diff --git a/Code/Access/AccessControl.php b/Code/Access/AccessControl.php new file mode 100644 index 000000000..cb95be4d6 --- /dev/null +++ b/Code/Access/AccessControl.php @@ -0,0 +1,169 @@ + string of allowed cids + * * \e string \b channel_allow_gid => string of allowed gids + * * \e string \b channel_deny_cid => string of denied cids + * * \e string \b channel_deny_gid => string of denied gids + */ + public function __construct($channel) + { + if ($channel) { + $this->allow_cid = $channel['channel_allow_cid']; + $this->allow_gid = $channel['channel_allow_gid']; + $this->deny_cid = $channel['channel_deny_cid']; + $this->deny_gid = $channel['channel_deny_gid']; + } else { + $this->allow_cid = ''; + $this->allow_gid = ''; + $this->deny_cid = ''; + $this->deny_gid = ''; + } + + $this->explicit = false; + } + + /** + * @brief Get if we are using the default constructor values + * or values that have been set explicitly. + * + * @return bool + */ + public function get_explicit() + { + return $this->explicit; + } + + /** + * @brief Set access list from strings such as those in already + * existing stored data items. + * + * @note The array to pass to this set function is different from the array + * that you provide to the constructor or set_from_array(). + * + * @param array $arr + * * \e string \b allow_cid => string of allowed cids + * * \e string \b allow_gid => string of allowed gids + * * \e string \b deny_cid => string of denied cids + * * \e string \b deny_gid => string of denied gids + * @param bool $explicit (optional) default true + */ + public function set($arr, $explicit = true) + { + $this->allow_cid = $arr['allow_cid']; + $this->allow_gid = $arr['allow_gid']; + $this->deny_cid = $arr['deny_cid']; + $this->deny_gid = $arr['deny_gid']; + + $this->explicit = $explicit; + } + + /** + * @brief Return an array consisting of the current access list components + * where the elements are directly storable. + * + * @return array An associative array with: + * * \e string \b allow_cid => string of allowed cids + * * \e string \b allow_gid => string of allowed gids + * * \e string \b deny_cid => string of denied cids + * * \e string \b deny_gid => string of denied gids + */ + public function get() + { + return [ + 'allow_cid' => $this->allow_cid, + 'allow_gid' => $this->allow_gid, + 'deny_cid' => $this->deny_cid, + 'deny_gid' => $this->deny_gid, + ]; + } + + /** + * @brief Set access list components from arrays, such as those provided by + * acl_selector(). + * + * For convenience, a string (or non-array) input is assumed to be a + * comma-separated list and auto-converted into an array. + * + * @note The array to pass to this set function is different from the array + * that you provide to the constructor or set(). + * + * @param array $arr An associative array with: + * * \e array|string \b contact_allow => array with cids or comma-seperated string + * * \e array|string \b group_allow => array with gids or comma-seperated string + * * \e array|string \b contact_deny => array with cids or comma-seperated string + * * \e array|string \b group_deny => array with gids or comma-seperated string + * @param bool $explicit (optional) default true + */ + public function set_from_array($arr, $explicit = true) + { + $this->allow_cid = perms2str((is_array($arr['contact_allow'])) + ? $arr['contact_allow'] : explode(',', $arr['contact_allow'])); + $this->allow_gid = perms2str((is_array($arr['group_allow'])) + ? $arr['group_allow'] : explode(',', $arr['group_allow'])); + $this->deny_cid = perms2str((is_array($arr['contact_deny'])) + ? $arr['contact_deny'] : explode(',', $arr['contact_deny'])); + $this->deny_gid = perms2str((is_array($arr['group_deny'])) + ? $arr['group_deny'] : explode(',', $arr['group_deny'])); + + $this->explicit = $explicit; + } + + /** + * @brief Returns true if any access lists component is set. + * + * @return bool Return true if any of allow_* deny_* values is set. + */ + public function is_private() + { + return (($this->allow_cid || $this->allow_gid || $this->deny_cid || $this->deny_gid) ? true : false); + } +} diff --git a/Code/Access/PermissionLimits.php b/Code/Access/PermissionLimits.php new file mode 100644 index 000000000..9fe7d5928 --- /dev/null +++ b/Code/Access/PermissionLimits.php @@ -0,0 +1,109 @@ + $v) { + if (strstr($k, 'view')) { + $limits[$k] = PERMS_PUBLIC; + } else { + $limits[$k] = PERMS_SPECIFIC; + } + } + + return $limits; + } + + /** + * @brief Sets a permission limit for a channel. + * + * @param int $channel_id + * @param string $perm + * @param int $perm_limit one of PERMS_* constants + */ + public static function Set($channel_id, $perm, $perm_limit) + { + PConfig::Set($channel_id, 'perm_limits', $perm, $perm_limit); + } + + /** + * @brief Get a channel's permission limits. + * + * Return a channel's permission limits from PConfig. If $perm is set just + * return this permission limit, if not set, return an array with all + * permission limits. + * + * @param int $channel_id + * @param string $perm (optional) + * @return + * * \b false if no perm_limits set for this channel + * * \b int if $perm is set, return one of PERMS_* constants for this permission, default 0 + * * \b array with all permission limits, if $perm is not set + */ + public static function Get($channel_id, $perm = '') + { + + if (! intval($channel_id)) { + return false; + } + + if ($perm) { + $x = PConfig::Get($channel_id, 'perm_limits', $perm); + if ($x === false) { + $a = [ 'channel_id' => $channel_id, 'permission' => $perm, 'value' => $x ]; + Hook::call('permission_limits_get', $a); + return intval($a['value']); + } + return intval($x); + } + + PConfig::Load($channel_id); + if (array_key_exists($channel_id, App::$config) && array_key_exists('perm_limits', App::$config[$channel_id])) { + return App::$config[$channel_id]['perm_limits']; + } + + return false; + } +} diff --git a/Code/Access/PermissionRoles.php b/Code/Access/PermissionRoles.php new file mode 100644 index 000000000..1b6ec352b --- /dev/null +++ b/Code/Access/PermissionRoles.php @@ -0,0 +1,155 @@ + $role, 'result' => $ret]; + + Hook::call('get_role_perms', $x); + + return $x['result']; + } + + + /** + * @brief Array with translated role names and grouping. + * + * Return an associative array with grouped role names that can be used + * to create select groups like in \e field_select_grouped.tpl. + * + * @return array + */ + public static function roles() + { + $roles = [ + t('Social Networking') => [ + 'social' => t('Social - Normal'), + 'social_restricted' => t('Social - Restricted') + ], + + t('Community Group') => [ + 'forum' => t('Group - Normal'), + 'forum_restricted' => t('Group - Restricted'), + 'forum_moderated' => t('Group - Moderated') + ], + ]; + + Hook::call('list_permission_roles', $roles); + + return $roles; + } + +} diff --git a/Code/Access/Permissions.php b/Code/Access/Permissions.php new file mode 100644 index 000000000..3fd019214 --- /dev/null +++ b/Code/Access/Permissions.php @@ -0,0 +1,298 @@ + t('Grant viewing access to and delivery of your channel stream and posts'), + 'view_profile' => t('Grant viewing access to your default channel profile'), + 'view_contacts' => t('Grant viewing access to your address book (connections)'), + 'view_storage' => t('Grant viewing access to your file storage and photos'), + 'post_wall' => t('Grant permission to post on your channel (wall) page'), + 'post_mail' => t('Accept delivery of direct messages and personal mail'), + 'send_stream' => t('Accept delivery of their posts and all comments to their posts'), + 'post_comments' => t('Accept delivery of their comments and likes on your posts'), + 'write_storage' => t('Grant upload permissions to your file storage and photos'), + 'republish' => t('Grant permission to republish/mirror your posts'), + 'moderated' => t('Accept comments and wall posts only after approval (moderation)'), + 'delegate' => t('Grant channel administration (delegation) permission') + ]; + + $x = [ + 'permissions' => $perms, + 'filter' => $filter + ]; + /** + * @hooks permissions_list + * * \e array \b permissions + * * \e string \b filter + */ + Hook::call('permissions_list', $x); + + return($x['permissions']); + } + + /** + * @brief Perms from the above list that are blocked from anonymous observers. + * + * e.g. you must be authenticated. + * + * @return array Associative array with permissions and short description. + */ + public static function BlockedAnonPerms() + { + + $res = []; + $perms = PermissionLimits::Std_limits(); + foreach ($perms as $perm => $limit) { + if ($limit != PERMS_PUBLIC) { + $res[] = $perm; + } + } + + $x = ['permissions' => $res]; + /** + * @hooks write_perms + * * \e array \b permissions + */ + Hook::call('write_perms', $x); + + return($x['permissions']); + } + + /** + * @brief Converts indexed perms array to associative perms array. + * + * Converts [ 0 => 'view_stream', ... ] + * to [ 'view_stream' => 1 ] for any permissions in $arr; + * Undeclared permissions which exist in Perms() are added and set to 0. + * + * @param array $arr + * @return array + */ + public static function FilledPerms($arr) + { + if (is_null($arr) || (! is_array($arr))) { + btlogger('FilledPerms: ' . print_r($arr, true)); + $arr = []; + } + + $everything = self::Perms(); + $ret = []; + foreach ($everything as $k => $v) { + if (in_array($k, $arr)) { + $ret[$k] = 1; + } else { + $ret[$k] = 0; + } + } + + return $ret; + } + + /** + * @brief Convert perms array to indexed array. + * + * Converts [ 'view_stream' => 1 ] for any permissions in $arr + * to [ 0 => ['name' => 'view_stream', 'value' => 1], ... ] + * + * @param array $arr associative perms array 'view_stream' => 1 + * @return array Indexed array with elements that look like + * * \e string \b name the perm name (e.g. view_stream) + * * \e int \b value the value of the perm (e.g. 1) + */ + public static function OPerms($arr) + { + $ret = []; + if ($arr) { + foreach ($arr as $k => $v) { + $ret[] = [ 'name' => $k, 'value' => $v ]; + } + } + return $ret; + } + + /** + * @brief + * + * @param int $channel_id + * @return bool|array + */ + public static function FilledAutoperms($channel_id) + { + if (! intval(get_pconfig($channel_id, 'system', 'autoperms'))) { + return false; + } + + $arr = []; + $r = q( + "select * from pconfig where uid = %d and cat = 'autoperms'", + intval($channel_id) + ); + if ($r) { + foreach ($r as $rr) { + $arr[$rr['k']] = intval($rr['v']); + } + } + return $arr; + } + + /** + * @brief Compares that all Permissions from $p1 exist also in $p2. + * + * @param array $p1 The perms that have to exist in $p2 + * @param array $p2 The perms to compare against + * @return bool true if all perms from $p1 exist also in $p2 + */ + public static function PermsCompare($p1, $p2) + { + foreach ($p1 as $k => $v) { + if (! array_key_exists($k, $p2)) { + return false; + } + + if ($p1[$k] != $p2[$k]) { + return false; + } + } + + return true; + } + + /** + * @brief + * + * @param int $channel_id A channel id + * @return array Associative array with + * * \e array \b perms Permission array + * * \e int \b automatic 0 or 1 + */ + public static function connect_perms($channel_id) + { + + $my_perms = []; + $permcat = null; + $automatic = 0; + + // If a default permcat exists, use that + + $pc = ((Zlib\Apps::system_app_installed($channel_id, 'Roles')) ? get_pconfig($channel_id, 'system', 'default_permcat') : 'default'); + if (! in_array($pc, [ '','default' ])) { + $pcp = new Zlib\Permcat($channel_id); + $permcat = $pcp->fetch($pc); + if ($permcat && $permcat['perms']) { + foreach ($permcat['perms'] as $p) { + $my_perms[$p['name']] = $p['value']; + } + } + } + + $automatic = intval(get_pconfig($channel_id, 'system', 'autoperms')); + + // look up the permission role to see if it specified auto-connect + // and if there was no permcat or a default permcat, set the perms + // from the role + + $role = get_pconfig($channel_id, 'system', 'permissions_role'); + if ($role) { + $xx = PermissionRoles::role_perms($role); + + if ((! $my_perms) && ($xx['perms_connect'])) { + $default_perms = $xx['perms_connect']; + $my_perms = Permissions::FilledPerms($default_perms); + } + } + + // If we reached this point without having any permission information, + // it is likely a custom permissions role. First see if there are any + // automatic permissions. + + if (! $my_perms) { + $m = Permissions::FilledAutoperms($channel_id); + if ($m) { + $my_perms = $m; + } + } + + // If we reached this point with no permissions, the channel is using + // custom perms but they are not automatic. They will be stored in abconfig with + // the channel's channel_hash (the 'self' connection). + + if (! $my_perms) { + $c = Channel::from_id($channel_id); + if ($c) { + $my_perms = Permissions::FilledPerms(explode(',', get_abconfig($channel_id, $c['channel_hash'], 'system', 'my_perms', EMPTY_STR))); + } + } + + return ( [ 'perms' => $my_perms, 'automatic' => $automatic ] ); + } + + + public static function serialise($p) + { + $n = []; + if ($p) { + foreach ($p as $k => $v) { + if (intval($v)) { + $n[] = $k; + } + } + } + return implode(',', $n); + } +} diff --git a/Code/Daemon/Addon.php b/Code/Daemon/Addon.php new file mode 100644 index 000000000..3f62bd834 --- /dev/null +++ b/Code/Daemon/Addon.php @@ -0,0 +1,15 @@ + $max_thumb || $height > $max_thumb) { + $imagick_path = get_config('system', 'imagick_convert_path'); + if ($imagick_path && @file_exists($imagick_path)) { + $tmp_name = $path . '-001'; + $newsize = photo_calculate_scale(array_merge($is, ['max' => $max_thumb])); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $path) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + + for ($x = 0; $x < 4; $x++) { + exec($cmd); + if (file_exists($tmp_name)) { + break; + } + continue; + } + + if (! file_exists($tmp_name)) { + return; + } + @rename($tmp_name, $path); + } + } + } +} diff --git a/Code/Daemon/Cache_embeds.php b/Code/Daemon/Cache_embeds.php new file mode 100644 index 000000000..d24d34709 --- /dev/null +++ b/Code/Daemon/Cache_embeds.php @@ -0,0 +1,35 @@ + 1) && ($argv[1])) { + $site_id = $argv[1]; + } + + if ($site_id) { + $sql_options = " and site_url = '" . dbesc($argv[1]) . "' "; + } + + $days = intval(get_config('system', 'sitecheckdays')); + if ($days < 1) { + $days = 30; + } + + $r = q( + "select * from site where site_dead = 0 and site_update < %s - INTERVAL %s and site_type = %d $sql_options ", + db_utcnow(), + db_quoteinterval($days . ' DAY'), + intval(SITE_TYPE_ZOT) + ); + + if (! $r) { + return; + } + + foreach ($r as $rr) { + if (! strcasecmp($rr['site_url'], z_root())) { + continue; + } + + $x = ping_site($rr['site_url']); + if ($x['success']) { + logger('checksites: ' . $rr['site_url']); + q( + "update site set site_update = '%s' where site_url = '%s' ", + dbesc(datetime_convert()), + dbesc($rr['site_url']) + ); + } else { + logger('marking dead site: ' . $x['message']); + q( + "update site set site_dead = 1 where site_url = '%s' ", + dbesc($rr['site_url']) + ); + } + } + + return; + } +} diff --git a/Code/Daemon/Content_importer.php b/Code/Daemon/Content_importer.php new file mode 100644 index 000000000..1e1873be0 --- /dev/null +++ b/Code/Daemon/Content_importer.php @@ -0,0 +1,63 @@ + random_string(), + 'X-API-Request' => $hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page , + 'Host' => $m['host'], + '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page , + ]; + + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512'); + + $x = z_fetch_url($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, false, $redirects, [ 'headers' => $headers ]); + + if (! $x['success']) { + logger('no API response', LOGGER_DEBUG); + killme(); + } + + $j = json_decode($x['body'], true); + + if (! $j) { + killme(); + } + + if (! ($j['item'] || count($j['item']))) { + killme(); + } + + import_items($channel, $j['item'], false, ((array_key_exists('relocate', $j)) ? $j['relocate'] : null)); + + killme(); + } +} diff --git a/Code/Daemon/Convo.php b/Code/Daemon/Convo.php new file mode 100644 index 000000000..0c18349e2 --- /dev/null +++ b/Code/Daemon/Convo.php @@ -0,0 +1,62 @@ +get(); + + if ($messages) { + foreach ($messages as $message) { + if (is_string($message)) { + $message = Activity::fetch($message, $channel); + } + // set client flag because comments will probably just be objects and not full blown activities + // and that lets us use implied_create + $AS = new ActivityStreams($message, null, true); + if ($AS->is_valid() && is_array($AS->obj)) { + $item = Activity::decode_note($AS, true); + Activity::store($channel, $contact['abook_xchan'], $AS, $item, true, true); + } + } + } + } +} diff --git a/Code/Daemon/Cron.php b/Code/Daemon/Cron.php new file mode 100644 index 000000000..93547eb8e --- /dev/null +++ b/Code/Daemon/Cron.php @@ -0,0 +1,223 @@ + $maxsysload) { + logger('system: load ' . $load . ' too high. Cron deferred to next scheduled run.'); + return; + } + } + + // Check for a lockfile. If it exists, but is over an hour old, it's stale. Ignore it. + $lockfile = 'cache/cron'; + if ( + (file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600)) + && (! get_config('system', 'override_cron_lockfile')) + ) { + logger("cron: Already running"); + return; + } + + // Create a lockfile. Needs two vars, but $x doesn't need to contain anything. + file_put_contents($lockfile, $x); + + logger('cron: start'); + + // run queue delivery process in the background + + Run::Summon([ 'Queue' ]); + + Run::Summon([ 'Poller' ]); + + // maintenance for mod sharedwithme - check for updated items and remove them + + require_once('include/sharedwithme.php'); + apply_updates(); + + // expire any expired items + + $r = q( + "select id,item_wall from item where expires > '2001-01-01 00:00:00' and expires < %s + and item_deleted = 0 ", + db_utcnow() + ); + if ($r) { + require_once('include/items.php'); + foreach ($r as $rr) { + drop_item($rr['id'], false, (($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); + if ($rr['item_wall']) { + // The notifier isn't normally invoked unless item_drop is interactive. + Run::Summon([ 'Notifier', 'drop', $rr['id'] ]); + } + } + } + + + // delete expired access tokens + + $r = q( + "select atoken_id from atoken where atoken_expires > '%s' and atoken_expires < %s", + dbesc(NULL_DATE), + db_utcnow() + ); + if ($r) { + require_once('include/security.php'); + foreach ($r as $rr) { + atoken_delete($rr['atoken_id']); + } + } + + // Ensure that every channel pings their directory occasionally. + + $r = q( + "select channel_id from channel where channel_dirdate < %s - INTERVAL %s and channel_removed = 0", + db_utcnow(), + db_quoteinterval('7 DAY') + ); + if ($r) { + foreach ($r as $rr) { + Run::Summon([ 'Directory', $rr['channel_id'], 'force' ]); + if ($interval) { + @time_sleep_until(microtime(true) + (float) $interval); + } + } + } + + // publish any applicable items that were set to be published in the future + // (time travel posts). Restrict to items that have come of age in the last + // couple of days to limit the query to something reasonable. + + $r = q( + "select id from item where item_delayed = 1 and created <= %s and created > '%s' ", + db_utcnow(), + dbesc(datetime_convert('UTC', 'UTC', 'now - 2 days')) + ); + if ($r) { + foreach ($r as $rr) { + $x = q( + "update item set item_delayed = 0 where id = %d", + intval($rr['id']) + ); + if ($x) { + $z = q( + "select * from item where id = %d", + intval($message_id) + ); + if ($z) { + xchan_query($z); + $sync_item = fetch_post_tags($z); + Libsync::build_sync_packet( + $sync_item[0]['uid'], + [ + 'item' => [ encode_item($sync_item[0], true) ] + ] + ); + } + Run::Summon([ 'Notifier','wall-new',$rr['id'] ]); + } + } + } + + require_once('include/attach.php'); + attach_upgrade(); + + $abandon_days = intval(get_config('system', 'account_abandon_days')); + if ($abandon_days < 1) { + $abandon_days = 0; + } + + + // once daily run birthday_updates and then expire in background + + // FIXME: add birthday updates, both locally and for xprof for use + // by directory servers + + $d1 = intval(get_config('system', 'last_expire_day')); + $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd')); + + // Allow somebody to staggger daily activities if they have more than one site on their server, + // or if it happens at an inconvenient (busy) hour. + + $h1 = intval(get_config('system', 'cron_hour')); + $h2 = intval(datetime_convert('UTC', 'UTC', 'now', 'G')); + + + if (($d2 != $d1) && ($h1 == $h2)) { + Run::Summon([ 'Cron_daily' ]); + } + + // update any photos which didn't get imported properly + // This should be rare + + $r = q( + "select xchan_photo_l, xchan_hash from xchan where xchan_photo_l != '' and xchan_photo_m = '' + and xchan_photo_date < %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('1 DAY') + ); + if ($r) { + require_once('include/photo_factory.php'); + foreach ($r as $rr) { + $photos = import_remote_xchan_photo($rr['xchan_photo_l'], $rr['xchan_hash']); + if ($photos) { + $x = q( + "update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' + where xchan_hash = '%s'", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($rr['xchan_hash']) + ); + } + } + } + + $generation = 0; + + $restart = false; + + if (($argc > 1) && ($argv[1] == 'restart')) { + $restart = true; + $generation = intval($argv[2]); + if (! $generation) { + return; + } + } + + Addon::reload_all(); + + $d = datetime_convert(); + + // TODO check to see if there are any cronhooks before wasting a process + + if (! $restart) { + Run::Summon([ 'Cronhooks' ]); + } + + set_config('system', 'lastcron', datetime_convert()); + + //All done - clear the lockfile + @unlink($lockfile); + + return; + } +} diff --git a/Code/Daemon/Cron_daily.php b/Code/Daemon/Cron_daily.php new file mode 100644 index 000000000..bdbc01fd5 --- /dev/null +++ b/Code/Daemon/Cron_daily.php @@ -0,0 +1,117 @@ + %s - INTERVAL %s and channel_deleted < %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('21 DAY'), + db_utcnow(), + db_quoteinterval('10 DAY') + ); + if ($r) { + foreach ($r as $rv) { + Channel::channel_remove_final($rv['channel_id']); + } + } + + // get rid of really old poco records + + q( + "delete from xlink where xlink_updated < %s - INTERVAL %s and xlink_static = 0 ", + db_utcnow(), + db_quoteinterval('14 DAY') + ); + + // Check for dead sites + Run::Summon(['Checksites' ]); + + + // clean up image cache - use site expiration or 60 days if not set or zero + + $files = glob('cache/img/*/*'); + $expire_days = intval(get_config('system', 'default_expire_days')); + if ($expire_days <= 0) { + $expire_days = 60; + } + $now = time(); + $maxage = 86400 * $expire_days; + if ($files) { + foreach ($files as $file) { + if (is_file($file)) { + if ($now - filemtime($file) >= $maxage) { + unlink($file); + } + } + } + } + + // update searchable doc indexes + + Run::Summon([ 'Importdoc']); + + /** + * End Cron Weekly + */ + } +} diff --git a/Code/Daemon/Cronhooks.php b/Code/Daemon/Cronhooks.php new file mode 100644 index 000000000..dbc523d66 --- /dev/null +++ b/Code/Daemon/Cronhooks.php @@ -0,0 +1,22 @@ +start(); + + $_SESSION['authenticated'] = 1; + $_SESSION['uid'] = $argv[1]; + + $x = session_id(); + + $f = 'cache/cookie_' . $argv[1]; + $c = 'cache/cookien_' . $argv[1]; + + $e = file_exists($f); + + $output = ''; + + if ($e) { + $lines = file($f); + if ($lines) { + foreach ($lines as $line) { + if (strlen($line) > 0 && $line[0] != '#' && substr_count($line, "\t") == 6) { + $tokens = explode("\t", $line); + $tokens = array_map('trim', $tokens); + if ($tokens[4] > time()) { + $output .= $line . "\n"; + } + } else { + $output .= $line; + } + } + } + } + $t = time() + (24 * 3600); + file_put_contents($f, $output . 'HttpOnly_' . App::get_hostname() . "\tFALSE\t/\tTRUE\t$t\tPHPSESSID\t" . $x, (($e) ? FILE_APPEND : 0)); + + file_put_contents($c, $x); + + return; + } +} diff --git a/Code/Daemon/Deliver.php b/Code/Daemon/Deliver.php new file mode 100644 index 000000000..bfbc6875d --- /dev/null +++ b/Code/Daemon/Deliver.php @@ -0,0 +1,36 @@ + 2) { + if ($argv[2] === 'force') { + $force = true; + } + if ($argv[2] === 'nopush') { + $pushall = false; + } + } + + logger('directory update', LOGGER_DEBUG); + + $channel = Channel::from_id($argv[1]); + if (! $channel) { + return; + } + + // update the local directory - was optional, but now done regardless + + Libzotdir::local_dir_update($argv[1], $force); + + q( + "update channel set channel_dirdate = '%s' where channel_id = %d", + dbesc(datetime_convert()), + intval($channel['channel_id']) + ); + + // Now update all the connections + if ($pushall) { + Run::Summon([ 'Notifier','refresh_all',$channel['channel_id'] ]); + } + } +} diff --git a/Code/Daemon/Expire.php b/Code/Daemon/Expire.php new file mode 100644 index 000000000..2d2fb0912 --- /dev/null +++ b/Code/Daemon/Expire.php @@ -0,0 +1,98 @@ + random_string(), + 'X-API-Request' => $hz_server . '/api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, + 'Host' => $m['host'], + '(request-target)' => 'get /api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, + ]; + + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512'); + $x = z_fetch_url($hz_server . '/api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, false, $redirects, [ 'headers' => $headers ]); + + if (! $x['success']) { + logger('no API response', LOGGER_DEBUG); + return; + } + + $j = json_decode($x['body'], true); + + $r = sync_files($channel, [$j]); + + killme(); + } +} diff --git a/Code/Daemon/Gprobe.php b/Code/Daemon/Gprobe.php new file mode 100644 index 000000000..1785074df --- /dev/null +++ b/Code/Daemon/Gprobe.php @@ -0,0 +1,66 @@ + 3) ? $argv[3] : ''); + $dstname = (($argc > 4) ? $argv[4] : ''); + + $hash = random_string(); + + $arr = [ + 'src' => $srcfile, + 'filename' => (($dstname) ? $dstname : basename($srcfile)), + 'hash' => $hash, + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'], + 'preserve_original' => true, + 'replace' => true + ]; + + if ($folder) { + $arr['folder'] = $folder; + } + + attach_store($channel, $channel['channel_hash'], 'import', $arr); + + $sync = attach_export_data($channel, $hash); + if ($sync) { + Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync))); + } + + return; + } +} diff --git a/Code/Daemon/Notifier.php b/Code/Daemon/Notifier.php new file mode 100644 index 000000000..3be23de3f --- /dev/null +++ b/Code/Daemon/Notifier.php @@ -0,0 +1,816 @@ + $argv[4] ]; + self::$encoding = 'zot'; + $normal_mode = false; + } elseif ($cmd === 'keychange') { + self::$channel = Channel::from_id($item_id); + $r = q( + "select abook_xchan from abook where abook_channel = %d", + intval($item_id) + ); + if ($r) { + foreach ($r as $rr) { + self::$recipients[] = $rr['abook_xchan']; + } + } + self::$private = false; + self::$packet_type = 'keychange'; + self::$encoded_item = get_pconfig(self::$channel['channel_id'], 'system', 'keychange'); + self::$encoding = 'zot'; + $normal_mode = false; + } elseif (in_array($cmd, [ 'permissions_update', 'permissions_reject', 'permissions_accept', 'permissions_create' ])) { + // Get the (single) recipient + + $r = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0", + intval($item_id) + ); + if ($r) { + $recip = array_shift($r); + $uid = $recip['abook_channel']; + // Get the sender + self::$channel = Channel::from_id($uid); + if (self::$channel) { + $perm_update = [ 'sender' => self::$channel, 'recipient' => $recip, 'success' => false, 'deliveries' => '' ]; + + switch ($cmd) { + case 'permissions_create': + ActivityPub::permissions_create($perm_update); + break; + case 'permissions_accept': + ActivityPub::permissions_accept($perm_update); + break; + case 'permissions_update': + ActivityPub::permissions_update($perm_update); + break; + + default: + break; + } + if (! $perm_update['success']) { + Hook::call($cmd, $perm_update); + } + + if ($perm_update['success']) { + if ($perm_update['deliveries']) { + self::$deliveries[] = $perm_update['deliveries']; + do_delivery(self::$deliveries); + } + return; + } else { + self::$recipients[] = $recip['abook_xchan']; + self::$private = false; + self::$packet_type = 'refresh'; + self::$env_recips = [ $recip['xchan_hash'] ]; + } + } + } + } elseif ($cmd === 'refresh_all') { + logger('notifier: refresh_all: ' . $item_id); + + self::$channel = Channel::from_id($item_id, true); + $r = q( + "select abook_xchan from abook where abook_channel = %d", + intval($item_id) + ); + if ($r) { + foreach ($r as $rr) { + self::$recipients[] = $rr['abook_xchan']; + } + } + self::$recipients[] = self::$channel['channel_hash']; + self::$private = false; + self::$packet_type = 'refresh'; + } elseif ($cmd === 'purge') { + $xchan = $argv[3]; + logger('notifier: purge: ' . $item_id . ' => ' . $xchan); + if (! $xchan) { + return; + } + + self::$channel = Channel::from_id($item_id, true); + self::$recipients = [ $xchan ]; + self::$private = true; + self::$packet_type = 'purge'; + } elseif ($cmd === 'purge_all') { + logger('notifier: purge_all: ' . $item_id); + self::$channel = Channel::from_id($item_id, true); + + self::$recipients = []; + $r = q( + "select abook_xchan from abook where abook_channel = %d and abook_self = 0", + intval($item_id) + ); + if (! $r) { + return; + } + foreach ($r as $rr) { + self::$recipients[] = $rr['abook_xchan']; + } + + self::$private = false; + self::$packet_type = 'purge'; + } else { + // Normal items + + // Fetch the target item + + $r = q( + "SELECT * FROM item WHERE id = %d and parent != 0 LIMIT 1", + intval($item_id) + ); + + if (! $r) { + return; + } + + xchan_query($r); + $r = fetch_post_tags($r); + + $target_item = array_shift($r); + + if ($target_item['author']['xchan_network'] === 'anon') { + logger('notifier: target item author is not a fetchable actor', LOGGER_DEBUG); + return; + } + + $deleted_item = false; + + if (intval($target_item['item_deleted'])) { + logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG); + $deleted_item = true; + } + + if (! in_array(intval($target_item['item_type']), [ ITEM_TYPE_POST, ITEM_TYPE_MAIL ])) { + if (intval($target_item['item_type'] == ITEM_TYPE_CUSTOM)) { + $hookinfo=[ + 'targetitem' => $target_item, + 'deliver' => false + ]; + + Hook::call('customitem_deliver', $hookinfo); + } + + if (! $hookinfo['deliver']) { + logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG); + return; + } + } + + // Check for non published items, but allow an exclusion for transmitting hidden file activities + + if (intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) || + intval($target_item['item_blocked']) || + ( intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) { + logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG); + return; + } + + if (in_array($target_item['verb'], [ ACTIVITY_FOLLOW, ACTIVITY_IGNORE ])) { + logger('not fowarding follow|unfollow->note activity'); + return; + } + + $s = q( + "select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1", + intval($target_item['uid']) + ); + if ($s) { + self::$channel = array_shift($s); + } + + if (self::$channel['channel_hash'] !== $target_item['author_xchan'] && self::$channel['channel_hash'] !== $target_item['owner_xchan']) { + logger("notifier: Sending channel is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}", LOGGER_NORMAL, LOG_WARNING); + return; + } + + $thread_is_public = false; + + if ($target_item['mid'] === $target_item['parent_mid']) { + $parent_item = $target_item; + $top_level_post = true; + } else { + // fetch the parent item + $r = q( + "SELECT * from item where id = %d order by id asc", + intval($target_item['parent']) + ); + + if (! $r) { + return; + } + + xchan_query($r); + $r = fetch_post_tags($r); + + $parent_item = array_shift($r); + $top_level_post = false; + $thread_is_public = ((intval($parent_item['item_private'])) ? false : true) ; + } + + // avoid looping of discover items 12/4/2014 + + if ($sys && $parent_item['uid'] == $sys['channel_id']) { + return; + } + + $m = get_iconfig($target_item, 'activitypub', 'signed_data'); + // Re-use existing signature unless the activity type changed to a Tombstone, which won't verify. + if ($m && (! intval($target_item['item_deleted']))) { + self::$encoded_item = json_decode($m, true); + } else { + self::$encoded_item = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], Activity::encode_activity($target_item, true)); + self::$encoded_item['signature'] = LDSignatures::sign(self::$encoded_item, self::$channel); + } + + + logger('target_item: ' . print_r($target_item, true), LOGGER_DEBUG); + logger('encoded: ' . print_r(self::$encoded_item, true), LOGGER_DEBUG); + + // Send comments to the owner to re-deliver to everybody in the conversation + // We only do this if the item in question originated on this site. This prevents looping. + // To clarify, a site accepting a new comment is responsible for sending it to the owner for relay. + // Relaying should never be initiated on a post that arrived from elsewhere. + + // We should normally be able to rely on ITEM_ORIGIN, but start_delivery_chain() incorrectly set this + // flag on comments for an extended period. So we'll also call comment_local_origin() which looks at + // the hostname in the message_id and provides a second (fallback) opinion. + + $relay_to_owner = (((! $top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item) && $cmd !== 'hyper') ? true : false); + + $uplink = false; + + // $cmd === 'relay' indicates the owner is sending it to the original recipients + // don't allow the item in the relay command to relay to owner under any circumstances, it will loop + + logger('notifier: relay_to_owner: ' . (($relay_to_owner) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG); + logger('notifier: top_level_post: ' . (($top_level_post) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG); + + // tag_deliver'd post which needs to be sent back to the original author + + if (($cmd === 'uplink') && intval($parent_item['item_uplink']) && (! $top_level_post)) { + logger('notifier: uplink'); + $uplink = true; + self::$packet_type = 'response'; + } + + if (($relay_to_owner || $uplink) && ($cmd !== 'relay')) { + logger('followup relay (upstream delivery)', LOGGER_DEBUG); + $sendto = ($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']; + self::$recipients = [ $sendto ]; + // over-ride upstream recipients if 'replyTo' was set in the parent. + if ($parent_item['replyto'] && (! $uplink)) { + logger('replyto: over-riding owner ' . $sendto, LOGGER_DEBUG); + // unserialise is a no-op if presented with data that wasn't serialised. + $ptr = unserialise($parent_item['replyto']); + if (is_string($ptr)) { + if (ActivityStreams::is_url($sendto)) { + $sendto = $ptr; + self::$recipients = [ $sendto ]; + } + } elseif (is_array($ptr)) { + $sendto = []; + foreach ($ptr as $rto) { + if (is_string($rto)) { + $sendto[] = $rto; + } elseif (is_array($rto) && isset($rto['id'])) { + $sendto[] = $rto['id']; + } + } + self::$recipients = $sendto; + } + } + + logger('replyto: upstream recipients ' . print_r($sendto, true), LOGGER_DEBUG); + + + self::$private = true; + $upstream = true; + self::$packet_type = 'response'; + $is_moderated = their_perms_contains($parent_item['uid'], $sendto, 'moderated'); + if ($relay_to_owner && $thread_is_public && (! $is_moderated) && (! Channel::is_group($parent_item['uid']))) { + if (get_pconfig($target_item['uid'], 'system', 'hyperdrive', true)) { + Run::Summon([ 'Notifier' , 'hyper', $item_id ]); + } + } + } else { + if ($cmd === 'relay') { + logger('owner relay (downstream delivery)'); + } else { + logger('normal (downstream) distribution', LOGGER_DEBUG); + } + $upstream = false; + + if ($parent_item && $parent_item['item_private'] !== $target_item['item_private']) { + logger('parent_item: ' . $parent_item['id'] . ' item_private: ' . $parent_item['item_private']); + logger('target_item: ' . $target_item['id'] . ' item_private: ' . $target_item['item_private']); + + logger('conversation privacy mismatch - downstream delivery prevented'); + return; + } + + // if our parent is a tag_delivery recipient, uplink to the original author causing + // a delivery fork. + + if (($parent_item) && intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) { + // don't uplink a relayed post to the relay owner + if ($parent_item['source_xchan'] !== $parent_item['owner_xchan']) { + logger('notifier: uplinking this item'); + Run::Summon([ 'Notifier','uplink',$item_id ]); + } + } + + if ($thread_is_public && $cmd === 'hyper') { + self::$recipients = []; + $r = q( + "select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and abook_pending = 0 and abook_archived = 0 and not abook_xchan in ( '%s', '%s', '%s' ) ", + intval($target_item['uid']), + dbesc($target_item['author_xchan']), + dbesc($target_item['owner_xchan']), + dbesc($target_item['source_xchan']) + ); + if ($r) { + foreach ($r as $rv) { + self::$recipients[] = $rv['abook_xchan']; + } + } + self::$private = false; + } else { + self::$private = false; + self::$recipients = collect_recipients($parent_item, self::$private); + } + + // @FIXME add any additional recipients such as mentions, etc. + + if ($top_level_post) { + // remove clones who will receive the post via sync + self::$recipients = array_values(array_diff(self::$recipients, [ $target_item['owner_xchan'] ])); + } + + // don't send deletions onward for other people's stuff + + if (intval($target_item['item_deleted']) && (! intval($target_item['item_wall']))) { + logger('notifier: ignoring delete notification for non-wall item', LOGGER_NORMAL, LOG_NOTICE); + return; + } + } + } + + // Generic delivery section, we have an encoded item and recipients + // Now start the delivery process + + logger('encoded item: ' . print_r(self::$encoded_item, true), LOGGER_DATA, LOG_DEBUG); + + // This addresses an issue that crossposting addons weren't being called if the sender had no friends + // and only wanted to crosspost. + + $crossposting = (isset($target_item['postopts']) && $target_item['postopts']) ? true : false; + + stringify_array_elms(self::$recipients); + if ( (! self::$recipients && ! $crossposting)) { + logger('no recipients'); + return; + } + + // logger('recipients: ' . print_r(self::$recipients,true), LOGGER_NORMAL, LOG_DEBUG); + + if (! count(self::$env_recips)) { + self::$env_recips = ((self::$private) ? [] : null); + } + + $recip_list = []; + + if (self::$recipients) { + $details = q("select xchan_hash, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan + where xchan_hash in (" . protect_sprintf(implode(',', self::$recipients)) . ")"); + } + else { + $details = []; + } + + if ($details) { + foreach ($details as $d) { + $recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')'; + if (self::$private) { + self::$env_recips[] = $d['xchan_hash']; + } + } + } + + + $narr = [ + 'channel' => self::$channel, + 'upstream' => $upstream, + 'env_recips' => self::$env_recips, + 'recipients' => self::$recipients, + 'item' => $item, + 'target_item' => $target_item, + 'parent_item' => $parent_item, + 'top_level_post' => $top_level_post, + 'private' => self::$private, + 'relay_to_owner' => $relay_to_owner, + 'uplink' => $uplink, + 'cmd' => $cmd, + 'single' => (($cmd === 'single_activity') ? true : false), + 'request' => $request, + 'normal_mode' => $normal_mode, + 'packet_type' => self::$packet_type, + 'queued' => [] + ]; + + Hook::call('notifier_process', $narr); + if ($narr['queued']) { + foreach ($narr['queued'] as $pq) { + self::$deliveries[] = $pq; + } + } + + // notifier_process can alter the recipient list + + self::$recipients = $narr['recipients']; + self::$env_recips = $narr['env_recips']; + + if ((self::$private) && (! self::$env_recips)) { + // shouldn't happen + logger('private message with no envelope recipients.' . print_r($argv, true), LOGGER_NORMAL, LOG_NOTICE); + return; + } + + logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list, true), LOGGER_DEBUG); + + // Now we have collected recipients (except for external mentions, @FIXME) + // Let's reduce this to a set of hubs; checking that the site is not dead. + + if (self::$recipients) { + $hubs = q("select hubloc.*, site.site_crypto, site.site_flags from hubloc left join site on site_url = hubloc_url + where hubloc_hash in (" . protect_sprintf(implode(',', self::$recipients)) . ") + and hubloc_error = 0 and hubloc_deleted = 0 "); + } + else { + $hubs = []; + } + // public posts won't make it to the local public stream unless there's a recipient on this site. + // This code block sees if it's a public post and localhost is missing, and if so adds an entry for the local sys channel to the $hubs list + + if (! self::$private) { + $found_localhost = false; + if ($hubs) { + foreach ($hubs as $h) { + if ($h['hubloc_url'] === z_root()) { + $found_localhost = true; + break; + } + } + } + if (! $found_localhost) { + $localhub = q( + "select hubloc.*, site.site_crypto, site.site_flags, site.site_dead from hubloc + left join site on site_url = hubloc_url where hubloc_id_url = '%s' and hubloc_error = 0 and hubloc_deleted = 0 ", + dbesc(z_root() . '/channel/sys') + ); + if ($localhub) { + $hubs = array_merge($hubs, $localhub); + } + } + } + + if (! $hubs) { + logger('notifier: no hubs', LOGGER_NORMAL, LOG_NOTICE); + return; + } + + /** + * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey, + * since it may have been a re-install which has not yet been detected and pruned. + * For other networks which don't have or require sitekeys, we'll have to use the URL + */ + + + $hublist = []; // this provides an easily printable list for the logs + $dhubs = []; // delivery hubs where we store our resulting unique array + $keys = []; // array of keys to check uniquness for zot hubs + $urls = []; // array of urls to check uniqueness of hubs from other networks + $hub_env = []; // per-hub envelope so we don't broadcast the entire envelope to all + $dead = []; // known dead hubs - report them as undeliverable + + foreach ($hubs as $hub) { + if (isset($hub['site_dead']) && intval($hub['site_dead'])) { + $dead[] = $hub; + continue; + } + + if (self::$env_recips) { + foreach (self::$env_recips as $er) { + if ($hub['hubloc_hash'] === $er) { + if (! array_key_exists($hub['hubloc_site_id'], $hub_env)) { + $hub_env[$hub['hubloc_site_id']] = []; + } + $hub_env[$hub['hubloc_site_id']][] = $er; + } + } + } + + if (in_array($hub['hubloc_network'],['nomad','zot6'])) { + if (! in_array($hub['hubloc_sitekey'], $keys)) { + $hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network']; + $dhubs[] = $hub; + $keys[] = $hub['hubloc_sitekey']; + } + } else { + if (! in_array($hub['hubloc_url'], $urls)) { + $hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network']; + $dhubs[] = $hub; + $urls[] = $hub['hubloc_url']; + } + } + } + + logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist, true), LOGGER_DEBUG, LOG_DEBUG); + + foreach ($dhubs as $hub) { + logger('notifier_hub: ' . $hub['hubloc_url'], LOGGER_DEBUG, LOG_DEBUG); + + // deliver to any non-zot networks + + if (! in_array($hub['hubloc_network'], ['zot6', 'nomad' ])) { + $narr = [ + 'channel' => self::$channel, + 'upstream' => $upstream, + 'env_recips' => self::$env_recips, + 'recipients' => self::$recipients, + 'item' => $item, + 'target_item' => $target_item, + 'parent_item' => $parent_item, + 'hub' => $hub, + 'top_level_post' => $top_level_post, + 'private' => self::$private, + 'relay_to_owner' => $relay_to_owner, + 'uplink' => $uplink, + 'cmd' => $cmd, + 'single' => (($cmd === 'single_activity') ? true : false), + 'request' => $request, + 'normal_mode' => $normal_mode, + 'packet_type' => self::$packet_type, + 'queued' => [] + ]; + + ActivityPub::notifier_process($narr); + + Hook::call('notifier_hub', $narr); + if ($narr['queued']) { + foreach ($narr['queued'] as $pq) { + self::$deliveries[] = $pq; + } + } + continue; + } + + + // Single deliveries are for non-nomadic federated networks and we're essentially + // delivering only to those that have this site url in their abook_instance + // and only from within a sync operation. This means if you post from a clone, + // and a connection is connected to one of your other clones; assuming that hub + // is running it will receive a sync packet. On receipt of this sync packet it + // will invoke a delivery to those connections which are connected to just that + // hub instance. + + if ($cmd === 'single_activity') { + continue; + } + + // default: zot or nomad protocol + + // Prevent zot6/Nomad delivery of group comment boosts, which are not required for conversational platforms. + // ActivityPub conversational platforms may wish to filter these if they don't want or require them. + // We will assume here that if $target_item exists and has a verb that it is an actual item structure + // so we won't need to check the existence of the other item fields prior to evaluation. + + // This shouldn't produce false positives on comment boosts that were generated on other platforms + // because we won't be delivering them. + + if (isset($target_item) && isset($target_item['verb']) && $target_item['verb'] === 'Announce' && $target_item['author_xchan'] === $target_item['owner_xchan'] && ! intval($target_item['item_thread_top'])) { + continue; + } + + $hash = new_uuid(); + + $env = (($hub_env && $hub_env[$hub['hubloc_site_id']]) ? $hub_env[$hub['hubloc_site_id']] : ''); + if ((self::$private) && (! $env)) { + continue; + } + + $packet = Libzot::build_packet( + self::$channel, + self::$packet_type, + $env, + self::$encoded_item, + self::$encoding, + ((self::$private) ? $hub['hubloc_sitekey'] : null), + $hub['site_crypto'] + ); + + Queue::insert( + [ + 'hash' => $hash, + 'account_id' => self::$channel['channel_account_id'], + 'channel_id' => self::$channel['channel_id'], + 'posturl' => $hub['hubloc_callback'], + 'driver' => $hub['hubloc_network'], + 'notify' => $packet, + 'msg' => EMPTY_STR + ] + ); + + // only create delivery reports for normal undeleted items + if (is_array($target_item) && (! $target_item['item_deleted']) && (! get_config('system', 'disable_dreport'))) { + q( + "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue, dreport_log ) + values ( '%s', '%s','%s','%s','%s','%s','%s','%s', '%s' ) ", + dbesc($target_item['mid']), + dbesc($hub['hubloc_host']), + dbesc($hub['hubloc_host']), + dbesc($hub['hubloc_host']), + dbesc('queued'), + dbesc(datetime_convert()), + dbesc(self::$channel['channel_hash']), + dbesc($hash), + dbesc(EMPTY_STR) + ); + } + + self::$deliveries[] = $hash; + } + + if ($normal_mode) { + // This wastes a process if there are no delivery hooks configured, so check this before launching the new process + $x = q("select * from hook where hook = 'notifier_normal'"); + if ($x) { + Run::Summon([ 'Deliver_hooks', $target_item['id'] ]); + } + } + + if (self::$deliveries) { + do_delivery(self::$deliveries); + } + + if ($dead) { + foreach ($dead as $deceased) { + if (is_array($target_item) && (! $target_item['item_deleted']) && (! get_config('system', 'disable_dreport'))) { + q( + "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue, dreport_log ) + values ( '%s', '%s','%s','%s','%s','%s','%s','%s','%s' ) ", + dbesc($target_item['mid']), + dbesc($deceased['hubloc_host']), + dbesc($deceased['hubloc_host']), + dbesc($deceased['hubloc_host']), + dbesc('undeliverable/unresponsive site'), + dbesc(datetime_convert()), + dbesc(self::$channel['channel_hash']), + dbesc(new_uuid()), + dbesc(EMPTY_STR) + ); + } + } + } + + Hook::call('notifier_end', $target_item); + + logger('notifer: complete.'); + return; + } +} diff --git a/Code/Daemon/Onedirsync.php b/Code/Daemon/Onedirsync.php new file mode 100644 index 000000000..3704cf7e1 --- /dev/null +++ b/Code/Daemon/Onedirsync.php @@ -0,0 +1,87 @@ + 1) && (intval($argv[1]))) { + $update_id = intval($argv[1]); + } + + if (! $update_id) { + logger('onedirsync: no update'); + return; + } + + $r = q( + "select * from updates where ud_id = %d limit 1", + intval($update_id) + ); + + if (! $r) { + return; + } + if (($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr'])) { + return; + } + + // Have we probed this channel more recently than the other directory server + // (where we received this update from) ? + // If we have, we don't need to do anything except mark any older entries updated + + $x = q( + "select * from updates where ud_addr = '%s' and ud_date > '%s' and ( ud_flags & %d )>0 order by ud_date desc limit 1", + dbesc($r[0]['ud_addr']), + dbesc($r[0]['ud_date']), + intval(UPDATE_FLAGS_UPDATED) + ); + if ($x) { + $y = q( + "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date != '%s'", + intval(UPDATE_FLAGS_UPDATED), + dbesc($r[0]['ud_addr']), + intval(UPDATE_FLAGS_UPDATED), + dbesc($x[0]['ud_date']) + ); + return; + } + + // ignore doing an update if this ud_addr refers to a known dead hubloc + + $h = q( + "select * from hubloc where hubloc_addr = '%s' limit 1", + dbesc($r[0]['ud_addr']) + ); + if (($h) && ($h[0]['hubloc_status'] & HUBLOC_OFFLINE)) { + $y = q( + "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ", + intval(UPDATE_FLAGS_UPDATED), + dbesc($r[0]['ud_addr']), + intval(UPDATE_FLAGS_UPDATED) + ); + + return; + } + + // we might have to pull this out some day, but for now update_directory_entry() + // runs zot_finger() and is kind of zot specific + + if ($h && in_array($h[0]['hubloc_network'],['nomad','zot6'])) { + return; + } + + Libzotdir::update_directory_entry($r[0]); + + return; + } +} diff --git a/Code/Daemon/Onepoll.php b/Code/Daemon/Onepoll.php new file mode 100644 index 000000000..c7c2f8027 --- /dev/null +++ b/Code/Daemon/Onepoll.php @@ -0,0 +1,178 @@ + 1) && (intval($argv[1]))) { + $contact_id = intval($argv[1]); + } + + if (! $contact_id) { + logger('onepoll: no contact'); + return; + } + + $d = datetime_convert(); + + $contacts = q( + "SELECT abook.*, xchan.*, account.* + FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan + where abook_id = %d + and abook_pending = 0 and abook_archived = 0 and abook_blocked = 0 and abook_ignored = 0 + AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", + intval($contact_id), + intval(ACCOUNT_OK), + intval(ACCOUNT_UNVERIFIED) + ); + + if (! $contacts) { + logger('onepoll: abook_id not found: ' . $contact_id); + return; + } + + $contact = array_shift($contacts); + + $t = $contact['abook_updated']; + + $importer_uid = $contact['abook_channel']; + + $r = q( + "SELECT * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1", + intval($importer_uid) + ); + + if (! $r) { + return; + } + + $importer = $r[0]; + + logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); + + $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE)) + ? datetime_convert('UTC', 'UTC', 'now - 7 days') + : datetime_convert('UTC', 'UTC', $contact['abook_updated'] . ' - 2 days') + ); + + if (in_array($contact['xchan_network'],['nomad']['zot6'])) { + // update permissions + + $x = Libzot::refresh($contact, $importer); + + $responded = false; + $updated = datetime_convert(); + $connected = datetime_convert(); + if (! $x) { + // mark for death by not updating abook_connected, this is caught in include/poller.php + q( + "update abook set abook_updated = '%s' where abook_id = %d", + dbesc($updated), + intval($contact['abook_id']) + ); + } else { + q( + "update abook set abook_updated = '%s', abook_connected = '%s' where abook_id = %d", + dbesc($updated), + dbesc($connected), + intval($contact['abook_id']) + ); + $responded = true; + } + + if (! $responded) { + return; + } + } + + $fetch_feed = true; + + // They haven't given us permission to see their stream + + $can_view_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'their_perms', 'view_stream')); + + if (! $can_view_stream) { + $fetch_feed = false; + } + + // we haven't given them permission to send us their stream + + $can_send_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'my_perms', 'send_stream')); + + if (! $can_send_stream) { + $fetch_feed = false; + } + + if ($contact['abook_created'] < datetime_convert('UTC', 'UTC', 'now - 1 week')) { + $fetch_feed = false; + } + + // In previous releases there was a mechanism to fetch 'external' or public stream posts from a site + // (as opposed to a channel). This mechanism was deprecated as there is no reliable/scalable method + // for informing downstream publishers when/if the content has expired or been deleted. + // We can use the ThreadListener interface to implement this on the owner's outbox, however this is still a + // work in progress and may present scaling issues. Making this work correctly with third-party fetches is + // prohibitive as deletion requests would need to be relayed over potentially hostile networks. + + if ($fetch_feed) { + $max = intval(get_config('system', 'max_imported_posts', 20)); + if (intval($max)) { + $cl = get_xconfig($xchan, 'activitypub', 'collections'); + if (is_array($cl) && $cl) { + $url = ((array_key_exists('outbox', $cl)) ? $cl['outbox'] : ''); + if ($url) { + logger('fetching outbox'); + $url = $url . '?date_begin=' . urlencode($last_update); + $obj = new ASCollection($url, $importer, 0, $max); + $messages = $obj->get(); + if ($messages) { + foreach ($messages as $message) { + if (is_string($message)) { + $message = Activity::fetch($message, $importer); + } + if (is_array($message)) { + $AS = new ActivityStreams($message, null, true); + if ($AS->is_valid() && is_array($AS->obj)) { + $item = Activity::decode_note($AS, true); + if ($item) { + Activity::store($importer, $contact['abook_xchan'], $AS, $item, true, true); + } + } + } + } + } + } + } + } + } + + // update the poco details for this connection + + $r = q( + "SELECT xlink_id from xlink + where xlink_xchan = '%s' and xlink_updated > %s - INTERVAL %s and xlink_static = 0 limit 1", + intval($contact['xchan_hash']), + db_utcnow(), + db_quoteinterval('7 DAY') + ); + if (! $r) { + Socgraph::poco_load($contact['xchan_hash'], $contact['xchan_connurl']); + } + return; + } +} diff --git a/Code/Daemon/Poller.php b/Code/Daemon/Poller.php new file mode 100644 index 000000000..eb5729b3d --- /dev/null +++ b/Code/Daemon/Poller.php @@ -0,0 +1,206 @@ + $maxsysload) { + logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.'); + return; + } + } + + $interval = intval(get_config('system', 'poll_interval')); + if (! $interval) { + $interval = ((get_config('system', 'delivery_interval') === false) ? 3 : intval(get_config('system', 'delivery_interval'))); + } + + // Check for a lockfile. If it exists, but is over an hour old, it's stale. Ignore it. + $lockfile = 'cache/poller'; + if ( + (file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600)) + && (! get_config('system', 'override_poll_lockfile')) + ) { + logger("poller: Already running"); + return; + } + + // Create a lockfile. + file_put_contents($lockfile, EMPTY_STR); + + logger('poller: start'); + + $manual_id = 0; + $generation = 0; + + $force = false; + $restart = false; + + if (($argc > 1) && ($argv[1] == 'force')) { + $force = true; + } + + if (($argc > 1) && ($argv[1] == 'restart')) { + $restart = true; + $generation = intval($argv[2]); + if (! $generation) { + return; + } + } + + if (($argc > 1) && intval($argv[1])) { + $manual_id = intval($argv[1]); + $force = true; + } + + + $sql_extra = (($manual_id) ? " AND abook_id = " . intval($manual_id) . " " : ""); + + Addon::reload_all(); + + $d = datetime_convert(); + + // Only poll from those with suitable relationships + +// $abandon_sql = (($abandon_days) +// ? sprintf(" AND account_lastlog > %s - INTERVAL %s ", db_utcnow(), db_quoteinterval(intval($abandon_days).' DAY')) +// : '' +// ); + + $abandon_sql = EMPTY_STR; + + $randfunc = db_getfunc('RAND'); + + $contacts = q( + "SELECT abook.abook_updated, abook.abook_connected, abook.abook_feed, + abook.abook_channel, abook.abook_id, abook.abook_archived, abook.abook_pending, + abook.abook_ignored, abook.abook_blocked, + xchan.xchan_network, + account.account_lastlog, account.account_flags + FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash + LEFT JOIN account on abook_account = account_id + where abook_self = 0 + $sql_extra + AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc", + intval(ACCOUNT_OK), + intval(ACCOUNT_UNVERIFIED) // FIXME + ); + + if ($contacts) { + foreach ($contacts as $contact) { + $update = false; + + $t = $contact['abook_updated']; + $c = $contact['abook_connected']; + + if (intval($contact['abook_feed'])) { + $min = ServiceClass::fetch($contact['abook_channel'], 'minimum_feedcheck_minutes'); + if (! $min) { + $min = intval(get_config('system', 'minimum_feedcheck_minutes')); + } + if (! $min) { + $min = 60; + } + $x = datetime_convert('UTC', 'UTC', "now - $min minutes"); + if ($c < $x) { + Run::Summon([ 'Onepoll', $contact['abook_id'] ]); + if ($interval) { + @time_sleep_until(microtime(true) + (float) $interval); + } + } + continue; + } + + if (! in_array($contact['xchan_network'],['nomad','zot6'])) { + continue; + } + + if ($c == $t) { + if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) { + $update = true; + } + } else { + // if we've never connected with them, start the mark for death countdown from now + + if ($c <= NULL_DATE) { + $r = q( + "update abook set abook_connected = '%s' where abook_id = %d", + dbesc(datetime_convert()), + intval($contact['abook_id']) + ); + $c = datetime_convert(); + $update = true; + } + + // He's dead, Jim + + if (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $c . " + 30 day")) > 0) { + $r = q( + "update abook set abook_archived = 1 where abook_id = %d", + intval($contact['abook_id']) + ); + $update = false; + continue; + } + + if (intval($contact['abook_archived'])) { + $update = false; + continue; + } + + // might be dead, so maybe don't poll quite so often + + // recently deceased, so keep up the regular schedule for 3 days + + if ( + (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $c . " + 3 day")) > 0) + && (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $t . " + 1 day")) > 0) + ) { + $update = true; + } + + // After that back off and put them on a morphine drip + + if (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $t . " + 2 day")) > 0) { + $update = true; + } + } + + if (intval($contact['abook_pending']) || intval($contact['abook_archived']) || intval($contact['abook_ignored']) || intval($contact['abook_blocked'])) { + continue; + } + + if ((! $update) && (! $force)) { + continue; + } + + Run::Summon([ 'Onepoll',$contact['abook_id'] ]); + if ($interval) { + @time_sleep_until(microtime(true) + (float) $interval); + } + } + } + + set_config('system', 'lastpoll', datetime_convert()); + + //All done - clear the lockfile + @unlink($lockfile); + + return; + } +} diff --git a/Code/Daemon/Queue.php b/Code/Daemon/Queue.php new file mode 100644 index 000000000..14d70f262 --- /dev/null +++ b/Code/Daemon/Queue.php @@ -0,0 +1,94 @@ + 1) { + $queue_id = $argv[1]; + } else { + $queue_id = EMPTY_STR; + } + + logger('queue: start'); + + // delete all queue items more than 3 days old + // but first mark these sites dead if we haven't heard from them in a month + + $r = q( + "select outq_posturl from outq where outq_created < %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('3 DAY') + ); + if ($r) { + foreach ($r as $rr) { + $site_url = ''; + $h = parse_url($rr['outq_posturl']); + $desturl = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : ''); + q( + "update site set site_dead = 1 where site_dead = 0 and site_url = '%s' and site_update < %s - INTERVAL %s", + dbesc($desturl), + db_utcnow(), + db_quoteinterval('1 MONTH') + ); + } + } + + $r = q( + "DELETE FROM outq WHERE outq_created < %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('3 DAY') + ); + + if ($queue_id) { + $r = q( + "SELECT * FROM outq WHERE outq_hash = '%s' LIMIT 1", + dbesc($queue_id) + ); + } else { + // For the first 12 hours we'll try to deliver every 15 minutes + // After that, we'll only attempt delivery once per hour. + // This currently only handles the default queue drivers ('zot' or '') which we will group by posturl + // so that we don't start off a thousand deliveries for a couple of dead hubs. + // The zot driver will deliver everything destined for a single hub once contact is made (*if* contact is made). + // Other drivers will have to do something different here and may need their own query. + + // Note: this requires some tweaking as new posts to long dead hubs once a day will keep them in the + // "every 15 minutes" category. We probably need to prioritise them when inserted into the queue + // or just prior to this query based on recent and long-term delivery history. If we have good reason to believe + // the site is permanently down, there's no reason to attempt delivery at all, or at most not more than once + // or twice a day. + + $sqlrandfunc = db_getfunc('rand'); + + $r = q( + "SELECT *,$sqlrandfunc as rn FROM outq WHERE outq_delivered = 0 and outq_scheduled < %s order by rn limit 1", + db_utcnow() + ); + while ($r) { + foreach ($r as $rv) { + Zlib\Queue::deliver($rv); + } + $r = q( + "SELECT *,$sqlrandfunc as rn FROM outq WHERE outq_delivered = 0 and outq_scheduled < %s order by rn limit 1", + db_utcnow() + ); + } + } + if (! $r) { + return; + } + + foreach ($r as $rv) { + Zlib\Queue::deliver($rv); + } + } +} diff --git a/Code/Daemon/README.md b/Code/Daemon/README.md new file mode 100644 index 000000000..e8c1d7041 --- /dev/null +++ b/Code/Daemon/README.md @@ -0,0 +1,43 @@ +Daemon (background) Processes +============================= + + +This directory provides background tasks which are executed by a +command-line process and detached from normal web processing. + +Background tasks are invoked by calling + + + Code\Daemon\Run::Summon([ $cmd, $arg1, $argn... ]); + +The Run class loads the desired command file and passes the arguments. + + +To create a background task 'Foo' use the following template. + + $arr, + 'long_running' => self::$long_running + ]; + + Hook::call('daemon_summon', $hookinfo); + + $arr = $hookinfo['argv']; + $argc = count($arr); + + if ((! is_array($arr) || ($argc < 1))) { + logger("Summon handled by hook.", LOGGER_DEBUG); + return; + } + + proc_run('php', 'Code/Daemon/Run.php', $arr); + } + + public static function Release($argc, $argv) + { + cli_startup(); + + $hookinfo = [ + 'argv' => $argv, + 'long_running' => self::$long_running + ]; + + Hook::call('daemon_release', $hookinfo); + + $argv = $hookinfo['argv']; + $argc = count($argv); + + if ((! is_array($argv) || ($argc < 1))) { + logger("Release handled by hook.", LOGGER_DEBUG); + return; + } + + logger('Run: release: ' . print_r($argv, true), LOGGER_ALL, LOG_DEBUG); + $cls = '\\Code\\Daemon\\' . $argv[0]; + $cls::run($argc, $argv); + } +} diff --git a/Code/Daemon/Thumbnail.php b/Code/Daemon/Thumbnail.php new file mode 100644 index 000000000..3caadb6ce --- /dev/null +++ b/Code/Daemon/Thumbnail.php @@ -0,0 +1,87 @@ + $attach, + 'preview_style' => $preview_style, + 'preview_width' => $preview_width, + 'preview_height' => $preview_height, + 'thumbnail' => null + ]; + + /** + * @hooks thumbnail + * * \e array \b attach + * * \e int \b preview_style + * * \e int \b preview_width + * * \e int \b preview_height + * * \e string \b thumbnail + */ + + Hook::call('thumbnail', $p); + if ($p['thumbnail']) { + return; + } + + $default_controller = null; + + $files = glob('Code/Thumbs/*.php'); + if ($files) { + foreach ($files as $f) { + $clsname = '\\Code\\Thumbs\\' . ucfirst(basename($f, '.php')); + if (class_exists($clsname)) { + $x = new $clsname(); + if (method_exists($x, 'Match')) { + $matched = $x->Match($attach['filetype']); + if ($matched) { + $x->Thumb($attach, $preview_style, $preview_width, $preview_height); + } + } + if (method_exists($x, 'MatchDefault')) { + $default_matched = $x->MatchDefault(substr($attach['filetype'], 0, strpos($attach['filetype'], '/'))); + if ($default_matched) { + $default_controller = $x; + } + } + } + } + } + if ( + ($default_controller) + && ((! file_exists(dbunescbin($attach['content']) . '.thumb')) + || (filectime(dbunescbin($attach['content']) . 'thumb') < (time() - 60))) + ) { + $default_controller->Thumb($attach, $preview_style, $preview_width, $preview_height); + } + } +} diff --git a/Code/Daemon/Xchan_photo.php b/Code/Daemon/Xchan_photo.php new file mode 100644 index 000000000..ea24008b5 --- /dev/null +++ b/Code/Daemon/Xchan_photo.php @@ -0,0 +1,39 @@ + $v) { + self::register($k, $file, $v); + } + } + } + + + public static function unregister($hook, $file, $function, $version = 1, $priority = 0) + { + if (is_array($function)) { + $function = serialize($function); + } + $r = q( + "DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s' and priority = %d and hook_version = %d", + dbesc($hook), + dbesc($file), + dbesc($function), + intval($priority), + intval($version) + ); + + return $r; + } + + /** + * @brief Unregister all hooks with this file component. + * + * Useful for addon upgrades where you want to clean out old interfaces. + * + * @param string $file + */ + + public static function unregister_by_file($file) + { + $r = q( + "DELETE FROM hook WHERE file = '%s' ", + dbesc($file) + ); + + return $r; + } + + /** + * @brief Inserts a hook into a page request. + * + * Insert a short-lived hook into the running page request. + * Hooks are normally persistent so that they can be called + * across asynchronous processes such as delivery and poll + * processes. + * + * insert_hook lets you attach a hook callback immediately + * which will not persist beyond the life of this page request + * or the current process. + * + * @param string $hook + * name of hook to attach callback + * @param string $fn + * function name of callback handler + * @param int $version + * hook interface version, 0 uses two callback params, 1 uses one callback param + * @param int $priority + * currently not implemented in this function, would require the hook array to be resorted + */ + public static function insert($hook, $fn, $version = 0, $priority = 0) + { + if (is_array($fn)) { + $fn = serialize($fn); + } + + if (! is_array(App::$hooks)) { + App::$hooks = []; + } + + if (! array_key_exists($hook, App::$hooks)) { + App::$hooks[$hook] = []; + } + + App::$hooks[$hook][] = [ '', $fn, $priority, $version ]; + } + + + /** + * @brief loads all active hooks into memory + * alters: App::$hooks + * Called during initialisation + * Duplicated hooks are removed and the duplicates ignored + * + * It might not be obvious but themes can manually add hooks to the App::$hooks + * array in their theme_init() and use this to customise the app behaviour. + * use insert_hook($hookname,$function_name) to do this. + */ + + + public static function load() + { + + App::$hooks = []; + + $r = q("SELECT * FROM hook WHERE true ORDER BY priority DESC"); + if ($r) { + foreach ($r as $rv) { + $duplicated = false; + if (! array_key_exists($rv['hook'], App::$hooks)) { + App::$hooks[$rv['hook']] = []; + } else { + foreach (App::$hooks[$rv['hook']] as $h) { + if ($h[0] === $rv['file'] && $h[1] === $rv['fn']) { + $duplicated = true; + q( + "delete from hook where id = %d", + intval($rv['id']) + ); + logger('duplicate hook ' . $h[1] . ' removed'); + } + } + } + if (! $duplicated) { + App::$hooks[$rv['hook']][] = [ $rv['file'], $rv['fn'], $rv['priority'], $rv['hook_version']]; + } + } + } + // logger('hooks: ' . print_r(App::$hooks,true)); + } + + /** + * @brief Calls a hook. + * + * Use this function when you want to be able to allow a hook to manipulate + * the provided data. + * + * @param string $name of the hook to call + * @param[in,out] string|array &$data to transmit to the callback handler + */ + static public function call($name, &$data = null) + { + $a = 0; + + if (isset(App::$hooks[$name])) { + foreach (App::$hooks[$name] as $hook) { + $origfn = $hook[1]; + if ($hook[0]) { + @include_once($hook[0]); + } + if (preg_match('|^a:[0-9]+:{.*}$|s', $hook[1])) { + $hook[1] = unserialize($hook[1]); + } elseif (strpos($hook[1], '::')) { + // We shouldn't need to do this, but it appears that PHP + // isn't able to directly execute a string variable with a class + // method in the manner we are attempting it, so we'll + // turn it into an array. + $hook[1] = explode('::', $hook[1]); + } + + if (is_callable($hook[1])) { + $func = $hook[1]; + if ($hook[3]) { + $func($data); + } else { + $func($a, $data); + } + } else { + // Don't do any DB write calls if we're currently logging a possibly failed DB call. + if (! DBA::$logging) { + // The hook should be removed so we don't process it. + q( + "DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'", + dbesc($name), + dbesc($hook[0]), + dbesc($origfn) + ); + } + } + } + } + } + + + + +} diff --git a/Code/Extend/Route.php b/Code/Extend/Route.php new file mode 100644 index 000000000..55220d888 --- /dev/null +++ b/Code/Extend/Route.php @@ -0,0 +1,52 @@ + true, + 'issuer' => System::get_site_name(), +// 'use_jwt_access_tokens' => true, +// 'enforce_state' => false + ]; + } + + parent::__construct($storage, $config); + + // Add the "Client Credentials" grant type (it is the simplest of the grant types) + $this->addGrantType(new ClientCredentials($storage)); + + // Add the "Authorization Code" grant type (this is where the oauth magic happens) + // Need to use OpenID\GrantType to return id_token + // (see:https://github.com/bshaffer/oauth2-server-php/issues/443) + $this->addGrantType(new AuthorizationCode($storage)); + + $keyStorage = new Memory([ + 'keys' => [ + 'public_key' => get_config('system', 'pubkey'), + 'private_key' => get_config('system', 'prvkey') + ] + ]); + + $this->addStorage($keyStorage, 'public_key'); + } +} diff --git a/Code/Identity/OAuth2Storage.php b/Code/Identity/OAuth2Storage.php new file mode 100644 index 000000000..06e99d652 --- /dev/null +++ b/Code/Identity/OAuth2Storage.php @@ -0,0 +1,171 @@ +getUser($username)) { + return $this->checkPassword($user, $password); + } + + return false; + } + + /** + * @param string $username + * @return array|bool + */ + public function getUserDetails($username) + { + return $this->getUser($username); + } + + + /** + * + * @param array $user + * @param string $password + * @return bool + */ + protected function checkPassword($user, $password) + { + + $x = account_verify_password($user, $password); + return((array_key_exists('channel', $x) && ! empty($x['channel'])) ? true : false); + } + + /** + * @param string $username + * @return array|bool + */ + public function getUser($username) + { + + $x = Channel::from_id($username); + if (! $x) { + return false; + } + + $a = q( + "select * from account where account_id = %d", + intval($x['channel_account_id']) + ); + + $n = explode(' ', $x['channel_name']); + + return( [ + 'webfinger' => Channel::get_webfinger($x), + 'portable_id' => $x['channel_hash'], + 'email' => $a[0]['account_email'], + 'username' => $x['channel_address'], + 'user_id' => $x['channel_id'], + 'name' => $x['channel_name'], + 'firstName' => ((count($n) > 1) ? $n[1] : $n[0]), + 'lastName' => ((count($n) > 2) ? $n[count($n) - 1] : ''), + 'picture' => $x['xchan_photo_l'] + ] ); + } + + public function scopeExists($scope) + { + // Report that the scope is valid even if it's not. + // We will only return a very small subset no matter what. + // @TODO: Truly validate the scope + // see vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ScopeInterface.php and + // vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Pdo.php + // for more info. + return true; + } + + public function getDefaultScope($client_id = null) + { + // Do not REQUIRE a scope + // see vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ScopeInterface.php and + // for more info. + return null; + } + + public function getUserClaims($user_id, $claims) + { + // Populate the CLAIMS requested (if any). + // @TODO: create a more reasonable/comprehensive list. + // @TODO: present claims on the AUTHORIZATION screen + + $userClaims = []; + $claims = explode(' ', trim($claims)); + $validclaims = [ "name", "preferred_username", "webfinger", "portable_id", "email", "picture", "firstName", "lastName" ]; + $claimsmap = [ + "webfinger" => 'webfinger', + "portable_id" => 'portable_id', + "name" => 'name', + "email" => 'email', + "preferred_username" => 'username', + "picture" => 'picture', + "given_name" => 'firstName', + "family_name" => 'lastName' + ]; + $userinfo = $this->getUser($user_id); + foreach ($validclaims as $validclaim) { + if (in_array($validclaim, $claims)) { + $claimkey = $claimsmap[$validclaim]; + $userClaims[$validclaim] = $userinfo[$claimkey]; + } else { + $userClaims[$validclaim] = $validclaim; + } + } + $userClaims["sub"] = $user_id; + return $userClaims; + } + + /** + * plaintext passwords are bad! Override this for your application + * + * @param string $username + * @param string $password + * @param string $firstName + * @param string $lastName + * @return bool + */ + public function setUser($username, $password, $firstName = null, $lastName = null) + { + return true; + } + + public function setClientDetails($client_id, $client_secret = null, $redirect_uri = null, $grant_types = null, $scope = null, $user_id = null, $client_name = null) + { + // if it exists, update it. + if ($this->getClientDetails($client_id)) { + $stmt = $this->db->prepare($sql = sprintf('UPDATE %s SET client_secret=:client_secret, redirect_uri=:redirect_uri, grant_types=:grant_types, scope=:scope, user_id=:user_id, client_name=:client_name where client_id=:client_id', $this->config['client_table'])); + } else { + $stmt = $this->db->prepare(sprintf('INSERT INTO %s (client_id, client_secret, redirect_uri, grant_types, scope, user_id, client_name) VALUES (:client_id, :client_secret, :redirect_uri, :grant_types, :scope, :user_id, :client_name)', $this->config['client_table'])); + } + + return $stmt->execute(compact('client_id', 'client_secret', 'redirect_uri', 'grant_types', 'scope', 'user_id', 'client_name')); + } + + + + + public function checkRestrictedGrantType($client_id, $grant_type) + { + $details = $this->getClientDetails($client_id); + if ($details['grant_types']) { + $grant_types = explode(' ', $details['grant_types']); + return in_array($grant_type, (array) $grant_types); + } + + // if grant_types are not defined, then none are restricted + return true; + } +} diff --git a/Code/Import/Friendica.php b/Code/Import/Friendica.php new file mode 100644 index 000000000..ddc458138 --- /dev/null +++ b/Code/Import/Friendica.php @@ -0,0 +1,368 @@ +data = $data; + $this->settings = $settings; + $this->extract(); + } + + public function extract() + { + + // channel stuff + + $channel = [ + 'channel_name' => escape_tags($this->data['user']['username']), + 'channel_address' => escape_tags($this->data['user']['nickname']), + 'channel_guid' => escape_tags($this->data['user']['guid']), + 'channel_guid_sig' => Libzot::sign($this->data['user']['guid'], $this->data['user']['prvkey']), + 'channel_hash' => Libzot::make_xchan_hash($this->data['user']['guid'], $this->data['user']['pubkey']), + 'channel_prvkey' => $this->data['user']['prvkey'], + 'channel_pubkey' => $this->data['user']['pubkey'], + 'channel_pageflags' => PAGE_NORMAL, + 'channel_expire_days' => intval($this->data['user']['expire']), + 'channel_timezone' => escape_tags($this->data['user']['timezone']), + 'channel_location' => escape_tags($this->data['user']['default-location']) + ]; + + $account_id = $this->settings['account_id']; + + $max_identities = ServiceClass::account_fetch($account_id, 'total_identities'); + + if ($max_identities !== false) { + $r = q( + "select channel_id from channel where channel_account_id = %d and channel_removed = 0 ", + intval($account_id) + ); + if ($r && count($r) > $max_identities) { + notice(sprintf(t('Your service plan only allows %d channels.'), $max_identities) . EOL); + return; + } + } + + // save channel or die + + + $channel = import_channel($channel, $this->settings['account_id'], $this->settings['sieze'], $this->settings['newname']); + if (!$channel) { + logger('no channel'); + return; + } + + + // figure out channel permission roles + + $permissions_role = 'social'; + + $pageflags = ((isset($this->data['user']['page-flags'])) ? intval($this->data['user']['page-flags']) : 0); + + if ($pageflags === 2) { + $permissions_role = 'forum'; + } + if ($pageflags === 5) { + $permissions_role = 'forum_restricted'; + } + + if ($pageflags === 0 && isset($this->data['user']['allow_gid']) && $this->data['user']['allow_gid']) { + $permissions_role = 'social_restricted'; + } + + // Friendica folks only have PERMS_AUTHED and "just me" + + $post_comments = (($pageflags === 1) ? 0 : PERMS_AUTHED); + PermissionLimits::Set(local_channel(), 'post_comments', $post_comments); + + PConfig::Set($channel['channel_id'], 'system', 'permissions_role', $permissions_role); + PConfig::Set($channel['channel_id'], 'system', 'use_browser_location', (string)intval($this->data['user']['allow_location'])); + + // find the self contact + + $self_contact = null; + + if (isset($this->data['contact']) && is_array($this->data['contact'])) { + foreach ($this->data['contact'] as $contact) { + if (isset($contact['self']) && intval($contact['self'])) { + $self_contact = $contact; + break; + } + } + } + + if (!is_array($self_contact)) { + logger('self contact not found.'); + return; + } + + // Create a verified hub location pointing to this site. + + $r = hubloc_store_lowlevel( + [ + 'hubloc_guid' => $channel['channel_guid'], + 'hubloc_guid_sig' => $channel['channel_guid_sig'], + 'hubloc_id_url' => Channel::url($channel), + 'hubloc_hash' => $channel['channel_hash'], + 'hubloc_addr' => Channel::get_webfinger($channel), + 'hubloc_primary' => 1, + 'hubloc_url' => z_root(), + 'hubloc_url_sig' => Libzot::sign(z_root(), $channel['channel_prvkey']), + 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')), + 'hubloc_host' => App::get_hostname(), + 'hubloc_callback' => z_root() . '/zot', + 'hubloc_sitekey' => get_config('system', 'pubkey'), + 'hubloc_network' => 'nomad', + 'hubloc_updated' => datetime_convert() + ] + ); + if (!$r) { + logger('Unable to store hub location'); + } + + + if ($self_contact['avatar']) { + $p = z_fetch_url($self_contact['avatar'], true); + if ($p['success']) { + $h = explode("\n", $p['header']); + foreach ($h as $l) { + list($k, $v) = array_map("trim", explode(":", trim($l), 2)); + $hdrs[strtolower($k)] = $v; + } + if (array_key_exists('content-type', $hdrs)) { + $phototype = $hdrs['content-type']; + } else { + $phototype = 'image/jpeg'; + } + + import_channel_photo($p['body'], $phototype, $account_id, $channel['channel_id']); + } + } + + $newuid = $channel['channel_id']; + + $r = xchan_store_lowlevel( + [ + 'xchan_hash' => $channel['channel_hash'], + 'xchan_guid' => $channel['channel_guid'], + 'xchan_guid_sig' => $channel['channel_guid_sig'], + 'xchan_pubkey' => $channel['channel_pubkey'], + 'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'), + 'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}", + 'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}", + 'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}", + 'xchan_addr' => Channel::get_webfinger($channel), + 'xchan_url' => Channel::url($channel), + 'xchan_follow' => z_root() . '/follow?f=&url=%s', + 'xchan_connurl' => z_root() . '/poco/' . $channel['channel_address'], + 'xchan_name' => $channel['channel_name'], + 'xchan_network' => 'nomad', + 'xchan_updated' => datetime_convert(), + 'xchan_photo_date' => datetime_convert(), + 'xchan_name_date' => datetime_convert(), + 'xchan_system' => 0 + ] + ); + + $r = Channel::profile_store_lowlevel( + [ + 'aid' => intval($channel['channel_account_id']), + 'uid' => intval($newuid), + 'profile_guid' => new_uuid(), + 'profile_name' => t('Default Profile'), + 'is_default' => 1, + 'publish' => ((isset($this->data['profile']['publish'])) ? $this->data['profile']['publish'] : 1), + 'fullname' => $channel['channel_name'], + 'photo' => z_root() . "/photo/profile/l/{$newuid}", + 'thumb' => z_root() . "/photo/profile/m/{$newuid}", + 'homepage' => ((isset($this->data['profile']['homepage'])) ? $this->data['profile']['homepage'] : EMPTY_STR), + ] + ); + + if ($role_permissions) { + $myperms = ((array_key_exists('perms_connect', $role_permissions)) ? $role_permissions['perms_connect'] : []); + } else { + $x = PermissionRoles::role_perms('social'); + $myperms = $x['perms_connect']; + } + + $r = abook_store_lowlevel( + [ + 'abook_account' => intval($channel['channel_account_id']), + 'abook_channel' => intval($newuid), + 'abook_xchan' => $channel['channel_hash'], + 'abook_closeness' => 0, + 'abook_created' => datetime_convert(), + 'abook_updated' => datetime_convert(), + 'abook_self' => 1 + ] + ); + + + $x = Permissions::serialise(Permissions::FilledPerms($myperms)); + set_abconfig($newuid, $channel['channel_hash'], 'system', 'my_perms', $x); + + if (intval($channel['channel_account_id'])) { + // Save our permissions role so we can perhaps call it up and modify it later. + + if ($role_permissions) { + if (array_key_exists('online', $role_permissions)) { + set_pconfig($newuid, 'system', 'hide_presence', 1 - intval($role_permissions['online'])); + } + if (array_key_exists('perms_auto', $role_permissions)) { + $autoperms = intval($role_permissions['perms_auto']); + set_pconfig($newuid, 'system', 'autoperms', $autoperms); + } + } + + // Create a group with yourself as a member. This allows somebody to use it + // right away as a default group for new contacts. + + AccessList::add($newuid, t('Friends')); + AccessList::member_add($newuid, t('Friends'), $ret['channel']['channel_hash']); + + // if our role_permissions indicate that we're using a default collection ACL, add it. + + if (is_array($role_permissions) && $role_permissions['default_collection']) { + $r = q( + "select hash from pgrp where uid = %d and gname = '%s' limit 1", + intval($newuid), + dbesc(t('Friends')) + ); + if ($r) { + q( + "update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d", + dbesc($r[0]['hash']), + dbesc('<' . $r[0]['hash'] . '>'), + intval($newuid) + ); + } + } + + set_pconfig($channel['channel_id'], 'system', 'photo_path', '%Y/%Y-%m'); + set_pconfig($channel['channel_id'], 'system', 'attach_path', '%Y/%Y-%m'); + + + // auto-follow any of the hub's pre-configured channel choices. + // Only do this if it's the first channel for this account; + // otherwise it could get annoying. Don't make this list too big + // or it will impact registration time. + + $accts = get_config('system', 'auto_follow'); + if (($accts) && (!$total_identities)) { + if (!is_array($accts)) { + $accts = array($accts); + } + + foreach ($accts as $acct) { + if (trim($acct)) { + $f = Channel::connect_and_sync($channel, trim($acct)); + if ($f['success']) { + $can_view_stream = their_perms_contains($channel['channel_id'], $f['abook']['abook_xchan'], 'view_stream'); + + // If we can view their stream, pull in some posts + + if (($can_view_stream) || ($f['abook']['xchan_network'] === 'rss')) { + Run::Summon(['Onepoll', $f['abook']['abook_id']]); + } + } + } + } + } + + Hook::call('create_identity', $newuid); + } + + $this->groups = ((isset($this->data['group'])) ? $this->data['group'] : null); + $this->members = ((isset($this->data['group_member'])) ? $this->data['group_member'] : null); + + // import contacts + + if (isset($this->data['contact']) && is_array($this->data['contact'])) { + foreach ($this->data['contact'] as $contact) { + if (isset($contact['self']) && intval($contact['self'])) { + continue; + } + logger('connecting: ' . $contact['url'], LOGGER_DEBUG); + $result = Connect::connect($channel, (($contact['addr']) ? $contact['addr'] : $contact['url'])); + if ($result['success'] && isset($result['abook'])) { + $contact['xchan_hash'] = $result['abook']['abook_xchan']; + $this->contacts[] = $contact; + } + } + } + + // import pconfig + // it is unlikely we can make use of these unless we recongise them. + + if (isset($this->data['pconfig']) && is_array($this->data['pconfig'])) { + foreach ($this->data['pconfig'] as $pc) { + $entry = [ + 'cat' => escape_tags(str_replace('.', '__', $pc['cat'])), + 'k' => escape_tags(str_replace('.', '__', $pc['k'])), + 'v' => ((preg_match('|^a:[0-9]+:{.*}$|s', $pc['v'])) ? serialise(unserialize($pc['v'])) : $pc['v']), + ]; + PConfig::Set($channel['channel_id'], $entry['cat'], $entry['k'], $entry['v']); + } + } + + // The default 'Friends' group is already created and possibly populated. + // So some of the following code is redundant in that regard. + // Mostly this is used to create and populate any other groups. + + if ($this->groups) { + foreach ($this->groups as $group) { + if (!intval($group['deleted'])) { + AccessList::add($channel['channel_id'], $group['name'], intval($group['visible'])); + if ($this->members) { + foreach ($this->members as $member) { + if (intval($member['gid']) === intval(AccessList::byname($channel['channel_id'], $group['name']))) { + $contact_id = $member['contact-id']; + if ($this->contacts) { + foreach ($this->contacts as $contact) { + if (intval($contact['id']) === intval($contact_id)) { + AccessList::member_add($channel['channel_id'], $group['name'], $contact['xchan_hash']); + break; + } + } + } + } + } + } + } + } + } + + change_channel($channel['channel_id']); + notice(t('Import complete.') . EOL); + + goaway(z_root() . '/stream'); + } +} + diff --git a/Code/Lib/AConfig.php b/Code/Lib/AConfig.php new file mode 100644 index 000000000..5c2f944b0 --- /dev/null +++ b/Code/Lib/AConfig.php @@ -0,0 +1,29 @@ +get() to return an array of collection members. + */ +class ASCollection +{ + + private $channel = null; + private $nextpage = null; + private $limit = 0; + private $direction = 0; // 0 = forward, 1 = reverse + private $data = []; + private $history = []; + + + public function __construct($obj, $channel = null, $direction = 0, $limit = 0) + { + + $this->channel = $channel; + $this->direction = $direction; + $this->limit = $limit; + + if (is_array($obj)) { + $data = $obj; + } + + if (is_string($obj)) { + $data = Activity::fetch($obj, $channel); + $this->history[] = $obj; + } + + if (!is_array($data)) { + return; + } + + if (!in_array($data['type'], ['Collection', 'OrderedCollection'])) { + return false; + } + + if ($this->direction) { + if (array_key_exists('last', $data) && $data['last']) { + $this->nextpage = $data['last']; + } + } else { + if (array_key_exists('first', $data) && $data['first']) { + $this->nextpage = $data['first']; + } + } + + if (isset($data['items']) && is_array($data['items'])) { + $this->data = (($this->direction) ? array_reverse($data['items']) : $data['items']); + } elseif (isset($data['orderedItems']) && is_array($data['orderedItems'])) { + $this->data = (($this->direction) ? array_reverse($data['orderedItems']) : $data['orderedItems']); + } + + if ($limit) { + if (count($this->data) > $limit) { + $this->data = array_slice($this->data, 0, $limit); + return; + } + } + + do { + $x = $this->next(); + } while ($x); + } + + public function get() + { + return $this->data; + } + + public function next() + { + + if (!$this->nextpage) { + return false; + } + + if (is_array($this->nextpage)) { + $data = $this->nextpage; + } + + if (is_string($this->nextpage)) { + if (in_array($this->nextpage, $this->history)) { + // recursion detected + return false; + } + $data = Activity::fetch($this->nextpage, $this->channel); + $this->history[] = $this->nextpage; + } + + if (!is_array($data)) { + return false; + } + + if (!in_array($data['type'], ['CollectionPage', 'OrderedCollectionPage'])) { + return false; + } + + $this->setnext($data); + + if (isset($data['items']) && is_array($data['items'])) { + $this->data = array_merge($this->data, (($this->direction) ? array_reverse($data['items']) : $data['items'])); + } elseif (isset($data['orderedItems']) && is_array($data['orderedItems'])) { + $this->data = array_merge($this->data, (($this->direction) ? array_reverse($data['orderedItems']) : $data['orderedItems'])); + } + + if ($limit) { + if (count($this->data) > $limit) { + $this->data = array_slice($this->data, 0, $limit); + $this->nextpage = false; + return true; + } + } + + return true; + } + + public function setnext($data) + { + if ($this->direction) { + if (array_key_exists('prev', $data) && $data['prev']) { + $this->nextpage = $data['prev']; + } elseif (array_key_exists('first', $data) && $data['first']) { + $this->nextpage = $data['first']; + } else { + $this->nextpage = false; + } + } else { + if (array_key_exists('next', $data) && $data['next']) { + $this->nextpage = $data['next']; + } elseif (array_key_exists('last', $data) && $data['last']) { + $this->nextpage = $data['last']; + } else { + $this->nextpage = false; + } + } + logger('nextpage: ' . $this->nextpage, LOGGER_DEBUG); + } +} diff --git a/Code/Lib/AbConfig.php b/Code/Lib/AbConfig.php new file mode 100644 index 000000000..3a3f05ae7 --- /dev/null +++ b/Code/Lib/AbConfig.php @@ -0,0 +1,84 @@ +may apply to this list and any future members. If this is not what you intended, please create another list with a different name.') . EOL); + } + $hash = self::by_id($uid, $r); + return $hash; + } + + $hash = new_uuid(); + + $r = q( + "INSERT INTO pgrp ( hash, uid, visible, gname, rule ) + VALUES( '%s', %d, %d, '%s', '' ) ", + dbesc($hash), + intval($uid), + intval($public), + dbesc($name) + ); + $ret = $r; + } + + Libsync::build_sync_packet($uid, null, true); + + return (($ret) ? $hash : $ret); + } + + + public static function remove($uid, $name) + { + $ret = false; + if ($uid && $name) { + $r = q( + "SELECT id, hash FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1", + intval($uid), + dbesc($name) + ); + if ($r) { + $group_id = $r[0]['id']; + $group_hash = $r[0]['hash']; + } else { + return false; + } + + // remove group from default posting lists + $r = q( + "SELECT channel_default_group, channel_allow_gid, channel_deny_gid FROM channel WHERE channel_id = %d LIMIT 1", + intval($uid) + ); + if ($r) { + $user_info = array_shift($r); + $change = false; + + if ($user_info['channel_default_group'] == $group_hash) { + $user_info['channel_default_group'] = ''; + $change = true; + } + if (strpos($user_info['channel_allow_gid'], '<' . $group_hash . '>') !== false) { + $user_info['channel_allow_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_allow_gid']); + $change = true; + } + if (strpos($user_info['channel_deny_gid'], '<' . $group_hash . '>') !== false) { + $user_info['channel_deny_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_deny_gid']); + $change = true; + } + + if ($change) { + q( + "UPDATE channel SET channel_default_group = '%s', channel_allow_gid = '%s', channel_deny_gid = '%s' + WHERE channel_id = %d", + intval($user_info['channel_default_group']), + dbesc($user_info['channel_allow_gid']), + dbesc($user_info['channel_deny_gid']), + intval($uid) + ); + } + } + + // remove all members + $r = q( + "DELETE FROM pgrp_member WHERE uid = %d AND gid = %d ", + intval($uid), + intval($group_id) + ); + + // remove group + $r = q( + "UPDATE pgrp SET deleted = 1 WHERE uid = %d AND gname = '%s'", + intval($uid), + dbesc($name) + ); + + $ret = $r; + } + + Libsync::build_sync_packet($uid, null, true); + + return $ret; + } + + // returns the integer id of an access group owned by $uid and named $name + // or false. + + public static function byname($uid, $name) + { + if (!($uid && $name)) { + return false; + } + $r = q( + "SELECT id FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1", + intval($uid), + dbesc($name) + ); + if ($r) { + return $r[0]['id']; + } + return false; + } + + public static function by_id($uid, $id) + { + if (!($uid && $id)) { + return false; + } + + $r = q( + "SELECT * FROM pgrp WHERE uid = %d AND id = %d and deleted = 0", + intval($uid), + intval($id) + ); + if ($r) { + return array_shift($r); + } + return false; + } + + + public static function rec_byhash($uid, $hash) + { + if (!($uid && $hash)) { + return false; + } + $r = q( + "SELECT * FROM pgrp WHERE uid = %d AND hash = '%s' LIMIT 1", + intval($uid), + dbesc($hash) + ); + if ($r) { + return array_shift($r); + } + return false; + } + + + public static function member_remove($uid, $name, $member) + { + $gid = self::byname($uid, $name); + if (!$gid) { + return false; + } + if (!($uid && $gid && $member)) { + return false; + } + $r = q( + "DELETE FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' ", + intval($uid), + intval($gid), + dbesc($member) + ); + + Libsync::build_sync_packet($uid, null, true); + + return $r; + } + + + public static function member_add($uid, $name, $member, $gid = 0) + { + if (!$gid) { + $gid = self::byname($uid, $name); + } + if (!($gid && $uid && $member)) { + return false; + } + + $r = q( + "SELECT * FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' LIMIT 1", + intval($uid), + intval($gid), + dbesc($member) + ); + if ($r) { + return true; // You might question this, but + // we indicate success because the group member was in fact created + // -- It was just created at another time + } else { + $r = q( + "INSERT INTO pgrp_member (uid, gid, xchan) + VALUES( %d, %d, '%s' ) ", + intval($uid), + intval($gid), + dbesc($member) + ); + } + Libsync::build_sync_packet($uid, null, true); + return $r; + } + + + public static function members($uid, $gid, $total = false, $start = 0, $records = 0) + { + $ret = []; + if ($records) { + $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval($records), intval($start)); + } + + // process virtual groups + if (strpos($gid, ':') === 0) { + $vg = substr($gid, 1); + switch ($vg) { + case '1': + $sql_extra = EMPTY_STR; + break; + case '2': + $sql_extra = " and xchan_network in ('nomad','zot6') "; + break; + case '3': + $sql_extra = " and xchan_network = 'activitypub' "; + break; + default: + break; + } + if ($total) { + $r = q( + "SELECT count(*) FROM abook left join xchan on xchan_hash = abook_xchan WHERE abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 $sql_extra ORDER BY xchan_name ASC $pager_sql", + intval($uid) + ); + return ($r) ? $r[0]['total'] : false; + } + + $r = q( + "SELECT * FROM abook left join xchan on xchan_hash = abook_xchan + WHERE abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 $sql_extra ORDER BY xchan_name ASC $pager_sql", + intval($uid) + ); + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['xchan'] = $r[$x]['abook_xchan']; + } + } + return $r; + } + + if (intval($gid)) { + if ($total) { + $r = q( + "SELECT count(xchan) as total FROM pgrp_member + LEFT JOIN abook ON abook_xchan = pgrp_member.xchan left join xchan on xchan_hash = abook_xchan + WHERE gid = %d AND abook_channel = %d and pgrp_member.uid = %d and xchan_deleted = 0 and abook_self = 0 + and abook_blocked = 0 and abook_pending = 0", + intval($gid), + intval($uid), + intval($uid) + ); + if ($r) { + return $r[0]['total']; + } + } + + $r = q( + "SELECT * FROM pgrp_member + LEFT JOIN abook ON abook_xchan = pgrp_member.xchan left join xchan on xchan_hash = abook_xchan + WHERE gid = %d AND abook_channel = %d and pgrp_member.uid = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC $pager_sql", + intval($gid), + intval($uid), + intval($uid) + ); + if ($r) { + $ret = $r; + } + } + return $ret; + } + + public static function members_xchan($uid, $gid) + { + $ret = []; + if (intval($gid)) { + $r = q( + "SELECT xchan FROM pgrp_member WHERE gid = %d AND uid = %d", + intval($gid), + intval($uid) + ); + if ($r) { + foreach ($r as $rv) { + $ret[] = $rv['xchan']; + } + } + } + return $ret; + } + + public static function select($uid, $group = '') + { + + $grps = []; + + $r = q( + "SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval($uid) + ); + $grps[] = ['name' => '', 'hash' => '0', 'selected' => '']; + if ($r) { + foreach ($r as $rr) { + $grps[] = ['name' => $rr['gname'], 'id' => $rr['hash'], 'selected' => (($group == $rr['hash']) ? 'true' : '')]; + } + } + + return replace_macros(Theme::get_template('group_selection.tpl'), [ + '$label' => t('Add new connections to this access list'), + '$groups' => $grps + ]); + } + + + public static function widget($every = "connections", $each = "lists", $edit = false, $group_id = 0, $cid = '', $mode = 1) + { + + $o = ''; + + $groups = []; + + $r = q( + "SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval($_SESSION['uid']) + ); + $member_of = []; + if ($cid) { + $member_of = self::containing(local_channel(), $cid); + } + + if ($r) { + foreach ($r as $rr) { + $selected = (($group_id == $rr['id']) ? ' group-selected' : ''); + + if ($edit) { + $groupedit = ['href' => "lists/" . $rr['id'], 'title' => t('edit')]; + } else { + $groupedit = null; + } + + $groups[] = [ + 'id' => $rr['id'], + 'enc_cid' => base64url_encode($cid), + 'cid' => $cid, + 'text' => $rr['gname'], + 'selected' => $selected, + 'href' => (($mode == 0) ? $each . '?f=&gid=' . $rr['id'] : $each . "/" . $rr['id']) . ((x($_GET, 'new')) ? '&new=' . $_GET['new'] : '') . ((x($_GET, 'order')) ? '&order=' . $_GET['order'] : ''), + 'edit' => $groupedit, + 'ismember' => in_array($rr['id'], $member_of), + ]; + } + } + + return replace_macros(Theme::get_template('group_side.tpl'), [ + '$title' => t('Lists'), + '$edittext' => t('Edit list'), + '$createtext' => t('Create new list'), + '$ungrouped' => (($every === 'contacts') ? t('Channels not in any access list') : ''), + '$groups' => $groups, + '$add' => t('add'), + ]); + } + + + public static function expand($g) + { + if (!(is_array($g) && count($g))) { + return []; + } + + $ret = []; + $x = []; + + foreach ($g as $gv) { + // virtual access lists + // connections:abc is all the connection sof the channel with channel_hash abc + // zot:abc is all of abc's zot6 connections + // activitypub:abc is all of abc's activitypub connections + + if (strpos($gv, 'connections:') === 0 || strpos($gv, 'zot:') === 0 || strpos($gv, 'activitypub:') === 0) { + $sql_extra = EMPTY_STR; + $channel_hash = substr($gv, strpos($gv, ':') + 1); + if (strpos($gv, 'zot:') === 0) { + $sql_extra = " and xchan_network in ('nomad','zot6') "; + } + if (strpos($gv, 'activitypub:') === 0) { + $sql_extra = " and xchan_network = 'activitypub' "; + } + $r = q( + "select channel_id from channel where channel_hash = '%s' ", + dbesc($channel_hash) + ); + if ($r) { + foreach ($r as $rv) { + $y = q( + "select abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and abook_pending = 0 and abook_archived = 0 $sql_extra", + intval($rv['channel_id']) + ); + if ($y) { + foreach ($y as $yv) { + $ret[] = $yv['abook_xchan']; + } + } + } + } + } else { + $x[] = $gv; + } + } + + if ($x) { + stringify_array_elms($x, true); + $groups = implode(',', $x); + if ($groups) { + $r = q("SELECT xchan FROM pgrp_member WHERE gid IN ( select id from pgrp where hash in ( $groups ))"); + if ($r) { + foreach ($r as $rv) { + $ret[] = $rv['xchan']; + } + } + } + } + return $ret; + } + + + public static function member_of($c) + { + $r = q( + "SELECT pgrp.gname, pgrp.id FROM pgrp LEFT JOIN pgrp_member ON pgrp_member.gid = pgrp.id + WHERE pgrp_member.xchan = '%s' AND pgrp.deleted = 0 ORDER BY pgrp.gname ASC ", + dbesc($c) + ); + + return $r; + } + + public static function containing($uid, $c) + { + + $r = q( + "SELECT gid FROM pgrp_member WHERE uid = %d AND pgrp_member.xchan = '%s' ", + intval($uid), + dbesc($c) + ); + + $ret = []; + if ($r) { + foreach ($r as $rv) { + $ret[] = $rv['gid']; + } + } + + return $ret; + } +} diff --git a/Code/Lib/Account.php b/Code/Lib/Account.php new file mode 100644 index 000000000..b3661d55c --- /dev/null +++ b/Code/Lib/Account.php @@ -0,0 +1,707 @@ + false, 'message' => '' ]; + + // Caution: empty email isn't counted as an error in this function. + // Check for empty value separately. + + if (! strlen($email)) { + return $result; + } + + if (! validate_email($email)) { + $result['message'] .= t('Not a valid email address') . EOL; + } elseif (! allowed_email($email)) { + $result['message'] = t('Your email domain is not among those allowed on this site'); + } else { + $r = q( + "select account_email from account where account_email = '%s' limit 1", + dbesc($email) + ); + if ($r) { + $result['message'] .= t('Your email address is already registered at this site.'); + } + } + if ($result['message']) { + $result['error'] = true; + } + + $arr = array('email' => $email, 'result' => $result); + Hook::call('check_account_email', $arr); + + return $arr['result']; + } + + public static function check_password($password) + { + $result = [ 'error' => false, 'message' => '' ]; + + // The only validation we perform by default is pure Javascript to + // check minimum length and that both entered passwords match. + // Use hooked functions to perform complexity requirement checks. + + $arr = [ 'password' => $password, 'result' => $result ]; + Hook::call('check_account_password', $arr); + + return $arr['result']; + } + + public static function check_invite($invite_code) + { + $result = [ 'error' => false, 'message' => '' ]; + + $using_invites = get_config('system', 'invitation_only'); + + if ($using_invites && defined('INVITE_WORKING')) { + if (! $invite_code) { + $result['message'] .= t('An invitation is required.') . EOL; + } + $r = q("select * from register where hash = '%s' limit 1", dbesc($invite_code)); + if (! $r) { + $result['message'] .= t('Invitation could not be verified.') . EOL; + } + } + if (strlen($result['message'])) { + $result['error'] = true; + } + + $arr = [ 'invite_code' => $invite_code, 'result' => $result ]; + Hook::call('check_account_invite', $arr); + + return $arr['result']; + } + + public static function check_admin($arr) + { + if (is_site_admin()) { + return true; + } + $admin_email = trim(get_config('system', 'admin_email', '')); + if (strlen($admin_email) && $admin_email === trim($arr['email'])) { + return true; + } + return false; + } + + public static function account_total() + { + $r = q("select account_id from account where true"); + // Distinguish between an empty array and an error + if (is_array($r)) { + return count($r); + } + return false; + } + + + public static function account_store_lowlevel($arr) + { + + $store = [ + 'account_parent' => ((array_key_exists('account_parent', $arr)) ? $arr['account_parent'] : '0'), + 'account_default_channel' => ((array_key_exists('account_default_channel', $arr)) ? $arr['account_default_channel'] : '0'), + 'account_salt' => ((array_key_exists('account_salt', $arr)) ? $arr['account_salt'] : ''), + 'account_password' => ((array_key_exists('account_password', $arr)) ? $arr['account_password'] : ''), + 'account_email' => ((array_key_exists('account_email', $arr)) ? $arr['account_email'] : ''), + 'account_external' => ((array_key_exists('account_external', $arr)) ? $arr['account_external'] : ''), + 'account_language' => ((array_key_exists('account_language', $arr)) ? $arr['account_language'] : 'en'), + 'account_created' => ((array_key_exists('account_created', $arr)) ? $arr['account_created'] : '0001-01-01 00:00:00'), + 'account_lastlog' => ((array_key_exists('account_lastlog', $arr)) ? $arr['account_lastlog'] : '0001-01-01 00:00:00'), + 'account_flags' => ((array_key_exists('account_flags', $arr)) ? $arr['account_flags'] : '0'), + 'account_roles' => ((array_key_exists('account_roles', $arr)) ? $arr['account_roles'] : '0'), + 'account_reset' => ((array_key_exists('account_reset', $arr)) ? $arr['account_reset'] : ''), + 'account_expires' => ((array_key_exists('account_expires', $arr)) ? $arr['account_expires'] : '0001-01-01 00:00:00'), + 'account_expire_notified' => ((array_key_exists('account_expire_notified', $arr)) ? $arr['account_expire_notified'] : '0001-01-01 00:00:00'), + 'account_service_class' => ((array_key_exists('account_service_class', $arr)) ? $arr['account_service_class'] : ''), + 'account_level' => ((array_key_exists('account_level', $arr)) ? $arr['account_level'] : '0'), + 'account_password_changed' => ((array_key_exists('account_password_changed', $arr)) ? $arr['account_password_changed'] : '0001-01-01 00:00:00') + ]; + + return create_table_from_array('account', $store); + } + + + public static function create($arr) + { + + // Required: { email, password } + + $result = [ 'success' => false, 'email' => '', 'password' => '', 'message' => '' ]; + + $invite_code = ((isset($arr['invite_code'])) ? notags(trim($arr['invite_code'])) : ''); + $email = ((isset($arr['email'])) ? notags(punify(trim($arr['email']))) : ''); + $password = ((isset($arr['password'])) ? trim($arr['password']) : ''); + $password2 = ((isset($arr['password2'])) ? trim($arr['password2']) : ''); + $parent = ((isset($arr['parent'])) ? intval($arr['parent']) : 0 ); + $flags = ((isset($arr['account_flags'])) ? intval($arr['account_flags']) : ACCOUNT_OK); + $roles = ((isset($arr['account_roles'])) ? intval($arr['account_roles']) : 0 ); + $expires = ((isset($arr['expires'])) ? intval($arr['expires']) : NULL_DATE); + + $default_service_class = get_config('system', 'default_service_class', EMPTY_STR); + + if (! ($email && $password)) { + $result['message'] = t('Please enter the required information.'); + return $result; + } + + // prevent form hackery + + if (($roles & ACCOUNT_ROLE_ADMIN) && (! self::check_admin($arr))) { + $roles = $roles - ACCOUNT_ROLE_ADMIN; + } + + // allow the admin_email account to be admin, but only if it's the first account. + + $c = self::account_total(); + if (($c === 0) && (self::check_admin($arr))) { + $roles |= ACCOUNT_ROLE_ADMIN; + } + + // Ensure that there is a host keypair. + + if ((! get_config('system', 'pubkey')) && (! get_config('system', 'prvkey'))) { + $hostkey = Crypto::new_keypair(4096); + set_config('system', 'pubkey', $hostkey['pubkey']); + set_config('system', 'prvkey', $hostkey['prvkey']); + } + + $invite_result = check_account_invite($invite_code); + if ($invite_result['error']) { + $result['message'] = $invite_result['message']; + return $result; + } + + $email_result = check_account_email($email); + + if ($email_result['error']) { + $result['message'] = $email_result['message']; + return $result; + } + + $password_result = check_account_password($password); + + if ($password_result['error']) { + $result['message'] = $password_result['message']; + return $result; + } + + $salt = random_string(32); + $password_encoded = hash('whirlpool', $salt . $password); + + $r = self::account_store_lowlevel( + [ + 'account_parent' => intval($parent), + 'account_salt' => $salt, + 'account_password' => $password_encoded, + 'account_email' => $email, + 'account_language' => get_best_language(), + 'account_created' => datetime_convert(), + 'account_flags' => intval($flags), + 'account_roles' => intval($roles), + 'account_expires' => $expires, + 'account_service_class' => $default_service_class + ] + ); + if (! $r) { + logger('create_account: DB INSERT failed.'); + $result['message'] = t('Failed to store account information.'); + return($result); + } + + $r = q( + "select * from account where account_email = '%s' and account_password = '%s' limit 1", + dbesc($email), + dbesc($password_encoded) + ); + if ($r && is_array($r) && count($r)) { + $result['account'] = $r[0]; + } else { + logger('create_account: could not retrieve newly created account'); + } + + // Set the parent record to the current record_id if no parent was provided + + if (! $parent) { + $r = q( + "update account set account_parent = %d where account_id = %d", + intval($result['account']['account_id']), + intval($result['account']['account_id']) + ); + if (! $r) { + logger('create_account: failed to set parent'); + } + $result['account']['parent'] = $result['account']['account_id']; + } + + $result['success'] = true; + $result['email'] = $email; + $result['password'] = $password; + + Hook::call('register_account', $result); + + return $result; + } + + + + public static function verify_email_address($arr) + { + + if (array_key_exists('resend', $arr)) { + $email = $arr['email']; + $a = q( + "select * from account where account_email = '%s' limit 1", + dbesc($arr['email']) + ); + if (! ($a && ($a[0]['account_flags'] & ACCOUNT_UNVERIFIED))) { + return false; + } + $account = array_shift($a); + $v = q( + "select * from register where uid = %d and password = 'verify' limit 1", + intval($account['account_id']) + ); + if ($v) { + $hash = $v[0]['hash']; + } else { + return false; + } + } else { + $hash = random_string(24); + + $r = q( + "INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ", + dbesc($hash), + dbesc(datetime_convert()), + intval($arr['account']['account_id']), + dbesc('verify'), + dbesc($arr['account']['account_language']) + ); + $account = $arr['account']; + } + + push_lang(($account['account_language']) ? $account['account_language'] : 'en'); + + $email_msg = replace_macros( + Theme::get_email_template('register_verify_member.tpl'), + [ + '$sitename' => System::get_site_name(), + '$siteurl' => z_root(), + '$email' => $arr['email'], + '$uid' => $account['account_id'], + '$hash' => $hash, + '$details' => $details + ] + ); + + $res = z_mail( + [ + 'toEmail' => $arr['email'], + 'messageSubject' => sprintf(t('Registration confirmation for %s'), System::get_site_name()), + 'textVersion' => $email_msg, + ] + ); + + pop_lang(); + + if ($res) { + $delivered ++; + } else { + logger('send_reg_approval_email: failed to account_id: ' . $arr['account']['account_id']); + } + return $res; + } + + + + + public static function send_reg_approval_email($arr) + { + + $r = q( + "select * from account where (account_roles & %d) >= 4096", + intval(ACCOUNT_ROLE_ADMIN) + ); + if (! ($r && is_array($r) && count($r))) { + return false; + } + + $admins = []; + + foreach ($r as $rr) { + if (strlen($rr['account_email'])) { + $admins[] = [ 'email' => $rr['account_email'], 'lang' => $rr['account_lang'] ]; + } + } + + if (! count($admins)) { + return false; + } + + $hash = random_string(); + + $r = q( + "INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ", + dbesc($hash), + dbesc(datetime_convert()), + intval($arr['account']['account_id']), + dbesc(''), + dbesc($arr['account']['account_language']) + ); + + $ip = ((isset($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : EMPTY_STR); + + $details = (($ip) ? $ip . ' [' . gethostbyaddr($ip) . ']' : '[unknown or stealth IP]'); + + $delivered = 0; + + foreach ($admins as $admin) { + if (strlen($admin['lang'])) { + push_lang($admin['lang']); + } else { + push_lang('en'); + } + + $email_msg = replace_macros(Theme::get_email_template('register_verify_eml.tpl'), [ + '$sitename' => get_config('system', 'sitename'), + '$siteurl' => z_root(), + '$email' => $arr['email'], + '$uid' => $arr['account']['account_id'], + '$hash' => $hash, + '$details' => $details + ]); + + $res = z_mail( + [ + 'toEmail' => $admin['email'], + 'messageSubject' => sprintf(t('Registration request at %s'), get_config('system', 'sitename')), + 'textVersion' => $email_msg, + ] + ); + + if ($res) { + $delivered ++; + } else { + logger('send_reg_approval_email: failed to ' . $admin['email'] . 'account_id: ' . $arr['account']['account_id']); + } + + pop_lang(); + } + + return ($delivered ? true : false); + } + + public static function send_register_success_email($email, $password) + { + + $email_msg = replace_macros(Theme::get_email_template('register_open_eml.tpl'), [ + '$sitename' => System::get_site_name(), + '$siteurl' => z_root(), + '$email' => $email, + '$password' => t('your registration password'), + ]); + + $res = z_mail( + [ + 'toEmail' => $email, + 'messageSubject' => sprintf(t('Registration details for %s'), System::get_site_name()), + 'textVersion' => $email_msg, + ] + ); + + return ($res ? true : false); + } + + /** + * @brief Allows a user registration. + * + * @param string $hash + * @return array|bool + */ + public static function allow($hash) + { + + $ret = array('success' => false); + + $register = q( + "SELECT * FROM register WHERE hash = '%s' LIMIT 1", + dbesc($hash) + ); + + if (! $register) { + return $ret; + } + + $account = q( + "SELECT * FROM account WHERE account_id = %d LIMIT 1", + intval($register[0]['uid']) + ); + + if (! $account) { + return $ret; + } + + $r = q( + "DELETE FROM register WHERE hash = '%s'", + dbesc($register[0]['hash']) + ); + + $r = q( + "update account set account_flags = (account_flags & ~%d) where (account_flags & %d) > 0 and account_id = %d", + intval(ACCOUNT_BLOCKED), + intval(ACCOUNT_BLOCKED), + intval($register[0]['uid']) + ); + $r = q( + "update account set account_flags = (account_flags & ~%d) where (account_flags & %d) > 0 and account_id = %d", + intval(ACCOUNT_PENDING), + intval(ACCOUNT_PENDING), + intval($register[0]['uid']) + ); + + push_lang($register[0]['lang']); + + $email_tpl = Theme::get_email_template("register_open_eml.tpl"); + $email_msg = replace_macros($email_tpl, [ + '$sitename' => System::get_site_name(), + '$siteurl' => z_root(), + '$username' => $account[0]['account_email'], + '$email' => $account[0]['account_email'], + '$password' => '', + '$uid' => $account[0]['account_id'] + ]); + + $res = z_mail( + [ + 'toEmail' => $account[0]['account_email'], + 'messageSubject' => sprintf(t('Registration details for %s'), System::get_site_name()), + 'textVersion' => $email_msg, + ] + ); + + pop_lang(); + + if (get_config('system', 'auto_channel_create')) { + Channel::auto_create($register[0]['uid']); + } + + if ($res) { + info(t('Account approved.') . EOL); + return true; + } + } + + + /** + * @brief Denies an account registration. + * + * This does not have to go through user_remove() and save the nickname + * permanently against re-registration, as the person was not yet + * allowed to have friends on this system + * + * @param string $hash + * @return bool + */ + + public static function deny($hash) + { + + $register = q( + "SELECT * FROM register WHERE hash = '%s' LIMIT 1", + dbesc($hash) + ); + + if (! $register) { + return false; + } + + $account = q( + "SELECT account_id, account_email FROM account WHERE account_id = %d LIMIT 1", + intval($register[0]['uid']) + ); + + if (! $account) { + return false; + } + + $r = q( + "DELETE FROM account WHERE account_id = %d", + intval($register[0]['uid']) + ); + + $r = q( + "DELETE FROM register WHERE id = %d", + intval($register[0]['id']) + ); + notice(sprintf(t('Registration revoked for %s'), $account[0]['account_email']) . EOL); + + return true; + } + + // called from regver to activate an account from the email verification link + + public static function approve($hash) + { + + $ret = false; + + // Note: when the password in the register table is 'verify', the uid actually contains the account_id + + $register = q( + "SELECT * FROM register WHERE hash = '%s' and password = 'verify' LIMIT 1", + dbesc($hash) + ); + + if (! $register) { + return $ret; + } + + $account = q( + "SELECT * FROM account WHERE account_id = %d LIMIT 1", + intval($register[0]['uid']) + ); + + if (! $account) { + return $ret; + } + + $r = q( + "DELETE FROM register WHERE hash = '%s' and password = 'verify'", + dbesc($register[0]['hash']) + ); + + $r = q( + "update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", + intval(ACCOUNT_BLOCKED), + intval(ACCOUNT_BLOCKED), + intval($register[0]['uid']) + ); + $r = q( + "update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", + intval(ACCOUNT_PENDING), + intval(ACCOUNT_PENDING), + intval($register[0]['uid']) + ); + $r = q( + "update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d", + intval(ACCOUNT_UNVERIFIED), + intval(ACCOUNT_UNVERIFIED), + intval($register[0]['uid']) + ); + + // get a fresh copy after we've modified it. + + $account = q( + "SELECT * FROM account WHERE account_id = %d LIMIT 1", + intval($register[0]['uid']) + ); + + if (! $account) { + return $ret; + } + + if (get_config('system', 'auto_channel_create')) { + Channel::auto_create($register[0]['uid']); + } else { + $_SESSION['login_return_url'] = 'new_channel'; + authenticate_success($account[0], null, true, true, false, true); + } + + return true; + } + + /** + * Included here for completeness, but this is a very dangerous operation. + * It is the caller's responsibility to confirm the requestor's intent and + * authorisation to do this. + * + * @param int $account_id + * @param bool $local (optional) default true + * @param bool $unset_session (optional) default true + * @return bool|array + */ + + public static function remove($account_id, $local = true, $unset_session = true) + { + + logger('account_remove: ' . $account_id); + + // Global removal (all clones) not currently supported + $local = true; + + if (! intval($account_id)) { + logger('No account.'); + return false; + } + + // Don't let anybody nuke the only admin account. + + $r = q( + "select account_id from account where (account_roles & %d) > 0", + intval(ACCOUNT_ROLE_ADMIN) + ); + + if ($r !== false && count($r) == 1 && $r[0]['account_id'] == $account_id) { + logger("Unable to remove the only remaining admin account"); + return false; + } + + $r = q( + "select * from account where account_id = %d limit 1", + intval($account_id) + ); + + if (! $r) { + logger('No account with id: ' . $account_id); + return false; + } + + $account_email = $r[0]['account_email']; + + $x = q( + "select channel_id from channel where channel_account_id = %d", + intval($account_id) + ); + if ($x) { + foreach ($x as $xx) { + Channel::channel_remove($xx['channel_id'], $local, false); + } + } + + $r = q( + "delete from account where account_id = %d", + intval($account_id) + ); + + if ($unset_session) { + App::$session->nuke(); + notice(sprintf(t('Account \'%s\' deleted'), $account_email) . EOL); + goaway(z_root()); + } + + return $r; + } + + +} diff --git a/Code/Lib/Activity.php b/Code/Lib/Activity.php new file mode 100644 index 000000000..df4d75e1b --- /dev/null +++ b/Code/Lib/Activity.php @@ -0,0 +1,4376 @@ + 'application/activity+json, application/x-zot-activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + 'Host' => $parsed['host'], + 'Date' => datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'), + '(request-target)' => 'get ' . get_request_string($url) + ]; + + if (isset($token)) { + $headers['Authorization'] = 'Bearer ' . $token; + } + $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false); + $x = z_fetch_url($url, true, $redirects, ['headers' => $h]); + } + + if ($x['success']) { + $y = json_decode($x['body'], true); + logger('returned: ' . json_encode($y, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); + + $site_url = unparse_url(['scheme' => $parsed['scheme'], 'host' => $parsed['host'], 'port' => ((array_key_exists('port', $parsed) && intval($parsed['port'])) ? $parsed['port'] : 0)]); + q( + "update site set site_update = '%s' where site_url = '%s' and site_update < %s - INTERVAL %s", + dbesc(datetime_convert()), + dbesc($site_url), + db_utcnow(), + db_quoteinterval('1 DAY') + ); + + // check for a valid signature, but only if this is not an actor object. If it is signed, it must be valid. + // Ignore actors because of the potential for infinite recursion if we perform this step while + // fetching an actor key to validate a signature elsewhere. This should validate relayed activities + // over litepub which arrived at our inbox that do not use LD signatures + + if (($y['type']) && (!ActivityStreams::is_an_actor($y['type']))) { + $sigblock = HTTPSig::verify($x); + + if (($sigblock['header_signed']) && (!$sigblock['header_valid'])) { + return null; + } + } + + return json_decode($x['body'], true); + } else { + logger('fetch failed: ' . $url); + if ($debug) { + return $x; + } + } + return null; + } + + + public static function fetch_person($x) + { + return self::fetch_profile($x); + } + + public static function fetch_profile($x) + { + $r = q( + "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' limit 1", + dbesc($x['id']) + ); + if (!$r) { + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($x['id']) + ); + } + if (!$r) { + return []; + } + + return self::encode_person($r[0], false); + } + + public static function fetch_thing($x) + { + + $r = q( + "select * from obj where obj_type = %d and obj_obj = '%s' limit 1", + intval(TERM_OBJ_THING), + dbesc($x['id']) + ); + + if (!$r) { + return []; + } + + $x = [ + 'type' => 'Object', + 'id' => z_root() . '/thing/' . $r[0]['obj_obj'], + 'name' => $r[0]['obj_term'] + ]; + + if ($r[0]['obj_image']) { + $x['image'] = $r[0]['obj_image']; + } + return $x; + } + + public static function fetch_item($x, $activitypub = false) + { + + if (array_key_exists('source', $x)) { + // This item is already processed and encoded + return $x; + } + + $r = q( + "select * from item where mid = '%s' limit 1", + dbesc($x['id']) + ); + if ($r) { + xchan_query($r, true); + $r = fetch_post_tags($r, true); + if ($r[0]['verb'] === 'Invite') { + return self::encode_activity($r[0], $activitypub); + } + return self::encode_item($r[0], $activitypub); + } + } + + public static function paged_collection_init($total, $id, $type = 'OrderedCollection') + { + + $ret = [ + 'id' => z_root() . '/' . $id, + 'type' => $type, + 'totalItems' => $total, + ]; + + $numpages = $total / App::$pager['itemspage']; + $lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages); + + $ret['first'] = z_root() . '/' . App::$query_string . '?page=1'; + $ret['last'] = z_root() . '/' . App::$query_string . '?page=' . $lastpage; + + return $ret; + } + + + public static function encode_item_collection($items, $id, $type, $activitypub = false, $total = 0) + { + + if ($total > 100) { + $ret = [ + 'id' => z_root() . '/' . $id, + 'type' => $type . 'Page', + ]; + + $numpages = $total / App::$pager['itemspage']; + $lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages); + + $url_parts = parse_url($id); + + $ret['partOf'] = z_root() . '/' . $url_parts['path']; + + $extra_query_args = ''; + $query_args = null; + if (isset($url_parts['query'])) { + parse_str($url_parts['query'], $query_args); + } + + if (is_array($query_args)) { + unset($query_args['page']); + foreach ($query_args as $k => $v) { + $extra_query_args .= '&' . urlencode($k) . '=' . urlencode($v); + } + } + + if (App::$pager['page'] < $lastpage) { + $ret['next'] = z_root() . '/' . $url_parts['path'] . '?page=' . (intval(App::$pager['page']) + 1) . $extra_query_args; + } + if (App::$pager['page'] > 1) { + $ret['prev'] = z_root() . '/' . $url_parts['path'] . '?page=' . (intval(App::$pager['page']) - 1) . $extra_query_args; + } + } else { + $ret = [ + 'id' => z_root() . '/' . $id, + 'type' => $type, + 'totalItems' => $total, + ]; + } + + + if ($items) { + $x = []; + foreach ($items as $i) { + $m = get_iconfig($i['id'], 'activitypub', 'rawmsg'); + if ($m) { + $t = json_decode($m, true); + } else { + $t = self::encode_activity($i, $activitypub); + } + if ($t) { + $x[] = $t; + } + } + if ($type === 'OrderedCollection') { + $ret['orderedItems'] = $x; + } else { + $ret['items'] = $x; + } + } + + return $ret; + } + + public static function encode_follow_collection($items, $id, $type, $total = 0, $extra = null) + { + + if ($total > 100) { + $ret = [ + 'id' => z_root() . '/' . $id, + 'type' => $type . 'Page', + ]; + + $numpages = $total / App::$pager['itemspage']; + $lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages); + + $stripped = preg_replace('/([&|\?]page=[0-9]*)/', '', $id); + $stripped = rtrim($stripped, '/'); + + $ret['partOf'] = z_root() . '/' . $stripped; + + if (App::$pager['page'] < $lastpage) { + $ret['next'] = z_root() . '/' . $stripped . '?page=' . (intval(App::$pager['page']) + 1); + } + if (App::$pager['page'] > 1) { + $ret['prev'] = z_root() . '/' . $stripped . '?page=' . (intval(App::$pager['page']) - 1); + } + } else { + $ret = [ + 'id' => z_root() . '/' . $id, + 'type' => $type, + 'totalItems' => $total, + ]; + } + + if ($extra) { + $ret = array_merge($ret, $extra); + } + + if ($items) { + $x = []; + foreach ($items as $i) { + if ($i['xchan_network'] === 'activitypub') { + $x[] = $i['xchan_hash']; + } else { + $x[] = $i['xchan_url']; + } + } + + if ($type === 'OrderedCollection') { + $ret['orderedItems'] = $x; + } else { + $ret['items'] = $x; + } + } + + return $ret; + } + + + public static function encode_simple_collection($items, $id, $type, $total = 0, $extra = null) + { + + $ret = [ + 'id' => z_root() . '/' . $id, + 'type' => $type, + 'totalItems' => $total, + ]; + + if ($extra) { + $ret = array_merge($ret, $extra); + } + + if ($items) { + if ($type === 'OrderedCollection') { + $ret['orderedItems'] = $items; + } else { + $ret['items'] = $items; + } + } + + return $ret; + } + + + public static function decode_taxonomy($item) + { + + $ret = []; + + if (array_key_exists('tag', $item) && is_array($item['tag'])) { + $ptr = $item['tag']; + if (!array_key_exists(0, $ptr)) { + $ptr = [$ptr]; + } + foreach ($ptr as $t) { + if (!is_array($t)) { + continue; + } + if (!array_key_exists('type', $t)) { + $t['type'] = 'Hashtag'; + } + if (!(array_key_exists('name', $t))) { + continue; + } + if (!(array_path_exists('icon/url', $t) || array_key_exists('href', $t))) { + continue; + } + + switch ($t['type']) { + case 'Hashtag': + $ret[] = ['ttype' => TERM_HASHTAG, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '#') ? substr($t['name'], 1) : $t['name'])]; + break; + + case 'topicalCollection': + $ret[] = ['ttype' => TERM_PCATEGORY, 'url' => $t['href'], 'term' => escape_tags($t['name'])]; + break; + + case 'Category': + $ret[] = ['ttype' => TERM_CATEGORY, 'url' => $t['href'], 'term' => escape_tags($t['name'])]; + break; + + case 'Mention': + $mention_type = substr($t['name'], 0, 1); + if ($mention_type === '!') { + $ret[] = ['ttype' => TERM_FORUM, 'url' => $t['href'], 'term' => escape_tags(substr($t['name'], 1))]; + } else { + $ret[] = ['ttype' => TERM_MENTION, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '@') ? substr($t['name'], 1) : $t['name'])]; + } + break; + + case 'Emoji': + $ret[] = ['ttype' => TERM_EMOJI, 'url' => $t['icon']['url'], 'term' => escape_tags($t['name'])]; + break; + + default: + break; + } + } + } + + return $ret; + } + + + public static function encode_taxonomy($item) + { + + $ret = []; + + if (isset($item['term']) && is_array($item['term']) && $item['term']) { + foreach ($item['term'] as $t) { + switch ($t['ttype']) { + case TERM_HASHTAG: + // An id is required so if we don't have a url in the taxonomy, ignore it and keep going. + if ($t['url']) { + $ret[] = ['id' => $t['url'], 'name' => '#' . $t['term']]; + } + break; + + case TERM_PCATEGORY: + if ($t['url'] && $t['term']) { + $ret[] = ['type' => 'topicalCollection', 'href' => $t['url'], 'name' => $t['term']]; + } + break; + + case TERM_CATEGORY: + if ($t['url'] && $t['term']) { + $ret[] = ['type' => 'Category', 'href' => $t['url'], 'name' => $t['term']]; + } + break; + + case TERM_FORUM: + $term = self::lookup_term_addr($t['url'], $t['term']); + $ret[] = ['type' => 'Mention', 'href' => $t['url'], 'name' => '!' . (($term) ? $term : $t['term'])]; + break; + + case TERM_MENTION: + $term = self::lookup_term_addr($t['url'], $t['term']); + $ret[] = ['type' => 'Mention', 'href' => $t['url'], 'name' => '@' . (($term) ? $term : $t['term'])]; + break; + + default: + break; + } + } + } + + return $ret; + } + + + public static function lookup_term_addr($url, $name) + { + + // The visible mention in our activities is always the full name. + // In the object taxonomy change this to the webfinger handle in case + // platforms expect the Mastodon form in order to generate notifications + // Try a couple of different things in case the url provided isn't the canonical id. + // If all else fails, try to match the name. + + $r = false; + + if ($url) { + $r = q( + "select xchan_addr from xchan where ( xchan_url = '%s' OR xchan_hash = '%s' ) limit 1", + dbesc($url), + dbesc($url) + ); + + if ($r) { + return $r[0]['xchan_addr']; + } + } + if ($name) { + $r = q( + "select xchan_addr from xchan where xchan_name = '%s' limit 1", + dbesc($name) + ); + if ($r) { + return $r[0]['xchan_addr']; + } + } + + return EMPTY_STR; + } + + + public static function lookup_term_url($url) + { + + // The xchan_url for mastodon is a text/html rendering. This is called from map_mentions where we need + // to convert the mention url to an ActivityPub id. If this fails for any reason, return the url we have + + $r = q( + "select * from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1", + dbesc($url), + dbesc($url) + ); + + if ($r) { + if ($r[0]['hubloc_network'] === 'activitypub') { + return $r[0]['hubloc_hash']; + } + return $r[0]['hubloc_id_url']; + } + + return $url; + } + + + public static function encode_attachment($item) + { + + $ret = []; + + if (array_key_exists('attach', $item)) { + $atts = ((is_array($item['attach'])) ? $item['attach'] : json_decode($item['attach'], true)); + if ($atts) { + foreach ($atts as $att) { + if (strpos($att['type'], 'image')) { + $ret[] = ['type' => 'Image', 'url' => $att['href']]; + } else { + $ret[] = ['type' => 'Link', 'mediaType' => $att['type'], 'href' => $att['href']]; + } + } + } + } + if (array_key_exists('iconfig', $item) && is_array($item['iconfig'])) { + foreach ($item['iconfig'] as $att) { + if ($att['sharing']) { + $ret[] = ['type' => 'PropertyValue', 'name' => 'zot.' . $att['cat'] . '.' . $att['k'], 'value' => unserialise($att['v'])]; + } + } + } + + return $ret; + } + + + public static function decode_iconfig($item) + { + + $ret = []; + + if (is_array($item['attachment']) && $item['attachment']) { + $ptr = $item['attachment']; + if (!array_key_exists(0, $ptr)) { + $ptr = [$ptr]; + } + foreach ($ptr as $att) { + $entry = []; + if ($att['type'] === 'PropertyValue') { + if (array_key_exists('name', $att) && $att['name']) { + $key = explode('.', $att['name']); + if (count($key) === 3 && $key[0] === 'zot') { + $entry['cat'] = $key[1]; + $entry['k'] = $key[2]; + $entry['v'] = $att['value']; + $entry['sharing'] = '1'; + $ret[] = $entry; + } + } + } + } + } + return $ret; + } + + + public static function decode_attachment($item) + { + + $ret = []; + + if (array_key_exists('attachment', $item) && is_array($item['attachment'])) { + $ptr = $item['attachment']; + if (!array_key_exists(0, $ptr)) { + $ptr = [$ptr]; + } + foreach ($ptr as $att) { + $entry = []; + if (array_key_exists('href', $att) && $att['href']) { + $entry['href'] = $att['href']; + } elseif (array_key_exists('url', $att) && $att['url']) { + $entry['href'] = $att['url']; + } + if (array_key_exists('mediaType', $att) && $att['mediaType']) { + $entry['type'] = $att['mediaType']; + } elseif (array_key_exists('type', $att) && $att['type'] === 'Image') { + $entry['type'] = 'image/jpeg'; + } + if (array_key_exists('name', $att) && $att['name']) { + $entry['name'] = html2plain(purify_html($att['name']), 256); + } + if ($entry) { + $ret[] = $entry; + } + } + } elseif (is_string($item['attachment'])) { + btlogger('not an array: ' . $item['attachment']); + } + + return $ret; + } + + + // the $recurse flag encodes the original non-deleted object of a deleted activity + + public static function encode_activity($i, $activitypub = false, $recurse = false) + { + + $ret = []; + $reply = false; + + if (intval($i['item_deleted']) && (!$recurse)) { + $is_response = ActivityStreams::is_response_activity($i['verb']); + + if ($is_response) { + $ret['type'] = 'Undo'; + $fragment = '#undo'; + } else { + $ret['type'] = 'Delete'; + $fragment = '#delete'; + } + + $ret['id'] = str_replace('/item/', '/activity/', $i['mid']) . $fragment; + $actor = self::encode_person($i['author'], false); + if ($actor) { + $ret['actor'] = $actor; + } else { + return []; + } + + $obj = (($is_response) ? self::encode_activity($i, $activitypub, true) : self::encode_item($i, $activitypub)); + if ($obj) { + if (array_path_exists('object/id', $obj)) { + $obj['object'] = $obj['object']['id']; + } + if ($obj) { + $ret['object'] = $obj; + } + } else { + return []; + } + + $ret['to'] = [ACTIVITY_PUBLIC_INBOX]; + return $ret; + } + + $ret['type'] = self::activity_mapper($i['verb']); + + if (strpos($i['mid'], z_root() . '/item/') !== false) { + $ret['id'] = str_replace('/item/', '/activity/', $i['mid']); + } elseif (strpos($i['mid'], z_root() . '/event/') !== false) { + $ret['id'] = str_replace('/event/', '/activity/', $i['mid']); + } else { + $ret['id'] = $i['mid']; + } + + if ($i['title']) { + $ret['name'] = $i['title']; + } + + if ($i['summary']) { + $ret['summary'] = bbcode($i['summary'], ['export' => true]); + } + + if ($ret['type'] === 'Announce') { + $tmp = $i['body']; + $ret['content'] = bbcode($tmp, ['export' => true]); + $ret['source'] = [ + 'content' => $i['body'], + 'mediaType' => 'text/x-multicode' + ]; + if ($i['summary']) { + $ret['source']['summary'] = $i['summary']; + } + } + + $ret['published'] = datetime_convert('UTC', 'UTC', $i['created'], ATOM_TIME); + if ($i['created'] !== $i['edited']) { + $ret['updated'] = datetime_convert('UTC', 'UTC', $i['edited'], ATOM_TIME); + if ($ret['type'] === 'Create') { + $ret['type'] = 'Update'; + } + } + if ($i['app']) { + $ret['generator'] = ['type' => 'Application', 'name' => $i['app']]; + } + if ($i['location'] || $i['coord']) { + $ret['location'] = ['type' => 'Place']; + if ($i['location']) { + $ret['location']['name'] = $i['location']; + } + if ($i['coord']) { + $l = explode(' ', $i['coord']); + $ret['location']['latitude'] = $l[0]; + $ret['location']['longitude'] = $l[1]; + } + } + + if ($i['mid'] !== $i['parent_mid']) { + $reply = true; + + // inReplyTo needs to be set in the activity for followup actions (Like, Dislike, Announce, etc.), + // but *not* for comments and RSVPs, where it should only be present in the object + + if (!in_array($ret['type'], ['Create', 'Update', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject'])) { + $ret['inReplyTo'] = $i['thr_parent']; + $cnv = get_iconfig($i['parent'], 'activitypub', 'context'); + if (!$cnv) { + $cnv = get_iconfig($i['parent'], 'ostatus', 'conversation'); + } + if (!$cnv) { + $cnv = $ret['parent_mid']; + } + } + } + + if (!(isset($cnv) && $cnv)) { + $cnv = get_iconfig($i, 'activitypub', 'context'); + if (!$cnv) { + $cnv = get_iconfig($i, 'ostatus', 'conversation'); + } + if (!$cnv) { + $cnv = $i['parent_mid']; + } + } + if (isset($cnv) && $cnv) { + if (strpos($cnv, z_root()) === 0) { + $cnv = str_replace(['/item/', '/activity/'], ['/conversation/', '/conversation/'], $cnv); + } + $ret['context'] = $cnv; + $ret['conversation'] = $cnv; + } + + if (intval($i['item_private']) === 2) { + $ret['directMessage'] = true; + } + + $actor = self::encode_person($i['author'], false); + if ($actor) { + $ret['actor'] = $actor; + } else { + return []; + } + + + $replyto = unserialise($i['replyto']); + if ($replyto) { + $ret['replyTo'] = $replyto; + } + + + if (!isset($ret['url'])) { + $urls = []; + if (intval($i['item_wall'])) { + $locs = self::nomadic_locations($i); + if ($locs) { + foreach ($locs as $l) { + if (strpos($ret['id'], $l['hubloc_url']) !== false) { + continue; + } + $urls[] = [ + 'type' => 'Link', + 'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']), + 'rel' => 'alternate', + 'mediaType' => 'text/html' + ]; + $urls[] = [ + 'type' => 'Link', + 'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']), + 'rel' => 'alternate', + 'mediaType' => 'application/activity+json' + ]; + $urls[] = [ + 'type' => 'Link', + 'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']), + 'rel' => 'alternate', + 'mediaType' => 'application/x-zot+json' + ]; + $urls[] = [ + 'type' => 'Link', + 'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']), + 'rel' => 'alternate', + 'mediaType' => 'application/x-nomad+json' + ]; + } + } + } + if ($urls) { + $curr[] = [ + 'type' => 'Link', + 'href' => $ret['id'], + 'rel' => 'alternate', + 'mediaType' => 'text/html' + ]; + $ret['url'] = array_merge($curr, $urls); + } else { + $ret['url'] = $ret['id']; + } + } + + + if ($i['obj']) { + if (is_string($i['obj'])) { + $tmp = json_decode($i['obj'], true); + if ($tmp !== null) { + $i['obj'] = $tmp; + } + } + $obj = self::encode_object($i['obj']); + if ($obj) { + $ret['object'] = $obj; + } else { + return []; + } + } else { + $obj = self::encode_item($i, $activitypub); + if ($obj) { + $ret['object'] = $obj; + } else { + return []; + } + } + + if ($i['target']) { + if (is_string($i['target'])) { + $tmp = json_decode($i['target'], true); + if ($tmp !== null) { + $i['target'] = $tmp; + } + } + $tgt = self::encode_object($i['target']); + if ($tgt) { + $ret['target'] = $tgt; + } + } + + $t = self::encode_taxonomy($i); + if ($t) { + $ret['tag'] = $t; + } + + $a = self::encode_attachment($i); + if ($a) { + $ret['attachment'] = $a; + } + + + // addressing madness + + if ($activitypub) { + $parent_i = []; + $public = (($i['item_private']) ? false : true); + $top_level = (($reply) ? false : true); + $ret['to'] = []; + $ret['cc'] = []; + + if (!$top_level) { + $recips = get_iconfig($i['parent'], 'activitypub', 'recips'); + if ($recips) { + $parent_i['to'] = $recips['to']; + $parent_i['cc'] = $recips['cc']; + } + } + + if ($public) { + $ret['to'] = [ACTIVITY_PUBLIC_INBOX]; + if (isset($parent_i['to']) && is_array($parent_i['to'])) { + $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to']))); + } + if ($i['item_origin']) { + $ret['cc'] = [z_root() . '/followers/' . substr($i['author']['xchan_addr'], 0, strpos($i['author']['xchan_addr'], '@'))]; + } + if (isset($parent_i['cc']) && is_array($parent_i['cc'])) { + $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc']))); + } + } else { + // private activity + + if ($top_level) { + $ret['to'] = self::map_acl($i); + if (isset($parent_i['to']) && is_array($parent_i['to'])) { + $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to']))); + } + } else { + $ret['cc'] = self::map_acl($i); + if (isset($parent_i['cc']) && is_array($parent_i['cc'])) { + $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc']))); + } + + if ($ret['tag']) { + foreach ($ret['tag'] as $mention) { + if (is_array($mention) && array_key_exists('ttype', $mention) && in_array($mention['ttype'], [TERM_FORUM, TERM_MENTION]) && array_key_exists('href', $mention) && $mention['href']) { + $h = q( + "select * from hubloc where hubloc_id_url = '%s' limit 1", + dbesc($mention['href']) + ); + if ($h) { + if ($h[0]['hubloc_network'] === 'activitypub') { + $addr = $h[0]['hubloc_hash']; + } else { + $addr = $h[0]['hubloc_id_url']; + } + if (!in_array($addr, $ret['to'])) { + $ret['to'][] = $addr; + } + } + } + } + } + + $d = q( + "select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1", + dbesc($i['parent_mid']), + intval($i['uid']) + ); + if ($d) { + if ($d[0]['hubloc_network'] === 'activitypub') { + $addr = $d[0]['hubloc_hash']; + } else { + $addr = $d[0]['hubloc_id_url']; + } + $ret['cc'][] = $addr; + } + } + } + + $mentions = self::map_mentions($i); + if (count($mentions) > 0) { + if (!$ret['to']) { + $ret['to'] = $mentions; + } else { + $ret['to'] = array_values(array_unique(array_merge($ret['to'], $mentions))); + } + } + } + + $cc = []; + if ($ret['cc'] && is_array($ret['cc'])) { + foreach ($ret['cc'] as $e) { + if (!is_array($ret['to'])) { + $cc[] = $e; + } elseif (!in_array($e, $ret['to'])) { + $cc[] = $e; + } + } + } + $ret['cc'] = $cc; + + return $ret; + } + + + public static function nomadic_locations($item) + { + $synchubs = []; + $h = q( + "select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url + where hubloc_hash = '%s' and hubloc_network in ('zot6','nomad') and hubloc_deleted = 0", + dbesc($item['author_xchan']) + ); + + if (!$h) { + return []; + } + + foreach ($h as $x) { + $y = q( + "select site_dead from site where site_url = '%s' limit 1", + dbesc($x['hubloc_url']) + ); + + if ((!$y) || intval($y[0]['site_dead']) === 0) { + $synchubs[] = $x; + } + } + + return $synchubs; + } + + + public static function encode_item($i, $activitypub = false) + { + + $ret = []; + $reply = false; + $is_directmessage = false; + + $bbopts = (($activitypub) ? 'activitypub' : 'export'); + + $objtype = self::activity_obj_mapper($i['obj_type']); + + if (intval($i['item_deleted'])) { + $ret['type'] = 'Tombstone'; + $ret['formerType'] = $objtype; + $ret['id'] = $i['mid']; + $ret['to'] = [ACTIVITY_PUBLIC_INBOX]; + return $ret; + } + + if (isset($i['obj']) && $i['obj']) { + if (is_string($i['obj'])) { + $tmp = json_decode($i['obj'], true); + if ($tmp !== null) { + $i['obj'] = $tmp; + } + } + $ret = $i['obj']; + if (is_string($ret)) { + return $ret; + } + } + + + $ret['type'] = $objtype; + + if ($objtype === 'Question') { + if ($i['obj']) { + if (is_array($i['obj'])) { + $ret = $i['obj']; + } else { + $ret = json_decode($i['obj'], true); + } + + if (array_path_exists('actor/id', $ret)) { + $ret['actor'] = $ret['actor']['id']; + } + } + } + + + $images = false; + $has_images = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism', $i['body'], $images, PREG_SET_ORDER); + + $ret['id'] = $i['mid']; + +// $token = IConfig::get($i,'ocap','relay'); +// if ($token) { +// if (defined('USE_BEARCAPS')) { +// $ret['id'] = 'bear:?u=' . $ret['id'] . '&t=' . $token; +// } +// else { +// $ret['id'] = $ret['id'] . '?token=' . $token; +// } +// } + + $ret['published'] = datetime_convert('UTC', 'UTC', $i['created'], ATOM_TIME); + if ($i['created'] !== $i['edited']) { + $ret['updated'] = datetime_convert('UTC', 'UTC', $i['edited'], ATOM_TIME); + } + if ($i['expires'] > NULL_DATE) { + $ret['expires'] = datetime_convert('UTC', 'UTC', $i['expires'], ATOM_TIME); + } + if ($i['app']) { + $ret['generator'] = ['type' => 'Application', 'name' => $i['app']]; + } + if ($i['location'] || $i['coord']) { + $ret['location'] = ['type' => 'Place']; + if ($i['location']) { + $ret['location']['name'] = $i['location']; + } + if ($i['coord']) { + $l = explode(' ', $i['coord']); + $ret['location']['latitude'] = $l[0]; + $ret['location']['longitude'] = $l[1]; + } + } + + if (intval($i['item_wall']) && $i['mid'] === $i['parent_mid']) { + $ret['commentPolicy'] = $i['comment_policy']; + } + + if (intval($i['item_private']) === 2) { + $ret['directMessage'] = true; + } + + if (intval($i['item_nocomment'])) { + if ($ret['commentPolicy']) { + $ret['commentPolicy'] .= ' '; + } + $ret['commentPolicy'] .= 'until=' . datetime_convert('UTC', 'UTC', $i['created'], ATOM_TIME); + } elseif (array_key_exists('comments_closed', $i) && $i['comments_closed'] !== EMPTY_STR && $i['comments_closed'] > NULL_DATE) { + if ($ret['commentPolicy']) { + $ret['commentPolicy'] .= ' '; + } + $ret['commentPolicy'] .= 'until=' . datetime_convert('UTC', 'UTC', $i['comments_closed'], ATOM_TIME); + } + + $ret['attributedTo'] = ((in_array($i['author']['xchan_network'],['zot6','nomad'])) ? $i['author']['xchan_url'] : $i['author']['xchan_hash']); + + if ($i['mid'] !== $i['parent_mid']) { + $ret['inReplyTo'] = $i['thr_parent']; + $cnv = get_iconfig($i['parent'], 'activitypub', 'context'); + if (!$cnv) { + $cnv = get_iconfig($i['parent'], 'ostatus', 'conversation'); + } + if (!$cnv) { + $cnv = $ret['parent_mid']; + } + + $reply = true; + + if ($i['item_private']) { + $d = q( + "select xchan_url, xchan_addr, xchan_name from item left join xchan on xchan_hash = author_xchan where id = %d limit 1", + intval($i['parent']) + ); + if ($d) { + $recips = get_iconfig($i['parent'], 'activitypub', 'recips'); + + if (is_array($recips) && in_array($i['author']['xchan_url'], $recips['to'])) { + $reply_url = $d[0]['xchan_url']; + $is_directmessage = true; + } else { + $reply_url = z_root() . '/followers/' . substr($i['author']['xchan_addr'], 0, strpos($i['author']['xchan_addr'], '@')); + } + $reply_addr = (($d[0]['xchan_addr']) ? $d[0]['xchan_addr'] : $d[0]['xchan_name']); + } + } + } + if (!isset($cnv)) { + $cnv = get_iconfig($i, 'activitypub', 'context'); + if (!$cnv) { + $cnv = get_iconfig($i, 'ostatus', 'conversation'); + } + if (!$cnv) { + $cnv = $i['parent_mid']; + } + } + if (isset($cnv) && $cnv) { + if (strpos($cnv, z_root()) === 0) { + $cnv = str_replace(['/item/', '/activity/'], ['/conversation/', '/conversation/'], $cnv); + } + $ret['context'] = $cnv; + $ret['conversation'] = $cnv; + } + + // provide ocap access token for private media. + // set this for descendants even if the current item is not private + // because it may have been relayed from a private item. + + $token = get_iconfig($i, 'ocap', 'relay'); + if ($token && $has_images) { + for ($n = 0; $n < count($images); $n++) { + $match = $images[$n]; + if (strpos($match[1], '=http') === 0 && strpos($match[1], '/photo/' !== false)) { + $i['body'] = str_replace($match[1], $match[1] . '?token=' . $token, $i['body']); + $images[$n][2] = substr($match[1], 1) . '?token=' . $token; + } elseif (strpos($match[2], z_root() . '/photo/') !== false) { + $i['body'] = str_replace($match[2], $match[2] . '?token=' . $token, $i['body']); + $images[$n][2] = $match[2] . '?token=' . $token; + } + } + } + + if ($i['title']) { + $ret['name'] = $i['title']; + } + + if (in_array($i['mimetype'], [ 'text/bbcode', 'text/x-multicode' ])) { + if ($i['summary']) { + $ret['summary'] = bbcode($i['summary'], [$bbopts => true]); + } + $opts = [$bbopts => true]; + $ret['content'] = bbcode($i['body'], $opts); + $ret['source'] = ['content' => $i['body'], 'mediaType' => 'text/x-multicode']; + if (isset($ret['summary'])) { + $ret['source']['summary'] = $i['summary']; + } + } else { + $ret['mediaType'] = $i['mimetype']; + $ret['content'] = $i['body']; + } + + if (!(isset($ret['actor']) || isset($ret['attributedTo']))) { + $actor = self::encode_person($i['author'], false); + if ($actor) { + $ret['actor'] = $actor; + } else { + return []; + } + } + + $replyto = unserialise($i['replyto']); + if ($replyto) { + $ret['replyTo'] = $replyto; + } + + if (!isset($ret['url'])) { + $urls = []; + if (intval($i['item_wall'])) { + $locs = self::nomadic_locations($i); + if ($locs) { + foreach ($locs as $l) { + if (strpos($i['mid'], $l['hubloc_url']) !== false) { + continue; + } + $urls[] = [ + 'type' => 'Link', + 'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']), + 'rel' => 'alternate', + 'mediaType' => 'text/html' + ]; + $urls[] = [ + 'type' => 'Link', + 'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']), + 'rel' => 'alternate', + 'mediaType' => 'application/activity+json' + ]; + $urls[] = [ + 'type' => 'Link', + 'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']), + 'rel' => 'alternate', + 'mediaType' => 'application/x-nomad+json' + ]; + } + } + } + if ($urls) { + $curr[] = [ + 'type' => 'Link', + 'href' => $ret['id'], + 'rel' => 'alternate', + 'mediaType' => 'text/html' + ]; + $ret['url'] = array_merge($curr, $urls); + } else { + $ret['url'] = $ret['id']; + } + } + + $t = self::encode_taxonomy($i); + if ($t) { + $ret['tag'] = $t; + } + + $a = self::encode_attachment($i); + if ($a) { + $ret['attachment'] = $a; + } + + + if ($activitypub && $has_images && $ret['type'] === 'Note') { + foreach ($images as $match) { + $img = []; + // handle Friendica/Hubzilla style img links with [img=$url]$alttext[/img] + if (strpos($match[1], '=http') === 0) { + $img[] = ['type' => 'Image', 'url' => substr($match[1], 1), 'name' => $match[2]]; + } // preferred mechanism for adding alt text + elseif (strpos($match[1], 'alt=') !== false) { + $txt = str_replace('"', '"', $match[1]); + $txt = substr($match[1], strpos($match[1], 'alt="') + 5, -1); + $img[] = ['type' => 'Image', 'url' => $match[2], 'name' => $txt]; + } else { + $img[] = ['type' => 'Image', 'url' => $match[2]]; + } + + if (!$ret['attachment']) { + $ret['attachment'] = []; + } + $already_added = false; + if ($img) { + for ($pc = 0; $pc < count($ret['attachment']); $pc++) { + // caution: image attachments use url and links use href, and our own links will be 'attach' links based on the image href + // We could alternatively supply the correct attachment info when item is saved, but by replacing here we will pick up + // any "per-post" or manual changes to the image alt-text before sending. + + if ((isset($ret['attachment'][$pc]['href']) && strpos($img[0]['url'], str_replace('/attach/', '/photo/', $ret['attachment'][$pc]['href'])) !== false) || (isset($ret['attachment'][$pc]['url']) && $ret['attachment'][$pc]['url'] === $img[0]['url'])) { + // if it's already there, replace it with our alt-text aware version + $ret['attachment'][$pc] = $img[0]; + $already_added = true; + } + } + if (!$already_added) { + // add it + $ret['attachment'] = array_merge($img, $ret['attachment']); + } + } + } + } + + // addressing madness + + if ($activitypub) { + $parent_i = []; + $ret['to'] = []; + $ret['cc'] = []; + + $public = (($i['item_private']) ? false : true); + $top_level = (($i['mid'] === $i['parent_mid']) ? true : false); + + if (!$top_level) { + if (intval($i['parent'])) { + $recips = get_iconfig($i['parent'], 'activitypub', 'recips'); + } else { + // if we are encoding this item for storage there won't be a parent. + $p = q( + "select parent from item where parent_mid = '%s' and uid = %d", + dbesc($i['parent_mid']), + intval($i['uid']) + ); + if ($p) { + $recips = get_iconfig($p[0]['parent'], 'activitypub', 'recips'); + } + } + if ($recips) { + $parent_i['to'] = $recips['to']; + $parent_i['cc'] = $recips['cc']; + } + } + + + if ($public) { + $ret['to'] = [ACTIVITY_PUBLIC_INBOX]; + if (isset($parent_i['to']) && is_array($parent_i['to'])) { + $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to']))); + } + if ($i['item_origin']) { + $ret['cc'] = [z_root() . '/followers/' . substr($i['author']['xchan_addr'], 0, strpos($i['author']['xchan_addr'], '@'))]; + } + if (isset($parent_i['cc']) && is_array($parent_i['cc'])) { + $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc']))); + } + } else { + // private activity + + if ($top_level) { + $ret['to'] = self::map_acl($i); + if (isset($parent_i['to']) && is_array($parent_i['to'])) { + $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to']))); + } + } else { + $ret['cc'] = self::map_acl($i); + if (isset($parent_i['cc']) && is_array($parent_i['cc'])) { + $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc']))); + } + if ($ret['tag']) { + foreach ($ret['tag'] as $mention) { + if (is_array($mention) && array_key_exists('ttype', $mention) && in_array($mention['ttype'], [TERM_FORUM, TERM_MENTION]) && array_key_exists('href', $mention) && $mention['href']) { + $h = q( + "select * from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1", + dbesc($mention['href']), + dbesc($mention['href']) + ); + if ($h) { + if ($h[0]['hubloc_network'] === 'activitypub') { + $addr = $h[0]['hubloc_hash']; + } else { + $addr = $h[0]['hubloc_id_url']; + } + if (!in_array($addr, $ret['to'])) { + $ret['to'][] = $addr; + } + } + } + } + } + + + $d = q( + "select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1", + dbesc($i['parent_mid']), + intval($i['uid']) + ); + + if ($d) { + if ($d[0]['hubloc_network'] === 'activitypub') { + $addr = $d[0]['hubloc_hash']; + } else { + $addr = $d[0]['hubloc_id_url']; + } + $ret['cc'][] = $addr; + } + } + } + + $mentions = self::map_mentions($i); + if (count($mentions) > 0) { + if (!$ret['to']) { + $ret['to'] = $mentions; + } else { + $ret['to'] = array_values(array_unique(array_merge($ret['to'], $mentions))); + } + } + } + + // remove any duplicates from 'cc' that are present in 'to' + // as this may indicate that mentions changed the audience from secondary to primary + + $cc = []; + if ($ret['cc'] && is_array($ret['cc'])) { + foreach ($ret['cc'] as $e) { + if (!is_array($ret['to'])) { + $cc[] = $e; + } elseif (!in_array($e, $ret['to'])) { + $cc[] = $e; + } + } + } + $ret['cc'] = $cc; + + return $ret; + } + + + // Returns an array of URLS for any mention tags found in the item array $i. + + public static function map_mentions($i) + { + if (!(array_key_exists('term', $i) && is_array($i['term']))) { + return []; + } + + $list = []; + + foreach ($i['term'] as $t) { + if (!(array_key_exists('url', $t) && $t['url'])) { + continue; + } + if (array_key_exists('ttype', $t) && $t['ttype'] == TERM_MENTION) { + $url = self::lookup_term_url($t['url']); + $list[] = (($url) ? $url : $t['url']); + } + } + + return $list; + } + + // Returns an array of all recipients targeted by private item array $i. + + public static function map_acl($i) + { + $ret = []; + + if (!$i['item_private']) { + return $ret; + } + + if ($i['mid'] !== $i['parent_mid']) { + $i = q( + "select * from item where parent_mid = '%s' and uid = %d", + dbesc($i['parent_mid']), + intval($i['uid']) + ); + if ($i) { + $i = array_shift($i); + } + } + if ($i['allow_gid']) { + $tmp = expand_acl($i['allow_gid']); + if ($tmp) { + foreach ($tmp as $t) { + $ret[] = z_root() . '/lists/' . $t; + } + } + } + + if ($i['allow_cid']) { + $tmp = expand_acl($i['allow_cid']); + $list = stringify_array($tmp, true); + if ($list) { + $details = q("select hubloc_id_url, hubloc_hash, hubloc_network from hubloc where hubloc_hash in (" . $list . ") "); + if ($details) { + foreach ($details as $d) { + if ($d['hubloc_network'] === 'activitypub') { + $ret[] = $d['hubloc_hash']; + } else { + $ret[] = $d['hubloc_id_url']; + } + } + } + } + } + + $x = get_iconfig($i['id'], 'activitypub', 'recips'); + if ($x) { + foreach (['to', 'cc'] as $k) { + if (isset($x[$k])) { + if (is_string($x[$k])) { + $ret[] = $x[$k]; + } else { + $ret = array_merge($ret, $x[$k]); + } + } + } + } + + return array_values(array_unique($ret)); + } + + + public static function encode_person($p, $extended = true, $activitypub = false) + { + + $ret = []; + + if (!$p['xchan_url']) { + return $ret; + } + + if (!$extended) { + return $p['xchan_url']; + } + + $c = ((array_key_exists('channel_id', $p)) ? $p : Channel::from_hash($p['xchan_hash'])); + + $ret['type'] = 'Person'; + $auto_follow = false; + + if ($c) { + $role = PConfig::Get($c['channel_id'], 'system', 'permissions_role'); + if (strpos($role, 'forum') !== false) { + $ret['type'] = 'Group'; + } + $auto_follow = intval(PConfig::Get($c['channel_id'],'system','autoperms')); + } + + if ($c) { + $ret['id'] = Channel::url($c); + } else { + $ret['id'] = ((strpos($p['xchan_hash'], 'http') === 0) ? $p['xchan_hash'] : $p['xchan_url']); + } + if ($p['xchan_addr'] && strpos($p['xchan_addr'], '@')) { + $ret['preferredUsername'] = substr($p['xchan_addr'], 0, strpos($p['xchan_addr'], '@')); + } + $ret['name'] = $p['xchan_name']; + $ret['updated'] = datetime_convert('UTC', 'UTC', $p['xchan_name_date'], ATOM_TIME); + $ret['icon'] = [ + 'type' => 'Image', + 'mediaType' => (($p['xchan_photo_mimetype']) ? $p['xchan_photo_mimetype'] : 'image/png'), + 'updated' => datetime_convert('UTC', 'UTC', $p['xchan_photo_date'], ATOM_TIME), + 'url' => $p['xchan_photo_l'], + 'height' => 300, + 'width' => 300, + ]; + $ret['url'] = $p['xchan_url']; + if (isset($p['channel_location']) && $p['channel_location']) { + $ret['location'] = ['type' => 'Place', 'name' => $p['channel_location']]; + } + + $ret['tag'] = [['type' => 'PropertyValue', 'name' => 'Protocol', 'value' => 'zot6']]; + $ret['tag'][] = ['type' => 'PropertyValue', 'name' => 'Protocol', 'value' => 'nomad']; + + if ($activitypub && get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) { + if ($c) { + if (get_pconfig($c['channel_id'], 'system', 'activitypub', ACTIVITYPUB_ENABLED)) { + $ret['inbox'] = z_root() . '/inbox/' . $c['channel_address']; + $ret['tag'][] = ['type' => 'PropertyValue', 'name' => 'Protocol', 'value' => 'activitypub']; + } else { + $ret['inbox'] = null; + } + + $ret['outbox'] = z_root() . '/outbox/' . $c['channel_address']; + $ret['followers'] = z_root() . '/followers/' . $c['channel_address']; + $ret['following'] = z_root() . '/following/' . $c['channel_address']; + + $ret['endpoints'] = [ + 'sharedInbox' => z_root() . '/inbox', + 'oauthRegistrationEndpoint' => z_root() . '/api/client/register', + 'oauthAuthorizationEndpoint' => z_root() . '/authorize', + 'oauthTokenEndpoint' => z_root() . '/token' + ]; + + $ret['discoverable'] = ((1 - intval($p['xchan_hidden'])) ? true : false); + $ret['publicKey'] = [ + 'id' => $p['xchan_url'] . '?operation=getkey', + 'owner' => $p['xchan_url'], + 'signatureAlgorithm' => 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256', + 'publicKeyPem' => $p['xchan_pubkey'] + ]; + + $ret['manuallyApprovesFollowers'] = (($auto_follow) ? false : true); + if ($ret['type'] === 'Group') { + $ret['capabilities'] = ['acceptsJoins' => true]; + } + // map other nomadic identities linked with this channel + + $locations = []; + $locs = Libzot::encode_locations($c); + if ($locs) { + foreach ($locs as $loc) { + if ($loc['url'] !== z_root()) { + $locations[] = $loc['id_url']; + } + } + } + + if ($locations) { + if (count($locations) === 1) { + $locations = array_shift($locations); + } + $ret['copiedTo'] = $locations; + $ret['alsoKnownAs'] = $locations; + } + + $cp = Channel::get_cover_photo($c['channel_id'], 'array'); + if ($cp) { + $ret['image'] = [ + 'type' => 'Image', + 'mediaType' => $cp['type'], + 'url' => $cp['url'] + ]; + } + // only fill in profile information if the profile is publicly visible + if (perm_is_allowed($c['channel_id'], EMPTY_STR, 'view_profile')) { + $dp = q( + "select * from profile where uid = %d and is_default = 1", + intval($c['channel_id']) + ); + if ($dp) { + if ($dp[0]['about']) { + $ret['summary'] = bbcode($dp[0]['about'], ['export' => true]); + } + foreach ( + ['pdesc', 'address', 'locality', 'region', 'postal_code', 'country_name', + 'hometown', 'gender', 'marital', 'sexual', 'politic', 'religion', 'pronouns', + 'homepage', 'contact', 'dob'] as $k + ) { + if ($dp[0][$k]) { + $key = $k; + if ($key === 'pdesc') { + $key = 'description'; + } + if ($key == 'politic') { + $key = 'political'; + } + if ($key === 'dob') { + $key = 'birthday'; + } + $ret['attachment'][] = ['type' => 'PropertyValue', 'name' => $key, 'value' => $dp[0][$k]]; + } + } + if ($dp[0]['keywords']) { + $kw = explode(' ', $dp[0]['keywords']); + if ($kw) { + foreach ($kw as $k) { + $k = trim($k); + $k = trim($k, '#,'); + $ret['tag'][] = ['id' => z_root() . '/search?tag=' . urlencode($k), 'name' => '#' . urlencode($k)]; + } + } + } + } + } + } else { + $collections = get_xconfig($p['xchan_hash'], 'activitypub', 'collections', []); + if ($collections) { + $ret = array_merge($ret, $collections); + } else { + $ret['inbox'] = null; + $ret['outbox'] = null; + } + } + } else { + $ret['publicKey'] = [ + 'id' => $p['xchan_url'], + 'owner' => $p['xchan_url'], + 'publicKeyPem' => $p['xchan_pubkey'] + ]; + } + + $arr = ['xchan' => $p, 'encoded' => $ret, 'activitypub' => $activitypub]; + Hook::call('encode_person', $arr); + $ret = $arr['encoded']; + + + return $ret; + } + + + public static function encode_site() + { + + + $sys = Channel::get_system(); + + // encode the sys channel information and over-ride with site + // information + $ret = self::encode_person($sys, true, true); + + $ret['type'] = ((Channel::is_group($sys['channel_id'])) ? 'Group' : 'Service'); + $ret['id'] = z_root(); + $ret['alsoKnownAs'] = z_root() . '/channel/sys'; + $auto_follow = false; + + $ret['preferredUsername'] = 'sys'; + $ret['name'] = System::get_site_name(); + + $ret['icon'] = [ + 'type' => 'Image', + 'url' => System::get_site_icon(), + ]; + + $ret['generator'] = ['type' => 'Application', 'name' => System::get_project_name()]; + + $ret['url'] = z_root(); + + $ret['manuallyApprovesFollowers'] = ((get_config('system', 'allowed_sites')) ? true : false); + + $cp = Channel::get_cover_photo($sys['channel_id'], 'array'); + if ($cp) { + $ret['image'] = [ + 'type' => 'Image', + 'mediaType' => $cp['type'], + 'url' => $cp['url'] + ]; + } + + $ret['summary'] = bbcode(get_config('system', 'siteinfo', ''), ['export' => true]); + $ret['source'] = [ + 'mediaType' => 'text/x-multicode', + 'summary' => get_config('system', 'siteinfo', '') + ]; + + $ret['publicKey'] = [ + 'id' => z_root() . '?operation=getkey', + 'owner' => z_root(), + 'publicKeyPem' => get_config('system', 'pubkey') + ]; + + return $ret; + } + + + public static function activity_mapper($verb) + { + + if (strpos($verb, '/') === false) { + return $verb; + } + + $acts = [ + 'http://activitystrea.ms/schema/1.0/post' => 'Create', + 'http://activitystrea.ms/schema/1.0/share' => 'Announce', + 'http://activitystrea.ms/schema/1.0/update' => 'Update', + 'http://activitystrea.ms/schema/1.0/like' => 'Like', + 'http://activitystrea.ms/schema/1.0/favorite' => 'Like', + 'http://purl.org/zot/activity/dislike' => 'Dislike', + 'http://activitystrea.ms/schema/1.0/tag' => 'Add', + 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', + 'http://activitystrea.ms/schema/1.0/unfollow' => 'Ignore', + ]; + + Hook::call('activity_mapper', $acts); + + if (array_key_exists($verb, $acts) && $acts[$verb]) { + return $acts[$verb]; + } + + // Reactions will just map to normal activities + + if (strpos($verb, ACTIVITY_REACT) !== false) { + return 'Create'; + } + if (strpos($verb, ACTIVITY_MOOD) !== false) { + return 'Create'; + } + + if (strpos($verb, ACTIVITY_POKE) !== false) { + return 'Activity'; + } + + // We should return false, however this will trigger an uncaught exception and crash + // the delivery system if encountered by the JSON-LDSignature library + + logger('Unmapped activity: ' . $verb); + return 'Create'; + // return false; + } + + + public static function activity_obj_mapper($obj) + { + + + $objs = [ + 'http://activitystrea.ms/schema/1.0/note' => 'Note', + 'http://activitystrea.ms/schema/1.0/comment' => 'Note', + 'http://activitystrea.ms/schema/1.0/person' => 'Person', + 'http://purl.org/zot/activity/profile' => 'Profile', + 'http://activitystrea.ms/schema/1.0/photo' => 'Image', + 'http://activitystrea.ms/schema/1.0/profile-photo' => 'Icon', + 'http://activitystrea.ms/schema/1.0/event' => 'Event', + 'http://activitystrea.ms/schema/1.0/wiki' => 'Document', + 'http://purl.org/zot/activity/location' => 'Place', + 'http://purl.org/zot/activity/chessgame' => 'Game', + 'http://purl.org/zot/activity/tagterm' => 'zot:Tag', + 'http://purl.org/zot/activity/thing' => 'Object', + 'http://purl.org/zot/activity/file' => 'zot:File', + 'http://purl.org/zot/activity/mood' => 'zot:Mood', + + ]; + + Hook::call('activity_obj_mapper', $objs); + + if ($obj === 'Answer') { + return 'Note'; + } + + if (strpos($obj, '/') === false) { + return $obj; + } + + if (array_key_exists($obj, $objs)) { + return $objs[$obj]; + } + + logger('Unmapped activity object: ' . $obj); + return 'Note'; + + // return false; + } + + + public static function follow($channel, $act) + { + + $contact = null; + $their_follow_id = null; + + if (intval($channel['channel_system'])) { + // The system channel ignores all follow requests + return; + } + + /* + * + * if $act->type === 'Follow', actor is now following $channel + * if $act->type === 'Accept', actor has approved a follow request from $channel + * + */ + + $person_obj = $act->actor; + + if (in_array($act->type, ['Follow', 'Invite', 'Join'])) { + $their_follow_id = $act->id; + } elseif ($act->type === 'Accept') { + $my_follow_id = z_root() . '/follow/' . $contact['id']; + } + + if (is_array($person_obj)) { + // store their xchan and hubloc + + self::actor_store($person_obj['id'], $person_obj); + + // Find any existing abook record + + $r = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($person_obj['id']), + intval($channel['channel_id']) + ); + if ($r) { + $contact = $r[0]; + } + } + + $x = PermissionRoles::role_perms('social'); + $p = Permissions::FilledPerms($x['perms_connect']); + + // add tag_deliver permissions to remote groups + + if (is_array($person_obj) && $person_obj['type'] === 'Group') { + $p['tag_deliver'] = 1; + } + + $their_perms = Permissions::serialise($p); + + + if ($contact && $contact['abook_id']) { + // A relationship of some form already exists on this site. + + switch ($act->type) { + case 'Follow': + case 'Invite': + case 'Join': + // A second Follow request, but we haven't approved the first one + + if ($contact['abook_pending']) { + return; + } + + // We've already approved them or followed them first + // Send an Accept back to them + + set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_id', $their_follow_id); + set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_type', $act->type); + Run::Summon(['Notifier', 'permissions_accept', $contact['abook_id']]); + return; + + case 'Accept': + // They accepted our Follow request - set default permissions + + set_abconfig($channel['channel_id'], $contact['abook_xchan'], 'system', 'their_perms', $their_perms); + + $abook_instance = $contact['abook_instance']; + + if (strpos($abook_instance, z_root()) === false) { + if ($abook_instance) { + $abook_instance .= ','; + } + $abook_instance .= z_root(); + + $r = q( + "update abook set abook_instance = '%s', abook_not_here = 0 + where abook_id = %d and abook_channel = %d", + dbesc($abook_instance), + intval($contact['abook_id']), + intval($channel['channel_id']) + ); + } + + return; + default: + return; + } + } + + // No previous relationship exists. + + if ($act->type === 'Accept') { + // This should not happen unless we deleted the connection before it was accepted. + return; + } + + // From here on out we assume a Follow activity to somebody we have no existing relationship with + + set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_id', $their_follow_id); + set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_type', $act->type); + + // The xchan should have been created by actor_store() above + + $r = q( + "select * from xchan where xchan_hash = '%s' and xchan_network = 'activitypub' limit 1", + dbesc($person_obj['id']) + ); + + if (!$r) { + logger('xchan not found for ' . $person_obj['id']); + return; + } + $ret = $r[0]; + + $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER); + if ($blocked) { + foreach ($blocked as $b) { + if (strpos($ret['xchan_url'], $b['block_entity']) !== false) { + logger('siteblock - follower denied'); + return; + } + } + } + if (LibBlock::fetch_by_entity($channel['channel_id'], $ret['xchan_hash'])) { + logger('actorblock - follower denied'); + return; + } + + $p = Permissions::connect_perms($channel['channel_id']); + $my_perms = Permissions::serialise($p['perms']); + $automatic = $p['automatic']; + + $closeness = PConfig::Get($channel['channel_id'], 'system', 'new_abook_closeness', 80); + + $r = abook_store_lowlevel( + [ + 'abook_account' => intval($channel['channel_account_id']), + 'abook_channel' => intval($channel['channel_id']), + 'abook_xchan' => $ret['xchan_hash'], + 'abook_closeness' => intval($closeness), + 'abook_created' => datetime_convert(), + 'abook_updated' => datetime_convert(), + 'abook_connected' => datetime_convert(), + 'abook_dob' => NULL_DATE, + 'abook_pending' => intval(($automatic) ? 0 : 1), + 'abook_instance' => z_root() + ] + ); + + if ($my_perms) { + AbConfig::Set($channel['channel_id'], $ret['xchan_hash'], 'system', 'my_perms', $my_perms); + } + + if ($their_perms) { + AbConfig::Set($channel['channel_id'], $ret['xchan_hash'], 'system', 'their_perms', $their_perms); + } + + + if ($r) { + logger("New ActivityPub follower for {$channel['channel_name']}"); + + $new_connection = q( + "select * from abook left join xchan on abook_xchan = xchan_hash left join hubloc on hubloc_hash = xchan_hash where abook_channel = %d and abook_xchan = '%s' order by abook_created desc limit 1", + intval($channel['channel_id']), + dbesc($ret['xchan_hash']) + ); + if ($new_connection) { + Enotify::submit( + [ + 'type' => NOTIFY_INTRO, + 'from_xchan' => $ret['xchan_hash'], + 'to_xchan' => $channel['channel_hash'], + 'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'], + ] + ); + + if ($my_perms && $automatic) { + // send an Accept for this Follow activity + Run::Summon(['Notifier', 'permissions_accept', $new_connection[0]['abook_id']]); + // Send back a Follow notification to them + Run::Summon(['Notifier', 'permissions_create', $new_connection[0]['abook_id']]); + } + + $clone = []; + foreach ($new_connection[0] as $k => $v) { + if (strpos($k, 'abook_') === 0) { + $clone[$k] = $v; + } + } + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']); + + if ($abconfig) { + $clone['abconfig'] = $abconfig; + } + Libsync::build_sync_packet($channel['channel_id'], ['abook' => [$clone]]); + } + } + + + /* If there is a default group for this channel and permissions are automatic, add this member to it */ + + if ($channel['channel_default_group'] && $automatic) { + $g = AccessList::rec_byhash($channel['channel_id'], $channel['channel_default_group']); + if ($g) { + AccessList::member_add($channel['channel_id'], '', $ret['xchan_hash'], $g['id']); + } + } + + return; + } + + + public static function unfollow($channel, $act) + { + + $contact = null; + + /* actor is unfollowing $channel */ + + $person_obj = $act->actor; + + if (is_array($person_obj)) { + $r = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($person_obj['id']), + intval($channel['channel_id']) + ); + if ($r) { + // remove all permissions they provided + del_abconfig($channel['channel_id'], $r[0]['xchan_hash'], 'system', 'their_perms', EMPTY_STR); + } + } + + return; + } + + + public static function actor_store($url, $person_obj, $force = false) + { + + if (!is_array($person_obj)) { + return; + } + +// logger('person_obj: ' . print_r($person_obj,true)); + + if (array_key_exists('movedTo', $person_obj) && $person_obj['movedTo'] && !is_array($person_obj['movedTo'])) { + $tgt = self::fetch($person_obj['movedTo']); + if (is_array($tgt)) { + self::actor_store($person_obj['movedTo'], $tgt); + ActivityPub::move($person_obj['id'], $tgt); + } + return; + } + + + $ap_hubloc = null; + + $hublocs = self::get_actor_hublocs($url); + if ($hublocs) { + foreach ($hublocs as $hub) { + if ($hub['hubloc_network'] === 'activitypub') { + $ap_hubloc = $hub; + } + if (in_array($hub['hubloc_network'],['zot6','nomad'])) { + Libzot::update_cached_hubloc($hub); + } + } + } + + if ($ap_hubloc) { + // we already have a stored record. Determine if it needs updating. + if ($ap_hubloc['hubloc_updated'] < datetime_convert('UTC', 'UTC', ' now - ' . self::$ACTOR_CACHE_DAYS . ' days') || $force) { + $person_obj = self::fetch($url); + // ensure we received something + if (!is_array($person_obj)) { + return; + } + } else { + return; + } + } + + + if (isset($person_obj['id'])) { + $url = $person_obj['id']; + } + + if (!$url) { + return; + } + + // store the actor record in XConfig + XConfig::Set($url, 'system', 'actor_record', $person_obj); + + $name = escape_tags($person_obj['name']); + if (!$name) { + $name = escape_tags($person_obj['preferredUsername']); + } + if (!$name) { + $name = escape_tags(t('Unknown')); + } + + $username = escape_tags($person_obj['preferredUsername']); + $h = parse_url($url); + if ($h && $h['host']) { + $username .= '@' . $h['host']; + } + + if ($person_obj['icon']) { + if (is_array($person_obj['icon'])) { + if (array_key_exists('url', $person_obj['icon'])) { + $icon = $person_obj['icon']['url']; + } else { + if (is_string($person_obj['icon'][0])) { + $icon = $person_obj['icon'][0]; + } elseif (array_key_exists('url', $person_obj['icon'][0])) { + $icon = $person_obj['icon'][0]['url']; + } + } + } else { + $icon = $person_obj['icon']; + } + } + if (!(isset($icon) && $icon)) { + $icon = z_root() . '/' . Channel::get_default_profile_photo(); + } + + $cover_photo = false; + + if (isset($person_obj['image'])) { + if (is_string($person_obj['image'])) { + $cover_photo = $person_obj['image']; + } + if (isset($person_obj['image']['url'])) { + $cover_photo = $person_obj['image']['url']; + } + } + + $hidden = false; + if (array_key_exists('discoverable', $person_obj) && (!intval($person_obj['discoverable']))) { + $hidden = true; + } + + $links = false; + $profile = false; + + if (is_array($person_obj['url'])) { + if (!array_key_exists(0, $person_obj['url'])) { + $links = [$person_obj['url']]; + } else { + $links = $person_obj['url']; + } + } + + if (is_array($links) && $links) { + foreach ($links as $link) { + if (is_array($link) && array_key_exists('mediaType', $link) && $link['mediaType'] === 'text/html') { + $profile = $link['href']; + } + } + if (!$profile) { + $profile = $links[0]['href']; + } + } elseif (isset($person_obj['url']) && is_string($person_obj['url'])) { + $profile = $person_obj['url']; + } + + if (!$profile) { + $profile = $url; + } + + $inbox = ((array_key_exists('inbox', $person_obj)) ? $person_obj['inbox'] : null); + + // either an invalid identity or a cached entry of some kind which didn't get caught above + + if ((!$inbox) || strpos($inbox, z_root()) !== false) { + return; + } + + + $collections = []; + + if ($inbox) { + $collections['inbox'] = $inbox; + if (array_key_exists('outbox', $person_obj) && is_string($person_obj['outbox'])) { + $collections['outbox'] = $person_obj['outbox']; + } + if (array_key_exists('followers', $person_obj) && is_string($person_obj['followers'])) { + $collections['followers'] = $person_obj['followers']; + } + if (array_key_exists('following', $person_obj) && is_string($person_obj['following'])) { + $collections['following'] = $person_obj['following']; + } + if (array_key_exists('wall', $person_obj) && is_string($person_obj['wall'])) { + $collections['wall'] = $person_obj['wall']; + } + if (array_path_exists('endpoints/sharedInbox', $person_obj) && is_string($person_obj['endpoints']['sharedInbox'])) { + $collections['sharedInbox'] = $person_obj['endpoints']['sharedInbox']; + } + } + + if (isset($person_obj['publicKey']['publicKeyPem'])) { + if ($person_obj['id'] === $person_obj['publicKey']['owner']) { + $pubkey = $person_obj['publicKey']['publicKeyPem']; + if (strstr($pubkey, 'RSA ')) { + $pubkey = Keyutils::rsatopem($pubkey); + } + } + } + + $keywords = []; + + if (isset($person_obj['tag']) && is_array($person_obj['tag'])) { + foreach ($person_obj['tag'] as $t) { + if (is_array($t) && isset($t['type']) && $t['type'] === 'Hashtag') { + if (isset($t['name'])) { + $tag = escape_tags((substr($t['name'], 0, 1) === '#') ? substr($t['name'], 1) : $t['name']); + if ($tag) { + $keywords[] = $tag; + } + } + } + if (is_array($t) && isset($t['type']) && $t['type'] === 'PropertyValue') { + if (isset($t['name']) && isset($t['value']) && $t['name'] === 'Protocol') { + self::update_protocols($url, trim($t['value'])); + } + } + } + } + + $xchan_type = self::get_xchan_type($person_obj['type']); + $about = ((isset($person_obj['summary'])) ? html2bbcode(purify_html($person_obj['summary'])) : EMPTY_STR); + + $p = q( + "select * from xchan where xchan_url = '%s' and xchan_network in ('zot6','nomad') limit 1", + dbesc($url) + ); + if ($p) { + set_xconfig($url, 'system', 'protocols', 'nomad,zot6,activitypub'); + } + + // there is no standard way to represent an 'instance actor' but this will at least subdue the multiple + // pages of Mastodon and Pleroma instance actors in the directory. + // @TODO - (2021-08-27) remove this if they provide a non-person xchan_type + // once extended xchan_type directory filtering is implemented. + $censored = ((strpos($profile, 'instance_actor') || strpos($profile, '/internal/fetch')) ? 1 : 0); + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($url) + ); + if (!$r) { + // create a new record + $r = xchan_store_lowlevel( + [ + 'xchan_hash' => $url, + 'xchan_guid' => $url, + 'xchan_pubkey' => $pubkey, + 'xchan_addr' => ((strpos($username, '@')) ? $username : ''), + 'xchan_url' => $profile, + 'xchan_name' => $name, + 'xchan_hidden' => intval($hidden), + 'xchan_updated' => datetime_convert(), + 'xchan_name_date' => datetime_convert(), + 'xchan_network' => 'activitypub', + 'xchan_type' => $xchan_type, + 'xchan_photo_date' => datetime_convert('UTC', 'UTC', '1968-01-01'), + 'xchan_photo_l' => z_root() . '/' . Channel::get_default_profile_photo(), + 'xchan_photo_m' => z_root() . '/' . Channel::get_default_profile_photo(80), + 'xchan_photo_s' => z_root() . '/' . Channel::get_default_profile_photo(48), + 'xchan_photo_mimetype' => 'image/png', + 'xchan_censored' => $censored + + ] + ); + } else { + // Record exists. Cache existing records for a set number of days + // then refetch to catch updated profile photos, names, etc. + + if ($r[0]['xchan_name_date'] >= datetime_convert('UTC', 'UTC', 'now - ' . self::$ACTOR_CACHE_DAYS . ' days') && (!$force)) { + return; + } + + // update existing record + $u = q( + "update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_pubkey = '%s', xchan_network = '%s', xchan_name_date = '%s', xchan_hidden = %d, xchan_type = %d, xchan_censored = %d where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc($name), + dbesc($pubkey), + dbesc('activitypub'), + dbesc(datetime_convert()), + intval($hidden), + intval($xchan_type), + intval($censored), + dbesc($url) + ); + + if (strpos($username, '@') && ($r[0]['xchan_addr'] !== $username)) { + $r = q( + "update xchan set xchan_addr = '%s' where xchan_hash = '%s'", + dbesc($username), + dbesc($url) + ); + } + } + + if ($cover_photo) { + set_xconfig($url, 'system', 'cover_photo', $cover_photo); + } + + + $m = parse_url($url); + if ($m['scheme'] && $m['host']) { + $site_url = $m['scheme'] . '://' . $m['host']; + $ni = Nodeinfo::fetch($site_url); + if ($ni && is_array($ni)) { + $software = ((array_path_exists('software/name', $ni)) ? $ni['software']['name'] : ''); + $version = ((array_path_exists('software/version', $ni)) ? $ni['software']['version'] : ''); + $register = $ni['openRegistrations']; + + $site = q( + "select * from site where site_url = '%s'", + dbesc($site_url) + ); + if ($site) { + q( + "update site set site_project = '%s', site_update = '%s', site_version = '%s' where site_url = '%s'", + dbesc($software), + dbesc(datetime_convert()), + dbesc($version), + dbesc($site_url) + ); + // it may have been saved originally as an unknown type, but we now know what it is + if (intval($site[0]['site_type']) === SITE_TYPE_UNKNOWN) { + q( + "update site set site_type = %d where site_url = '%s'", + intval(SITE_TYPE_NOTZOT), + dbesc($site_url) + ); + } + } else { + site_store_lowlevel( + [ + 'site_url' => $site_url, + 'site_update' => datetime_convert(), + 'site_dead' => 0, + 'site_type' => SITE_TYPE_NOTZOT, + 'site_project' => $software, + 'site_version' => $version, + 'site_access' => (($register) ? ACCESS_FREE : ACCESS_PRIVATE), + 'site_register' => (($register) ? REGISTER_OPEN : REGISTER_CLOSED) + ] + ); + } + } + } + + Libzotdir::import_directory_profile($url, ['about' => $about, 'keywords' => $keywords, 'dob' => '0000-00-00'], null, 0, true); + + if ($collections) { + set_xconfig($url, 'activitypub', 'collections', $collections); + } + + $h = q( + "select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($url) + ); + + + $m = parse_url($url); + if ($m) { + $hostname = $m['host']; + $baseurl = $m['scheme'] . '://' . $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . $m['port'] : ''); + } + + if (!$h) { + $r = hubloc_store_lowlevel( + [ + 'hubloc_guid' => $url, + 'hubloc_hash' => $url, + 'hubloc_id_url' => $profile, + 'hubloc_addr' => ((strpos($username, '@')) ? $username : ''), + 'hubloc_network' => 'activitypub', + 'hubloc_url' => $baseurl, + 'hubloc_host' => $hostname, + 'hubloc_callback' => $inbox, + 'hubloc_updated' => datetime_convert(), + 'hubloc_primary' => 1 + ] + ); + } else { + if (strpos($username, '@') && ($h[0]['hubloc_addr'] !== $username)) { + $r = q( + "update hubloc set hubloc_addr = '%s' where hubloc_hash = '%s'", + dbesc($username), + dbesc($url) + ); + } + if ($inbox !== $h[0]['hubloc_callback']) { + $r = q( + "update hubloc set hubloc_callback = '%s' where hubloc_hash = '%s'", + dbesc($inbox), + dbesc($url) + ); + } + if ($profile !== $h[0]['hubloc_id_url']) { + $r = q( + "update hubloc set hubloc_id_url = '%s' where hubloc_hash = '%s'", + dbesc($profile), + dbesc($url) + ); + } + $r = q( + "update hubloc set hubloc_updated = '%s' where hubloc_hash = '%s'", + dbesc(datetime_convert()), + dbesc($url) + ); + } + + if (!$icon) { + $icon = z_root() . '/' . Channel::get_default_profile_photo(300); + } + + // We store all ActivityPub actors we can resolve. Some of them may be able to communicate over Zot6. Find them. + // Only probe if it looks like it looks something like a zot6 URL as there isn't anything in the actor record which we can reliably use for this purpose + // and adding zot discovery urls to the actor record will cause federation to fail with the 20-30 projects which don't accept arrays in the url field. + + if (strpos($url, '/channel/') !== false) { + $zx = q( + "select * from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad')", + dbesc($url) + ); + if (($username) && strpos($username, '@') && (!$zx)) { + Run::Summon(['Gprobe', bin2hex($username)]); + } + } + + Run::Summon(['Xchan_photo', bin2hex($icon), bin2hex($url)]); + } + + public static function update_protocols($xchan, $str) + { + $existing = explode(',', get_xconfig($xchan, 'system', 'protocols', EMPTY_STR)); + if (!in_array($str, $existing)) { + $existing[] = $str; + set_xconfig($xchan, 'system', 'protocols', implode(',', $existing)); + } + } + + + public static function drop($channel, $observer, $act) + { + $r = q( + "select * from item where mid = '%s' and uid = %d limit 1", + dbesc((is_array($act->obj)) ? $act->obj['id'] : $act->obj), + intval($channel['channel_id']) + ); + + if (!$r) { + return; + } + + if (in_array($observer, [$r[0]['author_xchan'], $r[0]['owner_xchan']])) { + drop_item($r[0]['id'], false); + } elseif (in_array($act->actor['id'], [$r[0]['author_xchan'], $r[0]['owner_xchan']])) { + drop_item($r[0]['id'], false); + } + } + + + // sort function width decreasing + + public static function vid_sort($a, $b) + { + if ($a['width'] === $b['width']) { + return 0; + } + return (($a['width'] > $b['width']) ? -1 : 1); + } + + public static function share_bb($obj) + { + // @fixme - error check and set defaults + + $name = urlencode($obj['actor']['name']); + $profile = $obj['actor']['id']; + $photo = $obj['icon']['url']; + + $s = "\r\n[share author='" . $name . + "' profile='" . $profile . + "' avatar='" . $photo . + "' link='" . $act->obj['id'] . + "' auth='" . ((is_matrix_url($act->obj['id'])) ? 'true' : 'false') . + "' posted='" . $act->obj['published'] . + "' message_id='" . $act->obj['id'] . + "']"; + + return $s; + } + + public static function get_actor_bbmention($id) + { + + $x = q( + "select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_hash = '%s' or hubloc_id_url = '%s' limit 1", + dbesc($id), + dbesc($id) + ); + + if ($x) { + // a name starting with a left paren can trick the markdown parser into creating a link so insert a zero-width space + if (substr($x[0]['xchan_name'], 0, 1) === '(') { + $x[0]['xchan_name'] = htmlspecialchars_decode('​', ENT_QUOTES) . $x[0]['xchan_name']; + } + + return sprintf('@[zrl=%s]%s[/zrl]', $x[0]['xchan_url'], $x[0]['xchan_name']); + } + return '@{' . $id . '}'; + } + + public static function update_poll($item, $post) + { + + logger('updating poll'); + + $multi = false; + $mid = $post['mid']; + $content = $post['title']; + + if (!$item) { + return false; + } + + $o = json_decode($item['obj'], true); + if ($o && array_key_exists('anyOf', $o)) { + $multi = true; + } + + $r = q( + "select mid, title from item where parent_mid = '%s' and author_xchan = '%s' and mid != parent_mid ", + dbesc($item['mid']), + dbesc($post['author_xchan']) + ); + + // prevent any duplicate votes by same author for oneOf and duplicate votes with same author and same answer for anyOf + + if ($r) { + if ($multi) { + foreach ($r as $rv) { + if ($rv['title'] === $content && $rv['mid'] !== $mid) { + return false; + } + } + } else { + foreach ($r as $rv) { + if ($rv['mid'] !== $mid) { + return false; + } + } + } + } + + $answer_found = false; + $found = false; + if ($multi) { + for ($c = 0; $c < count($o['anyOf']); $c++) { + if ($o['anyOf'][$c]['name'] === $content) { + $answer_found = true; + if (is_array($o['anyOf'][$c]['replies'])) { + foreach ($o['anyOf'][$c]['replies'] as $reply) { + if (is_array($reply) && array_key_exists('id', $reply) && $reply['id'] === $mid) { + $found = true; + } + } + } + + if (!$found) { + $o['anyOf'][$c]['replies']['totalItems']++; + $o['anyOf'][$c]['replies']['items'][] = ['id' => $mid, 'type' => 'Note']; + } + } + } + } else { + for ($c = 0; $c < count($o['oneOf']); $c++) { + if ($o['oneOf'][$c]['name'] === $content) { + $answer_found = true; + if (is_array($o['oneOf'][$c]['replies'])) { + foreach ($o['oneOf'][$c]['replies'] as $reply) { + if (is_array($reply) && array_key_exists('id', $reply) && $reply['id'] === $mid) { + $found = true; + } + } + } + + if (!$found) { + $o['oneOf'][$c]['replies']['totalItems']++; + $o['oneOf'][$c]['replies']['items'][] = ['id' => $mid, 'type' => 'Note']; + } + } + } + } + + if ($item['comments_closed'] > NULL_DATE) { + if ($item['comments_closed'] > datetime_convert()) { + $o['closed'] = datetime_convert('UTC', 'UTC', $item['comments_closed'], ATOM_TIME); + // set this to force an update + $answer_found = true; + } + } + + logger('updated_poll: ' . print_r($o, true), LOGGER_DATA); + if ($answer_found && !$found) { + $x = q( + "update item set obj = '%s', edited = '%s' where id = %d", + dbesc(json_encode($o)), + dbesc(datetime_convert()), + intval($item['id']) + ); + Run::Summon(['Notifier', 'wall-new', $item['id']]); + return true; + } + + return false; + } + + + public static function decode_note($act, $cacheable = false) + { + + $response_activity = false; + $poll_handled = false; + + $s = []; + + if (is_array($act->obj)) { + $binary = false; + $markdown = false; + + if (array_key_exists('mediaType', $act->obj) && $act->obj['mediaType'] !== 'text/html') { + if ($act->obj['mediaType'] === 'text/markdown') { + $markdown = true; + } else { + $s['mimetype'] = escape_tags($act->obj['mediaType']); + $binary = true; + } + } + + $content = self::get_content($act->obj, $binary); + + if ($cacheable) { + // Zot6 activities will all be rendered from bbcode source in order to generate dynamic content. + // If the activity came from ActivityPub (hence $cacheable is set), use the HTML rendering + // and discard the bbcode source since it is unlikely that it is compatible with our implementation. + // Friendica for example. + + unset($content['bbcode']); + } + + // handle markdown conversion inline (peertube) + + if ($markdown) { + foreach (['summary', 'content'] as $t) { + $content[$t] = Markdown::to_bbcode($content[$t], true, ['preserve_lf' => true]); + } + } + } + + // These activities should have been handled separately in the Inbox module and should not be turned into posts + + if ( + in_array($act->type, ['Follow', 'Accept', 'Reject', 'Create', 'Update']) && is_array($act->obj) && array_key_exists('type', $act->obj) + && ($act->obj['type'] === 'Follow' || ActivityStreams::is_an_actor($act->obj['type'])) + ) { + return false; + } + + // Within our family of projects, Follow/Unfollow of a thread is an internal activity which should not be transmitted, + // hence if we receive it - ignore or reject it. + // This may have to be revisited if AP projects start using Follow for objects other than actors. + + if (in_array($act->type, [ACTIVITY_FOLLOW, ACTIVITY_IGNORE])) { + return false; + } + + // Do not proceed further if there is no actor. + + if (!isset($act->actor['id'])) { + logger('No actor!'); + return false; + } + + $s['owner_xchan'] = $act->actor['id']; + $s['author_xchan'] = $act->actor['id']; + + // ensure we store the original actor + self::actor_store($act->actor['id'], $act->actor); + + $s['mid'] = ((is_array($act->obj) && isset($act->obj['id'])) ? $act->obj['id'] : $act->obj); + + if (!$s['mid']) { + return false; + } + + $s['parent_mid'] = $act->parent_id; + + if (array_key_exists('published', $act->data) && $act->data['published']) { + $s['created'] = datetime_convert('UTC', 'UTC', $act->data['published']); + } elseif (array_key_exists('published', $act->obj) && $act->obj['published']) { + $s['created'] = datetime_convert('UTC', 'UTC', $act->obj['published']); + } + if (array_key_exists('updated', $act->data) && $act->data['updated']) { + $s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']); + } elseif (array_key_exists('updated', $act->obj) && $act->obj['updated']) { + $s['edited'] = datetime_convert('UTC', 'UTC', $act->obj['updated']); + } + if (array_key_exists('expires', $act->data) && $act->data['expires']) { + $s['expires'] = datetime_convert('UTC', 'UTC', $act->data['expires']); + } elseif (array_key_exists('expires', $act->obj) && $act->obj['expires']) { + $s['expires'] = datetime_convert('UTC', 'UTC', $act->obj['expires']); + } + + if ($act->type === 'Invite' && is_array($act->obj) && array_key_exists('type', $act->obj) && $act->obj['type'] === 'Event') { + $s['mid'] = $s['parent_mid'] = $act->id; + } + + if (isset($act->replyto) && !empty($act->replyto)) { + if (is_array($act->replyto) && isset($act->replyto['id'])) { + $s['replyto'] = $act->replyto['id']; + } else { + $s['replyto'] = $act->replyto; + } + } + + if (ActivityStreams::is_response_activity($act->type)) { + $response_activity = true; + + $s['mid'] = $act->id; + $s['parent_mid'] = ((is_array($act->obj) && isset($act->obj['id'])) ? $act->obj['id'] : $act->obj); + + + // over-ride the object timestamp with the activity + + if (isset($act->data['published']) && $act->data['published']) { + $s['created'] = datetime_convert('UTC', 'UTC', $act->data['published']); + } + + if (isset($act->data['updated']) && $act->data['updated']) { + $s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']); + } + + $obj_actor = ((isset($act->obj['actor'])) ? $act->obj['actor'] : $act->get_actor('attributedTo', $act->obj)); + + // Actor records themselves do not have an actor or attributedTo + if ((!$obj_actor) && isset($act->obj['type']) && Activitystreams::is_an_actor($act->obj['type'])) { + $obj_actor = $act->obj; + } + + // We already check for admin blocks of third-party objects when fetching them explicitly. + // Repeat here just in case the entire object was supplied inline and did not require fetching + + if ($obj_actor && array_key_exists('id', $obj_actor)) { + $m = parse_url($obj_actor['id']); + if ($m && $m['scheme'] && $m['host']) { + if (!check_siteallowed($m['scheme'] . '://' . $m['host'])) { + return; + } + } + if (!check_channelallowed($obj_actor['id'])) { + return; + } + } + + // if the object is an actor, it is not really a response activity, so reset it to a top level post + + if (ActivityStreams::is_an_actor($act->obj['type'])) { + $s['parent_mid'] = $s['mid']; + } + + + // ensure we store the original actor of the associated (parent) object + self::actor_store($obj_actor['id'], $obj_actor); + + $mention = self::get_actor_bbmention($obj_actor['id']); + + $quoted_content = '[quote]' . $content['content'] . '[/quote]'; + + if ($act->type === 'Like') { + $content['content'] = sprintf(t('Likes %1$s\'s %2$s'), $mention, ((ActivityStreams::is_an_actor($act->obj['type'])) ? t('Profile') : $act->obj['type'])) . EOL . EOL . $quoted_content; + } + if ($act->type === 'Dislike') { + $content['content'] = sprintf(t('Doesn\'t like %1$s\'s %2$s'), $mention, ((ActivityStreams::is_an_actor($act->obj['type'])) ? t('Profile') : $act->obj['type'])) . EOL . EOL . $quoted_content; + } + + // handle event RSVPs + if (($act->obj['type'] === 'Event') || ($act->obj['type'] === 'Invite' && array_path_exists('object/type', $act->obj) && $act->obj['object']['type'] === 'Event')) { + if ($act->type === 'Accept') { + $content['content'] = sprintf(t('Will attend %s\'s event'), $mention) . EOL . EOL . $quoted_content; + } + if ($act->type === 'Reject') { + $content['content'] = sprintf(t('Will not attend %s\'s event'), $mention) . EOL . EOL . $quoted_content; + } + if ($act->type === 'TentativeAccept') { + $content['content'] = sprintf(t('May attend %s\'s event'), $mention) . EOL . EOL . $quoted_content; + } + if ($act->type === 'TentativeReject') { + $content['content'] = sprintf(t('May not attend %s\'s event'), $mention) . EOL . EOL . $quoted_content; + } + } + + if ($act->type === 'Announce') { + $content['content'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, ((ActivityStreams::is_an_actor($act->obj['type'])) ? t('Profile') : $act->obj['type'])); + } + + if ($act->type === 'emojiReaction') { + // Hubzilla reactions + $content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';'); + } + + if (in_array($act->type, ['EmojiReaction', 'EmojiReact'])) { + // Pleroma reactions + $t = trim(self::get_textfield($act->data, 'content')); + $e = Emoji\is_single_emoji($t) || mb_strlen($t) === 1; + if ($e) { + $content['content'] = $t; + } + } + + $a = self::decode_taxonomy($act->data); + if ($a) { + $s['term'] = $a; + foreach ($a as $b) { + if ($b['ttype'] === TERM_EMOJI) { + $s['summary'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['summary']); + + // @todo - @bug + // The emoji reference in the body might be inside a code block. In that case we shouldn't replace it. + // Currently we do. + + $s['body'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['body']); + } + } + } + + $a = self::decode_attachment($act->data); + if ($a) { + $s['attach'] = $a; + } + + $a = self::decode_iconfig($act->data); + if ($a) { + $s['iconfig'] = $a; + } + } + + $s['comment_policy'] = 'authenticated'; + + if ($s['mid'] === $s['parent_mid']) { + // it is a parent node - decode the comment policy info if present + if (isset($act->obj['commentPolicy'])) { + $until = strpos($act->obj['commentPolicy'], 'until='); + if ($until !== false) { + $s['comments_closed'] = datetime_convert('UTC', 'UTC', substr($act->obj['commentPolicy'], $until + 6)); + if ($s['comments_closed'] < datetime_convert()) { + $s['nocomment'] = true; + } + } + $remainder = substr($act->obj['commentPolicy'], 0, (($until) ? $until : strlen($act->obj['commentPolicy']))); + if ($remainder) { + $s['comment_policy'] = $remainder; + } + if (!(isset($item['comment_policy']) && strlen($item['comment_policy']))) { + $s['comment_policy'] = 'contacts'; + } + } + } + + if (!(array_key_exists('created', $s) && $s['created'])) { + $s['created'] = datetime_convert(); + } + if (!(array_key_exists('edited', $s) && $s['edited'])) { + $s['edited'] = $s['created']; + } + $s['title'] = (($response_activity) ? EMPTY_STR : self::bb_content($content, 'name')); + $s['summary'] = self::bb_content($content, 'summary'); + + if (array_key_exists('mimetype', $s) && (!in_array($s['mimetype'], ['text/bbcode', 'text/x-multicode']))) { + $s['body'] = $content['content']; + } else { + $s['body'] = ((self::bb_content($content, 'bbcode') && (!$response_activity)) ? self::bb_content($content, 'bbcode') : self::bb_content($content, 'content')); + } + + + // handle some of the more widely used of the numerous and varied ways of deleting something + + if (in_array($act->type, ['Delete', 'Undo', 'Tombstone'])) { + $s['item_deleted'] = 1; + } + + if ($act->type === 'Create' && $act->obj['type'] === 'Tombstone') { + $s['item_deleted'] = 1; + } + + if ($act->obj && array_key_exists('sensitive', $act->obj) && boolval($act->obj['sensitive'])) { + $s['item_nsfw'] = 1; + } + + $s['verb'] = self::activity_mapper($act->type); + + // Mastodon does not provide update timestamps when updating poll tallies which means race conditions may occur here. + if (in_array($act->type,['Create','Update']) && $act->obj['type'] === 'Question' && $s['edited'] === $s['created']) { + if (isset($act->obj['votersCount']) && intval($act->obj['votersCount'])) { + $s['edited'] = datetime_convert(); + } + } + + + $s['obj_type'] = self::activity_obj_mapper($act->obj['type']); + $s['obj'] = $act->obj; + if (is_array($s['obj']) && array_path_exists('actor/id', $s['obj'])) { + $s['obj']['actor'] = $s['obj']['actor']['id']; + } + + if (is_array($act->tgt) && $act->tgt) { + if (array_key_exists('type', $act->tgt)) { + $s['tgt_type'] = self::activity_obj_mapper($act->tgt['type']); + } + // We shouldn't need to store collection contents which could be large. We will often only require the meta-data + if (isset($s['tgt_type']) && strpos($s['tgt_type'], 'Collection') !== false) { + $s['target'] = ['id' => $act->tgt['id'], 'type' => $s['tgt_type'], 'attributedTo' => ((isset($act->tgt['attributedTo'])) ? $act->tgt['attributedTo'] : $act->tgt['actor'])]; + } + } + + $generator = $act->get_property_obj('generator'); + if ((!$generator) && (!$response_activity)) { + $generator = $act->get_property_obj('generator', $act->obj); + } + + if ( + $generator && array_key_exists('type', $generator) + && in_array($generator['type'], ['Application', 'Service']) && array_key_exists('name', $generator) + ) { + $s['app'] = escape_tags($generator['name']); + } + + $location = $act->get_property_obj('location'); + if (is_array($location) && array_key_exists('type', $location) && $location['type'] === 'Place') { + if (array_key_exists('name', $location)) { + $s['location'] = escape_tags($location['name']); + } + if (array_key_exists('content', $location)) { + $s['location'] = html2plain(purify_html($location['content']), 256); + } + + if (array_key_exists('latitude', $location) && array_key_exists('longitude', $location)) { + $s['coord'] = escape_tags($location['latitude']) . ' ' . escape_tags($location['longitude']); + } + } + + if (!$response_activity) { + $a = self::decode_taxonomy($act->obj); + if ($a) { + $s['term'] = $a; + foreach ($a as $b) { + if ($b['ttype'] === TERM_EMOJI) { + $s['summary'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['summary']); + + // @todo - @bug + // The emoji reference in the body might be inside a code block. In that case we shouldn't replace it. + // Currently we do. + + $s['body'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['body']); + } + } + } + + $a = self::decode_attachment($act->obj); + if ($a) { + $s['attach'] = $a; + } + + $a = self::decode_iconfig($act->obj); + if ($a) { + $s['iconfig'] = $a; + } + } + + // Objects that might have media attachments which aren't already provided in the content element. + // We'll check specific media objects separately. + + if (in_array($act->obj['type'], ['Article', 'Document', 'Event', 'Note', 'Page', 'Place', 'Question']) && isset($s['attach']) && $s['attach']) { + $s['body'] .= self::bb_attach($s['attach'], $s['body']); + } + + if ($act->obj['type'] === 'Question' && in_array($act->type, ['Create', 'Update'])) { + if ($act->obj['endTime']) { + $s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['endTime']); + } + } + + if (array_key_exists('closed', $act->obj) && $act->obj['closed']) { + $s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['closed']); + } + + + // we will need a hook here to extract magnet links e.g. peertube + // right now just link to the largest mp4 we find that will fit in our + // standard content region + + if (!$response_activity) { + if ($act->obj['type'] === 'Video') { + $vtypes = [ + 'video/mp4', + 'video/ogg', + 'video/webm' + ]; + + $mps = []; + $poster = null; + $ptr = null; + + // try to find a poster to display on the video element + + if (array_key_exists('icon', $act->obj)) { + if (is_array($act->obj['icon'])) { + if (array_key_exists(0, $act->obj['icon'])) { + $ptr = $act->obj['icon']; + } else { + $ptr = [$act->obj['icon']]; + } + } + if ($ptr) { + foreach ($ptr as $foo) { + if (is_array($foo) && array_key_exists('type', $foo) && $foo['type'] === 'Image' && is_string($foo['url'])) { + $poster = $foo['url']; + } + } + } + } + + $tag = (($poster) ? '[video poster="' . $poster . '"]' : '[video]'); + $ptr = null; + + if (array_key_exists('url', $act->obj)) { + if (is_array($act->obj['url'])) { + if (array_key_exists(0, $act->obj['url'])) { + $ptr = $act->obj['url']; + } else { + $ptr = [$act->obj['url']]; + } + // handle peertube's weird url link tree if we find it here + // 0 => html link, 1 => application/x-mpegURL with 'tag' set to an array of actual media links + foreach ($ptr as $idex) { + if (is_array($idex) && array_key_exists('mediaType', $idex)) { + if ($idex['mediaType'] === 'application/x-mpegURL' && isset($idex['tag']) && is_array($idex['tag'])) { + $ptr = $idex['tag']; + break; + } + } + } + foreach ($ptr as $vurl) { + if (array_key_exists('mediaType', $vurl)) { + if (in_array($vurl['mediaType'], $vtypes)) { + if (!array_key_exists('width', $vurl)) { + $vurl['width'] = 0; + } + $mps[] = $vurl; + } + } + } + } + if ($mps) { + usort($mps, [__CLASS__, 'vid_sort']); + foreach ($mps as $m) { + if (intval($m['width']) < 500 && self::media_not_in_body($m['href'], $s['body'])) { + $s['body'] .= "\n\n" . $tag . $m['href'] . '[/video]'; + break; + } + } + } elseif (is_string($act->obj['url']) && self::media_not_in_body($act->obj['url'], $s['body'])) { + $s['body'] .= "\n\n" . $tag . $act->obj['url'] . '[/video]'; + } + } + } + + if ($act->obj['type'] === 'Audio') { + $atypes = [ + 'audio/mpeg', + 'audio/ogg', + 'audio/wav' + ]; + + $ptr = null; + + if (array_key_exists('url', $act->obj)) { + if (is_array($act->obj['url'])) { + if (array_key_exists(0, $act->obj['url'])) { + $ptr = $act->obj['url']; + } else { + $ptr = [$act->obj['url']]; + } + foreach ($ptr as $vurl) { + if (isset($vurl['mediaType']) && in_array($vurl['mediaType'], $atypes) && self::media_not_in_body($vurl['href'], $s['body'])) { + $s['body'] .= "\n\n" . '[audio]' . $vurl['href'] . '[/audio]'; + break; + } + } + } elseif (is_string($act->obj['url']) && self::media_not_in_body($act->obj['url'], $s['body'])) { + $s['body'] .= "\n\n" . '[audio]' . $act->obj['url'] . '[/audio]'; + } + } // Pleroma audio scrobbler + elseif ($act->type === 'Listen' && array_key_exists('artist', $act->obj) && array_key_exists('title', $act->obj) && $s['body'] === EMPTY_STR) { + $s['body'] .= "\n\n" . sprintf('Listening to \"%1$s\" by %2$s', escape_tags($act->obj['title']), escape_tags($act->obj['artist'])); + if (isset($act->obj['album'])) { + $s['body'] .= "\n" . sprintf('(%s)', escape_tags($act->obj['album'])); + } + } + } + + if ($act->obj['type'] === 'Image' && strpos($s['body'], 'zrl=') === false) { + $ptr = null; + + if (array_key_exists('url', $act->obj)) { + if (is_array($act->obj['url'])) { + if (array_key_exists(0, $act->obj['url'])) { + $ptr = $act->obj['url']; + } else { + $ptr = [$act->obj['url']]; + } + foreach ($ptr as $vurl) { + if (is_array($vurl) && isset($vurl['href']) && strpos($s['body'], $vurl['href']) === false) { + $s['body'] .= "\n\n" . '[zmg]' . $vurl['href'] . '[/zmg]'; + break; + } + } + } elseif (is_string($act->obj['url'])) { + if (strpos($s['body'], $act->obj['url']) === false) { + $s['body'] .= "\n\n" . '[zmg]' . $act->obj['url'] . '[/zmg]'; + } + } + } + } + + + if ($act->obj['type'] === 'Page' && !$s['body']) { + $ptr = null; + $purl = EMPTY_STR; + + if (array_key_exists('url', $act->obj)) { + if (is_array($act->obj['url'])) { + if (array_key_exists(0, $act->obj['url'])) { + $ptr = $act->obj['url']; + } else { + $ptr = [$act->obj['url']]; + } + foreach ($ptr as $vurl) { + if (is_array($vurl) && array_key_exists('mediaType', $vurl) && $vurl['mediaType'] === 'text/html') { + $purl = $vurl['href']; + break; + } elseif (array_key_exists('mimeType', $vurl) && $vurl['mimeType'] === 'text/html') { + $purl = $vurl['href']; + break; + } + } + } elseif (is_string($act->obj['url'])) { + $purl = $act->obj['url']; + } + if ($purl) { + $li = z_fetch_url(z_root() . '/linkinfo?binurl=' . bin2hex($purl)); + if ($li['success'] && $li['body']) { + $s['body'] .= "\n" . $li['body']; + } else { + $s['body'] .= "\n\n" . $purl; + } + } + } + } + } + + + if (in_array($act->obj['type'], ['Note', 'Article', 'Page'])) { + $ptr = null; + + if (array_key_exists('url', $act->obj)) { + if (is_array($act->obj['url'])) { + if (array_key_exists(0, $act->obj['url'])) { + $ptr = $act->obj['url']; + } else { + $ptr = [$act->obj['url']]; + } + foreach ($ptr as $vurl) { + if (is_array($vurl) && array_key_exists('mediaType', $vurl) && $vurl['mediaType'] === 'text/html') { + $s['plink'] = $vurl['href']; + break; + } + } + } elseif (is_string($act->obj['url'])) { + $s['plink'] = $act->obj['url']; + } + } + } + + if (!(isset($s['plink']) && $s['plink'])) { + $s['plink'] = $s['mid']; + } + + // assume this is private unless specifically told otherwise. + + $s['item_private'] = 1; + + if ($act->recips && (in_array(ACTIVITY_PUBLIC_INBOX, $act->recips) || in_array('Public', $act->recips) || in_array('as:Public', $act->recips))) { + $s['item_private'] = 0; + } + + if (is_array($act->obj)) { + if (array_key_exists('directMessage', $act->obj) && intval($act->obj['directMessage'])) { + $s['item_private'] = 2; + } + } + + set_iconfig($s, 'activitypub', 'recips', $act->raw_recips); + + if (array_key_exists('directMessage', $act->data) && intval($act->data['directMessage'])) { + $s['item_private'] = 2; + } + + + set_iconfig($s, 'activitypub', 'rawmsg', $act->raw, 1); + + // Restrict html caching to ActivityPub senders. + // Zot has dynamic content and this library is used by both. + + if ($cacheable) { + if ((!array_key_exists('mimetype', $s)) || (in_array($s['mimetype'], ['text/bbcode', 'text/x-multicode']))) { + // preserve the original purified HTML content *unless* we've modified $s['body'] + // within this function (to add attachments or reaction descriptions or mention rewrites). + // This avoids/bypasses some markdown rendering issues which can occur when + // converting to our markdown-enhanced bbcode and then back to HTML again. + // Also if we do need bbcode, use the 'bbonly' flag to ignore markdown and only + // interpret bbcode; which is much less susceptible to false positives in the + // conversion regexes. + + if ($s['body'] === self::bb_content($content, 'content')) { + $s['html'] = $content['content']; + } else { + $s['html'] = bbcode($s['body'], ['bbonly' => true]); + } + } + } + + $hookinfo = [ + 'act' => $act, + 's' => $s + ]; + + Hook::call('decode_note', $hookinfo); + + $s = $hookinfo['s']; + + return $s; + } + + public static function rewrite_mentions_sub(&$s, $pref, &$obj = null) + { + + if (isset($s['term']) && is_array($s['term'])) { + foreach ($s['term'] as $tag) { + $txt = EMPTY_STR; + if (intval($tag['ttype']) === TERM_MENTION) { + // some platforms put the identity url into href rather than the profile url. Accept either form. + $x = q( + "select * from xchan where xchan_url = '%s' or xchan_hash = '%s' limit 1", + dbesc($tag['url']), + dbesc($tag['url']) + ); + if ($x) { + switch ($pref) { + case 0: + $txt = $x[0]['xchan_name']; + break; + case 1: + $txt = (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_name']); + break; + case 2: + default; + if ($x[0]['xchan_addr']) { + $txt = sprintf(t('%1$s (%2$s)'), $x[0]['xchan_name'], $x[0]['xchan_addr']); + } else { + $txt = $x[0]['xchan_name']; + } + break; + } + } + } + + if ($txt) { + // the Markdown filter will get tripped up and think this is a markdown link + // if $txt begins with parens so put it behind a zero-width space + if (substr($txt, 0, 1) === '(') { + $txt = htmlspecialchars_decode('​', ENT_QUOTES) . $txt; + } + $s['body'] = preg_replace( + '/\@\[zrl\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/zrl\]/ism', + '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]', + $s['body'] + ); + $s['body'] = preg_replace( + '/\@\[url\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/url\]/ism', + '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]', + $s['body'] + ); + $s['body'] = preg_replace( + '/\[zrl\=' . preg_quote($x[0]['xchan_url'], '/') . '\]@(.*?)\[\/zrl\]/ism', + '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]', + $s['body'] + ); + $s['body'] = preg_replace( + '/\[url\=' . preg_quote($x[0]['xchan_url'], '/') . '\]@(.*?)\[\/url\]/ism', + '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]', + $s['body'] + ); + + // replace these just in case the sender (in this case Friendica) got it wrong + $s['body'] = preg_replace( + '/\@\[zrl\=' . preg_quote($x[0]['xchan_hash'], '/') . '\](.*?)\[\/zrl\]/ism', + '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]', + $s['body'] + ); + $s['body'] = preg_replace( + '/\@\[url\=' . preg_quote($x[0]['xchan_hash'], '/') . '\](.*?)\[\/url\]/ism', + '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]', + $s['body'] + ); + $s['body'] = preg_replace( + '/\[zrl\=' . preg_quote($x[0]['xchan_hash'], '/') . '\]@(.*?)\[\/zrl\]/ism', + '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]', + $s['body'] + ); + $s['body'] = preg_replace( + '/\[url\=' . preg_quote($x[0]['xchan_hash'], '/') . '\]@(.*?)\[\/url\]/ism', + '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]', + $s['body'] + ); + + if ($obj && $txt) { + if (!is_array($obj)) { + $obj = json_decode($obj, true); + } + if (array_path_exists('source/content', $obj)) { + $obj['source']['content'] = preg_replace( + '/\@\[zrl\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/zrl\]/ism', + '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]', + $obj['source']['content'] + ); + $obj['source']['content'] = preg_replace( + '/\@\[url\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/url\]/ism', + '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]', + $obj['source']['content'] + ); + } + $obj['content'] = preg_replace( + '/\@(.*?)\(.*?)\<\/a\>/ism', + '@$1' . $txt . '', + $obj['content'] + ); + } + } + } + } + + // $s['html'] will be populated if caching was enabled. + // This is usually the case for ActivityPub sourced content, while Zot6 content is not cached. + + if (isset($s['html']) && $s['html']) { + $s['html'] = bbcode($s['body'], ['bbonly' => true]); + } + + return; + } + + public static function rewrite_mentions(&$s) + { + // rewrite incoming mentions in accordance with system.tag_username setting + // 0 - displayname + // 1 - username + // 2 - displayname (username) + // 127 - default + + $pref = intval(PConfig::Get($s['uid'], 'system', 'tag_username', Config::Get('system', 'tag_username', false))); + + if ($pref === 127) { + return; + } + + self::rewrite_mentions_sub($s, $pref); + + + return; + } + + // $force is used when manually fetching a remote item - it assumes you are granting one-time + // permission for the selected item/conversation regardless of your relationship with the author and + // assumes that you are in fact the sender. Please do not use it for anything else. The only permission + // checking that is performed is that the author isn't blocked by the site admin. + + public static function store($channel, $observer_hash, $act, $item, $fetch_parents = true, $force = false) + { + + if ($act && $act->implied_create && !$force) { + // This is originally a S2S object with no associated activity + logger('Not storing implied create activity!'); + return; + } + + $is_system = Channel::is_system($channel['channel_id']); + $is_child_node = false; + + // Pleroma scrobbles can be really noisy and contain lots of duplicate activities. Disable them by default. + + if (($act->type === 'Listen') && ($is_system || get_pconfig($channel['channel_id'], 'system', 'allow_scrobbles', false))) { + return; + } + + // Mastodon only allows visibility in public timelines if the public inbox is listed in the 'to' field. + // They are hidden in the public timeline if the public inbox is listed in the 'cc' field. + // This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point. + + $pubstream = ((is_array($act->obj) && array_key_exists('to', $act->obj) && is_array($act->obj['to']) && (in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to']) || in_array('Public', $act->obj['to']) || in_array('as:Public', $act->obj['to']))) ? true : false); + + // very unpleasant and imperfect way of determining a Mastodon DM + + if ($act->raw_recips && array_key_exists('to', $act->raw_recips) && is_array($act->raw_recips['to']) && count($act->raw_recips['to']) === 1 && $act->raw_recips['to'][0] === Channel::url($channel) && !$act->raw_recips['cc']) { + $item['item_private'] = 2; + } + + + if ($item['parent_mid'] && $item['parent_mid'] !== $item['mid']) { + $is_child_node = true; + } + + $allowed = false; + $reason = ['init']; + $permit_mentions = intval(PConfig::Get($channel['channel_id'], 'system', 'permit_all_mentions') && i_am_mentioned($channel, $item)); + + if ($is_child_node) { + $p = q( + "select * from item where mid = '%s' and uid = %d and item_wall = 1", + dbesc($item['parent_mid']), + intval($channel['channel_id']) + ); + if ($p) { + // set the owner to the owner of the parent + $item['owner_xchan'] = $p[0]['owner_xchan']; + + // quietly reject group comment boosts by group owner + // (usually only sent via ActivityPub so groups will work on microblog platforms) + // This catches those activities if they slipped in via a conversation fetch + + if ($p[0]['parent_mid'] !== $item['parent_mid']) { + if ($item['verb'] === 'Announce' && $item['author_xchan'] === $item['owner_xchan']) { + logger('group boost activity by group owner rejected'); + return; + } + } + + // check permissions against the author, not the sender + $allowed = perm_is_allowed($channel['channel_id'], $item['author_xchan'], 'post_comments'); + if (!$allowed) { + $reason[] = 'post_comments perm'; + } + if ((!$allowed) && $permit_mentions) { + if ($p[0]['owner_xchan'] === $channel['channel_hash']) { + $allowed = false; + $reason[] = 'ownership'; + } else { + $allowed = true; + } + } + if (absolutely_no_comments($p[0])) { + $allowed = false; + $reason[] = 'absolutely'; + } + + if (!$allowed) { + logger('rejected comment from ' . $item['author_xchan'] . ' for ' . $channel['channel_address']); + logger('rejected reason ' . print_r($reason, true)); + logger('rejected: ' . print_r($item, true), LOGGER_DATA); + // let the sender know we received their comment but we don't permit spam here. + self::send_rejection_activity($channel, $item['author_xchan'], $item); + return; + } + + if (perm_is_allowed($channel['channel_id'], $item['author_xchan'], 'moderated')) { + $item['item_blocked'] = ITEM_MODERATED; + } + } else { + // By default if we allow you to send_stream and comments and this is a comment, it is allowed. + // A side effect of this action is that if you take away send_stream permission, comments to those + // posts you previously allowed will still be accepted. It is possible but might be difficult to fix this. + + $allowed = true; + + // reject public stream comments that weren't sent by the conversation owner + // but only on remote message deliveries to our site ($fetch_parents === true) + + if ($is_system && $pubstream && $item['owner_xchan'] !== $observer_hash && !$fetch_parents) { + $allowed = false; + $reason[] = 'sender ' . $observer_hash . ' not owner ' . $item['owner_xchan']; + } + } + + if ($p && $p[0]['obj_type'] === 'Question') { + if ($item['obj_type'] === 'Note' && $item['title'] && (!$item['content'])) { + $item['obj_type'] = 'Answer'; + } + } + } else { + if (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') || ($is_system && $pubstream)) { + logger('allowed: permission allowed', LOGGER_DATA); + $allowed = true; + } + if ($permit_mentions) { + logger('allowed: permitted mention', LOGGER_DATA); + $allowed = true; + } + } + + if (tgroup_check($channel['channel_id'], $item) && (!$is_child_node)) { + // for forum deliveries, make sure we keep a copy of the signed original + set_iconfig($item, 'activitypub', 'rawmsg', $act->raw, 1); + logger('allowed: tgroup'); + $allowed = true; + } + + if (get_abconfig($channel['channel_id'], $observer_hash, 'system', 'block_announce', false)) { + if ($item['verb'] === 'Announce' || strpos($item['body'], '[/share]')) { + $allowed = false; + } + } + + if (intval($item['item_private']) === 2) { + if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'post_mail')) { + $allowed = false; + } + } + + if ($is_system) { + if (!check_pubstream_channelallowed($observer_hash)) { + $allowed = false; + $reason[] = 'pubstream channel blocked'; + } + + // don't allow pubstream posts if the sender even has a clone on a pubstream denied site + + $h = q( + "select hubloc_url from hubloc where hubloc_hash = '%s'", + dbesc($observer_hash) + ); + if ($h) { + foreach ($h as $hub) { + if (!check_pubstream_siteallowed($hub['hubloc_url'])) { + $allowed = false; + $reason = 'pubstream site blocked'; + break; + } + } + } + if (intval($item['item_private'])) { + $allowed = false; + $reason[] = 'private item'; + } + } + + $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER); + if ($blocked) { + foreach ($blocked as $b) { + if (strpos($observer_hash, $b['block_entity']) !== false) { + $allowed = false; + $reason[] = 'blocked'; + } + } + } + + if (!$allowed && !$force) { + logger('no permission: channel ' . $channel['channel_address'] . ', id = ' . $item['mid']); + logger('no permission: reason ' . print_r($reason, true)); + return; + } + + $item['aid'] = $channel['channel_account_id']; + $item['uid'] = $channel['channel_id']; + + + // Some authors may be zot6 authors in which case we want to store their nomadic identity + // instead of their ActivityPub identity + + $item['author_xchan'] = self::find_best_identity($item['author_xchan']); + $item['owner_xchan'] = self::find_best_identity($item['owner_xchan']); + + if (!($item['author_xchan'] && $item['owner_xchan'])) { + logger('owner or author missing.'); + return; + } + + if ($channel['channel_system']) { + if (!MessageFilter::evaluate($item, get_config('system', 'pubstream_incl'), get_config('system', 'pubstream_excl'))) { + logger('post is filtered'); + return; + } + } + + // fetch allow/deny lists for the sender, author, or both + // if you have them. post_is_importable() assumes true + // and only fails if there was intentional rejection + // due to this channel's filtering rules for content + // provided by either of these entities. + + $abook = q( + "select * from abook where ( abook_xchan = '%s' OR abook_xchan = '%s') and abook_channel = %d ", + dbesc($item['author_xchan']), + dbesc($item['owner_xchan']), + intval($channel['channel_id']) + ); + + + if (!post_is_importable($channel['channel_id'], $item, $abook)) { + logger('post is filtered'); + return; + } + + $maxlen = get_max_import_size(); + + if ($maxlen && mb_strlen($item['body']) > $maxlen) { + $item['body'] = mb_substr($item['body'], 0, $maxlen, 'UTF-8'); + logger('message length exceeds max_import_size: truncated'); + } + + if ($maxlen && mb_strlen($item['summary']) > $maxlen) { + $item['summary'] = mb_substr($item['summary'], 0, $maxlen, 'UTF-8'); + logger('message summary length exceeds max_import_size: truncated'); + } + + if ($act->obj['context']) { + set_iconfig($item, 'activitypub', 'context', $act->obj['context'], 1); + } + + if ($act->obj['conversation']) { + set_iconfig($item, 'ostatus', 'conversation', $act->obj['conversation'], 1); + } + + set_iconfig($item, 'activitypub', 'recips', $act->raw_recips); + + if (intval($act->sigok)) { + $item['item_verified'] = 1; + } + + $parent = null; + + if ($is_child_node) { + $parent = q( + "select * from item where mid = '%s' and uid = %d limit 1", + dbesc($item['parent_mid']), + intval($item['uid']) + ); + if (!$parent) { + if (!get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) { + return; + } else { + $fetch = false; + if (intval($channel['channel_system']) || (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && (PConfig::Get($channel['channel_id'], 'system', 'hyperdrive', true) || $act->type === 'Announce'))) { + $fetch = (($fetch_parents) ? self::fetch_and_store_parents($channel, $observer_hash, $act, $item) : false); + } + if ($fetch) { + $parent = q( + "select * from item where mid = '%s' and uid = %d limit 1", + dbesc($item['parent_mid']), + intval($item['uid']) + ); + } else { + logger('no parent'); + return; + } + } + } + + $item['comment_policy'] = $parent[0]['comment_policy']; + $item['item_nocomment'] = $parent[0]['item_nocomment']; + $item['comments_closed'] = $parent[0]['comments_closed']; + + if ($parent[0]['parent_mid'] !== $item['parent_mid']) { + $item['thr_parent'] = $item['parent_mid']; + } else { + $item['thr_parent'] = $parent[0]['parent_mid']; + } + $item['parent_mid'] = $parent[0]['parent_mid']; + + /* + * + * Check for conversation privacy mismatches + * We can only do this if we have a channel and we have fetched the parent + * + */ + + // public conversation, but this comment went rogue and was published privately + // hide it from everybody except the channel owner + + if (intval($parent[0]['item_private']) === 0) { + if (intval($item['item_private'])) { + $item['item_restrict'] = $item['item_restrict'] | 1; + $item['allow_cid'] = '<' . $channel['channel_hash'] . '>'; + $item['allow_gid'] = $item['deny_cid'] = $item['deny_gid'] = ''; + } + } + + // Private conversation, but this comment went rogue and was published publicly + // Set item_restrict to indicate this condition so we can flag it in the UI + + if (intval($parent[0]['item_private']) !== 0 && $act->recips && (in_array(ACTIVITY_PUBLIC_INBOX, $act->recips) || in_array('Public', $act->recips) || in_array('as:Public', $act->recips))) { + $item['item_restrict'] = $item['item_restrict'] | 2; + } + } + + self::rewrite_mentions($item); + + $r = q( + "select id, created, edited from item where mid = '%s' and uid = %d limit 1", + dbesc($item['mid']), + intval($item['uid']) + ); + if ($r) { + if ($item['edited'] > $r[0]['edited']) { + $item['id'] = $r[0]['id']; + $x = item_store_update($item); + } else { + return; + } + } else { + $x = item_store($item); + } + + +// experimental code that needs more work. What this did was once we fetched a conversation to find the root node, +// start at that root node and fetch children so you get all the branches and not just the branch related to the current node. +// Unfortunately there is no standard method for achieving this. Mastodon provides a 'replies' collection and Nomad projects +// can fetch the 'context'. For other platforms it's a wild guess. Additionally when we tested this, it started an infinite +// recursion and has been disabled until the recursive behaviour is tracked down and fixed. + +// if ($fetch_parents && $parent && ! intval($parent[0]['item_private'])) { +// logger('topfetch', LOGGER_DEBUG); +// // if the thread owner is a connnection, we will already receive any additional comments to their posts +// // but if they are not we can try to fetch others in the background +// $x = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash +// WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1", +// intval($channel['channel_id']), +// dbesc($parent[0]['owner_xchan']) +// ); +// if (! $x) { +// // determine if the top-level post provides a replies collection +// if ($parent[0]['obj']) { +// $parent[0]['obj'] = json_decode($parent[0]['obj'],true); +// } +// logger('topfetch: ' . print_r($parent[0],true), LOGGER_ALL); +// $id = ((array_path_exists('obj/replies/id',$parent[0])) ? $parent[0]['obj']['replies']['id'] : false); +// if (! $id) { +// $id = ((array_path_exists('obj/replies',$parent[0]) && is_string($parent[0]['obj']['replies'])) ? $parent[0]['obj']['replies'] : false); +// } +// if ($id) { +// Run::Summon( [ 'Convo', $id, $channel['channel_id'], $observer_hash ] ); +// } +// } +// } + + if (is_array($x) && $x['item_id']) { + if ($is_child_node) { + if ($item['owner_xchan'] === $channel['channel_hash']) { + // We are the owner of this conversation, so send all received comments back downstream + Run::Summon(['Notifier', 'comment-import', $x['item_id']]); + } + $r = q( + "select * from item where id = %d limit 1", + intval($x['item_id']) + ); + if ($r) { + send_status_notifications($x['item_id'], $r[0]); + } + } + sync_an_item($channel['channel_id'], $x['item_id']); + } + } + + public static function find_best_identity($xchan) + { + + $r = q( + "select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1", + dbesc($xchan) + ); + if ($r) { + return $r[0]['hubloc_hash']; + } + return $xchan; + } + + + public static function fetch_and_store_parents($channel, $observer_hash, $act, $item) + { + + logger('fetching parents'); + + $p = []; + + $current_act = $act; + $current_item = $item; + + while ($current_item['parent_mid'] !== $current_item['mid']) { + $n = self::fetch($current_item['parent_mid']); + if (!$n) { + break; + } + // set client flag to convert objects to implied activities + $a = new ActivityStreams($n, null, true); + if ( + $a->type === 'Announce' && is_array($a->obj) + && array_key_exists('object', $a->obj) && array_key_exists('actor', $a->obj) + ) { + // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) + // Reparse the encapsulated Activity and use that instead + logger('relayed activity', LOGGER_DEBUG); + $a = new ActivityStreams($a->obj, null, true); + } + + logger($a->debug(), LOGGER_DATA); + + if (!$a->is_valid()) { + logger('not a valid activity'); + break; + } + if (is_array($a->actor) && array_key_exists('id', $a->actor)) { + self::actor_store($a->actor['id'], $a->actor); + } + + // ActivityPub sourced items are cacheable + $item = self::decode_note($a, true); + + if (!$item) { + break; + } + + $hookinfo = [ + 'a' => $a, + 'item' => $item + ]; + + Hook::call('fetch_and_store', $hookinfo); + + $item = $hookinfo['item']; + + if ($item) { + // don't leak any private conversations to the public stream + // even if they contain publicly addressed comments/reactions + + if (intval($channel['channel_system']) && intval($item['item_private'])) { + logger('private conversation ignored'); + $p = []; + break; + } + + if (count($p) > 100) { + logger('Conversation overflow'); + $p = []; + break; + } + + array_unshift($p, [$a, $item]); + + if ($item['parent_mid'] === $item['mid']) { + break; + } + } + + $current_act = $a; + $current_item = $item; + } + + + if ($p) { + foreach ($p as $pv) { + if ($pv[0]->is_valid()) { + self::store($channel, $observer_hash, $pv[0], $pv[1], false); + } + } + return true; + } + + return false; + } + + + // This function is designed to work with Zot attachments and item body + + public static function bb_attach($attach, $body) + { + + $ret = false; + + if (!(is_array($attach) && $attach)) { + return EMPTY_STR; + } + + foreach ($attach as $a) { + if (array_key_exists('type', $a) && stripos($a['type'], 'image') !== false) { + // don't add inline image if it's an svg and we already have an inline svg + if ($a['type'] === 'image/svg+xml' && strpos($body, '[/svg]')) { + continue; + } + if (self::media_not_in_body($a['href'], $body)) { + if (isset($a['name']) && $a['name']) { + $alt = htmlspecialchars($a['name'], ENT_QUOTES); + $ret .= "\n\n" . '[img alt="' . $alt . '"]' . $a['href'] . '[/img]'; + } else { + $ret .= "\n\n" . '[img]' . $a['href'] . '[/img]'; + } + } + } + if (array_key_exists('type', $a) && stripos($a['type'], 'video') !== false) { + if (self::media_not_in_body($a['href'], $body)) { + $ret .= "\n\n" . '[video]' . $a['href'] . '[/video]'; + } + } + if (array_key_exists('type', $a) && stripos($a['type'], 'audio') !== false) { + if (self::media_not_in_body($a['href'], $body)) { + $ret .= "\n\n" . '[audio]' . $a['href'] . '[/audio]'; + } + } + } + + return $ret; + } + + + // check for the existence of existing media link in body + + public static function media_not_in_body($s, $body) + { + + $s_alt = htmlspecialchars($s, ENT_QUOTES, 'UTF-8'); + + if ( + (strpos($body, ']' . $s . '[/img]') === false) && + (strpos($body, ']' . $s . '[/zmg]') === false) && + (strpos($body, ']' . $s . '[/video]') === false) && + (strpos($body, ']' . $s . '[/zvideo]') === false) && + (strpos($body, ']' . $s . '[/audio]') === false) && + (strpos($body, ']' . $s . '[/zaudio]') === false) && + (strpos($body, ']' . $s_alt . '[/img]') === false) && + (strpos($body, ']' . $s_alt . '[/zmg]') === false) && + (strpos($body, ']' . $s_alt . '[/video]') === false) && + (strpos($body, ']' . $s_alt . '[/zvideo]') === false) && + (strpos($body, ']' . $s_alt . '[/audio]') === false) && + (strpos($body, ']' . $s_alt . '[/zaudio]') === false) + ) { + return true; + } + return false; + } + + + public static function bb_content($content, $field) + { + + $ret = false; + + if (!is_array($content)) { + btlogger('content not initialised'); + return $ret; + } + + if (array_key_exists($field, $content) && is_array($content[$field])) { + foreach ($content[$field] as $k => $v) { + $ret .= html2bbcode($v); + // save this for auto-translate or dynamic filtering + // $ret .= '[language=' . $k . ']' . html2bbcode($v) . '[/language]'; + } + } elseif (isset($content[$field])) { + if ($field === 'bbcode' && array_key_exists('bbcode', $content)) { + $ret = $content[$field]; + } else { + $ret = html2bbcode($content[$field]); + } + } else { + $ret = EMPTY_STR; + } + if ($field === 'content' && isset($content['event']) && (!strpos($ret, '[event'))) { + $ret .= format_event_bbcode($content['event']); + } + + return $ret; + } + + + public static function get_content($act, $binary = false) + { + + $content = []; + $event = null; + + if ((!$act) || (!is_array($act))) { + return $content; + } + + + if ($act['type'] === 'Event') { + $adjust = false; + $event = []; + $event['event_hash'] = $act['id']; + if (array_key_exists('startTime', $act) && strpos($act['startTime'], -1, 1) === 'Z') { + $adjust = true; + $event['adjust'] = 1; + $event['dtstart'] = datetime_convert('UTC', 'UTC', $event['startTime'] . (($adjust) ? '' : 'Z')); + } + if (array_key_exists('endTime', $act)) { + $event['dtend'] = datetime_convert('UTC', 'UTC', $event['endTime'] . (($adjust) ? '' : 'Z')); + } else { + $event['nofinish'] = true; + } + + if (array_key_exists('eventRepeat', $act)) { + $event['event_repeat'] = $act['eventRepeat']; + } + } + + foreach (['name', 'summary', 'content'] as $a) { + if (($x = self::get_textfield($act, $a, $binary)) !== false) { + $content[$a] = $x; + } + if (isset($content['name'])) { + $content['name'] = html2plain(purify_html($content['name']), 256); + } + } + + if ($event && !$binary) { + $event['summary'] = html2plain(purify_html($content['summary']), 256); + if (!$event['summary']) { + if ($content['name']) { + $event['summary'] = html2plain(purify_html($content['name']), 256); + } + } + if (!$event['summary']) { + if ($content['content']) { + $event['summary'] = html2plain(purify_html($content['content']), 256); + } + } + if ($event['summary']) { + $event['summary'] = substr($event['summary'], 0, 256); + } + $event['description'] = html2bbcode($content['content']); + if ($event['summary'] && $event['dtstart']) { + $content['event'] = $event; + } + } + + if (array_path_exists('source/mediaType', $act) && array_path_exists('source/content', $act)) { + if (in_array($act['source']['mediaType'], ['text/bbcode', 'text/x-multicode'])) { + if (is_string($act['source']['content']) && strpos($act['source']['content'], '<') !== false) { + $content['bbcode'] = multicode_purify($act['source']['content']); + } else { + $content['bbcode'] = purify_html($act['source']['content'], ['escape']); + } + } + } + + return $content; + } + + + public static function get_textfield($act, $field, $binary = false) + { + + $content = false; + + if (array_key_exists($field, $act) && $act[$field]) { + $content = (($binary) ? $act[$field] : purify_html($act[$field])); + } elseif (array_key_exists($field . 'Map', $act) && $act[$field . 'Map']) { + foreach ($act[$field . 'Map'] as $k => $v) { + $content[escape_tags($k)] = (($binary) ? $v : purify_html($v)); + } + } + return $content; + } + + public static function send_rejection_activity($channel, $observer_hash, $item) + { + + $recip = q( + "select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($observer_hash) + ); + if (!$recip) { + return; + } + + $arr = [ + 'id' => z_root() . '/bounces/' . new_uuid(), + 'to' => [$observer_hash], + 'type' => 'Reject', + 'actor' => Channel::url($channel), + 'name' => 'Permission denied', + 'object' => $item['message_id'] + ]; + + $msg = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + self::ap_schema() + ]], $arr); + + $queue_id = ActivityPub::queue_message(json_encode($msg, JSON_UNESCAPED_SLASHES), $channel, $recip[0]); + do_delivery([$queue_id]); + } + + // Find either an Authorization: Bearer token or 'token' request variable + // in the current web request and return it + + public static function token_from_request() + { + + foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $s) { + $auth = ((array_key_exists($s, $_SERVER) && strpos($_SERVER[$s], 'Bearer ') === 0) + ? str_replace('Bearer ', EMPTY_STR, $_SERVER[$s]) + : EMPTY_STR + ); + if ($auth) { + break; + } + } + + if (!$auth) { + if (array_key_exists('token', $_REQUEST) && $_REQUEST['token']) { + $auth = $_REQUEST['token']; + } + } + + return $auth; + } + + public static function get_xchan_type($type) + { + switch ($type) { + case 'Person': + return XCHAN_TYPE_PERSON; + case 'Group': + return XCHAN_TYPE_GROUP; + case 'Service': + return XCHAN_TYPE_SERVICE; + case 'Organization': + return XCHAN_TYPE_ORGANIZATION; + case 'Application': + return XCHAN_TYPE_APPLICATION; + default: + return XCHAN_TYPE_UNKNOWN; + } + } + + public static function get_cached_actor($id) + { + return (XConfig::Get($id, 'system', 'actor_record')); + } + + + public static function get_actor_hublocs($url, $options = 'all,not_deleted') + { + + $hublocs = false; + $sql_options = EMPTY_STR; + + $options_arr = explode(',', $options); + if (count($options_arr) > 1) { + for ($x = 1; $x < count($options_arr); $x++) { + switch (trim($options_arr[$x])) { + case 'not_deleted': + $sql_options .= ' and hubloc_deleted = 0 '; + break; + default: + break; + } + } + } + + switch (trim($options_arr[0])) { + case 'activitypub': + $hublocs = q( + "select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_hash = '%s' $sql_options ", + dbesc($url) + ); + break; + case 'zot6': + case 'nomad': + $hublocs = q( + "select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_id_url = '%s' $sql_options ", + dbesc($url) + ); + break; + case 'all': + default: + $hublocs = q( + "select * from hubloc left join xchan on hubloc_hash = xchan_hash where ( hubloc_id_url = '%s' OR hubloc_hash = '%s' ) $sql_options ", + dbesc($url), + dbesc($url) + ); + break; + } + + return $hublocs; + } + + public static function get_actor_collections($url) + { + $ret = []; + $actor_record = XConfig::Get($url, 'system', 'actor_record'); + if (!$actor_record) { + return $ret; + } + + foreach (['inbox', 'outbox', 'followers', 'following'] as $collection) { + if (isset($actor_record[$collection]) && $actor_record[$collection]) { + $ret[$collection] = $actor_record[$collection]; + } + } + if (array_path_exists('endpoints/sharedInbox', $actor_record) && $actor_record['endpoints']['sharedInbox']) { + $ret['sharedInbox'] = $actor_record['endpoints']['sharedInbox']; + } + + return $ret; + } + + public static function ap_schema() + { + + return [ + 'zot' => z_root() . '/apschema#', + 'toot' => 'http://joinmastodon.org/ns#', + 'ostatus' => 'http://ostatus.org#', + 'schema' => 'http://schema.org#', + 'litepub' => 'http://litepub.social/ns#', + 'sm' => 'http://smithereen.software/ns#', + 'conversation' => 'ostatus:conversation', + 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', + 'oauthRegistrationEndpoint' => 'litepub:oauthRegistrationEndpoint', + 'sensitive' => 'as:sensitive', + 'movedTo' => 'as:movedTo', + 'copiedTo' => 'as:copiedTo', + 'alsoKnownAs' => 'as:alsoKnownAs', + 'EmojiReact' => 'as:EmojiReact', + 'commentPolicy' => 'zot:commentPolicy', + 'topicalCollection' => 'zot:topicalCollection', + 'eventRepeat' => 'zot:eventRepeat', + 'emojiReaction' => 'zot:emojiReaction', + 'expires' => 'zot:expires', + 'directMessage' => 'zot:directMessage', + 'Category' => 'zot:Category', + 'replyTo' => 'zot:replyTo', + 'PropertyValue' => 'schema:PropertyValue', + 'value' => 'schema:value', + 'discoverable' => 'toot:discoverable', + 'wall' => 'sm:wall', + 'capabilities' => 'litepub:capabilities', + 'acceptsJoins' => 'litepub:acceptsJoins', + ]; + } +} diff --git a/Code/Lib/ActivityPub.php b/Code/Lib/ActivityPub.php new file mode 100644 index 000000000..bce2390e2 --- /dev/null +++ b/Code/Lib/ActivityPub.php @@ -0,0 +1,600 @@ + Channel::url($arr['channel']) . '?operation=delete', + 'actor' => Channel::url($arr['channel']), + 'type' => 'Delete', + 'object' => Channel::url($arr['channel']), + 'to' => ['https://www.w3.org/ns/activitystreams#Public'], + 'cc' => [] + ]; + + $msg = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], $ti); + + $msg['signature'] = LDSignatures::sign($msg, $arr['channel']); + + logger('ActivityPub_encoded (purge_all): ' . json_encode($msg, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); + + $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES); + } else { + $target_item = $arr['target_item']; + + if (!$target_item['mid']) { + return; + } + + $prv_recips = $arr['env_recips']; + + + if ($signed_msg) { + $jmsg = $signed_msg; + } else { + // Rewrite outbound mentions so they match the ActivityPub convention, which + // is to pretend that the preferred display name doesn't exist and instead use + // the username or webfinger address when displaying names. This is likely to + // only cause confusion on nomadic networks where there could be any number + // of applicable webfinger addresses for a given identity. + + + Activity::rewrite_mentions_sub($target_item, 1, $target_item['obj']); + + $ti = Activity::encode_activity($target_item, true); + + if (!$ti) { + return; + } + +// $token = IConfig::get($target_item['id'],'ocap','relay'); +// if ($token) { +// if (defined('USE_BEARCAPS')) { +// $ti['id'] = 'bear:?u=' . $ti['id'] . '&t=' . $token; +// } +// else { +// $ti['id'] = $ti['id'] . '?token=' . $token; +// } +// if ($ti['url'] && is_string($ti['url'])) { +// $ti['url'] .= '?token=' . $token; +// } +// } + + $msg = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], $ti); + + $msg['signature'] = LDSignatures::sign($msg, $arr['channel']); + + logger('ActivityPub_encoded: ' . json_encode($msg, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); + + $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES); + } + } + if ($prv_recips) { + $hashes = []; + + // re-explode the recipients, but only for this hub/pod + + foreach ($prv_recips as $recip) { + $hashes[] = "'" . $recip . "'"; + } + + $r = q( + "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s' + and xchan_hash in (" . implode(',', $hashes) . ") and xchan_network = 'activitypub' ", + dbesc($arr['hub']['hubloc_url']) + ); + + if (!$r) { + logger('activitypub_process_outbound: no recipients'); + return; + } + + foreach ($r as $contact) { + // is $contact connected with this channel - and if the channel is cloned, also on this hub? + // 2018-10-19 this probably doesn't apply to activitypub anymore, just send the thing. + // They'll reject it if they don't like it. + // $single = deliverable_singleton($arr['channel']['channel_id'],$contact); + + if (!$arr['normal_mode']) { + continue; + } + + $qi = self::queue_message($jmsg, $arr['channel'], $contact, $target_item['mid']); + if ($qi) { + $arr['queued'][] = $qi; + } + continue; + } + } else { + // public message + + // See if we can deliver all of them at once + + $x = get_xconfig($arr['hub']['hubloc_hash'], 'activitypub', 'collections'); + if ($x && $x['sharedInbox']) { + logger('using publicInbox delivery for ' . $arr['hub']['hubloc_url'], LOGGER_DEBUG); + $contact['hubloc_callback'] = $x['sharedInbox']; + $qi = self::queue_message($jmsg, $arr['channel'], $contact, $target_item['mid']); + if ($qi) { + $arr['queued'][] = $qi; + } + } else { + $r = q( + "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s' and xchan_network = 'activitypub' ", + dbesc($arr['hub']['hubloc_url']) + ); + + if (!$r) { + logger('activitypub_process_outbound: no recipients'); + return; + } + + foreach ($r as $contact) { + // $single = deliverable_singleton($arr['channel']['channel_id'],$contact); + + $qi = self::queue_message($jmsg, $arr['channel'], $contact, $target_item['mid']); + if ($qi) { + $arr['queued'][] = $qi; + } + } + } + } + + return; + } + + + public static function queue_message($msg, $sender, $recip, $message_id = '') + { + + $dest_url = $recip['hubloc_callback']; + + logger('URL: ' . $dest_url, LOGGER_DEBUG); + logger('DATA: ' . jindent($msg), LOGGER_DATA); + + if (intval(get_config('system', 'activitypub_test')) || intval(get_pconfig($sender['channel_id'], 'system', 'activitypub_test'))) { + logger('test mode - delivery disabled'); + return false; + } + + $hash = random_string(); + + logger('queue: ' . $hash . ' ' . $dest_url, LOGGER_DEBUG); + Queue::insert([ + 'hash' => $hash, + 'account_id' => $sender['channel_account_id'], + 'channel_id' => $sender['channel_id'], + 'driver' => 'activitypub', + 'posturl' => $dest_url, + 'notify' => '', + 'msg' => $msg + ]); + + if ($message_id && (!get_config('system', 'disable_dreport'))) { + q( + "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue, dreport_log ) values ( '%s','%s','%s','%s','%s','%s','%s','%s' ) ", + dbesc($message_id), + dbesc($dest_url), + dbesc($dest_url), + dbesc('queued'), + dbesc(datetime_convert()), + dbesc($sender['channel_hash']), + dbesc($hash), + dbesc(EMPTY_STR) + ); + } + + return $hash; + } + + + public static function permissions_update(&$x) + { + + if ($x['recipient']['xchan_network'] !== 'activitypub') { + return; + } + self::discover($x['recipient']['xchan_hash'], true); + $x['success'] = true; + } + + + public static function permissions_create(&$x) + { + + // send a follow activity to the followee's inbox + + if ($x['recipient']['xchan_network'] !== 'activitypub') { + return; + } + + $p = Activity::encode_person($x['sender'], false); + if (!$p) { + return; + } + + $orig_follow = get_abconfig($x['sender']['channel_id'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_id'); + $orig_follow_type = get_abconfig($x['sender']['channel_id'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_type'); + + $msg = array_merge( + ['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], + [ + 'id' => z_root() . '/follow/' . $x['recipient']['abook_id'] . (($orig_follow) ? '/' . md5($orig_follow) : EMPTY_STR), + 'type' => (($orig_follow_type) ? $orig_follow_type : 'Follow'), + 'actor' => $p, + 'object' => $x['recipient']['xchan_hash'], + 'to' => [$x['recipient']['xchan_hash']], + 'cc' => [] + ] + ); + + // for Group actors, send both a Follow and a Join because some platforms only support one and there's + // no way of discovering/knowing in advance which type they support + + $join_msg = null; + + if (intval($x['recipient']['xchan_type']) === XCHAN_TYPE_GROUP) { + $join_msg = $msg; + $join_msg['type'] = 'Join'; + $join_msg['signature'] = LDSignatures::sign($join_msg, $x['sender']); + $jmsg2 = json_encode($join_msg, JSON_UNESCAPED_SLASHES); + } + + $msg['signature'] = LDSignatures::sign($msg, $x['sender']); + $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES); + + $h = q( + "select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($x['recipient']['xchan_hash']) + ); + + if ($h) { + $qi = self::queue_message($jmsg, $x['sender'], $h[0]); + if ($qi) { + $x['deliveries'] = $qi; + } + if ($join_msg) { + $qi = self::queue_message($jmsg2, $x['sender'], $h[0]); + if ($qi) { + $x['deliveries'] = $qi; + } + } + } + + $x['success'] = true; + } + + + public static function permissions_accept(&$x) + { + + // send an accept activity to the followee's inbox + + if ($x['recipient']['xchan_network'] !== 'activitypub') { + return; + } + + // we currently are not handling send of reject follow activities; this is permitted by protocol + + $accept = get_abconfig($x['recipient']['abook_channel'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_id'); + $follow_type = get_abconfig($x['recipient']['abook_channel'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_type'); + if (!$accept) { + return; + } + + $p = Activity::encode_person($x['sender'], false); + if (!$p) { + return; + } + + $msg = array_merge( + ['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], + [ + 'id' => z_root() . '/follow/' . $x['recipient']['abook_id'] . '/' . md5($accept), + 'type' => 'Accept', + 'actor' => $p, + 'object' => [ + 'type' => (($follow_type) ? $follow_type : 'Follow'), + 'id' => $accept, + 'actor' => $x['recipient']['xchan_hash'], + 'object' => z_root() . '/channel/' . $x['sender']['channel_address'] + ], + 'to' => [$x['recipient']['xchan_hash']], + 'cc' => [] + ] + ); + + $msg['signature'] = LDSignatures::sign($msg, $x['sender']); + + $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES); + + $h = q( + "select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($x['recipient']['xchan_hash']) + ); + + if ($h) { + $qi = self::queue_message($jmsg, $x['sender'], $h[0]); + if ($qi) { + $x['deliveries'] = $qi; + } + } + + $x['success'] = true; + } + + public static function contact_remove($channel_id, $abook) + { + + $recip = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d", + intval($abook['abook_id']) + ); + + if ((!$recip) || $recip[0]['xchan_network'] !== 'activitypub') { + return; + } + + $channel = Channel::from_id($recip[0]['abook_channel']); + if (!$channel) { + return; + } + + $p = Activity::encode_person($channel, true, true); + if (!$p) { + return; + } + + // send an unfollow activity to the followee's inbox + + $orig_activity = get_abconfig($recip[0]['abook_channel'], $recip[0]['xchan_hash'], 'activitypub', 'follow_id'); + + if ($orig_activity && $recip[0]['abook_pending']) { + // was never approved + + $msg = array_merge( + ['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], + [ + 'id' => z_root() . '/follow/' . $recip[0]['abook_id'] . '/' . md5($orig_activity) . '?operation=reject', + 'type' => 'Reject', + 'actor' => $p, + 'object' => [ + 'type' => 'Follow', + 'id' => $orig_activity, + 'actor' => $recip[0]['xchan_hash'], + 'object' => $p + ], + 'to' => [$recip[0]['xchan_hash']], + 'cc' => [] + ] + ); + del_abconfig($recip[0]['abook_channel'], $recip[0]['xchan_hash'], 'activitypub', 'follow_id'); + } else { + // send an unfollow + + $msg = array_merge( + ['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + Activity::ap_schema() + ]], + [ + 'id' => z_root() . '/follow/' . $recip[0]['abook_id'] . (($orig_activity) ? '/' . md5($orig_activity) : EMPTY_STR) . '?operation=unfollow', + 'type' => 'Undo', + 'actor' => $p, + 'object' => [ + 'id' => z_root() . '/follow/' . $recip[0]['abook_id'] . (($orig_activity) ? '/' . md5($orig_activity) : EMPTY_STR), + 'type' => 'Follow', + 'actor' => $p, + 'object' => $recip[0]['xchan_hash'] + ], + 'to' => [$recip[0]['xchan_hash']], + 'cc' => [] + ] + ); + } + + $msg['signature'] = LDSignatures::sign($msg, $channel); + + $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES); + + $h = q( + "select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($recip[0]['xchan_hash']) + ); + + if ($h) { + $qi = self::queue_message($jmsg, $channel, $h[0]); + if ($qi) { + Run::Summon(['Deliver', $qi]); + } + } + } + + public static function discover($apurl, $force = false) + { + + $person_obj = null; + $ap = Activity::fetch($apurl); + if ($ap) { + $AS = new ActivityStreams($ap); + if ($AS->is_valid()) { + if (ActivityStreams::is_an_actor($AS->type)) { + $person_obj = $AS->data; + } elseif ($AS->obj && ActivityStreams::is_an_actor($AS->obj['type'])) { + $person_obj = $AS->obj; + } + } + } + + if (isset($person_obj)) { + Activity::actor_store($person_obj['id'], $person_obj, $force); + return $person_obj['id']; + } + return false; + } + + public static function move($src, $dst) + { + + if (!($src && $dst)) { + return; + } + + if ($src && !is_array($src)) { + $src = Activity::fetch($src); + if (is_array($src)) { + $src_xchan = $src['id']; + } + } + + $approvals = null; + + if ($dst && !is_array($dst)) { + $dst = Activity::fetch($dst); + if (is_array($dst)) { + $dst_xchan = $dst['id']; + if (array_key_exists('alsoKnownAs', $dst)) { + if (!is_array($dst['alsoKnownAs'])) { + $dst['alsoKnownAs'] = [$dst['alsoKnownAs']]; + } + $approvals = $dst['alsoKnownAs']; + } + } + } + + if (!($src_xchan && $dst_xchan)) { + return; + } + + if ($approvals) { + foreach ($approvals as $approval) { + if ($approval === $src_xchan) { + $abooks = q( + "select abook_channel from abook where abook_xchan = '%s'", + dbesc($src_xchan) + ); + if ($abooks) { + foreach ($abooks as $abook) { + // check to see if we already performed this action + $x = q( + "select * from abook where abook_xchan = '%s' and abook_channel = %d", + dbesc($dst_xchan), + intval($abook['abook_channel']) + ); + if ($x) { + continue; + } + // update the local abook + q( + "update abconfig set xchan = '%s' where chan = %d and xchan = '%s'", + dbesc($dst_xchan), + intval($abook['abook_channel']), + dbesc($src_xchan) + ); + q( + "update pgrp_member set xchan = '%s' where uid = %d and xchan = '%s'", + dbesc($dst_xchan), + intval($abook['abook_channel']), + dbesc($src_xchan) + ); + $r = q( + "update abook set abook_xchan = '%s' where abook_xchan = '%s' and abook_channel = %d ", + dbesc($dst_xchan), + dbesc($src_xchan), + intval($abook['abook_channel']) + ); + + $r = q( + "SELECT abook.*, xchan.* + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d and abook_id = %d LIMIT 1", + intval(abook['abook_channel']), + intval($dst_xchan) + ); + if ($r) { + $clone = array_shift($r); + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + $abconfig = load_abconfig($abook['abook_channel'], $clone['abook_xchan']); + if ($abconfig) { + $clone['abconfig'] = $abconfig; + } + Libsync::build_sync_packet($abook['abook_channel'], ['abook' => [$clone]]); + } + } + } + } + } + } + } +} diff --git a/Code/Lib/ActivityStreams.php b/Code/Lib/ActivityStreams.php new file mode 100644 index 000000000..b0f64ae6b --- /dev/null +++ b/Code/Lib/ActivityStreams.php @@ -0,0 +1,502 @@ +raw = $string; + $this->hub = $hub; + + if (is_array($string)) { + $this->data = $string; + $this->raw = json_encode($string, JSON_UNESCAPED_SLASHES); + } else { + $this->data = json_decode($string, true); + } + + if ($this->data) { + // verify and unpack JSalmon signature if present + // This will only be the case for Zot6 packets + + if (is_array($this->data) && array_key_exists('signed', $this->data)) { + $ret = JSalmon::verify($this->data); + $tmp = JSalmon::unpack($this->data['data']); + if ($ret && $ret['success']) { + if ($ret['signer']) { + logger('Unpacked: ' . json_encode($tmp, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT), LOGGER_DATA, LOG_DEBUG); + $saved = json_encode($this->data, JSON_UNESCAPED_SLASHES); + $this->data = $tmp; + $this->meta['signer'] = $ret['signer']; + $this->meta['signed_data'] = $saved; + if ($ret['hubloc']) { + $this->meta['hubloc'] = $ret['hubloc']; + } + } + } + } + + // This indicates only that we have sucessfully decoded JSON. + $this->valid = true; + + // Special handling for Mastodon "delete actor" activities which will often fail to verify + // because the key cannot be fetched. We will catch this condition elsewhere. + + if (array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) { + if ($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) { + $this->deleted = $this->data['actor']; + $this->valid = false; + } + } + } + + // Attempt to assemble an Activity from what we were given. + + if ($this->is_valid()) { + $this->id = $this->get_property_obj('id'); + $this->type = $this->get_primary_type(); + $this->actor = $this->get_actor('actor', '', ''); + $this->obj = $this->get_compound_property('object'); + $this->tgt = $this->get_compound_property('target'); + $this->origin = $this->get_compound_property('origin'); + $this->recips = $this->collect_recips(); + $this->replyto = $this->get_property_obj('replyTo'); + + $this->ldsig = $this->get_compound_property('signature'); + if ($this->ldsig) { + $this->signer = $this->get_compound_property('creator', $this->ldsig); + if ( + $this->signer && is_array($this->signer) && array_key_exists('publicKey', $this->signer) + && is_array($this->signer['publicKey']) && $this->signer['publicKey']['publicKeyPem'] + ) { + $this->sigok = LDSignatures::verify($this->data, $this->signer['publicKey']['publicKeyPem']); + } + } + + // Implied create activity required by C2S specification if no object is present + + if (!$this->obj) { + if (!$client) { + $this->implied_create = true; + } + $this->obj = $this->data; + $this->type = 'Create'; + if (!$this->actor) { + $this->actor = $this->get_actor('attributedTo', $this->obj); + } + } + + // fetch recursive or embedded activities + + if ($this->obj && is_array($this->obj) && array_key_exists('object', $this->obj)) { + $this->obj['object'] = $this->get_compound_property($this->obj['object']); + } + + // Enumerate and store actors in referenced objects + + if ($this->obj && is_array($this->obj) && isset($this->obj['actor'])) { + $this->obj['actor'] = $this->get_actor('actor', $this->obj); + } + if ($this->tgt && is_array($this->tgt) && isset($this->tgt['actor'])) { + $this->tgt['actor'] = $this->get_actor('actor', $this->tgt); + } + + // Determine if this is a followup or response activity + + $this->parent_id = $this->get_property_obj('inReplyTo'); + + if ((!$this->parent_id) && is_array($this->obj)) { + $this->parent_id = $this->obj['inReplyTo']; + } + if ((!$this->parent_id) && is_array($this->obj)) { + $this->parent_id = $this->obj['id']; + } + } + } + + /** + * @brief Return if instantiated ActivityStream is valid. + * + * @return bool Return true if the JSON string could be decoded. + */ + + public function is_valid() + { + return $this->valid; + } + + public function set_recips($arr) + { + $this->saved_recips = $arr; + } + + /** + * @brief Collects all recipients. + * + * @param string $base + * @param string $namespace (optional) default empty + * @return array + */ + public function collect_recips($base = '', $namespace = '') + { + $x = []; + + $fields = ['to', 'cc', 'bto', 'bcc', 'audience']; + foreach ($fields as $f) { + // don't expand these yet + $y = $this->get_property_obj($f, $base, $namespace); + if ($y) { + if (!is_array($this->raw_recips)) { + $this->raw_recips = []; + } + if (!is_array($y)) { + $y = [$y]; + } + $this->raw_recips[$f] = $y; + $x = array_merge($x, $y); + } + } + +// not yet ready for prime time +// $x = $this->expand($x,$base,$namespace); + return $x; + } + + public function expand($arr, $base = '', $namespace = '') + { + $ret = []; + + // right now use a hardwired recursion depth of 5 + + for ($z = 0; $z < 5; $z++) { + if (is_array($arr) && $arr) { + foreach ($arr as $a) { + if (is_array($a)) { + $ret[] = $a; + } else { + $x = $this->get_compound_property($a, $base, $namespace); + if ($x) { + $ret = array_merge($ret, $x); + } + } + } + } + } + + /// @fixme de-duplicate + + return $ret; + } + + /** + * @brief + * + * @param array $base + * @param string $namespace if not set return empty string + * @return string|NULL + */ + + public function get_namespace($base, $namespace) + { + + if (!$namespace) { + return EMPTY_STR; + } + + $key = null; + + foreach ([$this->data, $base] as $b) { + if (!$b) { + continue; + } + + if (array_key_exists('@context', $b)) { + if (is_array($b['@context'])) { + foreach ($b['@context'] as $ns) { + if (is_array($ns)) { + foreach ($ns as $k => $v) { + if ($namespace === $v) { + $key = $k; + } + } + } else { + if ($namespace === $ns) { + $key = ''; + } + } + } + } else { + if ($namespace === $b['@context']) { + $key = ''; + } + } + } + } + + return $key; + } + + /** + * @brief + * + * @param string $property + * @param array $base (optional) + * @param string $namespace (optional) default empty + * @return NULL|mixed + */ + + public function get_property_obj($property, $base = '', $namespace = '') + { + $prefix = $this->get_namespace($base, $namespace); + if ($prefix === null) { + return null; + } + + $base = (($base) ? $base : $this->data); + $propname = (($prefix) ? $prefix . ':' : '') . $property; + + if (!is_array($base)) { + btlogger('not an array: ' . print_r($base, true)); + return null; + } + + return ((array_key_exists($propname, $base)) ? $base[$propname] : null); + } + + + /** + * @brief Fetches a property from an URL. + * + * @param string $url + * @param array $channel (signing channel, default system channel) + * @return NULL|mixed + */ + + public function fetch_property($url, $channel = null, $hub = null) + { + $x = Activity::fetch($url, $channel, $hub); + if ($x === null && strpos($url, '/channel/')) { + // look for other nomadic channels which might be alive + $zf = Zotfinger::exec($url, $channel); + + $url = $zf['signature']['signer']; + $x = Activity::fetch($url, $channel); + } + + return $x; + } + + /** + * @brief given a type, determine if this object represents an actor + * + * If $type is an array, recurse through each element and return true if any + * of the elements are a known actor type + * + * @param string|array $type + * @return boolean + */ + + public static function is_an_actor($type) + { + if (!$type) { + return false; + } + if (is_array($type)) { + foreach ($type as $x) { + if (self::is_an_actor($x)) { + return true; + } + } + return false; + } + return (in_array($type, ['Application', 'Group', 'Organization', 'Person', 'Service'])); + } + + public static function is_response_activity($s) + { + if (!$s) { + return false; + } + return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact'])); + } + + + /** + * @brief + * + * @param string $property + * @param array $base + * @param string $namespace (optional) default empty + * @return NULL|mixed + */ + + public function get_actor($property, $base = '', $namespace = '') + { + $x = $this->get_property_obj($property, $base, $namespace); + if (self::is_url($x)) { + $y = Activity::get_cached_actor($x); + if ($y) { + return $y; + } + } + + $actor = $this->get_compound_property($property, $base, $namespace, true); + if (is_array($actor) && self::is_an_actor($actor['type'])) { + if (array_key_exists('id', $actor) && (!array_key_exists('inbox', $actor))) { + $actor = $this->fetch_property($actor['id']); + } + return $actor; + } + return null; + } + + + /** + * @brief + * + * @param string $property + * @param array $base + * @param string $namespace (optional) default empty + * @param bool $first (optional) default false, if true and result is a sequential array return only the first element + * @return NULL|mixed + */ + + public function get_compound_property($property, $base = '', $namespace = '', $first = false) + { + $x = $this->get_property_obj($property, $base, $namespace); + if (self::is_url($x)) { + $y = $this->fetch_property($x); + if (is_array($y)) { + $x = $y; + } + } + + // verify and unpack JSalmon signature if present + // This may be present in Zot6 packets + + if (is_array($x) && array_key_exists('signed', $x)) { + $ret = JSalmon::verify($x); + $tmp = JSalmon::unpack($x['data']); + if ($ret && $ret['success']) { + if ($ret['signer']) { + logger('Unpacked: ' . json_encode($tmp, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT), LOGGER_DATA, LOG_DEBUG); + $saved = json_encode($x, JSON_UNESCAPED_SLASHES); + $x = $tmp; + $x['meta']['signer'] = $ret['signer']; + $x['meta']['signed_data'] = $saved; + if ($ret['hubloc']) { + $x['meta']['hubloc'] = $ret['hubloc']; + } + } + } + } + if ($first && is_array($x) && array_key_exists(0, $x)) { + return $x[0]; + } + + return $x; + } + + /** + * @brief Check if string starts with http. + * + * @param string $url + * @return bool + */ + + public static function is_url($url) + { + if (($url) && (!is_array($url)) && ((strpos($url, 'http') === 0) || (strpos($url, 'x-zot') === 0) || (strpos($url, 'bear') === 0))) { + return true; + } + + return false; + } + + /** + * @brief Gets the type property. + * + * @param array $base + * @param string $namespace (optional) default empty + * @return NULL|mixed + */ + + public function get_primary_type($base = '', $namespace = '') + { + if (!$base) { + $base = $this->data; + } + $x = $this->get_property_obj('type', $base, $namespace); + if (is_array($x)) { + foreach ($x as $y) { + if (strpos($y, ':') === false) { + return $y; + } + } + } + + return $x; + } + + public function debug() + { + $x = var_export($this, true); + return $x; + } + + + public static function is_as_request() + { + + $x = getBestSupportedMimeType([ + 'application/ld+json;profile="https://www.w3.org/ns/activitystreams"', + 'application/activity+json', + 'application/ld+json;profile="http://www.w3.org/ns/activitystreams"', + 'application/ld+json', // required for Friendica ~2021-09, can possibly be removed after next release of that project + 'application/x-zot-activity+json' + ]); + + return (($x) ? true : false); + } +} diff --git a/Code/Lib/Addon.php b/Code/Lib/Addon.php new file mode 100644 index 000000000..58973c940 --- /dev/null +++ b/Code/Lib/Addon.php @@ -0,0 +1,370 @@ +getMessage()); + } + } + } + + /** + * @brief Uninstalls an addon. + * + * @param string $addon name of the addon + * @return bool + */ + public static function uninstall($addon) + { + + self::unload($addon); + + if (! file_exists('addon/' . $addon . '/' . $addon . '.php')) { + q( + "DELETE FROM addon WHERE aname = '%s' ", + dbesc($addon) + ); + return false; + } + + logger("Addons: uninstalling " . $addon); + //$t = @filemtime('addon/' . $addon . '/' . $addon . '.php'); + @include_once('addon/' . $addon . '/' . $addon . '.php'); + if (function_exists($addon . '_uninstall')) { + $func = $addon . '_uninstall'; + try { + $func(); + } catch (Exception $e) { + self::ErrorHandler($addon, "Unable to uninstall.", "Unable to run _uninstall : ".$e->getMessage()); + } + } + + q( + "DELETE FROM addon WHERE aname = '%s' ", + dbesc($addon) + ); + } + + /** + * @brief Installs an addon. + * + * This function is called once to install the addon (either from the cli or via + * the web admin). This will also call load_plugin() once. + * + * @param string $addon name of the addon + * @return bool + */ + public static function install($addon) + { + if (! file_exists('addon/' . $addon . '/' . $addon . '.php')) { + return false; + } + + logger("Addons: installing " . $addon); + $t = @filemtime('addon/' . $addon . '/' . $addon . '.php'); + @include_once('addon/' . $addon . '/' . $addon . '.php'); + if (function_exists($addon . '_install')) { + $func = $addon . '_install'; + try { + $func(); + } catch (Exception $e) { + self::ErrorHandler($addon, "Install failed.", "Install failed : ".$e->getMessage()); + return; + } + } + + $addon_admin = (function_exists($addon . '_plugin_admin') ? 1 : 0); + + $d = q( + "select * from addon where aname = '%s' limit 1", + dbesc($addon) + ); + if (! $d) { + q( + "INSERT INTO addon (aname, installed, tstamp, plugin_admin) VALUES ( '%s', 1, %d , %d ) ", + dbesc($addon), + intval($t), + $addon_admin + ); + } + + self::load($addon); + } + + /** + * @brief loads an addon by it's name. + * + * @param string $addon name of the addon + * @return bool + */ + public static function load($addon) + { + // silently fail if plugin was removed + if (! file_exists('addon/' . $addon . '/' . $addon . '.php')) { + return false; + } + + logger("Addons: loading " . $addon, LOGGER_DEBUG); + //$t = @filemtime('addon/' . $addon . '/' . $addon . '.php'); + @include_once('addon/' . $addon . '/' . $addon . '.php'); + if (function_exists($addon . '_load')) { + $func = $addon . '_load'; + try { + $func(); + } catch (Exception $e) { + self::ErrorHandler($addon, "Unable to load.", "FAILED loading : ".$e->getMessage(), true); + return; + } + + // we can add the following with the previous SQL + // once most site tables have been updated. + // This way the system won't fall over dead during the update. + + if (file_exists('addon/' . $addon . '/.hidden')) { + q( + "update addon set hidden = 1 where name = '%s'", + dbesc($addon) + ); + } + return true; + } else { + logger("Addons: FAILED loading " . $addon . " (missing _load function)"); + return false; + } + } + + /** + * @brief Check if addon is installed. + * + * @param string $name + * @return bool + */ + + public static function is_installed($name) + { + $r = q( + "select aname from addon where aname = '%s' and installed = 1 limit 1", + dbesc($name) + ); + if ($r) { + return true; + } + + return false; + } + + + /** + * @brief Reload all updated plugins. + */ + public static function reload_all() + { + $addons = get_config('system', 'addon'); + if (strlen($addons)) { + $r = q("SELECT * FROM addon WHERE installed = 1"); + if (count($r)) { + $installed = $r; + } else { + $installed = []; + } + + $parr = explode(',', $addons); + + if (count($parr)) { + foreach ($parr as $pl) { + $pl = trim($pl); + + $fname = 'addon/' . $pl . '/' . $pl . '.php'; + + if (file_exists($fname)) { + $t = @filemtime($fname); + foreach ($installed as $i) { + if (($i['aname'] == $pl) && ($i['tstamp'] != $t)) { + logger('Reloading plugin: ' . $i['aname']); + @include_once($fname); + + if (function_exists($pl . '_unload')) { + $func = $pl . '_unload'; + try { + $func(); + } catch (Exception $e) { + self::ErrorHandler($addon, "", "UNLOAD FAILED (uninstalling) : ".$e->getMessage(), true); + continue; + } + } + if (function_exists($pl . '_load')) { + $func = $pl . '_load'; + try { + $func(); + } catch (Exception $e) { + self::ErrorHandler($addon, "", "LOAD FAILED (uninstalling): ".$e->getMessage(), true); + continue; + } + } + q( + "UPDATE addon SET tstamp = %d WHERE id = %d", + intval($t), + intval($i['id']) + ); + } + } + } + } + } + } + } + + + public static function list_installed() + { + + $r = q("select * from addon where installed = 1 order by aname asc"); + return(($r) ? ids_to_array($r, 'aname') : []); + } + + + /** + * @brief Get a list of non hidden addons. + * + * @return array + */ + public static function list_visible() + { + + $r = q("select * from addon where hidden = 0 order by aname asc"); + $x = (($r) ? ids_to_array($r, 'aname') : []); + $y = []; + if ($x) { + foreach ($x as $xv) { + if (is_dir('addon/' . $xv)) { + $y[] = $xv; + } + } + } + return $y; + } + + /** + * @brief Parse plugin comment in search of plugin infos. + * + * like + * \code + * * Name: Plugin + * * Description: A plugin which plugs in + * * Version: 1.2.3 + * * Author: John + * * Author: Jane + * * + *\endcode + * @param string $plugin the name of the plugin + * @return array with the plugin information + */ + public static function get_info($plugin) + { + + $info = null; + if (is_file("addon/$plugin/$plugin.yml")) { + $info = Infocon::from_file("addon/$plugin/$plugin.yml"); + } + elseif (is_file("addon/$plugin/$plugin.php")) { + $info = Infocon::from_c_comment("addon/$plugin/$plugin.php"); + } + return $info ? $info : [ 'name' => $plugin ] ; + } + + + public static function check_versions($info) + { + + if (! is_array($info)) { + return true; + } + + if (array_key_exists('minversion', $info) && $info['minversion']) { + if (! version_compare(STD_VERSION, trim($info['minversion']), '>=')) { + logger('minversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING); + return false; + } + } + if (array_key_exists('maxversion', $info) && $info['maxversion']) { + if (! version_compare(STD_VERSION, trim($info['maxversion']), '<')) { + logger('maxversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING); + return false; + } + } + if (array_key_exists('minphpversion', $info) && $info['minphpversion']) { + if (! version_compare(PHP_VERSION, trim($info['minphpversion']), '>=')) { + logger('minphpversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING); + return false; + } + } + + if (array_key_exists('requires', $info)) { + $arr = explode(',', $info['requires']); + $found = true; + if ($arr) { + foreach ($arr as $test) { + $test = trim($test); + if (! $test) { + continue; + } + if (strpos($test, '.')) { + $conf = explode('.', $test); + if (get_config(trim($conf[0]), trim($conf[1]))) { + return true; + } else { + return false; + } + } + if (! in_array($test, Addon::list_installed())) { + $found = false; + } + } + } + if (! $found) { + return false; + } + } + + return true; + } + +} \ No newline at end of file diff --git a/Code/Lib/Api_router.php b/Code/Lib/Api_router.php new file mode 100644 index 000000000..0a17928e1 --- /dev/null +++ b/Code/Lib/Api_router.php @@ -0,0 +1,34 @@ + $fn, 'auth' => $auth_required]; + } + + public static function find($path) + { + if (array_key_exists($path, self::$routes)) { + return self::$routes[$path]; + } + + $with_params = dirname($path) . '/[id]'; + + if (array_key_exists($with_params, self::$routes)) { + return self::$routes[$with_params]; + } + + return null; + } + + public static function dbg() + { + return self::$routes; + } +} diff --git a/Code/Lib/Apps.php b/Code/Lib/Apps.php new file mode 100644 index 000000000..65d3f0063 --- /dev/null +++ b/Code/Lib/Apps.php @@ -0,0 +1,1404 @@ + $v) { + if (strpos($v, 'http') === 0) { + if (!(local_channel() && strpos($v, z_root()) === 0)) { + $ret[$k] = zid($v); + } + } + } + + if (array_key_exists('desc', $ret)) { + $ret['desc'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['desc']); + } + if (array_key_exists('target', $ret)) { + $ret['target'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['target']); + } + if (array_key_exists('version', $ret)) { + $ret['version'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['version']); + } + if (array_key_exists('categories', $ret)) { + $ret['categories'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['categories']); + } + if (array_key_exists('requires', $ret)) { + $requires = explode(',', $ret['requires']); + foreach ($requires as $require) { + $require = trim(strtolower($require)); + $config = false; + + if (substr($require, 0, 7) == 'config:') { + $config = true; + $require = ltrim($require, 'config:'); + $require = explode('=', $require); + } + + switch ($require) { + case 'nologin': + if (local_channel()) { + unset($ret); + } + break; + case 'admin': + if (!is_site_admin()) { + unset($ret); + } + break; + case 'local_channel': + if (!local_channel()) { + unset($ret); + } + break; + case 'public_profile': + if (!Channel::is_public_profile()) { + unset($ret); + } + break; + case 'public_stream': + if (!can_view_public_stream()) { + unset($ret); + } + break; + case 'custom_role': + if (get_pconfig(local_channel(), 'system', 'permissions_role') !== 'custom') { + unset($ret); + } + break; + case 'observer': + if (!$observer) { + unset($ret); + } + break; + default: + if ($config) { + $unset = ((get_config('system', $require[0]) == $require[1]) ? false : true); + } else { + $unset = ((local_channel() && Features::enabled(local_channel(), $require)) ? false : true); + } + if ($unset) { + unset($ret); + } + break; + } + } + } + if (isset($ret)) { + if ($translate) { + self::translate_system_apps($ret); + } + return $ret; + } + return false; + } + + + public static function translate_system_apps(&$arr) + { + $apps = array( + 'Admin' => t('Site Admin'), + 'Apps' => t('Apps'), + 'Articles' => t('Articles'), + 'CalDAV' => t('CalDAV'), + 'CardDAV' => t('CardDAV'), + 'Cards' => t('Cards'), + 'Calendar' => t('Calendar'), + 'Categories' => t('Categories'), + 'Channel Home' => t('Channel Home'), + 'Channel Manager' => t('Channel Manager'), + 'Channel Sources' => t('Channel Sources'), + 'Chat' => t('Chat'), + 'Chatrooms' => t('Chatrooms'), + 'Clients' => t('Clients'), + 'Comment Control' => t('Comment Control'), + 'Connections' => t('Connections'), + 'Content Filter' => t('Content Filter'), + 'Content Import' => t('Content Import'), + 'Directory' => t('Directory'), + 'Drafts' => t('Drafts'), + 'Events' => t('Events'), + 'Expire Posts' => t('Expire Posts'), + 'Features' => t('Features'), + 'Files' => t('Files'), + 'Followlist' => t('Followlist'), + 'Friend Zoom' => t('Friend Zoom'), + 'Future Posting' => t('Future Posting'), + 'Gallery' => t('Gallery'), + 'Guest Pass' => t('Guest Pass'), + 'Help' => t('Help'), + 'Invite' => t('Invite'), + 'Language' => t('Language'), + 'Lists' => t('Lists'), + 'Login' => t('Login'), + 'Mail' => t('Mail'), + 'Markup' => t('Markup'), + 'Mood' => t('Mood'), + 'My Chatrooms' => t('My Chatrooms'), + 'No Comment' => t('No Comment'), + 'Notes' => t('Notes'), + 'Notifications' => t('Notifications'), + 'OAuth Apps Manager' => t('OAuth Apps Manager'), + 'OAuth2 Apps Manager' => t('OAuth2 Apps Manager'), + 'Order Apps' => t('Order Apps'), + 'PDL Editor' => t('PDL Editor'), + 'Permission Categories' => t('Permission Categories'), + 'Photos' => t('Photos'), + 'Photomap' => t('Photomap'), + 'Poke' => t('Poke'), + 'Post' => t('Post'), + 'Premium Channel' => t('Premium Channel'), + 'Probe' => t('Probe'), + 'Profile' => t('Profile'), + 'Profile Photo' => t('Profile Photo'), + 'Profiles' => t('Profiles'), + 'Public Stream' => t('Public Stream'), + 'Random Channel' => t('Random Channel'), + 'Remote Diagnostics' => t('Remote Diagnostics'), + 'Report Bug' => t('Report Bug'), + 'Roles' => t('Roles'), + 'Search' => t('Search'), + 'Secrets' => t('Secrets'), + 'Settings' => t('Settings'), + 'Sites' => t('Sites'), + 'Stream' => t('Stream'), + 'Stream Order' => t('Stream Order'), + 'Suggest' => t('Suggest'), + 'Suggest Channels' => t('Suggest Channels'), + 'Tagadelic' => t('Tagadelic'), + 'Tasks' => t('Tasks'), + 'View Bookmarks' => t('View Bookmarks'), + 'View Profile' => t('View Profile'), + 'Virtual Lists' => t('Virtual Lists'), + 'Webpages' => t('Webpages'), + 'Wiki' => t('Wiki'), + 'ZotPost' => t('ZotPost'), + ); + + if (array_key_exists('name', $arr)) { + if (array_key_exists($arr['name'], $apps)) { + $arr['name'] = $apps[$arr['name']]; + } + } else { + for ($x = 0; $x < count($arr); $x++) { + if (array_key_exists($arr[$x]['name'], $apps)) { + $arr[$x]['name'] = $apps[$arr[$x]['name']]; + } else { + // Try to guess by app name if not in list + $arr[$x]['name'] = t(trim($arr[$x]['name'])); + } + } + } + } + + + // papp is a portable app + + public static function app_render($papp, $mode = 'view') + { + + /** + * modes: + * view: normal mode for viewing an app via bbcode from a conversation or page + * provides install/update button if you're logged in locally + * install: like view but does not display app-bin options if they are present + * list: normal mode for viewing an app on the app page + * no buttons are shown + * edit: viewing the app page in editing mode provides a delete button + * nav: render apps for app-bin + */ + + $channel_id = local_channel(); + $sys_channel = Channel::is_system($channel_id); + + $installed = false; + + if (!$papp) { + return; + } + + if (!$papp['photo']) { + $papp['photo'] = 'icon:gear'; + } + + self::translate_system_apps($papp); + + if (isset($papp['plugin']) && trim($papp['plugin']) && (!Addon::is_installed(trim($papp['plugin'])))) { + return ''; + } + + $papp['papp'] = self::papp_encode($papp); + + // This will catch somebody clicking on a system "available" app that hasn't had the path macros replaced + // and they are allowed to see the app + + + if (strpos($papp['url'], '$baseurl') !== false || strpos($papp['url'], '$nick') !== false || strpos($papp['photo'], '$baseurl') !== false || strpos($papp['photo'], '$nick') !== false) { + $view_channel = $channel_id; + if (!$view_channel) { + $sys = Channel::get_system(); + $view_channel = $sys['channel_id']; + } + self::app_macros($view_channel, $papp); + } + + if (strpos($papp['url'], ',')) { + $urls = explode(',', $papp['url']); + $papp['url'] = trim($urls[0]); + $papp['settings_url'] = trim($urls[1]); + } + + if (!strstr($papp['url'], '://')) { + $papp['url'] = z_root() . ((strpos($papp['url'], '/') === 0) ? '' : '/') . $papp['url']; + } + + + foreach ($papp as $k => $v) { + if (strpos($v, 'http') === 0 && $k != 'papp') { + if (!($channel_id && strpos($v, z_root()) === 0)) { + $papp[$k] = zid($v); + } + } + if ($k === 'desc') { + $papp['desc'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $papp['desc']); + } + + if ($k === 'requires') { + $requires = explode(',', $v); + + foreach ($requires as $require) { + $require = trim(strtolower($require)); + $config = false; + + if (substr($require, 0, 7) == 'config:') { + $config = true; + $require = ltrim($require, 'config:'); + $require = explode('=', $require); + } + + switch ($require) { + case 'nologin': + if ($channel_id) { + return ''; + } + break; + case 'admin': + if (!(is_site_admin() || $sys_channel)) { + return ''; + } + break; + case 'local_channel': + if (!$channel_id) { + return ''; + } + break; + case 'public_profile': + if (!Channel::is_public_profile()) { + return ''; + } + break; + case 'public_stream': + if (!can_view_public_stream()) { + return ''; + } + break; + case 'custom_role': + if (get_pconfig($channel_id, 'system', 'permissions_role') != 'custom') { + return ''; + } + break; + case 'observer': + $observer = App::get_observer(); + if (!$observer) { + return ''; + } + break; + default: + if ($config) { + $unset = ((get_config('system', $require[0]) === $require[1]) ? false : true); + } else { + $unset = (($channel_id && Features::enabled($channnel_id, $require)) ? false : true); + } + if ($unset) { + return ''; + } + break; + } + } + } + } + + $hosturl = ''; + + if ($channel_id || $sys_channel) { + if (self::app_installed(($sys_channel) ? 0 : $channel_id, $papp)) { + $installed = true; + if ($mode === 'install') { + return ''; + } + } + $hosturl = z_root() . '/'; + } elseif (remote_channel()) { + $observer = App::get_observer(); + if ($observer && in_array($observer['xchan_network'],['nomad','zot6'])) { + // some folks might have xchan_url redirected offsite, use the connurl + $x = parse_url($observer['xchan_connurl']); + if ($x) { + $hosturl = $x['scheme'] . '://' . $x['host'] . '/'; + } + } + } + + $install_action = (($installed) ? t('Installed') : t('Install')); + $icon = ((strpos($papp['photo'], 'icon:') === 0) ? substr($papp['photo'], 5) : ''); + + if ($mode === 'navbar') { + return replace_macros(Theme::get_template('app_nav.tpl'), [ + '$app' => $papp, + '$icon' => $icon, + ]); + } + + if ($mode === 'install') { + $papp['embed'] = true; + } + + $featured = $pinned = false; + if (isset($papp['categories'])) { + $featured = ((strpos($papp['categories'], 'nav_featured_app') !== false) ? true : false); + $pinned = ((strpos($papp['categories'], 'nav_pinned_app') !== false) ? true : false); + } + + return replace_macros(Theme::get_template('app.tpl'), [ + '$app' => $papp, + '$icon' => $icon, + '$hosturl' => $hosturl, + '$purchase' => ((isset($papp['page']) && $papp['page'] && (!$installed)) ? t('Purchase') : ''), + '$installed' => $installed, + '$action_label' => (($hosturl && in_array($mode, ['view', 'install'])) ? $install_action : ''), + '$edit' => (($channel_id && $installed && $mode === 'edit') ? t('Edit') : ''), + '$delete' => (($channel_id && $installed && $mode === 'edit') ? t('Delete') : ''), + '$undelete' => (($channel_id && $installed && $mode === 'edit') ? t('Undelete') : ''), + '$settings_url' => (($channel_id && $installed && $mode === 'list' && isset($papp['settings_url'])) ? $papp['settings_url'] : ''), + '$deleted' => ((isset($papp['deleted'])) ? intval($papp['deleted']) : false), + '$feature' => (((isset($papp['embed']) && $papp['embed']) || $mode === 'edit') ? false : true), + '$pin' => (((isset($papp['embed']) && $papp['embed']) || $mode === 'edit') ? false : true), + '$featured' => $featured, + '$pinned' => $pinned, + '$navapps' => (($mode === 'nav') ? true : false), + '$order' => (($mode === 'nav-order' || $mode === 'nav-order-pinned') ? true : false), + '$mode' => $mode, + '$add' => t('Add to app-tray'), + '$remove' => t('Remove from app-tray'), + '$add_nav' => t('Pin to navbar'), + '$remove_nav' => t('Unpin from navbar') + ]); + } + + public static function app_install($uid, $app) + { + + if (!is_array($app)) { + $r = q( + "select * from app where app_name = '%s' and app_channel = 0", + dbesc($app) + ); + if (!$r) { + return false; + } + + $app = self::app_encode($r[0]); + } + + $app['uid'] = $uid; + + if (self::app_installed($uid, $app, true)) { + // preserve the existing deleted status across app updates + if (isset($app['guid'])) { + $check = q("select * from app where app_id = '%s' and app_channel = %d", + dbesc($app['guid']), + intval($uid) + ); + if ($check) { + $app['deleted'] = intval($check[0]['app_deleted']); + } + } + $x = self::app_update($app); + } else { + $x = self::app_store($app); + } + + if ($x['success']) { + $r = q( + "select * from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($x['app_id']), + intval($uid) + ); + if ($r) { + if (($app['uid']) && (!$r[0]['app_system'])) { + if ($app['categories'] && (!$app['term'])) { + $r[0]['term'] = q( + "select * from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($r[0]['id']) + ); + if (intval($r[0]['app_system'])) { + Libsync::build_sync_packet($uid, array('sysapp' => $r[0])); + } else { + Libsync::build_sync_packet($uid, array('app' => $r[0])); + } + } + } + } + return $x['app_id']; + } + return false; + } + + + public static function can_delete($uid, $app) + { + // $uid 0 cannot delete, only archive + + if (!$uid) { + return false; + } + + $base_apps = self::get_base_apps(); + if ($base_apps) { + foreach ($base_apps as $b) { + if ($app['guid'] === hash('whirlpool', $b)) { + return false; + } + } + } + return true; + } + + + public static function app_destroy($uid, $app) + { + + if ($app['guid']) { + $x = q( + "select * from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($app['guid']), + intval($target_uid) + ); + if ($x) { + if (!intval($x[0]['app_deleted'])) { + $x[0]['app_deleted'] = 1; + if (self::can_delete($uid, $app)) { + $r = q( + "delete from app where app_id = '%s' and app_channel = %d", + dbesc($app['guid']), + intval($uid) + ); + q( + "delete from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($x[0]['id']) + ); + Hook::call('app_destroy', $x[0]); + } else { + $r = q( + "update app set app_deleted = 1 where app_id = '%s' and app_channel = %d", + dbesc($app['guid']), + intval($target_uid) + ); + } + if ($uid) { + if (intval($x[0]['app_system'])) { + Libsync::build_sync_packet($uid, array('sysapp' => $x)); + } else { + Libsync::build_sync_packet($uid, array('app' => $x)); + } + } + } else { + self::app_undestroy($uid, $app); + } + } + } + } + + public static function app_undestroy($uid, $app) + { + + // undelete a system app + + if ($app['guid']) { + $x = q( + "select * from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($app['guid']), + intval($uid) + ); + if ($x) { + if ($x[0]['app_system']) { + $r = q( + "update app set app_deleted = 0 where app_id = '%s' and app_channel = %d", + dbesc($app['guid']), + intval($uid) + ); + } + } + } + } + + public static function app_feature($uid, $app, $term) + { + $r = q( + "select id from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($app['guid']), + intval($uid) + ); + + $x = q( + "select * from term where otype = %d and oid = %d and term = '%s' limit 1", + intval(TERM_OBJ_APP), + intval($r[0]['id']), + dbesc($term) + ); + + if ($x) { + q( + "delete from term where otype = %d and oid = %d and term = '%s'", + intval(TERM_OBJ_APP), + intval($x[0]['oid']), + dbesc($term) + ); + } else { + store_item_tag($uid, $r[0]['id'], TERM_OBJ_APP, TERM_CATEGORY, $term, escape_tags(z_root() . '/apps/?f=&cat=' . $term)); + } + } + + public static function app_installed($uid, $app, $bypass_filter = false) + { + $r = q( + "select id from app where app_id = '%s' and app_channel = %d limit 1", + dbesc((array_key_exists('guid', $app)) ? $app['guid'] : ''), + intval($uid) + ); + if (!$bypass_filter) { + $filter_arr = [ + 'uid' => $uid, + 'app' => $app, + 'installed' => $r + ]; + Hook::call('app_installed_filter', $filter_arr); + $r = $filter_arr['installed']; + } + + return (($r) ? true : false); + } + + public static function addon_app_installed($uid, $app, $bypass_filter = false) + { + + $r = q( + "select id from app where app_plugin = '%s' and app_channel = %d limit 1", + dbesc($app), + intval($uid) + ); + if (!$bypass_filter) { + $filter_arr = [ + 'uid' => $uid, + 'app' => $app, + 'installed' => $r + ]; + Hook::call('addon_app_installed_filter', $filter_arr); + $r = $filter_arr['installed']; + } + + return (($r) ? true : false); + } + + public static function system_app_installed($uid, $app, $bypass_filter = false) + { + + $r = q( + "select id from app where app_id = '%s' and app_channel = %d and app_deleted = 0 limit 1", + dbesc(hash('whirlpool', $app)), + intval($uid) + ); + if (!$bypass_filter) { + $filter_arr = [ + 'uid' => $uid, + 'app' => $app, + 'installed' => $r + ]; + Hook::call('system_app_installed_filter', $filter_arr); + $r = $filter_arr['installed']; + } + + return (($r) ? true : false); + } + + public static function app_list($uid, $deleted = false, $cats = []) + { + if ($deleted) { + $sql_extra = ""; + } else { + $sql_extra = " and app_deleted = 0 "; + } + if ($cats) { + $cat_sql_extra = " and ( "; + + foreach ($cats as $cat) { + if (strpos($cat_sql_extra, 'term')) { + $cat_sql_extra .= "or "; + } + + $cat_sql_extra .= "term = '" . dbesc($cat) . "' "; + } + + $cat_sql_extra .= ") "; + + $r = q( + "select oid from term where otype = %d $cat_sql_extra", + intval(TERM_OBJ_APP) + ); + if (!$r) { + return $r; + } + $sql_extra .= " and app.id in ( " . array_elm_to_str($r, 'oid') . ') '; + } + + $r = q( + "select * from app where app_channel = %d $sql_extra order by app_name asc", + intval($uid) + ); + + if ($r) { + $hookinfo = ['uid' => $uid, 'deleted' => $deleted, 'cats' => $cats, 'apps' => $r]; + Hook::call('app_list', $hookinfo); + $r = $hookinfo['apps']; + for ($x = 0; $x < count($r); $x++) { + if (!$r[$x]['app_system']) { + $r[$x]['type'] = 'personal'; + } + $r[$x]['term'] = q( + "select * from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($r[$x]['id']) + ); + } + } + + return ($r); + } + + + public static function app_search_available($str) + { + + // not yet finished + // somehow need to account for translations + + $r = q( + "select * from app where app_channel = 0 $sql_extra order by app_name asc", + intval($uid) + ); + + return ($r); + } + + + public static function app_order($uid, $apps, $menu) + { + + if (!$apps) { + return $apps; + } + + $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order'); + + $x = (($uid) ? get_pconfig($uid, 'system', $conf) : get_config('system', $conf)); + if (($x) && (!is_array($x))) { + $y = explode(',', $x); + $y = array_map('trim', $y); + $x = $y; + } + + if (!(is_array($x) && ($x))) { + return $apps; + } + + $ret = []; + foreach ($x as $xx) { + $y = self::find_app_in_array($xx, $apps); + if ($y) { + $ret[] = $y; + } + } + foreach ($apps as $ap) { + if (!self::find_app_in_array($ap['name'], $ret)) { + $ret[] = $ap; + } + } + return $ret; + } + + public static function find_app_in_array($name, $arr) + { + if (!$arr) { + return false; + } + foreach ($arr as $x) { + if ($x['name'] === $name) { + return $x; + } + } + return false; + } + + public static function moveup($uid, $guid, $menu) + { + $syslist = []; + + $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order'); + + $list = self::app_list($uid, false, [$menu]); + if ($list) { + foreach ($list as $li) { + $papp = self::app_encode($li); + $syslist[] = $papp; + } + } + self::translate_system_apps($syslist); + + usort($syslist, 'self::app_name_compare'); + + $syslist = self::app_order($uid, $syslist, $menu); + + if (!$syslist) { + return; + } + + $newlist = []; + + foreach ($syslist as $k => $li) { + if ($li['guid'] === $guid) { + $position = $k; + break; + } + } + if (!$position) { + return; + } + $dest_position = $position - 1; + $saved = $syslist[$dest_position]; + $syslist[$dest_position] = $syslist[$position]; + $syslist[$position] = $saved; + + $narr = []; + foreach ($syslist as $x) { + $narr[] = $x['name']; + } + + set_pconfig($uid, 'system', $conf, implode(',', $narr)); + } + + public static function movedown($uid, $guid, $menu) + { + $syslist = []; + + $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order'); + + $list = self::app_list($uid, false, [$menu]); + if ($list) { + foreach ($list as $li) { + $papp = self::app_encode($li); + $syslist[] = $papp; + } + } + self::translate_system_apps($syslist); + + usort($syslist, 'self::app_name_compare'); + + $syslist = self::app_order($uid, $syslist, $menu); + + if (!$syslist) { + return; + } + + $newlist = []; + + foreach ($syslist as $k => $li) { + if ($li['guid'] === $guid) { + $position = $k; + break; + } + } + if ($position >= count($syslist) - 1) { + return; + } + $dest_position = $position + 1; + $saved = $syslist[$dest_position]; + $syslist[$dest_position] = $syslist[$position]; + $syslist[$position] = $saved; + + $narr = []; + foreach ($syslist as $x) { + $narr[] = $x['name']; + } + + set_pconfig($uid, 'system', $conf, implode(',', $narr)); + } + + public static function app_decode($s) + { + $x = base64_decode(str_replace(array('
', "\r", "\n", ' '), array('', '', '', ''), $s)); + return json_decode($x, true); + } + + + public static function app_macros($uid, &$arr) + { + + if (!intval($uid)) { + return; + } + + $baseurl = z_root(); + $channel = Channel::from_id($uid); + $address = (($channel) ? $channel['channel_address'] : ''); + + // future expansion + + $observer = App::get_observer(); + + $arr['url'] = str_replace(array('$baseurl', '$nick'), array($baseurl, $address), $arr['url']); + $arr['photo'] = str_replace(array('$baseurl', '$nick'), array($baseurl, $address), $arr['photo']); + } + + + public static function app_store($arr) + { + + // logger('app_store: ' . print_r($arr,true)); + + $darray = []; + $ret = ['success' => false]; + + $sys = Channel::get_system(); + + self::app_macros($arr['uid'], $arr); + + $darray['app_url'] = ((x($arr, 'url')) ? $arr['url'] : ''); + $darray['app_channel'] = ((x($arr, 'uid')) ? $arr['uid'] : 0); + + if (!$darray['app_url']) { + return $ret; + } + + if ((!$arr['uid']) && (!$arr['author'])) { + $arr['author'] = $sys['channel_hash']; + } + + if ($arr['photo'] && (strpos($arr['photo'], 'icon:') === false) && (strpos($arr['photo'], z_root()) === false)) { + $x = import_remote_xchan_photo(str_replace('$baseurl', z_root(), $arr['photo']), get_observer_hash(), true); + if ((!$x) || ($x[4])) { + // $x[4] = true indicates storage failure of our cached/resized copy. If this failed, just keep the original url. + $arr['photo'] = $x[1]; + } + } + + + $darray['app_id'] = ((x($arr, 'guid')) ? $arr['guid'] : random_string() . '.' . App::get_hostname()); + $darray['app_sig'] = ((x($arr, 'sig')) ? $arr['sig'] : ''); + $darray['app_author'] = ((x($arr, 'author')) ? $arr['author'] : get_observer_hash()); + $darray['app_name'] = ((x($arr, 'name')) ? escape_tags($arr['name']) : t('Unknown')); + $darray['app_desc'] = ((x($arr, 'desc')) ? escape_tags($arr['desc']) : ''); + $darray['app_photo'] = ((x($arr, 'photo')) ? $arr['photo'] : z_root() . '/' . Channel::get_default_profile_photo(80)); + $darray['app_version'] = ((x($arr, 'version')) ? escape_tags($arr['version']) : ''); + $darray['app_addr'] = ((x($arr, 'addr')) ? escape_tags($arr['addr']) : ''); + $darray['app_price'] = ((x($arr, 'price')) ? escape_tags($arr['price']) : ''); + $darray['app_page'] = ((x($arr, 'page')) ? escape_tags($arr['page']) : ''); + $darray['app_plugin'] = ((x($arr, 'plugin')) ? escape_tags(trim($arr['plugin'])) : ''); + $darray['app_requires'] = ((x($arr, 'requires')) ? escape_tags($arr['requires']) : ''); + $darray['app_system'] = ((x($arr, 'system')) ? intval($arr['system']) : 0); + $darray['app_deleted'] = ((x($arr, 'deleted')) ? intval($arr['deleted']) : 0); + $darray['app_options'] = ((x($arr, 'options')) ? intval($arr['options']) : 0); + + $created = datetime_convert(); + + $r = q( + "insert into app ( app_id, app_sig, app_author, app_name, app_desc, app_url, app_photo, app_version, app_channel, app_addr, app_price, app_page, app_requires, app_created, app_edited, app_system, app_plugin, app_deleted, app_options ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d )", + dbesc($darray['app_id']), + dbesc($darray['app_sig']), + dbesc($darray['app_author']), + dbesc($darray['app_name']), + dbesc($darray['app_desc']), + dbesc($darray['app_url']), + dbesc($darray['app_photo']), + dbesc($darray['app_version']), + intval($darray['app_channel']), + dbesc($darray['app_addr']), + dbesc($darray['app_price']), + dbesc($darray['app_page']), + dbesc($darray['app_requires']), + dbesc($created), + dbesc($created), + intval($darray['app_system']), + dbesc($darray['app_plugin']), + intval($darray['app_deleted']), + intval($darray['app_options']) + ); + + if ($r) { + $ret['success'] = true; + $ret['app_id'] = $darray['app_id']; + } + + if ($arr['categories']) { + $x = q( + "select id from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($darray['app_id']), + intval($darray['app_channel']) + ); + $y = explode(',', $arr['categories']); + if ($y) { + foreach ($y as $t) { + $t = trim($t); + if ($t) { + store_item_tag($darray['app_channel'], $x[0]['id'], TERM_OBJ_APP, TERM_CATEGORY, escape_tags($t), escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t))); + } + } + } + } + + return $ret; + } + + + public static function app_update($arr) + { + + // logger('app_update: ' . print_r($arr,true)); + $darray = []; + $ret = ['success' => false]; + + self::app_macros($arr['uid'], $arr); + + + $darray['app_url'] = ((x($arr, 'url')) ? $arr['url'] : ''); + $darray['app_channel'] = ((x($arr, 'uid')) ? $arr['uid'] : 0); + $darray['app_id'] = ((x($arr, 'guid')) ? $arr['guid'] : 0); + + if ((!$darray['app_url']) || (!$darray['app_id'])) { + return $ret; + } + + if ($arr['photo'] && (strpos($arr['photo'], 'icon:') === false) && (strpos($arr['photo'], z_root()) === false)) { + $x = import_remote_xchan_photo(str_replace('$baseurl', z_root(), $arr['photo']), get_observer_hash(), true); + if ((!$x) || ($x[4])) { + // $x[4] = true indicates storage failure of our cached/resized copy. If this failed, just keep the original url. + $arr['photo'] = $x[1]; + } + } + + $darray['app_sig'] = ((x($arr, 'sig')) ? $arr['sig'] : ''); + $darray['app_author'] = ((x($arr, 'author')) ? $arr['author'] : get_observer_hash()); + $darray['app_name'] = ((x($arr, 'name')) ? escape_tags($arr['name']) : t('Unknown')); + $darray['app_desc'] = ((x($arr, 'desc')) ? escape_tags($arr['desc']) : ''); + $darray['app_photo'] = ((x($arr, 'photo')) ? $arr['photo'] : z_root() . '/' . Channel::get_default_profile_photo(80)); + $darray['app_version'] = ((x($arr, 'version')) ? escape_tags($arr['version']) : ''); + $darray['app_addr'] = ((x($arr, 'addr')) ? escape_tags($arr['addr']) : ''); + $darray['app_price'] = ((x($arr, 'price')) ? escape_tags($arr['price']) : ''); + $darray['app_page'] = ((x($arr, 'page')) ? escape_tags($arr['page']) : ''); + $darray['app_plugin'] = ((x($arr, 'plugin')) ? escape_tags(trim($arr['plugin'])) : ''); + $darray['app_requires'] = ((x($arr, 'requires')) ? escape_tags($arr['requires']) : ''); + $darray['app_system'] = ((x($arr, 'system')) ? intval($arr['system']) : 0); + $darray['app_deleted'] = ((x($arr, 'deleted')) ? intval($arr['deleted']) : 0); + $darray['app_options'] = ((x($arr, 'options')) ? intval($arr['options']) : 0); + + $edited = datetime_convert(); + + $r = q( + "update app set app_sig = '%s', app_author = '%s', app_name = '%s', app_desc = '%s', app_url = '%s', app_photo = '%s', app_version = '%s', app_addr = '%s', app_price = '%s', app_page = '%s', app_requires = '%s', app_edited = '%s', app_system = %d, app_plugin = '%s', app_deleted = %d, app_options = %d where app_id = '%s' and app_channel = %d", + dbesc($darray['app_sig']), + dbesc($darray['app_author']), + dbesc($darray['app_name']), + dbesc($darray['app_desc']), + dbesc($darray['app_url']), + dbesc($darray['app_photo']), + dbesc($darray['app_version']), + dbesc($darray['app_addr']), + dbesc($darray['app_price']), + dbesc($darray['app_page']), + dbesc($darray['app_requires']), + dbesc($edited), + intval($darray['app_system']), + dbesc($darray['app_plugin']), + intval($darray['app_deleted']), + intval($darray['app_options']), + dbesc($darray['app_id']), + intval($darray['app_channel']) + ); + if ($r) { + $ret['success'] = true; + $ret['app_id'] = $darray['app_id']; + } + + $x = q( + "select id from app where app_id = '%s' and app_channel = %d limit 1", + dbesc($darray['app_id']), + intval($darray['app_channel']) + ); + + // if updating an embed app and we don't have a 0 channel_id don't mess with any existing categories + + if (array_key_exists('embed', $arr) && intval($arr['embed']) && (intval($darray['app_channel']))) { + return $ret; + } + + if ($x) { + q( + "delete from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($x[0]['id']) + ); + if (isset($arr['categories']) && $arr['categories']) { + $y = explode(',', $arr['categories']); + if ($y) { + foreach ($y as $t) { + $t = trim($t); + if ($t) { + store_item_tag($darray['app_channel'], $x[0]['id'], TERM_OBJ_APP, TERM_CATEGORY, escape_tags($t), escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t))); + } + } + } + } + } + + return $ret; + } + + + public static function app_encode($app, $embed = false) + { + + $ret = []; + + $ret['type'] = 'personal'; + + if (isset($app['app_id']) && $app['app_id']) { + $ret['guid'] = $app['app_id']; + } + if (isset($app['app_sig']) && $app['app_sig']) { + $ret['sig'] = $app['app_sig']; + } + if (isset($app['app_author']) && $app['app_author']) { + $ret['author'] = $app['app_author']; + } + if (isset($app['app_name']) && $app['app_name']) { + $ret['name'] = $app['app_name']; + } + if (isset($app['app_desc']) && $app['app_desc']) { + $ret['desc'] = $app['app_desc']; + } + if (isset($app['app_url']) && $app['app_url']) { + $ret['url'] = $app['app_url']; + } + if (isset($app['app_photo']) && $app['app_photo']) { + $ret['photo'] = $app['app_photo']; + } + if (isset($app['app_icon']) && $app['app_icon']) { + $ret['icon'] = $app['app_icon']; + } + if (isset($app['app_version']) && $app['app_version']) { + $ret['version'] = $app['app_version']; + } + if (isset($app['app_addr']) && $app['app_addr']) { + $ret['addr'] = $app['app_addr']; + } + if (isset($app['app_price']) && $app['app_price']) { + $ret['price'] = $app['app_price']; + } + if (isset($app['app_page']) && $app['app_page']) { + $ret['page'] = $app['app_page']; + } + if (isset($app['app_requires']) && $app['app_requires']) { + $ret['requires'] = $app['app_requires']; + } + if (isset($app['app_system']) && $app['app_system']) { + $ret['system'] = $app['app_system']; + } + if (isset($app['app_options']) && $app['app_options']) { + $ret['options'] = $app['app_options']; + } + if (isset($app['app_plugin']) && $app['app_plugin']) { + $ret['plugin'] = trim($app['app_plugin']); + } + if (isset($app['app_deleted']) && $app['app_deleted']) { + $ret['deleted'] = $app['app_deleted']; + } + if (isset($app['term']) && $app['term']) { + $ret['categories'] = array_elm_to_str($app['term'], 'term'); + } + + + if (!$embed) { + return $ret; + } + $ret['embed'] = true; + + if (array_key_exists('categories', $ret)) { + unset($ret['categories']); + } + + $j = json_encode($ret); + return '[app]' . chunk_split(base64_encode($j), 72, "\n") . '[/app]'; + } + + + public static function papp_encode($papp) + { + return chunk_split(base64_encode(json_encode($papp)), 72, "\n"); + } +} diff --git a/Code/Lib/Cache.php b/Code/Lib/Cache.php new file mode 100644 index 000000000..fb35158f3 --- /dev/null +++ b/Code/Lib/Cache.php @@ -0,0 +1,63 @@ + 191) { + return t('Name too long'); + } + + $arr = ['name' => $name]; + /** + * @hooks validate_channelname + * Used to validate the names used by a channel. + * * \e string \b name + * * \e string \b message - return error message + */ + Hook::call('validate_channelname', $arr); + + if (x($arr, 'message')) { + return $arr['message']; + } + } + + + /** + * @brief Create a system channel - which has no account attached. + * + */ + public static function create_system() + { + + // Ensure that there is a host keypair. + + if ((! get_config('system', 'pubkey')) || (! get_config('system', 'prvkey'))) { + $hostkey = Crypto::new_keypair(4096); + set_config('system', 'pubkey', $hostkey['pubkey']); + set_config('system', 'prvkey', $hostkey['prvkey']); + } + + $sys = self::get_system(); + + if ($sys) { + if (isset($sys['channel_pubkey']) && $sys['channel_pubkey'] === get_config('system', 'pubkey')) { + return; + } else { + // upgrade the sys channel and return + $pubkey = get_config('system', 'pubkey'); + $prvkey = get_config('system', 'prvkey'); + $guid_sig = Libzot::sign($sys['channel_guid'], $prvkey); + $hash = Libzot::make_xchan_hash($sys['channel_guid'], $pubkey); + + q( + "update channel set channel_guid_sig = '%s', channel_hash = '%s', channel_pubkey = '%s', channel_prvkey = '%s' where channel_id = %d", + dbesc($guid_sig), + dbesc($hash), + dbesc($pubkey), + dbesc($prvkey), + dbesc($sys['channel_id']) + ); + + q( + "update xchan set xchan_guid_sig = '%s', xchan_hash = '%s', xchan_pubkey = '%s', xchan_url = '%s' where xchan_hash = '%s'", + dbesc($guid_sig), + dbesc($hash), + dbesc($pubkey), + dbesc(z_root()), + dbesc($sys['channel_hash']) + ); + q( + "update hubloc set hubloc_guid_sig = '%s', hubloc_hash = '%s', hubloc_id_url = '%s', hubloc_url_sig = '%s', hubloc_url = '%s', hubloc_callback = '%s', hubloc_site_id = '%s', hubloc_orphancheck = 0, hubloc_error = 0, hubloc_deleted = 0 where hubloc_hash = '%s'", + dbesc($guid_sig), + dbesc($hash), + dbesc(z_root()), + dbesc(Libzot::sign(z_root(), $prvkey)), + dbesc(z_root()), + dbesc(z_root() . '/zot'), + dbesc(Libzot::make_xchan_hash(z_root(), $pubkey)), + dbesc($sys['channel_hash']) + ); + + q( + "update abook set abook_xchan = '%s' where abook_xchan = '%s'", + dbesc($hash), + dbesc($sys['channel_hash']) + ); + + q( + "update abconfig set xchan = '%s' where xchan = '%s'", + dbesc($hash), + dbesc($sys['channel_hash']) + ); + + return; + } + } + + self::create([ + 'account_id' => 'xxx', // Typecast trickery: account_id is required. This will create an identity with an (integer) account_id of 0 + 'nickname' => 'sys', + 'name' => 'System', + 'permissions_role' => 'social', + 'pageflags' => 0, + 'publish' => 0, + 'system' => 1 + ]); + } + + + /** + * @brief Returns the sys channel. + * + * @return array|bool + */ + public static function get_system() + { + + // App::$sys_channel caches this lookup + + if (is_array(App::$sys_channel)) { + return App::$sys_channel; + } + + $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_system = 1 limit 1"); + + if ($r) { + App::$sys_channel = array_shift($r); + return App::$sys_channel; + } + return false; + } + + + /** + * @brief Checks if $channel_id is sys channel. + * + * @param int $channel_id + * @return bool + */ + public static function is_system($channel_id) + { + $s = self::get_system(); + if ($s) { + return (intval($s['channel_id']) === intval($channel_id)); + } + return false; + } + + + /** + * @brief Return the total number of channels on this site. + * + * No filtering is performed except to check PAGE_REMOVED. + * + * @returns int|booleean + * on error returns boolean false + */ + public static function channel_total() + { + $r = q("select channel_id from channel where channel_removed = 0"); + + if (is_array($r)) { + return count($r); + } + + return false; + } + + + /** + * @brief Create a new channel. + * + * Also creates the related xchan, hubloc, profile, and "self" abook records, + * and an empty "Friends" group/collection for the new channel. + * + * @param array $arr associative array with: + * * \e string \b name full name of channel + * * \e string \b nickname "email/url-compliant" nickname + * * \e int \b account_id to attach with this channel + * * [other identity fields as desired] + * + * @returns array + * 'success' => boolean true or false + * 'message' => optional error text if success is false + * 'channel' => if successful the created channel array + */ + public static function create($arr) + { + + $ret = array('success' => false); + + if (! $arr['account_id']) { + $ret['message'] = t('No account identifier'); + return $ret; + } + $ret = ServiceClass::identity_check_service_class($arr['account_id']); + if (!$ret['success']) { + return $ret; + } + // save this for auto_friending + $total_identities = $ret['total_identities']; + + $nick = mb_strtolower(trim($arr['nickname'])); + if (! $nick) { + $ret['message'] = t('Nickname is required.'); + return $ret; + } + + $name = escape_tags($arr['name']); + $pageflags = ((x($arr, 'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL); + $system = ((x($arr, 'system')) ? intval($arr['system']) : 0); + $name_error = self::validate_channelname($arr['name']); + if ($name_error) { + $ret['message'] = $name_error; + return $ret; + } + + if ($nick === 'sys' && (! $system)) { + $ret['message'] = t('Reserved nickname. Please choose another.'); + return $ret; + } + + if (check_webbie(array($nick)) !== $nick) { + $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.'); + return $ret; + } + + $guid = Libzot::new_uid($nick); + + if ($system) { + $key = [ 'pubkey' => get_config('system', 'pubkey'), 'prvkey' => get_config('system', 'prvkey') ]; + } else { + $key = Crypto::new_keypair(4096); + } + + $sig = Libzot::sign($guid, $key['prvkey']); + $hash = Libzot::make_xchan_hash($guid, $key['pubkey']); + + // Force a few things on the short term until we can provide a theme or app with choice + + $publish = 1; + + if (array_key_exists('publish', $arr)) { + $publish = intval($arr['publish']); + } + + $role_permissions = null; + $parent_channel_hash = EMPTY_STR; + + if (array_key_exists('permissions_role', $arr) && $arr['permissions_role']) { + $role_permissions = PermissionRoles::role_perms($arr['permissions_role']); + if (isset($role_permissions['channel_type']) && $role_permissions['channel_type'] === 'collection') { + $parent_channel_hash = $arr['parent_hash']; + } + } + + if ($role_permissions && array_key_exists('directory_publish', $role_permissions)) { + $publish = intval($role_permissions['directory_publish']); + } + + $primary = true; + + if (array_key_exists('primary', $arr)) { + $primary = intval($arr['primary']); + } + + $expire = 0; + + $r = self::channel_store_lowlevel( + [ + 'channel_account_id' => intval($arr['account_id']), + 'channel_primary' => intval($primary), + 'channel_name' => $name, + 'channel_parent' => $parent_channel_hash, + 'channel_address' => $nick, + 'channel_guid' => $guid, + 'channel_guid_sig' => $sig, + 'channel_hash' => $hash, + 'channel_prvkey' => $key['prvkey'], + 'channel_pubkey' => $key['pubkey'], + 'channel_pageflags' => intval($pageflags), + 'channel_system' => intval($system), + 'channel_expire_days' => intval($expire), + 'channel_timezone' => App::$timezone + ] + ); + + $r = q( + "select * from channel where channel_account_id = %d + and channel_guid = '%s' limit 1", + intval($arr['account_id']), + dbesc($guid) + ); + + if (! $r) { + $ret['message'] = t('Unable to retrieve created identity'); + return $ret; + } + + $a = q( + "select * from account where account_id = %d", + intval($arr['account_id']) + ); + + $photo_type = null; + + $z = [ + 'account' => $a[0], + 'channel' => $r[0], + 'photo_url' => '' + ]; + /** + * @hooks create_channel_photo + * * \e array \b account + * * \e array \b channel + * * \e string \b photo_url - Return value + */ + Hook::call('create_channel_photo', $z); + + // The site channel gets the project logo as a profile photo. + if ($arr['account_id'] === 'xxx') { + $photo_type = import_channel_photo_from_url(z_root() . '/images/' . PLATFORM_NAME . '.png', 0, $r[0]['channel_id']); + } + elseif ($z['photo_url']) { + $photo_type = import_channel_photo_from_url($z['photo_url'], $arr['account_id'], $r[0]['channel_id']); + } + + if ($role_permissions && array_key_exists('limits', $role_permissions)) { + $perm_limits = $role_permissions['limits']; + } else { + $perm_limits = site_default_perms(); + } + + foreach ($perm_limits as $p => $v) { + PermissionLimits::Set($r[0]['channel_id'], $p, $v); + } + + if ($role_permissions && array_key_exists('perms_auto', $role_permissions)) { + set_pconfig($r[0]['channel_id'], 'system', 'autoperms', intval($role_permissions['perms_auto'])); + } + + $ret['channel'] = $r[0]; + + if (intval($arr['account_id'])) { + self::set_default($arr['account_id'], $ret['channel']['channel_id'], false); + } + + // Create a verified hub location pointing to this site. + + $r = hubloc_store_lowlevel( + [ + 'hubloc_guid' => $guid, + 'hubloc_guid_sig' => $sig, + 'hubloc_id_url' => (($system) ? z_root() : Channel::url($ret['channel'])), + 'hubloc_hash' => $hash, + 'hubloc_addr' => self::get_webfinger($ret['channel']), + 'hubloc_primary' => intval($primary), + 'hubloc_url' => z_root(), + 'hubloc_url_sig' => Libzot::sign(z_root(), $ret['channel']['channel_prvkey']), + 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')), + 'hubloc_host' => App::get_hostname(), + 'hubloc_callback' => z_root() . '/zot', + 'hubloc_sitekey' => get_config('system', 'pubkey'), + 'hubloc_network' => 'nomad', + 'hubloc_updated' => datetime_convert() + ] + ); + if (! $r) { + logger('Unable to store hub location'); + } + + $newuid = $ret['channel']['channel_id']; + + $r = xchan_store_lowlevel( + [ + 'xchan_hash' => $hash, + 'xchan_guid' => $guid, + 'xchan_guid_sig' => $sig, + 'xchan_pubkey' => $key['pubkey'], + 'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'), + 'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}", + 'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}", + 'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}", + 'xchan_addr' => self::get_webfinger($ret['channel']), + 'xchan_url' => (($system) ? z_root() : Channel::url($ret['channel'])), + 'xchan_follow' => z_root() . '/follow?f=&url=%s', + 'xchan_connurl' => z_root() . '/poco/' . $ret['channel']['channel_address'], + 'xchan_name' => $ret['channel']['channel_name'], + 'xchan_network' => 'nomad', + 'xchan_updated' => datetime_convert(), + 'xchan_photo_date' => datetime_convert(), + 'xchan_name_date' => datetime_convert(), + 'xchan_system' => $system + ] + ); + + // Not checking return value. + // It's ok for this to fail if it's an imported channel, and therefore the hash is a duplicate + + $r = self::profile_store_lowlevel( + [ + 'aid' => intval($ret['channel']['channel_account_id']), + 'uid' => intval($newuid), + 'profile_guid' => new_uuid(), + 'profile_name' => t('Default Profile'), + 'is_default' => 1, + 'publish' => $publish, + 'fullname' => $ret['channel']['channel_name'], + 'photo' => z_root() . "/photo/profile/l/{$newuid}", + 'thumb' => z_root() . "/photo/profile/m/{$newuid}" + ] + ); + + if ($role_permissions) { + $myperms = ((array_key_exists('perms_connect', $role_permissions)) ? $role_permissions['perms_connect'] : [] ); + } else { + $x = PermissionRoles::role_perms('social'); + $myperms = $x['perms_connect']; + } + + $r = abook_store_lowlevel( + [ + 'abook_account' => intval($ret['channel']['channel_account_id']), + 'abook_channel' => intval($newuid), + 'abook_xchan' => $hash, + 'abook_closeness' => 0, + 'abook_created' => datetime_convert(), + 'abook_updated' => datetime_convert(), + 'abook_self' => 1 + ] + ); + + + $x = Permissions::serialise(Permissions::FilledPerms($myperms)); + set_abconfig($newuid, $hash, 'system', 'my_perms', $x); + + if (intval($ret['channel']['channel_account_id'])) { + // Save our permissions role so we can perhaps call it up and modify it later. + + if ($role_permissions) { + set_pconfig($newuid, 'system', 'permissions_role', $arr['permissions_role']); + if (array_key_exists('online', $role_permissions)) { + set_pconfig($newuid, 'system', 'hide_presence', 1 - intval($role_permissions['online'])); + } + if (array_key_exists('perms_auto', $role_permissions)) { + $autoperms = intval($role_permissions['perms_auto']); + set_pconfig($newuid, 'system', 'autoperms', $autoperms); + } + } + + // Create a group with yourself as a member. This allows somebody to use it + // right away as a default group for new contacts. + + $group_hash = AccessList::add($newuid, t('Friends')); + if ($group_hash) { + AccessList::member_add($newuid, t('Friends'), $ret['channel']['channel_hash']); + + // if our role_permissions indicate that we're using a default collection ACL, add it. + + if (is_array($role_permissions) && $role_permissions['default_collection']) { + $default_collection_str = '<' . $group_hash . '>'; + } + q( + "update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d", + dbesc($group_hash), + dbesc(($default_collection_str) ? $default_collection_str : EMPTY_STR), + intval($newuid) + ); + } + + set_pconfig($ret['channel']['channel_id'], 'system', 'photo_path', '%Y/%Y-%m'); + set_pconfig($ret['channel']['channel_id'], 'system', 'attach_path', '%Y/%Y-%m'); + + // If this channel has a parent, auto follow them. + + if ($parent_channel_hash) { + $ch = self::from_hash($parent_channel_hash); + if ($ch) { + self::connect_and_sync($ret['channel'], self::get_webfinger($ch), true); + } + } + + // auto-follow any of the hub's pre-configured channel choices. + // Only do this if it's the first channel for this account; + // otherwise it could get annoying. Don't make this list too big + // or it will impact registration time. + + $accts = get_config('system', 'auto_follow'); + if (($accts) && (! $total_identities)) { + if (! is_array($accts)) { + $accts = array($accts); + } + + foreach ($accts as $acct) { + if (trim($acct)) { + $f = self::connect_and_sync($ret['channel'], trim($acct)); + if ($f['success']) { + $can_view_stream = their_perms_contains($ret['channel']['channel_id'], $f['abook']['abook_xchan'], 'view_stream'); + + // If we can view their stream, pull in some posts + + if (($can_view_stream) || ($f['abook']['xchan_network'] === 'rss')) { + Run::Summon([ 'Onepoll',$f['abook']['abook_id'] ]); + } + } + } + } + } + + /** + * @hooks create_identity + * Called when creating a channel. + * * \e int - The UID of the created identity + */ + + Hook::call('create_identity', $newuid); + + Run::Summon([ 'Directory', $ret['channel']['channel_id'] ]); + } + + $ret['success'] = true; + return $ret; + } + + + + public static function connect_and_sync($channel, $address, $sub_channel = false) + { + + if ((! $channel) || (! $address)) { + return false; + } + + $f = Connect::connect($channel, $address, $sub_channel); + if ($f['success']) { + $clone = []; + foreach ($f['abook'] as $k => $v) { + if (strpos($k, 'abook_') === 0) { + $clone[$k] = $v; + } + } + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']); + if ($abconfig) { + $clone['abconfig'] = $abconfig; + } + + Libsync::build_sync_packet($channel['channel_id'], [ 'abook' => [ $clone ] ], true); + return $f; + } + return false; + } + + + public static function change_channel_keys($channel) + { + + $ret = array('success' => false); + + $stored = []; + + $key = Crypto::new_keypair(4096); + + $sig = Libzot::sign($channel['channel_guid'], $key['prvkey']); + $hash = Libzot::make_xchan_hash($channel['channel_guid'], $channel['channel_pubkey']); + + $stored['old_guid'] = $channel['channel_guid']; + $stored['old_guid_sig'] = $channel['channel_guid_sig']; + $stored['old_key'] = $channel['channel_pubkey']; + $stored['old_hash'] = $channel['channel_hash']; + + $stored['new_key'] = $key['pubkey']; + $stored['new_sig'] = Libzot::sign($key['pubkey'], $channel['channel_prvkey']); + + // Save this info for the notifier to collect + + set_pconfig($channel['channel_id'], 'system', 'keychange', $stored); + + $r = q( + "update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s', channel_hash = '%s' where channel_id = %d", + dbesc($key['prvkey']), + dbesc($key['pubkey']), + dbesc($sig), + dbesc($hash), + intval($channel['channel_id']) + ); + if (! $r) { + return $ret; + } + + $r = q( + "select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); + + if (! $r) { + $ret['message'] = t('Unable to retrieve modified identity'); + return $ret; + } + + $modified = $r[0]; + + $h = q( + "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($stored['old_hash']), + dbesc(z_root()) + ); + + if ($h) { + foreach ($h as $hv) { + $hv['hubloc_guid_sig'] = $sig; + $hv['hubloc_hash'] = $hash; + $hv['hubloc_url_sig'] = Libzot::sign(z_root(), $modifed['channel_prvkey']); + hubloc_store_lowlevel($hv); + } + } + + $x = q( + "select * from xchan where xchan_hash = '%s' ", + dbesc($stored['old_hash']) + ); + + $check = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($hash) + ); + + if (($x) && (! $check)) { + $oldxchan = $x[0]; + foreach ($x as $xv) { + $xv['xchan_guid_sig'] = $sig; + $xv['xchan_hash'] = $hash; + $xv['xchan_pubkey'] = $key['pubkey']; + $xv['xchan_updated'] = datetime_convert(); + xchan_store_lowlevel($xv); + $newxchan = $xv; + } + } + + Libsync::build_sync_packet($channel['channel_id'], [ 'keychange' => $stored ]); + + $a = q( + "select * from abook where abook_xchan = '%s' and abook_self = 1", + dbesc($stored['old_hash']) + ); + + if ($a) { + q( + "update abook set abook_xchan = '%s' where abook_id = %d", + dbesc($hash), + intval($a[0]['abook_id']) + ); + } + + xchan_change_key($oldxchan, $newxchan, $stored); + + Run::Summon([ 'Notifier', 'keychange', $channel['channel_id'] ]); + + $ret['success'] = true; + return $ret; + } + + public static function change_address($channel, $new_address) + { + + $ret = array('success' => false); + + $old_address = $channel['channel_address']; + + if ($new_address === 'sys') { + $ret['message'] = t('Reserved nickname. Please choose another.'); + return $ret; + } + + if (check_webbie(array($new_address)) !== $new_address) { + $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.'); + return $ret; + } + + $r = q( + "update channel set channel_address = '%s' where channel_id = %d", + dbesc($new_address), + intval($channel['channel_id']) + ); + if (! $r) { + return $ret; + } + + $r = q( + "select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); + + if (! $r) { + $ret['message'] = t('Unable to retrieve modified identity'); + return $ret; + } + + $r = q( + "update xchan set xchan_addr = '%s' where xchan_hash = '%s'", + dbesc($new_address . '@' . App::get_hostname()), + dbesc($channel['channel_hash']) + ); + + $h = q( + "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($channel['channel_hash']), + dbesc(z_root()) + ); + + if ($h) { + foreach ($h as $hv) { + if ($hv['hubloc_primary']) { + q( + "update hubloc set hubloc_primary = 0 where hubloc_id = %d", + intval($hv['hubloc_id']) + ); + } + q( + "update hubloc set hubloc_deleted = 1 where hubloc_id = %d", + intval($hv['hubloc_id']) + ); + + unset($hv['hubloc_id']); + $hv['hubloc_addr'] = $new_address . '@' . App::get_hostname(); + hubloc_store_lowlevel($hv); + } + } + + // fix apps which were stored with the actual name rather than a macro + + $r = q( + "select * from app where app_channel = %d and app_system = 1", + intval($channel['channel_id']) + ); + if ($r) { + foreach ($r as $rv) { + $replace = preg_replace('/([\=\/])(' . $old_address . ')($|[\%\/])/ism', '$1' . $new_address . '$3', $rv['app_url']); + if ($replace != $rv['app_url']) { + q( + "update app set app_url = '%s' where id = %d", + dbesc($replace), + intval($rv['id']) + ); + } + } + } + + Run::Summon([ 'Notifier', 'refresh_all', $channel['channel_id'] ]); + + $ret['success'] = true; + return $ret; + } + + + /** + * @brief Set default channel to be used on login. + * + * @param int $account_id + * login account + * @param int $channel_id + * channel id to set as default for this account + * @param bool $force (optional) default true + * - if true, set this default unconditionally + * - if $force is false only do this if there is no existing default + */ + public static function set_default($account_id, $channel_id, $force = true) + { + $r = q( + "select account_default_channel from account where account_id = %d limit 1", + intval($account_id) + ); + if ($r) { + if ((intval($r[0]['account_default_channel']) == 0) || ($force)) { + $r = q( + "update account set account_default_channel = %d where account_id = %d", + intval($channel_id), + intval($account_id) + ); + } + } + } + + /** + * @brief Return an array with default list of sections to export. + * + * @return array with default section names to export + */ + public static function get_default_export_sections() + { + $sections = [ + 'channel', + 'connections', + 'config', + 'apps', + 'chatrooms', + 'events' + ]; + + $cb = [ 'sections' => $sections ]; + /** + * @hooks get_default_export_sections + * Called to get the default list of functional data groups to export in Channel::basic_export(). + * * \e array \b sections - return value + */ + Hook::call('get_default_export_sections', $cb); + + return $cb['sections']; + } + + + /** + * @brief Create an array representing the important channel information + * which would be necessary to create a nomadic identity clone. This includes + * most channel resources and connection information with the exception of content. + * + * @param int $channel_id + * Channel_id to export + * @param array $sections (optional) + * Which sections to include in the export, default see get_default_export_sections() + * @return array + * See function for details + */ + public static function basic_export($channel_id, $sections = null) + { + + /* + * basic channel export + */ + + if (! $sections) { + $sections = self::get_default_export_sections(); + } + + $ret = []; + + // use constants here as otherwise we will have no idea if we can import from a site + // with a non-standard platform and version. + + $ret['compatibility'] = [ + 'project' => PLATFORM_NAME, + 'codebase' => 'zap', + 'version' => STD_VERSION, + 'database' => DB_UPDATE_VERSION + ]; + + /* + * Process channel information regardless of it is one of the sections desired + * because we need the channel relocation information in all export files/streams. + */ + + $r = q( + "select * from channel where channel_id = %d limit 1", + intval($channel_id) + ); + if ($r) { + $ret['relocate'] = [ 'channel_address' => $r[0]['channel_address'], 'url' => z_root()]; + if (in_array('channel', $sections)) { + $ret['channel'] = $r[0]; + unset($ret['channel']['channel_password']); + unset($ret['channel']['channel_salt']); + } + } + + if (in_array('channel', $sections) || in_array('profile', $sections)) { + $r = q( + "select * from profile where uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['profile'] = $r; + } + + $r = q( + "select mimetype, content, os_storage from photo + where imgscale = 4 and photo_usage = %d and uid = %d limit 1", + intval(PHOTO_PROFILE), + intval($channel_id) + ); + + if ($r) { + $ret['photo'] = [ + 'type' => $r[0]['mimetype'], + 'data' => (($r[0]['os_storage']) + ? base64url_encode(file_get_contents($r[0]['content'])) : base64url_encode(dbunescbin($r[0]['content']))) + ]; + } + } + + if (in_array('connections', $sections)) { + $r = q( + "select * from atoken where atoken_uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['atoken'] = $r; + } + + $xchans = []; + $r = q( + "select * from abook where abook_channel = %d ", + intval($channel_id) + ); + if ($r) { + $ret['abook'] = $r; + + for ($x = 0; $x < count($ret['abook']); $x++) { + $xchans[] = $ret['abook'][$x]['abook_xchan']; + $abconfig = load_abconfig($channel_id, $ret['abook'][$x]['abook_xchan']); + if ($abconfig) { + $ret['abook'][$x]['abconfig'] = $abconfig; + } + } + stringify_array_elms($xchans); + } + + if ($xchans) { + $r = q("select * from xchan where xchan_hash in ( " . implode(',', $xchans) . " ) "); + if ($r) { + $ret['xchan'] = $r; + } + + $r = q("select * from hubloc where hubloc_hash in ( " . implode(',', $xchans) . " ) "); + if ($r) { + $ret['hubloc'] = $r; + } + } + + $r = q( + "select * from pgrp where uid = %d ", + intval($channel_id) + ); + + if ($r) { + $ret['group'] = $r; + } + + $r = q( + "select * from pgrp_member where uid = %d ", + intval($channel_id) + ); + if ($r) { + $ret['group_member'] = $r; + } + + $r = q( + "select * from xign where uid = %d ", + intval($channel_id) + ); + if ($r) { + $ret['xign'] = $r; + } + + $r = q( + "select * from block where block_channel_id = %d ", + intval($channel_id) + ); + if ($r) { + $ret['block'] = $r; + } + } + + if (in_array('config', $sections)) { + $r = q( + "select * from pconfig where uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['config'] = $r; + } + + // All other term types will be included in items, if requested. + + $r = q( + "select * from term where ttype in (%d,%d) and uid = %d", + intval(TERM_SAVEDSEARCH), + intval(TERM_THING), + intval($channel_id) + ); + if ($r) { + $ret['term'] = $r; + } + // add psuedo-column obj_baseurl to aid in relocations + + $r = q( + "select obj.*, '%s' as obj_baseurl from obj where obj_channel = %d", + dbesc(z_root()), + intval($channel_id) + ); + + if ($r) { + $ret['obj'] = $r; + } + + $r = q( + "select * from likes where channel_id = %d", + intval($channel_id) + ); + + if ($r) { + $ret['likes'] = $r; + } + } + + if (in_array('apps', $sections)) { + $r = q( + "select * from app where app_channel = %d and app_system = 0", + intval($channel_id) + ); + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['term'] = q( + "select * from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($r[$x]['id']) + ); + } + $ret['app'] = $r; + } + $r = q( + "select * from app where app_channel = %d and app_system = 1", + intval($channel_id) + ); + if ($r) { + for ($x = 0; $x < count($r); $x++) { + $r[$x]['term'] = q( + "select * from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($r[$x]['id']) + ); + } + $ret['sysapp'] = $r; + } + } + + if (in_array('chatrooms', $sections)) { + $r = q( + "select * from chatroom where cr_uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['chatroom'] = $r; + } + } + + if (in_array('events', $sections)) { + $r = q( + "select * from event where uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['event'] = $r; + } + + $r = q( + "select * from item where resource_type = 'event' and uid = %d", + intval($channel_id) + ); + if ($r) { + $ret['event_item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['event_item'][] = encode_item($rr, true); + } + } + } + + if (in_array('items', $sections)) { + /** @warning this may run into memory limits on smaller systems */ + + /** export three months of posts. If you want to export and import all posts you have to start with + * the first year and export/import them in ascending order. + * + * Don't export linked resource items. we'll have to pull those out separately. + */ + + $r = q( + "select * from item where item_wall = 1 and item_deleted = 0 and uid = %d + and created > %s - INTERVAL %s and resource_type = '' order by created", + intval($channel_id), + db_utcnow(), + db_quoteinterval('3 MONTH') + ); + if ($r) { + $ret['item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['item'][] = encode_item($rr, true); + } + } + } + + $addon = [ + 'channel_id' => $channel_id, + 'sections' => $sections, + 'data' => $ret + ]; + /** + * @hooks identity_basic_export + * Called when exporting a channel's basic information for backup or transfer. + * * \e number \b channel_id - The channel ID + * * \e array \b sections + * * \e array \b data - The data will get returned + */ + Hook::call('identity_basic_export', $addon); + $ret = $addon['data']; + + return $ret; + } + + /** + * @brief Export items for a year, or a month of a year. + * + * @param int $channel_id The channel ID + * @param number $year YYYY + * @param number $month (optional) 0-12, default 0 complete year + * @return array An associative array + * * \e array \b relocate - (optional) + * * \e array \b item - array with items encoded_item() + */ + public static function export_year($channel_id, $year, $month = 0) + { + + if (! $year) { + return []; + } + + if ($month && $month <= 12) { + $target_month = sprintf('%02d', $month); + $target_month_plus = sprintf('%02d', $month + 1); + } else { + $target_month = '01'; + } + + $mindate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month . '-01 00:00:00'); + if ($month && $month < 12) { + $maxdate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month_plus . '-01 00:00:00'); + } else { + $maxdate = datetime_convert('UTC', 'UTC', $year + 1 . '-01-01 00:00:00'); + } + + return self::export_items_date($channel_id, $mindate, $maxdate); + } + + /** + * @brief Export items within an arbitrary date range. + * + * Date/time is in UTC. + * + * @param int $channel_id The channel ID + * @param string $start + * @param string $finish + * @return array + */ + + public static function export_items_date($channel_id, $start, $finish) + { + + if (! $start) { + return []; + } else { + $start = datetime_convert('UTC', 'UTC', $start); + } + + $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now')); + if ($finish < $start) { + return []; + } + + $ret = []; + + $ch = self::from_id($channel_id); + if ($ch) { + $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()]; + } + + $ret['compatibility']['codebase'] = 'zap'; + + $r = q( + "select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created <= '%s' and resource_type = '' order by created", + intval(ITEM_TYPE_POST), + intval($channel_id), + dbesc($start), + dbesc($finish) + ); + + if ($r) { + $ret['item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['item'][] = encode_item($rr, true); + } + } + + return $ret; + } + + + + /** + * @brief Export items with pagination + * + * + * @param int $channel_id The channel ID + * @param int $page + * @param int $limit (default 50) + * @return array + */ + + public static function export_items_page($channel_id, $start, $finish, $page = 0, $limit = 50) + { + + if (intval($page) < 1) { + $page = 0; + } + + if (intval($limit) < 1) { + $limit = 1; + } + + if (intval($limit) > 5000) { + $limit = 5000; + } + + if (! $start) { + $start = NULL_DATE; + } else { + $start = datetime_convert('UTC', 'UTC', $start); + } + + $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now')); + if ($finish < $start) { + return []; + } + + $offset = intval($limit) * intval($page); + + $ret = []; + + $ch = self::from_id($channel_id); + if ($ch) { + $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()]; + } + + $ret['compatibility']['codebase'] = 'zap'; + + + $r = q( + "select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type = '' and created >= '%s' and created <= '%s' order by created limit %d offset %d", + intval(ITEM_TYPE_POST), + intval($channel_id), + dbesc($start), + dbesc($finish), + intval($limit), + intval($offset) + ); + + if ($r) { + $ret['item'] = []; + xchan_query($r); + $r = fetch_post_tags($r, true); + foreach ($r as $rr) { + $ret['item'][] = encode_item($rr, true); + } + } + + return $ret; + } + + + + public static function get_my_url() + { + if (x($_SESSION, 'zrl_override')) { + return $_SESSION['zrl_override']; + } + if (x($_SESSION, 'my_url')) { + return $_SESSION['my_url']; + } + + return false; + } + + public static function get_my_address() + { + if (x($_SESSION, 'zid_override')) { + return $_SESSION['zid_override']; + } + if (x($_SESSION, 'my_address')) { + return $_SESSION['my_address']; + } + + return false; + } + + /** + * @brief Add visitor's zid to our xchan and attempt authentication. + * + * If somebody arrives at our site using a zid, add their xchan to our DB if we + * don't have it already. + * And if they aren't already authenticated here, attempt reverse magic auth. + */ + public static function zid_init() + { + $tmp_str = self::get_my_address(); + if (validate_email($tmp_str)) { + $arr = [ + 'zid' => $tmp_str, + 'url' => App::$cmd + ]; + /** + * @hooks zid_init + * * \e string \b zid - their zid + * * \e string \b url - the destination url + */ + Hook::call('zid_init', $arr); + + if (! local_channel()) { + $r = q( + "select * from hubloc where hubloc_addr = '%s' order by hubloc_connected desc limit 1", + dbesc($tmp_str) + ); + if (! $r) { + Run::Summon([ 'Gprobe', bin2hex($tmp_str) ]); + } + if ($r && remote_channel() && remote_channel() === $r[0]['hubloc_hash']) { + return; + } + + logger('Not authenticated. Invoking reverse magic-auth for ' . $tmp_str); + // try to avoid recursion - but send them home to do a proper magic auth + $query = App::$query_string; + $query = str_replace(array('?zid=','&zid='), array('?rzid=','&rzid='), $query); + $dest = '/' . $query; + if ($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest, '/magic')) && (! strstr($dest, '/rmagic'))) { + goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&bdest=' . bin2hex(z_root() . $dest)); + } else { + logger('No hubloc found.'); + } + } + } + } + + /** + * @brief If somebody arrives at our site using a zat, authenticate them. + * + */ + public static function zat_init() + { + if (local_channel() || remote_channel()) { + return; + } + + $r = q( + "select * from atoken where atoken_token = '%s' limit 1", + dbesc($_REQUEST['zat']) + ); + if ($r) { + $xchan = atoken_xchan($r[0]); + atoken_login($xchan); + } + } + + public static function atoken_delete_and_sync($channel_id, $atoken_guid) + { + $r = q( + "select * from atoken where atoken_guid = '%s' and atoken_uid = %d", + dbesc($atoken_guid), + intval($channel_id) + ); + if ($r) { + $atok = array_shift($r); + $atok['deleted'] = true; + atoken_delete($atok['atoken_id']); + Libsync::build_sync_packet($channel_id, [ 'atoken' => [ $atok ] ]); + } + } + + /** + * @brief Used from within PCSS themes to set theme parameters. + * + * If there's a puid request variable, that is the "page owner" and normally + * their theme settings take precedence; unless a local user sets the "always_my_theme" + * system pconfig, which means they don't want to see anybody else's theme + * settings except their own while on this site. + * + * @return int + */ + public static function get_theme_uid() + { + $uid = ((isset($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); + if (local_channel()) { + if ((get_pconfig(local_channel(), 'system', 'always_my_theme')) || (! $uid)) { + return local_channel(); + } + } + if (! $uid) { + $x = self::get_system(); + if ($x) { + return $x['channel_id']; + } + } + + return $uid; + } + + /** + * @brief Retrieves the path of the default_profile_photo for this system + * with the specified size. + * + * @param int $size (optional) default 300 + * one of (300, 80, 48) + * @return string with path to profile photo + */ + public static function get_default_profile_photo($size = 300) + { + $scheme = get_config('system', 'default_profile_photo'); + if (! $scheme) { + $scheme = 'rainbow_man'; + } + + if (! is_dir('images/default_profile_photos/' . $scheme)) { + $x = [ 'scheme' => $scheme, 'size' => $size, 'url' => '' ]; + Hook::call('default_profile_photo', $x); + if ($x['url']) { + return $x['url']; + } else { + $scheme = 'rainbow_man'; + } + } + + return 'images/default_profile_photos/' . $scheme . '/' . $size . '.png'; + } + + /** + * @brief Test whether a given identity is NOT a member of the Hubzilla. + * + * @param string $s + * xchan_hash of the identity in question + * @return bool true or false + */ + public static function is_foreigner($s) + { + return((strpbrk($s, '.:@')) ? true : false); + } + + /** + * @brief Test whether a given identity is a member of the Hubzilla. + * + * @param string $s + * xchan_hash of the identity in question + * @return bool true or false + */ + public static function is_member($s) + { + return((self::is_foreigner($s)) ? false : true); + } + + /** + * @brief Get chatpresence status for nick. + * + * @param string $nick + * @return array An associative array with + * * \e bool \b result + */ + public static function get_online_status($nick) + { + + $ret = array('result' => false); + + if (observer_prohibited()) { + return $ret; + } + + $r = q( + "select channel_id, channel_hash from channel where channel_address = '%s' limit 1", + dbesc($nick) + ); + if ($r) { + $hide = get_pconfig($r[0]['channel_id'], 'system', 'hide_online_status'); + if ($hide) { + return $ret; + } + $x = q( + "select cp_status from chatpresence where cp_xchan = '%s' and cp_room = 0 limit 1", + dbesc($r[0]['channel_hash']) + ); + if ($x) { + $ret['result'] = $x[0]['cp_status']; + } + } + + return $ret; + } + + + /** + * @brief + * + * @param string $webbie + * @return array|bool|string + */ + public static function remote_online_status($webbie) + { + + $result = false; + $r = q( + "select * from hubloc where hubloc_addr = '%s' limit 1", + dbesc($webbie) + ); + if (! $r) { + return $result; + } + $url = $r[0]['hubloc_url'] . '/online/' . substr($webbie, 0, strpos($webbie, '@')); + + $x = z_fetch_url($url); + if ($x['success']) { + $j = json_decode($x['body'], true); + if ($j) { + $result = (($j['result']) ? $j['result'] : false); + } + } + + return $result; + } + + + /** + * @brief Return the parsed identity selector HTML template. + * + * @return string with parsed HTML channel_id_selet template + */ + public static function identity_selector() + { + if (local_channel()) { + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ", + intval(get_account_id()) + ); + if ($r && count($r) > 1) { + $o = replace_macros(Theme::get_template('channel_id_select.tpl'), array( + '$channels' => $r, + '$selected' => local_channel() + )); + + return $o; + } + } + + return ''; + } + + + public static function is_public_profile() + { + if (! local_channel()) { + return false; + } + + if (intval(get_config('system', 'block_public'))) { + return false; + } + + $channel = App::get_channel(); + if ($channel) { + $perm = PermissionLimits::Get($channel['channel_id'], 'view_profile'); + if ($perm == PERMS_PUBLIC) { + return true; + } + } + + return false; + } + + public static function get_profile_fields_basic($filter = 0) + { + + $profile_fields_basic = (($filter == 0) ? get_config('system', 'profile_fields_basic') : null); + + if (! $profile_fields_basic) { + $profile_fields_basic = array('fullname','pdesc','chandesc','basic_gender','pronouns','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact'); + } + + $x = []; + if ($profile_fields_basic) { + foreach ($profile_fields_basic as $f) { + $x[$f] = 1; + } + } + + return $x; + } + + + public static function get_profile_fields_advanced($filter = 0) + { + $basic = self::get_profile_fields_basic($filter); + $profile_fields_advanced = (($filter == 0) ? get_config('system', 'profile_fields_advanced') : null); + if (! $profile_fields_advanced) { + $profile_fields_advanced = array('comms', 'address','locality','postal_code','advanced_gender', 'partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education'); + } + $x = []; + if ($basic) { + foreach ($basic as $f => $v) { + $x[$f] = $v; + } + } + + if ($profile_fields_advanced) { + foreach ($profile_fields_advanced as $f) { + $x[$f] = 1; + } + } + + return $x; + } + + /** + * @brief Clear notifyflags for a channel. + * + * Most likely during bulk import of content or other activity that is likely + * to generate huge amounts of undesired notifications. + * + * @param int $channel_id + * The channel to disable notifications for + * @return int + * Current notification flag value. Send this to notifications_on() to restore the channel settings when finished + * with the activity requiring notifications_off(); + */ + public static function notifications_off($channel_id) + { + $r = q( + "select channel_notifyflags from channel where channel_id = %d limit 1", + intval($channel_id) + ); + q( + "update channel set channel_notifyflags = 0 where channel_id = %d", + intval($channel_id) + ); + + return intval($r[0]['channel_notifyflags']); + } + + + public static function notifications_on($channel_id, $value) + { + $x = q( + "update channel set channel_notifyflags = %d where channel_id = %d", + intval($value), + intval($channel_id) + ); + + return $x; + } + + + public static function get_default_perms($uid) + { + + $ret = []; + + $r = q( + "select abook_xchan from abook where abook_channel = %d and abook_self = 1 limit 1", + intval($uid) + ); + if ($r) { + $ret = Permissions::FilledPerms(get_abconfig($uid, $r[0]['abook_xchan'], 'system', 'my_perms', EMPTY_STR)); + } + + return $ret; + } + + + public static function profiles_build_sync($channel_id, $send = true) + { + $r = q( + "select * from profile where uid = %d", + intval($channel_id) + ); + if ($r) { + if ($send) { + Libsync::build_sync_packet($channel_id, array('profile' => $r)); + } else { + return $r; + } + } + } + + + public static function auto_create($account_id) + { + + if (! $account_id) { + return false; + } + + $arr = []; + $arr['account_id'] = $account_id; + $arr['name'] = get_aconfig($account_id, 'register', 'channel_name'); + $arr['nickname'] = legal_webbie(get_aconfig($account_id, 'register', 'channel_address')); + $arr['permissions_role'] = get_aconfig($account_id, 'register', 'permissions_role'); + + del_aconfig($account_id, 'register', 'channel_name'); + del_aconfig($account_id, 'register', 'channel_address'); + del_aconfig($account_id, 'register', 'permissions_role'); + + if ((! $arr['name']) || (! $arr['nickname'])) { + $x = q( + "select * from account where account_id = %d limit 1", + intval($account_id) + ); + if ($x) { + if (! $arr['name']) { + $arr['name'] = substr($x[0]['account_email'], 0, strpos($x[0]['account_email'], '@')); + } + if (! $arr['nickname']) { + $arr['nickname'] = legal_webbie(substr($x[0]['account_email'], 0, strpos($x[0]['account_email'], '@'))); + } + } + } + if (! $arr['permissions_role']) { + $arr['permissions_role'] = 'social'; + } + + if (self::validate_channelname($arr['name'])) { + return false; + } + if ($arr['nickname'] === 'sys') { + $arr['nickname'] = $arr['nickname'] . mt_rand(1000, 9999); + } + + $arr['nickname'] = check_webbie(array($arr['nickname'], $arr['nickname'] . mt_rand(1000, 9999))); + + return self::create($arr); + } + + public static function get_cover_photo($channel_id, $format = 'bbcode', $res = PHOTO_RES_COVER_1200) + { + + $r = q( + "select height, width, resource_id, edited, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d", + intval($channel_id), + intval($res), + intval(PHOTO_COVER) + ); + if (! $r) { + return false; + } + + $output = false; + + $url = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $res ; + + switch ($format) { + case 'bbcode': + $output = '[zrl=' . $r[0]['width'] . 'x' . $r[0]['height'] . ']' . $url . '[/zrl]'; + break; + case 'html': + $output = '' . t('cover photo') . ''; + break; + case 'array': + default: + $output = array( + 'width' => $r[0]['width'], + 'height' => $r[0]['height'], + 'type' => $r[0]['mimetype'], + 'updated' => $r[0]['edited'], + 'url' => $url + ); + break; + } + + return $output; + } + + + /** + * @brief Return parsed HTML zcard template. + * + * @param array $channel + * @param string $observer_hash (optional) + * @param array $args (optional) + * @return string parsed HTML from \e zcard template + */ + public static function get_zcard($channel, $observer_hash = '', $args = []) + { + + logger('get_zcard'); + + $maxwidth = (($args['width']) ? intval($args['width']) : 0); + $maxheight = (($args['height']) ? intval($args['height']) : 0); + + if (($maxwidth > 1200) || ($maxwidth < 1)) { + $maxwidth = 1200; + $cover_width = 1200; + } + + if ($maxwidth <= 425) { + $width = 425; + $cover_width = 425; + $size = 'hz_small'; + $cover_size = PHOTO_RES_COVER_425; + $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m'] . '?rev=' . strtotime($channel['xchan_photo_date'])); + } elseif ($maxwidth <= 900) { + $width = 900; + $cover_width = 850; + $size = 'hz_medium'; + $cover_size = PHOTO_RES_COVER_850; + $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 160 , 'height' => 160, 'href' => $channel['xchan_photo_l'] . '?rev=' . strtotime($channel['xchan_photo_date'])); + } elseif ($maxwidth <= 1200) { + $width = 1200; + $cover_width = 1200; + $size = 'hz_large'; + $cover_size = PHOTO_RES_COVER_1200; + $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l'] . '?rev=' . strtotime($channel['xchan_photo_date'])); + } + + // $scale = (float) $maxwidth / $width; + // $translate = intval(($scale / 1.0) * 100); + + $channel['channel_addr'] = self::get_webfinger($channel); + $zcard = array('chan' => $channel); + + $r = q( + "select height, width, resource_id, imgscale, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d", + intval($channel['channel_id']), + intval($cover_size), + intval(PHOTO_COVER) + ); + + if ($r) { + $cover = $r[0]; + $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; + } else { + $default_cover = get_config('system', 'default_cover_photo', 'pexels-94622'); + $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.jpg' ]; + } + + $o .= replace_macros(Theme::get_template('zcard.tpl'), array( + '$maxwidth' => $maxwidth, + '$scale' => $scale, + '$translate' => $translate, + '$size' => $size, + '$cover' => $cover, + '$pphoto' => $pphoto, + '$zcard' => $zcard + )); + + return $o; + } + + + /** + * @brief Return parsed HTML embed zcard template. + * + * @param array $channel + * @param string $observer_hash (optional) + * @param array $args (optional) + * @return string parsed HTML from \e zcard_embed template + */ + public static function get_zcard_embed($channel, $observer_hash = '', $args = []) + { + + logger('get_zcard_embed'); + + $maxwidth = (($args['width']) ? intval($args['width']) : 0); + $maxheight = (($args['height']) ? intval($args['height']) : 0); + + if (($maxwidth > 1200) || ($maxwidth < 1)) { + $maxwidth = 1200; + $cover_width = 1200; + } + + if ($maxwidth <= 425) { + $width = 425; + $cover_width = 425; + $size = 'hz_small'; + $cover_size = PHOTO_RES_COVER_425; + $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m']); + } elseif ($maxwidth <= 900) { + $width = 900; + $cover_width = 850; + $size = 'hz_medium'; + $cover_size = PHOTO_RES_COVER_850; + $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 160 , 'height' => 160, 'href' => $channel['xchan_photo_l']); + } elseif ($maxwidth <= 1200) { + $width = 1200; + $cover_width = 1200; + $size = 'hz_large'; + $cover_size = PHOTO_RES_COVER_1200; + $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l']); + } + + $channel['channel_addr'] = self::get_webfinger($channel); + $zcard = array('chan' => $channel); + + $r = q( + "select height, width, resource_id, imgscale, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d", + intval($channel['channel_id']), + intval($cover_size), + intval(PHOTO_COVER) + ); + + if ($r) { + $cover = $r[0]; + $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; + } else { + $default_cover = get_config('system', 'default_cover_photo', 'pexels-94622'); + $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.jpg' ]; + } + + $o .= replace_macros(Theme::get_template('zcard_embed.tpl'), array( + '$maxwidth' => $maxwidth, + '$scale' => $scale, + '$translate' => $translate, + '$size' => $size, + '$cover' => $cover, + '$pphoto' => $pphoto, + '$zcard' => $zcard + )); + + return $o; + } + + /** + * @brief Get a channel array from a channel nickname. + * + * @param string $nick - A channel_address nickname + * @return array|bool + * - array with channel entry + * - false if no channel with $nick was found + */ + + public static function from_username($nick, $include_removed = false) + { + + $sql_extra = (($include_removed) ? "" : " and channel_removed = 0 "); + + // If we are provided a Unicode nickname convert to IDN + + $nick = punify($nick); + + // return a cached copy if there is a cached copy and it's a match. + // Also check that there is an xchan_hash to validate the App::$channel data is complete + // and that columns from both joined tables are present + + if ( + App::$channel && is_array(App::$channel) && array_key_exists('channel_address', App::$channel) + && array_key_exists('xchan_hash', App::$channel) && App::$channel['channel_address'] === $nick + ) { + return App::$channel; + } + + $r = q( + "SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' $sql_extra LIMIT 1", + dbesc($nick) + ); + + return(($r) ? array_shift($r) : false); + } + + /** + * @brief Get a channel array by a channel_hash. + * + * @param string $hash + * @return array|bool false if channel ID not found, otherwise the channel array + */ + + public static function from_hash($hash, $include_removed = false) + { + + $sql_extra = (($include_removed) ? "" : " and channel_removed = 0 "); + + if ( + App::$channel && is_array(App::$channel) && array_key_exists('channel_hash', App::$channel) + && array_key_exists('xchan_hash', App::$channel) && App::$channel['channel_hash'] === $hash + ) { + return App::$channel; + } + + $r = q( + "SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_hash = '%s' $sql_extra LIMIT 1", + dbesc($hash) + ); + + return(($r) ? array_shift($r) : false); + } + + + /** + * @brief Get a channel array by a channel ID. + * + * @param int $id A channel ID + * @return array|bool false if channel ID not found, otherwise the channel array + */ + + public static function from_id($id, $include_removed = false) + { + + $sql_extra = (($include_removed) ? "" : " and channel_removed = 0 "); + + if ( + App::$channel && is_array(App::$channel) && array_key_exists('channel_id', App::$channel) + && array_key_exists('xchan_hash', App::$channel) && intval(App::$channel['channel_id']) === intval($id) + ) { + return App::$channel; + } + + $r = q( + "SELECT * FROM channel LEFT JOIN xchan ON channel_hash = xchan_hash WHERE channel_id = %d $sql_extra LIMIT 1", + dbesc($id) + ); + + return(($r) ? array_shift($r) : false); + } + + /** + * @brief + * + * @param array $channel + * @return string + */ + + public static function get_webfinger($channel) + { + if (! ($channel && array_key_exists('channel_address', $channel))) { + return ''; + } + + return strtolower($channel['channel_address'] . '@' . App::get_hostname()); + } + + + /** + * @brief Get manual channel conversation update config. + * + * Check the channel config \e manual_conversation_update, if not set fall back + * to global system config, defaults to 1 if nothing set. + * + * @param int $channel_id + * @return int + */ + + public static function manual_conv_update($channel_id) + { + + $x = get_pconfig($channel_id, 'system', 'manual_conversation_update', get_config('system', 'manual_conversation_update', 1)); + return intval($x); + } + + + /** + * @brief Return parsed HTML remote_login template. + * + * @return string with parsed HTML from \e remote_login template + */ + public static function remote_login() + { + $o = replace_macros(Theme::get_template('remote_login.tpl'), array( + '$title' => t('Remote Authentication'), + '$desc' => t('Enter your channel address (e.g. channel@example.com)'), + '$submit' => t('Authenticate') + )); + + return $o; + } + + public static function channel_store_lowlevel($arr) + { + $store = [ + 'channel_account_id' => ((array_key_exists('channel_account_id', $arr)) ? $arr['channel_account_id'] : '0'), + 'channel_primary' => ((array_key_exists('channel_primary', $arr)) ? $arr['channel_primary'] : '0'), + 'channel_name' => ((array_key_exists('channel_name', $arr)) ? $arr['channel_name'] : ''), + 'channel_parent' => ((array_key_exists('channel_parent', $arr)) ? $arr['channel_parent'] : ''), + 'channel_address' => ((array_key_exists('channel_address', $arr)) ? $arr['channel_address'] : ''), + 'channel_guid' => ((array_key_exists('channel_guid', $arr)) ? $arr['channel_guid'] : ''), + 'channel_guid_sig' => ((array_key_exists('channel_guid_sig', $arr)) ? $arr['channel_guid_sig'] : ''), + 'channel_hash' => ((array_key_exists('channel_hash', $arr)) ? $arr['channel_hash'] : ''), + 'channel_timezone' => ((array_key_exists('channel_timezone', $arr)) ? $arr['channel_timezone'] : 'UTC'), + 'channel_location' => ((array_key_exists('channel_location', $arr)) ? $arr['channel_location'] : ''), + 'channel_theme' => ((array_key_exists('channel_theme', $arr)) ? $arr['channel_theme'] : ''), + 'channel_startpage' => ((array_key_exists('channel_startpage', $arr)) ? $arr['channel_startpage'] : ''), + 'channel_pubkey' => ((array_key_exists('channel_pubkey', $arr)) ? $arr['channel_pubkey'] : ''), + 'channel_prvkey' => ((array_key_exists('channel_prvkey', $arr)) ? $arr['channel_prvkey'] : ''), + 'channel_notifyflags' => ((array_key_exists('channel_notifyflags', $arr)) ? $arr['channel_notifyflags'] : '65535'), + 'channel_pageflags' => ((array_key_exists('channel_pageflags', $arr)) ? $arr['channel_pageflags'] : '0'), + 'channel_dirdate' => ((array_key_exists('channel_dirdate', $arr)) ? $arr['channel_dirdate'] : NULL_DATE), + 'channel_lastpost' => ((array_key_exists('channel_lastpost', $arr)) ? $arr['channel_lastpost'] : NULL_DATE), + 'channel_deleted' => ((array_key_exists('channel_deleted', $arr)) ? $arr['channel_deleted'] : NULL_DATE), + 'channel_active' => ((array_key_exists('channel_active', $arr)) ? $arr['channel_active'] : NULL_DATE), + 'channel_max_anon_mail' => ((array_key_exists('channel_max_anon_mail', $arr)) ? $arr['channel_max_anon_mail'] : '10'), + 'channel_max_friend_req' => ((array_key_exists('channel_max_friend_req', $arr)) ? $arr['channel_max_friend_req'] : '10'), + 'channel_expire_days' => ((array_key_exists('channel_expire_days', $arr)) ? $arr['channel_expire_days'] : '0'), + 'channel_passwd_reset' => ((array_key_exists('channel_passwd_reset', $arr)) ? $arr['channel_passwd_reset'] : ''), + 'channel_default_group' => ((array_key_exists('channel_default_group', $arr)) ? $arr['channel_default_group'] : ''), + 'channel_allow_cid' => ((array_key_exists('channel_allow_cid', $arr)) ? $arr['channel_allow_cid'] : ''), + 'channel_allow_gid' => ((array_key_exists('channel_allow_gid', $arr)) ? $arr['channel_allow_gid'] : ''), + 'channel_deny_cid' => ((array_key_exists('channel_deny_cid', $arr)) ? $arr['channel_deny_cid'] : ''), + 'channel_deny_gid' => ((array_key_exists('channel_deny_gid', $arr)) ? $arr['channel_deny_gid'] : ''), + 'channel_removed' => ((array_key_exists('channel_removed', $arr)) ? $arr['channel_removed'] : '0'), + 'channel_system' => ((array_key_exists('channel_system', $arr)) ? $arr['channel_system'] : '0'), + 'channel_moved' => ((array_key_exists('channel_moved', $arr)) ? $arr['channel_moved'] : ''), + 'channel_password' => ((array_key_exists('channel_password', $arr)) ? $arr['channel_password'] : ''), + 'channel_salt' => ((array_key_exists('channel_salt', $arr)) ? $arr['channel_salt'] : '') + ]; + + return create_table_from_array('channel', $store); + } + + public static function profile_store_lowlevel($arr) + { + + $store = [ + 'profile_guid' => ((array_key_exists('profile_guid', $arr)) ? $arr['profile_guid'] : ''), + 'aid' => ((array_key_exists('aid', $arr)) ? $arr['aid'] : 0), + 'uid' => ((array_key_exists('uid', $arr)) ? $arr['uid'] : 0), + 'profile_name' => ((array_key_exists('profile_name', $arr)) ? $arr['profile_name'] : ''), + 'is_default' => ((array_key_exists('is_default', $arr)) ? $arr['is_default'] : 0), + 'hide_friends' => ((array_key_exists('hide_friends', $arr)) ? $arr['hide_friends'] : 0), + 'fullname' => ((array_key_exists('fullname', $arr)) ? $arr['fullname'] : ''), + 'pdesc' => ((array_key_exists('pdesc', $arr)) ? $arr['pdesc'] : ''), + 'chandesc' => ((array_key_exists('chandesc', $arr)) ? $arr['chandesc'] : ''), + 'dob' => ((array_key_exists('dob', $arr)) ? $arr['dob'] : ''), + 'dob_tz' => ((array_key_exists('dob_tz', $arr)) ? $arr['dob_tz'] : ''), + 'address' => ((array_key_exists('address', $arr)) ? $arr['address'] : ''), + 'locality' => ((array_key_exists('locality', $arr)) ? $arr['locality'] : ''), + 'region' => ((array_key_exists('region', $arr)) ? $arr['region'] : ''), + 'postal_code' => ((array_key_exists('postal_code', $arr)) ? $arr['postal_code'] : ''), + 'country_name' => ((array_key_exists('country_name', $arr)) ? $arr['country_name'] : ''), + 'hometown' => ((array_key_exists('hometown', $arr)) ? $arr['hometown'] : ''), + 'gender' => ((array_key_exists('gender', $arr)) ? $arr['gender'] : ''), + 'marital' => ((array_key_exists('marital', $arr)) ? $arr['marital'] : ''), + 'partner' => ((array_key_exists('partner', $arr)) ? $arr['partner'] : ''), + 'howlong' => ((array_key_exists('howlong', $arr)) ? $arr['howlong'] : NULL_DATE), + 'sexual' => ((array_key_exists('sexual', $arr)) ? $arr['sexual'] : ''), + 'pronouns' => ((array_key_exists('pronouns', $arr)) ? $arr['pronouns'] : ''), + 'politic' => ((array_key_exists('politic', $arr)) ? $arr['politic'] : ''), + 'religion' => ((array_key_exists('religion', $arr)) ? $arr['religion'] : ''), + 'keywords' => ((array_key_exists('keywords', $arr)) ? $arr['keywords'] : ''), + 'likes' => ((array_key_exists('likes', $arr)) ? $arr['likes'] : ''), + 'dislikes' => ((array_key_exists('dislikes', $arr)) ? $arr['dislikes'] : ''), + 'about' => ((array_key_exists('about', $arr)) ? $arr['about'] : ''), + 'summary' => ((array_key_exists('summary', $arr)) ? $arr['summary'] : ''), + 'music' => ((array_key_exists('music', $arr)) ? $arr['music'] : ''), + 'book' => ((array_key_exists('book', $arr)) ? $arr['book'] : ''), + 'tv' => ((array_key_exists('tv', $arr)) ? $arr['tv'] : ''), + 'film' => ((array_key_exists('film', $arr)) ? $arr['film'] : ''), + 'interest' => ((array_key_exists('interest', $arr)) ? $arr['interest'] : ''), + 'romance' => ((array_key_exists('romance', $arr)) ? $arr['romance'] : ''), + 'employment' => ((array_key_exists('employment', $arr)) ? $arr['employment'] : ''), + 'education' => ((array_key_exists('education', $arr)) ? $arr['education'] : ''), + 'contact' => ((array_key_exists('contact', $arr)) ? $arr['contact'] : ''), + 'channels' => ((array_key_exists('channels', $arr)) ? $arr['channels'] : ''), + 'homepage' => ((array_key_exists('homepage', $arr)) ? $arr['homepage'] : ''), + 'photo' => ((array_key_exists('photo', $arr)) ? $arr['photo'] : ''), + 'thumb' => ((array_key_exists('thumb', $arr)) ? $arr['thumb'] : ''), + 'publish' => ((array_key_exists('publish', $arr)) ? $arr['publish'] : 0), + 'profile_vcard' => ((array_key_exists('profile_vcard', $arr)) ? $arr['profile_vcard'] : '') + ]; + + return create_table_from_array('profile', $store); + } + + + + /** + * @brief Removes a channel. + * + * @param int $channel_id + * @param bool $local default true + * @param bool $unset_session default false + */ + + public static function channel_remove($channel_id, $local = true, $unset_session = false) + { + + if (! $channel_id) { + return; + } + + // global removal (all clones) not currently supported + // hence this operation _may_ leave orphan data on remote servers + + $local = true; + + logger('Removing channel: ' . $channel_id); + logger('local only: ' . intval($local)); + + + $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id)); + if (! $r) { + logger('channel not found: ' . $channel_id); + return; + } + + $channel = $r[0]; + + /** + * @hooks channel_remove + * Called when removing a channel. + * * \e array with entry from channel tabel for $channel_id + */ + + Hook::call('channel_remove', $channel); + + $r = q( + "select iid from iconfig left join item on item.id = iconfig.iid + where item.uid = %d", + intval($channel_id) + ); + if ($r) { + foreach ($r as $rr) { + q( + "delete from iconfig where iid = %d", + intval($rr['iid']) + ); + } + } + + q("DELETE FROM app WHERE app_channel = %d", intval($channel_id)); + q("DELETE FROM atoken WHERE atoken_uid = %d", intval($channel_id)); + q("DELETE FROM chatroom WHERE cr_uid = %d", intval($channel_id)); + q("DELETE FROM conv WHERE uid = %d", intval($channel_id)); + + q("DELETE FROM pgrp WHERE uid = %d", intval($channel_id)); + q("DELETE FROM pgrp_member WHERE uid = %d", intval($channel_id)); + q("DELETE FROM event WHERE uid = %d", intval($channel_id)); + q("DELETE FROM menu WHERE menu_channel_id = %d", intval($channel_id)); + q("DELETE FROM menu_item WHERE mitem_channel_id = %d", intval($channel_id)); + + q("DELETE FROM notify WHERE uid = %d", intval($channel_id)); + q("DELETE FROM obj WHERE obj_channel = %d", intval($channel_id)); + + + q("DELETE FROM photo WHERE uid = %d", intval($channel_id)); + q("DELETE FROM attach WHERE uid = %d", intval($channel_id)); + q("DELETE FROM profile WHERE uid = %d", intval($channel_id)); + q("DELETE FROM source WHERE src_channel_id = %d", intval($channel_id)); + + $r = q("select hash FROM attach WHERE uid = %d", intval($channel_id)); + if ($r) { + foreach ($r as $rv) { + attach_delete($channel_id, $rv['hash']); + } + } + + + q( + "delete from abook where abook_xchan = '%s' and abook_self = 1 ", + dbesc($channel['channel_hash']) + ); + + $r = q( + "update channel set channel_deleted = '%s', channel_removed = 1 where channel_id = %d", + dbesc(datetime_convert()), + intval($channel_id) + ); + + // remove items + + Run::Summon([ 'Channel_purge', $channel_id ]); + + // if this was the default channel, set another one as default + + if (App::$account['account_default_channel'] == $channel_id) { + $r = q( + "select channel_id from channel where channel_account_id = %d and channel_removed = 0 limit 1", + intval(App::$account['account_id']), + intval(PAGE_REMOVED) + ); + if ($r) { + $rr = q( + "update account set account_default_channel = %d where account_id = %d", + intval($r[0]['channel_id']), + intval(App::$account['account_id']) + ); + logger("Default channel deleted, changing default to channel_id " . $r[0]['channel_id']); + } else { + $rr = q( + "update account set account_default_channel = 0 where account_id = %d", + intval(App::$account['account_id']) + ); + } + } + + logger('deleting hublocs', LOGGER_DEBUG); + + $r = q( + "update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($channel['channel_hash']), + dbesc(z_root()) + ); + + // Do we have any valid hublocs remaining? + + $hublocs = 0; + + $r = q( + "select hubloc_id from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0", + dbesc($channel['channel_hash']) + ); + if ($r) { + $hublocs = count($r); + } + + if (! $hublocs) { + $r = q( + "update xchan set xchan_deleted = 1 where xchan_hash = '%s' ", + dbesc($channel['channel_hash']) + ); + // send a cleanup message to other servers + Run::Summon([ 'Notifier', 'purge_all', $channel_id ]); + } + + //remove from file system + + $f = 'store/' . $channel['channel_address']; + // This shouldn't happen but make sure the address isn't empty because that could do bad things + if (is_dir($f) && $channel['channel_address']) { + @rrmdir($f); + } + + Run::Summon([ 'Directory', $channel_id ]); + + if ($channel_id == local_channel() && $unset_session) { + App::$session->nuke(); + goaway(z_root()); + } + } + + // execute this at least a week after removing a channel + + public static function channel_remove_final($channel_id) + { + + q("delete from abook where abook_channel = %d", intval($channel_id)); + q("delete from abconfig where chan = %d", intval($channel_id)); + q("delete from pconfig where uid = %d", intval($channel_id)); + q("delete from channel where channel_id = %d", intval($channel_id)); + } + + + /** + * @brief This checks if a channel is allowed to publish executable code. + * + * It is up to the caller to determine if the observer or local_channel + * is in fact the resource owner whose channel_id is being checked. + * + * @param int $channel_id + * @return bool + */ + public static function codeallowed($channel_id) + { + if (! intval($channel_id)) { + return false; + } + + $x = self::from_id($channel_id); + if (($x) && ($x['channel_pageflags'] & PAGE_ALLOWCODE)) { + return true; + } + + return false; + } + + public static function anon_identity_init($reqvars) + { + + $x = [ + 'request_vars' => $reqvars, + 'xchan' => null, + 'success' => 'unset' + ]; + /** + * @hooks anon_identity_init + * * \e array \b request_vars + * * \e string \b xchan - return value + * * \e string|int \b success - Must be a number, so xchan return value gets used + */ + Hook::call('anon_identity_init', $x); + + if ($x['success'] !== 'unset' && intval($x['success']) && $x['xchan']) { + return $x['xchan']; + } + + // allow a captcha handler to over-ride + if ($x['success'] !== 'unset' && (intval($x['success']) === 0)) { + return false; + } + + + $anon_name = strip_tags(trim($reqvars['anonname'])); + $anon_email = strip_tags(trim($reqvars['anonmail'])); + $anon_url = strip_tags(trim($reqvars['anonurl'])); + + if (! ($anon_name && $anon_email)) { + logger('anonymous commenter did not complete form'); + return false; + } + + if (! validate_email($anon_email)) { + logger('enonymous email not valid'); + return false; + } + + if (! $anon_url) { + $anon_url = z_root(); + } + + $hash = hash('md5', $anon_email); + + $x = q( + "select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'anon' limit 1", + dbesc($anon_email), + dbesc($hash) + ); + + if (! $x) { + xchan_store_lowlevel([ + 'xchan_guid' => $anon_email, + 'xchan_hash' => $hash, + 'xchan_name' => $anon_name, + 'xchan_url' => $anon_url, + 'xchan_network' => 'anon', + 'xchan_updated' => datetime_convert(), + 'xchan_name_date' => datetime_convert() + ]); + + + $x = q( + "select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'anon' limit 1", + dbesc($anon_email), + dbesc($hash) + ); + + $photo = z_root() . '/' . self::get_default_profile_photo(300); + $photos = import_remote_xchan_photo($photo, $hash); + if ($photos) { + $r = q( + "update xchan set xchan_updated = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'anon' ", + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($anon_email), + dbesc($hash) + ); + } + } + + return $x[0]; + } + + public static function url($channel) + { + + // data validation - if this is wrong, log the call stack so we can find the issue + + if (! is_array($channel)) { + btlogger('not a channel array: ' . print_r($channel, true)); + } + + if ($channel['channel_address'] === App::get_hostname() || intval($channel['channel_system'])) { + return z_root(); + } + + return (($channel) ? z_root() . '/channel/' . $channel['channel_address'] : z_root()); + } + + public static function is_group($uid) + { + $role = get_pconfig($uid, 'system', 'permissions_role'); + $rolesettings = PermissionRoles::role_perms($role); + return ((isset($rolesettings['channel_type']) && $rolesettings['channel_type'] === 'group') ? true : false); + } +} diff --git a/Code/Lib/Chatroom.php b/Code/Lib/Chatroom.php new file mode 100644 index 000000000..caa5c2ec1 --- /dev/null +++ b/Code/Lib/Chatroom.php @@ -0,0 +1,315 @@ + false); + + $name = trim($arr['name']); + if (!$name) { + $ret['message'] = t('Missing room name'); + return $ret; + } + + $r = q( + "select cr_id from chatroom where cr_uid = %d and cr_name = '%s' limit 1", + intval($channel['channel_id']), + dbesc($name) + ); + if ($r) { + $ret['message'] = t('Duplicate room name'); + return $ret; + } + + $r = q( + "select count(cr_id) as total from chatroom where cr_aid = %d", + intval($channel['channel_account_id']) + ); + if ($r) { + $limit = ServiceClass::fetch($channel['channel_id'], 'chatrooms'); + } + + if (($r) && ($limit !== false) && ($r[0]['total'] >= $limit)) { + $ret['message'] = ServiceClass::upgrade_message(); + return $ret; + } + + if (!array_key_exists('expire', $arr)) { + $arr['expire'] = 120; // minutes, e.g. 2 hours + } + + $created = datetime_convert(); + + $x = q( + "insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, cr_expire, allow_cid, allow_gid, deny_cid, deny_gid ) + values ( %d, %d , '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s' ) ", + intval($channel['channel_account_id']), + intval($channel['channel_id']), + dbesc($name), + dbesc($created), + dbesc($created), + intval($arr['expire']), + dbesc($arr['allow_cid']), + dbesc($arr['allow_gid']), + dbesc($arr['deny_cid']), + dbesc($arr['deny_gid']) + ); + + if ($x) { + $ret['success'] = true; + } + + return $ret; + } + + + public static function destroy($channel, $arr) + { + + $ret = array('success' => false); + + if (intval($arr['cr_id'])) { + $sql_extra = " and cr_id = " . intval($arr['cr_id']) . " "; + } elseif (trim($arr['cr_name'])) { + $sql_extra = " and cr_name = '" . protect_sprintf(dbesc(trim($arr['cr_name']))) . "' "; + } else { + $ret['message'] = t('Invalid room specifier.'); + return $ret; + } + + $r = q( + "select * from chatroom where cr_uid = %d $sql_extra limit 1", + intval($channel['channel_id']) + ); + if (!$r) { + $ret['message'] = t('Invalid room specifier.'); + return $ret; + } + + Libsync::build_sync_packet($channel['channel_id'], array('chatroom' => $r)); + + q( + "delete from chatroom where cr_id = %d", + intval($r[0]['cr_id']) + ); + if ($r[0]['cr_id']) { + q( + "delete from chatpresence where cp_room = %d", + intval($r[0]['cr_id']) + ); + q( + "delete from chat where chat_room = %d", + intval($r[0]['cr_id']) + ); + } + + $ret['success'] = true; + return $ret; + } + + + public static function enter($observer_xchan, $room_id, $status, $client) + { + + if (!$room_id || !$observer_xchan) { + return; + } + + $r = q( + "select * from chatroom where cr_id = %d limit 1", + intval($room_id) + ); + if (!$r) { + notice(t('Room not found.') . EOL); + return false; + } + require_once('include/security.php'); + $sql_extra = permissions_sql($r[0]['cr_uid']); + + $x = q( + "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1", + intval($room_id), + intval($r[0]['cr_uid']) + ); + if (!$x) { + notice(t('Permission denied.') . EOL); + return false; + } + + $limit = ServiceClass::fetch($r[0]['cr_uid'], 'chatters_inroom'); + if ($limit !== false) { + $y = q( + "select count(*) as total from chatpresence where cp_room = %d", + intval($room_id) + ); + if ($y && $y[0]['total'] > $limit) { + notice(t('Room is full') . EOL); + return false; + } + } + + if (intval($x[0]['cr_expire'])) { + $r = q( + "delete from chat where created < %s - INTERVAL %s and chat_room = %d", + db_utcnow(), + db_quoteinterval(intval($x[0]['cr_expire']) . ' MINUTE'), + intval($x[0]['cr_id']) + ); + } + + $r = q( + "select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1", + dbesc($observer_xchan), + intval($room_id) + ); + if ($r) { + q( + "update chatpresence set cp_last = '%s' where cp_id = %d and cp_client = '%s'", + dbesc(datetime_convert()), + intval($r[0]['cp_id']), + dbesc($client) + ); + return true; + } + + $r = q( + "insert into chatpresence ( cp_room, cp_xchan, cp_last, cp_status, cp_client ) + values ( %d, '%s', '%s', '%s', '%s' )", + intval($room_id), + dbesc($observer_xchan), + dbesc(datetime_convert()), + dbesc($status), + dbesc($client) + ); + + return $r; + } + + + public function leave($observer_xchan, $room_id, $client) + { + if (!$room_id || !$observer_xchan) { + return; + } + + $r = q( + "select * from chatpresence where cp_xchan = '%s' and cp_room = %d and cp_client = '%s' limit 1", + dbesc($observer_xchan), + intval($room_id), + dbesc($client) + ); + if ($r) { + q( + "delete from chatpresence where cp_id = %d", + intval($r[0]['cp_id']) + ); + } + + return true; + } + + + public static function roomlist($uid) + { + require_once('include/security.php'); + $sql_extra = permissions_sql($uid); + + $r = q( + "select allow_cid, allow_gid, deny_cid, deny_gid, cr_name, cr_expire, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d $sql_extra group by cr_name, cr_id order by cr_name", + intval($uid) + ); + + return $r; + } + + public static function list_count($uid) + { + require_once('include/security.php'); + $sql_extra = permissions_sql($uid); + + $r = q( + "select count(*) as total from chatroom where cr_uid = %d $sql_extra", + intval($uid) + ); + + return $r[0]['total']; + } + + /** + * @brief Create a chat message via API. + * + * It is the caller's responsibility to enter the room. + * + * @param int $uid + * @param int $room_id + * @param string $xchan + * @param string $text + * @return array + */ + public static function message($uid, $room_id, $xchan, $text) + { + + $ret = array('success' => false); + + if (!$text) { + return; + } + + $sql_extra = permissions_sql($uid); + + $r = q( + "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra", + intval($uid), + intval($room_id) + ); + if (!$r) { + return $ret; + } + + $arr = [ + 'chat_room' => $room_id, + 'chat_xchan' => $xchan, + 'chat_text' => $text + ]; + /** + * @hooks chat_message + * Called to create a chat message. + * * \e int \b chat_room + * * \e string \b chat_xchan + * * \e string \b chat_text + */ + Hook::call('chat_message', $arr); + + $x = q( + "insert into chat ( chat_room, chat_xchan, created, chat_text ) + values( %d, '%s', '%s', '%s' )", + intval($room_id), + dbesc($xchan), + dbesc(datetime_convert()), + dbesc(str_rot47(base64url_encode($arr['chat_text']))) + ); + + $ret['success'] = true; + return $ret; + } +} diff --git a/Code/Lib/Config.php b/Code/Lib/Config.php new file mode 100644 index 000000000..261569dd9 --- /dev/null +++ b/Code/Lib/Config.php @@ -0,0 +1,175 @@ + false, 'message' => '']; + + $my_perms = false; + $protocol = ''; + + $ap_allowed = get_config('system', 'activitypub', ACTIVITYPUB_ENABLED) && get_pconfig($uid, 'system', 'activitypub', ACTIVITYPUB_ENABLED); + + if (substr($url, 0, 1) === '[') { + $x = strpos($url, ']'); + if ($x) { + $protocol = substr($url, 1, $x - 1); + $url = substr($url, $x + 1); + } + } + + if (!check_siteallowed($url)) { + $result['message'] = t('Channel is blocked on this site.'); + return $result; + } + + if (!$url) { + $result['message'] = t('Channel location missing.'); + return $result; + } + + // check service class limits + + $r = q( + "select count(*) as total from abook where abook_channel = %d and abook_self = 0 ", + intval($uid) + ); + if ($r) { + $total_channels = $r[0]['total']; + } + + if (!ServiceClass::allows($uid, 'total_channels', $total_channels)) { + $result['message'] = ServiceClass::upgrade_message(); + return $result; + } + + $xchan_hash = ''; + $sql_options = (($protocol) ? " and xchan_network = '" . dbesc($protocol) . "' " : ''); + + $r = q( + "select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s') $sql_options ", + dbesc($url), + dbesc($url), + dbesc($url) + ); + + if ($r) { + // reset results to the best record or the first if we don't have the best + // note: this returns a single record and not an array of records + + $r = Libzot::zot_record_preferred($r, 'xchan_network'); + + // ensure there's a valid hubloc for this xchan before proceeding - you cannot connect without it + + if (in_array($r['xchan_network'], ['nomad', 'zot6', 'activitypub'])) { + $h = q( + "select * from hubloc where hubloc_hash = '%s'", + dbesc($r['xchan_hash']) + ); + if (!$h) { + $r = null; + } + } + + // we may have nulled out this record so check again + + if ($r) { + // Check the site table to see if we should have a zot6 hubloc, + // If so, clear the xchan and start fresh + + if ($r['xchan_network'] === 'activitypub') { + $m = parse_url($r['xchan_hash']); + unset($m['path']); + $h = unparse_url($m); + $s = q( + "select * from site where site_url = '%s'", + dbesc($h) + ); + if (intval($s['site_type']) === SITE_TYPE_ZOT) { + logger('got zot - ignore activitypub entry'); + $r = null; + } + } + } + } + + + $singleton = false; + + if (!$r) { + // not in cache - try discovery + + $wf = discover_by_webbie($url, $protocol, false); + + if (!$wf) { + $result['message'] = t('Remote channel or protocol unavailable.'); + return $result; + } + } + + if ($wf) { + // something was discovered - find the record which was just created. + + $r = q( + "select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s' ) $sql_options", + dbesc(($wf) ? $wf : $url), + dbesc($url), + dbesc($url) + ); + + // convert to a single record (once again preferring a zot solution in the case of multiples) + + if ($r) { + $r = Libzot::zot_record_preferred($r, 'xchan_network'); + } + } + + // if discovery was a success or the channel was already cached we should have an xchan record in $r + + if ($r) { + $xchan = $r; + $xchan_hash = $r['xchan_hash']; + $their_perms = EMPTY_STR; + } + + // failure case + + if (!$xchan_hash) { + $result['message'] = t('Channel discovery failed.'); + logger('follow: ' . $result['message']); + return $result; + } + + if (!check_channelallowed($xchan_hash)) { + $result['message'] = t('Channel is blocked on this site.'); + logger('follow: ' . $result['message']); + return $result; + } + + + if ($r['xchan_network'] === 'activitypub') { + if (!$ap_allowed) { + $result['message'] = t('Protocol not supported'); + return $result; + } + $singleton = true; + } + + // Now start processing the new connection + + $aid = $channel['channel_account_id']; + $hash = $channel['channel_hash']; + $default_group = $channel['channel_default_group']; + + if ($hash === $xchan_hash) { + $result['message'] = t('Cannot connect to yourself.'); + return $result; + } + + $p = Permissions::connect_perms($uid); + + // parent channels have unencumbered write permission + + if ($sub_channel) { + $p['perms']['post_wall'] = 1; + $p['perms']['post_comments'] = 1; + $p['perms']['write_storage'] = 1; + $p['perms']['post_like'] = 1; + $p['perms']['delegate'] = 0; + $p['perms']['moderated'] = 0; + } + + $my_perms = Permissions::serialise($p['perms']); + + $profile_assign = get_pconfig($uid, 'system', 'profile_assign', ''); + + // See if we are already connected by virtue of having an abook record + + $r = q( + "select abook_id, abook_xchan, abook_pending, abook_instance from abook + where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($xchan_hash), + intval($uid) + ); + + if ($r) { + $abook_instance = $r[0]['abook_instance']; + + // If they are on a non-nomadic network, add them to this location + + if (($singleton) && strpos($abook_instance, z_root()) === false) { + if ($abook_instance) { + $abook_instance .= ','; + } + $abook_instance .= z_root(); + + $x = q( + "update abook set abook_instance = '%s', abook_not_here = 0 where abook_id = %d", + dbesc($abook_instance), + intval($r[0]['abook_id']) + ); + } + + // if they have a pending connection, we just followed them so approve the connection request + + if (intval($r[0]['abook_pending'])) { + $x = q( + "update abook set abook_pending = 0 where abook_id = %d", + intval($r[0]['abook_id']) + ); + } + } else { + // create a new abook record + + $closeness = get_pconfig($uid, 'system', 'new_abook_closeness', 80); + + $r = abook_store_lowlevel( + [ + 'abook_account' => intval($aid), + 'abook_channel' => intval($uid), + 'abook_closeness' => intval($closeness), + 'abook_xchan' => $xchan_hash, + 'abook_profile' => $profile_assign, + 'abook_feed' => intval(($xchan['xchan_network'] === 'rss') ? 1 : 0), + 'abook_created' => datetime_convert(), + 'abook_updated' => datetime_convert(), + 'abook_instance' => (($singleton) ? z_root() : '') + ] + ); + } + + if (!$r) { + logger('abook creation failed'); + $result['message'] = t('error saving data'); + return $result; + } + + // Set suitable permissions to the connection + + if ($my_perms) { + set_abconfig($uid, $xchan_hash, 'system', 'my_perms', $my_perms); + } + + // fetch the entire record + + $r = q( + "select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash + where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($xchan_hash), + intval($uid) + ); + + if ($r) { + $result['abook'] = array_shift($r); + Run::Summon(['Notifier', 'permissions_create', $result['abook']['abook_id']]); + } + + $arr = ['channel_id' => $uid, 'channel' => $channel, 'abook' => $result['abook']]; + + Hook::call('follow', $arr); + + /** If there is a default group for this channel, add this connection to it */ + + if ($default_group) { + $g = AccessList::rec_byhash($uid, $default_group); + if ($g) { + AccessList::member_add($uid, '', $xchan_hash, $g['id']); + } + } + + $result['success'] = true; + return $result; + } +} diff --git a/Code/Lib/Crypto.php b/Code/Lib/Crypto.php new file mode 100644 index 000000000..ea273a6b6 --- /dev/null +++ b/Code/Lib/Crypto.php @@ -0,0 +1,214 @@ + 'sha1', + 'private_key_bits' => $bits, + 'encrypt_key' => false + ]; + + $conf = get_config('system', 'openssl_conf_file'); + + if ($conf) { + $openssl_options['config'] = $conf; + } + + $result = openssl_pkey_new($openssl_options); + + if (empty($result)) { + return false; + } + + // Get private key + + $response = [ 'prvkey' => '', 'pubkey' => '' ]; + + openssl_pkey_export($result, $response['prvkey']); + + // Get public key + $pkey = openssl_pkey_get_details($result); + $response['pubkey'] = $pkey["key"]; + + return $response; + } + + + public static function sign($data, $key, $alg = 'sha256') + { + + if (! $key) { + return false; + } + + $sig = ''; + openssl_sign($data, $sig, $key, $alg); + return $sig; + } + + + public static function verify($data, $sig, $key, $alg = 'sha256') + { + + if (! $key) { + return false; + } + + try { + $verify = openssl_verify($data, $sig, $key, $alg); + } catch (Exception $e) { + $verify = (-1); + } + + if ($verify === (-1)) { + while ($msg = openssl_error_string()) { + logger('openssl_verify: ' . $msg, LOGGER_NORMAL, LOG_ERR); + } + btlogger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR); + } + + return (($verify > 0) ? true : false); + } + + public static function encapsulate($data, $pubkey, $alg) + { + + if (! ($alg && $pubkey)) { + return $data; + } + + $alg_base = $alg; + $padding = OPENSSL_PKCS1_PADDING; + + $exts = explode('.', $alg); + if (count($exts) > 1) { + switch ($exts[1]) { + case 'oaep': + $padding = OPENSSL_PKCS1_OAEP_PADDING; + break; + default: + break; + } + $alg_base = $exts[0]; + } + + $method = null; + + foreach (self::$openssl_algorithms as $ossl) { + if ($ossl[0] === $alg_base) { + $method = $ossl; + break; + } + } + + if ($method) { + $result = [ 'encrypted' => true ]; + + $key = openssl_random_pseudo_bytes(256); + $iv = openssl_random_pseudo_bytes(256); + + $key1 = substr($key, 0, $method[2]); + $iv1 = substr($iv, 0, $method[3]); + + $result['data'] = base64url_encode(openssl_encrypt($data, $method[1], $key1, OPENSSL_RAW_DATA, $iv1), true); + + openssl_public_encrypt($key, $k, $pubkey, $padding); + openssl_public_encrypt($iv, $i, $pubkey, $padding); + + $result['alg'] = $alg; + $result['key'] = base64url_encode($k, true); + $result['iv'] = base64url_encode($i, true); + return $result; + } else { + $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data ]; + Hook::call('crypto_encapsulate', $x); + return $x['result']; + } + } + + public static function unencapsulate($data, $prvkey) + { + + if (! (is_array($data) && array_key_exists('encrypted', $data) && array_key_exists('alg', $data) && $data['alg'])) { + logger('not encrypted'); + + return $data; + } + + $alg_base = $data['alg']; + $padding = OPENSSL_PKCS1_PADDING; + + $exts = explode('.', $data['alg']); + if (count($exts) > 1) { + switch ($exts[1]) { + case 'oaep': + $padding = OPENSSL_PKCS1_OAEP_PADDING; + break; + default: + break; + } + $alg_base = $exts[0]; + } + + $method = null; + + foreach (self::$openssl_algorithms as $ossl) { + if ($ossl[0] === $alg_base) { + $method = $ossl; + break; + } + } + + if ($method) { + openssl_private_decrypt(base64url_decode($data['key']), $k, $prvkey, $padding); + openssl_private_decrypt(base64url_decode($data['iv']), $i, $prvkey, $padding); + return openssl_decrypt(base64url_decode($data['data']), $method[1], substr($k, 0, $method[2]), OPENSSL_RAW_DATA, substr($i, 0, $method[3])); + } else { + $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $data['alg'], 'result' => $data ]; + Hook::call('crypto_unencapsulate', $x); + return $x['result']; + } + } +} diff --git a/Code/Lib/DB_Upgrade.php b/Code/Lib/DB_Upgrade.php new file mode 100644 index 000000000..1e35a323c --- /dev/null +++ b/Code/Lib/DB_Upgrade.php @@ -0,0 +1,119 @@ +config_name = 'db_version'; + $this->func_prefix = '_'; + + $build = get_config('system', 'db_version', 0); + if (!intval($build)) { + $build = set_config('system', 'db_version', $db_revision); + } + + if ($build == $db_revision) { + // Nothing to be done. + return; + } else { + $stored = intval($build); + if (!$stored) { + logger('Critical: check_config unable to determine database schema version'); + return; + } + + $current = intval($db_revision); + + if ($stored < $current) { + // The last update we performed was $stored. + // Start at $stored + 1 and continue until we have completed $current + + for ($x = $stored + 1; $x <= $current; $x++) { + $s = '_' . $x; + $cls = '\\Code\Update\\' . $s; + if (!class_exists($cls)) { + return; + } + + // There could be a lot of processes running or about to run. + // We want exactly one process to run the update command. + // So store the fact that we're taking responsibility + // after first checking to see if somebody else already has. + + // If the update fails or times-out completely you may need to + // delete the config entry to try again. + + Config::Load('database'); + + if (get_config('database', $s)) { + break; + } + set_config('database', $s, '1'); + + + $c = new $cls(); + + $retval = $c->run(); + + if ($retval != UPDATE_SUCCESS) { + $source = t('Source code of failed update: ') . "\n\n" . @file_get_contents('Code/Update/' . $s . '.php'); + + + // Prevent sending hundreds of thousands of emails by creating + // a lockfile. + + $lockfile = 'cache/mailsent'; + + if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 86400))) { + return; + } + @unlink($lockfile); + //send the administrator an e-mail + file_put_contents($lockfile, $x); + + $r = q( + "select account_language from account where account_email = '%s' limit 1", + dbesc(App::$config['system']['admin_email']) + ); + push_lang(($r) ? $r[0]['account_language'] : 'en'); + z_mail( + [ + 'toEmail' => App::$config['system']['admin_email'], + 'messageSubject' => sprintf(t('Update Error at %s'), z_root()), + 'textVersion' => replace_macros( + Theme::get_email_template('update_fail_eml.tpl'), + [ + '$sitename' => App::$config['system']['sitename'], + '$siteurl' => z_root(), + '$update' => $x, + '$error' => sprintf(t('Update %s failed. See error logs.'), $x), + '$baseurl' => z_root(), + '$source' => $source + ] + ) + ] + ); + + //try the logger + logger('CRITICAL: Update Failed: ' . $x); + pop_lang(); + } else { + set_config('database', $s, 'success'); + } + } + } + set_config('system', 'db_version', $db_revision); + } + } +} diff --git a/Code/Lib/DReport.php b/Code/Lib/DReport.php new file mode 100644 index 000000000..22d3851fd --- /dev/null +++ b/Code/Lib/DReport.php @@ -0,0 +1,156 @@ +location = $location; + $this->sender = $sender; + $this->recipient = $recipient; + $this->name = EMPTY_STR; + $this->message_id = $message_id; + $this->status = $status; + $this->date = datetime_convert(); + } + + public function update($status) + { + $this->status = $status; + $this->date = datetime_convert(); + } + + public function set_name($name) + { + $this->name = $name; + } + + public function addto_update($status) + { + $this->status = $this->status . ' ' . $status; + } + + + public function set($arr) + { + $this->location = $arr['location']; + $this->sender = $arr['sender']; + $this->recipient = $arr['recipient']; + $this->name = $arr['name']; + $this->message_id = $arr['message_id']; + $this->status = $arr['status']; + $this->date = $arr['date']; + } + + public function get() + { + return array( + 'location' => $this->location, + 'sender' => $this->sender, + 'recipient' => $this->recipient, + 'name' => $this->name, + 'message_id' => $this->message_id, + 'status' => $this->status, + 'date' => $this->date + ); + } + + /** + * @brief decide whether to store a returned delivery report + * + * @param array $dr + * @return bool + */ + + public static function is_storable($dr) + { + + if (get_config('system', 'disable_dreport')) { + return false; + } + + /** + * @hooks dreport_is_storable + * Called before storing a dreport record to determine whether to store it. + * * \e array + */ + + Hook::call('dreport_is_storable', $dr); + + // let plugins accept or reject - if neither, continue on + if (array_key_exists('accept', $dr) && intval($dr['accept'])) { + return true; + } + if (array_key_exists('reject', $dr) && intval($dr['reject'])) { + return false; + } + + if (!($dr['sender'])) { + return false; + } + + // Is the sender one of our channels? + + $c = q( + "select channel_id from channel where channel_hash = '%s' limit 1", + dbesc($dr['sender']) + ); + if (!$c) { + return false; + } + + + // is the recipient one of our connections, or do we want to store every report? + + + $rxchan = $dr['recipient']; + $pcf = get_pconfig($c[0]['channel_id'], 'system', 'dreport_store_all'); + if ($pcf) { + return true; + } + + // We always add ourself as a recipient to private and relayed posts + // So if a remote site says they can't find us, that's no big surprise + // and just creates a lot of extra report noise + + if (($dr['location'] !== z_root()) && ($dr['sender'] === $rxchan) && ($dr['status'] === 'recipient not found')) { + return false; + } + + // If you have a private post with a recipient list, every single site is going to report + // back a failed delivery for anybody on that list that isn't local to them. We're only + // concerned about this if we have a local hubloc record which says we expected them to + // have a channel on that site. + + $r = q( + "select hubloc_id from hubloc where hubloc_hash = '%s' and hubloc_url = '%s'", + dbesc($rxchan), + dbesc($dr['location']) + ); + if ((!$r) && ($dr['status'] === 'recipient not found')) { + return false; + } + + $r = q( + "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($rxchan), + intval($c[0]['channel_id']) + ); + if ($r) { + return true; + } + + return false; + } +} diff --git a/Code/Lib/Enotify.php b/Code/Lib/Enotify.php new file mode 100644 index 000000000..7af194791 --- /dev/null +++ b/Code/Lib/Enotify.php @@ -0,0 +1,985 @@ +' . t('Notification Settings') . ''); + $sender_name = $product; + $hostname = App::get_hostname(); + if (strpos($hostname, ':')) { + $hostname = substr($hostname, 0, strpos($hostname, ':')); + } + + // Do not translate 'noreply' as it must be a legal 7-bit email address + + $reply_email = get_config('system', 'reply_address'); + if (! $reply_email) { + $reply_email = 'noreply' . '@' . $hostname; + } + + $sender_email = get_config('system', 'from_email'); + if (! $sender_email) { + $sender_email = 'Administrator' . '@' . $hostname; + } + + $sender_name = get_config('system', 'from_email_name'); + if (! $sender_name) { + $sender_name = System::get_site_name(); + } + + + $additional_mail_header = ""; + + if (array_key_exists('item', $params)) { + require_once('include/conversation.php'); + // if it's a normal item... + if (array_key_exists('verb', $params['item'])) { + // localize_item() alters the original item so make a copy first + $i = $params['item']; + logger('calling localize'); + localize_item($i); + $title = $i['title']; + $body = $i['body']; + $private = (($i['item_private']) || intval($i['item_obscured'])); + } else { + $title = $params['item']['title']; + $body = $params['item']['body']; + } + if ($params['item']['created'] < datetime_convert('UTC', 'UTC', 'now - 1 month')) { + logger('notification invoked for an old item which may have been refetched.', LOGGER_DEBUG, LOG_INFO); + return; + } + } else { + $title = $body = ''; + } + + + $always_show_in_notices = get_pconfig($recip['channel_id'], 'system', 'always_show_in_notices'); + $vnotify = get_pconfig($recip['channel_id'], 'system', 'vnotify'); + + $salutation = $recip['channel_name']; + + // e.g. "your post", "David's photo", etc. + $possess_desc = t('%s '); + + if ($params['type'] == NOTIFY_MAIL) { + logger('notification: mail'); + $subject = sprintf(t('[$Projectname:Notify] New mail received at %s'), $sitename); + + if ($params['item']['mid'] === $params['item']['parent_mid']) { + $preamble = sprintf(t('%1$s sent you a new private message at %2$s.'), $sender['xchan_name'], $sitename); + $epreamble = sprintf(t('%1$s sent you %2$s.'), '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]'); + } else { + $preamble = sprintf(t('%1$s replied to a private message at %2$s.'), $sender['xchan_name'], $sitename); + $epreamble = sprintf(t('%1$s replied to %2$s.'), '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]'); + } + $sitelink = t('Please visit %s to view and/or reply to your private messages.'); + + $tsitelink = sprintf($sitelink, $siteurl . '/display/' . gen_link_id($params['item']['mid'])); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + $itemlink = z_root() . '/display/' . gen_link_id($params['item']['mid']); + } + + if (in_array(intval($params['type']), [ NOTIFY_COMMENT, NOTIFY_RESHARE ])) { + // logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); + + $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false); + + $itemlink = $params['link']; + + $action = t('commented on'); + + if (array_key_exists('item', $params) && in_array($params['item']['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) { + if (! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE)) { + logger('notification: not a visible activity. Ignoring.'); + pop_lang(); + return; + } + + if (activity_match($params['verb'], ACTIVITY_LIKE)) { + $action = t('liked'); + } + + if (activity_match($params['verb'], ACTIVITY_DISLIKE)) { + $action = t('disliked'); + } + } + + $parent_mid = $params['parent_mid']; + + // Check to see if there was already a notify for this post. + // If so don't create a second notification + + $p = null; + $p = q( + "select id from notify where link = '%s' and uid = %d limit 1", + dbesc($params['link']), + intval($recip['channel_id']) + ); + if ($p) { + logger('notification: comment already notified'); + pop_lang(); + return; + } + + + // if it's a post figure out who's post it is. + + $p = null; + + if ($params['otype'] === 'item' && $parent_mid) { + $p = q( + "select * from item where mid = '%s' and uid = %d limit 1", + dbesc($parent_mid), + intval($recip['channel_id']) + ); + } + + xchan_query($p); + + $item_post_type = item_post_type($p[0]); + // $private = $p[0]['item_private']; + $parent_id = $p[0]['id']; + + $parent_item = $p[0]; + + //$possess_desc = str_replace('',$possess_desc); + + // "a post" + $dest_str = sprintf( + t('%1$s %2$s [zrl=%3$s]a %4$s[/zrl]'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $action, + $itemlink, + $item_post_type + ); + + // "George Bull's post" + if ($p) { + $dest_str = sprintf( + t('%1$s %2$s [zrl=%3$s]%4$s\'s %5$s[/zrl]'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $action, + $itemlink, + $p[0]['author']['xchan_name'], + $item_post_type + ); + } + + // "your post" + if ($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall'])) { + $dest_str = sprintf( + t('%1$s %2$s [zrl=%3$s]your %4$s[/zrl]'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $action, + $itemlink, + $item_post_type + ); + } + + // Some mail softwares relies on subject field for threading. + // So, we cannot have different subjects for notifications of the same thread. + // Before this we have the name of the replier on the subject rendering + // differents subjects for messages on the same thread. + + if ($moderated) { + $subject = sprintf(t('[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); + $itemlink = z_root() . '/moderate/' . gen_link_id($params['item']['mid']); + } else { + $subject = sprintf(t('[$Projectname:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); + } + $preamble = sprintf(t('%1$s commented on an item/conversation you have been following.'), $sender['xchan_name']); + $epreamble = $dest_str; + + if ($moderated) { + $epreamble .= ' ' . t('(Moderated)'); + } + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + if ($moderated) { + $tsitelink .= "\n\n" . sprintf(t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate'); + $hsitelink .= "

" . sprintf(t('Please visit %s to approve or reject this comment.'), '' . z_root() . '/moderate'); + } + } + + if ($params['type'] == NOTIFY_LIKE) { + // logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); + + $itemlink = $params['link']; + + if (array_key_exists('item', $params) && (! activity_match($params['item']['verb'], ACTIVITY_LIKE))) { + if (! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE)) { + logger('notification: not a visible activity. Ignoring.'); + pop_lang(); + return; + } + } + + $parent_mid = $params['parent_mid']; + + // Check to see if there was already a notify for this post. + // If so don't create a second notification + + $p = null; + $p = q( + "select id from notify where link = '%s' and uid = %d limit 1", + dbesc($params['link']), + intval($recip['channel_id']) + ); + if ($p) { + logger('notification: like already notified'); + pop_lang(); + return; + } + + + // if it's a post figure out who's post it is. + + $p = null; + + if ($params['otype'] === 'item' && $parent_mid) { + $p = q( + "select * from item where mid = '%s' and uid = %d limit 1", + dbesc($parent_mid), + intval($recip['channel_id']) + ); + } + + xchan_query($p); + + + $item_post_type = item_post_type($p[0]); + // $private = $p[0]['item_private']; + $parent_id = $p[0]['id']; + + $parent_item = $p[0]; + + + // "your post" + if ($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall'])) { + $dest_str = sprintf( + t('%1$s liked [zrl=%2$s]your %3$s[/zrl]'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $itemlink, + $item_post_type + ); + } else { + pop_lang(); + return; + } + + // Some mail softwares relies on subject field for threading. + // So, we cannot have different subjects for notifications of the same thread. + // Before this we have the name of the replier on the subject rendering + // differents subjects for messages on the same thread. + + $subject = sprintf(t('[$Projectname:Notify] Like received to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); + $preamble = sprintf(t('%1$s liked an item/conversation you created.'), $sender['xchan_name']); + $epreamble = $dest_str; + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + } + + + + if ($params['type'] == NOTIFY_WALL) { + $subject = sprintf(t('[$Projectname:Notify] %s posted to your profile wall'), $sender['xchan_name']); + + $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false); + + $itemlink = (($moderated) ? z_root() . '/moderate/' . gen_link_id($params['item']['mid']) : $params['link']); + + $preamble = sprintf(t('%1$s posted to your profile wall at %2$s'), $sender['xchan_name'], $sitename); + + $epreamble = sprintf( + t('%1$s posted to [zrl=%2$s]your wall[/zrl]'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $itemlink + ); + + + if ($moderated) { + $subject .= t(' - ') . t('Moderated'); + $epreamble .= t(' - ') . t('Moderated'); + } + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + + if ($moderated) { + $tsitelink .= "\n\n" . sprintf(t('Please visit %s to approve or reject this post.'), z_root() . '/moderate'); + $hsitelink .= "

" . sprintf(t('Please visit %s to approve or reject this post.'), '' . z_root() . '/moderate'); + } + } + + if ($params['type'] == NOTIFY_TAGSELF) { + $p = null; + $p = q( + "select id from notify where link = '%s' and uid = %d limit 1", + dbesc($params['link']), + intval($recip['channel_id']) + ); + if ($p) { + logger('enotify: tag: already notified about this post'); + pop_lang(); + return; + } + + $subject = sprintf(t('[$Projectname:Notify] %s tagged you'), $sender['xchan_name']); + $preamble = sprintf(t('%1$s tagged you at %2$s'), $sender['xchan_name'], $sitename); + $epreamble = sprintf( + t('%1$s [zrl=%2$s]tagged you[/zrl].'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $params['link'] + ); + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + + if ($params['type'] == NOTIFY_POKE) { + $subject = sprintf(t('[$Projectname:Notify] %1$s poked you'), $sender['xchan_name']); + $preamble = sprintf(t('%1$s poked you at %2$s'), $sender['xchan_name'], $sitename); + $epreamble = sprintf( + t('%1$s [zrl=%2$s]poked you[/zrl].'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $params['link'] + ); + + $subject = str_replace('poked', t($params['activity']), $subject); + $preamble = str_replace('poked', t($params['activity']), $preamble); + $epreamble = str_replace('poked', t($params['activity']), $epreamble); + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + + if ($params['type'] == NOTIFY_TAGSHARE) { + $subject = sprintf(t('[$Projectname:Notify] %s tagged your post'), $sender['xchan_name']); + $preamble = sprintf(t('%1$s tagged your post at %2$s'), $sender['xchan_name'], $sitename); + $epreamble = sprintf( + t('%1$s tagged [zrl=%2$s]your post[/zrl]'), + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $itemlink + ); + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + + if ($params['type'] == NOTIFY_INTRO) { + $subject = sprintf(t('[$Projectname:Notify] Introduction received')); + $preamble = sprintf(t('You\'ve received an new connection request from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename); + $epreamble = sprintf( + t('You\'ve received [zrl=%1$s]a new connection request[/zrl] from %2$s.'), + $siteurl . '/connections/ifpending', + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]' + ); + $body = sprintf(t('You may visit their profile at %s'), $sender['xchan_url']); + + $sitelink = t('Please visit %s to approve or reject the connection request.'); + $tsitelink = sprintf($sitelink, $siteurl . '/connections/ifpending'); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + + if ($params['type'] == NOTIFY_SUGGEST) { + $subject = sprintf(t('[$Projectname:Notify] Friend suggestion received')); + $preamble = sprintf(t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename); + $epreamble = sprintf( + t('You\'ve received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s.'), + $itemlink, + '[zrl=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/zrl]', + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]' + ); + + $body = t('Name:') . ' ' . $params['item']['name'] . "\n"; + $body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n"; + $body .= sprintf(t('You may visit their profile at %s'), $params['item']['url']); + + $sitelink = t('Please visit %s to approve or reject the suggestion.'); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + + if ($params['type'] == NOTIFY_CONFIRM) { + // ? + } + + if ($params['type'] == NOTIFY_SYSTEM) { + // ? + } + + $h = array( + 'params' => $params, + 'subject' => $subject, + 'preamble' => $preamble, + 'epreamble' => $epreamble, + 'body' => $body, + 'sitelink' => $sitelink, + 'sitename' => $sitename, + 'tsitelink' => $tsitelink, + 'hsitelink' => $hsitelink, + 'itemlink' => $itemlink, + 'sender' => $sender, + 'recipient' => $recip + ); + + Hook::call('enotify', $h); + + $subject = $h['subject']; + $preamble = $h['preamble']; + $epreamble = $h['epreamble']; + $body = $h['body']; + $sitelink = $h['sitelink']; + $tsitelink = $h['tsitelink']; + $hsitelink = $h['hsitelink']; + $itemlink = $h['itemlink']; + + + require_once('include/html2bbcode.php'); + + do { + $dups = false; + $hash = random_string(); + $r = q( + "SELECT id FROM notify WHERE hash = '%s' LIMIT 1", + dbesc($hash) + ); + if ($r) { + $dups = true; + } + } while ($dups === true); + + + $datarray = []; + $datarray['hash'] = $hash; + $datarray['sender_hash'] = $sender['xchan_hash']; + $datarray['xname'] = $sender['xchan_name']; + $datarray['url'] = $sender['xchan_url']; + $datarray['photo'] = $sender['xchan_photo_s']; + $datarray['created'] = datetime_convert(); + $datarray['aid'] = $recip['channel_account_id']; + $datarray['uid'] = $recip['channel_id']; + $datarray['link'] = $itemlink; + $datarray['parent'] = $parent_mid; + $datarray['parent_item'] = $parent_item; + $datarray['ntype'] = $params['type']; + $datarray['verb'] = $params['verb']; + $datarray['otype'] = $params['otype']; + $datarray['abort'] = false; + + $datarray['item'] = $params['item']; + + if (LibBlock::fetch_by_entity($datarray['uid'], $datarray['sender_hash'])) { + pop_lang(); + return; + } + + if (is_array($datarray['parent_item'])) { + if (LibBlock::fetch_by_entity($datarray['uid'], $datarray['parent_item']['author_xchan']) || LibBlock::fetch_by_entity($datarray['uid'], $datarray['parent_item']['owner_xchan'])) { + pop_lang(); + return; + } + } + + Hook::call('enotify_store', $datarray); + + if ($datarray['abort']) { + pop_lang(); + return; + } + + + // create notification entry in DB + $seen = 0; + + // Mark some notifications as seen right away + // Note! The notification have to be created, because they are used to send emails + // So easiest solution to hide them from Notices is to mark them as seen right away. + // Another option would be to not add them to the DB, and change how emails are handled + // (probably would be better that way) + + if (!$always_show_in_notices) { + if (($params['type'] == NOTIFY_WALL) || ($params['type'] == NOTIFY_INTRO)) { + $seen = 1; + } + // set back to unseen for moderated wall posts + if ($params['type'] == NOTIFY_WALL && $params['item']['item_blocked'] == ITEM_MODERATED) { + $seen = 0; + } + } + + $e = q( + "select * from notify where otype = '%s' and xname = '%s' and verb = '%s' and link = '%s' and ntype = %d limit 1", + dbesc($datarray['otype']), + dbesc($datarray['xname']), + dbesc($datarray['verb']), + dbesc($datarray['link']), + intval($datarray['ntype']) + ); + if ($e) { + logger('duplicated notification'); + pop_lang(); + return; + } + + $r = q( + "insert into notify (hash,xname,url,photo,created,msg,aid,uid,link,parent,seen,ntype,verb,otype) + values('%s','%s','%s','%s','%s','%s',%d,%d,'%s','%s',%d,%d,'%s','%s')", + dbesc($datarray['hash']), + dbesc($datarray['xname']), + dbesc($datarray['url']), + dbesc($datarray['photo']), + dbesc($datarray['created']), + dbesc(''), // will fill this in below after the record is created + intval($datarray['aid']), + intval($datarray['uid']), + dbesc($datarray['link']), + dbesc($datarray['parent']), + intval($seen), + intval($datarray['ntype']), + dbesc($datarray['verb']), + dbesc($datarray['otype']) + ); + + $r = q( + "select id from notify where hash = '%s' and uid = %d limit 1", + dbesc($hash), + intval($recip['channel_id']) + ); + if ($r) { + $notify_id = $r[0]['id']; + } else { + logger('notification not found.'); + pop_lang(); + return; + } + + $itemlink = z_root() . '/notify/view/' . $notify_id; + $msg = str_replace('$itemlink', $itemlink, $epreamble); + + // wretched hack, but we don't want to duplicate all the preamble variations and we also don't want to screw up a translation + + if ((App::$language === 'en' || (! App::$language)) && strpos($msg, ', ')) { + $msg = substr($msg, strpos($msg, ', ') + 1); + } + + $r = q( + "update notify set msg = '%s' where id = %d and uid = %d", + dbesc($msg), + intval($notify_id), + intval($datarray['uid']) + ); + + // send email notification if notification preferences permit + + require_once('bbcode.php'); + if ((intval($recip['channel_notifyflags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { + logger('notification: sending notification email'); + + $hn = get_pconfig($recip['channel_id'], 'system', 'email_notify_host'); + if ($hn && (! stristr(App::get_hostname(), $hn))) { + // this isn't the email notification host + pop_lang(); + return; + } + + $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"), array( "", "\n"), $body))), ENT_QUOTES, 'UTF-8')); + + $htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","
\n"), $body))); + + + // use $_SESSION['zid_override'] to force zid() to use + // the recipient address instead of the current observer + + $_SESSION['zid_override'] = Channel::get_webfinger($recip); + $_SESSION['zrl_override'] = z_root() . '/channel/' . $recip['channel_address']; + + $textversion = zidify_links($textversion); + $htmlversion = zidify_links($htmlversion); + + // unset when done to revert to normal behaviour + + unset($_SESSION['zid_override']); + unset($_SESSION['zrl_override']); + + $datarray = []; + $datarray['banner'] = $banner; + $datarray['product'] = $product; + $datarray['preamble'] = $preamble; + $datarray['sitename'] = $sitename; + $datarray['siteurl'] = $siteurl; + $datarray['type'] = $params['type']; + $datarray['parent'] = $params['parent_mid']; + $datarray['source_name'] = $sender['xchan_name']; + $datarray['source_link'] = $sender['xchan_url']; + $datarray['source_photo'] = $sender['xchan_photo_s']; + $datarray['uid'] = $recip['channel_id']; + $datarray['username'] = $recip['channel_name']; + $datarray['hsitelink'] = $hsitelink; + $datarray['tsitelink'] = $tsitelink; + $datarray['hitemlink'] = '' . $itemlink . ''; + $datarray['titemlink'] = $itemlink; + $datarray['thanks'] = $thanks; + $datarray['site_admin'] = $site_admin; + $datarray['opt_out1'] = $opt_out1; + $datarray['opt_out2'] = $opt_out2; + $datarray['hopt_out2'] = $hopt_out2; + $datarray['title'] = stripslashes($title); + $datarray['htmlversion'] = $htmlversion; + $datarray['textversion'] = $textversion; + $datarray['subject'] = $subject; + $datarray['headers'] = $additional_mail_header; + $datarray['email_secure'] = false; + + Hook::call('enotify_mail', $datarray); + + // Default to private - don't disclose message contents over insecure channels (such as email) + // Might be interesting to use GPG,PGP,S/MIME encryption instead + // but we'll save that for a clever plugin developer to implement + + $private_activity = false; + + if (! $datarray['email_secure']) { + switch ($params['type']) { + case NOTIFY_WALL: + case NOTIFY_TAGSELF: + case NOTIFY_POKE: + case NOTIFY_RESHARE: + case NOTIFY_COMMENT: + if (! $private) { + break; + } + $private_activity = true; + case NOTIFY_MAIL: + $datarray['textversion'] = $datarray['htmlversion'] = $datarray['title'] = ''; + $datarray['subject'] = preg_replace('/' . preg_quote(t('[$Projectname:Notify]'), '/') . '/', '$0*', $datarray['subject']); + break; + default: + break; + } + } + + if ( + $private_activity + && intval(get_pconfig($datarray['uid'], 'system', 'ignore_private_notifications')) + ) { + pop_lang(); + return; + } + + // load the template for private message notifications + $tpl = Theme::get_template('email_notify_html.tpl'); + $email_html_body = replace_macros($tpl, array( + '$banner' => $datarray['banner'], + '$notify_icon' => System::get_site_icon(), + '$product' => $datarray['product'], + '$preamble' => $salutation . '

' . $datarray['preamble'], + '$sitename' => $datarray['sitename'], + '$siteurl' => $datarray['siteurl'], + '$source_name' => $datarray['source_name'], + '$source_link' => $datarray['source_link'], + '$source_photo' => $datarray['source_photo'], + '$username' => $datarray['to_name'], + '$hsitelink' => $datarray['hsitelink'], + '$hitemlink' => $datarray['hitemlink'], + '$thanks' => $datarray['thanks'], + '$site_admin' => $datarray['site_admin'], + '$opt_out1' => $datarray['opt_out1'], + '$opt_out2' => $datarray['hopt_out2'], + '$title' => $datarray['title'], + '$htmlversion' => $datarray['htmlversion'], + )); + + // load the template for private message notifications + $tpl = Theme::get_template('email_notify_text.tpl'); + $email_text_body = replace_macros($tpl, array( + '$banner' => $datarray['banner'], + '$product' => $datarray['product'], + '$preamble' => $salutation . "\n\n" . $datarray['preamble'], + '$sitename' => $datarray['sitename'], + '$siteurl' => $datarray['siteurl'], + '$source_name' => $datarray['source_name'], + '$source_link' => $datarray['source_link'], + '$source_photo' => $datarray['source_photo'], + '$username' => $datarray['to_name'], + '$tsitelink' => $datarray['tsitelink'], + '$titemlink' => $datarray['titemlink'], + '$thanks' => $datarray['thanks'], + '$site_admin' => $datarray['site_admin'], + '$opt_out1' => $datarray['opt_out1'], + '$opt_out2' => $datarray['opt_out2'], + '$title' => $datarray['title'], + '$textversion' => $datarray['textversion'], + )); + + // logger('text: ' . $email_text_body); + + // use the EmailNotification library to send the message + + $to_email = $recip['account_email']; + + $e = get_pconfig($recip['channel_id'], 'system', 'notification_email', false); + if ($e) { + $to_email = $e; + } + + $addrs = explode(',', $to_email); + + foreach ($addrs as $addr) { + self::send(array( + 'fromName' => $sender_name, + 'fromEmail' => $sender_email, + 'replyTo' => $reply_email, + 'toEmail' => $addr, + 'messageSubject' => $datarray['subject'], + 'htmlVersion' => $email_html_body, + 'textVersion' => $email_text_body, + 'additionalMailHeader' => $datarray['headers'], + )); + } + } + + pop_lang(); + } + + + /** + * @brief Send a multipart/alternative message with Text and HTML versions. + * + * @param array $params an assoziative array with: + * * \e string \b fromName name of the sender + * * \e string \b fromEmail email of the sender + * * \e string \b replyTo replyTo address to direct responses + * * \e string \b toEmail destination email address + * * \e string \b messageSubject subject of the message + * * \e string \b htmlVersion html version of the message + * * \e string \b textVersion text only version of the message + * * \e string \b additionalMailHeader additions to the smtp mail header + */ + public static function send($params) + { + + $params['sent'] = false; + $params['result'] = false; + + Hook::call('email_send', $params); + + if ($params['sent']) { + logger("notification: enotify::send (addon) returns " . (($params['result']) ? 'success' : 'failure'), LOGGER_DEBUG); + return $params['result']; + } + + $fromName = email_header_encode(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); + $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'], ENT_QUOTES, 'UTF-8'), 'UTF-8'); + + // generate a mime boundary + $mimeBoundary = rand(0, 9) . "-" + . rand(100000000, 999999999) . "-" + . rand(100000000, 999999999) . "=:" + . rand(10000, 99999); + + // generate a multipart/alternative message header + $messageHeader = + $params['additionalMailHeader'] . + "From: $fromName <{$params['fromEmail']}>" . PHP_EOL . + "Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL . + "MIME-Version: 1.0" . PHP_EOL . + "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; + + // assemble the final multipart message body with the text and html types included + $textBody = chunk_split(base64_encode($params['textVersion'])); + $htmlBody = chunk_split(base64_encode($params['htmlVersion'])); + + $multipartMessageBody = + "--" . $mimeBoundary . PHP_EOL . // plain text section + "Content-Type: text/plain; charset=UTF-8" . PHP_EOL . + "Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL . + $textBody . PHP_EOL . + "--" . $mimeBoundary . PHP_EOL . // text/html section + "Content-Type: text/html; charset=UTF-8" . PHP_EOL . + "Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL . + $htmlBody . PHP_EOL . + "--" . $mimeBoundary . "--" . PHP_EOL; // message ending + + // send the message + $res = mail( + $params['toEmail'], // send to address + $messageSubject, // subject + $multipartMessageBody, // message body + $messageHeader // message headers + ); + logger("notification: enotify::send returns " . (($res) ? 'success' : 'failure'), LOGGER_DEBUG); + return $res; + } + + public static function format($item) + { + + $ret = ''; + + $expire = intval(get_config('system', 'default_expire_days')); + $expire_date = (($expire) ? datetime_convert('UTC', 'UTC', 'now - ' . $expire . ' days') : NULL_DATE); + + require_once('include/conversation.php'); + + // Call localize_item to get a one line status for activities. + // This should set $item['localize'] to indicate we have a brief summary. + // and perhaps $item['shortlocalize'] for an even briefer summary + + localize_item($item); + + if ($item['shortlocalize']) { + $itemem_text = $item['shortlocalize']; + } elseif ($item['localize']) { + $itemem_text = $item['localize']; + } else { + $itemem_text = (($item['item_thread_top']) + ? t('created a new post') + : sprintf(t('reacted to %s\'s conversation'), $item['owner']['xchan_name'])); + if ($item['verb'] === 'Announce') { + $itemem_text = sprintf(t('shared %s\'s post'), $item['owner']['xchan_name']); + } + } + if ($item['item_private'] == 2) { + $itemem_text = t('sent a direct message'); + } + + $edit = false; + + if ($item['edited'] > $item['created']) { + if ($item['item_thread_top']) { + $itemem_text = sprintf(t('edited a post dated %s'), relative_date($item['created'])); + $edit = true; + } else { + $itemem_text = sprintf(t('edited a comment dated %s'), relative_date($item['created'])); + $edit = true; + } + } + + if (LibBlock::fetch_by_entity(local_channel(), $item['author']['xchan_hash'])) { + return []; + } + + // convert this logic into a json array just like the system notifications + + $x = array( + 'notify_link' => $item['llink'], + 'name' => $item['author']['xchan_name'], + 'addr' => $item['author']['xchan_addr'], + 'url' => $item['author']['xchan_url'], + 'photo' => $item['author']['xchan_photo_s'], + 'when' => relative_date(($edit) ? $item['edited'] : $item['created']), + 'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'), + 'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? gen_link_id($item['thr_parent']) : gen_link_id($item['mid'])), + 'notify_id' => 'undefined', + 'thread_top' => (($item['item_thread_top']) ? true : false), + 'message' => strip_tags(bbcode($itemem_text)), + // these are for the superblock addon + 'hash' => $item['author']['xchan_hash'], + 'uid' => local_channel(), + 'display' => true + ); + + $post_date = (($edit) ? $item['edited'] : $item['created']); + if ($post_date && $post_date < $expire_date) { + return []; + } + + Hook::call('enotify_format', $x); + if (! $x['display']) { + return []; + } + + return $x; + } +} diff --git a/Code/Lib/ExtendedZip.php b/Code/Lib/ExtendedZip.php new file mode 100644 index 000000000..b0f9f5845 --- /dev/null +++ b/Code/Lib/ExtendedZip.php @@ -0,0 +1,63 @@ +addEmptyDir($localname); + } + $this->_addTree($dirname, $localname); + } + + // Internal function, to recurse + protected function _addTree($dirname, $localname) + { + $dir = opendir($dirname); + while ($filename = readdir($dir)) { + // Discard . and .. + if ($filename == '.' || $filename == '..') { + continue; + } + + // Proceed according to type + $path = $dirname . '/' . $filename; + $localpath = $localname ? ($localname . '/' . $filename) : $filename; + if (is_dir($path)) { + // Directory: add & recurse + $this->addEmptyDir($localpath); + $this->_addTree($path, $localpath); + } elseif (is_file($path)) { + // File: just add + $this->addFile($path, $localpath); + } + } + closedir($dir); + } + + // Helper function + public static function zipTree($dirname, $zipFilename, $flags = 0, $localname = '') + { + $zip = new self(); + $zip->open($zipFilename, $flags); + $zip->addTree($dirname, $localname); + $zip->close(); + } +} diff --git a/Code/Lib/Features.php b/Code/Lib/Features.php new file mode 100644 index 000000000..9317d9dcb --- /dev/null +++ b/Code/Lib/Features.php @@ -0,0 +1,572 @@ + $uid, 'feature' => $feature, 'enabled' => $x); + Hook::call('feature_enabled', $arr); + return($arr['enabled']); + } + + public static function get_default($feature) + { + $f = Features::get(false); + foreach ($f as $cat) { + foreach ($cat as $feat) { + if (is_array($feat) && $feat[0] === $feature) { + return $feat[3]; + } + } + } + return false; + } + + + public static function level($feature, $def) + { + $x = get_config('feature_level', $feature); + if ($x !== false) { + return intval($x); + } + return $def; + } + + public static function get($filtered = true, $level = (-1)) + { + + $account = App::get_account(); + + $arr = [ + + // General + 'general' => [ + + t('General Features'), + + [ + 'start_menu', + t('New Member Links'), + t('Display new member quick links menu'), + (($account && $account['account_created'] > datetime_convert('', '', 'now - 30 days')) ? true : false), + get_config('feature_lock', 'start_menu'), + self::level('start_menu', 1), + ], + + [ + 'advanced_profiles', + t('Advanced Profiles'), + t('Additional profile sections and selections'), + false, + get_config('feature_lock', 'advanced_profiles'), + self::level('advanced_profiles', 1), + ], + + + // [ + // 'profile_export', + // t('Profile Import/Export'), + // t('Save and load profile details across sites/channels'), + // false, + // get_config('feature_lock','profile_export'), + // self::level('profile_export',3), + // ], + + // [ + // 'webpages', + // t('Web Pages'), + // t('Provide managed web pages on your channel'), + // false, + // get_config('feature_lock','webpages'), + // self::level('webpages',3), + // ], + + // [ + // 'wiki', + // t('Wiki'), + // t('Provide a wiki for your channel'), + // false, + // get_config('feature_lock','wiki'), + // self::level('wiki',2), + // ], + + /* + [ + 'hide_rating', + t('Hide Rating'), + t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'), + false, + get_config('feature_lock','hide_rating'), + self::level('hide_rating',3), + ], + */ + [ + 'private_notes', + t('Private Notes'), + t('Enables a tool to store notes and reminders (note: not encrypted)'), + false, + get_config('feature_lock', 'private_notes'), + self::level('private_notes', 1), + ], + + + // [ + // 'cards', + // t('Cards'), + // t('Create personal planning cards'), + // false, + // get_config('feature_lock','cards'), + // self::level('cards',1), + // ], + + + [ + 'articles', + t('Articles'), + t('Create interactive articles'), + false, + get_config('feature_lock', 'articles'), + self::level('articles', 1), + ], + + // [ + // 'nav_channel_select', + // t('Navigation Channel Select'), + // t('Change channels directly from within the navigation dropdown menu'), + // false, + // get_config('feature_lock','nav_channel_select'), + // self::level('nav_channel_select',3), + // ], + + [ + 'photo_location', + t('Photo Location'), + t('If location data is available on uploaded photos, link this to a map.'), + false, + get_config('feature_lock', 'photo_location'), + self::level('photo_location', 2), + ], + + + // [ + // 'ajaxchat', + // t('Access Controlled Chatrooms'), + // t('Provide chatrooms and chat services with access control.'), + // true, + // get_config('feature_lock','ajaxchat'), + // self::level('ajaxchat',1), + // ], + + + // [ + // 'smart_birthdays', + // t('Smart Birthdays'), + // t('Make birthday events timezone aware in case your friends are scattered across the planet.'), + // true, + // get_config('feature_lock','smart_birthdays'), + // self::level('smart_birthdays',2), + // ], + + [ + 'event_tz_select', + t('Event Timezone Selection'), + t('Allow event creation in timezones other than your own.'), + false, + get_config('feature_lock', 'event_tz_select'), + self::level('event_tz_select', 2), + ], + + + // [ + // 'premium_channel', + // t('Premium Channel'), + // t('Allows you to set restrictions and terms on those that connect with your channel'), + // false, + // get_config('feature_lock','premium_channel'), + // self::level('premium_channel',4), + // ], + + [ + 'advanced_dirsearch', + t('Advanced Directory Search'), + t('Allows creation of complex directory search queries'), + false, + get_config('feature_lock', 'advanced_dirsearch'), + self::level('advanced_dirsearch', 4), + ], + + [ + 'advanced_theming', + t('Advanced Theme and Layout Settings'), + t('Allows fine tuning of themes and page layouts'), + false, + get_config('feature_lock', 'advanced_theming'), + self::level('advanced_theming', 4), + ], + ], + + + 'access_control' => [ + t('Access Control and Permissions'), + + [ + 'groups', + t('Privacy Groups'), + t('Enable management and selection of privacy groups'), + false, + get_config('feature_lock', 'groups'), + self::level('groups', 0), + ], + + // [ + // 'multi_profiles', + // t('Multiple Profiles'), + // t('Ability to create multiple profiles'), + // false, + // get_config('feature_lock','multi_profiles'), + // self::level('multi_profiles',3), + // ], + + + [ + 'permcats', + t('Permission Categories'), + t('Create custom connection permission limits'), + true, + get_config('feature_lock','permcats'), + self::level('permcats',2), + ], + + // [ + // 'oauth_clients', + // t('OAuth1 Clients'), + // t('Manage OAuth1 authenticatication tokens for mobile and remote apps.'), + // false, + // get_config('feature_lock','oauth_clients'), + // self::level('oauth_clients',1), + // ], + + [ + 'oauth2_clients', + t('OAuth2 Clients'), + t('Manage OAuth2 authenticatication tokens for mobile and remote apps.'), + false, + get_config('feature_lock', 'oauth2_clients'), + self::level('oauth2_clients', 1), + ], + + // [ + // 'access_tokens', + // t('Access Tokens'), + // t('Create access tokens so that non-members can access private content.'), + // false, + // get_config('feature_lock','access_tokens'), + // self::level('access_tokens',2), + // ], + + ], + + // Post composition + 'composition' => [ + + t('Post Composition Features'), + + // [ + // 'large_photos', + // t('Large Photos'), + // t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'), + // false, + // get_config('feature_lock','large_photos'), + // self::level('large_photos',1), + // ], + + // [ + // 'channel_sources', + // t('Channel Sources'), + // t('Automatically import channel content from other channels or feeds'), + // false, + // get_config('feature_lock','channel_sources'), + // self::level('channel_sources',3), + // ], + + [ + 'content_encrypt', + t('Browser Encryption'), + t('Provide optional browser-to-browser encryption of content with a shared secret key'), + true, + get_config('feature_lock', 'content_encrypt'), + self::level('content_encrypt', 3), + ], + + // [ + // 'consensus_tools', + // t('Enable Voting Tools'), + // t('Provide a class of post which others can vote on'), + // false, + // get_config('feature_lock','consensus_tools'), + // self::level('consensus_tools',3), + // ], + + // [ + // 'disable_comments', + // t('Disable Comments'), + // t('Provide the option to disable comments for a post'), + // false, + // get_config('feature_lock','disable_comments'), + // self::level('disable_comments',2), + // ], + + // [ + // 'delayed_posting', + // t('Delayed Posting'), + // t('Allow posts to be published at a later date'), + // false, + // get_config('feature_lock','delayed_posting'), + // self::level('delayed_posting',2), + // ], + + // [ + // 'content_expire', + // t('Content Expiration'), + // t('Remove posts/comments and/or private messages at a future time'), + // false, + // get_config('feature_lock','content_expire'), + // self::level('content_expire',1), + // ], + + [ + 'suppress_duplicates', + t('Suppress Duplicate Posts/Comments'), + t('Prevent posts with identical content to be published with less than two minutes in between submissions.'), + true, + get_config('feature_lock', 'suppress_duplicates'), + self::level('suppress_duplicates', 1), + ], + + [ + 'auto_save_draft', + t('Auto-save drafts of posts and comments'), + t('Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions'), + true, + get_config('feature_lock', 'auto_save_draft'), + self::level('auto_save_draft', 1), + ], + + ], + + // Network Tools + 'net_module' => [ + + t('Network and Stream Filtering'), + + [ + 'archives', + t('Search by Date'), + t('Ability to select posts by date ranges'), + false, + get_config('feature_lock', 'archives'), + self::level('archives', 1), + ], + + + [ + 'savedsearch', + t('Saved Searches'), + t('Save search terms for re-use'), + false, + get_config('feature_lock', 'savedsearch'), + self::level('savedsearch', 2), + ], + + [ + 'order_tab', + t('Alternate Stream Order'), + t('Ability to order the stream by last post date, last comment date or unthreaded activities'), + false, + get_config('feature_lock', 'order_tab'), + self::level('order_tab', 2), + ], + + [ + 'name_tab', + t('Contact Filter'), + t('Ability to display only posts of a selected contact'), + false, + get_config('feature_lock', 'name_tab'), + self::level('name_tab', 1), + ], + + [ + 'forums_tab', + t('Forum Filter'), + t('Ability to display only posts of a specific forum'), + false, + get_config('feature_lock', 'forums_tab'), + self::level('forums_tab', 1), + ], + + [ + 'personal_tab', + t('Personal Posts Filter'), + t('Ability to display only posts that you\'ve interacted on'), + false, + get_config('feature_lock', 'personal_tab'), + self::level('personal_tab', 1), + ], + + [ + 'affinity', + t('Affinity Tool'), + t('Filter stream activity by depth of relationships'), + false, + get_config('feature_lock', 'affinity'), + self::level('affinity', 1), + ], + + [ + 'suggest', + t('Suggest Channels'), + t('Show friend and connection suggestions'), + false, + get_config('feature_lock', 'suggest'), + self::level('suggest', 1), + ], + + [ + 'connfilter', + t('Connection Filtering'), + t('Filter incoming posts from connections based on keywords/content'), + false, + get_config('feature_lock', 'connfilter'), + self::level('connfilter', 3), + ], + + + ], + + // Item tools + 'tools' => [ + + t('Post/Comment Tools'), + + [ + 'commtag', + t('Community Tagging'), + t('Ability to tag existing posts'), + false, + get_config('feature_lock', 'commtag'), + self::level('commtag', 1), + ], + + [ + 'categories', + t('Post Categories'), + t('Add categories to your posts'), + false, + get_config('feature_lock', 'categories'), + self::level('categories', 1), + ], + + [ + 'emojis', + t('Emoji Reactions'), + t('Add emoji reaction ability to posts'), + true, + get_config('feature_lock', 'emojis'), + self::level('emojis', 1), + ], + + [ + 'filing', + t('Saved Folders'), + t('Ability to file posts under folders'), + false, + get_config('feature_lock', 'filing'), + self::level('filing', 2), + ], + + [ + 'dislike', + t('Dislike Posts'), + t('Ability to dislike posts/comments'), + false, + get_config('feature_lock', 'dislike'), + self::level('dislike', 1), + ], + + // [ + // 'star_posts', + // t('Star Posts'), + // t('Ability to mark special posts with a star indicator'), + // false, + // get_config('feature_lock','star_posts'), + // self::level('star_posts',1), + // ], + // + [ + 'tagadelic', + t('Tag Cloud'), + t('Provide a personal tag cloud on your channel page'), + false, + get_config('feature_lock', 'tagadelic'), + self::level('tagadelic', 2), + ], + ], + ]; + + $x = [ 'features' => $arr, ]; + Hook::call('get_features', $x); + + $arr = $x['features']; + + // removed any locked features and remove the entire category if this makes it empty + + if ($filtered) { + $narr = []; + foreach ($arr as $k => $x) { + $narr[$k] = [ $arr[$k][0] ]; + $has_items = false; + for ($y = 0; $y < count($arr[$k]); $y++) { + $disabled = false; + if (is_array($arr[$k][$y])) { + if ($arr[$k][$y][4] !== false) { + $disabled = true; + } + if (! $disabled) { + $has_items = true; + $narr[$k][$y] = $arr[$k][$y]; + } + } + } + if (! $has_items) { + unset($narr[$k]); + } + } + } else { + $narr = $arr; + } + + return $narr; + } + + + + +} diff --git a/Code/Lib/Hashpath.php b/Code/Lib/Hashpath.php new file mode 100644 index 000000000..b8d9fbe91 --- /dev/null +++ b/Code/Lib/Hashpath.php @@ -0,0 +1,57 @@ + + * + * @param string $src + * @param string $media change media attribute (default to 'screen') + */ + public static function add_css($src, $media = 'screen') + { + App::$css_sources[] = [ $src, $media ]; + } + + public static function remove_css($src, $media = 'screen') + { + + $index = array_search([$src, $media], App::$css_sources); + if ($index !== false) { + unset(App::$css_sources[$index]); + } + // re-index the array + App::$css_sources = array_values(App::$css_sources); + } + + public static function get_css() + { + $str = EMPTY_STR; + $sources = App::$css_sources; + if (is_array($sources) && $sources) { + foreach ($sources as $source) { + $str .= self::format_css_if_exists($source); + } + } + + return $str; + } + + public static function add_link($arr) + { + if ($arr) { + App::$linkrel[] = $arr; + } + } + + public static function get_links() + { + $str = ''; + $sources = App::$linkrel; + if (is_array($sources) && $sources) { + foreach ($sources as $source) { + if (is_array($source) && $source) { + $str .= ' $v) { + $str .= ' ' . $k . '="' . $v . '"'; + } + $str .= ' />' . "\r\n"; + } + } + } + + return $str; + } + + public static function format_css_if_exists($source) + { + + // script_path() returns https://yoursite.tld + + $path_prefix = self::script_path(); + + $script = $source[0]; + + if (strpos($script, '/') !== false) { + // The script is a path relative to the server root + $path = $script; + // If the url starts with // then it's an absolute URL + if (substr($script, 0, 2) === '//') { + $path_prefix = ''; + } + } else { + // It's a file from the theme + $path = '/' . Theme::include($script); + } + + if ($path) { + $qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION; + return '' . "\r\n"; + } + } + + /** + * This basically calculates the baseurl. We have other functions to do that, but + * there was an issue with script paths and mixed-content whose details are arcane + * and perhaps lost in the message archives. The short answer is that we're ignoring + * the URL which we are "supposed" to use, and generating script paths relative to + * the URL which we are currently using; in order to ensure they are found and aren't + * blocked due to mixed content issues. + * + * @return string + */ + public static function script_path() + { + if (x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) { + $scheme = 'https'; + } elseif (x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) { + $scheme = 'https'; + } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') { + $scheme = 'https'; + } else { + $scheme = 'http'; + } + + // Some proxy setups may require using http_host + + if (isset(App::$config['system']['script_path_use_http_host']) && intval(App::$config['system']['script_path_use_http_host'])) { + $server_var = 'HTTP_HOST'; + } else { + $server_var = 'SERVER_NAME'; + } + + + if (x($_SERVER, $server_var)) { + $hostname = $_SERVER[$server_var]; + } else { + return z_root(); + } + + return $scheme . '://' . $hostname; + } + + public static function add_js($src, $priority = 0) + { + if (! (isset(App::$js_sources[$priority]) && is_array(App::$js_sources[$priority]))) { + App::$js_sources[$priority] = []; + } + App::$js_sources[$priority][] = $src; + } + + public static function remove_js($src, $priority = 0) + { + + $index = array_search($src, App::$js_sources[$priority]); + if ($index !== false) { + unset(App::$js_sources[$priority][$index]); + } + } + + /** + * We should probably try to register main.js with a high priority, but currently + * we handle it separately and put it at the end of the html head block in case + * any other javascript is added outside the head_add_js construct. + * + * @return string + */ + public static function get_js() + { + + $str = ''; + if (App::$js_sources) { + ksort(App::$js_sources, SORT_NUMERIC); + foreach (App::$js_sources as $sources) { + if (count($sources)) { + foreach ($sources as $source) { + if ($source === 'main.js') { + continue; + } + $str .= self::format_js_if_exists($source); + } + } + } + } + + return $str; + } + + public static function get_main_js() + { + return self::format_js_if_exists('main.js', true); + } + + public static function format_js_if_exists($source) + { + $path_prefix = self::script_path(); + + if (strpos($source, '/') !== false) { + // The source is a known path on the system + $path = $source; + // If the url starts with // then it's an absolute URL + if (substr($source, 0, 2) === '//') { + $path_prefix = ''; + } + } else { + // It's a file from the theme + $path = '/' . Theme::include($source); + } + if ($path) { + $qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION; + return '' . "\r\n" ; + } + } + +} \ No newline at end of file diff --git a/Code/Lib/IConfig.php b/Code/Lib/IConfig.php new file mode 100644 index 000000000..de016c8f0 --- /dev/null +++ b/Code/Lib/IConfig.php @@ -0,0 +1,182 @@ + $family, 'k' => $key, 'v' => $value, 'sharing' => $sharing); + + if (is_null($idx)) { + $item['iconfig'][] = $entry; + } else { + $item['iconfig'][$idx] = $entry; + } + return $value; + } + + if (intval($item)) { + $iid = intval($item); + } + + if (! $iid) { + return false; + } + + if (self::Get($item, $family, $key) === false) { + $r = q( + "insert into iconfig( iid, cat, k, v, sharing ) values ( %d, '%s', '%s', '%s', %d ) ", + intval($iid), + dbesc($family), + dbesc($key), + dbesc($dbvalue), + intval($sharing) + ); + } else { + $r = q( + "update iconfig set v = '%s', sharing = %d where iid = %d and cat = '%s' and k = '%s' ", + dbesc($dbvalue), + intval($sharing), + intval($iid), + dbesc($family), + dbesc($key) + ); + } + + if (! $r) { + return false; + } + + return $value; + } + + + + public static function Delete(&$item, $family, $key) + { + + + $is_item = false; + $idx = null; + + if (is_array($item)) { + $is_item = true; + if (is_array($item['iconfig'])) { + for ($x = 0; $x < count($item['iconfig']); $x++) { + if ($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) { + unset($item['iconfig'][$x]); + } + } + // re-order the array index + $item['iconfig'] = array_values($item['iconfig']); + } + return true; + } + + if (intval($item)) { + $iid = intval($item); + } + + if (! $iid) { + return false; + } + + return q( + "delete from iconfig where iid = %d and cat = '%s' and k = '%s' ", + intval($iid), + dbesc($family), + dbesc($key) + ); + } +} diff --git a/Code/Lib/Img_cache.php b/Code/Lib/Img_cache.php new file mode 100644 index 000000000..1c6058c13 --- /dev/null +++ b/Code/Lib/Img_cache.php @@ -0,0 +1,83 @@ += self::$cache_life) { + Run::Summon(['Cache_image', $url, $path]); + return false; + } else { + return ((filesize($path)) ? true : false); + } + } + + // Cache_image invokes url_to_cache() as a background task + + Run::Summon(['Cache_image', $url, $path]); + return false; + } + + public static function url_to_cache($url, $file) + { + + $fp = fopen($file, 'wb'); + + if (!$fp) { + logger('failed to open storage file: ' . $file, LOGGER_NORMAL, LOG_ERR); + return false; + } + + // don't check certs, and since we're running in the background, + // allow a two-minute timeout rather than the default one minute. + // This is a compromise. We want to cache all the slow sites we can, + // but don't want to rack up too many processes doing so. + + $redirects = 0; + $x = z_fetch_url($url, true, $redirects, ['filep' => $fp, 'novalidate' => true, 'timeout' => 120]); + + fclose($fp); + + if ($x['success'] && file_exists($file)) { + $i = @getimagesize($file); + if ($i && $i[2]) { // looking for non-zero imagetype + Run::Summon(['CacheThumb', basename($file)]); + return true; + } + } + + // We could not cache the image for some reason. Leave an empty file here + // to provide a record of the attempt. We'll use this as a flag to avoid + // doing it again repeatedly. + + file_put_contents($file, EMPTY_STR); + logger('cache failed from ' . $url); + return false; + } +} diff --git a/Code/Lib/Img_filesize.php b/Code/Lib/Img_filesize.php new file mode 100644 index 000000000..1ee2d4127 --- /dev/null +++ b/Code/Lib/Img_filesize.php @@ -0,0 +1,127 @@ +url = $url; + } + + public function getSize() + { + $size = null; + + if (stripos($this->url, z_root() . '/photo') !== false) { + $size = self::getLocalFileSize($this->url); + } + if (!$size) { + $size = getRemoteFileSize($this->url); + } + + return $size; + } + + + public static function getLocalFileSize($url) + { + + $fname = basename($url); + $resolution = 0; + + if (strpos($fname, '.') !== false) { + $fname = substr($fname, 0, strpos($fname, '.')); + } + + if (substr($fname, -2, 1) == '-') { + $resolution = intval(substr($fname, -1, 1)); + $fname = substr($fname, 0, -2); + } + + $r = q( + "SELECT filesize FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", + dbesc($fname), + intval($resolution) + ); + if ($r) { + return $r[0]['filesize']; + } + return null; + } +} + +/** + * Try to determine the size of a remote file by making an HTTP request for + * a byte range, or look for the content-length header in the response. + * The function aborts the transfer as soon as the size is found, or if no + * length headers are returned, it aborts the transfer. + * + * @return int|null null if size could not be determined, or length of content + */ +function getRemoteFileSize($url) +{ + $ch = curl_init($url); + + $headers = array( + 'Range: bytes=0-1', + 'Connection: close', + ); + + $in_headers = true; + $size = null; + + curl_setopt($ch, CURLOPT_HEADER, 1); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2450.0 Iron/46.0.2450.0'); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($ch, CURLOPT_VERBOSE, 0); // set to 1 to debug + curl_setopt($ch, CURLOPT_STDERR, fopen('php://output', 'r')); + + curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $line) use (&$in_headers, &$size) { + $length = strlen($line); + + if (trim($line) == '') { + $in_headers = false; + } + + list($header, $content) = explode(':', $line, 2); + $header = strtolower(trim($header)); + + if ($header == 'content-range') { + // found a content-range header + list($rng, $s) = explode('/', $content, 2); + $size = (int)$s; + return 0; // aborts transfer + } elseif ($header == 'content-length' && 206 != curl_getinfo($curl, CURLINFO_HTTP_CODE)) { + // found content-length header and this is not a 206 Partial Content response (range response) + $size = (int)$content; + return 0; + } else { + // continue + return $length; + } + }); + + curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($curl, $data) use ($in_headers) { + if (!$in_headers) { + // shouldn't be here unless we couldn't determine file size + // abort transfer + return 0; + } + + // write function is also called when reading headers + return strlen($data); + }); + + curl_exec($ch); + curl_getinfo($ch); + curl_close($ch); + + return $size; +} diff --git a/Code/Lib/Infocon.php b/Code/Lib/Infocon.php new file mode 100644 index 000000000..5e77717b6 --- /dev/null +++ b/Code/Lib/Infocon.php @@ -0,0 +1,76 @@ + true, + 'data' => $data, + 'data_type' => $data_type, + 'encoding' => $encoding, + 'alg' => $algorithm, + 'sigs' => [ + 'value' => $signature, + 'key_id' => base64url_encode($key_id, true) + ] + ]); + } + + public static function verify($x) + { + + logger('verify'); + $ret = ['results' => []]; + + if (!is_array($x)) { + return false; + } + if (!(array_key_exists('signed', $x) && $x['signed'])) { + return false; + } + + $signed_data = preg_replace('/\s+/', '', $x['data']) . '.' + . base64url_encode($x['data_type'], true) . '.' + . base64url_encode($x['encoding'], true) . '.' + . base64url_encode($x['alg'], true); + + $key = HTTPSig::get_key(EMPTY_STR, 'zot6', base64url_decode($x['sigs']['key_id'])); + logger('key: ' . print_r($key, true)); + if ($key['portable_id'] && $key['public_key']) { + if (Crypto::verify($signed_data, base64url_decode($x['sigs']['value']), $key['public_key'])) { + logger('verified'); + $ret = ['success' => true, 'signer' => $key['portable_id'], 'hubloc' => $key['hubloc']]; + } + } + + return $ret; + } + + public static function unpack($data) + { + return json_decode(base64url_decode($data), true); + } +} + diff --git a/Code/Lib/Keyutils.php b/Code/Lib/Keyutils.php new file mode 100644 index 000000000..aee7fd33f --- /dev/null +++ b/Code/Lib/Keyutils.php @@ -0,0 +1,102 @@ +loadKey([ + 'e' => new BigInteger($e, 256), + 'n' => new BigInteger($m, 256) + ]); + return $rsa->getPublicKey(); + } + + /** + * @param string key + * @return string + */ + public static function rsaToPem($key) + { + + $rsa = new RSA(); + $rsa->setPublicKey($key); + + return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8); + } + + /** + * @param string key + * @return string + */ + public static function pemToRsa($key) + { + + $rsa = new RSA(); + $rsa->setPublicKey($key); + + return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1); + } + + /** + * @param string $key key + * @param string $m reference modulo + * @param string $e reference exponent + */ + public static function pemToMe($key, &$m, &$e) + { + + $rsa = new RSA(); + $rsa->loadKey($key); + $rsa->setPublicKey(); + + $m = $rsa->modulus->toBytes(); + $e = $rsa->exponent->toBytes(); + } + + /** + * @param string $pubkey + * @return string + */ + public static function salmonKey($pubkey) + { + self::pemToMe($pubkey, $m, $e); + return 'RSA' . '.' . base64url_encode($m, true) . '.' . base64url_encode($e, true); + } + + /** + * @param string $key + * @return string + */ + public static function convertSalmonKey($key) + { + if (strstr($key, ',')) { + $rawkey = substr($key, strpos($key, ',') + 1); + } else { + $rawkey = substr($key, 5); + } + + $key_info = explode('.', $rawkey); + + $m = base64url_decode($key_info[1]); + $e = base64url_decode($key_info[2]); + + return self::meToPem($m, $e); + } +} diff --git a/Code/Lib/LDSignatures.php b/Code/Lib/LDSignatures.php new file mode 100644 index 000000000..99a8dd372 --- /dev/null +++ b/Code/Lib/LDSignatures.php @@ -0,0 +1,139 @@ + 'RsaSignature2017', + 'nonce' => random_string(64), + 'creator' => Channel::url($channel), + 'created' => datetime_convert('UTC', 'UTC', 'now', 'Y-m-d\TH:i:s\Z') + ]; + + $ohash = self::hash(self::signable_options($options)); + $dhash = self::hash(self::signable_data($data)); + $options['signatureValue'] = base64_encode(Crypto::sign($ohash . $dhash, $channel['channel_prvkey'])); + + return $options; + } + + + public static function signable_data($data) + { + + $newdata = []; + if ($data) { + foreach ($data as $k => $v) { + if (!in_array($k, ['signature'])) { + $newdata[$k] = $v; + } + } + } + return json_encode($newdata, JSON_UNESCAPED_SLASHES); + } + + + public static function signable_options($options) + { + + $newopts = ['@context' => 'https://w3id.org/identity/v1']; + if ($options) { + foreach ($options as $k => $v) { + if (!in_array($k, ['type', 'id', 'signatureValue'])) { + $newopts[$k] = $v; + } + } + } + return json_encode($newopts, JSON_UNESCAPED_SLASHES); + } + + public static function hash($obj) + { + + return hash('sha256', self::normalise($obj)); + } + + public static function normalise($data) + { + if (is_string($data)) { + $data = json_decode($data); + } + + if (!is_object($data)) { + return ''; + } + + jsonld_set_document_loader('jsonld_document_loader'); + + try { + $d = jsonld_normalize($data, ['algorithm' => 'URDNA2015', 'format' => 'application/nquads']); + } catch (Exception $e) { + // Don't log the exception - this can exhaust memory + // logger('normalise error:' . print_r($e,true)); + logger('normalise error: ' . print_r($data, true)); + } + + return $d; + } + + public static function salmon_sign($data, $channel) + { + + $arr = $data; + $data = json_encode($data, JSON_UNESCAPED_SLASHES); + $data = base64url_encode($data, false); // do not strip padding + $data_type = 'application/activity+json'; + $encoding = 'base64url'; + $algorithm = 'RSA-SHA256'; + $keyhash = base64url_encode(Channel::url($channel)); + + $data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $data); + + // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods + + $precomputed = '.' . base64url_encode($data_type, false) . '.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='; + + $signature = base64url_encode(Crypto::sign($data . $precomputed, $channel['channel_prvkey'])); + + return ([ + 'id' => $arr['id'], + 'meData' => $data, + 'meDataType' => $data_type, + 'meEncoding' => $encoding, + 'meAlgorithm' => $algorithm, + 'meCreator' => Channel::url($channel), + 'meSignatureValue' => $signature + ]); + } +} diff --git a/Code/Lib/LibBlock.php b/Code/Lib/LibBlock.php new file mode 100644 index 000000000..bce0de6e9 --- /dev/null +++ b/Code/Lib/LibBlock.php @@ -0,0 +1,118 @@ +' ], [ '', '' ], $item); + } + + /** + * Builds a modal dialog for editing permissions, using acl_selector.tpl as the template. + * + * @param array $defaults Optional access control list for the initial state of the dialog. + * @param bool $show_jotnets Whether plugins for federated networks should be included in the permissions dialog + * @param PermissionDescription $emptyACL_description - An optional description for the permission implied by selecting an empty ACL. Preferably an instance of PermissionDescription. + * @param string $dialog_description Optional message to include at the top of the dialog. E.g. "Warning: Post permissions cannot be changed once sent". + * @param string $context_help Allows the dialog to present a help icon. E.g. "acl_dialog_post" + * @param bool $readonly Not implemented yet. When implemented, the dialog will use acl_readonly.tpl instead, so that permissions may be viewed for posts that can no longer have their permissions changed. + * + * @return string html modal dialog built from acl_selector.tpl + */ + public static function populate($defaults = null, $show_jotnets = true, $emptyACL_description = '', $dialog_description = '', $context_help = '', $readonly = false) + { + + $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; + $showall_origin = ''; + $showall_icon = 'fa-globe'; + $role = get_pconfig(local_channel(), 'system', 'permissions_role'); + + if (! $emptyACL_description) { + $showall_caption = t('Visible to your default audience'); + } elseif (is_a($emptyACL_description, '\\Code\\Lib\\PermissionDescription')) { + $showall_caption = $emptyACL_description->get_permission_description(); + $showall_origin = (($role === 'custom') ? $emptyACL_description->get_permission_origin_description() : ''); + $showall_icon = $emptyACL_description->get_permission_icon(); + } else { + // For backwards compatibility we still accept a string... for now! + $showall_caption = $emptyACL_description; + } + + + if (is_array($defaults)) { + $allow_cid = ((strlen($defaults['allow_cid'])) + ? explode('><', $defaults['allow_cid']) : [] ); + $allow_gid = ((strlen($defaults['allow_gid'])) + ? explode('><', $defaults['allow_gid']) : [] ); + $deny_cid = ((strlen($defaults['deny_cid'])) + ? explode('><', $defaults['deny_cid']) : [] ); + $deny_gid = ((strlen($defaults['deny_gid'])) + ? explode('><', $defaults['deny_gid']) : [] ); + array_walk($allow_cid, ['\\Code\\Lib\\Libacl', 'fixacl']); + array_walk($allow_gid, ['\\Code\\Lib\\Libacl', 'fixacl']); + array_walk($deny_cid, ['\\Code\\Lib\\Libacl','fixacl']); + array_walk($deny_gid, ['\\Code\\Lib\\Libacl','fixacl']); + } + + $channel = ((local_channel()) ? App::get_channel() : ''); + $has_acl = false; + $single_group = false; + $just_me = false; + $custom = false; + + if ($allow_cid || $allow_gid || $deny_gid || $deny_cid) { + $has_acl = true; + $custom = true; + } + + if (count($allow_gid) === 1 && (! $allow_cid) && (! $deny_gid) && (! $deny_cid)) { + $single_group = true; + $custom = false; + } + + if (count($allow_cid) === 1 && $channel && $allow_cid[0] === $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) { + $just_me = true; + $custom = false; + } + + $groups = EMPTY_STR; + + $r = q( + "SELECT id, hash, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval(local_channel()) + ); + + if ($r) { + foreach ($r as $rr) { + $selected = (($single_group && $rr['hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } + } + + if ($channel && Apps::system_app_installed($channel['channel_id'], 'Virtual Lists')) { + $selected = (($single_group && 'connections:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + if (get_pconfig($channel['channel_id'], 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) { + $selected = (($single_group && 'activitypub:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } + $selected = (($single_group && 'zot:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } + + + $forums = get_forum_channels(local_channel(), 1); + $selected = false; + if ($forums) { + foreach ($forums as $f) { + $selected = (($single_group && $f['hash'] === $allow_cid[0]) ? ' selected = "selected" ' : ''); + $groups .= '' . "\r\n"; + } + } + + // preset acl with DM to a single xchan (not a group) + if ($selected === false && count($allow_cid) === 1 && $channel && $allow_cid[0] !== $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) { + $f = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($allow_cid[0]) + ); + if ($f) { + $custom = false; + $selected = ' selected="selected" '; + $groups .= '' . "\r\n"; + } + } + + $tpl = Theme::get_template("acl_selector.tpl"); + $o = replace_macros($tpl, array( + '$showall' => $showall_caption, + '$onlyme' => t('Only me'), + '$groups' => $groups, + '$public_selected' => (($has_acl) ? false : ' selected="selected" '), + '$justme_selected' => (($just_me) ? ' selected="selected" ' : ''), + '$custom_selected' => (($custom) ? ' selected="selected" ' : ''), + '$showallOrigin' => $showall_origin, + '$showallIcon' => $showall_icon, + '$select_label' => t('Who can see this?'), + '$custom' => t('Custom selection'), + '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'), + '$show' => t('Show'), + '$hide' => t("Don't show"), + '$search' => t('Search'), + '$allowcid' => json_encode($allow_cid), + '$allowgid' => json_encode($allow_gid), + '$denycid' => json_encode($deny_cid), + '$denygid' => json_encode($deny_gid), + '$aclModalTitle' => t('Permissions'), + '$aclModalDesc' => $dialog_description, + '$aclModalDismiss' => t('Close'), + // '$helpUrl' => (($context_help == '') ? '' : (z_root() . '/help/' . $context_help)) + )); + + return $o; + } + + /** + * Returns a string that's suitable for passing as the $dialog_description argument to a + * populate() call for wall posts or network posts. + * + * This string is needed in 3 different files, and our .po translation system currently + * cannot be used as a string table (because the value is always the key in english) so + * I've centralized the value here (making this function name the "key") until we have a + * better way. + * + * @return string Description to present to user in modal permissions dialog + */ + public static function get_post_aclDialogDescription() + { + + // I'm trying to make two points in this description text - warn about finality of wall + // post permissions, and try to clear up confusion that these permissions set who is + // *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking + // the "Show" button on a group does not post it to the feed of people in that group, it + // mearly allows those people to view the post if they are viewing/following this channel. + $description = t('Post permissions cannot be changed after a post is shared.
These permissions set who is allowed to view the post.'); + + // Lets keep the emphasis styling seperate from the translation. It may change. + //$emphasisOpen = ''; + //$emphasisClose = ''; + + return $description; + } + + +} diff --git a/Code/Lib/Libprofile.php b/Code/Lib/Libprofile.php new file mode 100644 index 000000000..3ac88dea1 --- /dev/null +++ b/Code/Lib/Libprofile.php @@ -0,0 +1,697 @@ + $f) { + if ($k == $qq['k']) { + $p[0][$k] = $qq['v']; + $extra_fields[] = $k; + break; + } + } + } + } + + $p[0]['extra_fields'] = ((isset($extra_fields)) ? $extra_fields : []); + + $z = q( + "select xchan_photo_date, xchan_addr from xchan where xchan_hash = '%s' limit 1", + dbesc($p[0]['channel_hash']) + ); + if ($z) { + $p[0]['picdate'] = $z[0]['xchan_photo_date']; + $p[0]['reddress'] = str_replace('@', '@', unpunify($z[0]['xchan_addr'])); + } + + // fetch user tags if this isn't the default profile + + if (!$p[0]['is_default']) { + $x = q( + "select keywords from profile where uid = %d and is_default = 1 limit 1", + intval($p[0]['profile_uid']) + ); + if ($x && $can_view_profile) { + $p[0]['keywords'] = $x[0]['keywords']; + } + } + + if ($p[0]['keywords']) { + $keywords = str_replace(array('#', ',', ' ', ',,'), array('', ' ', ',', ','), $p[0]['keywords']); + if (strlen($keywords) && $can_view_profile) { + if (!isset(App::$page['htmlhead'])) { + App::$page['htmlhead'] = EMPTY_STR; + } + App::$page['htmlhead'] .= '' . "\r\n"; + } + } + + App::$profile = $p[0]; + App::$profile_uid = $p[0]['profile_uid']; + App::$page['title'] = App::$profile['channel_name'] . " - " . unpunify(Channel::get_webfinger(App::$profile)); + + App::$profile['permission_to_view'] = $can_view_profile; + + if ($can_view_profile) { + $online = Channel::get_online_status($nickname); + App::$profile['online_status'] = $online['result']; + } + + if (local_channel()) { + App::$profile['channel_mobile_theme'] = get_pconfig(local_channel(), 'system', 'mobile_theme'); + $_SESSION['mobile_theme'] = App::$profile['channel_mobile_theme']; + } + + /* + * load/reload current theme info + */ + + // $_SESSION['theme'] = $p[0]['channel_theme']; + } + + public static function edit_menu($uid) + { + + $ret = []; + + $is_owner = (($uid == local_channel()) ? true : false); + + // show edit profile to profile owner + if ($is_owner) { + $ret['menu'] = array( + 'chg_photo' => t('Change profile photo'), + 'entries' => [], + ); + + $multi_profiles = Features::enabled(local_channel(), 'multi_profiles'); + if ($multi_profiles) { + $ret['multi'] = 1; + $ret['edit'] = [z_root() . '/profiles', t('Edit Profiles'), '', t('Edit')]; + $ret['menu']['cr_new'] = t('Create New Profile'); + } else { + $ret['edit'] = [z_root() . '/profiles/' . $uid, t('Edit Profile'), '', t('Edit')]; + } + + $r = q( + "SELECT * FROM profile WHERE uid = %d", + local_channel() + ); + + if ($r) { + foreach ($r as $rr) { + if (!($multi_profiles || $rr['is_default'])) { + continue; + } + + $ret['menu']['entries'][] = [ + 'photo' => $rr['thumb'], + 'id' => $rr['id'], + 'alt' => t('Profile Image'), + 'profile_name' => $rr['profile_name'], + 'isdefault' => $rr['is_default'], + 'visible_to_everybody' => t('Visible to everybody'), + 'edit_visibility' => t('Edit visibility'), + ]; + } + } + } + + return $ret; + } + + /** + * @brief Formats a profile for display in the sidebar. + * + * It is very difficult to templatise the HTML completely + * because of all the conditional logic. + * + * @param array $profile + * @param int $block + * @param bool $show_connect (optional) default true + * @param mixed $zcard (optional) default false + * + * @return HTML string suitable for sidebar inclusion + * Exceptions: Returns empty string if passed $profile is wrong type or not populated + */ + + public static function widget($profile, $block = 0, $show_connect = true, $zcard = false) + { + + $observer = App::get_observer(); + + $o = ''; + $location = false; + $pdesc = true; + $reddress = true; + + if (!perm_is_allowed($profile['uid'], ((is_array($observer)) ? $observer['xchan_hash'] : ''), 'view_profile')) { + $block = true; + } + + if ((!is_array($profile)) && (!count($profile))) { + return $o; + } + + head_set_icon($profile['thumb']); + + if (Channel::is_system($profile['uid'])) { + $show_connect = false; + } + + $profile['picdate'] = urlencode($profile['picdate']); + + /** + * @hooks profile_sidebar_enter + * Called before generating the 'channel sidebar' or mini-profile. + */ + Hook::call('profile_sidebar_enter', $profile); + + $profdm = EMPTY_STR; + $profdm_url = EMPTY_STR; + + $can_dm = perm_is_allowed($profile['uid'], (is_array($observer)) ? $observer['xchan_hash'] : EMPTY_STR, 'post_mail') && intval($observer['xchan_type']) !== XCHAN_TYPE_GROUP ; + + if (intval($profile['uid']) === local_channel()) { + $can_dm = false; + } + + if ($can_dm) { + $dm_path = Libzot::get_rpost_path($observer); + if ($dm_path) { + $profdm = t('Direct Message'); + $profdm_url = $dm_path + . '&to=' + . urlencode($profile['channel_hash']) + . '&body=' + . urlencode('@!{' . $profile['channel_address'] . '@' . App::get_hostname() . '}'); + } + } + + if ($show_connect) { + // This will return an empty string if we're already connected. + + $connect_url = rconnect_url($profile['uid'], get_observer_hash()); + $connect = (($connect_url) ? t('Connect') : ''); + if ($connect_url) { + $connect_url = sprintf($connect_url, urlencode(Channel::get_webfinger($profile))); + } + + // premium channel - over-ride + + if ($profile['channel_pageflags'] & PAGE_PREMIUM) { + $connect_url = z_root() . '/connect/' . $profile['channel_address']; + } + } + + if ( + (x($profile, 'address') == 1) + || (x($profile, 'locality') == 1) + || (x($profile, 'region') == 1) + || (x($profile, 'postal_code') == 1) + || (x($profile, 'country_name') == 1) + ) { + $location = t('Location:'); + } + + $profile['homepage'] = linkify($profile['homepage'], true); + + $gender = ((x($profile, 'gender') == 1) ? t('Gender:') : false); + $marital = ((x($profile, 'marital') == 1) ? t('Status:') : false); + $homepage = ((x($profile, 'homepage') == 1) ? t('Homepage:') : false); + $pronouns = ((x($profile, 'pronouns') == 1) ? t('Pronouns:') : false); + + // zap/osada do not have a realtime chat system at this time so don't show online state + // $profile['online'] = (($profile['online_status'] === 'online') ? t('Online Now') : False); + // logger('online: ' . $profile['online']); + + $profile['online'] = false; + + if (($profile['hidewall'] && (!local_channel()) && (!remote_channel())) || $block) { + $location = $reddress = $pdesc = $gender = $marital = $homepage = false; + } + + if ($profile['gender']) { + $profile['gender_icon'] = self::gender_icon($profile['gender']); + } + + if ($profile['pronouns']) { + $profile['pronouns_icon'] = self::pronouns_icon($profile['pronouns']); + } + + $firstname = ((strpos($profile['channel_name'], ' ')) + ? trim(substr($profile['channel_name'], 0, strpos($profile['channel_name'], ' '))) : $profile['channel_name']); + $lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'], strlen($firstname)))); + + + $contact_block = contact_block(); + + $channel_menu = false; + $menu = get_pconfig($profile['uid'], 'system', 'channel_menu'); + if ($menu && !$block) { + $m = Menu::fetch($menu, $profile['uid'], $observer['xchan_hash']); + if ($m) { + $channel_menu = Menu::render($m); + } + } + $menublock = get_pconfig($profile['uid'], 'system', 'channel_menublock'); + if ($menublock && (!$block)) { + $comanche = new Comanche(); + $channel_menu .= $comanche->block($menublock); + } + + if ($zcard) { + $tpl = Theme::get_template('profile_vcard_short.tpl'); + } else { + $tpl = Theme::get_template('profile_vcard.tpl'); + } + + $o .= replace_macros($tpl, array( + '$zcard' => $zcard, + '$profile' => $profile, + '$connect' => $connect, + '$connect_url' => $connect_url, + '$profdm' => $profdm, + '$profdm_url' => $profdm_url, + '$location' => $location, + '$gender' => $gender, + '$pronouns' => $pronouns, + '$pdesc' => $pdesc, + '$marital' => $marital, + '$homepage' => $homepage, + '$chanmenu' => $channel_menu, + '$reddress' => $reddress, + '$active' => t('Active'), + '$activewhen' => relative_date($profile['channel_lastpost']), + '$rating' => '', + '$contact_block' => $contact_block, + '$change_photo' => t('Change your profile photo'), + '$copyto' => t('Copy to clipboard'), + '$copied' => t('Address copied to clipboard'), + '$editmenu' => self::edit_menu($profile['uid']) + )); + + $arr = [ + 'profile' => $profile, + 'entry' => $o + ]; + + /** + * @hooks profile_sidebar + * Called when generating the 'channel sidebar' or mini-profile. + * * \e array \b profile + * * \e string \b entry - The parsed HTML template + */ + Hook::call('profile_sidebar', $arr); + + return $arr['entry']; + } + + public static function gender_icon($gender) + { + + // logger('gender: ' . $gender); + + // This can easily get throw off if the observer language is different + // than the channel owner language. + + if (strpos(strtolower($gender), strtolower(t('Female'))) !== false) { + return 'venus'; + } + if (strpos(strtolower($gender), strtolower(t('Male'))) !== false) { + return 'mars'; + } + if (strpos(strtolower($gender), strtolower(t('Trans'))) !== false) { + return 'transgender'; + } + if (strpos(strtolower($gender), strtolower(t('Inter'))) !== false) { + return 'transgender'; + } + if (strpos(strtolower($gender), strtolower(t('Neuter'))) !== false) { + return 'neuter'; + } + if (strpos(strtolower($gender), strtolower(t('Non-specific'))) !== false) { + return 'genderless'; + } + + return ''; + } + + public static function pronouns_icon($pronouns) + { + + + // This can easily get throw off if the observer language is different + // than the channel owner language. + + if (strpos(strtolower($pronouns), strtolower(t('She'))) !== false) { + return 'venus'; + } + if (strpos(strtolower($pronouns), strtolower(t('Him'))) !== false) { + return 'mars'; + } + if (strpos(strtolower($pronouns), strtolower(t('Them'))) !== false) { + return 'users'; + } + + return ''; + } + + + public static function advanced() + { + + if (!perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile')) { + return ''; + } + + if (App::$profile['fullname']) { + $profile_fields_basic = Channel::get_profile_fields_basic(); + $profile_fields_advanced = Channel::get_profile_fields_advanced(); + + $advanced = ((Features::enabled(App::$profile['profile_uid'], 'advanced_profiles')) ? true : false); + if ($advanced) { + $fields = $profile_fields_advanced; + } else { + $fields = $profile_fields_basic; + } + + $clean_fields = []; + if ($fields) { + foreach ($fields as $k => $v) { + $clean_fields[] = trim($k); + } + } + + + $tpl = Theme::get_template('profile_advanced.tpl'); + + $profile = []; + + $profile['fullname'] = array(t('Full Name:'), App::$profile['fullname']); + + if (App::$profile['gender']) { + $profile['gender'] = array(t('Gender:'), App::$profile['gender']); + } + + + $ob_hash = get_observer_hash(); +// this may not work at all any more, but definitely won't work correctly if the liked profile belongs to a group +// comment out until we are able to look at it much closer +// if($ob_hash && perm_is_allowed(App::$profile['profile_uid'],$ob_hash,'post_like')) { +// $profile['canlike'] = true; +// $profile['likethis'] = t('Like this channel'); +// $profile['profile_guid'] = App::$profile['profile_guid']; +// } + +// $likers = q("select liker, xchan.* from likes left join xchan on liker = xchan_hash where channel_id = %d and target_type = '%s' and verb = '%s'", +// intval(App::$profile['profile_uid']), +// dbesc(ACTIVITY_OBJ_PROFILE), +// dbesc(ACTIVITY_LIKE) +// ); +// $profile['likers'] = []; +// $profile['like_count'] = count($likers); +// $profile['like_button_label'] = tt('Like','Likes',$profile['like_count'],'noun'); + +// if($likers) { +// foreach($likers as $l) +// $profile['likers'][] = array('name' => $l['xchan_name'],'photo' => zid($l['xchan_photo_s']), 'url' => zid($l['xchan_url'])); +// } + + if ((App::$profile['dob']) && (App::$profile['dob'] != '0000-00-00')) { + $val = ''; + + if ((substr(App::$profile['dob'], 5, 2) === '00') || (substr(App::$profile['dob'], 8, 2) === '00')) { + $val = substr(App::$profile['dob'], 0, 4); + } + + $year_bd_format = t('j F, Y'); + $short_bd_format = t('j F'); + + if (!$val) { + $val = ((intval(App::$profile['dob'])) + ? day_translate(datetime_convert('UTC', 'UTC', App::$profile['dob'] . ' 00:00 +00:00', $year_bd_format)) + : day_translate(datetime_convert('UTC', 'UTC', '2001-' . substr(App::$profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format))); + } + $profile['birthday'] = array(t('Birthday:'), $val); + } + + if ($age = age(App::$profile['dob'], App::$profile['timezone'], '')) { + $profile['age'] = array(t('Age:'), $age); + } + + if (App::$profile['marital']) { + $profile['marital'] = array(t('Status:'), App::$profile['marital']); + } + + if (App::$profile['partner']) { + $profile['marital']['partner'] = zidify_links(bbcode(App::$profile['partner'])); + } + + if (strlen(App::$profile['howlong']) && App::$profile['howlong'] > NULL_DATE) { + $profile['howlong'] = relative_date(App::$profile['howlong'], t('for %1$d %2$s')); + } + + if (App::$profile['keywords']) { + $keywords = str_replace(',', ' ', App::$profile['keywords']); + $keywords = str_replace(' ', ' ', $keywords); + $karr = explode(' ', $keywords); + if ($karr) { + for ($cnt = 0; $cnt < count($karr); $cnt++) { + $karr[$cnt] = '' . $karr[$cnt] . ''; + } + } + $profile['keywords'] = array(t('Tags:'), implode(' ', $karr)); + } + + + if (App::$profile['sexual']) { + $profile['sexual'] = array(t('Sexual Preference:'), App::$profile['sexual']); + } + + if (App::$profile['pronouns']) { + $profile['pronouns'] = array(t('Pronouns:'), App::$profile['pronouns']); + } + + if (App::$profile['homepage']) { + $profile['homepage'] = array(t('Homepage:'), linkify(App::$profile['homepage'])); + } + + if (App::$profile['hometown']) { + $profile['hometown'] = array(t('Hometown:'), linkify(App::$profile['hometown'])); + } + + if (App::$profile['politic']) { + $profile['politic'] = array(t('Political Views:'), App::$profile['politic']); + } + + if (App::$profile['religion']) { + $profile['religion'] = array(t('Religion:'), App::$profile['religion']); + } + + if ($txt = prepare_text(App::$profile['about'])) { + $profile['about'] = array(t('About:'), $txt); + } + + if ($txt = prepare_text(App::$profile['interest'])) { + $profile['interest'] = array(t('Hobbies/Interests:'), $txt); + } + + if ($txt = prepare_text(App::$profile['likes'])) { + $profile['likes'] = array(t('Likes:'), $txt); + } + + if ($txt = prepare_text(App::$profile['dislikes'])) { + $profile['dislikes'] = array(t('Dislikes:'), $txt); + } + + if ($txt = prepare_text(App::$profile['contact'])) { + $profile['contact'] = array(t('Contact information and Social Networks:'), $txt); + } + + if ($txt = prepare_text(App::$profile['channels'])) { + $profile['channels'] = array(t('My other channels:'), $txt); + } + + if ($txt = prepare_text(App::$profile['music'])) { + $profile['music'] = array(t('Musical interests:'), $txt); + } + + if ($txt = prepare_text(App::$profile['book'])) { + $profile['book'] = array(t('Books, literature:'), $txt); + } + + if ($txt = prepare_text(App::$profile['tv'])) { + $profile['tv'] = array(t('Television:'), $txt); + } + + if ($txt = prepare_text(App::$profile['film'])) { + $profile['film'] = array(t('Film/dance/culture/entertainment:'), $txt); + } + + if ($txt = prepare_text(App::$profile['romance'])) { + $profile['romance'] = array(t('Love/Romance:'), $txt); + } + + if ($txt = prepare_text(App::$profile['employment'])) { + $profile['employment'] = array(t('Work/employment:'), $txt); + } + + if ($txt = prepare_text(App::$profile['education'])) { + $profile['education'] = array(t('School/education:'), $txt); + } + + if (App::$profile['extra_fields']) { + foreach (App::$profile['extra_fields'] as $f) { + $x = q( + "select * from profdef where field_name = '%s' limit 1", + dbesc($f) + ); + if ($x && $txt = prepare_text(App::$profile[$f])) { + $profile[$f] = array($x[0]['field_desc'] . ':', $txt); + } + } + $profile['extra_fields'] = App::$profile['extra_fields']; + } + + $things = get_things(App::$profile['profile_guid'], App::$profile['profile_uid']); + + + // logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); + + // $exportlink = ((App::$profile['profile_vcard']) ? zid(z_root() . '/profile/' . App::$profile['channel_address'] . '/vcard') : ''); + + return replace_macros($tpl, array( + '$title' => t('Profile'), + '$canlike' => (($profile['canlike']) ? true : false), + '$likethis' => t('Like this thing'), + '$export' => t('Export'), + '$exportlink' => '', // $exportlink, + '$profile' => $profile, + '$fields' => $clean_fields, + '$editmenu' => self::edit_menu(App::$profile['profile_uid']), + '$things' => $things + )); + } + + return ''; + } +} diff --git a/Code/Lib/Libsync.php b/Code/Lib/Libsync.php new file mode 100644 index 000000000..5277bc62a --- /dev/null +++ b/Code/Lib/Libsync.php @@ -0,0 +1,1303 @@ + $channel['channel_address'], 'url' => z_root()]; + + if (array_key_exists($uid, App::$config) && array_key_exists('transient', App::$config[$uid])) { + $settings = App::$config[$uid]['transient']; + if ($settings) { + $info['config'] = $settings; + } + } + + if ($channel) { + $info['channel'] = []; + foreach ($channel as $k => $v) { + // filter out any joined tables like xchan + + if (strpos($k, 'channel_') !== 0) { + continue; + } + + // don't pass these elements, they should not be synchronised + + + $disallowed = ['channel_id', 'channel_account_id', 'channel_primary', 'channel_address', + 'channel_deleted', 'channel_removed', 'channel_system']; + + if (!$keychange) { + $disallowed[] = 'channel_prvkey'; + } + + if (in_array($k, $disallowed)) { + continue; + } + + $info['channel'][$k] = $v; + } + } + + if ($groups_changed) { + $r = q( + "select hash as collection, visible, deleted, rule, gname as name from pgrp where uid = %d ", + intval($uid) + ); + if ($r) { + $info['collections'] = $r; + } + + $r = q( + "select pgrp.hash as collection, pgrp_member.xchan as member from pgrp left join pgrp_member on pgrp.id = pgrp_member.gid + where pgrp_member.uid = %d ", + intval($uid) + ); + if ($r) { + $info['collection_members'] = $r; + } + } + + $interval = get_config('system', 'delivery_interval', 2); + + logger('Packet: ' . print_r($info, true), LOGGER_DATA, LOG_DEBUG); + + $total = count($synchubs); + + foreach ($synchubs as $hub) { + $hash = random_string(); + $n = Libzot::build_packet($channel, 'sync', $env_recips, json_encode($info), 'red', $hub['hubloc_sitekey'], $hub['site_crypto']); + Queue::insert([ + 'hash' => $hash, + 'account_id' => $channel['channel_account_id'], + 'channel_id' => $channel['channel_id'], + 'posturl' => $hub['hubloc_callback'], + 'notify' => $n, + 'msg' => EMPTY_STR + ]); + + + $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); + if (intval($x[0]['total']) > intval(get_config('system', 'force_queue_threshold', 3000))) { + logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); + Queue::update($hash); + continue; + } + + + Run::Summon(['Deliver', $hash]); + $total = $total - 1; + + if ($interval && $total) { + @time_sleep_until(microtime(true) + (float)$interval); + } + } + } + + + public static function build_link_packet($uid = 0, $packet = null) + { + + // logger('build_link_packet'); + + if (!$uid) { + $uid = local_channel(); + } + + if (!$uid) { + return; + } + + $channel = Channel::from_id($uid); + if (!$channel) { + return; + } + + $l = q( + "select link from linkid where ident = '%s' and sigtype = 2", + dbesc($channel['channel_hash']) + ); + + if (!$l) { + return; + } + + $hashes = ids_to_querystr($l, 'link', true); + + $h = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . protect_sprintf($hashes) . ") and hubloc_network in ('nomad','zot6') and hubloc_deleted = 0"); + + if (!$h) { + return; + } + + $interval = get_config('system', 'delivery_interval', 2); + + + foreach ($h as $x) { + if ($x['hubloc_host'] == App::get_hostname()) { + continue; + } + + $y = q( + "select site_dead from site where site_url = '%s' limit 1", + dbesc($x['hubloc_url']) + ); + + if (($y) && (intval($y[0]['site_dead']) == 1)) { + $continue; + } + + $env_recips = [$x['hubloc_hash']]; + + if ($packet) { + logger('packet: ' . print_r($packet, true), LOGGER_DATA, LOG_DEBUG); + } + + $info = (($packet) ? $packet : []); + $info['type'] = 'sync'; + $info['encoding'] = 'red'; // note: not zot, this packet is very platform specific + + logger('Packet: ' . print_r($info, true), LOGGER_DATA, LOG_DEBUG); + + + $hash = random_string(); + $n = Libzot::build_packet($channel, 'sync', $env_recips, json_encode($info), 'red', $x['hubloc_sitekey'], $x['site_crypto']); + Queue::insert([ + 'hash' => $hash, + 'account_id' => $channel['channel_account_id'], + 'channel_id' => $channel['channel_id'], + 'posturl' => $x['hubloc_callback'], + 'notify' => $n, + 'msg' => EMPTY_STR + ]); + + $y = q("select count(outq_hash) as total from outq where outq_delivered = 0"); + if (intval($y[0]['total']) > intval(get_config('system', 'force_queue_threshold', 3000))) { + logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); + Queue::update($hash); + continue; + } + + Run::Summon(['Deliver', $hash]); + + if ($interval && count($h) > 1) { + @time_sleep_until(microtime(true) + (float)$interval); + } + } + } + + + /** + * @brief + * + * @param array $sender + * @param array $arr + * @param array $deliveries + * @return array + */ + + public static function process_channel_sync_delivery($sender, $arr, $deliveries) + { + + require_once('include/import.php'); + + $result = []; + + $keychange = ((array_key_exists('keychange', $arr)) ? true : false); + + foreach ($deliveries as $d) { + $linked_channel = false; + + $r = q( + "select * from channel where channel_hash = '%s' limit 1", + dbesc($sender) + ); + + $DR = new DReport(z_root(), $sender, $d, 'sync'); + + if (!$r) { + $l = q( + "select ident from linkid where link = '%s' and sigtype = 2 limit 1", + dbesc($sender) + ); + if ($l) { + $linked_channel = true; + $r = q( + "select * from channel where channel_hash = '%s' limit 1", + dbesc($l[0]['ident']) + ); + } + } + + if (!$r) { + $DR->update('recipient not found'); + $result[] = $DR->get(); + continue; + } + + $channel = $r[0]; + + $DR->set_name($channel['channel_name'] . ' <' . Channel::get_webfinger($channel) . '>'); + + $max_friends = ServiceClass::fetch($channel['channel_id'], 'total_channels'); + $max_feeds = ServiceClass::account_fetch($channel['channel_account_id'], 'total_feeds'); + + if ($channel['channel_hash'] != $sender && (!$linked_channel)) { + logger('Possible forgery. Sender ' . $sender . ' is not ' . $channel['channel_hash']); + $DR->update('channel mismatch'); + $result[] = $DR->get(); + continue; + } + + if ($keychange) { + self::keychange($channel, $arr); + continue; + } + + // if the clone is active, so are we + + if (substr($channel['channel_active'], 0, 10) !== substr(datetime_convert(), 0, 10)) { + q( + "UPDATE channel set channel_active = '%s' where channel_id = %d", + dbesc(datetime_convert()), + intval($channel['channel_id']) + ); + } + + if (array_key_exists('config', $arr) && is_array($arr['config']) && count($arr['config'])) { + foreach ($arr['config'] as $cat => $k) { + foreach ($arr['config'][$cat] as $k => $v) { + set_pconfig($channel['channel_id'], $cat, $k, $v); + } + } + } + + if (array_key_exists('atoken', $arr) && $arr['atoken']) { + sync_atoken($channel, $arr['atoken']); + } + + if (array_key_exists('xign', $arr) && $arr['xign']) { + sync_xign($channel, $arr['xign']); + } + + if (array_key_exists('block', $arr) && $arr['block']) { + sync_block($channel, $arr['block']); + } + + if (array_key_exists('obj', $arr) && $arr['obj']) { + sync_objs($channel, $arr['obj']); + } + + if (array_key_exists('likes', $arr) && $arr['likes']) { + import_likes($channel, $arr['likes']); + } + + if (array_key_exists('app', $arr) && $arr['app']) { + sync_apps($channel, $arr['app']); + } + + if (array_key_exists('sysapp', $arr) && $arr['sysapp']) { + sync_sysapps($channel, $arr['sysapp']); + } + + if (array_key_exists('chatroom', $arr) && $arr['chatroom']) { + sync_chatrooms($channel, $arr['chatroom']); + } + + if (array_key_exists('conv', $arr) && $arr['conv']) { + import_conv($channel, $arr['conv']); + } + + if (array_key_exists('mail', $arr) && $arr['mail']) { + sync_mail($channel, $arr['mail']); + } + + if (array_key_exists('event', $arr) && $arr['event']) { + sync_events($channel, $arr['event']); + } + + if (array_key_exists('event_item', $arr) && $arr['event_item']) { + sync_items($channel, $arr['event_item'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null)); + } + + if (array_key_exists('item', $arr) && $arr['item']) { + sync_items($channel, $arr['item'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null)); + } + + if (array_key_exists('menu', $arr) && $arr['menu']) { + sync_menus($channel, $arr['menu']); + } + + if (array_key_exists('file', $arr) && $arr['file']) { + sync_files($channel, $arr['file']); + } + + if (array_key_exists('wiki', $arr) && $arr['wiki']) { + sync_items($channel, $arr['wiki'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null)); + } + + if (array_key_exists('channel', $arr) && is_array($arr['channel']) && count($arr['channel'])) { + $remote_channel = $arr['channel']; + $remote_channel['channel_id'] = $channel['channel_id']; + + if (array_key_exists('channel_pageflags', $arr['channel']) && intval($arr['channel']['channel_pageflags'])) { + // Several pageflags are site-specific and cannot be sync'd. + // Only allow those bits which are shareable from the remote and then + // logically OR with the local flags + + $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] & (PAGE_HIDDEN | PAGE_AUTOCONNECT | PAGE_APPLICATION | PAGE_PREMIUM | PAGE_ADULT); + $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] | $channel['channel_pageflags']; + } + + $columns = db_columns('channel'); + + $disallowed = [ + 'channel_id', 'channel_account_id', 'channel_primary', 'channel_prvkey', + 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted', + 'channel_system', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook', + 'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall', + 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall', + 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish', + 'channel_a_delegate', 'channel_moved' + ]; + + foreach ($arr['channel'] as $k => $v) { + if (in_array($k, $disallowed)) { + continue; + } + if (!in_array($k, $columns)) { + continue; + } + $r = dbq("UPDATE channel set " . dbesc($k) . " = '" . dbesc($v) + . "' where channel_id = " . intval($channel['channel_id'])); + } + } + + if (array_key_exists('abook', $arr) && is_array($arr['abook']) && count($arr['abook'])) { + $total_friends = 0; + $total_feeds = 0; + + $r = q( + "select abook_id, abook_feed from abook where abook_channel = %d", + intval($channel['channel_id']) + ); + if ($r) { + // don't count yourself + $total_friends = ((count($r) > 0) ? count($r) - 1 : 0); + foreach ($r as $rr) { + if (intval($rr['abook_feed'])) { + $total_feeds++; + } + } + } + + + $disallowed = ['abook_id', 'abook_account', 'abook_channel', 'abook_rating', 'abook_rating_text', 'abook_not_here']; + + $fields = db_columns('abook'); + + foreach ($arr['abook'] as $abook) { + // this is here for debugging so we can find the issue source + + if (!is_array($abook)) { + btlogger('abook is not an array'); + continue; + } + + $abconfig = null; + + if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) { + $abconfig = $abook['abconfig']; + } + + $clean = []; + + if ($abook['abook_xchan'] && $abook['entry_deleted']) { + logger('Removing abook entry for ' . $abook['abook_xchan']); + + $r = q( + "select abook_id, abook_feed from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", + dbesc($abook['abook_xchan']), + intval($channel['channel_id']) + ); + if ($r) { + contact_remove($channel['channel_id'], $r[0]['abook_id']); + if ($total_friends) { + $total_friends--; + } + if (intval($r[0]['abook_feed'])) { + $total_feeds--; + } + } + continue; + } + + // Perform discovery if the referenced xchan hasn't ever been seen on this hub. + // This relies on the undocumented behaviour that red sites send xchan info with the abook + // and import_author_xchan will look them up on all federated networks + + $found = false; + if ($abook['abook_xchan'] && $abook['xchan_addr'] && (!in_array($abook['xchan_network'], ['token', 'unknown']))) { + $h = Libzot::get_hublocs($abook['abook_xchan']); + if ($h) { + $found = true; + } else { + $xhash = import_author_xchan(encode_item_xchan($abook)); + if ($xhash) { + $found = true; + } else { + logger('Import of ' . $abook['xchan_addr'] . ' failed.'); + } + } + } + + if ((!$found) && (!in_array($abook['xchan_network'], ['nomad', 'zot6', 'activitypub']))) { + // just import the record. + $xc = []; + foreach ($abook as $k => $v) { + if (strpos($k, 'xchan_') === 0) { + $xc[$k] = $v; + } + } + $r = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($xc['xchan_hash']) + ); + if (!$r) { + xchan_store_lowlevel($xc); + } + } + + foreach ($abook as $k => $v) { + if (in_array($k, $disallowed) || (strpos($k, 'abook_') !== 0)) { + continue; + } + if (!in_array($k, $fields)) { + continue; + } + $clean[$k] = $v; + } + + if (!array_key_exists('abook_xchan', $clean)) { + continue; + } + + $reconnect = false; + if (array_key_exists('abook_instance', $clean) && $clean['abook_instance'] && strpos($clean['abook_instance'], z_root()) === false) { + // guest pass or access token - don't try to probe since it is one-way + // we are relying on the undocumented behaviour that the abook record also contains the xchan + if ($abook['xchan_network'] === 'token') { + $clean['abook_instance'] .= ','; + $clean['abook_instance'] .= z_root(); + $clean['abook_not_here'] = 0; + } else { + $clean['abook_not_here'] = 1; + if (!($abook['abook_pending'] || $abook['abook_blocked'])) { + $reconnect = true; + } + } + } + + $r = q( + "select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($clean['abook_xchan']), + intval($channel['channel_id']) + ); + + // make sure we have an abook entry for this xchan on this system + + if (!$r) { + if ($max_friends !== false && $total_friends > $max_friends) { + logger('total_channels service class limit exceeded'); + continue; + } + if ($max_feeds !== false && intval($clean['abook_feed']) && $total_feeds > $max_feeds) { + logger('total_feeds service class limit exceeded'); + continue; + } + abook_store_lowlevel( + [ + 'abook_xchan' => $clean['abook_xchan'], + 'abook_account' => $channel['channel_account_id'], + 'abook_channel' => $channel['channel_id'] + ] + ); + $total_friends++; + if (intval($clean['abook_feed'])) { + $total_feeds++; + } + } + + if (count($clean)) { + foreach ($clean as $k => $v) { + if ($k == 'abook_dob') { + $v = dbescdate($v); + } + + $r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v) + . "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id'])); + } + } + + // This will set abconfig vars if the sender is using old-style fixed permissions + // using the raw abook record as passed to us. New-style permissions will fall through + // and be set using abconfig + + // translate_abook_perms_inbound($channel,$abook); + + if ($abconfig) { + /// @fixme does not handle sync of del_abconfig + foreach ($abconfig as $abc) { + set_abconfig($channel['channel_id'], $abc['xchan'], $abc['cat'], $abc['k'], $abc['v']); + } + } + if ($reconnect) { + Connect::connect($channel, $abook['abook_xchan']); + } + } + } + + // sync collections (privacy groups) oh joy... + + if (array_key_exists('collections', $arr) && is_array($arr['collections']) && count($arr['collections'])) { + $x = q( + "select * from pgrp where uid = %d ", + intval($channel['channel_id']) + ); + foreach ($arr['collections'] as $cl) { + $found = false; + if ($x) { + foreach ($x as $y) { + if ($cl['collection'] == $y['hash']) { + $found = true; + break; + } + } + if ($found) { + if ( + ($y['gname'] != $cl['name']) + || ($y['visible'] != $cl['visible']) + || ($y['deleted'] != $cl['deleted']) + ) { + q( + "update pgrp set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d", + dbesc($cl['name']), + intval($cl['visible']), + intval($cl['deleted']), + dbesc($cl['collection']), + intval($channel['channel_id']) + ); + } + if (intval($cl['deleted']) && (!intval($y['deleted']))) { + q( + "delete from pgrp_member where gid = %d", + intval($y['id']) + ); + } + } + } + if (!$found) { + $r = q( + "INSERT INTO pgrp ( hash, uid, visible, deleted, gname, rule ) + VALUES( '%s', %d, %d, %d, '%s', '%s' ) ", + dbesc($cl['collection']), + intval($channel['channel_id']), + intval($cl['visible']), + intval($cl['deleted']), + dbesc($cl['name']), + dbesc($cl['rule']) + ); + } + + // now look for any collections locally which weren't in the list we just received. + // They need to be removed by marking deleted and removing the members. + // This shouldn't happen except for clones created before this function was written. + + if ($x) { + $found_local = false; + foreach ($x as $y) { + foreach ($arr['collections'] as $cl) { + if ($cl['collection'] == $y['hash']) { + $found_local = true; + break; + } + } + if (!$found_local) { + q( + "delete from pgrp_member where gid = %d", + intval($y['id']) + ); + q( + "update pgrp set deleted = 1 where id = %d and uid = %d", + intval($y['id']), + intval($channel['channel_id']) + ); + } + } + } + } + + // reload the group list with any updates + $x = q( + "select * from pgrp where uid = %d", + intval($channel['channel_id']) + ); + + // now sync the members + + if ( + array_key_exists('collection_members', $arr) + && is_array($arr['collection_members']) + && count($arr['collection_members']) + ) { + // first sort into groups keyed by the group hash + $members = []; + foreach ($arr['collection_members'] as $cm) { + if (!array_key_exists($cm['collection'], $members)) { + $members[$cm['collection']] = []; + } + + $members[$cm['collection']][] = $cm['member']; + } + + // our group list is already synchronised + if ($x) { + foreach ($x as $y) { + // for each group, loop on members list we just received + if (isset($y['hash']) && isset($members[$y['hash']])) { + foreach ($members[$y['hash']] as $member) { + $found = false; + $z = q( + "select xchan from pgrp_member where gid = %d and uid = %d and xchan = '%s' limit 1", + intval($y['id']), + intval($channel['channel_id']), + dbesc($member) + ); + if ($z) { + $found = true; + } + + // if somebody is in the group that wasn't before - add them + + if (!$found) { + q( + "INSERT INTO pgrp_member (uid, gid, xchan) + VALUES( %d, %d, '%s' ) ", + intval($channel['channel_id']), + intval($y['id']), + dbesc($member) + ); + } + } + } + + // now retrieve a list of members we have on this site + $m = q( + "select xchan from pgrp_member where gid = %d and uid = %d", + intval($y['id']), + intval($channel['channel_id']) + ); + if ($m) { + foreach ($m as $mm) { + // if the local existing member isn't in the list we just received - remove them + if (!in_array($mm['xchan'], $members[$y['hash']])) { + q( + "delete from pgrp_member where xchan = '%s' and gid = %d and uid = %d", + dbesc($mm['xchan']), + intval($y['id']), + intval($channel['channel_id']) + ); + } + } + } + } + } + } + } + + if (array_key_exists('profile', $arr) && is_array($arr['profile']) && count($arr['profile'])) { + $disallowed = array('id', 'aid', 'uid', 'guid'); + + foreach ($arr['profile'] as $profile) { + $x = q( + "select * from profile where profile_guid = '%s' and uid = %d limit 1", + dbesc($profile['profile_guid']), + intval($channel['channel_id']) + ); + if (!$x) { + Channel::profile_store_lowlevel( + [ + 'aid' => $channel['channel_account_id'], + 'uid' => $channel['channel_id'], + 'profile_guid' => $profile['profile_guid'], + ] + ); + + $x = q( + "select * from profile where profile_guid = '%s' and uid = %d limit 1", + dbesc($profile['profile_guid']), + intval($channel['channel_id']) + ); + if (!$x) { + continue; + } + } + $clean = []; + foreach ($profile as $k => $v) { + if (in_array($k, $disallowed)) { + continue; + } + + if ($profile['is_default'] && in_array($k, ['photo', 'thumb'])) { + continue; + } + + if ($k === 'name') { + $clean['fullname'] = $v; + } elseif ($k === 'with') { + $clean['partner'] = $v; + } elseif ($k === 'work') { + $clean['employment'] = $v; + } elseif (array_key_exists($k, $x[0])) { + $clean[$k] = $v; + } + + /** + * @TODO + * We also need to import local photos if a custom photo is selected + */ + + if ((strpos($profile['thumb'], '/photo/profile/l/') !== false) || intval($profile['is_default'])) { + $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id']; + $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id']; + } else { + $profile['photo'] = z_root() . '/photo/' . basename($profile['photo']); + $profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']); + } + } + + if (count($clean)) { + foreach ($clean as $k => $v) { + $r = dbq("UPDATE profile set " . TQUOT . dbesc($k) . TQUOT . " = '" . dbesc($v) + . "' where profile_guid = '" . dbesc($profile['profile_guid']) + . "' and uid = " . intval($channel['channel_id'])); + } + } + } + } + + $addon = ['channel' => $channel, 'data' => $arr]; + /** + * @hooks process_channel_sync_delivery + * Called when accepting delivery of a 'sync packet' containing structure and table updates from a channel clone. + * * \e array \b channel + * * \e array \b data + */ + Hook::call('process_channel_sync_delivery', $addon); + + $DR = new DReport(z_root(), $d, $d, 'sync', 'channel sync delivered'); + + $DR->set_name($channel['channel_name'] . ' <' . Channel::get_webfinger($channel) . '>'); + + $result[] = $DR->get(); + } + + return $result; + } + + /** + * @brief Synchronises locations. + * + * @param array $sender + * @param array $arr + * @param bool $absolute (optional) default false + * @return array + */ + + public static function sync_locations($sender, $arr, $absolute = false) + { + + $ret = []; + $what = EMPTY_STR; + $changed = false; + + // If a sender reports that the channel has been deleted, delete its hubloc + + if (isset($arr['deleted_locally']) && intval($arr['deleted_locally'])) { + q( + "UPDATE hubloc SET hubloc_deleted = 1, hubloc_updated = '%s' WHERE hubloc_hash = '%s' AND hubloc_url = '%s'", + dbesc(datetime_convert()), + dbesc($sender['hash']), + dbesc($sender['site']['url']) + ); + } + + if ($arr['locations']) { + $x = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($sender['hash']) + ); + if ($x) { + $xchan = array_shift($x); + } + + if ($absolute) { + Libzot::check_location_move($sender['hash'], $arr['locations']); + } + + $xisting = q( + "select * from hubloc where hubloc_hash = '%s'", + dbesc($sender['hash']) + ); + + if (!$xisting) { + $xisting = []; + } + + // See if a primary is specified + + $has_primary = false; + foreach ($arr['locations'] as $location) { + if ($location['primary']) { + $has_primary = true; + break; + } + } + + // Ensure that they have one primary hub + + if (!$has_primary) { + $arr['locations'][0]['primary'] = true; + } + + foreach ($arr['locations'] as $location) { + + $network = isset($location['driver']) ? $location['driver'] : 'zot6'; + // only set nomad if the location info is coming from the same site as the original zotinfo packet + if (isset($sender['site']) && isset($sender['site']['url']) && $sender['site']['url'] === $location['url']) { + if (isset($sender['site']['protocol_version']) && intval($sender['site']['protocol_version']) > 10) { + $network = 'nomad'; + } + } + + if (!Libzot::verify($location['url'], $location['url_sig'], $sender['public_key'])) { + logger('Unable to verify site signature for ' . $location['url']); + $ret['message'] .= sprintf(t('Unable to verify site signature for %s'), $location['url']) . EOL; + continue; + } + + for ($x = 0; $x < count($xisting); $x++) { + if ( + ($xisting[$x]['hubloc_url'] === $location['url']) + && ($xisting[$x]['hubloc_sitekey'] === $location['sitekey']) + ) { + $xisting[$x]['updated'] = true; + } + } + + if (!$location['sitekey']) { + logger('Empty hubloc sitekey. ' . print_r($location, true)); + continue; + } + + // match as many fields as possible in case anything at all changed. + + $r = q( + "select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_id_url = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ", + dbesc($sender['hash']), + dbesc($sender['id']), + dbesc($sender['id_sig']), + dbesc($location['id_url']), + dbesc($location['url']), + dbesc($location['url_sig']), + dbesc($location['host']), + dbesc($location['address']), + dbesc($location['callback']), + dbesc($location['sitekey']) + ); + if ($r) { + logger('Hub exists: ' . $location['url'], LOGGER_DEBUG); + + // generate a new hubloc_site_id if it's wrong due to historical bugs 2021-11-30 + + if ($r[0]['hubloc_site_id'] !== $location['site_id']) { + q( + "update hubloc set hubloc_site_id = '%s' where hubloc_id = %d", + dbesc(Libzot::make_xchan_hash($location['url'], $location['sitekey'])), + intval($r[0]['hubloc_id']) + ); + } + + // update connection timestamp if this is the site we're talking to + // This only happens when called from import_xchan + + $current_site = false; + + $t = datetime_convert('UTC', 'UTC', 'now - 15 minutes'); + + if (isset($location['driver']) && $location['driver'] === 'nomad' && $location['driver'] !== $r[0]['hubloc_network']) { + q("update hubloc set hubloc_network = '%s' where hubloc_id = %d", + dbesc($location['driver']), + intval($r[0]['hubloc_id']) + ); + } + + if (array_key_exists('site', $arr) && $location['url'] == $arr['site']['url']) { + q( + "update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_updated < '%s'", + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']), + dbesc($t) + ); + $current_site = true; + } + + if ($current_site && (intval($r[0]['hubloc_error']) || intval($r[0]['hubloc_deleted']))) { + q( + "update hubloc set hubloc_error = 0, hubloc_deleted = 0 where hubloc_id = %d", + intval($r[0]['hubloc_id']) + ); + if (intval($r[0]['hubloc_orphancheck'])) { + q( + "update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d", + intval($r[0]['hubloc_id']) + ); + } + q( + "update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'", + dbesc($sender['hash']) + ); + } + + // Remove pure duplicates + if (count($r) > 1) { + for ($h = 1; $h < count($r); $h++) { + q( + "delete from hubloc where hubloc_id = %d", + intval($r[$h]['hubloc_id']) + ); + $what .= 'duplicate_hubloc_removed '; + $changed = true; + } + } + + if (intval($r[0]['hubloc_primary']) && (!$location['primary'])) { + $m = q( + "update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id = %d", + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + $r[0]['hubloc_primary'] = intval($location['primary']); + hubloc_change_primary($r[0]); + $what .= 'primary_hub '; + $changed = true; + } elseif ((!intval($r[0]['hubloc_primary'])) && ($location['primary'])) { + $m = q( + "update hubloc set hubloc_primary = 1, hubloc_updated = '%s' where hubloc_id = %d", + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + // make sure hubloc_change_primary() has current data + $r[0]['hubloc_primary'] = intval($location['primary']); + hubloc_change_primary($r[0]); + $what .= 'primary_hub '; + $changed = true; + } elseif ($absolute) { + // Absolute sync - make sure the current primary is correctly reflected in the xchan + $pr = hubloc_change_primary($r[0]); + if ($pr) { + $what .= 'xchan_primary '; + $changed = true; + } + } elseif (intval($r[0]['hubloc_primary']) && $xchan && $xchan['xchan_url'] !== $r[0]['hubloc_id_url']) { + $pr = hubloc_change_primary($r[0]); + if ($pr) { + $what .= 'xchan_primary '; + $changed = true; + } + } + + if (intval($r[0]['hubloc_deleted']) && (!intval($location['deleted']))) { + $n = q( + "update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id = %d", + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + $what .= 'undelete_hub '; + $changed = true; + } elseif ((!intval($r[0]['hubloc_deleted'])) && (intval($location['deleted']))) { + logger('deleting hubloc: ' . $r[0]['hubloc_addr']); + $n = q( + "update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d", + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + $what .= 'delete_hub '; + $changed = true; + } + continue; + } + + // Existing hubs are dealt with. Now let's process any new ones. + // New hub claiming to be primary. Make it so by removing any existing primaries. + + if (intval($location['primary'])) { + $r = q( + "update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_hash = '%s' and hubloc_primary = 1", + dbesc(datetime_convert()), + dbesc($sender['hash']) + ); + } + + logger('New hub: ' . $location['url']); + + $r = hubloc_store_lowlevel( + [ + 'hubloc_guid' => $sender['id'], + 'hubloc_guid_sig' => $sender['id_sig'], + 'hubloc_id_url' => $location['id_url'], + 'hubloc_hash' => $sender['hash'], + 'hubloc_addr' => $location['address'], + 'hubloc_network' => $network, + 'hubloc_primary' => intval($location['primary']), + 'hubloc_url' => $location['url'], + 'hubloc_url_sig' => $location['url_sig'], + 'hubloc_site_id' => Libzot::make_xchan_hash($location['url'], $location['sitekey']), + 'hubloc_host' => $location['host'], + 'hubloc_callback' => $location['callback'], + 'hubloc_sitekey' => $location['sitekey'], + 'hubloc_updated' => datetime_convert(), + 'hubloc_connected' => datetime_convert() + ] + ); + + $what .= 'newhub '; + $changed = true; + + if ($location['primary']) { + $r = q( + "select * from hubloc where hubloc_addr = '%s' and hubloc_sitekey = '%s' limit 1", + dbesc($location['address']), + dbesc($location['sitekey']) + ); + if ($r) { + hubloc_change_primary($r[0]); + } + } + } + + // get rid of any hubs we have for this channel which weren't reported. + + if ($absolute && $xisting) { + foreach ($xisting as $x) { + if (!array_key_exists('updated', $x)) { + logger('Deleting unreferenced hub location ' . $x['hubloc_addr']); + $r = q( + "update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d", + dbesc(datetime_convert()), + intval($x['hubloc_id']) + ); + $what .= 'removed_hub '; + $changed = true; + } + } + } + } else { + logger('No locations to sync!'); + } + + $ret['change_message'] = $what; + $ret['changed'] = $changed; + + return $ret; + } + + + public static function keychange($channel, $arr) + { + + // verify the keychange operation + if (!Libzot::verify($arr['channel']['channel_pubkey'], $arr['keychange']['new_sig'], $channel['channel_prvkey'])) { + logger('sync keychange: verification failed'); + return; + } + + $sig = Libzot::sign($channel['channel_guid'], $arr['channel']['channel_prvkey']); + $hash = Libzot::make_xchan_hash($channel['channel_guid'], $arr['channel']['channel_pubkey']); + + + $r = q( + "update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s', + channel_hash = '%s' where channel_id = %d", + dbesc($arr['channel']['channel_prvkey']), + dbesc($arr['channel']['channel_pubkey']), + dbesc($sig), + dbesc($hash), + intval($channel['channel_id']) + ); + if (!$r) { + logger('keychange sync: channel update failed'); + return; + } + + $r = q( + "select * from channel where channel_id = %d", + intval($channel['channel_id']) + ); + + if (!$r) { + logger('keychange sync: channel retrieve failed'); + return; + } + + $channel = $r[0]; + + $h = q( + "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ", + dbesc($arr['keychange']['old_hash']), + dbesc(z_root()) + ); + + if ($h) { + foreach ($h as $hv) { + $hv['hubloc_guid_sig'] = $sig; + $hv['hubloc_hash'] = $hash; + $hv['hubloc_url_sig'] = Libzot::sign(z_root(), $channel['channel_prvkey']); + hubloc_store_lowlevel($hv); + } + } + + $x = q( + "select * from xchan where xchan_hash = '%s' ", + dbesc($arr['keychange']['old_hash']) + ); + + $check = q( + "select * from xchan where xchan_hash = '%s'", + dbesc($hash) + ); + + if (($x) && (!$check)) { + $oldxchan = $x[0]; + foreach ($x as $xv) { + $xv['xchan_guid_sig'] = $sig; + $xv['xchan_hash'] = $hash; + $xv['xchan_pubkey'] = $channel['channel_pubkey']; + $xv['xchan_updated'] = datetime_convert(); + xchan_store_lowlevel($xv); + $newxchan = $xv; + } + } + + $a = q( + "select * from abook where abook_xchan = '%s' and abook_self = 1", + dbesc($arr['keychange']['old_hash']) + ); + + if ($a) { + q( + "update abook set abook_xchan = '%s' where abook_id = %d", + dbesc($hash), + intval($a[0]['abook_id']) + ); + } + + xchan_change_key($oldxchan, $newxchan, $arr['keychange']); + } +} diff --git a/Code/Lib/Libzot.php b/Code/Lib/Libzot.php new file mode 100644 index 000000000..c6e17d431 --- /dev/null +++ b/Code/Lib/Libzot.php @@ -0,0 +1,3645 @@ + $type, + 'encoding' => $encoding, + 'sender' => $channel['channel_hash'], + 'site_id' => self::make_xchan_hash(z_root(), get_config('system', 'pubkey')), + 'version' => System::get_zot_revision(), + ]; + + if ($recipients) { + $data['recipients'] = $recipients; + } + + if ($msg) { + $actor = Channel::url($channel); + if ($encoding === 'activitystreams' && array_key_exists('actor', $msg) && is_string($msg['actor']) && $actor === $msg['actor']) { + $msg = JSalmon::sign($msg, $actor, $channel['channel_prvkey']); + } + $data['data'] = $msg; + } else { + unset($data['encoding']); + } + + logger('packet: ' . print_r($data, true), LOGGER_DATA, LOG_DEBUG); + + if ($remote_key) { + $algorithm = self::best_algorithm($methods); + if ($algorithm) { + $data = Crypto::encapsulate(json_encode($data), $remote_key, $algorithm); + } + } + + return json_encode($data); + } + + + /** + * @brief Choose best encryption function from those available on both sites. + * + * @param string $methods + * comma separated list of encryption methods + * @return string first match from our site method preferences crypto_methods() array + * of a method which is common to both sites; or an empty string if no matches are found. + * + * Failure to find a common algorithm is not an issue as our communications + * take place primarily over https, so this is just redundant encryption in many cases. + * + * In any case, the receiver is free to reject unencrypted private content if they have + * reason to distrust https. + * + * We are not using array_intersect() here because the specification for that function + * does not guarantee the order of results. It probably returns entries in the correct + * order for our needs and would simplify this function dramatically, but we cannot be + * certain that it will always do so on all operating systems. + * + */ + + public static function best_algorithm($methods) + { + + $x = [ + 'methods' => $methods, + 'result' => '' + ]; + + /** + * @hooks zot_best_algorithm + * Called when negotiating crypto algorithms with remote sites. + * * \e string \b methods - comma separated list of encryption methods + * * \e string \b result - the algorithm to return + */ + + Hook::call('zot_best_algorithm', $x); + + if ($x['result']) { + return $x['result']; + } + + if ($methods) { + // $x = their methods as an array + $x = explode(',', $methods); + if ($x) { + // $y = our methods as an array + $y = Crypto::methods(); + if ($y) { + foreach ($y as $yv) { + $yv = trim($yv); + if (in_array($yv, $x)) { + return ($yv); + } + } + } + } + } + + return EMPTY_STR; + } + + + /** + * @brief send a zot message + * + * @param string $url + * @param array $data + * @param array $channel (required if using zot6 delivery) + * @param array $crypto (required if encrypted httpsig, requires hubloc_sitekey and site_crypto elements) + * @return array see z_post_url() for returned data format + * @see z_post_url() + * + */ + + public static function zot($url, $data, $channel = null, $crypto = null) + { + + if ($channel) { + $headers = [ + 'X-Zot-Token' => random_string(), + 'Digest' => HTTPSig::generate_digest_header($data), + 'Content-type' => 'application/x-zot+json', + '(request-target)' => 'post ' . get_request_string($url) + ]; + + $h = HTTPSig::create_sig( + $headers, + $channel['channel_prvkey'], + Channel::url($channel), + false, + 'sha512', + (($crypto) ? ['key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto'])] : false) + ); + } else { + $h = []; + } + + $redirects = 0; + + return z_post_url($url, $data, $redirects, ((empty($h)) ? [] : ['headers' => $h])); + } + + public static function nomad($url, $data, $channel = null,$crypto = null) { + + if ($channel) { + $headers = [ + 'X-Nomad-Token' => random_string(), + 'Digest' => HTTPSig::generate_digest_header($data), + 'Content-type' => 'application/x-nomad+json', + '(request-target)' => 'post ' . get_request_string($url) + ]; + + $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],Channel::url($channel),false,'sha512', + (($crypto) ? [ 'key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto']) ] : false)); + } + else { + $h = []; + } + + $redirects = 0; + + return z_post_url($url,$data,$redirects,((empty($h)) ? [] : [ 'headers' => $h ])); + } + + + + + /** + * @brief Refreshes after permission changed or friending, etc. + * + * + * refresh is typically invoked when somebody has changed permissions of a channel and they are notified + * to fetch new permissions via a finger/discovery operation. This may result in a new connection + * (abook entry) being added to a local channel and it may result in auto-permissions being granted. + * + * Friending in zot is accomplished by sending a refresh packet to a specific channel which indicates a + * permission change has been made by the sender which affects the target channel. The hub controlling + * the target channel does targeted discovery (in which a zot discovery request contains permissions for + * the sender which were set by the local channel). These are decoded here, and if necessary an abook + * structure (addressbook) is created to store the permissions assigned to this channel. + * + * Initially these abook structures are created with a 'pending' flag, so that no reverse permissions are + * implied until this is approved by the owner channel. A channel can also auto-populate permissions in + * return and send back a refresh packet of its own. This is used by forum and group communication channels + * so that friending and membership in the channel's "club" is automatic. + * + * If $force is set when calling this function, this operation will be attempted even if our records indicate + * the remote site is permanently down. + * + * @param array $them => xchan structure of sender + * @param array $channel => local channel structure of target recipient, required for "friending" operations + * @param array $force (optional) default false + * + * @return boolean + * * \b true if successful + * * otherwise \b false + */ + + public static function refresh($them, $channel = null, $force = false) + { + + $hsig_valid = false; + + logger('them: ' . print_r($them, true), LOGGER_DATA, LOG_DEBUG); + if ($channel) { + logger('channel: ' . print_r($channel, true), LOGGER_DATA, LOG_DEBUG); + } + + $url = null; + + if ($them['hubloc_id_url']) { + $url = $them['hubloc_id_url']; + } else { + $r = null; + + // if they re-installed the server we could end up with the wrong record - pointing to a hash generated by the old install. + // We'll order by reverse id to try and pick off the most recently created ones first and hopefully end up with the correct hubloc. + // We are looking for the most recently created primary hub, and the most recently created if for some reason we do not have a primary. + // hubloc_id_url is set to the channel home, which corresponds to an ActivityStreams actor id. + + $r = q( + "select hubloc_id_url, hubloc_primary from hubloc where hubloc_hash = '%s' and hubloc_network in ('zot6','nomad') order by hubloc_id desc", + dbesc($them['xchan_hash']) + ); + + if ($r) { + foreach ($r as $rr) { + if (intval($rr['hubloc_primary'])) { + $url = $rr['hubloc_id_url']; + break; + } + } + if (!$url) { + $url = $r[0]['hubloc_id_url']; + } + } + } + + if (!$url) { + logger('zot_refresh: no url'); + return false; + } + + $m = parse_url($url); + $site_url = unparse_url(['scheme' => $m['scheme'], 'host' => $m['host']]); + + + $s = q( + "select site_dead from site where site_url = '%s' limit 1", + dbesc($site_url) + ); + + if ($s && intval($s[0]['site_dead']) && (!$force)) { + logger('zot_refresh: site ' . $site_url . ' is marked dead and force flag is not set. Cancelling operation.'); + return false; + } + + $record = Zotfinger::exec($url, $channel); + + // Check the HTTP signature + + $hsig = $record['signature']; + if ($hsig && $hsig['signer'] === $url && $hsig['header_valid'] === true && $hsig['content_valid'] === true) { + $hsig_valid = true; + } + + if (!$hsig_valid) { + logger('http signature not valid: ' . (($record['data']) ? print_r($hsig, true) : 'fetch failed')); + return false; + } + + // If we reach this point, the signature is valid and we can trust the channel discovery data, so try and store + // the generic information in the returned discovery packet. + + logger('zot-info: ' . print_r($record, true), LOGGER_DATA, LOG_DEBUG); + + $x = self::import_xchan($record['data'], (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED)); + + if (!$x['success']) { + return false; + } + + // Here we handle discovery packets that return targeted permissions and require an abook (either an existing connection + // or a new one) + + if ($channel && $record['data']['permissions']) { + $old_read_stream_perm = their_perms_contains($channel['channel_id'], $x['hash'], 'view_stream'); + set_abconfig($channel['channel_id'], $x['hash'], 'system', 'their_perms', $record['data']['permissions']); + + if (array_key_exists('profile', $record['data']) && array_key_exists('next_birthday', $record['data']['profile'])) { + $next_birthday = datetime_convert('UTC', 'UTC', $record['data']['profile']['next_birthday']); + } else { + $next_birthday = NULL_DATE; + } + + $profile_assign = get_pconfig($channel['channel_id'], 'system', 'profile_assign', ''); + + // Keep original perms to check if we need to notify them + $previous_perms = get_all_perms($channel['channel_id'], $x['hash']); + + $r = q( + "select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", + dbesc($x['hash']), + intval($channel['channel_id']) + ); + + if ($r) { + // connection exists + + // if the dob is the same as what we have stored (disregarding the year), keep the one + // we have as we may have updated the year after sending a notification; and resetting + // to the one we just received would cause us to create duplicated events. + + if (substr($r[0]['abook_dob'], 5) == substr($next_birthday, 5)) { + $next_birthday = $r[0]['abook_dob']; + } + + $y = q( + "update abook set abook_dob = '%s' + where abook_xchan = '%s' and abook_channel = %d + and abook_self = 0 ", + dbescdate($next_birthday), + dbesc($x['hash']), + intval($channel['channel_id']) + ); + + if (!$y) { + logger('abook update failed'); + } else { + // if we were just granted read stream permission and didn't have it before, try to pull in some posts + if ((!$old_read_stream_perm) && (intval($permissions['view_stream']))) { + Run::Summon(['Onepoll', $r[0]['abook_id']]); + } + } + } else { + // limit the ability to do connection spamming, this limit is per channel + $lim = intval(get_config('system', 'max_connections_per_day', 50)); + if ($lim) { + $n = q( + "select count(abook_id) as total from abook where abook_channel = %d and abook_created > '%s'", + intval($channel['channel_id']), + dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours')) + ); + if ($n && intval($n['total']) > $lim) { + logger('channel: ' . $channel['channel_id'] . ' too many new connections per day. This one from ' . $hsig['signer'], LOGGER_NORMAL, LOG_WARNING); + return false; + } + } + + // check personal blocklists + + $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER); + if ($blocked) { + foreach ($blocked as $b) { + if (strpos($url, $b['block_entity']) !== false) { + logger('siteblock - follower denied'); + return; + } + } + } + if (LibBlock::fetch_by_entity($channel['channel_id'], $x['hash'])) { + logger('actorblock - follower denied'); + return; + } + + $p = Permissions::connect_perms($channel['channel_id']); + $my_perms = Permissions::serialise($p['perms']); + + $automatic = $p['automatic']; + + // new connection + + if ($my_perms) { + set_abconfig($channel['channel_id'], $x['hash'], 'system', 'my_perms', $my_perms); + } + + $closeness = get_pconfig($channel['channel_id'], 'system', 'new_abook_closeness', 80); + + // check if it is a sub-channel (collection) and auto-friend if it is + + $is_collection = false; + + $cl = q( + "select channel_id from channel where channel_hash = '%s' and channel_parent = '%s' and channel_account_id = %d limit 1", + dbesc($x['hash']), + dbesc($channel['channel_hash']), + intval($channel['channel_account_id']) + ); + if ($cl) { + $is_collection = true; + $automatic = true; + $closeness = 10; + } + + $y = abook_store_lowlevel( + [ + 'abook_account' => intval($channel['channel_account_id']), + 'abook_channel' => intval($channel['channel_id']), + 'abook_closeness' => intval($closeness), + 'abook_xchan' => $x['hash'], + 'abook_profile' => $profile_assign, + 'abook_created' => datetime_convert(), + 'abook_updated' => datetime_convert(), + 'abook_dob' => $next_birthday, + 'abook_pending' => intval(($automatic) ? 0 : 1) + ] + ); + + if ($y) { + logger("New introduction received for {$channel['channel_name']}"); + $new_perms = get_all_perms($channel['channel_id'], $x['hash']); + + // Send a clone sync packet and a permissions update if permissions have changed + + $new_connection = q( + "select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1", + dbesc($x['hash']), + intval($channel['channel_id']) + ); + + if ($new_connection) { + if (!Permissions::PermsCompare($new_perms, $previous_perms)) { + Run::Summon(['Notifier', 'permissions_create', $new_connection[0]['abook_id']]); + } + + if (!$is_collection) { + Enotify::submit( + [ + 'type' => NOTIFY_INTRO, + 'from_xchan' => $x['hash'], + 'to_xchan' => $channel['channel_hash'], + 'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'] + ] + ); + } + + if (intval($permissions['view_stream'])) { + if ( + intval(get_pconfig($channel['channel_id'], 'perm_limits', 'send_stream') & PERMS_PENDING) + || (!intval($new_connection[0]['abook_pending'])) + ) { + Run::Summon(['Onepoll', $new_connection[0]['abook_id']]); + } + } + + + // If there is a default group for this channel, add this connection to it + // for pending connections this will happens at acceptance time. + + if (!intval($new_connection[0]['abook_pending'])) { + $default_group = $channel['channel_default_group']; + if ($default_group) { + $g = AccessList::rec_byhash($channel['channel_id'], $default_group); + if ($g) { + AccessList::member_add($channel['channel_id'], '', $x['hash'], $g['id']); + } + } + } + + unset($new_connection[0]['abook_id']); + unset($new_connection[0]['abook_account']); + unset($new_connection[0]['abook_channel']); + $abconfig = load_abconfig($channel['channel_id'], $new_connection[0]['abook_xchan']); + if ($abconfig) { + $new_connection[0]['abconfig'] = $abconfig; + } + Libsync::build_sync_packet($channel['channel_id'], ['abook' => $new_connection]); + } + } + } + return true; + } else { + return true; + } + return false; + } + + /** + * @brief Look up if channel is known and previously verified. + * + * A guid and a url, both signed by the sender, distinguish a known sender at a + * known location. + * This function looks these up to see if the channel is known and therefore + * previously verified. If not, we will need to verify it. + * + * @param array $arr an associative array which must contain: + * * \e string \b id => id of conversant + * * \e string \b id_sig => id signed with conversant's private key + * * \e string \b location => URL of the origination hub of this communication + * * \e string \b location_sig => URL signed with conversant's private key + * @param bool $multiple (optional) default false + * + * @return array|null + * * null if site is denied or not found + * * otherwise an array with an hubloc record + */ + + public static function gethub($arr, $multiple = false) + { + + if ($arr['id'] && $arr['id_sig'] && $arr['location'] && $arr['location_sig']) { + if (!check_siteallowed($arr['location'])) { + logger('denied site: ' . $arr['location']); + return null; + } + + $limit = (($multiple) ? '' : ' limit 1 '); + + $r = q( + "select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url + where hubloc_guid = '%s' and hubloc_guid_sig = '%s' + and hubloc_url = '%s' and hubloc_url_sig = '%s' + and hubloc_site_id = '%s' and hubloc_network in ('nomad','zot6') + $limit", + dbesc($arr['id']), + dbesc($arr['id_sig']), + dbesc($arr['location']), + dbesc($arr['location_sig']), + dbesc($arr['site_id']) + ); + if ($r) { + logger('Found', LOGGER_DEBUG); + return (($multiple) ? $r : $r[0]); + } + } + logger('Not found: ' . print_r($arr, true), LOGGER_DEBUG); + + return false; + } + + + public static function valid_hub($sender, $site_id) + { + + $r = q( + "select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_site_id = '%s' limit 1", + dbesc($sender), + dbesc($site_id) + ); + if (!$r) { + return null; + } + + if (!check_siteallowed($r[0]['hubloc_url'])) { + logger('denied site: ' . $r[0]['hubloc_url']); + return null; + } + + if (!check_channelallowed($r[0]['hubloc_hash'])) { + logger('denied channel: ' . $r[0]['hubloc_hash']); + return null; + } + + return $r[0]; + } + + /** + * @brief Registers an unknown hub. + * + * A communication has been received which has an unknown (to us) sender. + * Perform discovery based on our calculated hash of the sender at the + * origination address. This will fetch the discovery packet of the sender, + * which contains the public key we need to verify our guid and url signatures. + * + * @param array $arr an associative array which must contain: + * * \e string \b guid => guid of conversant + * * \e string \b guid_sig => guid signed with conversant's private key + * * \e string \b url => URL of the origination hub of this communication + * * \e string \b url_sig => URL signed with conversant's private key + * + * @return array An associative array with + * * \b success boolean true or false + * * \b message (optional) error string only if success is false + */ + + public static function register_hub($id) + { + + $id_hash = false; + $valid = false; + $hsig_valid = false; + + $result = ['success' => false]; + + if (!$id) { + return $result; + } + + $record = Zotfinger::exec($id); + + // Check the HTTP signature + + $hsig = $record['signature']; + if ($hsig['signer'] === $id && $hsig['header_valid'] === true && $hsig['content_valid'] === true) { + $hsig_valid = true; + } + if (!$hsig_valid) { + logger('http signature not valid: ' . print_r($hsig, true)); + return $result; + } + + $c = self::import_xchan($record['data']); + if ($c['success']) { + $result['success'] = true; + } else { + logger('Failure to verify zot packet'); + } + + return $result; + } + + /** + * @brief Takes an associative array of a fetch discovery packet and updates + * all internal data structures which need to be updated as a result. + * + * @param array $arr => json_decoded discovery packet + * @param int $ud_flags + * Determines whether to create a directory update record if any changes occur, default is UPDATE_FLAGS_UPDATED + * $ud_flags = UPDATE_FLAGS_FORCED indicates a forced refresh where we unconditionally create a directory update record + * this typically occurs once a month for each channel as part of a scheduled ping to notify the directory + * that the channel still exists + * @param array $ud_arr + * If set [typically by update_directory_entry()] indicates a specific update table row and more particularly + * contains a particular address (ud_addr) which needs to be updated in that table. + * + * @return array An associative array with: + * * \e boolean \b success boolean true or false + * * \e string \b message (optional) error string only if success is false + */ + + public static function import_xchan($arr, $ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) + { + + /** + * @hooks import_xchan + * Called when processing the result of zot_finger() to store the result + * * \e array + */ + Hook::call('import_xchan', $arr); + + $ret = array('success' => false); + $dirmode = intval(get_config('system', 'directory_mode')); + + $changed = false; + $what = ''; + + if (!is_array($arr)) { + logger('Not an array: ' . print_r($arr, true), LOGGER_DEBUG); + return $ret; + } + + if (!($arr['id'] && $arr['id_sig'])) { + logger('No identity information provided. ' . print_r($arr, true)); + return $ret; + } + + $xchan_hash = self::make_xchan_hash($arr['id'], $arr['public_key']); + $arr['hash'] = $xchan_hash; + + $import_photos = false; + + $sig_methods = ((array_key_exists('signing', $arr) && is_array($arr['signing'])) ? $arr['signing'] : ['sha256']); + $verified = false; + + if (!self::verify($arr['id'], $arr['id_sig'], $arr['public_key'])) { + logger('Unable to verify channel signature for ' . $arr['address']); + return $ret; + } else { + $verified = true; + } + + if (!$verified) { + $ret['message'] = t('Unable to verify channel signature'); + return $ret; + } + + logger('import_xchan: ' . $xchan_hash, LOGGER_DEBUG); + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($xchan_hash) + ); + + if (!array_key_exists('connect_url', $arr)) { + $arr['connect_url'] = ''; + } + + if ($r) { + if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $arr['photo']['updated'] > $r[0]['xchan_photo_date']) { + $import_photos = true; + } + + // if we import an entry from a site that's not ours and either or both of us is off the grid - hide the entry. + /** @TODO: check if we're the same directory realm, which would mean we are allowed to see it */ + + $dirmode = get_config('system', 'directory_mode'); + + if ((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root())) { + $arr['searchable'] = false; + } + + $hidden = (1 - intval($arr['searchable'])); + + $hidden_changed = $adult_changed = $deleted_changed = $type_changed = 0; + + if (intval($r[0]['xchan_hidden']) != (1 - intval($arr['searchable']))) { + $hidden_changed = 1; + } + if (intval($r[0]['xchan_selfcensored']) != intval($arr['adult_content'])) { + $adult_changed = 1; + } + if (isset($arr['deleted']) && intval($r[0]['xchan_deleted']) != intval($arr['deleted'])) { + $deleted_changed = 1; + } + + $px = 0; + if (isset($arr['channel_type'])) { + if ($arr['channel_type'] === 'collection') { + $px = 2; + } elseif ($arr['channel_type'] === 'group') { + $px = 1; + } + } + if (array_key_exists('public_forum', $arr) && intval($arr['public_forum'])) { + $px = 1; + } + + if (intval($r[0]['xchan_type']) !== $px) { + $type_changed = true; + } + + if ($arr['protocols']) { + set_xconfig($xchan_hash, 'system', 'protocols', implode(',',$arr['protocols'])); + } + $collections = []; + if (isset($arr['primary_location']['following'])) { + $collections['following'] = $arr['primary_location']['following']; + } + if (isset($arr['primary_location']['followers'])) { + $collections['followers'] = $arr['primary_location']['followers']; + } + if (isset($arr['primary_location']['wall'])) { + $collections['wall'] = $arr['primary_location']['wall']; + } + if ($collections) { + set_xconfig($xchan_hash, 'activitypub', 'collections', $collections); + } + + if (isset($arr['cover_photo']) && isset($arr['cover_photo']['url']) && strlen($arr['cover_photo']['url'])) { + set_xconfig($xchan_hash, 'system', 'cover_photo', $arr['cover_photo']['url']); + } + + if (isset($arr['signing_algorithm']) && strlen($arr['signing_algorithm'])) { + set_xconfig($xchan_hash, 'system', 'signing_algorithm', $arr['signing_algorithm']); + } + + + if ( + ($r[0]['xchan_name_date'] != $arr['name_updated']) + || ($r[0]['xchan_connurl'] != $arr['primary_location']['connections_url']) + || ($r[0]['xchan_addr'] != $arr['primary_location']['address']) + || ($r[0]['xchan_follow'] != $arr['primary_location']['follow_url']) + || ($r[0]['xchan_connpage'] != $arr['connect_url']) + || ($r[0]['xchan_url'] != $arr['primary_location']['url']) + || ($r[0]['xchan_updated'] < datetime_convert('UTC', 'UTC', 'now - 7 days')) + || $hidden_changed || $adult_changed || $deleted_changed || $type_changed + ) { + $rup = q( + "update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s', + xchan_connpage = '%s', xchan_hidden = %d, xchan_selfcensored = %d, xchan_deleted = %d, xchan_type = %d, + xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc(($arr['name']) ? escape_tags($arr['name']) : '-'), + dbesc($arr['name_updated']), + dbesc($arr['primary_location']['connections_url']), + dbesc($arr['primary_location']['follow_url']), + dbesc($arr['primary_location']['connect_url']), + intval(1 - intval($arr['searchable'])), + intval($arr['adult_content']), + intval($arr['deleted']), + intval($px), + dbesc(escape_tags($arr['primary_location']['address'])), + dbesc(escape_tags($arr['primary_location']['url'])), + dbesc($xchan_hash) + ); + + logger('Update: existing: ' . print_r($r[0], true), LOGGER_DATA, LOG_DEBUG); + logger('Update: new: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG); + $what .= 'xchan '; + $changed = true; + } + } else { + $import_photos = true; + + if ( + (($arr['site']['directory_mode'] === 'standalone') + || ($dirmode & DIRECTORY_MODE_STANDALONE)) + && ($arr['site']['url'] != z_root()) + ) { + $arr['searchable'] = false; + } + + + if ($arr['channel_type'] === 'collection') { + $px = 2; + } elseif ($arr['channel_type'] === 'group') { + $px = 1; + } else { + $px = 0; + } + + if (array_key_exists('public_forum', $arr) && intval($arr['public_forum'])) { + $px = 1; + } + + $network = isset($arr['site']['protocol_version']) && intval($arr['site']['protocol_version']) > 10 ? 'nomad' : 'zot6'; + + + $x = xchan_store_lowlevel( + [ + 'xchan_hash' => $xchan_hash, + 'xchan_guid' => $arr['id'], + 'xchan_guid_sig' => $arr['id_sig'], + 'xchan_pubkey' => $arr['public_key'], + 'xchan_photo_mimetype' => $arr['photo']['type'], + 'xchan_photo_l' => $arr['photo']['url'], + 'xchan_addr' => escape_tags($arr['primary_location']['address']), + 'xchan_url' => escape_tags($arr['primary_location']['url']), + 'xchan_connurl' => $arr['primary_location']['connections_url'], + 'xchan_follow' => $arr['primary_location']['follow_url'], + 'xchan_connpage' => $arr['connect_url'], + 'xchan_name' => (($arr['name']) ? escape_tags($arr['name']) : '-'), + 'xchan_network' => $network, + 'xchan_updated' => datetime_convert(), + 'xchan_photo_date' => $arr['photo']['updated'], + 'xchan_name_date' => $arr['name_updated'], + 'xchan_hidden' => intval(1 - intval($arr['searchable'])), + 'xchan_selfcensored' => $arr['adult_content'], + 'xchan_deleted' => $arr['deleted'], + 'xchan_type' => $px + ] + ); + + $what .= 'new_xchan'; + $changed = true; + } + + if (isset($arr['cover_photo']) && isset($arr['cover_photo']['url']) && strlen($arr['cover_photo']['url'])) { + set_xconfig($xchan_hash, 'system', 'cover_photo', $arr['cover_photo']['url']); + } + + if ($import_photos) { + require_once('include/photo_factory.php'); + + // see if this is a channel clone that's hosted locally - which we treat different from other xchans/connections + + $local = q( + "select channel_account_id, channel_id from channel where channel_hash = '%s' limit 1", + dbesc($xchan_hash) + ); + if ($local) { + $ph = false; + if (strpos($arr['photo']['url'], z_root()) === false) { + $ph = z_fetch_url($arr['photo']['url'], true); + } + if ($ph && $ph['success']) { + $hash = import_channel_photo($ph['body'], $arr['photo']['type'], $local[0]['channel_account_id'], $local[0]['channel_id']); + + if ($hash) { + // unless proven otherwise + $is_default_profile = 1; + + $profile = q( + "select is_default from profile where aid = %d and uid = %d limit 1", + intval($local[0]['channel_account_id']), + intval($local[0]['channel_id']) + ); + if ($profile) { + if (!intval($profile[0]['is_default'])) { + $is_default_profile = 0; + } + } + + // If setting for the default profile, unset the profile photo flag from any other photos I own + if ($is_default_profile) { + q( + "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND aid = %d AND uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + dbesc($hash), + intval($local[0]['channel_account_id']), + intval($local[0]['channel_id']) + ); + } + } + + // reset the names in case they got messed up when we had a bug in this function + $photos = array( + z_root() . '/photo/profile/l/' . $local[0]['channel_id'], + z_root() . '/photo/profile/m/' . $local[0]['channel_id'], + z_root() . '/photo/profile/s/' . $local[0]['channel_id'], + $arr['photo_mimetype'], + false + ); + } + } else { + $photos = import_remote_xchan_photo($arr['photo']['url'], $xchan_hash); + } + if ($photos) { + if ($photos[4]) { + // importing the photo failed somehow. Leave the photo_date alone so we can try again at a later date. + // This often happens when somebody joins the matrix with a bad cert. + $r = q( + "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' + where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($xchan_hash) + ); + } else { + $r = q( + "update xchan set xchan_updated = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' + where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc(datetime_convert('UTC', 'UTC', ((isset($arr['photo_updated'])) ? $arr['photo_updated'] : 'now'))), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($xchan_hash) + ); + } + $what .= 'photo '; + $changed = true; + } + } + + // what we are missing for true hub independence is for any changes in the primary hub to + // get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan + + $s = Libsync::sync_locations($arr, $arr); + + if ($s) { + if (isset($s['change_message']) && $s['change_message']) { + $what .= $s['change_message']; + } + if (isset($s['changed']) && $s['changed']) { + $changed = $s['changed']; + } + if (isset($s['message']) && $s['message']) { + $ret['message'] .= $s['message']; + } + } + + // Which entries in the update table are we interested in updating? + $address = ((isset($arr['address']) && $arr['address']) ? $arr['address'] : EMPTY_STR); + if (isset($ud_arr) && isset($ud_arr['ud_addr'])) { + $address = $ud_arr['ud_addr']; + } + + // Are we a directory server of some kind? + + $other_realm = false; + +// $realm = get_directory_realm(); +// if (array_key_exists('site',$arr) +// && array_key_exists('realm',$arr['site']) +// && (strpos($arr['site']['realm'],$realm) === false)) +// $other_realm = true; + + +// if ($dirmode != DIRECTORY_MODE_NORMAL) { + + // We're some kind of directory server. However we can only add directory information + // if the entry is in the same realm (or is a sub-realm). Sub-realms are denoted by + // including the parent realm in the name. e.g. 'RED_GLOBAL:foo' would allow an entry to + // be in directories for the local realm (foo) and also the RED_GLOBAL realm. + + if (array_key_exists('profile', $arr) && is_array($arr['profile']) && (!$other_realm)) { + $profile_changed = Libzotdir::import_directory_profile($xchan_hash, $arr['profile'], $address, $ud_flags, 1); + if ($profile_changed) { + $what .= 'profile '; + $changed = true; + } + } else { + logger('Profile not available - hiding'); + // they may have made it private + $r = q( + "delete from xprof where xprof_hash = '%s'", + dbesc($xchan_hash) + ); + $r = q( + "delete from xtag where xtag_hash = '%s' and xtag_flags = 0", + dbesc($xchan_hash) + ); + } +// } + + if (array_key_exists('site', $arr) && is_array($arr['site'])) { + $profile_changed = self::import_site($arr['site']); + if ($profile_changed) { + $what .= 'site '; + $changed = true; + } + } + + if (($changed) || ($ud_flags == UPDATE_FLAGS_FORCED)) { + $guid = random_string() . '@' . App::get_hostname(); + Libzotdir::update_modtime($xchan_hash, $guid, $address, $ud_flags); + logger('Changed: ' . $what, LOGGER_DEBUG); + } elseif (!$ud_flags) { + // nothing changed but we still need to update the updates record + q( + "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) > 0 ", + intval(UPDATE_FLAGS_UPDATED), + dbesc($address), + intval(UPDATE_FLAGS_UPDATED) + ); + } + + if (!x($ret, 'message')) { + $ret['success'] = true; + $ret['hash'] = $xchan_hash; + } + + logger('Result: ' . print_r($ret, true), LOGGER_DATA, LOG_DEBUG); + return $ret; + } + + /** + * @brief Called immediately after sending a zot message which is using queue processing. + * + * Updates the queue item according to the response result and logs any information + * returned to aid communications troubleshooting. + * + * @param string $hub - url of site we just contacted + * @param array $arr - output of z_post_url() + * @param array $outq - The queue structure attached to this request + */ + + public static function process_response($hub, $arr, $outq) + { + + logger('remote: ' . print_r($arr, true), LOGGER_DATA); + + if (!$arr['success']) { + logger('Failed: ' . $hub); + return; + } + + $x = json_decode($arr['body'], true); + + if (!$x) { + logger('No json from ' . $hub); + logger('Headers: ' . print_r($arr['header'], true), LOGGER_DATA, LOG_DEBUG); + } + + $x = Crypto::unencapsulate($x, get_config('system', 'prvkey')); + if (!is_array($x)) { + $x = json_decode($x, true); + } + + if (!is_array($x)) { + logger('no useful response: ' . $x); + } + + if ($x) { + if (!$x['success']) { + // handle remote validation issues + + $b = q( + "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'", + dbesc(($x['message']) ? $x['message'] : 'unknown delivery error'), + dbesc(datetime_convert()), + dbesc($outq['outq_hash']) + ); + } + + if (is_array($x) && array_key_exists('delivery_report', $x) && is_array($x['delivery_report'])) { + foreach ($x['delivery_report'] as $xx) { + Hook::call('dreport_process', $xx); + if (is_array($xx) && array_key_exists('message_id', $xx) && DReport::is_storable($xx)) { + q( + "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_log ) values ( '%s', '%s', '%s','%s','%s','%s','%s','%s' ) ", + dbesc($xx['message_id']), + dbesc($xx['location']), + dbesc($xx['recipient']), + dbesc($xx['name']), + dbesc($xx['status']), + dbesc(datetime_convert('UTC', 'UTC', $xx['date'])), + dbesc($xx['sender']), + dbesc(EMPTY_STR) + ); + } + } + + // we have a more descriptive delivery report, so discard the per hub 'queue' report. + + q( + "delete from dreport where dreport_queue = '%s' ", + dbesc($outq['outq_hash']) + ); + } + } + // update the timestamp for this site + + q( + "update site set site_dead = 0, site_update = '%s' where site_url = '%s'", + dbesc(datetime_convert()), + dbesc(dirname($hub)) + ); + + // synchronous message types are handled immediately + // async messages remain in the queue until processed. + + if (intval($outq['outq_async'])) { + Queue::remove($outq['outq_hash'], $outq['outq_channel']); + } + + logger('zot_process_response: ' . print_r($x, true), LOGGER_DEBUG); + } + + /** + * @brief + * + * We received a notification packet (in mod_post) that a message is waiting for us, and we've verified the sender. + * Check if the site is using zot6 delivery and includes a verified HTTP Signature, signed content, and a 'msg' field, + * and also that the signer and the sender match. + * If that happens, we do not need to fetch/pickup the message - we have it already and it is verified. + * Translate it into the form we need for zot_import() and import it. + * + * Otherwise send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site + * private key. + * The entire pickup message is encrypted with the remote site's public key. + * If everything checks out on the remote end, we will receive back a packet containing one or more messages, + * which will be processed and delivered before this function ultimately returns. + * + * @param array $arr + * decrypted and json decoded notify packet from remote site + * @return array from zot_import() + * @see zot_import() + * + */ + + public static function fetch($arr, $hub = null) + { + + logger('zot_fetch: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG); + + return self::import($arr, $hub); + } + + /** + * @brief Process incoming messages. + * + * Process incoming messages and import, update, delete as directed + * + * The message types handled here are 'activity' (e.g. posts), and 'sync'. + * + * @param array $arr + * 'pickup' structure returned from remote site + * @param string $sender_url + * the url specified by the sender in the initial communication. + * We will verify the sender and url in each returned message structure and + * also verify that all the messages returned match the site url that we are + * currently processing. + * + * @returns array + * Suitable for logging remotely, enumerating the processing results of each message/recipient combination + * * [0] => \e string $channel_hash + * * [1] => \e string $delivery_status + * * [2] => \e string $address + */ + + public static function import($arr, $hub = null) + { + + $env = $arr; + $private = false; + $return = []; + + $result = null; + + logger('Notify: ' . print_r($env, true), LOGGER_DATA, LOG_DEBUG); + + if (!is_array($env)) { + logger('decode error'); + return; + } + + $message_request = false; + + $has_data = array_key_exists('data', $env) && $env['data']; + $data = (($has_data) ? $env['data'] : false); + + $AS = null; + + if ($env['encoding'] === 'activitystreams') { + $AS = new ActivityStreams($data); + if ( + $AS->is_valid() && $AS->type === 'Announce' && is_array($AS->obj) + && array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj) + ) { + // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) + // Reparse the encapsulated Activity and use that instead + logger('relayed activity', LOGGER_DEBUG); + $AS = new ActivityStreams($AS->obj); + } + + if (!$AS->is_valid()) { + logger('Activity rejected: ' . print_r($data, true)); + return; + } + + // compatibility issue with like of Hubzilla "new friend" activities which is very difficult to fix + + if ($AS->implied_create && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) { + logger('create/person activity rejected. ' . print_r($data, true)); + return false; + } + + if (is_array($AS->obj)) { + $arr = Activity::decode_note($AS); + } else { + $arr = []; + } + + logger($AS->debug(), LOGGER_DATA); + } + + // There is nothing inherently wrong with getting a message-id which isn't a canonical URI/URL, but + // at the present time (2019/02) during the Hubzilla transition to zot6 it is likely to cause lots of duplicates for + // messages arriving from different protocols and sources with different message-id semantics. This + // restriction can be relaxed once most Hubzilla sites are upgraded to > 4.0. + // Don't check sync packets since they have a different encoding + + if ($arr && $env['type'] !== 'sync') { + if (strpos($arr['mid'], 'http') === false && strpos($arr['mid'], 'x-zot') === false) { + if (strpos($arr['mid'], 'bear:') === false) { + logger('activity rejected: legacy message-id'); + return; + } + } + + if ($arr['verb'] === 'Create' && ActivityStreams::is_an_actor($arr['obj_type'])) { + logger('activity rejected: create actor'); + return; + } + } + + $deliveries = null; + + if (array_key_exists('recipients', $env) && count($env['recipients'])) { + logger('specific recipients'); + logger('recipients: ' . print_r($env['recipients'], true), LOGGER_DEBUG); + + $recip_arr = []; + foreach ($env['recipients'] as $recip) { + $recip_arr[] = $recip; + } + + $r = false; + if ($recip_arr) { + stringify_array_elms($recip_arr, true); + $recips = implode(',', $recip_arr); + $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and channel_removed = 0 "); + } + + if (!$r) { + logger('recips: no recipients on this site'); + return; + } + + // Response messages will inherit the privacy of the parent + + if ($env['type'] !== 'response') { + $private = true; + } + + $deliveries = ids_to_array($r, 'hash'); + + // We found somebody on this site that's in the recipient list. + } else { + logger('public post'); + + + // Public post. look for any site members who are or may be accepting posts from this sender + // and who are allowed to see them based on the sender's permissions + // @fixme; + + $deliveries = self::public_recips($env, $AS); + } + + $deliveries = array_unique($deliveries); + + if (!$deliveries) { + logger('No deliveries on this site'); + return; + } + + if ($has_data) { + if (in_array($env['type'], ['activity', 'response'])) { + if (!(is_array($AS->actor) && isset($AS->actor['id']))) { + logger('No author!'); + return; + } + + $r = q( + "select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_id_url = '%s'", + dbesc($AS->actor['id']) + ); + + if ($r) { + $r = self::zot_record_preferred($r); + $arr['author_xchan'] = $r['hubloc_hash']; + } + + if (!$arr['author_xchan']) { + logger('No author!'); + return; + } + + $s = q( + "select hubloc_hash, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad') limit 1", + dbesc($env['sender']) + ); + + // in individual delivery, change owner if needed + if ($s) { + $arr['owner_xchan'] = $s[0]['hubloc_hash']; + } else { + $arr['owner_xchan'] = $env['sender']; + } + + if ($private && (!intval($arr['item_private']))) { + $arr['item_private'] = 1; + } + if ($arr['mid'] === $arr['parent_mid']) { + if (is_array($AS->obj) && array_key_exists('commentPolicy', $AS->obj)) { + $p = strstr($AS->obj['commentPolicy'], 'until='); + + // if until= is the same as the creation date, set the item_nocomment flag + // as comments were already closed before the post was even sent. + + if ($p !== false) { + $comments_closed_at = datetime_convert('UTC', 'UTC', substr($p, 6)); + if ($comments_closed_at === $arr['created']) { + $arr['item_nocomment'] = 1; + } else { + $arr['comments_closed'] = $comments_closed_at; + $arr['comment_policy'] = trim(str_replace($p, '', $AS->obj['commentPolicy'])); + } + } else { + $arr['comment_policy'] = $AS->obj['commentPolicy']; + } + } + } + if ($AS->data['hubloc']) { + $arr['item_verified'] = true; + + if (!array_key_exists('comment_policy', $arr)) { + // set comment policy based on type of site. + $s = q( + "select site_type from site where site_url = '%s' limit 1", + dbesc($r[0]['hubloc_url']) + ); + + if ($s && intval($s[0]['site_type']) === SITE_TYPE_ZOT) { + $arr['comment_policy'] = 'contacts'; + } else { + $arr['comment_policy'] = 'authenticated'; + } + } + } + if ($AS->meta['signed_data']) { + IConfig::Set($arr, 'activitypub', 'signed_data', $AS->meta['signed_data'], false); + $j = json_decode($AS->meta['signed_data'], true); + if ($j) { + IConfig::Set($arr, 'activitypub', 'rawmsg', json_encode(JSalmon::unpack($j['data'])), true); + } + } + + logger('Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG); + logger('Activity recipients: ' . print_r($deliveries, true), LOGGER_DATA, LOG_DEBUG); + + $relay = (($env['type'] === 'response') ? true : false); + + $result = self::process_delivery($env['sender'], $AS, $arr, $deliveries, $relay, false, $message_request); + } elseif ($env['type'] === 'sync') { + $arr = json_decode($data, true); + + logger('Channel sync received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG); + logger('Channel sync recipients: ' . print_r($deliveries, true), LOGGER_DATA, LOG_DEBUG); + + if ($env['encoding'] === 'red') { + $result = Libsync::process_channel_sync_delivery($env['sender'], $arr, $deliveries); + } else { + logger('unsupported sync packet encoding ignored.'); + } + } + } + if ($result) { + $return = array_merge($return, $result); + } + return $return; + } + + + public static function is_top_level($env, $act) + { + if ($env['encoding'] === 'zot' && array_key_exists('flags', $env) && in_array('thread_parent', $env['flags'])) { + return true; + } + if ($act) { + if (in_array($act->type, ['Like', 'Dislike'])) { + return false; + } + $x = self::find_parent($env, $act); + if ($x === $act->id || (is_array($act->obj) && array_key_exists('id', $act->obj) && $x === $act->obj['id'])) { + return true; + } + } + return false; + } + + + public static function find_parent($env, $act) + { + if ($act) { + if (in_array($act->type, ['Like', 'Dislike']) && is_array($act->obj)) { + return $act->obj['id']; + } + if ($act->parent_id) { + return $act->parent_id; + } + } + return false; + } + + + /** + * @brief + * + * A public message with no listed recipients can be delivered to anybody who + * has PERMS_NETWORK for that type of post, PERMS_AUTHED (in-network senders are + * by definition authenticated) or PERMS_SITE and is one the same site, + * or PERMS_SPECIFIC and the sender is a contact who is granted permissions via + * their connection permissions in the address book. + * Here we take a given message and construct a list of hashes of everybody + * on the site that we should try and deliver to. + * Some of these will be rejected, but this gives us a place to start. + * + * @param array $msg + * @return NULL|array + */ + + public static function public_recips($msg, $act) + { + + $check_mentions = false; + $include_sys = false; + + if ($msg['type'] === 'activity') { + $public_stream_mode = intval(get_config('system', 'public_stream_mode', PUBLIC_STREAM_NONE)); + if ($public_stream_mode === PUBLIC_STREAM_FULL) { + $include_sys = true; + } + + $perm = 'send_stream'; + + if (self::is_top_level($msg, $act)) { + $check_mentions = true; + } + } elseif ($msg['type'] === 'mail') { + $perm = 'post_mail'; + } + + // channels which we will deliver this post to + $r = []; + + $c = q("select channel_id, channel_hash from channel where channel_removed = 0"); + + if ($c) { + foreach ($c as $cc) { + // top level activity sent to ourself: ignore. Clones will get a sync activity + // which is a true clone of the original item. Everything else is a duplicate. + + if ($check_mentions && $cc['channel_hash'] === $msg['sender']) { + continue; + } + + if (perm_is_allowed($cc['channel_id'], $msg['sender'], $perm)) { + $r[] = $cc['channel_hash']; + } + } + } + + if ($include_sys) { + $sys = Channel::get_system(); + if ($sys) { + $r[] = $sys['channel_hash']; + } + } + + // add channels that are following tags + // these will be enumerated and validated in tgroup_check() + + $ft = q( + "select channel_hash as hash from channel left join pconfig on pconfig.uid = channel_id where cat = 'system' and k = 'followed_tags' and channel_hash != '%s' and channel_removed = 0", + dbesc($msg['sender']) + ); + if ($ft) { + foreach ($ft as $t) { + $r[] = $t['hash']; + } + } + + // look for any public mentions on this site + // They will get filtered by tgroup_check() so we don't need to check permissions now + + if ($check_mentions) { + // It's a top level post. Look at the tags. See if any of them are mentions and are on this hub. + if ($act && $act->obj) { + if (is_array($act->obj['tag']) && $act->obj['tag']) { + foreach ($act->obj['tag'] as $tag) { + if ($tag['type'] === 'Mention' && (strpos($tag['href'], z_root()) !== false)) { + $address = basename($tag['href']); + if ($address) { + $z = q( + "select channel_hash as hash from channel where channel_address = '%s' + and channel_hash != '%s' and channel_removed = 0 limit 1", + dbesc($address), + dbesc($msg['sender']) + ); + if ($z) { + $r[] = $z[0]['hash']; + } + } + } + if ($tag['type'] === 'topicalCollection' && strpos($tag['name'], App::get_hostname())) { + $address = substr($tag['name'], 0, strpos($tag['name'], '@')); + if ($address) { + $z = q( + "select channel_hash as hash from channel where channel_address = '%s' + and channel_hash != '%s' and channel_removed = 0 limit 1", + dbesc($address), + dbesc($msg['sender']) + ); + if ($z) { + $r[] = $z[0]['hash']; + } + } + } + } + } + } + } else { + // This is a comment. We need to find any parent with ITEM_UPLINK set. But in fact, let's just return + // everybody that stored a copy of the parent. This way we know we're covered. We'll check the + // comment permissions when we deliver them. + + $thread_parent = self::find_parent($msg, $act); + + if ($thread_parent) { + $z = q( + "select channel_hash as hash from channel left join item on channel.channel_id = item.uid where ( item.thr_parent = '%s' OR item.parent_mid = '%s' ) ", + dbesc($thread_parent), + dbesc($thread_parent) + ); + if ($z) { + foreach ($z as $zv) { + $r[] = $zv['hash']; + } + } + } + } + + // There are probably a lot of duplicates in $r at this point. We need to filter those out. + + if ($r) { + $r = array_values(array_unique($r)); + } + + logger('public_recips: ' . print_r($r, true), LOGGER_DATA, LOG_DEBUG); + return $r; + } + + + /** + * @brief + * + * @param array $sender + * @param ActivityStreams object $act + * @param array $msg_arr + * @param array $deliveries + * @param bool $relay + * @param bool $public (optional) default false + * @param bool $request (optional) default false + * @return array + */ + + public static function process_delivery($sender, $act, $msg_arr, $deliveries, $relay, $public = false, $request = false) + { + + $result = []; + + // logger('msg_arr: ' . print_r($msg_arr,true),LOGGER_ALL); + + // If an upstream hop used ActivityPub, set the identities to zot6 nomadic identities where applicable + // else things could easily get confused + + $msg_arr['author_xchan'] = Activity::find_best_identity($msg_arr['author_xchan']); + $msg_arr['owner_xchan'] = Activity::find_best_identity($msg_arr['owner_xchan']); + + // We've validated the sender. Now make sure that the sender is the owner or author + + if (!$public) { + if ($sender != $msg_arr['owner_xchan'] && $sender != $msg_arr['author_xchan']) { + logger("Sender $sender is not owner {$msg_arr['owner_xchan']} or author {$msg_arr['author_xchan']} - mid {$msg_arr['mid']}"); + return; + } + } + + if ($act->implied_create) { + logger('implied create activity. Not delivering/storing.'); + return; + } + + foreach ($deliveries as $d) { + $local_public = $public; + + // if any further changes are to be made, change a copy and not the original + $arr = $msg_arr; + +// if (! $msg_arr['mid']) { +// logger('no mid2: ' . print_r($msg_arr,true)); +// logger('recip: ' . $d); +// } + + + $DR = new DReport(z_root(), $sender, $d, $arr['mid']); + + $channel = Channel::from_hash($d); + + if (!$channel) { + $DR->update('recipient not found'); + $result[] = $DR->get(); + continue; + } + + $DR->set_name($channel['channel_name'] . ' <' . Channel::get_webfinger($channel) . '>'); + +// if ($act->type === 'Tombstone') { +// $r = q("select * from item where mid in ( '%s', '%s' ) and uid = %d", +// dbesc($act->id), +// dbesc(str_replace('/activity/','/item/',$act->id)) +// intval($channel['channel_id']) +// ); +// if ($r) { +// if (($r[0]['author_xchan'] === $sender) || ($r[0]['owner_xchan'] === $sender)) { +// drop_item($r[0]['id'],false); +// } +// $DR->update('item deleted'); +// $result[] = $DR->get(); +// continue; +// } +// $DR->update('deleted item not found'); +// $result[] = $DR->get(); +// continue; +// } + + if (($act) && ($act->obj) && (!is_array($act->obj))) { + // The initial object fetch failed using the sys channel credentials. + // Try again using the delivery channel credentials. + // We will also need to re-parse the $item array, + // but preserve any values that were set during anonymous parsing. + + $o = Activity::fetch($act->obj, $channel); + if ($o) { + $act->obj = $o; + $arr = array_merge(Activity::decode_note($act), $arr); + } else { + $DR->update('Incomplete or corrupt activity'); + $result[] = $DR->get(); + continue; + } + } + + /** + * We need to block normal top-level message delivery from our clones, as the delivered + * message doesn't have ACL information in it as the cloned copy does. That copy + * will normally arrive first via sync delivery, but this isn't guaranteed. + * There's a chance the current delivery could take place before the cloned copy arrives + * hence the item could have the wrong ACL and *could* be used in subsequent deliveries or + * access checks. + */ + + if ($sender === $channel['channel_hash'] && $arr['author_xchan'] === $channel['channel_hash'] && $arr['mid'] === $arr['parent_mid']) { + $DR->update('self delivery ignored'); + $result[] = $DR->get(); + continue; + } + + // allow public postings to the sys channel regardless of permissions, but not + // for comments travelling upstream. Wait and catch them on the way down. + // They may have been blocked by the owner. + + if (intval($channel['channel_system']) && (!$arr['item_private']) && (!$relay)) { + $local_public = true; + + if (!check_pubstream_channelallowed($sender)) { + $local_public = false; + continue; + } + + // don't allow pubstream posts if the sender even has a clone on a pubstream denied site + + $siteallowed = true; + $h = q( + "select hubloc_url from hubloc where hubloc_hash = '%s'", + dbesc($sender) + ); + if ($h) { + foreach ($h as $hub) { + if (!check_pubstream_siteallowed($hub['hubloc_url'])) { + $siteallowed = false; + break; + } + } + } + if (!$siteallowed) { + $local_public = false; + continue; + } + + $r = q( + "select xchan_selfcensored from xchan where xchan_hash = '%s' limit 1", + dbesc($sender) + ); + // don't import sys channel posts from selfcensored authors + if ($r && (intval($r[0]['xchan_selfcensored']))) { + $local_public = false; + continue; + } + if (!MessageFilter::evaluate($arr, get_config('system', 'pubstream_incl'), get_config('system', 'pubstream_excl'))) { + $local_public = false; + continue; + } + } + + // perform pre-storage check to see if it's "likely" that this is a group or collection post + + $tag_delivery = tgroup_check($channel['channel_id'], $arr); + + $perm = 'send_stream'; + if (($arr['mid'] !== $arr['parent_mid']) && ($relay)) { + $perm = 'post_comments'; + } + + // This is our own post, possibly coming from a channel clone + + if ($arr['owner_xchan'] == $d) { + $arr['item_wall'] = 1; + } else { + $arr['item_wall'] = 0; + } + + $friendofriend = false; + + if ((!$tag_delivery) && (!$local_public)) { + $allowed = (perm_is_allowed($channel['channel_id'], $sender, $perm)); + + $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER); + if ($blocked) { + $h = q( + "select hubloc_url from hubloc where hubloc_hash = '%s'", + dbesc($sender) + ); + if ($h) { + foreach ($h as $hub) { + foreach ($blocked as $b) { + if (strpos($hub['hubloc_url'], $b['block_entity']) !== false) { + $allowed = false; + } + } + } + } + } + + $permit_mentions = intval(PConfig::Get($channel['channel_id'], 'system', 'permit_all_mentions') && i_am_mentioned($channel, $arr)); + + if (!$allowed) { + if ($perm === 'post_comments') { + $parent = q( + "select * from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['parent_mid']), + intval($channel['channel_id']) + ); + if ($parent) { + $allowed = can_comment_on_post($sender, $parent[0]); + } + if ((!$allowed) && $permit_mentions) { + if ($parent && $parent[0]['owner_xchan'] === $channel['channel_hash']) { + $allowed = false; + } else { + $allowed = true; + } + } + if ($parent && absolutely_no_comments($parent[0])) { + $allowed = false; + } + } elseif ($permit_mentions) { + $allowed = true; + } + } + if ($request) { + // Conversation fetches (e.g. $request == true) take place for + // a) new comments on expired posts + // b) hyperdrive (friend-of-friend) conversations + + + // over-ride normal connection permissions for hyperdrive (friend-of-friend) conversations + // (if hyperdrive is enabled). + // If $allowed is already true, this is probably the conversation of a direct friend or a + // conversation fetch for a new comment on an expired post + // Comments of all these activities are allowed and will only be rejected (later) if the parent + // doesn't exist. + + if ($perm === 'send_stream') { + if (get_pconfig($channel['channel_id'], 'system', 'hyperdrive', true)) { + $allowed = true; + } + } else { + $allowed = true; + } + + $friendofriend = true; + } + + if (intval($arr['item_private']) === 2) { + if (!perm_is_allowed($channel['channel_id'], $sender, 'post_mail')) { + $allowed = false; + } + } + + if (get_abconfig($channel['channel_id'], $sender, 'system', 'block_announce', false)) { + if ($arr['verb'] === 'Announce' || strpos($arr['body'], '[/share]')) { + $allowed = false; + } + } + + if (!$allowed) { + logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}"); + $DR->update('permission denied'); + $result[] = $DR->get(); + continue; + } + } + + if ($arr['mid'] !== $arr['parent_mid']) { + if (perm_is_allowed($channel['channel_id'], $sender, 'moderated') && $relay) { + $arr['item_blocked'] = ITEM_MODERATED; + } + + // check source route. + // We are only going to accept comments from this sender if the comment has the same route as the top-level-post, + // this is so that permissions mismatches between senders apply to the entire conversation + // As a side effect we will also do a preliminary check that we have the top-level-post, otherwise + // processing it is pointless. + + // The original author won't have a token in their copy of the message + + $prnt = ((strpos($arr['parent_mid'], 'token=') !== false) ? substr($arr['parent_mid'], 0, strpos($arr['parent_mid'], '?')) : ''); + + $r = q( + "select route, id, parent_mid, mid, owner_xchan, item_private, obj_type from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['parent_mid']), + intval($channel['channel_id']) + ); + if (!$r) { + $r = q( + "select route, id, parent_mid, mid, owner_xchan, item_private, obj_type from item where mid = '%s' and uid = %d limit 1", + dbesc($prnt), + intval($channel['channel_id']) + ); + } + + if ($r) { + // if this is a multi-threaded conversation, preserve the threading information + if ($r[0]['parent_mid'] !== $r[0]['mid']) { + $arr['thr_parent'] = $arr['parent_mid']; + $arr['parent_mid'] = $r[0]['parent_mid']; + if ($act->replyto) { + q( + "update item set replyto = '%s' where id = %d", + dbesc($act->replyto), + intval($r[0]['id']) + ); + } + } + + if ($r[0]['obj_type'] === 'Question') { + // route checking doesn't work correctly here because we've changed the privacy + $r[0]['route'] = EMPTY_STR; + // If this is a poll response, convert the obj_type to our (internal-only) "Answer" type + if ($arr['obj_type'] === 'Note' && $arr['title'] && (!$arr['content'])) { + $arr['obj_type'] = 'Answer'; + } + } + } else { + // We don't seem to have a copy of this conversation or at least the parent + // - so request a copy of the entire conversation to date. + // Don't do this if it's a relay post as we're the ones who are supposed to + // have the copy and we don't want the request to loop. + // Also don't do this if this comment came from a conversation request packet. + // It's possible that comments are allowed but posting isn't and that could + // cause a conversation fetch loop. + // We'll also check the send_stream permission - because if it isn't allowed, + // the top level post is unlikely to be imported and + // this is just an exercise in futility. + + if ( + (!$relay) && (!$request) && (!$local_public) + && perm_is_allowed($channel['channel_id'], $sender, 'send_stream') + ) { + $reports = self::fetch_conversation($channel, $arr['mid']); + + // extract our delivery report from the fetched conversation + // if we can find it. + logger('fetch_report for ' . $arr['mid'], LOGGER_ALL); + logger('fetch_report: ' . print_r($reports, true), LOGGER_ALL); + + if ($reports && is_array($reports)) { + $found_report = false; + foreach ($reports as $report) { + if ($report['message_id'] === $arr['mid']) { + $found_report = true; + $DR->update($report['status']); + } + } + if (!$found_report) { + $DR->update('conversation fetch failed'); + } + } else { + $DR->update('conversation fetch failed'); + } + } else { + $DR->update('comment parent not found'); + } + $result[] = $DR->get(); + continue; + } + + + if ($relay || $friendofriend || (intval($r[0]['item_private']) === 0 && intval($arr['item_private']) === 0)) { + // reset the route in case it travelled a great distance upstream + // use our parent's route so when we go back downstream we'll match + // with whatever route our parent has. + // Also friend-of-friend conversations may have been imported without a route, + // but we are now getting comments via listener delivery + // and if there is no privacy on this or the parent, we don't care about the route, + // so just set the owner and route accordingly. + $arr['route'] = $r[0]['route']; + $arr['owner_xchan'] = $r[0]['owner_xchan']; + } else { + // going downstream check that we have the same upstream provider that + // sent it to us originally. Ignore it if it came from another source + // (with potentially different permissions). + // only compare the last hop since it could have arrived at the last location any number of ways. + // Always accept empty routes and firehose items (route contains 'undefined') . + + $existing_route = explode(',', $r[0]['route']); + $routes = count($existing_route); + if ($routes) { + $last_hop = array_pop($existing_route); + $last_prior_route = implode(',', $existing_route); + } else { + $last_hop = ''; + $last_prior_route = ''; + } + + if (in_array('undefined', $existing_route) || $last_hop == 'undefined' || $sender == 'undefined') { + $last_hop = ''; + } + + $current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender; + + if ($last_hop && $last_hop != $sender) { + logger('comment route mismatch: parent route = ' . $r[0]['route'] . ' expected = ' . $current_route, LOGGER_DEBUG); + logger('comment route mismatch: parent msg = ' . $r[0]['id'], LOGGER_DEBUG); + $DR->update('comment route mismatch'); + $result[] = $DR->get(); + continue; + } + + // we'll add sender onto this when we deliver it. $last_prior_route now has the previously stored route + // *except* for the sender which would've been the last hop before it got to us. + + $arr['route'] = $last_prior_route; + } + } + + // This is used to fetch allow/deny rules if either the sender + // or owner is a connection. post_is_importable() evaluates all of them + $abook = q( + "select * from abook where abook_channel = %d and ( abook_xchan = '%s' OR abook_xchan = '%s' )", + intval($channel['channel_id']), + dbesc($arr['owner_xchan']), + dbesc($arr['author_xchan']) + ); + + if (isset($arr['item_deleted']) && intval($arr['item_deleted'])) { + // set these just in case we need to store a fresh copy of the deleted post. + // This could happen if the delete got here before the original post did. + + $arr['aid'] = $channel['channel_account_id']; + $arr['uid'] = $channel['channel_id']; + + $item_id = self::delete_imported_item($sender, $act, $arr, $channel['channel_id'], $relay); + $DR->update(($item_id) ? 'deleted' : 'delete_failed'); + $result[] = $DR->get(); + + if ($relay && $item_id) { + logger('process_delivery: invoking relay'); + Run::Summon(['Notifier', 'relay', intval($item_id)]); + $DR->update('relayed'); + $result[] = $DR->get(); + } + continue; + } + + // reactions such as like and dislike could have an mid with /activity/ in it. + // Check for both forms in order to prevent duplicates. + + $r = q( + "select * from item where mid in ('%s','%s') and uid = %d limit 1", + dbesc($arr['mid']), + dbesc(str_replace(z_root() . '/activity/', z_root() . '/item/', $arr['mid'])), + intval($channel['channel_id']) + ); + + if ($r) { + // We already have this post. + $item_id = $r[0]['id']; + + if (intval($r[0]['item_deleted'])) { + // It was deleted locally. + $DR->update('update ignored'); + $result[] = $DR->get(); + + continue; + } // Maybe it has been edited? + elseif ($arr['edited'] > $r[0]['edited']) { + $arr['id'] = $r[0]['id']; + $arr['uid'] = $channel['channel_id']; + if (post_is_importable($channel['channel_id'], $arr, $abook)) { + $item_result = self::update_imported_item($sender, $arr, $r[0], $channel['channel_id'], $tag_delivery); + $DR->update('updated'); + $result[] = $DR->get(); + if (!$relay) { + add_source_route($item_id, $sender); + } + } else { + $DR->update('update ignored'); + $result[] = $DR->get(); + } + } else { + $DR->update('update ignored'); + $result[] = $DR->get(); + + // We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit), + // and at the same time not relay any other relayable posts more than once, because to do so is very wasteful. + if (!intval($r[0]['item_origin'])) { + continue; + } + } + } else { + $arr['aid'] = $channel['channel_account_id']; + $arr['uid'] = $channel['channel_id']; + + // if it's a sourced post, call the post_local hooks as if it were + // posted locally so that crosspost connectors will be triggered. + + if (check_item_source($arr['uid'], $arr)) { + /** + * @hooks post_local + * Called when an item has been posted on this machine via mod/item.php (also via API). + * * \e array with an item + */ + Hook::call('post_local', $arr); + } + + $item_id = 0; + + Activity::rewrite_mentions($arr); + + + $maxlen = get_max_import_size(); + + if ($maxlen && mb_strlen($arr['body']) > $maxlen) { + $arr['body'] = mb_substr($arr['body'], 0, $maxlen, 'UTF-8'); + logger('message length exceeds max_import_size: truncated'); + } + + if ($maxlen && mb_strlen($arr['summary']) > $maxlen) { + $arr['summary'] = mb_substr($arr['summary'], 0, $maxlen, 'UTF-8'); + logger('message summary length exceeds max_import_size: truncated'); + } + + if (post_is_importable($arr['uid'], $arr, $abook)) { + // Strip old-style hubzilla bookmarks + if (strpos($arr['body'], "#^[") !== false) { + $arr['body'] = str_replace("#^[", "[", $arr['body']); + } + + $item_result = item_store($arr); + if ($item_result['success']) { + $item_id = $item_result['item_id']; + $parr = [ + 'item_id' => $item_id, + 'item' => $arr, + 'sender' => $sender, + 'channel' => $channel + ]; + /** + * @hooks activity_received + * Called when an activity (post, comment, like, etc.) has been received from a zot source. + * * \e int \b item_id + * * \e array \b item + * * \e array \b sender + * * \e array \b channel + */ + Hook::call('activity_received', $parr); + // don't add a source route if it's a relay or later recipients will get a route mismatch + if (!$relay) { + add_source_route($item_id, $sender); + } + } + $DR->update(($item_id) ? 'posted' : 'storage failed: ' . $item_result['message']); + $result[] = $DR->get(); + } else { + $DR->update('post ignored'); + $result[] = $DR->get(); + } + } + + // preserve conversations with which you are involved from expiration + + $stored = (($item_result && $item_result['item']) ? $item_result['item'] : false); + if ( + (is_array($stored)) && ($stored['id'] != $stored['parent']) + && ($stored['author_xchan'] === $channel['channel_hash']) + ) { + retain_item($stored['item']['parent']); + } + + if ($relay && $item_id) { + logger('Invoking relay'); + Run::Summon(['Notifier', 'relay', intval($item_id)]); + $DR->addto_update('relayed'); + $result[] = $DR->get(); + } + } + + if (!$deliveries) { + $result[] = array('', 'no recipients', '', $arr['mid']); + } + + logger('Local results: ' . print_r($result, true), LOGGER_DEBUG); + + return $result; + } + + public static function hyperdrive_enabled($channel, $item) + { + + if (get_pconfig($channel['channel_id'], 'system', 'hyperdrive', true)) { + return true; + } + return false; + } + + public static function fetch_conversation($channel, $mid) + { + + // Use Zotfinger to create a signed request + + logger('fetching conversation: ' . $mid, LOGGER_DEBUG); + + $a = Zotfinger::exec($mid, $channel); + + logger('received conversation: ' . print_r($a, true), LOGGER_DATA); + + if (!$a) { + return false; + } + + if ($a['data']['type'] !== 'OrderedCollection') { + return false; + } + + $obj = new ASCollection($a['data'], $channel); + $items = $obj->get(); + + if (!$items) { + return false; + } + + $ret = []; + + + $signer = q( + "select hubloc_hash, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad') limit 1", + dbesc($a['signature']['signer']) + ); + + + foreach ($items as $activity) { + $AS = new ActivityStreams($activity); + if ( + $AS->is_valid() && $AS->type === 'Announce' && is_array($AS->obj) + && array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj) + ) { + // This is a relayed/forwarded Activity (as opposed to a shared/boosted object) + // Reparse the encapsulated Activity and use that instead + logger('relayed activity', LOGGER_DEBUG); + $AS = new ActivityStreams($AS->obj); + } + + if (!$AS->is_valid()) { + logger('FOF Activity rejected: ' . print_r($activity, true)); + continue; + } + $arr = Activity::decode_note($AS); + + // logger($AS->debug()); + + $r = q( + "select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1", + dbesc($AS->actor['id']), + dbesc($AS->actor['id']) + ); + + if (!$r) { + $y = import_author_xchan(['url' => $AS->actor['id']]); + if ($y) { + $r = q( + "select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1", + dbesc($AS->actor['id']), + dbesc($AS->actor['id']) + ); + } + if (!$r) { + logger('FOF Activity: no actor'); + continue; + } + } + + if ($AS->obj['actor'] && $AS->obj['actor']['id'] && $AS->obj['actor']['id'] !== $AS->actor['id']) { + $y = import_author_xchan(['url' => $AS->obj['actor']['id']]); + if (!$y) { + logger('FOF Activity: no object actor'); + continue; + } + } + + + if ($r) { + $arr['author_xchan'] = $r[0]['hubloc_hash']; + } + + if ($signer) { + $arr['owner_xchan'] = $signer[0]['hubloc_hash']; + } else { + $arr['owner_xchan'] = $a['signature']['signer']; + } + + if ($AS->meta['hubloc'] || $arr['author_xchan'] === $arr['owner_xchan']) { + $arr['item_verified'] = true; + } + + if ($AS->meta['signed_data']) { + IConfig::Set($arr, 'activitystreams', 'signed_data', $AS->meta['signed_data'], false); + } + + logger('FOF Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG); + logger('FOF Activity recipient: ' . $channel['channel_hash'], LOGGER_DATA, LOG_DEBUG); + + $result = self::process_delivery($arr['owner_xchan'], $AS, $arr, [$channel['channel_hash']], false, false, true); + if ($result) { + $ret = array_merge($ret, $result); + } + } + + return $ret; + } + + + /** + * @brief Remove community tag. + * + * @param array $sender an associative array with + * * \e string \b hash a xchan_hash + * @param array $arr an associative array + * * \e int \b verb + * * \e int \b obj_type + * * \e int \b mid + * @param int $uid + */ + + public static function remove_community_tag($sender, $arr, $uid) + { + + if (!(activity_match($arr['verb'], ACTIVITY_TAG) && ($arr['obj_type'] == ACTIVITY_OBJ_TAGTERM))) { + return; + } + + logger('remove_community_tag: invoked'); + + if (!get_pconfig($uid, 'system', 'blocktags')) { + logger('Permission denied.'); + return; + } + + $r = q( + "select * from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['mid']), + intval($uid) + ); + if (!$r) { + logger('No item'); + return; + } + + if (($sender != $r[0]['owner_xchan']) && ($sender != $r[0]['author_xchan'])) { + logger('Sender not authorised.'); + return; + } + + $i = $r[0]; + + if ($i['target']) { + $i['target'] = json_decode($i['target'], true); + } + if ($i['object']) { + $i['object'] = json_decode($i['object'], true); + } + if (!($i['target'] && $i['object'])) { + logger('No target/object'); + return; + } + + $message_id = $i['target']['id']; + + $r = q( + "select id from item where mid = '%s' and uid = %d limit 1", + dbesc($message_id), + intval($uid) + ); + if (!$r) { + logger('No parent message'); + return; + } + + q( + "delete from term where uid = %d and oid = %d and otype = %d and ttype in ( %d, %d ) and term = '%s' and url = '%s'", + intval($uid), + intval($r[0]['id']), + intval(TERM_OBJ_POST), + intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG), + dbesc($i['object']['title']), + dbesc(get_rel_link($i['object']['link'], 'alternate')) + ); + } + + /** + * @brief Updates an imported item. + * + * @param array $sender + * @param array $item + * @param array $orig + * @param int $uid + * @param bool $tag_delivery + * @see item_store_update() + * + */ + + public static function update_imported_item($sender, $item, $orig, $uid, $tag_delivery) + { + + // If this is a comment being updated, remove any privacy information + // so that item_store_update will set it from the original. + + if ($item['mid'] !== $item['parent_mid']) { + unset($item['allow_cid']); + unset($item['allow_gid']); + unset($item['deny_cid']); + unset($item['deny_gid']); + unset($item['item_private']); + } + + // we need the tag_delivery check for downstream flowing posts as the stored post + // may have a different owner than the one being transmitted. + + if (($sender != $orig['owner_xchan'] && $sender != $orig['author_xchan']) && (!$tag_delivery)) { + logger('sender is not owner or author'); + return; + } + + + $x = item_store_update($item); + + // If we're updating an event that we've saved locally, we store the item info first + // because event_addtocal will parse the body to get the 'new' event details + + if ($orig['resource_type'] === 'event') { + $res = event_addtocal($orig['id'], $uid); + if (!$res) { + logger('update event: failed'); + } + } + + if (!$x['item_id']) { + logger('update_imported_item: failed: ' . $x['message']); + } else { + logger('update_imported_item'); + } + + return $x; + } + + /** + * @brief Deletes an imported item. + * + * @param array $sender + * * \e string \b hash a xchan_hash + * @param array $item + * @param int $uid + * @param bool $relay + * @return bool|int post_id + */ + + public static function delete_imported_item($sender, $act, $item, $uid, $relay) + { + + logger('invoked', LOGGER_DEBUG); + + $ownership_valid = false; + $item_found = false; + $post_id = 0; + + if ($item['verb'] === 'Tombstone') { + // The id of the deleted thing is the item mid (activity id) + $mid = $item['mid']; + } else { + // The id is the object id if the type is Undo or Delete + $mid = ((is_array($act->obj)) ? $act->obj['id'] : $act->obj); + } + + // we may have stored either the object id or the activity id if it was a response activity (like, dislike, etc.) + + $r = q( + "select * from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) + and mid in ('%s','%s') and uid = %d limit 1", + dbesc($sender), + dbesc($sender), + dbesc($sender), + dbesc($mid), + dbesc(str_replace('/activity/', '/item/', $mid)), + intval($uid) + ); + + if ($r) { + $stored = $r[0]; + // we proved ownership in the sql query + $ownership_valid = true; + + $post_id = $stored['id']; + $item_found = true; + } else { + // this will fail with an ownership issue, so explain the real reason + logger('delete received for non-existent item or not owned by sender - ignoring.'); + } + + if ($ownership_valid === false) { + logger('delete_imported_item: failed: ownership issue'); + return false; + } + + if ($stored['resource_type'] === 'event') { + $i = q( + "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", + dbesc($stored['resource_id']), + intval($uid) + ); + if ($i) { + if ($i[0]['event_xchan'] === $sender) { + q( + "delete from event where event_hash = '%s' and uid = %d", + dbesc($stored['resource_id']), + intval($uid) + ); + } else { + logger('delete linked event: not owner'); + return; + } + } + } + if ($item_found) { + if (intval($stored['item_deleted'])) { + logger('delete_imported_item: item was already deleted'); + if (!$relay) { + return false; + } + + // This is a bit hackish, but may have to suffice until the notification/delivery loop is optimised + // a bit further. We're going to strip the ITEM_ORIGIN on this item if it's a comment, because + // it was already deleted, and we're already relaying, and this ensures that no other process or + // code path downstream can relay it again (causing a loop). Since it's already gone it's not coming + // back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing + // this information from the metadata should have no other discernible impact. + + if (($stored['id'] != $stored['parent']) && intval($stored['item_origin'])) { + q( + "update item set item_origin = 0 where id = %d and uid = %d", + intval($stored['id']), + intval($stored['uid']) + ); + } + } else { + if ($stored['id'] !== $stored['parent']) { + q( + "update item set commented = '%s', changed = '%s' where id = %d", + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($stored['parent']) + ); + } + } + + // Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels + // and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2). + + drop_item($post_id, false, DROPITEM_PHASE1); + tag_deliver($uid, $post_id); + } + + return $post_id; + } + + + /** + * @brief Processes delivery of profile. + * + * @param array $sender an associative array + * * \e string \b hash a xchan_hash + * @param array $arr + * @param array $deliveries (unused) + * @see import_directory_profile() + */ + + public static function process_profile_delivery($sender, $arr, $deliveries) + { + + logger('process_profile_delivery', LOGGER_DEBUG); + + $r = q( + "select xchan_addr from xchan where xchan_hash = '%s' limit 1", + dbesc($sender['hash']) + ); + if ($r) { + Libzotdir::import_directory_profile($sender, $arr, $r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0); + } + } + + + /** + * @brief + * + * @param array $sender an associative array + * * \e string \b hash a xchan_hash + * @param array $arr + * @param array $deliveries (unused) deliveries is irrelevant + */ + public static function process_location_delivery($sender, $arr, $deliveries) + { + + // deliveries is irrelevant + logger('process_location_delivery', LOGGER_DEBUG); + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($sender) + ); + if ($r) { + $xchan = ['id' => $r[0]['xchan_guid'], 'id_sig' => $r[0]['xchan_guid_sig'], + 'hash' => $r[0]['xchan_hash'], 'public_key' => $r[0]['xchan_pubkey']]; + } + if (array_key_exists('locations', $arr) && $arr['locations']) { + $x = Libsync::sync_locations($xchan, $arr, true); + logger('results: ' . print_r($x, true), LOGGER_DEBUG); + if ($x['changed']) { + $guid = random_string() . '@' . App::get_hostname(); + Libzotdir::update_modtime($sender, $r[0]['xchan_guid'], $arr['locations'][0]['address'], UPDATE_FLAGS_UPDATED); + } + } + } + + /** + * @brief Checks for a moved channel and sets the channel_moved flag. + * + * Currently the effect of this flag is to turn the channel into 'read-only' mode. + * New content will not be processed (there was still an issue with blocking the + * ability to post comments as of 10-Mar-2016). + * We do not physically remove the channel at this time. The hub admin may choose + * to do so, but is encouraged to allow a grace period of several days in case there + * are any issues migrating content. This packet will generally be received by the + * original site when the basic channel import has been processed. + * + * This will only be executed on the old location + * if a new location is reported and there is only one location record. + * The rest of the hubloc syncronisation will be handled within + * sync_locations + * + * @param string $sender_hash A channel hash + * @param array $locations + */ + + public static function check_location_move($sender_hash, $locations) + { + + if (!$locations) { + return; + } + + if (count($locations) != 1) { + return; + } + + $loc = $locations[0]; + + $r = q( + "select * from channel where channel_hash = '%s' limit 1", + dbesc($sender_hash) + ); + + if (!$r) { + return; + } + + if ($loc['url'] !== z_root()) { + $x = q( + "update channel set channel_moved = '%s' where channel_hash = '%s' limit 1", + dbesc($loc['url']), + dbesc($sender_hash) + ); + + // federation plugins may wish to notify connections + // of the move on singleton networks + + $arr = [ + 'channel' => $r[0], + 'locations' => $locations + ]; + /** + * @hooks location_move + * Called when a new location has been provided to a UNO channel (indicating a move rather than a clone). + * * \e array \b channel + * * \e array \b locations + */ + Hook::call('location_move', $arr); + } + } + + + /** + * @brief Returns an array with all known distinct hubs for this channel. + * + * @param array $channel an associative array which must contain + * * \e string \b channel_hash the hash of the channel + * @return array an array with associative arrays + * @see self::get_hublocs() + */ + + public static function encode_locations($channel) + { + $ret = []; + + $x = self::get_hublocs($channel['channel_hash']); + + if ($x && count($x)) { + foreach ($x as $hub) { + // if this is a local channel that has been deleted, the hubloc is no good + // - make sure it is marked deleted so that nobody tries to use it. + + if (intval($channel['channel_removed']) && $hub['hubloc_url'] === z_root()) { + $hub['hubloc_deleted'] = 1; + } + + $ret[] = [ + 'host' => $hub['hubloc_host'], + 'address' => $hub['hubloc_addr'], + 'id_url' => $hub['hubloc_id_url'], + 'primary' => (intval($hub['hubloc_primary']) ? true : false), + 'url' => $hub['hubloc_url'], + 'url_sig' => $hub['hubloc_url_sig'], + 'site_id' => $hub['hubloc_site_id'], + 'callback' => $hub['hubloc_callback'], + 'sitekey' => $hub['hubloc_sitekey'], + 'deleted' => (intval($hub['hubloc_deleted']) ? true : false) + ]; + } + } + + return $ret; + } + + + /** + * @brief + * + * @param array $arr + * @param string $pubkey + * @return bool true if updated or inserted + */ + + public static function import_site($arr) + { + + if ((!is_array($arr)) || (!$arr['url']) || (!$arr['site_sig'])) { + return false; + } + + if (!self::verify($arr['url'], $arr['site_sig'], $arr['sitekey'])) { + logger('Bad url_sig'); + return false; + } + + $update = false; + $exists = false; + + $r = q( + "select * from site where site_url = '%s' limit 1", + dbesc($arr['url']) + ); + if ($r) { + $exists = true; + $siterecord = $r[0]; + } + + $site_directory = 0; + if ($arr['directory_mode'] == 'normal') { + $site_directory = DIRECTORY_MODE_NORMAL; + } + if ($arr['directory_mode'] == 'primary') { + $site_directory = DIRECTORY_MODE_PRIMARY; + } + if ($arr['directory_mode'] == 'secondary') { + $site_directory = DIRECTORY_MODE_SECONDARY; + } + if ($arr['directory_mode'] == 'standalone') { + $site_directory = DIRECTORY_MODE_STANDALONE; + } + + $register_policy = 0; + if ($arr['register_policy'] == 'closed') { + $register_policy = REGISTER_CLOSED; + } + if ($arr['register_policy'] == 'open') { + $register_policy = REGISTER_OPEN; + } + if ($arr['register_policy'] == 'approve') { + $register_policy = REGISTER_APPROVE; + } + + $access_policy = 0; + if (array_key_exists('access_policy', $arr)) { + if ($arr['access_policy'] === 'private') { + $access_policy = ACCESS_PRIVATE; + } + if ($arr['access_policy'] === 'paid') { + $access_policy = ACCESS_PAID; + } + if ($arr['access_policy'] === 'free') { + $access_policy = ACCESS_FREE; + } + if ($arr['access_policy'] === 'tiered') { + $access_policy = ACCESS_TIERED; + } + } + + // don't let insecure sites register as public hubs + + if (strpos($arr['url'], 'https://') === false) { + $access_policy = ACCESS_PRIVATE; + } + + if ($access_policy != ACCESS_PRIVATE) { + $x = z_fetch_url($arr['url'] . '/siteinfo.json'); + if (!$x['success']) { + $access_policy = ACCESS_PRIVATE; + } + } + + $site_about = EMPTY_STR; + $site_logo = EMPTY_STR; + $sitename = EMPTY_STR; + + $directory_url = htmlspecialchars(isset($arr['directory_url']) ? $arr['directory_url'] : EMPTY_STR, ENT_COMPAT, 'UTF-8', false); + $url = htmlspecialchars(strtolower($arr['url']), ENT_COMPAT, 'UTF-8', false); + $sellpage = htmlspecialchars($arr['sellpage'], ENT_COMPAT, 'UTF-8', false); + $site_location = htmlspecialchars($arr['location'], ENT_COMPAT, 'UTF-8', false); + $site_realm = htmlspecialchars($arr['realm'], ENT_COMPAT, 'UTF-8', false); + $sitename = htmlspecialchars($arr['sitename'], ENT_COMPAT, 'UTF-8', false); + $site_project = htmlspecialchars($arr['project'], ENT_COMPAT, 'UTF-8', false); + $site_crypto = ((array_key_exists('encryption', $arr) && is_array($arr['encryption'])) ? htmlspecialchars(implode(',', $arr['encryption']), ENT_COMPAT, 'UTF-8', false) : ''); + $site_version = ((array_key_exists('version', $arr)) ? htmlspecialchars($arr['version'], ENT_COMPAT, 'UTF-8', false) : ''); + if (array_key_exists('about', $arr) && $arr['about']) { + $site_about = html2bbcode(purify_html($arr['about'])); + } + if (array_key_exists('logo', $arr) && $arr['logo']) { + $site_logo = $arr['logo']; + } elseif (file_exists('images/' . strtolower($site_project) . '.png')) { + $site_logo = z_root() . '/images/' . strtolower($site_project) . '.png'; + } else { + $site_logo = z_root() . '/images/default_profile_photos/red_koala_trans/300.png'; + } + + set_sconfig($url, 'system', 'about', $site_about); + set_sconfig($url, 'system', 'logo', $site_logo); + set_sconfig($url, 'system', 'sitename', $sitename); + + $site_flags = $site_directory; + + if (array_key_exists('zot', $arr)) { + set_sconfig($arr['url'], 'system', 'zot_version', $arr['zot']); + } + + if ($exists) { + if ( + ($siterecord['site_flags'] != $site_flags) + || ($siterecord['site_access'] != $access_policy) + || ($siterecord['site_directory'] != $directory_url) + || ($siterecord['site_sellpage'] != $sellpage) + || ($siterecord['site_location'] != $site_location) + || ($siterecord['site_register'] != $register_policy) + || ($siterecord['site_project'] != $site_project) + || ($siterecord['site_realm'] != $site_realm) + || ($siterecord['site_crypto'] != $site_crypto) + || ($siterecord['site_version'] != $site_version) + ) { + $update = true; + + // logger('import_site: input: ' . print_r($arr,true)); + // logger('import_site: stored: ' . print_r($siterecord,true)); + + $r = q( + "update site set site_dead = 0, site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_type = %d, site_project = '%s', site_version = '%s', site_crypto = '%s' + where site_url = '%s'", + dbesc($site_location), + intval($site_flags), + intval($access_policy), + dbesc($directory_url), + intval($register_policy), + dbesc(datetime_convert()), + dbesc($sellpage), + dbesc($site_realm), + intval(SITE_TYPE_ZOT), + dbesc($site_project), + dbesc($site_version), + dbesc($site_crypto), + dbesc($url) + ); + if (!$r) { + logger('Update failed. ' . print_r($arr, true)); + } + } else { + // update the timestamp to indicate we communicated with this site + q( + "update site set site_dead = 0, site_update = '%s' where site_url = '%s'", + dbesc(datetime_convert()), + dbesc($url) + ); + } + } else { + $update = true; + + $r = site_store_lowlevel( + [ + 'site_location' => $site_location, + 'site_url' => $url, + 'site_access' => intval($access_policy), + 'site_flags' => intval($site_flags), + 'site_update' => datetime_convert(), + 'site_directory' => $directory_url, + 'site_register' => intval($register_policy), + 'site_sellpage' => $sellpage, + 'site_realm' => $site_realm, + 'site_type' => intval(SITE_TYPE_ZOT), + 'site_project' => $site_project, + 'site_version' => $site_version, + 'site_crypto' => $site_crypto + ] + ); + + if (!$r) { + logger('Record create failed. ' . print_r($arr, true)); + } + } + + return $update; + } + + /** + * @brief Returns path to /rpost + * + * @param array $observer + * * \e string \b xchan_url + * @return string + * @todo We probably should make rpost discoverable. + * + */ + public static function get_rpost_path($observer) + { + if (!$observer) { + return EMPTY_STR; + } + + if (in_array($observer['xchan_network'],['zot6','nomad'])) { + $parsed = parse_url($observer['xchan_url']); + return $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f='; + } + return EMPTY_STR; + } + + /** + * @brief + * + * @param array $x + * @return bool|string return false or a hash + */ + + public static function import_author_zot($x) + { + + // Check that we have both a hubloc and xchan record - as occasionally storage calls will fail and + // we may only end up with one; which results in posts with no author name or photo and are a bit + // of a hassle to repair. If either or both are missing, do a full discovery probe. + + if (!array_key_exists('id', $x)) { + return import_author_activitypub($x); + } + + $hash = self::make_xchan_hash($x['id'], $x['key']); + + $desturl = $x['url']; + + $found_primary = false; + + $r1 = q( + "select hubloc_url, hubloc_updated, site_dead from hubloc left join site on + hubloc_url = site_url where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1", + dbesc($x['id']), + dbesc($x['id_sig']) + ); + if ($r1) { + $found_primary = true; + } + + $r2 = q( + "select xchan_hash from xchan where xchan_guid = '%s' and xchan_guid_sig = '%s' limit 1", + dbesc($x['id']), + dbesc($x['id_sig']) + ); + + $primary_dead = false; + + if ($r1 && intval($r1[0]['site_dead'])) { + $primary_dead = true; + } + + // We have valid and somewhat fresh information. Always true if it is our own site. + + if ($r1 && $r2 && ($r1[0]['hubloc_updated'] > datetime_convert('UTC', 'UTC', 'now - 1 week') || $r1[0]['hubloc_url'] === z_root())) { + logger('in cache', LOGGER_DEBUG); + return $hash; + } + + logger('not in cache or cache stale - probing: ' . print_r($x, true), LOGGER_DEBUG, LOG_INFO); + + // The primary hub may be dead. Try to find another one associated with this identity that is + // still alive. If we find one, use that url for the discovery/refresh probe. Otherwise, the dead site + // is all we have and there is no point probing it. Just return the hash indicating we have a + // cached entry and the identity is valid. It's just unreachable until they bring back their + // server from the grave or create another clone elsewhere. + + if ($primary_dead || !$found_primary) { + logger('dead or site - ignoring', LOGGER_DEBUG, LOG_INFO); + + $r = q( + "select hubloc_id_url from hubloc left join site on hubloc_url = site_url + where hubloc_hash = '%s' and site_dead = 0", + dbesc($hash) + ); + if ($r) { + logger('found another site that is not dead: ' . $r[0]['hubloc_id_url'], LOGGER_DEBUG, LOG_INFO); + $desturl = $r[0]['hubloc_id_url']; + } else { + return $hash; + } + } + + $them = ['hubloc_id_url' => $desturl]; + if (self::refresh($them)) { + return $hash; + } + + return false; + } + + public static function zotinfo($arr) + { + + $ret = []; + + $zhash = ((x($arr, 'guid_hash')) ? $arr['guid_hash'] : ''); + $zguid = ((x($arr, 'guid')) ? $arr['guid'] : ''); + $zguid_sig = ((x($arr, 'guid_sig')) ? $arr['guid_sig'] : ''); + $zaddr = ((x($arr, 'address')) ? $arr['address'] : ''); + $ztarget = ((x($arr, 'target_url')) ? $arr['target_url'] : ''); + $zsig = ((x($arr, 'target_sig')) ? $arr['target_sig'] : ''); + $zkey = ((x($arr, 'key')) ? $arr['key'] : ''); + $mindate = ((x($arr, 'mindate')) ? $arr['mindate'] : ''); + $token = ((x($arr, 'token')) ? $arr['token'] : ''); + $feed = ((x($arr, 'feed')) ? intval($arr['feed']) : 0); + + if ($ztarget) { + $t = q("select * from hubloc where hubloc_id_url = '%s' and hubloc_network in ('nomad','zot6') limit 1", + dbesc($ztarget) + ); + if ($t) { + $ztarget_hash = $t[0]['hubloc_hash']; + } else { + // should probably perform discovery of the requestor (target) but if they actually had + // permissions we would know about them and we only want to know who they are to + // enumerate their specific permissions + + $ztarget_hash = EMPTY_STR; + } + } + + $r = null; + + if (strlen($zhash)) { + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where channel_hash = '%s' limit 1", + dbesc($zhash) + ); + } elseif (strlen($zguid) && strlen($zguid_sig)) { + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where channel_guid = '%s' and channel_guid_sig = '%s' limit 1", + dbesc($zguid), + dbesc($zguid_sig) + ); + } elseif (strlen($zaddr)) { + if (strpos($zaddr, '[system]') === false) { /* normal address lookup */ + $r = q( + "select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1", + dbesc($zaddr), + dbesc($zaddr) + ); + } else { + + /** + * The special address '[system]' will return a system channel if one has been defined, + * Or the first valid channel we find if there are no system channels. + * + * This is used by magic-auth if we have no prior communications with this site - and + * returns an identity on this site which we can use to create a valid hub record so that + * we can exchange signed messages. The precise identity is irrelevant. It's the hub + * information that we really need at the other end - and this will return it. + * + */ + + $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where channel_system = 1 order by channel_id limit 1"); + if (!$r) { + $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash + where channel_removed = 0 order by channel_id limit 1"); + } + } + } else { + $ret['message'] = 'Invalid request'; + return ($ret); + } + + if (!$r) { + $ret['message'] = 'Item not found.'; + return ($ret); + } + + $e = $r[0]; + + $id = $e['channel_id']; + + $sys_channel = (intval($e['channel_system']) ? true : false); + $special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false); + $adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false); + $censored = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false); + $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true); + $deleted = (intval($e['xchan_deleted']) ? true : false); + + if ($deleted || $censored || $sys_channel) { + $searchable = false; + } + + // now all forums (public, restricted, and private) set the public_forum flag. So it really means "is a group" + // and has nothing to do with accessibility. + + $role = get_pconfig($e['channel_id'], 'system', 'permissions_role'); + $rolesettings = PermissionRoles::role_perms($role); + + $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal'; + + // This is for birthdays and keywords, but must check access permissions + $p = q( + "select * from profile where uid = %d and is_default = 1", + intval($e['channel_id']) + ); + + $profile = []; + + if ($p) { + if (!intval($p[0]['publish'])) { + $searchable = false; + } + + $profile['description'] = $p[0]['pdesc']; + $profile['birthday'] = $p[0]['dob']; + if (($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'], $e['channel_timezone'])) !== '')) { + $profile['next_birthday'] = $bd; + } + + if ($age = age($p[0]['dob'], $e['channel_timezone'], '')) { + $profile['age'] = $age; + } + $profile['gender'] = $p[0]['gender']; + $profile['marital'] = $p[0]['marital']; + $profile['sexual'] = $p[0]['sexual']; + $profile['locale'] = $p[0]['locality']; + $profile['region'] = $p[0]['region']; + $profile['postcode'] = $p[0]['postal_code']; + $profile['country'] = $p[0]['country_name']; + $profile['about'] = ((Channel::is_system($e['channel_id'])) ? get_config('system', 'siteinfo') : $p[0]['about']); + $profile['homepage'] = $p[0]['homepage']; + $profile['hometown'] = $p[0]['hometown']; + + if ($p[0]['keywords']) { + $tags = []; + $k = explode(' ', $p[0]['keywords']); + if ($k) { + foreach ($k as $kk) { + if (trim($kk, " \t\n\r\0\x0B,")) { + $tags[] = trim($kk, " \t\n\r\0\x0B,"); + } + } + } + if ($tags) { + $profile['keywords'] = $tags; + } + } + } + + $cover_photo = Channel::get_cover_photo($e['channel_id'], 'array'); + + // Communication details + + $ret['id'] = $e['xchan_guid']; + $ret['id_sig'] = self::sign($e['xchan_guid'], $e['channel_prvkey']); + + $ret['primary_location'] = [ + 'address' => $e['xchan_addr'], + 'url' => $e['xchan_url'], + 'connections_url' => $e['xchan_connurl'], + 'follow_url' => $e['xchan_follow'], + 'wall' => z_root() . '/outbox/' . $e['channel_address'], + 'followers' => z_root() . '/followers/' . $e['channel_address'], + 'following' => z_root() . '/following/' . $e['channel_address'] + ]; + + $ret['public_key'] = $e['xchan_pubkey']; + $ret['signing_algorithm'] = 'rsa-sha256'; + $ret['username'] = $e['channel_address']; + $ret['name'] = $e['xchan_name']; + $ret['name_updated'] = $e['xchan_name_date']; + $ret['photo'] = [ + 'url' => $e['xchan_photo_l'], + 'type' => $e['xchan_photo_mimetype'], + 'updated' => $e['xchan_photo_date'] + ]; + + if ($cover_photo) { + $ret['cover_photo'] = [ + 'url' => $cover_photo['url'], + 'type' => $cover_photo['type'], + 'updated' => $cover_photo['updated'] + ]; + } + + $ret['channel_role'] = get_pconfig($e['channel_id'], 'system', 'permissions_role', 'custom'); + $ret['channel_type'] = $channel_type; + $ret['protocols'] = ['nomad','zot6']; + if (get_pconfig($e['channel_id'], 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) { + $ret['protocols'][] = 'activitypub'; + } + $ret['searchable'] = $searchable; + $ret['adult_content'] = $adult_channel; + + $ret['comments'] = map_scope(PermissionLimits::Get($e['channel_id'], 'post_comments')); + + if ($deleted) { + $ret['deleted'] = $deleted; + } + + if (intval($e['channel_removed'])) { + $ret['deleted_locally'] = true; + } + + // premium or other channel desiring some contact with potential followers before connecting. + // This is a template - %s will be replaced with the follow_url we discover for the return channel. + + if ($special_channel) { + $ret['connect_url'] = (($e['xchan_connpage']) ? $e['xchan_connpage'] : z_root() . '/connect/' . $e['channel_address']); + } + + // This is a template for our follow url, %s will be replaced with a webbie + if (!isset($ret['follow_url'])) { + $ret['follow_url'] = z_root() . '/follow?f=&url=%s'; + } + + $permissions = get_all_perms($e['channel_id'], $ztarget_hash, false); + + if ($ztarget_hash) { + $permissions['connected'] = false; + $b = q( + "select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($ztarget_hash), + intval($e['channel_id']) + ); + if ($b) { + $permissions['connected'] = true; + } + } + + if ($permissions['view_profile']) { + $ret['profile'] = $profile; + } + + + $concise_perms = []; + if ($permissions) { + foreach ($permissions as $k => $v) { + if ($v) { + $concise_perms[] = $k; + } + } + $permissions = implode(',', $concise_perms); + } + + $ret['permissions'] = $permissions; + $ret['permissions_for'] = $ztarget; + + + // array of (verified) hubs this channel uses + + $x = self::encode_locations($e); + if ($x) { + $ret['locations'] = $x; + } + $ret['site'] = self::site_info(); + + Hook::call('zotinfo', $ret); + + return ($ret); + } + + + public static function site_info($force = false) + { + + $signing_key = get_config('system', 'prvkey'); + $sig_method = get_config('system', 'signature_algorithm', 'sha256'); + + $ret = []; + $ret['site'] = []; + $ret['site']['url'] = z_root(); + $ret['site']['site_sig'] = self::sign(z_root(), $signing_key); + $ret['site']['post'] = z_root() . '/zot'; + $ret['site']['openWebAuth'] = z_root() . '/owa'; + $ret['site']['authRedirect'] = z_root() . '/magic'; + $ret['site']['sitekey'] = get_config('system', 'pubkey'); + + $dirmode = get_config('system', 'directory_mode'); + if (($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL)) { + $ret['site']['directory_mode'] = 'normal'; + } + + if ($dirmode == DIRECTORY_MODE_PRIMARY) { + $ret['site']['directory_mode'] = 'primary'; + } elseif ($dirmode == DIRECTORY_MODE_SECONDARY) { + $ret['site']['directory_mode'] = 'secondary'; + } elseif ($dirmode == DIRECTORY_MODE_STANDALONE) { + $ret['site']['directory_mode'] = 'standalone'; + } + if ($dirmode != DIRECTORY_MODE_NORMAL) { + $ret['site']['directory_url'] = z_root() . '/dirsearch'; + } + + + $ret['site']['encryption'] = Crypto::methods(); + $ret['site']['zot'] = System::get_zot_revision(); + + // hide detailed site information if you're off the grid + + if ($dirmode != DIRECTORY_MODE_STANDALONE || $force) { + $register_policy = intval(get_config('system', 'register_policy')); + + if ($register_policy == REGISTER_CLOSED) { + $ret['site']['register_policy'] = 'closed'; + } + if ($register_policy == REGISTER_APPROVE) { + $ret['site']['register_policy'] = 'approve'; + } + if ($register_policy == REGISTER_OPEN) { + $ret['site']['register_policy'] = 'open'; + } + + $access_policy = intval(get_config('system', 'access_policy')); + + if ($access_policy == ACCESS_PRIVATE) { + $ret['site']['access_policy'] = 'private'; + } + if ($access_policy == ACCESS_PAID) { + $ret['site']['access_policy'] = 'paid'; + } + if ($access_policy == ACCESS_FREE) { + $ret['site']['access_policy'] = 'free'; + } + if ($access_policy == ACCESS_TIERED) { + $ret['site']['access_policy'] = 'tiered'; + } + + $ret['site']['admin'] = get_config('system', 'admin_email'); + + $visible_plugins = []; + + $r = q("select * from addon where hidden = 0"); + if ($r) { + foreach ($r as $rr) { + $visible_plugins[] = $rr['aname']; + } + } + + + $ret['site']['about'] = bbcode(get_config('system', 'siteinfo'), ['export' => true]); + $ret['site']['plugins'] = $visible_plugins; + $ret['site']['sitehash'] = get_config('system', 'location_hash'); + $ret['site']['sellpage'] = get_config('system', 'sellpage'); + $ret['site']['location'] = get_config('system', 'site_location'); + $ret['site']['realm'] = get_directory_realm(); + $ret['site']['sitename'] = System::get_site_name(); + $ret['site']['logo'] = System::get_site_icon(); + $ret['site']['project'] = System::get_project_name(); + $ret['site']['version'] = System::get_project_version(); + } + + return $ret['site']; + } + + /** + * @brief + * + * @param array $hub + * @param string $sitekey (optional, default empty) + * + * @return string hubloc_url + */ + + public static function update_hub_connected($hub, $site_id = '') + { + + if ($site_id) { + /* + * This hub has now been proven to be valid. + * Any hub with the same URL and a different sitekey cannot be valid. + * Get rid of them (mark them deleted). There's a good chance they were re-installs. + */ + + q( + "update hubloc set hubloc_deleted = 1, hubloc_error = 1 where hubloc_hash = '%s' and hubloc_url = '%s' and hubloc_site_id != '%s' ", + dbesc($hub['hubloc_hash']), + dbesc($hub['hubloc_url']), + dbesc($site_id) + ); + } else { + $site_id = $hub['hubloc_site_id']; + } + + // $sender['sitekey'] is a new addition to the protocol to distinguish + // hublocs coming from re-installed sites. Older sites will not provide + // this field and we have to still mark them valid, since we can't tell + // if this hubloc has the same sitekey as the packet we received. + // Update our DB to show when we last communicated successfully with this hub + // This will allow us to prune dead hubs from using up resources + + $t = datetime_convert('UTC', 'UTC', 'now - 15 minutes'); + + $r = q( + "update hubloc set hubloc_connected = '%s' where hubloc_id = %d and hubloc_site_id = '%s' and hubloc_connected < '%s' ", + dbesc(datetime_convert()), + intval($hub['hubloc_id']), + dbesc($site_id), + dbesc($t) + ); + + // a dead hub came back to life - reset any tombstones we might have + + if (intval($hub['hubloc_error']) || intval($hub['hubloc_deleted'])) { + q( + "update hubloc set hubloc_error = 0, hubloc_deleted = 0 where hubloc_id = %d and hubloc_site_id = '%s' ", + intval($hub['hubloc_id']), + dbesc($site_id) + ); + if (intval($hub['hubloc_orphancheck'])) { + q( + "update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d and hubloc_site_id = '%s' ", + intval($hub['hubloc_id']), + dbesc($site_id) + ); + } + q( + "update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'", + dbesc($hub['hubloc_hash']) + ); + } + + // this site obviously isn't dead because they are trying to communicate with us. + q( + "update site set site_dead = 0 where site_dead = 1 and site_url = '%s' ", + dbesc($hub['hubloc_url']) + ); + + return $hub['hubloc_url']; + } + + + public static function sign($data, $key, $alg = 'sha256') + { + if (!$key) { + return 'no key'; + } + $sig = ''; + openssl_sign($data, $sig, $key, $alg); + return $alg . '.' . base64url_encode($sig); + } + + public static function verify($data, $sig, $key) + { + + $verify = 0; + + $x = explode('.', $sig, 2); + + if ($key && count($x) === 2) { + $alg = $x[0]; + $signature = base64url_decode($x[1]); + + $verify = @openssl_verify($data, $signature, $key, $alg); + + if ($verify === (-1)) { + while ($msg = openssl_error_string()) { + logger('openssl_verify: ' . $msg, LOGGER_NORMAL, LOG_ERR); + } + btlogger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR); + } + } + return (($verify > 0) ? true : false); + } + + + public static function is_zot_request() + { + $x = getBestSupportedMimeType([ 'application/x-zot+json', 'application/x-nomad+json' ]); + return (($x) ? true : false); + } + + + public static function zot_record_preferred($arr, $check = 'hubloc_network') + { + + if (!$arr) { + return $arr; + } + foreach ($arr as $v) { + if($v[$check] === 'nomad') { + return $v; + } + } + foreach ($arr as $v) { + if ($v[$check] === 'zot6') { + return $v; + } + } + return $arr[0]; + } + + public static function update_cached_hubloc($hubloc) + { + if ($hubloc['hubloc_updated'] > datetime_convert('UTC', 'UTC', 'now - 1 week') || $hubloc['hubloc_url'] === z_root()) { + return; + } + self::refresh(['hubloc_id_url' => $hubloc['hubloc_id_url']]); + } +} diff --git a/Code/Lib/Libzotdir.php b/Code/Lib/Libzotdir.php new file mode 100644 index 000000000..3e3c49860 --- /dev/null +++ b/Code/Lib/Libzotdir.php @@ -0,0 +1,543 @@ + t('Directory Options'), + '$forumsurl' => $forumsurl, + '$safemode' => array('safemode', t('Safe Mode'), $safe_mode, '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''), + '$pubforums' => array('pubforums', t('Groups Only'), (($pubforums == 1) ? true : false), '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&type="+(this.checked ? 1 : 0)\''), +// '$collections' => array('collections', t('Collections Only'),(($pubforums == 2) ? true : false),'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&type="+(this.checked ? 2 : 0)\''), + '$hide_local' => $hide_local, + '$globaldir' => array('globaldir', t('This Website Only'), 1 - intval($globaldir), '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''), + '$activedir' => array('activedir', t('Recently Updated'), intval($activedir), '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&active="+(this.checked ? 1 : 0)\''), + ]); + + return $o; + } + + /** + * @brief + * + * Given an update record, probe the channel, grab a zot-info packet and refresh/sync the data. + * + * Ignore updating records marked as deleted. + * + * If successful, sets ud_last in the DB to the current datetime for this + * reddress/webbie. + * + * @param array $ud Entry from update table + */ + + public static function update_directory_entry($ud) + { + + logger('update_directory_entry: ' . print_r($ud, true), LOGGER_DATA); + + if ($ud['ud_addr'] && (!($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) { + $success = false; + + $href = Webfinger::zot_url(punify($ud['ud_addr'])); + if ($href) { + $zf = Zotfinger::exec($href); + } + if (is_array($zf) && array_path_exists('signature/signer', $zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) { + $xc = Libzot::import_xchan($zf['data'], 0, $ud); + } else { + q( + "update updates set ud_last = '%s' where ud_addr = '%s'", + dbesc(datetime_convert()), + dbesc($ud['ud_addr']) + ); + } + } + } + + + /** + * @brief Push local channel updates to a local directory server. + * + * This is called from Code/Daemon/Directory.php if a profile is to be pushed to the + * directory and the local hub in this case is any kind of directory server. + * + * @param int $uid + * @param bool $force + */ + + public static function local_dir_update($uid, $force) + { + + + logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG); + + $p = q( + "select channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1", + intval($uid) + ); + + $profile = []; + $profile['encoding'] = 'zot'; + + if ($p) { + $hash = $p[0]['channel_hash']; + + $profile['description'] = $p[0]['pdesc']; + $profile['birthday'] = $p[0]['dob']; + if ($age = age($p[0]['dob'], $p[0]['channel_timezone'], '')) { + $profile['age'] = $age; + } + + $profile['gender'] = $p[0]['gender']; + $profile['marital'] = $p[0]['marital']; + $profile['sexual'] = $p[0]['sexual']; + $profile['locale'] = $p[0]['locality']; + $profile['region'] = $p[0]['region']; + $profile['postcode'] = $p[0]['postal_code']; + $profile['country'] = $p[0]['country_name']; + $profile['about'] = $p[0]['about']; + $profile['homepage'] = $p[0]['homepage']; + $profile['hometown'] = $p[0]['hometown']; + + if ($p[0]['keywords']) { + $tags = []; + $k = explode(' ', $p[0]['keywords']); + if ($k) { + foreach ($k as $kk) { + if (trim($kk)) { + $tags[] = trim($kk); + } + } + } + + if ($tags) { + $profile['keywords'] = $tags; + } + } + + $hidden = (1 - intval($p[0]['publish'])); + + // logger('hidden: ' . $hidden); + + $r = q( + "select xchan_hidden from xchan where xchan_hash = '%s' limit 1", + dbesc($p[0]['channel_hash']) + ); + + if (intval($r[0]['xchan_hidden']) != $hidden) { + $r = q( + "update xchan set xchan_hidden = %d where xchan_hash = '%s'", + intval($hidden), + dbesc($p[0]['channel_hash']) + ); + } + + $arr = ['channel_id' => $uid, 'hash' => $hash, 'profile' => $profile]; + Hook::call('local_dir_update', $arr); + + $address = Channel::get_webfinger($p[0]); + + if (perm_is_allowed($uid, '', 'view_profile')) { + self::import_directory_profile($hash, $arr['profile'], $address, 0); + } else { + // they may have made it private + $r = q( + "delete from xprof where xprof_hash = '%s'", + dbesc($hash) + ); + $r = q( + "delete from xtag where xtag_hash = '%s'", + dbesc($hash) + ); + } + } + + $ud_hash = random_string() . '@' . App::get_hostname(); + self::update_modtime($hash, $ud_hash, Channel::get_webfinger($p[0]), (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED)); + } + + + /** + * @brief Imports a directory profile. + * + * @param string $hash + * @param array $profile + * @param string $addr + * @param number $ud_flags (optional) UPDATE_FLAGS_UPDATED + * @param number $suppress_update (optional) default 0 + * @return bool $updated if something changed + */ + + public static function import_directory_profile($hash, $profile, $addr, $ud_flags = UPDATE_FLAGS_UPDATED, $suppress_update = 0) + { + + logger('import_directory_profile', LOGGER_DEBUG); + if (!$hash) { + return false; + } + + + $maxlen = get_max_import_size(); + + if ($maxlen && mb_strlen($profile['about']) > $maxlen) { + $profile['about'] = mb_substr($profile['about'], 0, $maxlen, 'UTF-8'); + } + + $arr = []; + + $arr['xprof_hash'] = $hash; + if (isset($profile['birthday'])) { + $arr['xprof_dob'] = (($profile['birthday'] === '0000-00-00') + ? $profile['birthday'] + : datetime_convert('', '', $profile['birthday'], 'Y-m-d')); // !!!! check this for 0000 year + } + $arr['xprof_age'] = (isset($profile['age']) ? intval($profile['age']) : 0); + $arr['xprof_desc'] = ((isset($profile['description']) && $profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_gender'] = ((isset($profile['gender']) && $profile['gender']) ? htmlspecialchars($profile['gender'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_marital'] = ((isset($profile['marital']) && $profile['marital']) ? htmlspecialchars($profile['marital'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_sexual'] = ((isset($profile['sexual']) && $profile['sexual']) ? htmlspecialchars($profile['sexual'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_locale'] = ((isset($profile['locale']) && $profile['locale']) ? htmlspecialchars($profile['locale'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_region'] = ((isset($profile['region']) && $profile['region']) ? htmlspecialchars($profile['region'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_postcode'] = ((isset($profile['postcode']) && $profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_country'] = ((isset($profile['country']) && $profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_about'] = ((isset($profile['about']) && $profile['about']) ? htmlspecialchars($profile['about'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_pronouns'] = ((isset($profile['pronouns']) && $profile['pronouns']) ? htmlspecialchars($profile['pronouns'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_homepage'] = ((isset($profile['homepage']) && $profile['homepage']) ? htmlspecialchars($profile['homepage'], ENT_COMPAT, 'UTF-8', false) : ''); + $arr['xprof_hometown'] = ((isset($profile['hometown']) && $profile['hometown']) ? htmlspecialchars($profile['hometown'], ENT_COMPAT, 'UTF-8', false) : ''); + + $clean = []; + if (array_key_exists('keywords', $profile) and is_array($profile['keywords'])) { + self::import_directory_keywords($hash, $profile['keywords']); + foreach ($profile['keywords'] as $kw) { + $kw = trim(htmlspecialchars($kw, ENT_COMPAT, 'UTF-8', false)); + $kw = trim($kw, ','); + $clean[] = $kw; + } + } + + $arr['xprof_keywords'] = implode(' ', $clean); + + // Self censored, make it so + // These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult". + + + if (in_arrayi('nsfw', $clean) || in_arrayi('adult', $clean)) { + q( + "update xchan set xchan_selfcensored = 1 where xchan_hash = '%s'", + dbesc($hash) + ); + } + + $r = q( + "select * from xprof where xprof_hash = '%s' limit 1", + dbesc($hash) + ); + + if ($arr['xprof_age'] > 150) { + $arr['xprof_age'] = 150; + } + if ($arr['xprof_age'] < 0) { + $arr['xprof_age'] = 0; + } + + if ($r) { + $update = false; + foreach ($r[0] as $k => $v) { + if ((array_key_exists($k, $arr)) && ($arr[$k] != $v)) { + logger('import_directory_profile: update ' . $k . ' => ' . $arr[$k]); + $update = true; + break; + } + } + if ($update) { + q( + "update xprof set + xprof_desc = '%s', + xprof_dob = '%s', + xprof_age = %d, + xprof_gender = '%s', + xprof_marital = '%s', + xprof_sexual = '%s', + xprof_locale = '%s', + xprof_region = '%s', + xprof_postcode = '%s', + xprof_country = '%s', + xprof_about = '%s', + xprof_homepage = '%s', + xprof_hometown = '%s', + xprof_keywords = '%s', + xprof_pronouns = '%s' + where xprof_hash = '%s'", + dbesc($arr['xprof_desc']), + dbesc($arr['xprof_dob']), + intval($arr['xprof_age']), + dbesc($arr['xprof_gender']), + dbesc($arr['xprof_marital']), + dbesc($arr['xprof_sexual']), + dbesc($arr['xprof_locale']), + dbesc($arr['xprof_region']), + dbesc($arr['xprof_postcode']), + dbesc($arr['xprof_country']), + dbesc($arr['xprof_about']), + dbesc($arr['xprof_homepage']), + dbesc($arr['xprof_hometown']), + dbesc($arr['xprof_keywords']), + dbesc($arr['xprof_pronouns']), + dbesc($arr['xprof_hash']) + ); + } + } else { + $update = true; + logger('New profile'); + q( + "insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_about, xprof_homepage, xprof_hometown, xprof_keywords, xprof_pronouns) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", + dbesc($arr['xprof_hash']), + dbesc($arr['xprof_desc']), + dbesc($arr['xprof_dob']), + intval($arr['xprof_age']), + dbesc($arr['xprof_gender']), + dbesc($arr['xprof_marital']), + dbesc($arr['xprof_sexual']), + dbesc($arr['xprof_locale']), + dbesc($arr['xprof_region']), + dbesc($arr['xprof_postcode']), + dbesc($arr['xprof_country']), + dbesc($arr['xprof_about']), + dbesc($arr['xprof_homepage']), + dbesc($arr['xprof_hometown']), + dbesc($arr['xprof_keywords']), + dbesc($arr['xprof_pronouns']) + ); + } + + $d = [ + 'xprof' => $arr, + 'profile' => $profile, + 'update' => $update + ]; + + /** + * @hooks import_directory_profile + * Called when processing delivery of a profile structure from an external source (usually for directory storage). + * * \e array \b xprof + * * \e array \b profile + * * \e boolean \b update + */ + + Hook::call('import_directory_profile', $d); + + if (($d['update']) && (!$suppress_update)) { + self::update_modtime($arr['xprof_hash'], new_uuid(), $addr, $ud_flags); + } + + q( + "update xchan set xchan_updated = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc($arr['xprof_hash']) + ); + + return $d['update']; + } + + /** + * @brief + * + * @param string $hash An xtag_hash + * @param array $keywords + */ + + public static function import_directory_keywords($hash, $keywords) + { + + $existing = []; + $r = q( + "select * from xtag where xtag_hash = '%s' and xtag_flags = 0", + dbesc($hash) + ); + + if ($r) { + foreach ($r as $rr) { + $existing[] = $rr['xtag_term']; + } + } + + $clean = []; + foreach ($keywords as $kw) { + $kw = trim(htmlspecialchars($kw, ENT_COMPAT, 'UTF-8', false)); + $kw = trim($kw, ','); + $clean[] = $kw; + } + + foreach ($existing as $x) { + if (!in_array($x, $clean)) { + $r = q( + "delete from xtag where xtag_hash = '%s' and xtag_term = '%s' and xtag_flags = 0", + dbesc($hash), + dbesc($x) + ); + } + } + foreach ($clean as $x) { + if (!in_array($x, $existing)) { + $r = q( + "insert into xtag ( xtag_hash, xtag_term, xtag_flags) values ( '%s' ,'%s', 0 )", + dbesc($hash), + dbesc($x) + ); + } + } + } + + + /** + * @brief + * + * @param string $hash + * @param string $guid + * @param string $addr + * @param int $flags (optional) default 0 + */ + + public static function update_modtime($hash, $guid, $addr, $flags = 0) + { + + $dirmode = intval(get_config('system', 'directory_mode')); + + if ($dirmode == DIRECTORY_MODE_NORMAL) { + return; + } + + if ($flags) { + q( + "insert into updates (ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) values ( '%s', '%s', '%s', %d, '%s' )", + dbesc($hash), + dbesc($guid), + dbesc(datetime_convert()), + intval($flags), + dbesc($addr) + ); + } else { + q( + "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and (ud_flags & %d) = 0 ", + intval(UPDATE_FLAGS_UPDATED), + dbesc($addr), + intval(UPDATE_FLAGS_UPDATED) + ); + } + } +} diff --git a/Code/Lib/Markdown.php b/Code/Lib/Markdown.php new file mode 100644 index 000000000..3070024ca --- /dev/null +++ b/Code/Lib/Markdown.php @@ -0,0 +1,414 @@ + $s, + 'zrl' => $use_zrl, + 'options' => $options + ]; + + /** + * @hooks markdown_to_bb_init + * * \e string \b text - The message as Markdown and what will get returned + * * \e boolean \b zrl + * * \e array \b options + */ + Hook::call('markdown_to_bb_init', $x); + + $s = $x['text']; + + // Escaping the hash tags + $s = preg_replace('/\#([^\s\#])/', '#$1', $s); + + $s = MarkdownExtra::defaultTransform($s); + + if ($options && $options['preserve_lf']) { + $s = str_replace(["\r", "\n"], ["", '
'], $s); + } else { + $s = str_replace("\r", "", $s); + } + + $s = str_replace('#', '#', $s); + + $s = html2bbcode($s); + + // Convert everything that looks like a link to a link + if ($use_zrl) { + if (strpos($s, '[/img]') !== false) { + $s = preg_replace_callback("/\[img\](.*?)\[\/img\]/ism", ['\\Code\\Lib\\Markdown', 'use_zrl_cb_img'], $s); + $s = preg_replace_callback("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", ['\\Code\\Lib\\Markdown', 'use_zrl_cb_img_x'], $s); + } + $s = preg_replace_callback("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", ['\\Code\\Lib\\Markdown', 'use_zrl_cb_link'], $s); + } else { + $s = preg_replace("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]', $s); + } + + // remove duplicate adjacent code tags + $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism", "[code]$2[/code]", $s); + + /** + * @hooks markdown_to_bb + * * \e string - The already converted message as bbcode + */ + Hook::call('markdown_to_bb', $s); + + return $s; + } + + public static function use_zrl_cb_link($match) + { + $res = ''; + $is_zid = is_matrix_url(trim($match[0])); + + if ($is_zid) { + $res = $match[1] . '[zrl=' . $match[2] . $match[3] . ']' . $match[2] . $match[3] . '[/zrl]'; + } else { + $res = $match[1] . '[url=' . $match[2] . $match[3] . ']' . $match[2] . $match[3] . '[/url]'; + } + + return $res; + } + + public static function use_zrl_cb_img($match) + { + $res = ''; + $is_zid = is_matrix_url(trim($match[1])); + + if ($is_zid) { + $res = '[zmg]' . $match[1] . '[/zmg]'; + } else { + $res = $match[0]; + } + + return $res; + } + + public static function use_zrl_cb_img_x($match) + { + $res = ''; + $is_zid = is_matrix_url(trim($match[3])); + + if ($is_zid) { + $res = '[zmg=' . $match[1] . 'x' . $match[2] . ']' . $match[3] . '[/zmg]'; + } else { + $res = $match[0]; + } + + return $res; + } + + /** + * @brief + * + * @param array $match + * @return string + */ + + public static function from_bbcode_share($match) + { + + $matches = []; + $attributes = $match[1]; + + $author = ""; + preg_match("/author='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $author = urldecode($matches[1]); + } + + $link = ""; + preg_match("/link='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $link = $matches[1]; + } + + $avatar = ""; + preg_match("/avatar='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $avatar = $matches[1]; + } + + $profile = ""; + preg_match("/profile='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $profile = $matches[1]; + } + + $posted = ""; + preg_match("/posted='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $posted = $matches[1]; + } + + // message_id is never used, do we still need it? + $message_id = ""; + preg_match("/message_id='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $message_id = $matches[1]; + } + + if (!$message_id) { + preg_match("/guid='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") { + $message_id = $matches[1]; + } + } + + + $reldate = datetime_convert('UTC', date_default_timezone_get(), $posted, 'r'); + + $headline = ''; + + if ($avatar != "") { + $headline .= '[url=' . zid($profile) . '][img]' . $avatar . '[/img][/url]'; + } + + // Bob Smith wrote the following post 2 hours ago + + $fmt = sprintf( + t('%1$s wrote the following %2$s %3$s'), + '[url=' . zid($profile) . ']' . $author . '[/url]', + '[url=' . zid($link) . ']' . t('post') . '[/url]', + $reldate + ); + + $headline .= $fmt . "\n\n"; + + $text = $headline . trim($match[2]); + + return $text; + } + + + /** + * @brief Convert bbcode to Markdown. + * + * @param string $Text The message as bbcode + * @param array $options default empty + * @return string The message converted to Markdown + */ + + public static function from_bbcode($Text, $options = []) + { + + /* + * Transform #tags, strip off the [url] and replace spaces with underscore + */ + + $Text = preg_replace_callback( + '/#\[([zu])rl\=(.*?)\](.*?)\[\/[(zu)]rl\]/i', + create_function('$match', 'return \'#\'. str_replace(\' \', \'_\', $match[3]);'), + $Text + ); + + $Text = preg_replace('/#\^\[([zu])rl\=(.*?)\](.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text); + + // Converting images with size parameters to simple images. Markdown doesn't know it. + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); + + $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", ['\\Code\\Lib\\Markdown', 'from_bbcode_share'], $Text); + + $x = ['bbcode' => $Text, 'options' => $options]; + + /** + * @hooks bb_to_markdown_bb + * * \e string \b bbcode - The message as bbcode and what will get returned + * * \e array \b options + */ + Hook::call('bb_to_markdown_bb', $x); + + $Text = $x['bbcode']; + + // Convert it to HTML - don't try oembed + $Text = bbcode($Text, ['tryoembed' => false]); + + // Now convert HTML to Markdown + + $Text = self::from_html($Text); + + //html2markdown adds backslashes infront of hashes after a new line. remove them + $Text = str_replace("\n\#", "\n#", $Text); + + + // If the text going into bbcode() has a plain URL in it, i.e. + // with no [url] tags around it, it will come out of parseString() + // looking like: , which gets removed by strip_tags(). + // So take off the angle brackets of any such URL + $Text = preg_replace("//is", "http$1", $Text); + + // Remove empty zrl links + $Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text); + + $Text = trim($Text); + + /** + * @hooks bb_to_markdown + * * \e string - The already converted message as bbcode and what will get returned + */ + Hook::call('bb_to_markdown', $Text); + + return $Text; + } + + + /** + * @brief Convert a HTML text into Markdown. + * + * This function uses the library league/html-to-markdown for this task. + * + * If the HTML text can not get parsed it will return an empty string. + * + * @param string $html The HTML code to convert + * @return string Markdown representation of the given HTML text, empty on error + */ + + public static function from_html($html, $options = []) + { + $markdown = ''; + + if (!$options) { + $options = [ + 'header_style' => 'setext', // Set to 'atx' to output H1 and H2 headers as # Header1 and ## Header2 + 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML + 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output. + 'bold_style' => '**', // DEPRECATED: Set to '__' if you prefer the underlined style + 'italic_style' => '*', // DEPRECATED: Set to '_' if you prefer the underlined style + 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: 'meta style script' + 'hard_break' => false, // Set to true to turn
into `\n` instead of ` \n` + 'list_item_style' => '-', // Set the default character for each
  • in a
      . Can be '-', '*', or '+' + ]; + } + + $environment = Environment::createDefaultEnvironment($options); + $environment->addConverter(new TableConverter()); + $converter = new HtmlConverter($environment); + + try { + $markdown = $converter->convert($html); + } catch (InvalidArgumentException $e) { + logger("Invalid HTML. HTMLToMarkdown library threw an exception."); + } + + return $markdown; + } +} + +// Tables are not an official part of the markdown specification. +// This interface was suggested as a workaround. +// author: Mark Hamstra +// https://github.com/Mark-H/Docs + + +class TableConverter implements ConverterInterface +{ + /** + * @param ElementInterface $element + * + * @return string + */ + public function convert(ElementInterface $element) + { + switch ($element->getTagName()) { + case 'tr': + $line = []; + $i = 1; + foreach ($element->getChildren() as $td) { + $i++; + $v = $td->getValue(); + $v = trim($v); + if ($i % 2 === 0 || $v !== '') { + $line[] = $v; + } + } + return '| ' . implode(' | ', $line) . " |\n"; + case 'td': + case 'th': + return trim($element->getValue()); + case 'tbody': + return trim($element->getValue()); + case 'thead': + $headerLine = reset($element->getChildren())->getValue(); + $headers = explode(' | ', trim(trim($headerLine, "\n"), '|')); + $hr = []; + foreach ($headers as $td) { + $length = strlen(trim($td)) + 2; + $hr[] = str_repeat('-', $length > 3 ? $length : 3); + } + $hr = '|' . implode('|', $hr) . '|'; + return $headerLine . $hr . "\n"; + case 'table': + $inner = $element->getValue(); + if (strpos($inner, '-----') === false) { + $inner = explode("\n", $inner); + $single = explode(' | ', trim($inner[0], '|')); + $hr = []; + foreach ($single as $td) { + $length = strlen(trim($td)) + 2; + $hr[] = str_repeat('-', $length > 3 ? $length : 3); + } + $hr = '|' . implode('|', $hr) . '|'; + array_splice($inner, 1, 0, $hr); + $inner = implode("\n", $inner); + } + return trim($inner) . "\n\n"; + } + return $element->getValue(); + } + /** + * @return string[] + */ + public function getSupportedTags() + { + return array('table', 'tr', 'thead', 'td', 'tbody'); + } +} diff --git a/Code/Lib/MarkdownSoap.php b/Code/Lib/MarkdownSoap.php new file mode 100644 index 000000000..de59234f0 --- /dev/null +++ b/Code/Lib/MarkdownSoap.php @@ -0,0 +1,147 @@ +clean(); + * @endcode + * What this does: + * 1. extracts code blocks and privately escapes them from processing + * 2. Run html purifier on the content + * 3. put back the code blocks + * 4. run htmlspecialchars on the entire content for safe storage + * + * At render time: + * @code{.php} + * $markdown = \Code\Lib\MarkdownSoap::unescape($text); + * $html = \Michelf\MarkdownExtra::DefaultTransform($markdown); + * @endcode + */ +class MarkdownSoap +{ + + /** + * @var string + */ + private $str; + /** + * @var string + */ + private $token; + + + public function __construct($s) + { + $this->str = $s; + $this->token = random_string(20); + } + + public function clean() + { + + $x = $this->extract_code($this->str); + + $x = $this->purify($x); + + $x = $this->putback_code($x); + + $x = $this->escape($x); + + return $x; + } + + /** + * @brief Extracts code blocks and privately escapes them from processing. + * + * @param string $s + * @return string + * @see encode_code() + * @see putback_code() + * + */ + public function extract_code($s) + { + + $text = preg_replace_callback( + '{ + (?:\n\n|\A\n?) + ( # $1 = the code block -- one or more lines, starting with a space/tab + (?> + [ ]{' . '4' . '} # Lines must start with a tab or a tab-width of spaces + .*\n+ + )+ + ) + ((?=^[ ]{0,' . '4' . '}\S)|\Z) # Lookahead for non-space at line-start, or end of doc + }xm', + [$this, 'encode_code'], + $s + ); + + return $text; + } + + public function encode_code($matches) + { + return $this->token . ';' . base64_encode($matches[0]) . ';'; + } + + public function decode_code($matches) + { + return base64_decode($matches[1]); + } + + /** + * @brief Put back the code blocks. + * + * @param string $s + * @return string + * @see extract_code() + * @see decode_code() + * + */ + public function putback_code($s) + { + $text = preg_replace_callback('{' . $this->token . '\;(.*?)\;}xm', [$this, 'decode_code'], $s); + return $text; + } + + public function purify($s) + { + $s = $this->protect_autolinks($s); + $s = purify_html($s); + $s = $this->unprotect_autolinks($s); + return $s; + } + + public function protect_autolinks($s) + { + $s = preg_replace('/\<(https?\:\/\/)(.*?)\>/', '[$1$2]($1$2)', $s); + return $s; + } + + public function unprotect_autolinks($s) + { + return $s; + } + + public function escape($s) + { + return htmlspecialchars($s, ENT_QUOTES, 'UTF-8', false); + } + + /** + * @brief Converts special HTML entities back to characters. + * + * @param string $s + * @return string + */ + public static function unescape($s) + { + return htmlspecialchars_decode($s, ENT_QUOTES); + } +} diff --git a/Code/Lib/MastAPI.php b/Code/Lib/MastAPI.php new file mode 100644 index 000000000..7c30de0d6 --- /dev/null +++ b/Code/Lib/MastAPI.php @@ -0,0 +1,109 @@ + true]); + $ret['url'] = Channel::url($channel); + $ret['avatar'] = $channel['xchan_photo_l']; + $ret['avatar_static'] = $channel['xchan_photo_l']; + if ($cover_photo) { + $ret['header'] = $cover_photo['url']; + $ret['header_static'] = $cover_photo['url']; + } + $ret['followers_count'] = intval($followers[0]['total']); + $ret['following_count'] = intval($following[0]['total']); + $ret['statuses_count'] = intval($statuses[0]['total']); + $ret['last_status_at'] = datetime_convert('UTC', 'UTC', $channel['lastpost'], ATOM_TIME); + + + return $ret; + } + + public static function format_site() + { + + $register = intval(get_config('system', 'register_policy')); + + $u = q("select count(channel_id) as total from channel where channel_removed = 0"); + $i = q("select count(id) as total from item where item_origin = 1"); + $s = q("select count(site_url) as total from site"); + + $admins = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) > 0 and account_default_channel = channel_id"); + $adminsx = Channel::from_id($admins[0]['channel_id']); + + + $ret = []; + $ret['uri'] = z_root(); + $ret['title'] = System::get_site_name(); + $ret['description'] = bbcode(get_config('system', 'siteinfo', ''), ['export' => true]); + $ret['email'] = get_config('system', 'admin_email'); + $ret['version'] = System::get_project_version(); + $ret['registrations'] = (($register) ? true : false); + $ret['approval_required'] = (($register === REGISTER_APPROVE) ? true : false); + $ret['invites_enabled'] = false; + $ret['urls'] = []; + $ret['stats'] = [ + 'user_count' => intval($u[0]['total']), + 'status_count' => intval($i[0]['total']), + 'domain_count' => intval($s[0]['total']), + ]; + + $ret['contact_account'] = self::format_channel($adminsx); + + return $ret; + } +} diff --git a/Code/Lib/Menu.php b/Code/Lib/Menu.php new file mode 100644 index 000000000..0f0543667 --- /dev/null +++ b/Code/Lib/Menu.php @@ -0,0 +1,367 @@ + $r[0], 'items' => $x ); + } + + return null; + } + + public static function element($channel, $menu) + { + + $arr = []; + $arr['type'] = 'menu'; + $arr['pagetitle'] = $menu['menu']['menu_name']; + $arr['desc'] = $menu['menu']['menu_desc']; + $arr['created'] = $menu['menu']['menu_created']; + $arr['edited'] = $menu['menu']['menu_edited']; + + $arr['baseurl'] = z_root(); + if ($menu['menu']['menu_flags']) { + $arr['flags'] = []; + if ($menu['menu']['menu_flags'] & MENU_BOOKMARK) { + $arr['flags'][] = 'bookmark'; + } + if ($menu['menu']['menu_flags'] & MENU_SYSTEM) { + $arr['flags'][] = 'system'; + } + } + if ($menu['items']) { + $arr['items'] = []; + foreach ($menu['items'] as $it) { + $entry = []; + + $entry['link'] = str_replace(z_root() . '/channel/' . $channel['channel_address'], '[channelurl]', $it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/page/' . $channel['channel_address'], '[pageurl]', $it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/cloud/' . $channel['channel_address'], '[cloudurl]', $it['mitem_link']); + $entry['link'] = str_replace(z_root(), '[baseurl]', $it['mitem_link']); + + $entry['desc'] = $it['mitem_desc']; + $entry['order'] = $it['mitem_order']; + if ($it['mitem_flags']) { + $entry['flags'] = []; + if ($it['mitem_flags'] & MENU_ITEM_ZID) { + $entry['flags'][] = 'zid'; + } + if ($it['mitem_flags'] & MENU_ITEM_NEWWIN) { + $entry['flags'][] = 'new-window'; + } + if ($it['mitem_flags'] & MENU_ITEM_CHATROOM) { + $entry['flags'][] = 'chatroom'; + } + } + $arr['items'][] = $entry; + } + } + + return $arr; + } + + + + public static function render($menu, $class = '', $edit = false, $var = []) + { + + if (! $menu) { + return ''; + } + + $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0); + if ((! $channel_id) && (local_channel())) { + $channel_id = local_channel(); + } + + $chan = Channel::from_id($channel_id); + if (! $chan) { + return ''; + } + + $menu_list = self::list($channel_id); + $menu_names = []; + + foreach ($menu_list as $menus) { + if ($menus['menu_name'] != $menu['menu']['menu_name']) { + $menu_names[] = $menus['menu_name']; + } + } + + for ($x = 0; $x < count($menu['items']); $x++) { + if (in_array($menu['items'][$x]['mitem_link'], $menu_names)) { + $m = self::fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash()); + $submenu = self::render($m, 'dropdown-menu', $edit = false, array('wrap' => 'none')); + $menu['items'][$x]['submenu'] = $submenu; + } + + if ($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID) { + $menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']); + } + + if ($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN) { + $menu['items'][$x]['newwin'] = '1'; + } + + $menu['items'][$x]['mitem_desc'] = zidify_links(smilies(bbcode($menu['items'][$x]['mitem_desc']))); + } + + $wrap = (($var['wrap'] === 'none') ? false : true); + + $ret = replace_macros(Theme::get_template('usermenu.tpl'), array( + '$menu' => $menu['menu'], + '$class' => $class, + '$nick' => $chan['channel_address'], + '$edit' => (($edit) ? t("Edit") : ''), + '$id' => $menu['menu']['menu_id'], + '$items' => $menu['items'], + '$wrap' => $wrap + )); + + return $ret; + } + + + + public static function fetch_id($menu_id, $channel_id) + { + + $r = q( + "select * from menu where menu_id = %d and menu_channel_id = %d limit 1", + intval($menu_id), + intval($channel_id) + ); + + return (($r) ? $r[0] : false); + } + + + + public static function create($arr) + { + $menu_name = trim(escape_tags($arr['menu_name'])); + $menu_desc = trim(escape_tags($arr['menu_desc'])); + $menu_flags = intval($arr['menu_flags']); + + //allow menu_desc (title) to be empty + //if(! $menu_desc) + // $menu_desc = $menu_name; + + if (! $menu_name) { + return false; + } + + if (! $menu_flags) { + $menu_flags = 0; + } + + + $menu_channel_id = intval($arr['menu_channel_id']); + + $r = q( + "select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($menu_channel_id) + ); + + if ($r) { + return false; + } + + $t = datetime_convert(); + + $r = q( + "insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id, menu_created, menu_edited ) + values( '%s', '%s', %d, %d, '%s', '%s' )", + dbesc($menu_name), + dbesc($menu_desc), + intval($menu_flags), + intval($menu_channel_id), + dbesc(datetime_convert('UTC', 'UTC', (($arr['menu_created']) ? $arr['menu_created'] : $t))), + dbesc(datetime_convert('UTC', 'UTC', (($arr['menu_edited']) ? $arr['menu_edited'] : $t))) + ); + if (! $r) { + return false; + } + + $r = q( + "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($menu_channel_id) + ); + if ($r) { + return $r[0]['menu_id']; + } + return false; + } + + /** + * If $flags is present, check that all the bits in $flags are set + * so that MENU_SYSTEM|MENU_BOOKMARK will return entries with both + * bits set. We will use this to find system generated bookmarks. + */ + + public static function list($channel_id, $name = '', $flags = 0) + { + + $sel_options = ''; + $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : ''); + $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : ''); + + $r = q( + "select * from menu where menu_channel_id = %d $sel_options order by menu_desc", + intval($channel_id) + ); + return $r; + } + + public static function list_count($channel_id, $name = '', $flags = 0) + { + + $sel_options = ''; + $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : ''); + $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : ''); + + $r = q( + "select count(*) as total from menu where menu_channel_id = %d $sel_options", + intval($channel_id) + ); + return $r[0]['total']; + } + + public static function edit($arr) + { + + $menu_id = intval($arr['menu_id']); + + $menu_name = trim(escape_tags($arr['menu_name'])); + $menu_desc = trim(escape_tags($arr['menu_desc'])); + $menu_flags = intval($arr['menu_flags']); + + //allow menu_desc (title) to be empty + //if(! $menu_desc) + // $menu_desc = $menu_name; + + if (! $menu_name) { + return false; + } + + if (! $menu_flags) { + $menu_flags = 0; + } + + + $menu_channel_id = intval($arr['menu_channel_id']); + + $r = q( + "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($menu_channel_id) + ); + if (($r) && ($r[0]['menu_id'] != $menu_id)) { + logger('menu_edit: duplicate menu name for channel ' . $menu_channel_id); + return false; + } + + $r = q( + "select * from menu where menu_id = %d and menu_channel_id = %d limit 1", + intval($menu_id), + intval($menu_channel_id) + ); + if (! $r) { + logger('menu_edit: not found: ' . print_r($arr, true)); + return false; + } + + return q( + "update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d, menu_edited = '%s' + where menu_id = %d and menu_channel_id = %d", + dbesc($menu_name), + dbesc($menu_desc), + intval($menu_flags), + dbesc(datetime_convert()), + intval($menu_id), + intval($menu_channel_id) + ); + } + + public static function delete($menu_name, $uid) + { + $r = q( + "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + dbesc($menu_name), + intval($uid) + ); + + if ($r) { + return self::delete_id($r[0]['menu_id'], $uid); + } + return false; + } + + public static function delete_id($menu_id, $uid) + { + $r = q( + "select menu_id from menu where menu_id = %d and menu_channel_id = %d limit 1", + intval($menu_id), + intval($uid) + ); + if ($r) { + $x = q( + "delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d", + intval($menu_id), + intval($uid) + ); + return q( + "delete from menu where menu_id = %d and menu_channel_id = %d", + intval($menu_id), + intval($uid) + ); + } + return false; + } + + public static function sync_packet($uid, $observer_hash, $menu_id, $delete = false) + { + $r = self::fetch_id($menu_id, $uid); + $c = Channel::from_id($uid); + if ($r) { + $m = self::fetch($r['menu_name'], $uid, $observer_hash); + if ($m) { + if ($delete) { + $m['menu_delete'] = 1; + } + Libsync::build_sync_packet($uid, array('menu' => array(menu_element($c, $m)))); + } + } + } + +} diff --git a/Code/Lib/MenuItem.php b/Code/Lib/MenuItem.php new file mode 100644 index 000000000..b566c8936 --- /dev/null +++ b/Code/Lib/MenuItem.php @@ -0,0 +1,122 @@ +set_from_array($arr); + $p = $acl->get(); + + $r = q( + "insert into menu_item ( mitem_link, mitem_desc, mitem_flags, allow_cid, allow_gid, deny_cid, deny_gid, mitem_channel_id, mitem_menu_id, mitem_order ) values ( '%s', '%s', %d, '%s', '%s', '%s', '%s', %d, %d, %d ) ", + dbesc($mitem_link), + dbesc($mitem_desc), + intval($mitem_flags), + dbesc($p['allow_cid']), + dbesc($p['allow_gid']), + dbesc($p['deny_cid']), + dbesc($p['deny_gid']), + intval($uid), + intval($menu_id), + intval($mitem_order) + ); + + $x = q( + "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); + + return $r; + } + + public static function edit($menu_id, $uid, $arr) + { + + + $mitem_id = intval($arr['mitem_id']); + $mitem_link = escape_tags($arr['mitem_link']); + $mitem_desc = escape_tags($arr['mitem_desc']); + $mitem_order = intval($arr['mitem_order']); + $mitem_flags = intval($arr['mitem_flags']); + + + if (local_channel() == $uid) { + $channel = App::get_channel(); + } + + $acl = new AccessControl($channel); + $acl->set_from_array($arr); + $p = $acl->get(); + + + $r = q( + "update menu_item set mitem_link = '%s', mitem_desc = '%s', mitem_flags = %d, allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', mitem_order = %d where mitem_channel_id = %d and mitem_menu_id = %d and mitem_id = %d", + dbesc($mitem_link), + dbesc($mitem_desc), + intval($mitem_flags), + dbesc($p['allow_cid']), + dbesc($p['allow_gid']), + dbesc($p['deny_cid']), + dbesc($p['deny_gid']), + intval($mitem_order), + intval($uid), + intval($menu_id), + intval($mitem_id) + ); + + $x = q( + "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); + + return $r; + } + + + + + public static function delete($menu_id, $uid, $item_id) + { + $r = q( + "delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d and mitem_id = %d", + intval($menu_id), + intval($uid), + intval($item_id) + ); + + $x = q( + "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); + + return $r; + } + +} diff --git a/Code/Lib/MessageFilter.php b/Code/Lib/MessageFilter.php new file mode 100644 index 000000000..97b049b02 --- /dev/null +++ b/Code/Lib/MessageFilter.php @@ -0,0 +1,96 @@ +$(document).ready(function() { $("#nav-search-text").search_autocomplete(\'' . z_root() . '/acloader' . '\');});'; + + $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + + if (local_channel()) { + $channel = App::get_channel(); + $observer = App::get_observer(); + $prof = q( + "select id from profile where uid = %d and is_default = 1", + intval($channel['channel_id']) + ); + + if (! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) { + $chans = q( + "select channel_name, channel_id from channel left join pconfig on channel_id = pconfig.uid where channel_account_id = %d and channel_removed = 0 and pconfig.cat = 'system' and pconfig.k = 'include_in_menu' and pconfig.v = '1' order by channel_name ", + intval(get_account_id()) + ); + if (is_site_admin() && intval(get_pconfig($site_channel['channel_id'], 'system', 'include_in_menu'))) { + $chans = array_merge([$site_channel], $chans); + } + } + + $sitelocation = (($is_owner) ? '' : App::$profile['reddress']); + } elseif (remote_channel()) { + $observer = App::get_observer(); + $sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname()); + } + + require_once('include/conversation.php'); + + + $channel_apps[] = ((isset(App::$profile)) ? self::channel_apps($is_owner, App::$profile['channel_address']) : []); + + $site_icon = System::get_site_icon(); + + $banner = EMPTY_STR; + +// $banner = System::get_site_name(); +// if (! isset(App::$page['header'])) { +// App::$page['header'] = EMPTY_STR; +// } + App::$page['header'] .= replace_macros(Theme::get_template('hdr.tpl'), array( + //we could additionally use this to display important system notifications e.g. for updates + )); + + + // nav links: array of array('href', 'text', 'extra css classes', 'title') + $nav = []; + + if (can_view_public_stream()) { + $nav['pubs'] = true; + } + + /** + * Display login or logout + */ + + $nav['usermenu'] = []; + $userinfo = null; + $nav['loginmenu'] = []; + + if ($observer) { + $userinfo = [ + 'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']), + 'name' => $observer['xchan_addr'], + ]; + } elseif (! $_SESSION['authenticated']) { + $nav['remote_login'] = Channel::remote_login(); + $nav['loginmenu'][] = array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn'); + } + + if (local_channel()) { + if (! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) { + $nav['manage'] = array('manage', t('Channels'), "", t('Manage your channels'),'manage_nav_btn'); + } + + $nav['group'] = array('lists', t('Lists'),"", t('Manage your access lists'),'group_nav_btn'); + + $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); + + $nav['safe'] = array('safe', t('Safe Mode'), ((get_safemode()) ? t('(is on)') : t('(is off)')) , t('Content filtering'),'safe_nav_btn'); + + + if ($chans && count($chans) > 0) { + $nav['channels'] = $chans; + } + + $nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; + + // user menu + $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((App::$nav_sel['raw_name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn']; + + if (Features::enabled(local_channel(), 'multi_profiles')) { + $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn']; + } else { + $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn']; + } + } else { + if (! get_account_id()) { + if (App::$module === 'channel') { + $nav['login'] = login(true, 'navbar-login', false, false); + $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'']; + } else { + $nav['login'] = login(true, 'navbar-login', false, false); + $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn']; + App::$page['content'] .= replace_macros( + Theme::get_template('nav_login.tpl'), + [ + '$nav' => $nav, + 'userinfo' => $userinfo + ] + ); + } + } else { + $nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; + } + } + + $my_url = Channel::get_my_url(); + if (! $my_url) { + $observer = App::get_observer(); + $my_url = (($observer) ? $observer['xchan_url'] : ''); + } + + $homelink_arr = parse_url($my_url); + $homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host']; + + if (! $is_owner) { + $nav['rusermenu'] = array( + $homelink, + t('Take me home'), + 'logout', + ((local_channel()) ? t('Logout') : t('Log me out of this site')) + ); + } + + if (((get_config('system', 'register_policy') == REGISTER_OPEN) || (get_config('system', 'register_policy') == REGISTER_APPROVE)) && (! $_SESSION['authenticated'])) { + $nav['register'] = ['register',t('Register'), "", t('Create an account'),'register_nav_btn']; + } + + if (! get_config('system', 'hide_help', true)) { + $help_url = z_root() . '/help?f=&cmd=' . App::$cmd; + $context_help = ''; + $enable_context_help = ((intval(get_config('system', 'enable_context_help')) === 1 || get_config('system', 'enable_context_help') === false) ? true : false); + if ($enable_context_help === true) { + require_once('include/help.php'); + $context_help = load_context_help(); + //point directly to /help if $context_help is empty - this can be removed once we have context help for all modules + $enable_context_help = (($context_help) ? true : false); + } + $nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help]; + } + + + $search_form_action = 'search'; + + + $nav['search'] = ['search', t('Search'), "", t('Search site @name, #tag, ?doc, content'), $search_form_action]; + + /** + * Admin page + */ + if (is_site_admin()) { + $nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'),'admin_nav_btn'); + } + + $x = array('nav' => $nav, 'usermenu' => $userinfo ); + + Hook::call('nav', $x); + + // Not sure the best place to put this on the page. So I'm implementing it but leaving it + // turned off until somebody discovers this and figures out a good location for it. + $powered_by = ''; + + if (App::$profile_uid && App::$nav_sel['raw_name']) { + $active_app = q( + "SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1", + intval(App::$profile_uid), + dbesc(App::$nav_sel['raw_name']) + ); + + if ($active_app) { + $url = $active_app[0]['app_url']; + } + } + + $pinned_list = []; + $syslist = []; + + //app bin + if ($is_owner) { + if (get_pconfig(local_channel(), 'system', 'import_system_apps') !== datetime_convert('UTC', 'UTC', 'now', 'Y-m-d')) { + Apps::import_system_apps(); + set_pconfig(local_channel(), 'system', 'import_system_apps', datetime_convert('UTC', 'UTC', 'now', 'Y-m-d')); + } + + $list = Apps::app_list(local_channel(), false, [ 'nav_pinned_app' ]); + if ($list) { + foreach ($list as $li) { + $pinned_list[] = Apps::app_encode($li); + } + } + Apps::translate_system_apps($pinned_list); + + usort($pinned_list, 'Code\\Lib\\Apps::app_name_compare'); + + $pinned_list = Apps::app_order(local_channel(), $pinned_list, 'nav_pinned_app'); + + + $syslist = []; + $list = Apps::app_list(local_channel(), false, [ 'nav_featured_app' ]); + + if ($list) { + foreach ($list as $li) { + $syslist[] = Apps::app_encode($li); + } + } + Apps::translate_system_apps($syslist); + } else { + $syslist = Apps::get_system_apps(true); + } + + usort($syslist, 'Code\\Lib\\Apps::app_name_compare'); + + $syslist = Apps::app_order(local_channel(), $syslist, 'nav_featured_app'); + + + if ($pinned_list) { + foreach ($pinned_list as $app) { + if (App::$nav_sel['name'] == $app['name']) { + $app['active'] = true; + } + + if ($is_owner) { + $navbar_apps[] = Apps::app_render($app, 'navbar'); + } elseif (! $is_owner && strpos($app['requires'], 'local_channel') === false) { + $navbar_apps[] = Apps::app_render($app, 'navbar'); + } + } + } + + if ($syslist) { + foreach ($syslist as $app) { + if (App::$nav_sel['name'] == $app['name']) { + $app['active'] = true; + } + + if ($is_owner) { + $nav_apps[] = Apps::app_render($app, 'nav'); + } elseif (! $is_owner && strpos($app['requires'], 'local_channel') === false) { + $nav_apps[] = Apps::app_render($app, 'nav'); + } + } + } + + $c = Theme::include('navbar_' . purify_filename($template) . '.css'); + $tpl = Theme::get_template('navbar_' . purify_filename($template) . '.tpl'); + + if ($c && $tpl) { + Head::add_css('navbar_' . $template . '.css'); + } + + if (! $tpl) { + $tpl = Theme::get_template('navbar_default.tpl'); + } + + App::$page['nav'] .= replace_macros($tpl, array( + '$baseurl' => z_root(), + '$site_home' => Channel::url($site_channel), + '$project_icon' => $site_icon, + '$project_title' => t('Powered by $Projectname'), + '$fulldocs' => t('Help'), + '$sitelocation' => $sitelocation, + '$nav' => $x['nav'], + '$banner' => $banner, + '$emptynotifications' => t('Loading'), + '$userinfo' => $x['usermenu'], + '$localuser' => local_channel(), + '$is_owner' => $is_owner, + '$sel' => App::$nav_sel, + '$powered_by' => $powered_by, + '$asidetitle' => t('Side Panel'), + '$help' => t('@name, #tag, ?doc, content'), + '$pleasewait' => t('Please wait...'), + '$nav_apps' => ((isset($nav_apps)) ? $nav_apps : []), + '$navbar_apps' => ((isset($navbar_apps)) ? $navbar_apps : []), + '$channel_menu' => get_pconfig(App::$profile_uid, 'system', 'channel_menu', get_config('system', 'channel_menu')), + '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''), + '$channel_apps' => ((isset($channel_apps)) ? $channel_apps : []), + '$manageapps' => t('Installed Apps'), + '$appstitle' => t('Apps'), + '$addapps' => t('Available Apps'), + '$orderapps' => t('Arrange Apps'), + '$sysapps_toggle' => t('Toggle System Apps'), + '$notificationstitle' => t('Notifications'), + '$url' => ((isset($url) && $url) ? $url : App::$cmd) + )); + + if (x($_SESSION, 'reload_avatar') && $observer) { + // The avatar has been changed on the server but the browser doesn't know that, + // force the browser to reload the image from the server instead of its cache. + $tpl = Theme::get_template('force_image_reload.tpl'); + + App::$page['nav'] .= replace_macros($tpl, array( + '$imgUrl' => $observer['xchan_photo_m'] + )); + unset($_SESSION['reload_avatar']); + } + + Hook::call('page_header', App::$page['nav']); + } + + /* + * Set a menu item in navbar as selected + * + */ + public static function set_selected($item) + { + App::$nav_sel['raw_name'] = $item; + $item = ['name' => $item]; + Apps::translate_system_apps($item); + App::$nav_sel['name'] = $item['name']; + } + + public static function channel_apps($is_owner = false, $nickname = null) + { + + // Don't provide any channel apps if we're running as the sys channel + + if (App::$is_sys) { + return ''; + } + + + $channel = App::get_channel(); + + if ($channel && is_null($nickname)) { + $nickname = $channel['channel_address']; + } + + $uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel()); + $account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']); + + if (! get_pconfig($uid, 'system', 'channelapps', '1')) { + return ''; + } + + if ($uid == local_channel()) { + return; + } else { + $cal_link = '/cal/' . $nickname; + } + + $sql_options = item_permissions_sql($uid); + + $r = q( + "select item.* from item left join iconfig on item.id = iconfig.iid + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' + and item.item_delayed = 0 and item.item_deleted = 0 + and ( iconfig.k = 'WEBPAGE' and item_type = %d ) + $sql_options limit 1", + intval($uid), + dbesc('home'), + intval(ITEM_TYPE_WEBPAGE) + ); + + $has_webpages = (($r) ? true : false); + + if (x($_GET, 'tab')) { + $tab = notags(trim($_GET['tab'])); + } + + $url = z_root() . '/channel/' . $nickname; + $pr = z_root() . '/profile/' . $nickname; + + $tabs = [ + [ + 'label' => t('Channel'), + 'url' => $url, + 'sel' => ((argv(0) == 'channel') ? 'active' : ''), + 'title' => t('Status Messages and Posts'), + 'id' => 'status-tab', + 'icon' => 'home' + ], + ]; + + $p = get_all_perms($uid, get_observer_hash()); + + if ($p['view_profile']) { + $tabs[] = [ + 'label' => t('About'), + 'url' => $pr, + 'sel' => ((argv(0) == 'profile') ? 'active' : ''), + 'title' => t('Profile Details'), + 'id' => 'profile-tab', + 'icon' => 'user' + ]; + } + if ($p['view_storage']) { + $tabs[] = [ + 'label' => t('Photos'), + 'url' => z_root() . '/photos/' . $nickname, + 'sel' => ((argv(0) == 'photos') ? 'active' : ''), + 'title' => t('Photo Albums'), + 'id' => 'photo-tab', + 'icon' => 'photo' + ]; + $tabs[] = [ + 'label' => t('Files'), + 'url' => z_root() . '/cloud/' . $nickname, + 'sel' => ((argv(0) == 'cloud' || argv(0) == 'sharedwithme') ? 'active' : ''), + 'title' => t('Files and Storage'), + 'id' => 'files-tab', + 'icon' => 'folder-open' + ]; + } + + if ($p['view_stream'] && $cal_link) { + $tabs[] = [ + 'label' => t('Calendar'), + 'url' => z_root() . $cal_link, + 'sel' => ((argv(0) == 'cal') ? 'active' : ''), + 'title' => t('Calendar'), + 'id' => 'event-tab', + 'icon' => 'calendar' + ]; + } + + + if ($p['chat'] && Apps::system_app_installed($uid, 'Chatrooms')) { + $has_chats = Chatroom::list_count($uid); + if ($has_chats) { + $tabs[] = [ + 'label' => t('Chatrooms'), + 'url' => z_root() . '/chat/' . $nickname, + 'sel' => ((argv(0) == 'chat') ? 'active' : '' ), + 'title' => t('Chatrooms'), + 'id' => 'chat-tab', + 'icon' => 'comments-o' + ]; + } + } + + $has_bookmarks = Menu::list_count(local_channel(), '', MENU_BOOKMARK) + Menu::list_count(local_channel(), '', MENU_SYSTEM | MENU_BOOKMARK); + if ($is_owner && $has_bookmarks) { + $tabs[] = [ + 'label' => t('Bookmarks'), + 'url' => z_root() . '/bookmarks', + 'sel' => ((argv(0) == 'bookmarks') ? 'active' : ''), + 'title' => t('Saved Bookmarks'), + 'id' => 'bookmarks-tab', + 'icon' => 'bookmark' + ]; + } + + if ($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) { + $tabs[] = [ + 'label' => t('Cards'), + 'url' => z_root() . '/cards/' . $nickname , + 'sel' => ((argv(0) == 'cards') ? 'active' : ''), + 'title' => t('View Cards'), + 'id' => 'cards-tab', + 'icon' => 'list' + ]; + } + + if ($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) { + $tabs[] = [ + 'label' => t('Articles'), + 'url' => z_root() . '/articles/' . $nickname , + 'sel' => ((argv(0) == 'articles') ? 'active' : ''), + 'title' => t('View Articles'), + 'id' => 'articles-tab', + 'icon' => 'file-text-o' + ]; + } + + + if ($has_webpages && Apps::system_app_installed($uid, 'Webpages')) { + $tabs[] = [ + 'label' => t('Webpages'), + 'url' => z_root() . '/page/' . $nickname . '/home', + 'sel' => ((argv(0) == 'webpages') ? 'active' : ''), + 'title' => t('View Webpages'), + 'id' => 'webpages-tab', + 'icon' => 'newspaper-o' + ]; + } + + + if ($p['view_wiki'] && Apps::system_app_installed($uid, 'Wiki')) { + $tabs[] = [ + 'label' => t('Wikis'), + 'url' => z_root() . '/wiki/' . $nickname, + 'sel' => ((argv(0) == 'wiki') ? 'active' : ''), + 'title' => t('Wiki'), + 'id' => 'wiki-tab', + 'icon' => 'pencil-square-o' + ]; + } + + $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs); + + Hook::call('channel_apps', $arr); + + return replace_macros( + Theme::get_template('profile_tabs.tpl'), + [ + '$tabs' => $arr['tabs'], + '$name' => App::$profile['channel_name'], + '$thumb' => App::$profile['thumb'], + ] + ); + } + + +} diff --git a/Code/Lib/Nodeinfo.php b/Code/Lib/Nodeinfo.php new file mode 100644 index 000000000..862393a1e --- /dev/null +++ b/Code/Lib/Nodeinfo.php @@ -0,0 +1,41 @@ +' . $result['url'] . ''; + } + + $j = self::fetch_url($result['url']); + $s = self::format_object($j); + return $s; + } + + + public static function action($embedurl) + { + + $host = ''; + $action = 'filter'; + + $embedurl = trim(str_replace('&', '&', $embedurl)); + + //logger('oembed_action: ' . $embedurl, LOGGER_DEBUG, LOG_INFO); + + if (strpos($embedurl, 'http://') === 0) { + if (intval(get_config('system', 'embed_sslonly'))) { + $action = 'block'; + } + } + + if (strpos($embedurl, '.well-known') !== false) { + $action = 'block'; + } + + + // site allow/deny list + + if (($x = get_config('system', 'embed_deny'))) { + if (($x) && (! is_array($x))) { + $x = explode("\n", $x); + } + if ($x) { + foreach ($x as $ll) { + $t = trim($ll); + if (($t) && (strpos($embedurl, $t) !== false)) { + $action = 'block'; + break; + } + } + } + } + + $found = false; + + if (($x = get_config('system', 'embed_allow'))) { + if (($x) && (! is_array($x))) { + $x = explode("\n", $x); + } + if ($x) { + foreach ($x as $ll) { + $t = trim($ll); + if (($t) && (strpos($embedurl, $t) !== false) && ($action !== 'block')) { + $found = true; + $action = 'allow'; + break; + } + } + } + if ((! $found) && ($action !== 'block')) { + $action = 'filter'; + } + } + + // allow individual members to block something that wasn't blocked already. + // They cannot over-ride the site to allow or change the filtering on an + // embed that is not allowed by the site admin. + + if (local_channel()) { + if (($x = get_pconfig(local_channel(), 'system', 'embed_deny'))) { + if (($x) && (! is_array($x))) { + $x = explode("\n", $x); + } + if ($x) { + foreach ($x as $ll) { + $t = trim($ll); + if (($t) && (strpos($embedurl, $t) !== false)) { + $action = 'block'; + break; + } + } + } + } + } + + $arr = array('url' => $embedurl, 'action' => $action); + Hook::call('oembed_action', $arr); + + //logger('action: ' . $arr['action'] . ' url: ' . $arr['url'], LOGGER_DEBUG,LOG_DEBUG); + + return $arr; + } + + // if the url is embeddable with oembed, return the bbcode link. + + public static function process($url) + { + + $j = self::fetch_url($url); + logger('oembed_process: ' . print_r($j, true), LOGGER_DATA, LOG_DEBUG); + if ($j && $j['type'] !== 'error') { + return '[embed]' . $url . '[/embed]'; + } + return false; + } + + + + public static function fetch_url($embedurl) + { + + $noexts = [ '.mp3', '.mp4', '.ogg', '.ogv', '.oga', '.ogm', '.webm', '.opus', '.m4a', '.mov' ]; + + $result = self::action($embedurl); + + $embedurl = $result['url']; + $action = $result['action']; + + foreach ($noexts as $ext) { + if (strpos(strtolower($embedurl), $ext) !== false) { + $action = 'block'; + } + } + + $txt = null; + + // we should try to cache this and avoid a lookup on each render + $is_matrix = is_matrix_url($embedurl); + + $zrl = ((get_config('system', 'oembed_zrl')) ? $is_matrix : false); + + $furl = ((local_channel() && $zrl) ? zid($embedurl) : $embedurl); + + if ($action !== 'block' && (! get_config('system', 'oembed_cache_disable'))) { + $txt = Cache::get('[' . App::$videowidth . '] ' . $furl); + } + + if (strpos(strtolower($embedurl), '.pdf') !== false && get_config('system', 'inline_pdf')) { + $action = 'allow'; + $j = [ + 'html' => '', + 'title' => t('View PDF'), + 'type' => 'pdf' + ]; + + // set $txt to something so that we don't attempt to fetch what could be a lengthy pdf. + $txt = EMPTY_STR; + } + + if (is_null($txt)) { + $txt = ""; + + if ($action !== 'block') { + // try oembed autodiscovery + $redirects = 0; + $result = z_fetch_url( + $furl, + false, + $redirects, + [ + 'timeout' => 30, + 'accept_content' => "text/*", + 'novalidate' => true, + 'session' => ((local_channel() && $zrl) ? true : false) + ] + ); + + if ($result['success']) { + $html_text = $result['body']; + } else { + logger('fetch failure: ' . $furl); + } + + if ($html_text) { + $dom = new DOMDocument(); + @$dom->loadHTML($html_text); + if ($dom) { + $xpath = new DOMXPath($dom); + $attr = "oembed"; + $xattr = self::build_xpath("class", "oembed"); + + $entries = $xpath->query("//link[@type='application/json+oembed']"); + foreach ($entries as $e) { + $href = $e->getAttributeNode("href")->nodeValue; + + $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); + if ($x['success']) { + $txt = $x['body']; + } else { + logger('fetch failed: ' . $href); + } + break; + } + // soundcloud is now using text/json+oembed instead of application/json+oembed, + // others may be also + $entries = $xpath->query("//link[@type='text/json+oembed']"); + foreach ($entries as $e) { + $href = $e->getAttributeNode("href")->nodeValue; + $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); + if ($x['success']) { + $txt = $x['body']; + } else { + logger('json fetch failed: ' . $href); + } + break; + } + } + } + } + + if ($txt == false || $txt == "") { + $x = array('url' => $embedurl,'videowidth' => App::$videowidth); + Hook::call('oembed_probe', $x); + if (array_key_exists('embed', $x)) { + $txt = $x['embed']; + } + } + + $txt = trim($txt); + + if ($txt[0] != "{") { + $txt = '{"type":"error"}'; + } + + // save in cache + + if (! get_config('system', 'oembed_cache_disable')) { + Cache::set('[' . App::$videowidth . '] ' . $furl, $txt); + } + } + + + if (! $j) { + $j = json_decode($txt, true); + } + + if (! $j) { + $j = []; + } + + if ($action === 'filter') { + if ($j['html']) { + $orig = $j['html']; + $allow_position = (($is_matrix) ? true : false); + + // some sites (e.g. Mastodon) wrap their entire embed in an iframe + // which we will purify away and which we provide anyway. + // So if we see this, grab the frame src url and use that + // as the embed content - which will still need to be purified. + + if (preg_match('#\"; + switch ($j['type']) { + case "video": { + if (isset($j['thumbnail_url'])) { + $tw = (isset($j['thumbnail_width'])) ? $j['thumbnail_width'] : 200; + $th = (isset($j['thumbnail_height'])) ? $j['thumbnail_height'] : 180; + $tr = $tw / $th; + + $th = 120; + $tw = $th * $tr; + $tpl = Theme::get_template('oembed_video.tpl'); + + $ret .= replace_macros($tpl, array( + '$baseurl' => z_root(), + '$embedurl' => $embedurl, + '$escapedhtml' => base64_encode($jhtml), + '$tw' => $tw, + '$th' => $th, + '$turl' => $j['thumbnail_url'], + )); + } else { + $ret = $jhtml; + } + $ret .= "
      "; + } + break; + case "photo": { + $ret .= ""; + $ret .= "
      "; + } + break; + case "link": { + if ($j['thumbnail_url']) { + if (is_matrix_url($embedurl)) { + $embedurl = zid($embedurl); + $j['thumbnail_url'] = zid($j['thumbnail_url']); + } + $ret = 'thumbnail

      '; + } + + //$ret = "".$j['title'].""; + } + break; + case 'pdf': { + $ret = $j['html']; + break; + } + + case "rich": + if ($j['zrl']) { + $ret = ((preg_match('/^]+>(.*?)<\/div>$/is', $j['html'], $o)) ? $o[1] : $j['html']); + } else { + $ret .= $jhtml; + } + break; + } + + // add link to source if not present in "rich" type + if ($j['type'] != 'rich' || !strpos($j['html'], $embedurl)) { + $embedlink = (isset($j['title'])) ? $j['title'] : $embedurl; + $ret .= '
      ' . "$embedlink"; + $ret .= "
      "; + if (isset($j['author_name'])) { + $ret .= t(' by ') . $j['author_name']; + } + if (isset($j['provider_name'])) { + $ret .= t(' on ') . $j['provider_name']; + } + } else { + // add for html2bbcode conversion + $ret .= "
      $embedurl"; + } + $ret .= "
      "; + return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret)); + } + + public static function iframe($src, $width, $height) + { + $scroll = ' scrolling="no" '; + if (! $width || strstr($width, '%')) { + $width = '640'; + $scroll = ' scrolling="auto" '; + } + if (! $height || strstr($height, '%')) { + $height = '300'; + $scroll = ' scrolling="auto" '; + } + + // try and leave some room for the description line. + $height = intval($height) + 80; + $width = intval($width) + 40; + + $s = z_root() . '/oembed/' . base64url_encode($src); + + // Make sure any children are sandboxed within their own iframe. + + return ''; + } + + + + public static function bbcode2html($text) + { + $stopoembed = get_config("system", "no_oembed"); + if ($stopoembed == true) { + return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "" . t('Embedding disabled') . " : $1", $text); + } + return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", ['\\Code\\Lib\\Oembed','replacecb'], $text); + } + + + public static function build_xpath($attr, $value) + { + // http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html + return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'"; + } + + public static function get_inner_html($node) + { + $innerHTML = ''; + $children = $node->childNodes; + foreach ($children as $child) { + $innerHTML .= $child->ownerDocument->saveXML($child); + } + return $innerHTML; + } + + /** + * Find .... + * and replace it with [embed]url[/embed] + */ + public static function html2bbcode($text) + { + // start parser only if 'oembed' is in text + if (strpos($text, "oembed")) { + // convert non ascii chars to html entities + $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text)); + + // If it doesn't parse at all, just return the text. + $dom = new DOMDocument(); + @$dom->loadHTML($html_text); + if ($dom) { + $xpath = new DOMXPath($dom); + $attr = "oembed"; + + $xattr = self::build_xpath("class", "oembed"); + $entries = $xpath->query("//span[$xattr]"); + + $xattr = "@rel='oembed'";//self::build_xpath("rel","oembed"); + foreach ($entries as $e) { + $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; + if (!is_null($href)) { + $e->parentNode->replaceChild(new DOMText("[embed]" . $href . "[/embed]"), $e); + } + } + return self::get_inner_html($dom->getElementsByTagName("body")->item(0)); + } + } + return $text; + } + + + +} diff --git a/Code/Lib/PConfig.php b/Code/Lib/PConfig.php new file mode 100644 index 000000000..884788eb1 --- /dev/null +++ b/Code/Lib/PConfig.php @@ -0,0 +1,229 @@ +PConfig is used for channel specific configurations and takes a + * channel_id as identifier. It stores for example which features are + * enabled per channel. The storage is of size MEDIUMTEXT. + * + * @code{.php}$var = Code\Lib\PConfig::Get('uid', 'category', 'key'); + * // with default value for non existent key + * $var = Code\Lib\PConfig::Get('uid', 'category', 'unsetkey', 'defaultvalue');@endcode + * + * The old (deprecated?) way to access a PConfig value is: + * @code{.php}$var = get_pconfig(local_channel(), 'category', 'key');@endcode + */ +class PConfig +{ + + /** + * @brief Loads all configuration values of a channel into a cached storage. + * + * All configuration values of the given channel are stored in global cache + * which is available under the global variable App::$config[$uid]. + * + * @param string $uid + * The channel_id + * @return void|false Nothing or false if $uid is null or false + */ + public static function Load($uid) + { + if (is_null($uid) || $uid === false) { + return false; + } + + if (! is_array(App::$config)) { + btlogger('App::$config not an array'); + } + + if (! array_key_exists($uid, App::$config)) { + App::$config[$uid] = []; + } + + if (! is_array(App::$config[$uid])) { + btlogger('App::$config[$uid] not an array: ' . $uid); + } + + $r = q( + "SELECT * FROM pconfig WHERE uid = %d", + intval($uid) + ); + + if ($r) { + foreach ($r as $rr) { + $k = $rr['k']; + $c = $rr['cat']; + if (! array_key_exists($c, App::$config[$uid])) { + App::$config[$uid][$c] = []; + App::$config[$uid][$c]['config_loaded'] = true; + } + App::$config[$uid][$c][$k] = $rr['v']; + } + } + } + + /** + * @brief Get a particular channel's config variable given the category name + * ($family) and a key. + * + * Get a particular channel's config value from the given category ($family) + * and the $key from a cached storage in App::$config[$uid]. + * + * Returns false if not set. + * + * @param string $uid + * The channel_id + * @param string $family + * The category of the configuration value + * @param string $key + * The configuration key to query + * @param mixed $default (optional, default false) + * Default value to return if key does not exist + * @return mixed Stored value or false if it does not exist + */ + public static function Get($uid, $family, $key, $default = false) + { + + if (is_null($uid) || $uid === false) { + return $default; + } + + if (! array_key_exists($uid, App::$config)) { + self::Load($uid); + } + + if ((! array_key_exists($family, App::$config[$uid])) || (! array_key_exists($key, App::$config[$uid][$family]))) { + return $default; + } + + return unserialise(App::$config[$uid][$family][$key]); + } + + /** + * @brief Sets a configuration value for a channel. + * + * Stores a config value ($value) in the category ($family) under the key ($key) + * for the channel_id $uid. + * + * @param string $uid + * The channel_id + * @param string $family + * The category of the configuration value + * @param string $key + * The configuration key to set + * @param string $value + * The value to store + * @return mixed Stored $value or false + */ + public static function Set($uid, $family, $key, $value) + { + + // this catches subtle errors where this function has been called + // with local_channel() when not logged in (which returns false) + // and throws an error in array_key_exists below. + // we provide a function backtrace in the logs so that we can find + // and fix the calling function. + + if (is_null($uid) || $uid === false) { + btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR); + return; + } + + // manage array value + $dbvalue = ((is_array($value)) ? serialise($value) : $value); + $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); + + if (self::Get($uid, $family, $key) === false) { + if (! array_key_exists($uid, App::$config)) { + App::$config[$uid] = []; + } + if (! array_key_exists($family, App::$config[$uid])) { + App::$config[$uid][$family] = []; + } + + $ret = q( + "INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ", + intval($uid), + dbesc($family), + dbesc($key), + dbesc($dbvalue) + ); + } else { + $ret = q( + "UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'", + dbesc($dbvalue), + intval($uid), + dbesc($family), + dbesc($key) + ); + } + + // keep a separate copy for all variables which were + // set in the life of this page. We need this to + // synchronise channel clones. + + if (! array_key_exists('transient', App::$config[$uid])) { + App::$config[$uid]['transient'] = []; + } + if (! array_key_exists($family, App::$config[$uid]['transient'])) { + App::$config[$uid]['transient'][$family] = []; + } + + App::$config[$uid][$family][$key] = $value; + App::$config[$uid]['transient'][$family][$key] = $value; + + if ($ret) { + return $value; + } + + return $ret; + } + + + /** + * @brief Deletes the given key from the channel's configuration. + * + * Removes the configured value from the stored cache in App::$config[$uid] + * and removes it from the database. + * + * @param string $uid + * The channel_id + * @param string $family + * The category of the configuration value + * @param string $key + * The configuration key to delete + * @return mixed + */ + public static function Delete($uid, $family, $key) + { + + if (is_null($uid) || $uid === false) { + return false; + } + + $ret = false; + + if ( + array_key_exists($uid, App::$config) + && is_array(App::$config['uid']) + && array_key_exists($family, App::$config['uid']) + && array_key_exists($key, App::$config[$uid][$family]) + ) { + unset(App::$config[$uid][$family][$key]); + } + + $ret = q( + "DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'", + intval($uid), + dbesc($family), + dbesc($key) + ); + + return $ret; + } +} diff --git a/Code/Lib/Permcat.php b/Code/Lib/Permcat.php new file mode 100644 index 000000000..b66fe337b --- /dev/null +++ b/Code/Lib/Permcat.php @@ -0,0 +1,226 @@ +permcats[] = [ + 'name' => 'default', + 'localname' => t('default', 'permcat'), + 'perms' => Permissions::Operms($perms), + 'system' => 1 + ]; + + + $p = $this->load_permcats($channel_id, $abook_id); + if ($p) { + for ($x = 0; $x < count($p); $x++) { + $this->permcats[] = [ + 'name' => $p[$x][0], + 'localname' => $p[$x][1], + 'perms' => Permissions::Operms(Permissions::FilledPerms($p[$x][2])), + 'system' => intval($p[$x][3]) + ]; + } + } + } + + public function match($current) { + if ($current) { + $perms = Permissions::FilledPerms($current); + $operms = Permissions::Operms($perms); + } + + if ($this->permcats && $operms) { + foreach($this->permcats as $permcat) { + $pp = $permcat['perms']; + $matching = 0; + foreach ($pp as $rp) { + foreach ($operms as $op) { + if ($rp['name'] === $op['name'] && intval($rp['value']) === intval($op['value'])) { + $matching ++; + break; + } + } + } + if ($matching === count($pp)) { + return $permcat['name']; + } + } + } + return 'custom'; + } + + /** + * @brief Return array with permcats. + * + * @return array + */ + public function listing() + { + return $this->permcats; + } + + /** + * @brief + * + * @param string $name + * @return array + * * \e array with permcats + * * \e bool \b error if $name not found in permcats true + */ + public function fetch($name) + { + if ($name && $this->permcats) { + foreach ($this->permcats as $permcat) { + if (strcasecmp($permcat['name'], $name) === 0) { + return $permcat; + } + } + } + return ['error' => true]; + } + + public function load_permcats($uid, $abook_id = 0) + { + + $permcats = [ + [ 'follower', t('follower', 'permcat'), + [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki', + 'post_like' ], 1 + ], + [ 'contributor', t('contributor', 'permcat'), + [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki', + 'post_wall','post_comments','write_wiki','post_like','tag_deliver','chat' ], 1 + ], + [ 'publisher', t('publisher', 'permcat'), + [ 'view_stream','view_profile','view_contacts','view_storage','view_pages', + 'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver', + 'chat', 'republish' ], 1 + ] + ]; + + if ($uid) { + $x = q( + "select * from pconfig where uid = %d and cat = 'permcat'", + intval($uid) + ); + if ($x) { + foreach ($x as $xv) { + $value = unserialise($xv['v']); + $permcats[] = [ $xv['k'], $xv['k'], $value, 0 ]; + } + } + } + + if ($abook_id) { + $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d", + intval($abook_id), + intval($uid) + ); + if ($r) { + $my_perms = explode(',', get_abconfig($uid, $r[0]['xchan_hash'], 'system', 'my_perms', EMPTY_STR)); + $permcats[] = [ 'custom', t('custom'), $my_perms, 1]; + } + + } + /** + * @hooks permcats + * * \e array + */ + Hook::call('permcats', $permcats); + + return $permcats; + } + + public static function find_permcat($arr, $name) + { + if ((! $arr) || (! $name)) { + return false; + } + + foreach ($arr as $p) { + if ($p['name'] == $name) { + return $p['value']; + } + } + } + + public static function update($channel_id, $name, $permarr) + { + PConfig::Set($channel_id, 'permcat', $name, $permarr); + } + + public static function delete($channel_id, $name) + { + PConfig::Delete($channel_id, 'permcat', $name); + } +} diff --git a/Code/Lib/PermissionDescription.php b/Code/Lib/PermissionDescription.php new file mode 100644 index 000000000..7fbed65f2 --- /dev/null +++ b/Code/Lib/PermissionDescription.php @@ -0,0 +1,193 @@ +global_perm = $global_perm; + $this->channel_perm = $channel_perm; + $this->fallback_description = ($description == '') ? t('Visible to your default audience') : $description; + } + + /** + * If the interpretation of an empty ACL can't be summarised with a global default permission + * or a specific permission setting then use this method and describe what it means instead. + * Remember to localize the description first. + * + * @param string $description - the localized caption for the no-ACL option in the ACL dialog. + * @return a new instance of PermissionDescription + */ + public static function fromDescription($description) + { + return new PermissionDescription('', 0x80000, $description); + } + + /** + * Use this method only if the interpretation of an empty ACL doesn't fall back to a global + * default permission. You should pass one of the constants from boot.php - PERMS_PUBLIC, + * PERMS_NETWORK etc. + * + * @param int $perm - a single enumerated constant permission - PERMS_PUBLIC, PERMS_NETWORK etc. + * @return a new instance of PermissionDescription + */ + public static function fromStandalonePermission($perm) + { + + $result = new PermissionDescription('', $perm); + + $checkPerm = $result->get_permission_description(); + if ($checkPerm == $result->fallback_description) { + $result = null; + logger('null PermissionDescription from unknown standalone permission: ' . $perm, LOGGER_DEBUG, LOG_ERR); + } + + return $result; + } + + /** + * This is the preferred way to create a PermissionDescription, as it provides the most details. + * Use this method if you know an empty ACL will result in one of the global default permissions + * being used, such as channel_r_stream (for which you would pass 'view_stream'). + * + * @param string $permname - a key for the global perms array from get_perms() in permissions.php, + * e.g. 'view_stream', 'view_profile', etc. + * @return a new instance of PermissionDescription + */ + public static function fromGlobalPermission($permname) + { + + $result = null; + + $global_perms = Permissions::Perms(); + + if (array_key_exists($permname, $global_perms)) { + $channelPerm = PermissionLimits::Get(App::$channel['channel_id'], $permname); + + $result = new PermissionDescription('', $channelPerm); + } else { + // The acl dialog can handle null arguments, but it shouldn't happen + logger('null PermissionDescription from unknown global permission: ' . $permname, LOGGER_DEBUG, LOG_ERR); + } + + return $result; + } + + /** + * Gets a localized description of the permission, or a generic message if the permission + * is unknown. + * + * @return string description + */ + public function get_permission_description() + { + + switch ($this->channel_perm) { + case 0: + return t('Only me'); + case PERMS_PUBLIC: + return t('Public'); + case PERMS_NETWORK: + return t('Anybody in the $Projectname network'); + case PERMS_SITE: + return sprintf(t('Any account on %s'), App::get_hostname()); + case PERMS_CONTACTS: + return t('Any of my connections'); + case PERMS_SPECIFIC: + return t('Only connections I specifically allow'); + case PERMS_AUTHED: + return t('Anybody authenticated (could include visitors from other networks)'); + case PERMS_PENDING: + return t('Any connections including those who haven\'t yet been approved'); + default: + return $this->fallback_description; + } + } + + /** + * Returns an icon css class name if an appropriate one is available, e.g. "fa-globe" for Public, + * otherwise returns empty string. + * + * @return string icon css class name (often FontAwesome) + */ + public function get_permission_icon() + { + + switch ($this->channel_perm) { + case 0: + return 'fa-eye-slash'; + case PERMS_PUBLIC: + return 'fa-globe'; + case PERMS_NETWORK: + return 'fa-share-alt-square'; // fa-share-alt-square is very similiar to the hubzilla logo, but we should create our own logo class to use + case PERMS_SITE: + return 'fa-sitemap'; + case PERMS_CONTACTS: + return 'fa-group'; + case PERMS_SPECIFIC: + return 'fa-list'; + case PERMS_AUTHED: + return ''; + case PERMS_PENDING: + return ''; + default: + return ''; + } + } + + /** + * Returns a localized description of where the permission came from, if this is known. + * If it's not know, or if the permission is standalone and didn't come from a default + * permission setting, then empty string is returned. + * + * @return string description or empty string + */ + public function get_permission_origin_description() + { + + switch ($this->global_perm) { + case PERMS_R_STREAM: + return t('This is your default setting for the audience of your normal stream, and posts.'); + case PERMS_R_PROFILE: + return t('This is your default setting for who can view your default channel profile'); + case PERMS_R_ABOOK: + return t('This is your default setting for who can view your connections'); + case PERMS_R_STORAGE: + return t('This is your default setting for who can view your file storage and photos'); + case PERMS_R_PAGES: + return t('This is your default setting for the audience of your webpages'); + default: + return ''; + } + } +} diff --git a/Code/Lib/Queue.php b/Code/Lib/Queue.php new file mode 100644 index 000000000..273ba0231 --- /dev/null +++ b/Code/Lib/Queue.php @@ -0,0 +1,522 @@ + $base, + 'site_update' => datetime_convert(), + 'site_dead' => 0, + 'site_type' => ((in_array($outq['outq_driver'], ['post', 'activitypub'])) ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN), + 'site_crypto' => '' + ] + ); + } + } + + $arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate); + Hook::call('queue_deliver', $arr); + if ($arr['handled']) { + return; + } + + // "post" queue driver - used for diaspora and friendica-over-diaspora communications. + + if ($outq['outq_driver'] === 'post') { + $result = z_post_url($outq['outq_posturl'], $outq['outq_msg']); + if ($result['success'] && $result['return_code'] < 300) { + logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG); + if ($base) { + q( + "update site set site_update = '%s', site_dead = 0 where site_url = '%s' ", + dbesc(datetime_convert()), + dbesc($base) + ); + } + q( + "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'", + dbesc('accepted for delivery'), + dbesc(datetime_convert()), + dbesc($outq['outq_hash']) + ); + self::remove($outq['outq_hash']); + + // server is responding - see if anything else is going to this destination and is piled up + // and try to send some more. We're relying on the fact that do_delivery() results in an + // immediate delivery otherwise we could get into a queue loop. + + if (!$immediate) { + $x = q( + "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0", + dbesc($outq['outq_posturl']) + ); + + $piled_up = []; + if ($x) { + foreach ($x as $xx) { + $piled_up[] = $xx['outq_hash']; + } + } + if ($piled_up) { + // call do_delivery() with the force flag + do_delivery($piled_up, true); + } + } + } else { + logger('deliver: queue post returned ' . $result['return_code'] + . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG); + self::update($outq['outq_hash'], 10); + } + return; + } + + if ($outq['outq_driver'] === 'asfetch') { + $channel = Channel::from_id($outq['outq_channel']); + if (!$channel) { + logger('missing channel: ' . $outq['outq_channel']); + return; + } + + if (!ActivityStreams::is_url($outq['outq_posturl'])) { + logger('fetch item is not url: ' . $outq['outq_posturl']); + self::remove($outq['outq_hash']); + return; + } + + $j = Activity::fetch($outq['outq_posturl'], $channel); + if ($j) { + $AS = new ActivityStreams($j, null, true); + if ($AS->is_valid() && isset($AS->data['type'])) { + if (ActivityStreams::is_an_actor($AS->data['type'])) { + Activity::actor_store($AS->data['id'], $AS->data); + } + if (strpos($AS->data['type'], 'Collection') !== false) { + // we are probably fetching a collection already - and do not support collection recursion at this time + self::remove($outq['outq_hash']); + return; + } + $item = Activity::decode_note($AS, true); + if ($item) { + Activity::store($channel, $channel['channnel_hash'], $AS, $item, true, true); + } + } + logger('deliver: queue fetch success from ' . $outq['outq_posturl'], LOGGER_DEBUG); + self::remove($outq['outq_hash']); + + // server is responding - see if anything else is going to this destination and is piled up + // and try to send some more. We're relying on the fact that do_delivery() results in an + // immediate delivery otherwise we could get into a queue loop. + + if (!$immediate) { + $x = q( + "select outq_hash from outq where outq_driver = 'asfetch' and outq_channel = %d and outq_delivered = 0", + dbesc($outq['outq_channel']) + ); + + $piled_up = []; + if ($x) { + foreach ($x as $xx) { + $piled_up[] = $xx['outq_hash']; + } + } + if ($piled_up) { + do_delivery($piled_up, true); + } + } + } else { + logger('deliver: queue fetch failed' . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG); + self::update($outq['outq_hash'], 10); + } + return; + } + + if ($outq['outq_driver'] === 'activitypub') { + $channel = Channel::from_id($outq['outq_channel']); + if (!$channel) { + logger('missing channel: ' . $outq['outq_channel']); + return; + } + + + $retries = 0; + $m = parse_url($outq['outq_posturl']); + + $headers = []; + $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'; + $ret = $outq['outq_msg']; + logger('ActivityPub send: ' . jindent($ret), LOGGER_DATA); + $headers['Date'] = datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['Host'] = $m['host']; + $headers['(request-target)'] = 'post ' . get_request_string($outq['outq_posturl']); + + $xhead = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel)); + if (strpos($outq['outq_posturl'], 'http') !== 0) { + logger('bad url: ' . $outq['outq_posturl']); + self::remove($outq['outq_hash']); + } + + $result = z_post_url($outq['outq_posturl'], $outq['outq_msg'], $retries, ['headers' => $xhead]); + + if ($result['success'] && $result['return_code'] < 300) { + logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG); + if ($base) { + q( + "update site set site_update = '%s', site_dead = 0 where site_url = '%s' ", + dbesc(datetime_convert()), + dbesc($base) + ); + } + q( + "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'", + dbesc('accepted for delivery'), + dbesc(datetime_convert()), + dbesc($outq['outq_hash']) + ); + self::remove($outq['outq_hash']); + + // server is responding - see if anything else is going to this destination and is piled up + // and try to send some more. We're relying on the fact that do_delivery() results in an + // immediate delivery otherwise we could get into a queue loop. + + if (!$immediate) { + $x = q( + "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0", + dbesc($outq['outq_posturl']) + ); + + $piled_up = []; + if ($x) { + foreach ($x as $xx) { + $piled_up[] = $xx['outq_hash']; + } + } + if ($piled_up) { + do_delivery($piled_up, true); + } + } + } + elseif ($result['return_code'] >= 400 && $result['return_code'] < 500) { + q( + "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'", + dbesc('delivery rejected' . ' ' . $result['return_code']), + dbesc(datetime_convert()), + dbesc($outq['outq_hash']) + ); + self::remove($outq['outq_hash']); + + } + else { + $dr = q( + "select * from dreport where dreport_queue = '%s'", + dbesc($outq['outq_hash']) + ); + if ($dr) { + // update every queue entry going to this site with the most recent communication error + q( + "update dreport set dreport_log = '%s' where dreport_site = '%s'", + dbesc(z_curl_error($result)), + dbesc($dr[0]['dreport_site']) + ); + } + self::update($outq['outq_hash'], 10); + } + + logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG); + return; + } + + // normal zot delivery + + logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG); + + + if ($outq['outq_posturl'] === z_root() . '/zot') { + // local delivery + $zot = new Receiver(new Zot6Handler(), $outq['outq_notify']); + $result = $zot->run(); + logger('returned_json: ' . json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES), LOGGER_DATA); + logger('deliver: local zot delivery succeeded to ' . $outq['outq_posturl']); + Libzot::process_response($outq['outq_posturl'], ['success' => true, 'body' => json_encode($result)], $outq); + + if (!$immediate) { + $x = q( + "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0", + dbesc($outq['outq_posturl']) + ); + + $piled_up = []; + if ($x) { + foreach ($x as $xx) { + $piled_up[] = $xx['outq_hash']; + } + } + if ($piled_up) { + do_delivery($piled_up, true); + } + } + } else { + logger('remote'); + $channel = null; + + if ($outq['outq_channel']) { + $channel = Channel::from_id($outq['outq_channel'], true); + } + + $host_crypto = null; + + if ($channel && $base) { + $h = q( + "select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('zot6','nomad') order by hubloc_id desc limit 1", + dbesc($base) + ); + if ($h) { + $host_crypto = $h[0]; + } + } + + $msg = $outq['outq_notify']; + + if ($outq['outq_driver'] === 'nomad') { + $result = Libzot::nomad($outq['outq_posturl'],$msg,$channel,$host_crypto); + } + else { + $result = Libzot::zot($outq['outq_posturl'],$msg,$channel,$host_crypto); + } + + if ($result['success']) { + logger('deliver: remote nomad/zot delivery succeeded to ' . $outq['outq_posturl']); + Libzot::process_response($outq['outq_posturl'], $result, $outq); + } else { + $dr = q( + "select * from dreport where dreport_queue = '%s'", + dbesc($outq['outq_hash']) + ); + + // update every queue entry going to this site with the most recent communication error + q( + "update dreport set dreport_log = '%s' where dreport_site = '%s'", + dbesc(z_curl_error($result)), + dbesc($dr[0]['dreport_site']) + ); + + logger('deliver: remote nomad/zot delivery failed to ' . $outq['outq_posturl']); + logger('deliver: remote nomad/zot delivery fail data: ' . print_r($result, true), LOGGER_DATA); + self::update($outq['outq_hash'], 10); + } + } + return; + } +} diff --git a/Code/Lib/SConfig.php b/Code/Lib/SConfig.php new file mode 100644 index 000000000..09d65e4db --- /dev/null +++ b/Code/Lib/SConfig.php @@ -0,0 +1,33 @@ + false, 'message' => ''); + + $r = q( + "select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0 ", + intval($account_id) + ); + if (! ($r && count($r))) { + $ret['total_identities'] = 0; + $ret['message'] = t('Unable to obtain identity information from database'); + return $ret; + } + + $ret['total_identities'] = intval($r[0]['total']); + + if (! self::account_allows($account_id, 'total_identities', $r[0]['total'])) { + $ret['message'] .= self::upgrade_message(); + return $ret; + } + + $ret['success'] = true; + + return $ret; + } + + + + /** + * @brief Checks for accounts that have past their expiration date. + * + * If the account has a service class which is not the site default, + * the service class is reset to the site default and expiration reset to never. + * If the account has no service class it is expired and subsequently disabled. + * called from include/poller.php as a scheduled task. + * + * Reclaiming resources which are no longer within the service class limits is + * not the job of this function, but this can be implemented by plugin if desired. + * Default behaviour is to stop allowing additional resources to be consumed. + */ + public static function downgrade_accounts() + { + + $r = q( + "select * from account where not ( account_flags & %d ) > 0 + and account_expires > '%s' + and account_expires < %s ", + intval(ACCOUNT_EXPIRED), + dbesc(NULL_DATE), + db_getfunc('UTC_TIMESTAMP') + ); + + if (! $r) { + return; + } + + $basic = get_config('system', 'default_service_class'); + + foreach ($r as $rr) { + if (($basic) && ($rr['account_service_class']) && ($rr['account_service_class'] != $basic)) { + $x = q( + "UPDATE account set account_service_class = '%s', account_expires = '%s' + where account_id = %d", + dbesc($basic), + dbesc(NULL_DATE), + intval($rr['account_id']) + ); + $ret = [ 'account' => $rr ]; + Hook::call('account_downgrade', $ret); + logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' downgraded.'); + } else { + $x = q( + "UPDATE account SET account_flags = (account_flags | %d) where account_id = %d", + intval(ACCOUNT_EXPIRED), + intval($rr['account_id']) + ); + $ret = [ 'account' => $rr ]; + Hook::call('account_downgrade', $ret); + logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' expired.'); + } + } + } + + + /** + * @brief Check service_class restrictions. + * + * If there are no service_classes defined, everything is allowed. + * If $usage is supplied, we check against a maximum count and return true if + * the current usage is less than the subscriber plan allows. Otherwise we + * return boolean true or false if the property is allowed (or not) in this + * subscriber plan. An unset property for this service plan means the property + * is allowed, so it is only necessary to provide negative properties for each + * plan, or what the subscriber is not allowed to do. + * + * Like account_service_class_allows() but queries directly by account rather + * than channel. Service classes are set for accounts, so we look up the + * account for the channel and fetch the service class restrictions of the + * account. + * + * @see account_service_class_allows() if you have a channel_id already + * @see service_class_fetch() + * + * @param int $uid The channel_id to check + * @param string $property The service class property to check for + * @param string|bool $usage (optional) The value to check against + * @return bool + */ + public static function allows($uid, $property, $usage = false) + { + $limit = self::fetch($uid, $property); + + if ($limit === false) { + return true; // No service class set => everything is allowed + } + + $limit = engr_units_to_bytes($limit); + if ($usage === false) { + // We use negative values for not allowed properties in a subscriber plan + return (($limit) ? (bool) $limit : true); + } else { + return (((intval($usage)) < intval($limit)) ? true : false); + } + } + + /** + * @brief Check service class restrictions by account. + * + * If there are no service_classes defined, everything is allowed. + * If $usage is supplied, we check against a maximum count and return true if + * the current usage is less than the subscriber plan allows. Otherwise we + * return boolean true or false if the property is allowed (or not) in this + * subscriber plan. An unset property for this service plan means the property + * is allowed, so it is only necessary to provide negative properties for each + * plan, or what the subscriber is not allowed to do. + * + * Like service_class_allows() but queries directly by account rather than channel. + * + * @see service_class_allows() if you have a channel_id instead of an account_id + * @see account_service_class_fetch() + * + * @param int $aid The account_id to check + * @param string $property The service class property to check for + * @param int|bool $usage (optional) The value to check against + * @return bool + */ + public static function account_allows($aid, $property, $usage = false) + { + + $limit = self::account_fetch($aid, $property); + + if ($limit === false) { + return true; // No service class is set => everything is allowed + } + + $limit = engr_units_to_bytes($limit); + + if ($usage === false) { + // We use negative values for not allowed properties in a subscriber plan + return (($limit) ? (bool) $limit : true); + } else { + return (((intval($usage)) < intval($limit)) ? true : false); + } + } + + /** + * @brief Queries a service class value for a channel and property. + * + * Service classes are set for accounts, so look up the account for this channel + * and fetch the service classe of the account. + * + * If no service class is available it returns false and everything should be + * allowed. + * + * @see account_service_class_fetch() + * + * @param int $uid The channel_id to query + * @param string $property The service property name to check for + * @return bool|int + * + * @todo Should we merge this with account_service_class_fetch()? + */ + public static function fetch($uid, $property) + { + + + if ($uid == local_channel()) { + $service_class = App::$account['account_service_class']; + } else { + $r = q( + "select account_service_class + from channel c, account a + where c.channel_account_id = a.account_id and c.channel_id = %d limit 1", + intval($uid) + ); + if ($r) { + $service_class = $r[0]['account_service_class']; + } + } + if (! $service_class) { + return false; // everything is allowed + } + $arr = get_config('service_class', $service_class); + + if (! is_array($arr) || (! count($arr))) { + return false; + } + + return((array_key_exists($property, $arr)) ? $arr[$property] : false); + } + + /** + * @brief Queries a service class value for an account and property. + * + * Like service_class_fetch() but queries by account rather than channel. + * + * @see service_class_fetch() if you have channel_id. + * @see account_service_class_allows() + * + * @param int $aid The account_id to query + * @param string $property The service property name to check for + * @return bool|int + */ + public static function account_fetch($aid, $property) + { + + $r = q( + "select account_service_class as service_class from account where account_id = %d limit 1", + intval($aid) + ); + if ($r !== false && count($r)) { + $service_class = $r[0]['service_class']; + } + + if (! x($service_class)) { + return false; // everything is allowed + } + + $arr = get_config('service_class', $service_class); + + if (! is_array($arr) || (! count($arr))) { + return false; + } + + return((array_key_exists($property, $arr)) ? $arr[$property] : false); + } + + + public static function upgrade_link($bbcode = false) + { + $l = get_config('service_class', 'upgrade_link'); + if (! $l) { + return ''; + } + if ($bbcode) { + $t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l); + } else { + $t = sprintf('' . t('Click here to upgrade.') . '', $l); + } + return $t; + } + + public static function upgrade_message($bbcode = false) + { + $x = self::upgrade_link($bbcode); + return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ; + } + + public static function upgrade_bool_message($bbcode = false) + { + $x = self::upgrade_link($bbcode); + return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ; + } +} diff --git a/Code/Lib/Share.php b/Code/Lib/Share.php new file mode 100644 index 000000000..0641373c4 --- /dev/null +++ b/Code/Lib/Share.php @@ -0,0 +1,249 @@ +item = $post_id; + return; + } + + if (! (local_channel() || remote_channel())) { + return; + } + + $r = q( + "SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1", + intval($post_id) + ); + if (! $r) { + return; + } + + if (($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) { + return; + } + + $sql_extra = item_permissions_sql($r[0]['uid']); + + $r = q( + "select * from item where id = %d $sql_extra", + intval($post_id) + ); + if (! $r) { + return; + } + + if (! in_array($r[0]['mimetype'], [ 'text/bbcode', 'text/x-multicode' ])) { + return; + } + + /** @FIXME eventually we want to post remotely via rpost on your home site */ + // When that works remove this next bit: + + if (! local_channel()) { + return; + } + + xchan_query($r); + + $this->item = array_shift($r); + + $arr = []; + + $owner_uid = $this->item['uid']; + $owner_aid = $this->item['aid']; + + $channel = Channel::from_id($this->item['uid']); + $observer = App::get_observer(); + + $can_comment = false; + if ((array_key_exists('owner', $this->item)) && intval($this->item['owner']['abook_self'])) { + $can_comment = perm_is_allowed($this->item['uid'], $observer['xchan_hash'], 'post_comments'); + } else { + $can_comment = can_comment_on_post($observer['xchan_hash'], $this->item); + } + + if (! $can_comment) { + return; + } + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($this->item['owner_xchan']) + ); + + if ($r) { + $thread_owner = array_shift($r); + } else { + return; + } + + $r = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($this->item['author_xchan']) + ); + if ($r) { + $item_author = array_shift($r); + } else { + return; + } + + if (! $this->attach) { + $this->attach = []; + } + + $this->attach[] = [ + 'href' => $this->item['mid'], + 'type' => 'application/activity+json', + 'title' => $this->item['mid'] + ]; + + if ($item_author['network'] === 'activitypub') { + // for Mastodon compatibility, send back an ActivityPub Announce activity. + // We don't need or want these on our own network as there is no mechanism for providing + // a fair-use defense to copyright claims and frivolous lawsuits. + + $arr['aid'] = $owner_aid; + $arr['uid'] = $owner_uid; + + $arr['item_origin'] = 1; + $arr['item_wall'] = $this->item['item_wall']; + $arr['uuid'] = new_uuid(); + $arr['mid'] = z_root() . '/item/' . $arr['uuid']; + $arr['mid'] = str_replace('/item/', '/activity/', $arr['mid']); + $arr['parent_mid'] = $this->item['mid']; + + $mention = '@[zrl=' . $this->item['author']['xchan_url'] . ']' . $this->item['author']['xchan_name'] . '[/zrl]'; + $arr['body'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $this->item['obj_type']); + + $arr['author_xchan'] = $observer['xchan_hash']; + $arr['owner_xchan'] = $this->item['author_xchan']; + $arr['obj'] = $this->item['obj']; + $arr['obj_type'] = $this->item['obj_type']; + $arr['verb'] = 'Announce'; + + $post = item_store($arr); + + $post_id = $post['item_id']; + + $arr['id'] = $post_id; + + Hook::call('post_local_end', $arr); + + $r = q( + "select * from item where id = %d", + intval($post_id) + ); + if ($r) { + xchan_query($r); + $sync_item = fetch_post_tags($r); + Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]); + } + + Run::Summon([ 'Notifier','like',$post_id ]); + } + + return; + } + + public function obj() + { + $obj = []; + + if (! $this->item) { + return $obj; + } + + $obj['type'] = $this->item['obj_type']; + $obj['id'] = $this->item['mid']; + $obj['content'] = bbcode($this->item['body']); + $obj['source'] = [ + 'mediaType' => $this->item['mimetype'], + 'content' => $this->item['body'] + ]; + + $obj['name'] = $this->item['title']; + $obj['published'] = $this->item['created']; + $obj['updated'] = $this->item['edited']; + $obj['attributedTo'] = ((strpos($this->item['author']['xchan_hash'], 'http') === 0) + ? $this->item['author']['xchan_hash'] + : $this->item['author']['xchan_url']); + + return $obj; + } + + public function get_attach() + { + return $this->attach; + } + + public function bbcode() + { + $bb = EMPTY_STR; + + if (! $this->item) { + return $bb; + } + + if (! $this->item['author']) { + $author = q( + "select * from xchan where xchan_hash = '%s' limit 1", + dbesc($this->item['author_xchan']) + ); + if ($author) { + $this->item['author'] = array_shift($author); + } + } + + $special_object = (in_array($this->item['obj_type'], [ ACTIVITY_OBJ_PHOTO, 'Event', 'Question' ]) ? true : false); + if ($special_object) { + $object = json_decode($this->item['obj'], true); + $special = (($object['source']) ? $object['source']['content'] : $object['body']); + } + + if (strpos($this->item['body'], "[/share]") !== false) { + $pos = strpos($this->item['body'], "[share"); + $bb = substr($this->item['body'], $pos); + } else { + $bb = "[share author='" . urlencode($this->item['author']['xchan_name']) . + "' profile='" . $this->item['author']['xchan_url'] . + "' portable_id='" . $this->item['author']['xchan_hash'] . + "' avatar='" . $this->item['author']['xchan_photo_s'] . + "' link='" . $this->item['plink'] . + "' auth='" . (in_array($this->item['author']['network'],['nomad','zot6']) ? 'true' : 'false') . + "' posted='" . $this->item['created'] . + "' message_id='" . $this->item['mid'] . + "']"; + if ($this->item['title']) { + $bb .= '[b]' . $this->item['title'] . '[/b]' . "\r\n"; + } + if ($this->item['summary']) { + $bb .= $this->item['summary'] . "\r\n"; + } + + $bb .= (($special_object) ? $special . "\r\n" . $this->item['body'] : $this->item['body']); + $bb .= "[/share]"; + } + + return $bb; + } +} diff --git a/Code/Lib/Socgraph.php b/Code/Lib/Socgraph.php new file mode 100644 index 000000000..293f49ed7 --- /dev/null +++ b/Code/Lib/Socgraph.php @@ -0,0 +1,696 @@ + $max) { + break; + } + } + logger("poco_load: loaded $total entries", LOGGER_DEBUG); + + q( + "delete from xlink where xlink_xchan = '%s' and xlink_updated < %s - INTERVAL %s and xlink_static = 0", + dbesc($xchan), + db_utcnow(), + db_quoteinterval('7 DAY') + ); + } + + + + + public static function ap_poco_load($xchan) + { + + $max = intval(get_config('system', 'max_imported_follow', MAX_IMPORTED_FOLLOW)); + if (! intval($max)) { + return; + } + + + if ($xchan) { + $cl = get_xconfig($xchan, 'activitypub', 'collections'); + if (is_array($cl) && $cl) { + $url = ((array_key_exists('following', $cl)) ? $cl['following'] : ''); + } else { + return false; + } + } + + if (! $url) { + logger('ap_poco_load: no url'); + return; + } + + $obj = new ASCollection($url, '', 0, $max); + + $friends = $obj->get(); + + if (! $friends) { + return; + } + + foreach ($friends as $entry) { + $hash = EMPTY_STR; + + $x = q( + "select xchan_hash from xchan where (xchan_hash = '%s' or xchan_url = '%s') order by xchan_network desc limit 1", + dbesc($entry), + dbesc($entry) + ); + + + if ($x) { + $hash = $x[0]['xchan_hash']; + } else { + // We've never seen this person before. Import them. + + $wf = discover_by_webbie($entry); + if ($wf) { + $x = q( + "select xchan_hash from xchan where (xchan_hash = '%s' or xchan_url = '%s') order by xchan_network desc limit 1", + dbesc($wf), + dbesc($wf) + ); + if ($x) { + $hash = $x[0]['xchan_hash']; + } + } + } + + if (! $hash) { + continue; + } + + $total++; + + $r = q( + "select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 0 limit 1", + dbesc($xchan), + dbesc($hash) + ); + + if (! $r) { + q( + "insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 0 ) ", + dbesc($xchan), + dbesc($hash), + intval(0), + dbesc(''), + dbesc(''), + dbesc(datetime_convert()) + ); + } else { + q( + "update xlink set xlink_updated = '%s' where xlink_id = %d", + dbesc(datetime_convert()), + intval($r[0]['xlink_id']) + ); + } + } + + logger("ap_poco_load: loaded $total entries", LOGGER_DEBUG); + + q( + "delete from xlink where xlink_xchan = '%s' and xlink_updated < %s - INTERVAL %s and xlink_static = 0", + dbesc($xchan), + db_utcnow(), + db_quoteinterval('7 DAY') + ); + + return true; + } + + + public static function count_common_friends($uid, $xchan) + { + + $r = q( + "SELECT count(xlink_id) as total from xlink where xlink_xchan = '%s' and xlink_static = 0 and xlink_link in + (select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_self = 0 )", + dbesc($xchan), + dbesc($xchan), + intval($uid) + ); + + if ($r) { + return $r[0]['total']; + } + return 0; + } + + + public static function common_friends($uid, $xchan, $start = 0, $limit = 100000000, $shuffle = false) + { + + $rand = db_getfunc('rand'); + if ($shuffle) { + $sql_extra = " order by $rand "; + } else { + $sql_extra = " order by xchan_name asc "; + } + + $r = q( + "SELECT * from xchan left join xlink on xlink_link = xchan_hash where xlink_xchan = '%s' and xlink_static = 0 and xlink_link in + (select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_self = 0 ) $sql_extra limit %d offset %d", + dbesc($xchan), + dbesc($xchan), + intval($uid), + intval($limit), + intval($start) + ); + + return $r; + } + + + public static function suggestion_query($uid, $myxchan, $start = 0, $limit = 120) + { + + if ((! $uid) || (! $myxchan)) { + return []; + } + + $r1 = q( + "SELECT count(xlink_xchan) as total, xchan.* from xchan + left join xlink on xlink_link = xchan_hash + where xlink_xchan in ( select abook_xchan from abook where abook_channel = %d ) + and not xlink_link in ( select abook_xchan from abook where abook_channel = %d ) + and not xlink_link in ( select xchan from xign where uid = %d ) + and xlink_xchan != '' + and xchan_hidden = 0 + and xchan_deleted = 0 + and xlink_static = 0 + group by xchan_hash order by total desc limit %d offset %d ", + intval($uid), + intval($uid), + intval($uid), + intval($limit), + intval($start) + ); + + if (! $r1) { + $r1 = []; + } + + $r2 = q( + "SELECT count(xtag_hash) as total, xchan.* from xchan + left join xtag on xtag_hash = xchan_hash + where xtag_hash != '%s' + and not xtag_hash in ( select abook_xchan from abook where abook_channel = %d ) + and xtag_term in ( select xtag_term from xtag where xtag_hash = '%s' ) + and not xtag_hash in ( select xchan from xign where uid = %d ) + and xchan_hidden = 0 + and xchan_deleted = 0 + group by xchan_hash order by total desc limit %d offset %d ", + dbesc($myxchan), + intval($uid), + dbesc($myxchan), + intval($uid), + intval($limit), + intval($start) + ); + + if (! $r2) { + $r2 = []; + } + + foreach ($r2 as $r) { + $found = false; + for ($x = 0; $x < count($r1); $x++) { + if ($r['xchan_hash'] === $r1[$x]['xchan_hash']) { + $r1[$x]['total'] = intval($r1[$x]['total']) + intval($r['total']); + $found = true; + continue; + } + } + if (! $found) { + $r1[] = $r; + } + } + + usort($r1, 'self::socgraph_total_sort'); + return ($r1); + } + + public static function socgraph_total_sort($a, $b) + { + if ($a['total'] === $b['total']) { + return 0; + } + + return((intval($a['total']) < intval($b['total'])) ? 1 : -1 ); + } + + + public static function poco() + { + + $system_mode = false; + + if (observer_prohibited()) { + logger('mod_poco: block_public'); + http_status_exit(401); + } + + $observer = App::get_observer(); + + if (argc() > 1) { + $user = notags(trim(argv(1))); + } + if (! (isset($user) && $user)) { + $c = q("select * from pconfig where cat = 'system' and k = 'suggestme' and v = '1'"); + if (! $c) { + logger('mod_poco: system mode. No candidates.', LOGGER_DEBUG); + http_status_exit(404); + } + $system_mode = true; + } + + $format = ((isset($_REQUEST['format']) && $_REQUEST['format']) ? $_REQUEST['format'] : 'json'); + + $justme = false; + + if (argc() > 2 && argv(2) === '@me') { + $justme = true; + } + if (argc() > 3) { + if (argv(3) === '@all') { + $justme = false; + } elseif (argv(3) === '@self') { + $justme = true; + } + } + if (argc() > 4 && intval(argv(4)) && $justme == false) { + $cid = intval(argv(4)); + } + + if (! $system_mode) { + $r = q( + "SELECT channel_id from channel where channel_address = '%s' limit 1", + dbesc($user) + ); + if (! $r) { + logger('mod_poco: user mode. Account not found. ' . $user); + http_status_exit(404); + } + + $channel_id = $r[0]['channel_id']; + $ohash = (($observer) ? $observer['xchan_hash'] : ''); + + if (! perm_is_allowed($channel_id, $ohash, 'view_contacts')) { + logger('mod_poco: user mode. Permission denied for ' . $ohash . ' user: ' . $user); + http_status_exit(401); + } + } + + if (isset($justme) && $justme) { + $sql_extra = " and abook_self = 1 "; + } else { + $sql_extra = " and abook_self = 0 "; + } + + if (isset($cid) && $cid) { + $sql_extra = sprintf(" and abook_id = %d and abook_archived = 0 and abook_hidden = 0 and abook_pending = 0 ", intval($cid)); + } + + if (isset($system_mode) && $system_mode) { + $r = q("SELECT count(*) as total from abook where abook_self = 1 + and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') "); + } else { + $r = q( + "SELECT count(*) as total from abook where abook_channel = %d + $sql_extra ", + intval($channel_id) + ); + $rooms = q( + "select * from menu_item where ( mitem_flags & " . intval(MENU_ITEM_CHATROOM) . " ) > 0 and allow_cid = '' and allow_gid = '' and deny_cid = '' and deny_gid = '' and mitem_channel_id = %d", + intval($channel_id) + ); + } + if ($r) { + $totalResults = intval($r[0]['total']); + } else { + $totalResults = 0; + } + + $startIndex = ((isset($_GET['startIndex'])) ? intval($_GET['startIndex']) : 0); + if ($startIndex < 0) { + $startIndex = 0; + } + + $itemsPerPage = ((isset($_GET['count']) && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults); + + if ($system_mode) { + $r = q( + "SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_self = 1 + and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') + limit %d offset %d ", + intval($itemsPerPage), + intval($startIndex) + ); + } else { + $r = q( + "SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d + $sql_extra LIMIT %d OFFSET %d", + intval($channel_id), + intval($itemsPerPage), + intval($startIndex) + ); + } + + $ret = []; + if (x($_GET, 'sorted')) { + $ret['sorted'] = 'false'; + } + if (x($_GET, 'filtered')) { + $ret['filtered'] = 'false'; + } + if (x($_GET, 'updatedSince')) { + $ret['updateSince'] = 'false'; + } + + $ret['startIndex'] = (string) $startIndex; + $ret['itemsPerPage'] = (string) $itemsPerPage; + $ret['totalResults'] = (string) $totalResults; + + if ($rooms) { + $ret['chatrooms'] = []; + foreach ($rooms as $room) { + $ret['chatrooms'][] = array('url' => $room['mitem_link'], 'desc' => $room['mitem_desc']); + } + } + + $ret['entry'] = []; + + $fields_ret = array( + 'id' => false, + 'guid' => false, + 'guid_sig' => false, + 'hash' => false, + 'displayName' => false, + 'urls' => false, + 'preferredUsername' => false, + 'photos' => false, + 'rating' => false + ); + + if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) { + foreach ($fields_ret as $k => $v) { + $fields_ret[$k] = true; + } + } else { + $fields_req = explode(',', $_GET['fields']); + foreach ($fields_req as $f) { + $fields_ret[trim($f)] = true; + } + } + + if (is_array($r)) { + if (count($r)) { + foreach ($r as $rr) { + $entry = []; + if ($fields_ret['id']) { + $entry['id'] = $rr['abook_id']; + } + if ($fields_ret['guid']) { + $entry['guid'] = $rr['xchan_guid']; + } + if ($fields_ret['guid_sig']) { + $entry['guid_sig'] = $rr['xchan_guid_sig']; + } + if ($fields_ret['hash']) { + $entry['hash'] = $rr['xchan_hash']; + } + + if ($fields_ret['displayName']) { + $entry['displayName'] = $rr['xchan_name']; + } + if ($fields_ret['urls']) { + $entry['urls'] = array(array('value' => $rr['xchan_url'], 'type' => 'profile')); + $network = $rr['xchan_network']; + if ($rr['xchan_addr']) { + $entry['urls'][] = array('value' => 'acct:' . $rr['xchan_addr'], 'type' => $network); + } + } + if ($fields_ret['preferredUsername']) { + $entry['preferredUsername'] = substr($rr['xchan_addr'], 0, strpos($rr['xchan_addr'], '@')); + } + if ($fields_ret['photos']) { + $entry['photos'] = array(array('value' => $rr['xchan_photo_l'], 'mimetype' => $rr['xchan_photo_mimetype'], 'type' => 'profile')); + } + $ret['entry'][] = $entry; + } + } else { + $ret['entry'][] = []; + } + } else { + http_status_exit(500); + } + + if ($format === 'xml') { + header('Content-type: text/xml'); + echo replace_macros(Theme::get_template('poco_xml.tpl'), array_xmlify(array('$response' => $ret))); + http_status_exit(500); + } + if ($format === 'json') { + header('Content-type: application/json'); + echo json_encode($ret); + killme(); + } else { + http_status_exit(500); + } + } + +} \ No newline at end of file diff --git a/Code/Lib/Statistics.php b/Code/Lib/Statistics.php new file mode 100644 index 000000000..cde30dde6 --- /dev/null +++ b/Code/Lib/Statistics.php @@ -0,0 +1,62 @@ + %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('6 MONTH') + ); + $total = ($r) ? count($r) : 0; + Config::Set('system', 'channels_active_halfyear_stat', $total); + return $total; + } + + function get_channels_1mo() + { + $r = q( + "select channel_id from channel left join account on account_id = channel_account_id + where account_flags = 0 and channel_active > %s - INTERVAL %s", + db_utcnow(), + db_quoteinterval('1 MONTH') + ); + $total = ($r) ? count($r) : 0; + Config::Set('system', 'channels_active_monthly_stat', $total); + return $total; + } + + function get_posts() + { + $posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 and id = parent"); + $total = ($posts) ? intval($posts[0]['local_posts']) : 0; + Config::Set('system', 'local_posts_stat', $total); + return $total; + } + + function get_comments() + { + $posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 and id != parent"); + $total = ($posts) ? intval($posts[0]['local_posts']) : 0; + Config::Set('system', 'local_comments_stat', $total); + return $total; + } + +} diff --git a/Code/Lib/Stringsjs.php b/Code/Lib/Stringsjs.php new file mode 100644 index 000000000..7ec6cb5a2 --- /dev/null +++ b/Code/Lib/Stringsjs.php @@ -0,0 +1,129 @@ + '/images/' . PLATFORM_NAME . '-64.png', + '$delitem' => t('Delete this item?'), + '$comment' => t('Comment'), + '$showmore' => sprintf(t('%s show all'), ''), + '$showfewer' => sprintf(t('%s show less'), ''), + '$divgrowmore' => sprintf(t('%s expand'), ''), + '$divgrowless' => sprintf(t('%s collapse'), ''), + '$pwshort' => t("Password too short"), + '$pwnomatch' => t("Passwords do not match"), + '$everybody' => t('everybody'), + '$passphrase' => t('Secret Passphrase'), + '$passhint' => t('Passphrase hint'), + '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'), + '$closeAll' => t('close all'), + '$nothingnew' => t('Nothing new here'), + '$rating_desc' => t('Rate This Channel (this is public)'), + '$rating_val' => t('Rating'), + '$rating_text' => t('Describe (optional)'), + '$submit' => t('Submit'), + '$linkurl' => t('Please enter a link URL'), + '$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'), + '$location' => t('Location'), + '$lovely' => t('lovely'), + '$wonderful' => t('wonderful'), + '$fantastic' => t('fantastic'), + '$great' => t('great'), + '$nick_invld1' => t('Your chosen nickname was either already taken or not valid. Please use our suggestion ('), + '$nick_invld2' => t(') or enter a new one.'), + '$nick_valid' => t('Thank you, this nickname is valid.'), + '$name_empty' => t('A channel name is required.'), + '$name_ok1' => t('This is a '), + '$name_ok2' => t(' channel name'), + '$pinned' => t('Pinned'), + '$pin_item' => t('Pin this post'), + '$unpin_item' => t('Unpin this post'), + '$tos' => t('Please accept terms to continue'), + + // translatable prefix and suffix strings for jquery.timeago - + // using the defaults set below if left untranslated, empty strings if + // translated to "NONE" and the corresponding language strings + // if translated to anything else + '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), + '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), + '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), + '$t04' => ((t('timeago.suffixFromNow') == 'timeago.suffixFromNow') ? 'from now' : ((t('timeago.suffixFromNow') == 'NONE') ? '' : t('timeago.suffixFromNow'))), + + // translatable main strings for jquery.timeago + '$t05' => t('less than a minute'), + '$t06' => t('about a minute'), + '$t07' => t('%d minutes'), + '$t08' => t('about an hour'), + '$t09' => t('about %d hours'), + '$t10' => t('a day'), + '$t11' => t('%d days'), + '$t12' => t('about a month'), + '$t13' => t('%d months'), + '$t14' => t('about a year'), + '$t15' => t('%d years'), + '$t16' => t(' '), // wordSeparator + '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'), + + '$January' => t('January'), + '$February' => t('February'), + '$March' => t('March'), + '$April' => t('April'), + '$May' => t('May', 'long'), + '$June' => t('June'), + '$July' => t('July'), + '$August' => t('August'), + '$September' => t('September'), + '$October' => t('October'), + '$November' => t('November'), + '$December' => t('December'), + '$Jan' => t('Jan'), + '$Feb' => t('Feb'), + '$Mar' => t('Mar'), + '$Apr' => t('Apr'), + '$MayShort' => t('May', 'short'), + '$Jun' => t('Jun'), + '$Jul' => t('Jul'), + '$Aug' => t('Aug'), + '$Sep' => t('Sep'), + '$Oct' => t('Oct'), + '$Nov' => t('Nov'), + '$Dec' => t('Dec'), + '$Sunday' => t('Sunday'), + '$Monday' => t('Monday'), + '$Tuesday' => t('Tuesday'), + '$Wednesday' => t('Wednesday'), + '$Thursday' => t('Thursday'), + '$Friday' => t('Friday'), + '$Saturday' => t('Saturday'), + '$Sun' => t('Sun'), + '$Mon' => t('Mon'), + '$Tue' => t('Tue'), + '$Wed' => t('Wed'), + '$Thu' => t('Thu'), + '$Fri' => t('Fri'), + '$Sat' => t('Sat'), + '$today' => t('today', 'calendar'), + '$month' => t('month', 'calendar'), + '$week' => t('week', 'calendar'), + '$day' => t('day', 'calendar'), + '$allday' => t('All day', 'calendar'), + '$channel_social' => t('A social networking profile that is public by default and private if desired'), + '$channel_social_restricted' => t('A social networking profile where content is private to your [Friends] Access List by default but can be made public if desired'), + '$channel_forum' => t('A public group where members are allowed to upload media by default'), + '$channel_forum_restricted' => t('A private group with no upload permission'), + '$channel_forum_moderated' => t('A public group where posts are moderated by the owner. The [moderated] permission may be removed from any group member once trust is established'), + '$channel_collection' => t('A sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'), + '$channel_collection_restricted' => t('A private sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'), + )); + } + + + +} \ No newline at end of file diff --git a/Code/Lib/SvgSanitizer.php b/Code/Lib/SvgSanitizer.php new file mode 100644 index 000000000..2ad2b6676 --- /dev/null +++ b/Code/Lib/SvgSanitizer.php @@ -0,0 +1,160 @@ + ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'href', 'xlink:href', 'xlink:title'], + 'circle' => ['class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'r', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'], + 'clipPath' => ['class', 'clipPathUnits', 'id'], + 'defs' => [], + 'style' => ['type'], + 'desc' => [], + 'ellipse' => ['class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'], + 'feGaussianBlur' => ['class', 'color-interpolation-filters', 'id', 'requiredFeatures', 'stdDeviation'], + 'filter' => ['class', 'color-interpolation-filters', 'filterRes', 'filterUnits', 'height', 'id', 'primitiveUnits', 'requiredFeatures', 'width', 'x', 'xlink:href', 'y'], + 'foreignObject' => ['class', 'font-size', 'height', 'id', 'opacity', 'requiredFeatures', 'style', 'transform', 'width', 'x', 'y'], + 'g' => ['class', 'clip-path', 'clip-rule', 'id', 'display', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'font-family', 'font-size', 'font-style', 'font-weight', 'text-anchor'], + 'image' => ['class', 'clip-path', 'clip-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'style', 'systemLanguage', 'transform', 'width', 'x', 'xlink:href', 'xlink:title', 'y'], + 'line' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'x1', 'x2', 'y1', 'y2'], + 'linearGradient' => ['class', 'id', 'gradientTransform', 'gradientUnits', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'x1', 'x2', 'xlink:href', 'y1', 'y2'], + 'marker' => ['id', 'class', 'markerHeight', 'markerUnits', 'markerWidth', 'orient', 'preserveAspectRatio', 'refX', 'refY', 'systemLanguage', 'viewBox'], + 'mask' => ['class', 'height', 'id', 'maskContentUnits', 'maskUnits', 'width', 'x', 'y'], + 'metadata' => ['class', 'id'], + 'path' => ['class', 'clip-path', 'clip-rule', 'd', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'], + 'pattern' => ['class', 'height', 'id', 'patternContentUnits', 'patternTransform', 'patternUnits', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xlink:href', 'y'], + 'polygon' => ['class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'], + 'polyline' => ['class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'], + 'radialGradient' => ['class', 'cx', 'cy', 'fx', 'fy', 'gradientTransform', 'gradientUnits', 'id', 'r', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'xlink:href'], + 'rect' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'width', 'x', 'y'], + 'stop' => ['class', 'id', 'offset', 'requiredFeatures', 'stop-color', 'stop-opacity', 'style', 'systemLanguage'], + 'svg' => ['class', 'clip-path', 'clip-rule', 'filter', 'id', 'height', 'mask', 'preserveAspectRatio', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xmlns', 'xmlns:se', 'xmlns:xlink', 'y'], + 'switch' => ['class', 'id', 'requiredFeatures', 'systemLanguage'], + 'symbol' => ['class', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'opacity', 'preserveAspectRatio', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'viewBox'], + 'text' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'transform', 'x', 'xml:space', 'y'], + 'textPath' => ['class', 'id', 'method', 'requiredFeatures', 'spacing', 'startOffset', 'style', 'systemLanguage', 'transform', 'xlink:href'], + 'title' => [], + 'tspan' => ['class', 'clip-path', 'clip-rule', 'dx', 'dy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'rotate', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'textLength', 'transform', 'x', 'xml:space', 'y'], + 'use' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'transform', 'width', 'x', 'xlink:href', 'y'], + ]; + + public function __construct() + { + $this->xmlDoc = new DOMDocument('1.0', 'UTF-8'); + $this->xmlDoc->preserveWhiteSpace = false; + libxml_use_internal_errors(true); + } + + // load XML SVG + public function load($file) + { + $this->xmlDoc->load($file); + } + + public function loadXML($str) + { + if (!$str) { + logger('loadxml: empty input', LOGGER_DEBUG); + return false; + } + if (!$this->xmlDoc->loadXML($str)) { + logger('loadxml: ' . print_r(array_slice(libxml_get_errors(), 0, Config::Get('system', 'svg_backtrace_limit', 3)), true), LOGGER_DEBUG); + return false; + } + return true; + } + + public function sanitize() + { + // all elements in xml doc + $allElements = $this->xmlDoc->getElementsByTagName('*'); + + // loop through all elements + for ($i = 0; $i < $allElements->length; $i++) { + $this->removedattrs = []; + + $currentNode = $allElements->item($i); + + // logger('current_node: ' . print_r($currentNode,true)); + + // array of allowed attributes in specific element + $allowlist_attr_arr = self::$allowlist[$currentNode->tagName]; + + // does element exist in allowlist? + if (isset($allowlist_attr_arr)) { + $total = $currentNode->attributes->length; + + for ($x = 0; $x < $total; $x++) { + // get attributes name + $attrName = $currentNode->attributes->item($x)->nodeName; + + // logger('checking: ' . print_r($currentNode->attributes->item($x),true)); + $matches = false; + + // check if attribute isn't in allowlist + if (!in_array($attrName, $allowlist_attr_arr)) { + $this->removedattrs[] = $attrName; + } // check for disallowed functions + elseif ( + preg_match_all( + '/([a-zA-Z0-9]+)[\s]*\(/', + $currentNode->attributes->item($x)->textContent, + $matches, + PREG_SET_ORDER + ) + ) { + if ($attrName === 'text') { + continue; + } + foreach ($matches as $match) { + if (!in_array($match[1], self::$allowed_functions)) { + logger('queue_remove_function: ' . $match[1], LOGGER_DEBUG); + $this->removedattrs[] = $attrName; + } + } + } + } + if ($this->removedattrs) { + foreach ($this->removedattrs as $attr) { + $currentNode->removeAttribute($attr); + logger('removed: ' . $attr, LOGGER_DEBUG); + } + } + } // else remove element + else { + logger('remove_node: ' . print_r($currentNode, true)); + $currentNode->parentNode->removeChild($currentNode); + } + } + return true; + } + + public function saveSVG() + { + $this->xmlDoc->formatOutput = true; + return ($this->xmlDoc->saveXML()); + } +} diff --git a/Code/Lib/System.php b/Code/Lib/System.php new file mode 100644 index 000000000..cb3f2922b --- /dev/null +++ b/Code/Lib/System.php @@ -0,0 +1,170 @@ + ZOT_REVISION ]; + Hook::call('zot_revision', $x); + return $x['revision']; + } + + public static function get_std_version() + { + if (defined('STD_VERSION')) { + return STD_VERSION; + } + return '0.0.0'; + } + + public static function compatible_project($p) + { + + if (in_array(strtolower($p), ['hubzilla', 'zap', 'red', 'misty', 'mistpark', 'redmatrix', 'osada', 'roadhouse','streams'])) { + return true; + } + return false; + } +} diff --git a/Code/Lib/ThreadItem.php b/Code/Lib/ThreadItem.php new file mode 100644 index 000000000..6356393eb --- /dev/null +++ b/Code/Lib/ThreadItem.php @@ -0,0 +1,1081 @@ +data = $data; + $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); + $this->threaded = get_config('system', 'thread_allow', true); + + $observer = App::get_observer(); + + // Prepare the children + if ($data['children']) { + foreach ($data['children'] as $item) { + /* + * Only add those that will be displayed + */ + + if (! visible_activity($item)) { + continue; + } + + // this is a quick hack to hide ActivityPub DMs that we should not be allowed to see + // but may have been forwarded as part of a conversation + + if (intval($item['item_private']) && (intval($item['item_restrict']) & 1 ) && $item['mid'] !== $item['parent_mid']) { + if (! $observer) { + continue; + } + } + + $child = new ThreadItem($item); + $this->add_child($child); + } + } + + // allow a site to configure the order and content of the reaction emoji list + if ($this->toplevel) { + $x = get_config('system', 'reactions'); + if ($x && is_array($x) && count($x)) { + $this->reactions = $x; + } + } + } + + /** + * Get data in a form usable by a conversation template + * + * Returns: + * _ The data requested on success + * _ false on failure + */ + + public function get_template_data($conv_responses, $thread_level = 1) + { + + $result = []; + + $item = $this->get_data(); + + $commentww = ''; + $sparkle = ''; + $buttons = ''; + $dropping = false; + $star = false; + $isstarred = "unstarred fa-star-o"; + $is_comment = false; + $is_item = false; + $osparkle = ''; + $total_children = $this->count_descendants(); + $unseen_comments = ((isset($item['real_uid']) && $item['real_uid']) ? 0 : $this->count_unseen_descendants()); + $privacy_warning = false; + + $conv = $this->get_conversation(); + $observer = $conv->get_observer(); + + $lock = t('Public visibility'); + if (intval($item['item_private']) === 2) { + $lock = t('Direct message (private mail)'); + } + if (intval($item['item_private']) === 1) { + $lock = t('Restricted visibility'); + } + + $locktype = intval($item['item_private']); + + $shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && (! intval($item['item_private']))) ? true : false); + + // allow an exemption for sharing stuff from your private feeds + if ($item['author']['xchan_network'] === 'rss') { + $shareable = true; + } + + // @fixme + // Have recently added code to properly handle polls in group reshares by redirecting all of the poll responses to the group. + // Sharing a poll using a regular embedded share is harder because the poll will need to fork. This is due to comment permissions. + // The original poll author may not accept responses from strangers. Forking the poll will receive responses from the sharer's + // followers, but there's no elegant way to merge these two sets of results together. For now, we'll disable sharing polls. + + if ($item['obj_type'] === 'Question') { + $shareable = false; + } + + + if ($item['item_restrict'] & 2) { + $privacy_warning = true; + $lock = t('This comment is part of a private conversation, yet was shared with the public. Discretion advised.'); + } + + $mode = $conv->get_mode(); + + $edlink = 'editpost'; + + if (local_channel() && $observer['xchan_hash'] === $item['author_xchan']) { + $edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit')); + } else { + $edpost = false; + } + + if (local_channel() && $observer['xchan_hash'] === $item['owner_xchan']) { + $myconv = true; + } else { + $myconv = false; + } + + + if ($item['verb'] === 'Announce') { + $edpost = false; + } + + + if ( + $observer && $observer['xchan_hash'] + && ( $observer['xchan_hash'] == $this->get_data_value('author_xchan') + || $observer['xchan_hash'] == $this->get_data_value('owner_xchan') + || $observer['xchan_hash'] == $this->get_data_value('source_xchan') + || $this->get_data_value('uid') == local_channel()) + ) { + $dropping = true; + } + + + if (array_key_exists('real_uid', $item)) { + $edpost = false; + $dropping = false; + } + + + if ($dropping) { + $drop = array( + 'dropping' => $dropping, + 'delete' => t('Delete'), + ); + } elseif (is_site_admin()) { + $drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ]; + } + + if (isset($observer_is_pageowner) && $observer_is_pageowner) { + $multidrop = array( + 'select' => t('Select'), + ); + } + + $filer = ((($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid', $item))) ? t('Save to Folder') : false); + + $profile_avatar = $item['author']['xchan_photo_m']; + $profile_link = chanlink_hash($item['author_xchan']); + $profile_name = $item['author']['xchan_name']; + + $profile_addr = $item['author']['xchan_addr'] ? $item['author']['xchan_addr'] : $item['author']['xchan_url']; + + $location = format_location($item); + $isevent = false; + $attend = null; + $canvote = false; + + // process action responses - e.g. like/dislike/attend/agree/whatever + $response_verbs = [ 'like', 'dislike' ]; + + if ($item['obj_type'] === ACTIVITY_OBJ_EVENT) { + $response_verbs[] = 'attendyes'; + $response_verbs[] = 'attendno'; + $response_verbs[] = 'attendmaybe'; + if ($this->is_commentable() && $observer) { + $isevent = true; + $attend = array( t('I will attend'), t('I will not attend'), t('I might attend')); + $undo_attend = t('Undo attendance'); + } + } + + $responses = get_responses($conv_responses, $response_verbs, $this, $item); + + $my_responses = []; + foreach ($response_verbs as $v) { + $my_responses[$v] = ((isset($conv_responses[$v][$item['mid'] . '-m']) && $conv_responses[$v][$item['mid'] . '-m']) ? 1 : 0); + } + + $like_count = ((x($conv_responses['like'], $item['mid'])) ? $conv_responses['like'][$item['mid']] : ''); + $like_list = ((x($conv_responses['like'], $item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : ''); + if (($like_list) && (count($like_list) > MAX_LIKERS)) { + $like_list_part = array_slice($like_list, 0, MAX_LIKERS); + array_push($like_list_part, '' . t('View all') . ''); + } else { + $like_list_part = ''; + } + if (get_config('system', 'show_like_counts', true)) { + $like_button_label = tt('Like', 'Likes', $like_count, 'noun'); + } else { + $like_button_label = t('Likes', 'noun'); + } + + $dislike_count = ((x($conv_responses['dislike'], $item['mid'])) ? $conv_responses['dislike'][$item['mid']] : ''); + $dislike_list = ((x($conv_responses['dislike'], $item['mid'])) ? $conv_responses['dislike'][$item['mid'] . '-l'] : ''); + if (get_config('system', 'show_like_counts', true)) { + $dislike_button_label = tt('Dislike', 'Dislikes', $dislike_count, 'noun'); + } else { + $dislike_button_label = t('Dislikes', 'noun'); + } + + if (($dislike_list) && (count($dislike_list) > MAX_LIKERS)) { + $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); + array_push($dislike_list_part, '' . t('View all') . ''); + } else { + $dislike_list_part = ''; + } + + + $showlike = ((x($conv_responses['like'], $item['mid'])) ? format_like($conv_responses['like'][$item['mid']], $conv_responses['like'][$item['mid'] . '-l'], 'like', $item['mid']) : ''); + $showdislike = ((x($conv_responses['dislike'], $item['mid'])) + ? format_like($conv_responses['dislike'][$item['mid']], $conv_responses['dislike'][$item['mid'] . '-l'], 'dislike', $item['mid']) : ''); + + /* + * We should avoid doing this all the time, but it depends on the conversation mode + * And the conv mode may change when we change the conv, or it changes its mode + * Maybe we should establish a way to be notified about conversation changes + */ + + $this->check_wall_to_wall(); + + if ($this->is_toplevel()) { + if (local_channel() && ($conv->get_profile_owner() == local_channel() || intval($item['item_private']) === 0)) { + $star = [ + 'toggle' => t('Save'), + 'isstarred' => ((intval($item['item_starred'])) ? true : false), + ]; + } + } else { + $is_comment = true; + } + + + $verified = (intval($item['item_verified']) ? t('Message signature validated') : ''); + $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : ''); + $unverified = '' ; // (($this->is_wall_to_wall() && (! intval($item['item_verified']))) ? t('Message cannot be verified') : ''); + + + if ($conv->get_profile_owner() == local_channel()) { + $tagger = array( + 'tagit' => t("Add Tag"), + 'classtagger' => "", + ); + } + + $has_bookmarks = false; + if (isset($item['term']) && is_array($item['term'])) { + foreach ($item['term'] as $t) { + if ($t['ttype'] == TERM_BOOKMARK) { + $has_bookmarks = true; + } + } + } + + $has_event = false; + if (($item['obj_type'] === ACTIVITY_OBJ_EVENT) && $conv->get_profile_owner() == local_channel()) { + $has_event = true; + } + + if ($this->is_commentable() && $observer) { + $like = array( t('I like this'), t('Undo like')); + $dislike = array( t('I don\'t like this'), t('Undo dislike') ); + } + + $share = $embed = EMPTY_STR; + + if ($shareable) { + $share = t('Repeat This'); + $embed = t('Share this'); + } + + $dreport = ''; + + $keep_reports = intval(get_config('system', 'expire_delivery_reports')); + if ($keep_reports === 0) { + $keep_reports = 10; + } + + if ((! get_config('system', 'disable_dreport')) && strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', "now - $keep_reports days")) > 0) { + $dreport = t('Delivery Report'); + $dreport_link = gen_link_id($item['mid']); + } + $is_new = false; + + if (strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', 'now - 12 hours')) > 0) { + $is_new = true; + } + + localize_item($item); + + $opts = []; + if ($this->is_wall_to_wall()) { + if ($this->owner_censored) { + $opts['censored'] = true; + } + } + + $body = prepare_body($item, true, $opts); + + // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link + // since we can't depend on llink or plink pointing to the right local location. + + $owner_address = substr($item['owner']['xchan_addr'], 0, strpos($item['owner']['xchan_addr'], '@')); + $viewthread = $item['llink']; + if ($conv->get_mode() === 'channel') { + $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid'])); + } + + $comment_count_txt = sprintf(tt('%d comment', '%d comments', $total_children), $total_children); + $list_unseen_txt = (($unseen_comments) ? sprintf(t('%d unseen'), $unseen_comments) : ''); + + $children = $this->get_children(); + + + $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); + + $dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ]; + Hook::call('dropdown_extras', $dropdown_extras_arr); + $dropdown_extras = $dropdown_extras_arr['dropdown_extras']; + + // Pinned item processing + $allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false); + $pinned_items = ($allowed_type ? get_pconfig($item['uid'], 'pinned', $item['item_type'], []) : []); + $pinned = ((! empty($pinned_items) && in_array($item['mid'], $pinned_items)) ? true : false); + + $tmp_item = array( + 'template' => $this->get_template(), + 'mode' => $mode, + 'item_type' => intval($item['item_type']), + 'comment_order' => $item['comment_order'], + 'parent' => $this->get_data_value('parent'), + 'collapsed' => ((intval($item['comment_order']) > 3) ? true : false), + 'type' => implode("", array_slice(explode("/", $item['verb']), -1)), + 'body' => $body['html'], + 'tags' => $body['tags'], + 'categories' => $body['categories'], + 'mentions' => $body['mentions'], + 'attachments' => $body['attachments'], + 'folders' => $body['folders'], + 'text' => strip_tags($body['html']), + 'id' => $this->get_id(), + 'mid' => $item['mid'], + 'isevent' => $isevent, + 'attend' => $attend, + 'undo_attend' => $undo_attend, + 'consensus' => '', + 'conlabels' => '', + 'canvote' => $canvote, + 'linktitle' => sprintf(t('View %s\'s profile - %s'), $profile_name, (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url'])), + 'olinktitle' => sprintf(t('View %s\'s profile - %s'), $this->get_owner_name(), (($item['owner']['xchan_addr']) ? $item['owner']['xchan_addr'] : $item['owner']['xchan_url'])), + 'llink' => $item['llink'], + 'viewthread' => $viewthread, + 'to' => t('to'), + 'via' => t('via'), + 'wall' => t('Wall-to-Wall'), + 'vwall' => t('via Wall-To-Wall:'), + 'profile_url' => $profile_link, + 'thread_action_menu' => thread_action_menu($item, $conv->get_mode()), + 'thread_author_menu' => thread_author_menu($item, $conv->get_mode()), + 'dreport' => $dreport, + 'dreport_link' => ((isset($dreport_link) && $dreport_link) ? $dreport_link : EMPTY_STR), + 'myconv' => $myconv, + 'name' => $profile_name, + 'thumb' => $profile_avatar, + 'osparkle' => $osparkle, + 'sparkle' => $sparkle, + 'title' => $item['title'], + 'title_tosource' => get_pconfig($conv->get_profile_owner(), 'system', 'title_tosource'), + 'ago' => relative_date($item['created']), + 'app' => $item['app'], + 'str_app' => sprintf(t('from %s'), $item['app']), + 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), + 'editedtime' => (($item['edited'] != $item['created']) ? sprintf(t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), + 'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf(t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')) : ''), + 'lock' => $lock, + 'locktype' => $locktype, + 'delayed' => $item['item_delayed'], + 'privacy_warning' => $privacy_warning, + 'verified' => $verified, + 'unverified' => $unverified, + 'forged' => $forged, + 'location' => $location, + 'divider' => get_pconfig($conv->get_profile_owner(), 'system', 'item_divider'), + 'attend_label' => t('Attend'), + 'attend_title' => t('Attendance Options'), + 'vote_label' => t('Vote'), + 'vote_title' => t('Voting Options'), + 'comment_lbl' => (($this->is_commentable() && $observer) ? t('Reply') : ''), + 'is_comment' => $is_comment, + 'is_new' => $is_new, + 'mod_display' => ((argv(0) === 'display') ? true : false), // comments are not collapsed when using mod_display + 'owner_url' => $this->get_owner_url(), + 'owner_photo' => $this->get_owner_photo(), + 'owner_name' => $this->get_owner_name(), + 'photo' => $body['photo'], + 'event' => $body['event'], + 'has_tags' => $has_tags, + 'reactions' => $this->reactions, + + // Item toolbar buttons + + 'emojis' => '', // deprecated - use your operating system or a browser plugin + 'like' => $like, + 'dislike' => $dislike, + 'share' => $share, + 'embed' => $embed, + 'rawmid' => $item['mid'], + 'plink' => get_plink($item), + 'edpost' => $edpost, // ((Features::enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''), + 'star' => $star, + 'tagger' => ((Features::enabled($conv->get_profile_owner(), 'commtag')) ? $tagger : ''), + 'filer' => ((Features::enabled($conv->get_profile_owner(), 'filing')) ? $filer : ''), + 'pinned' => ($pinned ? t('Pinned post') : ''), + 'pinnable' => (($this->is_toplevel() && local_channel() && $item['owner_xchan'] == $observer['xchan_hash'] && $allowed_type && $item['item_private'] == 0 && $item['item_delayed'] == 0) ? '1' : ''), + 'pinme' => ($pinned ? t('Unpin this post') : t('Pin this post')), + 'isdraft' => boolval($item['item_unpublished']), + 'draft_txt' => t('Saved draft'), + 'bookmark' => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''), + 'addtocal' => (($has_event && ! $item['resource_id']) ? t('Add to Calendar') : ''), + 'drop' => $drop, + 'multidrop' => ((Features::enabled($conv->get_profile_owner(), 'multi_delete')) ? $multidrop : ''), + 'dropdown_extras' => $dropdown_extras, + + // end toolbar buttons + + 'unseen_comments' => $unseen_comments, + 'comment_count' => $total_children, + 'comment_count_txt' => $comment_count_txt, + 'list_unseen_txt' => $list_unseen_txt, + 'markseen' => t('Mark all seen'), + 'responses' => $responses, + 'my_responses' => $my_responses, + 'like_count' => $like_count, + 'like_list' => $like_list, + 'like_list_part' => $like_list_part, + 'like_button_label' => $like_button_label, + 'like_modal_title' => t('Likes', 'noun'), + 'dislike_modal_title' => t('Dislikes', 'noun'), + 'dislike_count' => $dislike_count, + 'dislike_list' => $dislike_list, + 'dislike_list_part' => $dislike_list_part, + 'dislike_button_label' => $dislike_button_label, + 'modal_dismiss' => t('Close'), + 'showlike' => $showlike, + 'showdislike' => $showdislike, + 'comment' => ($item['item_delayed'] ? '' : $this->get_comment_box()), + 'previewing' => ($conv->is_preview() ? true : false ), + 'preview_lbl' => t('This is an unsaved preview'), + 'wait' => t('Please wait'), + 'submid' => str_replace(['+','='], ['',''], base64_encode($item['mid'])), + 'thread_level' => $thread_level, + 'indentpx' => intval(get_pconfig(local_channel(), 'system', 'thread_indent_px', get_config('system', 'thread_indent_px', 0))), + 'thread_max' => intval(get_config('system', 'thread_maxlevel', 20)) + 1 + ); + + $arr = array('item' => $item, 'output' => $tmp_item); + Hook::call('display_item', $arr); + + $result = $arr['output']; + + $result['children'] = []; + + if (local_channel() && get_pconfig(local_channel(), 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) { + // place to store all the author addresses (links if not available) in the thread so we can auto-mention them in JS. + $result['authors'] = []; + // fix to add in sub-replies if replying to a comment on your own post from the top level. + if ($observer && ($profile_addr === $observer['xchan_hash'] || $profile_addr === $observer['xchan_addr'])) { + // ignore it + } else { + $result['authors'][] = $profile_addr; + } + + // Add any mentions from the immediate parent, unless they are mentions of the current viewer or duplicates + if (isset($item['term']) && is_array($item['term'])) { + $additional_mentions = []; + foreach ($item['term'] as $t) { + if ($t['ttype'] == TERM_MENTION) { + $additional_mentions[] = ((($position = strpos($t['url'], 'url=')) !== false) ? urldecode(substr($t['url'], $position + 4)) : $t['url']); + } + } + if ($additional_mentions) { + $r = q("select hubloc_addr, hubloc_id_url, hubloc_hash from hubloc where hubloc_id_url in (" . protect_sprintf(stringify_array($additional_mentions, true)) . ") "); + if ($r) { + foreach ($r as $rv) { + $ment = (($r[0]['hubloc_addr']) ? $r[0]['hubloc_addr'] : $r[0]['hubloc_id_url']); + if ($ment) { + if ($observer && $observer['xchan_hash'] !== $rv['hubloc_hash'] && ! in_array($ment, $result['authors'])) { + $result['authors'][] = $ment; + } + } + } + } + } + } + } + + $nb_children = count($children); + + $total_children = $this->count_visible_descendants(); + + $visible_comments = get_config('system', 'expanded_comments', 3); + + if (($this->get_display_mode() === 'normal') && ($nb_children > 0)) { + if ($children) { + foreach ($children as $child) { + $xz = $child->get_template_data($conv_responses, $thread_level + 1); + $result['children'][] = $xz; + } + } + // Collapse + if ($total_children > $visible_comments && $thread_level == 1) { + $result['children'][0]['comment_firstcollapsed'] = true; + $result['children'][0]['num_comments'] = $comment_count_txt; + $result['children'][0]['hide_text'] = sprintf(t('%s show all'), ''); + } + } + + $result['private'] = $item['item_private']; + $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : ''); + + if ($this->is_threaded()) { + $result['flatten'] = false; + $result['threaded'] = true; + } else { + $result['flatten'] = true; + $result['threaded'] = false; + } + + return $result; + } + + public function get_id() + { + return $this->get_data_value('id'); + } + + public function get_display_mode() + { + return $this->display_mode; + } + + public function set_display_mode($mode) + { + $this->display_mode = $mode; + } + + public function is_threaded() + { + return $this->threaded; + } + + public function get_author() + { + $xchan = $this->get_data_value('author'); + if ($xchan['xchan_addr']) { + return $xchan['xchan_addr']; + } + return $xchan['xchan_url']; + } + + public function set_reload($val) + { + $this->reload = $val; + } + + public function get_reload() + { + return $this->reload; + } + + public function set_commentable($val) + { + $this->commentable = $val; + foreach ($this->get_children() as $child) { + $child->set_commentable($val); + } + } + + public function is_commentable() + { + return $this->commentable; + } + + /** + * Add a child item + */ + public function add_child($item) + { + $item_id = $item->get_id(); + if (!$item_id) { + logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG); + return false; + } + if ($this->get_child($item->get_id())) { + logger('[WARN] Item::add_child : Item already exists (' . $item->get_id() . ').', LOGGER_DEBUG); + return false; + } + + /* + * Only add what will be displayed + */ + + if (activity_match($item->get_data_value('verb'), ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'), ACTIVITY_DISLIKE)) { + return false; + } + + $item->set_parent($this); + $this->children[] = $item; + return end($this->children); + } + + /** + * Get a child by its ID + */ + + public function get_child($id) + { + foreach ($this->get_children() as $child) { + if ($child->get_id() == $id) { + return $child; + } + } + return null; + } + + /** + * Get all our children + */ + + public function get_children() + { + return $this->children; + } + + /** + * Set our parent + */ + protected function set_parent($item) + { + $parent = $this->get_parent(); + if ($parent) { + $parent->remove_child($this); + } + $this->parent = $item; + $this->set_conversation($item->get_conversation()); + } + + /** + * Remove our parent + */ + + protected function remove_parent() + { + $this->parent = null; + $this->conversation = null; + } + + /** + * Remove a child + */ + + public function remove_child($item) + { + $id = $item->get_id(); + foreach ($this->get_children() as $key => $child) { + if ($child->get_id() == $id) { + $child->remove_parent(); + unset($this->children[$key]); + // Reindex the array, in order to make sure there won't be any trouble on loops using count() + $this->children = array_values($this->children); + return true; + } + } + logger('[WARN] Item::remove_child : Item is not a child (' . $id . ').', LOGGER_DEBUG); + return false; + } + + /** + * Get parent item + */ + protected function get_parent() + { + return $this->parent; + } + + /** + * set conversation + */ + public function set_conversation($conv) + { + $previous_mode = ($this->conversation ? $this->conversation->get_mode() : ''); + + $this->conversation = $conv; + + // Set it on our children too + foreach ($this->get_children() as $child) { + $child->set_conversation($conv); + } + } + + /** + * get conversation + */ + public function get_conversation() + { + return $this->conversation; + } + + /** + * Get raw data + * + * We shouldn't need this + */ + public function get_data() + { + return $this->data; + } + + /** + * Get a data value + * + * Returns: + * _ value on success + * _ false on failure + */ + public function get_data_value($name) + { + if (!isset($this->data[$name])) { +// logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG); + return false; + } + + return $this->data[$name]; + } + + /** + * Get template + */ + public function get_template() + { + return $this->template; + } + + + public function set_template($t) + { + $this->template = $t; + } + + /** + * Check if this is a toplevel post + */ + private function is_toplevel() + { + return $this->toplevel; + } + + /** + * Count the total of our descendants + */ + private function count_descendants() + { + $children = $this->get_children(); + $total = count($children); + if ($total > 0) { + foreach ($children as $child) { + $total += $child->count_descendants(); + } + } + return $total; + } + + public function count_visible_descendants() + { + $total = 0; + $children = $this->get_children(); + if ($children) { + foreach ($children as $child) { + if (! visible_activity($child->data)) { + continue; + } + $total++; + $total += $child->count_visible_descendants(); + } + } + return $total; + } + + + private function label_descendants($count = 0) + { + if (! array_key_exists('sequence', $this->data)) { + if ($count) { + $count++; + } + $this->data['sequence'] = $count; + } + logger('labelled: ' . print_r($this->data, true), LOGGER_DATA); + $children = $this->get_children(); + $total = count($children); + if ($total > 0) { + foreach ($children as $child) { + if (! visible_activity($child->data)) { + continue; + } + if (! array_key_exists('sequence', $this->data)) { + $count++; + $child->data['sequence'] = $count; + logger('labelled_child: ' . print_r($child->data, true), LOGGER_DATA); + } + $child->label_descendants($count); + } + } + } + + private function count_unseen_descendants() + { + $children = $this->get_children(); + $total = count($children); + if ($total > 0) { + $total = 0; + foreach ($children as $child) { + if (! visible_activity($child->data)) { + continue; + } + if (intval($child->data['item_unseen'])) { + $total++; + } + } + } + return $total; + } + + + /** + * Get the template for the comment box + */ + private function get_comment_box_template() + { + return $this->comment_box_template; + } + + /** + * Get the comment box + * + * Returns: + * _ The comment box string (empty if no comment box) + * _ false on failure + */ + private function get_comment_box($indent = 0) + { + + if (!$this->is_toplevel() && !get_config('system', 'thread_allow', true)) { + return ''; + } + + $comment_box = ''; + $conv = $this->get_conversation(); + +// logger('Commentable conv: ' . $conv->is_commentable()); + + if (! $this->is_commentable()) { + return; + } + + $template = Theme::get_template($this->get_comment_box_template()); + + $observer = $conv->get_observer(); + + $arr = array('comment_buttons' => '','id' => $this->get_id()); + Hook::call('comment_buttons', $arr); + $comment_buttons = $arr['comment_buttons']; + + $feature_auto_save_draft = ((Features::enabled($conv->get_profile_owner(), 'auto_save_draft')) ? "true" : "false"); + $permanent_draft = ((intval($conv->get_profile_owner()) === intval(local_channel()) && Apps::system_app_installed($conv->get_profile_owner(), 'Drafts')) ? ('Save draft') : EMPTY_STR); + + + + $comment_box = replace_macros($template, array( + '$return_path' => '', + '$threaded' => $this->is_threaded(), + '$jsreload' => $conv->reload, + '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'), + '$id' => $this->get_id(), + '$parent' => $this->get_id(), + '$comment_buttons' => $comment_buttons, + '$profile_uid' => $conv->get_profile_owner(), + '$mylink' => $observer['xchan_url'], + '$mytitle' => t('This is you'), + '$myphoto' => $observer['xchan_photo_s'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), + '$edat' => EMPTY_STR, + '$edbold' => t('Bold'), + '$editalic' => t('Italic'), + '$eduline' => t('Underline'), + '$edquote' => t('Quote'), + '$edcode' => t('Code'), + '$edimg' => t('Image'), + '$edatt' => t('Attach/Upload file'), + '$edurl' => t('Insert Link'), + '$edvideo' => t('Video'), + '$preview' => t('Preview'), + '$reset' => t('Reset'), + '$indent' => $indent, + '$can_upload' => (perm_is_allowed($conv->get_profile_owner(), get_observer_hash(), 'write_storage') && $conv->is_uploadable()), + '$feature_encrypt' => ((Apps::system_app_installed($conv->get_profile_owner(), 'Secrets')) ? true : false), + '$feature_markup' => ((Apps::system_app_installed($conv->get_profile_owner(), 'Markup')) ? true : false), + '$encrypt' => t('Encrypt text'), + '$cipher' => $conv->get_cipher(), + '$sourceapp' => App::$sourcename, + '$observer' => get_observer_hash(), + '$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(), '', 'post_comments')) ? true : false), + '$anonname' => [ 'anonname', t('Your full name (required)') ], + '$anonmail' => [ 'anonmail', t('Your email address (required)') ], + '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ], + '$auto_save_draft' => $feature_auto_save_draft, + '$save' => $permanent_draft, + '$top' => $this->is_toplevel() + )); + + return $comment_box; + } + + private function get_redirect_url() + { + return $this->redirect_url; + } + + /** + * Check if we are a wall to wall item and set the relevant properties + */ + protected function check_wall_to_wall() + { + $conv = $this->get_conversation(); + $this->wall_to_wall = false; + $this->owner_url = ''; + $this->owner_photo = ''; + $this->owner_name = ''; + $this->owner_censored = false; + + if ($conv->get_mode() === 'channel') { + return; + } + + if ($this->is_toplevel() && ($this->get_data_value('author_xchan') != $this->get_data_value('owner_xchan'))) { + $this->owner_url = chanlink_hash($this->data['owner']['xchan_hash']); + $this->owner_photo = $this->data['owner']['xchan_photo_m']; + $this->owner_name = $this->data['owner']['xchan_name']; + $this->wall_to_wall = true; + } + + // present friend-of-friend conversations from hyperdrive as relayed posts from the first friend + // we find among the respondents. + + if ($this->is_toplevel() && (! $this->data['owner']['abook_id'])) { + if ($this->data['children']) { + $friend = $this->find_a_friend($this->data['children']); + if ($friend) { + $this->owner_url = $friend['url']; + $this->owner_photo = $friend['photo']; + $this->owner_name = $friend['name']; + $this->owner_censored = $friend['censored']; + $this->wall_to_wall = true; + } + } + } + } + + private function find_a_friend($items) + { + $ret = null; + if ($items) { + foreach ($items as $child) { + if ($child['author']['abook_id'] && (! intval($child['author']['abook_self']))) { + return [ + 'url' => chanlink_hash($child['author']['xchan_hash']), + 'photo' => $child['author']['xchan_photo_m'], + 'name' => $child['author']['xchan_name'], + 'censored' => (($child['author']['xchan_censored'] || $child['author']['abook_censor']) ? true : false) + ]; + if ($child['children']) { + $ret = $this->find_a_friend($child['children']); + if ($ret) { + break; + } + } + } + } + } + return $ret; + } + + + private function is_wall_to_wall() + { + return $this->wall_to_wall; + } + + private function get_owner_url() + { + return $this->owner_url; + } + + private function get_owner_photo() + { + return $this->owner_photo; + } + + private function get_owner_name() + { + return $this->owner_name; + } + + private function is_visiting() + { + return $this->visiting; + } +} diff --git a/Code/Lib/ThreadListener.php b/Code/Lib/ThreadListener.php new file mode 100644 index 000000000..42080bced --- /dev/null +++ b/Code/Lib/ThreadListener.php @@ -0,0 +1,63 @@ +set_mode($mode); + $this->preview = $preview; + $this->uploadable = $uploadable; + $this->prepared_item = $prepared_item; + $c = ((local_channel()) ? get_pconfig(local_channel(), 'system', 'default_cipher') : ''); + if ($c) { + $this->cipher = $c; + } + } + + /** + * Set the mode we'll be displayed on + */ + private function set_mode($mode) + { + if ($this->get_mode() == $mode) { + return; + } + + $this->observer = App::get_observer(); + $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : ''); + + switch ($mode) { + case 'stream': + $this->profile_owner = local_channel(); + $this->writable = true; + break; + case 'pubstream': + $this->profile_owner = local_channel(); + $this->writable = ((local_channel()) ? true : false); + break; + case 'hq': + $this->profile_owner = local_channel(); + $this->writable = true; + break; + case 'channel': + $this->profile_owner = App::$profile['profile_uid']; + $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments'); + break; + case 'cards': + $this->profile_owner = App::$profile['profile_uid']; + $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments'); + $this->reload = $_SESSION['return_url']; + break; + case 'articles': + $this->profile_owner = App::$profile['profile_uid']; + $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments'); + $this->reload = $_SESSION['return_url']; + break; + case 'display': + // in this mode we set profile_owner after initialisation (from conversation()) and then + // pull some trickery which allows us to re-invoke this function afterward + // it's an ugly hack so @FIXME + $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments'); + $this->uploadable = perm_is_allowed($this->profile_owner, $ob_hash, 'write_storage'); + break; + case 'page': + $this->profile_owner = App::$profile['uid']; + $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments'); + break; + default: + logger('[ERROR] Conversation::set_mode : Unhandled mode (' . $mode . ').', LOGGER_DEBUG); + return false; + break; + } + $this->mode = $mode; + } + + /** + * Get mode + */ + public function get_mode() + { + return $this->mode; + } + + /** + * Check if page is writable + */ + public function is_writable() + { + return $this->writable; + } + + public function is_commentable() + { + return $this->commentable; + } + + public function is_uploadable() + { + return $this->uploadable; + } + + + /** + * Check if page is a preview + */ + public function is_preview() + { + return $this->preview; + } + + /** + * Get profile owner + */ + public function get_profile_owner() + { + return $this->profile_owner; + } + + public function set_profile_owner($uid) + { + $this->profile_owner = $uid; + $mode = $this->get_mode(); + $this->mode = null; + $this->set_mode($mode); + } + + public function get_observer() + { + return $this->observer; + } + + public function get_cipher() + { + return $this->cipher; + } + + + /** + * Add a thread to the conversation + * + * Returns: + * _ The inserted item on success + * _ false on failure + */ + public function add_thread($item) + { + $item_id = $item->get_id(); + if (!$item_id) { + logger('Item has no ID!!', LOGGER_DEBUG, LOG_ERR); + return false; + } + if ($this->get_thread($item->get_id())) { + logger('Thread already exists (' . $item->get_id() . ').', LOGGER_DEBUG, LOG_WARNING); + return false; + } + + /* + * Only add things that will be displayed + */ + + + if (($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'), ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'), ACTIVITY_DISLIKE))) { + return false; + } + + $item->set_commentable(false); + $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : ''); + + if (! comments_are_now_closed($item->get_data())) { + if (($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash)) { + $item->set_commentable(true); + } + + if (intval($item->get_data_value('item_nocomment'))) { + $item->set_commentable(false); + } elseif (! $item->is_commentable()) { + if ((array_key_exists('owner', $item->data)) && intval($item->data['owner']['abook_self'])) { + $item->set_commentable(perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments')); + } else { + $item->set_commentable(can_comment_on_post($ob_hash, $item->data)); + } + } + } + if ($this->mode === 'pubstream' && (! local_channel())) { + $item->set_commentable(false); + } + + + $item->set_conversation($this); + $this->threads[] = $item; + return end($this->threads); + } + + /** + * Get data in a form usable by a conversation template + * + * We should find a way to avoid using those arguments (at least most of them) + * + * Returns: + * _ The data requested on success + * _ false on failure + */ + public function get_template_data($conv_responses) + { + $result = []; + + foreach ($this->threads as $item) { + if (($item->get_data_value('id') == $item->get_data_value('parent')) && $this->prepared_item) { + $item_data = $this->prepared_item; + } else { + $item_data = $item->get_template_data($conv_responses); + } + if (!$item_data) { + logger('Failed to get item template data (' . $item->get_id() . ').', LOGGER_DEBUG, LOG_ERR); + return false; + } + $result[] = $item_data; + } + + return $result; + } + + /** + * Get a thread based on its item id + * + * Returns: + * _ The found item on success + * _ false on failure + */ + private function get_thread($id) + { + foreach ($this->threads as $item) { + if ($item->get_id() == $id) { + return $item; + } + } + + return false; + } +} diff --git a/Code/Lib/Verify.php b/Code/Lib/Verify.php new file mode 100644 index 000000000..6c80be2f4 --- /dev/null +++ b/Code/Lib/Verify.php @@ -0,0 +1,72 @@ + ['Accept: application/jrd+json, */*']]); + + if ($s['success']) { + $j = json_decode($s['body'], true); + return ($j); + } + + return false; + } + + public static function parse_resource($resource) + { + + self::$resource = urlencode($resource); + + if (strpos($resource, 'http') === 0) { + $m = parse_url($resource); + if ($m) { + if ($m['scheme'] !== 'https') { + return false; + } + self::$server = $m['host'] . (($m['port']) ? ':' . $m['port'] : ''); + } else { + return false; + } + } elseif (strpos($resource, 'tag:') === 0) { + $arr = explode(':', $resource); // split the tag + $h = explode(',', $arr[1]); // split the host,date + self::$server = $h[0]; + } else { + $x = explode('@', $resource); + if (!strlen($x[0])) { + // e.g. @dan@pixelfed.org + array_shift($x); + } + $username = $x[0]; + if (count($x) > 1) { + self::$server = $x[1]; + } else { + return false; + } + if (strpos($resource, 'acct:') !== 0) { + self::$resource = urlencode('acct:' . $resource); + } + } + } + + /** + * @brief fetch a webfinger resource and return a zot6 discovery url if present + * + */ + + public static function zot_url($resource) + { + + $arr = self::exec($resource); + + if (is_array($arr) && array_key_exists('links', $arr)) { + foreach ($arr['links'] as $link) { + if (array_key_exists('rel',$link) && in_array($link['rel'], [ PROTOCOL_NOMAD, PROTOCOL_ZOT6 ])) { + if (array_key_exists('href', $link) && $link['href'] !== EMPTY_STR) { + return $link['href']; + } + } + } + } + return false; + } +} + diff --git a/Code/Lib/XConfig.php b/Code/Lib/XConfig.php new file mode 100644 index 000000000..1d2d10ea5 --- /dev/null +++ b/Code/Lib/XConfig.php @@ -0,0 +1,192 @@ +XConfig is comparable to PConfig, except that it uses xchan + * (an observer hash) as an identifier. + * + * XConfig is used for observer specific configurations and takes a + * xchan as identifier. + * The storage is of size MEDIUMTEXT. + * + * @code{.php}$var = Code\Lib\XConfig::Get('xchan', 'category', 'key'); + * // with default value for non existent key + * $var = Code\Lib\XConfig::Get('xchan', 'category', 'unsetkey', 'defaultvalue');@endcode + * + * The old (deprecated?) way to access a XConfig value is: + * @code{.php}$observer = App::get_observer_hash(); + * if ($observer) { + * $var = get_xconfig($observer, 'category', 'key'); + * }@endcode + */ +class XConfig +{ + + /** + * @brief Loads a full xchan's configuration into a cached storage. + * + * All configuration values of the given observer hash are stored in global + * cache which is available under the global variable App::$config[$xchan]. + * + * @param string $xchan + * The observer's hash + * @return void|false Returns false if xchan is not set + */ + public static function Load($xchan) + { + + if (! $xchan) { + return false; + } + + if (! array_key_exists($xchan, App::$config)) { + App::$config[$xchan] = []; + } + + $r = q( + "SELECT * FROM xconfig WHERE xchan = '%s'", + dbesc($xchan) + ); + + if ($r) { + foreach ($r as $rr) { + $k = $rr['k']; + $c = $rr['cat']; + if (! array_key_exists($c, App::$config[$xchan])) { + App::$config[$xchan][$c] = []; + App::$config[$xchan][$c]['config_loaded'] = true; + } + App::$config[$xchan][$c][$k] = $rr['v']; + } + } + } + + /** + * @brief Get a particular observer's config variable given the category + * name ($family) and a key. + * + * Get a particular observer's config value from the given category ($family) + * and the $key from a cached storage in App::$config[$xchan]. + * + * Returns false if not set. + * + * @param string $xchan + * The observer's hash + * @param string $family + * The category of the configuration value + * @param string $key + * The configuration key to query + * @param bool $default (optional) default false + * @return mixed Stored $value or false if it does not exist + */ + public static function Get($xchan, $family, $key, $default = false) + { + + if (! $xchan) { + return $default; + } + + if (! array_key_exists($xchan, App::$config)) { + load_xconfig($xchan); + } + + if ((! array_key_exists($family, App::$config[$xchan])) || (! array_key_exists($key, App::$config[$xchan][$family]))) { + return $default; + } + + return unserialise(App::$config[$xchan][$family][$key]); + } + + /** + * @brief Sets a configuration value for an observer. + * + * Stores a config value ($value) in the category ($family) under the key ($key) + * for the observer's $xchan hash. + * + * @param string $xchan + * The observer's hash + * @param string $family + * The category of the configuration value + * @param string $key + * The configuration key to set + * @param string $value + * The value to store + * @return mixed Stored $value or false + */ + public static function Set($xchan, $family, $key, $value) + { + + // manage array value + $dbvalue = ((is_array($value)) ? serialise($value) : $value); + $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); + + if (self::Get($xchan, $family, $key) === false) { + if (! array_key_exists($xchan, App::$config)) { + App::$config[$xchan] = []; + } + if (! array_key_exists($family, App::$config[$xchan])) { + App::$config[$xchan][$family] = []; + } + + $ret = q( + "INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' )", + dbesc($xchan), + dbesc($family), + dbesc($key), + dbesc($dbvalue) + ); + } else { + $ret = q( + "UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s'", + dbesc($dbvalue), + dbesc($xchan), + dbesc($family), + dbesc($key) + ); + } + + App::$config[$xchan][$family][$key] = $value; + + if ($ret) { + return $value; + } + + return $ret; + } + + /** + * @brief Deletes the given key from the observer's config. + * + * Removes the configured value from the stored cache in App::$config[$xchan] + * and removes it from the database. + * + * @param string $xchan + * The observer's hash + * @param string $family + * The category of the configuration value + * @param string $key + * The configuration key to delete + * @return mixed + */ + public static function Delete($xchan, $family, $key) + { + + if (isset(App::$config[$xchan]) && isset(App::$config[$xchan][$family]) && isset(App::$config[$xchan][$family][$key])) { + unset(App::$config[$xchan][$family][$key]); + } + + $ret = q( + "DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'", + dbesc($xchan), + dbesc($family), + dbesc($key) + ); + + return $ret; + } +} diff --git a/Code/Lib/Xchan.php b/Code/Lib/Xchan.php new file mode 100644 index 000000000..f8b579f15 --- /dev/null +++ b/Code/Lib/Xchan.php @@ -0,0 +1,12 @@ + $profile['xprof_hash'], + $arr['xprof_dob'] => (($profile['birthday'] === '0000-00-00') ? $profile['birthday'] : datetime_convert('', '', $profile['birthday'], 'Y-m-d')), + $arr['xprof_age'] => (($profile['age']) ? intval($profile['age']) : 0), + $arr['xprof_desc'] => (($profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_gender'] => (($profile['gender']) ? htmlspecialchars($profile['gender'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_marital'] => (($profile['marital']) ? htmlspecialchars($profile['marital'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_sexual'] => (($profile['sexual']) ? htmlspecialchars($profile['sexual'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_locale'] => (($profile['locale']) ? htmlspecialchars($profile['locale'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_region'] => (($profile['region']) ? htmlspecialchars($profile['region'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_postcode'] => (($profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_country'] => (($profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_about'] => (($profile['about']) ? htmlspecialchars($profile['about'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_homepage'] => (($profile['homepage']) ? htmlspecialchars($profile['homepage'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_hometown'] => (($profile['hometown']) ? htmlspecialchars($profile['hometown'], ENT_COMPAT, 'UTF-8', false) : ''), + $arr['xprof_keywords'] => (($profile['keywords']) ? htmlspecialchars($profile['keywords'], ENT_COMPAT, 'UTF-8', false) : ''), + + ]; + + return create_table_from_array('xprof', $store); + } + + +} \ No newline at end of file diff --git a/Code/Lib/Yaml.php b/Code/Lib/Yaml.php new file mode 100644 index 000000000..3f5a13464 --- /dev/null +++ b/Code/Lib/Yaml.php @@ -0,0 +1,33 @@ +getMessage()); + } + return $value; + } + + public static function encode($data) + { + return Syaml::dump($data); + } + + public static function fromJSON($data) + { + return Syaml::dump(json_decode($data,true)); + } + +} diff --git a/Code/Lib/ZotURL.php b/Code/Lib/ZotURL.php new file mode 100644 index 000000000..0ba78853b --- /dev/null +++ b/Code/Lib/ZotURL.php @@ -0,0 +1,128 @@ + false ]; + + if (strpos($url, 'x-zot:') !== 0) { + return $ret; + } + + + if (! $url) { + return $ret; + } + + $portable_url = substr($url, 6); + $u = explode('/', $portable_url); + $portable_id = $u[0]; + + $hosts = self::lookup($portable_id, $hub); + + if (! $hosts) { + return $ret; + } + + foreach ($hosts as $h) { + $newurl = $h . '/id/' . $portable_url; + + $m = parse_url($newurl); + + $data = json_encode([ 'zot_token' => random_string() ]); + + if ($channel && $m) { + $headers = [ + 'Accept' => 'application/x-nomad+json, application/x-zot+json', + 'Content-Type' => 'application/x-nomad+json', + 'X-Zot-Token' => random_string(), + 'Digest' => HTTPSig::generate_digest_header($data), + 'Host' => $m['host'], + '(request-target)' => 'post ' . get_request_string($newurl) + ]; + $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false); + } else { + $h = [ 'Accept: application/x-nomad+json, application/x-zot+json' ]; + } + + $result = []; + + $redirects = 0; + $x = z_post_url($newurl, $data, $redirects, [ 'headers' => $h ]); + if ($x['success']) { + return $x; + } + } + + return $ret; + } + + public static function is_zoturl($s) + { + + if (strpos($url, 'x-zot:') === 0) { + return true; + } + return false; + } + + + public static function lookup($portable_id, $hub) + { + + $r = q( + "select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0 order by hubloc_primary desc", + dbesc($portable_id) + ); + + if (! $r) { + // extend to network lookup + + $path = '/q/' . $portable_id; + + // first check sending hub since they have recently communicated with this object + + $redirects = 0; + + if ($hub) { + $x = z_fetch_url($hub['hubloc_url'] . $path, false, $redirects); + $u = self::parse_response($x); + if ($u) { + return $u; + } + } + + // If this fails, fallback on directory servers + + return false; + } + return ids_to_array($r, 'hubloc_url'); + } + + + public static function parse_response($arr) + { + if (! $arr['success']) { + return false; + } + $a = json_decode($arr['body'], true); + if ($a['success'] && array_key_exists('results', $a) && is_array($a['results']) && count($a['results'])) { + foreach ($a['results'] as $b) { + $m = discover_by_webbie($b); + if ($m) { + return([ $b ]); + } + } + } + return false; + } +} + diff --git a/Code/Lib/Zotfinger.php b/Code/Lib/Zotfinger.php new file mode 100644 index 000000000..91964a3c9 --- /dev/null +++ b/Code/Lib/Zotfinger.php @@ -0,0 +1,90 @@ + random_string()]); + + if ($channel && $m) { + $headers = [ + 'Accept' => 'application/x-nomad+json, application/x-zot+json', + 'Content-Type' => 'application/x-nomad+json', + 'X-Zot-Token' => random_string(), + 'Digest' => HTTPSig::generate_digest_header($data), + 'Host' => $m['host'], + '(request-target)' => 'post ' . get_request_string($resource) + ]; + $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false); + } else { + $h = ['Accept: application/x-nomad+json, application/x-zot+json']; + } + + $result = []; + + $redirects = 0; + $x = z_post_url($resource, $data, $redirects, ['headers' => $h]); + + if (in_array(intval($x['return_code']), [ 404, 410 ]) && $recurse) { + + // The resource has been deleted or doesn't exist at this location. + // Try to find another nomadic resource for this channel and return that. + + // First, see if there's a hubloc for this site. Fetch that record to + // obtain the nomadic identity hash. Then use that to find any additional + // nomadic locations. + + $h = Activity::get_actor_hublocs($resource, 'nomad'); + if ($h) { + // mark this location deleted + hubloc_delete($h[0]); + $hubs = Activity::get_actor_hublocs($h[0]['hubloc_hash']); + if ($hubs) { + foreach ($hubs as $hub) { + if ($hub['hubloc_id_url'] !== $resource and !$hub['hubloc_deleted']) { + $rzf = self::exec($hub['hubloc_id_url'],$channel,$verify); + if ($rzf) { + return $rzf; + } + } + } + } + } + } + + if ($x['success']) { + if ($verify) { + $result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6'); + } + + $result['data'] = json_decode($x['body'], true); + + if ($result['data'] && is_array($result['data']) && array_key_exists('encrypted', $result['data']) && $result['data']['encrypted']) { + $result['data'] = json_decode(Crypto::unencapsulate($result['data'], get_config('system', 'prvkey')), true); + } + + return $result; + } + + return false; + } +} + diff --git a/Code/Module/Acloader.php b/Code/Module/Acloader.php new file mode 100644 index 000000000..260a6edc2 --- /dev/null +++ b/Code/Module/Acloader.php @@ -0,0 +1,346 @@ + standard ACL request + // 'g' => Groups only ACL request + // 'f' => forums only ACL request + // 'c' => Connections only ACL request or editor (textarea) mention request + // $_REQUEST['search'] contains ACL search text. + + + // $type = + // 'm' => autocomplete private mail recipient (checks post_mail permission) + // 'a' => autocomplete connections (mod_connections, mod_poke, mod_sources, mod_photos) + // 'x' => nav search bar autocomplete (match any xchan) + // 'z' => autocomplete any xchan, but also include abook_alias, requires non-zero local_channel() + // and also contains xid without urlencode, used specifically by activity_filter widget + // $_REQUEST['query'] contains autocomplete search text. + + + // The different autocomplete libraries use different names for the search text + // parameter. Internally we'll use $search to represent the search text no matter + // what request variable it was attached to. + + if (array_key_exists('query', $_REQUEST)) { + $search = $_REQUEST['query']; + } + + if ((!local_channel()) && (!in_array($type, ['x', 'c', 'f']))) { + killme(); + } + + $permitted = []; + + if (in_array($type, ['m', 'a', 'f'])) { + // These queries require permission checking. We'll create a simple array of xchan_hash for those with + // the requisite permissions which we can check against. + + $x = q( + "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s'", + intval(local_channel()), + dbesc(($type === 'm') ? '%post_mail%' : '%tag_deliver%') + ); + + $permitted = ids_to_array($x, 'xchan'); + } + + + if ($search) { + $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " "; + // sql_extra2 is typically used when we don't have a local_channel - so we are not search abook_alias + $sql_extra2 = " AND ( xchan_name LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR xchan_addr LIKE " . protect_sprintf("'%" . dbesc(punify($search)) . ((strpos($search, '@') === false) ? "%@%'" : "%'")) . ") "; + + + // This horrible mess is needed because position also returns 0 if nothing is found. + // Would be MUCH easier if it instead returned a very large value + // Otherwise we could just + // order by LEAST(POSITION($search IN xchan_name),POSITION($search IN xchan_addr)). + + $order_extra2 = "CASE WHEN xchan_name LIKE " + . protect_sprintf("'%" . dbesc($search) . "%'") + . " then POSITION('" . protect_sprintf(dbesc($search)) + . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, "; + + $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf("'%" . dbesc(punify($search)) . "%'") . " OR xchan_name like " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR abook_alias like " . protect_sprintf("'%" . dbesc($search) . "%'") . " ) "; + + $sql_extra4 = "AND ( xchan_name LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR xchan_addr LIKE " . protect_sprintf("'%" . dbesc(punify($search)) . ((strpos($search, '@') === false) ? "%@%'" : "%'")) . " OR abook_alias LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . ") "; + } else { + $sql_extra = $sql_extra2 = $sql_extra3 = $sql_extra4 = ""; + } + + + $groups = []; + $contacts = []; + + if ($type == '' || $type == 'g') { + // Normal privacy groups + + $r = q( + "SELECT pgrp.id, pgrp.hash, pgrp.gname + FROM pgrp, pgrp_member + WHERE pgrp.deleted = 0 AND pgrp.uid = %d + AND pgrp_member.gid = pgrp.id + $sql_extra + GROUP BY pgrp.id + ORDER BY pgrp.gname + LIMIT %d OFFSET %d", + intval(local_channel()), + intval($count), + intval($start) + ); + + if ($r) { + foreach ($r as $g) { + // logger('acl: group: ' . $g['gname'] . ' members: ' . AccessList::members_xchan(local_channel(),$g['id'])); + $groups[] = [ + "type" => "g", + "photo" => "images/twopeople.png", + "name" => $g['gname'], + "id" => $g['id'], + "xid" => $g['hash'], + "uids" => AccessList::members_xchan(local_channel(), $g['id']), + "link" => '' + ]; + } + } + } + + if ($type == '' || $type == 'c' || $type === 'f') { + // Getting info from the abook is better for local users because it contains info about permissions + if (local_channel()) { + // add connections + + $r = q( + "SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, xchan_type, abook_flags, abook_self + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra4 order by xchan_name asc limit $count", + intval(local_channel()) + ); + } else { // Visitors + $r = q( + "SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self + FROM xchan left join xlink on xlink_link = xchan_hash + WHERE xlink_xchan = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc limit $count", + dbesc(get_observer_hash()) + ); + } + if ((count($r) < 100) && $type == 'c') { + $r2 = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self + FROM xchan WHERE xchan_deleted = 0 and xchan_network != 'unknown' $sql_extra2 order by $order_extra2 xchan_name asc limit $count"); + if ($r2) { + $r = array_merge($r, $r2); + $r = unique_multidim_array($r, 'hash'); + } + } + } elseif ($type == 'm') { + $r = []; + $z = q( + "SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d + and xchan_deleted = 0 + $sql_extra3 + ORDER BY xchan_name ASC ", + intval(local_channel()) + ); + if ($z) { + foreach ($z as $zz) { + if (in_array($zz['hash'], $permitted)) { + $r[] = $zz; + } + } + } + } elseif ($type == 'a') { + $r = q( + "SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d + and xchan_deleted = 0 + $sql_extra3 + ORDER BY xchan_name ASC ", + intval(local_channel()) + ); + } elseif ($type == 'z') { + $r = q( + "SELECT xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM xchan left join abook on xchan_hash = abook_xchan + WHERE ( abook_channel = %d OR abook_channel IS NULL ) + and xchan_deleted = 0 + $sql_extra3 + ORDER BY xchan_name ASC ", + intval(local_channel()) + ); + } elseif ($type == 'x') { + $contacts = []; + $r = $this->navbar_complete(); + if ($r) { + foreach ($r as $g) { + $contacts[] = [ + "photo" => $g['photo'], + "name" => $g['name'], + "nick" => $g['address'], + 'link' => (($g['address']) ? $g['address'] : $g['url']), + 'xchan' => $g['hash'] + ]; + } + } + + $o = [ + 'start' => $start, + 'count' => $count, + 'items' => $contacts, + ]; + json_return_and_die($o); + } else { + $r = []; + } + + if ($r) { + foreach ($r as $g) { + if (isset($g['network']) && in_array($g['network'], ['rss', 'anon', 'unknown']) && ($type != 'a')) { + continue; + } + + // 'z' (activity_filter autocomplete) requires an un-encoded hash to prevent double encoding + + if ($type !== 'z') { + $g['hash'] = urlencode($g['hash']); + } + + if (!$g['nick']) { + $g['nick'] = $g['url']; + } + + if (in_array($g['hash'], $permitted) && $type === 'f' && (!$noforums)) { + $contacts[] = [ + "type" => "c", + "photo" => "images/twopeople.png", + "name" => $g['name'], + "id" => urlencode($g['id']), + "xid" => $g['hash'], + "link" => (($g['nick']) ? $g['nick'] : $g['url']), + "nick" => substr($g['nick'], 0, strpos($g['nick'], '@')), + "self" => (intval($g['abook_self']) ? 'abook-self' : ''), + "taggable" => 'taggable', + "label" => t('network') + ]; + } + if ($type !== 'f') { + $contacts[] = [ + "type" => "c", + "photo" => $g['micro'], + "name" => $g['name'], + "id" => urlencode($g['id']), + "xid" => $g['hash'], + "link" => (($g['nick']) ? $g['nick'] : $g['url']), + "nick" => ((strpos($g['nick'], '@')) ? substr($g['nick'], 0, strpos($g['nick'], '@')) : $g['nick']), + "self" => (intval($g['abook_self']) ? 'abook-self' : ''), + "taggable" => '', + "label" => '', + ]; + } + } + } + + $items = array_merge($groups, $contacts); + + $o = [ + 'start' => $start, + 'count' => $count, + 'items' => $items, + ]; + + json_return_and_die($o); + } + + + public function navbar_complete() + { + + // logger('navbar_complete'); + + if (observer_prohibited()) { + return; + } + + $dirmode = intval(get_config('system', 'directory_mode')); + $search = ((x($_REQUEST, 'search')) ? htmlentities($_REQUEST['search'], ENT_COMPAT, 'UTF-8', false) : ''); + if (!$search || mb_strlen($search) < 2) { + return []; + } + + $star = false; + $address = false; + + if (substr($search, 0, 1) === '@') { + $search = substr($search, 1); + } + + if (substr($search, 0, 1) === '*') { + $star = true; + $search = substr($search, 1); + } + + if (strpos($search, '@') !== false) { + $address = true; + } + + + $url = z_root() . '/dirsearch'; + + + $results = []; + + $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 100); + + if ($url) { + $query = $url . '?f='; + $query .= '&name=' . urlencode($search) . "&limit=$count" . (($address) ? '&address=' . urlencode(punify($search)) : ''); + + $x = z_fetch_url($query); + if ($x['success']) { + $t = 0; + $j = json_decode($x['body'], true); + if ($j && $j['results']) { + $results = $j['results']; + } + } + } + return $results; + } +} diff --git a/Code/Module/Activity.php b/Code/Module/Activity.php new file mode 100644 index 000000000..30d564634 --- /dev/null +++ b/Code/Module/Activity.php @@ -0,0 +1,303 @@ + [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + ZlibActivity::ap_schema() + ]], $i); + + $headers = []; + $headers['Content-Type'] = 'application/x-nomad+json'; + $x['signature'] = LDSignatures::sign($x, $chan); + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::url($chan)); + HTTPSig::set_headers($h); + echo $ret; + killme(); + } + + + goaway(z_root() . '/item/' . argv(1)); + } +} + diff --git a/Code/Module/Admin.php b/Code/Module/Admin.php new file mode 100644 index 000000000..db5e203b9 --- /dev/null +++ b/Code/Module/Admin.php @@ -0,0 +1,188 @@ +sm = new SubModule(); + } + + public function init() + { + + logger('admin_init', LOGGER_DEBUG); + + if (!is_site_admin()) { + logger('admin denied.'); + return; + } + + if (argc() > 1) { + $this->sm->call('init'); + } + } + + + public function post() + { + + logger('admin_post', LOGGER_DEBUG); + + if (!is_site_admin()) { + logger('admin denied.'); + return; + } + + if (argc() > 1) { + $this->sm->call('post'); + } + + // goaway(z_root() . '/admin' ); + } + + /** + * @return string + */ + + public function get() + { + + logger('admin_content', LOGGER_DEBUG); + + if (!is_site_admin()) { + logger('admin denied.'); + return login(false); + } + + /* + * Page content + */ + + Navbar::set_selected('Admin'); + + $o = ''; + + if (argc() > 1) { + $o = $this->sm->call('get'); + if ($o === false) { + notice(t('Item not found.')); + } + } else { + $o = $this->admin_page_summary(); + } + + if (is_ajax()) { + echo $o; + killme(); + } else { + return $o; + } + } + + + /** + * @brief Returns content for Admin Summary Page. + * + * @return string HTML from parsed admin_summary.tpl + */ + + public function admin_page_summary() + { + + // list total user accounts, expirations etc. + $accounts = []; + $r = q( + "SELECT COUNT(CASE WHEN account_id > 0 THEN 1 ELSE NULL END) AS total, COUNT(CASE WHEN account_expires > %s THEN 1 ELSE NULL END) AS expiring, COUNT(CASE WHEN account_expires < %s AND account_expires > '%s' THEN 1 ELSE NULL END) AS expired, COUNT(CASE WHEN (account_flags & %d)>0 THEN 1 ELSE NULL END) AS blocked FROM account", + db_utcnow(), + db_utcnow(), + dbesc(NULL_DATE), + intval(ACCOUNT_BLOCKED) + ); + if ($r) { + $accounts['total'] = ['label' => t('Accounts'), 'val' => $r[0]['total']]; + $accounts['blocked'] = ['label' => t('Blocked accounts'), 'val' => $r[0]['blocked']]; + $accounts['expired'] = ['label' => t('Expired accounts'), 'val' => $r[0]['expired']]; + $accounts['expiring'] = ['label' => t('Expiring accounts'), 'val' => $r[0]['expiring']]; + } + + // pending registrations + + $pdg = q( + "SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) > 0 ", + intval(ACCOUNT_PENDING) + ); + + $pending = (($pdg) ? count($pdg) : 0); + + // available channels, primary and clones + $channels = []; + $r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE channel_removed = 0 and channel_system = 0"); + if ($r) { + $channels['total'] = ['label' => t('Channels'), 'val' => $r[0]['total']]; + $channels['main'] = ['label' => t('Primary'), 'val' => $r[0]['main']]; + $channels['clones'] = ['label' => t('Clones'), 'val' => $r[0]['clones']]; + } + + // We can do better, but this is a quick queue status + $r = q("SELECT COUNT(outq_delivered) AS total FROM outq WHERE outq_delivered = 0"); + $queue = (($r) ? $r[0]['total'] : 0); + $queues = ['label' => t('Message queues'), 'queue' => $queue]; + + $plugins = Addon::list_installed(); + + // Could be extended to provide also other alerts to the admin + + $alertmsg = ''; + + $upgrade = EMPTY_STR; + + if ((!defined('PLATFORM_ARCHITECTURE')) || (PLATFORM_ARCHITECTURE === 'zap')) { + $vrelease = get_repository_version('release'); + $vdev = get_repository_version('dev'); + $upgrade = ((version_compare(STD_VERSION, $vrelease) < 0) ? t('Your software should be updated') : ''); + } + + $t = Theme::get_template('admin_summary.tpl'); + return replace_macros($t, [ + '$title' => t('Administration'), + '$page' => t('Summary'), + '$adminalertmsg' => $alertmsg, + '$queues' => $queues, + '$accounts' => [t('Registered accounts'), $accounts], + '$pending' => [t('Pending registrations'), $pending], + '$channels' => [t('Registered channels'), $channels], + '$plugins' => (($plugins) ? [t('Active addons'), $plugins] : EMPTY_STR), + '$version' => [t('Version'), STD_VERSION], + '$vmaster' => [t('Repository version (release)'), $vrelease], + '$vdev' => [t('Repository version (dev)'), $vdev], + '$upgrade' => $upgrade, + '$build' => Config::Get('system', 'db_version') + ]); + } +} diff --git a/Code/Module/Admin/Account_edit.php b/Code/Module/Admin/Account_edit.php new file mode 100644 index 000000000..9d941d630 --- /dev/null +++ b/Code/Module/Admin/Account_edit.php @@ -0,0 +1,86 @@ + 2) { + $account_id = argv(2); + } + + $x = q( + "select * from account where account_id = %d limit 1", + intval($account_id) + ); + + if (!$x) { + notice(t('Account not found.') . EOL); + return ''; + } + + + $a = replace_macros(Theme::get_template('admin_account_edit.tpl'), [ + '$account' => $x[0], + '$title' => t('Account Edit'), + '$pass1' => ['pass1', t('New Password'), ' ', ''], + '$pass2' => ['pass2', t('New Password again'), ' ', ''], + '$account_language' => ['account_language', t('Account language (for emails)'), $x[0]['account_language'], '', language_list()], + '$service_class' => ['service_class', t('Service class'), $x[0]['account_service_class'], ''], + '$submit' => t('Submit'), + ]); + + return $a; + } +} diff --git a/Code/Module/Admin/Accounts.php b/Code/Module/Admin/Accounts.php new file mode 100644 index 000000000..085af4a10 --- /dev/null +++ b/Code/Module/Admin/Accounts.php @@ -0,0 +1,215 @@ + 2) { + $uid = argv(3); + $account = q( + "SELECT * FROM account WHERE account_id = %d", + intval($uid) + ); + + if (!$account) { + notice(t('Account not found') . EOL); + goaway(z_root() . '/admin/accounts'); + } + + check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts', 't'); + + switch (argv(2)) { + case 'delete': + // delete user + Account::remove($uid, true, false); + + notice(sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL); + break; + case 'block': + q( + "UPDATE account SET account_flags = ( account_flags | %d ) WHERE account_id = %d", + intval(ACCOUNT_BLOCKED), + intval($uid) + ); + + notice(sprintf(t("Account '%s' blocked"), $account[0]['account_email']) . EOL); + break; + case 'unblock': + q( + "UPDATE account SET account_flags = ( account_flags & ~ %d ) WHERE account_id = %d", + intval(ACCOUNT_BLOCKED), + intval($uid) + ); + + notice(sprintf(t("Account '%s' unblocked"), $account[0]['account_email']) . EOL); + break; + } + + goaway(z_root() . '/admin/accounts'); + } + + /* get pending */ + $pending = q( + "SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) != 0 ", + intval(ACCOUNT_PENDING) + ); + + /* get accounts */ + + $total = q("SELECT count(*) as total FROM account"); + if (count($total)) { + App::set_pager_total($total[0]['total']); + App::set_pager_itemspage(100); + } + + $serviceclass = (($_REQUEST['class']) ? " and account_service_class = '" . dbesc($_REQUEST['class']) . "' " : ''); + + $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'account_id'); + $dir = 'asc'; + if (array_key_exists('dir', $_REQUEST)) { + $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc'); + } + + $base = z_root() . '/admin/accounts?f='; + $odir = (($dir === 'asc') ? '0' : '1'); + + $users = q( + "SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked, + (SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac + where true $serviceclass and account_flags != %d order by $key $dir limit %d offset %d ", + intval(ACCOUNT_BLOCKED), + db_concat('ch.channel_address', ' '), + intval(ACCOUNT_BLOCKED | ACCOUNT_PENDING), + intval(App::$pager['itemspage']), + intval(App::$pager['start']) + ); + + if ($users) { + for ($x = 0; $x < count($users); $x++) { + $channel_arr = explode(' ', $users[$x]['channels']); + if ($channel_arr) { + $linked = []; + foreach ($channel_arr as $c) { + $linked[] = '' . $c . ''; + } + $users[$x]['channels'] = implode(' ', $linked); + } + } + } + + $t = + $o = replace_macros(Theme::get_template('admin_accounts.tpl'), [ + '$title' => t('Administration'), + '$page' => t('Accounts'), + '$submit' => t('Submit'), + '$select_all' => t('select all'), + '$h_pending' => t('Registrations waiting for confirm'), + '$th_pending' => array(t('Request date'), t('Email')), + '$no_pending' => t('No registrations.'), + '$approve' => t('Approve'), + '$deny' => t('Deny'), + '$delete' => t('Delete'), + '$block' => t('Block'), + '$unblock' => t('Unblock'), + '$odir' => $odir, + '$base' => $base, + '$h_users' => t('Accounts'), + '$th_users' => [ + [t('ID'), 'account_id'], + [t('Email'), 'account_email'], + [t('All Channels'), 'channels'], + [t('Register date'), 'account_created'], + [t('Last login'), 'account_lastlog'], + [t('Expires'), 'account_expires'], + [t('Service Class'), 'account_service_class'] + ], + '$confirm_delete_multi' => t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?'), + '$confirm_delete' => t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?'), + '$form_security_token' => get_form_security_token("admin_accounts"), + '$baseurl' => z_root(), + '$pending' => $pending, + '$users' => $users, + ]); + + $o .= paginate($a); + + return $o; + } +} diff --git a/Code/Module/Admin/Addons.php b/Code/Module/Admin/Addons.php new file mode 100644 index 000000000..e4b43c067 --- /dev/null +++ b/Code/Module/Admin/Addons.php @@ -0,0 +1,480 @@ + 2 && is_file("addon/" . argv(2) . "/" . argv(2) . ".php")) { + @include_once("addon/" . argv(2) . "/" . argv(2) . ".php"); + if (function_exists(argv(2) . '_plugin_admin_post')) { + $func = argv(2) . '_plugin_admin_post'; + $func($a); + } + + goaway(z_root() . '/admin/addons/' . argv(2)); + } elseif (argc() > 2) { + switch (argv(2)) { + case 'updaterepo': + if (array_key_exists('repoName', $_REQUEST)) { + $repoName = $_REQUEST['repoName']; + } else { + json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); + } + $extendDir = 'cache/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + $repoDir = 'cache/git/sys/extend/addon/' . $repoName; + if (!is_dir($repoDir)) { + logger('Repo directory does not exist: ' . $repoDir); + json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); + } + if (!is_writable($repoDir)) { + logger('Repo directory not writable to web server: ' . $repoDir); + json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false)); + } + $git = new GitRepo('sys', null, false, $repoName, $repoDir); + try { + if ($git->pull()) { + $files = array_diff(scandir($repoDir), array('.', '..')); + foreach ($files as $file) { + if (is_dir($repoDir . '/' . $file) && $file !== '.git') { + $source = '../extend/addon/' . $repoName . '/' . $file; + $target = realpath('addon/') . '/' . $file; + unlink($target); + if (!symlink($source, $target)) { + logger('Error linking addons to /addon'); + json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false)); + } + } + } + json_return_and_die(array('message' => 'Repo updated.', 'success' => true)); + } else { + json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); + } + } catch (GitException $e) { + json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false)); + } + case 'removerepo': + if (array_key_exists('repoName', $_REQUEST)) { + $repoName = $_REQUEST['repoName']; + } else { + json_return_and_die(array('message' => 'No repo name provided.', 'success' => false)); + } + $extendDir = 'cache/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + $repoDir = 'cache/git/sys/extend/addon/' . $repoName; + if (!is_dir($repoDir)) { + logger('Repo directory does not exist: ' . $repoDir); + json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false)); + } + if (!is_writable($repoDir)) { + logger('Repo directory not writable to web server: ' . $repoDir); + json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false)); + } + /// @TODO remove directory and unlink /addon/files + if (rrmdir($repoDir)) { + json_return_and_die(array('message' => 'Repo deleted.', 'success' => true)); + } else { + json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false)); + } + case 'installrepo': + if (array_key_exists('repoURL', $_REQUEST)) { + $repoURL = $_REQUEST['repoURL']; + $extendDir = 'cache/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + if (!is_writable($extendDir)) { + logger('Directory not writable to web server: ' . $extendDir); + json_return_and_die(array('message' => 'Directory not writable to web server.', 'success' => false)); + } + $repoName = null; + if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') { + $repoName = $_REQUEST['repoName']; + } else { + $repoName = GitRepo::getRepoNameFromURL($repoURL); + } + if (!$repoName) { + logger('Invalid git repo'); + json_return_and_die(array('message' => 'Invalid git repo', 'success' => false)); + } + $repoDir = $addonDir . '/' . $repoName; + $tempRepoBaseDir = 'cache/git/sys/temp/'; + $tempAddonDir = $tempRepoBaseDir . $repoName; + + if (!is_writable($addonDir) || !is_writable($tempAddonDir)) { + logger('Temp repo directory or /extend/addon not writable to web server: ' . $tempAddonDir); + json_return_and_die(array('message' => 'Temp repo directory not writable to web server.', 'success' => false)); + } + rename($tempAddonDir, $repoDir); + + if (!is_writable(realpath('addon/'))) { + logger('/addon directory not writable to web server: ' . $tempAddonDir); + json_return_and_die(array('message' => '/addon directory not writable to web server.', 'success' => false)); + } + $files = array_diff(scandir($repoDir), array('.', '..')); + foreach ($files as $file) { + if (is_dir($repoDir . '/' . $file) && $file !== '.git') { + $source = '../extend/addon/' . $repoName . '/' . $file; + $target = realpath('addon/') . '/' . $file; + unlink($target); + if (!symlink($source, $target)) { + logger('Error linking addons to /addon'); + json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false)); + } + } + } + $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir); + $repo = $git->probeRepo(); + json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true)); + } + case 'addrepo': + if (array_key_exists('repoURL', $_REQUEST)) { + $repoURL = $_REQUEST['repoURL']; + $extendDir = 'cache/git/sys/extend'; + $addonDir = $extendDir . '/addon'; + $tempAddonDir = realpath('cache') . '/git/sys/temp'; + if (!file_exists($extendDir)) { + if (!mkdir($extendDir, 0770, true)) { + logger('Error creating extend folder: ' . $extendDir); + json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false)); + } else { + if (!symlink(realpath('extend/addon'), $addonDir)) { + logger('Error creating symlink to addon folder: ' . $addonDir); + json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false)); + } + } + } + if (!is_dir($tempAddonDir)) { + if (!mkdir($tempAddonDir, 0770, true)) { + logger('Error creating temp plugin repo folder: ' . $tempAddonDir); + json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $tempAddonDir, 'success' => false)); + } + } + $repoName = null; + if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') { + $repoName = $_REQUEST['repoName']; + } else { + $repoName = GitRepo::getRepoNameFromURL($repoURL); + } + if (!$repoName) { + logger('Invalid git repo'); + json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false)); + } + $repoDir = $tempAddonDir . '/' . $repoName; + if (!is_writable($tempAddonDir)) { + logger('Temporary directory for new addon repo is not writable to web server: ' . $tempAddonDir); + json_return_and_die(array('message' => 'Temporary directory for new addon repo is not writable to web server.', 'success' => false)); + } + // clone the repo if new automatically + $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); + + $remotes = $git->git->remote(); + $fetchURL = $remotes['origin']['fetch']; + if ($fetchURL !== $git->url) { + if (rrmdir($repoDir)) { + $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir); + } else { + json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false)); + } + } + $repo = $git->probeRepo(); + $repo['readme'] = $repo['manifest'] = null; + foreach ($git->git->tree('master') as $object) { + if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) { + $repo['readme'] = MarkdownExtra::defaultTransform($git->git->cat->blob($object['hash'])); + } elseif ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') { + $repo['manifest'] = $git->git->cat->blob($object['hash']); + } + } + json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true)); + } else { + json_return_and_die(array('message' => 'No repo URL provided', 'success' => false)); + } + break; + default: + break; + } + } + } + + /** + * @brief Addons admin page. + * + * @return string with parsed HTML + */ + public function get() + { + + /* + * Single plugin + */ + + if (App::$argc == 3) { + $plugin = App::$argv[2]; + if (!is_file("addon/$plugin/$plugin.php")) { + notice(t("Item not found.")); + return ''; + } + + $enabled = in_array($plugin, Addon::list_installed()); + $info = Addon::get_info($plugin); + $x = check_plugin_versions($info); + + // disable plugins which are installed but incompatible versions + + if ($enabled && !$x) { + $enabled = false; + uninstall_plugin($plugin); + } + $info['disabled'] = 1 - intval($x); + + if (x($_GET, "a") && $_GET['a'] == "t") { + check_form_security_token_redirectOnErr('/admin/addons', 'admin_addons', 't'); + $pinstalled = false; + // Toggle plugin status + $idx = array_search($plugin, Addon::list_installed()); + if ($idx !== false) { + Addon::uninstall($plugin); + $pinstalled = false; + info(sprintf(t("Plugin %s disabled."), $plugin)); + } else { + Addon::install($plugin); + $pinstalled = true; + info(sprintf(t("Plugin %s enabled."), $plugin)); + } + + if ($pinstalled) { + @require_once("addon/$plugin/$plugin.php"); + if (function_exists($plugin . '_plugin_admin')) { + goaway(z_root() . '/admin/addons/' . $plugin); + } + } + goaway(z_root() . '/admin/addons'); + } + + // display plugin details + + if (in_array($plugin, Addon::list_installed())) { + $status = 'on'; + $action = t('Disable'); + } else { + $status = 'off'; + $action = t('Enable'); + } + + $readme = null; + if (is_file("addon/$plugin/README.md")) { + $readme = file_get_contents("addon/$plugin/README.md"); + $readme = MarkdownExtra::defaultTransform($readme); + } elseif (is_file("addon/$plugin/README")) { + $readme = "
      " . file_get_contents("addon/$plugin/README") . "
      "; + } + + $admin_form = ''; + + $r = q( + "select * from addon where plugin_admin = 1 and aname = '%s' limit 1", + dbesc($plugin) + ); + + if ($r) { + @require_once("addon/$plugin/$plugin.php"); + if (function_exists($plugin . '_plugin_admin')) { + $func = $plugin . '_plugin_admin'; + $func($a, $admin_form); + } + } + + + $t = Theme::get_template('admin_plugins_details.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Addons'), + '$toggle' => t('Toggle'), + '$settings' => t('Settings'), + '$baseurl' => z_root(), + + '$plugin' => $plugin, + '$status' => $status, + '$action' => $action, + '$info' => $info, + '$str_author' => t('Author: '), + '$str_maintainer' => t('Maintainer: '), + '$str_minversion' => t('Minimum project version: '), + '$str_maxversion' => t('Maximum project version: '), + '$str_minphpversion' => t('Minimum PHP version: '), + '$str_serverroles' => t('Compatible Server Roles: '), + '$str_requires' => t('Requires: '), + '$disabled' => t('Disabled - version incompatibility'), + + '$admin_form' => $admin_form, + '$function' => 'addons', + '$screenshot' => '', + '$readme' => $readme, + + '$form_security_token' => get_form_security_token('admin_addons'), + )); + } + + + /* + * List plugins + */ + $plugins = []; + $files = glob('addon/*/'); + if ($files) { + foreach ($files as $file) { + if ($file === 'addon/vendor/') { + continue; + } + if (is_dir($file)) { + list($tmp, $id) = array_map('trim', explode('/', $file)); + $info = Addon::get_info($id); + $enabled = in_array($id, App::$plugins); + $x = check_plugin_versions($info); + + // disable plugins which are installed but incompatible versions + + if ($enabled && !$x) { + $enabled = false; + $idz = array_search($id, Addon::list_installed()); + if ($idz !== false) { + uninstall_plugin($id); + } + } + $info['disabled'] = 1 - intval($x); + + $plugins[] = array($id, (($enabled) ? "on" : "off"), $info); + } + } + } + + usort($plugins, 'self::plugin_sort'); + + $allowManageRepos = false; + if (is_writable('extend/addon') && is_writable('cache')) { + $allowManageRepos = true; + } + + $admin_plugins_add_repo_form = replace_macros( + Theme::get_template('admin_plugins_addrepo.tpl'), + array( + '$post' => 'admin/addons/addrepo', + '$desc' => t('Enter the public git repository URL of the addon repo.'), + '$repoURL' => array('repoURL', t('Addon repo git URL'), '', ''), + '$repoName' => array('repoName', t('Custom repo name'), '', '', t('(optional)')), + '$submit' => t('Download Addon Repo') + ) + ); + $newRepoModalID = random_string(3); + $newRepoModal = replace_macros( + Theme::get_template('generic_modal.tpl'), + array( + '$id' => $newRepoModalID, + '$title' => t('Install new repo'), + '$ok' => t('Install'), + '$cancel' => t('Cancel') + ) + ); + + $reponames = $this->listAddonRepos(); + $addonrepos = []; + foreach ($reponames as $repo) { + $addonrepos[] = array('name' => $repo, 'description' => ''); + /// @TODO Parse repo info to provide more information about repos + } + + $t = Theme::get_template('admin_plugins.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Addons'), + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$function' => 'addons', + '$plugins' => $plugins, + '$disabled' => t('Disabled - version incompatibility'), + '$form_security_token' => get_form_security_token('admin_addons'), + '$allowManageRepos' => $allowManageRepos, + '$managerepos' => t('Manage Repos'), + '$installedtitle' => t('Installed Addon Repositories'), + '$addnewrepotitle' => t('Install a New Addon Repository'), + '$expandform' => false, + '$form' => $admin_plugins_add_repo_form, + '$newRepoModal' => $newRepoModal, + '$newRepoModalID' => $newRepoModalID, + '$addonrepos' => $addonrepos, + '$repoUpdateButton' => t('Update'), + '$repoBranchButton' => t('Switch branch'), + '$repoRemoveButton' => t('Remove') + )); + } + + public function listAddonRepos() + { + $addonrepos = []; + $addonDir = 'extend/addon/'; + if (is_dir($addonDir)) { + if ($handle = opendir($addonDir)) { + while (false !== ($entry = readdir($handle))) { + if ($entry != "." && $entry != "..") { + $addonrepos[] = $entry; + } + } + closedir($handle); + } + } + return $addonrepos; + } + + public static function plugin_sort($a, $b) + { + return (strcmp(strtolower($a[2]['name']), strtolower($b[2]['name']))); + } +} diff --git a/Code/Module/Admin/Channels.php b/Code/Module/Admin/Channels.php new file mode 100644 index 000000000..26d7731de --- /dev/null +++ b/Code/Module/Admin/Channels.php @@ -0,0 +1,203 @@ + 2) { + $uid = argv(3); + $channel = q( + "SELECT * FROM channel WHERE channel_id = %d", + intval($uid) + ); + + if (!$channel) { + notice(t('Channel not found') . EOL); + goaway(z_root() . '/admin/channels'); + } + + switch (argv(2)) { + case "delete": + { + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); + // delete channel + Channel::channel_remove($uid, true); + + notice(sprintf(t("Channel '%s' deleted"), $channel[0]['channel_name']) . EOL); + } + break; + + case "block": + { + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); + $pflags = $channel[0]['channel_pageflags'] ^ PAGE_CENSORED; + q( + "UPDATE channel SET channel_pageflags = %d where channel_id = %d", + intval($pflags), + intval($uid) + ); + Run::Summon(['Directory', $uid, 'nopush']); + + notice(sprintf((($pflags & PAGE_CENSORED) ? t("Channel '%s' censored") : t("Channel '%s' uncensored")), $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')') . EOL); + } + break; + + case "code": + { + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); + $pflags = $channel[0]['channel_pageflags'] ^ PAGE_ALLOWCODE; + q( + "UPDATE channel SET channel_pageflags = %d where channel_id = %d", + intval($pflags), + intval($uid) + ); + + notice(sprintf((($pflags & PAGE_ALLOWCODE) ? t("Channel '%s' code allowed") : t("Channel '%s' code disallowed")), $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')') . EOL); + } + break; + + default: + break; + } + goaway(z_root() . '/admin/channels'); + } + + $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'channel_id'); + $dir = 'asc'; + if (array_key_exists('dir', $_REQUEST)) { + $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc'); + } + + $base = z_root() . '/admin/channels?f='; + $odir = (($dir === 'asc') ? '0' : '1'); + + /* get channels */ + + $total = q("SELECT count(*) as total FROM channel where channel_removed = 0 and channel_system = 0"); + if ($total) { + App::set_pager_total($total[0]['total']); + App::set_pager_itemspage(100); + } + + $channels = q( + "SELECT * from channel where channel_removed = 0 and channel_system = 0 order by $key $dir limit %d offset %d ", + intval(App::$pager['itemspage']), + intval(App::$pager['start']) + ); + + if ($channels) { + for ($x = 0; $x < count($channels); $x++) { + if ($channels[$x]['channel_pageflags'] & PAGE_CENSORED) { + $channels[$x]['blocked'] = true; + } else { + $channels[$x]['blocked'] = false; + } + + if ($channels[$x]['channel_pageflags'] & PAGE_ALLOWCODE) { + $channels[$x]['allowcode'] = true; + } else { + $channels[$x]['allowcode'] = false; + } + + $channels[$x]['channel_link'] = z_root() . '/channel/' . $channels[$x]['channel_address']; + } + } + + Hook::call('admin_channels', $channels); + + $o = replace_macros(Theme::get_template('admin_channels.tpl'), [ + // strings // + '$title' => t('Administration'), + '$page' => t('Channels'), + '$submit' => t('Submit'), + '$select_all' => t('select all'), + '$delete' => t('Delete'), + '$block' => t('Censor'), + '$unblock' => t('Uncensor'), + '$code' => t('Allow Code'), + '$uncode' => t('Disallow Code'), + '$h_channels' => t('Channel'), + '$base' => $base, + '$odir' => $odir, + '$th_channels' => array( + [t('UID'), 'channel_id'], + [t('Name'), 'channel_name'], + [t('Address'), 'channel_address']), + + '$confirm_delete_multi' => t('Selected channels will be deleted!\n\nEverything that was posted in these channels on this site will be permanently deleted!\n\nAre you sure?'), + '$confirm_delete' => t('The channel {0} will be deleted!\n\nEverything that was posted in this channel on this site will be permanently deleted!\n\nAre you sure?'), + + '$form_security_token' => get_form_security_token('admin_channels'), + + // values // + '$baseurl' => z_root(), + '$channels' => $channels, + ]); + $o .= paginate($a); + + return $o; + } +} diff --git a/Code/Module/Admin/Cover_photo.php b/Code/Module/Admin/Cover_photo.php new file mode 100644 index 000000000..8a5963d5a --- /dev/null +++ b/Code/Module/Admin/Cover_photo.php @@ -0,0 +1,448 @@ + 0 order by imgscale asc LIMIT 1", + dbesc($image_id), + intval($channel['channel_id']) + ); + + if ($r) { + $max_thumb = intval(get_config('system', 'max_thumbnail', 1600)); + $iscaled = false; + if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { + $imagick_path = get_config('system', 'imagick_convert_path'); + if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + $fname = dbunescbin($r[0]['content']); + $tmp_name = $fname . '-001'; + $newsize = photo_calculate_scale(array_merge(getimagesize($fname), ['max' => $max_thumb])); + $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); + // logger('imagick thumbnail command: ' . $cmd); + for ($x = 0; $x < 4; $x++) { + exec($cmd); + if (file_exists($tmp_name)) { + break; + } + } + if (file_exists($tmp_name)) { + $base_image = $r[0]; + $gis = getimagesize($tmp_name); + logger('gis: ' . print_r($gis, true)); + $base_image['width'] = $gis[0]; + $base_image['height'] = $gis[1]; + $base_image['content'] = @file_get_contents($tmp_name); + $iscaled = true; + @unlink($tmp_name); + } + } + } + if (!$iscaled) { + $base_image = $r[0]; + $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); + } + + $im = photo_factory($base_image['content'], $base_image['mimetype']); + if ($im->is_valid()) { + // We are scaling and cropping the relative pixel locations to the original photo instead of the + // scaled photo we operated on. + + // First load the scaled photo to check its size. (Should probably pass this in the post form and save + // a query.) + + $g = q( + "select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3", + dbesc($image_id), + intval($channel['channel_id']) + ); + + + $scaled_width = $g[0]['width']; + $scaled_height = $g[0]['height']; + + if ((!$scaled_width) || (!$scaled_height)) { + logger('potential divide by zero scaling cover photo'); + return; + } + + // unset all other cover photos + + q( + "update photo set photo_usage = %d where photo_usage = %d and uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_COVER), + intval($channel['channel_id']) + ); + + $orig_srcx = ($base_image['width'] / $scaled_width) * $srcX; + $orig_srcy = ($base_image['height'] / $scaled_height) * $srcY; + $orig_srcw = ($srcW / $scaled_width) * $base_image['width']; + $orig_srch = ($srcH / $scaled_height) * $base_image['height']; + + $im->cropImageRect(1200, 435, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch); + + $aid = get_account_id(); + + $p = [ + 'aid' => 0, + 'uid' => $channel['channel_id'], + 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], + 'album' => t('Cover Photos'), + 'os_path' => $base_image['os_path'], + 'display_path' => $base_image['display_path'], + 'created' => $base_image['created'], + 'edited' => $base_image['edited'] + ]; + + $p['imgscale'] = 7; + $p['photo_usage'] = PHOTO_COVER; + + $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200); + + $im->doScaleImage(850, 310); + $p['imgscale'] = 8; + + $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850); + + $im->doScaleImage(425, 160); + $p['imgscale'] = 9; + + $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425); + + if ($r1 === false || $r2 === false || $r3 === false) { + // if one failed, delete them all so we can start over. + notice(t('Image resize failed.') . EOL); + $x = q( + "delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ", + dbesc($base_image['resource_id']), + intval($channel['channel_id']) + ); + return; + } + } else { + notice(t('Unable to process image') . EOL); + } + } + + goaway(z_root() . '/admin'); + } + + + $hash = photo_new_resource(); + $smallest = 0; + + $matches = []; + $partial = false; + + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true)); + $partial = true; + } + } + + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); + + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } + + $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Cover Photos'), 'hash' => $hash)); + + logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG); + + json_return_and_die(['message' => $hash]); + } + + + /** + * @brief Generate content of profile-photo view + * + * @return string + * + */ + + + public function get() + { + + if (!is_site_admin()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = Channel::get_system(); + + $newuser = false; + + if (argc() == 3 && argv(1) === 'new') { + $newuser = true; + } + + + if (argv(2) === 'reset') { + q( + "update photo set photo_usage = %d where photo_usage = %d and uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_COVER), + intval($channel['channel_id']) + ); + } + + if (argv(2) === 'use') { + if (argc() < 4) { + notice(t('Permission denied.') . EOL); + return; + } + + // check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo'); + + $resource_id = argv(3); + + $r = q( + "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC", + intval($channel['channel_id']), + dbesc($resource_id) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + $havescale = false; + foreach ($r as $rr) { + if ($rr['imgscale'] == 7) { + $havescale = true; + } + } + + $r = q( + "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", + intval($r[0]['id']), + intval($channel['channel_id']) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + + if (intval($r[0]['os_storage'])) { + $data = @file_get_contents(dbunescbin($r[0]['content'])); + } else { + $data = dbunescbin($r[0]['content']); + } + + $ph = photo_factory($data, $r[0]['mimetype']); + $smallest = 0; + if ($ph->is_valid()) { + // go ahead as if we have just uploaded a new photo to crop + $i = q( + "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0", + dbesc($r[0]['resource_id']), + intval($channel['channel_id']) + ); + + if ($i) { + $hash = $i[0]['resource_id']; + foreach ($i as $ii) { + $smallest = intval($ii['imgscale']); + } + } + } + + $this->cover_photo_crop_ui_head($ph, $hash, $smallest); + } + + + if (!array_key_exists('imagecrop', App::$data)) { + $o .= replace_macros(Theme::get_template('admin_cover_photo.tpl'), [ + '$user' => $channel['channel_address'], + '$channel_id' => $channel['channel_id'], + '$info' => t('Your cover photo may be visible to anybody on the internet'), + '$existing' => Channel::get_cover_photo($channel['channel_id'], 'array', PHOTO_RES_COVER_850), + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => t('Change Cover Photo'), + '$submit' => t('Upload'), + '$profiles' => $profiles, + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$select' => t('Select previously uploaded photo'), + + ]); + + Hook::call('cover_photo_content_end', $o); + + return $o; + } else { + $filename = App::$data['imagecrop'] . '-3'; + $resolution = 3; + + $o .= replace_macros(Theme::get_template('admin_cropcover.tpl'), [ + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => App::$data['imagecrop'] . '-3', + '$image_url' => z_root() . '/photo/' . $filename, + '$title' => t('Crop Image'), + '$desc' => t('Please adjust the image cropping for optimum viewing.'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$done' => t('Done Editing') + ]); + return $o; + } + } + + /* @brief Generate the UI for photo-cropping + * + * @param $a Current application + * @param $ph Photo-Factory + * @return void + * + */ + + public function cover_photo_crop_ui_head($ph, $hash, $smallest) + { + + $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH); + + if ($max_length > 0) { + $ph->scaleImage($max_length); + } + + $width = $ph->getWidth(); + $height = $ph->getHeight(); + + if ($width < 300 || $height < 300) { + $ph->scaleImageUp(240); + $width = $ph->getWidth(); + $height = $ph->getHeight(); + } + + + App::$data['imagecrop'] = $hash; + App::$data['imagecrop_resolution'] = $smallest; + App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []); + return; + } +} diff --git a/Code/Module/Admin/Dbsync.php b/Code/Module/Admin/Dbsync.php new file mode 100644 index 000000000..a2d1dfea9 --- /dev/null +++ b/Code/Module/Admin/Dbsync.php @@ -0,0 +1,111 @@ + 3 && intval(argv(3)) && argv(2) === 'mark') { + // remove the old style config if it exists + del_config('database', 'update_r' . intval(argv(3))); + set_config('database', '_' . intval(argv(3)), 'success'); + if (intval(get_config('system', 'db_version')) < intval(argv(3))) { + set_config('system', 'db_version', intval(argv(3))); + } + info(t('Update has been marked successful') . EOL); + goaway(z_root() . '/admin/dbsync'); + } + + if (argc() > 3 && intval(argv(3)) && argv(2) === 'verify') { + $s = '_' . intval(argv(3)); + $cls = '\\Code\Update\\' . $s; + if (class_exists($cls)) { + $c = new $cls(); + if (method_exists($c, 'verify')) { + $retval = $c->verify(); + if ($retval === UPDATE_FAILED) { + $o .= sprintf(t('Verification of update %s failed. Check system logs.'), $s); + } elseif ($retval === UPDATE_SUCCESS) { + $o .= sprintf(t('Update %s was successfully applied.'), $s); + set_config('database', $s, 'success'); + } else { + $o .= sprintf(t('Verifying update %s did not return a status. Unknown if it succeeded.'), $s); + } + } else { + $o .= sprintf(t('Update %s does not contain a verification function.'), $s); + } + } else { + $o .= sprintf(t('Update function %s could not be found.'), $s); + } + + return $o; + + + // remove the old style config if it exists + del_config('database', 'update_r' . intval(argv(3))); + set_config('database', '_' . intval(argv(3)), 'success'); + if (intval(get_config('system', 'db_version')) < intval(argv(3))) { + set_config('system', 'db_version', intval(argv(3))); + } + info(t('Update has been marked successful') . EOL); + goaway(z_root() . '/admin/dbsync'); + } + + if (argc() > 2 && intval(argv(2))) { + $x = intval(argv(2)); + $s = '_' . $x; + $cls = '\\Code\Update\\' . $s; + if (class_exists($cls)) { + $c = new $cls(); + $retval = $c->run(); + if ($retval === UPDATE_FAILED) { + $o .= sprintf(t('Executing update procedure %s failed. Check system logs.'), $s); + } elseif ($retval === UPDATE_SUCCESS) { + $o .= sprintf(t('Update %s was successfully applied.'), $s); + set_config('database', $s, 'success'); + } else { + $o .= sprintf(t('Update %s did not return a status. It cannot be determined if it was successful.'), $s); + } + } else { + $o .= sprintf(t('Update function %s could not be found.'), $s); + } + + return $o; + } + + $failed = []; + $r = q("select * from config where cat = 'database' "); + if (count($r)) { + foreach ($r as $rr) { + $upd = intval(substr($rr['k'], -4)); + if ($rr['v'] === 'success') { + continue; + } + $failed[] = $upd; + } + } + if (count($failed)) { + $o = replace_macros(Theme::get_template('failed_updates.tpl'), array( + '$base' => z_root(), + '$banner' => t('Failed Updates'), + '$desc' => '', + '$mark' => t('Mark success (if update was manually applied)'), + '$verify' => t('Attempt to verify this update if a verification procedure exists'), + '$apply' => t('Attempt to execute this update step automatically'), + '$failed' => $failed + )); + } else { + return '

      ' . t('No failed updates.') . '

      '; + } + return $o; + } +} + diff --git a/Code/Module/Admin/Logs.php b/Code/Module/Admin/Logs.php new file mode 100644 index 000000000..329f4063f --- /dev/null +++ b/Code/Module/Admin/Logs.php @@ -0,0 +1,101 @@ + 'Normal', + LOGGER_TRACE => 'Trace', + LOGGER_DEBUG => 'Debug', + LOGGER_DATA => 'Data', + LOGGER_ALL => 'All' + ); + + $t = Theme::get_template('admin_logs.tpl'); + + $f = get_config('system', 'logfile'); + + $data = ''; + + if (!file_exists($f)) { + $data = t("Error trying to open $f log file.\r\n
      Check to see if file $f exist and is + readable."); + } else { + $fp = fopen($f, 'r'); + if (!$fp) { + $data = t("Couldn't open $f log file.\r\n
      Check to see if file $f is readable."); + } else { + $fstat = fstat($fp); + $size = $fstat['size']; + if ($size != 0) { + if ($size > 5000000 || $size < 0) { + $size = 5000000; + } + $seek = fseek($fp, 0 - $size, SEEK_END); + if ($seek === 0) { + $data = escape_tags(fread($fp, $size)); + while (!feof($fp)) { + $data .= escape_tags(fread($fp, 4096)); + } + } + } + fclose($fp); + } + } + + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Logs'), + '$submit' => t('Submit'), + '$clear' => t('Clear'), + '$data' => $data, + '$baseurl' => z_root(), + '$logname' => get_config('system', 'logfile'), + + // name, label, value, help string, extra data... + '$debugging' => array('debugging', t("Debugging"), get_config('system', 'debugging'), ""), + '$logfile' => array('logfile', t("Log file"), get_config('system', 'logfile'), t("Must be writable by web server. Relative to your top-level webserver directory.")), + '$loglevel' => array('loglevel', t("Log level"), get_config('system', 'loglevel'), "", $log_choices), + + '$form_security_token' => get_form_security_token('admin_logs'), + )); + } +} diff --git a/Code/Module/Admin/Profile_photo.php b/Code/Module/Admin/Profile_photo.php new file mode 100644 index 000000000..039fe4a13 --- /dev/null +++ b/Code/Module/Admin/Profile_photo.php @@ -0,0 +1,540 @@ +is_valid()) { + $im->cropImage(300, $srcX, $srcY, $srcW, $srcH); + + $aid = 0; + + $p = [ + 'aid' => $aid, + 'uid' => $channel['channel_id'], + 'resource_id' => $base_image['resource_id'], + 'filename' => $base_image['filename'], + 'album' => t('Profile Photos'), + 'os_path' => $base_image['os_path'], + 'display_path' => $base_image['display_path'], + 'created' => $base_image['created'], + 'edited' => $base_image['edited'] + ]; + + $p['imgscale'] = PHOTO_RES_PROFILE_300; + $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL); + + $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300); + + $im->scaleImage(80); + $p['imgscale'] = PHOTO_RES_PROFILE_80; + + $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80); + + $im->scaleImage(48); + $p['imgscale'] = PHOTO_RES_PROFILE_48; + + $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48); + + if ($r1 === false || $r2 === false || $r3 === false) { + // if one failed, delete them all so we can start over. + notice(t('Image resize failed.') . EOL); + $x = q( + "delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ", + dbesc($base_image['resource_id']), + $channel['channel_id'], + intval(PHOTO_RES_PROFILE_300), + intval(PHOTO_RES_PROFILE_80), + intval(PHOTO_RES_PROFILE_48) + ); + return; + } + + + $r = q( + "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d + AND resource_id != '%s' AND uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + dbesc($base_image['resource_id']), + intval($channel['channel_id']) + ); + + // We'll set the updated profile-photo timestamp even if it isn't the default profile, + // so that browsers will do a cache update unconditionally + // Also set links back to site-specific profile photo url in case it was + // changed to a generic URL by a clone operation. Otherwise the new photo may + // not get pushed to other sites correctly. + + $r = q( + "UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' + where xchan_hash = '%s'", + dbesc($im->getType()), + dbesc(datetime_convert()), + dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']), + dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']), + dbesc($channel['xchan_hash']) + ); + + // Similarly, tell the nav bar to bypass the cache and update the avatar image. + $_SESSION['reload_avatar'] = true; + + Config::Set('system', 'site_icon_url', z_root() . '/photo/profile/m/' . $channel['channel_id']); + + info(t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); + } else { + notice(t('Unable to process image') . EOL); + } + } + + goaway(z_root() . '/admin'); + } + + // A new photo was uploaded. Store it and save some important details + // in App::$data for use in the cropping function + + + $hash = photo_new_resource(); + $importing = false; + $smallest = 0; + + + if ($_REQUEST['importfile']) { + $hash = $_REQUEST['importfile']; + $importing = true; + } else { + $matches = []; + $partial = false; + + if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) { + $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches); + if ($pm) { + logger('Content-Range: ' . print_r($matches, true), LOGGER_DEBUG); + $partial = true; + } + } + + if ($partial) { + $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]); + + if ($x['partial']) { + header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); + json_return_and_die($x); + } else { + header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0)); + + $_FILES['userfile'] = [ + 'name' => $x['name'], + 'type' => $x['type'], + 'tmp_name' => $x['tmp_name'], + 'error' => $x['error'], + 'size' => $x['size'] + ]; + } + } else { + if (!array_key_exists('userfile', $_FILES)) { + $_FILES['userfile'] = [ + 'name' => $_FILES['files']['name'], + 'type' => $_FILES['files']['type'], + 'tmp_name' => $_FILES['files']['tmp_name'], + 'error' => $_FILES['files']['error'], + 'size' => $_FILES['files']['size'] + ]; + } + } + + $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Profile Photos'), 'hash' => $hash)); + + logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG); + + json_return_and_die(['message' => $hash]); + } + + if (($res && intval($res['data']['is_photo'])) || $importing) { + $i = q( + "select * from photo where resource_id = '%s' and uid = %d order by imgscale", + dbesc($hash), + intval($channel['channel_hash']) + ); + + if (!$i) { + notice(t('Image upload failed.') . EOL); + return; + } + $os_storage = false; + + foreach ($i as $ii) { + if (intval($ii['imgscale']) < PHOTO_RES_640) { + $smallest = intval($ii['imgscale']); + $os_storage = intval($ii['os_storage']); + $imagedata = $ii['content']; + $filetype = $ii['mimetype']; + } + } + } + + $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); + $ph = photo_factory($imagedata, $filetype); + + if (!$ph->is_valid()) { + notice(t('Unable to process image.') . EOL); + return; + } + + return $this->profile_photo_crop_ui_head($ph, $hash, $smallest); + + // This will "fall through" to the get() method, and since + // App::$data['imagecrop'] is set, it will proceed to cropping + // rather than present the upload form + } + + + /* @brief Generate content of profile-photo view + * + * @return void + * + */ + + + public function get() + { + + if (!is_site_admin()) { + notice(t('Permission denied.') . EOL); + return; + } + + $channel = Channel::get_system(); + $pf = 0; + $newuser = false; + + if (argc() == 3 && argv(2) === 'new') { + $newuser = true; + } + + if (argv(2) === 'reset') { + Config::Delete('system', 'site_icon_url'); + } + + if (argv(2) === 'use') { + if (argc() < 4) { + notice(t('Permission denied.') . EOL); + return; + } + + $resource_id = argv(3); + + $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0); + + $c = q( + "select id, is_default from profile where uid = %d", + intval($channel['channel_id']) + ); + + $multi_profiles = true; + + if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) { + $_REQUEST['profile'] = $c[0]['id']; + $multi_profiles = false; + } else { + $_REQUEST['profile'] = $pf; + } + + $r = q( + "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", + intval($channel['channel_id']), + dbesc($resource_id) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + $havescale = false; + foreach ($r as $rr) { + if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) { + $havescale = true; + } + } + + // set an already loaded and cropped photo as profile photo + + if ($havescale) { + // unset any existing profile photos + $r = q( + "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d", + intval(PHOTO_NORMAL), + intval(PHOTO_PROFILE), + intval($channel['channel_id']) + ); + + $r = q( + "UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'", + intval(PHOTO_PROFILE), + intval($channel['channel_id']), + dbesc($resource_id) + ); + + $r = q( + "UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'", + dbesc(datetime_convert()), + dbesc($channel['xchan_hash']) + ); + + goaway(z_root() . '/admin'); + } + + $r = q( + "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", + intval($r[0]['id']), + intval($channel['channel_id']) + ); + if (!$r) { + notice(t('Photo not available.') . EOL); + return; + } + + if (intval($r[0]['os_storage'])) { + $data = @file_get_contents(dbunescbin($r[0]['content'])); + } else { + $data = dbunescbin($r[0]['content']); + } + + $ph = photo_factory($data, $r[0]['mimetype']); + $smallest = 0; + if ($ph->is_valid()) { + // go ahead as if we have just uploaded a new photo to crop + $i = q( + "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale", + dbesc($r[0]['resource_id']), + intval($channel['channel_id']) + ); + + if ($i) { + $hash = $i[0]['resource_id']; + foreach ($i as $ii) { + if (intval($ii['imgscale']) < PHOTO_RES_640) { + $smallest = intval($ii['imgscale']); + } + } + } + } + + if ($multi_profiles) { + App::$data['importfile'] = $resource_id; + } else { + $this->profile_photo_crop_ui_head($ph, $hash, $smallest); + } + + // falls through with App::$data['imagecrop'] set so we go straight to the cropping section + } + + // present an upload form + + $profiles = q( + "select id, profile_name as name, is_default from profile where uid = %d order by id asc", + intval($channel['channel_id']) + ); + + if ($profiles) { + for ($x = 0; $x < count($profiles); $x++) { + $profiles[$x]['selected'] = false; + if ($pf && $profiles[$x]['id'] == $pf) { + $profiles[$x]['selected'] = true; + } + if ((!$pf) && $profiles[$x]['is_default']) { + $profiles[$x]['selected'] = true; + } + } + } + + $importing = ((array_key_exists('importfile', App::$data)) ? true : false); + + if (!array_key_exists('imagecrop', App::$data)) { + $tpl = Theme::get_template('admin_profile_photo.tpl'); + + $o .= replace_macros($tpl, [ + '$user' => $channel['channel_address'], + '$channel_id' => $channel['channel_id'], + '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your site photo is visible to anybody on the internet and may be distributed to other websites.')), + '$importfile' => (($importing) ? App::$data['importfile'] : ''), + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => (($importing) ? t('Use Photo for Site Logo') : t('Change Site Logo')), + '$submit' => (($importing) ? t('Use') : t('Upload')), + '$profiles' => $profiles, + '$single' => ((count($profiles) == 1) ? true : false), + '$profile0' => $profiles[0], + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), + '$embedPhotosModalCancel' => t('Cancel'), + '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), + '$form_security_token' => get_form_security_token("profile_photo"), + '$select' => t('Select previously uploaded photo'), + ]); + + Hook::call('profile_photo_content_end', $o); + return $o; + } else { + // present a cropping form + + $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution']; + $resolution = App::$data['imagecrop_resolution']; + $o .= replace_macros(Theme::get_template('admin_cropbody.tpl'), [ + '$filename' => $filename, + '$profile' => intval($_REQUEST['profile']), + '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'], + '$image_url' => z_root() . '/photo/' . $filename, + '$title' => t('Crop Image'), + '$desc' => t('Please adjust the image cropping for optimum viewing.'), + '$form_security_token' => get_form_security_token("profile_photo"), + '$done' => t('Done Editing') + ]); + return $o; + } + } + + /* @brief Generate the UI for photo-cropping + * + * @param $ph Photo-Factory + * @return void + * + */ + + public function profile_photo_crop_ui_head($ph, $hash, $smallest) + { + $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH); + + if ($max_length > 0) { + $ph->scaleImage($max_length); + } + + App::$data['width'] = $ph->getWidth(); + App::$data['height'] = $ph->getHeight(); + + if (App::$data['width'] < 500 || App::$data['height'] < 500) { + $ph->scaleImageUp(400); + App::$data['width'] = $ph->getWidth(); + App::$data['height'] = $ph->getHeight(); + } + + App::$data['imagecrop'] = $hash; + App::$data['imagecrop_resolution'] = $smallest; + App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []); + return; + } +} diff --git a/Code/Module/Admin/Profs.php b/Code/Module/Admin/Profs.php new file mode 100644 index 000000000..0530a68b5 --- /dev/null +++ b/Code/Module/Admin/Profs.php @@ -0,0 +1,200 @@ + 3) && argv(2) == 'drop' && intval(argv(3))) { + $r = q( + "delete from profdef where id = %d", + intval(argv(3)) + ); + // remove from allowed fields + + goaway(z_root() . '/admin/profs'); + } + + if ((argc() > 2) && argv(2) === 'new') { + return replace_macros(Theme::get_template('profdef_edit.tpl'), array( + '$header' => t('New Profile Field'), + '$field_name' => array('field_name', t('Field nickname'), $_REQUEST['field_name'], t('System name of field')), + '$field_type' => array('field_type', t('Input type'), (($_REQUEST['field_type']) ? $_REQUEST['field_type'] : 'text'), ''), + '$field_desc' => array('field_desc', t('Field Name'), $_REQUEST['field_desc'], t('Label on profile pages')), + '$field_help' => array('field_help', t('Help text'), $_REQUEST['field_help'], t('Additional info (optional)')), + '$submit' => t('Save') + )); + } + + if ((argc() > 2) && intval(argv(2))) { + $r = q( + "select * from profdef where id = %d limit 1", + intval(argv(2)) + ); + if (!$r) { + notice(t('Field definition not found') . EOL); + goaway(z_root() . '/admin/profs'); + } + + return replace_macros(Theme::get_template('profdef_edit.tpl'), array( + '$id' => intval($r[0]['id']), + '$header' => t('Edit Profile Field'), + '$field_name' => array('field_name', t('Field nickname'), $r[0]['field_name'], t('System name of field')), + '$field_type' => array('field_type', t('Input type'), $r[0]['field_type'], ''), + '$field_desc' => array('field_desc', t('Field Name'), $r[0]['field_desc'], t('Label on profile pages')), + '$field_help' => array('field_help', t('Help text'), $r[0]['field_help'], t('Additional info (optional)')), + '$submit' => t('Save') + )); + } + + $basic = ''; + $barr = []; + $fields = Channel::get_profile_fields_basic(); + + if (!$fields) { + $fields = Channel::get_profile_fields_basic(1); + } + if ($fields) { + foreach ($fields as $k => $v) { + if ($basic) { + $basic .= ', '; + } + $basic .= trim($k); + $barr[] = trim($k); + } + } + + $advanced = ''; + $fields = Channel::get_profile_fields_advanced(); + if (!$fields) { + $fields = Channel::get_profile_fields_advanced(1); + } + if ($fields) { + foreach ($fields as $k => $v) { + if (in_array(trim($k), $barr)) { + continue; + } + if ($advanced) { + $advanced .= ', '; + } + $advanced .= trim($k); + } + } + + $all = ''; + $fields = Channel::get_profile_fields_advanced(1); + if ($fields) { + foreach ($fields as $k => $v) { + if ($all) { + $all .= ', '; + } + $all .= trim($k); + } + } + + $r = q("select * from profdef where true"); + if ($r) { + foreach ($r as $rr) { + if ($all) { + $all .= ', '; + } + $all .= $rr['field_name']; + } + } + + + $o = replace_macros(Theme::get_template('admin_profiles.tpl'), array( + '$title' => t('Profile Fields'), + '$basic' => array('basic', t('Basic Profile Fields'), $basic, ''), + '$advanced' => array('advanced', t('Advanced Profile Fields'), $advanced, t('(In addition to basic fields)')), + '$all' => $all, + '$all_desc' => t('All available fields'), + '$cust_field_desc' => t('Custom Fields'), + '$cust_fields' => $r, + '$edit' => t('Edit'), + '$drop' => t('Delete'), + '$new' => t('Create Custom Field'), + '$submit' => t('Submit') + )); + + return $o; + } +} diff --git a/Code/Module/Admin/Queue.php b/Code/Module/Admin/Queue.php new file mode 100644 index 000000000..4f270c9a9 --- /dev/null +++ b/Code/Module/Admin/Queue.php @@ -0,0 +1,52 @@ + t('Queue Statistics'), + '$numentries' => t('Total Entries'), + '$priority' => t('Priority'), + '$desturl' => t('Destination URL'), + '$nukehub' => t('Mark hub permanently offline'), + '$empty' => t('Empty queue for this hub'), + '$lastconn' => t('Last known contact'), + '$hasentries' => ((count($r)) ? true : false), + '$entries' => $r, + '$expert' => $expert + )); + + return $o; + } +} diff --git a/Code/Module/Admin/Security.php b/Code/Module/Admin/Security.php new file mode 100644 index 000000000..a0251a23b --- /dev/null +++ b/Code/Module/Admin/Security.php @@ -0,0 +1,191 @@ +trim_array_elems(explode("\n", $_POST['allowed_sites'])); + set_config('system', 'allowed_sites', $ws); + + $bs = $this->trim_array_elems(explode("\n", $_POST['denied_sites'])); + set_config('system', 'denied_sites', $bs); + + $wc = $this->trim_array_elems(explode("\n", $_POST['allowed_channels'])); + set_config('system', 'allowed_channels', $wc); + + $bc = $this->trim_array_elems(explode("\n", $_POST['denied_channels'])); + set_config('system', 'denied_channels', $bc); + + $ws = $this->trim_array_elems(explode("\n", $_POST['pubstream_allowed_sites'])); + set_config('system', 'pubstream_allowed_sites', $ws); + + $bs = $this->trim_array_elems(explode("\n", $_POST['pubstream_denied_sites'])); + set_config('system', 'pubstream_denied_sites', $bs); + + $wc = $this->trim_array_elems(explode("\n", $_POST['pubstream_allowed_channels'])); + set_config('system', 'pubstream_allowed_channels', $wc); + + $bc = $this->trim_array_elems(explode("\n", $_POST['pubstream_denied_channels'])); + set_config('system', 'pubstream_denied_channels', $bc); + + $embed_sslonly = ((x($_POST, 'embed_sslonly')) ? true : false); + set_config('system', 'embed_sslonly', $embed_sslonly); + + $we = $this->trim_array_elems(explode("\n", $_POST['embed_allow'])); + set_config('system', 'embed_allow', $we); + + $be = $this->trim_array_elems(explode("\n", $_POST['embed_deny'])); + set_config('system', 'embed_deny', $be); + + $ts = ((x($_POST, 'transport_security')) ? true : false); + set_config('system', 'transport_security_header', $ts); + + $cs = ((x($_POST, 'content_security')) ? true : false); + set_config('system', 'content_security_policy', $cs); + + goaway(z_root() . '/admin/security'); + } + + + public function get() + { + + $allowedsites = get_config('system', 'allowed_sites'); + $allowedsites_str = ((is_array($allowedsites)) ? implode("\n", $allowedsites) : ''); + + $deniedsites = get_config('system', 'denied_sites'); + $deniedsites_str = ((is_array($deniedsites)) ? implode("\n", $deniedsites) : ''); + + + $allowedchannels = get_config('system', 'allowed_channels'); + $allowedchannels_str = ((is_array($allowedchannels)) ? implode("\n", $allowedchannels) : ''); + + $deniedchannels = get_config('system', 'denied_channels'); + $deniedchannels_str = ((is_array($deniedchannels)) ? implode("\n", $deniedchannels) : ''); + + $psallowedsites = get_config('system', 'pubstream_allowed_sites'); + $psallowedsites_str = ((is_array($psallowedsites)) ? implode("\n", $psallowedsites) : ''); + + $psdeniedsites = get_config('system', 'pubstream_denied_sites'); + $psdeniedsites_str = ((is_array($psdeniedsites)) ? implode("\n", $psdeniedsites) : ''); + + + $psallowedchannels = get_config('system', 'pubstream_allowed_channels'); + $psallowedchannels_str = ((is_array($psallowedchannels)) ? implode("\n", $psallowedchannels) : ''); + + $psdeniedchannels = get_config('system', 'pubstream_denied_channels'); + $psdeniedchannels_str = ((is_array($psdeniedchannels)) ? implode("\n", $psdeniedchannels) : ''); + + $allowedembeds = get_config('system', 'embed_allow'); + $allowedembeds_str = ((is_array($allowedembeds)) ? implode("\n", $allowedembeds) : ''); + + $deniedembeds = get_config('system', 'embed_deny'); + $deniedembeds_str = ((is_array($deniedembeds)) ? implode("\n", $deniedembeds) : ''); + + $embed_coop = intval(get_config('system', 'embed_coop')); + + if ((!$allowedembeds) && (!$deniedembeds)) { + $embedhelp1 = t("By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."); + } + + $embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:"); + $embedhelp3 = t("https://youtube.com/
      https://www.youtube.com/
      https://youtu.be/
      https://vimeo.com/
      https://soundcloud.com/
      "); + $embedhelp4 = t("All other embedded content will be filtered, unless embedded content from that site is explicitly blocked."); + + $t = Theme::get_template('admin_security.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Security'), + '$form_security_token' => get_form_security_token('admin_security'), + '$block_public' => array('block_public', t("Block public"), get_config('system', 'block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), + '$block_public_search' => array('block_public_search', t("Block public search"), get_config('system', 'block_public_search', 1), t("Prevent access to search content unless you are currently authenticated.")), + '$block_public_dir' => ['block_public_directory', t('Block directory from visitors'), get_config('system', 'block_public_directory', true), t('Only allow authenticated access to directory.')], + '$localdir_hide' => ['localdir_hide', t('Hide local directory'), intval(get_config('system', 'localdir_hide')), t('Only use the global directory')], + '$cloud_noroot' => ['cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system', 'cloud_disable_siteroot', true)), t('The cloud root directory lists all channel names which provide public files. Otherwise only the names of connections are shown.')], + '$cloud_disksize' => ['cloud_disksize', t('Show total disk space available to cloud uploads'), intval(get_config('system', 'cloud_report_disksize')), ''], + '$thumbnail_security' => ['thumbnail_security', t("Allow SVG thumbnails in file browser"), get_config('system', 'thumbnail_security', 0), t("WARNING: SVG images may contain malicious code.")], + + '$inline_pdf' => ['inline_pdf', t("Allow embedded (inline) PDF files"), get_config('system', 'inline_pdf', 0), ''], + '$anonymous_comments' => ['anonymous_comments', t('Permit anonymous comments'), intval(get_config('system', 'anonymous_comments')), t('Moderation will be performed by channels that select this comment option.')], + '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'), intval(get_config('system', 'transport_security_header')), ''), + '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'), intval(get_config('system', 'content_security_policy')), ''), + '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system', 'allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), + '$not_allowed_email' => array('not_allowed_email', t("Not allowed email domains"), get_config('system', 'not_allowed_email'), t("Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.")), + '$allowed_sites' => array('allowed_sites', t('Allow communications only from these sites'), $allowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), + '$denied_sites' => array('denied_sites', t('Block communications from these sites'), $deniedsites_str, ''), + '$allowed_channels' => array('allowed_channels', t('Allow communications only from these channels'), $allowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')), + '$denied_channels' => array('denied_channels', t('Block communications from these channels'), $deniedchannels_str, ''), + + '$psallowed_sites' => array('pubstream_allowed_sites', t('Allow public stream communications only from these sites'), $psallowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), + '$psdenied_sites' => array('pubstream_denied_sites', t('Block public stream communications from these sites'), $psdeniedsites_str, ''), + '$psallowed_channels' => array('pubstream_allowed_channels', t('Allow public stream communications only from these channels'), $psallowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')), + '$psdenied_channels' => array('pubstream_denied_channels', t('Block public stream communications from these channels'), $psdeniedchannels_str, ''), + + + '$embed_sslonly' => array('embed_sslonly', t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system', 'embed_sslonly')), ''), + '$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $allowedembeds_str, t('One site per line. By default embedded content is filtered.')), + '$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $deniedembeds_str, ''), + +// '$embed_coop' => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')), + + '$submit' => t('Submit') + )); + } + + + public function trim_array_elems($arr) + { + $narr = []; + + if ($arr && is_array($arr)) { + for ($x = 0; $x < count($arr); $x++) { + $y = trim($arr[$x]); + if ($y) { + $narr[] = $y; + } + } + } + return $narr; + } +} diff --git a/Code/Module/Admin/Site.php b/Code/Module/Admin/Site.php new file mode 100644 index 000000000..ed131dc4b --- /dev/null +++ b/Code/Module/Admin/Site.php @@ -0,0 +1,384 @@ + 0) ? intval(trim($_POST['delivery_batch_count'])) : 3); + $poll_interval = ((x($_POST, 'poll_interval')) ? intval(trim($_POST['poll_interval'])) : 0); + $maxloadavg = ((x($_POST, 'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); +// $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); + $ap_contacts = ((x($_POST, 'ap_contacts')) ? intval($_POST['ap_contacts']) : 0); + $verify_email = ((x($_POST, 'verify_email')) ? 1 : 0); + $imagick_path = ((x($_POST, 'imagick_path')) ? trim($_POST['imagick_path']) : ''); + $force_queue = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue']) : 3000); + $pub_incl = escape_tags(trim($_POST['pub_incl'])); + $pub_excl = escape_tags(trim($_POST['pub_excl'])); + + $permissions_role = escape_tags(trim($_POST['permissions_role'])); + +// set_config('system', 'feed_contacts', $feed_contacts); + set_config('system', 'activitypub', $ap_contacts); + set_config('system', 'delivery_interval', $delivery_interval); + set_config('system', 'delivery_batch_count', $delivery_batch_count); + set_config('system', 'poll_interval', $poll_interval); + set_config('system', 'maxloadavg', $maxloadavg); + set_config('system', 'frontpage', $frontpage); + set_config('system', 'cache_images', $cache_images); + set_config('system', 'sellpage', $site_sellpage); + set_config('system', 'workflow_channel_next', $first_page); + set_config('system', 'site_location', $site_location); + set_config('system', 'mirror_frontpage', $mirror_frontpage); + set_config('system', 'sitename', $sitename); + set_config('system', 'login_on_homepage', $login_on_homepage); + set_config('system', 'enable_context_help', $enable_context_help); + set_config('system', 'verify_email', $verify_email); + set_config('system', 'default_expire_days', $default_expire_days); + set_config('system', 'active_expire_days', $active_expire_days); + set_config('system', 'reply_address', $reply_address); + set_config('system', 'from_email', $from_email); + set_config('system', 'from_email_name', $from_email_name); + set_config('system', 'imagick_convert_path', $imagick_path); + set_config('system', 'default_permissions_role', $permissions_role); + set_config('system', 'show_like_counts', $show_like_counts); + set_config('system', 'pubstream_incl', $pub_incl); + set_config('system', 'pubstream_excl', $pub_excl); + set_config('system', 'max_imported_follow', $max_imported_follow); + set_config('system', 'animated_avatars', $animations); + set_config('system', 'tos_required', $tos_required); + + if ($directory_server) { + set_config('system', 'directory_server', $directory_server); + } + + if ($admininfo == '') { + del_config('system', 'admininfo'); + } else { + require_once('include/text.php'); + linkify_tags($admininfo, local_channel()); + set_config('system', 'admininfo', $admininfo); + } + set_config('system', 'siteinfo', $siteinfo); + + // sync sitename and siteinfo updates to the system channel + + q( + "update profile set about = '%s' where uid = %d and is_default = 1", + dbesc($siteinfo), + intval($sys['channel_id']) + ); + q( + "update profile set fullname = '%s' where uid = %d and is_default = 1", + dbesc($sitename), + intval($sys['channel_id']) + ); + q( + "update channel set channel_name = '%s' where channel_id = %d", + dbesc($sitename), + intval($sys['channel_id']) + ); + q( + "update xchan set xchan_name = '%s' , xchan_name_updated = '%s' where xchan_hash = '%s'", + dbesc($sitename), + dbesc(datetime_convert()), + dbesc($sys['channel_hash']) + ); + + set_config('system', 'language', $language); + set_config('system', 'theme', $theme); + // set_config('system','site_channel', $site_channel); + set_config('system', 'maximagesize', $maximagesize); + + set_config('system', 'register_policy', $register_policy); + set_config('system', 'minimum_age', $minimum_age); + set_config('system', 'invitation_only', $invite_only); + set_config('system', 'access_policy', $access_policy); + set_config('system', 'account_abandon_days', $abandon_days); + set_config('system', 'register_text', $register_text); + set_config('system', 'publish_all', $force_publish); + set_config('system', 'public_stream_mode', $public_stream_mode); + set_config('system', 'open_pubstream', $open_pubstream); + set_config('system', 'force_queue_threshold', $force_queue); + if ($global_directory == '') { + del_config('system', 'directory_submit_url'); + } else { + set_config('system', 'directory_submit_url', $global_directory); + } + + set_config('system', 'no_community_page', $no_community_page); + set_config('system', 'no_utf', $no_utf); + set_config('system', 'verifyssl', $verifyssl); + set_config('system', 'proxyuser', $proxyuser); + set_config('system', 'proxy', $proxy); + set_config('system', 'curl_timeout', $timeout); + set_config('system', 'curl_post_timeout', $post_timeout); + + info(t('Site settings updated.') . EOL); + goaway(z_root() . '/admin/site'); + } + + /** + * @brief Admin page site. + * + * @return string with HTML + */ + + public function get() + { + + /* Installed langs */ + $lang_choices = []; + $langs = glob('view/*/strings.php'); + + if (is_array($langs) && count($langs)) { + if (!in_array('view/en/strings.php', $langs)) { + $langs[] = 'view/en/'; + } + asort($langs); + foreach ($langs as $l) { + $t = explode("/", $l); + $lang_choices[$t[1]] = $t[1]; + } + } + + /* Installed themes */ + $theme_choices_mobile["---"] = t("Default"); + $theme_choices = []; + $files = glob('view/theme/*'); + if ($files) { + foreach ($files as $file) { + $vars = ''; + $f = basename($file); + + $info = Theme::get_info($f); + $compatible = Addon::check_versions($info); + if (!$compatible) { + $theme_choices[$f] = $theme_choices_mobile[$f] = sprintf(t('%s - (Incompatible)'), $f); + continue; + } + + if (file_exists($file . '/library')) { + continue; + } + if (file_exists($file . '/mobile')) { + $vars = t('mobile'); + } + if (file_exists($file . '/experimental')) { + $vars .= t('experimental'); + } + if (file_exists($file . '/unsupported')) { + $vars .= t('unsupported'); + } + if ($vars) { + $theme_choices[$f] = $f . ' (' . $vars . ')'; + $theme_choices_mobile[$f] = $f . ' (' . $vars . ')'; + } else { + $theme_choices[$f] = $f; + $theme_choices_mobile[$f] = $f; + } + } + } + + $dir_choices = null; + $dirmode = get_config('system', 'directory_mode'); + $realm = get_directory_realm(); + + // directory server should not be set or settable unless we are a directory client + // avoid older redmatrix servers which don't have modern encryption + + if ($dirmode == DIRECTORY_MODE_NORMAL) { + $x = q( + "select site_url from site where site_flags in (%d,%d) and site_realm = '%s' and site_dead = 0", + intval(DIRECTORY_MODE_SECONDARY), + intval(DIRECTORY_MODE_PRIMARY), + dbesc($realm) + ); + if ($x) { + $dir_choices = []; + foreach ($x as $xx) { + $dir_choices[$xx['site_url']] = $xx['site_url']; + } + } + } + + + /* Admin Info */ + + $admininfo = get_config('system', 'admininfo'); + + /* Register policy */ + $register_choices = [ + REGISTER_CLOSED => t("No"), + REGISTER_APPROVE => t("Yes - with approval"), + REGISTER_OPEN => t("Yes") + ]; + + /* Acess policy */ + $access_choices = [ + ACCESS_PRIVATE => t("My site is not a public server"), + ACCESS_FREE => t("My site provides free public access"), + ACCESS_PAID => t("My site provides paid public access"), + ACCESS_TIERED => t("My site provides free public access and premium paid plans") + ]; + + $perm_roles = PermissionRoles::roles(); + $default_role = get_config('system', 'default_permissions_role', 'social'); + + $role = ['permissions_role', t('Default permission role for new accounts'), $default_role, t('This role will be used for the first channel created after registration.'), $perm_roles]; + + + $homelogin = get_config('system', 'login_on_homepage'); + $enable_context_help = get_config('system', 'enable_context_help'); + + return replace_macros(Theme::get_template('admin_site.tpl'), [ + '$title' => t('Administration'), + '$page' => t('Site'), + '$submit' => t('Submit'), + '$h_basic' => t('Site Configuration'), + '$registration' => t('Registration'), + '$upload' => t('File upload'), + '$corporate' => t('Policies'), + '$advanced' => t('Advanced'), + '$baseurl' => z_root(), + '$sitename' => ['sitename', t("Site name"), htmlspecialchars(get_config('system', 'sitename', App::get_hostname()), ENT_QUOTES, 'UTF-8'), ''], + '$admininfo' => ['admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators. Displayed on siteinfo page. BBCode may be used here.")], + '$siteinfo' => ['siteinfo', t('Site Information'), get_config('system', 'siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode may be used here.")], + '$language' => ['language', t("System language"), get_config('system', 'language', 'en'), "", $lang_choices], + '$theme' => ['theme', t("System theme"), get_config('system', 'theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices], +// '$theme_mobile' => [ 'theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile ], +// '$site_channel' => [ 'site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel") ], + '$ap_contacts' => ['ap_contacts', t('ActivityPub protocol'), get_config('system', 'activitypub', ACTIVITYPUB_ENABLED), t('Provides access to software supporting the ActivityPub protocol.')], + '$maximagesize' => ['maximagesize', t("Maximum image size"), intval(get_config('system', 'maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")], + '$cache_images' => ['cache_images', t('Cache all public images'), intval(get_config('system', 'cache_images', 1)), t('If disabled, proxy non-SSL images, but do not store locally')], + '$register_policy' => ['register_policy', t("Does this site allow new member registration?"), get_config('system', 'register_policy'), "", $register_choices], + '$invite_only' => ['invite_only', t("Invitation only"), get_config('system', 'invitation_only'), t("Only allow new member registrations with an invitation code. New member registration must be allowed for this to work.")], + '$invite_working' => defined('INVITE_WORKING'), + '$minimum_age' => ['minimum_age', t("Minimum age"), (x(get_config('system', 'minimum_age')) ? get_config('system', 'minimum_age') : 13), t("Minimum age (in years) for who may register on this site.")], + '$access_policy' => ['access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system', 'access_policy'), t("If a public server policy is selected, this information may be displayed on the public server site list."), $access_choices], + '$register_text' => ['register_text', t("Register text"), htmlspecialchars(get_config('system', 'register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")], + '$tos_required' => [ 'tos_required', t('Require acceptance of Terms of Service'),get_config('system','tos_required'),'', [ t('No'), t('Yes') ] ], + '$role' => $role, + '$frontpage' => ['frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system', 'frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")], + '$mirror_frontpage' => ['mirror_frontpage', t("Preserve site homepage URL"), get_config('system', 'mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')], + '$abandon_days' => ['abandon_days', t('Accounts abandoned after x days'), get_config('system', 'account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')], + '$block_public_dir' => ['block_public_directory', t('Block directory from visitors'), get_config('system', 'block_public_directory', true), t('Only allow authenticated access to directory.')], + '$verify_email' => ['verify_email', t("Verify Email Addresses"), get_config('system', 'verify_email'), t("Check to verify email addresses used in account registration (recommended).")], + '$force_publish' => ['publish_all', t("Force publish in directory"), get_config('system', 'publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")], + + '$public_stream_mode' => ['public_stream_mode', t('Public stream'), intval(get_config('system', 'public_stream_mode', 0)), t('Provide a Public stream on your site. This content is unmoderated.'), [ + 0 => t('the Public stream is disabled'), + 1 => t('the Public stream contains public conversations from this site only'), + 2 => t('the Public stream contains public conversations from anywhere on the internet'), + ]], + + '$open_pubstream' => ['open_pubstream', t('Allow anybody on the internet to access the Public stream'), get_config('system', 'open_pubstream', 0), t('Default is to only allow viewing by site members. Warning: this content is unmoderated.')], + '$show_like_counts' => ['show_like_counts', t('Show numbers of likes and dislikes in conversations'), get_config('system', 'show_like_counts', 1), t('If disabled, the presence of likes and dislikes will be shown, but without totals.')], + '$animations' => ['animations', t('Permit animated profile photos'), get_config('system', 'animated_avatars', true), t('Changing this may take several days to work through the system')], + '$incl' => ['pub_incl', t('Only import Public stream posts with this text'), get_config('system', 'pubstream_incl'), t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')], + '$excl' => ['pub_excl', t('Do not import Public stream posts with this text'), get_config('system', 'pubstream_excl'), t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')], + '$max_imported_follow' => ['max_imported_follow', t('Maximum number of imported friends of friends'), get_config('system', 'max_imported_follow', MAX_IMPORTED_FOLLOW), t('Warning: higher numbers will improve the quality of friend suggestions and directory results but can exponentially increase resource usage')], + '$login_on_homepage' => ['login_on_homepage', t("Login on Homepage"), ((intval($homelogin) || $homelogin === false) ? 1 : ''), t("Present a login box to visitors on the home page if no other content has been configured.")], + '$enable_context_help' => ['enable_context_help', t("Enable context help"), ((intval($enable_context_help) === 1 || $enable_context_help === false) ? 1 : 0), t("Display contextual help for the current page when the help button is pressed.")], + '$reply_address' => ['reply_address', t('Reply-to email address for system generated email.'), get_config('system', 'reply_address', 'noreply@' . App::get_hostname()), ''], + '$from_email' => ['from_email', t('Sender (From) email address for system generated email.'), get_config('system', 'from_email', 'Administrator@' . App::get_hostname()), ''], + '$from_email_name' => ['from_email_name', t('Display name of email sender for system generated email.'), get_config('system', 'from_email_name', System::get_site_name()), ''], + '$directory_server' => (($dir_choices) ? ['directory_server', t("Directory Server URL"), get_config('system', 'directory_server'), t("Default directory server"), $dir_choices] : null), + '$proxyuser' => ['proxyuser', t("Proxy user"), get_config('system', 'proxyuser'), ""], + '$proxy' => ['proxy', t("Proxy URL"), get_config('system', 'proxy'), ""], + '$timeout' => ['timeout', t("Network fetch timeout"), (x(get_config('system', 'curl_timeout')) ? get_config('system', 'curl_timeout') : 60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")], + '$post_timeout' => ['post_timeout', t("Network post timeout"), (x(get_config('system', 'curl_post_timeout')) ? get_config('system', 'curl_post_timeout') : 90), t("Value is in seconds. Set to 0 for unlimited (not recommended).")], + '$delivery_interval' => ['delivery_interval', t("Delivery interval"), (x(get_config('system', 'delivery_interval')) ? get_config('system', 'delivery_interval') : 2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")], + '$delivery_batch_count' => ['delivery_batch_count', t('Deliveries per process'), (x(get_config('system', 'delivery_batch_count')) ? get_config('system', 'delivery_batch_count') : 3), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")], + '$force_queue' => ['force_queue', t("Queue Threshold"), get_config('system', 'force_queue_threshold', 3000), t("Always defer immediate delivery if queue contains more than this number of entries.")], + '$poll_interval' => ['poll_interval', t("Poll interval"), (x(get_config('system', 'poll_interval')) ? get_config('system', 'poll_interval') : 2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")], + '$imagick_path' => ['imagick_path', t("Path to ImageMagick convert program"), get_config('system', 'imagick_convert_path'), t("If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert")], + '$maxloadavg' => ['maxloadavg', t("Maximum Load Average"), ((intval(get_config('system', 'maxloadavg')) > 0) ? get_config('system', 'maxloadavg') : 50), t("Maximum system load before delivery and poll processes are deferred - default 50.")], + '$default_expire_days' => ['default_expire_days', t('Expiration period in days for imported streams and cached images'), intval(get_config('system', 'default_expire_days', 60)), t('0 for no expiration of imported content')], + '$active_expire_days' => ['active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system', 'active_expire_days', 7)), ''], + '$sellpage' => ['site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system', 'sellpage', ''), sprintf(t('Create this page first. Default is %s/register'), z_root())], + '$first_page' => ['first_page', t('Page to display after creating a new channel'), get_config('system', 'workflow_channel_next', 'profiles'), t('Default: profiles')], + '$location' => ['site_location', t('Site location'), get_config('system', 'site_location', ''), t('Region or country - shared with other sites')], + '$form_security_token' => get_form_security_token("admin_site"), + ]); + } +} diff --git a/Code/Module/Admin/Themes.php b/Code/Module/Admin/Themes.php new file mode 100644 index 000000000..9d781c5c2 --- /dev/null +++ b/Code/Module/Admin/Themes.php @@ -0,0 +1,243 @@ + $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed); + } + } + + if (!count($themes)) { + notice(t('No themes found.')); + return ''; + } + + /* + * Single theme + */ + + if (App::$argc == 3) { + $theme = App::$argv[2]; + if (!is_dir("view/theme/$theme")) { + notice(t("Item not found.")); + return ''; + } + + if (x($_GET, "a") && $_GET['a'] == "t") { + check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't'); + + // Toggle theme status + + $this->toggle_theme($themes, $theme, $result); + $s = $this->rebuild_theme_table($themes); + if ($result) { + info(sprintf('Theme %s enabled.', $theme)); + } else { + info(sprintf('Theme %s disabled.', $theme)); + } + + set_config('system', 'allowed_themes', $s); + goaway(z_root() . '/admin/themes'); + } + + // display theme details + + if ($this->theme_status($themes, $theme)) { + $status = "on"; + $action = t("Disable"); + } else { + $status = "off"; + $action = t("Enable"); + } + + $readme = null; + if (is_file("view/theme/$theme/README.md")) { + $readme = file_get_contents("view/theme/$theme/README.md"); + $readme = MarkdownExtra::defaultTransform($readme); + } elseif (is_file("view/theme/$theme/README")) { + $readme = '
      ' . file_get_contents("view/theme/$theme/README") . '
      '; + } + + $admin_form = ''; + if (is_file("view/theme/$theme/php/config.php")) { + require_once("view/theme/$theme/php/config.php"); + if (function_exists("theme_admin")) { + $admin_form = theme_admin($a); + } + } + + $screenshot = array(get_theme_screenshot($theme), t('Screenshot')); + if (!stristr($screenshot[0], $theme)) { + $screenshot = null; + } + + $t = Theme::get_template('admin_plugins_details.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Themes'), + '$toggle' => t('Toggle'), + '$settings' => t('Settings'), + '$baseurl' => z_root(), + + '$plugin' => $theme, + '$status' => $status, + '$action' => $action, + '$info' => get_theme_info($theme), + '$function' => 'themes', + '$admin_form' => $admin_form, + '$str_author' => t('Author: '), + '$str_maintainer' => t('Maintainer: '), + '$screenshot' => $screenshot, + '$readme' => $readme, + + '$form_security_token' => get_form_security_token('admin_themes'), + )); + } + + /* + * List themes + */ + + $xthemes = []; + if ($themes) { + foreach ($themes as $th) { + $xthemes[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name'])); + } + } + + $t = Theme::get_template('admin_plugins.tpl'); + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Themes'), + '$submit' => t('Submit'), + '$baseurl' => z_root(), + '$function' => 'themes', + '$plugins' => $xthemes, + '$experimental' => t('[Experimental]'), + '$unsupported' => t('[Unsupported]'), + '$form_security_token' => get_form_security_token('admin_themes'), + )); + } + + + /** + * @brief Toggle a theme. + * + * @param array &$themes + * @param[in] string $th + * @param[out] int &$result + */ + public function toggle_theme(&$themes, $th, &$result) + { + for ($x = 0; $x < count($themes); $x++) { + if ($themes[$x]['name'] === $th) { + if ($themes[$x]['allowed']) { + $themes[$x]['allowed'] = 0; + $result = 0; + } else { + $themes[$x]['allowed'] = 1; + $result = 1; + } + } + } + } + + /** + * @param array $themes + * @param string $th + * @return int + */ + public function theme_status($themes, $th) + { + for ($x = 0; $x < count($themes); $x++) { + if ($themes[$x]['name'] === $th) { + if ($themes[$x]['allowed']) { + return 1; + } else { + return 0; + } + } + } + return 0; + } + + /** + * @param array $themes + * @return string + */ + public function rebuild_theme_table($themes) + { + $o = ''; + if (count($themes)) { + foreach ($themes as $th) { + if ($th['allowed']) { + if (strlen($o)) { + $o .= ','; + } + $o .= $th['name']; + } + } + } + return $o; + } +} diff --git a/Code/Module/Affinity.php b/Code/Module/Affinity.php new file mode 100644 index 000000000..30d245802 --- /dev/null +++ b/Code/Module/Affinity.php @@ -0,0 +1,95 @@ + 99) { + $cmax = 99; + } + $cmin = intval($_POST['affinity_cmin']); + if ($cmin < 0 || $cmin > 99) { + $cmin = 0; + } + set_pconfig(local_channel(), 'affinity', 'cmin', 0); + set_pconfig(local_channel(), 'affinity', 'cmax', $cmax); + + info(t('Friend Zoom settings updated.') . EOL); + } + + Libsync::build_sync_packet(); + } + + + public function get() + { + + $desc = t('This app (when installed) presents a slider control in your connection editor and also on your stream page. The slider represents your degree of friendship with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.'); + + $text = '
      ' . $desc . '
      '; + + if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Friend Zoom'))) { + return $text; + } + + $text .= EOL . t('The number below represents the default maximum slider position for your stream page as a percentage.') . EOL . EOL; + + $setting_fields = $text; + + $cmax = intval(get_pconfig(local_channel(), 'affinity', 'cmax')); + $cmax = (($cmax) ? $cmax : 99); +// $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), array( +// '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99')) +// )); + + if (Apps::system_app_installed(local_channel(), 'Friend Zoom')) { + $labels = array( + 0 => t('Me'), + 20 => t('Family'), + 40 => t('Friends'), + 60 => t('Peers'), + 80 => t('Connections'), + 99 => t('All') + ); + Hook::call('affinity_labels', $labels); + + $tpl = Theme::get_template('affinity.tpl'); + $x = replace_macros($tpl, [ + '$cmin' => 0, + '$cmax' => $cmax, + '$lbl' => t('Default friend zoom in/out'), + '$refresh' => t('Refresh'), + '$labels' => $labels, + ]); + + + $arr = array('html' => $x); + Hook::call('affinity_slider', $arr); + $setting_fields .= $arr['html']; + } + + $s .= replace_macros(Theme::get_template('generic_app_settings.tpl'), array( + '$addon' => array('affinity', '' . t('Friend Zoom Settings'), '', t('Submit')), + '$content' => $setting_fields + )); + + return $s; + } +} diff --git a/Code/Module/Album.php b/Code/Module/Album.php new file mode 100644 index 000000000..7494d9abb --- /dev/null +++ b/Code/Module/Album.php @@ -0,0 +1,104 @@ + 1) { + $channel = Channel::from_username(argv(1)); + } + if (!$channel) { + http_status_exit(404, 'Not found.'); + } + + $sql_extra = permissions_sql($channel['channel_id'], $observer_xchan); + + if (argc() > 2) { + $folder = argv(2); + $r = q( + "select * from attach where is_dir = 1 and hash = '%s' and uid = %d $sql_extra limit 1", + dbesc($folder), + intval($channel['channel_id']) + ); + $allowed = (($r) ? attach_can_view($channel['channel_id'], $observer_xchan, $r[0]['hash'], $bear) : false); + } else { + $folder = EMPTY_STR; + $allowed = perm_is_allowed($channel['channel_id'], $observer_xchan, 'view_storage'); + } + + if (!$allowed) { + http_status_exit(403, 'Permission denied.'); + } + + $x = q( + "select * from attach where folder = '%s' and uid = %d $sql_extra", + dbesc($folder), + intval($channel['channel_id']) + ); + + $contents = []; + + if ($x) { + foreach ($x as $xv) { + if (intval($xv['is_dir'])) { + continue; + } + if (!attach_can_view($channel['channel_id'], $observer_xchan, $xv['hash'], $bear)) { + continue; + } + if (intval($xv['is_photo'])) { + $contents[] = z_root() . '/photo/' . $xv['hash']; + } + } + } + + $obj = Activity::encode_simple_collection($contents, App::$query_string, 'OrderedCollection', count($contents)); + as_return_and_die($obj, $channel); + } + } +} diff --git a/Code/Module/Ap_probe.php b/Code/Module/Ap_probe.php new file mode 100644 index 000000000..8e22734a1 --- /dev/null +++ b/Code/Module/Ap_probe.php @@ -0,0 +1,49 @@ + t('ActivityPub Probe Diagnostic'), + '$resource' => ['resource', t('Object URL'), $_REQUEST['resource'], EMPTY_STR], + '$authf' => ['authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [t('No'), t('Yes')]], + '$submit' => t('Submit') + ]); + + if (x($_REQUEST, 'resource')) { + $resource = $_REQUEST['resource']; + if ($_REQUEST['authf']) { + $channel = App::get_channel(); + if (!$channel) { + $channel = Channel::get_system(); + } + } + + $x = Activity::fetch($resource, $channel, null, true); + + if ($x) { + $o .= '
      ' . str_replace('\\n', "\n", htmlspecialchars(json_encode($x, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT))) . '
      '; + $o .= '
      ' . str_replace('\\n', "\n", htmlspecialchars(Yaml::encode($x))) . '
      '; + } + } + + return $o; + } +} diff --git a/Code/Module/Api.php b/Code/Module/Api.php new file mode 100644 index 000000000..0eaac91d1 --- /dev/null +++ b/Code/Module/Api.php @@ -0,0 +1,142 @@ +"; var_dump($e); + killme(); + } + + + if (x($_POST, 'oauth_yes')) { + $app = $this->oauth_get_client($request); + if (is_null($app)) { + return "Invalid request. Unknown token."; + } + + $consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']); + + $verifier = md5($app['secret'] . local_channel()); + set_config('oauth', $verifier, local_channel()); + + + if ($consumer->callback_url != null) { + $params = $request->get_parameters(); + $glue = '?'; + if (strstr($consumer->callback_url, $glue)) { + $glue = '?'; + } + goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier)); + killme(); + } + + $tpl = Theme::get_template("oauth_authorize_done.tpl"); + $o = replace_macros($tpl, array( + '$title' => t('Authorize application connection'), + '$info' => t('Return to your app and insert this Security Code:'), + '$code' => $verifier, + )); + + return $o; + } + + + if (!local_channel()) { + // TODO: we need login form to redirect to this page + notice(t('Please login to continue.') . EOL); + return login(false, 'api-login', $request->get_parameters()); + } + + $app = $this->oauth_get_client($request); + if (is_null($app)) { + return "Invalid request. Unknown token."; + } + + $tpl = Theme::get_template('oauth_authorize.tpl'); + $o = replace_macros($tpl, array( + '$title' => t('Authorize application connection'), + '$app' => $app, + '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), + '$yes' => t('Yes'), + '$no' => t('No'), + )); + + // echo "
      "; var_dump($app); killme();
+
+            return $o;
+        }
+
+        echo api_call();
+        killme();
+    }
+
+    public function oauth_get_client($request)
+    {
+
+        $params = $request->get_parameters();
+        $token = $params['oauth_token'];
+
+        $r = q(
+            "SELECT clients.* FROM clients, tokens WHERE clients.client_id = tokens.client_id 
+			AND tokens.id = '%s' AND tokens.auth_scope = 'request' ",
+            dbesc($token)
+        );
+        if ($r) {
+            return $r[0];
+        }
+
+        return null;
+    }
+}
diff --git a/Code/Module/Appman.php b/Code/Module/Appman.php
new file mode 100644
index 000000000..436ec9971
--- /dev/null
+++ b/Code/Module/Appman.php
@@ -0,0 +1,166 @@
+ intval($_REQUEST['uid']),
+                'url' => escape_tags($_REQUEST['url']),
+                'guid' => escape_tags($_REQUEST['guid']),
+                'author' => escape_tags($_REQUEST['author']),
+                'addr' => escape_tags($_REQUEST['addr']),
+                'name' => escape_tags($_REQUEST['name']),
+                'desc' => escape_tags($_REQUEST['desc']),
+                'photo' => escape_tags($_REQUEST['photo']),
+                'version' => escape_tags($_REQUEST['version']),
+                'price' => escape_tags($_REQUEST['price']),
+                'page' => escape_tags($_REQUEST['sellpage']), // do not use 'page' as a request variable here as it conflicts with pagination
+                'requires' => escape_tags($_REQUEST['requires']),
+                'system' => intval($_REQUEST['system']),
+                'plugin' => escape_tags($_REQUEST['plugin']),
+                'sig' => escape_tags($_REQUEST['sig']),
+                'categories' => escape_tags($_REQUEST['categories'])
+            ];
+
+            $_REQUEST['appid'] = Apps::app_install($channel_id, $arr);
+
+            if (Apps::app_installed($channel_id, $arr)) {
+                info(t('App installed.') . EOL);
+            }
+
+            goaway(z_root() . '/apps');
+        }
+
+
+        $papp = Apps::app_decode($_POST['papp']);
+
+        if (!is_array($papp)) {
+            notice(t('Malformed app.') . EOL);
+            return;
+        }
+
+        if ($_POST['install']) {
+            Apps::app_install($channel_id, $papp);
+            if (Apps::app_installed($channel_id, $papp)) {
+                info(t('App installed.') . EOL);
+            }
+        }
+
+        if ($_POST['delete']) {
+            Apps::app_destroy($channel_id, $papp);
+        }
+
+        if ($_POST['edit']) {
+            return;
+        }
+
+        if ($_POST['feature']) {
+            Apps::app_feature($channel_id, $papp, $_POST['feature']);
+        }
+
+        if ($_POST['pin']) {
+            Apps::app_feature($channel_id, $papp, $_POST['pin']);
+        }
+
+        if ($_SESSION['return_url']) {
+            goaway(z_root() . '/' . $_SESSION['return_url']);
+        }
+
+        goaway(z_root() . '/apps');
+    }
+
+
+    public function get()
+    {
+
+		$channel_id = local_channel();
+		
+        if (!$channel_id) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+		if (Channel::is_system($channel_id)) {
+			$channel_id = 0;
+		}
+		
+        $channel = App::get_channel();
+
+        if (argc() > 3) {
+            if (argv(2) === 'moveup') {
+                Apps::moveup($channel_id, argv(1), argv(3));
+            }
+            if (argv(2) === 'movedown') {
+                Apps::movedown($channel_id, argv(1), argv(3));
+            }
+            goaway(z_root() . '/apporder');
+        }
+
+        $app = null;
+        $embed = null;
+        if ($_REQUEST['appid']) {
+            $r = q(
+                "select * from app where app_id = '%s' and app_channel = %d limit 1",
+                dbesc($_REQUEST['appid']),
+                dbesc($channel_id)
+            );
+            if ($r) {
+                $app = $r[0];
+
+                $term = q(
+                    "select * from term where otype = %d and oid = %d and uid = %d",
+                    intval(TERM_OBJ_APP),
+                    intval($r[0]['id']),
+                    intval($channel_id)
+                );
+                if ($term) {
+                    $app['categories'] = array_elm_to_str($term, 'term');
+                }
+            }
+
+            $embed = ['embed', t('Embed code'), Apps::app_encode($app, true), EMPTY_STR, 'onclick="this.select();"'];
+        }
+
+        return replace_macros(Theme::get_template('app_create.tpl'), [
+            '$banner' => (($app) ? t('Edit App') : t('Create App')),
+            '$app' => $app,
+            '$guid' => (($app) ? $app['app_id'] : EMPTY_STR),
+            '$author' => (($app) ? $app['app_author'] : $channel['channel_hash']),
+            '$addr' => (($app) ? $app['app_addr'] : $channel['xchan_addr']),
+            '$name' => ['name', t('Name of app'), (($app) ? $app['app_name'] : EMPTY_STR), t('Required')],
+            '$url' => ['url', t('Location (URL) of app'), (($app) ? $app['app_url'] : EMPTY_STR), t('Required')],
+            '$desc' => ['desc', t('Description'), (($app) ? $app['app_desc'] : EMPTY_STR), EMPTY_STR],
+            '$photo' => ['photo', t('Photo icon URL'), (($app) ? $app['app_photo'] : EMPTY_STR), t('80 x 80 pixels - optional')],
+            '$categories' => ['categories', t('Categories (optional, comma separated list)'), (($app) ? $app['categories'] : EMPTY_STR), EMPTY_STR],
+            '$version' => ['version', t('Version ID'), (($app) ? $app['app_version'] : EMPTY_STR), EMPTY_STR],
+            '$price' => ['price', t('Price of app'), (($app) ? $app['app_price'] : EMPTY_STR), EMPTY_STR],
+            '$page' => ['sellpage', t('Location (URL) to purchase app'), (($app) ? $app['app_page'] : EMPTY_STR), EMPTY_STR],
+            '$system' => (($app) ? intval($app['app_system']) : 0),
+            '$plugin' => (($app) ? $app['app_plugin'] : EMPTY_STR),
+            '$requires' => (($app) ? $app['app_requires'] : EMPTY_STR),
+            '$embed' => $embed,
+            '$submit' => t('Submit')
+        ]);
+    }
+}
diff --git a/Code/Module/Apporder.php b/Code/Module/Apporder.php
new file mode 100644
index 000000000..43c2865dc
--- /dev/null
+++ b/Code/Module/Apporder.php
@@ -0,0 +1,57 @@
+ t('Arrange Apps'),
+            '$header' => [t('Change order of pinned navbar apps'), t('Change order of app tray apps')],
+            '$desc' => [t('Use arrows to move the corresponding app left (top) or right (bottom) in the navbar'),
+                t('Use arrows to move the corresponding app up or down in the app tray')],
+            '$nav_apps' => $nav_apps,
+            '$navbar_apps' => $navbar_apps
+        ]);
+    }
+}
diff --git a/Code/Module/Apps.php b/Code/Module/Apps.php
new file mode 100644
index 000000000..f77a338fd
--- /dev/null
+++ b/Code/Module/Apps.php
@@ -0,0 +1,66 @@
+ get_config('system', 'sitename'),
+            '$cat' => $cat,
+            '$title' => (($available) ? t('Available Apps') : t('Installed Apps')),
+            '$apps' => $apps,
+            '$authed' => ((local_channel()) ? true : false),
+            '$manage' => (($available) ? EMPTY_STR : t('Manage apps')),
+            '$create' => (($mode == 'edit') ? t('Create Custom App') : '')
+        ));
+    }
+}
diff --git a/Code/Module/Apschema.php b/Code/Module/Apschema.php
new file mode 100644
index 000000000..935bd8fc6
--- /dev/null
+++ b/Code/Module/Apschema.php
@@ -0,0 +1,22 @@
+ array_merge(['as' => 'https://www.w3.org/ns/activitystreams#'], Activity::ap_schema())
+        ];
+
+        header('Content-Type: application/ld+json');
+        echo json_encode($arr, JSON_UNESCAPED_SLASHES);
+        killme();
+    }
+}
diff --git a/Code/Module/Attach.php b/Code/Module/Attach.php
new file mode 100644
index 000000000..92ead58cc
--- /dev/null
+++ b/Code/Module/Attach.php
@@ -0,0 +1,58 @@
+ 2) ? intval(argv(2)) : 0));
+
+        if (!$r['success']) {
+            notice($r['message'] . EOL);
+            return;
+        }
+
+        $c = q(
+            "select channel_address from channel where channel_id = %d limit 1",
+            intval($r['data']['uid'])
+        );
+
+        if (!$c) {
+            return;
+        }
+
+        header('Content-type: ' . $r['data']['filetype']);
+        header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"');
+        if (intval($r['data']['os_storage'])) {
+            $fname = dbunescbin($r['data']['content']);
+            if (strpos($fname, 'store') !== false) {
+                $istream = fopen($fname, 'rb');
+            } else {
+                $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname, 'rb');
+            }
+            $ostream = fopen('php://output', 'wb');
+            if ($istream && $ostream) {
+                pipe_streams($istream, $ostream);
+                fclose($istream);
+                fclose($ostream);
+            }
+        } else {
+            echo dbunescbin($r['data']['content']);
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Authorize.php b/Code/Module/Authorize.php
new file mode 100644
index 000000000..02b729faf
--- /dev/null
+++ b/Code/Module/Authorize.php
@@ -0,0 +1,145 @@
+ $name,
+                'icon' => (x($_REQUEST, 'logo_uri') ? $_REQUEST['logo_uri'] : z_root() . '/images/icons/plugin.png'),
+                'url' => (x($_REQUEST, 'client_uri') ? $_REQUEST['client_uri'] : ''),
+            ];
+
+            $link = (($app['url']) ? '' . $app['name'] . ' ' : $app['name']);
+
+            $o .= replace_macros(Theme::get_template('oauth_authorize.tpl'), [
+                '$title' => t('Authorize'),
+                '$authorize' => sprintf(t('Do you authorize the app %s to access your channel data?'), $link),
+                '$app' => $app,
+                '$yes' => t('Allow'),
+                '$no' => t('Deny'),
+                '$client_id' => (x($_REQUEST, 'client_id') ? $_REQUEST['client_id'] : ''),
+                '$redirect_uri' => (x($_REQUEST, 'redirect_uri') ? $_REQUEST['redirect_uri'] : ''),
+                '$state' => (x($_REQUEST, 'state') ? $_REQUEST['state'] : ''),
+            ]);
+            return $o;
+        }
+    }
+
+    public function post()
+    {
+        if (!local_channel()) {
+            return;
+        }
+
+        $storage = new OAuth2Storage(DBA::$dba->db);
+        $s = new OAuth2Server($storage);
+
+        // TODO: The automatic client registration protocol below should adhere more
+        // closely to "OAuth 2.0 Dynamic Client Registration Protocol" defined
+        // at https://tools.ietf.org/html/rfc7591
+
+        // If no client_id was provided, generate a new one.
+        if (x($_POST, 'client_name')) {
+            $client_name = $_POST['client_name'];
+        } else {
+            $client_name = $_POST['client_name'] = EMPTY_STR;
+        }
+
+        // If no client_id was provided, generate a new one.
+        if (x($_POST, 'client_id')) {
+            $client_id = $_POST['client_id'];
+        } else {
+            $client_id = $_POST['client_id'] = random_string(16);
+        }
+
+        // If no redirect_uri was provided, generate a fake one.
+        if (x($_POST, 'redirect_uri')) {
+            $redirect_uri = $_POST['redirect_uri'];
+        } else {
+            $redirect_uri = $_POST['redirect_uri'] = 'https://fake.example.com/oauth';
+        }
+
+        $request = Request::createFromGlobals();
+        $response = new Response();
+
+        // Note, "sub" field must match type and content. $user_id is used to populate - make sure it's a string.
+        $channel = Channel::from_id(local_channel());
+        $user_id = $channel['channel_id'];
+
+        $client_found = false;
+        $client = $storage->getClientDetails($client_id);
+
+        logger('client: ' . print_r($client, true), LOGGER_DATA);
+
+        if ($client) {
+            if (intval($client['user_id']) === 0 || intval($client['user_id']) === intval($user_id)) {
+                $client_found = true;
+                $client_name = $client['client_name'];
+                $client_secret = $client['client_secret'];
+                // Until "Dynamic Client Registration" is fully tested - allow new clients to assign their own secret in the REQUEST
+                if (!$client_secret) {
+                    $client_secret = ((isset($_REQUEST['client_secret'])) ? $_REQUEST['client_secret'] : random_string(16));
+                }
+                $grant_types = $client['grant_types'];
+                // Client apps are registered per channel
+
+
+                logger('client_id: ' . $client_id);
+                logger('client_secret: ' . $client_secret);
+                logger('redirect_uri: ' . $redirect_uri);
+                logger('grant_types: ' . $_REQUEST['grant_types']);
+                logger('scope: ' . $_REQUEST['scope']);
+                logger('user_id: ' . $user_id);
+                logger('client_name: ' . $client_name);
+
+                $storage->setClientDetails($client_id, $client_secret, $redirect_uri, $grant_types, $_REQUEST['scope'], $user_id, $client_name);
+            }
+        }
+        if (!$client_found) {
+            $response->send();
+            killme();
+        }
+
+        $response->setParameter('client_secret', $client['client_secret']);
+
+        // validate the authorize request
+        if (!$s->validateAuthorizeRequest($request, $response)) {
+            $response->send();
+            killme();
+        }
+
+        // print the authorization code if the user has authorized your client
+        $is_authorized = ($_POST['authorize'] === 'allow');
+        $s->handleAuthorizeRequest($request, $response, $is_authorized, $user_id);
+        if ($is_authorized) {
+            $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40);
+            logger('Authorization Code: ' . $code);
+        }
+
+        $response->send();
+        killme();
+    }
+}
diff --git a/Code/Module/Block.php b/Code/Module/Block.php
new file mode 100644
index 000000000..263d3d34a
--- /dev/null
+++ b/Code/Module/Block.php
@@ -0,0 +1,97 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+
+    public function get()
+    {
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $which = argv(1);
+
+        $_SESSION['return_url'] = App::$query_string;
+
+        $uid = local_channel();
+        $owner = 0;
+        $channel = null;
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                $uid = $owner = intval($sys['channel_id']);
+                $channel = $sys;
+                $observer = $sys;
+            }
+        }
+
+        if (!$owner) {
+            // Figure out who the page owner is.
+            $r = q(
+                "select channel_id from channel where channel_address = '%s'",
+                dbesc($which)
+            );
+            if ($r) {
+                $owner = intval($r[0]['channel_id']);
+            }
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        // Block design features from visitors
+
+        if ((!$uid) || ($uid != $owner)) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner, 'system', 'page_mimetype'));
+
+        $x = array(
+            'webpage' => ITEM_TYPE_BLOCK,
+            'is_owner' => true,
+            'nickname' => App::$profile['channel_address'],
+            'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+            'bang' => '',
+            'showacl' => false,
+            'visitor' => true,
+            'mimetype' => $mimetype,
+            'mimeselect' => true,
+            'hide_location' => true,
+            'ptlabel' => t('Block Name'),
+            'profile_uid' => intval($owner),
+            'expanded' => true,
+            'novoting' => true,
+            'bbco_autocomplete' => 'bbcode',
+            'bbcode' => true
+        );
+
+        if ($_REQUEST['title']) {
+            $x['title'] = $_REQUEST['title'];
+        }
+        if ($_REQUEST['body']) {
+            $x['body'] = $_REQUEST['body'];
+        }
+        if ($_REQUEST['pagetitle']) {
+            $x['pagetitle'] = $_REQUEST['pagetitle'];
+        }
+
+        $editor = status_editor($x);
+
+
+        $r = q(
+            "select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig 
+			left join item on iconfig.iid = item.id
+			where uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' 
+			and item_type = %d order by item.created desc",
+            intval($owner),
+            intval(ITEM_TYPE_BLOCK)
+        );
+
+        $pages = null;
+
+        if ($r) {
+            $pages = [];
+            foreach ($r as $rr) {
+                $element_arr = array(
+                    'type' => 'block',
+                    'title' => $rr['title'],
+                    'body' => $rr['body'],
+                    'created' => $rr['created'],
+                    'edited' => $rr['edited'],
+                    'mimetype' => $rr['mimetype'],
+                    'pagetitle' => $rr['v'],
+                    'mid' => $rr['mid']
+                );
+                $pages[$rr['iid']][] = array(
+                    'url' => $rr['iid'],
+                    'name' => $rr['v'],
+                    'title' => $rr['title'],
+                    'created' => $rr['created'],
+                    'edited' => $rr['edited'],
+                    'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
+                );
+            }
+        }
+
+        //Build the base URL for edit links
+        $url = z_root() . '/editblock/' . $which;
+
+        $o .= replace_macros(Theme::get_template('blocklist.tpl'), array(
+            '$baseurl' => $url,
+            '$title' => t('Blocks'),
+            '$name' => t('Block Name'),
+            '$blocktitle' => t('Block Title'),
+            '$created' => t('Created'),
+            '$edited' => t('Edited'),
+            '$create' => t('Create'),
+            '$edit' => t('Edit'),
+            '$share' => t('Share'),
+            '$delete' => t('Delete'),
+            '$editor' => $editor,
+            '$pages' => $pages,
+            '$channel' => $which,
+            '$view' => t('View'),
+            '$preview' => '1',
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Ca.php b/Code/Module/Ca.php
new file mode 100644
index 000000000..9df6c8cf5
--- /dev/null
+++ b/Code/Module/Ca.php
@@ -0,0 +1,66 @@
+ 1) {
+            $path = 'cache/img/' . substr(argv(1), 0, 2) . '/' . argv(1);
+
+            if (file_exists($path) && filesize($path)) {
+                $x = @getimagesize($path);
+                if ($x) {
+                    header('Content-Type: ' . $x['mime']);
+                }
+
+                $cache = intval(get_config('system', 'photo_cache_time'));
+                if (!$cache) {
+                    $cache = (3600 * 24); // 1 day
+                }
+                header(
+                    'Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache)
+                    . ' GMT'
+                );
+                // Set browser cache age as $cache.  But set timeout of
+                // 'shared caches' much lower in the event that infrastructure
+                // caching is present.
+                $smaxage = intval($cache / 12);
+                header(
+                    'Cache-Control: s-maxage=' . $smaxage
+                    . '; max-age=' . $cache . ';'
+                );
+
+                $infile = fopen($path, 'rb');
+                $outfile = fopen('php://output', 'wb');
+                if ($infile && $outfile) {
+                    pipe_streams($infile, $outfile);
+                }
+                fclose($infile);
+                fclose($outfile);
+                killme();
+            }
+
+            if ($_GET['url']) {
+                goaway($url);
+            }
+        }
+        http_status_exit(404, 'Not found');
+    }
+}
diff --git a/Code/Module/Cal.php b/Code/Module/Cal.php
new file mode 100644
index 000000000..e485a4b3e
--- /dev/null
+++ b/Code/Module/Cal.php
@@ -0,0 +1,379 @@
+ 1) {
+            $nick = argv(1);
+
+            Libprofile::load($nick);
+
+            $channelx = Channel::from_username($nick);
+
+            if (!$channelx) {
+                return;
+            }
+
+            App::$data['channel'] = $channelx;
+
+            $observer = App::get_observer();
+            App::$data['observer'] = $observer;
+
+            $observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
+
+            head_set_icon(App::$data['channel']['xchan_photo_s']);
+
+            App::$page['htmlhead'] .= "";
+        }
+
+        return;
+    }
+
+
+    public function get()
+    {
+
+        if (observer_prohibited()) {
+            return;
+        }
+
+        $channel = null;
+
+        if (argc() > 1) {
+            $channel = Channel::from_username(argv(1));
+        }
+
+
+        if (!$channel) {
+            notice(t('Channel not found.') . EOL);
+            return;
+        }
+
+        // since we don't currently have an event permission - use the stream permission
+
+        if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_stream')) {
+            notice(t('Permissions denied.') . EOL);
+            return;
+        }
+
+        Navbar::set_selected('Calendar');
+
+        $sql_extra = permissions_sql($channel['channel_id'], get_observer_hash(), 'event');
+
+        $first_day = intval(get_pconfig($channel['channel_id'], 'system', 'cal_first_day', 0));
+
+        $htpl = Theme::get_template('event_head.tpl');
+        App::$page['htmlhead'] .= replace_macros($htpl, array(
+            '$baseurl' => z_root(),
+            '$module_url' => '/cal/' . $channel['channel_address'],
+            '$modparams' => 2,
+            '$lang' => App::$language,
+            '$first_day' => $first_day
+        ));
+
+        $o = '';
+
+        $mode = 'view';
+        $y = 0;
+        $m = 0;
+        $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
+
+        // logger('args: ' . print_r(\App::$argv,true));
+
+        if (argc() > 3 && intval(argv(2)) && intval(argv(3))) {
+            $mode = 'view';
+            $y = intval(argv(2));
+            $m = intval(argv(3));
+        }
+        if (argc() <= 3) {
+            $mode = 'view';
+            $event_id = argv(2);
+        }
+
+        if ($mode == 'view') {
+            /* edit/create form */
+            if ($event_id) {
+                $r = q(
+                    "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+                    dbesc($event_id),
+                    intval($channel['channel_id'])
+                );
+                if (count($r)) {
+                    $orig_event = $r[0];
+                }
+            }
+
+
+            // Passed parameters overrides anything found in the DB
+            if (!x($orig_event)) {
+                $orig_event = [];
+            }
+
+
+            $tz = date_default_timezone_get();
+            if (x($orig_event)) {
+                $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+            }
+
+            $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+            $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
+            $sday = datetime_convert('UTC', $tz, $sdt, 'd');
+            $shour = datetime_convert('UTC', $tz, $sdt, 'H');
+            $sminute = datetime_convert('UTC', $tz, $sdt, 'i');
+
+            $stext = datetime_convert('UTC', $tz, $sdt);
+            $stext = substr($stext, 0, 14) . "00:00";
+
+            $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+            $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
+            $fday = datetime_convert('UTC', $tz, $fdt, 'd');
+            $fhour = datetime_convert('UTC', $tz, $fdt, 'H');
+            $fminute = datetime_convert('UTC', $tz, $fdt, 'i');
+
+            $ftext = datetime_convert('UTC', $tz, $fdt);
+            $ftext = substr($ftext, 0, 14) . "00:00";
+
+            $type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
+
+            $f = get_config('system', 'event_input_format');
+            if (!$f) {
+                $f = 'ymd';
+            }
+
+            $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
+
+
+            $show_bd = perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts');
+            if (!$show_bd) {
+                $sql_extra .= " and event.etype != 'birthday' ";
+            }
+
+
+            $category = '';
+
+            $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
+            $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
+            if (!$y) {
+                $y = intval($thisyear);
+            }
+            if (!$m) {
+                $m = intval($thismonth);
+            }
+
+            // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
+            // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
+
+            if ($y < 1901) {
+                $y = 1900;
+            }
+            if ($y > 2099) {
+                $y = 2100;
+            }
+
+            $nextyear = $y;
+            $nextmonth = $m + 1;
+            if ($nextmonth > 12) {
+                $nextmonth = 1;
+                $nextyear++;
+            }
+
+            $prevyear = $y;
+            if ($m > 1) {
+                $prevmonth = $m - 1;
+            } else {
+                $prevmonth = 12;
+                $prevyear--;
+            }
+
+            $dim = get_dim($y, $m);
+            $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
+            $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
+
+
+            if (argv(2) === 'json') {
+                if (x($_GET, 'start')) {
+                    $start = $_GET['start'];
+                }
+                if (x($_GET, 'end')) {
+                    $finish = $_GET['end'];
+                }
+            }
+
+            $start = datetime_convert('UTC', 'UTC', $start);
+            $finish = datetime_convert('UTC', 'UTC', $finish);
+
+            $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+            $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+
+
+            if (!perm_is_allowed(App::$profile['uid'], get_observer_hash(), 'view_contacts')) {
+                $sql_extra .= " and etype != 'birthday' ";
+            }
+
+            if (x($_GET, 'id')) {
+                $r = q(
+                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+	                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1",
+                    intval($channel['channel_id']),
+                    intval($_GET['id'])
+                );
+            } else {
+                // fixed an issue with "nofinish" events not showing up in the calendar.
+                // There's still an issue if the finish date crosses the end of month.
+                // Noting this for now - it will need to be fixed here and in Friendica.
+                // Ultimately the finish date shouldn't be involved in the query.
+
+                $r = q(
+                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+	                              from event left join item on event_hash = resource_id 
+					where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
+					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
+					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) $sql_extra ",
+                    intval($channel['channel_id']),
+                    dbesc($start),
+                    dbesc($finish),
+                    dbesc($adjust_start),
+                    dbesc($adjust_finish)
+                );
+            }
+
+            $links = [];
+
+            if ($r) {
+                xchan_query($r);
+                $r = fetch_post_tags($r, true);
+
+                $r = sort_by_date($r);
+            }
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
+                    if (!x($links, $j)) {
+                        $links[$j] = z_root() . '/' . App::$cmd . '#link-' . $j;
+                    }
+                }
+            }
+
+            $events = [];
+
+            $last_date = '';
+            $fmt = t('l, F j');
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
+                    $d = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], $fmt) : datetime_convert('UTC', 'UTC', $rr['dtstart'], $fmt));
+                    $d = day_translate($d);
+
+                    $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
+                    if ($rr['nofinish']) {
+                        $end = null;
+                    } else {
+                        $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
+                    }
+
+
+                    $is_first = ($d !== $last_date);
+
+                    $last_date = $d;
+
+                    $edit = false;
+
+                    $drop = false;
+
+                    $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
+                    if (!$title) {
+                        list($title, $_trash) = explode(" $rr['id'],
+                        'hash' => $rr['event_hash'],
+                        'start' => $start,
+                        'end' => $end,
+                        'drop' => $drop,
+                        'allDay' => false,
+                        'title' => $title,
+
+                        'j' => $j,
+                        'd' => $d,
+                        'edit' => $edit,
+                        'is_first' => $is_first,
+                        'item' => $rr,
+                        'html' => $html,
+                        'plink' => array($rr['plink'], t('Link to Source'), '', ''),
+                    );
+                }
+            }
+
+            if (argv(2) === 'json') {
+                echo json_encode($events);
+                killme();
+            }
+
+            // links: array('href', 'text', 'extra css classes', 'title')
+            if (x($_GET, 'id')) {
+                $tpl = Theme::get_template("event_cal.tpl");
+            } else {
+                $tpl = Theme::get_template("events_cal-js.tpl");
+            }
+
+            $nick = $channel['channel_address'];
+
+            $o = replace_macros($tpl, array(
+                '$baseurl' => z_root(),
+                '$new_event' => array(z_root() . '/cal', (($event_id) ? t('Edit Event') : t('Create Event')), '', ''),
+                '$previus' => array(z_root() . "/cal/$nick/$prevyear/$prevmonth", t('Previous'), '', ''),
+                '$next' => array(z_root() . "/cal/$nick/$nextyear/$nextmonth", t('Next'), '', ''),
+                '$export' => array(z_root() . "/cal/$nick/$y/$m/export", t('Export'), '', ''),
+                '$calendar' => cal($y, $m, $links, ' eventcal'),
+                '$events' => $events,
+                '$upload' => t('Import'),
+                '$submit' => t('Submit'),
+                '$prev' => t('Previous'),
+                '$next' => t('Next'),
+                '$today' => t('Today'),
+                '$form' => $form,
+                '$expandform' => ((x($_GET, 'expandform')) ? true : false)
+            ));
+
+            if (x($_GET, 'id')) {
+                echo $o;
+                killme();
+            }
+
+            return $o;
+        }
+    }
+}
diff --git a/Code/Module/Calendar.php b/Code/Module/Calendar.php
new file mode 100644
index 000000000..4d8efdaa7
--- /dev/null
+++ b/Code/Module/Calendar.php
@@ -0,0 +1,494 @@
+set($x[0]);
+
+            $created = $x[0]['created'];
+            $edited = datetime_convert();
+        } else {
+            $created = $edited = datetime_convert();
+            $acl->set_from_array($_POST);
+        }
+
+        $post_tags = [];
+        $ac = $acl->get();
+
+        $str_contact_allow = $ac['allow_cid'];
+        $str_group_allow = $ac['allow_gid'];
+        $str_contact_deny = $ac['deny_cid'];
+        $str_group_deny = $ac['deny_gid'];
+
+        $private = $acl->is_private();
+
+        $results = linkify_tags($desc, local_channel());
+
+        if ($results) {
+            // Set permissions based on tag replacements
+
+            set_linkified_perms($results, $str_contact_allow, $str_group_allow, local_channel(), false, $private);
+
+            foreach ($results as $result) {
+                $success = $result['success'];
+                if ($success['replaced']) {
+                    $post_tags[] = [
+                        'uid' => local_channel(),
+                        'ttype' => $success['termtype'],
+                        'otype' => TERM_OBJ_POST,
+                        'term' => $success['term'],
+                        'url' => $success['url']
+                    ];
+                }
+            }
+        }
+
+
+        if (strlen($categories)) {
+            $cats = explode(',', $categories);
+            foreach ($cats as $cat) {
+                $post_tags[] = array(
+                    'uid' => local_channel(),
+                    'ttype' => TERM_CATEGORY,
+                    'otype' => TERM_OBJ_POST,
+                    'term' => trim($cat),
+                    'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat))
+                );
+            }
+        }
+
+        $datarray = [
+            'dtstart' => $start,
+            'dtend' => $finish,
+            'summary' => $summary,
+            'description' => $desc,
+            'location' => $location,
+            'etype' => $type,
+            'adjust' => $adjust,
+            'nofinish' => $nofinish,
+            'uid' => local_channel(),
+            'account' => get_account_id(),
+            'event_xchan' => $channel['channel_hash'],
+            'allow_cid' => $str_contact_allow,
+            'allow_gid' => $str_group_allow,
+            'deny_cid' => $str_contact_deny,
+            'deny_gid' => $str_group_deny,
+            'private' => intval($private),
+            'id' => $event_id,
+            'created' => $created,
+            'edited' => $edited
+        ];
+
+        if (intval($_REQUEST['preview'])) {
+            $html = format_event_html($datarray);
+            echo $html;
+            killme();
+        }
+
+        $event = event_store_event($datarray);
+
+        if ($post_tags) {
+            $datarray['term'] = $post_tags;
+        }
+
+        $item_id = event_store_item($datarray, $event);
+
+        if ($item_id) {
+            $r = q(
+                "select * from item where id = %d",
+                intval($item_id)
+            );
+            if ($r) {
+                xchan_query($r);
+                $sync_item = fetch_post_tags($r);
+                $z = q(
+                    "select * from event where event_hash = '%s' and uid = %d limit 1",
+                    dbesc($r[0]['resource_id']),
+                    intval($channel['channel_id'])
+                );
+                if ($z) {
+                    Libsync::build_sync_packet($channel['channel_id'], ['event_item' => [encode_item($sync_item[0], true)], 'event' => $z]);
+                }
+            }
+        }
+
+        Run::Summon(['Notifier', 'event', $item_id]);
+        killme();
+    }
+
+
+    public function get()
+    {
+
+        if (argc() > 2 && argv(1) == 'ical') {
+            $event_id = argv(2);
+
+            $sql_extra = permissions_sql(local_channel());
+
+            $r = q(
+                "select * from event where event_hash = '%s' $sql_extra limit 1",
+                dbesc($event_id)
+            );
+            if ($r) {
+                header('Content-type: text/calendar');
+                header('Content-Disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"');
+                echo ical_wrapper($r);
+                killme();
+            } else {
+                notice(t('Event not found.') . EOL);
+                return;
+            }
+        }
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if ((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
+            $r = q(
+                "update event set dismissed = 1 where id = %d and uid = %d",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+        }
+
+        if ((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
+            $r = q(
+                "update event set dismissed = 0 where id = %d and uid = %d",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+        }
+
+        $channel = App::get_channel();
+
+        $mode = 'view';
+        $export = false;
+
+        $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
+
+        if (argc() > 1) {
+            if (argc() > 2 && argv(1) === 'add') {
+                $mode = 'add';
+                $item_id = intval(argv(2));
+            }
+            if (argc() > 2 && argv(1) === 'drop') {
+                $mode = 'drop';
+                $event_id = argv(2);
+            }
+            if (argc() <= 2 && argv(1) === 'export') {
+                $export = true;
+            }
+            if (argc() > 2 && intval(argv(1)) && intval(argv(2))) {
+                $mode = 'view';
+            }
+            if (argc() <= 2) {
+                $mode = 'view';
+                $event_id = argv(1);
+            }
+        }
+
+        if ($mode === 'add') {
+            event_addtocal($item_id, local_channel());
+            killme();
+        }
+
+        if ($mode == 'view') {
+            /* edit/create form */
+            if ($event_id) {
+                $r = q(
+                    "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+                    dbesc($event_id),
+                    intval(local_channel())
+                );
+                if ($r) {
+                    $orig_event = $r[0];
+                }
+            }
+
+            $channel = App::get_channel();
+
+            if (argv(1) === 'json') {
+                if (x($_GET, 'start')) {
+                    $start = $_GET['start'];
+                }
+                if (x($_GET, 'end')) {
+                    $finish = $_GET['end'];
+                }
+            }
+
+            $start = datetime_convert('UTC', 'UTC', $start);
+            $finish = datetime_convert('UTC', 'UTC', $finish);
+
+            $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+            $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+
+            if (x($_GET, 'id')) {
+                $r = q(
+                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
+	                                from event left join item on item.resource_id = event.event_hash
+					where item.resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
+                    intval(local_channel()),
+                    intval($_GET['id'])
+                );
+            } elseif ($export) {
+                $r = q(
+                    "SELECT * from event where uid = %d",
+                    intval(local_channel())
+                );
+            } else {
+                // fixed an issue with "nofinish" events not showing up in the calendar.
+                // There's still an issue if the finish date crosses the end of month.
+                // Noting this for now - it will need to be fixed here and in Friendica.
+                // Ultimately the finish date shouldn't be involved in the query.
+
+                $r = q(
+                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
+					from event left join item on event.event_hash = item.resource_id 
+					where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
+					AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ) 
+					OR  (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) ",
+                    intval(local_channel()),
+                    dbesc($start),
+                    dbesc($finish),
+                    dbesc($adjust_start),
+                    dbesc($adjust_finish)
+                );
+            }
+
+            if ($r && !$export) {
+                xchan_query($r);
+                $r = fetch_post_tags($r, true);
+
+                $r = sort_by_date($r);
+            }
+
+            $events = [];
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
+                    if ($rr['nofinish']) {
+                        $end = null;
+                    } else {
+                        $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
+
+                        // give a fake end to birthdays so they get crammed into a
+                        // single day on the calendar
+
+                        if ($rr['etype'] === 'birthday') {
+                            $end = null;
+                        }
+                    }
+
+                    $catsenabled = Apps::system_app_installed($x['profile_uid'], 'Categories');
+                    $categories = '';
+                    if ($catsenabled) {
+                        if ($rr['term']) {
+                            $categories = array_elm_to_str(get_terms_oftype($rr['term'], TERM_CATEGORY), 'term');
+                        }
+                    }
+
+                    $allDay = false;
+
+                    // allDay event rules
+                    if (!strpos($start, 'T') && !strpos($end, 'T')) {
+                        $allDay = true;
+                    }
+                    if (strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00')) {
+                        $allDay = true;
+                    }
+
+                    $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root() . '/events/' . $rr['event_hash'] . '?expandform=1', t('Edit event'), '', '') : false);
+
+                    $drop = [z_root() . '/events/drop/' . $rr['event_hash'], t('Delete event'), '', ''];
+
+                    $events[] = [
+                        'calendar_id' => 'calendar',
+                        'rw' => true,
+                        'id' => $rr['id'],
+                        'uri' => $rr['event_hash'],
+                        'start' => $start,
+                        'end' => $end,
+                        'drop' => $drop,
+                        'allDay' => $allDay,
+                        'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
+                        'editable' => $edit ? true : false,
+                        'item' => $rr,
+                        'plink' => [$rr['plink'], t('Link to source')],
+                        'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8', false),
+                        'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8', false),
+                        'allow_cid' => expand_acl($rr['allow_cid']),
+                        'allow_gid' => expand_acl($rr['allow_gid']),
+                        'deny_cid' => expand_acl($rr['deny_cid']),
+                        'deny_gid' => expand_acl($rr['deny_gid']),
+                        'categories' => $categories
+                    ];
+                }
+            }
+
+            if ($export) {
+                header('Content-type: text/calendar');
+                header('Content-Disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"');
+                echo ical_wrapper($r);
+                killme();
+            }
+
+            if (App::$argv[1] === 'json') {
+                json_return_and_die($events);
+            }
+        }
+
+
+        if ($mode === 'drop' && $event_id) {
+            $r = q(
+                "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+                dbesc($event_id),
+                intval(local_channel())
+            );
+
+            $sync_event = $r[0];
+
+            if ($r) {
+                $r = q(
+                    "delete from event where event_hash = '%s' and uid = %d",
+                    dbesc($event_id),
+                    intval(local_channel())
+                );
+                if ($r) {
+                    $r = q(
+                        "update item set resource_type = '', resource_id = '' where resource_type = 'event' and resource_id = '%s' and uid = %d",
+                        dbesc($event_id),
+                        intval(local_channel())
+                    );
+                    $sync_event['event_deleted'] = 1;
+                    Libsync::build_sync_packet(0, ['event' => [$sync_event]]);
+                    killme();
+                }
+                notice(t('Failed to remove event') . EOL);
+                killme();
+            }
+        }
+    }
+}
diff --git a/Code/Module/Card_edit.php b/Code/Module/Card_edit.php
new file mode 100644
index 000000000..68c6ec8c2
--- /dev/null
+++ b/Code/Module/Card_edit.php
@@ -0,0 +1,148 @@
+ 1) ? intval(argv(1)) : 0);
+
+        if (!$post_id) {
+            notice(t('Item not found') . EOL);
+            return;
+        }
+
+        $itm = q(
+            "SELECT * FROM item WHERE id = %d and item_type = %d LIMIT 1",
+            intval($post_id),
+            intval(ITEM_TYPE_CARD)
+        );
+        if ($itm) {
+            $item_id = q(
+                "select * from iconfig where cat = 'system' and k = 'CARD' and iid = %d limit 1",
+                intval($itm[0]['id'])
+            );
+            if ($item_id) {
+                $card_title = $item_id[0]['v'];
+            }
+        } else {
+            notice(t('Item not found') . EOL);
+            return;
+        }
+
+        $owner = $itm[0]['uid'];
+        $uid = local_channel();
+
+        $observer = App::get_observer();
+
+        $channel = Channel::from_id($owner);
+        if (!$channel) {
+            notice(t('Channel not found.') . EOL);
+            return;
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $is_owner = (($uid && $uid == $owner) ? true : false);
+
+        $o = '';
+
+
+        $category = '';
+        $catsenabled = ((Apps::system_app_installed($owner, 'Categories')) ? 'categories' : '');
+
+        if ($catsenabled) {
+            $itm = fetch_post_tags($itm);
+
+            $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
+
+            foreach ($cats as $cat) {
+                if (strlen($category)) {
+                    $category .= ', ';
+                }
+                $category .= $cat['term'];
+            }
+        }
+
+        if ($itm[0]['attach']) {
+            $j = json_decode($itm[0]['attach'], true);
+            if ($j) {
+                foreach ($j as $jj) {
+                    $itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
+                }
+            }
+        }
+
+
+        $mimetype = $itm[0]['mimetype'];
+
+        $content = $itm[0]['body'];
+
+
+        $rp = 'cards/' . $channel['channel_address'];
+
+        $x = array(
+            'nickname' => $channel['channel_address'],
+            'bbco_autocomplete' => 'bbcode',
+            'return_path' => $rp,
+            'webpage' => ITEM_TYPE_CARD,
+            'button' => t('Edit'),
+            'writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_pages'),
+            'weblink' => t('Insert web link'),
+            'hide_voting' => false,
+            'hide_future' => false,
+            'hide_location' => false,
+            'hide_expire' => false,
+            'showacl' => true,
+            'acl' => Libacl::populate($itm[0], false, PermissionDescription::fromGlobalPermission('view_pages')),
+            'permissions' => $itm[0],
+            'lockstate' => (($itm[0]['allow_cid'] || $itm[0]['allow_gid'] || $itm[0]['deny_cid'] || $itm[0]['deny_gid']) ? 'lock' : 'unlock'),
+            'ptyp' => $itm[0]['type'],
+            'mimeselect' => false,
+            'mimetype' => $itm[0]['mimetype'],
+            'body' => undo_post_tagging($content),
+            'post_id' => $post_id,
+            'visitor' => true,
+            'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'),
+            'placeholdertitle' => t('Title (optional)'),
+            'pagetitle' => $card_title,
+            'profile_uid' => (intval($channel['channel_id'])),
+            'catsenabled' => $catsenabled,
+            'category' => $category,
+			'bbcode' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? true : false)
+        );
+
+        $editor = status_editor($x);
+
+        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
+            '$title' => t('Edit Card'),
+            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+            '$id' => $itm[0]['id'],
+            '$cancel' => t('Cancel'),
+            '$editor' => $editor
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Cards.php b/Code/Module/Cards.php
new file mode 100644
index 000000000..58920c92f
--- /dev/null
+++ b/Code/Module/Cards.php
@@ -0,0 +1,223 @@
+ 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Code\Web\Controller::get()
+     */
+    public function get()
+    {
+
+        if (observer_prohibited(true)) {
+            return login();
+        }
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        if (!Apps::system_app_installed(App::$profile_uid, 'Cards')) {
+            //Do not display any associated widgets at this point
+            App::$pdl = '';
+
+            $o = 'Cards App (Not Installed):
      ';
+            $o .= t('Create personal planning cards');
+            return $o;
+        }
+
+        Navbar::set_selected('Cards');
+
+        head_add_link([
+            'rel' => 'alternate',
+            'type' => 'application/json+oembed',
+            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
+            'title' => 'oembed'
+        ]);
+
+
+        $category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : '');
+
+        if ($category) {
+            $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
+        }
+
+
+        $which = argv(1);
+
+        $selected_card = ((argc() > 2) ? argv(2) : '');
+
+        $_SESSION['return_url'] = App::$query_string;
+
+        $uid = local_channel();
+        $owner = App::$profile_uid;
+        $observer = App::get_observer();
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        if (!perm_is_allowed($owner, $ob_hash, 'view_pages')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $is_owner = ($uid && $uid == $owner);
+
+        $channel = Channel::from_id($owner);
+
+        if ($channel) {
+            $channel_acl = [
+                'allow_cid' => $channel['channel_allow_cid'],
+                'allow_gid' => $channel['channel_allow_gid'],
+                'deny_cid' => $channel['channel_deny_cid'],
+                'deny_gid' => $channel['channel_deny_gid']
+            ];
+        } else {
+            $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
+        }
+
+
+        if (perm_is_allowed($owner, $ob_hash, 'write_pages')) {
+            $x = [
+                'webpage' => ITEM_TYPE_CARD,
+                'is_owner' => true,
+                'content_label' => t('Add Card'),
+                'button' => t('Create'),
+                'nickname' => $channel['channel_address'],
+                'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
+                    || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+                'acl' => (($is_owner) ? Libacl::populate(
+                    $channel_acl,
+                    false,
+                    PermissionDescription::fromGlobalPermission('view_pages')
+                ) : ''),
+                'permissions' => $channel_acl,
+                'showacl' => (($is_owner) ? true : false),
+                'visitor' => true,
+                'hide_location' => false,
+                'hide_voting' => false,
+                'profile_uid' => intval($owner),
+                'mimetype' => 'text/x-multicode',
+                'mimeselect' => false,
+                'layoutselect' => false,
+                'expanded' => false,
+                'novoting' => false,
+                'catsenabled' => Apps::system_app_installed($owner, 'Categories'),
+                'bbco_autocomplete' => 'bbcode',
+                'bbcode' => true
+            ];
+
+            if ($_REQUEST['title']) {
+                $x['title'] = $_REQUEST['title'];
+            }
+            if ($_REQUEST['body']) {
+                $x['body'] = $_REQUEST['body'];
+            }
+
+            $editor = status_editor($x);
+        } else {
+            $editor = '';
+        }
+
+
+        $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
+        App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+        $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+
+
+        $sql_extra = item_permissions_sql($owner);
+        $sql_item = '';
+
+        if ($selected_card) {
+            $r = q(
+                "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1",
+                dbesc($selected_card)
+            );
+            if ($r) {
+                $sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
+            }
+        }
+
+        $r = q(
+            "select * from item
+			where uid = %d and item_type = %d
+			$sql_extra $sql_item order by item.created desc $pager_sql",
+            intval($owner),
+            intval(ITEM_TYPE_CARD)
+        );
+
+        $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0
+			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
+			and item.item_blocked = 0 ";
+
+        $items_result = [];
+        if ($r) {
+            $pager_total = count($r);
+
+            $parents_str = ids_to_querystr($r, 'id');
+
+            $items = q(
+                "SELECT item.*, item.id AS item_id
+				FROM item
+				WHERE item.uid = %d $item_normal
+				AND item.parent IN ( %s )
+				$sql_extra $sql_extra2 ",
+                intval(App::$profile['profile_uid']),
+                dbesc($parents_str)
+            );
+            if ($items) {
+                xchan_query($items);
+                $items = fetch_post_tags($items, true);
+                $items_result = conv_sort($items, 'updated');
+            }
+        }
+
+        $mode = 'cards';
+
+        if (get_pconfig(local_channel(), 'system', 'articles_list_mode') && (!$selected_card)) {
+            $page_mode = 'pager_list';
+        } else {
+            $page_mode = 'traditional';
+        }
+
+        $content = conversation($items_result, $mode, false, $page_mode);
+
+        $o = replace_macros(Theme::get_template('cards.tpl'), [
+            '$title' => t('Cards'),
+            '$editor' => $editor,
+            '$content' => $content,
+            '$pager' => alt_pager($pager_total)
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Categories.php b/Code/Module/Categories.php
new file mode 100644
index 000000000..a3297cc49
--- /dev/null
+++ b/Code/Module/Categories.php
@@ -0,0 +1,42 @@
+' . $desc . '';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Categories'))) {
+            return $text;
+        }
+
+        $c = new Comanche();
+        return $c->widget('catcloud', EMPTY_STR);
+    }
+}
diff --git a/Code/Module/Cdav.php b/Code/Module/Cdav.php
new file mode 100644
index 000000000..fee892b06
--- /dev/null
+++ b/Code/Module/Cdav.php
@@ -0,0 +1,1447 @@
+ $c, 'account' => $a[0]];
+                                        $channel_login = $c['channel_id'];
+                                    }
+                                }
+                            }
+                            if (!$record) {
+                                continue;
+                            }
+
+                            if ($record) {
+                                $verified = HTTPSig::verify('', $record['channel']['channel_pubkey']);
+                                if (!($verified && $verified['header_signed'] && $verified['header_valid'])) {
+                                    $record = null;
+                                }
+                                if ($record['account']) {
+                                    authenticate_success($record['account']);
+                                    if ($channel_login) {
+                                        change_channel($channel_login);
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            /**
+             * This server combines both CardDAV and CalDAV functionality into a single
+             * server. It is assumed that the server runs at the root of a HTTP domain (be
+             * that a domainname-based vhost or a specific TCP port.
+             *
+             * This example also assumes that you're using SQLite and the database has
+             * already been setup (along with the database tables).
+             *
+             * You may choose to use MySQL instead, just change the PDO connection
+             * statement.
+             */
+
+            /**
+             * UTC or GMT is easy to work with, and usually recommended for any
+             * application.
+             */
+            date_default_timezone_set('UTC');
+
+            /**
+             * Make sure this setting is turned on and reflect the root url for your WebDAV
+             * server.
+             *
+             * This can be for example the root / or a complete path to your server script.
+             */
+
+            $baseUri = '/cdav/';
+
+            /**
+             * Database
+             *
+             */
+
+            $pdo = DBA::$dba->db;
+
+            // Autoloader
+            require_once 'vendor/autoload.php';
+
+            /**
+             * The backends. Yes we do really need all of them.
+             *
+             * This allows any developer to subclass just any of them and hook into their
+             * own backend systems.
+             */
+
+            $auth = new BasicAuth();
+            $auth->setRealm(ucfirst(System::get_platform_name()) . ' ' . 'CalDAV/CardDAV');
+
+            if (local_channel()) {
+                logger('loggedin');
+
+                if ((argv(1) == 'addressbooks') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) {
+                    killme();
+                }
+
+                $channel = App::get_channel();
+                $auth->setCurrentUser($channel['channel_address']);
+                $auth->channel_id = $channel['channel_id'];
+                $auth->channel_hash = $channel['channel_hash'];
+                $auth->channel_account_id = $channel['channel_account_id'];
+                if ($channel['channel_timezone']) {
+                    $auth->setTimezone($channel['channel_timezone']);
+                }
+                $auth->observer = $channel['channel_hash'];
+
+                $principalUri = 'principals/' . $channel['channel_address'];
+                if (!cdav_principal($principalUri)) {
+                    $this->activate($pdo, $channel);
+                    if (!cdav_principal($principalUri)) {
+                        return;
+                    }
+                }
+            }
+
+
+            $principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo);
+            $carddavBackend = new PDO($pdo);
+            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+
+            /**
+             * The directory tree
+             *
+             * Basically this is an array which contains the 'top-level' directories in the
+             * WebDAV server.
+             */
+
+            $nodes = [
+                // /principals
+                new Collection($principalBackend),
+
+                // /calendars
+                new CalendarRoot($principalBackend, $caldavBackend),
+
+                // /addressbook
+                new AddressBookRoot($principalBackend, $carddavBackend)
+            ];
+
+
+            // The object tree needs in turn to be passed to the server class
+
+            $server = new Server($nodes);
+
+            if (isset($baseUri)) {
+                $server->setBaseUri($baseUri);
+            }
+
+            // Plugins
+            $server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth));
+            //$server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+            $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+            $server->addPlugin(new \Sabre\DAV\Sharing\Plugin());
+            $server->addPlugin(new \Sabre\DAVACL\Plugin());
+
+            // CalDAV plugins
+            $server->addPlugin(new \Sabre\CalDAV\Plugin());
+            $server->addPlugin(new SharingPlugin());
+            //$server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
+            $server->addPlugin(new ICSExportPlugin());
+
+            // CardDAV plugins
+            $server->addPlugin(new Plugin());
+            $server->addPlugin(new VCFExportPlugin());
+
+            // And off we go!
+            $server->exec();
+
+            killme();
+        }
+    }
+
+    public function post()
+    {
+
+        if (!local_channel()) {
+            return;
+        }
+
+        if ((argv(1) === 'addressbook') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) {
+            return;
+        }
+
+        $channel = App::get_channel();
+        $principalUri = 'principals/' . $channel['channel_address'];
+
+        if (!cdav_principal($principalUri)) {
+            return;
+        }
+
+        $pdo = DBA::$dba->db;
+
+        require_once 'vendor/autoload.php';
+
+        if (argc() == 2 && argv(1) === 'calendar') {
+            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+            $calendars = $caldavBackend->getCalendarsForUser($principalUri);
+
+            // create new calendar
+            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) {
+                do {
+                    $duplicate = false;
+                    $calendarUri = random_string(40);
+
+                    $r = q(
+                        "SELECT uri FROM calendarinstances WHERE principaluri = '%s' AND uri = '%s' LIMIT 1",
+                        dbesc($principalUri),
+                        dbesc($calendarUri)
+                    );
+
+                    if ($r) {
+                        $duplicate = true;
+                    }
+                } while ($duplicate == true);
+
+                $properties = [
+                    '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'],
+                    '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color'],
+                    '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name']
+                ];
+
+                $id = $caldavBackend->createCalendar($principalUri, $calendarUri, $properties);
+
+                // set new calendar to be visible
+                set_pconfig(local_channel(), 'cdav_calendar', $id[0], 1);
+            }
+
+            //create new calendar object via ajax request
+            if ($_REQUEST['submit'] === 'create_event' && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) {
+                $id = explode(':', $_REQUEST['target']);
+
+                if (!cdav_perms($id[0], $calendars, true)) {
+                    return;
+                }
+
+                $title = $_REQUEST['title'];
+                $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
+                $dtstart = new DateTime($start);
+                if ($_REQUEST['dtend']) {
+                    $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
+                    $dtend = new DateTime($end);
+                }
+                $description = $_REQUEST['description'];
+                $location = $_REQUEST['location'];
+
+                do {
+                    $duplicate = false;
+                    $objectUri = random_string(40) . '.ics';
+
+                    $r = q(
+                        "SELECT uri FROM calendarobjects WHERE calendarid = %s AND uri = '%s' LIMIT 1",
+                        intval($id[0]),
+                        dbesc($objectUri)
+                    );
+
+                    if (count($r)) {
+                        $duplicate = true;
+                    }
+                } while ($duplicate == true);
+
+
+                $vcalendar = new VCalendar([
+                    'VEVENT' => [
+                        'SUMMARY' => $title,
+                        'DTSTART' => $dtstart
+                    ]
+                ]);
+                if ($dtend) {
+                    $vcalendar->VEVENT->add('DTEND', $dtend);
+                    $vcalendar->VEVENT->DTEND['TZID'] = App::$timezone;
+                }
+                if ($description) {
+                    $vcalendar->VEVENT->add('DESCRIPTION', $description);
+                }
+                if ($location) {
+                    $vcalendar->VEVENT->add('LOCATION', $location);
+                }
+
+                $vcalendar->VEVENT->DTSTART['TZID'] = App::$timezone;
+
+                $calendarData = $vcalendar->serialize();
+
+                $caldavBackend->createCalendarObject($id, $objectUri, $calendarData);
+
+                killme();
+            }
+
+            // edit calendar name and color
+            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && $_REQUEST['id']) {
+                $id = explode(':', $_REQUEST['id']);
+
+                if (!cdav_perms($id[0], $calendars)) {
+                    return;
+                }
+
+                $mutations = [
+                    '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'],
+                    '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color']
+                ];
+
+                $patch = new PropPatch($mutations);
+
+                $caldavBackend->updateCalendar($id, $patch);
+
+                $patch->commit();
+            }
+
+            // edit calendar object via ajax request
+            if ($_REQUEST['submit'] === 'update_event' && $_REQUEST['uri'] && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) {
+                $id = explode(':', $_REQUEST['target']);
+
+                if (!cdav_perms($id[0], $calendars, true)) {
+                    return;
+                }
+
+                $uri = $_REQUEST['uri'];
+                $title = $_REQUEST['title'];
+                $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
+                $dtstart = new DateTime($start);
+                if ($_REQUEST['dtend']) {
+                    $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
+                    $dtend = new DateTime($end);
+                }
+                $description = $_REQUEST['description'];
+                $location = $_REQUEST['location'];
+
+                $object = $caldavBackend->getCalendarObject($id, $uri);
+
+                $vcalendar = Reader::read($object['calendardata']);
+
+                if ($title) {
+                    $vcalendar->VEVENT->SUMMARY = $title;
+                }
+                if ($dtstart) {
+                    $vcalendar->VEVENT->DTSTART = $dtstart;
+                }
+                if ($dtend) {
+                    $vcalendar->VEVENT->DTEND = $dtend;
+                } else {
+                    unset($vcalendar->VEVENT->DTEND);
+                }
+                if ($description) {
+                    $vcalendar->VEVENT->DESCRIPTION = $description;
+                }
+                if ($location) {
+                    $vcalendar->VEVENT->LOCATION = $location;
+                }
+
+                $calendarData = $vcalendar->serialize();
+
+                $caldavBackend->updateCalendarObject($id, $uri, $calendarData);
+                killme();
+            }
+
+            // delete calendar object via ajax request
+            if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) {
+                $id = explode(':', $_REQUEST['target']);
+
+                if (!cdav_perms($id[0], $calendars, true)) {
+                    return;
+                }
+
+                $uri = $_REQUEST['uri'];
+
+                $caldavBackend->deleteCalendarObject($id, $uri);
+                killme();
+            }
+
+            // edit calendar object date/timeme via ajax request (drag and drop)
+            if ($_REQUEST['update'] && $_REQUEST['id'] && $_REQUEST['uri']) {
+                $id = [$_REQUEST['id'][0], $_REQUEST['id'][1]];
+
+                if (!cdav_perms($id[0], $calendars, true)) {
+                    return;
+                }
+
+                $uri = $_REQUEST['uri'];
+                $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
+                $dtstart = new DateTime($start);
+                if ($_REQUEST['dtend']) {
+                    $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
+                    $dtend = new DateTime($end);
+                }
+
+                $object = $caldavBackend->getCalendarObject($id, $uri);
+
+                $vcalendar = Reader::read($object['calendardata']);
+
+                if ($dtstart) {
+                    $vcalendar->VEVENT->DTSTART = $dtstart;
+                }
+                if ($dtend) {
+                    $vcalendar->VEVENT->DTEND = $dtend;
+                } else {
+                    unset($vcalendar->VEVENT->DTEND);
+                }
+
+                $calendarData = $vcalendar->serialize();
+
+                $caldavBackend->updateCalendarObject($id, $uri, $calendarData);
+
+                killme();
+            }
+
+            // share a calendar - this only works on local system (with channels on the same server)
+            if ($_REQUEST['sharee'] && $_REQUEST['share']) {
+                $id = [intval($_REQUEST['calendarid']), intval($_REQUEST['instanceid'])];
+
+                if (!cdav_perms($id[0], $calendars)) {
+                    return;
+                }
+
+                $hash = $_REQUEST['sharee'];
+
+                $sharee_arr = Channel::from_hash($hash);
+
+                $sharee = new Sharee();
+
+                $sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
+                $sharee->principal = 'principals/' . $sharee_arr['channel_address'];
+                $sharee->access = intval($_REQUEST['access']);
+                $sharee->properties = ['{DAV:}displayname' => $channel['channel_name']];
+
+                $caldavBackend->updateInvites($id, [$sharee]);
+            }
+        }
+
+        if (argc() >= 2 && argv(1) === 'addressbook') {
+            $carddavBackend = new PDO($pdo);
+            $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
+
+            // create new addressbook
+            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) {
+                do {
+                    $duplicate = false;
+                    $addressbookUri = random_string(20);
+
+                    $r = q(
+                        "SELECT uri FROM addressbooks WHERE principaluri = '%s' AND uri = '%s' LIMIT 1",
+                        dbesc($principalUri),
+                        dbesc($addressbookUri)
+                    );
+
+                    if ($r) {
+                        $duplicate = true;
+                    }
+                } while ($duplicate == true);
+
+                $properties = ['{DAV:}displayname' => $_REQUEST['{DAV:}displayname']];
+
+                $carddavBackend->createAddressBook($principalUri, $addressbookUri, $properties);
+            }
+
+            // edit addressbook
+            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && intval($_REQUEST['id'])) {
+                $id = $_REQUEST['id'];
+
+                if (!cdav_perms($id, $addressbooks)) {
+                    return;
+                }
+
+                $mutations = [
+                    '{DAV:}displayname' => $_REQUEST['{DAV:}displayname']
+                ];
+
+                $patch = new PropPatch($mutations);
+
+                $carddavBackend->updateAddressBook($id, $patch);
+
+                $patch->commit();
+            }
+
+            // create addressbook card
+            if ($_REQUEST['create'] && $_REQUEST['target'] && $_REQUEST['fn']) {
+                $id = $_REQUEST['target'];
+
+                do {
+                    $duplicate = false;
+                    $uri = random_string(40) . '.vcf';
+
+                    $r = q(
+                        "SELECT uri FROM cards WHERE addressbookid = %s AND uri = '%s' LIMIT 1",
+                        intval($id),
+                        dbesc($uri)
+                    );
+
+                    if ($r) {
+                        $duplicate = true;
+                    }
+                } while ($duplicate == true);
+
+                // TODO: this mostly duplictes the procedure in update addressbook card.
+                // Should move this part to a function to avoid duplication
+                $fn = $_REQUEST['fn'];
+
+                $vcard = new \Sabre\VObject\Component\VCard([
+                    'FN' => $fn,
+                    'N' => array_reverse(explode(' ', $fn))
+                ]);
+
+                $org = $_REQUEST['org'];
+                if ($org) {
+                    $vcard->ORG = $org;
+                }
+
+                $title = $_REQUEST['title'];
+                if ($title) {
+                    $vcard->TITLE = $title;
+                }
+
+                $tel = $_REQUEST['tel'];
+                $tel_type = $_REQUEST['tel_type'];
+                if ($tel) {
+                    $i = 0;
+                    foreach ($tel as $item) {
+                        if ($item) {
+                            $vcard->add('TEL', $item, ['type' => $tel_type[$i]]);
+                        }
+                        $i++;
+                    }
+                }
+
+                $email = $_REQUEST['email'];
+                $email_type = $_REQUEST['email_type'];
+                if ($email) {
+                    $i = 0;
+                    foreach ($email as $item) {
+                        if ($item) {
+                            $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]);
+                        }
+                        $i++;
+                    }
+                }
+
+                $impp = $_REQUEST['impp'];
+                $impp_type = $_REQUEST['impp_type'];
+                if ($impp) {
+                    $i = 0;
+                    foreach ($impp as $item) {
+                        if ($item) {
+                            $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]);
+                        }
+                        $i++;
+                    }
+                }
+
+                $url = $_REQUEST['url'];
+                $url_type = $_REQUEST['url_type'];
+                if ($url) {
+                    $i = 0;
+                    foreach ($url as $item) {
+                        if ($item) {
+                            $vcard->add('URL', $item, ['type' => $url_type[$i]]);
+                        }
+                        $i++;
+                    }
+                }
+
+                $adr = $_REQUEST['adr'];
+                $adr_type = $_REQUEST['adr_type'];
+
+                if ($adr) {
+                    $i = 0;
+                    foreach ($adr as $item) {
+                        if ($item) {
+                            $vcard->add('ADR', $item, ['type' => $adr_type[$i]]);
+                        }
+                        $i++;
+                    }
+                }
+
+                $note = $_REQUEST['note'];
+                if ($note) {
+                    $vcard->NOTE = $note;
+                }
+
+                $cardData = $vcard->serialize();
+
+                $carddavBackend->createCard($id, $uri, $cardData);
+            }
+
+            // edit addressbook card
+            if ($_REQUEST['update'] && $_REQUEST['uri'] && $_REQUEST['target']) {
+                $id = $_REQUEST['target'];
+
+                if (!cdav_perms($id, $addressbooks)) {
+                    return;
+                }
+
+                $uri = $_REQUEST['uri'];
+
+                $object = $carddavBackend->getCard($id, $uri);
+                $vcard = Reader::read($object['carddata']);
+
+                $fn = $_REQUEST['fn'];
+                if ($fn) {
+                    $vcard->FN = $fn;
+                    $vcard->N = array_reverse(explode(' ', $fn));
+                }
+
+                $org = $_REQUEST['org'];
+                if ($org) {
+                    $vcard->ORG = $org;
+                } else {
+                    unset($vcard->ORG);
+                }
+
+                $title = $_REQUEST['title'];
+                if ($title) {
+                    $vcard->TITLE = $title;
+                } else {
+                    unset($vcard->TITLE);
+                }
+
+                $tel = $_REQUEST['tel'];
+                $tel_type = $_REQUEST['tel_type'];
+                if ($tel) {
+                    $i = 0;
+                    unset($vcard->TEL);
+                    foreach ($tel as $item) {
+                        if ($item) {
+                            $vcard->add('TEL', $item, ['type' => $tel_type[$i]]);
+                        }
+                        $i++;
+                    }
+                } else {
+                    unset($vcard->TEL);
+                }
+
+                $email = $_REQUEST['email'];
+                $email_type = $_REQUEST['email_type'];
+                if ($email) {
+                    $i = 0;
+                    unset($vcard->EMAIL);
+                    foreach ($email as $item) {
+                        if ($item) {
+                            $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]);
+                        }
+                        $i++;
+                    }
+                } else {
+                    unset($vcard->EMAIL);
+                }
+
+                $impp = $_REQUEST['impp'];
+                $impp_type = $_REQUEST['impp_type'];
+                if ($impp) {
+                    $i = 0;
+                    unset($vcard->IMPP);
+                    foreach ($impp as $item) {
+                        if ($item) {
+                            $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]);
+                        }
+                        $i++;
+                    }
+                } else {
+                    unset($vcard->IMPP);
+                }
+
+                $url = $_REQUEST['url'];
+                $url_type = $_REQUEST['url_type'];
+                if ($url) {
+                    $i = 0;
+                    unset($vcard->URL);
+                    foreach ($url as $item) {
+                        if ($item) {
+                            $vcard->add('URL', $item, ['type' => $url_type[$i]]);
+                        }
+                        $i++;
+                    }
+                } else {
+                    unset($vcard->URL);
+                }
+
+                $adr = $_REQUEST['adr'];
+                $adr_type = $_REQUEST['adr_type'];
+                if ($adr) {
+                    $i = 0;
+                    unset($vcard->ADR);
+                    foreach ($adr as $item) {
+                        if ($item) {
+                            $vcard->add('ADR', $item, ['type' => $adr_type[$i]]);
+                        }
+                        $i++;
+                    }
+                } else {
+                    unset($vcard->ADR);
+                }
+
+                $note = $_REQUEST['note'];
+                if ($note) {
+                    $vcard->NOTE = $note;
+                } else {
+                    unset($vcard->NOTE);
+                }
+
+                $cardData = $vcard->serialize();
+
+                $carddavBackend->updateCard($id, $uri, $cardData);
+            }
+
+            // delete addressbook card
+            if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) {
+                $id = $_REQUEST['target'];
+
+                if (!cdav_perms($id, $addressbooks)) {
+                    return;
+                }
+
+                $uri = $_REQUEST['uri'];
+
+                $carddavBackend->deleteCard($id, $uri);
+            }
+        }
+
+        // Import calendar or addressbook
+        if (($_FILES) && array_key_exists('userfile', $_FILES) && intval($_FILES['userfile']['size']) && $_REQUEST['target']) {
+            $src = $_FILES['userfile']['tmp_name'];
+
+            if ($src) {
+                if ($_REQUEST['c_upload']) {
+                    if ($_REQUEST['target'] == 'calendar') {
+                        $result = parse_ical_file($src, local_channel());
+                        if ($result) {
+                            info(t('Calendar entries imported.') . EOL);
+                        } else {
+                            notice(t('No calendar entries found.') . EOL);
+                        }
+
+                        @unlink($src);
+                        return;
+                    }
+
+                    $id = explode(':', $_REQUEST['target']);
+                    $ext = 'ics';
+                    $table = 'calendarobjects';
+                    $column = 'calendarid';
+                    $objects = new ICalendar(@file_get_contents($src));
+                    $profile = Node::PROFILE_CALDAV;
+                    $backend = new \Sabre\CalDAV\Backend\PDO($pdo);
+                }
+
+                if ($_REQUEST['a_upload']) {
+                    $id[] = intval($_REQUEST['target']);
+                    $ext = 'vcf';
+                    $table = 'cards';
+                    $column = 'addressbookid';
+                    $objects = new VCard(@file_get_contents($src));
+                    $profile = Node::PROFILE_CARDDAV;
+                    $backend = new PDO($pdo);
+                }
+
+                while ($object = $objects->getNext()) {
+                    if ($_REQUEST['a_upload']) {
+                        $object = $object->convert(Document::VCARD40);
+                    }
+
+                    $ret = $object->validate($profile & Node::REPAIR);
+
+                    // level 3 Means that the document is invalid,
+                    // level 2 means a warning. A warning means it's valid but it could cause interopability issues,
+                    // level 1 means that there was a problem earlier, but the problem was automatically repaired.
+
+                    if ($ret[0]['level'] < 3) {
+                        do {
+                            $duplicate = false;
+                            $objectUri = random_string(40) . '.' . $ext;
+
+                            $r = q(
+                                "SELECT uri FROM $table WHERE $column = %d AND uri = '%s' LIMIT 1",
+                                dbesc($id[0]),
+                                dbesc($objectUri)
+                            );
+
+                            if ($r) {
+                                $duplicate = true;
+                            }
+                        } while ($duplicate == true);
+
+                        if ($_REQUEST['c_upload']) {
+                            $backend->createCalendarObject($id, $objectUri, $object->serialize());
+                        }
+
+                        if ($_REQUEST['a_upload']) {
+                            $backend->createCard($id[0], $objectUri, $object->serialize());
+                        }
+                    } else {
+                        if ($_REQUEST['c_upload']) {
+                            notice('' . t('INVALID EVENT DISMISSED!') . '' . EOL .
+                                '' . t('Summary: ') . '' . (($object->VEVENT->SUMMARY) ? $object->VEVENT->SUMMARY : t('Unknown')) . EOL .
+                                '' . t('Date: ') . '' . (($object->VEVENT->DTSTART) ? $object->VEVENT->DTSTART : t('Unknown')) . EOL .
+                                '' . t('Reason: ') . '' . $ret[0]['message'] . EOL);
+                        }
+
+                        if ($_REQUEST['a_upload']) {
+                            notice('' . t('INVALID CARD DISMISSED!') . '' . EOL .
+                                '' . t('Name: ') . '' . (($object->FN) ? $object->FN : t('Unknown')) . EOL .
+                                '' . t('Reason: ') . '' . $ret[0]['message'] . EOL);
+                        }
+                    }
+                }
+            }
+            @unlink($src);
+        }
+    }
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            return;
+        }
+
+        if ((argv(1) === 'addressbook') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) {
+            // Do not display any associated widgets at this point
+            App::$pdl = '';
+
+            $o = '' . t('CardDAV App') . ' (' . t('Not Installed') . '):
      ';
+            $o .= t('CalDAV capable addressbook');
+            return $o;
+        }
+
+        App::$profile_uid = local_channel();
+
+        $channel = App::get_channel();
+        $principalUri = 'principals/' . $channel['channel_address'];
+
+        $pdo = DBA::$dba->db;
+
+        require_once 'vendor/autoload.php';
+
+        Head::add_css('cdav.css');
+
+        if (!cdav_principal($principalUri)) {
+            $this->activate($pdo, $channel);
+            if (!cdav_principal($principalUri)) {
+                return;
+            }
+        }
+
+        if (argv(1) === 'calendar') {
+            Navbar::set_selected('Calendar');
+            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+            $calendars = $caldavBackend->getCalendarsForUser($principalUri);
+        }
+
+        // Display calendar(s) here
+        if (argc() <= 3 && argv(1) === 'calendar') {
+            Head::add_css('/library/fullcalendar/packages/core/main.min.css');
+            Head::add_css('/library/fullcalendar/packages/daygrid/main.min.css');
+            Head::add_css('/library/fullcalendar/packages/timegrid/main.min.css');
+            Head::add_css('/library/fullcalendar/packages/list/main.min.css');
+            Head::add_css('cdav_calendar.css');
+
+            Head::add_js('/library/fullcalendar/packages/core/main.min.js');
+            Head::add_js('/library/fullcalendar/packages/interaction/main.min.js');
+            Head::add_js('/library/fullcalendar/packages/daygrid/main.min.js');
+            Head::add_js('/library/fullcalendar/packages/timegrid/main.min.js');
+            Head::add_js('/library/fullcalendar/packages/list/main.min.js');
+
+            $sources = '';
+            $resource_id = '';
+            $resource = null;
+
+            if (argc() == 3) {
+                $resource_id = argv(2);
+            }
+
+            if ($resource_id) {
+                $r = q(
+                    "SELECT event.*, item.author_xchan, item.owner_xchan, item.plink, item.id as item_id FROM event LEFT JOIN item ON event.event_hash = item.resource_id
+					WHERE event.uid = %d AND event.event_hash = '%s' LIMIT 1",
+                    intval(local_channel()),
+                    dbesc($resource_id)
+                );
+                if ($r) {
+                    xchan_query($r);
+                    $r = fetch_post_tags($r, true);
+
+                    $r[0]['dtstart'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $r[0]['dtstart'], 'c'));
+                    $r[0]['dtend'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtend'], 'c') : datetime_convert('UTC', 'UTC', $r[0]['dtend'], 'c'));
+
+                    $r[0]['plink'] = [$r[0]['plink'], t('Link to source')];
+
+                    $resource = $r[0];
+
+                    $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
+
+                    $categories = '';
+                    if ($catsenabled) {
+                        if ($r[0]['term']) {
+                            $categories = array_elm_to_str(get_terms_oftype($r[0]['term'], TERM_CATEGORY), 'term');
+                        }
+                    }
+
+                    if ($r[0]['dismissed'] == 0) {
+                        q(
+                            "UPDATE event SET dismissed = 1 WHERE event.uid = %d AND event.event_hash = '%s'",
+                            intval(local_channel()),
+                            dbesc($resource_id)
+                        );
+                    }
+                }
+            }
+
+            if (get_pconfig(local_channel(), 'cdav_calendar', 'calendar')) {
+                $sources .= '{
+					id: \'calendar\',
+					url: \'/calendar/json/\',
+					color: \'#3a87ad\'
+				}, ';
+            }
+
+            $calendars[] = [
+                'displayname' => $channel['channel_name'],
+                'id' => 'calendar'
+            ];
+
+            foreach ($calendars as $calendar) {
+                $editable = (($calendar['share-access'] == 2) ? 'false' : 'true');  // false/true must be string since we're passing it to javascript
+                $color = (($calendar['{http://apple.com/ns/ical/}calendar-color']) ? $calendar['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39');
+                $sharer = (($calendar['share-access'] == 3) ? $calendar['{urn:ietf:params:xml:ns:caldav}calendar-description'] : '');
+                $switch = get_pconfig(local_channel(), 'cdav_calendar', $calendar['id'][0]);
+                if ($switch) {
+                    $sources .= '{
+						id: ' . $calendar['id'][0] . ',
+						url: \'/cdav/calendar/json/' . $calendar['id'][0] . '/' . $calendar['id'][1] . '\',
+						color: \'' . $color . '\'
+					 }, ';
+                }
+
+                if ($calendar['share-access'] != 2) {
+                    $writable_calendars[] = [
+                        'displayname' => $calendar['{DAV:}displayname'],
+                        'sharer' => $sharer,
+                        'id' => $calendar['id']
+                    ];
+                }
+            }
+
+            $sources = rtrim($sources, ', ');
+
+            $first_day = Features::enabled(local_channel(), 'cal_first_day');
+            $first_day = (($first_day) ? $first_day : 0);
+
+            $title = ['title', t('Event title')];
+            $dtstart = ['dtstart', t('Start date and time')];
+            $dtend = ['dtend', t('End date and time')];
+            $description = ['description', t('Description')];
+            $location = ['location', t('Location')];
+
+            $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
+
+
+            $accesslist = new AccessControl($channel);
+            $perm_defaults = $accesslist->get();
+
+            $acl = Libacl::populate($perm_defaults, false, PermissionDescription::fromGlobalPermission('view_stream'));
+
+            $permissions = $perm_defaults;
+
+            $o .= replace_macros(Theme::get_template('cdav_calendar.tpl'), [
+                '$sources' => $sources,
+                '$color' => $color,
+                '$lang' => App::$language,
+                '$timezone' => App::$timezone,
+                '$first_day' => $first_day,
+                '$prev' => t('Previous'),
+                '$next' => t('Next'),
+                '$today' => t('Today'),
+                '$month' => t('Month'),
+                '$week' => t('Week'),
+                '$day' => t('Day'),
+                '$list_month' => t('List month'),
+                '$list_week' => t('List week'),
+                '$list_day' => t('List day'),
+                '$title' => $title,
+                '$calendars' => $calendars,
+                '$writable_calendars' => $writable_calendars,
+                '$dtstart' => $dtstart,
+                '$dtend' => $dtend,
+                '$description' => $description,
+                '$location' => $location,
+                '$more' => t('More'),
+                '$less' => t('Less'),
+                '$update' => t('Update'),
+                '$calendar_select_label' => t('Select calendar'),
+                '$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')],
+                '$delete' => t('Delete'),
+                '$delete_all' => t('Delete all'),
+                '$cancel' => t('Cancel'),
+                '$create' => t('Create'),
+                '$recurrence_warning' => t('Sorry! Editing of recurrent events is not yet implemented.'),
+                '$channel_hash' => $channel['channel_hash'],
+                '$acl' => $acl,
+                '$lockstate' => (($accesslist->is_private()) ? 'lock' : 'unlock'),
+                '$allow_cid' => acl2json($permissions['allow_cid']),
+                '$allow_gid' => acl2json($permissions['allow_gid']),
+                '$deny_cid' => acl2json($permissions['deny_cid']),
+                '$deny_gid' => acl2json($permissions['deny_gid']),
+                '$catsenabled' => $catsenabled,
+                '$categories_label' => t('Categories'),
+                '$resource' => json_encode($resource),
+                '$categories' => $categories
+            ]);
+
+            return $o;
+        }
+
+        // Provide json data for calendar
+        if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'json' && intval(argv(3)) && intval(argv(4))) {
+            $events = [];
+
+            $id = [argv(3), argv(4)];
+
+            if (!cdav_perms($id[0], $calendars)) {
+                json_return_and_die($events);
+            }
+
+            if (x($_GET, 'start')) {
+                $start = new DateTime($_GET['start']);
+            }
+            if (x($_GET, 'end')) {
+                $end = new DateTime($_GET['end']);
+            }
+
+            $filters['name'] = 'VCALENDAR';
+            $filters['prop-filters'][0]['name'] = 'VEVENT';
+            $filters['comp-filters'][0]['name'] = 'VEVENT';
+            $filters['comp-filters'][0]['time-range']['start'] = $start;
+            $filters['comp-filters'][0]['time-range']['end'] = $end;
+
+            $uris = $caldavBackend->calendarQuery($id, $filters);
+
+            if ($uris) {
+                $objects = $caldavBackend->getMultipleCalendarObjects($id, $uris);
+                foreach ($objects as $object) {
+                    $vcalendar = Reader::read($object['calendardata']);
+
+                    if (isset($vcalendar->VEVENT->RRULE)) {
+                        // expanding recurrent events seems to loose timezone info
+                        // save it here so we can add it later
+                        $recurrent_timezone = (string)$vcalendar->VEVENT->DTSTART['TZID'];
+                        $vcalendar = $vcalendar->expand($start, $end);
+                    }
+
+                    foreach ($vcalendar->VEVENT as $vevent) {
+                        $title = (string)$vevent->SUMMARY;
+                        $dtstart = (string)$vevent->DTSTART;
+                        $dtend = (string)$vevent->DTEND;
+                        $description = (string)$vevent->DESCRIPTION;
+                        $location = (string)$vevent->LOCATION;
+                        $timezone = (string)$vevent->DTSTART['TZID'];
+                        $rw = ((cdav_perms($id[0], $calendars, true)) ? true : false);
+                        $editable = $rw ? true : false;
+                        $recurrent = ((isset($vevent->{'RECURRENCE-ID'})) ? true : false);
+
+                        if ($recurrent) {
+                            $editable = false;
+                            $timezone = $recurrent_timezone;
+                        }
+
+                        $allDay = false;
+
+                        // allDay event rules
+                        if (!strpos($dtstart, 'T') && !strpos($dtend, 'T')) {
+                            $allDay = true;
+                        }
+                        if (strpos($dtstart, 'T000000') && strpos($dtend, 'T000000')) {
+                            $allDay = true;
+                        }
+
+                        $events[] = [
+                            'calendar_id' => $id,
+                            'uri' => $object['uri'],
+                            'title' => $title,
+                            'start' => datetime_convert($timezone, $timezone, $dtstart, 'c'),
+                            'end' => (($dtend) ? datetime_convert($timezone, $timezone, $dtend, 'c') : ''),
+                            'description' => $description,
+                            'location' => $location,
+                            'allDay' => $allDay,
+                            'editable' => $editable,
+                            'recurrent' => $recurrent,
+                            'rw' => $rw
+                        ];
+                    }
+                }
+            }
+            json_return_and_die($events);
+        }
+
+        // enable/disable calendars
+        if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'switch' && argv(3) && (argv(4) == 1 || argv(4) == 0)) {
+            $id = argv(3);
+
+            if (!cdav_perms($id, $calendars)) {
+                killme();
+            }
+
+            set_pconfig(local_channel(), 'cdav_calendar', argv(3), argv(4));
+            killme();
+        }
+
+        // drop calendar
+        if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'drop' && intval(argv(3)) && intval(argv(4))) {
+            $id = [argv(3), argv(4)];
+
+            if (!cdav_perms($id[0], $calendars)) {
+                killme();
+            }
+
+            $caldavBackend->deleteCalendar($id);
+            killme();
+        }
+
+        // drop sharee
+        if (argc() == 6 && argv(1) === 'calendar' && argv(2) === 'dropsharee' && intval(argv(3)) && intval(argv(4))) {
+            $id = [argv(3), argv(4)];
+            $hash = argv(5);
+
+            if (!cdav_perms($id[0], $calendars)) {
+                killme();
+            }
+
+            $sharee_arr = Channel::from_hash($hash);
+
+            $sharee = new Sharee();
+
+            $sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
+            $sharee->principal = 'principals/' . $sharee_arr['channel_address'];
+            $sharee->access = 4;
+            $caldavBackend->updateInvites($id, [$sharee]);
+
+            killme();
+        }
+
+
+        if (argv(1) === 'addressbook') {
+            Navbar::set_selected('CardDAV');
+            $carddavBackend = new PDO($pdo);
+            $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
+        }
+
+        // Display Adressbook here
+        if (argc() == 3 && argv(1) === 'addressbook' && intval(argv(2))) {
+            $id = argv(2);
+
+            $displayname = cdav_perms($id, $addressbooks);
+
+            if (!$displayname) {
+                return;
+            }
+
+            Head::add_css('cdav_addressbook.css');
+
+            $o = '';
+
+            $sabrecards = $carddavBackend->getCards($id);
+            foreach ($sabrecards as $sabrecard) {
+                $uris[] = $sabrecard['uri'];
+            }
+
+            if ($uris) {
+                $objects = $carddavBackend->getMultipleCards($id, $uris);
+
+                foreach ($objects as $object) {
+                    $vcard = Reader::read($object['carddata']);
+
+                    $photo = '';
+                    if ($vcard->PHOTO) {
+                        $photo_value = strtolower($vcard->PHOTO->getValueType()); // binary or uri
+                        if ($photo_value === 'binary') {
+                            $photo_type = strtolower($vcard->PHOTO['TYPE']); // mime jpeg, png or gif
+                            $photo = 'data:image/' . $photo_type . ';base64,' . base64_encode((string)$vcard->PHOTO);
+                        } else {
+                            $url = parse_url((string)$vcard->PHOTO);
+                            $photo = 'data:' . $url['path'];
+                        }
+                    }
+
+                    $fn = '';
+                    if ($vcard->FN) {
+                        $fn = (string)$vcard->FN;
+                    }
+
+                    $org = '';
+                    if ($vcard->ORG) {
+                        $org = (string)$vcard->ORG;
+                    }
+
+                    $title = '';
+                    if ($vcard->TITLE) {
+                        $title = (string)$vcard->TITLE;
+                    }
+
+                    $tels = [];
+                    if ($vcard->TEL) {
+                        foreach ($vcard->TEL as $tel) {
+                            $type = (($tel['TYPE']) ? translate_type((string)$tel['TYPE']) : '');
+                            $tels[] = [
+                                'type' => $type,
+                                'nr' => (string)$tel
+                            ];
+                        }
+                    }
+
+                    $emails = [];
+                    if ($vcard->EMAIL) {
+                        foreach ($vcard->EMAIL as $email) {
+                            $type = (($email['TYPE']) ? translate_type((string)$email['TYPE']) : '');
+                            $emails[] = [
+                                'type' => $type,
+                                'address' => (string)$email
+                            ];
+                        }
+                    }
+
+                    $impps = [];
+                    if ($vcard->IMPP) {
+                        foreach ($vcard->IMPP as $impp) {
+                            $type = (($impp['TYPE']) ? translate_type((string)$impp['TYPE']) : '');
+                            $impps[] = [
+                                'type' => $type,
+                                'address' => (string)$impp
+                            ];
+                        }
+                    }
+
+                    $urls = [];
+                    if ($vcard->URL) {
+                        foreach ($vcard->URL as $url) {
+                            $type = (($url['TYPE']) ? translate_type((string)$url['TYPE']) : '');
+                            $urls[] = [
+                                'type' => $type,
+                                'address' => (string)$url
+                            ];
+                        }
+                    }
+
+                    $adrs = [];
+                    if ($vcard->ADR) {
+                        foreach ($vcard->ADR as $adr) {
+                            $type = (($adr['TYPE']) ? translate_type((string)$adr['TYPE']) : '');
+                            $adrs[] = [
+                                'type' => $type,
+                                'address' => $adr->getParts()
+                            ];
+                        }
+                    }
+
+                    $note = '';
+                    if ($vcard->NOTE) {
+                        $note = (string)$vcard->NOTE;
+                    }
+
+                    $cards[] = [
+                        'id' => $object['id'],
+                        'uri' => $object['uri'],
+                        'photo' => $photo,
+                        'fn' => $fn,
+                        'org' => $org,
+                        'title' => $title,
+                        'tels' => $tels,
+                        'emails' => $emails,
+                        'impps' => $impps,
+                        'urls' => $urls,
+                        'adrs' => $adrs,
+                        'note' => $note
+                    ];
+                }
+
+                usort($cards, function ($a, $b) {
+                    return strcasecmp($a['fn'], $b['fn']);
+                });
+            }
+
+            $o .= replace_macros(Theme::get_template('cdav_addressbook.tpl'), [
+                '$id' => $id,
+                '$cards' => $cards,
+                '$displayname' => $displayname,
+                '$name_label' => t('Name'),
+                '$org_label' => t('Organisation'),
+                '$title_label' => t('Title'),
+                '$tel_label' => t('Phone'),
+                '$email_label' => t('Email'),
+                '$impp_label' => t('Instant messenger'),
+                '$url_label' => t('Website'),
+                '$adr_label' => t('Address'),
+                '$note_label' => t('Note'),
+                '$mobile' => t('Mobile'),
+                '$home' => t('Home'),
+                '$work' => t('Work'),
+                '$other' => t('Other'),
+                '$add_card' => t('Add Contact'),
+                '$add_field' => t('Add Field'),
+                '$create' => t('Create'),
+                '$update' => t('Update'),
+                '$delete' => t('Delete'),
+                '$cancel' => t('Cancel'),
+                '$po_box' => t('P.O. Box'),
+                '$extra' => t('Additional'),
+                '$street' => t('Street'),
+                '$locality' => t('Locality'),
+                '$region' => t('Region'),
+                '$zip_code' => t('ZIP Code'),
+                '$country' => t('Country')
+            ]);
+
+            return $o;
+        }
+
+        // delete addressbook
+        if (argc() > 3 && argv(1) === 'addressbook' && argv(2) === 'drop' && intval(argv(3))) {
+            $id = argv(3);
+
+            if (!cdav_perms($id, $addressbooks)) {
+                return;
+            }
+
+            $carddavBackend->deleteAddressBook($id);
+            killme();
+        }
+    }
+
+    public function activate($pdo, $channel)
+    {
+
+        if (!$channel) {
+            return;
+        }
+
+        $uri = 'principals/' . $channel['channel_address'];
+
+
+        $r = q(
+            "select * from principals where uri = '%s' limit 1",
+            dbesc($uri)
+        );
+        if ($r) {
+            $r = q(
+                "update principals set email = '%s', displayname = '%s' where uri = '%s' ",
+                dbesc($channel['xchan_addr']),
+                dbesc($channel['channel_name']),
+                dbesc($uri)
+            );
+        } else {
+            $r = q(
+                "insert into principals ( uri, email, displayname ) values('%s','%s','%s') ",
+                dbesc($uri),
+                dbesc($channel['xchan_addr']),
+                dbesc($channel['channel_name'])
+            );
+
+            // create default calendar
+            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+            $properties = [
+                '{DAV:}displayname' => t('Default Calendar'),
+                '{http://apple.com/ns/ical/}calendar-color' => '#6cad39',
+                '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name']
+            ];
+
+            $id = $caldavBackend->createCalendar($uri, 'default', $properties);
+            set_pconfig(local_channel(), 'cdav_calendar', $id[0], 1);
+            set_pconfig(local_channel(), 'cdav_calendar', 'calendar', 1);
+
+            // create default addressbook
+            $carddavBackend = new PDO($pdo);
+            $properties = ['{DAV:}displayname' => t('Default Addressbook')];
+            $carddavBackend->createAddressBook($uri, 'default', $properties);
+        }
+    }
+}
diff --git a/Code/Module/Changeaddr.php b/Code/Module/Changeaddr.php
new file mode 100644
index 000000000..85bc921af
--- /dev/null
+++ b/Code/Module/Changeaddr.php
@@ -0,0 +1,119 @@
+ NULL_DATE) {
+            $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours');
+            if ($account['account_password_changed'] > $d1) {
+                notice(t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL);
+                return;
+            }
+        }
+
+        $new_address = trim($_POST['newname']);
+
+        if ($new_address === $channel['channel_address']) {
+            return;
+        }
+
+        if ($new_address === 'sys') {
+            notice(t('Reserved nickname. Please choose another.') . EOL);
+            return;
+        }
+
+        if (check_webbie(array($new_address)) !== $new_address) {
+            notice(t('Nickname has unsupported characters or is already being used on this site.') . EOL);
+            return $ret;
+        }
+
+        Channel::change_address($channel, $new_address);
+
+        goaway(z_root() . '/changeaddr');
+    }
+
+
+    public function get()
+    {
+
+        if (!get_config('system', 'allow_nick_change')) {
+            notice(t('Feature has been disabled') . EOL);
+            return;
+        }
+
+
+        if (!local_channel()) {
+            goaway(z_root());
+        }
+
+        $channel = App::get_channel();
+
+        $hash = random_string();
+
+        $_SESSION['remove_account_verify'] = $hash;
+
+        $tpl = Theme::get_template('channel_rename.tpl');
+        $o .= replace_macros($tpl, [
+            '$basedir' => z_root(),
+            '$hash' => $hash,
+            '$title' => t('Change channel nickname/address'),
+            '$desc' => array(t('WARNING: '), t('Any/all connections on other networks will be lost!')),
+            '$passwd' => t('Please enter your password for verification:'),
+            '$newname' => ['newname', t('New channel address'), $channel['channel_address'], ''],
+            '$submit' => t('Rename Channel')
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Channel.php b/Code/Module/Channel.php
new file mode 100644
index 000000000..b48b8740d
--- /dev/null
+++ b/Code/Module/Channel.php
@@ -0,0 +1,619 @@
+ 1) {
+            $which = argv(1);
+        }
+        if (!$which) {
+            if (local_channel()) {
+                $channel = App::get_channel();
+                if ($channel && $channel['channel_address']) {
+                    $which = $channel['channel_address'];
+                }
+            }
+        }
+        if (!$which) {
+            notice(t('You must be logged in to see this page.') . EOL);
+            return;
+        }
+
+        $profile = 0;
+        $channel = App::get_channel();
+
+        if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+            $which = $channel['channel_address'];
+            $profile = argv(1);
+        }
+
+        $channel = Zlib\Channel::from_username($which, true);
+        if (!$channel) {
+            http_status_exit(404, 'Not found');
+        }
+        if ($channel['channel_removed']) {
+            http_status_exit(410, 'Gone');
+        }
+
+        if (get_pconfig($channel['channel_id'], 'system', 'noindex')) {
+            App::$meta->set('robots', 'noindex, noarchive');
+        }
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/atom+xml',
+            'title' => t('Only posts'),
+            'href' => z_root() . '/feed/' . $which
+        ]);
+
+
+        // An ActivityStreams actor record is more or less required for ActivityStreams compliance
+        // unless the actor object is inlined into every activity/object. This implies that it
+        // is more or less required for the Zot6 protocol, which uses ActivityStreams as a content
+        // serialisation and which doesn't always include the full actor record with every
+        // activity/object.
+
+        // "more or less" means it isn't spelled out in the ActivityStreams spec, but a number of
+        // things will break in subtle ways if it isn't provided.
+
+        // The ActivityPub protocol requires an 'inbox', which will not be present in this record
+        // if/when the ActivityPub protocol is disabled. This will be the case when using the Redmatrix
+        // fork of Zap; which disables ActivityPub connectivity by default.
+
+        if (ActivityStreams::is_as_request()) {
+            // Somebody may attempt an ActivityStreams fetch on one of our message permalinks
+            // Make it do the right thing.
+
+            $mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
+            $mid = unpack_link_id($mid);
+
+            if ($mid) {
+                $obj = null;
+                if (strpos($mid, z_root() . '/item/') === 0) {
+                    App::$argc = 2;
+                    App::$argv = ['item', basename($mid)];
+                    $obj = new Item();
+                }
+                if (strpos($mid, z_root() . '/activity/') === 0) {
+                    App::$argc = 2;
+                    App::$argv = ['activity', basename($mid)];
+                    $obj = new Activity();
+                }
+                if ($obj) {
+                    $obj->init();
+                }
+            }
+            if (intval($channel['channel_system'])) {
+                goaway(z_root());
+            }
+            as_return_and_die(Activity::encode_person($channel, true, true), $channel);
+        }
+
+        // handle zot6 channel discovery
+
+        if (Libzot::is_zot_request()) {
+            $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
+
+            if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
+                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']]));
+                $s = q(
+                    "select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('nomad','zot6') limit 1",
+                    dbesc($sigdata['signer'])
+                );
+
+                if ($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) {
+                    $data = json_encode(Crypto::encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto'])));
+                }
+            } else {
+                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']]));
+            }
+
+            $headers = [
+                'Content-Type' => 'application/x-nomad+json',
+                'Digest' => HTTPSig::generate_digest_header($data),
+                '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
+            ];
+            $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Zlib\Channel::url($channel));
+            HTTPSig::set_headers($h);
+            echo $data;
+            killme();
+        }
+
+
+        // Run Libprofile::load() here to make sure the theme is set before
+        // we start loading content
+
+        Libprofile::load($which, $profile);
+
+        if (!$_REQUEST['mid']) {
+            App::$meta->set('og:title', $channel['channel_name']);
+            App::$meta->set('og:image', $channel['xchan_photo_l']);
+            App::$meta->set('og:type', 'webpage');
+            App::$meta->set('og:url:secure_url', Zlib\Channel::url($channel));
+            if (App::$profile['about'] && perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_profile')) {
+                App::$meta->set('og:description', App::$profile['about']);
+            } else {
+                App::$meta->set('og:description', sprintf(t('This is the home page of %s.'), $channel['channel_name']));
+            }
+        }
+    }
+
+    public function get()
+    {
+
+        $noscript_content = get_config('system', 'noscript_content', '1');
+
+        $category = $datequery = $datequery2 = '';
+
+        $mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
+        $mid = unpack_link_id($mid);
+
+        $datequery = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
+        $datequery2 = ((x($_GET, 'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
+
+        if (observer_prohibited(true)) {
+            return login();
+        }
+
+        $category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : '');
+        $hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : '');
+        $order = ((x($_GET, 'order')) ? notags($_GET['order']) : 'post');
+        $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
+        $search = ((x($_GET, 'search')) ? $_GET['search'] : EMPTY_STR);
+
+        $groups = [];
+
+        $o = '';
+
+        if ($this->updating) {
+            // Ensure we've got a profile owner if updating.
+            App::$profile['profile_uid'] = App::$profile_uid = $this->profile_uid;
+        }
+
+        $is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false);
+
+        $channel = App::get_channel();
+        $observer = App::get_observer();
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms(App::$profile['profile_uid'], $ob_hash);
+
+
+        if ($this->loading && !$mid) {
+            $_SESSION['loadtime_channel'] = datetime_convert();
+            if ($is_owner) {
+                PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
+            }
+        }
+
+
+        if (!$perms['view_stream']) {
+            // We may want to make the target of this redirect configurable
+            if ($perms['view_profile']) {
+                notice(t('Insufficient permissions.  Request redirected to profile page.') . EOL);
+                goaway(z_root() . "/profile/" . App::$profile['channel_address']);
+            }
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+
+        if (!$this->updating) {
+            Navbar::set_selected('Channel Home');
+
+            $static = Zlib\Channel::manual_conv_update(App::$profile['profile_uid']);
+
+            // search terms header
+            if ($search) {
+                $o .= replace_macros(Theme::get_template("section_title.tpl"), array(
+                    '$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8')
+                ));
+            }
+
+            $role = get_pconfig(App::$profile['profile_uid'], 'system', 'permissions_role');
+            if ($role === 'social_restricted' && (!$ob_hash)) {
+                // provide warning that content is probably hidden ?
+            }
+
+            if ($channel && $is_owner) {
+                $channel_acl = array(
+                    'allow_cid' => $channel['channel_allow_cid'],
+                    'allow_gid' => $channel['channel_allow_gid'],
+                    'deny_cid' => $channel['channel_deny_cid'],
+                    'deny_gid' => $channel['channel_deny_gid']
+                );
+            } else {
+                $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
+            }
+
+
+            if ($perms['post_wall']) {
+                $x = array(
+                    'is_owner' => $is_owner,
+                    'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'], 'system', 'use_browser_location')))) ? true : false),
+                    'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''),
+                    'nickname' => App::$profile['channel_address'],
+                    'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
+                    'acl' => (($is_owner) ? Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
+                    'permissions' => $channel_acl,
+                    'showacl' => (($is_owner) ? 'yes' : ''),
+                    'bang' => '',
+                    'visitor' => (($is_owner || $observer) ? true : false),
+                    'profile_uid' => App::$profile['profile_uid'],
+                    'editor_autocomplete' => true,
+                    'bbco_autocomplete' => 'bbcode',
+                    'bbcode' => true,
+                    'jotnets' => true,
+                    'reset' => t('Reset form')
+                );
+
+                $o .= status_editor($x);
+            }
+
+            if (!$mid && !$search) {
+                $obj = new Pinned();
+                $o .= $obj->widget([]);
+            }
+        }
+
+
+        /**
+         * Get permissions SQL
+         */
+
+        $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
+		    and item.item_unpublished = 0 and item.item_pending_remove = 0
+		    and item.item_blocked = 0 ";
+        if (!$is_owner) {
+            $item_normal .= "and item.item_delayed = 0 ";
+        }
+        $item_normal_update = item_normal_update();
+        $sql_extra = item_permissions_sql(App::$profile['profile_uid']);
+
+        if (get_pconfig(App::$profile['profile_uid'], 'system', 'channel_list_mode') && (!$mid)) {
+            $page_mode = 'list';
+        } else {
+            $page_mode = 'client';
+        }
+
+        $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
+
+        $simple_update = (($this->updating) ? " AND item_unseen = 1 " : '');
+
+        if ($search) {
+            $search = escape_tags($search);
+            if (strpos($search, '#') === 0) {
+                $sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG);
+            } else {
+                $sql_extra .= sprintf(
+                    " AND (item.body like '%s' OR item.title like '%s') ",
+                    dbesc(protect_sprintf('%' . $search . '%')),
+                    dbesc(protect_sprintf('%' . $search . '%'))
+                );
+            }
+        }
+
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/json+oembed',
+            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
+            'title' => 'oembed'
+        ]);
+
+        if ($this->updating && isset($_SESSION['loadtime_channel'])) {
+            $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_channel']) . "' ";
+        }
+        if ($this->loading) {
+            $simple_update = '';
+        }
+
+        if ($static && $simple_update) {
+            $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
+        }
+
+        if (($this->updating) && (!$this->loading)) {
+            if ($mid) {
+                $r = q(
+                    "SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal_update
+					AND item_wall = 1 $simple_update $sql_extra limit 1",
+                    dbesc($mid . '%'),
+                    intval(App::$profile['profile_uid'])
+                );
+            } else {
+                $r = q(
+                    "SELECT parent AS item_id from item
+					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+					WHERE uid = %d $item_normal_update
+					AND item_wall = 1 $simple_update
+					AND (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra
+					ORDER BY created DESC",
+                    intval(App::$profile['profile_uid'])
+                );
+            }
+        } else {
+            if (x($category)) {
+                $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
+            }
+            if (x($hashtags)) {
+                $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+            }
+
+            if ($datequery) {
+                $sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
+                $order = 'post';
+            }
+            if ($datequery2) {
+                $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
+            }
+
+            if ($datequery || $datequery2) {
+                $sql_extra2 .= " and item.item_thread_top != 0 ";
+            }
+
+            if ($order === 'post') {
+                $ordering = "created";
+            } else {
+                $ordering = "commented";
+            }
+
+            $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
+            App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+
+            if ($noscript_content || $this->loading) {
+                if ($mid) {
+                    $r = q(
+                        "SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
+						AND item_wall = 1 $sql_extra limit 1",
+                        dbesc($mid . '%'),
+                        intval(App::$profile['profile_uid'])
+                    );
+                    if (!$r) {
+                        notice(t('Permission denied.') . EOL);
+                    }
+                } else {
+                    $r = q(
+                        "SELECT DISTINCT item.parent AS item_id, $ordering FROM item 
+						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
+						WHERE true and item.uid = %d $item_normal
+						AND (abook.abook_blocked = 0 or abook.abook_flags is null)
+						AND item.item_wall = 1 AND item.item_thread_top = 1
+						$sql_extra $sql_extra2 
+						ORDER BY $ordering DESC $pager_sql ",
+                        intval(App::$profile['profile_uid'])
+                    );
+                }
+            } else {
+                $r = [];
+            }
+        }
+        if ($r) {
+            $parents_str = ids_to_querystr($r, 'item_id');
+
+            $items = q(
+                "SELECT item.*, item.id AS item_id
+				FROM item
+				WHERE item.uid = %d $item_normal
+				AND item.parent IN ( %s )
+				$sql_extra ",
+                intval(App::$profile['profile_uid']),
+                dbesc($parents_str)
+            );
+
+            xchan_query($items);
+            $items = fetch_post_tags($items, true);
+            $items = conv_sort($items, $ordering);
+
+            if ($this->loading && $mid && (!count($items))) {
+                // This will happen if we don't have sufficient permissions
+                // to view the parent item (or the item itself if it is toplevel)
+                notice(t('Permission denied.') . EOL);
+            }
+        } else {
+            $items = [];
+        }
+
+        if ((!$this->updating) && (!$this->loading)) {
+            // This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
+            // because browser prefetching might change it on us. We have to deliver it with the page.
+
+            $maxheight = get_pconfig(App::$profile['profile_uid'], 'system', 'channel_divmore_height');
+            if (!$maxheight) {
+                $maxheight = 400;
+            }
+
+            $o .= '
      ' . "\r\n";
+            $o .= "\r\n";
+
+            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), array(
+                '$baseurl' => z_root(),
+                '$pgtype' => 'channel',
+                '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
+                '$gid' => '0',
+                '$cid' => '0',
+                '$cmin' => '(-1)',
+                '$cmax' => '(-1)',
+                '$star' => '0',
+                '$liked' => '0',
+                '$conv' => '0',
+                '$spam' => '0',
+                '$nouveau' => '0',
+                '$wall' => '1',
+                '$draft' => '0',
+                '$fh' => '0',
+                '$dm' => '0',
+                '$static' => $static,
+                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+                '$search' => $search,
+                '$xchan' => '',
+                '$order' => (($order) ? urlencode($order) : ''),
+                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
+                '$file' => '',
+                '$cats' => (($category) ? urlencode($category) : ''),
+                '$tags' => (($hashtags) ? urlencode($hashtags) : ''),
+                '$mid' => (($mid) ? urlencode($mid) : ''),
+                '$verb' => '',
+                '$net' => '',
+                '$dend' => $datequery,
+                '$dbegin' => $datequery2
+            ));
+        }
+
+        $update_unseen = '';
+
+        if ($page_mode === 'list') {
+
+            /**
+             * in "list mode", only mark the parent item and any like activities as "seen".
+             * We won't distinguish between comment likes and post likes. The important thing
+             * is that the number of unseen comments will be accurate. The SQL to separate the
+             * comment likes could also get somewhat hairy.
+             */
+
+            if (isset($parents_str) && $parents_str) {
+                $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
+                $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
+            }
+        } else {
+            if (isset($parents_str) && $parents_str) {
+                $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
+            }
+        }
+
+        if ($is_owner && $update_unseen && (!$_SESSION['sudo'])) {
+            $x = ['channel_id' => local_channel(), 'update' => 'unset'];
+            Hook::call('update_unseen', $x);
+            if ($x['update'] === 'unset' || intval($x['update'])) {
+                $r = q(
+                    "UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen",
+                    intval(local_channel())
+                );
+            }
+
+            $ids = ids_to_array($items, 'item_id');
+            $seen = PConfig::Get(local_channel(), 'system', 'seen_items');
+            if (!$seen) {
+                $seen = [];
+            }
+            $seen = array_merge($ids, $seen);
+            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
+        }
+
+        $mode = (($search) ? 'search' : 'channel');
+
+        if ($this->updating) {
+            $o .= conversation($items, $mode, $this->updating, $page_mode);
+        } else {
+            $o .= '';
+
+            $o .= conversation($items, $mode, $this->updating, $page_mode);
+
+            if ($mid && $items[0]['title']) {
+                App::$page['title'] = $items[0]['title'] . " - " . App::$page['title'];
+            }
+        }
+
+        // We reset $channel so that info can be obtained for unlogged visitors
+        $channel = Zlib\Channel::from_id(App::$profile['profile_uid']);
+
+        if (isset($_REQUEST['mid']) && $_REQUEST['mid']) {
+            if (preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) {
+                $ogimage = $matches[2];
+                //  Will we use og:image:type someday? We keep this just in case
+                //  $ogimagetype = guess_image_type($ogimage);
+            }
+
+            // some work on post content to generate a description
+            // almost fully based on work done on Hubzilla by Max Kostikov
+            $ogdesc = $items[0]['body'];
+
+            $ogdesc = str_replace("#^[", "[", $ogdesc);
+
+            $ogdesc = bbcode($ogdesc, ['tryoembed' => false]);
+            $ogdesc = trim(html2plain($ogdesc, 0, true));
+            $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8');
+
+            // remove all URLs
+            $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc);
+
+            // shorten description
+            $ogdesc = substr($ogdesc, 0, 300);
+            $ogdesc = str_replace("\n", " ", $ogdesc);
+            while (strpos($ogdesc, "  ") !== false) {
+                $ogdesc = str_replace("  ", " ", $ogdesc);
+            }
+            $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "...");
+
+            // we can now start loading content
+
+            App::$meta->set('og:title', ($items[0]['title'] ? $items[0]['title'] : $channel['channel_name']));
+            App::$meta->set('og:image', ($ogimage ? $ogimage : $channel['xchan_photo_l']));
+            App::$meta->set('og:type', 'article');
+            App::$meta->set('og:url:secure_url', Zlib\Channel::url($channel));
+            App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf(t('This post was published on the home page of %s.'), $channel['channel_name'])));
+        }
+
+        if ($mid) {
+            $o .= '
      ';
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Chanview.php b/Code/Module/Chanview.php
new file mode 100644
index 000000000..753d675e6
--- /dev/null
+++ b/Code/Module/Chanview.php
@@ -0,0 +1,184 @@
+ $url,
+                '$photo' => get_xconfig(App::$poi['xchan_hash'], 'system', 'cover_photo'),
+                '$alt' => t('Cover photo for this channel'),
+                '$about' => $about,
+                '$followers_txt' => t('Followers'),
+                '$following_txt' => t('Following'),
+                '$followers' => $followers,
+                '$following' => $following,
+                '$visit' => t('Visit'),
+                '$full' => t('toggle full screen mode')
+            ]);
+
+            return $o;
+        }
+    }
+}
diff --git a/Code/Module/Chat.php b/Code/Module/Chat.php
new file mode 100644
index 000000000..750eed5fd
--- /dev/null
+++ b/Code/Module/Chat.php
@@ -0,0 +1,273 @@
+ 1) ? argv(1) : null);
+        if (local_channel() && (!$which)) {
+            $channel = App::get_channel();
+            if ($channel && $channel['channel_address']) {
+                $which = $channel['channel_address'];
+            }
+        }
+
+        if (!$which) {
+            notice(t('You must be logged in to see this page.') . EOL);
+            return;
+        }
+
+        $profile = 0;
+
+        // Run Libprofile::load() here to make sure the theme is set before
+        // we start loading content
+
+        Libprofile::load($which, $profile);
+    }
+
+    public function post()
+    {
+
+        if ($_POST['room_name']) {
+            $room = strip_tags(trim($_POST['room_name']));
+        }
+
+        if ((!$room) || (!local_channel())) {
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        if ($_POST['action'] === 'drop') {
+            logger('delete chatroom');
+            Chatroom::destroy($channel, ['cr_name' => $room]);
+            goaway(z_root() . '/chat/' . $channel['channel_address']);
+        }
+
+        $acl = new AccessControl($channel);
+        $acl->set_from_array($_REQUEST);
+
+        $arr = $acl->get();
+        $arr['name'] = $room;
+        $arr['expire'] = intval($_POST['chat_expire']);
+        if (intval($arr['expire']) < 0) {
+            $arr['expire'] = 0;
+        }
+
+        Chatroom::create($channel, $arr);
+
+        $x = q(
+            "select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1",
+            dbesc($room),
+            intval(local_channel())
+        );
+
+        Libsync::build_sync_packet(0, array('chatroom' => $x));
+
+        if ($x) {
+            goaway(z_root() . '/chat/' . $channel['channel_address'] . '/' . $x[0]['cr_id']);
+        }
+
+        // that failed. Try again perhaps?
+
+        goaway(z_root() . '/chat/' . $channel['channel_address'] . '/new');
+    }
+
+
+    public function get()
+    {
+
+//      if(! Apps::system_app_installed(App::$profile_uid, 'Chatrooms')) {
+//          // Do not display any associated widgets at this point
+//          App::$pdl = '';
+//
+//          $o = 'Chatrooms App (Not Installed):
      ';
+//          $o .= t('Access Controlled Chatrooms');
+//          return $o;
+//      }
+
+        if (local_channel()) {
+            $channel = App::get_channel();
+            Navbar::set_selected('Chatrooms');
+        }
+
+        $ob = App::get_observer();
+        $observer = get_observer_hash();
+        if (!$observer) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if (!perm_is_allowed(App::$profile['profile_uid'], $observer, 'chat')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) {
+            Chatroom::leave($observer, argv(2), $_SERVER['REMOTE_ADDR']);
+            goaway(z_root() . '/channel/' . argv(1));
+        }
+
+
+        if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'status')) {
+            $ret = ['success' => false];
+            $room_id = intval(argv(2));
+            if (!$room_id || !$observer) {
+                return;
+            }
+
+            $r = q(
+                "select * from chatroom where cr_id = %d limit 1",
+                intval($room_id)
+            );
+            if (!$r) {
+                json_return_and_die($ret);
+            }
+            require_once('include/security.php');
+            $sql_extra = permissions_sql($r[0]['cr_uid']);
+
+            $x = q(
+                "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+                intval($room_id),
+                intval($r[0]['cr_uid'])
+            );
+            if (!$x) {
+                json_return_and_die($ret);
+            }
+            $y = q(
+                "select count(*) as total from chatpresence where cp_room = %d",
+                intval($room_id)
+            );
+            if ($y) {
+                $ret['success'] = true;
+                $ret['chatroom'] = $r[0]['cr_name'];
+                $ret['inroom'] = $y[0]['total'];
+            }
+
+            // figure out how to present a timestamp of the last activity, since we don't know the observer's timezone.
+
+            $z = q(
+                "select created from chat where chat_room = %d order by created desc limit 1",
+                intval($room_id)
+            );
+            if ($z) {
+                $ret['last'] = $z[0]['created'];
+            }
+            json_return_and_die($ret);
+        }
+
+
+        if (argc() > 2 && intval(argv(2))) {
+            $room_id = intval(argv(2));
+
+            $x = Chatroom::enter($observer, $room_id, 'online', $_SERVER['REMOTE_ADDR']);
+            if (!$x) {
+                return;
+            }
+            $x = q(
+                "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+                intval($room_id),
+                intval(App::$profile['profile_uid'])
+            );
+
+            if ($x) {
+                $acl = new AccessControl(false);
+                $acl->set($x[0]);
+
+                $private = $acl->is_private();
+                $room_name = $x[0]['cr_name'];
+            } else {
+                notice(t('Room not found') . EOL);
+                return;
+            }
+
+            $cipher = get_pconfig(local_channel(), 'system', 'default_cipher');
+            if (!$cipher) {
+                $cipher = 'AES-128-CCM';
+            }
+
+
+            $o = replace_macros(Theme::get_template('chat.tpl'), [
+                '$is_owner' => ((local_channel() && local_channel() == $x[0]['cr_uid']) ? true : false),
+                '$room_name' => $room_name,
+                '$room_id' => $room_id,
+                '$baseurl' => z_root(),
+                '$nickname' => argv(1),
+                '$submit' => t('Submit'),
+                '$leave' => t('Leave Room'),
+                '$drop' => t('Delete Room'),
+                '$away' => t('I am away right now'),
+                '$online' => t('I am online'),
+                '$feature_encrypt' => ((Apps::system_app_installed(local_channel(), 'Secrets')) ? true : false),
+                '$cipher' => $cipher,
+                '$linkurl' => t('Please enter a link URL:'),
+                '$encrypt' => t('Encrypt text'),
+                '$insert' => t('Insert web link')
+            ]);
+            return $o;
+        }
+
+        require_once('include/conversation.php');
+
+        $o = '';
+
+        $acl = new AccessControl($channel);
+        $channel_acl = $acl->get();
+
+        $lockstate = (($channel_acl['allow_cid'] || $channel_acl['allow_gid'] || $channel_acl['deny_cid'] || $channel_acl['deny_gid']) ? 'lock' : 'unlock');
+
+        $chatroom_new = '';
+        if (local_channel()) {
+            $chatroom_new = replace_macros(Theme::get_template('chatroom_new.tpl'), array(
+                '$header' => t('New Chatroom'),
+                '$name' => array('room_name', t('Chatroom name'), '', ''),
+                '$chat_expire' => array('chat_expire', t('Expiration of chats (minutes)'), 120, ''),
+                '$permissions' => t('Permissions'),
+                '$acl' => Libacl::populate($channel_acl, false),
+                '$allow_cid' => acl2json($channel_acl['allow_cid']),
+                '$allow_gid' => acl2json($channel_acl['allow_gid']),
+                '$deny_cid' => acl2json($channel_acl['deny_cid']),
+                '$deny_gid' => acl2json($channel_acl['deny_gid']),
+                '$lockstate' => $lockstate,
+                '$submit' => t('Submit')
+
+            ));
+        }
+
+        $rooms = Chatroom::roomlist(App::$profile['profile_uid']);
+
+        $o .= replace_macros(Theme::get_template('chatrooms.tpl'), [
+            '$header' => sprintf(t('%1$s\'s Chatrooms'), App::$profile['fullname']),
+            '$name' => t('Name'),
+            '$baseurl' => z_root(),
+            '$nickname' => App::$profile['channel_address'],
+            '$rooms' => $rooms,
+            '$norooms' => t('No chatrooms available'),
+            '$newroom' => t('Create New'),
+            '$is_owner' => ((local_channel() && local_channel() == App::$profile['profile_uid']) ? 1 : 0),
+            '$chatroom_new' => $chatroom_new,
+            '$expire' => t('Expiration'),
+            '$expire_unit' => t('min') //minutes
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Chatsvc.php b/Code/Module/Chatsvc.php
new file mode 100644
index 000000000..497a8a2a7
--- /dev/null
+++ b/Code/Module/Chatsvc.php
@@ -0,0 +1,201 @@
+ false);
+
+        App::$data['chat']['room_id'] = intval($_REQUEST['room_id']);
+        $x = q(
+            "select cr_uid from chatroom where cr_id = %d and cr_id != 0 limit 1",
+            intval(App::$data['chat']['room_id'])
+        );
+        if (!$x) {
+            json_return_and_die($ret);
+        }
+
+        App::$data['chat']['uid'] = $x[0]['cr_uid'];
+
+        if (!perm_is_allowed(App::$data['chat']['uid'], get_observer_hash(), 'chat')) {
+            json_return_and_die($ret);
+        }
+    }
+
+    public function post()
+    {
+
+        $ret = array('success' => false);
+
+        $room_id = App::$data['chat']['room_id'];
+        $text = escape_tags($_REQUEST['chat_text']);
+        if (!$text) {
+            return;
+        }
+
+        $sql_extra = permissions_sql(App::$data['chat']['uid']);
+
+        $r = q(
+            "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
+            intval(App::$data['chat']['uid']),
+            intval(App::$data['chat']['room_id'])
+        );
+        if (!$r) {
+            json_return_and_die($ret);
+        }
+
+        $arr = array(
+            'chat_room' => App::$data['chat']['room_id'],
+            'chat_xchan' => get_observer_hash(),
+            'chat_text' => $text
+        );
+
+        Hook::call('chat_post', $arr);
+
+        $x = q(
+            "insert into chat ( chat_room, chat_xchan, created, chat_text )
+			values( %d, '%s', '%s', '%s' )",
+            intval(App::$data['chat']['room_id']),
+            dbesc(get_observer_hash()),
+            dbesc(datetime_convert()),
+            dbesc(str_rot47(base64url_encode($arr['chat_text'])))
+        );
+
+        $ret['success'] = true;
+        json_return_and_die($ret);
+    }
+
+    public function get()
+    {
+
+        $status = strip_tags($_REQUEST['status']);
+        $room_id = intval(App::$data['chat']['room_id']);
+        $stopped = ((x($_REQUEST, 'stopped') && intval($_REQUEST['stopped'])) ? true : false);
+
+        if ($status && $room_id) {
+            $x = q(
+                "select channel_address from channel where channel_id = %d limit 1",
+                intval(App::$data['chat']['uid'])
+            );
+
+            $r = q(
+                "update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'",
+                dbesc($status),
+                dbesc(datetime_convert()),
+                intval($room_id),
+                dbesc(get_observer_hash()),
+                dbesc($_SERVER['REMOTE_ADDR'])
+            );
+
+            goaway(z_root() . '/chat/' . $x[0]['channel_address'] . '/' . $room_id);
+        }
+
+        if (!$stopped) {
+            $lastseen = intval($_REQUEST['last']);
+
+            $ret = array('success' => false);
+
+            $sql_extra = permissions_sql(App::$data['chat']['uid']);
+
+            $r = q(
+                "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
+                intval(App::$data['chat']['uid']),
+                intval(App::$data['chat']['room_id'])
+            );
+            if (!$r) {
+                json_return_and_die($ret);
+            }
+
+            $inroom = [];
+
+            $r = q(
+                "select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name",
+                intval(App::$data['chat']['room_id'])
+            );
+            if ($r) {
+                foreach ($r as $rv) {
+                    if (!$rv['xchan_name']) {
+                        $rv['xchan_hash'] = $rv['cp_xchan'];
+                        $rv['xchan_name'] = substr($rv['cp_xchan'], strrpos($rv['cp_xchan'], '.') + 1);
+                        $rv['xchan_addr'] = '';
+                        $rv['xchan_network'] = 'unknown';
+                        $rv['xchan_url'] = z_root();
+                        $rv['xchan_hidden'] = 1;
+                        $rv['xchan_photo_mimetype'] = 'image/png';
+                        $rv['xchan_photo_l'] = z_root() . '/' . Channel::get_default_profile_photo(300);
+                        $rv['xchan_photo_m'] = z_root() . '/' . Channel::get_default_profile_photo(80);
+                        $rv['xchan_photo_s'] = z_root() . '/' . Channel::get_default_profile_photo(48);
+                    }
+
+                    switch ($rv['cp_status']) {
+                        case 'away':
+                            $status = t('Away');
+                            $status_class = 'away';
+                            break;
+                        case 'online':
+                        default:
+                            $status = t('Online');
+                            $status_class = 'online';
+                            break;
+                    }
+
+                    $inroom[] = array('img' => zid($rv['xchan_photo_m']), 'img_type' => $rv['xchan_photo_mimetype'], 'name' => $rv['xchan_name'], 'status' => $status, 'status_class' => $status_class);
+                }
+            }
+
+            $chats = [];
+
+            $r = q(
+                "select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d order by created",
+                intval(App::$data['chat']['room_id']),
+                intval($lastseen)
+            );
+            if ($r) {
+                foreach ($r as $rr) {
+                    $chats[] = array(
+                        'id' => $rr['chat_id'],
+                        'img' => zid($rr['xchan_photo_m']),
+                        'img_type' => $rr['xchan_photo_mimetype'],
+                        'name' => $rr['xchan_name'],
+                        'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
+                        'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
+                        'text' => zidify_links(smilies(bbcode(base64url_decode(str_rot47($rr['chat_text']))))),
+                        'self' => ((get_observer_hash() == $rr['chat_xchan']) ? 'self' : '')
+                    );
+                }
+            }
+        }
+
+        $r = q(
+            "update chatpresence set cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'",
+            dbesc(datetime_convert()),
+            intval(App::$data['chat']['room_id']),
+            dbesc(get_observer_hash()),
+            dbesc($_SERVER['REMOTE_ADDR'])
+        );
+
+        $ret['success'] = true;
+        if (!$stopped) {
+            $ret['inroom'] = $inroom;
+            $ret['chats'] = $chats;
+        }
+        json_return_and_die($ret);
+    }
+}
diff --git a/Code/Module/Clients.php b/Code/Module/Clients.php
new file mode 100644
index 000000000..eb26bf2e0
--- /dev/null
+++ b/Code/Module/Clients.php
@@ -0,0 +1,23 @@
+' . $desc . '';
+        }
+        goaway(z_root() . '/settings/oauth2');
+    }
+}
diff --git a/Code/Module/Cloud.php b/Code/Module/Cloud.php
new file mode 100644
index 000000000..bb82ab0b5
--- /dev/null
+++ b/Code/Module/Cloud.php
@@ -0,0 +1,149 @@
+ 1) {
+            $which = argv(1);
+        }
+        $profile = 0;
+
+        if ($which) {
+            Libprofile::load($which, $profile);
+        }
+
+
+        $auth = new BasicAuth();
+
+        $ob_hash = get_observer_hash();
+
+        if ($ob_hash) {
+            if (local_channel()) {
+                $channel = App::get_channel();
+                $auth->setCurrentUser($channel['channel_address']);
+                $auth->channel_id = $channel['channel_id'];
+                $auth->channel_hash = $channel['channel_hash'];
+                $auth->channel_account_id = $channel['channel_account_id'];
+                if ($channel['channel_timezone']) {
+                    $auth->setTimezone($channel['channel_timezone']);
+                }
+            }
+            $auth->observer = $ob_hash;
+        }
+
+        // if we arrived at this path with any query parameters in the url, build a clean url without
+        // them and redirect.
+
+        if (!array_key_exists('cloud_sort', $_SESSION)) {
+            $_SESSION['cloud_sort'] = 'name';
+        }
+
+        $_SESSION['cloud_sort'] = (($_REQUEST['sort']) ? trim(notags($_REQUEST['sort'])) : $_SESSION['cloud_sort']);
+
+        $x = clean_query_string();
+        if ($x !== App::$query_string) {
+            goaway(z_root() . '/' . $x);
+        }
+
+        $rootDirectory = new Directory('/', $auth);
+
+        // A SabreDAV server-object
+        $server = new SDAV\Server($rootDirectory);
+        // prevent overwriting changes each other with a lock backend
+        $lockBackend = new SDAV\Locks\Backend\File('cache/locks');
+        $lockPlugin = new SDAV\Locks\Plugin($lockBackend);
+
+        $server->addPlugin($lockPlugin);
+
+        $is_readable = false;
+
+        // provide a directory view for the cloud in Hubzilla
+        $browser = new Browser($auth);
+        $auth->setBrowserPlugin($browser);
+
+        $server->addPlugin($browser);
+
+        // Experimental QuotaPlugin
+        //  require_once('\Code\Storage/QuotaPlugin.php');
+        //  $server->addPlugin(new \Code\Storage\\QuotaPlugin($auth));
+
+
+        // over-ride the default XML output on thrown exceptions
+
+        $server->on('exception', [$this, 'DAVException']);
+
+        // All we need to do now, is to fire up the server
+
+        $server->exec();
+
+        if ($browser->build_page) {
+            construct_page();
+        }
+
+        killme();
+    }
+
+
+    public function DAVException($err)
+    {
+
+        if ($err instanceof NotFound) {
+            notice(t('Not found') . EOL);
+        } elseif ($err instanceof Forbidden) {
+            notice(t('Permission denied') . EOL);
+        } elseif ($err instanceof NotImplemented) {
+            notice(t('Please refresh page') . EOL);
+            // It would be nice to do the following on remote authentication
+            // which provides an unexpected page query param, but we do not
+            // because if the exception has a different cause, it will loop.
+            // goaway(z_root() . '/' . App::$query_string);
+        } else {
+            notice(t('Unknown error') . EOL);
+        }
+
+        construct_page();
+
+        killme();
+    }
+}
diff --git a/Code/Module/Cloud_tiles.php b/Code/Module/Cloud_tiles.php
new file mode 100644
index 000000000..ac8861760
--- /dev/null
+++ b/Code/Module/Cloud_tiles.php
@@ -0,0 +1,25 @@
+' . $desc . '';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Comment Control'))) {
+            return $text;
+        }
+
+        $desc = t('This app is installed. A button to control comments may be found below the post editor.');
+
+        $text = '
      ' . $desc . '
      ';
+
+        return $text;
+    }
+}
diff --git a/Code/Module/Common.php b/Code/Module/Common.php
new file mode 100644
index 000000000..5664ecf1d
--- /dev/null
+++ b/Code/Module/Common.php
@@ -0,0 +1,81 @@
+ 1 && intval(argv(1))) {
+            $channel_id = intval(argv(1));
+        } else {
+            notice(t('No channel.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $x = q(
+            "select channel_address from channel where channel_id = %d limit 1",
+            intval($channel_id)
+        );
+
+        if ($x) {
+            Libprofile::load($x[0]['channel_address'], 0);
+        }
+    }
+
+    public function get()
+    {
+
+        $o = '';
+
+        if (!App::$profile['profile_uid']) {
+            return;
+        }
+
+        $observer_hash = get_observer_hash();
+
+        if (!perm_is_allowed(App::$profile['profile_uid'], $observer_hash, 'view_contacts')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $t = Socgraph::count_common_friends(App::$profile['profile_uid'], $observer_hash);
+
+        if (!$t) {
+            notice(t('No connections in common.') . EOL);
+            return;
+        }
+
+        $r = Socgraph::common_friends(App::$profile['profile_uid'], $observer_hash);
+
+        if ($r) {
+            foreach ($r as $rr) {
+                $items[] = [
+                    'url' => $rr['xchan_url'],
+                    'name' => $rr['xchan_name'],
+                    'photo' => $rr['xchan_photo_m'],
+                    'tags' => ''
+                ];
+            }
+        }
+
+        $tpl = Theme::get_template('common_friends.tpl');
+
+        $o = replace_macros($tpl, [
+            '$title' => t('View Common Connections'),
+            '$items' => $items
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Connac.php b/Code/Module/Connac.php
new file mode 100644
index 000000000..1c1e1a241
--- /dev/null
+++ b/Code/Module/Connac.php
@@ -0,0 +1,35 @@
+ 1) {
+            App::$data['channel'] = Channel::from_username(argv(1));
+            Libprofile::load(argv(1), EMPTY_STR);
+        } else {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+    }
+
+    public function post()
+    {
+
+        if (!array_key_exists('channel', App::$data)) {
+            return;
+        }
+
+        $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false);
+
+        if ($edit) {
+            $has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0);
+            $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0);
+            $text = escape_tags($_POST['text']);
+
+            if ($has_premium != $premium) {
+                $r = q(
+                    "update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d",
+                    db_getfunc('^'),
+                    intval(PAGE_PREMIUM),
+                    intval(local_channel())
+                );
+
+                Run::Summon(['Notifier', 'refresh_all', App::$data['channel']['channel_id']]);
+            }
+            set_pconfig(App::$data['channel']['channel_id'], 'system', 'selltext', $text);
+            // reload the page completely to get fresh data
+            goaway(z_root() . '/' . App::$query_string);
+        }
+
+        $url = EMPTY_STR;
+        $observer = App::get_observer();
+        if (($observer) && ($_POST['submit'] === t('Continue'))) {
+            if ($observer['xchan_follow']) {
+                $url = sprintf($observer['xchan_follow'], urlencode(Channel::get_webfinger(App::$data['channel'])));
+            }
+            if (!$url) {
+                $r = q(
+                    "select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1",
+                    dbesc($observer['xchan_hash'])
+                );
+                if ($r) {
+                    $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(Channel::get_webfinger(App::$data['channel']));
+                }
+            }
+        }
+        if ($url) {
+            goaway($url . '&confirm=1');
+        } else {
+            notice('Unable to connect to your home hub location.');
+        }
+    }
+
+
+    public function get()
+    {
+
+        $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false);
+
+        $text = get_pconfig(App::$data['channel']['channel_id'], 'system', 'selltext');
+
+        if ($edit) {
+            $o = replace_macros(Theme::get_template('sellpage_edit.tpl'), array(
+                '$header' => t('Premium Channel Setup'),
+                '$address' => App::$data['channel']['channel_address'],
+                '$premium' => array('premium', t('Enable premium channel connection restrictions'), ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''), ''),
+                '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'),
+                '$text' => $text,
+                '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
+                '$lbl2' => t('Potential connections will then see the following text before proceeding:'),
+                '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
+                '$submit' => t('Submit'),
+
+
+            ));
+            return $o;
+        } else {
+            if (!$text) {
+                $text = t('(No specific instructions have been provided by the channel owner.)');
+            }
+
+            $submit = replace_macros(Theme::get_template('sellpage_submit.tpl'), array(
+                '$continue' => t('Continue'),
+                '$address' => App::$data['channel']['channel_address']
+            ));
+
+            $o = replace_macros(Theme::get_template('sellpage_view.tpl'), array(
+                '$header' => t('Restricted or Premium Channel'),
+                '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
+                '$text' => prepare_text($text),
+
+                '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
+                '$submit' => $submit,
+
+            ));
+
+            $arr = array('channel' => App::$data['channel'], 'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit);
+            Hook::call('connect_premium', $arr);
+            $o = $arr['sellpage'];
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Connections.php b/Code/Module/Connections.php
new file mode 100644
index 000000000..e91b43878
--- /dev/null
+++ b/Code/Module/Connections.php
@@ -0,0 +1,392 @@
+ array(
+                'label' => t('Active Connections'),
+                'url' => z_root() . '/connections/active',
+                'sel' => ($active) ? 'active' : '',
+                'title' => t('Show active connections'),
+            ),
+
+            'pending' => array(
+                'label' => t('New Connections'),
+                'url' => z_root() . '/connections/pending',
+                'sel' => ($pending) ? 'active' : '',
+                'title' => t('Show pending (new) connections'),
+            ),
+
+            'blocked' => array(
+                'label' => t('Blocked'),
+                'url' => z_root() . '/connections/blocked',
+                'sel' => ($blocked) ? 'active' : '',
+                'title' => t('Only show blocked connections'),
+            ),
+
+            'ignored' => array(
+                'label' => t('Ignored'),
+                'url' => z_root() . '/connections/ignored',
+                'sel' => ($ignored) ? 'active' : '',
+                'title' => t('Only show ignored connections'),
+            ),
+
+            'archived' => array(
+                'label' => t('Archived/Unreachable'),
+                'url' => z_root() . '/connections/archived',
+                'sel' => ($archived) ? 'active' : '',
+                'title' => t('Only show archived/unreachable connections'),
+            ),
+
+            'hidden' => array(
+                'label' => t('Hidden'),
+                'url' => z_root() . '/connections/hidden',
+                'sel' => ($hidden) ? 'active' : '',
+                'title' => t('Only show hidden connections'),
+            ),
+
+            'all' => array(
+                'label' => t('All Connections'),
+                'url' => z_root() . '/connections/all',
+                'sel' => ($all) ? 'active' : '',
+                'title' => t('Show all connections'),
+            ),
+
+        );
+
+        $searching = false;
+        if ($search) {
+            $search_hdr = $search;
+            $search_txt = dbesc(protect_sprintf($search));
+            $searching = true;
+        }
+        $sql_extra .= (($searching) ? " AND ( xchan_name like '%%$search_txt%%' OR abook_alias like '%%$search_txt%%' ) " : "");
+
+        if (isset($_REQUEST['gid']) && intval($_REQUEST['gid'])) {
+            $sql_extra .= " and xchan_hash in ( select xchan from pgrp_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) ";
+        }
+
+        $r = q(
+            "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash 
+			where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ",
+            intval(local_channel())
+        );
+        if ($r) {
+            App::set_pager_total($r[0]['total']);
+            $total = $r[0]['total'];
+        }
+
+        $order_q = 'xchan_name';
+        if (isset($_REQUEST['order'])) {
+            switch ($_REQUEST['order']) {
+                case 'date':
+                    $order_q = 'abook_created desc';
+                    break;
+                case 'created':
+                    $order_q = 'abook_created';
+                    break;
+                case 'cmax':
+                    $order_q = 'abook_closeness';
+                    break;
+                case 'name':
+                default:
+                    $order_q = 'xchan_name';
+                    break;
+            }
+        }
+
+
+        $order = array(
+
+            'name' => array(
+                'label' => t('Name'),
+                'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=name',
+                'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] !== 'name') ? 'active' : ''),
+                'title' => t('Order by name'),
+            ),
+
+            'date' => array(
+                'label' => t('Recent'),
+                'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date',
+                'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'date') ? 'active' : ''),
+                'title' => t('Order by recent'),
+            ),
+
+            'created' => array(
+                'label' => t('Created'),
+                'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=created',
+                'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'created') ? 'active' : ''),
+                'title' => t('Order by date'),
+            ),
+// reserved for cmax
+//          'date' => array(
+//              'label' => t(''),
+//              'url'   => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date',
+//              'sel'   => ($_REQUEST['order'] === 'date') ? 'active' : '',
+//              'title' => t('Order by recent'),
+//          ),
+
+        );
+
+
+        $r = q(
+            "SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
+			WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ORDER BY $order_q LIMIT %d OFFSET %d ",
+            intval(local_channel()),
+            intval(App::$pager['itemspage']),
+            intval(App::$pager['start'])
+        );
+
+        $contacts = [];
+
+        if ($r) {
+            vcard_query($r);
+
+
+            foreach ($r as $rr) {
+                if ((!$blocked) && LibBlock::fetch_by_entity(local_channel(), $rr['xchan_hash'])) {
+                    continue;
+                }
+                if ($rr['xchan_url']) {
+                    if ((isset($rr['vcard']) && $rr['vcard']) && is_array($rr['vcard']['tels']) && $rr['vcard']['tels'][0]['nr']) {
+                        $phone = $rr['vcard']['tels'][0]['nr'];
+                    } else {
+                        $phone = '';
+                    }
+
+                    $status_str = '';
+                    $status = array(
+                        ((isset($rr['abook_active']) && intval($rr['abook_active'])) ? t('Active') : ''),
+                        ((intval($rr['abook_pending'])) ? t('Pending approval') : ''),
+                        ((intval($rr['abook_archived'])) ? t('Archived') : ''),
+                        ((intval($rr['abook_hidden'])) ? t('Hidden') : ''),
+                        ((intval($rr['abook_ignored'])) ? t('Ignored') : ''),
+                        ((intval($rr['abook_blocked'])) ? t('Blocked') : ''),
+                        ((intval($rr['abook_not_here'])) ? t('Not connected at this location') : '')
+                    );
+
+                    $oneway = false;
+                    if (!their_perms_contains(local_channel(), $rr['xchan_hash'], 'post_comments')) {
+                        $oneway = true;
+                    }
+
+                    foreach ($status as $str) {
+                        if (!$str) {
+                            continue;
+                        }
+                        $status_str .= $str;
+                        $status_str .= ', ';
+                    }
+                    $status_str = rtrim($status_str, ', ');
+
+                    $contacts[] = array(
+                        'img_hover' => sprintf(t('%1$s [%2$s]'), $rr['xchan_name'], $rr['xchan_url']),
+                        'edit_hover' => t('Edit connection'),
+                        'edit' => t('Edit'),
+                        'delete_hover' => t('Delete connection'),
+                        'id' => $rr['abook_id'],
+                        'thumb' => $rr['xchan_photo_m'],
+                        'name' => $rr['xchan_name'] . (($rr['abook_alias']) ? ' <' . $rr['abook_alias'] . '>' : ''),
+                        'classes' => ((intval($rr['abook_archived']) || intval($rr['abook_not_here'])) ? 'archived' : ''),
+                        'link' => z_root() . '/connedit/' . $rr['abook_id'],
+                        'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop',
+                        'delete' => t('Delete'),
+                        'url' => chanlink_hash($rr['xchan_hash']),
+                        'webbie_label' => t('Channel address'),
+                        'webbie' => $rr['xchan_addr'],
+                        'network_label' => t('Network'),
+                        'network' => network_to_name($rr['xchan_network']),
+                        'channel_type' => intval($rr['xchan_type']),
+                        'call' => t('Call'),
+                        'phone' => $phone,
+                        'status_label' => t('Status'),
+                        'status' => $status_str,
+                        'connected_label' => t('Connected'),
+                        'connected' => datetime_convert('UTC', date_default_timezone_get(), $rr['abook_created'], 'c'),
+                        'approve_hover' => t('Approve connection'),
+                        'approve' => (($rr['abook_pending']) ? t('Approve') : false),
+                        'ignore_hover' => t('Ignore connection'),
+                        'ignore' => ((!$rr['abook_ignored']) ? t('Ignore') : false),
+                        'recent_label' => t('Recent activity'),
+                        'recentlink' => z_root() . '/stream/?f=&cid=' . intval($rr['abook_id']),
+                        'oneway' => $oneway,
+                        'allow_delete' => ($rr['abook_pending'] || get_pconfig(local_channel(), 'system', 'connections_quick_delete')),
+                    );
+                }
+            }
+        }
+
+
+        if ($_REQUEST['aj']) {
+            if ($contacts) {
+                $o = replace_macros(Theme::get_template('contactsajax.tpl'), array(
+                    '$contacts' => $contacts,
+                    '$edit' => t('Edit'),
+                ));
+            } else {
+                $o = '
      ';
+            }
+            echo $o;
+            killme();
+        } else {
+            $o .= "";
+            $o .= replace_macros(Theme::get_template('connections.tpl'), array(
+                '$header' => t('Connections') . (($head) ? ': ' . $head : ''),
+                '$tabs' => $tabs,
+                '$order' => $order,
+                '$sort' => t('Filter by'),
+                '$sortorder' => t('Sort by'),
+                '$total' => $total,
+                '$search' => ((isset($search_hdr)) ? $search_hdr : EMPTY_STR),
+                '$label' => t('Search'),
+                '$desc' => t('Search your connections'),
+                '$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""),
+                '$submit' => t('Find'),
+                '$edit' => t('Edit'),
+                '$cmd' => App::$cmd,
+                '$contacts' => $contacts,
+                '$paginate' => paginate($a),
+
+            ));
+        }
+
+        if (!$contacts) {
+            $o .= '
      ';
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Connedit.php b/Code/Module/Connedit.php
new file mode 100644
index 000000000..079188c4f
--- /dev/null
+++ b/Code/Module/Connedit.php
@@ -0,0 +1,907 @@
+= 2) && intval(argv(1))) {
+            $r = q(
+                "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
+				WHERE abook_channel = %d and abook_id = %d LIMIT 1",
+                intval(local_channel()),
+                intval(argv(1))
+            );
+            // Set the person-of-interest for use by widgets that operate on a single pre-defined channel
+            if ($r) {
+                App::$poi = array_shift($r);
+            }
+        }
+
+        $channel = App::get_channel();
+        if ($channel) {
+            head_set_icon($channel['xchan_photo_s']);
+        }
+    }
+
+
+    /**
+     * @brief Evaluate posted values and set changes
+     */
+
+    public function post()
+    {
+
+        if (!local_channel()) {
+            return;
+        }
+
+        $contact_id = intval(argv(1));
+        if (!$contact_id) {
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        $orig_record = q(
+            "SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
+            intval($contact_id),
+            intval(local_channel())
+        );
+
+        if (!$orig_record) {
+            notice(t('Could not access contact record.') . EOL);
+            goaway(z_root() . '/connections');
+        }
+
+        $orig_record = array_shift($orig_record);
+
+        Hook::call('contact_edit_post', $_POST);
+
+        $vc = get_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard');
+        $vcard = (($vc) ? Reader::read($vc) : null);
+        $serialised_vcard = update_vcard($_REQUEST, $vcard);
+        if ($serialised_vcard) {
+            set_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard', $serialised_vcard);
+        }
+
+        $autoperms = null;
+        $is_self = false;
+
+        if (intval($orig_record['abook_self'])) {
+            $autoperms = intval($_POST['autoperms']);
+            $is_self = true;
+        }
+
+        $profile_id = ((array_key_exists('profile_assign', $_POST)) ? $_POST['profile_assign'] : $orig_record['abook_profile']);
+
+        if ($profile_id) {
+            $r = q(
+                "SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND uid = %d LIMIT 1",
+                dbesc($profile_id),
+                intval(local_channel())
+            );
+            if (!$r) {
+                notice(t('Could not locate selected profile.') . EOL);
+                return;
+            }
+        }
+
+        $abook_incl = ((array_key_exists('abook_incl', $_POST)) ? escape_tags($_POST['abook_incl']) : $orig_record['abook_incl']);
+        $abook_excl = ((array_key_exists('abook_excl', $_POST)) ? escape_tags($_POST['abook_excl']) : $orig_record['abook_excl']);
+        $abook_alias = ((array_key_exists('abook_alias', $_POST)) ? escape_tags(trim($_POST['abook_alias'])) : $orig_record['abook_alias']);
+
+        $block_announce = ((array_key_exists('block_announce', $_POST)) ? intval($_POST['block_announce']) : 0);
+
+        set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'block_announce', $block_announce);
+
+        $hidden = intval($_POST['hidden']);
+
+        $priority = intval($_POST['poll']);
+        if ($priority > 5 || $priority < 0) {
+            $priority = 0;
+        }
+
+        if (!array_key_exists('closeness', $_POST)) {
+            $_POST['closeness'] = 80;
+        }
+        $closeness = intval($_POST['closeness']);
+        if ($closeness < 0 || $closeness > 99) {
+            $closeness = 80;
+        }
+
+        $all_perms = Permissions::Perms();
+
+        $p = EMPTY_STR;
+
+        if ($all_perms) {
+            foreach ($all_perms as $perm => $desc) {
+                if (array_key_exists('perms_' . $perm, $_POST)) {
+                    if ($p) {
+                        $p .= ',';
+                    }
+                    $p .= $perm;
+                }
+            }
+            set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'my_perms', $p);
+            if ($autoperms) {
+                set_pconfig($channel['channel_id'], 'system', 'autoperms', $p);
+            }
+        }
+
+        $new_friend = false;
+
+        if (($_REQUEST['pending']) && intval($orig_record['abook_pending'])) {
+            $new_friend = true;
+
+            // @fixme it won't be common, but when you accept a new connection request
+            // the permissions will now be that of your permissions role and ignore
+            // any you may have set manually on the form. We'll probably see a bug if somebody
+            // tries to set the permissions *and* approve the connection in the same
+            // request. The workaround is to approve the connection, then go back and
+            // adjust permissions as desired.
+
+            $p = Permissions::connect_perms(local_channel());
+            $my_perms = Permissions::serialise($p['perms']);
+            if ($my_perms) {
+                set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'my_perms', $my_perms);
+            }
+        }
+
+        $abook_pending = (($new_friend) ? 0 : $orig_record['abook_pending']);
+
+        $r = q(
+            "UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d,
+			abook_incl = '%s', abook_excl = '%s', abook_alias = '%s'
+			where abook_id = %d AND abook_channel = %d",
+            dbesc($profile_id),
+            intval($closeness),
+            intval($abook_pending),
+            dbesc($abook_incl),
+            dbesc($abook_excl),
+            dbesc($abook_alias),
+            intval($contact_id),
+            intval(local_channel())
+        );
+
+        if ($r) {
+            info(t('Connection updated.') . EOL);
+        } else {
+            notice(t('Failed to update connection record.') . EOL);
+        }
+
+        if (!intval(App::$poi['abook_self'])) {
+            if ($new_friend) {
+                Run::Summon(['Notifier', 'permissions_accept', $contact_id]);
+            }
+
+            Run::Summon([
+                'Notifier',
+                (($new_friend) ? 'permissions_create' : 'permissions_update'),
+                $contact_id
+            ]);
+        }
+
+        if ($new_friend) {
+            $default_group = $channel['channel_default_group'];
+            if ($default_group) {
+                $g = AccessList::rec_byhash(local_channel(), $default_group);
+                if ($g) {
+                    AccessList::member_add(local_channel(), '', App::$poi['abook_xchan'], $g['id']);
+                }
+            }
+
+            // Check if settings permit ("post new friend activity" is allowed, and
+            // friends in general or this friend in particular aren't hidden)
+            // and send out a new friend activity
+
+            $pr = q(
+                "select * from profile where uid = %d and is_default = 1 and hide_friends = 0",
+                intval($channel['channel_id'])
+            );
+            if (($pr) && (!intval($orig_record['abook_hidden'])) && (intval(get_pconfig($channel['channel_id'], 'system', 'post_newfriend')))) {
+                $xarr = [];
+
+                $xarr['item_wall'] = 1;
+                $xarr['item_origin'] = 1;
+                $xarr['item_thread_top'] = 1;
+                $xarr['owner_xchan'] = $xarr['author_xchan'] = $channel['channel_hash'];
+                $xarr['allow_cid'] = $channel['channel_allow_cid'];
+                $xarr['allow_gid'] = $channel['channel_allow_gid'];
+                $xarr['deny_cid'] = $channel['channel_deny_cid'];
+                $xarr['deny_gid'] = $channel['channel_deny_gid'];
+                $xarr['item_private'] = (($xarr['allow_cid'] || $xarr['allow_gid'] || $xarr['deny_cid'] || $xarr['deny_gid']) ? 1 : 0);
+
+                $xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . App::$poi['xchan_url'] . ']' . App::$poi['xchan_name'] . '[/zrl]';
+
+                $xarr['body'] .= "\n\n\n" . '[zrl=' . App::$poi['xchan_url'] . '][zmg=80x80]' . App::$poi['xchan_photo_m'] . '[/zmg][/zrl]';
+
+                post_activity_item($xarr);
+            }
+
+            // pull in a bit of content if there is any to pull in
+            Run::Summon(['Onepoll', $contact_id]);
+        }
+
+        // Refresh the structure in memory with the new data
+
+        $r = q(
+            "SELECT abook.*, xchan.*
+			FROM abook left join xchan on abook_xchan = xchan_hash
+			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
+            intval(local_channel()),
+            intval($contact_id)
+        );
+        if ($r) {
+            App::$poi = array_shift($r);
+        }
+
+        if ($new_friend) {
+            $arr = ['channel_id' => local_channel(), 'abook' => App::$poi];
+            Hook::call('accept_follow', $arr);
+        }
+
+        $this->connedit_clone($a);
+
+        if (($_REQUEST['pending']) && (!$_REQUEST['done'])) {
+            goaway(z_root() . '/connections/ifpending');
+        }
+
+        return;
+    }
+
+    /* @brief Clone connection
+     *
+     *
+     */
+
+    public function connedit_clone(&$a)
+    {
+
+        if (!App::$poi) {
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        $r = q(
+            "SELECT abook.*, xchan.*
+			FROM abook left join xchan on abook_xchan = xchan_hash
+			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
+            intval(local_channel()),
+            intval(App::$poi['abook_id'])
+        );
+        if (!$r) {
+            return;
+        }
+
+        App::$poi = array_shift($r);
+        $clone = App::$poi;
+
+        unset($clone['abook_id']);
+        unset($clone['abook_account']);
+        unset($clone['abook_channel']);
+
+        $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
+        if ($abconfig) {
+            $clone['abconfig'] = $abconfig;
+        }
+        Libsync::build_sync_packet($channel['channel_id'], ['abook' => [$clone]]);
+    }
+
+    /**
+     * @brief Generate content of connection edit page
+     */
+
+    public function get()
+    {
+
+        $sort_type = 0;
+        $o = EMPTY_STR;
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return login();
+        }
+
+        $section = ((array_key_exists('section', $_REQUEST)) ? $_REQUEST['section'] : '');
+        $channel = App::get_channel();
+
+        $yes_no = [t('No'), t('Yes')];
+
+        $connect_perms = Permissions::connect_perms(local_channel());
+
+        $o .= "\n";
+
+        if (argc() == 3) {
+            $contact_id = intval(argv(1));
+            if (!$contact_id) {
+                return;
+            }
+
+            $cmd = argv(2);
+
+            $orig_record = q(
+                "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
+				WHERE abook_id = %d AND abook_channel = %d AND abook_self = 0 LIMIT 1",
+                intval($contact_id),
+                intval(local_channel())
+            );
+
+            if (!$orig_record) {
+                notice(t('Could not access address book record.') . EOL);
+                goaway(z_root() . '/connections');
+            }
+
+            $orig_record = array_shift($orig_record);
+
+            if ($cmd === 'update') {
+                // pull feed and consume it, which should subscribe to the hub.
+                Run::Summon(['Poller', $contact_id]);
+                goaway(z_root() . '/connedit/' . $contact_id);
+            }
+
+            if ($cmd === 'fetchvc') {
+                $url = str_replace('/channel/', '/profile/', $orig_record['xchan_url']) . '/vcard';
+                $recurse = 0;
+                $x = z_fetch_url(zid($url), false, $recurse, ['session' => true]);
+                if ($x['success']) {
+                    $h = new HTTPHeaders($x['header']);
+                    $fields = $h->fetcharr();
+                    if ($fields && array_key_exists('content-type', $fields)) {
+                        $type = explode(';', trim($fields['content-type']));
+                        if ($type && $type[0] === 'text/vcard' && $x['body']) {
+                            $vc = Reader::read($x['body']);
+                            $vcard = $vc->serialize();
+                            if ($vcard) {
+                                set_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard', $vcard);
+                                $this->connedit_clone($a);
+                            }
+                        }
+                    }
+                }
+                goaway(z_root() . '/connedit/' . $contact_id);
+            }
+
+
+            if ($cmd === 'resetphoto') {
+                q(
+                    "update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s'",
+                    dbesc($orig_record['xchan_hash'])
+                );
+                $cmd = 'refresh';
+            }
+
+            if ($cmd === 'refresh') {
+				if (in_array($orig_record['xchan_network'],['nomad','zot6'])) {
+                    if (!Libzot::refresh($orig_record, App::get_channel())) {
+                        notice(t('Refresh failed - channel is currently unavailable.'));
+                    }
+                } else {
+                    if ($orig_record['xchan_network'] === 'activitypub') {
+                        ActivityPub::discover($orig_record['xchan_hash'], true);
+                    }
+                    // if they are on a different network we'll force a refresh of the connection basic info
+                    Run::Summon(['Notifier', 'permissions_update', $contact_id]);
+                }
+                goaway(z_root() . '/connedit/' . $contact_id);
+            }
+
+            switch ($cmd) {
+                case 'block':
+                    if (intval($orig_record['abook_blocked'])) {
+                        LibBlock::remove(local_channel(), $orig_record['abook_xchan']);
+                        $sync = [
+                            'block_channel_id' => local_channel(),
+                            'block_entity' => $orig_record['abook_xchan'],
+                            'block_type' => BLOCKTYPE_CHANNEL,
+                            'deleted' => true,
+                        ];
+                    } else {
+                        LibBlock::store([
+                            'block_channel_id' => local_channel(),
+                            'block_entity' => $orig_record['abook_xchan'],
+                            'block_type' => BLOCKTYPE_CHANNEL,
+                            'block_comment' => t('Added by Connedit')
+                        ]);
+                        $z = q(
+                            "insert into xign ( uid, xchan ) values ( %d , '%s' ) ",
+                            intval(local_channel()),
+                            dbesc($orig_record['abook_xchan'])
+                        );
+                        $sync = LibBlock::fetch_by_entity(local_channel(), $orig_record['abook_xchan']);
+                    }
+                    $ignored = ['uid' => local_channel(), 'xchan' => $orig_record['abook_xchan']];
+                    Libsync::build_sync_packet(0, ['xign' => [$ignored], 'block' => [$sync]]);
+                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_BLOCKED);
+                    break;
+                case 'ignore':
+                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_IGNORED);
+                    break;
+                case 'censor':
+                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_CENSORED);
+                    break;
+                case 'archive':
+                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_ARCHIVED);
+                    break;
+                case 'hide':
+                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_HIDDEN);
+                    break;
+                case 'approve':
+                    if (intval($orig_record['abook_pending'])) {
+                        $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_PENDING);
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+            if (isset($flag_result)) {
+                if ($flag_result) {
+                    $this->connedit_clone($a);
+                } else {
+                    notice(t('Unable to set address book parameters.') . EOL);
+                }
+                goaway(z_root() . '/connedit/' . $contact_id);
+            }
+
+            if ($cmd === 'drop') {
+                if ($orig_record['xchan_network'] === 'activitypub') {
+                    ActivityPub::contact_remove(local_channel(), $orig_record);
+                }
+                contact_remove(local_channel(), $orig_record['abook_id'], true);
+
+                // The purge notification is sent to the xchan_hash as the abook record will have just been removed
+
+                Run::Summon(['Notifier', 'purge', $orig_record['xchan_hash']]);
+
+                Libsync::build_sync_packet(0, ['abook' => [['abook_xchan' => $orig_record['abook_xchan'], 'entry_deleted' => true]]]);
+
+                info(t('Connection has been removed.') . EOL);
+                if (isset($_SESSION['return_url']) && $_SESSION['return_url']) {
+                    goaway(z_root() . '/' . $_SESSION['return_url']);
+                }
+                goaway(z_root() . '/contacts');
+            }
+        }
+
+        if (App::$poi) {
+            $abook_prev = 0;
+            $abook_next = 0;
+
+            $contact_id = App::$poi['abook_id'];
+            $contact = App::$poi;
+
+            $cn = q(
+                "SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 order by xchan_name",
+                intval(local_channel())
+            );
+
+            if ($cn) {
+                // store previous/next ids for navigation
+                $pntotal = count($cn);
+
+                for ($x = 0; $x < $pntotal; $x++) {
+                    if ($cn[$x]['abook_id'] == $contact_id) {
+                        if ($x === 0) {
+                            $abook_prev = 0;
+                        } else {
+                            $abook_prev = $cn[$x - 1]['abook_id'];
+                        }
+                        if ($x === $pntotal) {
+                            $abook_next = 0;
+                        } else {
+                            $abook_next = $cn[$x + 1]['abook_id'];
+                        }
+                    }
+                }
+            }
+
+            $tools = array(
+
+                'view' => array(
+                    'label' => t('View Profile'),
+                    'url' => chanlink_cid($contact['abook_id']),
+                    'sel' => '',
+                    'title' => sprintf(t('View %s\'s profile'), $contact['xchan_name']),
+                ),
+
+                'refresh' => array(
+                    'label' => t('Refresh Permissions'),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/refresh',
+                    'sel' => '',
+                    'title' => t('Fetch updated permissions'),
+                ),
+
+                'rephoto' => array(
+                    'label' => t('Refresh Photo'),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/resetphoto',
+                    'sel' => '',
+                    'title' => t('Fetch updated photo'),
+                ),
+
+                'recent' => array(
+                    'label' => t('Recent Activity'),
+                    'url' => z_root() . '/stream/?f=&cid=' . $contact['abook_id'],
+                    'sel' => '',
+                    'title' => t('View recent posts and comments'),
+                ),
+
+                'block' => array(
+                    'label' => (intval($contact['abook_blocked']) ? t('Unblock') : t('Block')),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/block',
+                    'sel' => (intval($contact['abook_blocked']) ? 'active' : ''),
+                    'title' => t('Block (or Unblock) all communications with this connection'),
+                    'info' => (intval($contact['abook_blocked']) ? t('This connection is blocked') : ''),
+                ),
+
+                'ignore' => array(
+                    'label' => (intval($contact['abook_ignored']) ? t('Unignore') : t('Ignore')),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/ignore',
+                    'sel' => (intval($contact['abook_ignored']) ? 'active' : ''),
+                    'title' => t('Ignore (or Unignore) all inbound communications from this connection'),
+                    'info' => (intval($contact['abook_ignored']) ? t('This connection is ignored') : ''),
+                ),
+
+                'censor' => array(
+                    'label' => (intval($contact['abook_censor']) ? t('Uncensor') : t('Censor')),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/censor',
+                    'sel' => (intval($contact['abook_censor']) ? 'active' : ''),
+                    'title' => t('Censor (or Uncensor) images from this connection'),
+                    'info' => (intval($contact['abook_censor']) ? t('This connection is censored') : ''),
+                ),
+
+                'archive' => array(
+                    'label' => (intval($contact['abook_archived']) ? t('Unarchive') : t('Archive')),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/archive',
+                    'sel' => (intval($contact['abook_archived']) ? 'active' : ''),
+                    'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'),
+                    'info' => (intval($contact['abook_archived']) ? t('This connection is archived') : ''),
+                ),
+
+                'hide' => array(
+                    'label' => (intval($contact['abook_hidden']) ? t('Unhide') : t('Hide')),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/hide',
+                    'sel' => (intval($contact['abook_hidden']) ? 'active' : ''),
+                    'title' => t('Hide or Unhide this connection from your other connections'),
+                    'info' => (intval($contact['abook_hidden']) ? t('This connection is hidden') : ''),
+                ),
+
+                'delete' => array(
+                    'label' => t('Delete'),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/drop',
+                    'sel' => '',
+                    'title' => t('Delete this connection'),
+                ),
+
+            );
+
+
+            if (in_array($contact['xchan_network'], [ 'zot6', 'nomad' ])) {
+                $tools['fetchvc'] = [
+                    'label' => t('Fetch Vcard'),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/fetchvc',
+                    'sel' => '',
+                    'title' => t('Fetch electronic calling card for this connection')
+                ];
+            }
+
+            $sections = [];
+
+            $sections['perms'] = [
+                'label' => t('Permissions'),
+                'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=perms',
+                'sel' => '',
+                'title' => t('Open Individual Permissions section by default'),
+            ];
+
+            $self = false;
+
+            if (intval($contact['abook_self'])) {
+                $self = true;
+                $abook_prev = $abook_next = 0;
+            }
+
+            $vc = get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'vcard');
+
+            $vctmp = (($vc) ? Reader::read($vc) : null);
+            $vcard = (($vctmp) ? get_vcard_array($vctmp, $contact['abook_id']) : []);
+            if (!$vcard) {
+                $vcard['fn'] = $contact['xchan_name'];
+            }
+
+
+            $tpl = Theme::get_template("abook_edit.tpl");
+
+            if (Apps::system_app_installed(local_channel(), 'Friend Zoom')) {
+                $sections['affinity'] = [
+                    'label' => t('Friend Zoom'),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=affinity',
+                    'sel' => '',
+                    'title' => t('Open Friend Zoom section by default'),
+                ];
+
+                $labels = [
+                    0 => t('Me'),
+                    20 => t('Family'),
+                    40 => t('Friends'),
+                    60 => t('Peers'),
+                    80 => t('Connections'),
+                    99 => t('All')
+                ];
+                Hook::call('affinity_labels', $labels);
+
+                $slider_tpl = Theme::get_template('contact_slider.tpl');
+
+                $slideval = intval($contact['abook_closeness']);
+
+                $slide = replace_macros($slider_tpl, array(
+                    '$min' => 1,
+                    '$val' => $slideval,
+                    '$labels' => $labels,
+                ));
+            }
+
+            if (Apps::system_app_installed(local_channel(), 'Content Filter')) {
+                $sections['filter'] = [
+                    'label' => t('Filter'),
+                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=filter',
+                    'sel' => '',
+                    'title' => t('Open Custom Filter section by default'),
+                ];
+            }
+
+            $rating_val = 0;
+            $rating_text = '';
+
+            $xl = q(
+                "select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
+                dbesc($channel['channel_hash']),
+                dbesc($contact['xchan_hash'])
+            );
+
+            if ($xl) {
+                $rating_val = intval($xl[0]['xlink_rating']);
+                $rating_text = $xl[0]['xlink_rating_text'];
+            }
+
+            $rating_enabled = get_config('system', 'rating_enabled');
+
+            if ($rating_enabled) {
+                $rating = replace_macros(Theme::get_template('rating_slider.tpl'), array(
+                    '$min' => -10,
+                    '$val' => $rating_val
+                ));
+            } else {
+                $rating = false;
+            }
+
+
+            $perms = [];
+            $channel = App::get_channel();
+
+            $global_perms = Permissions::Perms();
+
+            $existing = get_all_perms(local_channel(), $contact['abook_xchan'], false);
+
+            $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'), t('Yes')));
+
+            $multiprofs = ((Features::enabled(local_channel(), 'multi_profiles')) ? true : false);
+
+            if ($slide && !$multiprofs) {
+                $affinity = t('Set Friend Zoom');
+            }
+
+            if (!$slide && $multiprofs) {
+                $affinity = t('Set Profile');
+            }
+
+            if ($slide && $multiprofs) {
+                $affinity = t('Set Friend Zoom & Profile');
+            }
+
+
+            $theirs = get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'their_perms', EMPTY_STR);
+
+            $their_perms = Permissions::FilledPerms(explode(',', $theirs));
+            foreach ($global_perms as $k => $v) {
+                if (!array_key_exists($k, $their_perms)) {
+                    $their_perms[$k] = 1;
+                }
+            }
+
+            $my_perms = explode(',', get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'my_perms', EMPTY_STR));
+
+            foreach ($global_perms as $k => $v) {
+                $thisperm = ((in_array($k, $my_perms)) ? 1 : 0);
+
+                $checkinherited = PermissionLimits::Get(local_channel(), $k);
+
+                // For auto permissions (when $self is true) we don't want to look at existing
+                // permissions because they are enabled for the channel owner
+                if ((!$self) && ($existing[$k])) {
+                    $thisperm = "1";
+                }
+
+                $perms[] = array('perms_' . $k, $v, ((array_key_exists($k, $their_perms)) ? intval($their_perms[$k]) : ''), $thisperm, $yes_no, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
+            }
+
+            $current_permcat = EMPTY_STR;
+
+            if (Apps::System_app_installed(local_channel(),'Roles')) {
+                $pcat = new Permcat(local_channel(), $contact['abook_id']);
+                $pcatlist = $pcat->listing();
+                $permcats = [];
+                if ($pcatlist) {
+                    foreach ($pcatlist as $pc) {
+                        $permcats[$pc['name']] = $pc['localname'];
+                    }
+                }
+
+                $current_permcat = $pcat->match($my_perms);
+            }
+
+            $locstr = locations_by_netid($contact['xchan_hash']);
+            if (!$locstr) {
+                $locstr = unpunify($contact['xchan_url']);
+            }
+
+            $clone_warn = '';
+            $clonable = (in_array($contact['xchan_network'], ['nomad', 'zot6', 'zot', 'rss']) ? true : false);
+            if (!$clonable) {
+                $clone_warn = '';
+                $clone_warn .= ((intval($contact['abook_not_here']))
+                    ? t('This connection is unreachable from this location.')
+                    : t('This connection may be unreachable from other channel locations.')
+                );
+                $clone_warn .= '
      ' . t('Location independence is not supported by their network.');
+            }
+
+
+            if (intval($contact['abook_not_here']) && $unclonable) {
+                $not_here = t('This connection is unreachable from this location. Location independence is not supported by their network.');
+            }
+
+            $o .= replace_macros($tpl, [
+                '$header' => (($self) ? t('Connection Default Permissions') : sprintf(t('Connection: %s'), $contact['xchan_name']) . (($contact['abook_alias']) ? ' <' . $contact['abook_alias'] . '>' : '')),
+                '$autoperms' => array('autoperms', t('Apply these permissions automatically'), ((get_pconfig(local_channel(), 'system', 'autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
+                '$permcat' => ['permcat', t('Permission role'), $current_permcat, '', $permcats],
+                '$permcat_new' => t('Add permission role'),
+                '$permcat_enable' => Apps::system_app_installed(local_channel(),'Roles'),
+                '$addr' => unpunify($contact['xchan_addr']),
+                '$primeurl' => unpunify($contact['xchan_url']),
+                '$block_announce' => ['block_announce', t('Ignore shares and repeats this connection posts'), get_abconfig(local_channel(), $contact['xchan_hash'], 'system', 'block_announce', false), t('Note: This is not recommended for Groups.'), [t('No'), t('Yes')]],
+                '$section' => $section,
+                '$sections' => $sections,
+                '$vcard' => $vcard,
+                '$addr_text' => t('This connection\'s primary address is'),
+                '$loc_text' => t('Available locations:'),
+                '$locstr' => $locstr,
+                '$unclonable' => $clone_warn,
+                '$notself' => (($self) ? '' : '1'),
+                '$self' => (($self) ? '1' : ''),
+                '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'),
+                '$tools_label' => t('Connection Tools'),
+                '$tools' => (($self) ? '' : $tools),
+                '$lbl_slider' => t('Slide to adjust your degree of friendship'),
+                '$lbl_rating' => t('Rating'),
+                '$lbl_rating_label' => t('Slide to adjust your rating'),
+                '$lbl_rating_txt' => t('Optionally explain your rating'),
+                '$connfilter' => Apps::system_app_installed(local_channel(), 'Content Filter'),
+                '$connfilter_label' => t('Custom Filter'),
+                '$incl' => array('abook_incl', t('Only import posts with this text'), $contact['abook_incl'], t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')),
+                '$excl' => array('abook_excl', t('Do not import posts with this text'), $contact['abook_excl'], t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')),
+                '$alias' => array('abook_alias', t('Nickname'), $contact['abook_alias'], t('optional - allows you to search by a name that you have chosen')),
+                '$rating_text' => array('rating_text', t('Optionally explain your rating'), $rating_text, ''),
+                '$rating_info' => t('This information is public!'),
+                '$rating' => $rating,
+                '$rating_val' => $rating_val,
+                '$slide' => $slide,
+                '$affinity' => $affinity,
+                '$pending_label' => t('Connection Pending Approval'),
+                '$is_pending' => (intval($contact['abook_pending']) ? 1 : ''),
+                '$unapproved' => $unapproved,
+                '$inherited' => '', // t('inherited'),
+                '$submit' => t('Submit'),
+                '$lbl_vis2' => sprintf(t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']),
+                '$close' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 80),
+                '$them' => t('Their Settings'),
+                '$me' => t('My Settings'),
+                '$perms' => $perms,
+                '$permlbl' => t('Individual Permissions'),
+                '$permnote' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
+                '$permnote_self' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
+                '$lastupdtext' => t('Last update:'),
+                '$last_update' => relative_date($contact['abook_connected']),
+                '$profile_select' => contact_profile_assign($contact['abook_profile']),
+                '$multiprofs' => $multiprofs,
+                '$contact_id' => $contact['abook_id'],
+                '$name' => $contact['xchan_name'],
+                '$abook_prev' => $abook_prev,
+                '$abook_next' => $abook_next,
+                '$vcard_label' => t('Details'),
+                '$displayname' => $displayname,
+                '$name_label' => t('Name'),
+                '$org_label' => t('Organisation'),
+                '$title_label' => t('Title'),
+                '$tel_label' => t('Phone'),
+                '$email_label' => t('Email'),
+                '$impp_label' => t('Instant messenger'),
+                '$url_label' => t('Website'),
+                '$adr_label' => t('Address'),
+                '$note_label' => t('Note'),
+                '$mobile' => t('Mobile'),
+                '$home' => t('Home'),
+                '$work' => t('Work'),
+                '$other' => t('Other'),
+                '$add_card' => t('Add Contact'),
+                '$add_field' => t('Add Field'),
+                '$create' => t('Create'),
+                '$update' => t('Update'),
+                '$delete' => t('Delete'),
+                '$cancel' => t('Cancel'),
+                '$po_box' => t('P.O. Box'),
+                '$extra' => t('Additional'),
+                '$street' => t('Street'),
+                '$locality' => t('Locality'),
+                '$region' => t('Region'),
+                '$zip_code' => t('ZIP Code'),
+                '$country' => t('Country')
+            ]);
+
+            $arr = array('contact' => $contact, 'output' => $o);
+
+            Hook::call('contact_edit', $arr);
+
+            return $arr['output'];
+        }
+    }
+}
diff --git a/Code/Module/Contactgroup.php b/Code/Module/Contactgroup.php
new file mode 100644
index 000000000..a2faf8413
--- /dev/null
+++ b/Code/Module/Contactgroup.php
@@ -0,0 +1,57 @@
+ AccessList['id']
+ * argv[2] => connection portable_id (base64url_encoded for transport)
+ *
+ */
+
+
+class Contactgroup extends Controller
+{
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            killme();
+        }
+
+        if ((argc() > 2) && (intval(argv(1))) && (argv(2))) {
+            $r = abook_by_hash(local_channel(), base64url_decode(argv(2)));
+            if ($r) {
+                $change = $r['abook_xchan'];
+            }
+        }
+
+        if ((argc() > 1) && (intval(argv(1)))) {
+            $group = AccessList::by_id(local_channel(), argv(1));
+
+            if (!$group) {
+                killme();
+            }
+
+            $members = AccessList::members(local_channel(), $group['id']);
+            $preselected = ids_to_array($members, 'xchan_hash');
+
+            if ($change) {
+                if (in_array($change, $preselected)) {
+                    AccessList::member_remove(local_channel(), $group['gname'], $change);
+                } else {
+                    AccessList::member_add(local_channel(), $group['gname'], $change);
+                }
+            }
+        }
+
+        killme();
+    }
+}
diff --git a/Code/Module/Content_filter.php b/Code/Module/Content_filter.php
new file mode 100644
index 000000000..686603306
--- /dev/null
+++ b/Code/Module/Content_filter.php
@@ -0,0 +1,74 @@
+' . $desc . '';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Content Filter'))) {
+            return $text;
+        }
+
+        $text .= EOL . t('The settings on this page apply to all incoming content. To edit the settings for individual connetions, see the similar settings on the Connection Edit page for that connection.') . EOL . EOL;
+
+        $setting_fields = $text;
+
+        $setting_fields .= replace_macros(Theme::get_template('field_textarea.tpl'), array(
+            '$field' => [
+                'message_filter_incl',
+                t('Only import posts with this text'),
+                get_pconfig(local_channel(), 'system', 'message_filter_incl', ''),
+                t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts')
+            ]
+        ));
+        $setting_fields .= replace_macros(Theme::get_template('field_textarea.tpl'), array(
+            '$field' => [
+                'message_filter_excl',
+                t('Do not import posts with this text'),
+                get_pconfig(local_channel(), 'system', 'message_filter_excl', ''),
+                t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts')
+            ]
+        ));
+
+        $s .= replace_macros(Theme::get_template('generic_app_settings.tpl'), array(
+            '$addon' => array('content_filter', '' . t('Content Filter Settings'), '', t('Submit')),
+            '$content' => $setting_fields
+        ));
+
+        return $s;
+    }
+}
diff --git a/Code/Module/Conversation.php b/Code/Module/Conversation.php
new file mode 100644
index 000000000..c23bb2b3d
--- /dev/null
+++ b/Code/Module/Conversation.php
@@ -0,0 +1,174 @@
+ 0 order by imgscale asc LIMIT 1",
+                dbesc($image_id),
+                intval(local_channel())
+            );
+
+            if ($r) {
+                $max_thumb = intval(get_config('system', 'max_thumbnail', 1600));
+                $iscaled = false;
+                if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) {
+                    $imagick_path = get_config('system', 'imagick_convert_path');
+                    if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) {
+                        $fname = dbunescbin($r[0]['content']);
+                        $tmp_name = $fname . '-001';
+                        $newsize = photo_calculate_scale(array_merge(getimagesize($fname), ['max' => $max_thumb]));
+                        $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
+                        //  logger('imagick thumbnail command: ' . $cmd);
+                        for ($x = 0; $x < 4; $x++) {
+                            exec($cmd);
+                            if (file_exists($tmp_name)) {
+                                break;
+                            }
+                        }
+                        if (file_exists($tmp_name)) {
+                            $base_image = $r[0];
+                            $gis = getimagesize($tmp_name);
+                            logger('gis: ' . print_r($gis, true));
+                            $base_image['width'] = $gis[0];
+                            $base_image['height'] = $gis[1];
+                            $base_image['content'] = @file_get_contents($tmp_name);
+                            $iscaled = true;
+                            @unlink($tmp_name);
+                        }
+                    }
+                }
+                if (!$iscaled) {
+                    $base_image = $r[0];
+                    $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content']));
+                }
+
+                $im = photo_factory($base_image['content'], $base_image['mimetype']);
+                if ($im && $im->is_valid()) {
+                    // We are scaling and cropping the relative pixel locations to the original photo instead of the
+                    // scaled photo we operated on.
+
+                    // First load the scaled photo to check its size. (Should probably pass this in the post form and save
+                    // a query.)
+
+                    $g = q(
+                        "select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3",
+                        dbesc($image_id),
+                        intval(local_channel())
+                    );
+
+
+                    $scaled_width = $g[0]['width'];
+                    $scaled_height = $g[0]['height'];
+
+                    if ((!$scaled_width) || (!$scaled_height)) {
+                        logger('potential divide by zero scaling cover photo');
+                        return;
+                    }
+
+                    // unset all other cover photos
+
+                    q(
+                        "update photo set photo_usage = %d where photo_usage = %d and uid = %d",
+                        intval(PHOTO_NORMAL),
+                        intval(PHOTO_COVER),
+                        intval(local_channel())
+                    );
+
+                    $orig_srcx = ($base_image['width'] / $scaled_width) * $srcX;
+                    $orig_srcy = ($base_image['height'] / $scaled_height) * $srcY;
+                    $orig_srcw = ($srcW / $scaled_width) * $base_image['width'];
+                    $orig_srch = ($srcH / $scaled_height) * $base_image['height'];
+
+                    $im->cropImageRect(1200, 435, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch);
+
+                    $aid = get_account_id();
+
+                    $p = [
+                        'aid' => $aid,
+                        'uid' => local_channel(),
+                        'resource_id' => $base_image['resource_id'],
+                        'filename' => $base_image['filename'],
+                        'album' => t('Cover Photos'),
+                        'os_path' => $base_image['os_path'],
+                        'display_path' => $base_image['display_path'],
+                        'created' => $base_image['created'],
+                        'edited' => $base_image['edited']
+                    ];
+
+                    $p['imgscale'] = 7;
+                    $p['photo_usage'] = PHOTO_COVER;
+
+                    $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200);
+
+                    $im->doScaleImage(850, 310);
+                    $p['imgscale'] = 8;
+
+                    $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850);
+
+                    $im->doScaleImage(425, 160);
+                    $p['imgscale'] = 9;
+
+                    $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425);
+
+                    if ($r1 === false || $r2 === false || $r3 === false) {
+                        // if one failed, delete them all so we can start over.
+                        notice(t('Image resize failed.') . EOL);
+                        $x = q(
+                            "delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ",
+                            dbesc($base_image['resource_id']),
+                            local_channel()
+                        );
+                        return;
+                    }
+
+                    $channel = App::get_channel();
+                    $this->send_cover_photo_activity($channel, $base_image, $profile);
+                } else {
+                    notice(t('Unable to process image') . EOL);
+                }
+            }
+
+            goaway(z_root() . '/channel/' . $channel['channel_address']);
+        }
+
+
+        $hash = photo_new_resource();
+        $smallest = 0;
+
+        $matches = [];
+        $partial = false;
+
+        if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
+            $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
+            if ($pm) {
+                logger('Content-Range: ' . print_r($matches, true));
+                $partial = true;
+            }
+        }
+
+        if ($partial) {
+            $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
+
+            if ($x['partial']) {
+                header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
+                json_return_and_die($x);
+            } else {
+                header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
+
+                $_FILES['userfile'] = [
+                    'name' => $x['name'],
+                    'type' => $x['type'],
+                    'tmp_name' => $x['tmp_name'],
+                    'error' => $x['error'],
+                    'size' => $x['size']
+                ];
+            }
+        } else {
+            if (!array_key_exists('userfile', $_FILES)) {
+                $_FILES['userfile'] = [
+                    'name' => $_FILES['files']['name'],
+                    'type' => $_FILES['files']['type'],
+                    'tmp_name' => $_FILES['files']['tmp_name'],
+                    'error' => $_FILES['files']['error'],
+                    'size' => $_FILES['files']['size']
+                ];
+            }
+        }
+
+        $res = attach_store(App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash));
+
+        logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG);
+
+        json_return_and_die(['message' => $hash]);
+    }
+
+    public function send_cover_photo_activity($channel, $photo, $profile)
+    {
+
+        $arr = [];
+        $arr['item_thread_top'] = 1;
+        $arr['item_origin'] = 1;
+        $arr['item_wall'] = 1;
+        $arr['uuid'] = new_uuid();
+        $arr['mid'] = z_root() . '/item/' . $arr['uuid'];
+        $arr['obj_type'] = ACTIVITY_OBJ_NOTE;
+        $arr['verb'] = ACTIVITY_CREATE;
+
+        if ($profile && stripos($profile['gender'], t('female')) !== false) {
+            $t = t('%1$s updated her %2$s');
+        } elseif ($profile && stripos($profile['gender'], t('male')) !== false) {
+            $t = t('%1$s updated his %2$s');
+        } else {
+            $t = t('%1$s updated their %2$s');
+        }
+
+        $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]';
+
+        $ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-8[/zmg][/zrl]';
+
+        $arr['body'] = sprintf($t, $channel['channel_name'], $ptext) . "\n\n" . $ltext;
+
+        $arr['obj'] = [
+            'type' => ACTIVITY_OBJ_NOTE,
+            'published' => datetime_convert('UTC', 'UTC', $photo['created'], ATOM_TIME),
+            'updated' => datetime_convert('UTC', 'UTC', $photo['edited'], ATOM_TIME),
+            'id' => $arr['mid'],
+            'url' => ['type' => 'Link', 'mediaType' => $photo['mimetype'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7'],
+            'source' => ['content' => $arr['body'], 'mediaType' => 'text/x-multicode'],
+            'content' => bbcode($arr['body']),
+            'actor' => Activity::encode_person($channel, false),
+        ];
+
+        $acl = new AccessControl($channel);
+        $x = $acl->get();
+        $arr['allow_cid'] = $x['allow_cid'];
+
+        $arr['allow_gid'] = $x['allow_gid'];
+        $arr['deny_cid'] = $x['deny_cid'];
+        $arr['deny_gid'] = $x['deny_gid'];
+
+        $arr['uid'] = $channel['channel_id'];
+        $arr['aid'] = $channel['channel_account_id'];
+
+        $arr['owner_xchan'] = $channel['channel_hash'];
+        $arr['author_xchan'] = $channel['channel_hash'];
+
+        post_activity_item($arr);
+    }
+
+
+    /**
+     * @brief Generate content of profile-photo view
+     *
+     * @return string
+     *
+     */
+
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        $newuser = false;
+
+        if (argc() == 2 && argv(1) === 'new') {
+            $newuser = true;
+        }
+
+        if (argv(1) === 'use') {
+            if (argc() < 3) {
+                notice(t('Permission denied.') . EOL);
+                return;
+            }
+
+            //      check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo');
+
+            $resource_id = argv(2);
+
+            $r = q(
+                "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC",
+                intval(local_channel()),
+                dbesc($resource_id)
+            );
+            if (!$r) {
+                notice(t('Photo not available.') . EOL);
+                return;
+            }
+            $havescale = false;
+            foreach ($r as $rr) {
+                if ($rr['imgscale'] == 7) {
+                    $havescale = true;
+                }
+            }
+
+            $r = q(
+                "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
+                intval($r[0]['id']),
+                intval(local_channel())
+            );
+            if (!$r) {
+                notice(t('Photo not available.') . EOL);
+                return;
+            }
+
+            if (intval($r[0]['os_storage'])) {
+                $data = @file_get_contents(dbunescbin($r[0]['content']));
+            } else {
+                $data = dbunescbin($r[0]['content']);
+            }
+
+            $ph = photo_factory($data, $r[0]['mimetype']);
+            $smallest = 0;
+            if ($ph && $ph->is_valid()) {
+                // go ahead as if we have just uploaded a new photo to crop
+                $i = q(
+                    "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0",
+                    dbesc($r[0]['resource_id']),
+                    intval(local_channel())
+                );
+
+                if ($i) {
+                    $hash = $i[0]['resource_id'];
+                    foreach ($i as $ii) {
+                        $smallest = intval($ii['imgscale']);
+                    }
+                }
+            }
+
+            $this->cover_photo_crop_ui_head($ph, $hash, $smallest);
+        }
+
+
+        if (!array_key_exists('imagecrop', App::$data)) {
+            $o .= replace_macros(Theme::get_template('cover_photo.tpl'), [
+                '$user' => App::$channel['channel_address'],
+                '$info' => t('Your cover photo may be visible to anybody on the internet'),
+                '$existing' => get_cover_photo(local_channel(), 'array', PHOTO_RES_COVER_850),
+                '$lbl_upfile' => t('Upload File:'),
+                '$lbl_profiles' => t('Select a profile:'),
+                '$title' => t('Change Cover Photo'),
+                '$submit' => t('Upload'),
+                '$profiles' => $profiles,
+                '$embedPhotos' => t('Use a photo from your albums'),
+                '$embedPhotosModalTitle' => t('Use a photo from your albums'),
+                '$embedPhotosModalCancel' => t('Cancel'),
+                '$embedPhotosModalOK' => t('OK'),
+                '$modalchooseimages' => t('Choose images to embed'),
+                '$modalchoosealbum' => t('Choose an album'),
+                '$modaldiffalbum' => t('Choose a different album'),
+                '$modalerrorlist' => t('Error getting album list'),
+                '$modalerrorlink' => t('Error getting photo link'),
+                '$modalerroralbum' => t('Error getting album'),
+                '$form_security_token' => get_form_security_token("cover_photo"),
+                '$select' => t('Select previously uploaded photo'),
+
+            ]);
+
+            Hook::call('cover_photo_content_end', $o);
+
+            return $o;
+        } else {
+            $filename = App::$data['imagecrop'] . '-3';
+            $resolution = 3;
+
+            $o .= replace_macros(Theme::get_template('cropcover.tpl'), [
+                '$filename' => $filename,
+                '$profile' => intval($_REQUEST['profile']),
+                '$resource' => App::$data['imagecrop'] . '-3',
+                '$image_url' => z_root() . '/photo/' . $filename,
+                '$title' => t('Crop Image'),
+                '$desc' => t('Please adjust the image cropping for optimum viewing.'),
+                '$form_security_token' => get_form_security_token("cover_photo"),
+                '$done' => t('Done Editing')
+            ]);
+            return $o;
+        }
+    }
+
+    /* @brief Generate the UI for photo-cropping
+     *
+     * @param $a Current application
+     * @param $ph Photo-Factory
+     * @return void
+     *
+     */
+
+    public function cover_photo_crop_ui_head($ph, $hash, $smallest)
+    {
+
+        $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH);
+        if ($max_length > 0) {
+            $ph->scaleImage($max_length);
+        }
+
+        $width = $ph->getWidth();
+        $height = $ph->getHeight();
+
+        if ($width < 300 || $height < 300) {
+            $ph->scaleImageUp(240);
+            $width = $ph->getWidth();
+            $height = $ph->getHeight();
+        }
+
+
+        App::$data['imagecrop'] = $hash;
+        App::$data['imagecrop_resolution'] = $smallest;
+        App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []);
+        return;
+    }
+}
diff --git a/Code/Module/Dav.php b/Code/Module/Dav.php
new file mode 100644
index 000000000..4a4d479b8
--- /dev/null
+++ b/Code/Module/Dav.php
@@ -0,0 +1,147 @@
+ $c, 'account' => $a[0]];
+                                    $channel_login = $c['channel_id'];
+                                }
+                            }
+                        }
+                        if (!$record) {
+                            continue;
+                        }
+
+                        if ($record) {
+                            $verified = HTTPSig::verify('', $record['channel']['channel_pubkey']);
+                            if (!($verified && $verified['header_signed'] && $verified['header_valid'])) {
+                                $record = null;
+                            }
+                            if ($record['account']) {
+                                authenticate_success($record['account']);
+                                if ($channel_login) {
+                                    change_channel($channel_login);
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!is_dir('store')) {
+            os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false);
+        }
+
+        if (argc() > 1) {
+            Libprofile::load(argv(1), 0);
+        }
+
+
+        $auth = new BasicAuth();
+//      $auth->observer = get_observer_hash();
+
+        $auth->setRealm(ucfirst(System::get_platform_name()) . ' ' . 'WebDAV');
+
+        $rootDirectory = new \Code\Storage\Directory('/', $auth);
+
+        // A SabreDAV server-object
+        $server = new SDAV\Server($rootDirectory);
+
+
+        $authPlugin = new Plugin($auth);
+        $server->addPlugin($authPlugin);
+
+
+        // prevent overwriting changes each other with a lock backend
+        $lockBackend = new SDAV\Locks\Backend\File('cache/locks');
+        $lockPlugin = new SDAV\Locks\Plugin($lockBackend);
+
+        $server->addPlugin($lockPlugin);
+
+        // provide a directory view for the cloud in Hubzilla
+        $browser = new Browser($auth);
+        $auth->setBrowserPlugin($browser);
+
+        // Experimental QuotaPlugin
+        // $server->addPlugin(new \Code\Storage\QuotaPlugin($auth));
+
+        // All we need to do now, is to fire up the server
+        $server->exec();
+
+        killme();
+    }
+}
diff --git a/Code/Module/Defperms.php b/Code/Module/Defperms.php
new file mode 100644
index 000000000..c86a25c46
--- /dev/null
+++ b/Code/Module/Defperms.php
@@ -0,0 +1,275 @@
+ $desc) {
+                if (array_key_exists('perms_' . $perm, $_POST)) {
+                    if ($p) {
+                        $p .= ',';
+                    }
+                    $p .= $perm;
+                }
+            }
+            set_abconfig($channel['channel_id'], $orig_record[0]['abook_xchan'], 'system', 'my_perms', $p);
+            if ($autoperms) {
+                set_pconfig($channel['channel_id'], 'system', 'autoperms', $p);
+            }
+        }
+
+        notice(t('Settings updated.') . EOL);
+
+
+        // Refresh the structure in memory with the new data
+
+        $r = q(
+            "SELECT abook.*, xchan.*
+			FROM abook left join xchan on abook_xchan = xchan_hash
+			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
+            intval(local_channel()),
+            intval($contact_id)
+        );
+        if ($r) {
+            App::$poi = $r[0];
+        }
+
+        $this->defperms_clone($a);
+
+        goaway(z_root() . '/defperms');
+
+        return;
+    }
+
+    /* @brief Clone connection
+     *
+     *
+     */
+
+    public function defperms_clone(&$a)
+    {
+
+        if (!App::$poi) {
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        $r = q(
+            "SELECT abook.*, xchan.*
+				FROM abook left join xchan on abook_xchan = xchan_hash
+				WHERE abook_channel = %d and abook_id = %d LIMIT 1",
+            intval(local_channel()),
+            intval(App::$poi['abook_id'])
+        );
+        if ($r) {
+            App::$poi = array_shift($r);
+        }
+
+        $clone = App::$poi;
+
+        unset($clone['abook_id']);
+        unset($clone['abook_account']);
+        unset($clone['abook_channel']);
+
+        $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
+        if ($abconfig) {
+            $clone['abconfig'] = $abconfig;
+        }
+        Libsync::build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone)));
+    }
+
+    /* @brief Generate content of connection default permissions page
+     *
+     *
+     */
+
+    public function get()
+    {
+
+        $sort_type = 0;
+        $o = '';
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return login();
+        }
+
+        $role = get_pconfig(local_channel(), 'system', 'permissions_role');
+        if ($role) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $section = ((array_key_exists('section', $_REQUEST)) ? $_REQUEST['section'] : '');
+        $channel = App::get_channel();
+
+        $yes_no = [t('No'), t('Yes')];
+
+        $connect_perms = Permissions::connect_perms(local_channel());
+
+        $o .= "\n";
+
+        if (App::$poi) {
+            $sections = [];
+
+            $self = false;
+
+            $tpl = Theme::get_template('defperms.tpl');
+
+            $perms = [];
+            $channel = App::get_channel();
+
+            $contact = App::$poi;
+
+            $global_perms = Permissions::Perms();
+
+            $hidden_perms = [];
+
+            foreach ($global_perms as $k => $v) {
+                $thisperm = get_abconfig(local_channel(), $contact['abook_xchan'], 'my_perms', $k);
+
+                $checkinherited = PermissionLimits::Get(local_channel(), $k);
+
+                $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true);
+
+                $perms[] = ['perms_' . $k, $v, intval($thisperm), '', $yes_no, (($inherited) ? ' disabled="disabled" ' : '')];
+                if ($inherited) {
+                    $hidden_perms[] = ['perms_' . $k, intval($thisperm)];
+                }
+            }
+
+            $pcat = new Permcat(local_channel());
+            $pcatlist = $pcat->listing();
+            $permcats = [];
+            if ($pcatlist) {
+                foreach ($pcatlist as $pc) {
+                    $permcats[$pc['name']] = $pc['localname'];
+                }
+            }
+
+            $o .= replace_macros($tpl, [
+                '$header' => t('Connection Default Permissions'),
+                '$autoperms' => array('autoperms', t('Apply these permissions automatically'), ((get_pconfig(local_channel(), 'system', 'autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no),
+                '$permcat' => ['permcat', t('Permission role'), '', '', $permcats],
+                '$permcat_new' => t('Add permission role'),
+                '$permcat_enable' => Apps::system_app_installed($channel_id, 'Roles'),
+                '$section' => $section,
+                '$sections' => $sections,
+                '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'),
+                '$autoapprove' => t('Automatic approval settings'),
+                '$unapproved' => $unapproved,
+                '$inherited' => t('inherited'),
+                '$submit' => t('Submit'),
+                '$me' => t('My Settings'),
+                '$perms' => $perms,
+                '$hidden_perms' => $hidden_perms,
+                '$permlbl' => t('Individual Permissions'),
+                '$permnote_self' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
+                '$contact_id' => $contact['abook_id'],
+                '$name' => $contact['xchan_name'],
+            ]);
+
+            $arr = array('contact' => $contact, 'output' => $o);
+
+            Hook::call('contact_edit', $arr);
+
+            return $arr['output'];
+        }
+    }
+}
diff --git a/Code/Module/Dircensor.php b/Code/Module/Dircensor.php
new file mode 100644
index 000000000..cfbed4491
--- /dev/null
+++ b/Code/Module/Dircensor.php
@@ -0,0 +1,52 @@
+ [['uid' => local_channel(), 'xchan' => $_GET['ignore']]]]);
+            if ($_REQUEST['return']) {
+                goaway(z_root() . '/' . base64_decode($_REQUEST['return']));
+            }
+            goaway(z_root() . '/directory?f=&suggest=1');
+        }
+
+        $observer = get_observer_hash();
+        $global_changed = false;
+        $safe_changed = false;
+        $type_changed = false;
+        $active_changed = false;
+
+        if (array_key_exists('global', $_REQUEST)) {
+            $globaldir = intval($_REQUEST['global']);
+            if (get_config('system', 'localdir_hide')) {
+                $globaldir = 1;
+            }
+            $global_changed = true;
+        }
+        if ($global_changed) {
+            $_SESSION['globaldir'] = $globaldir;
+            if ($observer) {
+                set_xconfig($observer, 'directory', 'globaldir', $globaldir);
+            }
+        }
+
+        if (array_key_exists('safe', $_REQUEST)) {
+            $safemode = intval($_REQUEST['safe']);
+            $safe_changed = true;
+        }
+        if ($safe_changed) {
+            $_SESSION['safemode'] = $safemode;
+            if ($observer) {
+                set_xconfig($observer, 'directory', 'safemode', $safemode);
+            }
+        }
+
+        if (array_key_exists('type', $_REQUEST)) {
+            $type = intval($_REQUEST['type']);
+            $type_changed = true;
+        }
+        if ($type_changed) {
+            $_SESSION['chantype'] = $type;
+            if ($observer) {
+                set_xconfig($observer, 'directory', 'chantype', $type);
+            }
+        }
+
+        if (array_key_exists('active', $_REQUEST)) {
+            $active = intval($_REQUEST['active']);
+            $active_changed = true;
+        }
+        if ($active_changed) {
+            $_SESSION['activedir'] = $active;
+            if ($observer) {
+                set_xconfig($observer, 'directory', 'activedir', $active);
+            }
+        }
+    }
+
+    public function get()
+    {
+
+        if (observer_prohibited()) {
+            notice(t('Public access denied.') . EOL);
+            return;
+        }
+
+        $observer = get_observer_hash();
+
+        if (get_config('system', 'block_public_directory', true) && (!$observer)) {
+            notice(t('Public access denied.') . EOL);
+            return login(false);
+        }
+
+        $globaldir = Libzotdir::get_directory_setting($observer, 'globaldir');
+
+        // override your personal global search pref if we're doing a navbar search of the directory
+        if (intval($_REQUEST['navsearch'])) {
+            $globaldir = 1;
+        }
+
+        $safe_mode = Libzotdir::get_directory_setting($observer, 'safemode');
+
+        $type = Libzotdir::get_directory_setting($observer, 'chantype');
+
+        $active = Libzotdir::get_directory_setting($observer, 'activedir');
+
+        $o = '';
+        Navbar::set_selected('Directory');
+
+        if (x($_POST, 'search')) {
+            $search = notags(trim($_POST['search']));
+        } else {
+            $search = ((x($_GET, 'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+        }
+
+        if (strpos($search, '=')) {
+            $advanced = $search;
+        }
+
+        $keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');
+
+        // Suggest channels if no search terms or keywords are given
+        $suggest = (local_channel() && x($_REQUEST, 'suggest')) ? $_REQUEST['suggest'] : '';
+
+        if ($suggest) {
+            // the directory options have no effect in suggestion mode
+
+            $globaldir = 1;
+            $safe_mode = 1;
+            $active = 1;
+            $type = 0;
+
+            // only return DIRECTORY_PAGESIZE suggestions as the suggestion sorting
+            // only works if the suggestion query and the directory query have the
+            // same number of results
+
+            App::set_pager_itemspage(60);
+            $r = Socgraph::suggestion_query(local_channel(), get_observer_hash(), App::$pager['start'], DIRECTORY_PAGESIZE);
+
+            if (!$r) {
+                if ($_REQUEST['aj']) {
+                    echo '
      ';
+                    killme();
+                }
+
+                notice(t('No default suggestions were found.') . EOL);
+                return;
+            }
+
+            // Remember in which order the suggestions were
+            $addresses = [];
+            $common = [];
+            $index = 0;
+            foreach ($r as $rr) {
+                $common[$rr['xchan_hash']] = ((intval($rr['total']) > 0) ? intval($rr['total']) - 1 : 0);
+                $addresses[$rr['xchan_hash']] = $index++;
+            }
+
+            // Build query to get info about suggested people
+            $advanced = '';
+            foreach (array_keys($addresses) as $address) {
+                $advanced .= "xhash=\"$address\" ";
+            }
+            // Remove last space in the advanced query
+            $advanced = rtrim($advanced);
+        }
+
+        $tpl = Theme::get_template('directory_header.tpl');
+
+        $dirmode = intval(get_config('system', 'directory_mode'));
+
+        $directory_admin = false;
+
+        $url = z_root() . '/dirsearch';
+        if (Channel::is_system(local_channel())) {
+            $directory_admin = true;
+        }
+
+        $contacts = [];
+
+        if (local_channel()) {
+            $x = q(
+                "select abook_xchan from abook where abook_channel = %d",
+                intval(local_channel())
+            );
+            if ($x) {
+                foreach ($x as $xx) {
+                    $contacts[] = $xx['abook_xchan'];
+                }
+            }
+        }
+
+        if ($url) {
+            $numtags = get_config('system', 'directorytags');
+
+            $kw = ((intval($numtags) > 0) ? intval($numtags) : 50);
+
+            if (get_config('system', 'disable_directory_keywords')) {
+                $kw = 0;
+            }
+
+            $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : '');
+
+            if ($token) {
+                $query .= '&t=' . $token;
+            }
+
+            if (!$globaldir) {
+                $query .= '&hub=' . App::get_hostname();
+            }
+            if ($search) {
+                $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search);
+            }
+            if (strpos($search, '@')) {
+                $query .= '&address=' . urlencode($search);
+            }
+            if (strpos($search, 'http') === 0) {
+                $query .= '&url=' . urlencode($search);
+            }
+            if ($keywords) {
+                $query .= '&keywords=' . urlencode($keywords);
+            }
+            if ($advanced) {
+                $query .= '&query=' . urlencode($advanced);
+            }
+            if (!is_null($type)) {
+                $query .= '&type=' . intval($type);
+            }
+            $directory_sort_order = get_config('system', 'directory_sort_order');
+            if (!$directory_sort_order) {
+                $directory_sort_order = 'date';
+            }
+
+            $sort_order = ((x($_REQUEST, 'order')) ? $_REQUEST['order'] : $directory_sort_order);
+
+            if ($sort_order) {
+                $query .= '&order=' . urlencode($sort_order);
+            }
+
+            if (App::$pager['page'] != 1) {
+                $query .= '&p=' . App::$pager['page'];
+            }
+
+            if (isset($active)) {
+                $query .= '&active=' . intval($active);
+            }
+
+
+            // logger('mod_directory: query: ' . $query);
+
+            $x = z_fetch_url($query);
+            // logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA);
+
+            if ($x['success']) {
+                $t = 0;
+                $j = json_decode($x['body'], true);
+                if ($j) {
+                    if ($j['results']) {
+                        $results = $j['results'];
+                        if ($suggest) {
+                            // change order to "number of common friends descending"
+                            $results = self::reorder_results($results, $addresses);
+                        }
+
+                        $entries = [];
+
+                        $photo = 'thumb';
+
+                        foreach ($results as $rr) {
+                            $profile_link = chanlink_url($rr['url']);
+
+                            $pdesc = (($rr['description']) ? $rr['description'] . '
      ' : '');
+                            $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');
+
+                            // Checking status is disabled ATM until someone checks the performance impact more carefully
+                            //$online = Channel::remote_online_status($rr['address']);
+                            $online = '';
+
+                            if (in_array($rr['hash'], $contacts)) {
+                                $connect_link = '';
+                            }
+
+                            $location = '';
+                            if (strlen($rr['locale'])) {
+                                $location .= $rr['locale'];
+                            }
+                            if (strlen($rr['region'])) {
+                                if (strlen($rr['locale'])) {
+                                    $location .= ', ';
+                                }
+                                $location .= $rr['region'];
+                            }
+                            if (strlen($rr['country'])) {
+                                if (strlen($location)) {
+                                    $location .= ', ';
+                                }
+                                $location .= $rr['country'];
+                            }
+
+                            $age = '';
+                            if (strlen($rr['birthday'])) {
+                                if (($years = age($rr['birthday'], 'UTC', '')) > 0) {
+                                    $age = $years;
+                                }
+                            }
+
+                            $page_type = '';
+
+                            $total_ratings = '';
+
+                            $profile = $rr;
+
+                            $gender = ((x($profile, 'gender') == 1) ? t('Gender: ') . $profile['gender'] : false);
+                            $marital = ((x($profile, 'marital') == 1) ? t('Status: ') . $profile['marital'] : false);
+                            $homepage = ((x($profile, 'homepage') == 1) ? t('Homepage: ') : false);
+                            $homepageurl = ((x($profile, 'homepage') == 1) ? html2plain($profile['homepage']) : '');
+                            $hometown = ((x($profile, 'hometown') == 1) ? html2plain($profile['hometown']) : false);
+                            $about = ((x($profile, 'about') == 1) ? zidify_links(bbcode($profile['about'])) : false);
+
+                            $keywords = ((x($profile, 'keywords')) ? $profile['keywords'] : '');
+
+                            $out = '';
+
+                            if ($keywords) {
+                                $keywords = str_replace(',', ' ', $keywords);
+                                $keywords = str_replace('  ', ' ', $keywords);
+                                $karr = explode(' ', $keywords);
+
+                                if ($karr) {
+                                    if (local_channel()) {
+                                        $pk = q(
+                                            "select keywords from profile where uid = %d and is_default = 1 limit 1",
+                                            intval(local_channel())
+                                        );
+                                        if ($pk) {
+                                            $keywords = str_replace(',', ' ', $pk[0]['keywords']);
+                                            $keywords = str_replace('  ', ' ', $keywords);
+                                            $marr = explode(' ', $keywords);
+                                        }
+                                    }
+                                    foreach ($karr as $k) {
+                                        if (strlen($out)) {
+                                            $out .= ', ';
+                                        }
+                                        if ($marr && in_arrayi($k, $marr)) {
+                                            $out .= '' . $k . '';
+                                        } else {
+                                            $out .= '' . $k . '';
+                                        }
+                                    }
+                                }
+                            }
+
+                            $entry = [
+                                'id' => ++$t,
+                                'profile_link' => $profile_link,
+                                'type' => $rr['type'],
+                                'photo' => $rr['photo'],
+                                'hash' => $rr['hash'],
+                                'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''),
+                                'name' => $rr['name'],
+                                'age' => $age,
+                                'age_label' => t('Age:'),
+                                'profile' => $profile,
+                                'address' => $rr['address'],
+                                'nickname' => substr($rr['address'], 0, strpos($rr['address'], '@')),
+                                'location' => $location,
+                                'location_label' => t('Location:'),
+                                'gender' => $gender,
+                                'total_ratings' => $total_ratings,
+                                'viewrate' => true,
+                                'canrate' => (($rating_enabled && local_channel()) ? true : false),
+                                // 'network'           => network_to_name($rr['network']),
+                                // 'network_label'     => t('Network:'),
+                                'pdesc' => $pdesc,
+                                'pdesc_label' => t('Description:'),
+                                'censor' => (($directory_admin) ? 'dircensor/' . $rr['hash'] : ''),
+                                'censor_label' => (($rr['censored']) ? t('Uncensor') : t('Censor')),
+                                'marital' => $marital,
+                                'homepage' => $homepage,
+                                'homepageurl' => (($safe_mode) ? $homepageurl : linkify($homepageurl)),
+                                'hometown' => $hometown,
+                                'hometown_label' => t('Hometown:'),
+                                'about' => $about,
+                                'about_label' => t('About:'),
+                                'conn_label' => t('Connect'),
+                                'forum_label' => t('Group'),
+                                'collections_label' => t('Collection'),
+                                'connect' => $connect_link,
+                                'online' => $online,
+                                'kw' => (($out) ? t('Keywords: ') : ''),
+                                'keywords' => $out,
+                                'ignlink' => $suggest ? z_root() . '/directory?ignore=' . $rr['hash'] : '',
+                                'ignore_label' => t('Don\'t suggest'),
+                                'common_friends' => (($common[$rr['hash']]) ? intval($common[$rr['hash']]) : ''),
+                                'common_label' => t('Suggestion ranking:'),
+                                'common_count' => intval($common[$rr['hash']]),
+                                'safe' => $safe_mode
+                            ];
+
+
+                            $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER);
+
+                            $found_block = false;
+                            if ($blocked) {
+                                foreach ($blocked as $b) {
+                                    if (strpos($rr['site_url'], $b['block_entity']) !== false) {
+                                        $found_block = true;
+                                        break;
+                                    }
+                                }
+                                if ($found_block) {
+                                    continue;
+                                }
+                            }
+
+                            if (LibBlock::fetch_by_entity(local_channel(), $entry['hash'])) {
+                                continue;
+                            }
+
+                            $arr = array('contact' => $rr, 'entry' => $entry);
+
+                            Hook::call('directory_item', $arr);
+
+                            unset($profile);
+                            unset($location);
+
+                            if (!$arr['entry']) {
+                                continue;
+                            }
+
+                            if ($sort_order == '' && $suggest) {
+                                $entries[$addresses[$rr['address']]] = $arr['entry']; // Use the same indexes as originally to get the best suggestion first
+                            } else {
+                                $entries[] = $arr['entry'];
+                            }
+                        }
+
+                        ksort($entries); // Sort array by key so that foreach-constructs work as expected
+
+                        if ($j['keywords']) {
+                            App::$data['directory_keywords'] = $j['keywords'];
+                        }
+
+                        // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
+
+
+                        if ($_REQUEST['aj']) {
+                            if ($entries) {
+                                $o = replace_macros(Theme::get_template('directajax.tpl'), ['$entries' => $entries]);
+                            } else {
+                                $o = '
      ';
+                            }
+                            echo $o;
+                            killme();
+                        } else {
+                            $maxheight = 94;
+
+                            $dirtitle = (($globaldir) ? t('Directory') : t('Local Directory'));
+
+                            $o .= "";
+                            $o .= replace_macros($tpl, [
+                                '$search' => $search,
+                                '$desc' => t('Find'),
+                                '$finddsc' => t('Finding:'),
+                                '$safetxt' => htmlspecialchars($search, ENT_QUOTES, 'UTF-8'),
+                                '$entries' => $entries,
+                                '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle,
+                                '$submit' => t('Find'),
+                                '$next' => alt_pager($j['records'], t('next page'), t('previous page')),
+                                '$sort' => t('Sort options'),
+                                '$normal' => t('Alphabetic'),
+                                '$reverse' => t('Reverse Alphabetic'),
+                                '$date' => t('Newest to Oldest'),
+                                '$reversedate' => t('Oldest to Newest'),
+                                '$suggest' => $suggest ? '&suggest=1' : ''
+                            ]);
+                        }
+                    } else {
+                        if ($_REQUEST['aj']) {
+                            $o = '
      ';
+                            echo $o;
+                            killme();
+                        }
+                        if ($search && App::$pager['page'] == 1 && $j['records'] == 0) {
+                            if (strpos($search, '@')) {
+                                goaway(z_root() . '/chanview/?f=&address=' . $search);
+                            } elseif (strpos($search, 'http') === 0) {
+                                goaway(z_root() . '/chanview/?f=&url=' . $search);
+                            } else {
+                                $r = q(
+                                    "select xchan_hash from xchan where xchan_name = '%s' limit 1",
+                                    dbesc($search)
+                                );
+                                if ($r) {
+                                    goaway(z_root() . '/chanview/?f=&hash=' . urlencode($r[0]['xchan_hash']));
+                                }
+                            }
+                        }
+                        info(t("No entries (some entries may be hidden).") . EOL);
+                    }
+                }
+            }
+        }
+        return $o;
+    }
+
+
+    public static function reorder_results($results, $suggests)
+    {
+        if (!$suggests) {
+            return $results;
+        }
+
+        $out = [];
+        foreach ($suggests as $k => $v) {
+            foreach ($results as $rv) {
+                if ($k == $rv['hash']) {
+                    $out[intval($v)] = $rv;
+                    break;
+                }
+            }
+        }
+        return $out;
+    }
+}
diff --git a/Code/Module/Dirsearch.php b/Code/Module/Dirsearch.php
new file mode 100644
index 000000000..741639a4c
--- /dev/null
+++ b/Code/Module/Dirsearch.php
@@ -0,0 +1,466 @@
+ false];
+
+        // logger('request: ' . print_r($_REQUEST,true));
+
+
+        if (argc() > 1 && argv(1) === 'sites') {
+            $ret = $this->list_public_sites();
+            json_return_and_die($ret);
+        }
+
+        $dirmode = intval(get_config('system', 'directory_mode'));
+
+
+        $network = EMPTY_STR;
+
+        $sql_extra = '';
+
+        $tables = ['name', 'address', 'xhash', 'locale', 'region', 'postcode',
+            'country', 'gender', 'marital', 'sexual', 'keywords'];
+
+        // parse advanced query if present
+
+        if ($_REQUEST['query']) {
+            $advanced = $this->dir_parse_query($_REQUEST['query']);
+            if ($advanced) {
+                foreach ($advanced as $adv) {
+                    if (in_array($adv['field'], $tables)) {
+                        if ($adv['field'] === 'name') {
+                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_name', $adv['value']);
+                        } elseif ($adv['field'] === 'address') {
+                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_addr', $adv['value']);
+                        } elseif ($adv['field'] === 'xhash') {
+                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_hash', $adv['value']);
+                        } else {
+                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xprof_' . $adv['field'], $adv['value']);
+                        }
+                    }
+                }
+            }
+        }
+
+        $hash = ((x($_REQUEST['hash'])) ? $_REQUEST['hash'] : '');
+        $name = ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : '');
+        $url = ((x($_REQUEST, 'url')) ? $_REQUEST['url'] : '');
+        $hub = ((x($_REQUEST, 'hub')) ? $_REQUEST['hub'] : '');
+        $address = ((x($_REQUEST, 'address')) ? $_REQUEST['address'] : '');
+        $locale = ((x($_REQUEST, 'locale')) ? $_REQUEST['locale'] : '');
+        $region = ((x($_REQUEST, 'region')) ? $_REQUEST['region'] : '');
+        $postcode = ((x($_REQUEST, 'postcode')) ? $_REQUEST['postcode'] : '');
+        $country = ((x($_REQUEST, 'country')) ? $_REQUEST['country'] : '');
+        $gender = ((x($_REQUEST, 'gender')) ? $_REQUEST['gender'] : '');
+        $marital = ((x($_REQUEST, 'marital')) ? $_REQUEST['marital'] : '');
+        $sexual = ((x($_REQUEST, 'sexual')) ? $_REQUEST['sexual'] : '');
+        $keywords = ((x($_REQUEST, 'keywords')) ? $_REQUEST['keywords'] : '');
+        $agege = ((x($_REQUEST, 'agege')) ? intval($_REQUEST['agege']) : 0);
+        $agele = ((x($_REQUEST, 'agele')) ? intval($_REQUEST['agele']) : 0);
+        $kw = ((x($_REQUEST, 'kw')) ? intval($_REQUEST['kw']) : 0);
+        $active = ((x($_REQUEST, 'active')) ? intval($_REQUEST['active']) : 0);
+        $type = ((array_key_exists('type', $_REQUEST)) ? intval($_REQUEST['type']) : 0);
+
+        // allow a site to disable the directory's keyword list
+        if (get_config('system', 'disable_directory_keywords')) {
+            $kw = 0;
+        }
+
+        // by default use a safe search
+        $safe = ((x($_REQUEST, 'safe')));
+        if ($safe === false) {
+            $safe = 1;
+        }
+
+        // Directory mirrors will request sync packets, which are lists
+        // of records that have changed since the sync datetime.
+
+        if (array_key_exists('sync', $_REQUEST)) {
+            if ($_REQUEST['sync']) {
+                $sync = datetime_convert('UTC', 'UTC', $_REQUEST['sync']);
+            } else {
+                $sync = datetime_convert('UTC', 'UTC', '2010-01-01 01:01:00');
+            }
+        } else {
+            $sync = false;
+        }
+
+        if (($dirmode == DIRECTORY_MODE_STANDALONE) && (!$hub)) {
+            $hub = App::get_hostname();
+        }
+
+        if ($hub) {
+            $hub_query = " and xchan_hash in (select hubloc_hash from hubloc where hubloc_host =  '" . protect_sprintf(dbesc($hub)) . "') ";
+        } else {
+            $hub_query = '';
+        }
+
+        if ($url) {
+            $r = q(
+                "select xchan_name from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_url = '%s' or hubloc_id_url = '%s'",
+                dbesc($url),
+                dbesc($url)
+            );
+            if ($r && $r[0]['xchan_name']) {
+                $name = $r[0]['xchan_name'];
+            }
+        }
+
+        // The order identifier is validated further below
+
+        $sort_order = ((x($_REQUEST, 'order')) ? $_REQUEST['order'] : '');
+
+
+        // parse and assemble the query for advanced searches
+
+        $joiner = ' OR ';
+
+        if ($_REQUEST['and']) {
+            $joiner = ' AND ';
+        }
+
+        if ($name) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xchan_name', $name);
+        }
+        if ($address) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xchan_addr', $address);
+        }
+        if ($hash) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xchan_hash', $hash);
+        }
+        if ($locale) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_locale', $locale);
+        }
+        if ($region) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_region', $region);
+        }
+        if ($postcode) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_postcode', $postcode);
+        }
+        if ($country) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_country', $country);
+        }
+        if ($gender) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_gender', $gender);
+        }
+        if ($marital) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_marital', $marital);
+        }
+        if ($sexual) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_sexual', $sexual);
+        }
+        if ($keywords) {
+            $sql_extra .= $this->dir_query_build($joiner, 'xprof_keywords', $keywords);
+        }
+
+        // we only support an age range currently. You must set both agege
+        // (greater than or equal) and agele (less than or equal)
+
+        if ($agele && $agege) {
+            $sql_extra .= " $joiner ( xprof_age <= " . intval($agele) . " ";
+            $sql_extra .= " AND  xprof_age >= " . intval($agege) . ") ";
+        }
+
+
+        $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 60);
+        $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0);
+        $startrec = (($page + 1) * $perpage) - $perpage;
+        $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0);
+        $return_total = ((x($_REQUEST, 'return_total')) ? intval($_REQUEST['return_total']) : 0);
+
+        // mtime is not currently working
+
+        $mtime = ((x($_REQUEST, 'mtime')) ? datetime_convert('UTC', 'UTC', $_REQUEST['mtime']) : '');
+
+        // merge them into xprof
+
+        $ret['success'] = true;
+
+        // If &limit=n, return at most n entries
+        // If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination.
+        // By default we return one page (default 60 items maximum) and do not count total entries
+
+        $logic = ((strlen($sql_extra)) ? 'false' : 'true');
+
+        if ($hash) {
+            $logic = 'true';
+        }
+
+        if ($dirmode == DIRECTORY_MODE_STANDALONE) {
+            $sql_extra .= " and xchan_addr like '%%" . App::get_hostname() . "' ";
+        }
+
+        $safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : '');
+        if ($safe < 0) {
+            $safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) ";
+        }
+
+        if ($type) {
+            $safesql .= " and xchan_type = " . intval($type);
+        }
+
+        $activesql = EMPTY_STR;
+
+        if ($active) {
+            $activesql = "and xchan_updated > '" . datetime_convert(date_default_timezone_get(), 'UTC', 'now - 60 days') . "' ";
+        }
+
+        if ($limit) {
+            $qlimit = " LIMIT $limit ";
+        } else {
+            $qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec);
+            if ($return_total) {
+                $r = q("SELECT COUNT(xchan_hash) AS total FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra $network and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $activesql ");
+                if ($r) {
+                    $ret['total_items'] = $r[0]['total'];
+                }
+            }
+        }
+
+        if ($sort_order == 'normal') {
+            $order = " order by xchan_name asc ";
+
+            // Start the alphabetic search at 'A'
+            // This will make a handful of channels whose names begin with
+            // punctuation un-searchable in this mode
+
+            $safesql .= " and ascii(substring(xchan_name FROM 1 FOR 1)) > 64 ";
+        } elseif ($sort_order == 'reverse') {
+            $order = " order by xchan_name desc ";
+        } elseif ($sort_order == 'reversedate') {
+            $order = " order by xchan_name_date asc ";
+        } else {
+            $order = " order by xchan_name_date desc ";
+        }
+
+
+        // normal directory query
+
+        $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash 
+			where ( $logic $sql_extra ) $hub_query $network and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 
+			$safesql $activesql $order $qlimit ");
+
+        $ret['page'] = $page + 1;
+        $ret['records'] = count($r);
+
+        if ($r) {
+            $entries = [];
+            $dups = [];
+            $isdup = EMPTY_STR;
+
+            // Collect activitypub identities and query which also have zot6 identities.
+            // Do this once per page fetch rather than once per entry.
+
+            foreach ($r as $rv) {
+                if ($rv['xchan_network'] === 'activitypub') {
+                    if ($isdup) {
+                        $isdup .= ',';
+                    }
+                    $isdup .= "'" . dbesc($rv['xchan_url']) . "'";
+                }
+                if ($isdup) {
+                    $isdup = protect_sprintf($isdup);
+					$z = q("select xchan_url, xchan_hash from xchan where xchan_url in  ( $isdup ) and xchan_network in ('nomad','zot6')");
+                    if ($z) {
+                        foreach ($z as $zv) {
+                            $dups[$zv['xchan_url']] = $zv['xchan_hash'];
+                        }
+                    }
+                }
+            }
+
+            foreach ($r as $rr) {
+                // If it's an activitypub record and the channel also has a zot6 address, don't return it.
+
+                if (array_key_exists($rr['xchan_url'], $dups)) {
+                    continue;
+                }
+
+                if (!check_siteallowed($rr['xchan_url'])) {
+                    continue;
+                }
+
+                if (!check_channelallowed($rr['xchan_hash'])) {
+                    continue;
+                }
+
+
+                $entry = [];
+
+                $entry['name'] = $rr['xchan_name'];
+                $entry['hash'] = $rr['xchan_hash'];
+                $entry['censored'] = $rr['xchan_censored'];
+                $entry['selfcensored'] = $rr['xchan_selfcensored'];
+                $entry['type'] = $rr['xchan_type'];
+                $entry['url'] = $rr['xchan_url'];
+                $entry['photo_l'] = $rr['xchan_photo_l'];
+                $entry['photo'] = $rr['xchan_photo_m'];
+                $entry['address'] = $rr['xchan_addr'];
+                $entry['network'] = $rr['xchan_network'];
+                $entry['description'] = $rr['xprof_desc'];
+                $entry['locale'] = $rr['xprof_locale'];
+                $entry['region'] = $rr['xprof_region'];
+                $entry['postcode'] = $rr['xprof_postcode'];
+                $entry['country'] = $rr['xprof_country'];
+                $entry['birthday'] = $rr['xprof_dob'];
+                $entry['age'] = $rr['xprof_age'];
+                $entry['gender'] = $rr['xprof_gender'];
+                $entry['marital'] = $rr['xprof_marital'];
+                $entry['sexual'] = $rr['xprof_sexual'];
+                $entry['about'] = $rr['xprof_about'];
+                $entry['homepage'] = $rr['xprof_homepage'];
+                $entry['hometown'] = $rr['xprof_hometown'];
+                $entry['keywords'] = $rr['xprof_keywords'];
+
+                $entries[] = $entry;
+            }
+
+            $ret['results'] = $entries;
+            if ($kw) {
+                $k = dir_tagadelic($kw, $hub, $type, $safesql);
+                if ($k) {
+                    $ret['keywords'] = [];
+                    foreach ($k as $kv) {
+                        $ret['keywords'][] = ['term' => $kv[0], 'weight' => $kv[1], 'normalise' => $kv[2]];
+                    }
+                }
+            }
+        }
+        json_return_and_die($ret);
+    }
+
+    public function dir_query_build($joiner, $field, $s)
+    {
+        $ret = '';
+        if (trim($s)) {
+            $ret .= dbesc($joiner) . " " . dbesc($field) . " like '" . protect_sprintf('%' . dbesc($s) . '%') . "' ";
+        }
+        return $ret;
+    }
+
+    public function dir_flag_build($joiner, $field, $bit, $s)
+    {
+        return dbesc($joiner) . " ( " . dbesc($field) . " & " . intval($bit) . " ) " . ((intval($s)) ? '>' : '=') . " 0 ";
+    }
+
+
+    public function dir_parse_query($s)
+    {
+
+        $ret = [];
+        $curr = [];
+        $all = explode(' ', $s);
+        $quoted_string = false;
+
+        if ($all) {
+            foreach ($all as $q) {
+                if ($quoted_string === false) {
+                    if ($q === 'and') {
+                        $curr['logic'] = 'and';
+                        continue;
+                    }
+                    if ($q === 'or') {
+                        $curr['logic'] = 'or';
+                        continue;
+                    }
+                    if ($q === 'not') {
+                        $curr['logic'] .= ' not';
+                        continue;
+                    }
+                    if (strpos($q, '=')) {
+                        if (!isset($curr['logic'])) {
+                            $curr['logic'] = 'or';
+                        }
+                        $curr['field'] = trim(substr($q, 0, strpos($q, '=')));
+                        $curr['value'] = trim(substr($q, strpos($q, '=') + 1));
+                        if ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value']) - 1] != '"') {
+                            $quoted_string = true;
+                            $curr['value'] = substr($curr['value'], 1);
+                            continue;
+                        } elseif ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value']) - 1] == '"') {
+                            $curr['value'] = substr($curr['value'], 1, strlen($curr['value']) - 2);
+                            $ret[] = $curr;
+                            $curr = [];
+                            continue;
+                        } else {
+                            $ret[] = $curr;
+                            $curr = [];
+                            continue;
+                        }
+                    }
+                } else {
+                    if ($q[strlen($q) - 1] == '"') {
+                        $curr['value'] .= ' ' . str_replace('"', '', trim($q));
+                        $ret[] = $curr;
+                        $curr = [];
+                        $quoted_string = false;
+                    } else {
+                        $curr['value'] .= ' ' . trim($q);
+                    }
+                }
+            }
+        }
+        logger('dir_parse_query:' . print_r($ret, true), LOGGER_DATA);
+        return $ret;
+    }
+
+
+    public function list_public_sites()
+    {
+
+        $rand = db_getfunc('rand');
+        $realm = get_directory_realm();
+
+        $r = q(
+            "select * from site where site_type = %d and site_dead = 0",
+            intval(SITE_TYPE_ZOT)
+        );
+
+        $ret = array('success' => false);
+
+        if ($r) {
+            $ret['success'] = true;
+            $ret['sites'] = [];
+
+            foreach ($r as $rr) {
+                if ($rr['site_access'] == ACCESS_FREE) {
+                    $access = 'free';
+                } elseif ($rr['site_access'] == ACCESS_PAID) {
+                    $access = 'paid';
+                } elseif ($rr['site_access'] == ACCESS_TIERED) {
+                    $access = 'tiered';
+                } else {
+                    $access = 'private';
+                }
+
+                if ($rr['site_register'] == REGISTER_OPEN) {
+                    $register = 'open';
+                } elseif ($rr['site_register'] == REGISTER_APPROVE) {
+                    $register = 'approve';
+                } else {
+                    $register = 'closed';
+                }
+
+                $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project'], 'version' => $rr['site_version']);
+            }
+        }
+        return $ret;
+    }
+}
diff --git a/Code/Module/Display.php b/Code/Module/Display.php
new file mode 100644
index 000000000..9d09b8584
--- /dev/null
+++ b/Code/Module/Display.php
@@ -0,0 +1,523 @@
+updating));
+
+        $module_format = 'html';
+
+        if (argc() > 1) {
+            $module_format = substr(argv(1), strrpos(argv(1), '.') + 1);
+            if (!in_array($module_format, ['atom', 'zot', 'json'])) {
+                $module_format = 'html';
+            }
+        }
+
+        if ($this->loading) {
+            $_SESSION['loadtime_display'] = datetime_convert();
+        }
+
+        if (observer_prohibited()) {
+            notice(t('Public access denied.') . EOL);
+            return;
+        }
+
+        if (argc() > 1) {
+            $item_hash = argv(1);
+            if ($module_format !== 'html') {
+                $item_hash = substr($item_hash, 0, strrpos($item_hash, '.'));
+            }
+        }
+
+        if ($_REQUEST['mid']) {
+            $item_hash = $_REQUEST['mid'];
+        }
+
+        if (!$item_hash) {
+            App::$error = 404;
+            notice(t('Item not found.') . EOL);
+            return;
+        }
+
+        $observer_is_owner = false;
+        $updateable = false;
+
+        if (local_channel() && (!$this->updating)) {
+            $channel = App::get_channel();
+
+            $channel_acl = array(
+                'allow_cid' => $channel['channel_allow_cid'],
+                'allow_gid' => $channel['channel_allow_gid'],
+                'deny_cid' => $channel['channel_deny_cid'],
+                'deny_gid' => $channel['channel_deny_gid']
+            );
+
+            $x = array(
+                'is_owner' => true,
+                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
+                'default_location' => $channel['channel_location'],
+                'nickname' => $channel['channel_address'],
+                'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
+                'permissions' => $channel_acl,
+                'bang' => '',
+                'visitor' => true,
+                'profile_uid' => local_channel(),
+                'return_path' => 'channel/' . $channel['channel_address'],
+                'expanded' => true,
+                'editor_autocomplete' => true,
+                'bbco_autocomplete' => 'bbcode',
+                'bbcode' => true,
+                'jotnets' => true,
+                'reset' => t('Reset form')
+            );
+
+            $o = '
      ';
+            $o .= status_editor($x);
+            $o .= '
      ';
+        }
+
+        // This page can be viewed by anybody so the query could be complicated
+        // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally.
+        // If that fails (or we aren't logged in locally),
+        // query an item in which the observer (if logged in remotely) has cid or gid rights
+        // and if that fails, look for a copy of the post that has no privacy restrictions.
+        // If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported.
+
+        // find a copy of the item somewhere
+
+        $target_item = null;
+
+        $item_hash = unpack_link_id($item_hash);
+
+        $r = q(
+            "select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1",
+            dbesc($item_hash . '%')
+        );
+
+        if ($r) {
+            $target_item = $r[0];
+        }
+
+        $x = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($target_item['author_xchan'])
+        );
+        if ($x) {
+// not yet ready for prime time
+//          \App::$poi = $x[0];
+        }
+
+        // if the item is to be moderated redirect to /moderate
+        if ($target_item['item_blocked'] == ITEM_MODERATED) {
+            goaway(z_root() . '/moderate/' . $target_item['id']);
+        }
+
+        $r = null;
+
+        if ($target_item['item_type'] == ITEM_TYPE_WEBPAGE) {
+            $x = q(
+                "select * from channel where channel_id = %d limit 1",
+                intval($target_item['uid'])
+            );
+            $y = q(
+                "select * from iconfig left join item on iconfig.iid = item.id 
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
+                intval($target_item['uid']),
+                intval($target_item['parent'])
+            );
+            if ($x && $y) {
+                goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
+            } else {
+                notice(t('Page not found.') . EOL);
+                return '';
+            }
+        }
+        if ($target_item['item_type'] == ITEM_TYPE_ARTICLE) {
+            $x = q(
+                "select * from channel where channel_id = %d limit 1",
+                intval($target_item['uid'])
+            );
+            $y = q(
+                "select * from iconfig left join item on iconfig.iid = item.id 
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1",
+                intval($target_item['uid']),
+                intval($target_item['parent'])
+            );
+            if ($x && $y) {
+                goaway(z_root() . '/articles/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
+            } else {
+                notice(t('Page not found.') . EOL);
+                return '';
+            }
+        }
+        if ($target_item['item_type'] == ITEM_TYPE_CARD) {
+            $x = q(
+                "select * from channel where channel_id = %d limit 1",
+                intval($target_item['uid'])
+            );
+            $y = q(
+                "select * from iconfig left join item on iconfig.iid = item.id 
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1",
+                intval($target_item['uid']),
+                intval($target_item['parent'])
+            );
+            if ($x && $y) {
+                goaway(z_root() . '/cards/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
+            } else {
+                notice(t('Page not found.') . EOL);
+                return '';
+            }
+        }
+        if ($target_item['item_type'] == ITEM_TYPE_CUSTOM) {
+            Hook::call('item_custom_display', $target_item);
+            notice(t('Page not found.') . EOL);
+            return '';
+        }
+
+
+        $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
+
+
+        $simple_update = (($this->updating) ? " AND item_unseen = 1 " : '');
+
+        if ($this->updating && $_SESSION['loadtime_display']) {
+            $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_display']) . "' ";
+        }
+        if ($this->loading) {
+            $simple_update = '';
+        }
+
+        if ($static && $simple_update) {
+            $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
+        }
+
+        if ((!$this->updating) && (!$this->loading)) {
+            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 1);
+
+            // if the target item is not a post (eg a like) we want to address its thread parent
+
+            $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
+
+            // if we received a decoded hash originally we must encode it again before handing to javascript
+
+            $mid = gen_link_id($mid);
+
+            $o .= '
      ' . "\r\n";
+            $o .= "\r\n";
+
+            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), array(
+                '$baseurl' => z_root(),
+                '$pgtype' => 'display',
+                '$uid' => '0',
+                '$gid' => '0',
+                '$cid' => '0',
+                '$cmin' => '(-1)',
+                '$cmax' => '(-1)',
+                '$star' => '0',
+                '$liked' => '0',
+                '$conv' => '0',
+                '$spam' => '0',
+                '$fh' => '0',
+                '$dm' => '0',
+                '$nouveau' => '0',
+                '$wall' => '0',
+                '$draft' => '0',
+                '$static' => $static,
+                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
+                '$search' => '',
+                '$xchan' => '',
+                '$order' => '',
+                '$file' => '',
+                '$cats' => '',
+                '$tags' => '',
+                '$dend' => '',
+                '$dbegin' => '',
+                '$verb' => '',
+                '$net' => '',
+                '$mid' => (($mid) ? urlencode($mid) : '')
+            ));
+
+            Head::add_link([
+                'rel' => 'alternate',
+                'type' => 'application/json+oembed',
+                'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
+                'title' => 'oembed'
+            ]);
+        }
+
+        $observer_hash = get_observer_hash();
+        $item_normal = item_normal();
+        $item_normal_update = item_normal_update();
+
+        $sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash));
+
+        if ($noscript_content || $this->loading) {
+            $r = null;
+
+            require_once('include/channel.php');
+            $sys = Channel::get_system();
+            $sysid = $sys['channel_id'];
+
+            if (local_channel()) {
+                $r = q(
+                    "SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1",
+                    intval(local_channel()),
+                    dbesc($target_item['parent_mid'])
+                );
+                if ($r) {
+                    $updateable = true;
+                }
+            }
+
+            if (!(is_array($r) && count($r))) {
+                $r = q(
+                    "SELECT item.id as item_id from item WHERE mid = '%s' $sql_extra $item_normal limit 1",
+                    dbesc($target_item['parent_mid'])
+                );
+            }
+        } elseif ($this->updating && !$this->loading) {
+            $r = null;
+
+            require_once('include/channel.php');
+            $sys = Channel::get_system();
+            $sysid = $sys['channel_id'];
+
+            if (local_channel()) {
+                $r = q(
+                    "SELECT item.parent AS item_id from item WHERE uid = %d and parent_mid = '%s' $item_normal_update $simple_update limit 1",
+                    intval(local_channel()),
+                    dbesc($target_item['parent_mid'])
+                );
+                if ($r) {
+                    $updateable = true;
+                }
+            }
+
+            if (!$r) {
+                $r = q(
+                    "SELECT item.parent AS item_id from item WHERE parent_mid = '%s' $sql_extra $item_normal_update $simple_update limit 1",
+                    dbesc($target_item['parent_mid'])
+                );
+            }
+        } else {
+            $r = [];
+        }
+
+        if ($r) {
+            $parents_str = ids_to_querystr($r, 'item_id');
+            if ($parents_str) {
+                $items = q(
+                    "SELECT item.*, item.id AS item_id 
+					FROM item
+					WHERE parent in ( %s ) $item_normal $sql_extra ",
+                    dbesc($parents_str)
+                );
+                xchan_query($items);
+                $items = fetch_post_tags($items, true);
+                $items = conv_sort($items, 'created');
+            }
+        } else {
+            $items = [];
+        }
+
+        // see if the top-level post owner chose to block search engines
+
+        if ($items && get_pconfig($items[0]['uid'], 'system', 'noindex')) {
+            App::$meta->set('robots', 'noindex, noarchive');
+        }
+
+        foreach ($items as $item) {
+            if ($item['mid'] === $item_hash) {
+                if (preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) {
+                    $ogimage = $matches[2];
+                    //  Will we use og:image:type someday? We keep this just in case
+                    //  $ogimagetype = guess_image_type($ogimage);
+                }
+
+                // some work on post content to generate a description
+                // almost fully based on work done on Hubzilla by Max Kostikov
+                $ogdesc = $item['body'];
+
+                $ogdesc = bbcode($ogdesc, ['export' => true]);
+                $ogdesc = trim(html2plain($ogdesc, 0, true));
+                $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8');
+
+                // remove all URLs
+                $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc);
+
+                // shorten description
+                $ogdesc = substr($ogdesc, 0, 300);
+                $ogdesc = str_replace("\n", " ", $ogdesc);
+                while (strpos($ogdesc, "  ") !== false) {
+                    $ogdesc = str_replace("  ", " ", $ogdesc);
+                }
+                $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "...");
+
+                $ogsite = (System::get_site_name()) ? escape_tags(System::get_site_name()) : System::get_platform_name();
+
+                // we can now start loading content
+                if ($item['mid'] == $item['parent_mid']) {
+                    App::$meta->set('og:title', ($items[0]['title']
+                        ? sprintf(t('"%1$s", shared by %2$s with %3$s'), $items[0]['title'], $item['author']['xchan_name'], $ogsite)
+                        : sprintf(t('%1$s shared this post with %2$s'), $item['author']['xchan_name'], $ogsite)));
+                    App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon()));
+                    App::$meta->set('og:type', 'article');
+                    App::$meta->set('og:url:secure_url', $item['llink']);
+                    App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf(t('Not much to read, click to see the post.'))));
+                } else {
+                    if (($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) {
+                        App::$meta->set('og:title', ($items[0]['title']
+                            ? sprintf(t('%1$s shared a reaction to "%2$s"'), $item['author']['xchan_name'], $items[0]['title'])
+                            : sprintf(t('%s shared a reaction to this post/conversation'), $item['author']['xchan_name'])));
+                        App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon()));
+                        App::$meta->set('og:type', 'article');
+                        App::$meta->set('og:url:secure_url', $item['llink']);
+                        App::$meta->set('og:description', $ogdesc);
+                    } else {
+                        App::$meta->set('og:title', ($items[0]['title']
+                            ? sprintf(t('%1$s commented "%2$s"'), $item['author']['xchan_name'], $items[0]['title'])
+                            : sprintf(t('%s shared a comment of this post/conversation'), $item['author']['xchan_name'])));
+                        App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon()));
+                        App::$meta->set('og:type', 'article');
+                        App::$meta->set('og:url:secure_url', $item['llink']);
+                        App::$meta->set('og:description', sprintf(t('%1$s wrote this: "%2$s"'), $item['author']['xchan_name'], $ogdesc));
+                    }
+                }
+            }
+        }
+
+        if (local_channel() && $items) {
+            $ids = ids_to_array($items, 'item_id');
+            $seen = PConfig::Get(local_channel(), 'system', 'seen_items');
+            if (!$seen) {
+                $seen = [];
+            }
+            $seen = array_unique(array_merge($ids, $seen));
+            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
+        }
+
+        switch ($module_format) {
+            case 'html':
+                if ($this->updating) {
+                    $o .= conversation($items, 'display', $this->updating, 'client');
+                } else {
+                    $o .= '';
+
+                    App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . App::$page['title'] : App::$page['title']);
+
+                    $o .= conversation($items, 'display', $this->updating, 'client');
+                }
+
+                break;
+
+            case 'atom':
+                $atom = replace_macros(Theme::get_template('atom_feed.tpl'), array(
+                    '$version' => xmlify(System::get_project_version()),
+                    '$generator' => xmlify(System::get_platform_name()),
+                    '$generator_uri' => 'https://hubzilla.org',
+                    '$feed_id' => xmlify(App::$cmd),
+                    '$feed_title' => xmlify(t('Article')),
+                    '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
+                    '$author' => '',
+                    '$owner' => '',
+                    '$profile_page' => xmlify(z_root() . '/display/' . $target_item['mid']),
+                ));
+
+                $x = ['xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params];
+                Hook::call('atom_feed_top', $x);
+
+                $atom = $x['xml'];
+
+                // a much simpler interface
+                Hook::call('atom_feed', $atom);
+
+
+                if ($items) {
+                    $type = 'html';
+                    foreach ($items as $item) {
+                        if ($item['item_private']) {
+                            continue;
+                        }
+                        $atom .= atom_entry($item, $type, null, '', true, '', false);
+                    }
+                }
+
+                Hook::call('atom_feed_end', $atom);
+
+                $atom .= '' . "\r\n";
+
+                header('Content-type: application/atom+xml');
+                echo $atom;
+                killme();
+        }
+
+        if ($updateable) {
+            $x = q(
+                "UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ",
+                intval(local_channel()),
+                intval($r[0]['item_id'])
+            );
+        }
+
+        $o .= '
      ';
+
+        if ((($this->updating && $this->loading) || $noscript_content) && (!$items)) {
+            $r = q(
+                "SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1",
+                dbesc($item_hash)
+            );
+
+            if ($r) {
+                if (intval($r[0]['item_deleted'])) {
+                    notice(t('Item has been removed.') . EOL);
+                } else {
+                    notice(t('Permission denied.') . EOL);
+                }
+            } else {
+                notice(t('Item not found.') . EOL);
+            }
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Drafts.php b/Code/Module/Drafts.php
new file mode 100644
index 000000000..82b5ee71a
--- /dev/null
+++ b/Code/Module/Drafts.php
@@ -0,0 +1,31 @@
+' . $desc . '';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Drafts'))) {
+            return $text;
+        }
+    }
+}
diff --git a/Code/Module/Dreport.php b/Code/Module/Dreport.php
new file mode 100644
index 000000000..bf3829022
--- /dev/null
+++ b/Code/Module/Dreport.php
@@ -0,0 +1,199 @@
+ 2) {
+            $cmd = argv(1);
+            $mid = argv(2);
+        } elseif (argc() > 1) {
+            $cmd = EMPTY_STR;
+            $mid = argv(1);
+        }
+
+        $message_id = unpack_link_id($mid);
+
+        if (!$message_id) {
+            notice(t('Invalid message') . EOL);
+            return;
+        }
+
+        if ($cmd === 'push') {
+            $i = q(
+                "select id from item where mid = '%s' and uid = %d and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
+                dbesc($message_id),
+                intval($channel['channel_id']),
+                dbesc($channel['channel_hash']),
+                dbesc($channel['channel_hash'])
+            );
+            if ($i) {
+                Run::Summon(['Notifier', 'edit_post', $i[0]['id']]);
+            }
+            sleep(3);
+            goaway(z_root() . '/dreport/' . urlencode($mid));
+        }
+
+        if ($cmd === 'log') {
+            $host = escape_tags($_REQUEST['host']);
+            $r = q(
+                "select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s' and dreport_recip = '%s'",
+                dbesc($channel['channel_hash']),
+                dbesc($message_id),
+                dbesc($host)
+            );
+            if ($r) {
+                $output = '
      ' . t('Delivery Log') . '
      ';
+                $output .= EOL . $r[0]['dreport_log'];
+                return $output;
+            } else {
+                notice(t('Item not found') . EOL);
+                return;
+            }
+        }
+
+        switch ($table) {
+            case 'item':
+                $i = q(
+                    "select id from item where mid = '%s' and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
+                    dbesc($message_id),
+                    dbesc($channel['channel_hash']),
+                    dbesc($channel['channel_hash'])
+                );
+                break;
+            default:
+                break;
+        }
+
+        if (!$i) {
+            notice(t('Permission denied') . EOL);
+            return;
+        }
+
+        $r = q(
+            "select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'",
+            dbesc($channel['channel_hash']),
+            dbesc($message_id)
+        );
+
+        if (!$r) {
+            notice(t('no results') . EOL);
+        }
+
+        for ($x = 0; $x < count($r); $x++) {
+            // This has two purposes: 1. make the delivery report strings translateable, and
+            // 2. assign an ordering to item delivery results so we can group them and provide
+            // a readable report with more interesting events listed toward the top and lesser
+            // interesting items towards the bottom
+
+            switch ($r[$x]['dreport_result']) {
+                case 'channel sync processed':
+                    $r[$x]['gravity'] = 0;
+                    $r[$x]['dreport_result'] = t('channel sync processed');
+                    break;
+                case 'queued':
+                    $r[$x]['gravity'] = 2;
+                    $r[$x]['dreport_result'] = '' . t('queued') . '';
+                    break;
+                case 'site dead':
+                    $r[$x]['gravity'] = 3;
+                    $r[$x]['dreport_result'] = t('site dead');
+                    break;
+                case 'site deferred':
+                    $r[$x]['gravity'] = 4;
+                    $r[$x]['dreport_result'] = t('site might be dead - deferred');
+                    break;
+                case 'posted':
+                    $r[$x]['gravity'] = 5;
+                    $r[$x]['dreport_result'] = t('posted');
+                    break;
+                case 'accepted for delivery':
+                    $r[$x]['gravity'] = 6;
+                    $r[$x]['dreport_result'] = t('accepted for delivery');
+                    break;
+                case 'updated':
+                    $r[$x]['gravity'] = 7;
+                    $r[$x]['dreport_result'] = t('updated');
+                case 'update ignored':
+                    $r[$x]['gravity'] = 8;
+                    $r[$x]['dreport_result'] = t('update ignored');
+                    break;
+                case 'permission denied':
+                    $r[$x]['dreport_result'] = t('permission denied');
+                    $r[$x]['gravity'] = 9;
+                    break;
+                case 'recipient not found':
+                    $r[$x]['dreport_result'] = t('recipient not found');
+                    break;
+                case 'mail recalled':
+                    $r[$x]['dreport_result'] = t('mail recalled');
+                    break;
+                case 'duplicate mail received':
+                    $r[$x]['dreport_result'] = t('duplicate mail received');
+                    break;
+                case 'mail delivered':
+                    $r[$x]['dreport_result'] = t('mail delivered');
+                    break;
+                default:
+                    if (strpos($r[$x]['dreport_result'], 'delivery rejected') === 0) {
+                        $r[$x]['dreport_result'] = t('delivery rejected') . ' ' . substr($r[$x]['dreport_result'], 17);
+                    }
+                    $r[$x]['gravity'] = 1;
+                    break;
+            }
+        }
+
+        usort($r, 'self::dreport_gravity_sort');
+
+        $entries = [];
+        foreach ($r as $rr) {
+            $entries[] = [
+                'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']),
+                'result' => $rr['dreport_result'],
+                'time' => escape_tags(datetime_convert('UTC', date_default_timezone_get(), $rr['dreport_time']))
+            ];
+        }
+
+        $output = replace_macros(Theme::get_template('dreport.tpl'), array(
+            '$title' => sprintf(t('Delivery report for %1$s'), basename($message_id)) . '...',
+            '$table' => $table,
+            '$mid' => urlencode($mid),
+            '$options' => t('Options'),
+            '$push' => t('Redeliver'),
+            '$entries' => $entries
+        ));
+
+
+        return $output;
+    }
+
+    private static function dreport_gravity_sort($a, $b)
+    {
+        if ($a['gravity'] == $b['gravity']) {
+            if ($a['dreport_name'] === $b['dreport_name']) {
+                return strcmp($a['dreport_time'], $b['dreport_time']);
+            }
+            return strcmp($a['dreport_name'], $b['dreport_name']);
+        }
+        return (($a['gravity'] > $b['gravity']) ? 1 : (-1));
+    }
+}
diff --git a/Code/Module/Editblock.php b/Code/Module/Editblock.php
new file mode 100644
index 000000000..7407fd584
--- /dev/null
+++ b/Code/Module/Editblock.php
@@ -0,0 +1,162 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+    public function get()
+    {
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $which = argv(1);
+
+        $uid = local_channel();
+        $owner = 0;
+        $channel = null;
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                $uid = $owner = intval($sys['channel_id']);
+                $channel = $sys;
+                $observer = $sys;
+            }
+        }
+
+        if (!$owner) {
+            // Figure out who the page owner is.
+            $r = q(
+                "select channel_id from channel where channel_address = '%s'",
+                dbesc($which)
+            );
+            if ($r) {
+                $owner = intval($r[0]['channel_id']);
+            }
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $is_owner = (($uid && $uid == $owner) ? true : false);
+
+        $o = '';
+
+        // Figure out which post we're editing
+        $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
+
+        if (!($post_id && $owner)) {
+            notice(t('Item not found') . EOL);
+            return;
+        }
+
+        $itm = q(
+            "SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1",
+            intval($post_id),
+            intval($owner)
+        );
+        if ($itm) {
+            $item_id = q(
+                "select * from iconfig where cat = 'system' and k = 'BUILDBLOCK' and iid = %d limit 1",
+                intval($itm[0]['id'])
+            );
+            if ($item_id) {
+                $block_title = $item_id[0]['v'];
+            }
+        } else {
+            notice(t('Item not found') . EOL);
+            return;
+        }
+
+        $mimetype = $itm[0]['mimetype'];
+
+        $content = $itm[0]['body'];
+        if ($itm[0]['mimetype'] === 'text/markdown') {
+            $content = MarkdownSoap::unescape($itm[0]['body']);
+        }
+
+
+        $rp = 'blocks/' . $channel['channel_address'];
+
+        $x = array(
+			'nickname' => $channel['channel_address'],
+			'bbco_autocomplete'=> ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? 'bbcode' : 'comanche-block'),
+			'return_path' => $rp,
+			'webpage' => ITEM_TYPE_BLOCK,
+			'ptlabel' => t('Block Name'),
+			'button' => t('Edit'),
+			'writefiles' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
+			'weblink' => ((in_array($mimetype, [ 'text/bbcode' , 'text/x-multicode' ])) ? t('Insert web link') : false),
+			'hide_voting' => true,
+			'hide_future' => true,
+			'hide_location' => true,
+			'hide_expire' => true,
+			'showacl' => false,
+			'ptyp' => $itm[0]['type'],
+			'mimeselect' => true,
+			'mimetype' => $itm[0]['mimetype'],
+			'body' => undo_post_tagging($content),
+			'post_id' => $post_id,
+			'visitor' => true,
+			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+			'placeholdertitle' => t('Title (optional)'),
+			'pagetitle' => $block_title,
+			'profile_uid' => (intval($channel['channel_id'])),
+			'bbcode' => ((in_array($mimetype, [ 'text/bbcode' , 'text/x-multicode' ])) ? true : false)
+        );
+
+        $editor = status_editor($x);
+
+        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
+            '$title' => t('Edit Block'),
+            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+            '$id' => $itm[0]['id'],
+            '$cancel' => t('Cancel'),
+            '$editor' => $editor
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Editlayout.php b/Code/Module/Editlayout.php
new file mode 100644
index 000000000..5cd3915ff
--- /dev/null
+++ b/Code/Module/Editlayout.php
@@ -0,0 +1,159 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+    public function get()
+    {
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $which = argv(1);
+
+        $uid = local_channel();
+        $owner = 0;
+        $channel = null;
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                $uid = $owner = intval($sys['channel_id']);
+                $channel = $sys;
+                $observer = $sys;
+            }
+        }
+
+        if (!$owner) {
+            // Figure out who the page owner is.
+            $r = q(
+                "select channel_id from channel where channel_address = '%s'",
+                dbesc($which)
+            );
+            if ($r) {
+                $owner = intval($r[0]['channel_id']);
+            }
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $is_owner = (($uid && $uid == $owner) ? true : false);
+
+        $o = '';
+
+        // Figure out which post we're editing
+        $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
+
+        if (!$post_id) {
+            notice(t('Item not found') . EOL);
+            return;
+        }
+
+        // Now we've got a post and an owner, let's find out if we're allowed to edit it
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $itm = q(
+            "SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1",
+            intval($post_id),
+            intval($owner)
+        );
+
+        $item_id = q(
+            "select * from iconfig where cat = 'system' and k = 'PDL' and iid = %d limit 1",
+            intval($itm[0]['id'])
+        );
+        if ($item_id) {
+            $layout_title = $item_id[0]['v'];
+        }
+
+
+        $rp = 'layouts/' . $which;
+
+        $x = array(
+            'webpage' => ITEM_TYPE_PDL,
+            'nickname' => $channel['channel_address'],
+            'editor_autocomplete' => true,
+            'bbco_autocomplete' => 'comanche',
+            'return_path' => $rp,
+            'button' => t('Edit'),
+            'hide_voting' => true,
+            'hide_future' => true,
+            'hide_expire' => true,
+            'hide_location' => true,
+            'hide_weblink' => true,
+            'hide_attach' => true,
+            'hide_preview' => true,
+            'disable_comments' => true,
+            'ptyp' => $itm[0]['obj_type'],
+            'body' => undo_post_tagging($itm[0]['body']),
+            'post_id' => $post_id,
+            'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'),
+            'pagetitle' => $layout_title,
+            'ptlabel' => t('Layout Name'),
+            'placeholdertitle' => t('Layout Description (Optional)'),
+            'showacl' => false,
+            'profile_uid' => intval($owner),
+        );
+
+        $editor = status_editor($x);
+
+        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
+            '$title' => t('Edit Layout'),
+            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+            '$id' => $itm[0]['id'],
+            '$cancel' => t('Cancel'),
+            '$editor' => $editor
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Editpost.php b/Code/Module/Editpost.php
new file mode 100644
index 000000000..d39dc2c6e
--- /dev/null
+++ b/Code/Module/Editpost.php
@@ -0,0 +1,155 @@
+ 1) ? intval(argv(1)) : 0);
+
+        if (!$post_id) {
+            notice(t('Item not found') . EOL);
+            return;
+        }
+
+        $item = q(
+            "SELECT * FROM item WHERE id = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1",
+            intval($post_id),
+            dbesc(get_observer_hash()),
+            dbesc(get_observer_hash())
+        );
+
+        // don't allow web editing of potentially binary content (item_obscured = 1)
+
+        if ((!$item) || intval($item[0]['item_obscured'])) {
+            notice(t('Item is not editable') . EOL);
+            return;
+        }
+
+        $item = array_shift($item);
+
+        $owner_uid = intval($item['uid']);
+        $owner = Channel::from_id($owner_uid);
+
+        if ($item['resource_type'] === 'photo' && $item['resource_id'] && $owner) {
+            goaway(z_root() . '/photos/' . $owner['channel_address'] . '/image/' . $item['resource_id'] . '?expandform=1');
+        }
+
+        if ($item['resource_type'] === 'event' && $item['resource_id']) {
+            goaway(z_root() . '/events/' . $item['resource_id'] . '?expandform=1');
+        }
+
+
+        $channel = App::get_channel();
+
+        $category = '';
+        $collections = [];
+        $catsenabled = ((Apps::system_app_installed($owner_uid, 'Categories')) ? 'categories' : '');
+
+        // we have a single item, but fetch_post_tags expects an array. Convert it before and after.
+
+        $item = array_shift(fetch_post_tags([$item]));
+
+        if ($catsenabled) {
+            $cats = get_terms_oftype($item['term'], TERM_CATEGORY);
+
+            if ($cats) {
+                foreach ($cats as $cat) {
+                    if (strlen($category)) {
+                        $category .= ', ';
+                    }
+                    $category .= $cat['term'];
+                }
+            }
+        }
+
+        $clcts = get_terms_oftype($item['term'], TERM_PCATEGORY);
+        if ($clcts) {
+            foreach ($clcts as $clct) {
+                $collections[] = $clct['term'];
+            }
+        }
+
+        if ($item['attach']) {
+            $j = json_decode($item['attach'], true);
+            if ($j) {
+                foreach ($j as $jj) {
+                    $item['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
+                }
+            }
+        }
+
+        if (intval($item['item_unpublished'])) {
+            // clear the old creation date if editing a saved draft. These will always show as just created.
+            unset($item['created']);
+        }
+
+        if ($item['summary']) {
+            $item['body'] = '[summary]' . $item['summary'] . '[/summary]' . "\n\n" . $item['body'];
+        }
+
+        $x = [
+            'nickname' => $channel['channel_address'],
+            'item' => $item,
+            'editor_autocomplete' => true,
+            'bbco_autocomplete' => 'bbcode',
+            'return_path' => $_SESSION['return_url'],
+            'button' => t('Submit'),
+            'hide_voting' => true,
+            'hide_future' => true,
+            'hide_location' => true,
+            'is_draft' => ((intval($item['item_unpublished'])) ? true : false),
+            'parent' => (($item['mid'] === $item['parent_mid']) ? 0 : $item['parent']),
+            'mimetype' => $item['mimetype'],
+            'ptyp' => $item['obj_type'],
+            'body' => htmlspecialchars_decode(undo_post_tagging($item['body']), ENT_COMPAT),
+            'post_id' => $post_id,
+            'defloc' => $channel['channel_location'],
+            'visitor' => true,
+            'title' => htmlspecialchars_decode($item['title'], ENT_COMPAT),
+            'category' => $category,
+            'showacl' => ((intval($item['item_unpublished'])) ? true : false),
+            'lockstate' => (($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) ? 'lock' : 'unlock'),
+            'acl' => Libacl::populate($item, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
+            'bang' => EMPTY_STR,
+            'permissions' => $item,
+            'profile_uid' => $owner_uid,
+            'catsenabled' => $catsenabled,
+            'collections' => $collections,
+            'jotnets' => true,
+            'hide_expire' => true,
+            'bbcode' => true
+        ];
+
+        $editor = status_editor($x);
+
+        $output .= replace_macros(
+            Theme::get_template('edpost_head.tpl'),
+            ['$title' => t('Edit post'), '$cancel' => t('Cancel'), '$editor' => $editor]
+        );
+
+        return $output;
+    }
+}
diff --git a/Code/Module/Editwebpage.php b/Code/Module/Editwebpage.php
new file mode 100644
index 000000000..915aa9507
--- /dev/null
+++ b/Code/Module/Editwebpage.php
@@ -0,0 +1,193 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+    public function get()
+    {
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $which = argv(1);
+
+        $uid = local_channel();
+        $owner = 0;
+        $channel = null;
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                $uid = $owner = intval($sys['channel_id']);
+                $channel = $sys;
+                $observer = $sys;
+            }
+        }
+
+        if (!$owner) {
+            // Figure out who the page owner is.
+            $r = q(
+                "select channel_id from channel where channel_address = '%s'",
+                dbesc($which)
+            );
+            if ($r) {
+                $owner = intval($r[0]['channel_id']);
+            }
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $is_owner = (($uid && $uid == $owner) ? true : false);
+
+        $o = '';
+
+        // Figure out which post we're editing
+        $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
+
+        if (!$post_id) {
+            notice(t('Item not found') . EOL);
+            return;
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        // We've already figured out which item we want and whose copy we need,
+        // so we don't need anything fancy here
+
+        $sql_extra = item_permissions_sql($owner);
+
+        $itm = q(
+            "SELECT * FROM item WHERE id = %d and uid = %s $sql_extra LIMIT 1",
+            intval($post_id),
+            intval($owner)
+        );
+
+        // don't allow web editing of potentially binary content (item_obscured = 1)
+        // @FIXME how do we do it instead?
+
+        if ((!$itm) || intval($itm[0]['item_obscured'])) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $item_id = q(
+            "select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1",
+            intval($itm[0]['id'])
+        );
+        if ($item_id) {
+            $page_title = urldecode($item_id[0]['v']);
+        }
+
+        $mimetype = $itm[0]['mimetype'];
+
+        if ($mimetype === 'application/x-php') {
+            if ((!$uid) || ($uid != $itm[0]['uid'])) {
+                notice(t('Permission denied.') . EOL);
+                return;
+            }
+        }
+
+        $layout = $itm[0]['layout_mid'];
+
+        $content = $itm[0]['body'];
+        if ($itm[0]['mimetype'] === 'text/markdown') {
+            $content = MarkdownSoap::unescape($itm[0]['body']);
+        }
+
+        $rp = 'webpages/' . $which;
+
+        $x = array(
+            'nickname' => $channel['channel_address'],
+            'bbco_autocomplete' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? 'bbcode' : ''),
+            'return_path' => $rp,
+            'webpage' => ITEM_TYPE_WEBPAGE,
+            'ptlabel' => t('Page link'),
+            'pagetitle' => $page_title,
+            'writefiles' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
+            'button' => t('Edit'),
+            'weblink' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? t('Insert web link') : false),
+            'hide_location' => true,
+            'hide_voting' => true,
+            'ptyp' => $itm[0]['type'],
+            'body' => undo_post_tagging($content),
+            'post_id' => $post_id,
+            'visitor' => ($is_owner) ? true : false,
+            'acl' => Libacl::populate($itm[0], false, PermissionDescription::fromGlobalPermission('view_pages')),
+            'permissions' => $itm[0],
+            'showacl' => ($is_owner) ? true : false,
+            'mimetype' => $mimetype,
+            'mimeselect' => true,
+            'layout' => $layout,
+            'layoutselect' => true,
+            'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'),
+            'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
+            'profile_uid' => (intval($owner)),
+            'bbcode' => ((in_array($mimetype, ['text/bbcode', 'text/x-multicode'])) ? true : false)
+        );
+
+        $editor = status_editor($x);
+
+        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
+            '$title' => t('Edit Webpage'),
+            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+            '$editor' => $editor,
+            '$cancel' => t('Cancel'),
+            '$id' => $itm[0]['id']
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Email_resend.php b/Code/Module/Email_resend.php
new file mode 100644
index 000000000..44b30cdb0
--- /dev/null
+++ b/Code/Module/Email_resend.php
@@ -0,0 +1,45 @@
+ 1) {
+            $result = false;
+            $email = hex2bin(argv(1));
+
+            if ($email) {
+                $result = Account::verify_email_address(['resend' => true, 'email' => $email]);
+            }
+
+            if ($result) {
+                notice(t('Email verification resent'));
+            } else {
+                notice(t('Unable to resend email verification message.'));
+            }
+
+            goaway(z_root() . '/email_validation/' . bin2hex($email));
+        }
+
+        // @todo - one can provide a form here to resend the mail
+        // after directing to here if a succesful login was attempted from an unverified address.
+    }
+}
diff --git a/Code/Module/Email_validation.php b/Code/Module/Email_validation.php
new file mode 100644
index 000000000..960fbe1b0
--- /dev/null
+++ b/Code/Module/Email_validation.php
@@ -0,0 +1,54 @@
+ 1) {
+            $email = hex2bin(argv(1));
+        }
+
+        $o = replace_macros(Theme::get_template('email_validation.tpl'), [
+            '$title' => t('Email Verification Required'),
+            '$desc' => sprintf(t('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.'), $email),
+            '$resend' => t('Resend Email'),
+            '$email' => bin2hex($email),
+            '$submit' => t('Submit'),
+            '$token' => ['token', t('Validation token'), '', ''],
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Embed.php b/Code/Module/Embed.php
new file mode 100644
index 000000000..1e62e0777
--- /dev/null
+++ b/Code/Module/Embed.php
@@ -0,0 +1,24 @@
+ 1) ? intval(argv(1)) : 0);
+
+        if ($post_id && local_channel()) {
+            echo '[share=' . $post_id . '][/share]';
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Embedphotos.php b/Code/Module/Embedphotos.php
new file mode 100644
index 000000000..97718164f
--- /dev/null
+++ b/Code/Module/Embedphotos.php
@@ -0,0 +1,248 @@
+ 2 && is_site_admin() && intval(argv(2))) {
+            $channel_id = argv(2);
+        } else {
+            $channel_id = local_channel();
+        }
+        if (argc() > 1 && argv(1) === 'album') {
+            // API: /embedphotos/album
+            $name = (x($_POST, 'name') ? $_POST['name'] : null);
+            if (!$name) {
+                json_return_and_die(array('errormsg' => 'Error retrieving album', 'status' => false));
+            }
+            $album = $this->embedphotos_widget_album(array('channel_id' => $channel_id, 'album' => $name));
+            json_return_and_die(array('status' => true, 'content' => $album));
+        }
+        if (argc() > 1 && argv(1) === 'albumlist') {
+            // API: /embedphotos/albumlist
+            $album_list = $this->embedphotos_album_list($channel_id);
+            json_return_and_die(array('status' => true, 'albumlist' => $album_list));
+        }
+        if (argc() > 1 && argv(1) === 'photolink') {
+            // API: /embedphotos/photolink
+            $href = (x($_POST, 'href') ? $_POST['href'] : null);
+            if (!$href) {
+                json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false));
+            }
+            $resource_id = array_pop(explode("/", $href));
+
+            $x = self::photolink($resource_id, $channel_id);
+            if ($x) {
+                json_return_and_die(array('status' => true, 'photolink' => $x, 'resource_id' => $resource_id));
+            }
+            json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
+        }
+    }
+
+
+    protected static function photolink($resource, $channel_id = 0)
+    {
+        if (intval($channel_id)) {
+            $channel = Channel::from_id($channel_id);
+        } else {
+            $channel = App::get_channel();
+        }
+
+        $output = EMPTY_STR;
+        if ($channel) {
+            $resolution = ((Features::enabled($channel['channel_id'], 'large_photos')) ? 1 : 2);
+            $r = q(
+                "select mimetype, height, width, title from photo where resource_id = '%s' and $resolution = %d and uid = %d limit 1",
+                dbesc($resource),
+                intval($resolution),
+                intval($channel['channel_id'])
+            );
+            if (!$r) {
+                return $output;
+            }
+
+            if ($r[0]['mimetype'] === 'image/jpeg') {
+                $ext = '.jpg';
+            } elseif ($r[0]['mimetype'] === 'image/png') {
+                $ext = '.png';
+            } elseif ($r[0]['mimetype'] === 'image/gif') {
+                $ext = '.gif';
+            } else {
+                $ext = EMPTY_STR;
+            }
+
+            $alt = $r[0]['title'];
+            if (!$alt) {
+                $a = q(
+                    "select filename from attach where hash = '%s' and uid = %d limit 1",
+                    dbesc($resource),
+                    intval($channel['channel_id'])
+                );
+                if ($a) {
+                    $alt = $a[0]['filename'];
+                } else {
+                    $alt = t('Image/photo');
+                }
+            }
+            $alt = ' alt="' . $alt . '"';
+
+            $output = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $resource . ']'
+                . '[zmg width="' . $r[0]['width'] . '" height="' . $r[0]['height'] . '"' . $alt . ']'
+                . z_root() . '/photo/' . $resource . '-' . $resolution . $ext . '[/zmg][/zrl]';
+
+            return $output;
+        }
+    }
+
+
+    /**
+     * Copied from include/widgets.php::widget_album() with a modification to get the profile_uid from
+     * the input array as in widget_item()
+     *
+     * @param array $args
+     * @return string with HTML
+     */
+
+    public function embedphotos_widget_album($args)
+    {
+
+        $channel_id = 0;
+        if (array_key_exists('channel_id', $args)) {
+            $channel_id = $args['channel_id'];
+            $channel = Channel::from_id($channel_id);
+        }
+
+        if (!$channel_id) {
+            return '';
+        }
+
+        $owner_uid = $channel_id;
+        require_once('include/security.php');
+        $sql_extra = permissions_sql($channel_id);
+
+        if (!perm_is_allowed($channel_id, get_observer_hash(), 'view_storage')) {
+            return '';
+        }
+
+        if ($args['album']) {
+            $album = (($args['album'] === '/') ? '' : $args['album']);
+        }
+
+        if ($args['title']) {
+            $title = $args['title'];
+        }
+
+        /**
+         * This may return incorrect permissions if you have multiple directories of the same name.
+         * It is a limitation of the photo table using a name for a photo album instead of a folder hash
+         */
+        if ($album) {
+            $x = q(
+                "select hash from attach where filename = '%s' and uid = %d limit 1",
+                dbesc($album),
+                intval($owner_uid)
+            );
+            if ($x) {
+                $y = attach_can_view_folder($owner_uid, get_observer_hash(), $x[0]['hash']);
+                if (!$y) {
+                    return '';
+                }
+            }
+        }
+
+        $order = 'DESC';
+
+        $r = q(
+            "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+				(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 
+				AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
+				ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+				ORDER BY created $order",
+            intval($owner_uid),
+            dbesc($album),
+            intval(PHOTO_NORMAL),
+            intval(PHOTO_PROFILE)
+        );
+
+        $photos = [];
+        if ($r) {
+            $twist = 'rotright';
+            foreach ($r as $rr) {
+                if ($twist == 'rotright') {
+                    $twist = 'rotleft';
+                } else {
+                    $twist = 'rotright';
+                }
+
+                $ext = $phototypes[$rr['mimetype']];
+
+                $imgalt_e = $rr['filename'];
+                $desc_e = $rr['description'];
+
+                $imagelink = (z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $rr['resource_id']
+                    . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
+
+                $photos[] = [
+                    'id' => $rr['id'],
+                    'twist' => ' ' . $twist . rand(2, 4),
+                    'link' => $imagelink,
+                    'title' => t('View Photo'),
+                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
+                    'alt' => $imgalt_e,
+                    'desc' => $desc_e,
+                    'ext' => $ext,
+                    'hash' => $rr['resource_id'],
+                    'unknown' => t('Unknown')
+                ];
+            }
+        }
+
+        $o .= replace_macros(Theme::get_template('photo_album.tpl'), [
+            '$photos' => $photos,
+            '$album' => (($title) ? $title : $album),
+            '$album_id' => rand(),
+            '$album_edit' => array(t('Edit Album'), $album_edit),
+            '$can_post' => false,
+            '$upload' => [t('Upload'), z_root() . '/photos/' . $channel['channel_address'] . '/upload/' . bin2hex($album)],
+            '$order' => false,
+            '$upload_form' => $upload_form,
+            '$no_fullscreen_btn' => true
+        ]);
+
+        return $o;
+    }
+
+    public function embedphotos_album_list($channel_id)
+    {
+        $channel = Channel::from_id($channel_id);
+        $p = photos_albums_list($channel, App::get_observer());
+        if ($p['success']) {
+            return $p['albums'];
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/Code/Module/Event.php b/Code/Module/Event.php
new file mode 100644
index 000000000..625f30af6
--- /dev/null
+++ b/Code/Module/Event.php
@@ -0,0 +1,61 @@
+ MAX_EVENT_REPEAT_COUNT) {
+            $count = MAX_EVENT_REPEAT_COUNT;
+        }
+
+        require_once('include/text.php');
+        linkify_tags($desc, local_channel());
+        linkify_tags($location, local_channel());
+
+        //$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
+
+        //@fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location)
+        //$onerror_url = z_root() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type";
+        $onerror_url = z_root() . "/events";
+
+        if (strcmp($finish, $start) < 0 && !$nofinish) {
+            notice(t('Event can not end before it has started.') . EOL);
+            if (intval($_REQUEST['preview'])) {
+                echo(t('Unable to generate preview.'));
+                killme();
+            }
+            goaway($onerror_url);
+        }
+
+        if ((!$summary) || (!$start)) {
+            notice(t('Event title and start time are required.') . EOL);
+            if (intval($_REQUEST['preview'])) {
+                echo(t('Unable to generate preview.'));
+                killme();
+            }
+            goaway($onerror_url);
+        }
+
+        //      $share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0);
+
+        $share = 1;
+
+
+        $acl = new AccessControl(false);
+
+        if ($event_id) {
+            $x = q(
+                "select * from event where id = %d and uid = %d limit 1",
+                intval($event_id),
+                intval(local_channel())
+            );
+            if (!$x) {
+                notice(t('Event not found.') . EOL);
+                if (intval($_REQUEST['preview'])) {
+                    echo(t('Unable to generate preview.'));
+                    killme();
+                }
+                return;
+            }
+
+            $acl->set($x[0]);
+
+            $created = $x[0]['created'];
+            $edited = datetime_convert();
+
+            if (
+                $x[0]['allow_cid'] === '<' . $channel['channel_hash'] . '>'
+                && $x[0]['allow_gid'] === '' && $x[0]['deny_cid'] === '' && $x[0]['deny_gid'] === ''
+            ) {
+                $share = false;
+            } else {
+                $share = true;
+            }
+        } else {
+            $created = $edited = datetime_convert();
+            if ($share) {
+                $acl->set_from_array($_POST);
+            } else {
+                $acl->set(array('allow_cid' => '<' . $channel['channel_hash'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''));
+            }
+        }
+
+        $post_tags = [];
+
+        $ac = $acl->get();
+
+        if (strlen($categories)) {
+            $cats = explode(',', $categories);
+            foreach ($cats as $cat) {
+                $post_tags[] = array(
+                    'uid' => $profile_uid,
+                    'ttype' => TERM_CATEGORY,
+                    'otype' => TERM_OBJ_POST,
+                    'term' => trim($cat),
+                    'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat))
+                );
+            }
+        }
+
+        $datarray = [];
+        $datarray['dtstart'] = $start;
+        $datarray['dtend'] = $finish;
+        $datarray['summary'] = $summary;
+        $datarray['description'] = $desc;
+        $datarray['location'] = $location;
+        $datarray['etype'] = $type;
+        $datarray['adjust'] = $adjust;
+        $datarray['nofinish'] = $nofinish;
+        $datarray['uid'] = local_channel();
+        $datarray['account'] = get_account_id();
+        $datarray['event_xchan'] = $channel['channel_hash'];
+        $datarray['allow_cid'] = $ac['allow_cid'];
+        $datarray['allow_gid'] = $ac['allow_gid'];
+        $datarray['deny_cid'] = $ac['deny_cid'];
+        $datarray['deny_gid'] = $ac['deny_gid'];
+        $datarray['private'] = (($acl->is_private()) ? 1 : 0);
+        $datarray['id'] = $event_id;
+        $datarray['created'] = $created;
+        $datarray['edited'] = $edited;
+
+        if (intval($_REQUEST['preview'])) {
+            $html = format_event_html($datarray);
+            echo $html;
+            killme();
+        }
+
+        $event = event_store_event($datarray);
+
+        if ($post_tags) {
+            $datarray['term'] = $post_tags;
+        }
+
+        $item_id = event_store_item($datarray, $event);
+
+        if ($item_id) {
+            $r = q(
+                "select * from item where id = %d",
+                intval($item_id)
+            );
+            if ($r) {
+                xchan_query($r);
+                $sync_item = fetch_post_tags($r);
+                $z = q(
+                    "select * from event where event_hash = '%s' and uid = %d limit 1",
+                    dbesc($r[0]['resource_id']),
+                    intval($channel['channel_id'])
+                );
+                if ($z) {
+                    Libsync::build_sync_packet($channel['channel_id'], ['event_item' => [encode_item($sync_item[0], true)], 'event' => $z]);
+                }
+            }
+        }
+
+        if ($share) {
+            Run::Summon(['Notifier', 'event', $item_id]);
+        }
+    }
+
+
+    public function get()
+    {
+
+        if (argc() > 2 && argv(1) == 'ical') {
+            $event_id = argv(2);
+
+            require_once('include/security.php');
+            $sql_extra = permissions_sql(local_channel());
+
+            $r = q(
+                "select * from event where event_hash = '%s' $sql_extra limit 1",
+                dbesc($event_id)
+            );
+            if ($r) {
+                header('Content-type: text/calendar');
+                header('Content-Disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"');
+                echo ical_wrapper($r);
+                killme();
+            } else {
+                notice(t('Event not found.') . EOL);
+                return;
+            }
+        }
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        Navbar::set_selected('Events');
+
+        if ((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
+            $r = q(
+                "update event set dismissed = 1 where id = %d and uid = %d",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+        }
+
+        if ((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
+            $r = q(
+                "update event set dismissed = 0 where id = %d and uid = %d",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+        }
+
+        $first_day = intval(get_pconfig(local_channel(), 'system', 'cal_first_day', 0));
+
+        $htpl = Theme::get_template('event_head.tpl');
+        App::$page['htmlhead'] .= replace_macros($htpl, array(
+            '$baseurl' => z_root(),
+            '$module_url' => '/events',
+            '$modparams' => 1,
+            '$lang' => App::$language,
+            '$first_day' => $first_day
+        ));
+
+        $o = '';
+
+        $mode = 'view';
+        $y = 0;
+        $m = 0;
+        $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
+
+
+        // logger('args: ' . print_r(App::$argv,true));
+
+
+        if (argc() > 1) {
+            if (argc() > 2 && argv(1) === 'add') {
+                $mode = 'add';
+                $item_id = intval(argv(2));
+            }
+            if (argc() > 2 && argv(1) === 'drop') {
+                $mode = 'drop';
+                $event_id = argv(2);
+            }
+            if (argc() > 2 && intval(argv(1)) && intval(argv(2))) {
+                $mode = 'view';
+                $y = intval(argv(1));
+                $m = intval(argv(2));
+            }
+            if (argc() <= 2) {
+                $mode = 'view';
+                $event_id = argv(1);
+            }
+        }
+
+        if ($mode === 'add') {
+            event_addtocal($item_id, local_channel());
+            killme();
+        }
+
+        if ($mode == 'view') {
+            /* edit/create form */
+            if ($event_id) {
+                $r = q(
+                    "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+                    dbesc($event_id),
+                    intval(local_channel())
+                );
+                if (count($r)) {
+                    $orig_event = $r[0];
+                }
+            }
+
+            $channel = App::get_channel();
+
+            // Passed parameters overrides anything found in the DB
+            if (!x($orig_event)) {
+                $orig_event = [];
+            }
+
+            // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
+            /*
+            if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
+            if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust'];
+            if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
+            if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
+            if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
+            if(x($_REQUEST,'start')) $orig_event['dtstart'] = $_REQUEST['start'];
+            if(x($_REQUEST,'finish')) $orig_event['dtend'] = $_REQUEST['finish'];
+            if(x($_REQUEST,'type')) $orig_event['etype'] = $_REQUEST['type'];
+            */
+
+            $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
+            $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
+            $t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
+            $d_orig = ((x($orig_event)) ? $orig_event['description'] : '');
+            $l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
+            $eid = ((x($orig_event)) ? $orig_event['id'] : 0);
+            $event_xchan = ((x($orig_event)) ? $orig_event['event_xchan'] : $channel['channel_hash']);
+            $mid = ((x($orig_event)) ? $orig_event['mid'] : '');
+
+            if (!x($orig_event)) {
+                $sh_checked = '';
+                $a_checked = ' checked="checked" ';
+            } else {
+                $sh_checked = ((($orig_event['allow_cid'] === '<' . $channel['channel_hash'] . '>' || (!$orig_event['allow_cid'])) && (!$orig_event['allow_gid']) && (!$orig_event['deny_cid']) && (!$orig_event['deny_gid'])) ? '' : ' checked="checked" ');
+            }
+
+            if ($orig_event['event_xchan']) {
+                $sh_checked .= ' disabled="disabled" ';
+            }
+
+            $sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now');
+
+            $fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour');
+
+            $tz = date_default_timezone_get();
+            if (x($orig_event)) {
+                $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+            }
+
+            $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+            $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
+            $sday = datetime_convert('UTC', $tz, $sdt, 'd');
+            $shour = datetime_convert('UTC', $tz, $sdt, 'H');
+            $sminute = datetime_convert('UTC', $tz, $sdt, 'i');
+
+            $stext = datetime_convert('UTC', $tz, $sdt);
+            $stext = substr($stext, 0, 14) . "00:00";
+
+            $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+            $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
+            $fday = datetime_convert('UTC', $tz, $fdt, 'd');
+            $fhour = datetime_convert('UTC', $tz, $fdt, 'H');
+            $fminute = datetime_convert('UTC', $tz, $fdt, 'i');
+
+            $ftext = datetime_convert('UTC', $tz, $fdt);
+            $ftext = substr($ftext, 0, 14) . "00:00";
+
+            $type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
+
+            $f = get_config('system', 'event_input_format');
+            if (!$f) {
+                $f = 'ymd';
+            }
+
+            $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
+
+            $category = '';
+
+            if ($catsenabled && x($orig_event)) {
+                $itm = q(
+                    "select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1",
+                    dbesc($orig_event['event_hash']),
+                    intval(local_channel())
+                );
+                $itm = fetch_post_tags($itm);
+                if ($itm) {
+                    $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
+                    foreach ($cats as $cat) {
+                        if (strlen($category)) {
+                            $category .= ', ';
+                        }
+                        $category .= $cat['term'];
+                    }
+                }
+            }
+
+            $acl = new AccessControl($channel);
+            $perm_defaults = $acl->get();
+
+            $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults);
+
+            $freq_options = [
+                'DAILY' => t('day(s)'),
+                'WEEKLY' => t('week(s)'),
+                'MONTHLY' => t('month(s)'),
+                'YEARLY' => t('year(s)')
+            ];
+
+
+            $tpl = Theme::get_template('event_form.tpl');
+
+            $form = replace_macros($tpl, array(
+                '$post' => z_root() . '/events',
+                '$eid' => $eid,
+                '$type' => $type,
+                '$xchan' => $event_xchan,
+                '$mid' => $mid,
+                '$event_hash' => $event_id,
+                '$summary' => array('summary', (($event_id) ? t('Edit event title') : t('Event title')), $t_orig, t('Required'), '*'),
+                '$catsenabled' => $catsenabled,
+                '$placeholdercategory' => t('Categories (comma-separated list)'),
+                '$c_text' => (($event_id) ? t('Edit Category') : t('Category')),
+                '$category' => $category,
+                '$required' => '*',
+                '$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear + 5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), (($event_id) ? t('Edit start date and time') : t('Start date and time')), 'start_text', true, true, '', '', true, $first_day),
+                '$n_text' => t('Finish date and time are not known or not relevant'),
+                '$n_checked' => $n_checked,
+                '$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear + 5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), (($event_id) ? t('Edit finish date and time') : t('Finish date and time')), 'finish_text', true, true, 'start_text', '', false, $first_day),
+                '$nofinish' => array('nofinish', t('Finish date and time are not known or not relevant'), $n_checked, '', array(t('No'), t('Yes')), 'onclick="enableDisableFinishDate();"'),
+                '$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'), array(t('No'), t('Yes'))),
+                '$a_text' => t('Adjust for viewer timezone'),
+                '$d_text' => (($event_id) ? t('Edit Description') : t('Description')),
+                '$d_orig' => $d_orig,
+                '$l_text' => (($event_id) ? t('Edit Location') : t('Location')),
+                '$l_orig' => $l_orig,
+                '$t_orig' => $t_orig,
+                '$preview' => t('Preview'),
+                '$perms_label' => t('Permission settings'),
+                // populating the acl dialog was a permission description from view_stream because Cal.php, which
+                // displays events, says "since we don't currently have an event permission - use the stream permission"
+                '$acl' => (($orig_event['event_xchan']) ? '' : Libacl::populate(((x($orig_event)) ? $orig_event : $perm_defaults), false, PermissionDescription::fromGlobalPermission('view_stream'))),
+
+                '$allow_cid' => acl2json($permissions['allow_cid']),
+                '$allow_gid' => acl2json($permissions['allow_gid']),
+                '$deny_cid' => acl2json($permissions['deny_cid']),
+                '$deny_gid' => acl2json($permissions['deny_gid']),
+                '$tz_choose' => Features::enabled(local_channel(), 'event_tz_select'),
+                '$timezone' => array('timezone_select', t('Timezone:'), date_default_timezone_get(), '', get_timezones()),
+
+                '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
+
+                '$submit' => t('Submit'),
+                '$advanced' => t('Advanced Options'),
+
+                '$repeat' => ['repeat', t('Event repeat'), false, '', [t('No'), t('Yes')]],
+                '$freq' => ['freq', t('Repeat frequency'), '', '', $freq_options],
+                '$interval' => ['interval', t('Repeat every'), 1, ''],
+                '$count' => ['count', t('Number of total repeats'), 10, ''],
+                '$until' => '',
+                '$byday' => '',
+
+            ));
+            /* end edit/create form */
+
+            $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
+            $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
+            if (!$y) {
+                $y = intval($thisyear);
+            }
+            if (!$m) {
+                $m = intval($thismonth);
+            }
+
+            $export = false;
+            if (argc() === 4 && argv(3) === 'export') {
+                $export = true;
+            }
+
+            // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
+            // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
+
+            if ($y < 1901) {
+                $y = 1900;
+            }
+            if ($y > 2099) {
+                $y = 2100;
+            }
+
+            $nextyear = $y;
+            $nextmonth = $m + 1;
+            if ($nextmonth > 12) {
+                $nextmonth = 1;
+                $nextyear++;
+            }
+
+            $prevyear = $y;
+            if ($m > 1) {
+                $prevmonth = $m - 1;
+            } else {
+                $prevmonth = 12;
+                $prevyear--;
+            }
+
+            $dim = get_dim($y, $m);
+            $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
+            $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
+
+
+            if (argv(1) === 'json') {
+                if (x($_GET, 'start')) {
+                    $start = $_GET['start'];
+                }
+                if (x($_GET, 'end')) {
+                    $finish = $_GET['end'];
+                }
+            }
+
+            $start = datetime_convert('UTC', 'UTC', $start);
+            $finish = datetime_convert('UTC', 'UTC', $finish);
+
+            $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+            $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+
+            if (x($_GET, 'id')) {
+                $r = q(
+                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+	                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
+                    intval(local_channel()),
+                    intval($_GET['id'])
+                );
+            } elseif ($export) {
+                $r = q(
+                    "SELECT * from event where uid = %d
+					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
+					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
+                    intval(local_channel()),
+                    dbesc($start),
+                    dbesc($finish),
+                    dbesc($adjust_start),
+                    dbesc($adjust_finish)
+                );
+            } else {
+                // fixed an issue with "nofinish" events not showing up in the calendar.
+                // There's still an issue if the finish date crosses the end of month.
+                // Noting this for now - it will need to be fixed here and in Friendica.
+                // Ultimately the finish date shouldn't be involved in the query.
+
+                $r = q(
+                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+	                              from event left join item on event_hash = resource_id 
+					where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
+					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
+					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
+                    intval(local_channel()),
+                    dbesc($start),
+                    dbesc($finish),
+                    dbesc($adjust_start),
+                    dbesc($adjust_finish)
+                );
+            }
+
+            $links = [];
+
+            if ($r && !$export) {
+                xchan_query($r);
+                $r = fetch_post_tags($r, true);
+
+                $r = sort_by_date($r);
+            }
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
+                    if (!x($links, $j)) {
+                        $links[$j] = z_root() . '/' . App::$cmd . '#link-' . $j;
+                    }
+                }
+            }
+
+            $events = [];
+
+            $last_date = '';
+            $fmt = t('l, F j');
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
+                    $d = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], $fmt) : datetime_convert('UTC', 'UTC', $rr['dtstart'], $fmt));
+                    $d = day_translate($d);
+
+                    $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
+                    if ($rr['nofinish']) {
+                        $end = null;
+                    } else {
+                        $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
+
+                        // give a fake end to birthdays so they get crammed into a
+                        // single day on the calendar
+
+                        if ($rr['etype'] === 'birthday') {
+                            $end = null;
+                        }
+                    }
+
+
+                    $is_first = ($d !== $last_date);
+
+                    $last_date = $d;
+
+                    $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root() . '/events/' . $rr['event_hash'] . '?expandform=1', t('Edit event'), '', '') : false);
+
+                    $drop = array(z_root() . '/events/drop/' . $rr['event_hash'], t('Delete event'), '', '');
+
+                    $title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])), ENT_QUOTES, 'UTF-8'));
+                    if (!$title) {
+                        list($title, $_trash) = explode(" $rr['id'],
+                        'hash' => $rr['event_hash'],
+                        'start' => $start,
+                        'end' => $end,
+                        'drop' => $drop,
+                        'allDay' => false,
+                        'title' => $title,
+
+                        'j' => $j,
+                        'd' => $d,
+                        'edit' => $edit,
+                        'is_first' => $is_first,
+                        'item' => $rr,
+                        'html' => $html,
+                        'plink' => array($rr['plink'], t('Link to Source'), '', ''),
+                    );
+                }
+            }
+
+            if ($export) {
+                header('Content-type: text/calendar');
+                header('Content-Disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"');
+                echo ical_wrapper($r);
+                killme();
+            }
+
+            if (App::$argv[1] === 'json') {
+                echo json_encode($events);
+                killme();
+            }
+
+            // links: array('href', 'text', 'extra css classes', 'title')
+            if (x($_GET, 'id')) {
+                $tpl = Theme::get_template("event.tpl");
+            } else {
+                $tpl = Theme::get_template("events-js.tpl");
+            }
+
+            $o = replace_macros($tpl, array(
+                '$baseurl' => z_root(),
+                '$new_event' => array(z_root() . '/events', (($event_id) ? t('Edit Event') : t('Create Event')), '', ''),
+                '$previus' => array(z_root() . "/events/$prevyear/$prevmonth", t('Previous'), '', ''),
+                '$next' => array(z_root() . "/events/$nextyear/$nextmonth", t('Next'), '', ''),
+                '$export' => array(z_root() . "/events/$y/$m/export", t('Export'), '', ''),
+                '$calendar' => cal($y, $m, $links, ' eventcal'),
+                '$events' => $events,
+                '$view_label' => t('View'),
+                '$month' => t('Month'),
+                '$week' => t('Week'),
+                '$day' => t('Day'),
+                '$prev' => t('Previous'),
+                '$next' => t('Next'),
+                '$today' => t('Today'),
+                '$form' => $form,
+                '$expandform' => ((x($_GET, 'expandform')) ? true : false),
+            ));
+
+            if (x($_GET, 'id')) {
+                echo $o;
+                killme();
+            }
+
+            return $o;
+        }
+
+        if ($mode === 'drop' && $event_id) {
+            $r = q(
+                "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+                dbesc($event_id),
+                intval(local_channel())
+            );
+
+            $sync_event = $r[0];
+
+            if ($r) {
+                $r = q(
+                    "delete from event where event_hash = '%s' and uid = %d",
+                    dbesc($event_id),
+                    intval(local_channel())
+                );
+                if ($r) {
+                    $i = q(
+                        "select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d",
+                        dbesc($event_id),
+                        intval(local_channel())
+                    );
+
+                    if ($i) {
+                        $can_delete = false;
+                        $local_delete = true;
+
+                        $ob_hash = get_observer_hash();
+                        if ($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) {
+                            $can_delete = true;
+                        }
+
+                        // The site admin can delete any post/item on the site.
+                        // If the item originated on this site+channel the deletion will propagate downstream.
+                        // Otherwise just the local copy is removed.
+
+                        if (is_site_admin()) {
+                            $local_delete = true;
+                            if (intval($i[0]['item_origin'])) {
+                                $can_delete = true;
+                            }
+                        }
+
+                        if ($can_delete || $local_delete) {
+                            // if this is a different page type or it's just a local delete
+                            // but not by the item author or owner, do a simple deletion
+
+                            $complex = false;
+
+                            if (intval($i[0]['item_type']) || ($local_delete && (!$can_delete))) {
+                                drop_item($i[0]['id']);
+                            } else {
+                                // complex deletion that needs to propagate and be performed in phases
+                                drop_item($i[0]['id'], true, DROPITEM_PHASE1);
+                                $complex = true;
+                            }
+
+                            $ii = q(
+                                "select * from item where id = %d",
+                                intval($i[0]['id'])
+                            );
+                            if ($ii) {
+                                xchan_query($ii);
+                                $sync_item = fetch_post_tags($ii);
+                                Libsync::build_sync_packet($i[0]['uid'], array('item' => array(encode_item($sync_item[0], true))));
+                            }
+
+                            if ($complex) {
+                                tag_deliver($i[0]['uid'], $i[0]['id']);
+                            }
+                        }
+                    }
+
+                    $r = q(
+                        "update item set resource_type = '', resource_id = '' where resource_type = 'event' and resource_id = '%s' and uid = %d",
+                        dbesc($event_id),
+                        intval(local_channel())
+                    );
+                    $sync_event['event_deleted'] = 1;
+                    Libsync::build_sync_packet(0, array('event' => array($sync_event)));
+
+                    info(t('Event removed') . EOL);
+                } else {
+                    notice(t('Failed to remove event') . EOL);
+                }
+                goaway(z_root() . '/events');
+            }
+        }
+    }
+}
diff --git a/Code/Module/Expire.php b/Code/Module/Expire.php
new file mode 100644
index 000000000..55e807781
--- /dev/null
+++ b/Code/Module/Expire.php
@@ -0,0 +1,54 @@
+' . $desc . '';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Expire Posts'))) {
+            return $text;
+        }
+
+        $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), [
+            '$field' => array('selfexpiredays', t('Expire and delete all my posts after this many days'), intval(get_pconfig(local_channel(), 'system', 'selfexpiredays', 0)), t('Leave at 0 if you wish to manually control expiration of specific posts.'))
+        ]);
+
+        return replace_macros(Theme::get_template('generic_app_settings.tpl'), [
+            '$addon' => array('expire', t('Automatic Expiration Settings'), '', t('Submit')),
+            '$content' => $setting_fields
+        ]);
+    }
+}
diff --git a/Code/Module/Fastping.php b/Code/Module/Fastping.php
new file mode 100644
index 000000000..d1b1b08ba
--- /dev/null
+++ b/Code/Module/Fastping.php
@@ -0,0 +1,72 @@
+ $m);
+            }
+            unset($_SESSION['sysmsg']);
+        }
+        if (x($_SESSION, 'sysmsg_info')) {
+            foreach ($_SESSION['sysmsg_info'] as $m) {
+                $result['info'][] = array('message' => $m);
+            }
+            unset($_SESSION['sysmsg_info']);
+        }
+        if (!($vnotify & VNOTIFY_INFO)) {
+            $result['info'] = [];
+        }
+        if (!($vnotify & VNOTIFY_ALERT)) {
+            $result['notice'] = [];
+        }
+
+        json_return_and_die($result);
+    }
+}
diff --git a/Code/Module/Fbrowser.php b/Code/Module/Fbrowser.php
new file mode 100644
index 000000000..f625f1f87
--- /dev/null
+++ b/Code/Module/Fbrowser.php
@@ -0,0 +1,144 @@
+
+ */
+
+require_once('include/photo_factory.php');
+
+
+class Fbrowser extends Controller
+{
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            killme();
+        }
+
+        if (App::$argc == 1) {
+            killme();
+        }
+
+        //echo "
      "; var_dump(\App::$argv); killme();
+
+        switch (App::$argv[1]) {
+            case "image":
+                $path = array(array(z_root() . "/fbrowser/image/", t("Photos")));
+                $albums = false;
+                $sql_extra = "";
+                $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
+
+                if (App::$argc == 2) {
+                    $albums = q(
+                        "SELECT distinct(album) AS album FROM photo WHERE uid = %d ",
+                        intval(local_channel())
+                    );
+                    // anon functions only from 5.3.0... meglio tardi che mai..
+                    $albums = array_map("self::folder1", $albums);
+                }
+
+                $album = "";
+                if (App::$argc == 3) {
+                    $album = hex2bin(App::$argv[2]);
+                    $sql_extra = sprintf("AND album = '%s' ", dbesc($album));
+                    $sql_extra2 = "";
+                    $path[] = array(z_root() . "/fbrowser/image/" . App::$argv[2] . "/", $album);
+                }
+
+                $r = q(
+                    "SELECT resource_id, id, filename, type, min(imgscale) AS hiq,max(imgscale) AS loq, description  
+						FROM photo WHERE uid = %d $sql_extra
+						GROUP BY resource_id $sql_extra2",
+                    intval(local_channel())
+                );
+
+                $files = array_map("self::files1", $r);
+
+                $tpl = Theme::get_template("filebrowser.tpl");
+                echo replace_macros($tpl, array(
+                    '$type' => 'image',
+                    '$baseurl' => z_root(),
+                    '$path' => $path,
+                    '$folders' => $albums,
+                    '$files' => $files,
+                    '$cancel' => t('Cancel'),
+                ));
+
+
+                break;
+            case "file":
+                if (App::$argc == 2) {
+                    $files = q(
+                        "SELECT id, filename, filetype FROM attach WHERE uid = %d ",
+                        intval(local_channel())
+                    );
+
+                    $files = array_map("self::files2", $files);
+                    //echo "
      "; var_dump($files); killme();
+
+
+                    $tpl = Theme::get_template("filebrowser.tpl");
+                    echo replace_macros($tpl, array(
+                        '$type' => 'file',
+                        '$baseurl' => z_root(),
+                        '$path' => array(array(z_root() . "/fbrowser/image/", t("Files"))),
+                        '$folders' => false,
+                        '$files' => $files,
+                        '$cancel' => t('Cancel'),
+                    ));
+                }
+
+                break;
+        }
+
+
+        killme();
+    }
+
+    private static function folder1($el)
+    {
+        return array(bin2hex($el['album']), $el['album']);
+    }
+
+
+    private static function files1($rr)
+    {
+
+        $ph = photo_factory('');
+        $types = $ph->supportedTypes();
+        $ext = $types[$rr['type']];
+
+        $filename_e = $rr['filename'];
+
+        return array(
+            z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' . $ext,
+            $filename_e,
+            z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['loq'] . '.' . $ext
+        );
+    }
+
+    private static function files2($rr)
+    {
+        list($m1, $m2) = explode("/", $rr['filetype']);
+        $filetype = ((file_exists("images/icons/$m1.png")) ? $m1 : "zip");
+
+        if (App::get_template_engine() === 'internal') {
+            $filename_e = template_escape($rr['filename']);
+        } else {
+            $filename_e = $rr['filename'];
+        }
+
+        return array(z_root() . '/attach/' . $rr['id'], $filename_e, z_root() . '/images/icons/16/' . $filetype . '.png');
+    }
+}
diff --git a/Code/Module/Fedi_id.php b/Code/Module/Fedi_id.php
new file mode 100644
index 000000000..98b6619e4
--- /dev/null
+++ b/Code/Module/Fedi_id.php
@@ -0,0 +1,59 @@
+ t('Home instance'),
+                '$address' => ['address', t('Enter your channel address or fediverse ID (e.g. channel@example.com)'), '', t('If you do not have a fediverse ID, please use your browser \'back\' button to return to the previous page')],
+                '$action' => 'fedi_id/' . argv(1),
+                '$method' => 'post',
+                '$submit' => t('Connect')
+            ]
+        );
+    }
+}
diff --git a/Code/Module/Feed.php b/Code/Module/Feed.php
new file mode 100644
index 000000000..478b68340
--- /dev/null
+++ b/Code/Module/Feed.php
@@ -0,0 +1,50 @@
+ 1) {
+            if (observer_prohibited(true)) {
+                killme();
+            }
+
+            $channel = Channel::from_username(argv(1));
+            if (!$channel) {
+                killme();
+            }
+
+            logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
+
+            echo get_public_feed($channel, $params);
+
+            killme();
+        }
+    }
+}
diff --git a/Code/Module/File_upload.php b/Code/Module/File_upload.php
new file mode 100644
index 000000000..a9e84e9a2
--- /dev/null
+++ b/Code/Module/File_upload.php
@@ -0,0 +1,106 @@
+ array($sync)));
+                }
+                goaway(z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']);
+            }
+        } else {
+            $matches = [];
+            $partial = false;
+
+
+            if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
+                $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
+                if ($pm) {
+                    logger('Content-Range: ' . print_r($matches, true));
+                    $partial = true;
+                }
+            }
+
+            if ($partial) {
+                $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
+
+                if ($x['partial']) {
+                    header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
+                    json_return_and_die($x);
+                } else {
+                    header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
+
+                    $_FILES['userfile'] = [
+                        'name' => $x['name'],
+                        'type' => $x['type'],
+                        'tmp_name' => $x['tmp_name'],
+                        'error' => $x['error'],
+                        'size' => $x['size']
+                    ];
+                }
+            } else {
+                if (!array_key_exists('userfile', $_FILES)) {
+                    $_FILES['userfile'] = [
+                        'name' => $_FILES['files']['name'],
+                        'type' => $_FILES['files']['type'],
+                        'tmp_name' => $_FILES['files']['tmp_name'],
+                        'error' => $_FILES['files']['error'],
+                        'size' => $_FILES['files']['size']
+                    ];
+                }
+            }
+
+            $r = attach_store($channel, get_observer_hash(), '', $_REQUEST);
+            if ($r['success']) {
+                $sync = attach_export_data($channel, $r['data']['hash']);
+                if ($sync) {
+                    Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
+                }
+            }
+        }
+        goaway(z_root() . '/' . $_REQUEST['return_url']);
+    }
+}
diff --git a/Code/Module/Filer.php b/Code/Module/Filer.php
new file mode 100644
index 000000000..73255f7ce
--- /dev/null
+++ b/Code/Module/Filer.php
@@ -0,0 +1,71 @@
+ 1) ? intval(App::$argv[1]) : 0);
+
+        logger('filer: tag ' . $term . ' item ' . $item_id);
+
+        if ($item_id && strlen($term)) {
+            // file item
+            store_item_tag(local_channel(), $item_id, TERM_OBJ_POST, TERM_FILE, $term, '');
+
+            // protect the entire conversation from periodic expiration
+
+            $r = q(
+                "select parent from item where id = %d and uid = %d limit 1",
+                intval($item_id),
+                intval(local_channel())
+            );
+            if ($r) {
+                $x = q(
+                    "update item set item_retained = 1 where id = %d and uid = %d",
+                    intval($r[0]['parent']),
+                    intval(local_channel())
+                );
+            }
+        } else {
+            $filetags = [];
+            $r = q(
+                "select distinct(term) from term where uid = %d and ttype = %d order by term asc",
+                intval(local_channel()),
+                intval(TERM_FILE)
+            );
+            if (count($r)) {
+                foreach ($r as $rr) {
+                    $filetags[] = $rr['term'];
+                }
+            }
+            $tpl = Theme::get_template("filer_dialog.tpl");
+            $o = replace_macros($tpl, array(
+                '$field' => array('term', t('Enter a folder name'), '', '', $filetags, 'placeholder="' . t('or select an existing folder (doubleclick)') . '"'),
+                '$submit' => t('Save'),
+                '$title' => t('Save to Folder'),
+                '$cancel' => t('Cancel')
+            ));
+
+            echo $o;
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Filerm.php b/Code/Module/Filerm.php
new file mode 100644
index 000000000..c92ac61d1
--- /dev/null
+++ b/Code/Module/Filerm.php
@@ -0,0 +1,46 @@
+ 1) ? intval(App::$argv[1]) : 0);
+
+        logger('filerm: tag ' . $term . ' item ' . $item_id);
+
+        if ($item_id && strlen($term)) {
+            $r = q(
+                "delete from term where uid = %d and ttype = %d and oid = %d and term = '%s'",
+                intval(local_channel()),
+                intval(($category) ? TERM_CATEGORY : TERM_FILE),
+                intval($item_id),
+                dbesc($term)
+            );
+        }
+
+        if (x($_SESSION, 'return_url')) {
+            goaway(z_root() . '/' . $_SESSION['return_url']);
+        }
+
+        killme();
+    }
+}
diff --git a/Code/Module/Filestorage.php b/Code/Module/Filestorage.php
new file mode 100644
index 000000000..f4402e2a6
--- /dev/null
+++ b/Code/Module/Filestorage.php
@@ -0,0 +1,259 @@
+set_from_array($_POST);
+        $x = $acl->get();
+
+        $url = get_cloud_url($channel_id, $channel['channel_address'], $resource);
+
+        // get the object before permissions change so we can catch eventual former allowed members
+        $object = get_file_activity_object($channel_id, $resource, $url);
+
+        attach_change_permissions($channel_id, $resource, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], $recurse, true);
+
+        $sync = attach_export_data($channel, $resource, false);
+        if ($sync) {
+            Libsync::build_sync_packet($channel_id, array('file' => array($sync)));
+        }
+
+//      file_activity($channel_id, $object, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], 'post', $notify);
+
+        goaway(dirname($url));
+    }
+
+    public function get()
+    {
+
+        if (argc() > 1) {
+            $channel = Channel::from_username(argv(1));
+        }
+        if (!$channel) {
+            notice(t('Channel unavailable.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $owner = intval($channel['channel_id']);
+        $observer = App::get_observer();
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!($perms['view_storage'] || is_site_admin())) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+
+        if (argc() > 3 && argv(3) === 'delete') {
+            if (argc() > 4 && argv(4) === 'json') {
+                $json_return = true;
+            }
+
+            $admin_delete = false;
+
+            if (!$perms['write_storage']) {
+                if (is_site_admin()) {
+                    $admin_delete = true;
+                } else {
+                    notice(t('Permission denied.') . EOL);
+                    if ($json_return) {
+                        json_return_and_die(['success' => false]);
+                    }
+                    return;
+                }
+            }
+
+            $file = intval(argv(2));
+            $r = q(
+                "SELECT hash, creator FROM attach WHERE id = %d AND uid = %d LIMIT 1",
+                dbesc($file),
+                intval($owner)
+            );
+            if (!$r) {
+                notice(t('File not found.') . EOL);
+
+                if ($json_return) {
+                    json_return_and_die(['success' => false]);
+                }
+
+                goaway(z_root() . '/cloud/' . $which);
+            }
+
+            $f = array_shift($r);
+
+            if (intval(local_channel()) !== $owner) {
+                if ($f['creator'] && $f['creator'] !== $ob_hash) {
+                    notice(t('Permission denied.') . EOL);
+
+                    if ($json_return) {
+                        json_return_and_die(['success' => false]);
+                    }
+                    goaway(z_root() . '/cloud/' . $which);
+                }
+            }
+
+            $url = get_cloud_url($channel['channel_id'], $channel['channel_address'], $f['hash']);
+
+            attach_delete($owner, $f['hash']);
+
+            if (!$admin_delete) {
+                $sync = attach_export_data($channel, $f['hash'], true);
+                if ($sync) {
+                    Libsync::build_sync_packet($channel['channel_id'], ['file' => [$sync]]);
+                }
+            }
+
+            if ($json_return) {
+                json_return_and_die(['success' => true]);
+            }
+
+            goaway(dirname($url));
+        }
+
+
+        // Since we have ACL'd files in the wild, but don't have ACL here yet, we
+        // need to return for anyone other than the owner, despite the perms check for now.
+
+        $is_owner = (((local_channel()) && ($owner == local_channel())) ? true : false);
+        if (!($is_owner || is_site_admin())) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+
+        if (argc() > 3 && argv(3) === 'edit') {
+            if (!$perms['write_storage']) {
+                notice(t('Permission denied.') . EOL);
+                return;
+            }
+
+            $file = intval(argv(2));
+
+            $r = q(
+                "select id, uid, folder, filename, revision, flags, is_dir, os_storage, hash, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and uid = %d limit 1",
+                intval($file),
+                intval($owner)
+            );
+
+            $f = array_shift($r);
+
+            $channel = App::get_channel();
+
+            $cloudpath = get_cloudpath($f);
+
+            $aclselect_e = Libacl::populate($f, false, PermissionDescription::fromGlobalPermission('view_storage'));
+            $is_a_dir = (intval($f['is_dir']) ? true : false);
+
+            $lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock');
+
+            // Encode path that is used for link so it's a valid URL
+            // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly
+            $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath));
+            $folder_list = attach_folder_select_list($channel['channel_id']);
+
+            $o = replace_macros(Theme::get_template('attach_edit.tpl'), [
+                '$header' => t('Edit file permissions'),
+                '$file' => $f,
+                '$cloudpath' => z_root() . '/' . $encoded_path,
+                '$uid' => $channel['channel_id'],
+                '$channelnick' => $channel['channel_address'],
+                '$permissions' => t('Permissions'),
+                '$aclselect' => $aclselect_e,
+                '$allow_cid' => acl2json($f['allow_cid']),
+                '$allow_gid' => acl2json($f['allow_gid']),
+                '$deny_cid' => acl2json($f['deny_cid']),
+                '$deny_gid' => acl2json($f['deny_gid']),
+                '$lockstate' => $lockstate,
+                '$newname' => ['newname', t('Change filename to'), '', t('Leave blank to keep the existing filename')],
+                '$newdir' => ['newdir', t('Move to directory'), $f['folder'], '', $folder_list],
+                '$permset' => t('Set/edit permissions'),
+                '$recurse' => ['recurse', t('Include all files and sub folders'), 0, '', [t('No'), t('Yes')]],
+                '$backlink' => t('Return to file list'),
+                '$isadir' => $is_a_dir,
+                '$cpdesc' => t('Copy/paste this code to attach file to a post'),
+                '$cpldesc' => t('Copy/paste this URL to link file from a web page'),
+                '$submit' => t('Submit'),
+                '$attach_btn_title' => t('Share this file'),
+                '$link_btn_title' => t('Show URL to this file'),
+                '$notify' => ['notify_edit', t('Show in your contacts shared folder'), 0, '', [t('No'), t('Yes')]],
+            ]);
+
+            echo $o;
+            killme();
+        }
+        goaway(z_root() . '/cloud/' . $which);
+    }
+}
diff --git a/Code/Module/Finger.php b/Code/Module/Finger.php
new file mode 100644
index 000000000..45302d397
--- /dev/null
+++ b/Code/Module/Finger.php
@@ -0,0 +1,38 @@
+ t('Webfinger Diagnostic'),
+            '$resource' => ['resource', t('Lookup address or URL'), $_GET['resource'], EMPTY_STR],
+            '$submit' => t('Submit')
+        ]);
+
+        if ($_GET['resource']) {
+            $resource = trim(escape_tags($_GET['resource']));
+
+            $result = Webfinger::exec($resource);
+
+            $o .= '
      ' . str_replace("\n", '
      ', print_array($result)) . '
      ';
+        }
+        return $o;
+    }
+}
diff --git a/Code/Module/Follow.php b/Code/Module/Follow.php
new file mode 100644
index 000000000..39e7b71bf
--- /dev/null
+++ b/Code/Module/Follow.php
@@ -0,0 +1,175 @@
+= 2) {
+            $abook_id = intval(argv(1));
+            if (!$abook_id) {
+                return;
+            }
+
+            $r = q(
+                "select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d",
+                intval($abook_id)
+            );
+            if (!$r) {
+                return;
+            }
+
+            $chan = Channel::from_id($r[0]['abook_channel']);
+
+            if (!$chan) {
+                http_status_exit(404, 'Not found');
+            }
+
+            $actor = Activity::encode_person($chan, true, true);
+            if (!$actor) {
+                http_status_exit(404, 'Not found');
+            }
+
+            // Pleroma requires a unique follow id for every follow and follow response
+            // instead of our method of re-using the abook_id. This causes issues if they unfollow
+            // and re-follow so md5 their follow id and slap it on the end so they don't simply discard our
+            // subsequent accept/reject actions.
+
+            $orig_follow = get_abconfig($chan['channel_id'], $r[0]['xchan_hash'], 'activitypub', 'their_follow_id');
+            $orig_follow_type = get_abconfig($chan['channel_id'], $r[0]['xchan_hash'], 'activitypub', 'their_follow_type');
+
+            as_return_and_die([
+                'id' => z_root() . '/follow/' . $r[0]['abook_id'] . (($orig_follow) ? '/' . md5($orig_follow) : EMPTY_STR),
+                'type' => (($orig_follow_type) ? $orig_follow_type : 'Follow'),
+                'actor' => $actor,
+                'object' => $r[0]['xchan_url']
+            ], $chan);
+        }
+
+
+        $uid = local_channel();
+
+        if (!$uid) {
+            return;
+        }
+
+        $url = notags(trim(punify($_REQUEST['url'])));
+        $return_url = $_SESSION['return_url'];
+        $confirm = intval($_REQUEST['confirm']);
+        $interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);
+        $channel = App::get_channel();
+
+        if ((strpos($url, 'http') === 0) || strpos($url, 'bear:') === 0 || strpos($url, 'x-zot:') === 0) {
+            $n = Activity::fetch($url);
+            if ($n && isset($n['type']) && !ActivityStreams::is_an_actor($n['type'])) {
+                // set client flag to convert objects to implied activities
+                $a = new ActivityStreams($n, null, true);
+                if (
+                    $a->type === 'Announce' && is_array($a->obj)
+                    && array_key_exists('object', $a->obj) && array_key_exists('actor', $a->obj)
+                ) {
+                    // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
+                    // Reparse the encapsulated Activity and use that instead
+                    logger('relayed activity', LOGGER_DEBUG);
+                    $a = new ActivityStreams($a->obj, null, true);
+                }
+
+                if ($a->is_valid()) {
+                    if (is_array($a->actor) && array_key_exists('id', $a->actor)) {
+                        Activity::actor_store($a->actor['id'], $a->actor);
+                    }
+
+                    // ActivityPub sourced items are cacheable
+                    $item = Activity::decode_note($a, true);
+
+                    if ($item) {
+                        Activity::store($channel, get_observer_hash(), $a, $item, true);
+
+                        $r = q(
+                            "select * from item where mid = '%s' and uid = %d",
+                            dbesc($item['mid']),
+                            intval($uid)
+                        );
+                        if ($r) {
+                            if ($interactive) {
+                                goaway(z_root() . '/display/' . gen_link_id($item['mid']));
+                            } else {
+                                $result['success'] = true;
+                                json_return_and_die($result);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
+        $result = Connect::connect($channel, $url);
+
+        if ($result['success'] == false) {
+            if ($result['message']) {
+                notice($result['message']);
+            }
+            if ($interactive) {
+                goaway($return_url);
+            } else {
+                json_return_and_die($result);
+            }
+        }
+
+        info(t('Connection added.') . EOL);
+
+        $clone = [];
+        foreach ($result['abook'] as $k => $v) {
+            if (strpos($k, 'abook_') === 0) {
+                $clone[$k] = $v;
+            }
+        }
+        unset($clone['abook_id']);
+        unset($clone['abook_account']);
+        unset($clone['abook_channel']);
+
+        $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
+        if ($abconfig) {
+            $clone['abconfig'] = $abconfig;
+        }
+        Libsync::build_sync_packet(0, ['abook' => [$clone]], true);
+
+        $can_view_stream = their_perms_contains($channel['channel_id'], $clone['abook_xchan'], 'view_stream');
+
+        // If we can view their stream, pull in some posts
+
+        if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) {
+            Run::Summon(['Onepoll', $result['abook']['abook_id']]);
+        }
+
+        if ($interactive) {
+            goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1');
+        } else {
+            json_return_and_die(['success' => true]);
+        }
+    }
+
+    public function get()
+    {
+        if (!local_channel()) {
+            return login();
+        }
+    }
+}
diff --git a/Code/Module/Followers.php b/Code/Module/Followers.php
new file mode 100644
index 000000000..d2f4a3007
--- /dev/null
+++ b/Code/Module/Followers.php
@@ -0,0 +1,94 @@
+ 100) {
+            $ret = Activity::paged_collection_init($t[0]['total'], App::$query_string);
+        } else {
+            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+
+            $r = q(
+                "select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql",
+                intval($channel['channel_id']),
+                intval($channel['channel_id']),
+                dbesc($channel['channel_hash'])
+            );
+
+            $this->results = $r;
+			$ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']);
+        }
+
+        if (ActivityStreams::is_as_request()) {
+            as_return_and_die($ret, $channel);
+        }
+    }
+
+	function get() {
+
+		if ($this->results) {
+            foreach ($this->results as $member) {
+                $members[] = micropro($member, true, 'mpgroup', 'card');
+            }
+        }
+        $o = replace_macros(Theme::get_template('listmembers.tpl'), [
+            '$title' => t('List members'),
+            '$members' => $members
+        ]);
+        return $o;
+	}
+}
diff --git a/Code/Module/Following.php b/Code/Module/Following.php
new file mode 100644
index 000000000..354498e38
--- /dev/null
+++ b/Code/Module/Following.php
@@ -0,0 +1,97 @@
+ 100) {
+            $ret = Activity::paged_collection_init($t[0]['total'], App::$query_string);
+        } else {
+            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+
+            $r = q(
+                "select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'my_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql",
+                intval($channel['channel_id']),
+                intval($channel['channel_id']),
+                dbesc($channel['channel_hash'])
+            );
+
+			$this->results = $r;
+			
+            $ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']);
+        }
+
+        if (ActivityStreams::is_as_request()) {
+            as_return_and_die($ret, $channel);
+        }
+    }
+
+	function get() {
+
+		if ($this->results) {
+            foreach ($this->results as $member) {
+                $members[] = micropro($member, true, 'mpgroup', 'card');
+            }
+        }
+        $o = replace_macros(Theme::get_template('listmembers.tpl'), [
+            '$title' => t('List members'),
+            '$members' => $members
+        ]);
+        return $o;
+	}
+
+}
diff --git a/Code/Module/Future.php b/Code/Module/Future.php
new file mode 100644
index 000000000..aecc72190
--- /dev/null
+++ b/Code/Module/Future.php
@@ -0,0 +1,21 @@
+' . $desc . '';
+
+        return $text;
+    }
+}
diff --git a/Code/Module/Getfile.php b/Code/Module/Getfile.php
new file mode 100644
index 000000000..3eb713f7e
--- /dev/null
+++ b/Code/Module/Getfile.php
@@ -0,0 +1,148 @@
+ 1) {
+            $verify_hash = argv(1);
+            if ($verify_hash !== $resource) {
+                logger('resource mismatch');
+                killme();
+            }
+        }
+
+        if (!$hash) {
+            logger('no sender hash');
+            killme();
+        }
+
+        foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) {
+            if (array_key_exists($head, $_SERVER) && substr(trim($_SERVER[$head]), 0, 9) === 'Signature') {
+                if ($head !== 'HTTP_AUTHORIZATION') {
+                    $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
+                    continue;
+                }
+
+                $verified = HTTPSig::verify('');
+                if ($verified && $verified['header_signed'] && $verified['header_valid']) {
+                    $r = q(
+                        "select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_addr = '%s' limit 1",
+                        dbesc($verified['signer']),
+                        dbesc(str_replace('acct:', '', $verified['signer']))
+                    );
+                    if ($r && $r[0]['hubloc_hash'] === $hash) {
+                        $header_verified = true;
+                    }
+                }
+            }
+        }
+
+        if (!$header_verified) {
+            http_status_exit(403, 'Permission denied');
+        }
+
+        $channel = Channel::from_hash($hash);
+
+        if (!$channel) {
+            logger('error: missing info');
+            killme();
+        }
+
+        if ($resolution > 0) {
+            $r = q(
+                "select * from photo where resource_id = '%s' and uid = %d and imgscale = %d limit 1",
+                dbesc($resource),
+                intval($channel['channel_id']),
+                intval($resolution)
+            );
+            if ($r) {
+                header('Content-type: ' . $r[0]['mimetype']);
+
+                if (intval($r[0]['os_storage'])) {
+                    $fname = dbunescbin($r[0]['content']);
+                    if (strpos($fname, 'store') !== false) {
+                        $istream = fopen($fname, 'rb');
+                    } else {
+                        $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname, 'rb');
+                    }
+                    $ostream = fopen('php://output', 'wb');
+                    if ($istream && $ostream) {
+                        pipe_streams($istream, $ostream);
+                        fclose($istream);
+                        fclose($ostream);
+                    }
+                } else {
+                    echo dbunescbin($r[0]['content']);
+                }
+            }
+            killme();
+        }
+
+        $r = attach_by_hash($resource, $channel['channel_hash'], $revision);
+
+        if (!$r['success']) {
+            logger('attach_by_hash failed: ' . $r['message']);
+            notice($r['message'] . EOL);
+            return;
+        }
+
+        header('Content-type: ' . $r['data']['filetype']);
+        header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"');
+        if (intval($r['data']['os_storage'])) {
+            $fname = dbunescbin($r['data']['content']);
+            if (strpos($fname, 'store') !== false) {
+                $istream = fopen($fname, 'rb');
+            } else {
+                $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname, 'rb');
+            }
+            $ostream = fopen('php://output', 'wb');
+            if ($istream && $ostream) {
+                pipe_streams($istream, $ostream);
+                fclose($istream);
+                fclose($ostream);
+            }
+        } else {
+            echo dbunescbin($r['data']['content']);
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Hashtags.php b/Code/Module/Hashtags.php
new file mode 100644
index 000000000..cb3097702
--- /dev/null
+++ b/Code/Module/Hashtags.php
@@ -0,0 +1,37 @@
+ $rv['term']];
+            }
+        }
+
+        json_return_and_die($result);
+    }
+}
diff --git a/Code/Module/Hcard.php b/Code/Module/Hcard.php
new file mode 100644
index 000000000..fc8d35be5
--- /dev/null
+++ b/Code/Module/Hcard.php
@@ -0,0 +1,78 @@
+ 1) {
+            $which = argv(1);
+        } else {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        logger('hcard_request: ' . $which, LOGGER_DEBUG);
+
+        $profile = '';
+        $channel = App::get_channel();
+
+        if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+            $which = $channel['channel_address'];
+            $profile = argv(1);
+            $r = q(
+                "select profile_guid from profile where id = %d and uid = %d limit 1",
+                intval($profile),
+                intval(local_channel())
+            );
+            if (!$r) {
+                $profile = '';
+            }
+            $profile = $r[0]['profile_guid'];
+        }
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/atom+xml',
+            'title' => t('Posts and comments'),
+            'href' => z_root() . '/feed/' . $which
+        ]);
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/atom+xml',
+            'title' => t('Only posts'),
+            'href' => z_root() . '/feed/' . $which . '?f=&top=1'
+        ]);
+
+
+        if (!$profile) {
+            $x = q(
+                "select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
+                dbesc(argv(1))
+            );
+            if ($x) {
+                App::$profile = $x[0];
+            }
+        }
+
+        Libprofile::load($which, $profile);
+    }
+
+
+    public function get()
+    {
+
+        $x = new \Code\Widget\Profile();
+        return $x->widget([]);
+    }
+}
diff --git a/Code/Module/Help.php b/Code/Module/Help.php
new file mode 100644
index 000000000..362bd7fd3
--- /dev/null
+++ b/Code/Module/Help.php
@@ -0,0 +1,145 @@
+';
+            $o .= '
      ';
+            $o .= '
      ' . t('Documentation Search') . ' - ' . htmlspecialchars($_REQUEST['search']) . '
      ';
+            $o .= '
      ';
+            $o .= '
      ';
+
+            $r = search_doc_files($_REQUEST['search']);
+            if ($r) {
+                $o .= '
        ';
+                foreach ($r as $rr) {
+                    $dirname = dirname($rr['v']);
+                    $fname = basename($rr['v']);
+                    $fname = substr($fname, 0, strrpos($fname, '.'));
+                    $path = trim(substr($dirname, 4), '/');
+
+                    $o .= '
      • ' . ucwords(str_replace('_', ' ', notags($fname))) . '
        '
+                        . '' . 'help/' . (($path) ? $path . '/' : '') . $fname . '
        '
+                        . '...' . str_replace('$Projectname', System::get_platform_name(), $rr['text']) . '...

        • ';
+                }
+                $o .= '
      ';
+                $o .= '
      ';
+                $o .= '';
+            }
+
+            return $o;
+        }
+
+
+        if (argc() > 2 && argv(argc() - 2) === 'assets') {
+            $path = '';
+            for ($x = 1; $x < argc(); $x++) {
+                if (strlen($path)) {
+                    $path .= '/';
+                }
+                $path .= argv($x);
+            }
+            $realpath = 'doc/' . $path;
+            //Set the content-type header as appropriate
+            $imageInfo = getimagesize($realpath);
+            switch ($imageInfo[2]) {
+                case IMAGETYPE_JPEG:
+                    header("Content-Type: image/jpeg");
+                    break;
+                case IMAGETYPE_GIF:
+                    header("Content-Type: image/gif");
+                    break;
+                case IMAGETYPE_PNG:
+                    header("Content-Type: image/png");
+                    break;
+                default:
+                    break;
+            }
+            header("Content-Length: " . filesize($realpath));
+
+            // dump the picture and stop the script
+            readfile($realpath);
+            killme();
+        }
+
+        if (argc() === 1) {
+            $files = self::listdir('doc');
+
+            if ($files) {
+                foreach ($files as $file) {
+                    if ((!strpos($file, '/site/')) && file_exists(str_replace('doc/', 'doc/site/', $file))) {
+                        continue;
+                    }
+                    if (strpos($file, 'README')) {
+                        continue;
+                    }
+                    if (preg_match('/\/(..|..\-..)\//', $file, $matches)) {
+                        $language = $matches[1];
+                    } else {
+                        $language = t('Unknown language');
+                    }
+                    if ($language === substr(App::$language, 0, 2)) {
+                        $language = '';
+                    }
+
+                    $link = str_replace(['doc/', '.mc'], ['help/', ''], $file);
+                    if (strpos($link, '/global/') !== false || strpos($link, '/media/') !== false) {
+                        continue;
+                    }
+                    $content .= '
      ' . ucfirst(basename($link)) . '
      ' . (($language) ? " [$language]" : '') . EOL;
+                }
+            }
+        } else {
+            $content = get_help_content();
+        }
+
+
+        return replace_macros(Theme::get_template('help.tpl'), array(
+            '$title' => t('$Projectname Documentation'),
+            '$tocHeading' => t('Contents'),
+            '$content' => $content,
+            '$heading' => $heading,
+            '$language' => $language
+        ));
+    }
+
+    public static function listdir($path)
+    {
+        $results = [];
+        $handle = opendir($path);
+        if (!$handle) {
+            return $results;
+        }
+        while (false !== ($file = readdir($handle))) {
+            if ($file === '.' || $file === '..') {
+                continue;
+            }
+            if (is_dir($path . '/' . $file)) {
+                $results = array_merge($results, self::listdir($path . '/' . $file));
+            } else {
+                $results[] = $path . '/' . $file;
+            }
+        }
+        closedir($handle);
+        return $results;
+    }
+}
diff --git a/Code/Module/Home.php b/Code/Module/Home.php
new file mode 100644
index 000000000..1d37bcafc
--- /dev/null
+++ b/Code/Module/Home.php
@@ -0,0 +1,173 @@
+ [
+                ACTIVITYSTREAMS_JSONLD_REV,
+                'https://w3id.org/security/v1',
+                Activity::ap_schema()
+            ]], Activity::encode_site());
+
+            $headers = [];
+            $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
+            $x['signature'] = LDSignatures::sign($x, ['channel_address' => z_root(), 'channel_prvkey' => get_config('system', 'prvkey')]);
+            $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
+            logger('data: ' . jindent($ret), LOGGER_DATA);
+            $headers['Date'] = datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T');
+            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
+            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
+
+            $h = HTTPSig::create_sig($headers, get_config('system', 'prvkey'), z_root());
+            HTTPSig::set_headers($h);
+
+            echo $ret;
+            killme();
+        }
+
+        if (Libzot::is_zot_request()) {
+            $channel = Channel::get_system();
+            $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
+
+            if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
+                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']]));
+                $s = q(
+                    "select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad') limit 1",
+                    dbesc($sigdata['signer'])
+                );
+
+                if ($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) {
+                    $data = json_encode(Crypto::encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto'])));
+                }
+            } else {
+                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']]));
+            }
+
+            $headers = [
+                'Content-Type' => 'application/x-nomad+json',
+                'Digest' => HTTPSig::generate_digest_header($data),
+                '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
+            ];
+            $h = HTTPSig::create_sig($headers, get_config('system', 'prvkey'), z_root());
+            HTTPSig::set_headers($h);
+            echo $data;
+            killme();
+        }
+
+
+        $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false);
+
+        $channel = App::get_channel();
+        if (local_channel() && $channel && $channel['xchan_url'] && !$splash) {
+            $dest = $channel['channel_startpage'];
+            if (!$dest) {
+                $dest = get_pconfig(local_channel(), 'system', 'startpage');
+            }
+            if (!$dest) {
+                $dest = get_config('system', 'startpage');
+            }
+            if (!$dest) {
+                $dest = z_root() . '/stream';
+            }
+            goaway($dest);
+        }
+
+        if (remote_channel() && (!$splash) && $_SESSION['atoken']) {
+            $r = q(
+                "select * from atoken where atoken_id = %d",
+                intval($_SESSION['atoken'])
+            );
+            if ($r) {
+                $x = Channel::from_id($r[0]['atoken_uid']);
+                if ($x) {
+                    goaway(z_root() . '/channel/' . $x['channel_address']);
+                }
+            }
+        }
+
+
+        if (get_account_id() && !$splash) {
+            goaway(z_root() . '/new_channel');
+        }
+    }
+
+
+    public function get()
+    {
+
+        $o = EMPTY_STR;
+
+        if (x($_SESSION, 'theme')) {
+            unset($_SESSION['theme']);
+        }
+        if (x($_SESSION, 'mobile_theme')) {
+            unset($_SESSION['mobile_theme']);
+        }
+
+        $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false);
+
+        Hook::call('home_content', $o);
+        if ($o) {
+            return $o;
+        }
+
+        $frontpage = get_config('system', 'frontpage');
+        if ($frontpage) {
+            if (strpos($frontpage, 'include:') !== false) {
+                $file = trim(str_replace('include:', '', $frontpage));
+                if (file_exists($file)) {
+                    App::$page['template'] = 'full';
+                    App::$page['title'] = t('$Projectname');
+                    $o .= file_get_contents($file);
+                    return $o;
+                }
+            }
+            if (strpos($frontpage, 'http') !== 0) {
+                $frontpage = z_root() . '/' . $frontpage;
+            }
+            if (intval(get_config('system', 'mirror_frontpage'))) {
+                $o = '' . t('$Projectname') . '';
+                echo $o;
+                killme();
+            }
+            goaway($frontpage);
+        }
+
+
+        $sitename = get_config('system', 'sitename');
+        if ($sitename) {
+            $o .= '
      ' . sprintf(t('Welcome to %s'), $sitename) . '
      ';
+        }
+
+        $loginbox = get_config('system', 'login_on_homepage');
+        if (intval($loginbox) || $loginbox === false) {
+            $o .= login(true);
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Hostxrd.php b/Code/Module/Hostxrd.php
new file mode 100644
index 000000000..0d9f38905
--- /dev/null
+++ b/Code/Module/Hostxrd.php
@@ -0,0 +1,32 @@
+ App::get_hostname(),
+            '$zroot' => z_root()
+        ));
+        $arr = array('xrd' => $x);
+        Hook::call('hostxrd', $arr);
+
+        echo $arr['xrd'];
+        killme();
+    }
+}
diff --git a/Code/Module/Hq.php b/Code/Module/Hq.php
new file mode 100644
index 000000000..900c1cf80
--- /dev/null
+++ b/Code/Module/Hq.php
@@ -0,0 +1,321 @@
+loading) {
+            $_SESSION['loadtime_hq'] = datetime_convert();
+        }
+
+        if (argc() > 1 && argv(1) !== 'load') {
+            $item_hash = argv(1);
+        }
+
+        if ($_REQUEST['mid']) {
+            $item_hash = $_REQUEST['mid'];
+        }
+
+        $item_normal = item_normal();
+        $item_normal_update = item_normal_update();
+
+        if (!$item_hash) {
+            $r = q(
+                "SELECT mid FROM item 
+				WHERE uid = %d $item_normal
+				AND mid = parent_mid 
+				ORDER BY created DESC LIMIT 1",
+                intval(local_channel())
+            );
+
+            if ($r[0]['mid']) {
+                $item_hash = gen_link_id($r[0]['mid']);
+            }
+        }
+
+        if ($item_hash) {
+            $item_hash = unpack_link_id($item_hash);
+
+            $target_item = null;
+
+            $r = q(
+                "select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1",
+                dbesc($item_hash . '%')
+            );
+
+            if ($r) {
+                $target_item = $r[0];
+            }
+
+            //if the item is to be moderated redirect to /moderate
+            if ($target_item['item_blocked'] == ITEM_MODERATED) {
+                goaway(z_root() . '/moderate/' . $target_item['id']);
+            }
+
+            $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
+
+            $simple_update = (($this->updating) ? " AND item_unseen = 1 " : '');
+
+            if ($this->updating && $_SESSION['loadtime_hq']) {
+                $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_hq']) . "' ";
+            }
+
+            if ($static && $simple_update) {
+                $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
+            }
+
+            $sys = Channel::get_system();
+            $sql_extra = item_permissions_sql($sys['channel_id']);
+
+            $sys_item = false;
+        }
+
+        if (!$this->updating) {
+            $channel = App::get_channel();
+
+            $channel_acl = [
+                'allow_cid' => $channel['channel_allow_cid'],
+                'allow_gid' => $channel['channel_allow_gid'],
+                'deny_cid' => $channel['channel_deny_cid'],
+                'deny_gid' => $channel['channel_deny_gid']
+            ];
+
+            $x = [
+                'is_owner' => true,
+                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
+                'default_location' => $channel['channel_location'],
+                'nickname' => $channel['channel_address'],
+                'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
+                'permissions' => $channel_acl,
+                'bang' => '',
+                'visitor' => true,
+                'profile_uid' => local_channel(),
+                'return_path' => 'hq',
+                'expanded' => true,
+                'editor_autocomplete' => true,
+                'bbco_autocomplete' => 'bbcode',
+                'bbcode' => true,
+                'jotnets' => true,
+                'reset' => t('Reset form')
+            ];
+
+            $o = replace_macros(
+                Theme::get_template("hq.tpl"),
+                [
+                    '$no_messages' => (($target_item) ? false : true),
+                    '$no_messages_label' => [t('Welcome to $Projectname!'), t('You have got no unseen posts...')],
+                    '$editor' => status_editor($x)
+                ]
+            );
+        }
+
+        if (!$this->updating && !$this->loading) {
+            Navbar::set_selected('HQ');
+
+            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 1);
+
+            if ($target_item) {
+                // if the target item is not a post (eg a like) we want to address its thread parent
+                $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
+
+                // if we got a decoded hash we must encode it again before handing to javascript
+                $mid = gen_link_id($mid);
+            } else {
+                $mid = '';
+            }
+
+            $o .= '
      ' . "\r\n";
+            $o .= "\r\n";
+
+            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), [
+                '$baseurl' => z_root(),
+                '$pgtype' => 'hq',
+                '$uid' => local_channel(),
+                '$gid' => '0',
+                '$cid' => '0',
+                '$cmin' => '0',
+                '$cmax' => '99',
+                '$star' => '0',
+                '$liked' => '0',
+                '$conv' => '0',
+                '$spam' => '0',
+                '$fh' => '0',
+                '$dm' => '0',
+                '$nouveau' => '0',
+                '$wall' => '0',
+                '$draft' => '0',
+                '$static' => $static,
+                '$page' => 1,
+                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
+                '$search' => '',
+                '$xchan' => '',
+                '$order' => '',
+                '$file' => '',
+                '$cats' => '',
+                '$tags' => '',
+                '$dend' => '',
+                '$dbegin' => '',
+                '$verb' => '',
+                '$net' => '',
+                '$mid' => (($mid) ? urlencode($mid) : '')
+            ]);
+        }
+
+        $updateable = false;
+
+        if ($this->loading && $target_item) {
+            $r = null;
+
+            $r = q(
+                "SELECT item.id AS item_id FROM item
+				WHERE uid = %d
+				AND mid = '%s'
+				$item_normal
+				LIMIT 1",
+                intval(local_channel()),
+                dbesc($target_item['parent_mid'])
+            );
+
+            if ($r) {
+                $updateable = true;
+            }
+
+            if (!$r) {
+                $sys_item = true;
+
+                $r = q(
+                    "SELECT item.id AS item_id FROM item
+					LEFT JOIN abook ON item.author_xchan = abook.abook_xchan
+					WHERE mid = '%s' AND item.uid = %d $item_normal
+					AND (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra LIMIT 1",
+                    dbesc($target_item['parent_mid']),
+                    intval($sys['channel_id'])
+                );
+            }
+        } elseif ($this->updating && $target_item) {
+            $r = null;
+
+            $r = q(
+                "SELECT item.parent AS item_id FROM item
+				WHERE uid = %d
+				AND parent_mid = '%s'
+				$item_normal_update
+				$simple_update
+				LIMIT 1",
+                intval(local_channel()),
+                dbesc($target_item['parent_mid'])
+            );
+
+            if ($r) {
+                $updateable = true;
+            }
+
+            if (!$r) {
+                $sys_item = true;
+
+                $r = q(
+                    "SELECT item.parent AS item_id FROM item
+					LEFT JOIN abook ON item.author_xchan = abook.abook_xchan
+					WHERE mid = '%s' AND item.uid = %d $item_normal_update $simple_update
+					AND (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra LIMIT 1",
+                    dbesc($target_item['parent_mid']),
+                    intval($sys['channel_id'])
+                );
+            }
+
+            $_SESSION['loadtime_hq'] = datetime_convert();
+        } else {
+            $r = [];
+        }
+
+        if ($r) {
+            $items = q(
+                "SELECT item.*, item.id AS item_id 
+				FROM item
+				WHERE parent = '%s' $item_normal ",
+                dbesc($r[0]['item_id'])
+            );
+
+            xchan_query($items, true, (($sys_item) ? local_channel() : 0));
+            $items = fetch_post_tags($items, true);
+            $items = conv_sort($items, 'created');
+        } else {
+            $items = [];
+        }
+
+        $o .= conversation($items, 'hq', $this->updating, 'client');
+
+        if ($updateable) {
+            $x = q(
+                "UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d AND parent = %d ",
+                intval(local_channel()),
+                intval($r[0]['item_id'])
+            );
+        }
+
+        $o .= '
      ';
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Id.php b/Code/Module/Id.php
new file mode 100644
index 000000000..84c1dc75d
--- /dev/null
+++ b/Code/Module/Id.php
@@ -0,0 +1,119 @@
+ 2) {
+                $item_id = argv(2);
+            }
+
+            $portable_id = EMPTY_STR;
+
+            $sigdata = HTTPSig::verify(EMPTY_STR);
+            if ($sigdata['portable_id'] && $sigdata['header_valid']) {
+                $portable_id = $sigdata['portable_id'];
+            }
+
+            $chan = Channel::from_hash($request_portable_id);
+
+            if ($chan) {
+                $channel_id = $chan['channel_id'];
+                if (!$item_id) {
+                    $handler = new Channel();
+                    App::$argc = 2;
+                    App::$argv[0] = 'channel';
+                    App::$argv[1] = $chan['channel_address'];
+                    $handler->init();
+                }
+            } else {
+                http_status_exit(404, 'Not found');
+            }
+
+
+            $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
+
+            $sql_extra = item_permissions_sql(0);
+
+            $r = q(
+                "select * from item where uuid = '%s' $item_normal $sql_extra and uid = %d limit 1",
+                dbesc($item_id),
+                intval($channel_id)
+            );
+            if (!$r) {
+                $r = q(
+                    "select * from item where uuid = '%s' $item_normal and uid = %d limit 1",
+                    dbesc($item_id),
+                    intval($channel_id)
+                );
+                if ($r) {
+                    http_status_exit(403, 'Forbidden');
+                }
+                http_status_exit(404, 'Not found');
+            }
+
+            if (!perm_is_allowed($chan['channel_id'], get_observer_hash(), 'view_stream')) {
+                http_status_exit(403, 'Forbidden');
+            }
+
+            xchan_query($r, true);
+            $items = fetch_post_tags($r, true);
+
+            $i = Activity::encode_item($items[0], (get_config('system', 'activitypub', ACTIVITYPUB_ENABLED) ? true : false));
+
+            if (!$i) {
+                http_status_exit(404, 'Not found');
+            }
+
+            $x = array_merge(['@context' => [
+                ACTIVITYSTREAMS_JSONLD_REV,
+                'https://w3id.org/security/v1',
+                Activity::ap_schema()
+            ]], $i);
+
+            $headers = [];
+            $headers['Content-Type'] = 'application/x-nomad+json';
+            $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
+            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
+            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
+            $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::url($chan));
+            HTTPSig::set_headers($h);
+            echo $ret;
+            killme();
+        }
+    }
+}
diff --git a/Code/Module/Impel.php b/Code/Module/Impel.php
new file mode 100644
index 000000000..4a1c406f0
--- /dev/null
+++ b/Code/Module/Impel.php
@@ -0,0 +1,213 @@
+ false);
+
+        if (!local_channel()) {
+            json_return_and_die($ret);
+        }
+
+        logger('impel: ' . print_r($_REQUEST, true), LOGGER_DATA);
+
+        $elm = $_REQUEST['element'];
+        $x = base64url_decode($elm);
+        if (!$x) {
+            json_return_and_die($ret);
+        }
+
+        $j = json_decode($x, true);
+        if (!$j) {
+            json_return_and_die($ret);
+        }
+
+        // logger('element: ' . print_r($j,true));
+
+        $channel = App::get_channel();
+
+        $arr = [];
+        $is_menu = false;
+
+        // a portable menu has its links rewritten with the local baseurl
+        $portable_menu = false;
+
+        switch ($j['type']) {
+            case 'webpage':
+                $arr['item_type'] = ITEM_TYPE_WEBPAGE;
+                $namespace = 'WEBPAGE';
+                $installed_type = t('webpage');
+                break;
+            case 'block':
+                $arr['item_type'] = ITEM_TYPE_BLOCK;
+                $namespace = 'BUILDBLOCK';
+                $installed_type = t('block');
+                break;
+            case 'layout':
+                $arr['item_type'] = ITEM_TYPE_PDL;
+                $namespace = 'PDL';
+                $installed_type = t('layout');
+                break;
+            case 'portable-menu':
+                $portable_menu = true;
+            // fall through
+            case 'menu':
+                $is_menu = true;
+                $installed_type = t('menu');
+                break;
+            default:
+                logger('mod_impel: unrecognised element type' . print_r($j, true));
+                break;
+        }
+
+        if ($is_menu) {
+            $m = [];
+            $m['menu_channel_id'] = local_channel();
+            $m['menu_name'] = $j['pagetitle'];
+            $m['menu_desc'] = $j['desc'];
+            if ($j['created']) {
+                $m['menu_created'] = datetime_convert($j['created']);
+            }
+            if ($j['edited']) {
+                $m['menu_edited'] = datetime_convert($j['edited']);
+            }
+
+            $m['menu_flags'] = 0;
+            if ($j['flags']) {
+                if (in_array('bookmark', $j['flags'])) {
+                    $m['menu_flags'] |= MENU_BOOKMARK;
+                }
+                if (in_array('system', $j['flags'])) {
+                    $m['menu_flags'] |= MENU_SYSTEM;
+                }
+            }
+
+            $menu_id = Menu::create($m);
+
+            if ($menu_id) {
+                if (is_array($j['items'])) {
+                    foreach ($j['items'] as $it) {
+                        $mitem = [];
+
+                        $mitem['mitem_link'] = str_replace('[channelurl]', z_root() . '/channel/' . $channel['channel_address'], $it['link']);
+                        $mitem['mitem_link'] = str_replace('[pageurl]', z_root() . '/page/' . $channel['channel_address'], $it['link']);
+                        $mitem['mitem_link'] = str_replace('[cloudurl]', z_root() . '/cloud/' . $channel['channel_address'], $it['link']);
+                        $mitem['mitem_link'] = str_replace('[baseurl]', z_root(), $it['link']);
+
+                        $mitem['mitem_desc'] = escape_tags($it['desc']);
+                        $mitem['mitem_order'] = intval($it['order']);
+                        if (is_array($it['flags'])) {
+                            $mitem['mitem_flags'] = 0;
+                            if (in_array('zid', $it['flags'])) {
+                                $mitem['mitem_flags'] |= MENU_ITEM_ZID;
+                            }
+                            if (in_array('new-window', $it['flags'])) {
+                                $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN;
+                            }
+                            if (in_array('chatroom', $it['flags'])) {
+                                $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM;
+                            }
+                        }
+                        MenuItem::add($menu_id, local_channel(), $mitem);
+                    }
+                    if ($j['edited']) {
+                        $x = q(
+                            "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
+                            dbesc(datetime_convert('UTC', 'UTC', $j['edited'])),
+                            intval($menu_id),
+                            intval(local_channel())
+                        );
+                    }
+                }
+                $ret['success'] = true;
+            }
+            $x = $ret;
+        } else {
+            $arr['uid'] = local_channel();
+            $arr['aid'] = $channel['channel_account_id'];
+            $arr['title'] = $j['title'];
+            $arr['body'] = $j['body'];
+            $arr['term'] = $j['term'];
+            $arr['layout_mid'] = $j['layout_mid'];
+            $arr['created'] = datetime_convert('UTC', 'UTC', $j['created']);
+            $arr['edited'] = datetime_convert('UTC', 'UTC', $j['edited']);
+            $arr['owner_xchan'] = get_observer_hash();
+            $arr['author_xchan'] = (($j['author_xchan']) ? $j['author_xchan'] : get_observer_hash());
+            $arr['mimetype'] = (($j['mimetype']) ? $j['mimetype'] : 'text/x-multicode');
+
+            if (!$j['mid']) {
+                $j['uuid'] = new_uuid();
+                $j['mid'] = z_root() . '/item/' . $j['uuid'];
+            }
+
+            $arr['uuid'] = $j['uuid'];
+            $arr['mid'] = $arr['parent_mid'] = $j['mid'];
+
+
+            if ($j['pagetitle']) {
+                $pagetitle = strtolower(URLify::transliterate($j['pagetitle']));
+            }
+
+            // Verify ability to use html or php!!!
+
+            $execflag = ((intval($channel['channel_id']) == intval(local_channel()) && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
+
+            $i = q(
+                "select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
+                dbesc($arr['mid']),
+                intval(local_channel())
+            );
+
+            IConfig::Set($arr, 'system', $namespace, (($pagetitle) ? $pagetitle : substr($arr['mid'], 0, 16)), true);
+
+            if ($i) {
+                $arr['id'] = $i[0]['id'];
+                // don't update if it has the same timestamp as the original
+                if ($arr['edited'] > $i[0]['edited']) {
+                    $x = item_store_update($arr, $execflag);
+                }
+            } else {
+                if (($i) && (intval($i[0]['item_deleted']))) {
+                    // was partially deleted already, finish it off
+                    q(
+                        "delete from item where mid = '%s' and uid = %d",
+                        dbesc($arr['mid']),
+                        intval(local_channel())
+                    );
+                } else {
+                    $x = item_store($arr, $execflag);
+                }
+            }
+
+            if ($x && $x['success']) {
+                $item_id = $x['item_id'];
+            }
+        }
+
+        if ($x['success']) {
+            $ret['success'] = true;
+            info(sprintf(t('%s element installed'), $installed_type));
+        } else {
+            notice(sprintf(t('%s element installation failed'), $installed_type));
+        }
+
+        //??? should perhaps return ret?
+
+        json_return_and_die(true);
+    }
+}
diff --git a/Code/Module/Import.php b/Code/Module/Import.php
new file mode 100644
index 000000000..a556b1b45
--- /dev/null
+++ b/Code/Module/Import.php
@@ -0,0 +1,711 @@
+ $email . ':' . $password];
+            $ret = z_fetch_url($api_path, $binary, $redirects, $opts);
+            if ($ret['success']) {
+                $data = $ret['body'];
+            } else {
+                notice(t('Unable to download data from old server') . EOL);
+                return;
+            }
+        }
+
+        if (!$data) {
+            logger('Empty import file.');
+            notice(t('Imported file is empty.') . EOL);
+            return;
+        }
+
+        $data = json_decode($data, true);
+
+        //logger('import: data: ' . print_r($data,true));
+        //print_r($data);
+
+
+        // handle Friendica export
+
+        if (array_path_exists('user/parent-uid', $data)) {
+            $settings = ['account_id' => $account_id, 'sieze' => 1, 'newname' => $newname];
+            $f = new Friendica($data, $settings);
+
+            return;
+        }
+
+        if (!array_key_exists('compatibility', $data)) {
+            Hook::call('import_foreign_channel_data', $data);
+            if ($data['handled']) {
+                return;
+            }
+        }
+
+        $codebase = 'zap';
+
+        if ((!array_path_exists('compatibility/codebase', $data)) || $data['compatibility']['codebase'] !== $codebase) {
+            notice('Data export format is not compatible with this software');
+            return;
+        }
+
+        if ($moving) {
+            $seize = 1;
+        }
+
+        // import channel
+
+        $relocate = ((array_key_exists('relocate', $data)) ? $data['relocate'] : null);
+
+        if (array_key_exists('channel', $data)) {
+            $max_identities = ServiceClass::account_fetch($account_id, 'total_identities');
+
+            if ($max_identities !== false) {
+                $r = q(
+                    "select channel_id from channel where channel_account_id = %d and channel_removed = 0 ",
+                    intval($account_id)
+                );
+                if ($r && count($r) > $max_identities) {
+                    notice(sprintf(t('Your service plan only allows %d channels.'), $max_identities) . EOL);
+                    return;
+                }
+            }
+
+            if ($newname) {
+                $x = false;
+
+                if (get_config('system', 'unicode_usernames')) {
+                    $x = punify(mb_strtolower($newname));
+                }
+
+                if ((!$x) || strlen($x) > 64) {
+                    $x = strtolower(URLify::transliterate($newname));
+                } else {
+                    $x = $newname;
+                }
+                $newname = $x;
+            }
+
+            $channel = import_channel($data['channel'], $account_id, $seize, $newname);
+        } else {
+            $moving = false;
+            $channel = App::get_channel();
+        }
+
+        if (!$channel) {
+            logger('Channel not found. ' . print_r($channel, true));
+            notice(t('No channel. Import failed.') . EOL);
+            return;
+        }
+
+        if (is_array($data['config'])) {
+            import_config($channel, $data['config']);
+        }
+
+        logger('import step 2');
+
+        if (array_key_exists('channel', $data)) {
+            if ($data['photo']) {
+                import_channel_photo(base64url_decode($data['photo']['data']), $data['photo']['type'], $account_id, $channel['channel_id']);
+            }
+
+            if (is_array($data['profile'])) {
+                import_profiles($channel, $data['profile']);
+            }
+        }
+
+        logger('import step 3');
+
+        // import xchans and contact photos
+        // This *must* be done before importing hublocs
+
+        if (array_key_exists('channel', $data) && $seize) {
+            // replace any existing xchan we may have on this site if we're seizing control
+
+            $r = q(
+                "delete from xchan where xchan_hash = '%s'",
+                dbesc($channel['channel_hash'])
+            );
+
+            $r = xchan_store_lowlevel(
+                [
+                    'xchan_hash' => $channel['channel_hash'],
+                    'xchan_guid' => $channel['channel_guid'],
+                    'xchan_guid_sig' => $channel['channel_guid_sig'],
+                    'xchan_pubkey' => $channel['channel_pubkey'],
+                    'xchan_photo_l' => z_root() . "/photo/profile/l/" . $channel['channel_id'],
+                    'xchan_photo_m' => z_root() . "/photo/profile/m/" . $channel['channel_id'],
+                    'xchan_photo_s' => z_root() . "/photo/profile/s/" . $channel['channel_id'],
+                    'xchan_addr' => Channel::get_webfinger($channel),
+                    'xchan_url' => z_root() . '/channel/' . $channel['channel_address'],
+                    'xchan_connurl' => z_root() . '/poco/' . $channel['channel_address'],
+                    'xchan_follow' => z_root() . '/follow?f=&url=%s',
+                    'xchan_name' => $channel['channel_name'],
+                    'xchan_network' => 'nomad',
+                    'xchan_updated' => datetime_convert(),
+                    'xchan_photo_date' => datetime_convert(),
+                    'xchan_name_date' => datetime_convert()
+                ]
+            );
+        }
+
+        logger('import step 4');
+
+        // import xchans
+        $xchans = $data['xchan'];
+        if ($xchans) {
+            foreach ($xchans as $xchan) {
+                // Provide backward compatibility for zot11 based projects
+
+                if ($xchan['xchan_network'] === 'nomad' && version_compare(ZOT_REVISION, '10.0') <= 0) {
+                    $xchan['xchan_network'] = 'zot6';
+                }
+
+                $hash = Libzot::make_xchan_hash($xchan['xchan_guid'], $xchan['xchan_pubkey']);
+
+                if (in_array($xchan['xchan_network'], ['nomad', 'zot6']) && $hash !== $xchan['xchan_hash']) {
+                    logger('forged xchan: ' . print_r($xchan, true));
+                    continue;
+                }
+
+                $r = q(
+                    "select xchan_hash from xchan where xchan_hash = '%s' limit 1",
+                    dbesc($xchan['xchan_hash'])
+                );
+                if ($r) {
+                    continue;
+                }
+                xchan_store_lowlevel($xchan);
+
+
+                if ($xchan['xchan_hash'] === $channel['channel_hash']) {
+                    $r = q(
+                        "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'",
+                        dbesc(datetime_convert()),
+                        dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']),
+                        dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']),
+                        dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']),
+                        dbesc($xchan['xchan_hash'])
+                    );
+                } else {
+                    $photos = import_remote_xchan_photo($xchan['xchan_photo_l'], $xchan['xchan_hash']);
+                    if ($photos) {
+                        if ($photos[4]) {
+                            $photodate = NULL_DATE;
+                        } else {
+                            $photodate = $xchan['xchan_photo_date'];
+                        }
+
+                        $r = q(
+                            "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' where xchan_hash = '%s'",
+                            dbesc(datetime_convert()),
+                            dbesc($photos[0]),
+                            dbesc($photos[1]),
+                            dbesc($photos[2]),
+                            dbesc($photos[3]),
+                            dbesc($photodate),
+                            dbesc($xchan['xchan_hash'])
+                        );
+                    }
+                }
+            }
+
+            logger('import step 5');
+        }
+
+
+        logger('import step 6');
+
+
+        if (is_array($data['hubloc'])) {
+            import_hublocs($channel, $data['hubloc'], $seize, $moving);
+        }
+
+        logger('import step 7');
+
+        // create new hubloc for the new channel at this site
+
+        if (array_key_exists('channel', $data)) {
+            $r = hubloc_store_lowlevel(
+                [
+                    'hubloc_guid' => $channel['channel_guid'],
+                    'hubloc_guid_sig' => $channel['channel_guid_sig'],
+                    'hubloc_id_url' => Channel::url($channel),
+                    'hubloc_hash' => $channel['channel_hash'],
+                    'hubloc_addr' => Channel::get_webfinger($channel),
+                    'hubloc_network' => 'nomad',
+                    'hubloc_primary' => (($seize) ? 1 : 0),
+                    'hubloc_url' => z_root(),
+                    'hubloc_url_sig' => Libzot::sign(z_root(), $channel['channel_prvkey']),
+                    'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')),
+                    'hubloc_host' => App::get_hostname(),
+                    'hubloc_callback' => z_root() . '/zot',
+                    'hubloc_sitekey' => get_config('system', 'pubkey'),
+                    'hubloc_updated' => datetime_convert()
+                ]
+            );
+
+            // reset the original primary hubloc if it is being seized
+
+            if ($seize) {
+                $r = q(
+                    "update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ",
+                    dbesc($channel['channel_hash']),
+                    dbesc(z_root())
+                );
+            }
+        }
+
+
+        $friends = 0;
+        $feeds = 0;
+
+        // import contacts
+        $abooks = $data['abook'];
+        if ($abooks) {
+            foreach ($abooks as $abook) {
+                $abook_copy = $abook;
+
+                $abconfig = null;
+                if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) {
+                    $abconfig = $abook['abconfig'];
+                }
+
+                unset($abook['abook_id']);
+                unset($abook['abook_rating']);
+                unset($abook['abook_rating_text']);
+                unset($abook['abconfig']);
+                unset($abook['abook_their_perms']);
+                unset($abook['abook_my_perms']);
+                unset($abook['abook_not_here']);
+
+                $abook['abook_account'] = $account_id;
+                $abook['abook_channel'] = $channel['channel_id'];
+
+                $reconnect = false;
+
+                if (array_key_exists('abook_instance', $abook) && $abook['abook_instance'] && strpos($abook['abook_instance'], z_root()) === false) {
+                    $abook['abook_not_here'] = 1;
+                    if (!($abook['abook_pending'] || $abook['abook_blocked'])) {
+                        $reconnect = true;
+                    }
+                }
+
+                if ($abook['abook_self']) {
+                    $ctype = 0;
+                    $role = get_pconfig($channel['channel_id'], 'system', 'permissions_role');
+                    if (strpos($role, 'collection' !== false)) {
+                        $ctype = 2;
+                    } elseif (strpos($role, 'group') !== false) {
+                        $ctype = 1;
+                    }
+                    if ($ctype) {
+                        q(
+                            "update xchan set xchan_type = %d where xchan_hash = '%s' ",
+                            intval($ctype),
+                            dbesc($abook['abook_xchan'])
+                        );
+                    }
+                } else {
+                    if ($max_friends !== false && $friends > $max_friends) {
+                        continue;
+                    }
+                    if ($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) {
+                        continue;
+                    }
+                }
+
+                $r = q(
+                    "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
+                    dbesc($abook['abook_xchan']),
+                    intval($channel['channel_id'])
+                );
+                if ($r) {
+                    $columns = db_columns('abook');
+
+                    foreach ($abook as $k => $v) {
+                        if (!in_array($k, $columns)) {
+                            continue;
+                        }
+                        $r = q(
+                            "UPDATE abook SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE abook_xchan = '%s' AND abook_channel = %d",
+                            dbesc($k),
+                            dbesc($v),
+                            dbesc($abook['abook_xchan']),
+                            intval($channel['channel_id'])
+                        );
+                    }
+                } else {
+                    abook_store_lowlevel($abook);
+
+                    $friends++;
+                    if (intval($abook['abook_feed'])) {
+                        $feeds++;
+                    }
+                }
+
+                if ($abconfig) {
+                    foreach ($abconfig as $abc) {
+                        set_abconfig($channel['channel_id'], $abc['xchan'], $abc['cat'], $abc['k'], $abc['v']);
+                    }
+                }
+                if ($reconnect) {
+                    Connect::connect($channel, $abook['abook_xchan']);
+                }
+            }
+
+            logger('import step 8');
+        }
+
+        // import groups
+        $groups = $data['group'];
+        if ($groups) {
+            $saved = [];
+            foreach ($groups as $group) {
+                $saved[$group['hash']] = ['old' => $group['id']];
+                if (array_key_exists('name', $group)) {
+                    $group['gname'] = $group['name'];
+                    unset($group['name']);
+                }
+                unset($group['id']);
+                $group['uid'] = $channel['channel_id'];
+
+                create_table_from_array('pgrp', $group);
+            }
+            $r = q(
+                "select * from pgrp where uid = %d",
+                intval($channel['channel_id'])
+            );
+            if ($r) {
+                foreach ($r as $rr) {
+                    $saved[$rr['hash']]['new'] = $rr['id'];
+                }
+            }
+        }
+
+        // import group members
+        $group_members = $data['group_member'];
+        if ($group_members) {
+            foreach ($group_members as $group_member) {
+                unset($group_member['id']);
+                $group_member['uid'] = $channel['channel_id'];
+                foreach ($saved as $x) {
+                    if ($x['old'] == $group_member['gid']) {
+                        $group_member['gid'] = $x['new'];
+                    }
+                }
+                create_table_from_array('pgrp_member', $group_member);
+            }
+        }
+
+        logger('import step 9');
+
+
+        if (is_array($data['atoken'])) {
+            import_atoken($channel, $data['atoken']);
+        }
+        if (is_array($data['xign'])) {
+            import_xign($channel, $data['xign']);
+        }
+        if (is_array($data['block'])) {
+            import_block($channel, $data['block']);
+        }
+        if (is_array($data['obj'])) {
+            import_objs($channel, $data['obj']);
+        }
+        if (is_array($data['likes'])) {
+            import_likes($channel, $data['likes']);
+        }
+        if (is_array($data['app'])) {
+            import_apps($channel, $data['app']);
+        }
+        if (is_array($data['sysapp'])) {
+            import_sysapps($channel, $data['sysapp']);
+        }
+        if (is_array($data['chatroom'])) {
+            import_chatrooms($channel, $data['chatroom']);
+        }
+//      if (is_array($data['conv'])) {
+//          import_conv($channel,$data['conv']);
+//      }
+//      if (is_array($data['mail'])) {
+//          import_mail($channel,$data['mail']);
+//      }
+        if (is_array($data['event'])) {
+            import_events($channel, $data['event']);
+        }
+        if (is_array($data['event_item'])) {
+            import_items($channel, $data['event_item'], false, $relocate);
+        }
+//      if (is_array($data['menu'])) {
+//          import_menus($channel,$data['menu']);
+//      }
+//      if (is_array($data['wiki'])) {
+//          import_items($channel,$data['wiki'],false,$relocate);
+//      }
+//      if (is_array($data['webpages'])) {
+//          import_items($channel,$data['webpages'],false,$relocate);
+//      }
+        $addon = array('channel' => $channel, 'data' => $data);
+        Hook::call('import_channel', $addon);
+
+        $saved_notification_flags = Channel::notifications_off($channel['channel_id']);
+        if ($import_posts && array_key_exists('item', $data) && $data['item']) {
+            import_items($channel, $data['item'], false, $relocate);
+        }
+
+        if ($api_path && $import_posts) {  // we are importing from a server and not a file
+            $m = parse_url($api_path);
+
+            $hz_server = $m['scheme'] . '://' . $m['host'];
+
+            $since = datetime_convert(date_default_timezone_get(), date_default_timezone_get(), '0001-01-01 00:00');
+            $until = datetime_convert(date_default_timezone_get(), date_default_timezone_get(), 'now + 1 day');
+
+            $poll_interval = get_config('system', 'poll_interval', 3);
+            $page = 0;
+
+            while (1) {
+                $headers = [
+                    'X-API-Token' => random_string(),
+                    'X-API-Request' => $hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page,
+                    'Host' => $m['host'],
+                    '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page,
+                ];
+
+                $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
+
+                $x = z_fetch_url($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, false, $redirects, ['headers' => $headers]);
+
+                // logger('z_fetch: ' . print_r($x,true));
+
+                if (!$x['success']) {
+                    logger('no API response');
+                    break;
+                }
+
+                $j = json_decode($x['body'], true);
+
+                if (!$j) {
+                    break;
+                }
+
+                if (!($j['item'] || count($j['item']))) {
+                    break;
+                }
+
+                Run::Summon(['Content_importer', sprintf('%d', $page), $since, $until, $channel['channel_address'], urlencode($hz_server)]);
+                sleep($poll_interval);
+
+                $page++;
+                continue;
+            }
+
+            $headers = [
+                'X-API-Token' => random_string(),
+                'X-API-Request' => $hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until),
+                'Host' => $m['host'],
+                '(request-target)' => 'get /api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until),
+            ];
+
+            $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
+
+            $x = z_fetch_url($hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), false, $redirects, ['headers' => $headers]);
+
+            if (!$x['success']) {
+                logger('no API response');
+                return;
+            }
+
+            $j = json_decode($x['body'], true);
+
+            if (!$j) {
+                return;
+            }
+
+            if (!$j['success']) {
+                return;
+            }
+
+            $poll_interval = get_config('system', 'poll_interval', 3);
+
+            if (count($j['results'])) {
+                $todo = count($j['results']);
+                logger('total to process: ' . $todo, LOGGER_DEBUG);
+
+                foreach ($j['results'] as $jj) {
+                    Run::Summon(['File_importer', $jj['hash'], $channel['channel_address'], urlencode($hz_server)]);
+                    sleep($poll_interval);
+                }
+            }
+
+            notice(t('Files and Posts imported.') . EOL);
+        }
+
+        Channel::notifications_on($channel['channel_id'], $saved_notification_flags);
+
+
+        // send out refresh requests
+        // notify old server that it may no longer be primary.
+
+        Run::Summon(['Notifier', 'refresh_all', $channel['channel_id']]);
+
+        // This will indirectly perform a refresh_all *and* update the directory
+
+        Run::Summon(['Directory', $channel['channel_id']]);
+
+        notice(t('Import completed.') . EOL);
+
+        change_channel($channel['channel_id']);
+
+        goaway(z_root() . '/stream');
+    }
+
+    /**
+     * @brief Handle POST action on channel import page.
+     */
+
+    public function post()
+    {
+        $account_id = get_account_id();
+        if (!$account_id) {
+            return;
+        }
+
+        check_form_security_token_redirectOnErr('/import', 'channel_import');
+        $this->import_account($account_id);
+    }
+
+    /**
+     * @brief Generate channel import page.
+     *
+     * @return string with parsed HTML.
+     */
+
+    public function get()
+    {
+
+        if (!get_account_id()) {
+            notice(t('You must be logged in to use this feature.') . EOL);
+            return EMPTY_STR;
+        }
+
+        return replace_macros(Theme::get_template('channel_import.tpl'), [
+            '$title' => t('Import Channel'),
+            '$desc' => t('Use this form to import an existing channel from a different server. You may retrieve the channel identity from the old server via the network or provide an export file.'),
+            '$label_filename' => t('File to Upload'),
+            '$choice' => t('Or provide the old server details'),
+            '$old_address' => ['old_address', t('Your old identity address (xyz@example.com)'), '', ''],
+            '$email' => ['email', t('Your old login email address'), '', ''],
+            '$password' => ['password', t('Your old login password'), '', ''],
+            '$import_posts' => ['import_posts', t('Import a few months of posts if possible (limited by available memory)'), false, '', [t('No'), t('Yes')]],
+
+            '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'),
+
+            '$make_primary' => ['make_primary', t('Make this hub my primary location'), false, '', [t('No'), t('Yes')]],
+            '$moving' => ['moving', t('Move this channel (disable all previous locations)'), false, '', [t('No'), t('Yes')]],
+            '$newname' => ['newname', t('Use this channel nickname instead of the one provided'), '', t('Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site.')],
+
+            '$pleasewait' => t('This process may take several minutes to complete and considerably longer if importing a large amount of posts and files. Please submit the form only once and leave this page open until finished.'),
+
+            '$form_security_token' => get_form_security_token('channel_import'),
+            '$submit' => t('Submit')
+        ]);
+    }
+}
diff --git a/Code/Module/Import_items.php b/Code/Module/Import_items.php
new file mode 100644
index 000000000..48c8e162f
--- /dev/null
+++ b/Code/Module/Import_items.php
@@ -0,0 +1,149 @@
+ $email . ':' . $password);
+            $url = $scheme . $servername . $api_path;
+            $ret = z_fetch_url($url, $binary, $redirects, $opts);
+            if (!$ret['success']) {
+                $ret = z_fetch_url('http://' . $servername . $api_path, $binary, $redirects, $opts);
+            }
+            if ($ret['success']) {
+                $data = $ret['body'];
+            } else {
+                notice(t('Unable to download data from old server') . EOL);
+            }
+        }
+
+        if (!$data) {
+            logger('Empty file.');
+            notice(t('Imported file is empty.') . EOL);
+            return;
+        }
+
+        $data = json_decode($data, true);
+
+        //logger('import: data: ' . print_r($data,true));
+        //print_r($data);
+
+        if (!is_array($data)) {
+            return;
+        }
+
+//      if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
+//          $v1 = substr($data['compatibility']['database'],-4);
+//          $v2 = substr(DB_UPDATE_VERSION,-4);
+//          if($v2 > $v1) {
+//              $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
+//              notice($t . EOL);
+//          }
+//      }
+
+        $codebase = 'zap';
+
+        if ((!array_path_exists('compatibility/codebase', $data)) || $data['compatibility']['codebase'] !== $codebase) {
+            notice(t('Data export format is not compatible with this software'));
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        if (array_key_exists('item', $data) && $data['item']) {
+            import_items($channel, $data['item'], false, ((array_key_exists('relocate', $data)) ? $data['relocate'] : null));
+        }
+
+        info(t('Import completed') . EOL);
+    }
+
+
+    /**
+     * @brief Generate item import page.
+     *
+     * @return string with parsed HTML.
+     */
+    public function get()
+    {
+
+        if (!local_channel()) {
+            notice(t('Permission denied') . EOL);
+            return login();
+        }
+
+        $o = replace_macros(Theme::get_template('item_import.tpl'), array(
+            '$title' => t('Import Items'),
+            '$desc' => t('Use this form to import existing posts and content from an export file.'),
+            '$label_filename' => t('File to Upload'),
+            '$form_security_token' => get_form_security_token('import_items'),
+            '$submit' => t('Submit')
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Inbox.php b/Code/Module/Inbox.php
new file mode 100644
index 000000000..7e22cd2d7
--- /dev/null
+++ b/Code/Module/Inbox.php
@@ -0,0 +1,431 @@
+is_valid() && $AS->type === 'Announce' && is_array($AS->obj)
+            && array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj)
+        ) {
+            // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
+            // Reparse the encapsulated Activity and use that instead
+            logger('relayed activity', LOGGER_DEBUG);
+            $AS = new ActivityStreams($AS->obj);
+        }
+
+        // logger('debug: ' . $AS->debug());
+
+        if (!$AS->is_valid()) {
+            if ($AS->deleted) {
+                // process mastodon user deletion activities, but only if we can validate the signature
+                if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) {
+                    logger('removing deleted actor');
+                    remove_all_xchan_resources($hsig['portable_id']);
+                } else {
+                    logger('ignoring deleted actor', LOGGER_DEBUG, LOG_INFO);
+                }
+            }
+            return;
+        }
+
+
+        if (is_array($AS->actor) && array_key_exists('id', $AS->actor)) {
+            Activity::actor_store($AS->actor['id'], $AS->actor);
+        }
+
+        if (is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
+            Activity::actor_store($AS->obj['id'], $AS->obj);
+        }
+
+        if (is_array($AS->obj) && is_array($AS->obj['actor']) && array_key_exists('id', $AS->obj['actor']) && $AS->obj['actor']['id'] !== $AS->actor['id']) {
+            Activity::actor_store($AS->obj['actor']['id'], $AS->obj['actor']);
+            if (!check_channelallowed($AS->obj['actor']['id'])) {
+                http_status_exit(403, 'Permission denied');
+            }
+        }
+
+        // Validate that the channel that sent us this activity has authority to do so.
+        // Require a valid HTTPSignature with a signed Digest header.
+
+        // Only permit relayed activities if the activity is signed with LDSigs
+        // AND the signature is valid AND the signer is the actor.
+
+        if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) {
+            // if the sender has the ability to send messages over zot/nomad, ignore messages sent via activitypub
+            // as observer aware features and client side markup will be unavailable
+
+            $test = Activity::get_actor_hublocs($hsig['portable_id'], 'all,not_deleted');
+            if ($test) {
+                foreach ($test as $t) {
+                    if ($t['hubloc_network'] === 'zot6') {
+                        http_status_exit(409, 'Conflict');
+                    }
+                }
+            }
+
+            // fetch the portable_id for the actor, which may or may not be the sender
+
+            $v = Activity::get_actor_hublocs($AS->actor['id'], 'activitypub,not_deleted');
+
+            if ($v && $v[0]['hubloc_hash'] !== $hsig['portable_id']) {
+                // The sender is not actually the activity actor, so verify the LD signature.
+                // litepub activities (with no LD signature) will always have a matching actor and sender
+
+                if ($AS->signer && is_array($AS->signer) && $AS->signer['id'] !== $AS->actor['id']) {
+                    // the activity wasn't signed by the activity actor
+                    return;
+                }
+                if (!$AS->sigok) {
+                    // The activity signature isn't valid.
+                    return;
+                }
+            }
+
+            if ($v) {
+                // The sender has been validated and stored
+                $observer_hash = $hsig['portable_id'];
+            }
+        }
+
+        if (!$observer_hash) {
+            return;
+        }
+
+        // verify that this site has permitted communication with the sender.
+
+        $m = parse_url($observer_hash);
+
+        if ($m && $m['scheme'] && $m['host']) {
+            if (!check_siteallowed($m['scheme'] . '://' . $m['host'])) {
+                http_status_exit(403, 'Permission denied');
+            }
+            // this site obviously isn't dead because they are trying to communicate with us.
+            $test = q(
+                "update site set site_dead = 0 where site_dead = 1 and site_url = '%s' ",
+                dbesc($m['scheme'] . '://' . $m['host'])
+            );
+        }
+        if (!check_channelallowed($observer_hash)) {
+            http_status_exit(403, 'Permission denied');
+        }
+
+        // update the hubloc_connected timestamp, ignore failures
+
+        $test = q(
+            "update hubloc set hubloc_connected = '%s' where hubloc_hash = '%s' and hubloc_network = 'activitypub'",
+            dbesc(datetime_convert()),
+            dbesc($observer_hash)
+        );
+
+
+        // Now figure out who the recipients are
+
+        if ($is_public) {
+            if (in_array($AS->type, ['Follow', 'Join']) && is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
+                $channels = q(
+                    "SELECT * from channel where channel_address = '%s' and channel_removed = 0 ",
+                    dbesc(basename($AS->obj['id']))
+                );
+            } else {
+                $collections = Activity::get_actor_collections($observer_hash);
+
+                if (in_array($collection['followers'], $AS->recips)
+                    || in_array(ACTIVITY_PUBLIC_INBOX, $AS->recips)
+                    || in_array('Public', $AS->recips)
+                    || in_array('as:Public', $AS->recips)) {
+
+                    // deliver to anybody following $AS->actor
+
+                    $channels = q(
+                        "SELECT * from channel where channel_id in
+                        ( SELECT abook_channel from abook left join xchan on abook_xchan = xchan_hash
+                        WHERE xchan_network = 'activitypub' and xchan_hash = '%s'
+                        ) and channel_removed = 0 ",
+                        dbesc($observer_hash)
+                    );
+                }
+                else {
+                    // deliver to anybody at this site directly addressed
+                    $channel_addr = '';
+                    foreach($AS->recips as $recip) {
+                        if (strpos($recip, z_root()) === 0) {
+                            $channel_addr .= '\'' . dbesc(basename($recip)) . '\',';
+                        }
+                    }
+                    if ($channel_addr) {
+                        $channel_addr = rtrim($channel_addr, ',');
+                        $channels = dbq("SELECT * FROM channel
+                            WHERE channel_address IN ($channel_addr) AND channel_removed = 0");
+                    }
+                }
+
+                if (!$channels) {
+                    $channels = [];
+                }
+
+                $parent = $AS->parent_id;
+                if ($parent) {
+                    // this is a comment - deliver to everybody who owns the parent
+                    $owners = q(
+                        "SELECT * from channel where channel_id in ( SELECT uid from item where mid = '%s' ) ",
+                        dbesc($parent)
+                    );
+                    if ($owners) {
+                        $channels = array_merge($channels, $owners);
+                    }
+                }
+            }
+
+            if ($channels === false) {
+                $channels = [];
+            }
+
+            if (in_array(ACTIVITY_PUBLIC_INBOX, $AS->recips) || in_array('Public', $AS->recips) || in_array('as:Public', $AS->recips)) {
+                // look for channels with send_stream = PERMS_PUBLIC (accept posts from anybody on the internet)
+
+                $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'perm_limits' and k = 'send_stream' and v = '1' ) and channel_removed = 0 ");
+                if ($r) {
+                    $channels = array_merge($channels, $r);
+                }
+
+                // look for channels that are following hashtags. These will be checked in tgroup_check()
+
+                $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'system' and k = 'followed_tags' and v != '' ) and channel_removed = 0 ");
+                if ($r) {
+                    $channels = array_merge($channels, $r);
+                }
+
+
+                if (!$sys_disabled) {
+                    $channels[] = Channel::get_system();
+                }
+            }
+        }
+
+        // $channels represents all "potential" recipients. If they are not in this array, they will not receive the activity.
+        // If they are in this array, we will decide whether or not to deliver on a case-by-case basis.
+
+        if (!$channels) {
+            logger('no deliveries on this site');
+            return;
+        }
+
+        // Bto and Bcc will only be present in a C2S transaction and should not be stored.
+
+        $saved_recips = [];
+        foreach (['to', 'cc', 'audience'] as $x) {
+            if (array_key_exists($x, $AS->data)) {
+                $saved_recips[$x] = $AS->data[$x];
+            }
+        }
+        $AS->set_recips($saved_recips);
+
+
+        foreach ($channels as $channel) {
+            // Even though activitypub may be enabled for the site, check if the channel has specifically disabled it
+            if (!PConfig::Get($channel['channel_id'], 'system', 'activitypub', Config::Get('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
+                continue;
+            }
+
+            logger('inbox_channel: ' . $channel['channel_address'], LOGGER_DEBUG);
+
+            switch ($AS->type) {
+                case 'Follow':
+                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
+                        // do follow activity
+                        Activity::follow($channel, $AS);
+                    }
+                    break;
+                case 'Invite':
+                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
+                        // do follow activity
+                        Activity::follow($channel, $AS);
+                    }
+                    break;
+                case 'Join':
+                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
+                        // do follow activity
+                        Activity::follow($channel, $AS);
+                    }
+                    break;
+                case 'Accept':
+                    // Activitypub for wordpress sends lowercase 'follow' on accept.
+                    // https://github.com/pfefferle/wordpress-activitypub/issues/97
+                    // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group
+                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow', 'follow', 'Member'])) {
+                        // do follow activity
+                        Activity::follow($channel, $AS);
+                    }
+                    break;
+
+                case 'Reject':
+                default:
+                    break;
+            }
+
+            // These activities require permissions
+
+            $item = null;
+
+            switch ($AS->type) {
+                case 'Update':
+                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
+                        Activity::actor_store($AS->obj['id'], $AS->obj, true /* force cache refresh */);
+                        break;
+                    }
+                case 'Accept':
+                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) {
+                        break;
+                    }
+                case 'Create':
+                case 'Like':
+                case 'Dislike':
+                case 'Announce':
+                case 'Reject':
+                case 'TentativeAccept':
+                case 'TentativeReject':
+                case 'Add':
+                case 'Arrive':
+                case 'Block':
+                case 'Flag':
+                case 'Ignore':
+                case 'Invite':
+                case 'Listen':
+                case 'Move':
+                case 'Offer':
+                case 'Question':
+                case 'Read':
+                case 'Travel':
+                case 'View':
+                case 'emojiReaction':
+                case 'EmojiReaction':
+                case 'EmojiReact':
+                    // These require a resolvable object structure
+                    if (is_array($AS->obj)) {
+                        // The boolean flag enables html cache of the item
+                        $item = Activity::decode_note($AS, true);
+                    } else {
+                        logger('unresolved object: ' . print_r($AS->obj, true));
+                    }
+                    break;
+                case 'Undo':
+                    if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') {
+                        // do unfollow activity
+                        Activity::unfollow($channel, $AS);
+                        break;
+                    }
+                case 'Leave':
+                    if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
+                        // do unfollow activity
+                        Activity::unfollow($channel, $AS);
+                        break;
+                    }
+                case 'Tombstone':
+                case 'Delete':
+                    Activity::drop($channel, $observer_hash, $AS);
+                    break;
+
+                case 'Move':
+                    if (
+                        $observer_hash && $observer_hash === $AS->actor
+                        && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type'])
+                        && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type'])
+                    ) {
+                        ActivityPub::move($AS->obj, $AS->tgt);
+                    }
+                    break;
+                case 'Add':
+                case 'Remove':
+                    // for writeable collections as target, it's best to provide an array and include both the type and the id in the target element.
+                    // If it's just a string id, we'll try to fetch the collection when we receive it and that's wasteful since we don't actually need
+                    // the contents.
+                    if (is_array($AS->obj) && isset($AS->tgt)) {
+                        // The boolean flag enables html cache of the item
+                        $item = Activity::decode_note($AS, true);
+                        break;
+                    }
+                default:
+                    break;
+            }
+
+            if ($item) {
+                logger('parsed_item: ' . print_r($item, true), LOGGER_DATA);
+                Activity::store($channel, $observer_hash, $AS, $item);
+            }
+        }
+
+        http_status_exit(200, 'OK');
+    }
+
+    public function get()
+    {
+    }
+}
diff --git a/Code/Module/Inspect.php b/Code/Module/Inspect.php
new file mode 100644
index 000000000..e224c90b4
--- /dev/null
+++ b/Code/Module/Inspect.php
@@ -0,0 +1,92 @@
+ 2) {
+            $item_type = argv(1);
+            $item_id = argv(2);
+        } elseif (argc() > 1) {
+            $item_type = 'item';
+            $item_id = argv(1);
+        }
+
+        if (!$item_id) {
+            App::$error = 404;
+            notice(t('Item not found.') . EOL);
+        }
+
+        if ($item_type === 'item') {
+            $r = q(
+                "select * from item where uuid = '%s' or id = %d ",
+                dbesc($item_id),
+                intval($item_id)
+            );
+
+            if ($r) {
+                xchan_query($r);
+                $items = fetch_post_tags($r, true);
+            }
+
+            if (!$items) {
+                return $output;
+            }
+
+            foreach ($items as $item) {
+                if ($item['obj']) {
+                    $item['obj'] = json_decode($item['obj'], true);
+                }
+                if ($item['target']) {
+                    $item['target'] = json_decode($item['target'], true);
+                }
+                if ($item['attach']) {
+                    $item['attach'] = json_decode($item['attach'], true);
+                }
+
+                $output .= '
      ' . print_array($item) . '
      ' . EOL . EOL;
+
+                $output .= '
      ' . escape_tags(json_encode(Activity::encode_activity($item, true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
      ' . EOL . EOL;
+
+                $output .= '
      ' . escape_tags(json_encode(json_decode(get_iconfig($item['id'], 'activitypub', 'rawmsg'), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
      ' . EOL . EOL;
+            }
+        }
+
+        if ($item_type === 'xchan') {
+            $items = q(
+                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_hash = '%s' or hubloc_addr = '%s' ",
+                dbesc($item_id),
+                dbesc($item_id)
+            );
+
+            if (!$items) {
+                return $output;
+            }
+
+            foreach ($items as $item) {
+                $output .= '
      ' . print_array($item) . '
      ' . EOL . EOL;
+            }
+        }
+
+
+        return $output;
+    }
+}
diff --git a/Code/Module/Invite.php b/Code/Module/Invite.php
new file mode 100644
index 000000000..eb9c00f1e
--- /dev/null
+++ b/Code/Module/Invite.php
@@ -0,0 +1,176 @@
+ $max_invites) {
+            notice(t('Total invitation limit exceeded.') . EOL);
+            return;
+        }
+
+
+        $recips = ((x($_POST, 'recipients')) ? explode("\n", $_POST['recipients']) : []);
+        $message = ((x($_POST, 'message')) ? notags(trim($_POST['message'])) : '');
+
+        $total = 0;
+
+        if (get_config('system', 'invitation_only')) {
+            $invonly = true;
+            $x = get_pconfig(local_channel(), 'system', 'invites_remaining');
+            if ((!$x) && (!is_site_admin())) {
+                return;
+            }
+        }
+
+        foreach ($recips as $recip) {
+            $recip = trim($recip);
+            if (!$recip) {
+                continue;
+            }
+
+            if (!validate_email($recip)) {
+                notice(sprintf(t('%s : Not a valid email address.'), $recip) . EOL);
+                continue;
+            } else {
+                $nmessage = $message;
+            }
+
+            $account = App::get_account();
+
+            $res = z_mail(
+                [
+                    'toEmail' => $recip,
+                    'fromName' => ' ',
+                    'fromEmail' => $account['account_email'],
+                    'messageSubject' => t('Please join us on $Projectname'),
+                    'textVersion' => $nmessage,
+                ]
+            );
+
+            if ($res) {
+                $total++;
+                $current_invites++;
+                set_pconfig(local_channel(), 'system', 'sent_invites', $current_invites);
+                if ($current_invites > $max_invites) {
+                    notice(t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
+                    return;
+                }
+            } else {
+                notice(sprintf(t('%s : Message delivery failed.'), $recip) . EOL);
+            }
+        }
+        notice(sprintf(tt("%d message sent.", "%d messages sent.", $total), $total) . EOL);
+        return;
+    }
+
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if (!Apps::system_app_installed(local_channel(), 'Invite')) {
+            //Do not display any associated widgets at this point
+            App::$pdl = '';
+
+            $o = 'Invite App (Not Installed):
      ';
+            $o .= t('Send email invitations to join this network');
+            return $o;
+        }
+
+        Navbar::set_selected('Invite');
+
+        $tpl = Theme::get_template('invite.tpl');
+        $invonly = false;
+
+        if (get_config('system', 'invitation_only')) {
+            $invonly = true;
+            $x = get_pconfig(local_channel(), 'system', 'invites_remaining');
+            if ((!$x) && (!is_site_admin())) {
+                notice(t('You have no more invitations available') . EOL);
+                return '';
+            }
+        }
+
+        if ($invonly && ($x || is_site_admin())) {
+            $invite_code = autoname(8) . rand(1000, 9999);
+            $nmessage = str_replace('$invite_code', $invite_code, $message);
+
+            $r = q(
+                "INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s',0,'','') ",
+                dbesc($invite_code),
+                dbesc(datetime_convert())
+            );
+
+            if (!is_site_admin()) {
+                $x--;
+                if ($x >= 0) {
+                    set_pconfig(local_channel(), 'system', 'invites_remaining', $x);
+                } else {
+                    return;
+                }
+            }
+        }
+
+        $ob = App::get_observer();
+        if (!$ob) {
+            return $o;
+        }
+
+        $channel = App::get_channel();
+
+        $o = replace_macros($tpl, array(
+            '$form_security_token' => get_form_security_token("send_invite"),
+            '$invite' => t('Send invitations'),
+            '$addr_text' => t('Enter email addresses, one per line:'),
+            '$msg_text' => t('Your message:'),
+            '$default_message' => t('Please join my community on $Projectname.') . "\r\n" . "\r\n"
+                . $linktxt
+                . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code:') . " " . $invite_code . "\r\n" . "\r\n" : '')
+                . t('1. Register at any $Projectname location (they are all inter-connected)')
+                . "\r\n" . "\r\n" . z_root() . '/register'
+                . "\r\n" . "\r\n" . t('2. Enter my $Projectname network address into the site searchbar.')
+                . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit') . " " . z_root() . '/channel/' . $channel['channel_address'] . ')'
+                . "\r\n" . "\r\n"
+                . t('3. Click [Connect]')
+                . "\r\n" . "\r\n",
+            '$submit' => t('Submit')
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Item.php b/Code/Module/Item.php
new file mode 100644
index 000000000..86c146a6f
--- /dev/null
+++ b/Code/Module/Item.php
@@ -0,0 +1,2004 @@
+ [
+                ACTIVITYSTREAMS_JSONLD_REV,
+                'https://w3id.org/security/v1',
+                Activity::ap_schema()
+            ]], $i);
+
+            $headers = [];
+            $headers['Content-Type'] = 'application/x-nomad+json';
+            $x['signature'] = LDSignatures::sign($x, $chan);
+            $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
+            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
+            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
+            $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::url($chan));
+            HTTPSig::set_headers($h);
+            echo $ret;
+            killme();
+        }
+
+        // if it isn't a drop command and isn't a post method and wasn't handled already,
+        // the default action is a browser request for a persistent uri and this should return
+        // the text/html page of the item.
+
+        if (argc() > 1 && argv(1) !== 'drop') {
+            $x = q(
+                "select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' or uuid = '%s'",
+                dbesc(z_root() . '/item/' . argv(1)),
+                dbesc(z_root() . '/activity/' . argv(1)),
+                dbesc(argv(1))
+            );
+            if ($x) {
+                foreach ($x as $xv) {
+                    if (intval($xv['item_wall'])) {
+                        $c = Channel::from_id($xv['uid']);
+                        if ($c) {
+                            goaway($c['xchan_url'] . '?mid=' . gen_link_id($xv['mid']));
+                        }
+                    }
+                }
+                goaway($x[0]['llink']);
+            }
+
+            // save this state and catch it in the get() function
+            $this->return_404 = true;
+        }
+    }
+
+    public function post()
+    {
+
+        if ((!local_channel()) && (!remote_channel()) && (!isset($_REQUEST['anonname']))) {
+            return;
+        }
+
+        // drop an array of items.
+
+        if (isset($_REQUEST['dropitems'])) {
+            $arr_drop = explode(',', $_REQUEST['dropitems']);
+            drop_items($arr_drop);
+            $json = array('success' => 1);
+            echo json_encode($json);
+            killme();
+        }
+
+
+        $uid = local_channel();
+        $channel = null;
+        $observer = null;
+        $token = EMPTY_STR;
+        $datarray = [];
+        $item_starred = false;
+        $item_uplink = false;
+        $item_notshown = false;
+        $item_nsfw = false;
+        $item_relay = false;
+        $item_mentionsme = false;
+        $item_verified = false;
+        $item_retained = false;
+        $item_rss = false;
+        $item_deleted = false;
+        $item_hidden = false;
+        $item_delayed = false;
+        $item_pending_remove = false;
+        $item_blocked = false;
+
+        $post_tags = false;
+        $pub_copy = false;
+
+
+        /**
+         * Is this a reply to something?
+         */
+
+        $parent = ((isset($_REQUEST['parent'])) ? intval($_REQUEST['parent']) : 0);
+        $parent_mid = ((isset($_REQUEST['parent_mid'])) ? trim($_REQUEST['parent_mid']) : '');
+
+        $hidden_mentions = ((isset($_REQUEST['hidden_mentions'])) ? trim($_REQUEST['hidden_mentions']) : '');
+
+
+        /**
+         * Who is viewing this page and posting this thing
+         */
+
+        $remote_xchan = ((isset($_REQUEST['remote_xchan'])) ? trim($_REQUEST['remote_xchan']) : false);
+        $remote_observer = xchan_match(['xchan_hash' => $remote_xchan]);
+
+        if (!$remote_observer) {
+            $remote_xchan = $remote_observer = false;
+        }
+
+        // This is the local channel representing who the posted item will belong to.
+
+        $profile_uid = ((isset($_REQUEST['profile_uid'])) ? intval($_REQUEST['profile_uid']) : 0);
+
+        // *If* you are logged in as the site admin you are allowed to create top-level items for the sys channel.
+        // This would typically be a webpage or webpage element.
+        // Comments and replies are excluded because further below we also check for sys channel ownership and
+        // will make a copy of the parent that you can interact with in your own stream
+
+        $sys = Channel::get_system();
+        if ($sys && $profile_uid && ($sys['channel_id'] == $profile_uid) && is_site_admin() && !$parent) {
+            $uid = intval($sys['channel_id']);
+            $channel = $sys;
+            $observer = $sys;
+        }
+
+        Hook::call('post_local_start', $_REQUEST);
+
+        // logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+
+        $api_source = ((isset($_REQUEST['api_source']) && $_REQUEST['api_source']) ? true : false);
+
+        $nocomment = 0;
+        if (isset($_REQUEST['comments_enabled'])) {
+            $nocomment = 1 - intval($_REQUEST['comments_enabled']);
+        }
+
+        // this is in days, convert to absolute time
+        $channel_comments_closed = get_pconfig($profile_uid, 'system', 'close_comments');
+        if (intval($channel_comments_closed)) {
+            $channel_comments_closed = datetime_convert(date_Default_timezone_get(), 'UTC', 'now + ' . intval($channel_comments_closed) . ' days');
+        } else {
+            $channel_comments_closed = NULL_DATE;
+        }
+
+        $comments_closed = ((isset($_REQUEST['comments_closed']) && $_REQUEST['comments_closed']) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['comments_closed']) : $channel_comments_closed);
+
+        $is_poll = ((trim($_REQUEST['poll_answers'][0]) != '' && trim($_REQUEST['poll_answers'][1]) != '') ? true : false);
+
+        // 'origin' (if non-zero) indicates that this network is where the message originated,
+        // for the purpose of relaying comments to other conversation members.
+        // If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset.
+        // If the API is used from another network with its own distribution
+        // and deliveries, you may wish to set origin to 0 or false and allow the other
+        // network to relay comments.
+
+        // If you are unsure, it is prudent (and important) to leave it unset.
+
+        $origin = (($api_source && array_key_exists('origin', $_REQUEST)) ? intval($_REQUEST['origin']) : 1);
+
+        // To represent message-ids on other networks - this will create an iconfig record
+
+        $namespace = (($api_source && array_key_exists('namespace', $_REQUEST)) ? strip_tags($_REQUEST['namespace']) : '');
+        $remote_id = (($api_source && array_key_exists('remote_id', $_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : '');
+
+        $owner_hash = null;
+
+        $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
+        $created = ((x($_REQUEST, 'created')) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['created']) : datetime_convert());
+
+        // Because somebody will probably try this and create a mess
+
+        if ($created <= NULL_DATE) {
+            $created = datetime_convert();
+        }
+
+        $post_id = ((x($_REQUEST, 'post_id')) ? intval($_REQUEST['post_id']) : 0);
+
+        $app = ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : '');
+        $return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : '');
+        $preview = ((x($_REQUEST, 'preview')) ? intval($_REQUEST['preview']) : 0);
+        $categories = ((x($_REQUEST, 'category')) ? escape_tags($_REQUEST['category']) : '');
+        $webpage = ((x($_REQUEST, 'webpage')) ? intval($_REQUEST['webpage']) : 0);
+        $item_obscured = ((x($_REQUEST, 'obscured')) ? intval($_REQUEST['obscured']) : 0);
+        $pagetitle = ((x($_REQUEST, 'pagetitle')) ? escape_tags(urlencode($_REQUEST['pagetitle'])) : '');
+        $layout_mid = ((x($_REQUEST, 'layout_mid')) ? escape_tags($_REQUEST['layout_mid']) : '');
+        $plink = ((x($_REQUEST, 'permalink')) ? escape_tags($_REQUEST['permalink']) : '');
+        $obj_type = ((x($_REQUEST, 'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE);
+
+
+        $item_unpublished = ((isset($_REQUEST['draft'])) ? intval($_REQUEST['draft']) : 0);
+
+        // allow API to bulk load a bunch of imported items without sending out a bunch of posts.
+        $nopush = ((x($_REQUEST, 'nopush')) ? intval($_REQUEST['nopush']) : 0);
+
+        /*
+         * Check service class limits
+         */
+        if ($uid && !(x($_REQUEST, 'parent')) && !(x($_REQUEST, 'post_id'))) {
+            $ret = $this->item_check_service_class($uid, (($_REQUEST['webpage'] == ITEM_TYPE_WEBPAGE) ? true : false));
+            if (!$ret['success']) {
+                notice(t($ret['message']) . EOL);
+                if ($api_source) {
+                    return (['success' => false, 'message' => 'service class exception']);
+                }
+                if (x($_REQUEST, 'return')) {
+                    goaway(z_root() . "/" . $return_path);
+                }
+                killme();
+            }
+        }
+
+        if ($pagetitle) {
+            $pagetitle = strtolower(URLify::transliterate($pagetitle));
+        }
+
+        $item_flags = $item_restrict = 0;
+        $expires = NULL_DATE;
+
+        $route = '';
+        $parent_item = null;
+        $parent_contact = null;
+        $thr_parent = '';
+        $parid = 0;
+        $r = false;
+
+
+        // If this is a comment, find the parent and preset some stuff
+
+        if ($parent || $parent_mid) {
+            if (!x($_REQUEST, 'type')) {
+                $_REQUEST['type'] = 'net-comment';
+            }
+            if ($obj_type == ACTIVITY_OBJ_NOTE) {
+                $obj_type = ACTIVITY_OBJ_COMMENT;
+            }
+
+            // fetch the parent item
+
+            if ($parent) {
+                $r = q(
+                    "SELECT * FROM item WHERE id = %d LIMIT 1",
+                    intval($parent)
+                );
+            } elseif ($parent_mid && $uid) {
+                // This is coming from an API source, and we are logged in
+                $r = q(
+                    "SELECT * FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+                    dbesc($parent_mid),
+                    intval($uid)
+                );
+            }
+
+            // if this isn't the real parent of the conversation, find it
+            if ($r) {
+                $parid = $r[0]['parent'];
+                $parent_mid = $r[0]['mid'];
+                if ($r[0]['id'] != $r[0]['parent']) {
+                    $r = q(
+                        "SELECT * FROM item WHERE id = parent AND parent = %d LIMIT 1",
+                        intval($parid)
+                    );
+                }
+
+                // if interacting with a pubstream item (owned by the sys channel),
+                // create a copy of the parent in your stream
+
+                // $r may have changed. Check it again before trying to use it.
+
+                if ($r && local_channel() && (!Channel::is_system(local_channel()))) {
+                    $old_id = $r[0]['id'];
+                    $r = [copy_of_pubitem(App::get_channel(), $r[0]['mid'])];
+                    if ($r[0]['id'] !== $old_id) {
+                        // keep track that a copy was made to  display a special status notice that is unique to this condition
+                        $pub_copy = true;
+                    }
+                }
+            }
+
+            if (!$r) {
+                notice(t('Unable to locate original post.') . EOL);
+                if ($api_source) {
+                    return (['success' => false, 'message' => 'invalid post id']);
+                }
+                if (x($_REQUEST, 'return')) {
+                    goaway(z_root() . "/" . $return_path);
+                }
+                killme();
+            }
+
+            xchan_query($r, true);
+
+            $parent_item = $r[0];
+            $parent = $r[0]['id'];
+
+            // multi-level threading - preserve the info but re-parent to our single level threading
+
+            $thr_parent = $parent_mid;
+
+            $route = $parent_item['route'];
+        }
+
+        if ($parent_item && isset($parent_item['replyto']) && $parent_item['replyto']) {
+            $replyto = unserialise($parent_item['replyto']);
+        }
+
+        $moderated = false;
+
+        if (!$observer) {
+            $observer = App::get_observer();
+            if (!$observer) {
+                // perhaps we're allowing moderated comments from anonymous viewers
+                $observer = Channel::anon_identity_init($_REQUEST);
+                if ($observer) {
+                    $moderated = true;
+                    $remote_xchan = $remote_observer = $observer;
+                }
+            }
+        }
+
+        if (!$observer) {
+            notice(t('Permission denied.') . EOL);
+            if ($api_source) {
+                return (['success' => false, 'message' => 'permission denied']);
+            }
+            if (x($_REQUEST, 'return')) {
+                goaway(z_root() . "/" . $return_path);
+            }
+            killme();
+        }
+
+        if ($parent) {
+            logger('mod_item: item_post parent=' . $parent);
+            $can_comment = false;
+
+            $can_comment = can_comment_on_post($observer['xchan_hash'], $parent_item);
+            if (!$can_comment) {
+                if ((array_key_exists('owner', $parent_item)) && intval($parent_item['owner']['abook_self']) == 1) {
+                    $can_comment = perm_is_allowed($profile_uid, $observer['xchan_hash'], 'post_comments');
+                }
+            }
+
+            if (!$can_comment) {
+                notice(t('Permission denied.') . EOL);
+                if ($api_source) {
+                    return (['success' => false, 'message' => 'permission denied']);
+                }
+                if (x($_REQUEST, 'return')) {
+                    goaway(z_root() . "/" . $return_path);
+                }
+                killme();
+            }
+        } else {
+            // fixme - $webpage could also be a wiki page or article and require a different permission to be checked.
+            if (!perm_is_allowed($profile_uid, $observer['xchan_hash'], ($webpage) ? 'write_pages' : 'post_wall')) {
+                notice(t('Permission denied.') . EOL);
+                if ($api_source) {
+                    return (['success' => false, 'message' => 'permission denied']);
+                }
+                if (x($_REQUEST, 'return')) {
+                    goaway(z_root() . "/" . $return_path);
+                }
+                killme();
+            }
+        }
+
+        // check if this author is being moderated through the 'moderated' (negative) permission
+        // when posting wall-to-wall
+        if ($moderated === false && intval($uid) !== intval($profile_uid)) {
+            $moderated = perm_is_allowed($profile_uid, $observer['xchan_hash'], 'moderated');
+        }
+
+        // If this is a comment, check the moderated permission of the parent; who may be on another site
+        $remote_moderated = (($parent) ? their_perms_contains($profile_uid, $parent_item['owner_xchan'], 'moderated') : false);
+        if ($remote_moderated) {
+            notice(t('Comment may be moderated.') . EOL);
+        }
+
+        // is this an edited post?
+
+        $orig_post = null;
+
+        if ($namespace && $remote_id) {
+            // It wasn't an internally generated post - see if we've got an item matching this remote service id
+            $i = q(
+                "select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1",
+                dbesc($namespace),
+                dbesc($remote_id)
+            );
+            if ($i) {
+                $post_id = $i[0]['iid'];
+            }
+        }
+
+        $iconfig = null;
+
+        if ($post_id) {
+            $i = q(
+                "SELECT * FROM item WHERE uid = %d AND id = %d LIMIT 1",
+                intval($profile_uid),
+                intval($post_id)
+            );
+            if (!count($i)) {
+                killme();
+            }
+            $orig_post = $i[0];
+            $iconfig = q(
+                "select * from iconfig where iid = %d",
+                intval($post_id)
+            );
+        }
+
+
+        if (!$channel) {
+            if ($uid && $uid == $profile_uid) {
+                $channel = App::get_channel();
+            } else {
+                // posting as yourself but not necessarily to a channel you control
+                $r = q(
+                    "select * from channel left join account on channel_account_id = account_id where channel_id = %d LIMIT 1",
+                    intval($profile_uid)
+                );
+                if ($r) {
+                    $channel = $r[0];
+                }
+            }
+        }
+
+
+        if (!$channel) {
+            logger("mod_item: no channel.");
+            if ($api_source) {
+                return (['success' => false, 'message' => 'no channel']);
+            }
+            if (x($_REQUEST, 'return')) {
+                goaway(z_root() . "/" . $return_path);
+            }
+            killme();
+        }
+
+        $owner_xchan = null;
+
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($channel['channel_hash'])
+        );
+        if ($r && count($r)) {
+            $owner_xchan = $r[0];
+        } else {
+            logger("mod_item: no owner.");
+            if ($api_source) {
+                return (['success' => false, 'message' => 'no owner']);
+            }
+            if (x($_REQUEST, 'return')) {
+                goaway(z_root() . "/" . $return_path);
+            }
+            killme();
+        }
+
+        $walltowall = false;
+        $walltowall_comment = false;
+
+        if ($remote_xchan && !$moderated) {
+            $observer = $remote_observer;
+        }
+
+        if ($observer) {
+            logger('mod_item: post accepted from ' . $observer['xchan_name'] . ' for ' . $owner_xchan['xchan_name'], LOGGER_DEBUG);
+
+            // wall-to-wall detection.
+            // For top-level posts, if the author and owner are different it's a wall-to-wall
+            // For comments, We need to additionally look at the parent and see if it's a wall post that originated locally.
+
+            if ($observer['xchan_name'] != $owner_xchan['xchan_name']) {
+                if (($parent_item) && ($parent_item['item_wall'] && $parent_item['item_origin'])) {
+                    $walltowall_comment = true;
+                    $walltowall = true;
+                }
+                if (!$parent) {
+                    $walltowall = true;
+                }
+            }
+        }
+
+        if (!isset($replyto)) {
+            if (strpos($owner_xchan['xchan_hash'], 'http') === 0) {
+                $replyto = $owner_xchan['xchan_hash'];
+            } else {
+                $replyto = $owner_xchan['xchan_url'];
+            }
+        }
+
+
+        $acl = new AccessControl($channel);
+
+        $view_policy = PermissionLimits::Get($channel['channel_id'], 'view_stream');
+        $comment_policy = ((isset($_REQUEST['comments_from']) && intval($_REQUEST['comments_from'])) ? intval($_REQUEST['comments_from']) : PermissionLimits::Get($channel['channel_id'], 'post_comments'));
+
+        $public_policy = ((x($_REQUEST, 'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($view_policy, true));
+        if ($webpage) {
+            $public_policy = '';
+        }
+        if ($public_policy) {
+            $private = 1;
+        }
+
+        if ($orig_post) {
+            $private = 0;
+            // webpages and unpublished drafts are allowed to change ACLs after the fact. Normal conversation items aren't.
+            if ($webpage || intval($orig_post['item_unpublished'])) {
+                $acl->set_from_array($_REQUEST);
+            } else {
+                $acl->set($orig_post);
+                $public_policy = $orig_post['public_policy'];
+                $private = $orig_post['item_private'];
+            }
+
+            if ($public_policy || $acl->is_private()) {
+                $private = (($private) ? $private : 1);
+            }
+
+            $location = $orig_post['location'];
+            $coord = $orig_post['coord'];
+            $verb = $orig_post['verb'];
+            $app = $orig_post['app'];
+            $title = escape_tags(trim($_REQUEST['title']));
+            $summary = trim($_REQUEST['summary']);
+            $body = trim($_REQUEST['body']);
+
+            $item_flags = $orig_post['item_flags'];
+            $item_origin = $orig_post['item_origin'];
+            $item_unseen = $orig_post['item_unseen'];
+            $item_starred = $orig_post['item_starred'];
+            $item_uplink = $orig_post['item_uplink'];
+            $item_wall = $orig_post['item_wall'];
+            $item_thread_top = $orig_post['item_thread_top'];
+            $item_notshown = $orig_post['item_notshown'];
+            $item_nsfw = $orig_post['item_nsfw'];
+            $item_relay = $orig_post['item_relay'];
+            $item_mentionsme = $orig_post['item_mentionsme'];
+            $item_nocomment = $orig_post['item_nocomment'];
+            $item_obscured = $orig_post['item_obscured'];
+            $item_verified = $orig_post['item_verified'];
+            $item_retained = $orig_post['item_retained'];
+            $item_rss = $orig_post['item_rss'];
+            $item_deleted = $orig_post['item_deleted'];
+            $item_type = $orig_post['item_type'];
+            $item_hidden = $orig_post['item_hidden'];
+            $item_delayed = $orig_post['item_delayed'];
+            $item_pending_remove = $orig_post['item_pending_remove'];
+            $item_blocked = $orig_post['item_blocked'];
+
+
+            $postopts = $orig_post['postopts'];
+            $created = ((intval($orig_post['item_unpublished'])) ? $created : $orig_post['created']);
+            $expires = ((intval($orig_post['item_unpublished'])) ? NULL_DATE : $orig_post['expires']);
+            $mid = $orig_post['mid'];
+            $thr_parent = $orig_post['thr_parent'];
+            $parent_mid = $orig_post['parent_mid'];
+            $plink = $orig_post['plink'];
+        } else {
+            if (!$walltowall) {
+                if (
+                    (array_key_exists('contact_allow', $_REQUEST))
+                    || (array_key_exists('group_allow', $_REQUEST))
+                    || (array_key_exists('contact_deny', $_REQUEST))
+                    || (array_key_exists('group_deny', $_REQUEST))
+                ) {
+                    $acl->set_from_array($_REQUEST);
+                } elseif (!$api_source) {
+                    // if no ACL has been defined and we aren't using the API, the form
+                    // didn't send us any parameters. This means there's no ACL or it has
+                    // been reset to the default audience.
+                    // If $api_source is set and there are no ACL parameters, we default
+                    // to the channel permissions which were set in the ACL contructor.
+
+                    $acl->set(array('allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''));
+                }
+            }
+
+
+            $location = ((isset($_REQUEST['location'])) ? notags(trim($_REQUEST['location'])) : EMPTY_STR);
+            $coord = ((isset($_REQUEST['coord'])) ? notags(trim($_REQUEST['coord'])) : EMPTY_STR);
+            $verb = ((isset($_REQUEST['verb'])) ? notags(trim($_REQUEST['verb'])) : EMPTY_STR);
+            $title = ((isset($_REQUEST['title'])) ? escape_tags(trim($_REQUEST['title'])) : EMPTY_STR);
+            $summary = ((isset($_REQUEST['summary'])) ? trim($_REQUEST['summary']) : EMPTY_STR);
+            $body = ((isset($_REQUEST['body'])) ? trim($_REQUEST['body']) : EMPTY_STR);
+            $body .= ((isset($_REQUEST['attachment'])) ? trim($_REQUEST['attachment']) : EMPTY_STR);
+            $postopts = '';
+
+            $allow_empty = ((array_key_exists('allow_empty', $_REQUEST)) ? intval($_REQUEST['allow_empty']) : 0);
+
+            $private = ((isset($private) && $private) ? $private : intval($acl->is_private() || ($public_policy)));
+
+            // If this is a comment, set the permissions from the parent.
+
+            if ($parent_item) {
+                $private = 0;
+                $acl->set($parent_item);
+                $private = ((intval($parent_item['item_private']) ? $parent_item['item_private'] : $acl->is_private()));
+                $public_policy = $parent_item['public_policy'];
+                $owner_hash = $parent_item['owner_xchan'];
+                $webpage = $parent_item['item_type'];
+                $comment_policy = $parent_item['comment_policy'];
+                $item_nocomment = $parent_item['item_nocomment'];
+                $comments_closed = $parent_item['comments_closed'];
+            }
+
+            if ((!$allow_empty) && (!strlen($body))) {
+                if ($preview) {
+                    killme();
+                }
+                info(t('Empty post discarded.') . EOL);
+                if ($api_source) {
+                    return (['success' => false, 'message' => 'no content']);
+                }
+                if (x($_REQUEST, 'return')) {
+                    goaway(z_root() . "/" . $return_path);
+                }
+                killme();
+            }
+        }
+
+
+        if (Apps::system_app_installed($profile_uid, 'Expire Posts')) {
+            if (x($_REQUEST, 'expire')) {
+                $expires = datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['expire']);
+                if ($expires <= datetime_convert()) {
+                    $expires = NULL_DATE;
+                }
+            }
+        }
+
+
+        $mimetype = notags(trim($_REQUEST['mimetype']));
+        if (!$mimetype) {
+            $mimetype = 'text/x-multicode';
+        }
+
+
+        $execflag = ((intval($uid) == intval($profile_uid)
+            && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
+
+        if ($preview) {
+            $summary = z_input_filter($summary, $mimetype, $execflag);
+            $body = z_input_filter($body, $mimetype, $execflag);
+        }
+
+
+        $arr = ['profile_uid' => $profile_uid, 'summary' => $summary, 'content' => $body, 'mimetype' => $mimetype];
+        Hook::call('post_content', $arr);
+        $summary = $arr['summary'];
+        $body = $arr['content'];
+        $mimetype = $arr['mimetype'];
+
+
+        $gacl = $acl->get();
+        $str_contact_allow = $gacl['allow_cid'];
+        $str_group_allow = $gacl['allow_gid'];
+        $str_contact_deny = $gacl['deny_cid'];
+        $str_group_deny = $gacl['deny_gid'];
+
+
+        $groupww = false;
+
+        // if this is a wall-to-wall post to a group, turn it into a direct message
+
+        $role = get_pconfig($profile_uid, 'system', 'permissions_role');
+
+        $rolesettings = PermissionRoles::role_perms($role);
+
+        $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal';
+
+        $is_group = (($channel_type === 'group') ? true : false);
+
+        if (($is_group) && ($walltowall) && (!$walltowall_comment)) {
+            $groupww = true;
+            $str_contact_allow = $owner_xchan['xchan_hash'];
+            $str_group_allow = '';
+        }
+
+
+        if (in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) {
+            // BBCODE alert: the following functions assume bbcode input
+            // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
+            // we may need virtual or template classes to implement the possible alternatives
+
+            if (strpos($body, '[/summary]') !== false) {
+                $match = '';
+                $cnt = preg_match("/\[summary\](.*?)\[\/summary\]/ism", $body, $match);
+                if ($cnt) {
+                    $summary .= $match[1];
+                }
+                $body_content = preg_replace("/^(.*?)\[summary\](.*?)\[\/summary\]/ism", '', $body);
+                $body = trim($body_content);
+            }
+
+            $summary = cleanup_bbcode($summary);
+            $body = cleanup_bbcode($body);
+
+            // Look for tags and linkify them
+            $summary_tags = linkify_tags($summary, ($uid) ? $uid : $profile_uid);
+            $body_tags = linkify_tags($body, ($uid) ? $uid : $profile_uid);
+            $comment_tags = linkify_tags($hidden_mentions, ($uid) ? $uid : $profile_uid);
+
+            foreach ([$summary_tags, $body_tags, $comment_tags] as $results) {
+                if ($results) {
+                    // Set permissions based on tag replacements
+                    set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private);
+
+                    if (!isset($post_tags)) {
+                        $post_tags = [];
+                    }
+                    foreach ($results as $result) {
+                        $success = $result['success'];
+                        if ($success['replaced']) {
+                            // suppress duplicate mentions/tags
+                            $already_tagged = false;
+                            foreach ($post_tags as $pt) {
+                                if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) {
+                                    $already_tagged = true;
+                                    break;
+                                }
+                            }
+                            if ($already_tagged) {
+                                continue;
+                            }
+
+                            $post_tags[] = array(
+                                'uid' => $profile_uid,
+                                'ttype' => $success['termtype'],
+                                'otype' => TERM_OBJ_POST,
+                                'term' => $success['term'],
+                                'url' => $success['url']
+                            );
+
+                            // support #collection syntax to post to a collection
+                            // this is accomplished by adding a pcategory tag for each collection target
+                            // this is checked inside tag_deliver() to create a second delivery chain
+
+                            if ($success['termtype'] === TERM_HASHTAG) {
+                                $r = q(
+                                    "select xchan_url from channel left join xchan on xchan_hash = channel_hash where channel_address = '%s' and channel_parent = '%s' and channel_removed = 0",
+                                    dbesc($success['term']),
+                                    dbesc(get_observer_hash())
+                                );
+                                if ($r) {
+                                    $post_tags[] = [
+                                        'uid' => $profile_uid,
+                                        'ttype' => TERM_PCATEGORY,
+                                        'otype' => TERM_OBJ_POST,
+                                        'term' => $success['term'] . '@' . App::get_hostname(),
+                                        'url' => $r[0]['xchan_url']
+                                    ];
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            /**
+             * process collections selected manually
+             */
+
+            if (array_key_exists('collections', $_REQUEST) && is_array($_REQUEST['collections']) && count($_REQUEST['collections'])) {
+                foreach ($_REQUEST['collections'] as $clct) {
+                    $r = q(
+                        "select xchan_url, xchan_hash from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
+                        dbesc($clct)
+                    );
+                    if ($r) {
+                        if (!isset($post_tags)) {
+                            $post_tags = [];
+                        }
+                        $post_tags[] = [
+                            'uid' => $profile_uid,
+                            'ttype' => TERM_PCATEGORY,
+                            'otype' => TERM_OBJ_POST,
+                            'term' => $clct,
+                            'url' => $r[0]['xchan_url']
+                        ];
+                    }
+                }
+            }
+
+            if (in_array(substr_count($str_contact_allow,'<'), [ 1, 2 ]) && (!$str_group_allow)) {
+                // direct message - private between individual channels but not groups
+                $private = 2;
+            }
+
+            if ($private) {
+                // for edited posts, re-use any existing OCAP token (if found).
+                // Otherwise generate a new one.
+
+                if ($iconfig) {
+                    foreach ($iconfig as $cfg) {
+                        if ($cfg['cat'] === 'ocap' && $cfg['k'] === 'relay') {
+                            $token = $cfg['v'];
+                        }
+                    }
+                }
+                if (!$token) {
+                    $token = new_token();
+                }
+            }
+
+
+            /**
+             *
+             * When a photo was uploaded into the message using the (profile wall) ajax
+             * uploader, The permissions are initially set to disallow anybody but the
+             * owner from seeing it. This is because the permissions may not yet have been
+             * set for the post. If it's private, the photo permissions should be set
+             * appropriately. But we didn't know the final permissions on the post until
+             * now. So now we'll look for links of uploaded photos and attachments that are in the
+             * post and set them to the same permissions as the post itself.
+             *
+             * If the post was end-to-end encrypted we can't find images and attachments in the body,
+             * use our media_str input instead which only contains these elements - but only do this
+             * when encrypted content exists because the photo/attachment may have been removed from
+             * the post and we should keep it private. If it's encrypted we have no way of knowing
+             * so we'll set the permissions regardless and realise that the media may not be
+             * referenced in the post.
+             *
+             */
+
+            if (!$preview) {
+                fix_attached_permissions($profile_uid, ((strpos($body, '[/crypt]')) ? $_POST['media_str'] : $body), $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $token);
+            }
+
+
+            $attachments = '';
+            $match = false;
+
+            if (preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/', $body, $match)) {
+                $attachments = [];
+                $i = 0;
+                foreach ($match[2] as $mtch) {
+                    $attach_link = '';
+                    $hash = substr($mtch, 0, strpos($mtch, ','));
+                    $rev = intval(substr($mtch, strpos($mtch, ',')));
+                    $r = attach_by_hash_nodata($hash, $observer['xchan_hash'], $rev);
+                    if ($r['success']) {
+                        $attachments[] = array(
+                            'href' => z_root() . '/attach/' . $r['data']['hash'],
+                            'length' => $r['data']['filesize'],
+                            'type' => $r['data']['filetype'],
+                            'title' => urlencode($r['data']['filename']),
+                            'revision' => $r['data']['revision']
+                        );
+                    }
+                    $body = str_replace($match[1][$i], $attach_link, $body);
+                    $i++;
+                }
+            }
+
+
+            if (preg_match_all('/(\[share=(.*?)\](.*?)\[\/share\])/', $body, $match)) {
+                // process share by id
+
+                $i = 0;
+                foreach ($match[2] as $mtch) {
+                    $reshare = new Share($mtch);
+                    $body = str_replace($match[1][$i], $reshare->bbcode(), $body);
+                    if (! is_array($attachments)) {
+                        $attachments = [];
+                    }
+                    $attachments = array_merge($attachments,$reshare->get_attach());
+                    $i++;
+                }
+            }
+        }
+
+        // BBCODE end alert
+
+
+        // if the acl contains a single contact and it's a group, add a mention. This is for compatibility
+        // with other groups implementations which require a mention to trigger group delivery.
+
+        if (($str_contact_allow) && (!$str_group_allow) && (!$str_contact_deny) && (!$str_group_deny)) {
+            $cida = expand_acl($str_contact_allow);
+            if (count($cida) === 1) {
+                $netgroups = get_forum_channels($profile_uid, 1);
+                if ($netgroups) {
+                    foreach ($netgroups as $ng) {
+                        if ($ng['xchan_hash'] == $cida[0]) {
+                            if (!is_array($post_tags)) {
+                                $post_tags = [];
+                            }
+                            $post_tags[] = array(
+                                'uid' => $profile_uid,
+                                'ttype' => TERM_MENTION,
+                                'otype' => TERM_OBJ_POST,
+                                'term' => $ng['xchan_name'],
+                                'url' => $ng['xchan_url']
+                            );
+
+                            $colls = get_xconfig($ng['xchan_hash'], 'activitypub', 'collections');
+                            if ($colls && is_array($colls) && isset($colls['wall'])) {
+                                $datarray['target'] = [
+                                    'id' => $colls['wall'],
+                                    'type' => 'Collection',
+                                    'attributedTo' => ((in_array($ng['xchan_network'], ['zot6', 'nomad'])) ? $ng['xchan_url'] : $ng['xchan_hash'])
+                                ];
+                                $datarray['tgt_type'] = 'Collection';
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+    
+        if (strlen($categories)) {
+            if (!isset($post_tags)) {
+                $post_tags = [];
+            }
+
+            $cats = explode(',', $categories);
+            foreach ($cats as $cat) {
+                if ($webpage == ITEM_TYPE_CARD) {
+                    $catlink = z_root() . '/cards/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
+                } elseif ($webpage == ITEM_TYPE_ARTICLE) {
+                    $catlink = z_root() . '/articles/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
+                } else {
+                    $catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat));
+                }
+
+                $post_tags[] = array(
+                    'uid' => $profile_uid,
+                    'ttype' => TERM_CATEGORY,
+                    'otype' => TERM_OBJ_POST,
+                    'term' => trim($cat),
+                    'url' => $catlink
+                );
+            }
+        }
+
+        if ($orig_post) {
+            // preserve original tags
+            $t = q(
+                "select * from term where oid = %d and otype = %d and uid = %d and ttype in ( %d, %d, %d )",
+                intval($orig_post['id']),
+                intval(TERM_OBJ_POST),
+                intval($profile_uid),
+                intval(TERM_UNKNOWN),
+                intval(TERM_FILE),
+                intval(TERM_COMMUNITYTAG)
+            );
+            if ($t) {
+                if (!isset($post_tags)) {
+                    $post_tags = [];
+                }
+
+                foreach ($t as $t1) {
+                    $post_tags[] = array(
+                        'uid' => $profile_uid,
+                        'ttype' => $t1['ttype'],
+                        'otype' => TERM_OBJ_POST,
+                        'term' => $t1['term'],
+                        'url' => $t1['url'],
+                    );
+                }
+            }
+        }
+
+
+        $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0);
+        $item_wall = ((isset($_REQUEST['type']) && ($_REQUEST['type'] === 'wall' || $_REQUEST['type'] === 'wall-comment')) ? 1 : 0);
+        $item_origin = (($origin) ? 1 : 0);
+        $item_nocomment = ((isset($item_nocomment)) ? $item_nocomment : $nocomment);
+
+
+        // determine if this is a wall post
+
+        if ($parent) {
+            $item_wall = $parent_item['item_wall'];
+        } else {
+            if (!$webpage) {
+                $item_wall = 1;
+            }
+        }
+
+
+        if ($moderated) {
+            $item_blocked = ITEM_MODERATED;
+        }
+
+
+        if (!strlen($verb)) {
+            $verb = ACTIVITY_POST;
+        }
+
+        $notify_type = (($parent) ? 'comment-new' : 'wall-new');
+
+        if (!(isset($mid) && $mid)) {
+            if ($message_id) {
+                $mid = $message_id;
+            } else {
+                $uuid = new_uuid();
+                $mid = z_root() . '/item/' . $uuid;
+            }
+        }
+
+
+        if ($is_poll) {
+            $poll = [
+                'question' => $body,
+                'answers' => $_REQUEST['poll_answers'],
+                'multiple_answers' => $_REQUEST['poll_multiple_answers'],
+                'expire_value' => $_REQUEST['poll_expire_value'],
+                'expire_unit' => $_REQUEST['poll_expire_unit']
+            ];
+            $obj = $this->extract_poll_data($poll, ['item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny]);
+        } else {
+            $obj = $this->extract_bb_poll_data($body, ['item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny]);
+        }
+
+
+        if ($obj) {
+            $obj['url'] = $obj['id'] = $mid;
+            $obj['attributedTo'] = Channel::url($channel);
+            $datarray['obj'] = $obj;
+            $obj_type = 'Question';
+            if ($obj['endTime']) {
+                $d = datetime_convert('UTC', 'UTC', $obj['endTime']);
+                if ($d > NULL_DATE) {
+                    $comments_closed = $d;
+                }
+            }
+        }
+
+        if (!$parent_mid) {
+            $parent_mid = $mid;
+        }
+
+        if ($parent_item) {
+            $parent_mid = $parent_item['mid'];
+        }
+
+
+        // Fallback so that we alway have a thr_parent
+
+        if (!$thr_parent) {
+            $thr_parent = $mid;
+        }
+
+
+        $item_thread_top = ((!$parent) ? 1 : 0);
+
+
+        // fix permalinks for cards, etc.
+
+        if ($webpage == ITEM_TYPE_CARD) {
+            $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid);
+        }
+        if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) {
+            $r = q(
+                "select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1",
+                intval($parent_item['id'])
+            );
+            if ($r) {
+                $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v'];
+            }
+        }
+
+        if ($webpage == ITEM_TYPE_ARTICLE) {
+            $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid);
+        }
+        if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_ARTICLE)) {
+            $r = q(
+                "select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.iid = %d limit 1",
+                intval($parent_item['id'])
+            );
+            if ($r) {
+                $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . $r[0]['v'];
+            }
+        }
+
+        if ((!(isset($plink) && $plink)) && $item_thread_top) {
+            $plink = z_root() . '/item/' . $uuid;
+        }
+
+        if (array_path_exists('obj/id', $datarray)) {
+            $datarray['obj']['id'] = $mid;
+        }
+
+		if ($private && !$parent) {
+			if ( intval($private) === 1 && (!$str_group_allow) && in_array(substr_count($str_contact_allow,'<'), [ 1, 2 ])) {
+				$private = 2;
+			}
+		}
+
+        $datarray['aid'] = $channel['channel_account_id'];
+        $datarray['uid'] = $profile_uid;
+        $datarray['uuid'] = $uuid;
+        $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']);
+        $datarray['author_xchan'] = $observer['xchan_hash'];
+        $datarray['created'] = $created;
+        $datarray['edited'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
+        $datarray['expires'] = $expires;
+        $datarray['commented'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
+        $datarray['received'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
+        $datarray['changed'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
+        $datarray['comments_closed'] = $comments_closed;
+        $datarray['mid'] = $mid;
+        $datarray['parent_mid'] = $parent_mid;
+        $datarray['mimetype'] = $mimetype;
+        $datarray['title'] = $title;
+        $datarray['summary'] = $summary;
+        $datarray['body'] = $body;
+        $datarray['app'] = $app;
+        $datarray['location'] = $location;
+        $datarray['coord'] = $coord;
+        $datarray['verb'] = $verb;
+        $datarray['obj_type'] = $obj_type;
+        $datarray['allow_cid'] = $str_contact_allow;
+        $datarray['allow_gid'] = $str_group_allow;
+        $datarray['deny_cid'] = $str_contact_deny;
+        $datarray['deny_gid'] = $str_group_deny;
+        $datarray['attach'] = $attachments;
+        $datarray['thr_parent'] = $thr_parent;
+        $datarray['postopts'] = $postopts;
+        $datarray['item_unseen'] = intval($item_unseen);
+        $datarray['item_wall'] = intval($item_wall);
+        $datarray['item_origin'] = intval($item_origin);
+        $datarray['item_type'] = $webpage;
+        $datarray['item_private'] = intval($private);
+        $datarray['item_thread_top'] = intval($item_thread_top);
+        $datarray['item_unseen'] = intval($item_unseen);
+        $datarray['item_starred'] = intval($item_starred);
+        $datarray['item_uplink'] = intval($item_uplink);
+        $datarray['item_consensus'] = 0;
+        $datarray['item_notshown'] = intval($item_notshown);
+        $datarray['item_nsfw'] = intval($item_nsfw);
+        $datarray['item_relay'] = intval($item_relay);
+        $datarray['item_mentionsme'] = intval($item_mentionsme);
+        $datarray['item_nocomment'] = intval($item_nocomment);
+        $datarray['item_obscured'] = intval($item_obscured);
+        $datarray['item_verified'] = intval($item_verified);
+        $datarray['item_retained'] = intval($item_retained);
+        $datarray['item_rss'] = intval($item_rss);
+        $datarray['item_deleted'] = intval($item_deleted);
+        $datarray['item_hidden'] = intval($item_hidden);
+        $datarray['item_unpublished'] = intval($item_unpublished);
+        $datarray['item_delayed'] = intval($item_delayed);
+        $datarray['item_pending_remove'] = intval($item_pending_remove);
+        $datarray['item_blocked'] = intval($item_blocked);
+        $datarray['layout_mid'] = $layout_mid;
+        $datarray['public_policy'] = $public_policy;
+        $datarray['comment_policy'] = ((is_numeric($comment_policy)) ? map_scope($comment_policy) : $comment_policy); // only map scope if it is numeric, otherwise use what we have
+        $datarray['term'] = $post_tags;
+        $datarray['plink'] = $plink;
+        $datarray['route'] = $route;
+        $datarray['replyto'] = $replyto;
+
+        // A specific ACL over-rides public_policy completely
+
+        if (!empty_acl($datarray)) {
+            $datarray['public_policy'] = '';
+        }
+
+        if ($iconfig) {
+            $datarray['iconfig'] = $iconfig;
+        }
+        if ($private) {
+            IConfig::set($datarray, 'ocap', 'relay', $token);
+        }
+
+        if (!array_key_exists('obj', $datarray)) {
+            $copy = $datarray;
+            $copy['author'] = $observer;
+            $datarray['obj'] = Activity::encode_item($copy, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
+            $recips = [];
+            $i = $datarray['obj'];
+            if ($i['to']) {
+                $recips['to'] = $i['to'];
+            }
+            if ($i['cc']) {
+                $recips['cc'] = $i['cc'];
+            }
+            IConfig::Set($datarray, 'activitypub', 'recips', $recips);
+        }
+
+        Activity::rewrite_mentions($datarray);
+
+        // preview mode - prepare the body for display and send it via json
+
+        if ($preview) {
+            require_once('include/conversation.php');
+
+            $datarray['owner'] = $owner_xchan;
+            $datarray['author'] = $observer;
+            $datarray['attach'] = json_encode($datarray['attach']);
+            $o = conversation(array($datarray), 'search', false, 'preview');
+            //      logger('preview: ' . $o, LOGGER_DEBUG);
+            echo json_encode(array('preview' => $o));
+            killme();
+        }
+
+        // Let 'post_local' event listeners know if this is an edit.
+        // We will unset it immediately afterward.
+
+        if ($orig_post) {
+            $datarray['edit'] = true;
+        }
+
+        // suppress duplicates, *unless* you're editing an existing post. This could get picked up
+        // as a duplicate if you're editing it very soon after posting it initially and you edited
+        // some attribute besides the content, such as title or categories.
+
+        if (PConfig::Get($profile_uid, 'system', 'suppress_duplicates', true) && (!$orig_post)) {
+            $z = q(
+                "select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1",
+                intval($profile_uid),
+                db_utcnow(),
+                db_quoteinterval('2 MINUTE'),
+                dbesc($body)
+            );
+
+            if ($z) {
+                $datarray['cancel'] = 1;
+                notice(t('Duplicate post suppressed.') . EOL);
+                logger('Duplicate post. Cancelled.');
+            }
+        }
+
+        Hook::call('post_local', $datarray);
+
+        // This is no longer needed
+        unset($datarray['edit']);
+
+        if (x($datarray, 'cancel')) {
+            logger('mod_item: post cancelled by plugin or duplicate suppressed.');
+            if ($return_path) {
+                goaway(z_root() . "/" . $return_path);
+            }
+            if ($api_source) {
+                return (['success' => false, 'message' => 'operation cancelled']);
+            }
+            $json = array('cancel' => 1);
+            $json['reload'] = z_root() . '/' . $_REQUEST['jsreload'];
+            json_return_and_die($json);
+        }
+
+
+        if (mb_strlen($datarray['title']) > 191) {
+            $datarray['title'] = mb_substr($datarray['title'], 0, 191);
+        }
+
+        if ($webpage) {
+            IConfig::Set(
+                $datarray,
+                'system',
+                webpage_to_namespace($webpage),
+                (($pagetitle) ? $pagetitle : basename($datarray['mid'])),
+                true
+            );
+        } elseif ($namespace) {
+            IConfig::Set(
+                $datarray,
+                'system',
+                $namespace,
+                (($remote_id) ? $remote_id : basename($datarray['mid'])),
+                true
+            );
+        }
+
+        if (intval($datarray['item_unpublished'])) {
+            $draft_msg = t('Draft saved. Use Drafts app to continue editing.');
+        }
+
+        if ($orig_post) {
+            $datarray['id'] = $post_id;
+
+            $x = item_store_update($datarray, $execflag);
+            if (!$parent) {
+                $r = q(
+                    "select * from item where id = %d",
+                    intval($post_id)
+                );
+                if ($r) {
+                    xchan_query($r);
+                    $sync_item = fetch_post_tags($r);
+                    Libsync::build_sync_packet($profile_uid, array('item' => array(encode_item($sync_item[0], true))));
+                }
+            }
+            if (!$nopush) {
+                Run::Summon(['Notifier', 'edit_post', $post_id]);
+            }
+
+            if ($api_source) {
+                return ($x);
+            }
+
+
+            if (intval($datarray['item_unpublished'])) {
+                info($draft_msg);
+            }
+
+
+            if ((x($_REQUEST, 'return')) && strlen($return_path)) {
+                logger('return: ' . $return_path);
+                goaway(z_root() . "/" . $return_path);
+            }
+            killme();
+        } else {
+            $post_id = 0;
+        }
+
+        $post = item_store($datarray, $execflag);
+
+        if ($pub_copy) {
+            info(t('Your comment has been posted.') . EOL);
+        }
+
+        $post_id = $post['item_id'];
+        $datarray = $post['item'];
+
+
+        if ($post_id) {
+            logger('mod_item: saved item ' . $post_id);
+
+            if ($parent) {
+                // prevent conversations which you are involved from being expired
+
+                if (local_channel()) {
+                    retain_item($parent);
+                }
+
+                // only send comment notification if this is a wall-to-wall comment and not a DM,
+                // otherwise it will happen during delivery
+
+                if (($datarray['owner_xchan'] != $datarray['author_xchan']) && (intval($parent_item['item_wall'])) && intval($datarray['item_private']) != 2) {
+                    Enotify::submit(array(
+                        'type' => NOTIFY_COMMENT,
+                        'from_xchan' => $datarray['author_xchan'],
+                        'to_xchan' => $datarray['owner_xchan'],
+                        'item' => $datarray,
+                        'link' => z_root() . '/display/' . gen_link_id($datarray['mid']),
+                        'verb' => ACTIVITY_POST,
+                        'otype' => 'item',
+                        'parent' => $parent,
+                        'parent_mid' => $parent_item['mid']
+                    ));
+                }
+            } else {
+                $parent = $post_id;
+
+                if (($datarray['owner_xchan'] != $datarray['author_xchan']) && ($datarray['item_type'] == ITEM_TYPE_POST)) {
+                    Enotify::submit(array(
+                        'type' => NOTIFY_WALL,
+                        'from_xchan' => $datarray['author_xchan'],
+                        'to_xchan' => $datarray['owner_xchan'],
+                        'item' => $datarray,
+                        'link' => z_root() . '/display/' . gen_link_id($datarray['mid']),
+                        'verb' => ACTIVITY_POST,
+                        'otype' => 'item'
+                    ));
+                }
+
+                if ($uid && $uid == $profile_uid && (is_item_normal($datarray))) {
+                    q(
+                        "update channel set channel_lastpost = '%s' where channel_id = %d",
+                        dbesc(datetime_convert()),
+                        intval($uid)
+                    );
+                }
+            }
+
+            // photo comments turn the corresponding item visible to the profile wall
+            // This way we don't see every picture in your new photo album posted to your wall at once.
+            // They will show up as people comment on them.
+
+            if (intval($parent_item['item_hidden'])) {
+                $r = q(
+                    "UPDATE item SET item_hidden = 0 WHERE id = %d",
+                    intval($parent_item['id'])
+                );
+            }
+        } else {
+            logger('mod_item: unable to retrieve post that was just stored.');
+            notice(t('System error. Post not saved.') . EOL);
+            if ($return_path) {
+                goaway(z_root() . "/" . $return_path);
+            }
+            if ($api_source) {
+                return (['success' => false, 'message' => 'system error']);
+            }
+            killme();
+        }
+
+        if (($parent) && ($parent != $post_id)) {
+            // Store the comment signature information in case we need to relay to Diaspora
+            //$ditem = $datarray;
+            //$ditem['author'] = $observer;
+            //store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0));
+        } else {
+            $r = q(
+                "select * from item where id = %d",
+                intval($post_id)
+            );
+            if ($r) {
+                xchan_query($r);
+                $sync_item = fetch_post_tags($r);
+                Libsync::build_sync_packet($profile_uid, array('item' => array(encode_item($sync_item[0], true))));
+            }
+        }
+
+        $datarray['id'] = $post_id;
+        $datarray['llink'] = z_root() . '/display/' . gen_link_id($datarray['mid']);
+
+        Hook::call('post_local_end', $datarray);
+
+        if ($groupww) {
+            $nopush = false;
+        }
+
+        if (!$nopush) {
+            Run::Summon(['Notifier', $notify_type, $post_id]);
+        }
+        logger('post_complete');
+
+        if ($moderated) {
+            info(t('Your post/comment is awaiting approval.') . EOL);
+        }
+
+        // figure out how to return, depending on from whence we came
+
+        if ($api_source) {
+            return $post;
+        }
+
+        if (intval($datarray['item_unpublished'])) {
+            info($draft_msg);
+        }
+
+        if ($return_path) {
+            goaway(z_root() . "/" . $return_path);
+        }
+
+        $json = array('success' => 1);
+        if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
+            $json['reload'] = z_root() . '/' . $_REQUEST['jsreload'];
+        }
+
+        logger('post_json: ' . print_r($json, true), LOGGER_DEBUG);
+
+        echo json_encode($json);
+        killme();
+        // NOTREACHED
+    }
+
+
+    public function get()
+    {
+
+
+        if ($this->return_404) {
+            notice(t('Not found'));
+            return;
+        }
+
+        if ((!local_channel()) && (!remote_channel())) {
+            return;
+        }
+
+        // allow pinned items to be dropped. 'pin-' was prepended to the id of these
+        // items so that they would have a unique html id even if the pinned item
+        // was also displayed in a normal conversation on the same web page.
+
+        $drop_id = str_replace('pin-', '', argv(2));
+
+        if ((argc() == 3) && (argv(1) === 'drop') && intval($drop_id)) {
+            $i = q(
+                "select * from item where id = %d limit 1",
+                intval($drop_id)
+            );
+
+            if ($i) {
+                $can_delete = false;
+                $local_delete = false;
+                $regular_delete = false;
+
+                if (local_channel() && local_channel() == $i[0]['uid']) {
+                    $local_delete = true;
+                }
+
+                $ob_hash = get_observer_hash();
+                if ($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) {
+                    $can_delete = true;
+                    $regular_delete = true;
+                }
+
+                // The site admin can delete any post/item on the site.
+                // If the item originated on this site+channel the deletion will propagate downstream.
+                // Otherwise just the local copy is removed.
+
+                if (is_site_admin()) {
+                    $local_delete = true;
+                    if (intval($i[0]['item_origin'])) {
+                        $can_delete = true;
+                    }
+                }
+
+
+                if (!($can_delete || $local_delete)) {
+                    notice(t('Permission denied.') . EOL);
+                    return;
+                }
+
+                if ($i[0]['resource_type'] === 'event') {
+                    // delete and sync the event separately
+                    $r = q(
+                        "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+                        dbesc($i[0]['resource_id']),
+                        intval($i[0]['uid'])
+                    );
+                    if ($r && $regular_delete) {
+                        $sync_event = $r[0];
+                        q(
+                            "delete from event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+                            dbesc($i[0]['resource_id']),
+                            intval($i[0]['uid'])
+                        );
+                        $sync_event['event_deleted'] = 1;
+                        Libsync::build_sync_packet($i[0]['uid'], array('event' => array($sync_event)));
+                    }
+                }
+
+                if ($i[0]['resource_type'] === 'photo') {
+                    attach_delete($i[0]['uid'], $i[0]['resource_id'], true);
+                    $ch = Channel::from_id($i[0]['uid']);
+                    if ($ch && $regular_delete) {
+                        $sync = attach_export_data($ch, $i[0]['resource_id'], true);
+                        if ($sync) {
+                            Libsync::build_sync_packet($i[0]['uid'], array('file' => array($sync)));
+                        }
+                    }
+                }
+
+
+                // if this is a different page type or it's just a local delete
+                // but not by the item author or owner, do a simple deletion
+
+                $complex = false;
+
+                if (intval($i[0]['item_type']) || ($local_delete && (!$can_delete))) {
+                    drop_item($i[0]['id']);
+                } else {
+                    // complex deletion that needs to propagate and be performed in phases
+                    drop_item($i[0]['id'], true, DROPITEM_PHASE1);
+                    $complex = true;
+                }
+
+                $r = q(
+                    "select * from item where id = %d",
+                    intval($i[0]['id'])
+                );
+                if ($r) {
+                    xchan_query($r);
+                    $sync_item = fetch_post_tags($r);
+                    Libsync::build_sync_packet($i[0]['uid'], array('item' => array(encode_item($sync_item[0], true))));
+                }
+
+                if ($complex) {
+                    tag_deliver($i[0]['uid'], $i[0]['id']);
+                }
+            }
+        }
+    }
+
+
+    public function item_check_service_class($channel_id, $iswebpage)
+    {
+        $ret = array('success' => false, 'message' => '');
+
+        if ($iswebpage) {
+            $r = q(
+                "select count(i.id)  as total from item i 
+				right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id )  
+				and i.parent=i.id and i.item_type = %d and i.item_deleted = 0 and i.uid= %d ",
+                intval(ITEM_TYPE_WEBPAGE),
+                intval($channel_id)
+            );
+        } else {
+            $r = q(
+                "select count(id) as total from item where parent = id and item_wall = 1 and uid = %d " . item_normal(),
+                intval($channel_id)
+            );
+        }
+
+        if (!$r) {
+            $ret['message'] = t('Unable to obtain post information from database.');
+            return $ret;
+        }
+
+
+        if (!$iswebpage) {
+            $max = engr_units_to_bytes(ServiceClass::fetch($channel_id, 'total_items'));
+            if (!ServiceClass::allows($channel_id, 'total_items', $r[0]['total'])) {
+                $result['message'] .= ServiceClass::upgrade_message() . sprintf(t('You have reached your limit of %1$.0f top level posts.'), $max);
+                return $result;
+            }
+        } else {
+            $max = engr_units_to_bytes(ServiceClass::fetch($channel_id, 'total_pages'));
+            if (!ServiceClass::allows($channel_id, 'total_pages', $r[0]['total'])) {
+                $result['message'] .= ServiceClass::upgrade_message() . sprintf(t('You have reached your limit of %1$.0f webpages.'), $max);
+                return $result;
+            }
+        }
+
+        $ret['success'] = true;
+        return $ret;
+    }
+
+    public function extract_bb_poll_data(&$body, $item)
+    {
+
+        $multiple = false;
+
+        if (strpos($body, '[/question]') === false && strpos($body, '[/answer]') === false) {
+            return false;
+        }
+        if (strpos($body, '[nobb]') !== false) {
+            return false;
+        }
+
+        $obj = [];
+        $ptr = [];
+        $matches = null;
+        $obj['type'] = 'Question';
+
+        if (preg_match_all('/\[answer\](.*?)\[\/answer\]/ism', $body, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $ptr[] = ['name' => $match[1], 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]];
+                $body = str_replace('[answer]' . $match[1] . '[/answer]', EMPTY_STR, $body);
+            }
+        }
+
+        $matches = null;
+
+        if (preg_match('/\[question\](.*?)\[\/question\]/ism', $body, $matches)) {
+            $obj['content'] = bbcode($matches[1]);
+            $body = str_replace('[question]' . $matches[1] . '[/question]', $matches[1], $body);
+            $obj['oneOf'] = $ptr;
+        }
+
+        $matches = null;
+
+        if (preg_match('/\[question=multiple\](.*?)\[\/question\]/ism', $body, $matches)) {
+            $obj['content'] = bbcode($matches[1]);
+            $body = str_replace('[question=multiple]' . $matches[1] . '[/question]', $matches[1], $body);
+            $obj['anyOf'] = $ptr;
+        }
+
+        $matches = null;
+
+        if (preg_match('/\[ends\](.*?)\[\/ends\]/ism', $body, $matches)) {
+            $obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', $matches[1], ATOM_TIME);
+            $body = str_replace('[ends]' . $matches[1] . '[/ends]', EMPTY_STR, $body);
+        }
+
+        if ($item['item_private']) {
+            $obj['to'] = Activity::map_acl($item);
+        } else {
+            $obj['to'] = [ACTIVITY_PUBLIC_INBOX];
+        }
+
+        return $obj;
+    }
+
+    public function extract_poll_data($poll, $item)
+    {
+
+        $multiple = intval($poll['multiple_answers']);
+        $expire_value = intval($poll['expire_value']);
+        $expire_unit = $poll['expire_unit'];
+        $question = $poll['question'];
+        $answers = $poll['answers'];
+
+        $obj = [];
+        $ptr = [];
+        $obj['type'] = 'Question';
+        $obj['content'] = bbcode($question);
+
+        foreach ($answers as $answer) {
+            if (trim($answer)) {
+                $ptr[] = ['name' => escape_tags($answer), 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]];
+            }
+        }
+
+        if ($multiple) {
+            $obj['anyOf'] = $ptr;
+        } else {
+            $obj['oneOf'] = $ptr;
+        }
+
+        $obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', 'now + ' . $expire_value . ' ' . $expire_unit, ATOM_TIME);
+
+        if ($item['item_private']) {
+            $obj['to'] = Activity::map_acl($item);
+        } else {
+            $obj['to'] = [ACTIVITY_PUBLIC_INBOX];
+        }
+
+        return $obj;
+    }
+}
diff --git a/Code/Module/Jwks.php b/Code/Module/Jwks.php
new file mode 100644
index 000000000..bc7a6af04
--- /dev/null
+++ b/Code/Module/Jwks.php
@@ -0,0 +1,62 @@
+ base64url_encode($e),
+                'n' => base64url_encode($m),
+                'kty' => 'RSA',
+                'kid' => '0',
+            ]
+        ];
+
+
+        $ret = [
+            'keys' => $keys
+        ];
+
+        if (argc() > 1) {
+            $entry = intval(argv(1));
+            if ($keys[$entry]) {
+                unset($keys[$entry]['kid']);
+                json_return_and_die($keys[$entry], 'application/jwk+json');
+            }
+        }
+
+        json_return_and_die($ret, 'application/jwk-set+json');
+    }
+}
diff --git a/Code/Module/Lang.php b/Code/Module/Lang.php
new file mode 100644
index 000000000..a95b80279
--- /dev/null
+++ b/Code/Module/Lang.php
@@ -0,0 +1,30 @@
+Language App (Not Installed):
      ';
+                $o .= t('Change UI language');
+                return $o;
+            }
+        }
+
+        Navbar::set_selected('Language');
+        return lang_selector();
+    }
+}
diff --git a/Code/Module/Layouts.php b/Code/Module/Layouts.php
new file mode 100644
index 000000000..1163224b0
--- /dev/null
+++ b/Code/Module/Layouts.php
@@ -0,0 +1,219 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+    public function get()
+    {
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $which = argv(1);
+
+        $_SESSION['return_url'] = App::$query_string;
+
+        $uid = local_channel();
+        $owner = 0;
+        $channel = null;
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                $uid = $owner = intval($sys['channel_id']);
+                $channel = $sys;
+                $observer = $sys;
+            }
+        }
+
+        if (!$owner) {
+            // Figure out who the page owner is.
+            $r = q(
+                "select channel_id from channel where channel_address = '%s'",
+                dbesc($which)
+            );
+            if ($r) {
+                $owner = intval($r[0]['channel_id']);
+            }
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        // Block design features from visitors
+
+        if ((!$uid) || ($uid != $owner)) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        // Get the observer, check their permissions
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        // This feature is not exposed in redbasic ui since it is not clear why one would want to
+        // download a json encoded pdl file - we dont have a possibility to import it.
+        // Use the buildin share/install feature instead.
+
+        if ((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
+            $r = q(
+                "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
+				left join item on item.id = iconfig.iid 
+				where uid = %d and mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc",
+                intval($owner),
+                dbesc(argv(3))
+            );
+            if ($r) {
+                header('Content-type: application/x-hubzilla-layout');
+                header('Content-Disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"');
+                echo json_encode($r);
+                killme();
+            }
+        }
+
+        // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
+        // Nickname is set to the observers xchan, and profile_uid to the owners.
+        // This lets you post pages at other people's channels.
+
+        $x = array(
+            'webpage' => ITEM_TYPE_PDL,
+            'is_owner' => true,
+            'nickname' => App::$profile['channel_address'],
+            'showacl' => false,
+            'hide_voting' => true,
+            'hide_future' => true,
+            'hide_expire' => true,
+            'hide_location' => true,
+            'hide_weblink' => true,
+            'hide_attach' => true,
+            'hide_preview' => true,
+            'disable_comments' => true,
+            'ptlabel' => t('Layout Name'),
+            'profile_uid' => intval($owner),
+            'expanded' => true,
+            'placeholdertitle' => t('Layout Description (Optional)'),
+            'novoting' => true,
+            'bbco_autocomplete' => 'comanche'
+        );
+
+        if ($_REQUEST['title']) {
+            $x['title'] = $_REQUEST['title'];
+        }
+        if ($_REQUEST['body']) {
+            $x['body'] = $_REQUEST['body'];
+        }
+        if ($_REQUEST['pagetitle']) {
+            $x['pagetitle'] = $_REQUEST['pagetitle'];
+        }
+
+        $editor = status_editor($x);
+
+        $r = q(
+            "select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig 
+			left join item on iconfig.iid = item.id
+			where uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' and item_type = %d order by item.created desc",
+            intval($owner),
+            intval(ITEM_TYPE_PDL)
+        );
+
+        $pages = null;
+
+        if ($r) {
+            $pages = [];
+            foreach ($r as $rr) {
+                $element_arr = array(
+                    'type' => 'layout',
+                    'title' => $rr['title'],
+                    'body' => $rr['body'],
+                    'created' => $rr['created'],
+                    'edited' => $rr['edited'],
+                    'mimetype' => $rr['mimetype'],
+                    'pagetitle' => urldecode($rr['v']),
+                    'mid' => $rr['mid']
+                );
+                $pages[$rr['iid']][] = array(
+                    'url' => $rr['iid'],
+                    'title' => urldecode($rr['v']),
+                    'descr' => $rr['title'],
+                    'mid' => $rr['mid'],
+                    'created' => $rr['created'],
+                    'edited' => $rr['edited'],
+                    'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
+                );
+            }
+        }
+
+        //Build the base URL for edit links
+        $url = z_root() . '/editlayout/' . $which;
+
+        $o .= replace_macros(Theme::get_template('layoutlist.tpl'), array(
+            '$title' => t('Layouts'),
+            '$create' => t('Create'),
+            '$help' => '', // array('text' => t('Help'), 'url' => 'help/comanche', 'title' => t('Comanche page description language help')),
+            '$editor' => $editor,
+            '$baseurl' => $url,
+            '$name' => t('Layout Name'),
+            '$descr' => t('Layout Description'),
+            '$created' => t('Created'),
+            '$edited' => t('Edited'),
+            '$edit' => t('Edit'),
+            '$share' => t('Share'),
+            '$download' => t('Download PDL file'),
+            '$pages' => $pages,
+            '$channel' => $which,
+            '$view' => t('View'),
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Like.php b/Code/Module/Like.php
new file mode 100644
index 000000000..ec10e9f05
--- /dev/null
+++ b/Code/Module/Like.php
@@ -0,0 +1,317 @@
+ 1 && $test[0] === 'Undo') {
+            $undo = true;
+            $activity = $test[1];
+        }
+
+        if (! in_array($activity, [ 'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept' ])) {
+            killme();
+        }
+
+        $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]);
+
+        // Check for when target is something besides messages, where argv(1) is the type of thing
+        // and  argv(2) is an identifier of things of that type
+        // We currently only recognise 'profile' but other types could be handled
+
+
+        if (! $observer) {
+            killme();
+        }
+
+        // this is used to like an item or comment
+
+        $item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0);
+
+        logger('like: undo: ' . (($undo) ? 'true' : 'false'));
+        logger('like: verb ' . $activity . ' item ' . $item_id, LOGGER_DEBUG);
+
+        // get the item. Allow linked photos (which are normally hidden) to be liked
+
+        $r = q(
+            "SELECT * FROM item WHERE id = %d 
+			and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 
+			and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
+            intval($item_id)
+        );
+
+        // if interacting with a pubstream item,
+        // create a copy of the parent in your stream.
+
+        if ($r) {
+            if (local_channel() && (! Channel::is_system(local_channel()))) {
+                $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ];
+            }
+        }
+
+        if (! $item_id || (! $r)) {
+            logger('like: no item ' . $item_id);
+            killme();
+        }
+
+        xchan_query($r, true);
+
+        $item = array_shift($r);
+
+        $owner_uid = $item['uid'];
+        $owner_aid = $item['aid'];
+
+        $can_comment = false;
+        if ((array_key_exists('owner', $item)) && intval($item['owner']['abook_self'])) {
+            $can_comment = perm_is_allowed($item['uid'], $observer['xchan_hash'], 'post_comments');
+        } else {
+            $can_comment = can_comment_on_post($observer['xchan_hash'], $item);
+        }
+
+        if (! $can_comment) {
+            notice(t('Permission denied') . EOL);
+            killme();
+        }
+
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($item['owner_xchan'])
+        );
+
+        if ($r) {
+            $thread_owner = array_shift($r);
+        } else {
+            killme();
+        }
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($item['author_xchan'])
+        );
+        if ($r) {
+            $item_author = array_shift($r);
+        } else {
+            killme();
+        }
+
+        if ($undo) {
+            $r = q(
+                "select * from item where thr_parent = '%s' and verb = '%s' and author_xchan = '%s' and uid = %d and item_deleted = 0 limit 1",
+                dbesc($item['thr_parent']),
+                dbesc($activity),
+                dbesc($observer['xchan_hash']),
+                intval($owner_uid)
+            );
+
+            xchan_query($r, true);
+            $r = fetch_post_tags($r, true);
+            $r[0]['obj'] = json_decode($r[0]['obj'], true);
+            $object = Activity::encode_activity($r[0], true);
+
+            // do not do either a federated or hard delete on the original reaction
+            // as we are going to send an Undo to perform this task
+            // just set item_deleted to update the local conversation
+
+            $retval = q(
+                "update item set item_deleted = 1 where id = %d",
+                intval($r[0]['id'])
+            );
+        } else {
+            $object = Activity::fetch_item([ 'id' => $item['mid'] ]);
+        }
+
+        if (! $object) {
+            killme();
+        }
+
+        $uuid = new_uuid();
+
+        // we have everything we need - start building our new item
+
+        $arr = [];
+
+        $arr['uuid']  = $uuid;
+        $arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/' ) . $uuid;
+
+        $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
+        if ($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
+            $post_type = t('event');
+        }
+
+        $objtype = $item['obj_type'];
+
+        $body = $item['body'];
+
+
+        if (! intval($item['item_thread_top'])) {
+            $post_type = 'comment';
+        }
+
+        $arr['item_origin'] = 1;
+        $arr['item_notshown'] = 1;
+        $arr['item_type'] = $item['item_type'];
+
+        if (intval($item['item_wall'])) {
+            $arr['item_wall'] = 1;
+        }
+
+        // if this was a linked photo and was hidden, unhide it and distribute it.
+
+        if (intval($item['item_hidden'])) {
+            $r = q(
+                "update item set item_hidden = 0 where id = %d",
+                intval($item['id'])
+            );
+
+            $r = q(
+                "select * from item where id = %d",
+                intval($item['id'])
+            );
+            if ($r) {
+                xchan_query($r);
+                $sync_item = fetch_post_tags($r);
+                Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
+            }
+
+            Run::Summon([ 'Notifier','wall-new',$item['id'] ]);
+        }
+
+
+        if ($undo) {
+            $arr['body'] = t('Undo a previous action');
+            $arr['item_notshown'] = 1;
+        } else {
+            if ($activity === 'Like') {
+                $bodyverb = t('%1$s likes %2$s\'s %3$s');
+            }
+            if ($activity === 'Dislike') {
+                $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
+            }
+            if ($activity === 'Accept') {
+                $bodyverb = t('%1$s is attending %2$s\'s %3$s');
+            }
+            if ($activity === 'Reject') {
+                $bodyverb = t('%1$s is not attending %2$s\'s %3$s');
+            }
+            if ($activity === 'TentativeAccept') {
+                $bodyverb = t('%1$s may attend %2$s\'s %3$s');
+            }
+
+            if (! isset($bodyverb)) {
+                killme();
+            }
+
+            $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
+            $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
+            $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
+
+            $arr['body'] = sprintf($bodyverb, $alink, $ulink, $plink);
+        }
+
+
+        if (local_channel() && $activity === 'Accept') {
+            event_addtocal($item['id'], $channel['channel_id']);
+        }
+
+        $arr['parent']       = $item['id'];
+        $arr['thr_parent']   = $item['mid'];
+        $allow_cid       = $item['allow_cid'];
+        $allow_gid       = $item['allow_gid'];
+        $deny_cid        = $item['deny_cid'];
+        $deny_gid        = $item['deny_gid'];
+        $private         = $item['private'];
+
+        $arr['aid']          = $owner_aid;
+        $arr['uid']          = $owner_uid;
+
+        $arr['item_flags']   = $item['item_flags'];
+        $arr['item_wall']    = $item['item_wall'];
+        $arr['parent_mid']   = $item['mid'];
+        $arr['owner_xchan']  = $thread_owner['xchan_hash'];
+        $arr['author_xchan'] = $observer['xchan_hash'];
+
+
+
+        $arr['verb']          = (($undo) ? 'Undo' : $activity);
+        $arr['obj_type']      = (($undo) ? $activity : $objtype);
+        $arr['obj']           = $object;
+
+        if ($target) {
+            $arr['tgt_type']  = $tgttype;
+            $arr['target']    = $target;
+        }
+
+        $arr['allow_cid']     = $allow_cid;
+        $arr['allow_gid']     = $allow_gid;
+        $arr['deny_cid']      = $deny_cid;
+        $arr['deny_gid']      = $deny_gid;
+        $arr['item_private']  = $private;
+
+        Hook::call('post_local', $arr);
+
+        $post = item_store($arr);
+        $post_id = $post['item_id'];
+
+        // save the conversation from expiration
+
+        if (local_channel() && array_key_exists('item', $post) && (intval($post['item']['id']) != intval($post['item']['parent']))) {
+            retain_item($post['item']['parent']);
+        }
+
+        $arr['id'] = $post_id;
+
+        Hook::call('post_local_end', $arr);
+
+        $r = q(
+            "select * from item where id = %d",
+            intval($post_id)
+        );
+        if ($r) {
+            xchan_query($r);
+            $sync_item = fetch_post_tags($r);
+            Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
+        }
+
+        Run::Summon([ 'Notifier', 'like', $post_id ]);
+
+        killme();
+    }
+}
diff --git a/Code/Module/Linkinfo.php b/Code/Module/Linkinfo.php
new file mode 100644
index 000000000..80190026d
--- /dev/null
+++ b/Code/Module/Linkinfo.php
@@ -0,0 +1,644 @@
+ true, 'nobody' => true]);
+        if ($result['success']) {
+            $hdrs = [];
+            $h = explode("\n", $result['header']);
+            foreach ($h as $l) {
+                list($k, $v) = array_map("trim", explode(":", trim($l), 2));
+                $hdrs[strtolower($k)] = $v;
+            }
+            if (array_key_exists('content-type', $hdrs)) {
+                $type = $hdrs['content-type'];
+            }
+            if ($type) {
+                if (stripos($type, 'image/') !== false) {
+                    $basename = basename($url);
+
+                    if ($zrl) {
+                        echo $br . '[zmg alt="' . $basename . '"]' . $url . '[/zmg]' . $br;
+                    } else {
+                        echo $br . '[img alt="' . $basename . '"]' . $url . '[/img]' . $br;
+                    }
+                    killme();
+                }
+                if ((stripos($type, 'video/') !== false) || ($type === 'application/ogg')) {
+                    $thumb = self::get_video_poster($url);
+                    if ($thumb) {
+                        if ($zrl) {
+                            echo $br . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . $br;
+                        } else {
+                            echo $br . '[video poster=\'' . $thumb . '\']' . $url . '[/video]' . $br;
+                        }
+                        killme();
+                    }
+                    if ($zrl) {
+                        echo $br . '[zvideo]' . $url . '[/zvideo]' . $br;
+                    } else {
+                        echo $br . '[video]' . $url . '[/video]' . $br;
+                    }
+                    killme();
+                }
+                if (stripos($type, 'audio/') !== false) {
+                    if ($zrl) {
+                        echo $br . '[zaudio]' . $url . '[/zaudio]' . $br;
+                    } else {
+                        echo $br . '[audio]' . $url . '[/audio]' . $br;
+                    }
+                    killme();
+                }
+                if (strtolower($type) === 'text/calendar') {
+                    $content = z_fetch_url($url, false, 0, array('novalidate' => true));
+                    if ($content['success']) {
+                        $ev = ical_to_ev($content['body']);
+                        if ($ev) {
+                            echo $br . format_event_bbcode($ev[0]) . $br;
+                            killme();
+                        }
+                    }
+                }
+                if (strtolower($type) === 'application/pdf' || strtolower($type) === 'application/x-pdf') {
+                    echo $br . '[embed]' . $url . '[/embed]' . $br;
+                    killme();
+                }
+            }
+        }
+
+        $template = $br . '[url=%s]%s[/url]%s' . $br;
+
+        $arr = array('url' => $url, 'text' => '');
+
+        Hook::call('parse_link', $arr);
+
+        if (strlen($arr['text'])) {
+            echo $arr['text'];
+            killme();
+        }
+
+        if ($process_oembed) {
+            $x = Oembed::process($url);
+            if ($x) {
+                echo $x;
+                killme();
+            }
+        }
+
+        if ($process_zotobj) {
+            $x = Activity::fetch($url, App::get_channel());
+            $y = null;
+            if (is_array($x)) {
+                if (ActivityStreams::is_an_actor($x['type']) && $x['id']) {
+                    if (check_siteallowed($x['id']) && check_channelallowed($x['id'])) {
+                        $url = $x['url'];
+                        if (is_array($url)) {
+                            $url = $url[0]['href'];
+                        }
+                        $name = (($x['name']) ? $x['name'] . ' (' . $x['preferredUsername'] . ')' : $x['preferredUsername']);
+
+                        if (array_path_exists('icon/url', $x)) {
+                            $text = $br . $br . '[zrl=' . $url . '][zmg=300x300]' . $x['icon']['url'] . '[/zmg][/zrl]';
+                        }
+                        $text .= $br . $br . '[zrl=' . $url . ']' . $name . '[/zrl]' . $br . $br;
+                        echo $text;
+                        killme();
+                    }
+                } else {
+                    $y = new ActivityStreams($x);
+                    if (
+                        $y->is_valid() && $y->type === 'Announce' && is_array($y->obj)
+                        && array_key_exists('object', $y->obj) && array_key_exists('actor', $y->obj)
+                    ) {
+                        // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
+                        // Reparse the encapsulated Activity and use that instead
+                        logger('relayed activity', LOGGER_DEBUG);
+                        $y = new ActivityStreams($y->obj);
+                    }
+                }
+
+                if ($y && $y->is_valid()) {
+                    $z = Activity::decode_note($y);
+                    $r = q(
+                        "select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_hash = '%s' OR hubloc_id_url = '%s'",
+                        dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor),
+                        dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor)
+                    );
+
+                    if ($r) {
+                        $r = Libzot::zot_record_preferred($r);
+                        if ($z) {
+                            $z['author_xchan'] = $r['hubloc_hash'];
+                        }
+                    }
+
+                    if ($z) {
+                        // do not allow somebody to embed a post that was blocked by the site admin
+                        // We *will* let them over-rule any blocks they created themselves
+
+                        if (check_siteallowed($r['hubloc_id_url']) && check_channelallowed($z['author_xchan'])) {
+                            $s = new Zlib\Share($z);
+                            echo $s->bbcode();
+                            killme();
+                        }
+                    }
+                }
+            }
+        }
+
+
+        if ($url && $title && $text) {
+            $text = $br . '[quote]' . trim($text) . '[/quote]' . $br;
+
+            $title = str_replace(array("\r", "\n"), array('', ''), $title);
+
+            $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
+
+            logger('linkinfo (unparsed): returns: ' . $result);
+
+            echo $result;
+            killme();
+        }
+
+        $siteinfo = self::parseurl_getsiteinfo($url);
+
+        // If the site uses this platform, use zrl rather than url so they get zids sent to them by default
+
+        if (is_matrix_url($url)) {
+            $template = str_replace('url', 'zrl', $template);
+        }
+
+        if ($siteinfo["title"] == "") {
+            echo sprintf($template, $url, $url, '') . $str_tags;
+            killme();
+        } else {
+            $text = $siteinfo["text"];
+            $title = $siteinfo["title"];
+        }
+
+        $image = "";
+
+        if (isset($siteinfo['images']) && is_array($siteinfo['images']) && count($siteinfo["images"])) {
+            /* Execute below code only if image is present in siteinfo */
+
+            $total_images = 0;
+            $max_images = get_config('system', 'max_bookmark_images');
+            if ($max_images === false) {
+                $max_images = 2;
+            } else {
+                $max_images = intval($max_images);
+            }
+
+            foreach ($siteinfo["images"] as $imagedata) {
+                if ($url) {
+                    $image .= sprintf('[url=%s]', $url);
+                }
+                $image .= '[img=' . $imagedata["width"] . 'x' . $imagedata["height"] . ']' . $imagedata["src"] . '[/img]';
+                if ($url) {
+                    $image .= '[/url]';
+                }
+                $image .= "\n";
+                $total_images++;
+                if ($max_images && $max_images >= $total_images) {
+                    break;
+                }
+            }
+        }
+
+        if (strlen($text)) {
+            $text = $br . '[quote]' . trim($text) . '[/quote]' . $br;
+        }
+
+        if ($image) {
+            $text = $br . $br . $image . $text;
+        }
+        $title = str_replace(array("\r", "\n"), array('', ''), $title);
+
+        $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
+
+        logger('linkinfo: returns: ' . $result, LOGGER_DEBUG);
+
+        echo trim($result);
+        killme();
+    }
+
+
+    public static function deletexnode(&$doc, $node)
+    {
+        $xpath = new DomXPath($doc);
+        $list = $xpath->query("//" . $node);
+        foreach ($list as $child) {
+            $child->parentNode->removeChild($child);
+        }
+    }
+
+    public static function completeurl($url, $scheme)
+    {
+        $urlarr = parse_url($url);
+
+        if (isset($urlarr["scheme"])) {
+            return ($url);
+        }
+
+        $schemearr = parse_url($scheme);
+
+        $complete = $schemearr["scheme"] . "://" . $schemearr["host"];
+
+        if ($schemearr["port"] != "") {
+            $complete .= ":" . $schemearr["port"];
+        }
+
+        if (strpos($urlarr['path'], '/') !== 0) {
+            $complete .= '/';
+        }
+
+        $complete .= $urlarr["path"];
+
+        if ($urlarr["query"] != "") {
+            $complete .= "?" . $urlarr["query"];
+        }
+
+        if ($urlarr["fragment"] != "") {
+            $complete .= "#" . $urlarr["fragment"];
+        }
+
+        return ($complete);
+    }
+
+    public static function get_video_poster($url)
+    {
+
+        if (strpos($url, z_root() . '/cloud/') === false) {
+            return EMPTY_STR;
+        }
+        $m = parse_url($url, PHP_URL_PATH);
+        if ($m) {
+            // strip leading '/cloud/'
+            $m = substr($m, 7);
+        }
+        $nick = substr($m, 0, strpos($m, '/'));
+        $p = substr($m, strpos($m, '/') + 1);
+
+        // get the channel to check permissions
+
+        $u = Channel::from_username($nick);
+
+        if ($u && $p) {
+            $sql_extra = permissions_sql(intval($u['channel_id']));
+
+            $r = q(
+                "select hash, content from attach where display_path = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1",
+                dbesc($p),
+                intval($u['channel_id'])
+            );
+            if ($r) {
+                $path = dbunescbin($r[0]['content']);
+                if ($path && @file_exists($path . '.thumb')) {
+                    return z_root() . '/poster/' . $nick . '/' . $r[0]['hash'];
+                }
+            }
+        }
+        return EMPTY_STR;
+    }
+
+
+    public static function parseurl_getsiteinfo($url)
+    {
+        $siteinfo = [];
+
+
+        $result = z_fetch_url($url, false, 0, array('novalidate' => true));
+        if (!$result['success']) {
+            return $siteinfo;
+        }
+
+        $header = $result['header'];
+        $body = $result['body'];
+
+        // Check codepage in HTTP headers or HTML if not exist
+        $cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : '');
+        if (empty($cp)) {
+            $cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO');
+        }
+
+        $body = mb_convert_encoding($body, 'UTF-8', $cp);
+        $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
+
+		if (! $body) {
+			return $siteinfo;
+		}
+
+		try {
+		    $doc = new DOMDocument();
+			$doc->loadHTML($body);
+		} catch (Exception $e) {
+			return $siteinfo;
+		}
+		
+        self::deletexnode($doc, 'style');
+        self::deletexnode($doc, 'script');
+        self::deletexnode($doc, 'option');
+        self::deletexnode($doc, 'h1');
+        self::deletexnode($doc, 'h2');
+        self::deletexnode($doc, 'h3');
+        self::deletexnode($doc, 'h4');
+        self::deletexnode($doc, 'h5');
+        self::deletexnode($doc, 'h6');
+        self::deletexnode($doc, 'ol');
+        self::deletexnode($doc, 'ul');
+
+        $xpath = new DomXPath($doc);
+
+        $list = $xpath->query("//title");
+        foreach ($list as $node) {
+            $siteinfo["title"] = html_entity_decode($node->nodeValue, ENT_QUOTES, "UTF-8");
+        }
+
+        $list = $xpath->query("//meta[@name]");
+        foreach ($list as $node) {
+            $attr = [];
+            if ($node->attributes->length) {
+                foreach ($node->attributes as $attribute) {
+                    $attr[$attribute->name] = $attribute->value;
+                }
+            }
+
+            $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8");
+
+            switch (strtolower($attr["name"])) {
+                case "fulltitle":
+                    $siteinfo["title"] = trim($attr["content"]);
+                    break;
+                case "description":
+                    $siteinfo["text"] = trim($attr["content"]);
+                    break;
+                case "thumbnail":
+                    $siteinfo["image"] = $attr["content"];
+                    break;
+                case "twitter:image":
+                    $siteinfo["image"] = $attr["content"];
+                    break;
+                case "twitter:image:src":
+                    $siteinfo["image"] = $attr["content"];
+                    break;
+                case "twitter:card":
+                    if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) {
+                        $siteinfo["type"] = $attr["content"];
+                    }
+                    break;
+                case "twitter:description":
+                    $siteinfo["text"] = trim($attr["content"]);
+                    break;
+                case "twitter:title":
+                    $siteinfo["title"] = trim($attr["content"]);
+                    break;
+                case "dc.title":
+                    $siteinfo["title"] = trim($attr["content"]);
+                    break;
+                case "dc.description":
+                    $siteinfo["text"] = trim($attr["content"]);
+                    break;
+                case "keywords":
+                    $keywords = explode(",", $attr["content"]);
+                    break;
+                case "news_keywords":
+                    $keywords = explode(",", $attr["content"]);
+                    break;
+            }
+        }
+
+        $list = $xpath->query("//meta[@property]");
+        foreach ($list as $node) {
+            $attr = [];
+            if ($node->attributes->length) {
+                foreach ($node->attributes as $attribute) {
+                    $attr[$attribute->name] = $attribute->value;
+                }
+            }
+
+            $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8");
+
+            switch (strtolower($attr["property"])) {
+                case "og:image":
+                    $siteinfo["image"] = $attr["content"];
+                    break;
+                case "og:title":
+                    $siteinfo["title"] = $attr["content"];
+                    break;
+                case "og:description":
+                    $siteinfo["text"] = $attr["content"];
+                    break;
+            }
+        }
+
+        if ($siteinfo["image"] == "") {
+            $list = $xpath->query("//img[@src]");
+            foreach ($list as $node) {
+                $attr = [];
+                if ($node->attributes->length) {
+                    foreach ($node->attributes as $attribute) {
+                        $attr[$attribute->name] = $attribute->value;
+                    }
+                }
+
+                $src = self::completeurl($attr["src"], $url);
+                $photodata = @getimagesize($src);
+
+                if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) {
+                    if ($photodata[0] > 300) {
+                        $photodata[1] = round($photodata[1] * (300 / $photodata[0]));
+                        $photodata[0] = 300;
+                    }
+                    if ($photodata[1] > 300) {
+                        $photodata[0] = round($photodata[0] * (300 / $photodata[1]));
+                        $photodata[1] = 300;
+                    }
+                    $siteinfo["images"][] = array("src" => $src,
+                        "width" => $photodata[0],
+                        "height" => $photodata[1]);
+                }
+            }
+        } else {
+            $src = self::completeurl($siteinfo["image"], $url);
+
+            unset($siteinfo["image"]);
+
+            $photodata = @getimagesize($src);
+
+            if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10)) {
+                $siteinfo["images"][] = array("src" => $src,
+                    "width" => $photodata[0],
+                    "height" => $photodata[1]);
+            }
+        }
+
+        if ($siteinfo["text"] == "") {
+            $text = "";
+
+            $list = $xpath->query("//div[@class='article']");
+            foreach ($list as $node) {
+                if (strlen($node->nodeValue) > 40) {
+                    $text .= " " . trim($node->nodeValue);
+                }
+            }
+
+            if ($text == "") {
+                $list = $xpath->query("//div[@class='content']");
+                foreach ($list as $node) {
+                    if (strlen($node->nodeValue) > 40) {
+                        $text .= " " . trim($node->nodeValue);
+                    }
+                }
+            }
+
+            // If none text was found then take the paragraph content
+            if ($text == "") {
+                $list = $xpath->query("//p");
+                foreach ($list as $node) {
+                    if (strlen($node->nodeValue) > 40) {
+                        $text .= " " . trim($node->nodeValue);
+                    }
+                }
+            }
+
+            if ($text != "") {
+                $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text));
+
+                while (strpos($text, "  ")) {
+                    $text = trim(str_replace("  ", " ", $text));
+                }
+
+                $siteinfo["text"] = html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8") . '...';
+            }
+        }
+
+        return ($siteinfo);
+    }
+
+
+    private static function arr_add_hashes(&$item, $k)
+    {
+        if (substr($item, 0, 1) !== '#') {
+            $item = '#' . $item;
+        }
+    }
+}
diff --git a/Code/Module/Lists.php b/Code/Module/Lists.php
new file mode 100644
index 000000000..1829f57ca
--- /dev/null
+++ b/Code/Module/Lists.php
@@ -0,0 +1,399 @@
+ 100) {
+                $ret = Activity::paged_collection_init($total, App::$query_string);
+            } else {
+                $members = AccessList::members($group['uid'], $group['id'], false, App::$pager['start'], App::$pager['itemspage']);
+                $ret = Activity::encode_follow_collection($members, App::$query_string, 'OrderedCollection', $total);
+            }
+
+            as_return_and_die($ret, $channel);
+        }
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        App::$profile_uid = local_channel();
+        Navbar::set_selected('Access Lists');
+    }
+
+    public function post()
+    {
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if ((argc() == 2) && (argv(1) === 'new')) {
+            check_form_security_token_redirectOnErr('/lists/new', 'group_edit');
+
+            $name = notags(trim($_POST['groupname']));
+            $public = intval($_POST['public']);
+            $r = AccessList::add(local_channel(), $name, $public);
+            if ($r) {
+                info(t('Access list created.') . EOL);
+            } else {
+                notice(t('Could not create access list.') . EOL);
+            }
+            goaway(z_root() . '/lists');
+        }
+        if ((argc() == 2) && (intval(argv(1)))) {
+            check_form_security_token_redirectOnErr('/lists', 'group_edit');
+
+            $r = q(
+                "SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
+                intval(argv(1)),
+                intval(local_channel())
+            );
+            if (!$r) {
+                $r = q(
+                    "select * from pgrp where id = %d limit 1",
+                    intval(argv(1))
+                );
+                if ($r) {
+                    notice(t('Permission denied.') . EOL);
+                } else {
+                    notice(t('Access list not found.') . EOL);
+                }
+                goaway(z_root() . '/connections');
+            }
+            $group = array_shift($r);
+            $groupname = notags(trim($_POST['groupname']));
+            $public = intval($_POST['public']);
+
+            if ((strlen($groupname)) && (($groupname != $group['gname']) || ($public != $group['visible']))) {
+                $r = q(
+                    "UPDATE pgrp SET gname = '%s', visible = %d  WHERE uid = %d AND id = %d",
+                    dbesc($groupname),
+                    intval($public),
+                    intval(local_channel()),
+                    intval($group['id'])
+                );
+                if ($r) {
+                    info(t('Access list updated.') . EOL);
+                }
+                Libsync::build_sync_packet(local_channel(), null, true);
+            }
+
+            goaway(z_root() . '/lists/' . argv(1) . '/' . argv(2));
+        }
+        return;
+    }
+
+    public function get()
+    {
+
+        $change = false;
+
+        // logger('mod_lists: ' . App::$cmd, LOGGER_DEBUG);
+
+        // Switch to text mode interface if we have more than 'n' contacts or group members, else loading avatars will lead to poor interactivity
+
+        $switchtotext = get_pconfig(local_channel(), 'system', 'listedit_image_limit', get_config('system', 'listedit_image_limit', 1000));
+
+        if ((argc() == 1) || ((argc() == 2) && (argv(1) === 'new'))) {
+	        if (!local_channel()) {
+    	        notice(t('Permission denied') . EOL);
+        	    return;
+        	}
+
+            $new = (((argc() == 2) && (argv(1) === 'new')) ? true : false);
+
+            $groups = q(
+                "SELECT id, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
+                intval(local_channel())
+            );
+
+            $i = 0;
+            foreach ($groups as $group) {
+                $entries[$i]['name'] = $group['gname'];
+                $entries[$i]['id'] = $group['id'];
+                $entries[$i]['count'] = count(AccessList::members(local_channel(), $group['id']));
+                $i++;
+            }
+
+            $tpl = Theme::get_template('privacy_groups.tpl');
+            $o = replace_macros($tpl, [
+                '$title' => t('Access Lists'),
+                '$add_new_label' => t('Create access list'),
+                '$new' => $new,
+
+                // new group form
+                '$gname' => array('groupname', t('Access list name')),
+                '$public' => array('public', t('Members are visible to other channels'), false),
+                '$form_security_token' => get_form_security_token("group_edit"),
+                '$submit' => t('Submit'),
+
+                // groups list
+                '$title' => t('Access Lists'),
+                '$name_label' => t('Name'),
+                '$count_label' => t('Members'),
+                '$entries' => $entries
+            ]);
+
+            return $o;
+        }
+
+        $context = array('$submit' => t('Submit'));
+        $tpl = Theme::get_template('group_edit.tpl');
+
+        if ((argc() == 3) && (argv(1) === 'drop')) {
+	        if (!local_channel()) {
+    	        notice(t('Permission denied') . EOL);
+        	    return;
+        	}
+
+
+			check_form_security_token_redirectOnErr('/lists', 'group_drop', 't');
+
+            if (intval(argv(2))) {
+                $r = q(
+                    "SELECT gname FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
+                    intval(argv(2)),
+                    intval(local_channel())
+                );
+                if ($r) {
+                    $result = AccessList::remove(local_channel(), $r[0]['gname']);
+                }
+                if ($result) {
+                    info(t('Access list removed.') . EOL);
+                } else {
+                    notice(t('Unable to remove access list.') . EOL);
+                }
+            }
+            goaway(z_root() . '/lists');
+            // NOTREACHED
+        }
+
+
+        if ((argc() > 2) && intval(argv(1)) && argv(2)) {
+		    if (!local_channel()) {
+            	notice(t('Permission denied') . EOL);
+            	return;
+        	}
+
+            check_form_security_token_ForbiddenOnErr('group_member_change', 't');
+
+            $r = q(
+                "SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
+                dbesc(base64url_decode(argv(2))),
+                intval(local_channel())
+            );
+            if (count($r)) {
+                $change = base64url_decode(argv(2));
+            }
+        }
+
+        if (argc() > 1) {
+
+            if (strlen(argv(1)) <= 11 && intval(argv(1))) {
+                $r = q(
+                    "SELECT * FROM pgrp WHERE id = %d AND deleted = 0 LIMIT 1",
+                    intval(argv(1))
+                );
+            } else {
+                $r = q(
+                    "SELECT * FROM pgrp WHERE hash = '%s' AND deleted = 0 LIMIT 1",
+                    dbesc(argv(1))
+                );
+            }
+
+			if (! $r) {
+                notice(t('Access list not found.') . EOL);
+				return;
+			}
+
+			$group = array_shift($r);
+            $uid = $group['uid'];
+			$owner = (local_channel() && intval(local_channel()) === intval($group['uid']));
+
+			if (!$owner) {
+				// public view of group members if permitted
+				if (!($group['visible'] && perm_is_allowed($uid, get_observer_hash(), 'view_contacts'))) {
+                    notice(t('Permission denied') . EOL);
+                    return;
+                }
+                $members = [];
+                $memberlist = AccessList::members($uid, $group['id']);
+
+                if ($memberlist) {
+                    foreach ($memberlist as $member) {
+                        $members[] = micropro($member, true, 'mpgroup', 'card');
+                    }
+                }
+                $o = replace_macros(Theme::get_template('listmembers.tpl'), [
+                    '$title' => t('List members'),
+                    '$members' => $members
+                ]);
+                return $o;
+			}
+
+            $members = AccessList::members(local_channel(), $group['id']);
+
+            $preselected = [];
+            if (count($members)) {
+                foreach ($members as $member) {
+                    if (!in_array($member['xchan_hash'], $preselected)) {
+                        $preselected[] = $member['xchan_hash'];
+                    }
+                }
+            }
+
+            if ($change) {
+                if (in_array($change, $preselected)) {
+                    AccessList::member_remove(local_channel(), $group['gname'], $change);
+                } else {
+                    AccessList::member_add(local_channel(), $group['gname'], $change);
+                }
+
+                $members = AccessList::members(local_channel(), $group['id']);
+
+                $preselected = [];
+                if (count($members)) {
+                    foreach ($members as $member) {
+                        $preselected[] = $member['xchan_hash'];
+                    }
+                }
+            }
+
+            $context = $context + array(
+                    '$title' => sprintf(t('Access List: %s'), $group['gname']),
+                    '$details_label' => t('Edit'),
+                    '$gname' => array('groupname', t('Access list name: '), $group['gname'], ''),
+                    '$gid' => $group['id'],
+                    '$drop' => $drop_txt,
+                    '$public' => array('public', t('Members are visible to other channels'), $group['visible'], ''),
+                    '$form_security_token_edit' => get_form_security_token('group_edit'),
+                    '$delete' => t('Delete access list'),
+                    '$form_security_token_drop' => get_form_security_token("group_drop"),
+                );
+        }
+
+        if (!isset($group)) {
+            return;
+        }
+
+        $groupeditor = array(
+            'label_members' => t('List members'),
+            'members' => [],
+            'label_contacts' => t('Not in this list'),
+            'contacts' => [],
+        );
+
+        $sec_token = addslashes(get_form_security_token('group_member_change'));
+        $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : 'card');
+        foreach ($members as $member) {
+            if ($member['xchan_url']) {
+                $member['archived'] = (intval($member['abook_archived']) ? true : false);
+                $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;';
+                $groupeditor['members'][] = micropro($member, true, 'mpgroup', $textmode);
+            } else {
+                AccessList::member_remove(local_channel(), $group['gname'], $member['xchan_hash']);
+            }
+        }
+
+        $r = q(
+            "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
+            intval(local_channel())
+        );
+
+        if (count($r)) {
+            $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : 'card');
+            foreach ($r as $member) {
+                if (!in_array($member['xchan_hash'], $preselected)) {
+                    $member['archived'] = (intval($member['abook_archived']) ? true : false);
+                    $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;';
+                    $groupeditor['contacts'][] = micropro($member, true, 'mpall', $textmode);
+                }
+            }
+        }
+
+        $context['$groupeditor'] = $groupeditor;
+        $context['$desc'] = t('Select a channel to toggle membership');
+
+        if ($change) {
+            $tpl = Theme::get_template('groupeditor.tpl');
+            echo replace_macros($tpl, $context);
+            killme();
+        }
+
+        return replace_macros($tpl, $context);
+    }
+}
diff --git a/Code/Module/Lockview.php b/Code/Module/Lockview.php
new file mode 100644
index 000000000..b53d810e6
--- /dev/null
+++ b/Code/Module/Lockview.php
@@ -0,0 +1,189 @@
+ 1) ? argv(1) : 0);
+        if (is_numeric($type)) {
+            $item_id = intval($type);
+            $type = 'item';
+        } else {
+            $item_id = ((argc() > 2) ? intval(argv(2)) : 0);
+        }
+
+        if (!$item_id) {
+            killme();
+        }
+
+        if (!in_array($type, array('item', 'photo', 'attach', 'event', 'menu_item', 'chatroom'))) {
+            killme();
+        }
+
+        // we have different naming in in menu_item table and chatroom table
+        switch ($type) {
+            case 'menu_item':
+                $id = 'mitem_id';
+                break;
+            case 'chatroom':
+                $id = 'cr_id';
+                break;
+            default:
+                $id = 'id';
+                break;
+        }
+
+        $r = q(
+            "SELECT * FROM %s WHERE $id = %d LIMIT 1",
+            dbesc($type),
+            intval($item_id)
+        );
+
+        if (!$r) {
+            killme();
+        }
+
+        $item = $r[0];
+
+        // we have different naming in in menu_item table and chatroom table
+        switch ($type) {
+            case 'menu_item':
+                $uid = $item['mitem_channel_id'];
+                break;
+            case 'chatroom':
+                $uid = $item['cr_uid'];
+                break;
+            default:
+                $uid = $item['uid'];
+                break;
+        }
+
+        if ($type === 'item') {
+            $recips = get_iconfig($item['id'], 'activitypub', 'recips');
+            if ($recips) {
+                $o = '
      ' . t('Visible to:') . '
      ';
+                $l = [];
+                if (isset($recips['to'])) {
+                    if (!is_array($recips['to'])) {
+                        $recips['to'] = [$recips['to']];
+                    }
+                    $l = array_merge($l, $recips['to']);
+                }
+                if (isset($recips['cc'])) {
+                    if (!is_array($recips['cc'])) {
+                        $recips['cc'] = [$recips['cc']];
+                    }
+                    $l = array_merge($l, $recips['cc']);
+                }
+                for ($x = 0; $x < count($l); $x++) {
+                    if ($l[$x] === ACTIVITY_PUBLIC_INBOX) {
+						$l[$x] = '' . t('Everybody') . '';
+					} else {
+                        $l[$x] = '' . $l[$x] . '';
+                    }
+                }
+                echo $o . implode('
      ', $l);
+                killme();
+            }
+        }
+
+
+        if (
+            intval($item['item_private']) && (!strlen($item['allow_cid'])) && (!strlen($item['allow_gid']))
+            && (!strlen($item['deny_cid'])) && (!strlen($item['deny_gid']))
+        ) {
+            if ($item['mid'] === $item['parent_mid']) {
+                echo '
      ' . translate_scope('specific') . '
      ';
+                killme();
+            }
+        }
+
+        $allowed_users = expand_acl($item['allow_cid']);
+        $allowed_groups = expand_acl($item['allow_gid']);
+        $deny_users = expand_acl($item['deny_cid']);
+        $deny_groups = expand_acl($item['deny_gid']);
+
+        $o = '
      ' . t('Visible to:') . '
      ';
+        $l = [];
+
+        stringify_array_elms($allowed_groups, true);
+        stringify_array_elms($allowed_users, true);
+        stringify_array_elms($deny_groups, true);
+        stringify_array_elms($deny_users, true);
+
+
+        if (count($allowed_groups)) {
+            $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $allowed_groups) . " )");
+            if ($r) {
+                foreach ($r as $rr) {
+                    $l[] = '
      ' . $rr['gname'] . '
      ';
+                }
+            }
+        }
+        if (count($allowed_users)) {
+            $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $allowed_users) . " )");
+            if ($r) {
+                foreach ($r as $rr) {
+                    $l[] = '
      ' . $rr['xchan_name'] . '
      ';
+                }
+            }
+            if ($atokens) {
+                foreach ($atokens as $at) {
+                    if (in_array("'" . $at['xchan_hash'] . "'", $allowed_users)) {
+                        $l[] = '
      ' . $at['xchan_name'] . '
      ';
+                    }
+                }
+            }
+        }
+
+        if (count($deny_groups)) {
+            $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $deny_groups) . " )");
+            if ($r) {
+                foreach ($r as $rr) {
+                    $l[] = '
      ' . $rr['gname'] . '
      ';
+                }
+            }
+        }
+        if (count($deny_users)) {
+            $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $deny_users) . " )");
+            if ($r) {
+                foreach ($r as $rr) {
+                    $l[] = '
      ' . $rr['xchan_name'] . '
      ';
+                }
+            }
+
+            if ($atokens) {
+                foreach ($atokens as $at) {
+                    if (in_array("'" . $at['xchan_hash'] . "'", $deny_users)) {
+                        $l[] = '
      ' . $at['xchan_name'] . '
      ';
+                    }
+                }
+            }
+        }
+
+        echo $o . implode($l);
+        killme();
+    }
+}
diff --git a/Code/Module/Locs.php b/Code/Module/Locs.php
new file mode 100644
index 000000000..af4a2a31d
--- /dev/null
+++ b/Code/Module/Locs.php
@@ -0,0 +1,149 @@
+ t('Manage Channel Locations'),
+            '$loc' => t('Location'),
+            '$addr' => t('Address'),
+            '$mkprm' => t('Primary'),
+            '$drop' => t('Drop'),
+            '$submit' => t('Submit'),
+            '$sync' => t('Publish these settings'),
+            '$sync_text' => t('Please wait several minutes between consecutive operations.'),
+            '$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'),
+            '$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'),
+            '$hubs' => $r,
+            '$base_url' => z_root()
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Login.php b/Code/Module/Login.php
new file mode 100644
index 000000000..e130d277a
--- /dev/null
+++ b/Code/Module/Login.php
@@ -0,0 +1,21 @@
+nuke();
+        }
+        goaway(z_root());
+    }
+}
diff --git a/Code/Module/Lostpass.php b/Code/Module/Lostpass.php
new file mode 100644
index 000000000..4443c0fdd
--- /dev/null
+++ b/Code/Module/Lostpass.php
@@ -0,0 +1,149 @@
+ get_config('system', 'sitename'),
+            '$siteurl' => z_root(),
+            '$username' => sprintf(t('Site Member (%s)'), $email),
+            '$email' => $email,
+            '$reset_link' => z_root() . '/lostpass?verify=' . $hash
+        ));
+
+        $subject = email_header_encode(sprintf(t('Password reset requested at %s'), get_config('system', 'sitename')), 'UTF-8');
+
+        $res = z_mail(
+            [
+                'toEmail' => $email,
+                'messageSubject' => sprintf(t('Password reset requested at %s'), get_config('system', 'sitename')),
+                'textVersion' => $message,
+            ]
+        );
+
+        goaway(z_root());
+    }
+
+
+    public function get()
+    {
+
+
+        if (x($_GET, 'verify')) {
+            $verify = $_GET['verify'];
+
+            $r = q(
+                "SELECT * FROM account WHERE account_reset = '%s' LIMIT 1",
+                dbesc($verify)
+            );
+            if (!$r) {
+                notice(t("Request could not be verified. (You may have previously submitted it.) Password reset failed.") . EOL);
+                goaway(z_root());
+                return;
+            }
+
+            $aid = $r[0]['account_id'];
+            $email = $r[0]['account_email'];
+
+            $new_password = autoname(6) . mt_rand(100, 9999);
+
+            $salt = random_string(32);
+            $password_encoded = hash('whirlpool', $salt . $new_password);
+
+            $r = q(
+                "UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '', account_flags = (account_flags & ~%d) where account_id = %d",
+                dbesc($salt),
+                dbesc($password_encoded),
+                intval(ACCOUNT_UNVERIFIED),
+                intval($aid)
+            );
+
+            if ($r) {
+                $tpl = Theme::get_template('pwdreset.tpl');
+                $o .= replace_macros($tpl, array(
+                    '$lbl1' => t('Password Reset'),
+                    '$lbl2' => t('Your password has been reset as requested.'),
+                    '$lbl3' => t('Your new password is'),
+                    '$lbl4' => t('Save or copy your new password - and then'),
+                    '$lbl5' => '' . t('click here to login') . '.',
+                    '$lbl6' => t('Your password may be changed from the Settings page after successful login.'),
+                    '$newpass' => $new_password,
+                    '$baseurl' => z_root()
+
+                ));
+
+                info("Your password has been reset." . EOL);
+
+                $email_tpl = Theme::get_email_template("passchanged_eml.tpl");
+                $message = replace_macros($email_tpl, array(
+                        '$sitename' => App::$config['sitename'],
+                        '$siteurl' => z_root(),
+                        '$username' => sprintf(t('Site Member (%s)'), $email),
+                        '$email' => $email,
+                        '$new_password' => $new_password,
+                        '$uid' => $newuid));
+
+                $res = z_mail(
+                    [
+                        'toEmail' => $email,
+                        'messageSubject' => sprintf(t('Your password has changed at %s'), get_config('system', 'sitename')),
+                        'textVersion' => $message,
+                    ]
+                );
+
+                return $o;
+            }
+        } else {
+            $tpl = Theme::get_template('lostpass.tpl');
+
+            $o .= replace_macros($tpl, array(
+                '$title' => t('Forgot your Password?'),
+                '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
+                '$name' => t('Email Address'),
+                '$submit' => t('Reset')
+            ));
+
+            return $o;
+        }
+    }
+}
diff --git a/Code/Module/Magic.php b/Code/Module/Magic.php
new file mode 100644
index 000000000..fa538a35c
--- /dev/null
+++ b/Code/Module/Magic.php
@@ -0,0 +1,134 @@
+ false,
+            'url' => '',
+            'message' => ''
+        ];
+
+        logger('mod_magic: invoked', LOGGER_DEBUG);
+
+        logger('args: ' . print_r($_REQUEST, true), LOGGER_DATA);
+
+        $addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
+        $bdest = ((x($_REQUEST, 'bdest')) ? $_REQUEST['bdest'] : '');
+        $dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
+        $rev = ((x($_REQUEST, 'rev')) ? intval($_REQUEST['rev']) : 0);
+        $owa = ((x($_REQUEST, 'owa')) ? intval($_REQUEST['owa']) : 0);
+        $delegate = ((x($_REQUEST, 'delegate')) ? $_REQUEST['delegate'] : '');
+
+        // bdest is preferred as it is hex-encoded and can survive url rewrite and argument parsing
+
+        if ($bdest) {
+            $dest = hex2bin($bdest);
+        }
+
+        $parsed = parse_url($dest);
+
+        if (!$parsed) {
+            goaway($dest);
+        }
+
+        $basepath = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '');
+        $owapath = SConfig::get($basepath, 'system', 'openwebauth', $basepath . '/owa');
+
+        // This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating.
+        // By default, we'll proceed without asking.
+
+        $arr = [
+            'channel_id' => local_channel(),
+            'destination' => $dest,
+            'proceed' => true
+        ];
+
+        Hook::call('magic_auth', $arr);
+        $dest = $arr['destination'];
+        if (!$arr['proceed']) {
+            goaway($dest);
+        }
+
+        if ((get_observer_hash()) && (stripos($dest, z_root()) === 0)) {
+            // We are already authenticated on this site and a registered observer.
+            // First check if this is a delegate request on the local system and process accordingly.
+            // Otherwise redirect.
+
+            if ($delegate) {
+                $r = q(
+                    "select * from channel left join hubloc on channel_hash = hubloc_hash where hubloc_addr = '%s' limit 1",
+                    dbesc($delegate)
+                );
+
+                if ($r) {
+                    $c = array_shift($r);
+                    if (perm_is_allowed($c['channel_id'], get_observer_hash(), 'delegate')) {
+                        $tmp = $_SESSION;
+                        $_SESSION['delegate_push'] = $tmp;
+                        $_SESSION['delegate_channel'] = $c['channel_id'];
+                        $_SESSION['delegate'] = get_observer_hash();
+                        $_SESSION['account_id'] = intval($c['channel_account_id']);
+
+                        change_channel($c['channel_id']);
+                    }
+                }
+            }
+
+            goaway($dest);
+        }
+
+        if (local_channel()) {
+            $channel = App::get_channel();
+
+            // OpenWebAuth
+
+            if ($owa) {
+                $dest = strip_zids($dest);
+                $dest = strip_query_param($dest, 'f');
+
+                // We now post to the OWA endpoint. This improves security by providing a signed digest
+
+                $data = json_encode(['OpenWebAuth' => random_string()]);
+
+                $headers = [];
+				$headers['Accept'] = 'application/x-nomad+json, application/x-zot+json';
+				$headers['Content-Type'] = 'application/x-nomad+json';
+                $headers['X-Open-Web-Auth'] = random_string();
+                $headers['Digest'] = HTTPSig::generate_digest_header($data);
+                $headers['Host'] = $parsed['host'];
+                $headers['(request-target)'] = 'post ' . '/owa';
+
+                $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
+                $x = z_post_url($owapath, $data, $redirects, ['headers' => $headers]);
+                logger('owa fetch returned: ' . print_r($x, true), LOGGER_DATA);
+                if ($x['success']) {
+                    $j = json_decode($x['body'], true);
+                    if ($j['success'] && $j['encrypted_token']) {
+                        // decrypt the token using our private key
+                        $token = '';
+                        openssl_private_decrypt(base64url_decode($j['encrypted_token']), $token, $channel['channel_prvkey']);
+                        $x = strpbrk($dest, '?&');
+                        // redirect using the encrypted token which will be exchanged for an authenticated session
+                        $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : '');
+                        goaway($dest . $args);
+                    }
+                }
+            }
+        }
+        goaway($dest);
+    }
+}
diff --git a/Code/Module/Manage.php b/Code/Module/Manage.php
new file mode 100644
index 000000000..db03fdeb6
--- /dev/null
+++ b/Code/Module/Manage.php
@@ -0,0 +1,204 @@
+ 1) ? intval(argv(1)) : 0);
+
+        if (argc() > 2) {
+            if (argv(2) === 'default') {
+                $r = q(
+                    "select channel_id from channel where channel_id = %d and channel_account_id = %d limit 1",
+                    intval($change_channel),
+                    intval(get_account_id())
+                );
+                if ($r) {
+                    q(
+                        "update account set account_default_channel = %d where account_id = %d",
+                        intval($change_channel),
+                        intval(get_account_id())
+                    );
+                }
+                goaway(z_root() . '/manage');
+            } elseif (argv(2) === 'menu') {
+                $state = intval(PConfig::get($change_channel, 'system', 'include_in_menu', 0));
+                PConfig::set($change_channel, 'system', 'include_in_menu', 1 - $state);
+                goaway(z_root() . '/manage');
+            }
+        }
+
+
+        if ($change_channel) {
+            $r = change_channel($change_channel);
+
+            if ((argc() > 2) && !(argv(2) === 'default')) {
+                goaway(z_root() . '/' . implode('/', array_slice(App::$argv, 2))); // Go to whatever is after /manage/, but with the new channel
+            } elseif ($r && $r['channel_startpage']) {
+                goaway(z_root() . '/' . $r['channel_startpage']); // If nothing extra is specified, go to the default page
+            }
+            goaway(z_root());
+        }
+
+        $channels = null;
+
+        $r = q(
+            "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
+            intval(get_account_id())
+        );
+
+        $account = App::get_account();
+
+        if ($r && count($r)) {
+            $channels = ((is_site_admin()) ? array_merge([Channel::get_system()], $r) : $r);
+            for ($x = 0; $x < count($channels); $x++) {
+                $channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
+                $channels[$x]['include_in_menu'] = intval(PConfig::get($channels[$x]['channel_id'], 'system', 'include_in_menu', 0));
+                $channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : '');
+                $channels[$x]['default_links'] = '1';
+                $channels[$x]['collections_label'] = t('Collection');
+                $channels[$x]['forum_label'] = t('Group');
+
+                $c = q(
+                    "SELECT id, item_wall FROM item
+					WHERE item_unseen = 1 and uid = %d " . item_normal(),
+                    intval($channels[$x]['channel_id'])
+                );
+
+                if ($c) {
+                    foreach ($c as $it) {
+                        if (intval($it['item_wall'])) {
+                            $channels[$x]['home']++;
+                        } else {
+                            $channels[$x]['network']++;
+                        }
+                    }
+                }
+
+
+                $intr = q(
+                    "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
+                    intval($channels[$x]['channel_id'])
+                );
+
+                if ($intr) {
+                    $channels[$x]['intros'] = intval($intr[0]['total']);
+                }
+
+                $events = q(
+                    "SELECT etype, dtstart, adjust FROM event
+					WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
+					ORDER BY dtstart ASC ",
+                    intval($channels[$x]['channel_id']),
+                    dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')),
+                    dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+                );
+
+                if ($events) {
+                    $channels[$x]['all_events'] = count($events);
+
+                    if ($channels[$x]['all_events']) {
+                        $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
+                        foreach ($events as $e) {
+                            $bd = false;
+                            if ($e['etype'] === 'birthday') {
+                                $channels[$x]['birthdays']++;
+                                $bd = true;
+                            } else {
+                                $channels[$x]['events']++;
+                            }
+                            if (datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) {
+                                $channels[$x]['all_events_today']++;
+                                if ($bd) {
+                                    $channels[$x]['birthdays_today']++;
+                                } else {
+                                    $channels[$x]['events_today']++;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        $r = q(
+            "select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0",
+            intval(get_account_id())
+        );
+        $limit = ServiceClass::account_fetch(get_account_id(), 'total_identities');
+        if ($limit !== false) {
+            $channel_usage_message = sprintf(t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit);
+        } else {
+            $channel_usage_message = '';
+        }
+
+
+        $create = ['new_channel', t('Create a new channel'), t('Create New')];
+
+        $delegates = null;
+
+        if (local_channel()) {
+            $delegates = q(
+                "select * from abook left join xchan on abook_xchan = xchan_hash where 
+				abook_channel = %d and abook_xchan in ( select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s' )",
+                intval(local_channel()),
+                intval(local_channel()),
+                dbesc('%delegate%')
+            );
+        }
+
+        if ($delegates) {
+            for ($x = 0; $x < count($delegates); $x++) {
+                $delegates[$x]['link'] = 'magic?f=&bdest=' . bin2hex($delegates[$x]['xchan_url'])
+                    . '&delegate=' . urlencode($delegates[$x]['xchan_addr']);
+                $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name'];
+                $delegates[$x]['delegate'] = 1;
+                $delegates[$x]['collections_label'] = t('Collection');
+                $delegates[$x]['forum_label'] = t('Group');
+            }
+        } else {
+            $delegates = null;
+        }
+
+        return replace_macros(Theme::get_template('channels.tpl'), [
+            '$header' => t('Channels'),
+            '$msg_selected' => t('Current Channel'),
+            '$selected' => local_channel(),
+            '$desc' => t('Switch to one of your channels by selecting it.'),
+            '$msg_default' => t('Default Login Channel'),
+            '$msg_make_default' => t('Make Default'),
+            '$msg_include' => t('Add to menu'),
+            '$msg_no_include' => t('Add to menu'),
+            '$create' => $create,
+            '$all_channels' => $channels,
+            '$mail_format' => t('%d new messages'),
+            '$intros_format' => t('%d new introductions'),
+            '$channel_usage_message' => $channel_usage_message,
+            '$delegated_desc' => t('Delegated Channel'),
+            '$delegates' => $delegates
+        ]);
+    }
+}
diff --git a/Code/Module/Manifest.php b/Code/Module/Manifest.php
new file mode 100644
index 000000000..6ebd66cd1
--- /dev/null
+++ b/Code/Module/Manifest.php
@@ -0,0 +1,50 @@
+ System::get_platform_name(),
+            'short_name' => System::get_platform_name(),
+            'icons' => [
+                ['src' => '/images/' . System::get_platform_name() . '-64' . '.png', 'sizes' => '64x64'],
+                ['src' => '/images/' . System::get_platform_name() . '-192' . '.png', 'sizes' => '192x192'],
+                ['src' => '/images/' . System::get_platform_name() . '-512' . '.png', 'sizes' => '512x512'],
+                ['src' => '/images/' . System::get_platform_name() . '.svg', 'sizes' => '600x600'],
+            ],
+            'scope' => '/',
+            'start_url' => z_root(),
+            'display' => 'fullscreen',
+            'orientation' => 'any',
+            'theme_color' => 'blue',
+            'background_color' => 'white',
+            'share_target' => [
+                'action' => '/rpost',
+                'method' => 'POST',
+                'enctype' => 'multipart/form-data',
+                'params' => [
+                    'title' => 'title',
+                    'text' => 'body',
+                    'url' => 'url',
+                    'files' => [
+                        ['name' => 'userfile',
+                            'accept' => ['image/*', 'audio/*', 'video/*', 'text/*', 'application/*']
+                        ]
+                    ]
+                ]
+            ]
+
+        ];
+
+
+        json_return_and_die($ret, 'application/manifest+json');
+    }
+}
diff --git a/Code/Module/Markup.php b/Code/Module/Markup.php
new file mode 100644
index 000000000..d83ab40a3
--- /dev/null
+++ b/Code/Module/Markup.php
@@ -0,0 +1,22 @@
+' . $desc . '';
+
+        return $text;
+    }
+}
diff --git a/Code/Module/Menu.php b/Code/Module/Menu.php
new file mode 100644
index 000000000..0b9cd8d7d
--- /dev/null
+++ b/Code/Module/Menu.php
@@ -0,0 +1,242 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+
+    public function post()
+    {
+
+        if (!App::$profile) {
+            return;
+        }
+
+        $which = argv(1);
+
+
+        $uid = App::$profile['channel_id'];
+
+        if (array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) {
+            $sys = Channel::get_system();
+            $uid = intval($sys['channel_id']);
+            App::$is_sys = true;
+        }
+
+        if (!$uid) {
+            return;
+        }
+
+        $_REQUEST['menu_channel_id'] = $uid;
+
+        if ($_REQUEST['menu_bookmark']) {
+            $_REQUEST['menu_flags'] |= MENU_BOOKMARK;
+        }
+        if ($_REQUEST['menu_system']) {
+            $_REQUEST['menu_flags'] |= MENU_SYSTEM;
+        }
+
+        $menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
+        if ($menu_id) {
+            $_REQUEST['menu_id'] = intval(argv(1));
+            $r = Zlib\Menu::edit($_REQUEST);
+            if ($r) {
+                Zlib\Menu::sync_packet($uid, get_observer_hash(), $menu_id);
+                //info( t('Menu updated.') . EOL);
+                goaway(z_root() . '/mitem/' . $which . '/' . $menu_id . ((App::$is_sys) ? '?f=&sys=1' : ''));
+            } else {
+                notice(t('Unable to update menu.') . EOL);
+            }
+        } else {
+            $r = Zlib\Menu::create($_REQUEST);
+            if ($r) {
+                Zlib\Menu::sync_packet($uid, get_observer_hash(), $r);
+
+                //info( t('Menu created.') . EOL);
+                goaway(z_root() . '/mitem/' . $which . '/' . $r . ((App::$is_sys) ? '?f=&sys=1' : ''));
+            } else {
+                notice(t('Unable to create menu.') . EOL);
+            }
+        }
+    }
+
+
+    public function get()
+    {
+
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        $which = argv(1);
+
+        $_SESSION['return_url'] = App::$query_string;
+
+        $uid = local_channel();
+        $owner = 0;
+        $channel = null;
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                $uid = $owner = intval($sys['channel_id']);
+                $channel = $sys;
+                $observer = $sys;
+            }
+        }
+
+        if (!$owner) {
+            // Figure out who the page owner is.
+            $r = Channel::from_username($which);
+            if ($r) {
+                $owner = intval($r['channel_id']);
+            }
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        // Get the observer, check their permissions
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if (argc() == 2) {
+            $channel = (($sys) ? $sys : Channel::from_id($owner));
+
+            // list menus
+            $x = Zlib\Menu::list($owner);
+            if ($x) {
+                for ($y = 0; $y < count($x); $y++) {
+                    $m = menu_fetch($x[$y]['menu_name'], $owner, get_observer_hash());
+                    if ($m) {
+                        $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($channel, $m))) . '[/element]';
+                    }
+                    $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false);
+                }
+            }
+
+            $create = replace_macros(Theme::get_template('menuedit.tpl'), array(
+                '$menu_name' => array('menu_name', t('Menu Name'), '', t('Unique name (not visible on webpage) - required'), '*'),
+                '$menu_desc' => array('menu_desc', t('Menu Title'), '', t('Visible on webpage - leave empty for no title'), ''),
+                '$menu_bookmark' => array('menu_bookmark', t('Allow Bookmarks'), 0, t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))),
+                '$submit' => t('Submit and proceed'),
+                '$sys' => App::$is_sys,
+                '$nick' => $which,
+                '$display' => 'none'
+            ));
+
+            $o = replace_macros(Theme::get_template('menulist.tpl'), array(
+                '$title' => t('Menus'),
+                '$create' => $create,
+                '$menus' => $x,
+                '$nametitle' => t('Menu Name'),
+                '$desctitle' => t('Menu Title'),
+                '$edit' => t('Edit'),
+                '$drop' => t('Drop'),
+                '$created' => t('Created'),
+                '$edited' => t('Edited'),
+                '$new' => t('New'),
+                '$bmark' => t('Bookmarks allowed'),
+                '$hintnew' => t('Create'),
+                '$hintdrop' => t('Delete this menu'),
+                '$hintcontent' => t('Edit menu contents'),
+                '$hintedit' => t('Edit this menu'),
+                '$nick' => $which,
+                '$sys' => App::$is_sys
+            ));
+
+            return $o;
+        }
+
+        if (argc() > 2) {
+            if (intval(argv(2))) {
+                if (argc() == 4 && argv(3) == 'drop') {
+                    Zlib\Menu::sync_packet($owner, get_observer_hash(), intval(argv(1)), true);
+                    $r = Zlib\Menu::delete_id(intval(argv(2)), $owner);
+                    if (!$r) {
+                        notice(t('Menu could not be deleted.') . EOL);
+                    }
+
+                    goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : ''));
+                }
+
+                $m = Zlib\Menu::fetch_id(intval(argv(2)), $owner);
+
+                if (!$m) {
+                    notice(t('Menu not found.') . EOL);
+                    return '';
+                }
+
+                $o = replace_macros(Theme::get_template('menuedit.tpl'), array(
+                    '$header' => t('Edit Menu'),
+                    '$sys' => App::$is_sys,
+                    '$menu_id' => intval(argv(2)),
+                    '$menu_edit_link' => 'mitem/' . $which . '/' . intval(argv(1)) . ((App::$is_sys) ? '?f=&sys=1' : ''),
+                    '$hintedit' => t('Add or remove entries to this menu'),
+                    '$editcontents' => t('Edit menu contents'),
+                    '$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
+                    '$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
+                    '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))),
+                    '$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0),
+                    '$nick' => $which,
+                    '$submit' => t('Submit and proceed')
+                ));
+
+                return $o;
+            } else {
+                notice(t('Not found.') . EOL);
+                return;
+            }
+        }
+    }
+}
diff --git a/Code/Module/Mitem.php b/Code/Module/Mitem.php
new file mode 100644
index 000000000..719e9eeab
--- /dev/null
+++ b/Code/Module/Mitem.php
@@ -0,0 +1,284 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+
+        if (argc() < 3) {
+            return;
+        }
+
+        $m = Menu::fetch_id(intval(argv(2)), App::$profile['channel_id']);
+        if (!$m) {
+            notice(t('Menu not found.') . EOL);
+            return '';
+        }
+        App::$data['menu'] = $m;
+    }
+
+    public function post()
+    {
+
+        if (!App::$profile) {
+            return;
+        }
+
+        $which = argv(1);
+
+
+        $uid = App::$profile['channel_id'];
+
+        if (array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) {
+            $sys = Channel::get_system();
+            $uid = intval($sys['channel_id']);
+            App::$is_sys = true;
+        }
+
+        if (!$uid) {
+            return;
+        }
+
+
+        if (!App::$data['menu']) {
+            return;
+        }
+
+        if (!$_REQUEST['mitem_desc'] || !$_REQUEST['mitem_link']) {
+            notice(t('Unable to create element.') . EOL);
+            return;
+        }
+
+        $_REQUEST['mitem_channel_id'] = $uid;
+        $_REQUEST['menu_id'] = App::$data['menu']['menu_id'];
+
+        $_REQUEST['mitem_flags'] = 0;
+        if ($_REQUEST['usezid']) {
+            $_REQUEST['mitem_flags'] |= MENU_ITEM_ZID;
+        }
+        if ($_REQUEST['newwin']) {
+            $_REQUEST['mitem_flags'] |= MENU_ITEM_NEWWIN;
+        }
+
+
+        $mitem_id = ((argc() > 3) ? intval(argv(3)) : 0);
+        if ($mitem_id) {
+            $_REQUEST['mitem_id'] = $mitem_id;
+            $r = MenuItem::edit($_REQUEST['menu_id'], $uid, $_REQUEST);
+            if ($r) {
+                Menu::sync_packet($uid, get_observer_hash(), $_REQUEST['menu_id']);
+                //info( t('Menu element updated.') . EOL);
+                goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . ((App::$is_sys) ? '?f=&sys=1' : ''));
+            } else {
+                notice(t('Unable to update menu element.') . EOL);
+            }
+        } else {
+            $r = MenuItem::add($_REQUEST['menu_id'], $uid, $_REQUEST);
+            if ($r) {
+                Menu::sync_packet($uid, get_observer_hash(), $_REQUEST['menu_id']);
+                //info( t('Menu element added.') . EOL);
+                if ($_REQUEST['submit']) {
+                    goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : ''));
+                }
+                if ($_REQUEST['submit-more']) {
+                    goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . '?f=&display=block' . ((App::$is_sys) ? '&sys=1' : ''));
+                }
+            } else {
+                notice(t('Unable to add menu element.') . EOL);
+            }
+        }
+    }
+
+
+    public function get()
+    {
+
+        $uid = local_channel();
+        $owner = App::$profile['channel_id'];
+        $channel = Channel::from_id($owner);
+        $observer = App::get_observer();
+
+        $which = argv(1);
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            $uid = intval($sys['channel_id']);
+            $channel = $sys;
+            $ob_hash = $sys['xchan_hash'];
+        }
+
+        if (!$uid) {
+            notice(t('Permission denied.') . EOL);
+            return '';
+        }
+
+        if (argc() < 3 || (!App::$data['menu'])) {
+            notice(t('Not found.') . EOL);
+            return '';
+        }
+
+        $m = Menu::fetch(App::$data['menu']['menu_name'], $owner, $ob_hash);
+        App::$data['menu_item'] = $m;
+
+        $menu_list = Menu::list($owner);
+
+        foreach ($menu_list as $menus) {
+            if ($menus['menu_name'] != $m['menu']['menu_name']) {
+                $menu_names[] = $menus['menu_name'];
+            }
+        }
+
+        $acl = new AccessControl($channel);
+
+        $lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
+
+        if (argc() == 3) {
+            $r = q(
+                "select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d order by mitem_order asc, mitem_desc asc",
+                intval(App::$data['menu']['menu_id']),
+                intval($owner)
+            );
+
+            if ($_GET['display']) {
+                $display = $_GET['display'];
+            } else {
+                $display = (($r) ? 'none' : 'block');
+            }
+
+            $create = replace_macros(Theme::get_template('mitemedit.tpl'), array(
+                '$menu_id' => App::$data['menu']['menu_id'],
+                '$permissions' => t('Menu Item Permissions'),
+                '$permdesc' => t("\x28click to open/close\x29"),
+                '$aclselect' => Libacl::populate($acl->get(), false),
+                '$allow_cid' => acl2json($acl->get()['allow_cid']),
+                '$allow_gid' => acl2json($acl->get()['allow_gid']),
+                '$deny_cid' => acl2json($acl->get()['deny_cid']),
+                '$deny_gid' => acl2json($acl->get()['deny_gid']),
+                '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link', '*'),
+                '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'),
+                '$usezid' => array('usezid', t('Use magic-auth if available'), true, '', array(t('No'), t('Yes'))),
+                '$newwin' => array('newwin', t('Open link in new window'), false, '', array(t('No'), t('Yes'))),
+                '$mitem_order' => array('mitem_order', t('Order in list'), '0', t('Higher numbers will sink to bottom of listing')),
+                '$submit' => t('Submit and finish'),
+                '$submit_more' => t('Submit and continue'),
+                '$display' => $display,
+                '$lockstate' => $lockstate,
+                '$menu_names' => $menu_names,
+                '$nick' => $which,
+                '$sys' => App::$is_sys
+            ));
+
+            $o .= replace_macros(Theme::get_template('mitemlist.tpl'), array(
+                '$title' => t('Menu:'),
+                '$create' => $create,
+                '$nametitle' => t('Link Name'),
+                '$targettitle' => t('Link Target'),
+                '$menuname' => App::$data['menu']['menu_name'],
+                '$menudesc' => App::$data['menu']['menu_desc'],
+                '$edmenu' => t('Edit menu'),
+                '$menu_id' => App::$data['menu']['menu_id'],
+                '$mlist' => $r,
+                '$edit' => t('Edit element'),
+                '$drop' => t('Drop element'),
+                '$new' => t('New element'),
+                '$hintmenu' => t('Edit this menu container'),
+                '$hintnew' => t('Add menu element'),
+                '$hintdrop' => t('Delete this menu item'),
+                '$hintedit' => t('Edit this menu item'),
+                '$nick' => $which,
+            ));
+
+            return $o;
+        }
+
+
+        if (argc() > 3) {
+            if (intval(argv(3))) {
+                $m = q(
+                    "select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1",
+                    intval(argv(3)),
+                    intval($owner)
+                );
+
+                if (!$m) {
+                    notice(t('Menu item not found.') . EOL);
+                    goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : ''));
+                }
+
+                $mitem = $m[0];
+
+                $lockstate = (($mitem['allow_cid'] || $mitem['allow_gid'] || $mitem['deny_cid'] || $mitem['deny_gid']) ? 'lock' : 'unlock');
+
+                if (argc() == 5 && argv(4) == 'drop') {
+                    Menu::sync_packet($owner, get_observer_hash(), $mitem['mitem_menu_id']);
+                    $r = MenuItem::delete($mitem['mitem_menu_id'], $owner, intval(argv(3)));
+                    Menu::sync_packet($owner, get_observer_hash(), $mitem['mitem_menu_id']);
+                    if ($r) {
+                        info(t('Menu item deleted.') . EOL);
+                    } else {
+                        notice(t('Menu item could not be deleted.') . EOL);
+                    }
+
+                    goaway(z_root() . '/mitem/' . $which . '/' . $mitem['mitem_menu_id'] . ((App::$is_sys) ? '?f=&sys=1' : ''));
+                }
+
+                // edit menu item
+                $o = replace_macros(Theme::get_template('mitemedit.tpl'), array(
+                    '$header' => t('Edit Menu Element'),
+                    '$menu_id' => App::$data['menu']['menu_id'],
+                    '$permissions' => t('Menu Item Permissions'),
+                    '$permdesc' => t("\x28click to open/close\x29"),
+                    '$aclselect' => Libacl::populate($mitem, false),
+                    '$allow_cid' => acl2json($mitem['allow_cid']),
+                    '$allow_gid' => acl2json($mitem['allow_gid']),
+                    '$deny_cid' => acl2json($mitem['deny_cid']),
+                    '$deny_gid' => acl2json($mitem['deny_gid']),
+                    '$mitem_id' => intval(argv(3)),
+                    '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '', '*'),
+                    '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
+                    '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), '', array(t('No'), t('Yes'))),
+                    '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0), '', array(t('No'), t('Yes'))),
+                    '$mitem_order' => array('mitem_order', t('Order in list'), $mitem['mitem_order'], t('Higher numbers will sink to bottom of listing')),
+                    '$submit' => t('Submit'),
+                    '$lockstate' => $lockstate,
+                    '$menu_names' => $menu_names,
+                    '$nick' => $which
+                ));
+
+                return $o;
+            }
+        }
+    }
+}
diff --git a/Code/Module/Moderate.php b/Code/Module/Moderate.php
new file mode 100644
index 000000000..7795b6f7e
--- /dev/null
+++ b/Code/Module/Moderate.php
@@ -0,0 +1,128 @@
+ 2) {
+            $post_id = intval(argv(1));
+            if (!$post_id) {
+                goaway(z_root() . '/moderate');
+            }
+
+            $action = argv(2);
+
+            $r = q(
+                "select * from item where uid = %d and id = %d and item_blocked = %d limit 1",
+                intval(local_channel()),
+                intval($post_id),
+                intval(ITEM_MODERATED)
+            );
+
+            if ($r) {
+                $item = $r[0];
+
+                if ($action === 'approve') {
+                    q(
+                        "update item set item_blocked = 0 where uid = %d and id = %d",
+                        intval(local_channel()),
+                        intval($post_id)
+                    );
+
+                    $item['item_blocked'] = 0;
+
+                    item_update_parent_commented($item);
+
+                    notice(t('Comment approved') . EOL);
+                } elseif ($action === 'drop') {
+                    drop_item($post_id, false);
+                    notice(t('Comment deleted') . EOL);
+                }
+
+                // refetch the item after changes have been made
+
+                $r = q(
+                    "select * from item where id = %d",
+                    intval($post_id)
+                );
+                if ($r) {
+                    xchan_query($r);
+                    $sync_item = fetch_post_tags($r);
+                    Libsync::build_sync_packet(local_channel(), array('item' => array(encode_item($sync_item[0], true))));
+                }
+                if ($action === 'approve') {
+                    if ($item['id'] !== $item['parent']) {
+                        // if this is a group comment, call tag_deliver() to generate the associated
+                        // Announce activity so microblog destinations will see it in their home timeline
+                        $role = get_pconfig(local_channel(), 'system', 'permissions_role');
+                        $rolesettings = PermissionRoles::role_perms($role);
+                        $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal';
+
+                        $is_group = (($channel_type === 'group') ? true : false);
+                        if ($is_group) {
+                            tag_deliver(local_channel(), $post_id);
+                        }
+                    }
+                    Run::Summon(['Notifier', 'comment-new', $post_id]);
+                }
+                goaway(z_root() . '/moderate');
+            }
+        }
+
+        if ($r) {
+            xchan_query($r);
+            $items = fetch_post_tags($r, true);
+        } else {
+            $items = [];
+        }
+
+        $o = conversation($items, 'moderate', false, 'traditional');
+        $o .= alt_pager(count($items));
+        return $o;
+    }
+}
diff --git a/Code/Module/Mood.php b/Code/Module/Mood.php
new file mode 100644
index 000000000..d4a34e97d
--- /dev/null
+++ b/Code/Module/Mood.php
@@ -0,0 +1,175 @@
+Mood App (Not Installed):
      ';
+            $o .= t('Set your current mood and tell your friends');
+            return $o;
+        }
+
+        Navbar::set_selected('Mood');
+
+        $parent = ((x($_GET, 'parent')) ? intval($_GET['parent']) : '0');
+
+        $verbs = get_mood_verbs();
+
+        $shortlist = [];
+        foreach ($verbs as $k => $v) {
+            if ($v !== 'NOTRANSLATION') {
+                $shortlist[] = array($k, $v);
+            }
+        }
+
+
+        $tpl = Theme::get_template('mood_content.tpl');
+
+        $o = replace_macros($tpl, array(
+            '$title' => t('Mood'),
+            '$desc' => t('Set your current mood and tell your friends'),
+            '$verbs' => $shortlist,
+            '$parent' => $parent,
+            '$submit' => t('Submit'),
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/New_channel.php b/Code/Module/New_channel.php
new file mode 100644
index 000000000..687436980
--- /dev/null
+++ b/Code/Module/New_channel.php
@@ -0,0 +1,212 @@
+ 1) ? argv(1) : '');
+
+        if ($cmd === 'autofill.json') {
+            $result = array('error' => false, 'message' => '');
+            $n = trim($_REQUEST['name']);
+
+            $x = false;
+
+            if (get_config('system', 'unicode_usernames')) {
+                $x = punify(mb_strtolower($n));
+            }
+
+            if ((!$x) || strlen($x) > 64) {
+                $x = strtolower(URLify::transliterate($n));
+            }
+
+            $test = [];
+
+            // first name
+            if (strpos($x, ' ')) {
+                $test[] = legal_webbie(substr($x, 0, strpos($x, ' ')));
+            }
+            if ($test[0]) {
+                // first name plus first initial of last
+                $test[] = ((strpos($x, ' ')) ? $test[0] . legal_webbie(trim(substr($x, strpos($x, ' '), 2))) : '');
+                // first name plus random number
+                $test[] = $test[0] . mt_rand(1000, 9999);
+            }
+            // fullname
+            $test[] = legal_webbie($x);
+            // fullname plus random number
+            $test[] = legal_webbie($x) . mt_rand(1000, 9999);
+
+            json_return_and_die(check_webbie($test));
+        }
+
+        if ($cmd === 'checkaddr.json') {
+            $result = array('error' => false, 'message' => '');
+            $n = trim($_REQUEST['nick']);
+            if (!$n) {
+                $n = trim($_REQUEST['name']);
+            }
+
+            $x = false;
+
+            if (get_config('system', 'unicode_usernames')) {
+                $x = punify(mb_strtolower($n));
+            }
+
+            if ((!$x) || strlen($x) > 64) {
+                $x = strtolower(URLify::transliterate($n));
+            }
+
+
+            $test = [];
+
+            // first name
+            if (strpos($x, ' ')) {
+                $test[] = legal_webbie(substr($x, 0, strpos($x, ' ')));
+            }
+            if ($test[0]) {
+                // first name plus first initial of last
+                $test[] = ((strpos($x, ' ')) ? $test[0] . legal_webbie(trim(substr($x, strpos($x, ' '), 2))) : '');
+                // first name plus random number
+                $test[] = $test[0] . mt_rand(1000, 9999);
+            }
+
+            $n = legal_webbie($x);
+            if (strlen($n)) {
+                $test[] = $n;
+                $test[] = $n . mt_rand(1000, 9999);
+            }
+
+            for ($y = 0; $y < 100; $y++) {
+                $test[] = 'id' . mt_rand(1000, 9999);
+            }
+
+            json_return_and_die(check_webbie($test));
+        }
+    }
+
+    public function post()
+    {
+
+        $arr = $_POST;
+
+        $acc = App::get_account();
+
+        if (local_channel()) {
+            $parent_channel = App::get_channel();
+            if ($parent_channel) {
+                $arr['parent_hash'] = $parent_channel['channel_hash'];
+            }
+        }
+
+        $arr['account_id'] = get_account_id();
+
+        // prevent execution by delegated channels as well as those not logged in.
+        // get_account_id() returns the account_id from the session. But \App::$account
+        // may point to the original authenticated account.
+
+        if ((!$acc) || ($acc['account_id'] != $arr['account_id'])) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $result = Channel::create($arr);
+
+        if (!$result['success']) {
+            notice($result['message']);
+            return;
+        }
+
+        $newuid = $result['channel']['channel_id'];
+
+        change_channel($result['channel']['channel_id']);
+
+        $next_page = get_config('system', 'workflow_channel_next', 'profiles');
+        goaway(z_root() . '/' . $next_page);
+    }
+
+    public function get()
+    {
+
+        $acc = App::get_account();
+
+        if ((!$acc) || $acc['account_id'] != get_account_id()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $default_role = '';
+        $aid = get_account_id();
+        if ($aid) {
+            $r = q(
+                "select count(channel_id) as total from channel where channel_account_id = %d",
+                intval($aid)
+            );
+            if ($r && (!intval($r[0]['total']))) {
+                $default_role = get_config('system', 'default_permissions_role', 'social');
+            }
+
+            $limit = ServiceClass::account_fetch(get_account_id(), 'total_identities');
+
+            if ($r && ($limit !== false)) {
+                $channel_usage_message = sprintf(t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit);
+            } else {
+                $channel_usage_message = '';
+            }
+        }
+
+        $name_help = '';
+        $name_help .= (($default_role)
+            ? t('Your real name is recommended.')
+            : t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"')
+        );
+        $name_help .= '';
+
+        $nick_help = '';
+        $nick_help .= t('This will be used to create a unique network address (like an email address).');
+        if (!get_config('system', 'unicode_usernames')) {
+            $nick_help .= ' ' . t('Allowed characters are a-z 0-9, - and _');
+        }
+        $nick_help .= '';
+
+        $privacy_role = ((x($_REQUEST, 'permissions_role')) ? $_REQUEST['permissions_role'] : "");
+
+        $perm_roles = PermissionRoles::roles();
+
+        $name = array('name', t('Channel name'), ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''), $name_help, "*");
+        $nickhub = '@' . App::get_hostname();
+        $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST, 'nickname')) ? $_REQUEST['nickname'] : ''), $nick_help, "*");
+        $role = array('permissions_role', t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role compatible with your usage needs and privacy requirements.'), $perm_roles);
+
+        $o = replace_macros(Theme::get_template('new_channel.tpl'), array(
+            '$title' => t('Create a Channel'),
+            '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.'),
+            '$label_import' => t('or import an existing channel from another location.'),
+            '$name' => $name,
+            '$role' => $role,
+            '$default_role' => $default_role,
+            '$nickname' => $nickname,
+            '$validate' => t('Validate'),
+            '$submit' => t('Create'),
+            '$channel_usage_message' => $channel_usage_message
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Notes.php b/Code/Module/Notes.php
new file mode 100644
index 000000000..cb4f3bac4
--- /dev/null
+++ b/Code/Module/Notes.php
@@ -0,0 +1,66 @@
+ true);
+        if (array_key_exists('note_text', $_REQUEST)) {
+            $body = escape_tags($_REQUEST['note_text']);
+
+            // I've had my notes vanish into thin air twice in four years.
+            // Provide a backup copy if there were contents previously
+            // and there are none being saved now.
+
+            if (!$body) {
+                $old_text = get_pconfig(local_channel(), 'notes', 'text');
+                if ($old_text) {
+                    set_pconfig(local_channel(), 'notes', 'text.bak', $old_text);
+                }
+            }
+            set_pconfig(local_channel(), 'notes', 'text', $body);
+
+
+            // push updates to channel clones
+
+            if ((argc() > 1) && (argv(1) === 'sync')) {
+                Libsync::build_sync_packet();
+            }
+
+            logger('notes saved.', LOGGER_DEBUG);
+            json_return_and_die($ret);
+        }
+    }
+
+    public function get()
+    {
+
+        $desc = t('This app allows you to create private notes for your personal use.');
+
+        $text = '
      ' . $desc . '
      ';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Notes'))) {
+            return $text;
+        }
+
+        $desc = t('This app is installed. The Notes tool can be found on your stream page.');
+
+        $text = '
      ' . $desc . '
      ';
+
+        return $text;
+    }
+}
diff --git a/Code/Module/Notifications.php b/Code/Module/Notifications.php
new file mode 100644
index 000000000..541ecedba
--- /dev/null
+++ b/Code/Module/Notifications.php
@@ -0,0 +1,82 @@
+ 49) {
+            $r = q(
+                "select * from notify where uid = %d
+				and seen = 0 order by created desc limit 50",
+                intval(local_channel())
+            );
+        } else {
+            $r1 = q(
+                "select * from notify where uid = %d
+				and seen = 0 order by created desc limit 50",
+                intval(local_channel())
+            );
+
+            $r2 = q(
+                "select * from notify where uid = %d
+				and seen = 1 order by created desc limit %d",
+                intval(local_channel()),
+                intval(50 - intval($n[0]['total']))
+            );
+            $r = array_merge($r1, $r2);
+        }
+
+        if ($r) {
+            $notifications_available = true;
+            foreach ($r as $rr) {
+                $x = strip_tags(bbcode($rr['msg']));
+                $notif_content .= replace_macros(Theme::get_template('notify.tpl'), array(
+                    '$item_link' => z_root() . '/notify/view/' . $rr['id'],
+                    '$item_image' => $rr['photo'],
+                    '$item_text' => $x,
+                    '$item_when' => relative_date($rr['created']),
+                    '$item_seen' => (($rr['seen']) ? true : false),
+                    '$new' => t('New')
+                ));
+            }
+        } else {
+            $notif_content = t('No more system notifications.');
+        }
+
+        $o .= replace_macros(Theme::get_template('notifications.tpl'), array(
+            '$notif_header' => t('System Notifications'),
+            '$notif_link_mark_seen' => t('Mark all seen'),
+            '$notif_content' => $notif_content,
+            '$notifications_available' => $notifications_available,
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Notify.php b/Code/Module/Notify.php
new file mode 100644
index 000000000..a01780311
--- /dev/null
+++ b/Code/Module/Notify.php
@@ -0,0 +1,87 @@
+ 2 && argv(1) === 'view' && intval(argv(2))) {
+            $r = q(
+                "select * from notify where id = %d and uid = %d limit 1",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+            if ($r) {
+                $x = ['channel_id' => local_channel(), 'update' => 'unset'];
+                Hook::call('update_unseen', $x);
+                if ((!$_SESSION['sudo']) && ($x['update'] === 'unset' || intval($x['update']))) {
+                    q(
+                        "update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d",
+                        dbesc($r[0]['parent']),
+                        dbesc($r[0]['otype']),
+                        dbesc($r[0]['link']),
+                        intval(local_channel())
+                    );
+                }
+                goaway($r[0]['link']);
+            }
+            notice(sprintf(t('A notification with that id was not found for channel \'%s\''), $channel['channel_name']));
+            goaway(z_root());
+        }
+    }
+
+
+    public function get()
+    {
+        if (!local_channel()) {
+            return login();
+        }
+
+        $notif_tpl = Theme::get_template('notifications.tpl');
+
+        $not_tpl = Theme::get_template('notify.tpl');
+
+        $r = q(
+            "SELECT * from notify where uid = %d and seen = 0 order by created desc",
+            intval(local_channel())
+        );
+
+        if ($r) {
+            foreach ($r as $it) {
+                $notif_content .= replace_macros($not_tpl, array(
+                    '$item_link' => z_root() . '/notify/view/' . $it['id'],
+                    '$item_image' => $it['photo'],
+                    '$item_text' => strip_tags(bbcode($it['msg'])),
+                    '$item_when' => relative_date($it['created'])
+                ));
+            }
+        } else {
+            $notif_content .= t('No more system notifications.');
+        }
+
+        $o .= replace_macros($notif_tpl, array(
+            '$notif_header' => t('System Notifications'),
+            '$tabs' => '', // $tabs,
+            '$notif_content' => $notif_content,
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Nullbox.php b/Code/Module/Nullbox.php
new file mode 100644
index 000000000..30734a31e
--- /dev/null
+++ b/Code/Module/Nullbox.php
@@ -0,0 +1,14 @@
+ z_root(),
+            'authorization_endpoint' => z_root() . '/authorize',
+            'jwks_uri' => z_root() . '/jwks',
+            'token_endpoint' => z_root() . '/token',
+            'userinfo_endpoint' => z_root() . '/userinfo',
+            'scopes_supported' => ['openid', 'profile', 'email'],
+            'response_types_supported' => ['code', 'token', 'id_token', 'code id_token', 'token id_token']
+        ];
+
+        json_return_and_die($ret);
+    }
+}
diff --git a/Code/Module/Oembed.php b/Code/Module/Oembed.php
new file mode 100644
index 000000000..9bebb8253
--- /dev/null
+++ b/Code/Module/Oembed.php
@@ -0,0 +1,35 @@
+ 1) {
+            if (argv(1) == 'b2h') {
+                $url = array("", trim(hex2bin($_REQUEST['url'])));
+                echo Zlib\Oembed::replacecb($url);
+                killme();
+            } elseif (argv(1) == 'h2b') {
+                $text = trim(hex2bin($_REQUEST['text']));
+                echo Zlib\Oembed::html2bbcode($text);
+                killme();
+            } else {
+                echo "";
+                $src = base64url_decode(argv(1));
+                $j = Zlib\Oembed::fetch_url($src);
+                echo $j['html'];
+                echo "";
+            }
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Oep.php b/Code/Module/Oep.php
new file mode 100644
index 000000000..35143abda
--- /dev/null
+++ b/Code/Module/Oep.php
@@ -0,0 +1,680 @@
+ 1 && argv(1) === 'html') ? true : false);
+        if ($_REQUEST['url']) {
+            $_REQUEST['url'] = strip_zids($_REQUEST['url']);
+            $url = $_REQUEST['url'];
+        }
+
+        if (!$url) {
+            http_status_exit(404, 'Not found');
+        }
+
+        $maxwidth = $_REQUEST['maxwidth'];
+        $maxheight = $_REQUEST['maxheight'];
+        $format = $_REQUEST['format'];
+        if ($format && $format !== 'json') {
+            http_status_exit(501, 'Not implemented');
+        }
+
+        if (fnmatch('*/photos/*/album/*', $url)) {
+            $arr = $this->oep_album_reply($_REQUEST);
+        } elseif (fnmatch('*/photos/*/image/*', $url)) {
+            $arr = $this->oep_photo_reply($_REQUEST);
+        } elseif (fnmatch('*/photos*', $url)) {
+            $arr = $this->oep_phototop_reply($_REQUEST);
+        } elseif (fnmatch('*/display/*', $url)) {
+            $arr = $this->oep_display_reply($_REQUEST);
+        } elseif (fnmatch('*/channel/*mid=*', $url)) {
+            $arr = $this->oep_mid_reply($_REQUEST);
+        } elseif (fnmatch('*/channel*', $url)) {
+            $arr = $this->oep_profile_reply($_REQUEST);
+        } elseif (fnmatch('*/profile/*', $url)) {
+            $arr = $this->oep_profile_reply($_REQUEST);
+        } elseif (fnmatch('*/cards/*', $url)) {
+            $arr = $this->oep_cards_reply($_REQUEST);
+        } elseif (fnmatch('*/articles/*', $url)) {
+            $arr = $this->oep_articles_reply($_REQUEST);
+        }
+
+        if ($arr) {
+            if ($html) {
+                if ($arr['type'] === 'rich') {
+                    header('Content-Type: text/html');
+                    echo $arr['html'];
+                }
+            } else {
+                header('Content-Type: application/json+oembed');
+                echo json_encode($arr);
+            }
+            killme();
+        }
+
+        http_status_exit(404, 'Not found');
+    }
+
+    public function oep_display_reply($args)
+    {
+
+        $ret = [];
+        $url = $args['url'];
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        if (preg_match('#//(.*?)/display/(.*?)(&|\?|$)#', $url, $matches)) {
+            $res = $matches[2];
+        }
+
+        $res = unpack_link_id($res);
+
+        $item_normal = item_normal();
+
+        $p = q(
+            "select * from item where mid like '%s' limit 1",
+            dbesc($res . '%')
+        );
+
+        if (!$p) {
+            return;
+        }
+
+        $c = Channel::from_id($p[0]['uid']);
+
+
+        if (!($c && $res)) {
+            return;
+        }
+
+        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_stream')) {
+            return;
+        }
+
+        $sql_extra = item_permissions_sql($c['channel_id']);
+
+        $p = q(
+            "select * from item where mid like '%s' and uid = %d $sql_extra $item_normal limit 1",
+            dbesc($res . '%'),
+            intval($c['channel_id'])
+        );
+
+        if (!$p) {
+            return;
+        }
+
+        xchan_query($p, true);
+        $p = fetch_post_tags($p, true);
+
+        // This function can get tripped up if the item is already a reshare
+        // (the multiple share declarations do not parse cleanly if nested)
+        // So build a template with a known nonsense string as the content, and then
+        // replace that known string with the actual rendered content, sending
+        // each content layer through bbcode() separately.
+
+        $x = '2eGriplW^*Jmf4';
+
+
+        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
+            "' profile='" . $p[0]['author']['xchan_url'] .
+            "' portable_id='" . $p[0]['author']['xchan_hash'] .
+            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
+            "' link='" . $p[0]['plink'] .
+			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
+            "' posted='" . $p[0]['created'] .
+            "' message_id='" . $p[0]['mid'] . "']";
+        if ($p[0]['title']) {
+            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
+        }
+
+        $o .= $x;
+        $o .= "[/share]";
+        $o = bbcode($o);
+
+        $o = str_replace($x, bbcode($p[0]['body']), $o);
+
+        $ret['type'] = 'rich';
+
+        $w = (($maxwidth) ? $maxwidth : 640);
+        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
+
+        $ret['html'] = '
      ' . $o . '
      ';
+
+        $ret['width'] = $w;
+        $ret['height'] = $h;
+
+        return $ret;
+    }
+
+
+    public function oep_cards_reply($args)
+    {
+
+        $ret = [];
+        $url = $args['url'];
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        if (preg_match('#//(.*?)/cards/(.*?)/(.*?)(&|\?|$)#', $url, $matches)) {
+            $nick = $matches[2];
+            $res = $matches[3];
+        }
+        if (!($nick && $res)) {
+            return $ret;
+        }
+
+        $channel = Channel::from_username($nick);
+
+        if (!$channel) {
+            return $ret;
+        }
+
+
+        if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_pages')) {
+            return $ret;
+        }
+
+        $sql_extra = item_permissions_sql($channel['channel_id'], get_observer_hash());
+
+        $r = q(
+            "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1",
+            dbesc($res)
+        );
+        if ($r) {
+            $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " ";
+        } else {
+            return $ret;
+        }
+
+        $r = q(
+            "select * from item 
+			where item.uid = %d and item_type = %d 
+			$sql_extra order by item.created desc",
+            intval($channel['channel_id']),
+            intval(ITEM_TYPE_CARD)
+        );
+
+        $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0
+			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
+			and item.item_blocked = 0 ";
+
+        if ($r) {
+            xchan_query($r);
+            $p = fetch_post_tags($r, true);
+        }
+
+        $x = '2eGriplW^*Jmf4';
+
+
+        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
+            "' profile='" . $p[0]['author']['xchan_url'] .
+            "' portable_id='" . $p[0]['author']['xchan_hash'] .
+            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
+            "' link='" . $p[0]['plink'] .
+			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
+            "' posted='" . $p[0]['created'] .
+            "' message_id='" . $p[0]['mid'] . "']";
+        if ($p[0]['title']) {
+            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
+        }
+
+        $o .= $x;
+        $o .= "[/share]";
+        $o = bbcode($o);
+
+        $o = str_replace($x, bbcode($p[0]['body']), $o);
+
+        $ret['type'] = 'rich';
+
+        $w = (($maxwidth) ? $maxwidth : 640);
+        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
+
+        $ret['html'] = '
      ' . $o . '
      ';
+
+        $ret['width'] = $w;
+        $ret['height'] = $h;
+
+        return $ret;
+    }
+
+    public function oep_articles_reply($args)
+    {
+
+        $ret = [];
+        $url = $args['url'];
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        if (preg_match('#//(.*?)/articles/(.*?)/(.*?)(&|\?|$)#', $url, $matches)) {
+            $nick = $matches[2];
+            $res = $matches[3];
+        }
+        if (!($nick && $res)) {
+            return $ret;
+        }
+
+        $channel = Channel::from_username($nick);
+
+        if (!$channel) {
+            return $ret;
+        }
+
+
+        if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_pages')) {
+            return $ret;
+        }
+
+        $sql_extra = item_permissions_sql($channel['channel_id'], get_observer_hash());
+
+        $r = q(
+            "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1",
+            dbesc($res)
+        );
+        if ($r) {
+            $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " ";
+        } else {
+            return $ret;
+        }
+
+        $r = q(
+            "select * from item 
+			where item.uid = %d and item_type = %d 
+			$sql_extra order by item.created desc",
+            intval($channel['channel_id']),
+            intval(ITEM_TYPE_ARTICLE)
+        );
+
+        $item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0
+			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
+			and item.item_blocked = 0 ";
+
+        if ($r) {
+            xchan_query($r);
+            $p = fetch_post_tags($r, true);
+        }
+
+        $x = '2eGriplW^*Jmf4';
+
+
+        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
+            "' profile='" . $p[0]['author']['xchan_url'] .
+            "' portable_id='" . $p[0]['author']['xchan_hash'] .
+            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
+            "' link='" . $p[0]['plink'] .
+			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
+            "' posted='" . $p[0]['created'] .
+            "' message_id='" . $p[0]['mid'] . "']";
+        if ($p[0]['title']) {
+            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
+        }
+
+        $o .= $x;
+        $o .= "[/share]";
+        $o = bbcode($o);
+
+        $o = str_replace($x, bbcode($p[0]['body']), $o);
+
+        $ret['type'] = 'rich';
+
+        $w = (($maxwidth) ? $maxwidth : 640);
+        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
+
+        $ret['html'] = '
      ' . $o . '
      ';
+
+        $ret['width'] = $w;
+        $ret['height'] = $h;
+
+        return $ret;
+    }
+
+
+    public function oep_mid_reply($args)
+    {
+
+        $ret = [];
+        $url = $args['url'];
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        if (preg_match('#//(.*?)/(.*?)/(.*?)/(.*?)mid\=(.*?)(&|$)#', $url, $matches)) {
+            $chn = $matches[3];
+            $res = $matches[5];
+        }
+
+        if (!($chn && $res)) {
+            return;
+        }
+        $c = q(
+            "select * from channel where channel_address = '%s' limit 1",
+            dbesc($chn)
+        );
+
+        if (!$c) {
+            return;
+        }
+
+        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_stream')) {
+            return;
+        }
+
+        $sql_extra = item_permissions_sql($c[0]['channel_id']);
+
+        $p = q(
+            "select * from item where mid = '%s' and uid = %d $sql_extra limit 1",
+            dbesc($res),
+            intval($c[0]['channel_id'])
+        );
+        if (!$p) {
+            return;
+        }
+
+        xchan_query($p, true);
+        $p = fetch_post_tags($p, true);
+
+        // This function can get tripped up if the item is already a reshare
+        // (the multiple share declarations do not parse cleanly if nested)
+        // So build a template with a known nonsense string as the content, and then
+        // replace that known string with the actual rendered content, sending
+        // each content layer through bbcode() separately.
+
+        $x = '2eGriplW^*Jmf4';
+
+        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
+            "' profile='" . $p[0]['author']['xchan_url'] .
+            "' portable_id='" . $p[0]['author']['xchan_hash'] .
+            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
+            "' link='" . $p[0]['plink'] .
+			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
+            "' posted='" . $p[0]['created'] .
+            "' message_id='" . $p[0]['mid'] . "']";
+        if ($p[0]['title']) {
+            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
+        }
+        $o .= $x;
+        $o .= "[/share]";
+        $o = bbcode($o);
+
+        $o = str_replace($x, bbcode($p[0]['body']), $o);
+
+        $ret['type'] = 'rich';
+
+        $w = (($maxwidth) ? $maxwidth : 640);
+        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
+
+        $ret['html'] = '
      ' . $o . '
      ';
+
+        $ret['width'] = $w;
+        $ret['height'] = $h;
+
+        return $ret;
+    }
+
+    public function oep_profile_reply($args)
+    {
+
+
+        require_once('include/channel.php');
+
+        $url = $args['url'];
+
+        if (preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#', $url, $matches)) {
+            $chn = $matches[3];
+        }
+
+        if (!$chn) {
+            return;
+        }
+
+        $c = Channel::from_username($chn);
+
+        if (!$c) {
+            return;
+        }
+
+
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        $width = 800;
+        $height = 375;
+
+        if ($maxwidth) {
+            $width = $maxwidth;
+            $height = (375 / 800) * $width;
+        }
+        if ($maxheight) {
+            if ($maxheight < $height) {
+                $width = (800 / 375) * $maxheight;
+                $height = $maxheight;
+            }
+        }
+        $ret = [];
+
+        $ret['type'] = 'rich';
+        $ret['width'] = intval($width);
+        $ret['height'] = intval($height);
+
+        $ret['html'] = Channel::get_zcard_embed($c, get_observer_hash(), array('width' => $width, 'height' => $height));
+
+        return $ret;
+    }
+
+    public function oep_album_reply($args)
+    {
+
+        $ret = [];
+        $url = $args['url'];
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        if (preg_match('|//(.*?)/(.*?)/(.*?)/album/|', $url, $matches)) {
+            $chn = $matches[3];
+            $res = basename($url);
+        }
+
+        if (!($chn && $res)) {
+            return;
+        }
+        $c = q(
+            "select * from channel where channel_address = '%s' limit 1",
+            dbesc($chn)
+        );
+
+        if (!$c) {
+            return;
+        }
+
+        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) {
+            return;
+        }
+
+        $sql_extra = permissions_sql($c[0]['channel_id']);
+
+        $p = q(
+            "select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
+            dbesc($res),
+            intval($c[0]['channel_id'])
+        );
+        if (!$p) {
+            return;
+        }
+
+        $res = $p[0]['resource_id'];
+
+        $r = q(
+            "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
+            intval($c[0]['channel_id']),
+            dbesc($res)
+        );
+
+        if ($r) {
+            foreach ($r as $rr) {
+                $foundres = false;
+                if ($maxheight && $rr['height'] > $maxheight) {
+                    continue;
+                }
+                if ($maxwidth && $rr['width'] > $maxwidth) {
+                    continue;
+                }
+                $foundres = true;
+                break;
+            }
+
+            if ($foundres) {
+                $ret['type'] = 'link';
+                $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
+                $ret['thumbnail_width'] = $rr['width'];
+                $ret['thumbnail_height'] = $rr['height'];
+            }
+        }
+        return $ret;
+    }
+
+
+    public function oep_phototop_reply($args)
+    {
+
+        $ret = [];
+        $url = $args['url'];
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        if (preg_match('|//(.*?)/(.*?)/(.*?)$|', $url, $matches)) {
+            $chn = $matches[3];
+        }
+
+        if (!$chn) {
+            return;
+        }
+        $c = q(
+            "select * from channel where channel_address = '%s' limit 1",
+            dbesc($chn)
+        );
+
+        if (!$c) {
+            return;
+        }
+
+        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) {
+            return;
+        }
+
+        $sql_extra = permissions_sql($c[0]['channel_id']);
+
+        $p = q(
+            "select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
+            intval($c[0]['channel_id'])
+        );
+        if (!$p) {
+            return;
+        }
+
+        $res = $p[0]['resource_id'];
+
+        $r = q(
+            "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
+            intval($c[0]['channel_id']),
+            dbesc($res)
+        );
+
+        if ($r) {
+            foreach ($r as $rr) {
+                $foundres = false;
+                if ($maxheight && $rr['height'] > $maxheight) {
+                    continue;
+                }
+                if ($maxwidth && $rr['width'] > $maxwidth) {
+                    continue;
+                }
+                $foundres = true;
+                break;
+            }
+
+            if ($foundres) {
+                $ret['type'] = 'link';
+                $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
+                $ret['thumbnail_width'] = $rr['width'];
+                $ret['thumbnail_height'] = $rr['height'];
+            }
+        }
+        return $ret;
+    }
+
+
+    public function oep_photo_reply($args)
+    {
+
+        $ret = [];
+        $url = $args['url'];
+        $maxwidth = intval($args['maxwidth']);
+        $maxheight = intval($args['maxheight']);
+
+        if (preg_match('|//(.*?)/(.*?)/(.*?)/image/|', $url, $matches)) {
+            $chn = $matches[3];
+            $res = basename($url);
+        }
+
+        if (!($chn && $res)) {
+            return;
+        }
+        $c = q(
+            "select * from channel where channel_address = '%s' limit 1",
+            dbesc($chn)
+        );
+
+        if (!$c) {
+            return;
+        }
+
+        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) {
+            return;
+        }
+
+        $sql_extra = permissions_sql($c[0]['channel_id']);
+
+
+        $r = q(
+            "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
+            intval($c[0]['channel_id']),
+            dbesc($res)
+        );
+
+        if ($r) {
+            foreach ($r as $rr) {
+                $foundres = false;
+                if ($maxheight && $rr['height'] > $maxheight) {
+                    continue;
+                }
+                if ($maxwidth && $rr['width'] > $maxwidth) {
+                    continue;
+                }
+                $foundres = true;
+                break;
+            }
+
+            if ($foundres) {
+                $ret['type'] = 'link';
+                $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
+                $ret['thumbnail_width'] = $rr['width'];
+                $ret['thumbnail_height'] = $rr['height'];
+            }
+        }
+        return $ret;
+    }
+}
diff --git a/Code/Module/Oexchange.php b/Code/Module/Oexchange.php
new file mode 100644
index 000000000..47fa49272
--- /dev/null
+++ b/Code/Module/Oexchange.php
@@ -0,0 +1,78 @@
+ 1) && (argv(1) === 'xrd')) {
+            echo replace_macros(Theme::get_template('oexchange_xrd.tpl'), ['$base' => z_root()]);
+            killme();
+        }
+    }
+
+    public function get()
+    {
+        if (!local_channel()) {
+            if (remote_channel()) {
+                $observer = App::get_observer();
+                if ($observer && $observer['xchan_url']) {
+                    $parsed = @parse_url($observer['xchan_url']);
+                    if (!$parsed) {
+                        notice(t('Unable to find your site.') . EOL);
+                        return;
+                    }
+                    $url = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '');
+                    $url .= '/oexchange';
+                    $result = z_post_url($url, $_REQUEST);
+                    json_return_and_die($result);
+                }
+            }
+
+            return login(false);
+        }
+
+        if ((argc() > 1) && argv(1) === 'done') {
+            info(t('Post successful.') . EOL);
+            return;
+        }
+
+        $url = (((x($_REQUEST, 'url')) && strlen($_REQUEST['url']))
+            ? urlencode(notags(trim($_REQUEST['url']))) : '');
+        $title = (((x($_REQUEST, 'title')) && strlen($_REQUEST['title']))
+            ? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
+        $description = (((x($_REQUEST, 'description')) && strlen($_REQUEST['description']))
+            ? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
+        $tags = (((x($_REQUEST, 'tags')) && strlen($_REQUEST['tags']))
+            ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
+
+        $ret = z_fetch_url(z_root() . '/linkinfo?f=&url=' . $url . $title . $description . $tags);
+
+        if ($ret['success']) {
+            $s = $ret['body'];
+        }
+
+        if (!strlen($s)) {
+            return;
+        }
+
+        $post = [];
+
+        $post['profile_uid'] = local_channel();
+        $post['return'] = '/oexchange/done';
+        $post['body'] = $s;
+        $post['type'] = 'wall';
+
+        $_REQUEST = $post;
+        $mod = new Item();
+        $mod->post();
+    }
+}
diff --git a/Code/Module/Online.php b/Code/Module/Online.php
new file mode 100644
index 000000000..0a56915f7
--- /dev/null
+++ b/Code/Module/Online.php
@@ -0,0 +1,18 @@
+ false];
+        if (argc() != 2) {
+            json_return_and_die($ret);
+        }
+        json_return_and_die(Channel::get_online_status(argv(1)));
+    }
+}
diff --git a/Code/Module/Outbox.php b/Code/Module/Outbox.php
new file mode 100644
index 000000000..bc26f40ef
--- /dev/null
+++ b/Code/Module/Outbox.php
@@ -0,0 +1,318 @@
+is_valid()) {
+            return;
+        }
+
+        if (!PConfig::Get($channel['channel_id'], 'system', 'activitypub', Config::Get('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
+            return;
+        }
+
+        logger('outbox_channel: ' . $channel['channel_address'], LOGGER_DEBUG);
+
+//      switch ($AS->type) {
+//          case 'Follow':
+//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type']) && isset($AS->obj['id'])) {
+//                  // do follow activity
+//                  Activity::follow($channel,$AS);
+//              }
+//              break;
+//          case 'Invite':
+//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
+//                  // do follow activity
+//                  Activity::follow($channel,$AS);
+//              }
+//              break;
+//          case 'Join':
+//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
+//                  // do follow activity
+//                  Activity::follow($channel,$AS);
+//              }
+//              break;
+//          case 'Accept':
+//              // Activitypub for wordpress sends lowercase 'follow' on accept.
+//              // https://github.com/pfefferle/wordpress-activitypub/issues/97
+//              // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group
+//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow','follow', 'Member'])) {
+//                  // do follow activity
+//                  Activity::follow($channel,$AS);
+//              }
+//              break;
+//          case 'Reject':
+//          default:
+//              break;
+//
+//      }
+
+        // These activities require permissions
+
+        $item = null;
+
+        switch ($AS->type) {
+            case 'Update':
+                if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
+                    // pretend this is an old cache entry to force an update of all the actor details
+                    $AS->obj['cached'] = true;
+                    $AS->obj['updated'] = datetime_convert('UTC', 'UTC', '1980-01-01', ATOM_TIME);
+                    Activity::actor_store($AS->obj['id'], $AS->obj);
+                    break;
+                }
+            case 'Accept':
+                if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) {
+                    break;
+                }
+            case 'Create':
+            case 'Like':
+            case 'Dislike':
+            case 'Announce':
+            case 'Reject':
+            case 'TentativeAccept':
+            case 'TentativeReject':
+            case 'Add':
+            case 'Arrive':
+            case 'Block':
+            case 'Flag':
+            case 'Ignore':
+            case 'Invite':
+            case 'Listen':
+            case 'Move':
+            case 'Offer':
+            case 'Question':
+            case 'Read':
+            case 'Travel':
+            case 'View':
+            case 'emojiReaction':
+            case 'EmojiReaction':
+            case 'EmojiReact':
+                // These require a resolvable object structure
+                if (is_array($AS->obj)) {
+                    // The boolean flag enables html cache of the item
+                    $item = Activity::decode_note($AS, true);
+                } else {
+                    logger('unresolved object: ' . print_r($AS->obj, true));
+                }
+                break;
+            case 'Undo':
+                if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') {
+                    // do unfollow activity
+                    Activity::unfollow($channel, $AS);
+                    break;
+                }
+            case 'Leave':
+                if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
+                    // do unfollow activity
+                    Activity::unfollow($channel, $AS);
+                    break;
+                }
+            case 'Tombstone':
+            case 'Delete':
+                Activity::drop($channel, $observer_hash, $AS);
+                break;
+            case 'Move':
+                if (
+                    $observer_hash && $observer_hash === $AS->actor
+                    && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type'])
+                    && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type'])
+                ) {
+                    ActivityPub::move($AS->obj, $AS->tgt);
+                }
+                break;
+            case 'Add':
+            case 'Remove':
+            default:
+                break;
+        }
+
+        if ($item) {
+            logger('parsed_item: ' . print_r($item, true), LOGGER_DATA);
+            Activity::store($channel, $observer_hash, $AS, $item);
+        }
+
+        http_status_exit(200, 'OK');
+        return;
+    }
+
+
+    public function get()
+    {
+
+        if (observer_prohibited(true)) {
+            killme();
+        }
+
+        if (argc() < 2) {
+            killme();
+        }
+
+        $channel = Channel::from_username(argv(1));
+        if (!$channel) {
+            killme();
+        }
+
+//      if (intval($channel['channel_system'])) {
+//          killme();
+//      }
+
+        if (ActivityStreams::is_as_request()) {
+            $sigdata = HTTPSig::verify(($_SERVER['REQUEST_METHOD'] === 'POST') ? file_get_contents('php://input') : EMPTY_STR);
+            if ($sigdata['portable_id'] && $sigdata['header_valid']) {
+                $portable_id = $sigdata['portable_id'];
+                if (!check_channelallowed($portable_id)) {
+                    http_status_exit(403, 'Permission denied');
+                }
+                if (!check_siteallowed($sigdata['signer'])) {
+                    http_status_exit(403, 'Permission denied');
+                }
+                observer_auth($portable_id);
+            } elseif (Config::get('system', 'require_authenticated_fetch', false)) {
+                http_status_exit(403, 'Permission denied');
+            }
+
+            $observer_hash = get_observer_hash();
+
+            $params = [];
+
+            $params['begin'] = ((x($_REQUEST, 'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE);
+            $params['end'] = ((x($_REQUEST, 'date_end')) ? $_REQUEST['date_end'] : '');
+            $params['type'] = 'json';
+            $params['pages'] = ((x($_REQUEST, 'pages')) ? intval($_REQUEST['pages']) : 0);
+            $params['top'] = ((x($_REQUEST, 'top')) ? intval($_REQUEST['top']) : 0);
+            $params['direction'] = ((x($_REQUEST, 'direction')) ? dbesc($_REQUEST['direction']) : 'desc'); // unimplemented
+            $params['cat'] = ((x($_REQUEST, 'cat')) ? escape_tags($_REQUEST['cat']) : '');
+            $params['compat'] = 1;
+
+
+            $total = items_fetch(
+                [
+                    'total' => true,
+                    'wall' => '1',
+                    'datequery' => $params['end'],
+                    'datequery2' => $params['begin'],
+                    'direction' => dbesc($params['direction']),
+                    'pages' => $params['pages'],
+                    'order' => dbesc('post'),
+                    'top' => $params['top'],
+                    'cat' => $params['cat'],
+                    'compat' => $params['compat']
+                ],
+                $channel,
+                $observer_hash,
+                CLIENT_MODE_NORMAL,
+                App::$module
+            );
+
+            if ($total) {
+                App::set_pager_total($total);
+                App::set_pager_itemspage(100);
+            }
+
+            if (App::$pager['unset'] && $total > 100) {
+                $ret = Activity::paged_collection_init($total, App::$query_string);
+            } else {
+                $items = items_fetch(
+                    [
+                        'wall' => '1',
+                        'datequery' => $params['end'],
+                        'datequery2' => $params['begin'],
+                        'records' => intval(App::$pager['itemspage']),
+                        'start' => intval(App::$pager['start']),
+                        'direction' => dbesc($params['direction']),
+                        'pages' => $params['pages'],
+                        'order' => dbesc('post'),
+                        'top' => $params['top'],
+                        'cat' => $params['cat'],
+                        'compat' => $params['compat']
+                    ],
+                    $channel,
+                    $observer_hash,
+                    CLIENT_MODE_NORMAL,
+                    App::$module
+                );
+
+                if ($items && $observer_hash) {
+                    // check to see if this observer is a connection. If not, register any items
+                    // belonging to this channel for notification of deletion/expiration
+
+                    $x = q(
+                        "select abook_id from abook where abook_channel = %d and abook_xchan = '%s'",
+                        intval($channel['channel_id']),
+                        dbesc($observer_hash)
+                    );
+                    if (!$x) {
+                        foreach ($items as $item) {
+                            if (strpos($item['mid'], z_root()) === 0) {
+                                ThreadListener::store($item['mid'], $observer_hash);
+                            }
+                        }
+                    }
+                }
+
+                $ret = Activity::encode_item_collection($items, App::$query_string, 'OrderedCollection', true, $total);
+            }
+
+            as_return_and_die($ret, $channel);
+        }
+    }
+}
diff --git a/Code/Module/Owa.php b/Code/Module/Owa.php
new file mode 100644
index 000000000..1741ef7c3
--- /dev/null
+++ b/Code/Module/Owa.php
@@ -0,0 +1,76 @@
+ false];
+
+        if (array_key_exists('REDIRECT_REMOTE_USER', $_SERVER) && (!array_key_exists('HTTP_AUTHORIZATION', $_SERVER))) {
+            $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['REDIRECT_REMOTE_USER'];
+        }
+
+
+        if (array_key_exists('HTTP_AUTHORIZATION', $_SERVER) && substr(trim($_SERVER['HTTP_AUTHORIZATION']), 0, 9) === 'Signature') {
+            $sigblock = HTTPSig::parse_sigheader($_SERVER['HTTP_AUTHORIZATION']);
+            if ($sigblock) {
+                $keyId = $sigblock['keyId'];
+                if ($keyId) {
+                    $r = q(
+                        "select * from hubloc left join xchan on hubloc_hash = xchan_hash 
+						where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and xchan_pubkey != '' ",
+                        dbesc(str_replace('acct:', '', $keyId)),
+                        dbesc($keyId)
+                    );
+                    if (!$r) {
+                        $found = discover_by_webbie(str_replace('acct:', '', $keyId));
+                        if ($found) {
+                            $r = q(
+                                "select * from hubloc left join xchan on hubloc_hash = xchan_hash 
+								where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and xchan_pubkey != '' ",
+                                dbesc(str_replace('acct:', '', $keyId)),
+                                dbesc($keyId)
+                            );
+                        }
+                    }
+                    if ($r) {
+                        foreach ($r as $hubloc) {
+                            $verified = HTTPSig::verify(file_get_contents('php://input'), $hubloc['xchan_pubkey']);
+                            if ($verified && $verified['header_signed'] && $verified['header_valid'] && ($verified['content_valid'] || (!$verified['content_signed']))) {
+                                logger('OWA header: ' . print_r($verified, true), LOGGER_DATA);
+                                logger('OWA success: ' . $hubloc['hubloc_addr'], LOGGER_DATA);
+                                $ret['success'] = true;
+                                $token = random_string(32);
+                                Verify::create('owt', 0, $token, $hubloc['hubloc_addr']);
+                                $result = '';
+                                openssl_public_encrypt($token, $result, $hubloc['xchan_pubkey']);
+                                $ret['encrypted_token'] = base64url_encode($result);
+                                break;
+                            } else {
+                                logger('OWA fail: ' . $hubloc['hubloc_id'] . ' ' . $hubloc['hubloc_addr']);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        json_return_and_die($ret, 'application/x-nomad+json');
+    }
+}
diff --git a/Code/Module/Page.php b/Code/Module/Page.php
new file mode 100644
index 000000000..cf6abca61
--- /dev/null
+++ b/Code/Module/Page.php
@@ -0,0 +1,203 @@
+parse($r[0]['body']);
+            App::$pdl = $r[0]['body'];
+        } elseif ($r[0]['layout_mid']) {
+            $l = q(
+                "select body from item where mid = '%s' and uid = %d limit 1",
+                dbesc($r[0]['layout_mid']),
+                intval($u[0]['channel_id'])
+            );
+
+            if ($l) {
+                App::$comanche = new Comanche();
+                App::$comanche->parse($l[0]['body']);
+                App::$pdl = $l[0]['body'];
+            }
+        }
+
+        App::$data['webpage'] = $r;
+    }
+
+    public function get()
+    {
+
+        $r = App::$data['webpage'];
+        if (!$r) {
+            return;
+        }
+
+        if ($r[0]['item_type'] == ITEM_TYPE_PDL) {
+            $r[0]['body'] = t('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.');
+            $r[0]['mimetype'] = 'text/plain';
+            $r[0]['title'] = '';
+        }
+
+        xchan_query($r);
+        $r = fetch_post_tags($r, true);
+
+        if ($r[0]['mimetype'] === 'application/x-pdl') {
+            App::$page['pdl_content'] = true;
+        }
+
+        $o .= prepare_page($r[0]);
+        return $o;
+    }
+}
diff --git a/Code/Module/Pconfig.php b/Code/Module/Pconfig.php
new file mode 100644
index 000000000..6c8744014
--- /dev/null
+++ b/Code/Module/Pconfig.php
@@ -0,0 +1,142 @@
+disallowed_pconfig())) {
+            notice(t('This setting requires special processing and editing has been blocked.') . EOL);
+            return;
+        }
+
+        if (strpos($k, 'password') !== false) {
+            $v = obscurify($v);
+        }
+
+        set_pconfig(local_channel(), $cat, $k, $v);
+        Libsync::build_sync_packet();
+
+        if ($aj) {
+            killme();
+        }
+
+        goaway(z_root() . '/pconfig/' . $cat . '/' . $k);
+    }
+
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            return login();
+        }
+
+        $content = '
      ' . t('Configuration Editor') . '
      ';
+        $content .= '
      ' . t('Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature.') . '
      ' . EOL . EOL;
+
+
+        if (argc() == 3) {
+            $content .= 'pconfig[' . local_channel() . ']' . EOL;
+            $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . ']' . EOL . EOL;
+            $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . escape_tags(argv(2)) . '] = ' . get_pconfig(local_channel(), escape_tags(argv(1)), escape_tags(argv(2))) . EOL;
+
+            if (in_array(argv(2), $this->disallowed_pconfig())) {
+                notice(t('This setting requires special processing and editing has been blocked.') . EOL);
+                return $content;
+            } else {
+                $content .= $this->pconfig_form(escape_tags(argv(1)), escape_tags(argv(2)));
+            }
+        }
+
+
+        if (argc() == 2) {
+            $content .= 'pconfig[' . local_channel() . ']' . EOL;
+            load_pconfig(local_channel(), escape_tags(argv(1)));
+            if (App::$config[local_channel()][escape_tags(argv(1))]) {
+                foreach (App::$config[local_channel()][escape_tags(argv(1))] as $k => $x) {
+                    $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . $k . '] = ' . escape_tags($x) . EOL;
+                }
+            }
+        }
+
+        if (argc() == 1) {
+            $r = q("select * from pconfig where uid = " . local_channel());
+            if ($r) {
+                foreach ($r as $rr) {
+                    $content .= 'pconfig[' . local_channel() . '][' . escape_tags($rr['cat']) . '][' . escape_tags($rr['k']) . '] = ' . escape_tags($rr['v']) . EOL;
+                }
+            }
+        }
+        return $content;
+    }
+
+
+    public function pconfig_form($cat, $k)
+    {
+
+        $o = '
      ';
+        $o .= '';
+
+        $v = get_pconfig(local_channel(), $cat, $k);
+        if (strpos($k, 'password') !== false) {
+            $v = unobscurify($v);
+        }
+
+        $o .= '';
+        $o .= '';
+
+
+        if (strpos($v, "\n")) {
+            $o .= '';
+        } else {
+            if (is_array($v)) {
+                $o .= '
      ' . "\n" . print_array($v) . '
      ';
+                $o .= '';
+            } else {
+                $o .= '';
+            }
+        }
+        $o .= EOL . EOL;
+        $o .= '';
+        $o .= '
      ';
+
+        return $o;
+    }
+
+
+    public function disallowed_pconfig()
+    {
+        return array(
+            'permissions_role'
+        );
+    }
+}
diff --git a/Code/Module/Pdledit.php b/Code/Module/Pdledit.php
new file mode 100644
index 000000000..efd0aa854
--- /dev/null
+++ b/Code/Module/Pdledit.php
@@ -0,0 +1,120 @@
+ 2 && argv(2) === 'reset') {
+            del_pconfig(local_channel(), 'system', 'mod_' . argv(1) . '.pdl');
+            goaway(z_root() . '/pdledit');
+        }
+
+        if (argc() > 1) {
+            $module = 'mod_' . argv(1) . '.pdl';
+        } else {
+            $o .= '
      ';
+            $o .= '
      ' . t('Edit System Page Description') . '
      ';
+
+            $edited = [];
+
+            $r = q(
+                "select k from pconfig where uid = %d and cat = 'system' and k like '%s' ",
+                intval(local_channel()),
+                dbesc('mod_%.pdl')
+            );
+
+            if ($r) {
+                foreach ($r as $rv) {
+                    $edited[] = substr(str_replace('.pdl', '', $rv['k']), 4);
+                }
+            }
+
+            $files = glob('Code/Module/*.php');
+            if ($files) {
+                foreach ($files as $f) {
+                    $name = lcfirst(basename($f, '.php'));
+                    $x = Theme::include('mod_' . $name . '.pdl');
+                    if ($x) {
+                        $o .= '' . $name . '' . ((in_array($name, $edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '' : '') . '
      ';
+                    }
+                }
+            }
+            $addons = glob('addon/*/*.pdl');
+            if ($addons) {
+                foreach ($addons as $a) {
+                    $name = substr(basename($a, '.pdl'), 4);
+                    $o .= '' . $name . '' . ((in_array($name, $edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '' : '') . '
      ';
+                }
+            }
+
+            $o .= '
      ';
+
+            // list module pdl files
+            return $o;
+        }
+
+        $t = get_pconfig(local_channel(), 'system', $module);
+        $s = @file_get_contents(Theme::include($module));
+        if (!$s) {
+            $a = glob('addon/*/' . $module);
+            if ($a) {
+                $s = @file_get_contents($a[0]);
+            }
+        }
+        if (!$t) {
+            $t = $s;
+        }
+        if (!$t) {
+            notice(t('Layout not found.') . EOL);
+            return '';
+        }
+
+        $o = replace_macros(Theme::get_template('pdledit.tpl'), array(
+            '$header' => t('Edit System Page Description'),
+            '$mname' => t('Module Name:'),
+            '$help' => t('Layout Help'),
+            '$another' => t('Edit another layout'),
+            '$original' => t('System layout'),
+            '$module' => argv(1),
+            '$src' => $s,
+            '$content' => htmlspecialchars($t, ENT_COMPAT, 'UTF-8'),
+            '$submit' => t('Submit')
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Permcat.php b/Code/Module/Permcat.php
new file mode 100644
index 000000000..592b749bc
--- /dev/null
+++ b/Code/Module/Permcat.php
@@ -0,0 +1,30 @@
+ false ]);
+        }
+    
+        $abook_id = (argc() > 2) ? argv(2) : EMPTY_STR;
+        $permcat = new Zlib\Permcat(local_channel(), $abook_id);
+
+        if (argc() > 1) {
+            // logger('fetched ' . argv(1) . ':' . print_r($permcat->fetch(argv(1)),true));
+            json_return_and_die($permcat->fetch(argv(1)));
+        }
+
+        json_return_and_die($permcat->listing());
+    }
+}
diff --git a/Code/Module/Photo.php b/Code/Module/Photo.php
new file mode 100644
index 000000000..32996d226
--- /dev/null
+++ b/Code/Module/Photo.php
@@ -0,0 +1,327 @@
+ $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => ''];
+            Hook::call('get_profile_photo', $d);
+
+            $resolution = $d['imgscale'];
+            $uid = $d['channel_id'];
+            $default = $d['default'];
+            $data = $d['data'];
+            $mimetype = $d['mimetype'];
+
+            if (!$data) {
+                $r = q(
+                    "SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
+                    intval($resolution),
+                    intval($uid),
+                    intval(PHOTO_PROFILE)
+                );
+                if ($r) {
+                    $data = dbunescbin($r[0]['content']);
+                    $mimetype = $r[0]['mimetype'];
+                    if (intval($r[0]['os_storage'])) {
+                        $data = file_get_contents($data);
+                    }
+                }
+            }
+            if (!$data) {
+                $data = fetch_image_from_url($default, $mimetype);
+            }
+            if (!$mimetype) {
+                $mimetype = 'image/png';
+            }
+        } else {
+            $bear = Activity::token_from_request();
+            if ($bear) {
+                logger('bear: ' . $bear, LOGGER_DEBUG);
+            }
+
+
+            /**
+             * Other photos
+             */
+
+            /* Check for a cookie to indicate display pixel density, in order to detect high-resolution
+               displays. This procedure was derived from the "Retina Images" by Jeremey Worboys,
+               used in accordance with the Creative Commons Attribution 3.0 Unported License.
+               Project link: https://github.com/Retina-Images/Retina-Images
+               License link: http://creativecommons.org/licenses/by/3.0/
+            */
+
+            $cookie_value = false;
+            if (isset($_COOKIE['devicePixelRatio'])) {
+                $cookie_value = intval($_COOKIE['devicePixelRatio']);
+            } else {
+                // Force revalidation of cache on next request
+                $cache_directive = 'no-cache';
+                $status = 'no cookie';
+            }
+
+            $resolution = 0;
+
+            if (strpos($photo, '.') !== false) {
+                $photo = substr($photo, 0, strpos($photo, '.'));
+            }
+
+            if (substr($photo, -2, 1) == '-') {
+                $resolution = intval(substr($photo, -1, 1));
+                $photo = substr($photo, 0, -2);
+                // If viewing on a high-res screen, attempt to serve a higher resolution image:
+                if ($resolution == 2 && ($cookie_value > 1)) {
+                    $resolution = 1;
+                }
+            }
+
+            $r = q(
+                "SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
+                dbesc($photo),
+                intval($resolution)
+            );
+            if ($r) {
+                $allowed = (-1);
+
+                if (intval($r[0]['photo_usage'])) {
+                    $allowed = 1;
+                    if (intval($r[0]['photo_usage']) === PHOTO_COVER) {
+                        if ($resolution < PHOTO_RES_COVER_1200) {
+                            $allowed = (-1);
+                        }
+                    }
+                    if (intval($r[0]['photo_usage']) === PHOTO_PROFILE) {
+                        if (!in_array($resolution, [4, 5, 6])) {
+                            $allowed = (-1);
+                        }
+                    }
+                }
+
+                if ($allowed === (-1)) {
+                    $allowed = attach_can_view($r[0]['uid'], $observer_xchan, $photo, $bear);
+                }
+
+                $channel = Channel::from_id($r[0]['uid']);
+
+                // Now we'll see if we can access the photo
+                $e = q(
+                    "SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
+                    dbesc($photo),
+                    intval($resolution)
+                );
+
+                $exists = (($e) ? true : false);
+
+                if ($exists && $allowed) {
+                    $data = dbunescbin($e[0]['content']);
+                    $mimetype = $e[0]['mimetype'];
+                    if (intval($e[0]['os_storage'])) {
+                        $streaming = $data;
+                    }
+
+                    if ($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '') {
+                        $prvcachecontrol = 'no-store, no-cache, must-revalidate';
+                    }
+                } else {
+                    if (!$allowed) {
+                        http_status_exit(403, 'forbidden');
+                    }
+                    if (!$exists) {
+                        http_status_exit(404, 'not found');
+                    }
+                }
+            }
+        }
+
+        if (!isset($data)) {
+            if (isset($resolution)) {
+                switch ($resolution) {
+                    case 4:
+                        $data = fetch_image_from_url(z_root() . '/' . Channel::get_default_profile_photo(), $mimetype);
+                        break;
+                    case 5:
+                        $data = fetch_image_from_url(z_root() . '/' . Channel::get_default_profile_photo(80), $mimetype);
+                        break;
+                    case 6:
+                        $data = fetch_image_from_url(z_root() . '/' . Channel::get_default_profile_photo(48), $mimetype);
+                        break;
+                    default:
+                        killme();
+                }
+            }
+        }
+
+        if (isset($res) && intval($res) && $res < 500) {
+            $ph = photo_factory($data, $mimetype);
+            if ($ph && $ph->is_valid()) {
+                $ph->scaleImageSquare($res);
+                $data = $ph->imageString();
+                $mimetype = $ph->getType();
+            }
+        }
+
+        if (function_exists('header_remove')) {
+            header_remove('Pragma');
+            header_remove('pragma');
+        }
+
+        header("Content-type: " . $mimetype);
+
+        if ($prvcachecontrol) {
+            // it is a private photo that they have permission to view.
+            // tell the browser and infrastructure caches not to cache it,
+            // in case permissions change before the next access.
+
+            header("Cache-Control: no-store, no-cache, must-revalidate");
+        } else {
+            // The cache default for public photos is 1 day to provide a privacy trade-off,
+            // as somebody reducing photo permissions on a photo that is already
+            // "in the wild" won't be able to stop the photo from being viewed
+            // for this amount amount of time once it is cached.
+            // The privacy expectations of your site members and their perception
+            // of privacy where it affects the entire project may be affected.
+            // This has performance considerations but we highly recommend you
+            // leave it alone.
+
+            $cache = get_config('system', 'photo_cache_time');
+            if (!$cache) {
+                $cache = (3600 * 24); // 1 day
+            }
+            header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT");
+            // Set browser cache age as $cache.  But set timeout of 'shared caches'
+            // much lower in the event that infrastructure caching is present.
+            $smaxage = intval($cache / 12);
+            header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';');
+        }
+
+        // If it's a file resource, stream it.
+
+        if ($streaming && $channel) {
+            if (strpos($streaming, 'store') !== false) {
+                $istream = fopen($streaming, 'rb');
+            } else {
+                $istream = fopen('store/' . $channel['channel_address'] . '/' . $streaming, 'rb');
+            }
+            $ostream = fopen('php://output', 'wb');
+            if ($istream && $ostream) {
+                pipe_streams($istream, $ostream);
+                fclose($istream);
+                fclose($ostream);
+            }
+        } else {
+            echo $data;
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Photomap.php b/Code/Module/Photomap.php
new file mode 100644
index 000000000..ec2dc47f3
--- /dev/null
+++ b/Code/Module/Photomap.php
@@ -0,0 +1,25 @@
+' . $desc . '';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Photomap'))) {
+            return $text;
+        }
+
+        return $text . '

      ' . t('This app is currently installed.');
+    }
+}
diff --git a/Code/Module/Photos.php b/Code/Module/Photos.php
new file mode 100644
index 000000000..22fd0d0a5
--- /dev/null
+++ b/Code/Module/Photos.php
@@ -0,0 +1,1450 @@
+ 1) {
+            $nick = escape_tags(argv(1));
+
+            Libprofile::load($nick);
+
+            $channelx = Channel::from_username($nick);
+
+            $profile_uid = 0;
+
+            if ($channelx) {
+                App::$data['channel'] = $channelx;
+                head_set_icon($channelx['xchan_photo_s']);
+                $profile_uid = $channelx['channel_id'];
+            }
+
+            App::$page['htmlhead'] .= "";
+            App::$data['observer'] = App::get_observer();
+        }
+    }
+
+
+    public function post()
+    {
+
+        logger('mod-photos: photos_post: begin', LOGGER_DEBUG);
+
+        logger('mod_photos: REQUEST ' . print_r($_REQUEST, true), LOGGER_DATA);
+        logger('mod_photos: FILES ' . print_r($_FILES, true), LOGGER_DATA);
+
+        $ph = photo_factory('');
+
+        $phototypes = $ph->supportedTypes();
+
+        $page_owner_uid = App::$data['channel']['channel_id'];
+
+        if (!perm_is_allowed($page_owner_uid, get_observer_hash(), 'write_storage')) {
+            notice(t('Permission denied.') . EOL);
+            killme_if_ajax();
+            return;
+        }
+
+        $acl = new AccessControl(App::$data['channel']);
+
+        if ((argc() > 3) && (argv(2) === 'album')) {
+            $album = argv(3);
+
+            if (!photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
+                notice(t('Album not found.') . EOL);
+                goaway(z_root() . '/' . $_SESSION['photo_return']);
+            }
+
+
+            /*
+             * DELETE photo album and all its photos
+             */
+
+            if ($_REQUEST['dropalbum'] === t('Delete Album')) {
+                $folder_hash = '';
+
+                $r = q(
+                    "select hash from attach where is_dir = 1 and uid = %d and hash = '%s'",
+                    intval($page_owner_uid),
+                    dbesc($album)
+                );
+                if (!$r) {
+                    notice(t('Album not found.') . EOL);
+                    return;
+                }
+                $folder_hash = $r[0]['hash'];
+
+
+                $res = [];
+                $admin_delete = false;
+
+                // get the list of photos we are about to delete
+
+                if (remote_channel() && (!local_channel())) {
+                    $str = photos_album_get_db_idstr($page_owner_uid, $album, remote_channel());
+                } elseif (local_channel()) {
+                    $str = photos_album_get_db_idstr(local_channel(), $album);
+                } elseif (is_site_admin()) {
+                    $str = photos_album_get_db_idstr_admin($page_owner_uid, $album);
+                    $admin_delete = true;
+                } else {
+                    $str = null;
+                }
+
+                if (!$str) {
+                    goaway(z_root() . '/' . $_SESSION['photo_return']);
+                }
+
+                $r = q(
+                    "select id from item where resource_id in ( $str ) and resource_type = 'photo' and uid = %d " . item_normal(),
+                    intval($page_owner_uid)
+                );
+                if ($r) {
+                    foreach ($r as $rv) {
+                        attach_delete($page_owner_uid, $rv['resource_id'], true);
+                    }
+                }
+
+                // remove the associated photos in case they weren't attached to an item (rare)
+
+                q(
+                    "delete from photo where resource_id in ( $str ) and uid = %d",
+                    intval($page_owner_uid)
+                );
+
+                q(
+                    "delete from attach where hash in ( $str ) and uid = %d",
+                    intval($page_owner_uid)
+                );
+
+                if ($folder_hash) {
+                    attach_delete($page_owner_uid, $folder_hash, true);
+
+                    // Sync this action to channel clones, UNLESS it was an admin delete action.
+                    // The admin only has authority to moderate content on their own site.
+
+                    if (!$admin_delete) {
+                        $sync = attach_export_data(App::$data['channel'], $folder_hash, true);
+                        if ($sync) {
+                            Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
+                        }
+                    }
+                }
+            }
+            goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
+        }
+
+        if ((argc() > 2) && (x($_REQUEST, 'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
+            // same as above but remove single photo
+
+            $ob_hash = get_observer_hash();
+
+            if (!$ob_hash) {
+                goaway(z_root() . '/' . $_SESSION['photo_return']);
+            }
+
+            // query to verify ownership of the photo by this viewer
+            // We've already checked observer permissions to perfom this action
+
+            // This implements the policy that remote channels (visitors and guests)
+            // which modify content  can only modify their own content.
+            // The page owner can modify anything within their authority, including
+            // content published by others in their own channel pages.
+            // The site admin can of course modify anything on their own site for
+            // maintenance or legal compliance reasons.
+
+            $r = q(
+                "SELECT id, resource_id FROM photo WHERE ( xchan = '%s' or uid = %d ) AND resource_id = '%s' LIMIT 1",
+                dbesc($ob_hash),
+                intval(local_channel()),
+                dbesc(argv(2))
+            );
+
+            if ($r) {
+                attach_delete($page_owner_uid, $r[0]['resource_id'], true);
+                $sync = attach_export_data(App::$data['channel'], $r[0]['resource_id'], true);
+                if ($sync) {
+                    Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
+                }
+            } elseif (is_site_admin()) {
+                // If the admin deletes a photo, don't check ownership or invoke clone sync
+                attach_delete($page_owner_uid, argv(2), true);
+            }
+
+            goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
+        }
+
+        // perform move_to_album
+
+        if ((argc() > 2) && array_key_exists('move_to_album', $_POST)) {
+            $m = q(
+                "select folder from attach where hash = '%s' and uid = %d limit 1",
+                dbesc(argv(2)),
+                intval($page_owner_uid)
+            );
+
+            // we should sanitize the post variable, but probably pointless because the move
+            // will fail if we can't find the target
+
+            if (($m) && ($m[0]['folder'] != $_POST['move_to_album'])) {
+                attach_move($page_owner_uid, argv(2), $_POST['move_to_album']);
+
+                $sync = attach_export_data(App::$data['channel'], argv(2), false);
+                if ($sync) {
+                    Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
+                }
+
+                // return if this is the only thing being edited
+
+                if (!($_POST['desc'] && $_POST['newtag'])) {
+                    goaway(z_root() . '/' . $_SESSION['photo_return']);
+                }
+            }
+        }
+
+        // this still needs some work
+
+        if (defined('FIXED')) {
+            if ((x($_POST, 'rotate') !== false) && ((intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2))) {
+                logger('rotate');
+
+                $resource_id = argv(2);
+
+                $r = q(
+                    "select * from photo where resource_id = '%s' and uid = %d and imgscale = 0 limit 1",
+                    dbesc($resource_id),
+                    intval($page_owner_uid)
+                );
+                if ($r) {
+                    $ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']);
+                    if ($ph && $ph->is_valid()) {
+                        $rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
+                        $ph->rotate($rotate_deg);
+
+                        $edited = datetime_convert();
+
+                        q(
+                            "update attach set filesize = %d, edited = '%s' where hash = '%s' and uid = %d",
+                            strlen($ph->imageString()),
+                            dbescdate($edited),
+                            dbesc($resource_id),
+                            intval($page_owner_uid)
+                        );
+
+                        $ph->saveImage(dbunescbin($r[0]['content']));
+
+                        $arr = [
+                            'aid' => get_account_id(),
+                            'uid' => intval($page_owner_uid),
+                            'resource_id' => dbesc($resource_id),
+                            'filename' => $r[0]['filename'],
+                            'imgscale' => 0,
+                            'album' => $r[0]['album'],
+                            'os_path' => $r[0]['os_path'],
+                            'os_storage' => 1,
+                            'os_syspath' => dbunescbin($r[0]['content']),
+                            'display_path' => $r[0]['display_path'],
+                            'photo_usage' => PHOTO_NORMAL,
+                            'edited' => dbescdate($edited)
+                        ];
+
+                        $ph->save($arr);
+
+                        unset($arr['os_syspath']);
+
+                        if ($width > 1024 || $height > 1024) {
+                            $ph->scaleImage(1024);
+                        }
+                        $ph->storeThumbnail($arr, PHOTO_RES_1024);
+
+                        if ($width > 640 || $height > 640) {
+                            $ph->scaleImage(640);
+                        }
+                        $ph->storeThumbnail($arr, PHOTO_RES_640);
+
+                        if ($width > 320 || $height > 320) {
+                            $ph->scaleImage(320);
+                        }
+                        $ph->storeThumbnail($arr, PHOTO_RES_320);
+                    }
+                }
+            }
+        } // end FIXED
+
+
+        // edit existing photo properties
+
+        if (x($_POST, 'item_id') !== false && intval($_POST['item_id'])) {
+            $title = ((x($_POST, 'title')) ? escape_tags(trim($_POST['title'])) : EMPTY_STR);
+            $desc = ((x($_POST, 'desc')) ? escape_tags(trim($_POST['desc'])) : EMPTY_STR);
+            $body = ((x($_POST, 'body')) ? trim($_POST['body']) : EMPTY_STR);
+
+            $item_id = ((x($_POST, 'item_id')) ? intval($_POST['item_id']) : 0);
+            $is_nsfw = ((x($_POST, 'adult')) ? intval($_POST['adult']) : 0);
+
+            // convert any supplied posted permissions for storage
+
+            $acl->set_from_array($_POST);
+            $perm = $acl->get();
+
+            $resource_id = argv(2);
+
+            $p = q(
+                "SELECT mimetype, is_nsfw, filename, title, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC",
+                dbesc($resource_id),
+                intval($page_owner_uid)
+            );
+            if ($p) {
+                // update the photo structure with any of the changed elements which are common to all resolutions
+                $r = q(
+                    "UPDATE photo SET title = '%s', description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d",
+                    dbesc($title),
+                    dbesc($desc),
+                    dbesc($perm['allow_cid']),
+                    dbesc($perm['allow_gid']),
+                    dbesc($perm['deny_cid']),
+                    dbesc($perm['deny_gid']),
+                    dbesc($resource_id),
+                    intval($page_owner_uid)
+                );
+            }
+
+            $item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
+
+            $old_is_nsfw = $p[0]['is_nsfw'];
+            if ($old_is_nsfw != $is_nsfw) {
+                $r = q(
+                    "update photo set is_nsfw = %d where resource_id = '%s' and uid = %d",
+                    intval($is_nsfw),
+                    dbesc($resource_id),
+                    intval($page_owner_uid)
+                );
+            }
+
+            /* Don't make the item visible if the only change was the album name */
+
+            $visibility = 0;
+            if ($p[0]['description'] !== $desc || $p[0]['title'] !== $title || $body !== EMPTY_STR) {
+                $visibility = 1;
+            }
+
+            $r = q(
+                "SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
+                intval($item_id),
+                intval($page_owner_uid)
+            );
+            if (!$r) {
+                logger('linked photo item not found.');
+                notice(t('linked item not found.') . EOL);
+                return;
+            }
+
+            $linked_item = array_shift($r);
+
+            // extract the original footer text
+            $footer_text = EMPTY_STR;
+            $orig_text = $linked_item['body'];
+            $matches = [];
+
+            if (preg_match('/\[footer\](.*?)\[\/footer\]/ism', $orig_text, $matches)) {
+                $footer_text = $matches[0];
+            }
+
+            $body = cleanup_bbcode($body);
+            $tags = linkify_tags($body, $page_owner_uid);
+
+            $post_tags = [];
+            if ($tags) {
+                foreach ($tags as $tag) {
+                    $success = $tag['success'];
+                    if ($success['replaced']) {
+                        // suppress duplicate mentions/tags
+                        $already_tagged = false;
+                        foreach ($post_tags as $pt) {
+                            if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) {
+                                $already_tagged = true;
+                                break;
+                            }
+                        }
+                        if ($already_tagged) {
+                            continue;
+                        }
+
+                        $post_tags[] = [
+                            'uid' => $page_owner_uid,
+                            'ttype' => $success['termtype'],
+                            'otype' => TERM_OBJ_POST,
+                            'term' => $success['term'],
+                            'url' => $success['url']
+                        ];
+                    }
+                }
+            }
+            if ($post_tags) {
+                q(
+                    "delete from term where otype = 1 and oid = %d",
+                    intval($linked_item['id'])
+                );
+                foreach ($post_tags as $t) {
+                    q(
+                        "insert into term (uid,oid,otype,ttype,term,url)
+						values(%d,%d,%d,%d,'%s','%s') ",
+                        intval($page_owner_uid),
+                        intval($linked_item['id']),
+                        intval(TERM_OBJ_POST),
+                        intval($t['ttype']),
+                        dbesc($t['term']),
+                        dbesc($t['url'])
+                    );
+                }
+            }
+
+            $body = z_input_filter($body, 'text/x-multicode');
+
+            $obj = EMPTY_STR;
+
+            if (isset($linked_item['obj']) && strlen($linked_item['obj'])) {
+                $obj = json_decode($linked_item['obj'], true);
+
+                $obj['name'] = (($title) ? $title : $p[0]['filename']);
+                $obj['summary'] = (($desc) ? $desc : $p[0]['filename']);
+                $obj['updated'] = datetime_convert('UTC', 'UTC', 'now', ATOM_TIME);
+                $obj['source'] = ['content' => $body, 'mediaType' => 'text/x-multicode'];
+                $obj['content'] = bbcode($body . $footer_text, ['export' => true]);
+                if (isset($obj['url']) && is_array($obj['url'])) {
+                    for ($x = 0; $x < count($obj['url']); $x++) {
+                        $obj['url'][$x]['summary'] = $obj['summary'];
+                    }
+                }
+                $obj = json_encode($obj);
+            }
+
+            // make sure the linked item has the same permissions as the photo regardless of any other changes
+            $x = q(
+                "update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', title = '%s', obj = '%s', body = '%s', edited = '%s', item_private = %d where id = %d",
+                dbesc($perm['allow_cid']),
+                dbesc($perm['allow_gid']),
+                dbesc($perm['deny_cid']),
+                dbesc($perm['deny_gid']),
+                dbesc(($desc) ? $desc : $p[0]['filename']),
+                dbesc($obj),
+                dbesc($body . $footer_text),
+                dbesc(datetime_convert()),
+                intval($acl->is_private()),
+                intval($item_id)
+            );
+
+            // make sure the attach has the same permissions as the photo regardless of any other changes
+            $x = q(
+                "update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1",
+                dbesc($perm['allow_cid']),
+                dbesc($perm['allow_gid']),
+                dbesc($perm['deny_cid']),
+                dbesc($perm['deny_gid']),
+                dbesc($resource_id),
+                intval($page_owner_uid)
+            );
+
+
+            if ($visibility) {
+                Run::Summon(['Notifier', 'edit_post', $item_id]);
+            }
+
+            $sync = attach_export_data(App::$data['channel'], $resource_id);
+
+            if ($sync) {
+                Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
+            }
+
+            goaway(z_root() . '/' . $_SESSION['photo_return']);
+            return; // NOTREACHED
+        }
+
+
+        /**
+         * default post action - upload a photo
+         */
+
+        $channel = App::$data['channel'];
+        $observer = App::$data['observer'];
+
+        $_REQUEST['source'] = 'photos';
+        require_once('include/attach.php');
+
+        if (!local_channel()) {
+            $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']);
+            $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']);
+            $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']);
+            $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']);
+        }
+
+
+        $matches = [];
+        $partial = false;
+
+        if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
+            $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
+            if ($pm) {
+                logger('Content-Range: ' . print_r($matches, true));
+                $partial = true;
+            }
+        }
+
+        if ($partial) {
+            $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
+
+            if ($x['partial']) {
+                header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
+                json_return_and_die($x);
+            } else {
+                header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
+
+                $_FILES['userfile'] = [
+                    'name' => $x['name'],
+                    'type' => $x['type'],
+                    'tmp_name' => $x['tmp_name'],
+                    'error' => $x['error'],
+                    'size' => $x['size']
+                ];
+            }
+        } else {
+            if (!array_key_exists('userfile', $_FILES)) {
+                $_FILES['userfile'] = [
+                    'name' => $_FILES['files']['name'],
+                    'type' => $_FILES['files']['type'],
+                    'tmp_name' => $_FILES['files']['tmp_name'],
+                    'error' => $_FILES['files']['error'],
+                    'size' => $_FILES['files']['size']
+                ];
+            }
+        }
+
+        $r = attach_store($channel, get_observer_hash(), '', $_REQUEST);
+
+        if (!$r['success']) {
+            notice($r['message'] . EOL);
+            if (is_ajax()) {
+                killme();
+            }
+            goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
+        }
+        if ($r['success'] && !intval($r['data']['is_photo'])) {
+            notice(sprintf(t('%s: Unsupported photo type. Saved as file.'), escape_tags($r['data']['filename'])));
+        }
+        if (is_ajax()) {
+            killme();
+        }
+
+        goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']);
+    }
+
+
+    public function get()
+    {
+
+        // URLs:
+        // photos/name
+        // photos/name/album/xxxxx (xxxxx is album name)
+        // photos/name/image/xxxxx
+
+
+        if (observer_prohibited()) {
+            notice(t('Public access denied.') . EOL);
+            return;
+        }
+
+        $unsafe = 1 - get_safemode();
+
+
+        if (!x(App::$data, 'channel')) {
+            notice(t('No photos selected') . EOL);
+            return;
+        }
+
+        $ph = photo_factory('');
+        $phototypes = $ph->supportedTypes();
+
+        $_SESSION['photo_return'] = App::$cmd;
+
+        //
+        // Parse arguments
+        //
+
+        $can_comment = perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'post_comments');
+
+        if (argc() > 3) {
+            $datatype = argv(2);
+            $datum = argv(3);
+        } else {
+            if (argc() > 2) {
+                $datatype = argv(2);
+                $datum = '';
+            } else {
+                $datatype = 'summary';
+            }
+        }
+
+        if (argc() > 4) {
+            $cmd = argv(4);
+        } else {
+            $cmd = 'view';
+        }
+
+        //
+        // Setup permissions structures
+        //
+
+        $can_post = false;
+        $visitor = 0;
+
+
+        $owner_uid = App::$data['channel']['channel_id'];
+        $owner_aid = App::$data['channel']['channel_account_id'];
+
+        $observer = App::get_observer();
+
+        $can_post = perm_is_allowed($owner_uid, $observer['xchan_hash'], 'write_storage');
+        $can_view = perm_is_allowed($owner_uid, $observer['xchan_hash'], 'view_storage');
+
+        if (!$can_view) {
+            notice(t('Access to this item is restricted.') . EOL);
+            return;
+        }
+
+        $sql_item = item_permissions_sql($owner_uid, get_observer_hash());
+        $sql_extra = permissions_sql($owner_uid, get_observer_hash(), 'photo');
+        $sql_attach = permissions_sql($owner_uid, get_observer_hash(), 'attach');
+
+        Navbar::set_selected('Photos');
+
+        $o = '
+			
+			';
+
+
+        $o .= "\r\n";
+
+        $_is_owner = (local_channel() && (local_channel() == $owner_uid));
+
+        /**
+         * Display upload form
+         */
+
+        if ($can_post) {
+            $uploader = '';
+
+            $ret = array('post_url' => z_root() . '/photos/' . App::$data['channel']['channel_address'],
+                'addon_text' => $uploader,
+                'default_upload' => true);
+
+            Hook::call('photo_upload_form', $ret);
+
+            /* Show space usage */
+
+            $r = q(
+                "select sum(filesize) as total from photo where aid = %d and imgscale = 0 ",
+                intval(App::$data['channel']['channel_account_id'])
+            );
+
+
+            $limit = engr_units_to_bytes(ServiceClass::fetch(App::$data['channel']['channel_id'], 'photo_upload_limit'));
+            if ($limit !== false) {
+                $usage_message = sprintf(t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000);
+            } else {
+                $usage_message = sprintf(t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000);
+            }
+
+            if ($_is_owner) {
+                $channel = App::get_channel();
+
+                $acl = new AccessControl($channel);
+                $channel_acl = $acl->get();
+
+                $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+            }
+
+            $aclselect = (($_is_owner) ? Libacl::populate($channel_acl, false, PermissionDescription::fromGlobalPermission('view_storage')) : '');
+
+            // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables
+            // don't exist. They really should be set to a parseable representation of the channel's default permissions
+            // which can be processed by getSelected()
+
+            if (!$aclselect) {
+                $aclselect = '';
+            }
+
+            $selname = '';
+
+            if ($datum) {
+                $h = attach_by_hash_nodata($datum, get_observer_hash());
+                $selname = $h['data']['display_path'];
+            }
+
+
+            $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer']));
+
+            if (!$selname) {
+                $def_album = get_pconfig(App::$data['channel']['channel_id'], 'system', 'photo_path');
+                if ($def_album) {
+                    $selname = filepath_macro($def_album);
+                    $albums['album'][] = array('text' => $selname);
+                }
+            }
+
+            $tpl = Theme::get_template('photos_upload.tpl');
+            $upload_form = replace_macros($tpl, array(
+                '$pagename' => t('Upload Photos'),
+                '$sessid' => session_id(),
+                '$usage' => $usage_message,
+                '$nickname' => App::$data['channel']['channel_address'],
+                '$newalbum_label' => t('Enter an album name'),
+                '$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
+                '$visible' => array('visible', t('Create a status post for this upload'), 0, t('If multiple files are selected, the message will be repeated for each photo'), array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
+                '$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')),
+                'title' => ['title', t('Title (optional)')],
+                '$body' => array('body', t('Your message (optional)'), '', 'This will only appear in the status post'),
+                '$albums' => $albums['albums'],
+                '$selname' => $selname,
+                '$permissions' => t('Permissions'),
+                '$aclselect' => $aclselect,
+                '$allow_cid' => acl2json($channel_acl['allow_cid']),
+                '$allow_gid' => acl2json($channel_acl['allow_gid']),
+                '$deny_cid' => acl2json($channel_acl['deny_cid']),
+                '$deny_gid' => acl2json($channel_acl['deny_gid']),
+                '$lockstate' => $lockstate,
+                '$uploader' => $ret['addon_text'],
+                '$default' => (($ret['default_upload']) ? true : false),
+                '$uploadurl' => $ret['post_url'],
+                '$submit' => t('Upload')
+
+            ));
+        }
+
+        //
+        // dispatch request
+        //
+
+        /*
+         * Display a single photo album
+         */
+
+        if ($datatype === 'album') {
+            Head::add_link([
+                'rel' => 'alternate',
+                'type' => 'application/json+oembed',
+                'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
+                'title' => 'oembed'
+            ]);
+
+            if ($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
+                App::set_pager_itemspage(60);
+                $album = $x['display_path'];
+            } else {
+                goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
+            }
+
+            if ($_GET['order'] === 'posted') {
+                $order = 'created ASC';
+            } elseif ($_GET['order'] === 'name') {
+                $order = 'filename ASC';
+            } else {
+                $order = 'created DESC';
+            }
+
+            $r = q(
+                "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+					(SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
+					ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+				ORDER BY $order LIMIT %d OFFSET %d",
+                dbesc($x['hash']),
+                intval($owner_uid),
+                intval(PHOTO_NORMAL),
+                intval(PHOTO_PROFILE),
+                intval(PHOTO_COVER),
+                intval($unsafe),
+                intval(App::$pager['itemspage']),
+                intval(App::$pager['start'])
+            );
+
+            // edit album name
+            $album_edit = null;
+
+            if ($can_post) {
+                $album_e = $album;
+                $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer']));
+
+                // @fixme - syncronise actions with DAV
+
+                //              $edit_tpl = Theme::get_template('album_edit.tpl');
+                //              $album_edit = replace_macros($edit_tpl,array(
+                //                  '$nametext' => t('Enter a new album name'),
+                //                  '$name_placeholder' => t('or select an existing one (doubleclick)'),
+                //                  '$nickname' => App::$data['channel']['channel_address'],
+                //                  '$album' => $album_e,
+                //                  '$albums' => $albums['albums'],
+                //                  '$hexalbum' => bin2hex($album),
+                //                  '$submit' => t('Submit'),
+                //                  '$dropsubmit' => t('Delete Album')
+                //              ));
+            }
+
+            $order = [
+                [t('Date descending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum],
+                [t('Date ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=posted'],
+                [t('Name ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=name']
+            ];
+
+
+            $photos = [];
+            if (count($r)) {
+                $twist = 'rotright';
+                foreach ($r as $rr) {
+                    if ($twist == 'rotright') {
+                        $twist = 'rotleft';
+                    } else {
+                        $twist = 'rotright';
+                    }
+
+                    $ext = $phototypes[$rr['mimetype']];
+
+                    $imgalt_e = $rr['filename'];
+                    $desc_e = $rr['description'];
+
+                    $imagelink = (z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id']
+                        . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
+
+                    $photos[] = array(
+                        'id' => $rr['id'],
+                        'twist' => ' ' . $twist . rand(2, 4),
+                        'link' => $imagelink,
+                        'title' => t('View Photo'),
+                        'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
+                        'alt' => $imgalt_e,
+                        'desc' => $desc_e,
+                        'ext' => $ext,
+                        'hash' => $rr['resource_id'],
+                        'unknown' => t('Unknown')
+                    );
+                }
+            }
+
+            if ($_REQUEST['aj']) {
+                if ($photos) {
+                    $o = replace_macros(Theme::get_template('photosajax.tpl'), array(
+                        '$photos' => $photos,
+                        '$album_id' => $datum
+                    ));
+                } else {
+                    $o = '
      ';
+                }
+                echo $o;
+                killme();
+            } else {
+                $o .= "";
+                $tpl = Theme::get_template('photo_album.tpl');
+                $o .= replace_macros($tpl, array(
+                    '$photos' => $photos,
+                    '$album' => $album,
+                    '$album_id' => $datum,
+                    '$file_view' => t('View files'),
+                    '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'] . '/' . $x['display_path'],
+                    '$album_edit' => array(t('Edit Album'), $album_edit),
+                    '$can_post' => $can_post,
+                    '$upload' => array(t('Add Photos'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/upload/' . $datum),
+                    '$order' => $order,
+                    '$sort' => t('Sort'),
+                    '$upload_form' => $upload_form,
+                    '$usage' => $usage_message
+                ));
+
+                return $o;
+            }
+        }
+
+        /**
+         * Display one photo
+         */
+
+        if ($datatype === 'image') {
+            Head::add_link([
+                'rel' => 'alternate',
+                'type' => 'application/json+oembed',
+                'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
+                'title' => 'oembed'
+            ]);
+
+            $x = q(
+                "select folder from attach where hash = '%s' and uid = %d $sql_attach limit 1",
+                dbesc($datum),
+                intval($owner_uid)
+            );
+
+            // fetch image, item containing image, then comments
+
+            $ph = q(
+                "SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' 
+				$sql_extra ORDER BY imgscale ASC ",
+                intval($owner_uid),
+                dbesc($datum)
+            );
+
+            if (!($ph && $x)) {
+                /* Check again - this time without specifying permissions */
+
+                $ph = q(
+                    "SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' LIMIT 1",
+                    intval($owner_uid),
+                    dbesc($datum)
+                );
+                if ($ph) {
+                    notice(t('Permission denied. Access to this item may be restricted.') . EOL);
+                } else {
+                    notice(t('Photo not available') . EOL);
+                }
+                return;
+            }
+
+
+            $prevlink = '';
+            $nextlink = '';
+
+            if ($_GET['order'] === 'posted') {
+                $order = 'created ASC';
+            } elseif ($_GET['order'] === 'name') {
+                $order = 'filename ASC';
+            } else {
+                $order = 'created DESC';
+            }
+
+
+            $prvnxt = q(
+                "SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1
+				$sql_attach ORDER BY $order ",
+                dbesc($x[0]['folder']),
+                intval($owner_uid)
+            );
+
+            if (count($prvnxt)) {
+                for ($z = 0; $z < count($prvnxt); $z++) {
+                    if ($prvnxt[$z]['hash'] == $ph[0]['resource_id']) {
+                        $prv = $z - 1;
+                        $nxt = $z + 1;
+                        if ($prv < 0) {
+                            $prv = count($prvnxt) - 1;
+                        }
+                        if ($nxt >= count($prvnxt)) {
+                            $nxt = 0;
+                        }
+                        break;
+                    }
+                }
+
+                $prevlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : '');
+                $nextlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : '');
+            }
+
+
+            if (count($ph) == 1) {
+                $hires = $lores = $ph[0];
+            }
+            if (count($ph) > 1) {
+                if ($ph[1]['imgscale'] == 2) {
+                    // original is 640 or less, we can display it directly
+                    $hires = $lores = $ph[0];
+                } else {
+                    $hires = $ph[0];
+                    $lores = $ph[1];
+                }
+            }
+
+            $album_link = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $x[0]['folder'];
+            $tools = null;
+            $lock = null;
+
+            if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
+                $tools = array(
+                    'profile' => array(z_root() . '/profile_photo/use/' . $ph[0]['resource_id'], t('Use as profile photo')),
+                    'cover' => array(z_root() . '/cover_photo/use/' . $ph[0]['resource_id'], t('Use as cover photo')),
+                );
+            }
+
+            // lockstate
+            $lockstate = (((strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+                || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])))
+                ? array('lock', t('Private Photo'))
+                : array('unlock', null));
+
+            App::$page['htmlhead'] .= '';
+
+            if ($prevlink) {
+                $prevlink = array($prevlink, t('Previous'));
+            }
+
+            $photo = array(
+                'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']],
+                'title' => t('View Full Size'),
+                'src' => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] . '?f=&_u=' . datetime_convert('', '', '', 'ymdhis')
+            );
+
+            if ($nextlink) {
+                $nextlink = array($nextlink, t('Next'));
+            }
+
+
+            // Do we have an item for this photo?
+
+            $linked_items = q(
+                "SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' and uid = %d
+				$sql_item LIMIT 1",
+                dbesc($datum),
+                intval($owner_uid)
+            );
+
+            $map = null;
+            $link_item = null;
+
+            if ($linked_items) {
+                xchan_query($linked_items);
+                $linked_items = fetch_post_tags($linked_items, true);
+
+                $link_item = $linked_items[0];
+                $item_normal = item_normal();
+
+                $r = q(
+                    "select * from item where parent_mid = '%s' 
+					$item_normal and uid = %d $sql_item ",
+                    dbesc($link_item['mid']),
+                    intval($link_item['uid'])
+                );
+
+                if ($r) {
+                    xchan_query($r);
+                    $items = fetch_post_tags($r, true);
+                    $sorted_items = conv_sort($items, 'commented');
+                }
+
+                $tags = [];
+                if ($link_item['term']) {
+                    $cnt = 0;
+                    foreach ($link_item['term'] as $t) {
+                        $tags[$cnt] = array(0 => format_term_for_display($t));
+                        if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
+                            $tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']);   //?f=&item=' . $link_item['id'];
+                            $tags[$cnt][2] = t('Remove');
+                        }
+                        $cnt++;
+                    }
+                }
+
+                if ((local_channel()) && (local_channel() == $link_item['uid'])) {
+                    q(
+                        "UPDATE item SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1",
+                        intval($link_item['parent']),
+                        intval(local_channel())
+                    );
+                }
+
+                if ($link_item['coord'] && Apps::system_app_installed($owner_uid, 'Photomap')) {
+                    $map = generate_map($link_item['coord']);
+                }
+            }
+
+            //      logger('mod_photo: link_item' . print_r($link_item,true));
+
+            // FIXME - remove this when we move to conversation module
+
+            $comment_items = $sorted_items[0]['children'];
+
+            $edit = null;
+            if ($can_post) {
+                $album_e = $ph[0]['album'];
+                $caption_e = $ph[0]['description'];
+                $aclselect_e = (($_is_owner) ? Libacl::populate($ph[0], true, PermissionDescription::fromGlobalPermission('view_storage')) : '');
+                $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer']));
+
+                $_SESSION['album_return'] = bin2hex($ph[0]['album']);
+
+                $folder_list = attach_folder_select_list($ph[0]['uid']);
+                $edit_body = htmlspecialchars_decode(undo_post_tagging($link_item['body']), ENT_COMPAT);
+                // We will regenerate the body footer
+                $edit_body = preg_replace('/\[footer\](.*?)\[\/footer\]/ism', '', $edit_body);
+
+                $edit = [
+                    'edit' => t('Edit photo'),
+                    'id' => $link_item['id'],
+                    'albums' => $albums['albums'],
+                    'album' => $album_e,
+                    'album_select' => ['move_to_album', t('Move photo to album'), $x[0]['folder'], '', $folder_list],
+                    'newalbum_label' => t('Enter a new album name'),
+                    'newalbum_placeholder' => t('or select an existing one (doubleclick)'),
+                    'nickname' => App::$data['channel']['channel_address'],
+                    'resource_id' => $ph[0]['resource_id'],
+                    'desc' => ['desc', t('Please briefly describe this photo for vision-impaired viewers'), $ph[0]['description']],
+                    'title' => ['title', t('Title (optional)'), $ph[0]['title']],
+                    'body' => ['body', t('Your message (optional)'), $edit_body, t('This will only appear in the optional status post attached to this photo')],
+                    'tag_label' => t('Add a Tag'),
+                    'permissions' => t('Permissions'),
+                    'aclselect' => $aclselect_e,
+                    'allow_cid' => acl2json($ph[0]['allow_cid']),
+                    'allow_gid' => acl2json($ph[0]['allow_gid']),
+                    'deny_cid' => acl2json($ph[0]['deny_cid']),
+                    'deny_gid' => acl2json($ph[0]['deny_gid']),
+                    'lockstate' => $lockstate[0],
+                    'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
+                    'item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
+                    'adult_enabled' => Features::enabled($owner_uid, 'adult_photo_flagging'),
+                    'adult' => array('adult', t('Flag as adult in album view'), intval($ph[0]['is_nsfw']), ''),
+                    'submit' => t('Submit'),
+                    'delete' => t('Delete Photo'),
+                    'expandform' => ((x($_GET, 'expandform')) ? true : false)
+                ];
+            }
+
+            if (count($linked_items)) {
+                $cmnt_tpl = Theme::get_template('comment_item.tpl');
+                $tpl = Theme::get_template('photo_item.tpl');
+                $return_url = App::$cmd;
+
+                $like_tpl = Theme::get_template('like_noshare.tpl');
+
+                $likebuttons = '';
+                $ilike = false;
+                $inolike = false;
+
+
+                if ($items) {
+                    foreach ($items as $i) {
+                        if ($i['verb'] === 'Like' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] = $link_item['mid']) {
+                            $ilike = true;
+                        }
+                        if ($i['verb'] === 'Dislike' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] === $link_item['mid']) {
+                            $inolike = true;
+                        }
+                    }
+                }
+
+                if ($observer && ($can_post || $can_comment)) {
+                    $likebuttons = [
+                        'id' => $link_item['id'],
+                        'likethis' => t('I like this'),
+                        'ilike' => $ilike,
+                        'inolike' => $inolike,
+                        'nolike' => t('I don\'t like this'),
+                        'unlikethis' => t('Undo like'),
+                        'unnolike' => t('Undo dislike'),
+                        'share' => t('Share'),
+                        'wait' => t('Please wait')
+                    ];
+                }
+
+                $comments = '';
+                if (!$comment_items) {
+                    if ($observer && ($can_post || $can_comment)) {
+                        $commentbox = replace_macros($cmnt_tpl, array(
+                            '$return_path' => '',
+                            '$mode' => 'photos',
+                            '$jsreload' => $return_url,
+                            '$type' => 'wall-comment',
+                            '$id' => $link_item['id'],
+                            '$parent' => $link_item['id'],
+                            '$profile_uid' => $owner_uid,
+                            '$mylink' => $observer['xchan_url'],
+                            '$mytitle' => t('This is you'),
+                            '$myphoto' => $observer['xchan_photo_s'],
+                            '$comment' => t('Comment'),
+                            '$submit' => t('Submit'),
+                            '$preview' => t('Preview'),
+                            '$auto_save_draft' => 'true',
+                            '$ww' => '',
+                            '$feature_encrypt' => false
+                        ));
+                    }
+                }
+
+                $alike = [];
+                $dlike = [];
+
+                $like = '';
+                $dislike = '';
+
+                $conv_responses = [
+                    'like' => ['title' => t('Likes', 'title')],
+                    'dislike' => ['title' => t('Dislikes', 'title')],
+                    'attendyes' => ['title' => t('Attending', 'title')],
+                    'attendno' => ['title' => t('Not attending', 'title')],
+                    'attendmaybe' => ['title' => t('Might attend', 'title')]
+                ];
+
+                if ($r) {
+                    foreach ($r as $item) {
+                        builtin_activity_puller($item, $conv_responses);
+                    }
+
+                    $like_count = ((x($alike, $link_item['mid'])) ? $alike[$link_item['mid']] : '');
+                    $like_list = ((x($alike, $link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : '');
+
+                    if (is_array($like_list) && (count($like_list) > MAX_LIKERS)) {
+                        $like_list_part = array_slice($like_list, 0, MAX_LIKERS);
+                        array_push($like_list_part, '' . t('View all') . '');
+                    } else {
+                        $like_list_part = '';
+                    }
+                    $like_button_label = tt('Like', 'Likes', $like_count, 'noun');
+
+                    $dislike_count = ((x($dlike, $link_item['mid'])) ? $dlike[$link_item['mid']] : '');
+                    $dislike_list = ((x($dlike, $link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : '');
+                    $dislike_button_label = tt('Dislike', 'Dislikes', $dislike_count, 'noun');
+                    if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) {
+                        $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
+                        array_push($dislike_list_part, '' . t('View all') . '');
+                    } else {
+                        $dislike_list_part = '';
+                    }
+
+
+                    $like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']], $alike[$link_item['mid'] . '-l'], 'like', $link_item['mid']) : '');
+                    $dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']], $dlike[$link_item['mid'] . '-l'], 'dislike', $link_item['mid']) : '');
+
+                    // display comments
+
+                    foreach ($comment_items as $item) {
+                        $comment = '';
+                        $template = $tpl;
+                        $sparkle = '';
+
+                        if (!visible_activity($item)) {
+                            continue;
+                        }
+
+                        $profile_url = zid($item['author']['xchan_url']);
+                        $profile_name = $item['author']['xchan_name'];
+                        $profile_avatar = $item['author']['xchan_photo_m'];
+
+                        $profile_link = $profile_url;
+
+                        $drop = '';
+
+                        if ($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan']) {
+                            $drop = replace_macros(Theme::get_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+                        }
+
+
+                        $name_e = $profile_name;
+                        $title_e = $item['title'];
+                        unobscure($item);
+                        $body_e = prepare_text($item['body'], $item['mimetype']);
+
+                        $comments .= replace_macros($template, array(
+                            '$id' => $item['id'],
+                            '$mode' => 'photos',
+                            '$profile_url' => $profile_link,
+                            '$name' => $name_e,
+                            '$thumb' => $profile_avatar,
+                            '$sparkle' => $sparkle,
+                            '$title' => $title_e,
+                            '$body' => $body_e,
+                            '$ago' => relative_date($item['created']),
+                            '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''),
+                            '$drop' => $drop,
+                            '$comment' => $comment
+                        ));
+                    }
+
+                    if ($observer && ($can_post || $can_comment)) {
+                        $commentbox = replace_macros($cmnt_tpl, array(
+                            '$return_path' => '',
+                            '$jsreload' => $return_url,
+                            '$type' => 'wall-comment',
+                            '$id' => $link_item['id'],
+                            '$parent' => $link_item['id'],
+                            '$profile_uid' => $owner_uid,
+                            '$mylink' => $observer['xchan_url'],
+                            '$mytitle' => t('This is you'),
+                            '$myphoto' => $observer['xchan_photo_s'],
+                            '$comment' => t('Comment'),
+                            '$submit' => t('Submit'),
+                            '$ww' => ''
+                        ));
+                    }
+                }
+                $paginate = paginate($a);
+            }
+
+            $album_e = [$album_link, $ph[0]['album']];
+            $like_e = $like;
+            $dislike_e = $dislike;
+
+
+            $response_verbs = array('like', 'dislike');
+
+            $responses = get_responses($conv_responses, $response_verbs, '', $link_item);
+
+            $o .= replace_macros(Theme::get_template('photo_view.tpl'), [
+                '$id' => $ph[0]['id'],
+                '$album' => $album_e,
+                '$tools_label' => t('Photo Tools'),
+                '$tools' => $tools,
+                '$lock' => $lockstate[1],
+                '$photo' => $photo,
+                '$prevlink' => $prevlink,
+                '$nextlink' => $nextlink,
+                '$title' => $ph[0]['title'],
+                '$desc' => $ph[0]['description'],
+                '$filename' => $ph[0]['filename'],
+                '$unknown' => t('Unknown'),
+                '$tag_hdr' => t('In This Photo:'),
+                '$tags' => $tags,
+                'responses' => $responses,
+                '$edit' => $edit,
+                '$map' => $map,
+                '$map_text' => t('Map'),
+                '$likebuttons' => $likebuttons,
+                '$like' => $like_e,
+                '$dislike' => $dislike_e,
+                '$like_count' => $like_count,
+                '$like_list' => $like_list,
+                '$like_list_part' => $like_list_part,
+                '$like_button_label' => $like_button_label,
+                '$like_modal_title' => t('Likes', 'noun'),
+                '$dislike_modal_title' => t('Dislikes', 'noun'),
+                '$dislike_count' => $dislike_count,
+                '$dislike_list' => $dislike_list,
+                '$dislike_list_part' => $dislike_list_part,
+                '$dislike_button_label' => $dislike_button_label,
+                '$modal_dismiss' => t('Close'),
+                '$comments' => $comments,
+                '$commentbox' => $commentbox,
+                '$paginate' => $paginate,
+            ]);
+
+            App::$data['photo_html'] = $o;
+            return $o;
+        }
+
+        // Default - show recent photos
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/json+oembed',
+            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
+            'title' => 'oembed'
+        ]);
+
+        App::set_pager_itemspage(60);
+
+        $r = q(
+            "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path FROM photo p 
+			INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) 
+			AND is_nsfw = %d $sql_extra group by resource_id ) ph ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) 
+			ORDER by p.created DESC LIMIT %d OFFSET %d",
+            intval(App::$data['channel']['channel_id']),
+            intval(PHOTO_NORMAL),
+            intval(PHOTO_PROFILE),
+            intval($unsafe),
+            intval(App::$pager['itemspage']),
+            intval(App::$pager['start'])
+        );
+
+        $photos = [];
+        if ($r) {
+            $twist = 'rotright';
+            foreach ($r as $rr) {
+                if (!attach_can_view_folder(App::$data['channel']['channel_id'], get_observer_hash(), $rr['resource_id'])) {
+                    continue;
+                }
+
+                if ($twist == 'rotright') {
+                    $twist = 'rotleft';
+                } else {
+                    $twist = 'rotright';
+                }
+                $ext = $phototypes[$rr['mimetype']];
+
+                $alt_e = $rr['filename'];
+                $name_e = dirname($rr['display_path']);
+
+                $photos[] = [
+                    'id' => $rr['id'],
+                    'twist' => ' ' . $twist . rand(2, 4),
+                    'link' => z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'],
+                    'title' => t('View Photo'),
+                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext,
+                    'alt' => $alt_e,
+                    'album' => ['name' => $name_e],
+                ];
+            }
+        }
+
+        if ($_REQUEST['aj']) {
+            if ($photos) {
+                $o = replace_macros(Theme::get_template('photosajax.tpl'), [
+                    '$photos' => $photos,
+                    '$album_id' => bin2hex(t('Recent Photos'))
+                ]);
+            } else {
+                $o = '
      ';
+            }
+            echo $o;
+            killme();
+        } else {
+            $o .= "";
+
+            $o .= replace_macros(Theme::get_template('photos_recent.tpl'), [
+                '$title' => t('Recent Photos'),
+                '$album_id' => bin2hex(t('Recent Photos')),
+                '$file_view' => t('View files'),
+                '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'],
+                '$can_post' => $can_post,
+                '$upload' => t('Add Photos'),
+                '$photos' => $photos,
+                '$upload_form' => $upload_form,
+                '$usage' => $usage_message
+            ]);
+
+            return $o;
+        }
+    }
+}
diff --git a/Code/Module/Pin.php b/Code/Module/Pin.php
new file mode 100644
index 000000000..1d110bd5d
--- /dev/null
+++ b/Code/Module/Pin.php
@@ -0,0 +1,68 @@
+ '%s'
+				$seenstr
+				$item_normal
+				$sql_extra",
+                intval($sys['channel_id']),
+                dbesc($loadtime)
+            );
+
+            if ($pubs) {
+                foreach ($pubs as $p) {
+                    if ($p['author_xchan'] === get_observer_hash()) {
+                        $my_activity++;
+                    } else {
+                        $result['pubs']++;
+                    }
+                }
+            }
+        }
+
+        if ((argc() > 1) && (argv(1) === 'pubs') && ($notify_pubs)) {
+            $local_result = [];
+
+            $r = q(
+                "SELECT * FROM item
+				WHERE uid = %d
+				AND author_xchan != '%s'
+				AND created > '%s'
+				$seenstr
+				$item_normal
+				$sql_extra
+				ORDER BY created DESC
+				LIMIT 300",
+                intval($sys['channel_id']),
+                dbesc(get_observer_hash()),
+                dbesc($loadtime)
+            );
+
+            if ($r) {
+                xchan_query($r);
+                foreach ($r as $rr) {
+                    $rr['llink'] = str_replace('display/', 'pubstream/?f=&mid=', $rr['llink']);
+                    $z = Enotify::format($rr);
+                    if ($z) {
+                        $local_result[] = $z;
+                    }
+                }
+            }
+
+            json_return_and_die(['notify' => $local_result]);
+        }
+
+        if ((!local_channel()) || ($result['invalid'])) {
+            json_return_and_die($result);
+        }
+
+        /**
+         * Everything following is only permitted under the context of a locally authenticated site member.
+         */
+
+        /**
+         * Handle "mark all xyz notifications read" requests.
+         */
+
+        // mark all items read
+        if (x($_REQUEST, 'markRead') && local_channel() && (!$_SESSION['sudo'])) {
+            switch ($_REQUEST['markRead']) {
+                case 'stream':
+                    $r = q(
+                        "UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1",
+                        intval(local_channel())
+                    );
+                    $_SESSION['loadtime_stream'] = datetime_convert();
+                    PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']);
+                    $_SESSION['loadtime_channel'] = datetime_convert();
+                    PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
+                    break;
+                case 'home':
+                    $r = q(
+                        "UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_wall = 1",
+                        intval(local_channel())
+                    );
+                    $_SESSION['loadtime_channel'] = datetime_convert();
+                    PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
+                    break;
+                case 'all_events':
+                    $r = q(
+                        "UPDATE event SET dismissed = 1 WHERE uid = %d AND dismissed = 0 AND dtstart < '%s' AND dtstart > '%s' ",
+                        intval(local_channel()),
+                        dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+                        dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+                    );
+                    break;
+                case 'notify':
+                    $r = q(
+                        "update notify set seen = 1 where uid = %d",
+                        intval(local_channel())
+                    );
+                    break;
+                case 'pubs':
+                    $_SESSION['loadtime_pubstream'] = datetime_convert();
+                    PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (x($_REQUEST, 'markItemRead') && local_channel() && (!$_SESSION['sudo'])) {
+            $r = q(
+                "UPDATE item SET item_unseen = 0 WHERE  uid = %d AND parent = %d",
+                intval(local_channel()),
+                intval($_REQUEST['markItemRead'])
+            );
+            $id = intval($_REQUEST['markItemRead']);
+            $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []);
+            if (!in_array($id, $seen)) {
+                $seen[] = $id;
+            }
+            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
+        }
+
+        /**
+         * URL ping/something will return detail for "something", e.g. a json list with which to populate a notification
+         * dropdown menu.
+         */
+
+        if (argc() > 1 && argv(1) === 'notify') {
+            $t = q(
+                "SELECT * FROM notify WHERE uid = %d AND seen = 0 ORDER BY CREATED DESC",
+                intval(local_channel())
+            );
+
+            if ($t) {
+                foreach ($t as $tt) {
+                    $message = trim(strip_tags(bbcode($tt['msg'])));
+
+                    if (strpos($message, $tt['xname']) === 0) {
+                        $message = substr($message, strlen($tt['xname']) + 1);
+                    }
+
+
+                    $mid = basename($tt['link']);
+                    $mid = unpack_link_id($mid);
+
+                    if (in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
+                        // we need the thread parent
+                        $r = q(
+                            "select thr_parent from item where mid = '%s' and uid = %d limit 1",
+                            dbesc($mid),
+                            intval(local_channel())
+                        );
+
+                        $b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : gen_link_id($r[0]['thr_parent']));
+                    } else {
+                        $b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : gen_link_id($mid));
+                    }
+
+                    $notifs[] = array(
+                        'notify_link' => z_root() . '/notify/view/' . $tt['id'],
+                        'name' => $tt['xname'],
+                        'url' => $tt['url'],
+                        'photo' => $tt['photo'],
+                        'when' => relative_date($tt['created']),
+                        'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'),
+                        'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'),
+                        'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'),
+                        'message' => $message
+                    );
+                }
+            }
+
+            json_return_and_die(['notify' => $notifs]);
+        }
+
+        if (argc() > 1 && (argv(1) === 'stream')) {
+            $local_result = [];
+
+            $item_normal_moderate = $item_normal;
+            $loadtime = get_loadtime('stream');
+
+            $r = q(
+                "SELECT * FROM item 
+				WHERE uid = %d
+				AND author_xchan != '%s'
+				AND edited > '%s'
+				$seenstr
+				$item_normal_moderate
+				$sql_extra
+				ORDER BY created DESC
+				LIMIT 300",
+                intval(local_channel()),
+                dbesc($ob_hash),
+                dbesc($loadtime)
+            );
+            if ($r) {
+                xchan_query($r);
+                foreach ($r as $item) {
+                    $z = Enotify::format($item);
+
+                    if ($z) {
+                        $local_result[] = $z;
+                    }
+                }
+            }
+
+            json_return_and_die(['notify' => $local_result]);
+        }
+
+        if (argc() > 1 && (argv(1) === 'home')) {
+            $local_result = [];
+            $item_normal_moderate = $item_normal;
+
+            $sql_extra .= " and item_wall = 1 ";
+            $item_normal_moderate = item_normal_moderate();
+
+            $loadtime = get_loadtime('channel');
+
+            $r = q(
+                "SELECT * FROM item 
+				WHERE uid = %d
+				AND author_xchan != '%s'
+				AND edited > '%s'
+				$seenstr
+				$item_normal_moderate
+				$sql_extra
+				ORDER BY created DESC
+				LIMIT 300",
+                intval(local_channel()),
+                dbesc($ob_hash),
+                dbesc($loadtime)
+            );
+            if ($r) {
+                xchan_query($r);
+                foreach ($r as $item) {
+                    $z = Enotify::format($item);
+
+                    if ($z) {
+                        $local_result[] = $z;
+                    }
+                }
+            }
+
+            json_return_and_die(['notify' => $local_result]);
+        }
+
+
+        if (argc() > 1 && (argv(1) === 'intros')) {
+            $local_result = [];
+
+            $r = q(
+                "SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ORDER BY abook_created DESC LIMIT 50",
+                intval(local_channel())
+            );
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $local_result[] = [
+                        'notify_link' => z_root() . '/connections/' . $rr['abook_id'],
+                        'name' => $rr['xchan_name'],
+                        'addr' => $rr['xchan_addr'],
+                        'url' => $rr['xchan_url'],
+                        'photo' => $rr['xchan_photo_s'],
+                        'when' => relative_date($rr['abook_created']),
+                        'hclass' => ('notify-unseen'),
+                        'message' => t('added your channel')
+                    ];
+                }
+            }
+
+            json_return_and_die(['notify' => $local_result]);
+        }
+
+        if ((argc() > 1 && (argv(1) === 'register')) && is_site_admin()) {
+            $result = [];
+
+            $r = q(
+                "SELECT account_email, account_created from account where (account_flags & %d) > 0",
+                intval(ACCOUNT_PENDING)
+            );
+            if ($r) {
+                foreach ($r as $rr) {
+                    $result[] = array(
+                        'notify_link' => z_root() . '/admin/accounts',
+                        'name' => $rr['account_email'],
+                        'addr' => $rr['account_email'],
+                        'url' => '',
+                        'photo' => z_root() . '/' . Channel::get_default_profile_photo(48),
+                        'when' => relative_date($rr['account_created']),
+                        'hclass' => ('notify-unseen'),
+                        'message' => t('requires approval')
+                    );
+                }
+            }
+
+            json_return_and_die(['notify' => $result]);
+        }
+
+        if (argc() > 1 && (argv(1) === 'all_events')) {
+            $bd_format = t('g A l F d'); // 8 AM Friday January 18
+
+            $result = [];
+
+            $r = q(
+                "SELECT * FROM event left join xchan on event_xchan = xchan_hash
+				WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
+				and etype in ( 'event', 'birthday' )
+				ORDER BY dtstart DESC LIMIT 1000",
+                intval(local_channel()),
+                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+            );
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']);
+                    $today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
+                    $when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ? ' ' . t('[today]') : '');
+
+                    $result[] = array(
+                        'notify_link' => z_root() . '/events', /// @FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event  --> '/events/event/' . $rr['event_hash'],
+                        'name' => $rr['xchan_name'],
+                        'addr' => $rr['xchan_addr'],
+                        'url' => $rr['xchan_url'],
+                        'photo' => $rr['xchan_photo_s'],
+                        'when' => $when,
+                        'hclass' => ('notify-unseen'),
+                        'message' => t('posted an event')
+                    );
+                }
+            }
+
+            json_return_and_die(['notify' => $result]);
+        }
+
+        if (argc() > 1 && (argv(1) === 'files')) {
+            $result = [];
+
+            $r = q(
+                "SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item 
+				LEFT JOIN xchan on author_xchan = xchan_hash
+				WHERE item.verb = '%s'
+				AND item.obj_type = '%s'
+				AND item.uid = %d
+				AND item.owner_xchan != '%s'
+				AND item.item_unseen = 1",
+                dbesc(ACTIVITY_POST),
+                dbesc(ACTIVITY_OBJ_FILE),
+                intval(local_channel()),
+                dbesc($ob_hash)
+            );
+            if ($r) {
+                foreach ($r as $rr) {
+                    $result[] = array(
+                        'notify_link' => z_root() . '/sharedwithme',
+                        'name' => $rr['xchan_name'],
+                        'addr' => $rr['xchan_addr'],
+                        'url' => $rr['xchan_url'],
+                        'photo' => $rr['xchan_photo_s'],
+                        'when' => relative_date($rr['created']),
+                        'hclass' => ('notify-unseen'),
+                        'message' => t('shared a file with you')
+                    );
+                }
+            }
+
+            json_return_and_die(['notify' => $result]);
+        }
+
+        if (argc() > 1 && (argv(1) === 'reports') && is_site_admin()) {
+            $local_result = [];
+
+            $r = q(
+                "SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item 
+				LEFT JOIN xchan on author_xchan = xchan_hash
+				WHERE item.type = '%s' AND item.item_unseen = 1",
+                dbesc(ITEM_TYPE_REPORT)
+            );
+
+            if ($r) {
+                foreach ($r as $rv) {
+                    $result[] = [
+                        'notify_link' => z_root() . '/reports',
+                        'name' => $rv['xchan_name'],
+                        'addr' => $rv['xchan_addr'],
+                        'url' => $rv['xchan_url'],
+                        'photo' => $rv['xchan_photo_s'],
+                        'when' => relative_date($rv['created']),
+                        'hclass' => ('notify-unseen'),
+                        'message' => t('reported content')
+                    ];
+                }
+            }
+
+            json_return_and_die(['notify' => $result]);
+        }
+
+
+        /**
+         * Normal ping - just the counts, no detail
+         */
+
+
+        if ($vnotify & VNOTIFY_SYSTEM) {
+            $t = q(
+                "select count(*) as total from notify where uid = %d and seen = 0",
+                intval(local_channel())
+            );
+            if ($t) {
+                $result['notify'] = intval($t[0]['total']);
+            }
+        }
+
+        if ($vnotify & VNOTIFY_FILES) {
+            $files = q(
+                "SELECT count(id) as total FROM item
+				WHERE verb = '%s'
+				AND obj_type = '%s'
+				AND uid = %d
+				AND owner_xchan != '%s'
+				AND item_unseen = 1",
+                dbesc(ACTIVITY_POST),
+                dbesc(ACTIVITY_OBJ_FILE),
+                intval(local_channel()),
+                dbesc($ob_hash)
+            );
+            if ($files) {
+                $result['files'] = intval($files[0]['total']);
+            }
+        }
+
+
+        if ($vnotify & VNOTIFY_NETWORK) {
+            $loadtime = get_loadtime('stream');
+            $r = q(
+                "SELECT id, author_xchan FROM item 
+				WHERE uid = %d and edited > '%s' 
+				$seenstr
+				$item_normal
+				$sql_extra ",
+                intval(local_channel()),
+                dbesc($loadtime)
+            );
+
+            if ($r) {
+                $arr = array('items' => $r);
+                Hook::call('network_ping', $arr);
+
+                foreach ($r as $it) {
+                    if ($it['author_xchan'] === $ob_hash) {
+                        $my_activity++;
+                    } else {
+                        $result['stream']++;
+                    }
+                }
+            }
+        }
+        if (!($vnotify & VNOTIFY_NETWORK)) {
+            $result['stream'] = 0;
+        }
+
+        if ($vnotify & VNOTIFY_CHANNEL) {
+            $loadtime = get_loadtime('channel');
+            $r = q(
+                "SELECT id, author_xchan FROM item 
+				WHERE item_wall = 1 and uid = %d and edited > '%s'
+				$seenstr 
+				$item_normal
+				$sql_extra ",
+                intval(local_channel()),
+                dbesc($loadtime)
+            );
+
+            if ($r) {
+                foreach ($r as $it) {
+                    if ($it['author_xchan'] === $ob_hash) {
+                        $my_activity++;
+                    } else {
+                        $result['home']++;
+                    }
+                }
+            }
+        }
+        if (!($vnotify & VNOTIFY_CHANNEL)) {
+            $result['home'] = 0;
+        }
+
+
+        if ($vnotify & VNOTIFY_INTRO) {
+            $intr = q(
+                "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
+                intval(local_channel())
+            );
+
+            if ($intr) {
+                $result['intros'] = intval($intr[0]['total']);
+            }
+        }
+
+
+        $channel = App::get_channel();
+
+        if ($vnotify & VNOTIFY_REGISTER) {
+            if (App::$config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
+                $regs = q(
+                    "SELECT count(account_id) as total from account where (account_flags & %d) > 0",
+                    intval(ACCOUNT_PENDING)
+                );
+                if ($regs) {
+                    $result['register'] = intval($regs[0]['total']);
+                }
+            }
+        }
+
+        if ($vnotify & VNOTIFY_REPORTS) {
+            if (is_site_admin()) {
+                $reps = q(
+                    "SELECT count(id) as total from item where item_type = %d",
+                    intval(ITEM_TYPE_REPORT)
+                );
+                if ($reps) {
+                    $result['reports'] = intval($reps[0]['total']);
+                }
+            }
+        }
+
+        if ($vnotify & (VNOTIFY_EVENT | VNOTIFY_EVENTTODAY | VNOTIFY_BIRTHDAY)) {
+            $events = q(
+                "SELECT etype, dtstart, adjust FROM event
+				WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
+				and etype in ( 'event', 'birthday' )
+				ORDER BY dtstart ASC ",
+                intval(local_channel()),
+                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+            );
+
+            if ($events) {
+                $result['all_events'] = count($events);
+
+                if ($result['all_events']) {
+                    $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
+                    foreach ($events as $x) {
+                        $bd = false;
+                        if ($x['etype'] === 'birthday') {
+                            $result['birthdays']++;
+                            $bd = true;
+                        } else {
+                            $result['events']++;
+                        }
+                        if (datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['dtstart'], 'Y-m-d') === $str_now) {
+                            $result['all_events_today']++;
+                            if ($bd) {
+                                $result['birthdays_today']++;
+                            } else {
+                                $result['events_today']++;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!($vnotify & VNOTIFY_EVENT)) {
+            $result['all_events'] = $result['events'] = 0;
+        }
+        if (!($vnotify & VNOTIFY_EVENTTODAY)) {
+            $result['all_events_today'] = $result['events_today'] = 0;
+        }
+        if (!($vnotify & VNOTIFY_BIRTHDAY)) {
+            $result['birthdays'] = 0;
+        }
+
+
+        if ($vnotify & VNOTIFY_FORUMS) {
+            $forums = get_forum_channels(local_channel());
+
+            if ($forums) {
+                $perms_sql = item_permissions_sql(local_channel()) . item_normal();
+                $fcount = count($forums);
+                $forums['total'] = 0;
+
+                for ($x = 0; $x < $fcount; $x++) {
+                    $ttype = TERM_FORUM;
+                    $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . protect_sprintf(dbesc($forums[$x]['xchan_name'])) . "'");
+
+                    $p = ids_to_querystr($p, 'parent');
+                    $pquery = (($p) ? "OR parent IN ( $p )" : '');
+
+                    $r = q(
+                        "select sum(item_unseen) as unseen from item 
+						where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ",
+                        intval(local_channel()),
+                        dbesc($forums[$x]['xchan_hash'])
+                    );
+                    if ($r[0]['unseen']) {
+                        $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/stream/?f=&pf=1&cid=' . $forums[$x]['abook_id']);
+                        $forums[$x]['name'] = $forums[$x]['xchan_name'];
+                        $forums[$x]['addr'] = $forums[$x]['xchan_addr'];
+                        $forums[$x]['url'] = $forums[$x]['xchan_url'];
+                        $forums[$x]['photo'] = $forums[$x]['xchan_photo_s'];
+                        $forums[$x]['unseen'] = $r[0]['unseen'];
+                        $forums[$x]['private_forum'] = (($forums[$x]['private_forum']) ? 'lock' : '');
+                        $forums[$x]['message'] = (($forums[$x]['private_forum']) ? t('Private group') : t('Public group'));
+
+                        $forums['total'] = $forums['total'] + $r[0]['unseen'];
+
+                        unset($forums[$x]['abook_id']);
+                        unset($forums[$x]['xchan_hash']);
+                        unset($forums[$x]['xchan_name']);
+                        unset($forums[$x]['xchan_url']);
+                        unset($forums[$x]['xchan_photo_s']);
+                    } else {
+                        unset($forums[$x]);
+                    }
+                }
+                $result['forums'] = $forums['total'];
+                unset($forums['total']);
+
+                $result['forums_sub'] = $forums;
+            }
+        }
+
+        // Mark all of the stream notifications seen if all three of them are caught up.
+        // This also resets the pconfig storage for items_seen
+
+        if ((!$my_activity) && (!(intval($result['home']) + intval($result['stream']) + intval($result['pubs'])))) {
+            PConfig::Delete(local_channel(), 'system', 'seen_items');
+
+            $_SESSION['loadtime_channel'] = datetime_convert();
+            $_SESSION['loadtime_stream'] = datetime_convert();
+            $_SESSION['loadtime_pubstream'] = datetime_convert();
+
+            PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
+            PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']);
+            PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']);
+        }
+
+        json_return_and_die($result);
+    }
+}
diff --git a/Code/Module/Plike.php b/Code/Module/Plike.php
new file mode 100644
index 000000000..e535f9133
--- /dev/null
+++ b/Code/Module/Plike.php
@@ -0,0 +1,312 @@
+ 'Like',
+            'dislike'     => 'Dislike',
+        ];
+
+        // unlike (etc.) reactions are an undo of positive reactions, rather than a negative action.
+        // The activity is the same in undo actions and will have the same activity mapping
+
+        if (substr($reaction, 0, 2) === 'un') {
+            $undo = true;
+            $reaction = substr($reaction, 2);
+        }
+
+        if (array_key_exists($reaction, $acts)) {
+            return (($undo) ? 'Undo/' : EMPTY_STR) . $acts[$reaction];
+        }
+
+        return EMPTY_STR;
+    }
+
+
+
+    public function get()
+    {
+
+        $undo = false;
+        $object = $target = null;
+        $owner_uid = 0;
+        $post_type = EMPTY_STR;
+        $objtype = EMPTY_STR;
+        $allow_cid = $allow_gid = $deny_cid = $deny_gid = '';
+        $output = EMPTY_STR;
+
+        $sys_channel = Channel::get_system();
+        $sys_channel_id = (($sys_channel) ? $sys_channel['channel_id'] : 0);
+
+        $observer = App::get_observer();
+
+        $verb = ((array_key_exists('verb', $_GET)) ? notags(trim($_GET['verb'])) :  EMPTY_STR);
+
+        // Figure out what action we're performing
+
+        $activity = $this->reaction_to_activity($verb);
+
+        if (! $activity) {
+            return EMPTY_STR;
+        }
+
+        // Check for negative (undo) condition
+        // eg: 'Undo/Like' results in $undo conditional and $activity set to 'Like'
+
+        $test = explode('/', $activity);
+        if (count($test) > 1) {
+            $undo = true;
+            $activity = $test[1];
+        }
+
+        $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]);
+
+        // Check for when target is something besides messages, where argv(1) is the type of thing
+        // and  argv(2) is an identifier of things of that type
+        // We currently only recognise 'profile' but other types could be handled
+
+        if (argc() == 3) {
+            if (! $observer) {
+                killme();
+            }
+
+            if ($obj_type == 'profile') {
+                $r = q(
+                    "select * from profile where profile_guid = '%s' limit 1",
+                    dbesc($obj_id)
+                );
+
+                if (! $r) {
+                    killme();
+                }
+
+                $profile = array_shift($r);
+
+                $owner_uid = $profile['uid'];
+
+                $public = ((intval($profile['is_default'])) ? true : false);
+
+                // if this is a private profile, select the destination recipients
+
+                if (! $public) {
+                    $d = q(
+                        "select abook_xchan from abook where abook_profile = '%s' and abook_channel = %d",
+                        dbesc($profile['profile_guid']),
+                        intval($owner_uid)
+                    );
+                    if (! $d) {
+                        // No profile could be found.
+                        killme();
+                    }
+
+                    // $d now contains a list of those who can see this profile.
+                    // Set the access accordingly.
+
+                    foreach ($d as $dd) {
+                        $allow_cid .= '<' . $dd['abook_xchan'] . '>';
+                    }
+                }
+
+                $post_type = t('channel');
+                $objtype = ACTIVITY_OBJ_PROFILE;
+            }
+
+            // We'll need the owner of the thing from up above to figure out what channel is the target
+
+            if (! ($owner_uid)) {
+                killme();
+            }
+
+            // Check permissions of the observer. If this is the owner (mostly this is the case)
+            // this will return true for all permissions.
+
+            $perms = get_all_perms($owner_uid, $observer['xchan_hash']);
+
+            if (! ($perms['post_like'] && $perms['view_profile'])) {
+                killme();
+            }
+
+            $channel = Channel::from_id($owner_uid);
+
+            if (! $channel) {
+                killme();
+            }
+
+            $object = json_encode(Activity::fetch_profile([ 'id' => Channel::url($channel) ]));
+
+            // second like of the same thing is "undo" for the first like
+
+            $z = q(
+                "select * from likes where channel_id = %d and liker = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' limit 1",
+                intval($channel['channel_id']),
+                dbesc($observer['xchan_hash']),
+                dbesc($activity),
+                dbesc(($tgttype) ? $tgttype : $objtype),
+                dbesc($obj_id)
+            );
+
+            if ($z) {
+                $z[0]['deleted'] = 1;
+                Libsync::build_sync_packet($channel['channel_id'], array('likes' => $z));
+
+                q(
+                    "delete from likes where id = %d",
+                    intval($z[0]['id'])
+                );
+                if ($z[0]['i_mid']) {
+                    $r = q(
+                        "select id from item where mid = '%s' and uid = %d limit 1",
+                        dbesc($z[0]['i_mid']),
+                        intval($channel['channel_id'])
+                    );
+                    if ($r) {
+                        drop_item($r[0]['id'], false);
+                    }
+                }
+                killme();
+            }
+        }
+
+        $uuid = new_uuid();
+
+        $arr = [];
+
+        $arr['uuid']  = $uuid;
+        $arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/' ) . $uuid;
+
+
+        $arr['item_thread_top'] = 1;
+        $arr['item_origin'] = 1;
+        $arr['item_wall'] = 1;
+
+
+        if ($verb === 'like') {
+            $bodyverb = t('%1$s likes %2$s\'s %3$s');
+        }
+        if ($verb === 'dislike') {
+            $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
+        }
+
+        if (! isset($bodyverb)) {
+            killme();
+        }
+
+
+        $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]';
+        $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
+        $plink = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . $post_type . '[/zrl]';
+        $private = (($public) ? 0 : 1);
+
+
+        $arr['aid']          = $channel['channel_account_id'];
+        $arr['uid']          = $owner_uid;
+
+
+        $arr['item_flags']   = $item['item_flags'];
+        $arr['item_wall']    = $item['item_wall'];
+        $arr['parent_mid']   = $arr['mid'];
+        $arr['owner_xchan']  = $channel['xchan_hash'];
+        $arr['author_xchan'] = $observer['xchan_hash'];
+
+
+        $arr['body']          =  sprintf($bodyverb, $alink, $ulink, $plink);
+
+        if ($obj_type === 'profile') {
+            if ($public) {
+                $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $channel['channel_address'] . '[/embed]';
+            } else {
+                $arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]';
+            }
+        }
+
+
+        $arr['verb']          = $activity;
+        $arr['obj_type']      = $objtype;
+        $arr['obj']           = $object;
+
+        if ($target) {
+            $arr['tgt_type']  = $tgttype;
+            $arr['target']    = $target;
+        }
+
+        $arr['allow_cid']     = $allow_cid;
+        $arr['allow_gid']     = $allow_gid;
+        $arr['deny_cid']      = $deny_cid;
+        $arr['deny_gid']      = $deny_gid;
+        $arr['item_private']  = $private;
+
+        Hook::call('post_local', $arr);
+
+        $post = item_store($arr);
+        $post_id = $post['item_id'];
+
+        // save the conversation from expiration
+
+        if (local_channel() && array_key_exists('item', $post) && (intval($post['item']['id']) != intval($post['item']['parent']))) {
+            retain_item($post['item']['parent']);
+        }
+
+        $arr['id'] = $post_id;
+
+        Hook::call('post_local_end', $arr);
+
+        $r = q(
+            "select * from item where id = %d",
+            intval($post_id)
+        );
+        if ($r) {
+            xchan_query($r);
+            $sync_item = fetch_post_tags($r);
+            Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
+        }
+
+        $r = q(
+            "insert into likes (channel_id,liker,likee,iid,i_mid,verb,target_type,target_id,target) values (%d,'%s','%s',%d,'%s','%s','%s','%s','%s')",
+            intval($channel['channel_id']),
+            dbesc($observer['xchan_hash']),
+            dbesc($channel['channel_hash']),
+            intval($post_id),
+            dbesc($mid),
+            dbesc($activity),
+            dbesc(($tgttype) ? $tgttype : $objtype),
+            dbesc($obj_id),
+            dbesc(($target) ? $target  : $object)
+        );
+        $r = q(
+            "select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ",
+            dbesc($observer['xchan_hash']),
+            dbesc($channel['channel_hash']),
+            dbesc($mid),
+            dbesc($activity),
+            dbesc(($tgttype) ? $tgttype : $objtype),
+            dbesc($obj_id)
+        );
+        if ($r) {
+            Libsync::build_sync_packet($channel['channel_id'], array('likes' => $r));
+        }
+
+        Run::Summon([ 'Notifier', 'like', $post_id ]);
+
+        killme();
+    }
+}
diff --git a/Code/Module/Poco.php b/Code/Module/Poco.php
new file mode 100644
index 000000000..0bcf89fb6
--- /dev/null
+++ b/Code/Module/Poco.php
@@ -0,0 +1,19 @@
+';
+            $allow_gid = EMPTY_STR;
+            $deny_cid = EMPTY_STR;
+            $deny_gid = EMPTY_STR;
+        }
+
+        $arr = [];
+
+        $arr['item_wall'] = 1;
+        $arr['owner_xchan'] = $channel['channel_hash'];
+        $arr['author_xchan'] = $channel['channel_hash'];
+        $arr['allow_cid'] = $allow_cid;
+        $arr['allow_gid'] = $allow_gid;
+        $arr['deny_cid'] = $deny_cid;
+        $arr['deny_gid'] = $deny_gid;
+        $arr['verb'] = 'Create';
+        $arr['item_private'] = 1;
+        $arr['obj_type'] = 'Note';
+        $arr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . $verbs[$verb][2] . ' ' . '[zrl=' . $target['xchan_url'] . ']' . $target['xchan_name'] . '[/zrl]';
+
+
+        $arr['item_origin'] = 1;
+        $arr['item_wall'] = 1;
+
+        $obj = Activity::encode_item($arr, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
+
+        $i = post_activity_item($arr);
+
+        if ($i['success']) {
+            $item_id = $i['item_id'];
+            $r = q(
+                "select * from item where id = %d",
+                intval($item_id)
+            );
+            if ($r) {
+                xchan_query($r);
+                $sync_item = fetch_post_tags($r);
+                Libsync::build_sync_packet($uid, ['item' => [encode_item($sync_item[0], true)]]);
+            }
+
+            info(sprintf(t('You %1$s %2$s'), $verbs[$verb][2], $target['xchan_name']));
+        }
+
+        json_return_and_die(['success' => true]);
+    }
+
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if (!Apps::system_app_installed(local_channel(), 'Poke')) {
+            $o = '' . t('Poke App (Not Installed)') . '
      ';
+            $o .= t('Poke or do something else to somebody');
+            return $o;
+        }
+
+        Navbar::set_selected('Poke');
+
+        $name = '';
+        $id = '';
+
+        $verbs = get_poke_verbs();
+
+        $shortlist = [];
+        $current = get_pconfig(local_channel(), 'system', 'pokeverb', 'poke');
+        foreach ($verbs as $k => $v) {
+            $shortlist[] = [$k, $v[1], (($k === $current) ? true : false)];
+        }
+
+
+        $title = t('Poke');
+        $desc = t('Poke, prod or do other things to somebody');
+
+        $o = replace_macros(Theme::get_template('poke_content.tpl'), array(
+            '$title' => $title,
+            '$desc' => $desc,
+            '$clabel' => t('Recipient'),
+            '$choice' => t('Choose your default action'),
+            '$verbs' => $shortlist,
+            '$submit' => t('Submit'),
+            '$id' => $id
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Poster.php b/Code/Module/Poster.php
new file mode 100644
index 000000000..54bc13d13
--- /dev/null
+++ b/Code/Module/Poster.php
@@ -0,0 +1,46 @@
+ get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits));
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Profile.php b/Code/Module/Profile.php
new file mode 100644
index 000000000..798d8aedd
--- /dev/null
+++ b/Code/Module/Profile.php
@@ -0,0 +1,140 @@
+ 1) {
+            $which = argv(1);
+        } else {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        Navbar::set_selected('Profile');
+
+        $profile = '';
+        $channel = App::get_channel();
+
+        if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+            $which = $channel['channel_address'];
+            $profile = argv(1);
+            $r = q(
+                "select profile_guid from profile where id = %d and uid = %d limit 1",
+                intval($profile),
+                intval(local_channel())
+            );
+            if (!$r) {
+                $profile = '';
+            }
+            $profile = $r[0]['profile_guid'];
+        }
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/atom+xml',
+            'title' => t('Posts and comments'),
+            'href' => z_root() . '/feed/' . $which
+        ]);
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/atom+xml',
+            'title' => t('Only posts'),
+            'href' => z_root() . '/feed/' . $which . '?f=&top=1'
+        ]);
+
+
+        if (!$profile) {
+            $x = q(
+                "select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
+                dbesc(argv(1))
+            );
+            if ($x) {
+                App::$profile = $x[0];
+            }
+        }
+
+
+        if (ActivityStreams::is_as_request()) {
+            $chan = Channel::from_username(argv(1));
+            if (!$chan) {
+                http_status_exit(404, 'Not found');
+            }
+            $p = Activity::encode_person($chan, true, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
+            if (!$p) {
+                http_status_exit(404, 'Not found');
+            }
+
+            as_return_and_die(['type' => 'Profile', 'describes' => $p], $chan);
+        }
+
+        Libprofile::load($which, $profile);
+    }
+
+    public function get()
+    {
+
+        if (observer_prohibited(true)) {
+            return login();
+        }
+
+        $groups = [];
+
+
+        $tab = 'profile';
+        $o = '';
+
+        if (!(perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile'))) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+
+        if (argc() > 2 && argv(2) === 'vcard') {
+            header('Content-type: text/vcard');
+            header('Content-Disposition: attachment; filename="' . t('vcard') . '-' . $profile['channel_address'] . '.vcf"');
+            echo App::$profile['profile_vcard'];
+            killme();
+        }
+
+        $is_owner = ((local_channel()) && (local_channel() == App::$profile['profile_uid']) ? true : false);
+
+        if (App::$profile['hidewall'] && (!$is_owner) && (!remote_channel())) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        Head::add_link([
+            'rel' => 'alternate',
+            'type' => 'application/json+oembed',
+            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
+            'title' => 'oembed'
+        ]);
+
+        $o .= Libprofile::advanced();
+        Hook::call('profile_advanced', $o);
+        return $o;
+    }
+}
diff --git a/Code/Module/Profile_photo.php b/Code/Module/Profile_photo.php
new file mode 100644
index 000000000..19d7dd662
--- /dev/null
+++ b/Code/Module/Profile_photo.php
@@ -0,0 +1,578 @@
+is_valid()) {
+                    $im->cropImage(300, $srcX, $srcY, $srcW, $srcH);
+
+                    $aid = get_account_id();
+
+                    $p = [
+                        'aid' => $aid,
+                        'uid' => local_channel(),
+                        'resource_id' => $base_image['resource_id'],
+                        'filename' => $base_image['filename'],
+                        'album' => t('Profile Photos'),
+                        'os_path' => $base_image['os_path'],
+                        'display_path' => $base_image['display_path'],
+                        'created' => $base_image['created'],
+                        'edited' => $base_image['edited']
+                    ];
+
+                    $animated = get_config('system', 'animated_avatars', true);
+
+                    $p['imgscale'] = PHOTO_RES_PROFILE_300;
+                    $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
+
+                    $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300, $animated);
+
+                    $im->scaleImage(80);
+                    $p['imgscale'] = PHOTO_RES_PROFILE_80;
+
+                    $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80, $animated);
+
+                    $im->scaleImage(48);
+                    $p['imgscale'] = PHOTO_RES_PROFILE_48;
+
+                    $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48, $animated);
+
+                    if ($r1 === false || $r2 === false || $r3 === false) {
+                        // if one failed, delete them all so we can start over.
+                        notice(t('Image resize failed.') . EOL);
+                        $x = q(
+                            "delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ",
+                            dbesc($base_image['resource_id']),
+                            local_channel(),
+                            intval(PHOTO_RES_PROFILE_300),
+                            intval(PHOTO_RES_PROFILE_80),
+                            intval(PHOTO_RES_PROFILE_48)
+                        );
+                        return;
+                    }
+
+                    $channel = App::get_channel();
+
+                    // If setting for the default profile, unset the profile photo flag from any other photos I own
+
+                    if ($is_default_profile) {
+                        $r = q(
+                            "update profile set photo = '%s', thumb = '%s' where is_default = 1 and uid = %d",
+                            dbesc(z_root() . '/photo/profile/l/' . local_channel()),
+                            dbesc(z_root() . '/photo/profile/m/' . local_channel()),
+                            intval(local_channel())
+                        );
+
+
+                        $r = q(
+                            "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d
+							AND resource_id != '%s' AND uid = %d",
+                            intval(PHOTO_NORMAL),
+                            intval(PHOTO_PROFILE),
+                            dbesc($base_image['resource_id']),
+                            intval(local_channel())
+                        );
+
+
+                        send_profile_photo_activity($channel, $base_image, $profile);
+                    } else {
+                        $r = q(
+                            "update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
+                            dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-4'),
+                            dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-5'),
+                            intval($_REQUEST['profile']),
+                            intval(local_channel())
+                        );
+                    }
+
+                    // set $send to false in profiles_build_sync() to return the data
+                    // so that we only send one sync packet.
+
+                    $sync_profiles = Channel::profiles_build_sync(local_channel(), false);
+
+                    // We'll set the updated profile-photo timestamp even if it isn't the default profile,
+                    // so that browsers will do a cache update unconditionally
+                    // Also set links back to site-specific profile photo url in case it was
+                    // changed to a generic URL by a clone operation. Otherwise the new photo may
+                    // not get pushed to other sites correctly.
+
+                    $r = q(
+                        "UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s'  
+						where xchan_hash = '%s'",
+                        dbesc($im->getType()),
+                        dbesc(datetime_convert()),
+                        dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']),
+                        dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']),
+                        dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']),
+                        dbesc($channel['xchan_hash'])
+                    );
+
+                    photo_profile_setperms(local_channel(), $base_image['resource_id'], $_REQUEST['profile']);
+
+                    $sync = attach_export_data($channel, $base_image['resource_id']);
+                    if ($sync) {
+                        Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync), 'profile' => $sync_profiles));
+                    }
+
+                    // Similarly, tell the nav bar to bypass the cache and update the avatar image.
+                    $_SESSION['reload_avatar'] = true;
+
+                    info(t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
+
+                    // Update directory in background
+                    Run::Summon(['Directory', $channel['channel_id']]);
+                } else {
+                    notice(t('Unable to process image') . EOL);
+                }
+            }
+
+            goaway(z_root() . '/profiles');
+        }
+
+        // A new photo was uploaded. Store it and save some important details
+        // in App::$data for use in the cropping function
+
+
+        $hash = photo_new_resource();
+        $importing = false;
+        $smallest = 0;
+
+
+        if ($_REQUEST['importfile']) {
+            $hash = $_REQUEST['importfile'];
+            $importing = true;
+        } else {
+            $matches = [];
+            $partial = false;
+
+            if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
+                $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
+                if ($pm) {
+                    logger('Content-Range: ' . print_r($matches, true), LOGGER_DEBUG);
+                    $partial = true;
+                }
+            }
+
+            if ($partial) {
+                $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
+
+                if ($x['partial']) {
+                    header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
+                    json_return_and_die($x);
+                } else {
+                    header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
+
+                    $_FILES['userfile'] = [
+                        'name' => $x['name'],
+                        'type' => $x['type'],
+                        'tmp_name' => $x['tmp_name'],
+                        'error' => $x['error'],
+                        'size' => $x['size']
+                    ];
+                }
+            } else {
+                if (!array_key_exists('userfile', $_FILES)) {
+                    $_FILES['userfile'] = [
+                        'name' => $_FILES['files']['name'],
+                        'type' => $_FILES['files']['type'],
+                        'tmp_name' => $_FILES['files']['tmp_name'],
+                        'error' => $_FILES['files']['error'],
+                        'size' => $_FILES['files']['size']
+                    ];
+                }
+            }
+
+            $res = attach_store(App::get_channel(), get_observer_hash(), '', [ 'album' => t('Profile Photos'), 'hash' => $hash, 'source' => 'photos' ]);
+
+            logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG);
+
+            json_return_and_die(['message' => $hash]);
+        }
+
+        if (($res && intval($res['data']['is_photo'])) || $importing) {
+            $i = q(
+                "select * from photo where resource_id = '%s' and uid = %d order by imgscale",
+                dbesc($hash),
+                intval(local_channel())
+            );
+
+            if (!$i) {
+                notice(t('Image upload failed.') . EOL);
+                return;
+            }
+            $os_storage = false;
+
+            foreach ($i as $ii) {
+                if (intval($ii['imgscale']) < PHOTO_RES_640) {
+                    $smallest = intval($ii['imgscale']);
+                    $os_storage = intval($ii['os_storage']);
+                    $imagedata = $ii['content'];
+                    $filetype = $ii['mimetype'];
+                }
+            }
+        }
+
+        $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata));
+        $ph = photo_factory($imagedata, $filetype);
+
+        if (!$ph->is_valid()) {
+            notice(t('Unable to process image.') . EOL);
+            return;
+        }
+
+        return $this->profile_photo_crop_ui_head($ph, $hash, $smallest);
+
+        // This will "fall through" to the get() method, and since
+        // App::$data['imagecrop'] is set, it will proceed to cropping
+        // rather than present the upload form
+    }
+
+
+    /* @brief Generate content of profile-photo view
+     *
+     * @return void
+     *
+     */
+
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $channel = App::get_channel();
+        $pf = 0;
+        $newuser = false;
+
+        if (argc() == 2 && argv(1) === 'new') {
+            $newuser = true;
+        }
+
+        if (argv(1) === 'use') {
+            if (argc() < 3) {
+                notice(t('Permission denied.') . EOL);
+                return;
+            }
+
+            $resource_id = argv(2);
+
+            $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0);
+
+            $c = q(
+                "select id, is_default from profile where uid = %d",
+                intval(local_channel())
+            );
+
+            $multi_profiles = true;
+
+            if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) {
+                $_REQUEST['profile'] = $c[0]['id'];
+                $multi_profiles = false;
+            } else {
+                $_REQUEST['profile'] = $pf;
+            }
+
+            $r = q(
+                "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC",
+                intval(local_channel()),
+                dbesc($resource_id)
+            );
+            if (!$r) {
+                notice(t('Photo not available.') . EOL);
+                return;
+            }
+            $havescale = false;
+            foreach ($r as $rr) {
+                if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) {
+                    $havescale = true;
+                }
+            }
+
+            // set an already loaded and cropped photo as profile photo
+
+            if ($havescale) {
+                // unset any existing profile photos
+                $r = q(
+                    "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
+                    intval(PHOTO_NORMAL),
+                    intval(PHOTO_PROFILE),
+                    intval(local_channel())
+                );
+
+                $r = q(
+                    "UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'",
+                    intval(PHOTO_PROFILE),
+                    intval(local_channel()),
+                    dbesc($resource_id)
+                );
+
+                $r = q(
+                    "UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'",
+                    dbesc(datetime_convert()),
+                    dbesc($channel['xchan_hash'])
+                );
+
+                photo_profile_setperms(local_channel(), $resource_id, $_REQUEST['profile']);
+
+                $sync = attach_export_data($channel, $resource_id);
+                if ($sync) {
+                    Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
+                }
+
+                Run::Summon(['Directory', local_channel()]);
+                goaway(z_root() . '/profiles');
+            }
+
+            $r = q(
+                "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
+                intval($r[0]['id']),
+                intval(local_channel())
+            );
+            if (!$r) {
+                notice(t('Photo not available.') . EOL);
+                return;
+            }
+
+            if (intval($r[0]['os_storage'])) {
+                $data = @file_get_contents(dbunescbin($r[0]['content']));
+            } else {
+                $data = dbunescbin($r[0]['content']);
+            }
+
+            $ph = photo_factory($data, $r[0]['mimetype']);
+            $smallest = 0;
+            if ($ph->is_valid()) {
+                // go ahead as if we have just uploaded a new photo to crop
+                $i = q(
+                    "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale",
+                    dbesc($r[0]['resource_id']),
+                    intval(local_channel())
+                );
+
+                if ($i) {
+                    $hash = $i[0]['resource_id'];
+                    foreach ($i as $ii) {
+                        if (intval($ii['imgscale']) < PHOTO_RES_640) {
+                            $smallest = intval($ii['imgscale']);
+                        }
+                    }
+                }
+            }
+
+            if ($multi_profiles) {
+                App::$data['importfile'] = $resource_id;
+            } else {
+                $this->profile_photo_crop_ui_head($ph, $hash, $smallest);
+            }
+
+            // falls through with App::$data['imagecrop'] set so we go straight to the cropping section
+        }
+
+        // present an upload form
+
+        $profiles = q(
+            "select id, profile_name as name, is_default from profile where uid = %d order by id asc",
+            intval(local_channel())
+        );
+
+        if ($profiles) {
+            for ($x = 0; $x < count($profiles); $x++) {
+                $profiles[$x]['selected'] = false;
+                if ($pf && $profiles[$x]['id'] == $pf) {
+                    $profiles[$x]['selected'] = true;
+                }
+                if ((!$pf) && $profiles[$x]['is_default']) {
+                    $profiles[$x]['selected'] = true;
+                }
+            }
+        }
+
+        $importing = ((array_key_exists('importfile', App::$data)) ? true : false);
+
+        if (!array_key_exists('imagecrop', App::$data)) {
+            $tpl = Theme::get_template('profile_photo.tpl');
+
+            $o .= replace_macros($tpl, [
+                '$user' => App::$channel['channel_address'],
+                '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your profile photo is visible to anybody on the internet and may be distributed to other websites.')),
+                '$importfile' => (($importing) ? App::$data['importfile'] : ''),
+                '$lbl_upfile' => t('Upload File:'),
+                '$lbl_profiles' => t('Select a profile:'),
+                '$title' => (($importing) ? t('Use Photo for Profile') : t('Change Profile Photo')),
+                '$submit' => (($importing) ? t('Use') : t('Upload')),
+                '$profiles' => $profiles,
+                '$single' => ((count($profiles) == 1) ? true : false),
+                '$profile0' => $profiles[0],
+                '$embedPhotos' => t('Use a photo from your albums'),
+                '$embedPhotosModalTitle' => t('Use a photo from your albums'),
+                '$embedPhotosModalCancel' => t('Cancel'),
+                '$embedPhotosModalOK' => t('OK'),
+                '$modalchooseimages' => t('Choose images to embed'),
+                '$modalchoosealbum' => t('Choose an album'),
+                '$modaldiffalbum' => t('Choose a different album'),
+                '$modalerrorlist' => t('Error getting album list'),
+                '$modalerrorlink' => t('Error getting photo link'),
+                '$modalerroralbum' => t('Error getting album'),
+                '$form_security_token' => get_form_security_token("profile_photo"),
+                '$select' => t('Select previously uploaded photo'),
+            ]);
+
+            Hook::call('profile_photo_content_end', $o);
+            return $o;
+        } else {
+            // present a cropping form
+
+            $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'];
+            $resolution = App::$data['imagecrop_resolution'];
+            $o .= replace_macros(Theme::get_template('cropbody.tpl'), [
+                '$filename' => $filename,
+                '$profile' => intval($_REQUEST['profile']),
+                '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'],
+                '$image_url' => z_root() . '/photo/' . $filename,
+                '$title' => t('Crop Image'),
+                '$desc' => t('Please adjust the image cropping for optimum viewing.'),
+                '$form_security_token' => get_form_security_token("profile_photo"),
+                '$done' => t('Done Editing')
+            ]);
+            return $o;
+        }
+    }
+
+    /* @brief Generate the UI for photo-cropping
+     *
+     * @param $ph Photo-Factory
+     * @return void
+     *
+     */
+
+    public function profile_photo_crop_ui_head($ph, $hash, $smallest)
+    {
+        $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH);
+        if ($max_length > 0) {
+            $ph->scaleImage($max_length);
+        }
+
+        App::$data['width'] = $ph->getWidth();
+        App::$data['height'] = $ph->getHeight();
+
+        if (App::$data['width'] < 500 || App::$data['height'] < 500) {
+            $ph->scaleImageUp(400);
+            App::$data['width'] = $ph->getWidth();
+            App::$data['height'] = $ph->getHeight();
+        }
+
+        App::$data['imagecrop'] = $hash;
+        App::$data['imagecrop_resolution'] = $smallest;
+        App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []);
+        return;
+    }
+}
diff --git a/Code/Module/Profiles.php b/Code/Module/Profiles.php
new file mode 100644
index 000000000..cbfbdfa91
--- /dev/null
+++ b/Code/Module/Profiles.php
@@ -0,0 +1,1128 @@
+ 2) && (argv(1) === "drop") && intval(argv(2))) {
+            $r = q(
+                "SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+            if (!$r) {
+                notice(t('Profile not found.') . EOL);
+                goaway(z_root() . '/profiles');
+            }
+            $profile_guid = $r[0]['profile_guid'];
+
+            check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+
+            // move every contact using this profile as their default to the user default
+
+            $r = q(
+                "UPDATE abook SET abook_profile = (SELECT profile_guid FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
+                intval(local_channel()),
+                dbesc($profile_guid),
+                intval(local_channel())
+            );
+            $r = q(
+                "DELETE FROM profile WHERE id = %d AND uid = %d",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+            if ($r) {
+                info(t('Profile deleted.') . EOL);
+            }
+
+            // @fixme this is a much more complicated sync - add any changed abook entries and
+            // also add deleted flag to profile structure
+            // profiles_build_sync is just here as a placeholder - it doesn't work at all here
+
+            // Channel::profiles_build_sync(local_channel());
+
+            goaway(z_root() . '/profiles');
+            return; // NOTREACHED
+        }
+
+
+        if ((argc() > 1) && (argv(1) === 'new')) {
+            //      check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+
+            $r0 = q(
+                "SELECT id FROM profile WHERE uid = %d",
+                intval(local_channel())
+            );
+            $num_profiles = count($r0);
+
+            $name = t('Profile-') . ($num_profiles + 1);
+
+            $r1 = q(
+                "SELECT fullname, photo, thumb FROM profile WHERE uid = %d AND is_default = 1 LIMIT 1",
+                intval(local_channel())
+            );
+
+            $r2 = Channel::profile_store_lowlevel(
+                [
+                    'aid' => intval(get_account_id()),
+                    'uid' => intval(local_channel()),
+                    'profile_guid' => new_uuid(),
+                    'profile_name' => $name,
+                    'fullname' => $r1[0]['fullname'],
+                    'photo' => $r1[0]['photo'],
+                    'thumb' => $r1[0]['thumb']
+                ]
+            );
+
+            $r3 = q(
+                "SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1",
+                intval(local_channel()),
+                dbesc($name)
+            );
+
+            info(t('New profile created.') . EOL);
+            if (count($r3) == 1) {
+                goaway(z_root() . '/profiles/' . $r3[0]['id']);
+            }
+
+            goaway(z_root() . '/profiles');
+        }
+
+        if ((argc() > 2) && (argv(1) === 'clone')) {
+            check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+
+            $r0 = q(
+                "SELECT id FROM profile WHERE uid = %d",
+                intval(local_channel())
+            );
+            $num_profiles = count($r0);
+
+            $name = t('Profile-') . ($num_profiles + 1);
+            $r1 = q(
+                "SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1",
+                intval(local_channel()),
+                intval(argv(2))
+            );
+            if (!count($r1)) {
+                notice(t('Profile unavailable to clone.') . EOL);
+                App::$error = 404;
+                return;
+            }
+            unset($r1[0]['id']);
+            $r1[0]['is_default'] = 0;
+            $r1[0]['publish'] = 0;
+            $r1[0]['profile_name'] = $name;
+            $r1[0]['profile_guid'] = new_uuid();
+
+            create_table_from_array('profile', $r1[0]);
+
+            $r3 = q(
+                "SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1",
+                intval(local_channel()),
+                dbesc($name)
+            );
+            info(t('New profile created.') . EOL);
+
+            Channel::profiles_build_sync(local_channel());
+
+            if (($r3) && (count($r3) == 1)) {
+                goaway(z_root() . '/profiles/' . $r3[0]['id']);
+            }
+
+            goaway(z_root() . '/profiles');
+
+            return; // NOTREACHED
+        }
+
+        if ((argc() > 2) && (argv(1) === 'export')) {
+            $r1 = q(
+                "SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1",
+                intval(local_channel()),
+                intval(argv(2))
+            );
+            if (!$r1) {
+                notice(t('Profile unavailable to export.') . EOL);
+                App::$error = 404;
+                return;
+            }
+            header('content-type: application/octet_stream');
+            header('Content-Disposition: attachment; filename="' . $r1[0]['profile_name'] . '.json"');
+
+            unset($r1[0]['id']);
+            unset($r1[0]['aid']);
+            unset($r1[0]['uid']);
+            unset($r1[0]['is_default']);
+            unset($r1[0]['publish']);
+            unset($r1[0]['profile_name']);
+            unset($r1[0]['profile_guid']);
+            echo json_encode($r1[0]);
+            killme();
+        }
+
+        if (((argc() > 1) && (intval(argv(1)))) || !Features::enabled(local_channel(), 'multi_profiles')) {
+            if (Features::enabled(local_channel(), 'multi_profiles')) {
+                $id = argv(1);
+            } else {
+                $x = q(
+                    "select id from profile where uid = %d and is_default = 1",
+                    intval(local_channel())
+                );
+                if ($x) {
+                    $id = $x[0]['id'];
+                }
+            }
+            $r = q(
+                "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1",
+                intval($id),
+                intval(local_channel())
+            );
+            if (!count($r)) {
+                notice(t('Profile not found.') . EOL);
+                App::$error = 404;
+                return;
+            }
+
+            $chan = App::get_channel();
+
+            Libprofile::load($chan['channel_address'], $r[0]['profile_guid']);
+        }
+    }
+
+    public function post()
+    {
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $namechanged = false;
+
+        // import from json export file.
+        // Only import fields that are allowed on this hub
+
+        if (x($_FILES, 'userfile')) {
+            $src = $_FILES['userfile']['tmp_name'];
+            $filesize = intval($_FILES['userfile']['size']);
+            if ($filesize) {
+                $j = @json_decode(@file_get_contents($src), true);
+                @unlink($src);
+                if ($j) {
+                    $fields = Channel::get_profile_fields_advanced();
+                    if ($fields) {
+                        foreach ($j as $jj => $v) {
+                            foreach ($fields as $f => $n) {
+                                if ($jj == $f) {
+                                    $_POST[$f] = $v;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Hook::call('profile_post', $_POST);
+
+
+        if ((argc() > 1) && (argv(1) !== "new") && intval(argv(1))) {
+            $orig = q(
+                "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1",
+                intval(argv(1)),
+                intval(local_channel())
+            );
+            if (!count($orig)) {
+                notice(t('Profile not found.') . EOL);
+                return;
+            }
+
+            check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
+
+
+            $is_default = (($orig[0]['is_default']) ? 1 : 0);
+
+            $profile_name = notags(trim($_POST['profile_name']));
+            if (!strlen($profile_name)) {
+                notice(t('Profile Name is required.') . EOL);
+                return;
+            }
+
+            $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00';
+
+            $y = substr($dob, 0, 4);
+            if ((!ctype_digit($y)) || ($y < 1900)) {
+                $ignore_year = true;
+            } else {
+                $ignore_year = false;
+            }
+
+            if ($dob !== '0000-00-00') {
+                if (strpos($dob, '0000-') === 0) {
+                    $ignore_year = true;
+                    $dob = substr($dob, 5);
+                }
+                $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d'));
+                if ($ignore_year) {
+                    $dob = '0000-' . $dob;
+                }
+            }
+
+            $name = escape_tags(trim($_POST['name']));
+
+            if ($orig[0]['fullname'] != $name) {
+                $namechanged = true;
+
+                $v = Channel::validate_channelname($name);
+                if ($v) {
+                    notice($v);
+                    $namechanged = false;
+                    $name = $orig[0]['fullname'];
+                }
+            }
+
+            $pdesc = escape_tags(trim($_POST['pdesc']));
+            $gender = escape_tags(trim($_POST['gender']));
+            $address = escape_tags(trim($_POST['address']));
+            $locality = escape_tags(trim($_POST['locality']));
+            $region = escape_tags(trim($_POST['region']));
+            $postal_code = escape_tags(trim($_POST['postal_code']));
+            $country_name = escape_tags(trim($_POST['country_name']));
+            $keywords = escape_tags(trim($_POST['keywords']));
+            $marital = escape_tags(trim($_POST['marital']));
+            $howlong = escape_tags(trim($_POST['howlong']));
+            $sexual = escape_tags(trim($_POST['sexual']));
+            $pronouns = escape_tags(trim($_POST['pronouns']));
+            $homepage = escape_tags(trim($_POST['homepage']));
+            $hometown = escape_tags(trim($_POST['hometown']));
+            $politic = escape_tags(trim($_POST['politic']));
+            $religion = escape_tags(trim($_POST['religion']));
+
+            $likes = escape_tags(trim($_POST['likes']));
+            $dislikes = escape_tags(trim($_POST['dislikes']));
+
+            $about = escape_tags(trim($_POST['about']));
+            $interest = escape_tags(trim($_POST['interest']));
+            $contact = escape_tags(trim($_POST['contact']));
+            $channels = escape_tags(trim($_POST['channels']));
+            $music = escape_tags(trim($_POST['music']));
+            $book = escape_tags(trim($_POST['book']));
+            $tv = escape_tags(trim($_POST['tv']));
+            $film = escape_tags(trim($_POST['film']));
+            $romance = escape_tags(trim($_POST['romance']));
+            $work = escape_tags(trim($_POST['work']));
+            $education = escape_tags(trim($_POST['education']));
+
+            $hide_friends = ((intval($_POST['hide_friends'])) ? 1 : 0);
+
+            // start fresh and create a new vcard.
+            // @TODO: preserve the original guid or whatever else needs saving
+            // $orig_vcard = (($orig[0]['profile_vcard']) ? Reader::read($orig[0]['profile_vcard']) : null);
+
+            $orig_vcard = null;
+
+            $channel = App::get_channel();
+
+            $default_vcard_cat = ((defined('DEFAULT_VCARD_CAT')) ? DEFAULT_VCARD_CAT : 'HOME');
+
+            $defcard = [
+                'fn' => $name,
+                'title' => $pdesc,
+                'photo' => $channel['xchan_photo_l'],
+                'adr' => [],
+                'adr_type' => [$default_vcard_cat],
+                'url' => [$homepage],
+                'url_type' => [$default_vcard_cat]
+            ];
+
+            $defcard['adr'][] = [
+                0 => '',
+                1 => '',
+                2 => $address,
+                3 => $locality,
+                4 => $region,
+                5 => $postal_code,
+                6 => $country_name
+            ];
+
+            $profile_vcard = update_vcard($defcard, $orig_vcard);
+
+            $orig_vcard = Reader::read($profile_vcard);
+
+            $profile_vcard = update_vcard($_REQUEST, $orig_vcard);
+
+
+            require_once('include/text.php');
+            linkify_tags($likes, local_channel());
+            linkify_tags($dislikes, local_channel());
+            linkify_tags($about, local_channel());
+            linkify_tags($interest, local_channel());
+            linkify_tags($interest, local_channel());
+            linkify_tags($contact, local_channel());
+            linkify_tags($channels, local_channel());
+            linkify_tags($music, local_channel());
+            linkify_tags($book, local_channel());
+            linkify_tags($tv, local_channel());
+            linkify_tags($film, local_channel());
+            linkify_tags($romance, local_channel());
+            linkify_tags($work, local_channel());
+            linkify_tags($education, local_channel());
+
+
+            $with = ((x($_POST, 'with')) ? escape_tags(trim($_POST['with'])) : '');
+
+            if (!strlen($howlong)) {
+                $howlong = NULL_DATE;
+            } else {
+                $howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong);
+            }
+
+            // linkify the relationship target if applicable
+
+            $withchanged = false;
+
+            if (strlen($with)) {
+                if ($with != strip_tags($orig[0]['partner'])) {
+                    $withchanged = true;
+                    $prf = '';
+                    $lookup = $with;
+                    if (strpos($lookup, '@') === 0) {
+                        $lookup = substr($lookup, 1);
+                    }
+                    $lookup = str_replace('_', ' ', $lookup);
+                    $newname = $lookup;
+
+                    $r = q(
+                        "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
+                        dbesc($newname),
+                        intval(local_channel())
+                    );
+                    if (!$r) {
+                        $r = q(
+                            "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_addr = '%s' AND abook_channel = %d LIMIT 1",
+                            dbesc($lookup . '@%'),
+                            intval(local_channel())
+                        );
+                    }
+                    if ($r) {
+                        $prf = $r[0]['xchan_url'];
+                        $newname = $r[0]['xchan_name'];
+                    }
+
+
+                    if ($prf) {
+                        $with = str_replace($lookup, '' . $newname . '', $with);
+                        if (strpos($with, '@') === 0) {
+                            $with = substr($with, 1);
+                        }
+                    }
+                } else {
+                    $with = $orig[0]['partner'];
+                }
+            }
+
+            $profile_fields_basic = Channel::get_profile_fields_basic();
+            $profile_fields_advanced = Channel::get_profile_fields_advanced();
+            $advanced = ((Features::enabled(local_channel(), 'advanced_profiles')) ? true : false);
+            if ($advanced) {
+                $fields = $profile_fields_advanced;
+            } else {
+                $fields = $profile_fields_basic;
+            }
+
+            $z = q("select * from profdef where true");
+            if ($z) {
+                foreach ($z as $zz) {
+                    if (array_key_exists($zz['field_name'], $fields)) {
+                        $w = q(
+                            "select * from profext where channel_id = %d and hash = '%s' and k = '%s' limit 1",
+                            intval(local_channel()),
+                            dbesc($orig[0]['profile_guid']),
+                            dbesc($zz['field_name'])
+                        );
+                        if ($w) {
+                            q(
+                                "update profext set v = '%s' where id = %d",
+                                dbesc(escape_tags(trim($_POST[$zz['field_name']]))),
+                                intval($w[0]['id'])
+                            );
+                        } else {
+                            q(
+                                "insert into profext ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ",
+                                intval(local_channel()),
+                                dbesc($orig[0]['profile_guid']),
+                                dbesc($zz['field_name']),
+                                dbesc(escape_tags(trim($_POST[$zz['field_name']])))
+                            );
+                        }
+                    }
+                }
+            }
+
+            $changes = [];
+            $value = '';
+            if ($is_default) {
+                if ($marital != $orig[0]['marital']) {
+                    $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
+                    $value = $marital;
+                }
+                if ($withchanged) {
+                    $changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
+                    $value = strip_tags($with);
+                }
+                if ($likes != $orig[0]['likes']) {
+                    $changes[] = t('Likes');
+                    $value = $likes;
+                }
+                if ($dislikes != $orig[0]['dislikes']) {
+                    $changes[] = t('Dislikes');
+                    $value = $dislikes;
+                }
+                if ($work != $orig[0]['employment']) {
+                    $changes[] = t('Work/Employment');
+                }
+                if ($religion != $orig[0]['religion']) {
+                    $changes[] = t('Religion');
+                    $value = $religion;
+                }
+                if ($politic != $orig[0]['politic']) {
+                    $changes[] = t('Political Views');
+                    $value = $politic;
+                }
+                if ($gender != $orig[0]['gender']) {
+                    $changes[] = t('Gender');
+                    $value = $gender;
+                }
+                if ($sexual != $orig[0]['sexual']) {
+                    $changes[] = t('Sexual Preference');
+                    $value = $sexual;
+                }
+                if ($homepage != $orig[0]['homepage']) {
+                    $changes[] = t('Homepage');
+                    $value = $homepage;
+                }
+                if ($interest != $orig[0]['interest']) {
+                    $changes[] = t('Interests');
+                    $value = $interest;
+                }
+                if ($address != $orig[0]['address']) {
+                    $changes[] = t('Address');
+                    // New address not sent in notifications, potential privacy issues
+                    // in case this leaks to unintended recipients. Yes, it's in the public
+                    // profile but that doesn't mean we have to broadcast it to everybody.
+                }
+                if (
+                    $locality != $orig[0]['locality'] || $region != $orig[0]['region']
+                    || $country_name != $orig[0]['country_name']
+                ) {
+                    $changes[] = t('Location');
+                    $comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
+                    $comma2 = (($region && $country_name) ? ', ' : '');
+                    $value = $locality . $comma1 . $region . $comma2 . $country_name;
+                }
+
+                self::profile_activity($changes, $value);
+            }
+
+            $r = q(
+                "UPDATE profile 
+				SET profile_name = '%s',
+				fullname = '%s',
+				pdesc = '%s',
+				gender = '%s',
+				dob = '%s',
+				address = '%s',
+				locality = '%s',
+				region = '%s',
+				postal_code = '%s',
+				country_name = '%s',
+				marital = '%s',
+				partner = '%s',
+				howlong = '%s',
+				sexual = '%s',
+				pronouns = '%s',
+				homepage = '%s',
+				hometown = '%s',
+				politic = '%s',
+				religion = '%s',
+				keywords = '%s',
+				likes = '%s',
+				dislikes = '%s',
+				about = '%s',
+				interest = '%s',
+				contact = '%s',
+				channels = '%s',
+				music = '%s',
+				book = '%s',
+				tv = '%s',
+				film = '%s',
+				romance = '%s',
+				employment = '%s',
+				education = '%s',
+				hide_friends = %d,
+				profile_vcard = '%s'
+				WHERE id = %d AND uid = %d",
+                dbesc($profile_name),
+                dbesc($name),
+                dbesc($pdesc),
+                dbesc($gender),
+                dbesc($dob),
+                dbesc($address),
+                dbesc($locality),
+                dbesc($region),
+                dbesc($postal_code),
+                dbesc($country_name),
+                dbesc($marital),
+                dbesc($with),
+                dbesc($howlong),
+                dbesc($sexual),
+                dbesc($pronouns),
+                dbesc($homepage),
+                dbesc($hometown),
+                dbesc($politic),
+                dbesc($religion),
+                dbesc($keywords),
+                dbesc($likes),
+                dbesc($dislikes),
+                dbesc($about),
+                dbesc($interest),
+                dbesc($contact),
+                dbesc($channels),
+                dbesc($music),
+                dbesc($book),
+                dbesc($tv),
+                dbesc($film),
+                dbesc($romance),
+                dbesc($work),
+                dbesc($education),
+                intval($hide_friends),
+                dbesc($profile_vcard),
+                intval(argv(1)),
+                intval(local_channel())
+            );
+
+            if ($r) {
+                info(t('Profile updated.') . EOL);
+            }
+
+            $sync = q(
+                "select * from profile where id = %d and uid = %d limit 1",
+                intval(argv(1)),
+                intval(local_channel())
+            );
+            if ($sync) {
+                Libsync::build_sync_packet(local_channel(), array('profile' => $sync));
+            }
+
+            if (Channel::is_system(local_channel())) {
+                set_config('system', 'siteinfo', $about);
+            }
+
+            $channel = App::get_channel();
+
+            if ($namechanged && $is_default) {
+                $r = q(
+                    "UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_hash = '%s'",
+                    dbesc($name),
+                    dbesc(datetime_convert()),
+                    dbesc($channel['xchan_hash'])
+                );
+                $r = q(
+                    "UPDATE channel SET channel_name = '%s' WHERE channel_hash = '%s'",
+                    dbesc($name),
+                    dbesc($channel['xchan_hash'])
+                );
+                if (Channel::is_system(local_channel())) {
+                    set_config('system', 'sitename', $name);
+                }
+            }
+
+            if ($is_default) {
+                Run::Summon(['Directory', local_channel()]);
+                goaway(z_root() . '/profiles/' . $sync[0]['id']);
+            }
+        }
+    }
+
+
+    public function get()
+    {
+
+        $o = '';
+
+        $channel = App::get_channel();
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $profile_fields_basic = Channel::get_profile_fields_basic();
+        $profile_fields_advanced = Channel::get_profile_fields_advanced();
+
+        if (((argc() > 1) && (intval(argv(1)))) || !Features::enabled(local_channel(), 'multi_profiles')) {
+            if (Features::enabled(local_channel(), 'multi_profiles')) {
+                $id = argv(1);
+            } else {
+                $x = q(
+                    "select id from profile where uid = %d and is_default = 1",
+                    intval(local_channel())
+                );
+                if ($x) {
+                    $id = $x[0]['id'];
+                }
+            }
+            $r = q(
+                "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1",
+                intval($id),
+                intval(local_channel())
+            );
+            if (!$r) {
+                notice(t('Profile not found.') . EOL);
+                return;
+            }
+
+            $editselect = 'none';
+
+            App::$page['htmlhead'] .= replace_macros(Theme::get_template('profed_head.tpl'), array(
+                '$baseurl' => z_root(),
+                '$editselect' => $editselect,
+            ));
+
+            $advanced = ((Features::enabled(local_channel(), 'advanced_profiles')) ? true : false);
+            if ($advanced) {
+                $fields = $profile_fields_advanced;
+            } else {
+                $fields = $profile_fields_basic;
+            }
+
+            $hide_friends = array(
+                'hide_friends',
+                t('Hide your connections list from viewers of this profile'),
+                $r[0]['hide_friends'],
+                '',
+                array(t('No'), t('Yes'))
+            );
+
+            $q = q("select * from profdef where true");
+            if ($q) {
+                $extra_fields = [];
+
+                foreach ($q as $qq) {
+                    $mine = q(
+                        "select v from profext where k = '%s' and hash = '%s' and channel_id = %d limit 1",
+                        dbesc($qq['field_name']),
+                        dbesc($r[0]['profile_guid']),
+                        intval(local_channel())
+                    );
+
+                    if (array_key_exists($qq['field_name'], $fields)) {
+                        $extra_fields[] = array($qq['field_name'], $qq['field_desc'], (($mine) ? $mine[0]['v'] : ''), $qq['field_help']);
+                    }
+                }
+            }
+
+            //logger('extra_fields: ' . print_r($extra_fields,true));
+
+            $vc = $r[0]['profile_vcard'];
+            $vctmp = (($vc) ? Reader::read($vc) : null);
+            $vcard = (($vctmp) ? get_vcard_array($vctmp, $r[0]['id']) : []);
+
+            $f = get_config('system', 'birthday_input_format');
+            if (!$f) {
+                $f = 'ymd';
+            }
+
+            $is_default = (($r[0]['is_default']) ? 1 : 0);
+
+            $tpl = Theme::get_template("profile_edit.tpl");
+            $o .= replace_macros($tpl, array(
+                '$multi_profiles' => ((Features::enabled(local_channel(), 'multi_profiles')) ? true : false),
+                '$form_security_token' => get_form_security_token("profile_edit"),
+                '$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"),
+                '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
+                '$fields' => $fields,
+                '$vcard' => $vcard,
+                '$guid' => $r[0]['profile_guid'],
+                '$banner' => t('Edit Profile Details'),
+                '$submit' => t('Submit'),
+                '$viewprof' => t('View this profile'),
+                '$editvis' => t('Edit visibility'),
+                '$tools_label' => t('Profile Tools'),
+                '$coverpic' => t('Change cover photo'),
+                '$profpic' => t('Change profile photo'),
+                '$cr_prof' => t('Create a new profile using these settings'),
+                '$cl_prof' => t('Clone this profile'),
+                '$del_prof' => t('Delete this profile'),
+                '$addthing' => t('Add profile things'),
+                '$personal' => t('Personal'),
+                '$location' => t('Location'),
+                '$relation' => t('Relationship'),
+                '$miscellaneous' => t('Miscellaneous'),
+                '$exportable' => Features::enabled(local_channel(), 'profile_export'),
+                '$lbl_import' => t('Import profile from file'),
+                '$lbl_export' => t('Export profile to file'),
+                '$lbl_gender' => t('Your gender'),
+                '$lbl_marital' => t('Marital status'),
+                '$lbl_sexual' => t('Sexual preference'),
+                '$lbl_pronouns' => t('Pronouns'),
+                '$baseurl' => z_root(),
+                '$profile_id' => $r[0]['id'],
+                '$profile_name' => array('profile_name', t('Profile name'), $r[0]['profile_name'], t('Required'), '*'),
+                '$is_default' => $is_default,
+                '$default' => '', // t('This is your default profile.') . EOL . translate_scope(map_scope(\Code\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'))),
+                '$advanced' => $advanced,
+                '$name' => array('name', t('Your full name'), $r[0]['fullname'], t('Required'), '*'),
+                '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']),
+                '$dob' => dob($r[0]['dob']),
+                '$hide_friends' => $hide_friends,
+                '$address' => array('address', t('Street address'), $r[0]['address']),
+                '$locality' => array('locality', t('Locality/City'), $r[0]['locality']),
+                '$region' => array('region', t('Region/State'), $r[0]['region']),
+                '$postal_code' => array('postal_code', t('Postal/Zip code'), $r[0]['postal_code']),
+                '$country_name' => array('country_name', t('Country'), $r[0]['country_name']),
+                '$gender' => self::gender_selector($r[0]['gender']),
+                '$gender_min' => self::gender_selector_min($r[0]['gender']),
+                '$gender_text' => self::gender_text($r[0]['gender']),
+                '$marital' => self::marital_selector($r[0]['marital']),
+                '$marital_min' => self::marital_selector_min($r[0]['marital']),
+                '$with' => array('with', t("Who (if applicable)"), $r[0]['partner'], t('Examples: cathy123, Cathy Williams, cathy@example.com')),
+                '$howlong' => array('howlong', t('Since (date)'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC', date_default_timezone_get(), $r[0]['howlong']))),
+                '$sexual' => self::sexpref_selector($r[0]['sexual']),
+                '$sexual_min' => self::sexpref_selector_min($r[0]['sexual']),
+                '$pronouns' => self::pronouns_selector($r[0]['pronouns']),
+                '$pronouns_min' => self::pronouns_selector($r[0]['pronouns']),
+                '$about' => array('about', t('Tell us about yourself'), $r[0]['about']),
+                '$homepage' => array('homepage', t('Homepage URL'), $r[0]['homepage']),
+                '$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']),
+                '$politic' => array('politic', t('Political views'), $r[0]['politic']),
+                '$religion' => array('religion', t('Religious views'), $r[0]['religion']),
+                '$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')),
+                '$likes' => array('likes', t('Likes'), $r[0]['likes']),
+                '$dislikes' => array('dislikes', t('Dislikes'), $r[0]['dislikes']),
+                '$music' => array('music', t('Musical interests'), $r[0]['music']),
+                '$book' => array('book', t('Books, literature'), $r[0]['book']),
+                '$tv' => array('tv', t('Television'), $r[0]['tv']),
+                '$film' => array('film', t('Film/Dance/Culture/Entertainment'), $r[0]['film']),
+                '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
+                '$romance' => array('romance', t('Love/Romance'), $r[0]['romance']),
+                '$employ' => array('work', t('Work/Employment'), $r[0]['employment']),
+                '$education' => array('education', t('School/Education'), $r[0]['education']),
+                '$contact' => array('contact', t('Contact information and social networks'), $r[0]['contact']),
+                '$channels' => array('channels', t('My other channels'), $r[0]['channels']),
+                '$extra_fields' => $extra_fields,
+                '$comms' => t('Communications'),
+                '$tel_label' => t('Phone'),
+                '$email_label' => t('Email'),
+                '$impp_label' => t('Instant messenger'),
+                '$url_label' => t('Website'),
+                '$adr_label' => t('Address'),
+                '$note_label' => t('Note'),
+                '$mobile' => t('Mobile'),
+                '$home' => t('Home'),
+                '$work' => t('Work'),
+                '$other' => t('Other'),
+                '$add_card' => t('Add Contact'),
+                '$add_field' => t('Add Field'),
+                '$create' => t('Create'),
+                '$update' => t('Update'),
+                '$delete' => t('Delete'),
+                '$cancel' => t('Cancel'),
+            ));
+
+            $arr = array('profile' => $r[0], 'entry' => $o);
+            Hook::call('profile_edit', $arr);
+
+            return $o;
+        } else {
+            $r = q(
+                "SELECT * FROM profile WHERE uid = %d",
+                local_channel()
+            );
+            if ($r) {
+                $tpl = Theme::get_template('profile_entry.tpl');
+                foreach ($r as $rr) {
+                    $profiles .= replace_macros($tpl, array(
+                        '$photo' => $rr['thumb'],
+                        '$id' => $rr['id'],
+                        '$alt' => t('Profile Image'),
+                        '$profile_name' => $rr['profile_name'],
+                        '$visible' => (($rr['is_default'])
+                            ? '' . translate_scope(map_scope(PermissionLimits::Get($channel['channel_id'], 'view_profile'))) . ''
+                            : '' . t('Edit visibility') . '')
+                    ));
+                }
+
+                $tpl_header = Theme::get_template('profile_listing_header.tpl');
+                $o .= replace_macros($tpl_header, array(
+                    '$header' => t('Edit Profiles'),
+                    '$cr_new' => t('Create New'),
+                    '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
+                    '$profiles' => $profiles
+                ));
+            }
+            return $o;
+        }
+    }
+
+    public static function profile_activity($changed, $value)
+    {
+
+        if (!local_channel() || !is_array($changed) || !count($changed)) {
+            return;
+        }
+
+        if (!get_pconfig(local_channel(), 'system', 'post_profilechange')) {
+            return;
+        }
+
+        $self = App::get_channel();
+
+        if (!$self) {
+            return;
+        }
+
+        $arr = [];
+        $uuid = new_uuid();
+        $mid = z_root() . '/item/' . $uuid;
+
+        $arr['uuid'] = $uuid;
+        $arr['mid'] = $arr['parent_mid'] = $mid;
+        $arr['uid'] = local_channel();
+        $arr['aid'] = $self['channel_account_id'];
+        $arr['owner_xchan'] = $arr['author_xchan'] = $self['xchan_hash'];
+
+        $arr['item_wall'] = 1;
+        $arr['item_origin'] = 1;
+        $arr['item_thread_top'] = 1;
+        $arr['verb'] = ACTIVITY_UPDATE;
+        $arr['obj_type'] = ACTIVITY_OBJ_PROFILE;
+
+        $arr['plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']);
+
+        $A = '[url=' . z_root() . '/channel/' . $self['channel_address'] . ']' . $self['channel_name'] . '[/url]';
+
+
+        $changes = '';
+        $t = count($changed);
+        $z = 0;
+        foreach ($changed as $ch) {
+            if (strlen($changes)) {
+                if ($z == ($t - 1)) {
+                    $changes .= t(' and ');
+                } else {
+                    $changes .= t(', ');
+                }
+            }
+            $z++;
+            $changes .= $ch;
+        }
+
+        $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]';
+
+        if ($t == 1 && strlen($value)) {
+            // if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to.
+            $value = preg_replace_callback("/([^\]\='" . '"' . "]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ismu", 'red_zrl_callback', $value);
+            // take out the bookmark indicator
+            if (substr($value, 0, 2) === '#^') {
+                $value = str_replace('#^', '', $value);
+            }
+
+            $message = sprintf(t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
+            $message .= "\n\n" . sprintf(t('Visit %1$s\'s %2$s'), $A, $prof);
+        } else {
+            $message = sprintf(t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+        }
+
+        $arr['body'] = $message;
+
+        $arr['obj'] = [
+            'type' => ACTIVITY_OBJ_PROFILE,
+            'summary' => bbcode($message),
+            'source' => ['mediaType' => 'text/x-multicode', 'summary' => $message],
+            'id' => $self['xchan_url'],
+            'url' => z_root() . '/profile/' . $self['channel_address']
+        ];
+
+
+        $arr['allow_cid'] = $self['channel_allow_cid'];
+        $arr['allow_gid'] = $self['channel_allow_gid'];
+        $arr['deny_cid'] = $self['channel_deny_cid'];
+        $arr['deny_gid'] = $self['channel_deny_gid'];
+
+        $res = item_store($arr);
+        $i = $res['item_id'];
+
+        if ($i) {
+            // FIXME - limit delivery in notifier.php to those specificed in the perms argument
+            Run::Summon(['Notifier', 'activity', $i, 'PERMS_R_PROFILE']);
+        }
+    }
+
+    public static function gender_selector($current = "", $suffix = "")
+    {
+        $o = '';
+        $select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided'));
+
+        Hook::call('gender_selector', $select);
+
+        $o .= "';
+        return $o;
+    }
+
+    public static function gender_selector_min($current = "", $suffix = "")
+    {
+        $o = '';
+        $select = array('', t('Male'), t('Female'), t('Other'));
+
+        Hook::call('gender_selector_min', $select);
+
+        $o .= "';
+        return $o;
+    }
+
+    public static function pronouns_selector($current = "", $suffix = "")
+    {
+        $o = '';
+        $select = array('', t('He/Him'), t('She/Her'), t('They/Them'));
+
+        Hook::call('pronouns_selector', $select);
+
+        $o .= "';
+        return $o;
+    }
+
+
+    public static function gender_text($current = "", $suffix = "")
+    {
+        $o = '';
+
+        if (!get_config('system', 'profile_gender_textfield')) {
+            return $o;
+        }
+
+        $o .= "";
+        return $o;
+    }
+
+
+    public static function sexpref_selector($current = "", $suffix = "")
+    {
+        $o = '';
+        $select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
+
+
+        Hook::call('sexpref_selector', $select);
+
+        $o .= "';
+        return $o;
+    }
+
+
+    public static function sexpref_selector_min($current = "", $suffix = "")
+    {
+        $o = '';
+        $select = array('', t('Males'), t('Females'), t('Other'));
+
+        Hook::call('sexpref_selector_min', $select);
+
+        $o .= "';
+        return $o;
+    }
+
+
+    public static function marital_selector($current = "", $suffix = "")
+    {
+        $o = '';
+        $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me'));
+
+        Hook::call('marital_selector', $select);
+
+        $o .= "';
+        return $o;
+    }
+
+    public static function marital_selector_min($current = "", $suffix = "")
+    {
+        $o = '';
+        $select = array('', t('Single'), t('Dating'), t('Cohabiting'), t('Married'), t('Separated'), t('Divorced'), t('Widowed'), t('It\'s complicated'), t('Other'));
+
+        Hook::call('marital_selector_min', $select);
+
+        $o .= "';
+        return $o;
+    }
+}
diff --git a/Code/Module/Profperm.php b/Code/Module/Profperm.php
new file mode 100644
index 000000000..da1e71295
--- /dev/null
+++ b/Code/Module/Profperm.php
@@ -0,0 +1,183 @@
+ 2) && intval(argv(1)) && intval(argv(2))) {
+            $r = q(
+                "SELECT abook_id FROM abook WHERE abook_id = %d and abook_channel = %d limit 1",
+                intval(argv(2)),
+                intval(local_channel())
+            );
+            if ($r) {
+                $change = intval(argv(2));
+            }
+        }
+
+
+        if ((argc() > 1) && (intval(argv(1)))) {
+            $r = q(
+                "SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1",
+                intval(argv(1)),
+                intval(local_channel())
+            );
+            if (!$r) {
+                notice(t('Invalid profile identifier.') . EOL);
+                return;
+            }
+
+            $profile = $r[0];
+
+            $r = q(
+                "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'",
+                intval(local_channel()),
+                dbesc($profile['profile_guid'])
+            );
+
+            $ingroup = [];
+            if ($r) {
+                foreach ($r as $member) {
+                    $ingroup[] = $member['abook_id'];
+                }
+            }
+
+            $members = $r;
+
+            if ($change) {
+                if (in_array($change, $ingroup)) {
+                    q(
+                        "UPDATE abook SET abook_profile = '' WHERE abook_id = %d AND abook_channel = %d",
+                        intval($change),
+                        intval(local_channel())
+                    );
+                } else {
+                    q(
+                        "UPDATE abook SET abook_profile = '%s' WHERE abook_id = %d AND abook_channel = %d",
+                        dbesc($profile['profile_guid']),
+                        intval($change),
+                        intval(local_channel())
+                    );
+                }
+
+                $r = q(
+                    "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash 
+					WHERE abook_channel = %d AND abook_profile = '%s'",
+                    intval(local_channel()),
+                    dbesc($profile['profile_guid'])
+                );
+
+                $members = $r;
+
+                $ingroup = [];
+                if (count($r)) {
+                    foreach ($r as $member) {
+                        $ingroup[] = $member['abook_id'];
+                    }
+                }
+            }
+
+            $o .= '
      ' . t('Profile Visibility Editor') . '
      ';
+
+            $o .= '
      ' . t('Profile') . ' \'' . $profile['profile_name'] . '\'
      ';
+
+            $o .= '
      ' . t('Click on a contact to add or remove.') . '
      ';
+        }
+
+        $o .= '
      ';
+        if ($change) {
+            $o = '';
+        }
+
+        $o .= '
      ';
+        $o .= '
      ' . t('Visible To') . '
      ';
+        $o .= '
      ';
+        $o .= '
      ';
+
+        $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
+
+        foreach ($members as $member) {
+            if ($member['xchan_url']) {
+                $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
+                $o .= micropro($member, true, 'mpprof', $textmode);
+            }
+        }
+        $o .= '
      ';
+        $o .= '
      ';
+
+        $o .= '
      ';
+        $o .= '
      ' . t("All Connections") . '
      ';
+        $o .= '
      ';
+        $o .= '
      ';
+
+        $r = abook_connections(local_channel());
+
+        if ($r) {
+            $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
+            foreach ($r as $member) {
+                if (!in_array($member['abook_id'], $ingroup)) {
+                    $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
+                    $o .= micropro($member, true, 'mpprof', $textmode);
+                }
+            }
+        }
+
+        $o .= '
      ';
+
+        if ($change) {
+            echo $o;
+            killme();
+        }
+        $o .= '
      ';
+        return $o;
+    }
+}
diff --git a/Code/Module/Pubstream.php b/Code/Module/Pubstream.php
new file mode 100644
index 000000000..4d90c5156
--- /dev/null
+++ b/Code/Module/Pubstream.php
@@ -0,0 +1,305 @@
+updating)) {
+            $channel = App::get_channel();
+
+            $channel_acl = array(
+                'allow_cid' => $channel['channel_allow_cid'],
+                'allow_gid' => $channel['channel_allow_gid'],
+                'deny_cid' => $channel['channel_deny_cid'],
+                'deny_gid' => $channel['channel_deny_gid']
+            );
+
+            $x = array(
+                'is_owner' => true,
+                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
+                'default_location' => $channel['channel_location'],
+                'nickname' => $channel['channel_address'],
+                'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
+                'permissions' => $channel_acl,
+                'bang' => '',
+                'visitor' => true,
+                'profile_uid' => local_channel(),
+                'return_path' => 'channel/' . $channel['channel_address'],
+                'expanded' => true,
+                'editor_autocomplete' => true,
+                'bbco_autocomplete' => 'bbcode',
+                'bbcode' => true,
+                'jotnets' => true,
+                'reset' => t('Reset form')
+            );
+
+            $o = '
      ';
+            $o .= status_editor($x);
+            $o .= '
      ';
+        }
+
+        if (!$this->updating && !$this->loading) {
+            Navbar::set_selected(t('Public Stream'));
+
+            if (!$mid) {
+                $_SESSION['loadtime_pubstream'] = datetime_convert();
+                if (local_channel()) {
+                    PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']);
+                }
+            }
+
+            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 1);
+
+            $maxheight = get_config('system', 'home_divmore_height');
+            if (!$maxheight) {
+                $maxheight = 400;
+            }
+
+            $o .= '
      ' . "\r\n";
+            $o .= "\r\n";
+
+            // if we got a decoded hash we must encode it again before handing to javascript
+            $mid = gen_link_id($mid);
+
+            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), array(
+                '$baseurl' => z_root(),
+                '$pgtype' => 'pubstream',
+                '$uid' => ((local_channel()) ? local_channel() : '0'),
+                '$gid' => '0',
+                '$cid' => '0',
+                '$cmin' => '(-1)',
+                '$cmax' => '(-1)',
+                '$star' => '0',
+                '$liked' => '0',
+                '$conv' => '0',
+                '$spam' => '0',
+                '$fh' => '1',
+                '$dm' => '0',
+                '$nouveau' => '0',
+                '$wall' => '0',
+                '$draft' => '0',
+                '$list' => '0',
+                '$static' => $static,
+                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+                '$search' => '',
+                '$xchan' => '',
+                '$order' => 'comment',
+                '$file' => '',
+                '$cats' => '',
+                '$tags' => (($hashtags) ? urlencode($hashtags) : ''),
+                '$dend' => '',
+                '$mid' => (($mid) ? urlencode($mid) : ''),
+                '$verb' => '',
+                '$net' => (($net) ? urlencode($net) : ''),
+                '$dbegin' => ''
+            ));
+        }
+
+        if ($this->updating && !$this->loading) {
+            // only setup pagination on initial page view
+            $pager_sql = '';
+        } else {
+            $itemspage = ((local_channel()) ? get_pconfig(local_channel(), 'system', 'itemspage', 20) : 20);
+            App::set_pager_itemspage($itemspage);
+            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+        }
+
+        require_once('include/channel.php');
+        require_once('include/security.php');
+
+        if ($public_stream_mode === PUBLIC_STREAM_SITE) {
+            $uids = " and item_private = 0  and item_wall = 1 ";
+        } else {
+            $sys = Channel::get_system();
+            $uids = " and item_private = 0 and item_wall = 0 and item.uid  = " . intval($sys['channel_id']) . " ";
+            $sql_extra = item_permissions_sql($sys['channel_id']);
+            App::$data['firehose'] = intval($sys['channel_id']);
+        }
+
+        if (get_config('system', 'public_list_mode')) {
+            $page_mode = 'list';
+        } else {
+            $page_mode = 'client';
+        }
+
+
+        if (x($hashtags)) {
+            $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+        }
+
+        $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
+        $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
+
+        if (isset(App::$profile) && isset(App::$profile['profile_uid'])) {
+            $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
+        }
+
+        $simple_update = ((isset($_SESSION['loadtime_pubstream']) && $_SESSION['loadtime_pubstream']) ? " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_pubstream']) . "' " : '');
+
+        if ($this->loading) {
+            $simple_update = '';
+        }
+
+        if ($static && $simple_update) {
+            $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
+        }
+
+        //logger('update: ' . $this->updating . ' load: ' . $this->loading);
+
+        if ($this->updating) {
+            $ordering = "commented";
+
+            if ($this->loading) {
+                if ($mid) {
+                    $r = q(
+                        "SELECT parent AS item_id FROM item
+						left join abook on item.author_xchan = abook.abook_xchan 
+						$net_query
+						WHERE mid like '%s' $uids $item_normal
+						and (abook.abook_blocked = 0 or abook.abook_flags is null)
+						$sql_extra $net_query2 LIMIT 1",
+                        dbesc($mid . '%')
+                    );
+                } else {
+                    // Fetch a page full of parent items for this page
+                    $r = q("SELECT item.id AS item_id FROM item 
+						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
+						$net_query
+						WHERE true $uids and item.item_thread_top = 1 $item_normal
+						and (abook.abook_blocked = 0 or abook.abook_flags is null)
+						$sql_extra $net_query2
+						ORDER BY $ordering DESC $pager_sql ");
+                }
+            } elseif ($this->updating) {
+                if ($mid) {
+                    $r = q(
+                        "SELECT parent AS item_id FROM item
+						left join abook on item.author_xchan = abook.abook_xchan
+						$net_query
+						WHERE mid like '%s' $uids $item_normal_update $simple_update
+						and (abook.abook_blocked = 0 or abook.abook_flags is null)
+						$sql_extra $net_query2 LIMIT 1",
+                        dbesc($mid . '%')
+                    );
+                } else {
+                    $r = q("SELECT parent AS item_id FROM item
+						left join abook on item.author_xchan = abook.abook_xchan
+						$net_query
+						WHERE true $uids $item_normal_update
+						$simple_update
+						and (abook.abook_blocked = 0 or abook.abook_flags is null)
+						$sql_extra $net_query2");
+                }
+            }
+
+            // Then fetch all the children of the parents that are on this page
+            $parents_str = '';
+            $update_unseen = '';
+
+            if ($r) {
+                $parents_str = ids_to_querystr($r, 'item_id');
+
+                $items = q(
+                    "SELECT item.*, item.id AS item_id FROM item
+					WHERE true $uids $item_normal
+					AND item.parent IN ( %s )
+					$sql_extra ",
+                    dbesc($parents_str)
+                );
+
+                // use effective_uid param of xchan_query to help sort out comment permission
+                // for sys_channel owned items.
+
+                xchan_query($items, true, (($sys) ? local_channel() : 0));
+                $items = fetch_post_tags($items, true);
+                $items = conv_sort($items, $ordering);
+            } else {
+                $items = [];
+            }
+        }
+
+        if ($mid && local_channel()) {
+            $ids = ids_to_array($items, 'item_id');
+            $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []);
+            if (!$seen) {
+                $seen = [];
+            }
+            $seen = array_merge($ids, $seen);
+            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
+        }
+
+        // fake it
+        $mode = ('pubstream');
+
+        $o .= conversation($items, $mode, $this->updating, $page_mode);
+
+        if ($mid) {
+            $o .= '
      ';
+        }
+
+        if (($items) && (!$this->updating)) {
+            $o .= alt_pager(count($items));
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Q.php b/Code/Module/Q.php
new file mode 100644
index 000000000..d67eac03a
--- /dev/null
+++ b/Code/Module/Q.php
@@ -0,0 +1,30 @@
+ false];
+
+        $h = argv(1);
+        if (!$h) {
+            json_return_and_die($ret);
+        }
+
+        $r = q(
+            "select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0",
+            dbesc($h)
+        );
+        if ($r) {
+            $ret['success'] = true;
+            $ret['results'] = ids_to_array($r, 'hubloc_id_url');
+        }
+        json_return_and_die($ret);
+    }
+}
diff --git a/Code/Module/README.md b/Code/Module/README.md
new file mode 100644
index 000000000..a6c1917e1
--- /dev/null
+++ b/Code/Module/README.md
@@ -0,0 +1,76 @@
+Code/Module
+==============
+
+
+This directory contains controller modules for handling web requests. The
+lowercase class name indicates the head of the URL path which this module
+handles. There are other methods of attaching (routing) URL paths to
+controllers, but this is the primary method used in this project.
+
+Module controllers MUST reside in this directory and namespace to be
+autoloaded (unless other specific routing methods are employed). They
+typically use and extend the class definition in Code/Web/Controller 
+as a template. 
+
+Template:
+
+	 $item['mid']]);
+            $n['obj_type'] = ((array_path_exists('obj/type', $n)) ? $n['obj']['type'] : EMPTY_STR);
+
+            $n['tgt_type'] = 'Image';
+
+            $n['target'] = [
+                'type' => 'Image',
+                'name' => $emoji,
+                'url' => z_root() . '/images/emoji/' . $emoji . '.png'
+            ];
+
+            $x = item_store($n);
+
+            retain_item($postid);
+
+            if ($x['success']) {
+                $nid = $x['item_id'];
+                Run::Summon(['Notifier', 'like', $nid]);
+            }
+        }
+    }
+}
diff --git a/Code/Module/Register.php b/Code/Module/Register.php
new file mode 100644
index 000000000..fae8eea39
--- /dev/null
+++ b/Code/Module/Register.php
@@ -0,0 +1,314 @@
+ 1) ? argv(1) : '');
+
+        // Provide a stored request for somebody desiring a connection
+        // when they first need to register someplace. Once they've
+        // created a channel, we'll try to revive the connection request
+        // and process it.
+
+        if ($_REQUEST['connect']) {
+            $_SESSION['connect'] = $_REQUEST['connect'];
+        }
+
+        switch ($cmd) {
+            case 'invite_check.json':
+                $result = Account::check_invite($_REQUEST['invite_code']);
+                break;
+            case 'email_check.json':
+                $result = Account::check_email($_REQUEST['email']);
+                break;
+            case 'password_check.json':
+                $result = Account::check_password($_REQUEST['password1']);
+                break;
+            default:
+                break;
+        }
+        if ($result) {
+            json_return_and_die($result);
+        }
+    }
+
+
+    public function post()
+    {
+        // security token is session_id() based and we have a transient session, so we can't use it here.
+        //check_form_security_token_redirectOnErr('/register', 'register');
+
+        $max_dailies = intval(get_config('system', 'max_daily_registrations'));
+        if ($max_dailies) {
+            $r = q(
+                "select count(account_id) as total from account where account_created > %s - INTERVAL %s",
+                db_utcnow(),
+                db_quoteinterval('1 day')
+            );
+            if ($r && intval($r[0]['total']) >= $max_dailies) {
+                notice(t('Maximum daily site registrations exceeded. Please try again tomorrow.') . EOL);
+                return;
+            }
+        }
+
+        if (Config::Get('system','tos_required') && !(isset($_POST['tos']) && intval($_POST['tos']))) {
+            notice(t('Please indicate acceptance of the Terms of Service. Registration failed.') . EOL);
+            return;
+        }
+
+        $policy = get_config('system', 'register_policy');
+
+        $email_verify = get_config('system', 'verify_email');
+
+
+        switch ($policy) {
+            case REGISTER_OPEN:
+                $flags = ACCOUNT_OK;
+                break;
+
+            case REGISTER_APPROVE:
+                $flags = ACCOUNT_BLOCKED | ACCOUNT_PENDING;
+                break;
+
+            default:
+            case REGISTER_CLOSED:
+                if (!is_site_admin()) {
+                    notice(t('Permission denied.') . EOL);
+                    return;
+                }
+                $flags = ACCOUNT_BLOCKED;
+                break;
+        }
+
+        if ($email_verify && $policy == REGISTER_OPEN) {
+            $flags = $flags | ACCOUNT_UNVERIFIED;
+        }
+
+
+        if ((!$_POST['password']) || ($_POST['password'] !== $_POST['password2'])) {
+            notice(t('Passwords do not match.') . EOL);
+            return;
+        }
+
+        $arr = $_POST;
+        $arr['account_flags'] = $flags;
+
+        $result = Account::create($arr);
+
+        if (!$result['success']) {
+            notice($result['message']);
+            return;
+        }
+
+        require_once('include/security.php');
+
+
+        if ($_REQUEST['name']) {
+            set_aconfig($result['account']['account_id'], 'register', 'channel_name', $_REQUEST['name']);
+        }
+        if ($_REQUEST['nickname']) {
+            set_aconfig($result['account']['account_id'], 'register', 'channel_address', $_REQUEST['nickname']);
+        }
+        if ($_REQUEST['permissions_role']) {
+            set_aconfig($result['account']['account_id'], 'register', 'permissions_role', $_REQUEST['permissions_role']);
+        }
+
+        // At this point the account has been created without error. Purge any error messages from prior failed registration
+        // attempts which haven't yet been delivered to the browser and start fresh. If you're willing to figure out why they
+        // weren't delivered to the browser please adopt zap issue 34.
+
+        $_SESSION['sysmsg'] = [];
+
+        $using_invites = intval(get_config('system', 'invitation_only'));
+        $num_invites = intval(get_config('system', 'number_invites'));
+        $invite_code = ((x($_POST, 'invite_code')) ? notags(trim($_POST['invite_code'])) : '');
+
+        if ($using_invites && $invite_code && defined('INVITE_WORKING')) {
+            q("delete from register where hash = '%s'", dbesc($invite_code));
+            // @FIXME - this also needs to be considered when using 'invites_remaining' in mod/invite.php
+            set_aconfig($result['account']['account_id'], 'system', 'invites_remaining', $num_invites);
+        }
+
+        if ($policy == REGISTER_OPEN) {
+            if ($email_verify) {
+                $res = Account::verify_email_address($result);
+            } else {
+                $res = Account::send_register_success_email($result['email'], $result['password']);
+            }
+            if ($res) {
+                if ($invite_code) {
+                    info(t('Registration successful. Continue to create your first channel...') . EOL);
+                } else {
+                    info(t('Registration successful. Please check your email for validation instructions.') . EOL);
+                }
+            }
+        } elseif ($policy == REGISTER_APPROVE) {
+            $res = Account::send_reg_approval_email($result);
+            if ($res) {
+                info(t('Your registration is pending approval by the site owner.') . EOL);
+            } else {
+                notice(t('Your registration can not be processed.') . EOL);
+            }
+            goaway(z_root());
+        }
+
+        if ($email_verify) {
+            goaway(z_root() . '/email_validation/' . bin2hex($result['email']));
+        }
+
+        // fall through and authenticate if no approvals or verifications were required.
+
+        authenticate_success($result['account'], null, true, false, true);
+
+        $new_channel = false;
+        $next_page = 'new_channel';
+
+        if (get_config('system', 'auto_channel_create')) {
+            $new_channel = Channel::auto_create($result['account']['account_id']);
+            if ($new_channel['success']) {
+                $channel_id = $new_channel['channel']['channel_id'];
+                change_channel($channel_id);
+                $next_page = '~';
+            } else {
+                $new_channel = false;
+            }
+        }
+
+        $x = get_config('system', 'workflow_register_next');
+        if ($x) {
+            $next_page = $x;
+            $_SESSION['workflow'] = true;
+        }
+
+        unset($_SESSION['login_return_url']);
+        goaway(z_root() . '/' . $next_page);
+    }
+
+
+    public function get()
+    {
+
+        $registration_is = EMPTY_STR;
+        $other_sites = false;
+
+        if (intval(get_config('system', 'register_policy')) === REGISTER_CLOSED) {
+            notice(t('Registration on this website is disabled.') . EOL);
+            if (intval(get_config('system', 'directory_mode')) === DIRECTORY_MODE_STANDALONE) {
+                return EMPTY_STR;
+            } else {
+                $other_sites = true;
+            }
+        }
+
+        if (intval(get_config('system', 'register_policy')) == REGISTER_APPROVE) {
+            $registration_is = t('Registration on this website is by approval only.');
+            $other_sites = true;
+        }
+
+        $invitations = false;
+
+        if (intval(get_config('system', 'invitation_only')) && defined('INVITE_WORKING')) {
+            $invitations = true;
+            $registration_is = t('Registration on this site is by invitation only.');
+            $other_sites = true;
+        }
+
+        $max_dailies = intval(get_config('system', 'max_daily_registrations'));
+        if ($max_dailies) {
+            $r = q(
+                "select count(account_id) as total from account where account_created > %s - INTERVAL %s",
+                db_utcnow(),
+                db_quoteinterval('1 day')
+            );
+            if ($r && $r[0]['total'] >= $max_dailies) {
+                logger('max daily registrations exceeded.');
+                notice(t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
+                return;
+            }
+        }
+
+        $privacy_role = ((x($_REQUEST, 'permissions_role')) ? $_REQUEST['permissions_role'] : "");
+
+        $perm_roles = PermissionRoles::roles();
+
+        // Configurable terms of service link
+
+        $tosurl = get_config('system', 'tos_url');
+        if (!$tosurl) {
+            $tosurl = z_root() . '/help/TermsOfService';
+        }
+
+        $toslink = '' . t('Terms of Service') . '';
+
+        // Configurable whether to restrict age or not - default is based on international legal requirements
+        // This can be relaxed if you are on a restricted server that does not share with public servers
+
+        if (get_config('system', 'no_age_restriction')) {
+            $label_tos = sprintf(t('I accept the %s for this website'), $toslink);
+        } else {
+            $age = get_config('system', 'minimum_age');
+            if (!$age) {
+                $age = 13;
+            }
+            $label_tos = sprintf(t('I am over %s years of age and accept the %s for this website'), $age, $toslink);
+        }
+
+        $enable_tos = Config::Get('system','tos_required');
+
+        $email = ['email', t('Your email address'), ((x($_REQUEST, 'email')) ? strip_tags(trim($_REQUEST['email'])) : ""), '', '', ' required '];
+        $password = ['password', t('Choose a password'), '', '', '', ' required '];
+        $password2 = ['password2', t('Please re-enter your password'), '', '', '', ' required '];
+        $invite_code = ['invite_code', t('Please enter your invitation code'), ((x($_REQUEST, 'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")];
+        $name = ['name', t('Your Name'), ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.')];
+        $nickhub = '@' . str_replace(array('http://', 'https://', '/'), '', get_config('system', 'baseurl'));
+        $nickname = ['nickname', t('Choose a short nickname'), ((x($_REQUEST, 'nickname')) ? $_REQUEST['nickname'] : ''), sprintf(t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub)];
+        $role = ['permissions_role', t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role for your usage needs and privacy requirements.'), $perm_roles];
+        $tos = ['tos', $label_tos, '', '', [t('no'), t('yes')], ' required '];
+
+
+        $auto_create = (get_config('system', 'auto_channel_create') ? true : false);
+        $default_role = get_config('system', 'default_permissions_role');
+        $email_verify = get_config('system', 'verify_email');
+
+
+        $o = replace_macros(Theme::get_template('register.tpl'), [
+            '$form_security_token' => get_form_security_token("register"),
+            '$title' => t('Registration'),
+            '$reg_is' => $registration_is,
+            '$registertext' => bbcode(get_config('system', 'register_text')),
+            '$other_sites' => (($other_sites) ? t('Show affiliated sites - some of which may allow registration.') : EMPTY_STR),
+            '$invitations' => $invitations,
+            '$invite_code' => $invite_code,
+            '$auto_create' => $auto_create,
+            '$name' => $name,
+            '$role' => $role,
+            '$default_role' => $default_role,
+            '$nickname' => $nickname,
+            '$enable_tos' => $enable_tos,
+            '$tos' => $tos,
+            '$email' => $email,
+            '$pass1' => $password,
+            '$pass2' => $password2,
+            '$submit' => t('Register'),
+            '$verify_note' => (($email_verify) ? t('This site requires email verification. After completing this form, please check your email for further instructions.') : ''),
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Regmod.php b/Code/Module/Regmod.php
new file mode 100644
index 000000000..7e94aac8b
--- /dev/null
+++ b/Code/Module/Regmod.php
@@ -0,0 +1,50 @@
+ NULL_DATE) {
+            $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours');
+            if ($account['account_password_changed'] > d1) {
+                notice(t('Account removals are not allowed within 48 hours of changing the account password.') . EOL);
+                return;
+            }
+        }
+
+        Account::remove($account_id);
+    }
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            goaway(z_root());
+        }
+
+        $hash = random_string();
+
+        $_SESSION['remove_account_verify'] = $hash;
+
+        $o .= replace_macros(Theme::get_template('removeaccount.tpl'), [
+            '$basedir' => z_root(),
+            '$hash' => $hash,
+            '$title' => t('Remove This Account'),
+            '$desc' => [t('WARNING: '), t('This account and all its channels will be completely removed from this server. '), t('This action is permanent and can not be undone!')],
+            '$passwd' => t('Please enter your password for verification:'),
+            '$submit' => t('Remove Account')
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Removeme.php b/Code/Module/Removeme.php
new file mode 100644
index 000000000..8cf6f8dfb
--- /dev/null
+++ b/Code/Module/Removeme.php
@@ -0,0 +1,82 @@
+ NULL_DATE) {
+            $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours');
+            if ($account['account_password_changed'] > $d1) {
+                notice(t('Channel removals are not allowed within 48 hours of changing the account password.') . EOL);
+                return;
+            }
+        }
+
+        Channel::channel_remove(local_channel(), true, true);
+    }
+
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            goaway(z_root());
+        }
+
+        $hash = random_string();
+
+        $_SESSION['remove_channel_verify'] = $hash;
+
+        $o .= replace_macros(Theme::get_template('removeme.tpl'), [
+            '$basedir' => z_root(),
+            '$hash' => $hash,
+            '$title' => t('Remove This Channel'),
+            '$desc' => [t('WARNING: '), t('This channel will be completely removed from this server. '), t('This action is permanent and can not be undone!')],
+            '$passwd' => t('Please enter your password for verification:'),
+            '$submit' => t('Remove Channel')
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Rmagic.php b/Code/Module/Rmagic.php
new file mode 100644
index 000000000..62634a048
--- /dev/null
+++ b/Code/Module/Rmagic.php
@@ -0,0 +1,96 @@
+ $address];
+            Hook::call('reverse_magic_auth', $arr);
+
+            // if they're still here...
+            notice(t('Authentication failed.') . EOL);
+            return;
+        } else {
+            // Presumed Red identity. Perform reverse magic auth
+
+            if (strpos($address, '@') === false) {
+                notice('Invalid address.');
+                return;
+            }
+
+            $r = null;
+            if ($address) {
+                $r = q(
+                    "select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
+                    dbesc($address)
+                );
+            }
+            if ($r) {
+                $url = $r[0]['hubloc_url'];
+            } else {
+                $url = 'https://' . substr($address, strpos($address, '@') + 1);
+            }
+
+            if ($url) {
+                if ($_SESSION['return_url']) {
+                    $dest = bin2hex(z_root() . '/' . str_replace('zid=', 'zid_=', $_SESSION['return_url']));
+                } else {
+                    $dest = bin2hex(z_root() . '/' . str_replace(['rmagic', 'zid='], ['', 'zid_='], App::$query_string));
+                }
+                goaway($url . '/magic' . '?f=&owa=1&bdest=' . $dest);
+            }
+        }
+    }
+
+
+    public function get()
+    {
+        return replace_macros(
+            Theme::get_template('rmagic.tpl'),
+            [
+                '$title' => t('Remote Authentication'),
+                '$address' => ['address', t('Enter your channel address (e.g. channel@example.com)'), '', ''],
+                '$action' => 'rmagic',
+                '$method' => 'post',
+                '$submit' => t('Authenticate')
+            ]
+        );
+    }
+}
diff --git a/Code/Module/Rpost.php b/Code/Module/Rpost.php
new file mode 100644
index 000000000..c316487cb
--- /dev/null
+++ b/Code/Module/Rpost.php
@@ -0,0 +1,258 @@
+ $arg) {
+                        if ($key === 'req') {
+                            continue;
+                        }
+                        $url .= '&' . $key . '=' . $arg;
+                    }
+                    goaway($url);
+                }
+            }
+
+            // The login procedure is going to bugger our $_REQUEST variables
+            // so save them in the session.
+
+            if (array_key_exists('body', $_REQUEST)) {
+                $_SESSION['rpost'] = $_REQUEST;
+            }
+            return login();
+        }
+
+        Navbar::set_selected('Post');
+
+        if (local_channel() && array_key_exists('userfile', $_FILES)) {
+            $channel = App::get_channel();
+            $observer = App::get_observer();
+
+            $def_album = get_pconfig($channel['channel_id'], 'system', 'photo_path');
+            $def_attach = get_pconfig($channel['channel_id'], 'system', 'attach_path');
+
+            $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [
+                'source' => 'editor',
+                'visible' => 0,
+                'album' => $def_album,
+                'directory' => $def_attach,
+                'flags' => 1, // indicates temporary permissions are created
+                'allow_cid' => '<' . $channel['channel_hash'] . '>'
+            ]);
+
+            if (!$r['success']) {
+                notice($r['message'] . EOL);
+            }
+
+            $s = EMPTY_STR;
+
+            if (intval($r['data']['is_photo'])) {
+                $s .= "\n\n" . $r['body'] . "\n\n";
+            }
+
+            $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
+
+            if (strpos($r['data']['filetype'], 'video') === 0) {
+                for ($n = 0; $n < 15; $n++) {
+                    $thumb = Linkinfo::get_video_poster($url);
+                    if ($thumb) {
+                        break;
+                    }
+                    sleep(1);
+                    continue;
+                }
+
+                if ($thumb) {
+                    $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n";
+                } else {
+                    $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n";
+                }
+            }
+            if (strpos($r['data']['filetype'], 'audio') === 0) {
+                $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n";
+            }
+            if ($r['data']['filetype'] === 'image/svg+xml') {
+                $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+                if ($x) {
+                    $bb = svg2bb($x);
+                    if ($bb) {
+                        $s .= "\n\n" . $bb;
+                    } else {
+                        logger('empty return from svgbb');
+                    }
+                } else {
+                    logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+                }
+            }
+            if ($r['data']['filetype'] === 'text/vnd.abc' && Addon::is_installed('abc')) {
+                $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+                if ($x) {
+                    $s .= "\n\n" . '[abc]' . $x . '[/abc]';
+                } else {
+                    logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+                }
+            }
+            if ($r['data']['filetype'] === 'text/calendar') {
+                $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+                if ($content) {
+                    $ev = ical_to_ev($content);
+                    if ($ev) {
+                        $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n";
+                    }
+                }
+            }
+
+            $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+            $_REQUEST['body'] = ((array_key_exists('body', $_REQUEST)) ? $_REQUEST['body'] . $s : $s);
+        }
+
+        // If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables
+
+        if ((!array_key_exists('body', $_REQUEST)) && (array_key_exists('rpost', $_SESSION))) {
+            $_REQUEST = $_SESSION['rpost'];
+            unset($_SESSION['rpost']);
+        }
+
+        if (array_key_exists('channel', $_REQUEST)) {
+            $r = q(
+                "select channel_id from channel where channel_account_id = %d and channel_address = '%s' limit 1",
+                intval(get_account_id()),
+                dbesc($_REQUEST['channel'])
+            );
+            if ($r) {
+                require_once('include/security.php');
+                $change = change_channel($r[0]['channel_id']);
+            }
+        }
+
+        if ($_REQUEST['remote_return']) {
+            $_SESSION['remote_return'] = $_REQUEST['remote_return'];
+        }
+
+        if (argc() > 1 && argv(1) === 'return') {
+            if ($_SESSION['remote_return']) {
+                goaway($_SESSION['remote_return']);
+            }
+            goaway(z_root() . '/stream');
+        }
+
+        $plaintext = true;
+
+        if (array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html' && isset($_REQUEST['body'])) {
+            require_once('include/html2bbcode.php');
+            $_REQUEST['body'] = html2bbcode($_REQUEST['body']);
+        }
+
+        $channel = App::get_channel();
+
+        $acl = new AccessControl($channel);
+
+        if (array_key_exists('to', $_REQUEST) && $_REQUEST['to']) {
+            $acl->set(['allow_cid' => '<' . $_REQUEST['to'] . '>',
+                    'allow_gid' => EMPTY_STR,
+                    'deny_cid' => EMPTY_STR,
+                    'deny_gid' => EMPTY_STR]);
+			if (! (isset($_REQUEST['body']) && $_REQUEST['body'])) {
+				$xchan = q("select * from xchan where xchan_hash = '%s'",
+					dbesc($_REQUEST['to'])
+				);
+			
+				if ($xchan) {
+					$_REQUEST['body'] .= '@!{' . (($xchan[0]['xchan_addr']) ? $xchan[0]['xchan_addr'] : $xchan[0]['xchan_url']) . '} ' ;
+				}
+			}
+        }
+
+        $channel_acl = $acl->get();
+
+        if ($_REQUEST['url']) {
+            $x = z_fetch_url(z_root() . '/linkinfo?f=&url=' . urlencode($_REQUEST['url']) . '&oembed=1&zotobj=1');
+            if ($x['success']) {
+                $_REQUEST['body'] = $_REQUEST['body'] . $x['body'];
+            }
+        }
+
+        if ($_REQUEST['post_id']) {
+            $_REQUEST['body'] .= '[share=' . intval($_REQUEST['post_id']) . '][/share]';
+        }
+
+        $x = [
+            'is_owner' => true,
+            'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
+            'default_location' => $channel['channel_location'],
+            'nickname' => $channel['channel_address'],
+            'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
+            'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
+            'permissions' => $channel_acl,
+            'bang' => '',
+            'visitor' => true,
+            'profile_uid' => local_channel(),
+            'title' => $_REQUEST['title'],
+            'body' => $_REQUEST['body'],
+            'attachment' => $_REQUEST['attachment'],
+            'source' => ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : ''),
+            'return_path' => 'rpost/return',
+            'bbco_autocomplete' => 'bbcode',
+            'editor_autocomplete' => true,
+            'bbcode' => true,
+            'jotnets' => true,
+            'reset' => t('Reset form')
+        ];
+
+        $editor = status_editor($x);
+
+        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), [
+            '$title' => t('Edit post'),
+            '$cancel' => '',
+            '$editor' => $editor
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Safe.php b/Code/Module/Safe.php
new file mode 100644
index 000000000..b22fceb10
--- /dev/null
+++ b/Code/Module/Safe.php
@@ -0,0 +1,21 @@
+loading) {
+            $_SESSION['loadtime'] = datetime_convert();
+        }
+        Navbar::set_selected('Search');
+
+        $format = (($_REQUEST['format']) ? $_REQUEST['format'] : '');
+        if ($format !== '') {
+            $this->updating = $this->loading = 1;
+        }
+
+        $observer = App::get_observer();
+        $observer_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $o = '' . "\r\n";
+        $o .= '
      ' . "\r\n";
+        $o .= '
      ' . t('Search') . '
      ';
+
+        if (x(App::$data, 'search')) {
+            $search = trim(App::$data['search']);
+        } else {
+            $search = ((x($_GET, 'search')) ? trim(escape_tags(rawurldecode($_GET['search']))) : '');
+        }
+        $tag = false;
+        if (x($_GET, 'tag')) {
+            $tag = true;
+            $search = ((x($_GET, 'tag')) ? trim(escape_tags(rawurldecode($_GET['tag']))) : '');
+        }
+
+        $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
+
+        $o .= search($search, 'search-box', '/search', ((local_channel()) ? true : false));
+
+        // ActivityStreams object fetches from the navbar
+
+        if (local_channel() && strpos($search, 'https://') === 0 && (!$this->updating) && (!$this->loading)) {
+            logger('searching for ActivityPub');
+            if (($pos = strpos($search,'b64.')) !== false) {
+                $search = substr($search,$pos + 4);
+                if (($pos2 = strpos($search,'?')) !== false) {
+                    $search = substr($search,0,$pos2);
+                }
+                $search = base64_decode($search);
+            }
+            logger('Search: ' . $search);
+            $channel = App::get_channel();
+            $hash = EMPTY_STR;
+            $j = Activity::fetch($search, $channel);
+            if ($j) {
+                if (isset($j['type']) && ActivityStreams::is_an_actor($j['type'])) {
+                    Activity::actor_store($j['id'], $j);
+                    goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
+                }
+                $AS = new ActivityStreams($j, null, true);
+                if ($AS->is_valid() && isset($AS->data['type'])) {
+                    if (is_array($AS->obj)) {
+                        // matches Collection and orderedCollection
+                        if (isset($AS->obj['type']) && strpos($AS->obj['type'], 'Collection') !== false) {
+                            // Collections are awkward to process because they can be huge.
+                            // Our strategy is to limit a navbar search to 100 Collection items
+                            // and only fetch the first 10 conversations in the foreground.
+                            // We'll queue the rest, and then send you to a page where
+                            // you can see something we've imported.
+                            // In theory you'll start to see notifications as other conversations
+                            // are fetched in the background while you're looking at the first ones.
+
+                            $max = intval(get_config('system', 'max_imported_search_collection', 100));
+
+                            if (intval($max)) {
+                                $obj = new ASCollection($search, $channel, 0, $max);
+                                $messages = $obj->get();
+                                // logger('received: ' . print_r($messages,true));
+                                $author = null;
+                                if ($messages) {
+                                    logger('received ' . count($messages) . ' items from collection.', LOGGER_DEBUG);
+                                    $processed = 0;
+                                    foreach ($messages as $message) {
+                                        $processed++;
+                                        // only process the first several items in the foreground and
+                                        // queue the remainder.
+                                        if ($processed > 10) {
+                                            $fetch_url = ((is_string($message)) ? $message : EMPTY_STR);
+                                            $fetch_url = ((is_array($message) && array_key_exists('id', $message)) ? $message['id'] : $fetch_url);
+
+                                            if (!$fetch_url) {
+                                                continue;
+                                            }
+
+                                            $hash = new_uuid();
+                                            Queue::insert(
+                                                [
+                                                    'hash' => $hash,
+                                                    'account_id' => $channel['channel_account_id'],
+                                                    'channel_id' => $channel['channel_id'],
+                                                    'posturl' => $fetch_url,
+                                                    'notify' => EMPTY_STR,
+                                                    'msg' => EMPTY_STR,
+                                                    'driver' => 'asfetch'
+                                                ]
+                                            );
+                                            continue;
+                                        }
+
+                                        if (is_string($message)) {
+                                            $message = Activity::fetch($message, App::get_channel());
+                                        }
+                                        $AS = new ActivityStreams($message, null, true);
+                                        if ($AS->is_valid() && is_array($AS->obj)) {
+                                            $item = Activity::decode_note($AS, true);
+                                        }
+                                        if ($item) {
+                                            if (!$author) {
+                                                $author = $item['author_xchan'];
+                                            }
+                                            Activity::store(App::get_channel(), get_observer_hash(), $AS, $item, true, true);
+                                        }
+                                    }
+                                    if ($hash) {
+                                        Run::Summon(['Deliver', $hash]);
+                                    }
+                                }
+
+                                // This will go to the right place most but not all of the time.
+                                // It will go to a relevant place all of the time, so we'll use it.
+
+                                if ($author) {
+                                    goaway(z_root() . '/stream/?xchan=' . urlencode($author));
+                                }
+                                goaway(z_root() . '/stream');
+                            }
+                        } else {
+                            // It wasn't a Collection object and wasn't an Actor object,
+                            // so let's see if it decodes. The boolean flag enables html
+                            // cache of the item
+                            $item = Activity::decode_note($AS, true);
+                            if ($item) {
+                                Activity::store(App::get_channel(), get_observer_hash(), $AS, $item, true, true);
+                                goaway(z_root() . '/display/' . gen_link_id($item['mid']));
+                            }
+                            else {
+                                notice( t('Item not found.') . EOL);
+                                return EMPTY_STR;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (strpos($search, '#') === 0) {
+            $tag = true;
+            $search = substr($search, 1);
+        }
+        if (strpos($search, '@') === 0) {
+            $search = substr($search, 1);
+            goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
+        }
+        if (strpos($search, '!') === 0) {
+            $search = substr($search, 1);
+            goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
+        }
+        if (strpos($search, '?') === 0) {
+            $search = substr($search, 1);
+            goaway(z_root() . '/help' . '?f=1&navsearch=1&search=' . $search);
+        }
+
+        // look for a naked webbie
+        if (strpos($search, '@') !== false && strpos($search, 'http') !== 0) {
+            goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
+        }
+
+        if (!$search) {
+            return $o;
+        }
+
+        if ($tag) {
+            $wildtag = str_replace('*', '%', $search);
+            $sql_extra = sprintf(
+                " AND item.id IN (select oid from term where otype = %d and ttype in ( %d , %d) and term like '%s') ",
+                intval(TERM_OBJ_POST),
+                intval(TERM_HASHTAG),
+                intval(TERM_COMMUNITYTAG),
+                dbesc(protect_sprintf($wildtag))
+            );
+        } else {
+            $regstr = db_getfunc('REGEXP');
+            $sql_extra = sprintf(" AND (item.title $regstr '%s' OR item.body $regstr '%s') ", dbesc(protect_sprintf(preg_quote($search))), dbesc(protect_sprintf(preg_quote($search))));
+        }
+
+        // Here is the way permissions work in the search module...
+        // Only public posts can be shown
+        // OR your own posts if you are a logged in member
+        // No items will be shown if the member has a blocked profile wall.
+
+
+        if ((!$this->updating) && (!$this->loading)) {
+            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 0);
+
+
+            // This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
+            // because browser prefetching might change it on us. We have to deliver it with the page.
+
+            $o .= '' . "\r\n";
+            $o .= "\r\n";
+
+            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), [
+                '$baseurl' => z_root(),
+                '$pgtype' => 'search',
+                '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
+                '$gid' => '0',
+                '$cid' => '0',
+                '$cmin' => '(-1)',
+                '$cmax' => '(-1)',
+                '$star' => '0',
+                '$liked' => '0',
+                '$conv' => '0',
+                '$spam' => '0',
+                '$fh' => '0',
+                '$dm' => '0',
+                '$nouveau' => '0',
+                '$wall' => '0',
+                '$draft' => '0',
+                '$static' => $static,
+                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
+                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+                '$search' => (($tag) ? urlencode('#') : '') . $search,
+                '$xchan' => '',
+                '$order' => '',
+                '$file' => '',
+                '$cats' => '',
+                '$tags' => '',
+                '$mid' => '',
+                '$verb' => '',
+                '$net' => '',
+                '$dend' => '',
+                '$dbegin' => ''
+            ]);
+        }
+
+        $item_normal = item_normal_search();
+        $pub_sql = item_permissions_sql(0, $observer_hash);
+
+        $sys = Channel::get_system();
+
+        if (($this->updating) && ($this->loading)) {
+            $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
+            App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+
+            if ($this->loading) {
+                $r = null;
+
+                // if logged in locally, first look in the items you own
+                // and if this returns zero results, resort to searching elsewhere on the site.
+                // Ideally these results would be merged but this can be difficult
+                // and results in lots of duplicated content and/or messed up pagination
+
+                if (local_channel()) {
+                    $r = q(
+                        "SELECT mid, MAX(id) as item_id from item where uid = %d
+                        $item_normal
+                        $sql_extra
+                        group by mid, created order by created desc $pager_sql ",
+                        intval(local_channel())
+                    );
+                }
+                if (!$r) {
+                    $r = q("SELECT mid, MAX(id) as item_id from item WHERE true $pub_sql
+                        $item_normal
+                        $sql_extra
+                        group by mid, created order by created desc $pager_sql");
+                }
+                if ($r) {
+                    $str = ids_to_querystr($r, 'item_id');
+                    $r = q("select *, id as item_id from item where id in ( " . $str . ") order by created desc ");
+                }
+            } else {
+                $r = [];
+            }
+        }
+
+        if ($r) {
+            xchan_query($r);
+            $items = fetch_post_tags($r, true);
+        } else {
+            $items = [];
+        }
+
+        if ($format == 'json') {
+            $result = [];
+            require_once('include/conversation.php');
+            foreach ($items as $item) {
+                $item['html'] = zidify_links(bbcode($item['body']));
+                $x = encode_item($item);
+                $x['html'] = prepare_text($item['body'], $item['mimetype']);
+                $result[] = $x;
+            }
+            json_return_and_die(array('success' => true, 'messages' => $result));
+        }
+
+        if ($tag) {
+            $o .= '
      ' . sprintf(t('Items tagged with: %s'), $search) . '
      ';
+        } else {
+            $o .= '
      ' . sprintf(t('Search results for: %s'), $search) . '
      ';
+        }
+
+        $o .= conversation($items, 'search', $this->updating, 'client');
+
+        $o .= '
      ';
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Search_ac.php b/Code/Module/Search_ac.php
new file mode 100644
index 000000000..dc6edca40
--- /dev/null
+++ b/Code/Module/Search_ac.php
@@ -0,0 +1,101 @@
+ $g['xchan_photo_s'],
+                        'name' => '@' . $g['xchan_name'],
+                        'id' => $g['abook_id'],
+                        'link' => $g['xchan_url'],
+                        'label' => '',
+                        'nick' => '',
+                    ];
+                }
+            }
+        }
+
+        if ($do_tags) {
+            $r = q(
+                "select distinct term, tid, url from term 
+				where ttype in ( %d, %d ) $tag_sql_extra group by term order by term asc",
+                intval(TERM_HASHTAG),
+                intval(TERM_COMMUNITYTAG)
+            );
+
+            if ($r) {
+                foreach ($r as $g) {
+                    $results[] = [
+                        'photo' => z_root() . '/images/hashtag.png',
+                        'name' => '#' . $g['term'],
+                        'id' => $g['tid'],
+                        'link' => $g['url'],
+                        'label' => '',
+                        'nick' => '',
+                    ];
+                }
+            }
+        }
+
+        json_return_and_die([
+            'start' => $start,
+            'count' => $count,
+            'items' => $results,
+        ]);
+    }
+}
diff --git a/Code/Module/Secrets.php b/Code/Module/Secrets.php
new file mode 100644
index 000000000..1a9abc9cb
--- /dev/null
+++ b/Code/Module/Secrets.php
@@ -0,0 +1,29 @@
+' . $desc . '';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Secrets'))) {
+            return $text;
+        }
+
+        $desc = t('This app is installed. A button to encrypt content may be found in the post editor.');
+
+        $text = '
      ' . $desc . '
      ';
+
+        return $text;
+    }
+}
diff --git a/Code/Module/Service_limits.php b/Code/Module/Service_limits.php
new file mode 100644
index 000000000..692ee249e
--- /dev/null
+++ b/Code/Module/Service_limits.php
@@ -0,0 +1,30 @@
+sm = new SubModule();
+    }
+
+
+    public function post()
+    {
+
+        if (!local_channel()) {
+            return;
+        }
+
+        if ($_SESSION['delegate']) {
+            return;
+        }
+
+        // logger('mod_settings: ' . print_r($_REQUEST,true));
+
+        if (argc() > 1) {
+            if ($this->sm->call('post') !== false) {
+                return;
+            }
+        }
+
+        goaway(z_root() . '/settings');
+    }
+
+
+    public function get()
+    {
+
+        Navbar::set_selected('Settings');
+
+        if ((!local_channel()) || ($_SESSION['delegate'])) {
+            notice(t('Permission denied.') . EOL);
+            return login();
+        }
+
+
+        $channel = App::get_channel();
+        if ($channel) {
+            head_set_icon($channel['xchan_photo_s']);
+        }
+
+        $o = $this->sm->call('get');
+        if ($o !== false) {
+            return $o;
+        }
+
+        $o = EMPTY_STR;
+    }
+}
diff --git a/Code/Module/Settings/Account.php b/Code/Module/Settings/Account.php
new file mode 100644
index 000000000..3ee53594f
--- /dev/null
+++ b/Code/Module/Settings/Account.php
@@ -0,0 +1,125 @@
+ get_form_security_token("settings_account"),
+            '$title' => t('Account Settings'),
+            '$origpass' => array('origpass', t('Current Password'), ' ', ''),
+            '$password1' => array('npassword', t('Enter New Password'), '', ''),
+            '$password2' => array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')),
+            '$submit' => t('Submit'),
+            '$email' => array('email', t('Email Address:'), $email, ''),
+            '$removeme' => t('Remove Account'),
+            '$removeaccount' => t('Remove this account including all its channels'),
+            '$account_settings' => $account_settings
+        ));
+        return $o;
+    }
+}
diff --git a/Code/Module/Settings/Channel.php b/Code/Module/Settings/Channel.php
new file mode 100644
index 000000000..d6284d467
--- /dev/null
+++ b/Code/Module/Settings/Channel.php
@@ -0,0 +1,773 @@
+ $v) {
+                    PermissionLimits::Set(local_channel(), $k, intval($_POST[$k]));
+                }
+                $acl = new AccessControl($channel);
+                $acl->set_from_array($_POST);
+                $x = $acl->get();
+
+                $r = q(
+                    "update channel set channel_allow_cid = '%s', channel_allow_gid = '%s', 
+					channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d",
+                    dbesc($x['allow_cid']),
+                    dbesc($x['allow_gid']),
+                    dbesc($x['deny_cid']),
+                    dbesc($x['deny_gid']),
+                    intval(local_channel())
+                );
+            } else {
+                $role_permissions = PermissionRoles::role_perms($_POST['permissions_role']);
+                if (!$role_permissions) {
+                    notice('Permissions category could not be found.');
+                    return;
+                }
+                $hide_presence = 1 - (intval($role_permissions['online']));
+                if ($role_permissions['default_collection']) {
+                    $r = q(
+                        "select hash from pgrp where uid = %d and gname = '%s' limit 1",
+                        intval(local_channel()),
+                        dbesc(t('Friends'))
+                    );
+                    if (!$r) {
+                        AccessList::add(local_channel(), t('Friends'));
+                        AccessList::member_add(local_channel(), t('Friends'), $channel['channel_hash']);
+                        $r = q(
+                            "select hash from pgrp where uid = %d and gname = '%s' limit 1",
+                            intval(local_channel()),
+                            dbesc(t('Friends'))
+                        );
+                    }
+                    if ($r) {
+                        q(
+                            "update channel set channel_default_group = '%s', channel_allow_gid = '%s', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d",
+                            dbesc($r[0]['hash']),
+                            dbesc('<' . $r[0]['hash'] . '>'),
+                            intval(local_channel())
+                        );
+                    } else {
+                        notice(sprintf('Default access list \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL);
+                        return;
+                    }
+                } // no default permissions
+                else {
+                    q(
+                        "update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '', 
+						channel_deny_cid = '' where channel_id = %d",
+                        intval(local_channel())
+                    );
+                }
+
+                if ($role_permissions['perms_connect']) {
+                    $x = Permissions::FilledPerms($role_permissions['perms_connect']);
+                    $str = Permissions::serialise($x);
+                    set_abconfig(local_channel(), $channel['channel_hash'], 'system', 'my_perms', $str);
+
+                    $autoperms = intval($role_permissions['perms_auto']);
+                }
+
+                if ($role_permissions['limits']) {
+                    foreach ($role_permissions['limits'] as $k => $v) {
+                        PermissionLimits::Set(local_channel(), $k, $v);
+                    }
+                }
+                if (array_key_exists('directory_publish', $role_permissions)) {
+                    $publish = intval($role_permissions['directory_publish']);
+                }
+            }
+
+            set_pconfig(local_channel(), 'system', 'hide_online_status', $hide_presence);
+            set_pconfig(local_channel(), 'system', 'permissions_role', $role);
+        }
+
+        // The post_comments permission is critical to privacy so we always allow you to set it, no matter what
+        // permission role is in place.
+
+        $post_comments = array_key_exists('post_comments', $_POST) ? intval($_POST['post_comments']) : PERMS_SPECIFIC;
+        PermissionLimits::Set(local_channel(), 'post_comments', $post_comments);
+
+        $post_mail = array_key_exists('post_mail', $_POST) ? intval($_POST['post_mail']) : PERMS_SPECIFIC;
+        PermissionLimits::Set(local_channel(), 'post_mail', $post_mail);
+
+
+        $publish = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1 : 0);
+        $username = ((x($_POST, 'username')) ? escape_tags(trim($_POST['username'])) : '');
+        $timezone = ((x($_POST, 'timezone_select')) ? notags(trim($_POST['timezone_select'])) : '');
+        $defloc = ((x($_POST, 'defloc')) ? notags(trim($_POST['defloc'])) : '');
+        $openid = ((x($_POST, 'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
+        $maxreq = ((x($_POST, 'maxreq')) ? intval($_POST['maxreq']) : 0);
+        $expire = ((x($_POST, 'expire')) ? intval($_POST['expire']) : 0);
+        $evdays = ((x($_POST, 'evdays')) ? intval($_POST['evdays']) : 3);
+        $photo_path = ((x($_POST, 'photo_path')) ? escape_tags(trim($_POST['photo_path'])) : '');
+        $attach_path = ((x($_POST, 'attach_path')) ? escape_tags(trim($_POST['attach_path'])) : '');
+        $noindex = ((x($_POST, 'noindex')) ? intval($_POST['noindex']) : 0);
+        $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']), ENT_QUOTES) : '');
+
+        $expire_items = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items']) : 0);
+        $expire_starred = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0);
+        $expire_photos = ((x($_POST, 'expire_photos')) ? intval($_POST['expire_photos']) : 0);
+        $expire_network_only = ((x($_POST, 'expire_network_only')) ? intval($_POST['expire_network_only']) : 0);
+
+        $allow_location = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1 : 0);
+
+        $blocktags = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0 : 1); // this setting is inverted!
+        $unkmail = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1 : 0);
+        $cntunkmail = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
+        $suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0);
+//      $anymention       = ((x($_POST,'anymention')) ? intval($_POST['anymention'])  : 0);
+        $hyperdrive = ((x($_POST, 'hyperdrive')) ? intval($_POST['hyperdrive']) : 0);
+        $activitypub = ((x($_POST, 'activitypub')) ? intval($_POST['activitypub']) : 0);
+        $tag_username = ((x($_POST, 'tag_username')) ? intval($_POST['tag_username']) : 0);
+        $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1 : 0);
+        $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1 : 0);
+        $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1 : 0);
+        $adult = (($_POST['adult'] == 1) ? 1 : 0);
+        $defpermcat = ((x($_POST, 'defpermcat')) ? notags(trim($_POST['defpermcat'])) : 'default');
+
+        $hide_friends = 1 - intval($_POST['hide_friends']);
+
+        $cal_first_day = (((x($_POST, 'first_day')) && intval($_POST['first_day']) >= 0 && intval($_POST['first_day']) < 7) ? intval($_POST['first_day']) : 0);
+        $mailhost = ((array_key_exists('mailhost', $_POST)) ? notags(trim($_POST['mailhost'])) : '');
+        $profile_assign = ((x($_POST, 'profile_assign')) ? notags(trim($_POST['profile_assign'])) : '');
+        $permit_all_mentions = (($_POST['permit_all_mentions'] == 1) ? 1 : 0);
+        $close_comment_days = (($_POST['close_comments']) ? intval($_POST['close_comments']) : 0);
+        if ($close_comment_days) {
+            set_pconfig(local_channel(), 'system', 'close_comments', $close_comment_days . ' days');
+        } else {
+            set_pconfig(local_channel(), 'system', 'close_comments', EMPTY_STR);
+        }
+    
+        // allow a permission change to over-ride the autoperms setting from the form
+        if (!isset($autoperms)) {
+            $autoperms = ((x($_POST, 'autoperms')) ? intval($_POST['autoperms']) : 0);
+        }
+
+
+        $pageflags = $channel['channel_pageflags'];
+        $existing_adult = (($pageflags & PAGE_ADULT) ? 1 : 0);
+        if ($adult != $existing_adult) {
+            $pageflags = ($pageflags ^ PAGE_ADULT);
+        }
+
+
+        $notify = 0;
+
+        if (x($_POST, 'notify1')) {
+            $notify += intval($_POST['notify1']);
+        }
+        if (x($_POST, 'notify2')) {
+            $notify += intval($_POST['notify2']);
+        }
+        if (x($_POST, 'notify3')) {
+            $notify += intval($_POST['notify3']);
+        }
+        if (x($_POST, 'notify4')) {
+            $notify += intval($_POST['notify4']);
+        }
+        if (x($_POST, 'notify5')) {
+            $notify += intval($_POST['notify5']);
+        }
+        if (x($_POST, 'notify6')) {
+            $notify += intval($_POST['notify6']);
+        }
+        if (x($_POST, 'notify7')) {
+            $notify += intval($_POST['notify7']);
+        }
+        if (x($_POST, 'notify8')) {
+            $notify += intval($_POST['notify8']);
+        }
+        if (x($_POST, 'notify10')) {
+            $notify += intval($_POST['notify10']);
+        }
+
+
+        $vnotify = 0;
+
+        if (x($_POST, 'vnotify1')) {
+            $vnotify += intval($_POST['vnotify1']);
+        }
+        if (x($_POST, 'vnotify2')) {
+            $vnotify += intval($_POST['vnotify2']);
+        }
+        if (x($_POST, 'vnotify3')) {
+            $vnotify += intval($_POST['vnotify3']);
+        }
+        if (x($_POST, 'vnotify4')) {
+            $vnotify += intval($_POST['vnotify4']);
+        }
+        if (x($_POST, 'vnotify5')) {
+            $vnotify += intval($_POST['vnotify5']);
+        }
+        if (x($_POST, 'vnotify6')) {
+            $vnotify += intval($_POST['vnotify6']);
+        }
+        if (x($_POST, 'vnotify7')) {
+            $vnotify += intval($_POST['vnotify7']);
+        }
+        if (x($_POST, 'vnotify8')) {
+            $vnotify += intval($_POST['vnotify8']);
+        }
+        if (x($_POST, 'vnotify9')) {
+            $vnotify += intval($_POST['vnotify9']);
+        }
+        if (x($_POST, 'vnotify10')) {
+            $vnotify += intval($_POST['vnotify10']);
+        }
+        if (x($_POST, 'vnotify11') && is_site_admin()) {
+            $vnotify += intval($_POST['vnotify11']);
+        }
+        if (x($_POST, 'vnotify12')) {
+            $vnotify += intval($_POST['vnotify12']);
+        }
+        if (x($_POST, 'vnotify13')) {
+            $vnotify += intval($_POST['vnotify13']);
+        }
+        if (x($_POST, 'vnotify14')) {
+            $vnotify += intval($_POST['vnotify14']);
+        }
+        if (x($_POST, 'vnotify15')) {
+            $vnotify += intval($_POST['vnotify15']);
+        }
+        if (x($_POST, 'vnotify16')) {
+            $vnotify += intval($_POST['vnotify16']);
+        }
+
+        $always_show_in_notices = x($_POST, 'always_show_in_notices') ? 1 : 0;
+
+        $err = '';
+
+        $name_change = false;
+
+        if ($username != $channel['channel_name']) {
+            $name_change = true;
+            require_once('include/channel.php');
+            $err = Zlib\Channel::validate_channelname($username);
+            if ($err) {
+                notice($err);
+                return;
+            }
+        }
+
+        if ($timezone != $channel['channel_timezone']) {
+            if (strlen($timezone)) {
+                date_default_timezone_set($timezone);
+            }
+        }
+
+
+        $followed_tags = $_POST['followed_tags'];
+        $ntags = [];
+        if ($followed_tags) {
+            $tags = explode(',', $followed_tags);
+            foreach ($tags as $t) {
+                $t = trim($t);
+                if ($t) {
+                    $ntags[] = $t;
+                }
+            }
+        }
+
+        set_pconfig(local_channel(), 'system', 'followed_tags', ($ntags) ? $ntags : EMPTY_STR);
+        set_pconfig(local_channel(), 'system', 'use_browser_location', $allow_location);
+        set_pconfig(local_channel(), 'system', 'suggestme', $suggestme);
+        set_pconfig(local_channel(), 'system', 'post_newfriend', $post_newfriend);
+        set_pconfig(local_channel(), 'system', 'post_joingroup', $post_joingroup);
+        set_pconfig(local_channel(), 'system', 'post_profilechange', $post_profilechange);
+        set_pconfig(local_channel(), 'system', 'blocktags', $blocktags);
+        set_pconfig(local_channel(), 'system', 'channel_menu', $channel_menu);
+        set_pconfig(local_channel(), 'system', 'vnotify', $vnotify);
+        set_pconfig(local_channel(), 'system', 'always_show_in_notices', $always_show_in_notices);
+        set_pconfig(local_channel(), 'system', 'evdays', $evdays);
+        set_pconfig(local_channel(), 'system', 'photo_path', $photo_path);
+        set_pconfig(local_channel(), 'system', 'attach_path', $attach_path);
+        set_pconfig(local_channel(), 'system', 'cal_first_day', $cal_first_day);
+        set_pconfig(local_channel(), 'system', 'default_permcat', $defpermcat);
+        set_pconfig(local_channel(), 'system', 'email_notify_host', $mailhost);
+        set_pconfig(local_channel(), 'system', 'profile_assign', $profile_assign);
+//      set_pconfig(local_channel(),'system','anymention',$anymention);
+        set_pconfig(local_channel(), 'system', 'hyperdrive', $hyperdrive);
+        set_pconfig(local_channel(), 'system', 'activitypub', $activitypub);
+        set_pconfig(local_channel(), 'system', 'autoperms', $autoperms);
+        set_pconfig(local_channel(), 'system', 'tag_username', $tag_username);
+        set_pconfig(local_channel(), 'system', 'permit_all_mentions', $permit_all_mentions);
+        set_pconfig(local_channel(), 'system', 'noindex', $noindex);
+
+
+        $r = q(
+            "update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d",
+            dbesc($username),
+            intval($pageflags),
+            dbesc($timezone),
+            dbesc($defloc),
+            intval($notify),
+            intval($unkmail),
+            intval($maxreq),
+            intval($expire),
+            intval(local_channel())
+        );
+        if ($r) {
+            info(t('Settings updated.') . EOL);
+        }
+
+
+        $r = q(
+            "UPDATE profile SET publish = %d, hide_friends = %d WHERE is_default = 1 AND uid = %d",
+            intval($publish),
+            intval($hide_friends),
+            intval(local_channel())
+        );
+        $r = q(
+            "UPDATE xchan SET xchan_hidden = %d WHERE xchan_hash = '%s'",
+            intval(1 - $publish),
+            intval($channel['channel_hash'])
+        );
+
+        if ($name_change) {
+            // catch xchans for all protocols by matching the url
+            $r = q(
+                "update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_url = '%s'",
+                dbesc($username),
+                dbesc(datetime_convert()),
+                dbesc(z_root() . '/channel/' . $channel['channel_address'])
+            );
+            $r = q(
+                "update profile set fullname = '%s' where uid = %d and is_default = 1",
+                dbesc($username),
+                intval($channel['channel_id'])
+            );
+            if (Zlib\Channel::is_system($channel['channel_id'])) {
+                set_config('system', 'sitename', $username);
+            }
+        }
+
+        Run::Summon(['Directory', local_channel()]);
+
+        Libsync::build_sync_packet();
+
+
+        if ($email_changed && App::$config['system']['register_policy'] == REGISTER_VERIFY) {
+            // FIXME - set to un-verified, blocked and redirect to logout
+            // Q: Why? Are we verifying people or email addresses?
+            // A: the policy is to verify email addresses
+        }
+
+        goaway(z_root() . '/settings');
+        return; // NOTREACHED
+    }
+
+    public function get()
+    {
+
+        require_once('include/permissions.php');
+
+
+        $yes_no = [t('No'), t('Yes')];
+
+
+        $p = q(
+            "SELECT * FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1",
+            intval(local_channel())
+        );
+        if (count($p)) {
+            $profile = $p[0];
+        }
+
+        load_pconfig(local_channel(), 'expire');
+
+        $channel = App::get_channel();
+
+        $global_perms = Permissions::Perms();
+
+        $permiss = [];
+
+        $perm_opts = [
+            [t('Restricted - from connections only'), PERMS_SPECIFIC],
+            [t('Semi-public - from anybody that can be identified'), PERMS_AUTHED],
+            [t('Public - from anybody on the internet'), PERMS_PUBLIC]
+        ];
+
+        $limits = PermissionLimits::Get(local_channel());
+        $anon_comments = get_config('system', 'anonymous_comments');
+
+        foreach ($global_perms as $k => $perm) {
+            $options = [];
+            $can_be_public = ((strstr($k, 'view') || ($k === 'post_comments' && $anon_comments)) ? true : false);
+            foreach ($perm_opts as $opt) {
+                if ($opt[1] == PERMS_PUBLIC && (!$can_be_public)) {
+                    continue;
+                }
+                $options[$opt[1]] = $opt[0];
+            }
+            if ($k === 'post_comments') {
+                $comment_perms = [$k, $perm, $limits[$k], '', $options];
+            } elseif ($k === 'post_mail') {
+                $mail_perms = [$k, $perm, $limits[$k], '', $options];
+            } else {
+                $permiss[] = array($k, $perm, $limits[$k], '', $options);
+            }
+        }
+
+        //      logger('permiss: ' . print_r($permiss,true));
+
+        $username = $channel['channel_name'];
+        $nickname = $channel['channel_address'];
+        $timezone = $channel['channel_timezone'];
+        $notify = $channel['channel_notifyflags'];
+        $defloc = $channel['channel_location'];
+
+        $maxreq = $channel['channel_max_friend_req'];
+        $expire = $channel['channel_expire_days'];
+        $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT);
+        $sys_expire = get_config('system', 'default_expire_days');
+
+        $hide_presence = intval(get_pconfig(local_channel(), 'system', 'hide_online_status'));
+
+        $expire_items = get_pconfig(local_channel(), 'expire', 'items');
+        $expire_items = (($expire_items === false) ? '1' : $expire_items); // default if not set: 1
+
+        $expire_notes = get_pconfig(local_channel(), 'expire', 'notes');
+        $expire_notes = (($expire_notes === false) ? '1' : $expire_notes); // default if not set: 1
+
+        $expire_starred = get_pconfig(local_channel(), 'expire', 'starred');
+        $expire_starred = (($expire_starred === false) ? '1' : $expire_starred); // default if not set: 1
+
+
+        $expire_photos = get_pconfig(local_channel(), 'expire', 'photos');
+        $expire_photos = (($expire_photos === false) ? '0' : $expire_photos); // default if not set: 0
+
+        $expire_network_only = get_pconfig(local_channel(), 'expire', 'network_only');
+        $expire_network_only = (($expire_network_only === false) ? '0' : $expire_network_only); // default if not set: 0
+
+
+        $suggestme = get_pconfig(local_channel(), 'system', 'suggestme');
+        $suggestme = (($suggestme === false) ? '0' : $suggestme); // default if not set: 0
+
+        $post_newfriend = get_pconfig(local_channel(), 'system', 'post_newfriend');
+        $post_newfriend = (($post_newfriend === false) ? '0' : $post_newfriend); // default if not set: 0
+
+        $post_joingroup = get_pconfig(local_channel(), 'system', 'post_joingroup');
+        $post_joingroup = (($post_joingroup === false) ? '0' : $post_joingroup); // default if not set: 0
+
+        $post_profilechange = get_pconfig(local_channel(), 'system', 'post_profilechange');
+        $post_profilechange = (($post_profilechange === false) ? '0' : $post_profilechange); // default if not set: 0
+
+        $blocktags = get_pconfig(local_channel(), 'system', 'blocktags');
+        $blocktags = (($blocktags === false) ? '0' : $blocktags);
+
+        $timezone = date_default_timezone_get();
+
+        $opt_tpl = Theme::get_template("field_checkbox.tpl");
+        if (get_config('system', 'publish_all')) {
+            $profile_in_dir = '';
+        } else {
+            $profile_in_dir = replace_macros($opt_tpl, array(
+                '$field' => array('profile_in_directory', t('Publish your profile in the network directory'), $profile['publish'], '', $yes_no),
+            ));
+        }
+
+        $suggestme = replace_macros($opt_tpl, array(
+            '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', $yes_no),
+
+        ));
+
+        $subdir = ((strlen(App::get_path())) ? '
      ' . t('or') . ' ' . z_root() . '/channel/' . $nickname : '');
+
+        $webbie = $nickname . '@' . App::get_hostname();
+        $intl_nickname = unpunify($nickname) . '@' . unpunify(App::get_hostname());
+
+        $prof_addr = replace_macros(Theme::get_template('channel_settings_header.tpl'), array(
+            '$desc' => t('Your channel address is'),
+            '$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . ' (' . $webbie . ')'),
+            '$compat' => t('Friends using compatible applications can use this address to connect with you.'),
+            '$subdir' => $subdir,
+            '$davdesc' => t('Your files/photos are accessible as a network drive at'),
+            '$davpath' => z_root() . '/dav/' . $nickname,
+            '$windows' => t('(Windows)'),
+            '$other' => t('(other platforms)'),
+            '$or' => t('or'),
+            '$davspath' => 'davs://' . App::get_hostname() . '/dav/' . $nickname,
+            '$basepath' => App::get_hostname()
+        ));
+
+
+        $pcat = new Permcat(local_channel());
+        $pcatlist = $pcat->listing();
+        $permcats = [];
+        if ($pcatlist) {
+            foreach ($pcatlist as $pc) {
+                $permcats[$pc['name']] = $pc['localname'];
+            }
+        }
+
+        $default_permcat = get_pconfig(local_channel(), 'system', 'default_permcat', 'default');
+
+
+        $acl = new AccessControl($channel);
+        $perm_defaults = $acl->get();
+
+        $group_select = AccessList::select(local_channel(), $channel['channel_default_group']);
+
+
+        $m1 = Menu::list(local_channel());
+        $menu = false;
+        if ($m1) {
+            $menu = [];
+            $current = get_pconfig(local_channel(), 'system', 'channel_menu');
+            $menu[] = array('name' => '', 'selected' => ((!$current) ? true : false));
+            foreach ($m1 as $m) {
+                $menu[] = array('name' => htmlspecialchars($m['menu_name'], ENT_COMPAT, 'UTF-8'), 'selected' => (($m['menu_name'] === $current) ? ' selected="selected" ' : false));
+            }
+        }
+
+        $evdays = get_pconfig(local_channel(), 'system', 'evdays');
+        if (!$evdays) {
+            $evdays = 3;
+        }
+
+        $permissions_role = get_pconfig(local_channel(), 'system', 'permissions_role');
+        if (!$permissions_role) {
+            $permissions_role = 'custom';
+        }
+
+        $autoperms = replace_macros(Theme::get_template('field_checkbox.tpl'), [
+                '$field' => ['autoperms', t('Automatic connection approval'), ((get_pconfig(local_channel(), 'system', 'autoperms', 0)) ? 1 : 0),
+                t('If enabled, connection requests will be approved without your interaction'), $yes_no]
+        ]);
+
+        $hyperdrive = ['hyperdrive', t('Friend-of-friend conversations'), ((get_pconfig(local_channel(), 'system', 'hyperdrive', true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no];
+
+        if (get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) {
+            $apconfig = true;
+            $activitypub = replace_macros(Theme::get_template('field_checkbox.tpl'), ['$field' => ['activitypub', t('Enable ActivityPub protocol'), ((get_pconfig(local_channel(), 'system', 'activitypub', ACTIVITYPUB_ENABLED)) ? 1 : 0), t('ActivityPub is an emerging internet standard for social communications'), $yes_no]]);
+        } else {
+            $apconfig = false;
+            $activitypub = '' . EOL;
+        }
+
+        $permissions_set = (($permissions_role != 'custom') ? true : false);
+
+        $perm_roles = PermissionRoles::roles();
+        // Don't permit changing to a collection (@TODO unless there is a mechanism to select the channel_parent)
+        unset($perm_roles['Collection']);
+
+
+        $vnotify = get_pconfig(local_channel(), 'system', 'vnotify');
+        $always_show_in_notices = get_pconfig(local_channel(), 'system', 'always_show_in_notices');
+        if ($vnotify === false) {
+            $vnotify = (-1);
+        }
+
+        $plugin = ['basic' => '', 'security' => '', 'notify' => '', 'misc' => ''];
+        Hook::call('channel_settings', $plugin);
+
+        $public_stream_mode = intval(get_config('system', 'public_stream_mode', PUBLIC_STREAM_NONE));
+
+        $ft = get_pconfig(local_channel(), 'system', 'followed_tags', '');
+        if ($ft && is_array($ft)) {
+            $followed = implode(',', $ft);
+        } else {
+            $followed = EMPTY_STR;
+        }
+
+
+        $o .= replace_macros(Theme::get_template('settings.tpl'), [
+            '$ptitle' => t('Channel Settings'),
+            '$submit' => t('Submit'),
+            '$baseurl' => z_root(),
+            '$uid' => local_channel(),
+            '$form_security_token' => get_form_security_token("settings"),
+            '$nickname_block' => $prof_addr,
+            '$h_basic' => t('Basic Settings'),
+            '$username' => array('username', t('Full name'), $username, ''),
+            '$email' => array('email', t('Email Address'), $email, ''),
+            '$timezone' => array('timezone_select', t('Your timezone'), $timezone, t('This is important for showing the correct time on shared events'), get_timezones()),
+            '$defloc' => array('defloc', t('Default post location'), $defloc, t('Optional geographical location to display on your posts')),
+            '$allowloc' => array('allow_location', t('Obtain post location from your web browser or device'), ((get_pconfig(local_channel(), 'system', 'use_browser_location')) ? 1 : ''), '', $yes_no),
+
+            '$adult' => array('adult', t('Adult content'), $adult_flag, t('Enable to indicate if this channel frequently or regularly publishes adult content. (Please also tag any adult material and/or nudity with #NSFW)'), $yes_no),
+
+            '$h_prv' => t('Security and Privacy'),
+            '$permissions_set' => $permissions_set,
+            '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'),
+
+            '$hide_presence' => array('hide_presence', t('Hide my online presence'), $hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no),
+            '$hidefriends' => array('hide_friends', t('Allow others to view your friends and connections'), 1 - intval($profile['hide_friends']), '', $yes_no),
+            '$permiss_arr' => $permiss,
+            '$comment_perms' => $comment_perms,
+            '$mail_perms' => $mail_perms,
+            '$noindex' => ['noindex', t('Forbid indexing of your channel content by search engines'), get_pconfig($channel['channel_id'], 'system', 'noindex'), '', $yes_no],
+            '$close_comments' => ['close_comments', t('Disable acceptance of comments on my posts after this many days'), ((intval(get_pconfig(local_channel(), 'system', 'close_comments'))) ? intval(get_pconfig(local_channel(), 'system', 'close_comments')) : EMPTY_STR), t('Leave unset or enter 0 to allow comments indefinitely')],
+            '$blocktags' => array('blocktags', t('Allow others to tag your posts'), 1 - $blocktags, t('Often used by the community to retro-actively flag inappropriate content'), $yes_no),
+
+            '$lbl_p2macro' => t('Channel Permission Limits'),
+
+            '$expire' => array('expire', t('Expire conversations you have not participated in after this many days'), $expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf(t('This website expires after %d days.'), intval($sys_expire)) : t('This website does not provide an expiration policy.')) . ' ' . t('The website limit takes precedence if lower than your limit.')),
+            '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']), t('May reduce spam activity')),
+            '$permissions' => t('Default Access List'),
+            '$permdesc' => t("(click to open/close)"),
+            '$aclselect' => Libacl::populate($perm_defaults, false, PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
+            '$profseltxt' => t('Profile to assign new connections'),
+            '$profselect' => ((Features::enabled(local_channel(), 'multi_profiles')) ? contact_profile_assign(get_pconfig(local_channel(), 'system', 'profile_assign', '')) : ''),
+
+            '$allow_cid' => acl2json($perm_defaults['allow_cid']),
+            '$allow_gid' => acl2json($perm_defaults['allow_gid']),
+            '$deny_cid' => acl2json($perm_defaults['deny_cid']),
+            '$deny_gid' => acl2json($perm_defaults['deny_gid']),
+            '$suggestme' => $suggestme,
+            '$group_select' => $group_select,
+            '$can_change_role' => ((in_array($permissions_role, ['collection', 'collection_restricted'])) ? false : true),
+            '$permissions_role' => $permissions_role,
+            '$role' => array('permissions_role', t('Channel type and privacy'), $permissions_role, '', $perm_roles, ' onchange="update_role_text(); return false;"'),
+            '$defpermcat' => ['defpermcat', t('Default Permissions Role'), $default_permcat, '', $permcats],
+            '$permcat_enable' => Apps::system_app_installed(local_channel(), 'Roles'),
+            '$profile_in_dir' => $profile_in_dir,
+            '$hide_friends' => $hide_friends,
+            '$hide_wall' => $hide_wall,
+            '$unkmail' => $unkmail,
+            '$cntunkmail' => array('cntunkmail', t('Maximum direct messages per day from unknown people:'), intval($channel['channel_max_anon_mail']), t("Useful to reduce spamming if you allow direct messages from unknown people")),
+
+            '$autoperms' => $autoperms,
+//          '$anymention' => $anymention,
+            '$hyperdrive' => $hyperdrive,
+            '$activitypub' => $activitypub,
+            '$apconfig' => $apconfig,
+            '$close' => t('Close'),
+            '$h_not' => t('Notifications'),
+            '$activity_options' => t('By default post a status message when:'),
+            '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, '', $yes_no),
+            '$post_joingroup' => array('post_joingroup', t('joining a group/community'), $post_joingroup, '', $yes_no),
+            '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, '', $yes_no),
+            '$lbl_not' => t('Send a notification email when:'),
+            '$notify1' => array('notify1', t('You receive a connection request'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, '', $yes_no),
+//          '$notify2'  => array('notify2', t('Your connections are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, '', $yes_no),
+            '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, '', $yes_no),
+            '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, '', $yes_no),
+            '$notify10' => array('notify10', t('Someone shares a followed conversation'), ($notify & NOTIFY_RESHARE), NOTIFY_RESHARE, '', $yes_no),
+            '$notify5' => array('notify5', t('You receive a direct (private) message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, '', $yes_no),
+//          '$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, '', $yes_no),
+            '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, '', $yes_no),
+//          '$notify8'  => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, '', $yes_no),
+
+            '$notify9' => array('notify9', t('Someone likes your post/comment'), ($notify & NOTIFY_LIKE), NOTIFY_LIKE, '', $yes_no),
+
+
+            '$lbl_vnot' => t('Show visual notifications including:'),
+
+            '$vnotify1' => array('vnotify1', t('Unseen stream activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
+            '$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no),
+            '$vnotify3' => array('vnotify3', t('Unseen direct messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no),
+            '$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no),
+            '$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, '', $yes_no),
+            '$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes'), $yes_no),
+            '$vnotify7' => array('vnotify7', t('System (personal) notifications'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, '', $yes_no),
+            '$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended'), $yes_no),
+            '$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended'), $yes_no),
+            '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no),
+            '$vnotify11' => ((is_site_admin()) ? array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no) : []),
+//          '$vnotify12'  => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no),
+            '$vnotify13' => (($public_stream_mode) ? ['vnotify13', t('Unseen public stream activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no] : []),
+            '$vnotify14' => array('vnotify14', t('Unseen likes and dislikes'), ($vnotify & VNOTIFY_LIKE), VNOTIFY_LIKE, '', $yes_no),
+            '$vnotify15' => array('vnotify15', t('Unseen group posts'), ($vnotify & VNOTIFY_FORUMS), VNOTIFY_FORUMS, '', $yes_no),
+            '$vnotify16' => ((is_site_admin()) ? array('vnotify16', t('Reported content'), ($vnotify & VNOTIFY_REPORTS), VNOTIFY_REPORTS, '', $yes_no) : []),
+            '$desktop_notifications_info' => t('Desktop notifications are unavailable because the required browser permission has not been granted'),
+            '$desktop_notifications_request' => t('Grant permission'),
+            '$mailhost' => ['mailhost', t('Email notifications sent from (hostname)'), get_pconfig(local_channel(), 'system', 'email_notify_host', App::get_hostname()), sprintf(t('If your channel is mirrored to multiple locations, set this to your preferred location. This will prevent duplicate email notifications. Example: %s'), App::get_hostname())],
+            '$always_show_in_notices' => array('always_show_in_notices', t('Show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no),
+            '$permit_all_mentions' => ['permit_all_mentions', t('Accept messages from strangers which mention you'), get_pconfig(local_channel(), 'system', 'permit_all_mentions'), t('This setting bypasses normal permissions'), $yes_no],
+            '$followed_tags' => ['followed_tags', t('Accept messages from strangers which include any of the following hashtags'), $followed, t('comma separated, do not include the #')],
+            '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')),
+            '$basic_addon' => $plugin['basic'],
+            '$sec_addon' => $plugin['security'],
+            '$notify_addon' => $plugin['notify'],
+            '$misc_addon' => $plugin['misc'],
+            '$lbl_time' => t('Date and time'),
+            '$miscdoc' => t('This section is reserved for use by optional addons and apps to provide additional settings.'),
+            '$h_advn' => t('Advanced Account/Page Type Settings'),
+            '$h_descadvn' => t('Change the behaviour of this account for special situations'),
+            '$pagetype' => $pagetype,
+            '$lbl_misc' => t('Miscellaneous'),
+            '$photo_path' => array('photo_path', t('Default photo upload folder name'), get_pconfig(local_channel(), 'system', 'photo_path'), t('%Y - current year, %m -  current month')),
+            '$attach_path' => array('attach_path', t('Default file upload folder name'), get_pconfig(local_channel(), 'system', 'attach_path'), t('%Y - current year, %m -  current month')),
+            '$menus' => $menu,
+            '$menu_desc' => t('Personal menu to display in your channel pages'),
+            '$removeme' => t('Remove Channel'),
+            '$removechannel' => t('Remove this channel.'),
+            '$tag_username' => ['tag_username', t('Mentions should display'), intval(get_pconfig(local_channel(), 'system', 'tag_username', get_config('system', 'tag_username', false))), t('Changes to this setting are applied to new posts/comments only. It is not retroactive.'),
+                [
+                    0 => t('the channel display name [example: @Barbara Jenkins]'),
+                    1 => t('the channel nickname [example: @barbara1976]'),
+                    2 => t('combined [example: @Barbara Jenkins (barbara1976)]'),
+                    127 => t('no preference, use the system default'),
+                ]],
+
+            '$cal_first_day' => array('first_day', t('Calendar week begins on'), intval(get_pconfig(local_channel(), 'system', 'cal_first_day')), t('This varies by country/culture'),
+                [0 => t('Sunday'),
+                    1 => t('Monday'),
+                    2 => t('Tuesday'),
+                    3 => t('Wednesday'),
+                    4 => t('Thursday'),
+                    5 => t('Friday'),
+                    6 => t('Saturday')
+                ]),
+        ]);
+
+        Hook::call('settings_form', $o);
+        return $o;
+    }
+}
diff --git a/Code/Module/Settings/Display.php b/Code/Module/Settings/Display.php
new file mode 100644
index 000000000..03883e06b
--- /dev/null
+++ b/Code/Module/Settings/Display.php
@@ -0,0 +1,248 @@
+ 100) {
+            $itemspage = 100;
+        }
+
+        if ($indentpx < 0) {
+            $indentpx = 0;
+        }
+        if ($indentpx > 20) {
+            $indentpx = 20;
+        }
+
+        set_pconfig(local_channel(), 'system', 'preload_images', $preload_images);
+        set_pconfig(local_channel(), 'system', 'user_scalable', $user_scalable);
+        set_pconfig(local_channel(), 'system', 'update_interval', $browser_update);
+        set_pconfig(local_channel(), 'system', 'itemspage', $itemspage);
+        set_pconfig(local_channel(), 'system', 'no_smilies', 1 - intval($nosmile));
+        set_pconfig(local_channel(), 'system', 'channel_divmore_height', $channel_divmore_height);
+        set_pconfig(local_channel(), 'system', 'stream_divmore_height', $stream_divmore_height);
+        set_pconfig(local_channel(), 'system', 'channel_menu', $channel_menu);
+        set_pconfig(local_channel(), 'system', 'thread_indent_px', $indentpx);
+
+        $newschema = '';
+        if ($theme) {
+            // call theme_post only if theme has not been changed
+            if (($themeconfigfile = $this->get_theme_config_file($theme)) != null) {
+                require_once($themeconfigfile);
+                if (class_exists('\\Code\\Theme\\' . ucfirst($theme) . 'Config')) {
+                    $clsname = '\\Code\\Theme\\' . ucfirst($theme) . 'Config';
+                    $theme_config = new $clsname();
+                    $schemas = $theme_config->get_schemas();
+                    if (array_key_exists($_POST['schema'], $schemas)) {
+                        $newschema = $_POST['schema'];
+                    }
+                    if ($newschema === '---') {
+                        $newschema = '';
+                    }
+                    $theme_config->post();
+                }
+            }
+        }
+
+        logger('theme: ' . $theme . (($newschema) ? ':' . $newschema : ''));
+
+        $_SESSION['theme'] = $theme . (($newschema) ? ':' . $newschema : '');
+
+        $r = q(
+            "UPDATE channel SET channel_theme = '%s' WHERE channel_id = %d",
+            dbesc($theme . (($newschema) ? ':' . $newschema : '')),
+            intval(local_channel())
+        );
+
+        Hook::call('display_settings_post', $_POST);
+        Libsync::build_sync_packet();
+        goaway(z_root() . '/settings/display');
+        return; // NOTREACHED
+    }
+
+
+    public function get()
+    {
+
+        $yes_no = array(t('No'), t('Yes'));
+
+        $default_theme = get_config('system', 'theme');
+        if (!$default_theme) {
+            $default_theme = 'redbasic';
+        }
+
+        $themespec = explode(':', App::$channel['channel_theme']);
+        $existing_theme = $themespec[0];
+        $existing_schema = $themespec[1];
+
+        $theme = (($existing_theme) ? $existing_theme : $default_theme);
+
+        $allowed_themes_str = get_config('system', 'allowed_themes');
+        $allowed_themes_raw = explode(',', $allowed_themes_str);
+        $allowed_themes = [];
+        if (count($allowed_themes_raw)) {
+            foreach ($allowed_themes_raw as $x) {
+                if (strlen(trim($x)) && is_dir("view/theme/$x")) {
+                    $allowed_themes[] = trim($x);
+                }
+            }
+        }
+
+
+        $themes = [];
+        $files = glob('view/theme/*');
+        if ($allowed_themes) {
+            foreach ($allowed_themes as $th) {
+                $f = $th;
+
+                $info = get_theme_info($th);
+                $compatible = check_plugin_versions($info);
+                if (!$compatible) {
+                    $themes[$f] = sprintf(t('%s - (Incompatible)'), $f);
+                    continue;
+                }
+
+                $is_experimental = file_exists('view/theme/' . $th . '/experimental');
+                $unsupported = file_exists('view/theme/' . $th . '/unsupported');
+                $is_library = file_exists('view/theme/' . $th . '/library');
+
+                if (!$is_experimental or ($is_experimental && (get_config('experimentals', 'exp_themes') == 1 or get_config('experimentals', 'exp_themes') === false))) {
+                    $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f);
+                    if (!$is_library) {
+                        $themes[$f] = $theme_name;
+                    }
+                }
+            }
+        }
+
+        $theme_selected = ((array_key_exists('theme', $_SESSION) && $_SESSION['theme']) ? $_SESSION['theme'] : $theme);
+
+        if (strpos($theme_selected, ':')) {
+            $theme_selected = explode(':', $theme_selected)[0];
+        }
+
+
+        $preload_images = get_pconfig(local_channel(), 'system', 'preload_images');
+
+        $user_scalable = get_pconfig(local_channel(), 'system', 'user_scalable', '0');
+
+        $browser_update = intval(get_pconfig(local_channel(), 'system', 'update_interval', 30000)); // default if not set: 30 seconds
+        $browser_update = (($browser_update < 15000) ? 15 : $browser_update / 1000); // minimum 15 seconds
+
+        $itemspage = intval(get_pconfig(local_channel(), 'system', 'itemspage'));
+        $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items
+
+        $nosmile = get_pconfig(local_channel(), 'system', 'no_smilies');
+        $nosmile = (($nosmile === false) ? '0' : $nosmile); // default if not set: 0
+
+        $theme_config = "";
+        if (($themeconfigfile = $this->get_theme_config_file($theme)) != null) {
+            require_once($themeconfigfile);
+            if (class_exists('\\Code\\Theme\\' . ucfirst($theme) . 'Config')) {
+                $clsname = '\\Code\\Theme\\' . ucfirst($theme) . 'Config';
+                $thm_config = new $clsname();
+                $schemas = $thm_config->get_schemas();
+                $theme_config = $thm_config->get();
+            }
+        }
+
+        // logger('schemas: ' . print_r($schemas,true));
+
+        $tpl = Theme::get_template("settings_display.tpl");
+        $o = replace_macros($tpl, array(
+            '$ptitle' => t('Display Settings'),
+            '$d_tset' => t('Theme Settings'),
+            '$d_ctset' => t('Custom Theme Settings'),
+            '$d_cset' => t('Content Settings'),
+            '$form_security_token' => get_form_security_token("settings_display"),
+            '$submit' => t('Submit'),
+            '$baseurl' => z_root(),
+            '$uid' => local_channel(),
+
+            '$theme' => (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false),
+            '$schema' => array('schema', t('Select scheme'), $existing_schema, '', $schemas),
+
+            '$preload_images' => array('preload_images', t("Preload images before rendering the page"), $preload_images, t("The subjective page load time will be longer but the page will be ready when displayed"), $yes_no),
+            '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, '', $yes_no),
+            '$ajaxint' => array('browser_update', t("Update notifications every xx seconds"), $browser_update, t('Minimum of 15 seconds, no maximum')),
+            '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
+            '$nosmile' => array('nosmile', t("Show emoticons (smilies) as images"), 1 - intval($nosmile), '', $yes_no),
+            '$channel_menu' => ['channel_menu', t('Provide channel menu in navigation bar'), get_pconfig(local_channel(), 'system', 'channel_menu', get_config('system', 'channel_menu', 0)), t('Default: channel menu located in app menu'), $yes_no],
+            '$layout_editor' => t('System Page Layout Editor - (advanced)'),
+            '$theme_config' => $theme_config,
+            '$expert' => Features::enabled(local_channel(), 'advanced_theming'),
+            '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(), 'system', 'channel_divmore_height')) ? get_pconfig(local_channel(), 'system', 'channel_divmore_height') : 400), t('click to expand content exceeding this height')),
+            '$stream_divmore_height' => array('stream_divmore_height', t('Stream page max height of content (in pixels)'), ((get_pconfig(local_channel(), 'system', 'stream_divmore_height')) ? get_pconfig(local_channel(), 'system', 'stream_divmore_height') : 400), t('click to expand content exceeding this height')),
+            '$indentpx' => ['indentpx', t('Indent threaded comments this many pixels from the parent'), intval(get_pconfig(local_channel(), 'system', 'thread_indent_px', get_config('system', 'thread_indent_px', 0))), t('0-20')],
+
+        ));
+
+        Hook::call('display_settings', $o);
+        return $o;
+    }
+
+
+    public function get_theme_config_file($theme)
+    {
+
+        $base_theme = App::$theme_info['extends'];
+
+        if (file_exists("view/theme/$theme/php/config.php")) {
+            return "view/theme/$theme/php/config.php";
+        }
+        if (file_exists("view/theme/$base_theme/php/config.php")) {
+            return "view/theme/$base_theme/php/config.php";
+        }
+        return null;
+    }
+}
diff --git a/Code/Module/Settings/Featured.php b/Code/Module/Settings/Featured.php
new file mode 100644
index 000000000..6e0f9db83
--- /dev/null
+++ b/Code/Module/Settings/Featured.php
@@ -0,0 +1,91 @@
+ 99) {
+                $cmax = 99;
+            }
+            $cmin = intval($_POST['affinity_cmin']);
+            if ($cmin < 0 || $cmin > 99) {
+                $cmin = 0;
+            }
+            set_pconfig(local_channel(), 'affinity', 'cmin', $cmin);
+            set_pconfig(local_channel(), 'affinity', 'cmax', $cmax);
+
+            info(t('Affinity Slider settings updated.') . EOL);
+        }
+
+        Libsync::build_sync_packet();
+        return;
+    }
+
+    public function get()
+    {
+        $settings_addons = "";
+
+        $o = '';
+
+        $r = q("SELECT * FROM hook WHERE hook = 'feature_settings' ");
+        if (!$r) {
+            $settings_addons = t('No feature settings configured');
+        }
+
+        if (Features::enabled(local_channel(), 'affinity')) {
+            $cmax = intval(get_pconfig(local_channel(), 'affinity', 'cmax'));
+            $cmax = (($cmax) ? $cmax : 99);
+            $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), array(
+                '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99'))
+            ));
+            $cmin = intval(get_pconfig(local_channel(), 'affinity', 'cmin'));
+            $cmin = (($cmin) ? $cmin : 0);
+            $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), array(
+                '$field' => array('affinity_cmin', t('Default minimum affinity level'), $cmin, t('0-99 - default 0'))
+            ));
+
+            $settings_addons .= replace_macros(Theme::get_template('generic_addon_settings.tpl'), array(
+                '$addon' => array('affinity_slider', '' . t('Affinity Slider Settings'), '', t('Submit')),
+                '$content' => $setting_fields
+            ));
+        }
+
+        Hook::call('feature_settings', $settings_addons);
+
+        $this->sortpanels($settings_addons);
+
+
+        $tpl = Theme::get_template("settings_addons.tpl");
+        $o .= replace_macros($tpl, array(
+            '$form_security_token' => get_form_security_token("settings_featured"),
+            '$title' => t('Addon Settings'),
+            '$descrip' => t('Please save/submit changes to any panel before opening another.'),
+            '$settings_addons' => $settings_addons
+        ));
+        return $o;
+    }
+
+    public function sortpanels(&$s)
+    {
+        $a = explode('
      ', $s);
+        if ($a) {
+            usort($a, 'featured_sort');
+            $s = implode('
      ', $a);
+        }
+    }
+}
diff --git a/Code/Module/Settings/Features.php b/Code/Module/Settings/Features.php
new file mode 100644
index 000000000..f8d3d3c56
--- /dev/null
+++ b/Code/Module/Settings/Features.php
@@ -0,0 +1,71 @@
+ $fdata) {
+            foreach (array_slice($fdata, 1) as $f) {
+                $k = $f[0];
+                if (array_key_exists("feature_$k", $_POST)) {
+                    set_pconfig(local_channel(), 'feature', $k, (string)$_POST["feature_$k"]);
+                } else {
+                    set_pconfig(local_channel(), 'feature', $k, '');
+                }
+            }
+        }
+        Libsync::build_sync_packet();
+        return;
+    }
+
+    public function get()
+    {
+
+        $arr = [];
+        $harr = [];
+
+
+        $all_features_raw = Zlib\Features::get(false);
+
+        foreach ($all_features_raw as $fname => $fdata) {
+            foreach (array_slice($fdata, 1) as $f) {
+                $harr[$f[0]] = ((intval(Zlib\Features::enabled(local_channel(), $f[0]))) ? "1" : '');
+            }
+        }
+
+        $features = Zlib\Features::get(true);
+
+        foreach ($features as $fname => $fdata) {
+            $arr[$fname] = [];
+            $arr[$fname][0] = $fdata[0];
+            foreach (array_slice($fdata, 1) as $f) {
+                $arr[$fname][1][] = array('feature_' . $f[0], $f[1], ((intval(Zlib\Features::enabled(local_channel(), $f[0]))) ? "1" : ''), $f[2], array(t('Off'), t('On')));
+                unset($harr[$f[0]]);
+            }
+        }
+
+        $tpl = Theme::get_template("settings_features.tpl");
+        $o .= replace_macros($tpl, array(
+            '$form_security_token' => get_form_security_token("settings_features"),
+            '$title' => t('Additional Features'),
+            '$features' => $arr,
+            '$hiddens' => $harr,
+            '$baseurl' => z_root(),
+            '$submit' => t('Submit'),
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Settings/Network.php b/Code/Module/Settings/Network.php
new file mode 100644
index 000000000..42605e578
--- /dev/null
+++ b/Code/Module/Settings/Network.php
@@ -0,0 +1,134 @@
+ 'settings/network',
+            '$form_security_token' => get_form_security_token("settings_network"),
+            '$title' => t('Activity Settings'),
+            '$features' => $arr,
+            '$baseurl' => z_root(),
+            '$submit' => t('Submit'),
+        ));
+
+        return $o;
+    }
+
+    public function get_features()
+    {
+        $arr = [
+
+            [
+                'archives',
+                t('Search by Date'),
+                t('Ability to select posts by date ranges'),
+                false,
+                get_config('feature_lock', 'archives')
+            ],
+
+            [
+                'savedsearch',
+                t('Saved Searches'),
+                t('Save search terms for re-use'),
+                false,
+                get_config('feature_lock', 'savedsearch')
+            ],
+
+            [
+                'order_tab',
+                t('Alternate Stream Order'),
+                t('Ability to order the stream by last post date, last comment date or unthreaded activities'),
+                false,
+                get_config('feature_lock', 'order_tab')
+            ],
+
+            [
+                'name_tab',
+                t('Contact Filter'),
+                t('Ability to display only posts of a selected contact'),
+                false,
+                get_config('feature_lock', 'name_tab')
+            ],
+
+            [
+                'forums_tab',
+                t('Forum Filter'),
+                t('Ability to display only posts of a specific forum'),
+                false,
+                get_config('feature_lock', 'forums_tab')
+            ],
+
+            [
+                'personal_tab',
+                t('Personal Posts Filter'),
+                t('Ability to display only posts that you\'ve interacted on'),
+                false,
+                get_config('feature_lock', 'personal_tab')
+            ],
+
+            [
+                'affinity',
+                t('Affinity Tool'),
+                t('Filter stream activity by depth of relationships'),
+                false,
+                get_config('feature_lock', 'affinity')
+            ],
+
+            [
+                'suggest',
+                t('Suggest Channels'),
+                t('Show friend and connection suggestions'),
+                false,
+                get_config('feature_lock', 'suggest')
+            ],
+
+            [
+                'connfilter',
+                t('Connection Filtering'),
+                t('Filter incoming posts from connections based on keywords/content'),
+                false,
+                get_config('feature_lock', 'connfilter')
+            ]
+
+        ];
+
+        return $arr;
+    }
+}
diff --git a/Code/Module/Settings/Oauth.php b/Code/Module/Settings/Oauth.php
new file mode 100644
index 000000000..5f761abbe
--- /dev/null
+++ b/Code/Module/Settings/Oauth.php
@@ -0,0 +1,175 @@
+ 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST, 'submit')) {
+            check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+
+            $name = ((x($_POST, 'name')) ? escape_tags($_POST['name']) : '');
+            $key = ((x($_POST, 'key')) ? escape_tags($_POST['key']) : '');
+            $secret = ((x($_POST, 'secret')) ? escape_tags($_POST['secret']) : '');
+            $redirect = ((x($_POST, 'redirect')) ? escape_tags($_POST['redirect']) : '');
+            $icon = ((x($_POST, 'icon')) ? escape_tags($_POST['icon']) : '');
+            $oauth2 = ((x($_POST, 'oauth2')) ? intval($_POST['oauth2']) : 0);
+            $ok = true;
+            if ($name == '') {
+                $ok = false;
+                notice(t('Name is required') . EOL);
+            }
+            if ($key == '' || $secret == '') {
+                $ok = false;
+                notice(t('Key and Secret are required') . EOL);
+            }
+
+            if ($ok) {
+                if ($_POST['submit'] == t("Update")) {
+                    $r = q(
+                        "UPDATE clients SET
+								client_id='%s',
+								pw='%s',
+								clname='%s',
+								redirect_uri='%s',
+								icon='%s',
+								uid=%d
+							WHERE client_id='%s'",
+                        dbesc($key),
+                        dbesc($secret),
+                        dbesc($name),
+                        dbesc($redirect),
+                        dbesc($icon),
+                        intval(local_channel()),
+                        dbesc($key)
+                    );
+                } else {
+                    $r = q(
+                        "INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid)
+						VALUES ('%s','%s','%s','%s','%s',%d)",
+                        dbesc($key),
+                        dbesc($secret),
+                        dbesc($name),
+                        dbesc($redirect),
+                        dbesc($icon),
+                        intval(local_channel())
+                    );
+                    $r = q(
+                        "INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ",
+                        dbesc($key),
+                        intval(local_channel()),
+                        dbesc('all')
+                    );
+                }
+            }
+            goaway(z_root() . "/settings/oauth/");
+            return;
+        }
+    }
+
+    public function get()
+    {
+
+        if ((argc() > 2) && (argv(2) === 'add')) {
+            $tpl = Theme::get_template("settings_oauth_edit.tpl");
+            $o .= replace_macros($tpl, array(
+                '$form_security_token' => get_form_security_token("settings_oauth"),
+                '$title' => t('Add application'),
+                '$submit' => t('Submit'),
+                '$cancel' => t('Cancel'),
+                '$name' => array('name', t('Name'), '', t('Name of application')),
+                '$key' => array('key', t('Consumer Key'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
+                '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
+                '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')),
+                '$icon' => array('icon', t('Icon url'), '', t('Optional')),
+            ));
+            return $o;
+        }
+
+        if ((argc() > 3) && (argv(2) === 'edit')) {
+            $r = q(
+                "SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
+                dbesc(argv(3)),
+                local_channel()
+            );
+
+            if (!count($r)) {
+                notice(t('Application not found.'));
+                return;
+            }
+            $app = $r[0];
+
+            $tpl = Theme::get_template("settings_oauth_edit.tpl");
+            $o .= replace_macros($tpl, array(
+                '$form_security_token' => get_form_security_token("settings_oauth"),
+                '$title' => t('Add application'),
+                '$submit' => t('Update'),
+                '$cancel' => t('Cancel'),
+                '$name' => array('name', t('Name'), $app['clname'], ''),
+                '$key' => array('key', t('Consumer Key'), $app['client_id'], ''),
+                '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''),
+                '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
+                '$icon' => array('icon', t('Icon url'), $app['icon'], ''),
+            ));
+            return $o;
+        }
+
+        if ((argc() > 3) && (argv(2) === 'delete')) {
+            check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+
+            $r = q(
+                "DELETE FROM clients WHERE client_id='%s' AND uid=%d",
+                dbesc(argv(3)),
+                local_channel()
+            );
+            goaway(z_root() . "/settings/oauth/");
+            return;
+        }
+
+
+        $r = q(
+            "SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my 
+				FROM clients
+				LEFT JOIN tokens ON clients.client_id=tokens.client_id
+				WHERE clients.uid IN (%d,0)",
+            local_channel(),
+            local_channel()
+        );
+
+
+        $tpl = Theme::get_template("settings_oauth.tpl");
+        $o .= replace_macros($tpl, array(
+            '$form_security_token' => get_form_security_token("settings_oauth"),
+            '$baseurl' => z_root(),
+            '$title' => t('Connected Apps'),
+            '$add' => t('Add application'),
+            '$edit' => t('Edit'),
+            '$delete' => t('Delete'),
+            '$consumerkey' => t('Client key starts with'),
+            '$noname' => t('No name'),
+            '$remove' => t('Remove authorization'),
+            '$apps' => $r,
+        ));
+        return $o;
+    }
+}
diff --git a/Code/Module/Settings/Oauth2.php b/Code/Module/Settings/Oauth2.php
new file mode 100644
index 000000000..218816312
--- /dev/null
+++ b/Code/Module/Settings/Oauth2.php
@@ -0,0 +1,222 @@
+ 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST, 'submit')) {
+            check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2');
+
+            $name = ((x($_POST, 'name')) ? escape_tags(trim($_POST['name'])) : '');
+            $clid = ((x($_POST, 'clid')) ? escape_tags(trim($_POST['clid'])) : '');
+            $secret = ((x($_POST, 'secret')) ? escape_tags(trim($_POST['secret'])) : '');
+            $redirect = ((x($_POST, 'redirect')) ? escape_tags(trim($_POST['redirect'])) : '');
+            $grant = ((x($_POST, 'grant')) ? escape_tags(trim($_POST['grant'])) : '');
+            $scope = ((x($_POST, 'scope')) ? escape_tags(trim($_POST['scope'])) : '');
+            logger('redirect: ' . $redirect);
+            $ok = true;
+            if ($clid == '' || $secret == '') {
+                $ok = false;
+                notice(t('ID and Secret are required') . EOL);
+            }
+
+            if ($ok) {
+                if ($_POST['submit'] == t("Update")) {
+                    $r = q(
+                        "UPDATE oauth_clients SET
+								client_name = '%s',
+								client_id = '%s',
+								client_secret = '%s',
+								redirect_uri = '%s',
+								grant_types = '%s',
+								scope = '%s', 
+								user_id = %d
+							WHERE client_id='%s' and user_id = %s",
+                        dbesc($name),
+                        dbesc($clid),
+                        dbesc($secret),
+                        dbesc($redirect),
+                        dbesc($grant),
+                        dbesc($scope),
+                        intval(local_channel()),
+                        dbesc($clid),
+                        intval(local_channel())
+                    );
+                } else {
+                    $r = q(
+                        "INSERT INTO oauth_clients (client_name, client_id, client_secret, redirect_uri, grant_types, scope, user_id)
+						VALUES ('%s','%s','%s','%s','%s','%s',%d)",
+                        dbesc($name),
+                        dbesc($clid),
+                        dbesc($secret),
+                        dbesc($redirect),
+                        dbesc($grant),
+                        dbesc($scope),
+                        intval(local_channel())
+                    );
+                    $r = q(
+                        "INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ",
+                        dbesc($name),
+                        intval(local_channel()),
+                        dbesc('all')
+                    );
+                }
+            }
+            goaway(z_root() . "/settings/oauth2/");
+            return;
+        }
+    }
+
+    public function get()
+    {
+
+        if (!Apps::system_app_installed(local_channel(), 'Clients')) {
+            return;
+        }
+
+        if ((argc() > 2) && (argv(2) === 'add')) {
+            $tpl = Theme::get_template("settings_oauth2_edit.tpl");
+            $o .= replace_macros($tpl, array(
+                '$form_security_token' => get_form_security_token("settings_oauth2"),
+                '$title' => t('Add OAuth2 application'),
+                '$submit' => t('Submit'),
+                '$cancel' => t('Cancel'),
+                '$name' => array('name', t('Name'), '', t('Name of application')),
+                '$clid' => array('clid', t('Consumer ID'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
+                '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
+                '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')),
+                '$grant' => array('grant', t('Grant Types'), '', t('leave blank unless your application specifically requires this')),
+                '$scope' => array('scope', t('Authorization scope'), '', t('leave blank unless your application specifically requires this')),
+            ));
+            return $o;
+        }
+
+        if ((argc() > 3) && (argv(2) === 'edit')) {
+            $r = q(
+                "SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= %d",
+                dbesc(argv(3)),
+                intval(local_channel())
+            );
+
+            if (!$r) {
+                notice(t('OAuth2 Application not found.'));
+                return;
+            }
+
+            $app = $r[0];
+
+            $tpl = Theme::get_template("settings_oauth2_edit.tpl");
+            $o .= replace_macros($tpl, array(
+                '$form_security_token' => get_form_security_token("settings_oauth2"),
+                '$title' => t('Add application'),
+                '$submit' => t('Update'),
+                '$cancel' => t('Cancel'),
+                '$name' => array('name', t('Name'), $app['client_name'], t('Name of application')),
+                '$clid' => array('clid', t('Consumer ID'), $app['client_id'], t('Automatically generated - change if desired. Max length 20')),
+                '$secret' => array('secret', t('Consumer Secret'), $app['client_secret'], t('Automatically generated - change if desired. Max length 20')),
+                '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], t('Redirect URI - leave blank unless your application specifically requires this')),
+                '$grant' => array('grant', t('Grant Types'), $app['grant_types'], t('leave blank unless your application specifically requires this')),
+                '$scope' => array('scope', t('Authorization scope'), $app['scope'], t('leave blank unless your application specifically requires this')),
+            ));
+            return $o;
+        }
+
+        if ((argc() > 3) && (argv(2) === 'delete')) {
+            check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2', 't');
+
+            $r = q(
+                "DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = %d",
+                dbesc(argv(3)),
+                intval(local_channel())
+            );
+            $r = q(
+                "DELETE FROM oauth_access_tokens WHERE client_id = '%s' AND user_id = %d",
+                dbesc(argv(3)),
+                intval(local_channel())
+            );
+            $r = q(
+                "DELETE FROM oauth_authorization_codes WHERE client_id = '%s' AND user_id = %d",
+                dbesc(argv(3)),
+                intval(local_channel())
+            );
+            $r = q(
+                "DELETE FROM oauth_refresh_tokens WHERE client_id = '%s' AND user_id = %d",
+                dbesc(argv(3)),
+                intval(local_channel())
+            );
+            goaway(z_root() . "/settings/oauth2/");
+            return;
+        }
+
+
+        $r = q(
+            "SELECT * FROM oauth_clients WHERE user_id = %d ",
+            intval(local_channel())
+        );
+
+        $c = q(
+            "select client_id, access_token from oauth_access_tokens where user_id = %d",
+            intval(local_channel())
+        );
+        if ($r && $c) {
+            foreach ($c as $cv) {
+                for ($x = 0; $x < count($r); $x++) {
+                    if ($r[$x]['client_id'] === $cv['client_id']) {
+                        if (!array_key_exists('tokens', $r[$x])) {
+                            $r[$x]['tokens'] = [];
+                        }
+                        $r[$x]['tokens'][] = $cv['access_token'];
+                    }
+                }
+            }
+        }
+
+        $tpl = Theme::get_template("settings_oauth2.tpl");
+        $o .= replace_macros($tpl, array(
+            '$form_security_token' => get_form_security_token("settings_oauth2"),
+            '$baseurl' => z_root(),
+            '$title' => t('Connected OAuth2 Apps'),
+            '$add' => t('Add application'),
+            '$edit' => t('Edit'),
+            '$delete' => t('Delete'),
+            '$consumerkey' => t('Client key starts with'),
+            '$noname' => t('No name'),
+            '$remove' => t('Remove authorization'),
+            '$apps' => $r,
+        ));
+        return $o;
+    }
+}
diff --git a/Code/Module/Settings/Permcats.php b/Code/Module/Settings/Permcats.php
new file mode 100644
index 000000000..f10d19bc3
--- /dev/null
+++ b/Code/Module/Settings/Permcats.php
@@ -0,0 +1,150 @@
+ $desc) {
+                if (array_key_exists('perms_' . $perm, $_POST)) {
+                    $pcarr[] = $perm;
+                }
+            }
+        }
+
+        Permcat::update(local_channel(), $name, $pcarr);
+
+        Libsync::build_sync_packet();
+
+        info(t('Permission role saved.') . EOL);
+
+        return;
+    }
+
+
+    public function get()
+    {
+
+        if (!local_channel()) {
+            return;
+        }
+
+        $channel = App::get_channel();
+
+
+        if (argc() > 2) {
+            $name = hex2bin(argv(2));
+        }
+
+        if (argc() > 3 && argv(3) === 'drop') {
+            Permcat::delete(local_channel(), $name);
+            Libsync::build_sync_packet();
+            json_return_and_die(['success' => true]);
+        }
+
+
+        $desc = t('Use this form to create permission rules for various classes of people or connections.');
+
+        $existing = [];
+
+        $pcat = new Permcat(local_channel());
+        $pcatlist = $pcat->listing();
+        $permcats = [];
+        if ($pcatlist) {
+            foreach ($pcatlist as $pc) {
+                if (($pc['name']) && ($name) && ($pc['name'] == $name)) {
+                    $existing = $pc['perms'];
+                }
+                if (!$pc['system']) {
+                    $permcats[bin2hex($pc['name'])] = $pc['localname'];
+                }
+            }
+        }
+
+        $hidden_perms = [];
+        $global_perms = Permissions::Perms();
+
+        foreach ($global_perms as $k => $v) {
+            $thisperm = Permcat::find_permcat($existing, $k);
+
+            $checkinherited = PermissionLimits::Get(local_channel(), $k);
+
+            $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true);
+
+            $thisperm = 0;
+            if ($existing) {
+                foreach ($existing as $ex) {
+                    if ($ex['name'] === $k) {
+                        $thisperm = $ex['value'];
+                        break;
+                    }
+                }
+            }
+
+            $perms[] = [ 'perms_' . $k, $v, $inherited ? 1 : intval($thisperm), '', [ t('No'), t('Yes') ], (($inherited) ? ' disabled="disabled" ' : '' )];
+
+            if ($inherited) {
+                $hidden_perms[] = ['perms_' . $k, 1 ];
+            }
+
+        }
+
+    
+        $tpl = Theme::get_template("settings_permcats.tpl");
+        $o .= replace_macros($tpl, array(
+            '$form_security_token' => get_form_security_token("settings_permcats"),
+            '$title' => t('Permission Roles'),
+            '$desc' => $desc,
+            '$desc2' => $desc2,
+            '$tokens' => $t,
+            '$permcats' => $permcats,
+            '$atoken' => $atoken,
+            '$url1' => z_root() . '/channel/' . $channel['channel_address'],
+            '$url2' => z_root() . '/photos/' . $channel['channel_address'],
+            '$name' => array('name', t('Role name') . ' *', (($name) ? $name : ''), ''),
+            '$me' => t('My Settings'),
+            '$perms' => $perms,
+            '$hidden_perms' => $hidden_perms,
+            '$inherited' => t('inherited'),
+            '$notself' => 0,
+            '$self' => 1,
+            '$permlbl' => t('Individual Permissions'),
+            '$permnote' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
+            '$submit' => t('Submit')
+        ));
+        return $o;
+    }
+}
diff --git a/Code/Module/Settings/Tokens.php b/Code/Module/Settings/Tokens.php
new file mode 100644
index 000000000..e7039011c
--- /dev/null
+++ b/Code/Module/Settings/Tokens.php
@@ -0,0 +1,321 @@
+= $max_tokens) {
+                    notice(sprintf(t('This channel is limited to %d tokens'), $max_tokens) . EOL);
+                    return;
+                }
+            }
+        }
+        if ($token_errs) {
+            notice(t('Name and Password are required.') . EOL);
+            return;
+        }
+
+        $old_atok = q(
+            "select * from atoken where atoken_uid = %d and atoken_name = '%s'",
+            intval($channel['channel_id']),
+            dbesc($name)
+        );
+        if ($old_atok) {
+            $old_atok = array_shift($old_atok);
+            $old_xchan = atoken_xchan($old_atok);
+        }
+
+        if ($atoken_id) {
+            $r = q(
+                "update atoken set atoken_name = '%s', atoken_token = '%s', atoken_expires = '%s' 
+				where atoken_id = %d and atoken_uid = %d",
+                dbesc($name),
+                dbesc($token),
+                dbesc($expires),
+                intval($atoken_id),
+                intval($channel['channel_id'])
+            );
+        } else {
+            $r = q(
+                "insert into atoken ( atoken_guid, atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expires )
+				values ( '%s', %d, %d, '%s', '%s', '%s' ) ",
+                dbesc($atoken_guid),
+                intval($channel['channel_account_id']),
+                intval($channel['channel_id']),
+                dbesc($name),
+                dbesc($token),
+                dbesc($expires)
+            );
+        }
+        $atok = q(
+            "select * from atoken where atoken_uid = %d and atoken_name = '%s'",
+            intval($channel['channel_id']),
+            dbesc($name)
+        );
+        if ($atok) {
+            $xchan = atoken_xchan($atok[0]);
+            atoken_create_xchan($xchan);
+            $atoken_xchan = $xchan['xchan_hash'];
+            if ($old_atok && $old_xchan) {
+                $r = q(
+                    "update xchan set xchan_name = '%s' where xchan_hash = '%s'",
+                    dbesc($xchan['xchan_name']),
+                    dbesc($old_xchan['xchan_hash'])
+                );
+            }
+        }
+
+        $all_perms = Permissions::Perms();
+
+        $p = EMPTY_STR;
+
+        if ($all_perms) {
+            foreach ($all_perms as $perm => $desc) {
+                if (array_key_exists('perms_' . $perm, $_POST)) {
+                    if ($p) {
+                        $p .= ',';
+                    }
+                    $p .= $perm;
+                }
+            }
+            set_abconfig(local_channel(), $atoken_xchan, 'system', 'my_perms', $p);
+            if ($old_atok) {
+            }
+        }
+
+        if (!$atoken_id) {
+            // If this is a new token, create a new abook record
+
+            $closeness = get_pconfig($uid, 'system', 'new_abook_closeness', 80);
+            $profile_assign = get_pconfig($uid, 'system', 'profile_assign', '');
+
+            $r = abook_store_lowlevel(
+                [
+                    'abook_account' => $channel['channel_account_id'],
+                    'abook_channel' => $channel['channel_id'],
+                    'abook_closeness' => intval($closeness),
+                    'abook_xchan' => $atoken_xchan,
+                    'abook_profile' => $profile_assign,
+                    'abook_feed' => 0,
+                    'abook_created' => datetime_convert(),
+                    'abook_updated' => datetime_convert(),
+                    'abook_instance' => z_root()
+                ]
+            );
+
+            if (!$r) {
+                logger('abook creation failed');
+            }
+
+            /** If there is a default group for this channel, add this connection to it */
+
+            if ($channel['channel_default_group']) {
+                $g = AccessList::rec_byhash($uid, $channel['channel_default_group']);
+                if ($g) {
+                    AccessList::member_add($uid, '', $atoken_xchan, $g['id']);
+                }
+            }
+
+            $r = q(
+                "SELECT abook.*, xchan.*
+				FROM abook left join xchan on abook_xchan = xchan_hash
+				WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
+                intval($channel['channel_id']),
+                dbesc($atoken_xchan)
+            );
+
+            if (!$r) {
+                logger('abook or xchan record not saved correctly');
+                return;
+            }
+
+            $clone = array_shift($r);
+
+            unset($clone['abook_id']);
+            unset($clone['abook_account']);
+            unset($clone['abook_channel']);
+
+            $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
+            if ($abconfig) {
+                $clone['abconfig'] = $abconfig;
+            }
+
+            Libsync::build_sync_packet(
+                $channel['channel_id'],
+                ['abook' => [$clone], 'atoken' => $atok],
+                true
+            );
+        }
+
+        info(t('Token saved.') . EOL);
+        return;
+    }
+
+
+    public function get()
+    {
+
+        $channel = App::get_channel();
+
+        $atoken = null;
+        $atoken_xchan = '';
+
+        if (argc() > 2) {
+            $id = argv(2);
+
+            $atoken = q(
+                "select * from atoken where atoken_id = %d and atoken_uid = %d",
+                intval($id),
+                intval(local_channel())
+            );
+
+            if ($atoken) {
+                $atoken = $atoken[0];
+                $atoken_xchan = substr($channel['channel_hash'], 0, 16) . '.' . $atoken['atoken_guid'];
+            }
+
+            if ($atoken && argc() > 3 && argv(3) === 'drop') {
+                $atoken['deleted'] = true;
+
+                $r = q(
+                    "SELECT abook.*, xchan.*
+					FROM abook left join xchan on abook_xchan = xchan_hash
+					WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
+                    intval($channel['channel_id']),
+                    dbesc($atoken_xchan)
+                );
+                if (!$r) {
+                    return;
+                }
+
+                $clone = array_shift($r);
+
+                unset($clone['abook_id']);
+                unset($clone['abook_account']);
+                unset($clone['abook_channel']);
+
+                $clone['entry_deleted'] = true;
+
+                $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
+                if ($abconfig) {
+                    $clone['abconfig'] = $abconfig;
+                }
+
+                atoken_delete($id);
+                Libsync::build_sync_packet(
+                    $channel['channel_id'],
+                    ['abook' => [$clone], 'atoken' => [$atoken]],
+                    true
+                );
+
+                $atoken = null;
+                $atoken_xchan = '';
+            }
+        }
+
+        $t = q(
+            "select * from atoken where atoken_uid = %d",
+            intval(local_channel())
+        );
+
+        $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.');
+
+        $desc2 = t('You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:');
+
+
+        $global_perms = Permissions::Perms();
+        $existing = get_all_perms(local_channel(), (($atoken_xchan) ? $atoken_xchan : EMPTY_STR));
+
+        $theirs = get_abconfig(local_channel(), $atoken_xchan, 'system', 'their_perms', EMPTY_STR);
+
+        $their_perms = Permissions::FilledPerms(explode(',', $theirs));
+        foreach ($global_perms as $k => $v) {
+            if (!array_key_exists($k, $their_perms)) {
+                $their_perms[$k] = 1;
+            }
+        }
+
+        $my_perms = explode(',', get_abconfig(local_channel(), $atoken_xchan, 'system', 'my_perms', EMPTY_STR));
+
+        foreach ($global_perms as $k => $v) {
+            $thisperm = ((in_array($k, $my_perms)) ? 1 : 0);
+
+            $checkinherited = PermissionLimits::Get(local_channel(), $k);
+
+            // For auto permissions (when $self is true) we don't want to look at existing
+            // permissions because they are enabled for the channel owner
+            if ((!$self) && ($existing[$k])) {
+                $thisperm = "1";
+            }
+
+            $perms[] = array('perms_' . $k, $v, ((array_key_exists($k, $their_perms)) ? intval($their_perms[$k]) : ''), $thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
+        }
+
+
+        $tpl = Theme::get_template("settings_tokens.tpl");
+        $o .= replace_macros($tpl, array(
+            '$form_security_token' => get_form_security_token("settings_tokens"),
+            '$title' => t('Guest Access Tokens'),
+            '$desc' => $desc,
+            '$desc2' => $desc2,
+            '$tokens' => $t,
+            '$atoken' => $atoken,
+            '$atoken_xchan' => $atoken_chan,
+            '$url1' => z_root() . '/channel/' . $channel['channel_address'],
+            '$url2' => z_root() . '/photos/' . $channel['channel_address'],
+            '$name' => array('name', t('Login Name') . ' *', (($atoken) ? $atoken['atoken_name'] : ''), ''),
+            '$token' => array('token', t('Login Password') . ' *', (($atoken) ? $atoken['atoken_token'] : new_token()), ''),
+            '$expires' => array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] > NULL_DATE) ? datetime_convert('UTC', date_default_timezone_get(), $atoken['atoken_expires']) : ''), ''),
+            '$them' => t('Their Settings'),
+            '$me' => t('My Settings'),
+            '$perms' => $perms,
+            '$inherited' => t('inherited'),
+            '$notself' => 1,
+            '$self' => 0,
+            '$permlbl' => t('Individual Permissions'),
+            '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'),
+            '$submit' => t('Submit')
+        ));
+        return $o;
+    }
+}
diff --git a/Code/Module/Setup.php b/Code/Module/Setup.php
new file mode 100644
index 000000000..18c848325
--- /dev/null
+++ b/Code/Module/Setup.php
@@ -0,0 +1,902 @@
+install_wizard_pass = intval($_POST['pass']);
+        } else {
+            $this->install_wizard_pass = 1;
+        }
+    }
+
+    /**
+     * @brief Handle the actions of the different setup steps.
+     *
+     */
+    public function post()
+    {
+
+        switch ($this->install_wizard_pass) {
+            case 1:
+            case 2:
+                return;
+            // implied break;
+            case 3:
+                $urlpath = App::get_path();
+                $dbhost = trim($_POST['dbhost']);
+                $dbport = intval(trim($_POST['dbport']));
+                $dbuser = trim($_POST['dbuser']);
+                $dbpass = trim($_POST['dbpass']);
+                $dbdata = trim($_POST['dbdata']);
+                $dbtype = intval(trim($_POST['dbtype']));
+                $servertype = intval(trim($_POST['servertype']));
+                $phpath = trim($_POST['phpath']);
+                $adminmail = trim($_POST['adminmail']);
+                $siteurl = trim($_POST['siteurl']);
+
+                // $siteurl should not have a trailing slash
+
+                $siteurl = rtrim($siteurl, '/');
+
+                require_once('include/dba/dba_driver.php');
+
+                $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);
+
+                if (!DBA::$dba->connected) {
+                    echo 'Database Connect failed: ' . DBA::$dba->error;
+                    killme();
+                }
+                return;
+            // implied break;
+            case 4:
+                $urlpath = App::get_path();
+                $dbhost = trim($_POST['dbhost']);
+                $dbport = intval(trim($_POST['dbport']));
+                $dbuser = trim($_POST['dbuser']);
+                $dbpass = trim($_POST['dbpass']);
+                $dbdata = trim($_POST['dbdata']);
+                $dbtype = intval(trim($_POST['dbtype']));
+                $servertype = intval(trim($_POST['servertype']));
+                $phpath = trim($_POST['phpath']);
+                $timezone = trim($_POST['timezone']);
+                $adminmail = trim($_POST['adminmail']);
+                $siteurl = trim($_POST['siteurl']);
+
+                if ($siteurl != z_root()) {
+                    $test = z_fetch_url($siteurl . '/setup/testrewrite');
+                    if ((!$test['success']) || ($test['body'] !== 'ok')) {
+                        App::$data['url_fail'] = true;
+                        App::$data['url_error'] = $test['error'];
+                        return;
+                    }
+                }
+
+                if (!DBA::$dba->connected) {
+                    // connect to db
+                    $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);
+                }
+
+                if (!DBA::$dba->connected) {
+                    echo 'CRITICAL: DB not connected.';
+                    killme();
+                }
+
+                $txt = replace_macros(Theme::get_email_template('htconfig.tpl'), [
+                    '$dbhost' => $dbhost,
+                    '$dbport' => $dbport,
+                    '$dbuser' => $dbuser,
+                    '$dbpass' => $dbpass,
+                    '$dbdata' => $dbdata,
+                    '$dbtype' => $dbtype,
+                    '$servertype' => '',
+                    '$server_role' => 'pro',
+                    '$timezone' => $timezone,
+                    '$platform' => ucfirst(PLATFORM_NAME),
+                    '$siteurl' => $siteurl,
+                    '$site_id' => random_string(),
+                    '$phpath' => $phpath,
+                    '$adminmail' => $adminmail
+                ]);
+
+                $result = file_put_contents('.htconfig.php', $txt);
+                if (!$result) {
+                    App::$data['txt'] = $txt;
+                }
+
+                $errors = $this->load_database($db);
+
+                if ($errors) {
+                    App::$data['db_failed'] = $errors;
+                } else {
+                    App::$data['db_installed'] = true;
+                }
+
+                return;
+            // implied break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @brief Get output for the setup page.
+     *
+     * Depending on the state we are currently in it returns different content.
+     *
+     * @return string parsed HTML output
+     */
+
+    public function get()
+    {
+
+        $o = EMPTY_STR;
+        $wizard_status = EMPTY_STR;
+        $db_return_text = EMPTY_STR;
+        $install_title = t('$Projectname Server - Setup');
+
+        if (x(App::$data, 'db_conn_failed')) {
+            $this->install_wizard_pass = 2;
+            $wizard_status = t('Could not connect to database.');
+        }
+        if (x(App::$data, 'url_fail')) {
+            $this->install_wizard_pass = 3;
+            $wizard_status = t('Could not connect to specified site URL. Possible SSL certificate or DNS issue.');
+            if (App::$data['url_error']) {
+                $wizard_status .= ' ' . App::$data['url_error'];
+            }
+        }
+
+        if (x(App::$data, 'db_create_failed')) {
+            $this->install_wizard_pass = 2;
+            $wizard_status = t('Could not create table.');
+        }
+        if (x(App::$data, 'db_installed')) {
+            $pass = t('Installation succeeded!');
+            $icon = 'check';
+            $txt = t('Your site database has been installed.') . EOL;
+            $db_return_text .= $txt;
+        }
+        if (x(App::$data, 'db_failed')) {
+            $pass = t('Database install failed!');
+            $icon = 'exclamation-triangle';
+            $txt = t('You may need to import the file "install/schema_xxx.sql" manually using a database client.') . EOL;
+            $txt .= t('Please see the file "install/INSTALL.txt".') . EOL . '
      ';
+            $txt .= '
      ' . App::$data['db_failed'] . '
      ' . EOL;
+            $db_return_text .= $txt;
+        }
+        if (DBA::$dba && DBA::$dba->connected) {
+            $r = q("SELECT COUNT(*) as total FROM account");
+            if ($r && count($r) && $r[0]['total']) {
+                return replace_macros(Theme::get_template('install.tpl'), [
+                    '$title' => $install_title,
+                    '$pass' => '',
+                    '$status' => t('Permission denied.'),
+                    '$text' => '',
+                ]);
+            }
+        }
+
+        if (x(App::$data, 'txt') && strlen(App::$data['txt'])) {
+            $db_return_text .= $this->manual_config($a);
+        }
+
+        if ($db_return_text !== EMPTY_STR) {
+            $tpl = Theme::get_template('install.tpl');
+            return replace_macros(Theme::get_template('install.tpl'), [
+                '$title' => $install_title,
+                '$icon' => $icon,
+                '$pass' => $pass,
+                '$text' => $db_return_text,
+                '$what_next' => $this->what_next()
+            ]);
+        }
+
+        switch ($this->install_wizard_pass) {
+            case 1:
+            {
+                // System check
+
+                $checks = [];
+
+                $this->check_funcs($checks);
+
+                $this->check_htconfig($checks);
+
+                $this->check_store($checks);
+
+                $this->check_smarty3($checks);
+
+                $this->check_keys($checks);
+
+                if (x($_POST, 'phpath')) {
+                    $phpath = notags(trim($_POST['phpath']));
+                }
+
+                $this->check_php($phpath, $checks);
+
+                $this->check_phpconfig($checks);
+
+                $this->check_htaccess($checks);
+
+                $checkspassed = array_reduce($checks, "self::check_passed", true);
+
+                $o .= replace_macros(Theme::get_template('install_checks.tpl'), [
+                    '$title' => $install_title,
+                    '$pass' => t('System check'),
+                    '$checks' => $checks,
+                    '$passed' => $checkspassed,
+                    '$see_install' => t('Please see the file "install/INSTALL.txt".'),
+                    '$next' => t('Next'),
+                    '$reload' => t('Check again'),
+                    '$phpath' => $phpath,
+                    '$baseurl' => z_root(),
+                ]);
+                return $o;
+                break;
+            }
+
+            case 2:
+            {
+                // Database config
+
+                $dbhost = ((x($_POST, 'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
+                $dbuser = ((x($_POST, 'dbuser')) ? trim($_POST['dbuser']) : EMPTY_STR);
+                $dbport = ((x($_POST, 'dbport')) ? intval(trim($_POST['dbport'])) : 0);
+                $dbpass = ((x($_POST, 'dbpass')) ? trim($_POST['dbpass']) : EMPTY_STR);
+                $dbdata = ((x($_POST, 'dbdata')) ? trim($_POST['dbdata']) : EMPTY_STR);
+                $dbtype = ((x($_POST, 'dbtype')) ? intval(trim($_POST['dbtype'])) : 0);
+                $phpath = ((x($_POST, 'phpath')) ? trim($_POST['phpath']) : EMPTY_STR);
+                $adminmail = ((x($_POST, 'adminmail')) ? trim($_POST['adminmail']) : EMPTY_STR);
+                $siteurl = ((x($_POST, 'siteurl')) ? trim($_POST['siteurl']) : EMPTY_STR);
+
+                $servertype = EMPTY_STR;
+
+                $o .= replace_macros(Theme::get_template('install_db.tpl'), [
+                    '$title' => $install_title,
+                    '$pass' => t('Database connection'),
+                    '$info_01' => t('In order to install this software we need to know how to connect to your database.'),
+                    '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+                    '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'),
+
+                    '$status' => $wizard_status,
+
+                    '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, t('Default is 127.0.0.1')),
+                    '$dbport' => array('dbport', t('Database Port'), $dbport, t('Communication port number - use 0 for default')),
+                    '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''),
+                    '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''),
+                    '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''),
+                    '$dbtype' => array('dbtype', t('Database Type'), $dbtype, '', array(0 => 'MySQL', 1 => 'PostgreSQL')),
+
+                    '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.')),
+                    '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')),
+                    '$lbl_10' => t('Please select a default timezone for your website'),
+                    '$baseurl' => z_root(),
+                    '$phpath' => $phpath,
+                    '$submit' => t('Submit'),
+                ]);
+
+                return $o;
+                break;
+            }
+            case 3:
+            {
+                // Site settings
+                $dbhost = ((x($_POST, 'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
+                $dbuser = ((x($_POST, 'dbuser')) ? trim($_POST['dbuser']) : EMPTY_STR);
+                $dbport = ((x($_POST, 'dbport')) ? intval(trim($_POST['dbport'])) : 0);
+                $dbpass = ((x($_POST, 'dbpass')) ? trim($_POST['dbpass']) : EMPTY_STR);
+                $dbdata = ((x($_POST, 'dbdata')) ? trim($_POST['dbdata']) : EMPTY_STR);
+                $dbtype = ((x($_POST, 'dbtype')) ? intval(trim($_POST['dbtype'])) : 0);
+                $phpath = ((x($_POST, 'phpath')) ? trim($_POST['phpath']) : EMPTY_STR);
+
+                $servertype = EMPTY_STR;
+
+                $adminmail = ((x($_POST, 'adminmail')) ? trim($_POST['adminmail']) : EMPTY_STR);
+                $siteurl = ((x($_POST, 'siteurl')) ? trim($_POST['siteurl']) : EMPTY_STR);
+                $timezone = ((x($_POST, 'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
+
+                $o .= replace_macros(Theme::get_template('install_settings.tpl'), [
+                    '$title' => $install_title,
+                    '$pass' => t('Site settings'),
+                    '$status' => $wizard_status,
+
+                    '$dbhost' => $dbhost,
+                    '$dbport' => $dbport,
+                    '$dbuser' => $dbuser,
+                    '$dbpass' => $dbpass,
+                    '$dbdata' => $dbdata,
+                    '$phpath' => $phpath,
+                    '$dbtype' => $dbtype,
+                    '$servertype' => $servertype,
+
+                    '$adminmail' => ['adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.')],
+
+                    '$siteurl' => ['siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')],
+
+                    '$timezone' => ['timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()],
+
+                    '$baseurl' => z_root(),
+
+                    '$submit' => t('Submit'),
+                ]);
+                return $o;
+                break;
+            }
+        }
+    }
+
+    /**
+     * @brief Add a check result to the array for output.
+     *
+     * @param[in,out] array &$checks array passed to template
+     * @param string $title a title for the check
+     * @param bool $status
+     * @param bool $required
+     * @param string $help optional help string
+     */
+    public function check_add(&$checks, $title, $status, $required, $help = '')
+    {
+        $checks[] = [
+            'title' => $title,
+            'status' => $status,
+            'required' => $required,
+            'help' => $help
+        ];
+    }
+
+    /**
+     * @brief Checks the PHP environment.
+     *
+     * @param[in,out] string &$phpath
+     * @param[out] array &$checks
+     */
+    public function check_php(&$phpath, &$checks)
+    {
+        $help = '';
+
+        if (version_compare(PHP_VERSION, '7.1') < 0) {
+            $help .= t('PHP version 7.1 or greater is required.');
+            $this->check_add($checks, t('PHP version'), false, true, $help);
+        }
+
+        if (strlen($phpath)) {
+            $passed = file_exists($phpath);
+        } elseif (function_exists('shell_exec')) {
+            if (is_windows()) {
+                $phpath = trim(shell_exec('where php'));
+            } else {
+                $phpath = trim(shell_exec('which php'));
+            }
+            $passed = strlen($phpath);
+        }
+
+        if (!$passed) {
+            $help .= t('Could not find a command line version of PHP in the web server PATH.') . EOL;
+            $help .= t('If you do not have a command line version of PHP installed on server, you will not be able to run background tasks - including message delivery.') . EOL;
+            $help .= EOL;
+
+            $help .= replace_macros(Theme::get_template('field_input.tpl'), [
+                '$field' => ['phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')],
+            ]);
+            $phpath = '';
+        }
+
+        $this->check_add($checks, t('Command line PHP') . ($passed ? " ($phpath)" : EMPTY_STR), $passed, false, $help);
+
+        if ($passed) {
+            $str = autoname(8);
+            $cmd = "$phpath install/testargs.php $str";
+            $help = '';
+
+            if (function_exists('shell_exec')) {
+                $result = trim(shell_exec($cmd));
+            } else {
+                $help .= t('Unable to check command line PHP, as shell_exec() is disabled. This is required.') . EOL;
+            }
+            $passed2 = (($result === $str) ? true : false);
+            if (!$passed2) {
+                $help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
+                $help .= t('This is required for message delivery to work.');
+            }
+
+            $this->check_add($checks, t('PHP register_argc_argv'), $passed, true, $help);
+        }
+    }
+
+    /**
+     * @brief Some PHP configuration checks.
+     *
+     * @param[out] array &$checks
+     * @todo Change how we display such informational text. Add more description
+     *       how to change them.
+     *
+     */
+    public function check_phpconfig(&$checks)
+    {
+
+        $help = '';
+        $mem_warning = EMPTY_STR;
+
+        $result = self::getPhpiniUploadLimits();
+        if ($result['post_max_size'] < (2 * 1024 * 1024) || $result['max_upload_filesize'] < (2 * 1024 * 1024)) {
+            $mem_warning = '' . t('This is not sufficient to upload larger images or files. You should be able to upload at least 2MB (2097152 bytes) at once.') . '';
+        }
+
+        $help = sprintf(
+            t('Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.'),
+            userReadableSize($result['post_max_size']),
+            userReadableSize($result['max_upload_filesize']),
+            $result['max_file_uploads']
+        );
+
+        $help .= (($mem_warning) ? $mem_warning : EMPTY_STR);
+        $help .= '

      ' . t('You can adjust these settings in the server php.ini file.');
+
+        $this->check_add($checks, t('PHP upload limits'), true, false, $help);
+    }
+
+    /**
+     * @brief Check if the openssl implementation can generate keys.
+     *
+     * @param[out] array $checks
+     */
+    public function check_keys(&$checks)
+    {
+        $help = '';
+        $res = false;
+
+        if (function_exists('openssl_pkey_new')) {
+            $res = openssl_pkey_new(array(
+                    'digest_alg' => 'sha1',
+                    'private_key_bits' => 4096,
+                    'encrypt_key' => false));
+        }
+
+        // Get private key
+
+        if (!$res) {
+            $help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
+            $help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
+        }
+
+        $this->check_add($checks, t('Generate encryption keys'), $res, true, $help);
+    }
+
+    /**
+     * @brief Check for some PHP functions and modules.
+     *
+     * @param[in,out] array &$checks
+     */
+    public function check_funcs(&$checks)
+    {
+        $ck_funcs = [];
+
+        $disabled = explode(',', ini_get('disable_functions'));
+        if ($disabled) {
+            array_walk($disabled, 'array_trim');
+        }
+
+        // add check metadata, the real check is done bit later and return values set
+
+        $this->check_add($ck_funcs, t('libCurl PHP module'), true, true);
+        $this->check_add($ck_funcs, t('GD graphics PHP module'), true, true);
+        $this->check_add($ck_funcs, t('OpenSSL PHP module'), true, true);
+        $this->check_add($ck_funcs, t('PDO database PHP module'), true, true);
+        $this->check_add($ck_funcs, t('mb_string PHP module'), true, true);
+        $this->check_add($ck_funcs, t('xml PHP module'), true, true);
+        $this->check_add($ck_funcs, t('zip PHP module'), true, true);
+
+        if (function_exists('apache_get_modules')) {
+            if (!in_array('mod_rewrite', apache_get_modules())) {
+                $this->check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+            } else {
+                $this->check_add($ck_funcs, t('Apache mod_rewrite module'), true, true);
+            }
+        }
+        if ((!function_exists('exec')) || in_array('exec', $disabled)) {
+            $this->check_add($ck_funcs, t('exec'), false, true, t('Error: exec is required but is either not installed or has been disabled in php.ini'));
+        } else {
+            $this->check_add($ck_funcs, t('exec'), true, true);
+        }
+        if ((!function_exists('shell_exec')) || in_array('shell_exec', $disabled)) {
+            $this->check_add($ck_funcs, t('shell_exec'), false, true, t('Error: shell_exec is required but is either not installed or has been disabled in php.ini'));
+        } else {
+            $this->check_add($ck_funcs, t('shell_exec'), true, true);
+        }
+
+        if (!function_exists('curl_init')) {
+            $ck_funcs[0]['status'] = false;
+            $ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.');
+        }
+        if ((!function_exists('imagecreatefromjpeg')) && (!class_exists('\\Imagick'))) {
+            $ck_funcs[1]['status'] = false;
+            $ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.');
+        }
+        if (!function_exists('openssl_public_encrypt')) {
+            $ck_funcs[2]['status'] = false;
+            $ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.');
+        }
+        if (class_exists('\\PDO')) {
+            $x = PDO::getAvailableDrivers();
+            if ((!in_array('mysql', $x)) && (!in_array('pgsql', $x))) {
+                $ck_funcs[3]['status'] = false;
+                $ck_funcs[3]['help'] = t('Error: PDO database PHP module missing a driver for either mysql or pgsql.');
+            }
+        }
+        if (!class_exists('\\PDO')) {
+            $ck_funcs[3]['status'] = false;
+            $ck_funcs[3]['help'] = t('Error: PDO database PHP module required but not installed.');
+        }
+        if (!function_exists('mb_strlen')) {
+            $ck_funcs[4]['status'] = false;
+            $ck_funcs[4]['help'] = t('Error: mb_string PHP module required but not installed.');
+        }
+        if (!extension_loaded('xml')) {
+            $ck_funcs[5]['status'] = false;
+            $ck_funcs[5]['help'] = t('Error: xml PHP module required for DAV but not installed.');
+        }
+        if (!extension_loaded('zip')) {
+            $ck_funcs[6]['status'] = false;
+            $ck_funcs[6]['help'] = t('Error: zip PHP module required but not installed.');
+        }
+
+        $checks = array_merge($checks, $ck_funcs);
+    }
+
+    /**
+     * @brief Check for .htconfig requirements.
+     *
+     * @param[out] array &$checks
+     */
+    public function check_htconfig(&$checks)
+    {
+        $status = true;
+        $help = EMPTY_STR;
+
+        $fname = '.htconfig.php';
+
+        if (
+            (file_exists($fname) && is_writable($fname)) ||
+            (!(file_exists($fname) && is_writable('.')))
+        ) {
+            $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
+            return;
+        }
+
+        $status = false;
+        $help .= t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') . EOL;
+        $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL;
+        $help .= t('Please see install/INSTALL.txt for additional information.');
+
+        $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
+    }
+
+    /**
+     * @brief Checks for our templating engine Smarty3 requirements.
+     *
+     * @param[out] array &$checks
+     */
+    public function check_smarty3(&$checks)
+    {
+        $status = true;
+        $help = '';
+
+        @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true);
+
+        if (!is_writable(TEMPLATE_BUILD_PATH)) {
+            $status = false;
+            $help .= t('This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL;
+            $help .= sprintf(t('In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder.'), TEMPLATE_BUILD_PATH) . EOL;
+            $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.') . EOL;
+        }
+
+        $this->check_add($checks, sprintf(t('%s is writable'), TEMPLATE_BUILD_PATH), $status, true, $help);
+    }
+
+    /**
+     * @brief Check for store directory.
+     *
+     * @param[out] array &$checks
+     */
+    public function check_store(&$checks)
+    {
+        $status = true;
+        $help = '';
+
+        @os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, true);
+
+        if (!is_writable('store')) {
+            $status = false;
+            $help = t('This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder') . EOL;
+            $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.') . EOL;
+        }
+
+        $this->check_add($checks, t('store is writable'), $status, true, $help);
+    }
+
+    /**
+     * @brief Check URL rewrite und SSL certificate.
+     *
+     * @param[out] array &$checks
+     */
+    public function check_htaccess(&$checks)
+    {
+        $status = true;
+        $help = '';
+        $ssl_error = false;
+
+        $url = z_root() . '/setup/testrewrite';
+
+        if (function_exists('curl_init')) {
+            $test = z_fetch_url($url);
+            if (!$test['success']) {
+                if (strstr($url, 'https://')) {
+                    $test = z_fetch_url($url, false, 0, ['novalidate' => true]);
+                    if ($test['success']) {
+                        $ssl_error = true;
+                    }
+                } else {
+                    $test = z_fetch_url(str_replace('http://', 'https://', $url), false, 0, ['novalidate' => true]);
+                    if ($test['success']) {
+                        $ssl_error = true;
+                    }
+                }
+
+                if ($ssl_error) {
+                    $help .= t('SSL certificate cannot be validated. Fix certificate or disable https access to this site.') . EOL;
+                    $help .= t('If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!') . EOL;
+                    $help .= t('This restriction is incorporated because public posts from you may for example contain references to images on your own hub.') . EOL;
+                    $help .= t('If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.') . EOL;
+                    $help .= t('This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.') . EOL;
+                    $help .= t('Providers are available that issue free certificates which are browser-valid.') . EOL;
+
+                    $help .= t('If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.') . EOL;
+
+                    $this->check_add($checks, t('SSL certificate validation'), false, true, $help);
+                }
+            }
+
+            if ((!$test['success']) || ($test['body'] !== 'ok')) {
+                $status = false;
+                $help = t('Url rewrite in .htaccess is not working. Check your server configuration.' . 'Test: ' . var_export($test, true));
+            }
+
+            $this->check_add($checks, t('Url rewrite is working'), $status, true, $help);
+        } else {
+            // cannot check modrewrite if libcurl is not installed
+        }
+    }
+
+    /**
+     * @brief
+     *
+     * @param App &$a
+     * @return string with paresed HTML
+     */
+    public function manual_config(&$a)
+    {
+        $data = htmlspecialchars(App::$data['txt'], ENT_COMPAT, 'UTF-8');
+        $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
+        $o .= "";
+
+        return $o;
+    }
+
+    public function load_database_rem($v, $i)
+    {
+        $l = trim($i);
+        if (strlen($l) > 1 && ($l[0] === '-' || ($l[0] === '/' && $l[1] === '*'))) {
+            return $v;
+        } else {
+            return $v . "\n" . $i;
+        }
+    }
+
+
+    public function load_database($db)
+    {
+        $str = file_get_contents(DBA::$dba->get_install_script());
+        $arr = explode(';', $str);
+        $errors = false;
+        foreach ($arr as $a) {
+            if (strlen(trim($a))) {
+                $r = dbq(trim($a));
+                if (!$r) {
+                    $errors .= t('Errors encountered creating database tables.') . $a . EOL;
+                }
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * @brief
+     *
+     * @return string with parsed HTML
+     */
+    public function what_next()
+    {
+        // install the standard theme
+        set_config('system', 'allowed_themes', 'redbasic');
+
+        // if imagick converter is installed, use it
+        if (@is_executable('/usr/bin/convert')) {
+            set_config('system', 'imagick_convert_path', '/usr/bin/convert');
+        }
+
+        // Set a lenient list of ciphers if using openssl. Other ssl engines
+        // (e.g. NSS used in RedHat) require different syntax, so hopefully
+        // the default curl cipher list will work for most sites. If not,
+        // this can set via config. Many distros are now disabling RC4,
+        // but many existing sites still use it and are unable to change it.
+        // We do not use SSL for encryption, only to protect session cookies.
+        // z_fetch_url() is also used to import shared links and other content
+        // so in theory most any cipher could show up and we should do our best
+        // to make the content available rather than tell folks that there's a
+        // weird SSL error which they can't do anything about. This does not affect
+        // the SSL server, but is only a client negotiation to find something workable.
+        // Hence it will not make your system susceptible to POODL or other nasties.
+
+        $x = curl_version();
+        if (stristr($x['ssl_version'], 'openssl')) {
+            set_config('system', 'curl_ssl_ciphers', 'ALL:!eNULL');
+        }
+
+        // Create a system channel
+
+        Channel::create_system();
+
+        $register_link = '' . t('registration page') . '';
+
+        return
+            t('
      What next?
      ')
+            . '
      '
+            . t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
+            . EOL
+            . t('Please see the file "install/INSTALL.txt" for more information and instructions.')
+            . '
      '
+            . sprintf(t('Go to your new hub %s and register as new member. Please use the same email address that you entered for the administrator email as this will allow your new account to enter the site admin panel.'), $register_link)
+            . '
      ';
+    }
+
+    /**
+     * @brief
+     *
+     * @param unknown $v
+     * @param array $c
+     * @return array
+     */
+    private static function check_passed($v, $c)
+    {
+        if ($c['required']) {
+            $v = $v && $c['status'];
+        }
+        return $v;
+    }
+
+    /**
+     * @brief Get some upload related limits from php.ini.
+     *
+     * This function returns values from php.ini like \b post_max_size,
+     * \b max_file_uploads, \b upload_max_filesize.
+     *
+     * @return array associative array
+     *   * \e int \b post_max_size the maximum size of a complete POST in bytes
+     *   * \e int \b upload_max_filesize the maximum size of one file in bytes
+     *   * \e int \b max_file_uploads maximum number of files in one POST
+     *   * \e int \b max_upload_filesize min(post_max_size, upload_max_filesize)
+     */
+
+    private static function getPhpiniUploadLimits()
+    {
+        $ret = [];
+
+        // max size of the complete POST
+        $ret['post_max_size'] = self::phpiniSizeToBytes(ini_get('post_max_size'));
+        // max size of one file
+        $ret['upload_max_filesize'] = self::phpiniSizeToBytes(ini_get('upload_max_filesize'));
+        // catch a configuration error where post_max_size < upload_max_filesize
+        $ret['max_upload_filesize'] = min(
+            $ret['post_max_size'],
+            $ret['upload_max_filesize']
+        );
+        // maximum number of files in one POST
+        $ret['max_file_uploads'] = intval(ini_get('max_file_uploads'));
+
+        return $ret;
+    }
+
+    /**
+     * @brief Parses php_ini size settings to bytes.
+     *
+     * This function parses common size setting from php.ini files to bytes.
+     * e.g. post_max_size = 8M ==> 8388608
+     *
+     * \note This method does not recognise other human readable formats like
+     * 8MB, etc.
+     *
+     * @param string $val value from php.ini e.g. 2M, 8M
+     * @return int size in bytes
+     * @todo Make this function more universal useable. MB, T, etc.
+     *
+     */
+    private static function phpiniSizeToBytes($val)
+    {
+        $val = trim($val);
+        $unit = strtolower($val[strlen($val) - 1]);
+        // strip off any non-numeric portion
+        $val = intval($val);
+        switch ($unit) {
+            case 'g':
+                $val *= 1024;
+            case 'm':
+                $val *= 1024;
+            case 'k':
+                $val *= 1024;
+            default:
+                break;
+        }
+
+        return (int)$val;
+    }
+}
diff --git a/Code/Module/Share.php b/Code/Module/Share.php
new file mode 100644
index 000000000..d7f5a2071
--- /dev/null
+++ b/Code/Module/Share.php
@@ -0,0 +1,151 @@
+ 1) ? intval(argv(1)) : 0);
+
+        if (!$post_id) {
+            killme();
+        }
+
+        if (!local_channel()) {
+            killme();
+        }
+
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+
+        $r = q(
+            "SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d  LIMIT 1",
+            intval($post_id)
+        );
+        if (!$r) {
+            killme();
+        }
+
+        if (($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) {
+            killme();
+        }
+
+        $sql_extra = item_permissions_sql($r[0]['uid']);
+
+        $r = q(
+            "select * from item where id = %d $sql_extra",
+            intval($post_id)
+        );
+        if (!$r) {
+            killme();
+        }
+
+        /** @FIXME we only share bbcode */
+
+        if (!in_array($r[0]['mimetype'], ['text/bbcode', 'text/x-multicode'])) {
+            killme();
+        }
+
+
+        xchan_query($r);
+
+        $arr = [];
+
+        $item = $r[0];
+
+        $owner_uid = $r[0]['uid'];
+        $owner_aid = $r[0]['aid'];
+
+        $can_comment = false;
+        if ((array_key_exists('owner', $item)) && intval($item['owner']['abook_self'])) {
+            $can_comment = perm_is_allowed($item['uid'], $observer['xchan_hash'], 'post_comments');
+        } else {
+            $can_comment = can_comment_on_post($observer['xchan_hash'], $item);
+        }
+
+        if (!$can_comment) {
+            notice(t('Permission denied') . EOL);
+            killme();
+        }
+
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($item['owner_xchan'])
+        );
+
+        if ($r) {
+            $thread_owner = $r[0];
+        } else {
+            killme();
+        }
+
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($item['author_xchan'])
+        );
+        if ($r) {
+            $item_author = $r[0];
+        } else {
+            killme();
+        }
+
+
+        $arr['aid'] = $owner_aid;
+        $arr['uid'] = $owner_uid;
+
+        $arr['item_origin'] = 1;
+        $arr['item_wall'] = $item['item_wall'];
+        $arr['uuid'] = new_uuid();
+        $arr['mid'] = z_root() . '/item/' . $arr['uuid'];
+        $arr['mid'] = str_replace('/item/', '/activity/', $arr['mid']);
+        $arr['parent_mid'] = $item['mid'];
+
+        $mention = '@[zrl=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/zrl]';
+        $arr['body'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $item['obj_type']);
+
+        $arr['author_xchan'] = $channel['channel_hash'];
+        $arr['owner_xchan'] = $item['author_xchan'];
+        $arr['obj'] = $item['obj'];
+        $arr['obj_type'] = $item['obj_type'];
+        $arr['verb'] = 'Announce';
+
+        $post = item_store($arr);
+
+        $post_id = $post['item_id'];
+
+        $arr['id'] = $post_id;
+
+        Hook::call('post_local_end', $arr);
+
+        info(t('Post repeated') . EOL);
+
+        $r = q(
+            "select * from item where id = %d",
+            intval($post_id)
+        );
+        if ($r) {
+            xchan_query($r);
+            $sync_item = fetch_post_tags($r);
+            Libsync::build_sync_packet($channel['channel_id'], ['item' => [encode_item($sync_item[0], true)]]);
+        }
+
+        Run::Summon(['Notifier', 'like', $post_id]);
+
+        killme();
+    }
+}
diff --git a/Code/Module/Sharedwithme.php b/Code/Module/Sharedwithme.php
new file mode 100644
index 000000000..a9a7d19f1
--- /dev/null
+++ b/Code/Module/Sharedwithme.php
@@ -0,0 +1,120 @@
+ 2) && (argv(2) === 'drop')) {
+            $id = intval(argv(1));
+
+            q(
+                "DELETE FROM item WHERE id = %d AND uid = %d",
+                intval($id),
+                intval(local_channel())
+            );
+
+            goaway(z_root() . '/sharedwithme');
+        }
+
+        //drop all files - localuser
+        if ((argc() > 1) && (argv(1) === 'dropall')) {
+            q(
+                "DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
+                dbesc(ACTIVITY_POST),
+                dbesc(ACTIVITY_OBJ_FILE),
+                intval(local_channel())
+            );
+
+            goaway(z_root() . '/sharedwithme');
+        }
+
+        //list files
+        $r = q(
+            "SELECT id, uid, obj, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'",
+            dbesc(ACTIVITY_POST),
+            dbesc(ACTIVITY_OBJ_FILE),
+            intval(local_channel()),
+            dbesc($channel['channel_hash'])
+        );
+
+        $items = [];
+        $ids = '';
+
+        if ($r) {
+            foreach ($r as $rr) {
+                $object = json_decode($rr['obj'], true);
+
+                $item = [];
+                $item['id'] = $rr['id'];
+                $item['objfiletype'] = $object['filetype'];
+                $item['objfiletypeclass'] = getIconFromType($object['filetype']);
+                $item['objurl'] = rawurldecode(get_rel_link($object['link'], 'alternate')) . '?f=&zid=' . $channel['xchan_addr'];
+                $item['objfilename'] = $object['filename'];
+                $item['objfilesize'] = userReadableSize($object['filesize']);
+                $item['objedited'] = $object['edited'];
+                $item['unseen'] = $rr['item_unseen'];
+
+                $items[] = $item;
+
+                if ($item['unseen'] > 0) {
+                    $ids .= " '" . $rr['id'] . "',";
+                }
+            }
+        }
+
+        if ($ids) {
+            //remove trailing ,
+            $ids = rtrim($ids, ",");
+
+            q(
+                "UPDATE item SET item_unseen = 0 WHERE id IN ( $ids ) AND uid = %d",
+                intval(local_channel())
+            );
+        }
+
+        $o = '';
+
+        $o .= replace_macros(Theme::get_template('sharedwithme.tpl'), array(
+            '$header' => t('Files: shared with me'),
+            '$name' => t('Name'),
+            '$label_new' => t('NEW'),
+            '$size' => t('Size'),
+            '$lastmod' => t('Last Modified'),
+            '$dropall' => t('Remove all files'),
+            '$drop' => t('Remove this file'),
+            '$items' => $items
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Siteinfo.php b/Code/Module/Siteinfo.php
new file mode 100644
index 000000000..f5092dd2f
--- /dev/null
+++ b/Code/Module/Siteinfo.php
@@ -0,0 +1,67 @@
+ t('About this site'),
+                '$url' => z_root(),
+                '$sitenametxt' => t('Site Name'),
+                '$sitename' => System::get_site_name(),
+                '$headline' => t('Site Information'),
+                '$site_about' => bbcode(get_config('system', 'siteinfo')),
+                '$admin_headline' => t('Administrator'),
+                '$admin_about' => bbcode(get_config('system', 'admininfo')),
+                '$terms' => t('Terms of Service'),
+                '$prj_header' => t('Software and Project information'),
+                '$prj_name' => t('This site is powered by $Projectname'),
+                '$prj_transport' => t('Federated and decentralised networking and identity services provided by Nomad'),
+                '$transport_link' => 'https://zotlabs.com',
+
+                '$ebs' => System::ebs(),
+                '$additional_text' => t('Protocols:'),
+                '$additional_fed' => $federated,
+                '$prj_version' => ((get_config('system', 'hidden_version_siteinfo')) ? '' : sprintf(t('Version %s'), System::get_project_version())),
+                '$prj_linktxt' => t('Project homepage'),
+                '$prj_srctxt' => t('Developer homepage'),
+                '$prj_link' => System::get_project_link(),
+                '$prj_src' => System::get_project_srclink(),
+                '$prj_icon' => System::get_site_icon(),
+            ]
+        );
+
+        Hook::call('about_hook', $siteinfo);
+
+        return $siteinfo;
+    }
+}
diff --git a/Code/Module/Sites.php b/Code/Module/Sites.php
new file mode 100644
index 000000000..71fc84971
--- /dev/null
+++ b/Code/Module/Sites.php
@@ -0,0 +1,150 @@
+ $rr['site_url'],
+                    'name' => $sitename,
+                    'access' => $access,
+                    'register' => $register_link,
+                    'sellpage' => $rr['site_sellpage'],
+                    'location_label' => t('Location'),
+                    'location' => $rr['site_location'],
+                    'project' => $rr['site_project'],
+                    'version' => $rr['site_version'],
+                    'photo' => $logo,
+                    'about' => bbcode($about),
+                    'hash' => substr(hash('sha256', $rr['site_url']), 0, 16),
+                    'network_label' => t('Project'),
+                    'network' => $rr['site_project'],
+                    'version_label' => t('Version'),
+                    'version' => $rr['site_version'],
+                    'private' => $disabled,
+                    'connect' => (($disabled) ? '' : $register_link),
+                    'connect_label' => $register,
+                    'access' => (($access === 'private') ? '' : $access),
+                    'access_label' => t('Access type'),
+                ];
+            }
+        }
+
+        $o = replace_macros(Theme::get_template('sitentry_header.tpl'), [
+            '$dirlbl' => t('Affiliated Sites'),
+            '$desc' => $desc,
+            '$entries' => $j,
+        ]);
+
+
+        return $o;
+    }
+
+    public function sort_sites($a)
+    {
+        $ret = [];
+        if ($a) {
+            foreach ($a as $e) {
+                $projectname = explode(' ', $e['project']);
+                $ret[$projectname[0]][] = $e;
+            }
+        }
+        $projects = array_keys($ret);
+        rsort($projects);
+
+        $newret = [];
+        foreach ($projects as $p) {
+            $newret[$p] = $ret[$p];
+        }
+
+        return $newret;
+    }
+
+    public function sort_versions($a, $b)
+    {
+        return version_compare($b['version'], $a['version']);
+    }
+}
diff --git a/Code/Module/Smilies.php b/Code/Module/Smilies.php
new file mode 100644
index 000000000..b394a51ff
--- /dev/null
+++ b/Code/Module/Smilies.php
@@ -0,0 +1,24 @@
+ $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]);
+            }
+            json_return_and_die($results);
+        } else {
+            return smilies('', true);
+        }
+    }
+}
diff --git a/Code/Module/Sources.php b/Code/Module/Sources.php
new file mode 100644
index 000000000..6456a3b5d
--- /dev/null
+++ b/Code/Module/Sources.php
@@ -0,0 +1,202 @@
+ t('Channel Sources'),
+                '$desc' => t('Manage remote sources of content for your channel.'),
+                '$new' => t('New Source'),
+                '$sources' => $r
+            ]);
+            return $o;
+        }
+
+        if (argc() == 2 && argv(1) === 'new') {
+            // TODO add the words 'or RSS feed' and corresponding code to manage feeds and frequency
+
+            $o = replace_macros(Theme::get_template('sources_new.tpl'), [
+                '$title' => t('New Source'),
+                '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'),
+                '$words' => ['words', t('Only import content with these words (one per line)'), '', t('Leave blank to import all public content')],
+                '$name' => ['name', t('Channel Name'), '', '', '', 'autocomplete="off"'],
+                '$tags' => ['tags', t('Add the following categories to posts imported from this source (comma separated)'), '', t('Optional')],
+                '$resend' => ['resend', t('Resend posts with this channel as author'), 0, t('Copyrights may apply'), [t('No'), t('Yes')]],
+                '$submit' => t('Submit')
+            ]);
+            return $o;
+        }
+
+        if (argc() == 2 && intval(argv(1))) {
+            // edit source
+            $r = q(
+                "select source.*, xchan.* from source left join xchan on src_xchan = xchan_hash where src_id = %d and src_channel_id = %d limit 1",
+                intval(argv(1)),
+                intval(local_channel())
+            );
+            if ($r) {
+                $x = q(
+                    "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
+                    dbesc($r[0]['src_xchan']),
+                    intval(local_channel())
+                );
+            }
+            if (!$r) {
+                notice(t('Source not found.') . EOL);
+                return '';
+            }
+
+            $r[0]['src_patt'] = htmlspecialchars($r[0]['src_patt'], ENT_QUOTES, 'UTF-8');
+
+            $o = replace_macros(Theme::get_template('sources_edit.tpl'), array(
+                '$title' => t('Edit Source'),
+                '$drop' => t('Delete Source'),
+                '$id' => $r[0]['src_id'],
+                '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'),
+                '$words' => array('words', t('Only import content with these words (one per line)'), $r[0]['src_patt'], t('Leave blank to import all public content')),
+                '$xchan' => $r[0]['src_xchan'],
+                '$abook' => $x[0]['abook_id'],
+                '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'), $r[0]['src_tag'], t('Optional')),
+                '$resend' => ['resend', t('Resend posts with this channel as author'), get_abconfig(local_channel(), $r[0]['xchan_hash'], 'system', 'rself'), t('Copyrights may apply'), [t('No'), t('Yes')]],
+
+                '$name' => array('name', t('Channel Name'), $r[0]['xchan_name'], ''),
+                '$submit' => t('Submit')
+            ));
+            return $o;
+        }
+
+        if (argc() == 3 && intval(argv(1)) && argv(2) === 'drop') {
+            $r = q(
+                "select * from source where src_id = %d and src_channel_id = %d limit 1",
+                intval(argv(1)),
+                intval(local_channel())
+            );
+            if (!$r) {
+                notice(t('Source not found.') . EOL);
+                return '';
+            }
+            $r = q(
+                "delete from source where src_id = %d and src_channel_id = %d",
+                intval(argv(1)),
+                intval(local_channel())
+            );
+            if ($r) {
+                info(t('Source removed') . EOL);
+            } else {
+                notice(t('Unable to remove source.') . EOL);
+            }
+
+            goaway(z_root() . '/sources');
+        }
+
+        // shouldn't get here.
+    }
+}
diff --git a/Code/Module/Sslify.php b/Code/Module/Sslify.php
new file mode 100644
index 000000000..836405e03
--- /dev/null
+++ b/Code/Module/Sslify.php
@@ -0,0 +1,29 @@
+ 1) ? intval(argv(1)) : 0);
+        if (!$message_id) {
+            killme();
+        }
+
+        $r = q(
+            "SELECT * FROM item WHERE id = %d 
+			and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 
+			and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
+            intval($message_id)
+        );
+
+        // if interacting with a pubstream item,
+        // create a copy of the parent in your stream.
+		
+
+        if ($r) {
+            if (! Channel::is_system(local_channel())) {
+                $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ];
+            }
+        }
+
+        if (! $r) {
+            killme();
+        }
+		
+		// reset $message_id to the fetched copy of message if applicable
+		$message_id = $r[0]['id'];
+        $item_starred = (intval($r[0]['item_starred']) ? 0 : 1);
+
+        $r = q(
+            "UPDATE item SET item_starred = %d WHERE uid = %d and id = %d",
+            intval($item_starred),
+            intval(local_channel()),
+            intval($message_id)
+        );
+
+        $r = q(
+            "select * from item where id = %d",
+            intval($message_id)
+        );
+        if ($r) {
+            xchan_query($r);
+            $sync_item = fetch_post_tags($r);
+            Libsync::build_sync_packet(local_channel(), [
+                'item' => [
+                    encode_item($sync_item[0], true)
+                ]
+            ]);
+        }
+
+        header('Content-type: application/json');
+        echo json_encode(array('result' => $item_starred));
+        killme();
+    }
+}
diff --git a/Code/Module/Stream.php b/Code/Module/Stream.php
new file mode 100644
index 000000000..90904e1e3
--- /dev/null
+++ b/Code/Module/Stream.php
@@ -0,0 +1,670 @@
+loading) {
+            $_SESSION['loadtime_stream'] = datetime_convert();
+            PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']);
+            // stream is a superset of channel when it comes to notifications
+            $_SESSION['loadtime_channel'] = datetime_convert();
+            PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
+        }
+
+        $arr = ['query' => App::$query_string];
+        Hook::call('stream_content_init', $arr);
+
+        $channel = ((isset(App::$data['channel'])) ? App::$data['channel'] : null);
+
+        // if called from liveUpdate() we will not have called Stream->init() on this request and $channel will not be set
+
+        if (!$channel) {
+            $channel = App::get_channel();
+        }
+
+
+        $item_normal = item_normal();
+        $item_normal_update = item_normal_update();
+
+        $datequery = $datequery2 = '';
+
+        $group = 0;
+
+        $nouveau = false;
+
+        $datequery = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
+        $datequery2 = ((x($_GET, 'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
+        $static = ((x($_GET, 'static')) ? intval($_GET['static']) : 0);
+        $gid = ((x($_GET, 'gid')) ? $_REQUEST['gid'] : 0);
+        $category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : '');
+        $hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : '');
+        $verb = ((x($_REQUEST, 'verb')) ? $_REQUEST['verb'] : '');
+        $dm = ((x($_REQUEST, 'dm')) ? $_REQUEST['dm'] : 0);
+
+        $c_order = get_pconfig(local_channel(), 'mod_stream', 'order', 0);
+        switch ($c_order) {
+            case 0:
+                $order = 'comment';
+                break;
+            case 1:
+                $order = 'post';
+                break;
+            case 2:
+                $nouveau = true;
+                break;
+        }
+
+        $search = (isset($_GET['search']) ? $_GET['search'] : '');
+        if ($search) {
+            $_GET['netsearch'] = escape_tags($search);
+            if (strpos($search, '@') === 0) {
+                $r = q(
+                    "select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1",
+                    dbesc(substr($search, 1)),
+                    intval(local_channel())
+                );
+                if ($r) {
+                    $_GET['cid'] = $r[0]['abook_id'];
+                    $search = $_GET['search'] = '';
+                }
+            } elseif (strpos($search, '#') === 0) {
+                $hashtags = substr($search, 1);
+                $search = $_GET['search'] = '';
+            }
+        }
+
+        if ($datequery) {
+            $order = 'post';
+        }
+
+        // filter by collection (e.g. group)
+
+        $vg = false;
+
+        if ($gid) {
+            if (strpos($gid, ':') === 0) {
+                $g = substr($gid, 1);
+                switch ($g) {
+                    case '1':
+                        $r = [['hash' => 'connections:' . $channel['channel_hash']]];
+                        $vg = t('Connections');
+                        break;
+                    case '2':
+                        $r = [['hash' => 'zot:' . $channel['channel_hash']]];
+                        $vg = t('Nomad');
+                        break;
+                    case '3':
+                        $r = [['hash' => 'activitypub:' . $channel['channel_hash']]];
+                        $vg = t('ActivityPub');
+                        break;
+                    default:
+                        break;
+                }
+            } else {
+                $r = q(
+                    "SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
+                    intval($gid),
+                    intval(local_channel())
+                );
+                if (!$r) {
+                    if ($this->updating) {
+                        killme();
+                    }
+                    notice(t('Access list not found') . EOL);
+                    goaway(z_root() . '/stream');
+                }
+            }
+
+
+            $group = $gid;
+            $group_hash = $r[0]['hash'];
+        }
+
+        $default_cmin = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmin', 0) : (-1));
+        $default_cmax = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmax', 99) : (-1));
+
+        $cid = ((x($_GET, 'cid')) ? intval($_GET['cid']) : 0);
+        $draft = ((x($_GET, 'draft')) ? intval($_GET['draft']) : 0);
+        $star = ((x($_GET, 'star')) ? intval($_GET['star']) : 0);
+        $liked = ((x($_GET, 'liked')) ? intval($_GET['liked']) : 0);
+        $conv = ((x($_GET, 'conv')) ? intval($_GET['conv']) : 0);
+        $spam = ((x($_GET, 'spam')) ? intval($_GET['spam']) : 0);
+        $cmin = ((array_key_exists('cmin', $_GET)) ? intval($_GET['cmin']) : $default_cmin);
+        $cmax = ((array_key_exists('cmax', $_GET)) ? intval($_GET['cmax']) : $default_cmax);
+        $file = ((x($_GET, 'file')) ? $_GET['file'] : '');
+        $xchan = ((x($_GET, 'xchan')) ? $_GET['xchan'] : '');
+        $net = ((x($_GET, 'net')) ? $_GET['net'] : '');
+        $pf = ((x($_GET, 'pf')) ? $_GET['pf'] : '');
+
+        $deftag = '';
+
+
+        if (x($_GET, 'search') || $file || (!$pf && $cid)) {
+            $nouveau = true;
+        }
+
+        if ($cid) {
+            $cid_r = q(
+                "SELECT abook.abook_xchan, xchan.xchan_addr, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s, xchan.xchan_type from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and abook_blocked = 0 limit 1",
+                intval($cid),
+                intval(local_channel())
+            );
+
+            if (!$cid_r) {
+                if ($this->updating) {
+                    killme();
+                }
+                notice(t('No such channel') . EOL);
+                goaway(z_root() . '/stream');
+            }
+        }
+
+        if (!$this->updating) {
+            // search terms header
+
+            // hide the terms we use to search for videos from
+            // the activity_filter widget because it doesn't look very good
+            if ($search && $search !== 'video]') {
+                $o .= replace_macros(
+                    Theme::get_template("section_title.tpl"),
+                    ['$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8')]
+                );
+            }
+
+            $body = EMPTY_STR;
+
+            Navbar::set_selected('Stream');
+
+            $channel_acl = [
+                'allow_cid' => $channel['channel_allow_cid'],
+                'allow_gid' => $channel['channel_allow_gid'],
+                'deny_cid' => $channel['channel_deny_cid'],
+                'deny_gid' => $channel['channel_deny_gid']
+            ];
+
+            $x = [
+                'is_owner' => true,
+                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
+                'default_location' => $channel['channel_location'],
+                'nickname' => $channel['channel_address'],
+                'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
+                'permissions' => $channel_acl,
+                'bang' => EMPTY_STR,
+                'body' => $body,
+                'visitor' => true,
+                'profile_uid' => local_channel(),
+                'editor_autocomplete' => true,
+                'bbco_autocomplete' => 'bbcode',
+                'bbcode' => true,
+                'jotnets' => true,
+                'reset' => t('Reset form')
+            ];
+
+            if ($deftag) {
+                $x['pretext'] = $deftag;
+            }
+
+            $status_editor = status_editor($x);
+            $o .= $status_editor;
+
+            $static = Channel::manual_conv_update(local_channel());
+        }
+
+
+        // We don't have to deal with ACL's on this page. You're looking at everything
+        // that belongs to you, hence you can see all of it. We will filter by group if
+        // desired.
+
+
+        $sql_options = (($star)
+            ? " and item_starred = 1 "
+            : '');
+
+        $sql_nets = '';
+
+        $item_thread_top = ' AND item_thread_top = 1 ';
+
+        $sql_extra = '';
+
+        if ($draft) {
+            $item_normal = item_normal_draft();
+            $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE item_unpublished = 1 and item_deleted = 0 ) ";
+        }
+
+        if ($group) {
+            $contact_str = '';
+            $contacts = AccessList::members(local_channel(), $group);
+            if ($contacts) {
+                $contact_str = ids_to_querystr($contacts, 'xchan', true);
+            } else {
+                $contact_str = " '0' ";
+                if (!$this->updating) {
+                    info(t('Access list is empty'));
+                }
+            }
+            $item_thread_top = '';
+
+            $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
+
+
+            if (!$vg) {
+                $x = AccessList::rec_byhash(local_channel(), $group_hash);
+            }
+
+            if ($x || $vg) {
+                $title = replace_macros(Theme::get_template("section_title.tpl"), array(
+                    '$title' => sprintf(t('Access list: %s'), (($vg) ? $vg : $x['gname']))
+                ));
+            }
+
+            $o = $title . $status_editor;
+        } elseif (isset($cid_r) && $cid_r) {
+            $item_thread_top = EMPTY_STR;
+
+            if ($this->loading || $this->updating) {
+                if (!$pf && $nouveau) {
+                    $sql_extra = " AND author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ";
+                } else {
+                    $ttype = (($pf) ? TERM_FORUM : TERM_MENTION);
+
+                    $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal ");
+                    $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'");
+
+                    $p_str = ids_to_querystr(array_merge($p1, $p2), 'parent');
+                    $sql_extra = " AND item.parent IN ( $p_str ) ";
+                }
+            }
+
+            $title = replace_macros(Theme::get_template('section_title.tpl'), [
+                '$title' => '' . urlencode($cid_r[0]['xchan_name']) . ' ' . $cid_r[0]['xchan_name'] . ''
+            ]);
+
+            $o = $title;
+            $o .= $status_editor;
+        } elseif ($xchan) {
+            $r = q(
+                "select * from xchan where xchan_hash = '%s'",
+                dbesc($xchan)
+            );
+            if ($r) {
+                $item_thread_top = '';
+                $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) ";
+                $title = replace_macros(Theme::get_template('section_title.tpl'), [
+                    '$title' => '' . urlencode($r[0]['xchan_name']) . ' ' . $r[0]['xchan_name'] . ''
+                ]);
+
+                $o = $title;
+                $o .= $status_editor;
+            } else {
+                notice(t('Invalid channel.') . EOL);
+                goaway(z_root() . '/stream');
+            }
+        }
+
+        if (x($category)) {
+            $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
+        }
+        if (x($hashtags)) {
+            $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+        }
+
+        if (!$this->updating) {
+            // The special div is needed for liveUpdate to kick in for this page.
+            // We only launch liveUpdate if you aren't filtering in some incompatible
+            // way and also you aren't writing a comment (discovered in javascript).
+
+            $maxheight = get_pconfig(local_channel(), 'system', 'stream_divmore_height');
+            if (!$maxheight) {
+                $maxheight = 400;
+            }
+
+
+            $o .= '
      ' . "\r\n";
+            $o .= "\r\n";
+
+            App::$page['htmlhead'] .= replace_macros(Theme::get_template('build_query.tpl'), [
+                '$baseurl' => z_root(),
+                '$pgtype' => 'stream',
+                '$uid' => ((local_channel()) ? local_channel() : '0'),
+                '$gid' => (($gid) ? $gid : '0'),
+                '$cid' => (($cid) ? $cid : '0'),
+                '$cmin' => (($cmin) ? $cmin : '(-1)'),
+                '$cmax' => (($cmax) ? $cmax : '(-1)'),
+                '$star' => (($star) ? $star : '0'),
+                '$liked' => (($liked) ? $liked : '0'),
+                '$conv' => (($conv) ? $conv : '0'),
+                '$spam' => (($spam) ? $spam : '0'),
+                '$fh' => '0',
+                '$dm' => (($dm) ? $dm : '0'),
+                '$nouveau' => (($nouveau) ? $nouveau : '0'),
+                '$wall' => '0',
+                '$draft' => (($draft) ? $draft : '0'),
+                '$static' => $static,
+                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
+                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
+                '$search' => (($search) ? urlencode($search) : ''),
+                '$xchan' => (($xchan) ? urlencode($xchan) : ''),
+                '$order' => (($order) ? urlencode($order) : ''),
+                '$file' => (($file) ? urlencode($file) : ''),
+                '$cats' => (($category) ? urlencode($category) : ''),
+                '$tags' => (($hashtags) ? urlencode($hashtags) : ''),
+                '$dend' => $datequery,
+                '$mid' => '',
+                '$verb' => (($verb) ? urlencode($verb) : ''),
+                '$net' => (($net) ? urlencode($net) : ''),
+                '$dbegin' => $datequery2,
+                '$pf' => (($pf) ? intval($pf) : '0'),
+            ]);
+        }
+
+        $sql_extra3 = '';
+
+        if ($datequery) {
+            $sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
+        }
+        if ($datequery2) {
+            $sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
+        }
+
+        $sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id ");
+        $sql_extra3 = (($nouveau) ? '' : $sql_extra3);
+
+        if (x($_GET, 'search')) {
+            $search = escape_tags($_GET['search']);
+            if (strpos($search, '#') === 0) {
+                $sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG);
+            } else {
+                $sql_extra .= sprintf(
+                    " AND (item.body like '%s' OR item.title like '%s') ",
+                    dbesc(protect_sprintf('%' . $search . '%')),
+                    dbesc(protect_sprintf('%' . $search . '%'))
+                );
+            }
+        }
+
+        if ($verb) {
+            // the presence of a leading dot in the verb determines
+            // whether to match the type of activity or the child object.
+            // The name 'verb' is a holdover from the earlier XML
+            // ActivityStreams specification.
+
+            if (substr($verb, 0, 1) === '.') {
+                $verb = substr($verb, 1);
+                $sql_extra .= sprintf(
+                    " AND item.obj_type like '%s' ",
+                    dbesc(protect_sprintf('%' . $verb . '%'))
+                );
+            } else {
+                $sql_extra .= sprintf(
+                    " AND item.verb like '%s' ",
+                    dbesc(protect_sprintf('%' . $verb . '%'))
+                );
+            }
+        }
+
+        if (strlen($file)) {
+            $sql_extra .= term_query('item', $file, TERM_FILE);
+        }
+
+        if ($dm) {
+            $sql_extra .= " and item_private = 2 ";
+        }
+
+        if ($conv) {
+            $item_thread_top = '';
+
+            if ($nouveau) {
+                $sql_extra .= " AND author_xchan = '" . dbesc($channel['channel_hash']) . "' ";
+            } else {
+                $sql_extra .= sprintf(
+                    " AND parent IN (SELECT distinct(parent) from item where ( author_xchan = '%s' or item_mentionsme = 1 ) and item_deleted = 0 ) ",
+                    dbesc(protect_sprintf($channel['channel_hash']))
+                );
+            }
+        }
+
+        if ($this->updating && !$this->loading) {
+            // only setup pagination on initial page view
+            $pager_sql = '';
+        } else {
+            $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
+            App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
+        }
+
+        // cmin and cmax are both -1 when the affinity tool is disabled
+
+        if (($cmin != (-1)) || ($cmax != (-1))) {
+            // Not everybody who shows up in the network stream will be in your address book.
+            // By default those that aren't are assumed to have closeness = 99; but this isn't
+            // recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
+            // the stream with a NULL address book entry.
+
+            $sql_nets .= " AND ";
+
+            if ($cmax == 99) {
+                $sql_nets .= " ( ";
+            }
+
+            $sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " ";
+            $sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) ";
+
+            if ($cmax == 99) {
+                $sql_nets .= " OR abook.abook_closeness IS NULL ) ";
+            }
+        }
+
+        $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
+        $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
+
+        $abook_uids = " and abook.abook_channel = " . local_channel() . " ";
+        $uids = " and item.uid = " . local_channel() . " ";
+
+        if (get_pconfig(local_channel(), 'system', 'stream_list_mode')) {
+            $page_mode = 'list';
+        } else {
+            $page_mode = 'client';
+        }
+
+        $simple_update = (($this->updating) ? " and item_changed >  = '" . $_SESSION['loadtime_stream'] . "' " : '');
+
+        $parents_str = '';
+        $update_unseen = '';
+        $items = [];
+
+        // This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
+        // or three and look at your stream page - after opening up your browser. The first page loads just as it
+        // should. All of a sudden a few seconds later, page 2 will get inserted at the beginning of the page
+        // (before the page 1 content). The update code is actually doing just what it's supposed
+        // to, it's fetching posts that have the ITEM_UNSEEN bit set. But the reason that page 2 content is being
+        // returned in an UPDATE is because you hadn't gotten that far yet - you're still on page 1 and everything
+        // that we loaded for page 1 is now marked as seen. But the stuff on page 2 hasn't been. So... it's being
+        // treated as "new fresh" content because it is unseen. We need to distinguish it somehow from content
+        // which "arrived as you were reading page 1". We're going to do this
+        // by storing in your session the current UTC time whenever you LOAD a network page, and only UPDATE items
+        // which are both ITEM_UNSEEN and have "changed" since that time. Cross fingers...
+
+        if ($this->updating && $_SESSION['loadtime_stream']) {
+            $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_stream']) . "' ";
+        }
+        if ($this->loading) {
+            $simple_update = '';
+        }
+
+        if ($static && $simple_update) {
+            $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
+        }
+
+
+        // we are not yet using this in updates because the content may have just been marked seen
+        // and this might prevent us from loading the update. Will need to test further.
+
+        $seenstr = EMPTY_STR;
+        if (local_channel()) {
+            $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []);
+            if ($seen) {
+                $seenstr = " and not item.id in (" . implode(',', $seen) . ") ";
+            }
+        }
+
+        if ($nouveau && $this->loading) {
+            // "New Item View" - show all items unthreaded in reverse created date order
+
+            $items = q("SELECT item.*, item.id AS item_id, created FROM item 
+				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+				$net_query
+				WHERE true $uids $item_normal
+				and (abook.abook_blocked = 0 or abook.abook_flags is null)
+				$simple_update
+				$sql_extra $sql_options $sql_nets
+				$net_query2
+				ORDER BY item.created DESC $pager_sql ");
+
+            xchan_query($items);
+
+            $items = fetch_post_tags($items, true);
+        } elseif ($this->updating) {
+            // Normal conversation view
+
+            if ($order === 'post') {
+                $ordering = "created";
+            } else {
+                $ordering = "commented";
+            }
+
+            if ($this->loading) {
+                // Fetch a page full of parent items for this page
+                $r = q("SELECT item.parent AS item_id FROM item 
+					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+					$net_query
+					WHERE true $uids $item_thread_top $item_normal
+					AND item.mid = item.parent_mid
+					and (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra3 $sql_extra $sql_options $sql_nets
+					$net_query2
+					ORDER BY $ordering DESC $pager_sql ");
+            } else {
+                // this is an update
+
+                $r = q("SELECT item.parent AS item_id FROM item
+					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+					$net_query
+					WHERE true $uids $item_normal_update $simple_update
+					and (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra3 $sql_extra $sql_options $sql_nets $net_query2");
+            }
+
+            if ($r) {
+                $parents_str = ids_to_querystr($r, 'item_id');
+
+                $items = q(
+                    "SELECT item.*, item.id AS item_id FROM item
+					WHERE true $uids $item_normal
+					AND item.parent IN ( %s )
+					$sql_extra ",
+                    dbesc($parents_str)
+                );
+
+                xchan_query($items, true);
+                $items = fetch_post_tags($items, true);
+                $items = conv_sort($items, $ordering);
+            }
+
+            if ($page_mode === 'list') {
+
+                /**
+                 * in "list mode", only mark the parent item and any like activities as "seen".
+                 * We won't distinguish between comment likes and post likes. The important thing
+                 * is that the number of unseen comments will be accurate. The SQL to separate the
+                 * comment likes could also get somewhat hairy.
+                 */
+
+                if ($parents_str) {
+                    $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
+                    $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
+                }
+            } else {
+                if ($parents_str) {
+                    $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
+                }
+            }
+        }
+
+        if ($update_unseen && (!(isset($_SESSION['sudo']) && $_SESSION['sudo']))) {
+            $x = ['channel_id' => local_channel(), 'update' => 'unset'];
+            Hook::call('update_unseen', $x);
+            if ($x['update'] === 'unset' || intval($x['update'])) {
+                $r = q(
+                    "UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ",
+                    intval(local_channel())
+                );
+            }
+        }
+
+        $mode = (($nouveau) ? 'stream-new' : 'stream');
+
+        if ($search) {
+            $mode = 'search';
+        }
+
+        $o .= conversation($items, $mode, $this->updating, $page_mode);
+
+        if (($items) && (!$this->updating)) {
+            $o .= alt_pager(count($items));
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Subthread.php b/Code/Module/Subthread.php
new file mode 100644
index 000000000..3168932f1
--- /dev/null
+++ b/Code/Module/Subthread.php
@@ -0,0 +1,191 @@
+ 2) ? notags(trim(argv(2))) : 0);
+
+        if (argv(1) === 'sub') {
+            $activity = ACTIVITY_FOLLOW;
+        } elseif (argv(1) === 'unsub') {
+            $activity = ACTIVITY_IGNORE;
+        }
+
+        $i = q(
+            "select * from item where id = %d and uid = %d",
+            intval($item_id),
+            intval(local_channel())
+        );
+
+        if (!$i) {
+            // try the global public stream
+            $i = q(
+                "select * from item where id = %d and uid = %d",
+                intval($postid),
+                intval($sys['channel_id'])
+            );
+            // try the local public stream
+            if (!$i) {
+                $i = q(
+                    "select * from item where id = %d and item_wall = 1 and item_private = 0",
+                    intval($postid)
+                );
+            }
+
+            if ($i && local_channel() && (!Channel::is_system(local_channel()))) {
+                $i = [copy_of_pubitem($channel, $i[0]['mid'])];
+                $item_id = (($i) ? $i[0]['id'] : 0);
+            }
+        }
+
+        if (!$i) {
+            return;
+        }
+
+        $r = q(
+            "select * from item where id = parent and id = %d limit 1",
+            dbesc($i[0]['parent'])
+        );
+
+        if ((!$item_id) || (!$r)) {
+            logger('subthread: no item ' . $item_id);
+            return;
+        }
+
+        $item = $r[0];
+
+        $owner_uid = $item['uid'];
+        $observer = App::get_observer();
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        if (!perm_is_allowed($owner_uid, $ob_hash, 'post_comments')) {
+            return;
+        }
+
+        $sys = Channel::get_system();
+
+        $owner_uid = $item['uid'];
+        $owner_aid = $item['aid'];
+
+        // if this is a "discover" item, (item['uid'] is the sys channel),
+        // fallback to the item comment policy, which should've been
+        // respected when generating the conversation thread.
+        // Even if the activity is rejected by the item owner, it should still get attached
+        // to the local discover conversation on this site.
+
+        if (($owner_uid != $sys['channel_id']) && (!perm_is_allowed($owner_uid, $observer['xchan_hash'], 'post_comments'))) {
+            notice(t('Permission denied') . EOL);
+            killme();
+        }
+
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($item['owner_xchan'])
+        );
+        if ($r) {
+            $thread_owner = $r[0];
+        } else {
+            killme();
+        }
+
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($item['author_xchan'])
+        );
+        if ($r) {
+            $item_author = $r[0];
+        } else {
+            killme();
+        }
+
+        $uuid = new_uuid();
+        $mid = z_root() . '/item/' . $uuid;
+
+        $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
+
+        $links = array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['plink']));
+        $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE);
+
+        $body = $item['body'];
+
+        $obj = Activity::fetch_item(['id' => $item['mid']]);
+        $objtype = $obj['type'];
+
+        if (!intval($item['item_thread_top'])) {
+            $post_type = 'comment';
+        }
+
+        if ($activity === ACTIVITY_FOLLOW) {
+            $bodyverb = t('%1$s is following %2$s\'s %3$s');
+        }
+        if ($activity === ACTIVITY_IGNORE) {
+            $bodyverb = t('%1$s stopped following %2$s\'s %3$s');
+        }
+
+        $arr = [];
+
+        $arr['uuid'] = $uuid;
+        $arr['mid'] = $mid;
+        $arr['aid'] = $owner_aid;
+        $arr['uid'] = $owner_uid;
+        $arr['parent'] = $item['id'];
+        $arr['parent_mid'] = $item['mid'];
+        $arr['thr_parent'] = $item['mid'];
+        $arr['owner_xchan'] = $thread_owner['xchan_hash'];
+        $arr['author_xchan'] = $observer['xchan_hash'];
+        $arr['item_origin'] = 1;
+        $arr['item_notshown'] = 1;
+
+        if (intval($item['item_wall'])) {
+            $arr['item_wall'] = 1;
+        } else {
+            $arr['item_wall'] = 0;
+        }
+
+        $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
+        $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
+        $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
+
+        $arr['body'] = sprintf($bodyverb, $alink, $ulink, $plink);
+
+        $arr['verb'] = $activity;
+        $arr['obj_type'] = $objtype;
+        $arr['obj'] = json_encode($obj);
+
+        $arr['allow_cid'] = $item['allow_cid'];
+        $arr['allow_gid'] = $item['allow_gid'];
+        $arr['deny_cid'] = $item['deny_cid'];
+        $arr['deny_gid'] = $item['deny_gid'];
+
+        $post = item_store($arr);
+        $post_id = $post['item_id'];
+
+        $arr['id'] = $post_id;
+
+        Hook::call('post_local_end', $arr);
+
+        killme();
+    }
+}
diff --git a/Code/Module/Suggestions.php b/Code/Module/Suggestions.php
new file mode 100644
index 000000000..a874e35bb
--- /dev/null
+++ b/Code/Module/Suggestions.php
@@ -0,0 +1,47 @@
+ [['uid' => local_channel(), 'xchan' => $_GET['ignore']]]]);
+        }
+    }
+
+
+    public function get()
+    {
+
+        $o = '';
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if (Apps::system_app_installed(local_channel(), 'Suggest Channels')) {
+            goaway(z_root() . '/directory?f=&suggest=1');
+        }
+
+        $desc = t('This app (when installed) displays a small number of friend suggestions on selected pages or you can run the app to display a full list of channel suggestions.');
+
+        return '
      ' . $desc . '
      ';
+    }
+}
diff --git a/Code/Module/Superblock.php b/Code/Module/Superblock.php
new file mode 100644
index 000000000..cfdfb9297
--- /dev/null
+++ b/Code/Module/Superblock.php
@@ -0,0 +1,263 @@
+ local_channel(),
+                'block_entity' => $blocked,
+                'block_type' => $type,
+                'block_comment' => t('Added by Superblock')
+            ];
+
+            LibBlock::store($bl);
+
+            $sync = [];
+
+            $sync['block'] = [LibBlock::fetch_by_entity(local_channel(), $blocked)];
+
+            if ($type === BLOCKTYPE_CHANNEL) {
+                $z = q(
+                    "insert into xign ( uid, xchan ) values ( %d , '%s' ) ",
+                    intval(local_channel()),
+                    dbesc($blocked)
+                );
+                $ab = q(
+                    "select * from abook where abook_channel = %d and abook_xchan = '%s'",
+                    intval(local_channel()),
+                    dbesc($blocked)
+                );
+                if (($ab) && (!intval($ab['abook_blocked']))) {
+                    q(
+                        "update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'",
+                        intval(local_channel()),
+                        dbesc($blocked)
+                    );
+
+                    $r = q(
+                        "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
+                        intval(local_channel()),
+                        dbesc($blocked)
+                    );
+                    if ($r) {
+                        $r = array_shift($r);
+                        $abconfig = load_abconfig(local_channel(), $blocked);
+                        if ($abconfig) {
+                            $r['abconfig'] = $abconfig;
+                        }
+                        unset($r['abook_id']);
+                        unset($r['abook_account']);
+                        unset($r['abook_channel']);
+                        $sync['abook'] = [$r];
+                    }
+                }
+                $sync['xign'] = [['uid' => local_channel(), 'xchan' => $_GET['block']]];
+            }
+            Libsync::build_sync_packet(0, $sync);
+        }
+
+        $type = BLOCKTYPE_CHANNEL;
+        $unblocked = trim($_REQUEST['unblock']);
+        if (!$unblocked) {
+            $unblocked = trim($_REQUEST['unblocksite']);
+            if ($unblocked) {
+                $type = BLOCKTYPE_SERVER;
+            }
+        }
+        if ($unblocked) {
+            $handled = true;
+            if (check_form_security_token('superblock', 'sectok')) {
+                $r = LibBlock::fetch_by_entity(local_channel(), $unblocked);
+                if ($r) {
+                    LibBlock::remove(local_channel(), $unblocked);
+
+                    $sync = [];
+                    $sync['block'] = [[
+                        'block_channel_id' => local_channel(),
+                        'block_entity' => $unblocked,
+                        'block_type' => $type,
+                        'deleted' => true,
+                    ]];
+                    if ($type === BLOCKTYPE_CHANNEL) {
+                        $ab = q(
+                            "select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s'",
+                            intval(local_channel()),
+                            dbesc($unblocked)
+                        );
+                        if (($ab) && (intval($ab['abook_blocked']))) {
+                            q(
+                                "update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'",
+                                intval(local_channel()),
+                                dbesc($unblocked)
+                            );
+                            $ab['abook_blocked'] = 0;
+                            $abconfig = load_abconfig(local_channel(), $unblocked);
+                            if ($abconfig) {
+                                $ab['abconfig'] = $abconfig;
+                            }
+                            unset($ab['abook_id']);
+                            unset($ab['abook_account']);
+                            unset($ab['abook_channel']);
+                            $sync['abook'] = [$ab];
+                        }
+
+                        $z = q(
+                            "delete from xign where uid = %d  and xchan = '%s' ",
+                            intval(local_channel()),
+                            dbesc($unblocked)
+                        );
+                    }
+                    Libsync::build_sync_packet(0, $sync);
+                }
+            }
+        }
+
+        if ($handled) {
+            info(t('superblock settings updated') . EOL);
+
+            if ($unblocked || $inline) {
+                return;
+            }
+
+            killme();
+        }
+    }
+
+    public function get()
+    {
+
+        $l = LibBlock::fetch(local_channel(), BLOCKTYPE_CHANNEL);
+
+        $list = ids_to_array($l, 'block_entity');
+
+        stringify_array_elms($list, true);
+        $query_str = implode(',', $list);
+        if ($query_str) {
+            $r = q("select * from xchan where xchan_hash in ( " . $query_str . " ) ");
+        } else {
+            $r = [];
+        }
+        if ($r) {
+            for ($x = 0; $x < count($r); $x++) {
+                $r[$x]['encoded_hash'] = urlencode($r[$x]['xchan_hash']);
+            }
+        }
+
+        $sc .= replace_macros(Theme::get_template('superblock_list.tpl'), [
+            '$blocked' => t('Blocked channels'),
+            '$entries' => $r,
+            '$nothing' => (($r) ? '' : t('No channels currently blocked')),
+            '$token' => get_form_security_token('superblock'),
+            '$remove' => t('Remove')
+        ]);
+
+
+        $l = LibBlock::fetch(local_channel(), BLOCKTYPE_SERVER);
+        $list = ids_to_array($l, 'block_entity');
+        if ($list) {
+            for ($x = 0; $x < count($list); $x++) {
+                $list[$x] = [$list[$x], urlencode($list[$x])];
+            }
+        }
+
+        $sc .= replace_macros(Theme::get_template('superblock_serverlist.tpl'), [
+            '$blocked' => t('Blocked servers'),
+            '$entries' => $list,
+            '$nothing' => (($list) ? '' : t('No servers currently blocked')),
+            '$token' => get_form_security_token('superblock'),
+            '$remove' => t('Remove')
+        ]);
+
+        $s .= replace_macros(Theme::get_template('generic_app_settings.tpl'), [
+            '$addon' => array('superblock', t('Manage Blocks'), '', t('Submit')),
+            '$content' => $sc
+        ]);
+
+        return $s;
+    }
+}
diff --git a/Code/Module/Tagadelic.php b/Code/Module/Tagadelic.php
new file mode 100644
index 000000000..604ef3de3
--- /dev/null
+++ b/Code/Module/Tagadelic.php
@@ -0,0 +1,47 @@
+' . $desc . '
      ';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Tagadelic'))) {
+            return $text;
+        }
+
+        $desc = t('This app is installed. It displays a hashtag cloud on your channel homepage.');
+
+        $text = '
      ' . $desc . '
      ';
+
+
+        $c = new Comanche();
+        return $text . EOL . EOL . $c->widget('tagcloud_wall', EMPTY_STR);
+    }
+}
diff --git a/Code/Module/Tagger.php b/Code/Module/Tagger.php
new file mode 100644
index 000000000..310bb8544
--- /dev/null
+++ b/Code/Module/Tagger.php
@@ -0,0 +1,179 @@
+ 1) ? notags(trim(argv(1))) : 0);
+
+        logger('tagger: tag ' . $term . ' item ' . $item_id);
+
+        $r = q(
+            "select * from item where id = %d and uid = %d limit 1",
+            intval($item_id),
+            intval(local_channel())
+        );
+
+        if (!$r) {
+            $r = q(
+                "select * from item where id = %d and uid = %d limit 1",
+                intval($item_id),
+                intval($sys['channel_id'])
+            );
+            if (!$r) {
+                $r = q(
+                    "select * from item where id = %d and item_private = 0 and item_wall = 1",
+                    intval($item_id)
+                );
+            }
+            if ($r && local_channel() && (!Channel::is_system(local_channel()))) {
+                $r = [copy_of_pubitem($channel, $i[0]['mid'])];
+                $item_id = (($r) ? $r[0]['id'] : 0);
+            }
+        }
+
+        if (!$r) {
+            notice(t('Post not found.') . EOL);
+            return;
+        }
+
+        $r = q(
+            "SELECT * FROM item left join xchan on xchan_hash = author_xchan WHERE id = %d and uid = %d LIMIT 1",
+            intval($item_id),
+            intval(local_channel())
+        );
+
+        if ((!$item_id) || (!$r)) {
+            logger('tagger: no item ' . $item_id);
+            return;
+        }
+
+        $item = $r[0];
+
+        $owner_uid = $item['uid'];
+
+        switch ($item['resource_type']) {
+            case 'photo':
+                $targettype = ACTIVITY_OBJ_PHOTO;
+                $post_type = t('photo');
+                break;
+            case 'event':
+                $targgettype = ACTIVITY_OBJ_EVENT;
+                $post_type = t('event');
+                break;
+            default:
+                $targettype = ACTIVITY_OBJ_NOTE;
+                $post_type = t('post');
+                if ($item['mid'] != $item['parent_mid']) {
+                    $post_type = t('comment');
+                }
+                break;
+        }
+
+
+        $clean_term = trim($term, '"\' ');
+
+        $links = array(array('rel' => 'alternate', 'type' => 'text/html',
+            'href' => z_root() . '/display/' . gen_link_id($item['mid'])));
+
+        $target = json_encode(array(
+            'type' => $targettype,
+            'id' => $item['mid'],
+            'link' => $links,
+            'title' => $item['title'],
+            'content' => $item['body'],
+            'created' => $item['created'],
+            'edited' => $item['edited'],
+            'author' => array(
+                'name' => $item['xchan_name'],
+                'address' => $item['xchan_addr'],
+                'guid' => $item['xchan_guid'],
+                'guid_sig' => $item['xchan_guid_sig'],
+                'link' => array(
+                    array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['xchan_url']),
+                    array('rel' => 'photo', 'type' => $item['xchan_photo_mimetype'], 'href' => $item['xchan_photo_m'])),
+            ),
+        ));
+
+        $tagid = z_root() . '/search?tag=' . $clean_term;
+        $objtype = ACTIVITY_OBJ_TAGTERM;
+
+        $obj = json_encode(array(
+            'type' => $objtype,
+            'id' => $tagid,
+            'link' => array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $tagid)),
+            'title' => $clean_term,
+            'content' => $clean_term
+        ));
+
+        $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
+
+        // saving here for reference
+        // also check out x22d5 and x2317 and x0d6b and x0db8 and x24d0 and xff20 !!!
+
+        $termlink = html_entity_decode('⋕') . '[zrl=' . z_root() . '/search?tag=' . urlencode($clean_term) . ']' . $clean_term . '[/zrl]';
+
+        $channel = App::get_channel();
+
+        $arr = [];
+
+        $arr['owner_xchan'] = $item['owner_xchan'];
+        $arr['author_xchan'] = $channel['channel_hash'];
+
+        $arr['item_origin'] = 1;
+        $arr['item_wall'] = ((intval($item['item_wall'])) ? 1 : 0);
+
+        $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
+        $alink = '[zrl=' . $item['xchan_url'] . ']' . $item['xchan_name'] . '[/zrl]';
+        $plink = '[zrl=' . $item['plink'] . ']' . $post_type . '[/zrl]';
+
+        $arr['body'] = sprintf($bodyverb, $ulink, $alink, $plink, $termlink);
+
+        $arr['verb'] = ACTIVITY_TAG;
+        $arr['tgt_type'] = $targettype;
+        $arr['target'] = $target;
+        $arr['obj_type'] = $objtype;
+        $arr['obj'] = $obj;
+        $arr['parent_mid'] = $item['mid'];
+        store_item_tag($item['uid'], $item['id'], TERM_OBJ_POST, TERM_COMMUNITYTAG, $clean_term, $tagid);
+        $ret = post_activity_item($arr);
+
+        if ($ret['success']) {
+            Libsync::build_sync_packet(
+                local_channel(),
+                [
+                    'item' => [encode_item($ret['activity'], true)]
+                ]
+            );
+        }
+
+        killme();
+    }
+}
diff --git a/Code/Module/Tagrm.php b/Code/Module/Tagrm.php
new file mode 100644
index 000000000..1491242c1
--- /dev/null
+++ b/Code/Module/Tagrm.php
@@ -0,0 +1,158 @@
+' . t('Remove Item Tag') . '';
+
+            $o .= '
      ' . t('Select a tag to remove: ') . '
      ';
+
+            $o .= '
      ';
+            $o .= '';
+            $o .= '
        ';
+
+
+            foreach ($r[0]['term'] as $x) {
+                $o .= '
      • ' . bbcode($x['term']) . '
        • ';
+            }
+
+            $o .= '
      ';
+            $o .= '';
+            $o .= '';
+            $o .= '
      ';
+
+            return $o;
+        }
+    }
+}
diff --git a/Code/Module/Tasks.php b/Code/Module/Tasks.php
new file mode 100644
index 000000000..bd95c3cb6
--- /dev/null
+++ b/Code/Module/Tasks.php
@@ -0,0 +1,117 @@
+ 1 && argv(1) === 'fetch') {
+            if (argc() > 2 && argv(2) === 'all') {
+                $arr['all'] = 1;
+            }
+
+            $x = tasks_fetch($arr);
+            $x['html'] = '';
+            if (isset($x['tasks']) && is_array($x['tasks'])) {
+                foreach ($x['tasks'] as $y) {
+                    $x['html'] .= '
       ' . $y['summary'] . '
      ';
+                }
+            }
+            json_return_and_die($x);
+        }
+    }
+
+
+    public function post()
+    {
+        //  logger('post: ' . print_r($_POST,true));
+
+
+        if (!local_channel()) {
+            return;
+        }
+
+        $channel = App::get_channel();
+
+        if ((argc() > 2) && (argv(1) === 'complete') && intval(argv(2))) {
+            $ret = array('success' => false);
+            $r = q(
+                "select * from event where etype = 'task' and uid = %d and id = %d limit 1",
+                intval(local_channel()),
+                intval(argv(2))
+            );
+            if ($r) {
+                $event = $r[0];
+                if ($event['event_status'] === 'COMPLETED') {
+                    $event['event_status'] = 'IN-PROCESS';
+                    $event['event_status_date'] = NULL_DATE;
+                    $event['event_percent'] = 0;
+                    $event['event_sequence'] = $event['event_sequence'] + 1;
+                    $event['edited'] = datetime_convert();
+                } else {
+                    $event['event_status'] = 'COMPLETED';
+                    $event['event_status_date'] = datetime_convert();
+                    $event['event_percent'] = 100;
+                    $event['event_sequence'] = $event['event_sequence'] + 1;
+                    $event['edited'] = datetime_convert();
+                }
+                $x = event_store_event($event);
+                if ($x) {
+                    $ret['success'] = true;
+                }
+            }
+            json_return_and_die($ret);
+        }
+
+        if (argc() == 2 && argv(1) === 'new') {
+            $text = escape_tags(trim($_REQUEST['summary']));
+            if (!$text) {
+                return ['success' => false];
+            }
+            $event = [];
+            $event['account'] = $channel['channel_account_id'];
+            $event['uid'] = $channel['channel_id'];
+            $event['event_xchan'] = $channel['channel_hash'];
+            $event['etype'] = 'task';
+            $event['nofinish'] = true;
+            $event['created'] = $event['edited'] = $event['dtstart'] = datetime_convert();
+            $event['adjust'] = 1;
+            $event['allow_cid'] = '<' . $channel['channel_hash'] . '>';
+            $event['summary'] = escape_tags($_REQUEST['summary']);
+            $x = event_store_event($event);
+            if ($x) {
+                $x['success'] = true;
+            } else {
+                $x = ['success' => false];
+            }
+            json_return_and_die($x);
+        }
+    }
+
+    public function get()
+    {
+        $desc = t('This app provides a simple personal and task list.');
+
+        $text = '
      ' . $desc . '
      ';
+
+        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Tasks'))) {
+            return $text;
+        }
+
+        $obj = new Tasklist();
+        return $obj->widget([]);
+    }
+}
diff --git a/Code/Module/Theme_info.php b/Code/Module/Theme_info.php
new file mode 100644
index 000000000..13168b64e
--- /dev/null
+++ b/Code/Module/Theme_info.php
@@ -0,0 +1,73 @@
+get_theme_config_file($theme)) != null) {
+            require_once($themeconfigfile);
+            if (class_exists('\\Code\\Theme\\' . ucfirst($theme) . 'Config')) {
+                $clsname = '\\Code\\Theme\\' . ucfirst($theme) . 'Config';
+                $th_config = new $clsname();
+                $schemas = $th_config->get_schemas();
+                if ($schemas) {
+                    foreach ($schemas as $k => $v) {
+                        $schemalist[] = ['key' => $k, 'val' => $v];
+                    }
+                }
+                $theme_config = $th_config->get();
+            }
+        }
+        $info = get_theme_info($theme);
+        if ($info) {
+            // unfortunately there will be no translation for this string
+            $desc = $info['description'];
+            $version = $info['version'];
+            $credits = $info['credits'];
+        } else {
+            $desc = '';
+            $version = '';
+            $credits = '';
+        }
+
+        $ret = [
+            'theme' => $theme,
+            'img' => get_theme_screenshot($theme),
+            'desc' => $desc,
+            'version' => $version,
+            'credits' => $credits,
+            'schemas' => $schemalist,
+            'config' => $theme_config
+        ];
+        json_return_and_die($ret);
+    }
+
+
+    public function get_theme_config_file($theme)
+    {
+
+        $base_theme = App::$theme_info['extends'];
+
+        if (file_exists("view/theme/$theme/php/config.php")) {
+            return "view/theme/$theme/php/config.php";
+        }
+        if (file_exists("view/theme/$base_theme/php/config.php")) {
+            return "view/theme/$base_theme/php/config.php";
+        }
+        return null;
+    }
+}
diff --git a/Code/Module/Thing.php b/Code/Module/Thing.php
new file mode 100644
index 000000000..7f00a06f7
--- /dev/null
+++ b/Code/Module/Thing.php
@@ -0,0 +1,424 @@
+set_from_array($_REQUEST);
+        }
+
+        $x = $acl->get();
+
+        if ($term_hash) {
+            $t = q(
+                "select * from obj where obj_obj = '%s' and obj_channel = %d limit 1",
+                dbesc($term_hash),
+                intval(local_channel())
+            );
+            if (!$t) {
+                notice(t('Item not found.') . EOL);
+                return;
+            }
+            $orig_record = $t[0];
+            if ($photo != $orig_record['obj_imgurl']) {
+                delete_thing_photo($orig_record['obj_imgurl'], get_observer_hash());
+                $arr = import_remote_xchan_photo($photo, get_observer_hash(), true);
+                if ($arr) {
+                    $local_photo = $arr[0];
+                    $local_photo_type = $arr[3];
+                } else {
+                    $local_photo = $orig_record['obj_imgurl'];
+                }
+            } else {
+                $local_photo = $orig_record['obj_imgurl'];
+            }
+            if ($local_photo) {
+                $r = q(
+                    "update obj set obj_term = '%s', obj_url = '%s', obj_imgurl = '%s', obj_edited = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where obj_obj = '%s' and obj_channel = %d ",
+                    dbesc($name),
+                    dbesc(($url) ? $url : z_root() . '/thing/' . $term_hash),
+                    dbesc($local_photo),
+                    dbesc(datetime_convert()),
+                    dbesc($x['allow_cid']),
+                    dbesc($x['allow_gid']),
+                    dbesc($x['deny_cid']),
+                    dbesc($x['deny_gid']),
+                    dbesc($term_hash),
+                    intval(local_channel())
+                );
+            }
+            info(t('Thing updated') . EOL);
+
+            $r = q(
+                "select * from obj where obj_channel = %d and obj_obj = '%s' limit 1",
+                intval(local_channel()),
+                dbesc($term_hash)
+            );
+            if ($r) {
+                Libsync::build_sync_packet(0, array('obj' => $r));
+            }
+
+            return;
+        }
+
+        $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 ");
+        $p = q(
+            "select profile_guid, is_default from profile where uid = %d $sql limit 1",
+            intval(local_channel())
+        );
+
+        if ($p) {
+            $profile = $p[0];
+        } else {
+            return;
+        }
+
+        $local_photo = null;
+
+        if ($photo) {
+            $arr = import_remote_xchan_photo($photo, get_observer_hash(), true);
+            if ($arr) {
+                $local_photo = $arr[0];
+                $local_photo_type = $arr[3];
+            } else {
+                $local_photo = $photo;
+            }
+        }
+
+
+        $created = datetime_convert();
+        $url = (($url) ? $url : z_root() . '/thing/' . $hash);
+
+        $r = q(
+            "insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj, obj_term, obj_url, obj_imgurl, obj_created, obj_edited, allow_cid, allow_gid, deny_cid, deny_gid ) values ('%s','%s', %d, %d, '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s') ",
+            dbesc($profile['profile_guid']),
+            dbesc($verb),
+            intval(TERM_OBJ_THING),
+            intval(local_channel()),
+            dbesc($hash),
+            dbesc($name),
+            dbesc($url),
+            dbesc(($photo) ? $local_photo : ''),
+            dbesc($created),
+            dbesc($created),
+            dbesc($x['allow_cid']),
+            dbesc($x['allow_gid']),
+            dbesc($x['deny_cid']),
+            dbesc($x['deny_gid'])
+        );
+
+        if (!$r) {
+            notice(t('Object store: failed'));
+            return;
+        }
+
+        info(t('Thing added'));
+
+        $r = q(
+            "select * from obj where obj_channel = %d and obj_obj = '%s' limit 1",
+            intval(local_channel()),
+            dbesc($hash)
+        );
+        if ($r) {
+            Libsync::build_sync_packet(0, array('obj' => $r));
+        }
+
+        if ($activity) {
+            $arr = [];
+            $links = array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $url));
+            if ($local_photo) {
+                $links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo);
+            }
+
+            $objtype = ACTIVITY_OBJ_THING;
+
+            $obj = json_encode(array(
+                'type' => $objtype,
+                'id' => $url,
+                'link' => $links,
+                'title' => $name,
+                'content' => $name
+            ));
+
+            $bodyverb = str_replace('OBJ: ', '', t('OBJ: %1$s %2$s %3$s'));
+
+            $arr['owner_xchan'] = $channel['channel_hash'];
+            $arr['author_xchan'] = $channel['channel_hash'];
+
+            $arr['item_origin'] = 1;
+            $arr['item_wall'] = 1;
+            $arr['item_thread_top'] = 1;
+
+            $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
+            $plink = '[zrl=' . $url . ']' . $name . '[/zrl]';
+
+            $arr['body'] = sprintf($bodyverb, $ulink, $translated_verb, $plink);
+
+            if ($local_photo) {
+                $arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]";
+            }
+
+            $arr['verb'] = $verb;
+            $arr['obj_type'] = $objtype;
+            $arr['obj'] = $obj;
+
+            if (!$profile['is_default']) {
+                $arr['item_private'] = true;
+                $str = '';
+                $r = q(
+                    "select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'",
+                    intval(local_channel()),
+                    dbesc($profile_guid)
+                );
+                if ($r) {
+                    $arr['allow_cid'] = '';
+                    foreach ($r as $rr) {
+                        $arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
+                    }
+                } else {
+                    $arr['allow_cid'] = '<' . get_observer_hash() . '>';
+                }
+            }
+
+            $ret = post_activity_item($arr);
+        }
+    }
+
+
+    public function get()
+    {
+
+        // @FIXME one problem with things is we can't share them unless we provide the channel in the url
+        // so we can definitively lookup the owner.
+
+        if (argc() == 2) {
+            $r = q(
+                "select obj_channel from obj where obj_type = %d and obj_obj = '%s' limit 1",
+                intval(TERM_OBJ_THING),
+                dbesc(argv(1))
+            );
+            if ($r) {
+                $sql_extra = permissions_sql($r[0]['obj_channel']);
+            }
+
+            $r = q(
+                "select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1",
+                intval(TERM_OBJ_THING),
+                dbesc(argv(1))
+            );
+
+            if ($r) {
+                return replace_macros(Theme::get_template('show_thing.tpl'), array(
+                    '$header' => t('Show Thing'),
+                    '$edit' => t('Edit'),
+                    '$delete' => t('Delete'),
+                    '$canedit' => ((local_channel() && local_channel() == $r[0]['obj_channel']) ? true : false),
+                    '$thing' => $r[0]));
+            } else {
+                notice(t('item not found.') . EOL);
+                return;
+            }
+        }
+
+        $channel = App::get_channel();
+
+        if (!(local_channel() && $channel)) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $acl = new AccessControl($channel);
+        $channel_acl = $acl->get();
+
+        $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+
+        $thing_hash = '';
+
+        if (argc() == 3 && argv(1) === 'edit') {
+            $thing_hash = argv(2);
+
+            $r = q(
+                "select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
+                intval(TERM_OBJ_THING),
+                dbesc($thing_hash)
+            );
+
+            if ((!$r) || ($r[0]['obj_channel'] != local_channel())) {
+                notice(t('Permission denied.') . EOL);
+                return '';
+            }
+
+            $o .= replace_macros(Theme::get_template('thing_edit.tpl'), array(
+                '$thing_hdr' => t('Edit Thing'),
+                '$multiprof' => Features::enabled(local_channel(), 'multi_profiles'),
+                '$profile_lbl' => t('Select a profile'),
+                '$profile_select' => contact_profile_assign($r[0]['obj_page']),
+                '$verb_lbl' => $channel['channel_name'],
+                '$verb_select' => obj_verb_selector($r[0]['obj_verb']),
+                '$activity' => array('activity', t('Post an activity'), true, t('Only sends to viewers of the applicable profile')),
+                '$thing_hash' => $thing_hash,
+                '$thing_lbl' => t('Name of thing e.g. something'),
+                '$thething' => $r[0]['obj_term'],
+                '$url_lbl' => t('URL of thing (optional)'),
+                '$theurl' => $r[0]['obj_url'],
+                '$img_lbl' => t('URL for photo of thing (optional)'),
+                '$imgurl' => $r[0]['obj_imgurl'],
+                '$permissions' => t('Permissions'),
+                '$aclselect' => Libacl::populate($channel_acl, false),
+                '$allow_cid' => acl2json($channel_acl['allow_cid']),
+                '$allow_gid' => acl2json($channel_acl['allow_gid']),
+                '$deny_cid' => acl2json($channel_acl['deny_cid']),
+                '$deny_gid' => acl2json($channel_acl['deny_gid']),
+                '$lockstate' => $lockstate,
+                '$submit' => t('Submit')
+            ));
+
+            return $o;
+        }
+
+        if (argc() == 3 && argv(1) === 'drop') {
+            $thing_hash = argv(2);
+
+            $r = q(
+                "select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
+                intval(TERM_OBJ_THING),
+                dbesc($thing_hash)
+            );
+
+            if ((!$r) || ($r[0]['obj_channel'] != local_channel())) {
+                notice(t('Permission denied.') . EOL);
+                return '';
+            }
+
+
+            delete_thing_photo($r[0]['obj_imgurl'], get_observer_hash());
+
+            $x = q(
+                "delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d",
+                dbesc($thing_hash),
+                intval(TERM_OBJ_THING),
+                intval(local_channel())
+            );
+
+            $r[0]['obj_deleted'] = 1;
+
+            Libsync::build_sync_packet(0, array('obj' => $r));
+
+            return $o;
+        }
+
+        $o .= replace_macros(Theme::get_template('thing_input.tpl'), array(
+            '$thing_hdr' => t('Add Thing to your Profile'),
+            '$multiprof' => Features::enabled(local_channel(), 'multi_profiles'),
+            '$profile_lbl' => t('Select a profile'),
+            '$profile_select' => contact_profile_assign(''),
+            '$verb_lbl' => $channel['channel_name'],
+            '$activity' => array('activity', t('Post an activity'), ((array_key_exists('activity', $_REQUEST)) ? $_REQUEST['activity'] : true), t('Only sends to viewers of the applicable profile')),
+            '$verb_select' => obj_verb_selector(),
+            '$thing_lbl' => t('Name of thing e.g. something'),
+            '$url_lbl' => t('URL of thing (optional)'),
+            '$img_lbl' => t('URL for photo of thing (optional)'),
+            '$permissions' => t('Permissions'),
+            '$aclselect' => Libacl::populate($channel_acl, false),
+            '$allow_cid' => acl2json($channel_acl['allow_cid']),
+            '$allow_gid' => acl2json($channel_acl['allow_gid']),
+            '$deny_cid' => acl2json($channel_acl['deny_cid']),
+            '$deny_gid' => acl2json($channel_acl['deny_gid']),
+            '$lockstate' => $lockstate,
+            '$submit' => t('Submit')
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Toggle_safesearch.php b/Code/Module/Toggle_safesearch.php
new file mode 100644
index 000000000..41a501fd2
--- /dev/null
+++ b/Code/Module/Toggle_safesearch.php
@@ -0,0 +1,37 @@
+db);
+        $s = new OAuth2Server($storage);
+        $request = Request::createFromGlobals();
+        $response = $s->handleTokenRequest($request);
+        $response->send();
+        killme();
+    }
+}
diff --git a/Code/Module/Uexport.php b/Code/Module/Uexport.php
new file mode 100644
index 000000000..f26c6de77
--- /dev/null
+++ b/Code/Module/Uexport.php
@@ -0,0 +1,83 @@
+ 1) {
+            $channel = App::get_channel();
+
+            if (argc() > 1 && intval(argv(1)) > 1900) {
+                $year = intval(argv(1));
+            }
+
+            if (argc() > 2 && intval(argv(2)) > 0 && intval(argv(2)) <= 12) {
+                $month = intval(argv(2));
+            }
+
+            header('content-type: application/json');
+            header('Content-Disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . (($month) ? '-' . $month : '') . (($_REQUEST['sections']) ? '-' . $_REQUEST['sections'] : '') . '.json"');
+
+            $flags = ((version_compare(PHP_VERSION, '7.2.0') >= 0) ? JSON_INVALID_UTF8_SUBSTITUTE : 0);
+
+            if ($year) {
+                echo json_encode(Channel::export_year(local_channel(), $year, $month), $flags);
+                killme();
+            }
+
+            if (argc() > 1 && argv(1) === 'basic') {
+                echo json_encode(Channel::basic_export(local_channel(), $sections), $flags);
+                killme();
+            }
+
+            // Warning: this option may consume a lot of memory
+
+            if (argc() > 1 && argv(1) === 'complete') {
+                $sections[] = 'items';
+                echo json_encode(Channel::basic_export(local_channel(), $sections));
+                killme();
+            }
+        }
+    }
+
+    public function get()
+    {
+
+        $y = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
+
+        $yearurl = z_root() . '/uexport/' . $y;
+        $janurl = z_root() . '/uexport/' . $y . '/1';
+        $impurl = '/import_items';
+        $o = replace_macros(Theme::get_template('uexport.tpl'), array(
+            '$title' => t('Export Channel'),
+            '$basictitle' => t('Export Channel'),
+            '$basic' => t('Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'),
+            '$fulltitle' => t('Export Content'),
+            '$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin.'),
+
+            '$by_year' => t('Export your posts from a given year.'),
+
+            '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'),
+            '$extra2' => sprintf(t('To select all posts for a given year, such as this year, visit %2$s'), $yearurl, $yearurl),
+            '$extra3' => sprintf(t('To select all posts for a given month, such as January of this year, visit %2$s'), $janurl, $janurl),
+            '$extra4' => sprintf(t('These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results please import or restore these in date order (oldest first).'), $impurl, $impurl)
+
+        ));
+        return $o;
+    }
+}
diff --git a/Code/Module/Update.php b/Code/Module/Update.php
new file mode 100644
index 000000000..6aacbf89d
--- /dev/null
+++ b/Code/Module/Update.php
@@ -0,0 +1,83 @@
+get() to indicate that
+ * the existing content should either be replaced or appended to.
+ * The current modules that support this manner of update are
+ *  channel, hq, stream, display, search, and pubstream.
+ * The state we are passing is the profile_uid (passed to us as $_GET['p']), and argv(2) === 'load'
+ * to indicate that we're replacing original content.
+ *
+ * module->profile_uid - tell the module who owns this data
+ * module->loading - tell the module to replace existing  content
+ * module->updating - always true to tell the module that this is a js initiated request
+ *
+ * Inside main.js we also append all of the relevant content query params which were initially used on that
+ * page via buildCmd so those are passed to this instance of update and are therefore available from the module.
+ */
+
+use App;
+use Code\Web\Controller;
+
+class Update extends Controller
+{
+
+    public function get()
+    {
+
+        $profile_uid = intval($_GET['p']);
+
+        // Change a profile_uid of 0 (not logged in) to (-1) for selected controllers
+        // as they only respond to liveUpdate with non-zero values
+
+        if ((!$profile_uid) && in_array(argv(1), ['display', 'search', 'pubstream', 'home'])) {
+            $profile_uid = (-1);
+        }
+
+        if (argc() < 2) {
+            killme();
+        }
+
+        // These modules don't have a completely working liveUpdate implementation currently
+
+        if (in_array(strtolower(argv(1)), ['articles', 'cards'])) {
+            killme();
+        }
+
+        $module = "\\Code\\Module\\" . ucfirst(argv(1));
+        $load = (((argc() > 2) && (argv(2) == 'load')) ? 1 : 0);
+
+        $mod = new $module();
+
+        // Set the state flags of the relevant module (only conversational
+        // modules support state flags
+
+        if (isset($mod->profile_uid)) {
+            $mod->profile_uid = $profile_uid;
+        }
+        if (isset($mod->updating)) {
+            $mod->updating = 1;
+        }
+        if (isset($mod->loading) && $load) {
+            $mod->loading = 1;
+        }
+
+        header("Content-type: text/html");
+
+        // Modify the argument parameters to match what the new controller
+        // expects. They are currently set to what this controller expects.
+
+        App::$argv = [argv(1)];
+        App::$argc = 1;
+
+        echo "
      \r\n";
+        echo $mod->get();
+        echo "
      \r\n";
+
+        killme();
+    }
+}
diff --git a/Code/Module/Userinfo.php b/Code/Module/Userinfo.php
new file mode 100644
index 000000000..16a575ffd
--- /dev/null
+++ b/Code/Module/Userinfo.php
@@ -0,0 +1,21 @@
+db));
+        $request = Request::createFromGlobals();
+        $s->handleUserInfoRequest($request)->send();
+        killme();
+    }
+}
diff --git a/Code/Module/View.php b/Code/Module/View.php
new file mode 100644
index 000000000..ae32750bc
--- /dev/null
+++ b/Code/Module/View.php
@@ -0,0 +1,24 @@
+ 1) {
+            Libprofile::load(argv(1));
+        }
+    }
+
+    public function get()
+    {
+
+        // logger('request: ' . print_r($_REQUEST,true));
+
+        if (observer_prohibited()) {
+            notice(t('Public access denied.') . EOL);
+            return;
+        }
+
+        if (((!(is_array(App::$profile) && count(App::$profile))) || (App::$profile['hide_friends']))) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if (!perm_is_allowed(App::$profile['uid'], get_observer_hash(), 'view_contacts')) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        if (!$_REQUEST['aj']) {
+            $_SESSION['return_url'] = App::$query_string;
+        }
+
+        $is_owner = ((local_channel() && local_channel() == App::$profile['uid']) ? true : false);
+
+        $abook_flags = " and abook_pending = 0 and abook_self = 0 ";
+        $sql_extra = '';
+
+        if (!$is_owner) {
+            $abook_flags .= " and abook_hidden = 0 ";
+            $sql_extra = " and xchan_hidden = 0 ";
+        }
+
+        $r = q(
+            "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ",
+            intval(App::$profile['uid']),
+            intval(App::$pager['itemspage']),
+            intval(App::$pager['start'])
+        );
+
+        if ((!$r) && (!$_REQUEST['aj'])) {
+            info(t('No connections.') . EOL);
+            return $o;
+        }
+
+        $contacts = [];
+
+        foreach ($r as $rr) {
+            $oneway = false;
+            if (!their_perms_contains(App::$profile['uid'], $rr['xchan_hash'], 'post_comments')) {
+                $oneway = true;
+            }
+
+            $url = chanlink_hash($rr['xchan_hash']);
+            if ($url) {
+                $contacts[] = [
+                    'id' => $rr['abook_id'],
+                    'archived' => (intval($rr['abook_archived']) ? true : false),
+                    'img_hover' => sprintf(t('Visit %1$s\'s profile [%2$s]'), $rr['xchan_name'], $rr['xchan_url']),
+                    'thumb' => $rr['xchan_photo_m'],
+                    'name' => substr($rr['xchan_name'], 0, 20),
+                    'username' => $rr['xchan_addr'],
+                    'link' => $url,
+                    'sparkle' => '',
+                    'itemurl' => $rr['url'],
+                    'network' => '',
+                    'oneway' => $oneway
+                ];
+            }
+        }
+
+
+        if ($_REQUEST['aj']) {
+            if ($contacts) {
+                $o = replace_macros(Theme::get_template('viewcontactsajax.tpl'), [
+                    '$contacts' => $contacts
+                ]);
+            } else {
+                $o = '
      ';
+            }
+            echo $o;
+            killme();
+        } else {
+            $o .= "";
+            $o .= replace_macros(Theme::get_template('viewcontact_template.tpl'), [
+                '$title' => t('View Connections'),
+                '$contacts' => $contacts,
+            ]);
+        }
+
+        if (!$contacts) {
+            $o .= '
      ';
+        }
+        return $o;
+    }
+}
diff --git a/Code/Module/Viewsrc.php b/Code/Module/Viewsrc.php
new file mode 100644
index 000000000..dd5b3e5dc
--- /dev/null
+++ b/Code/Module/Viewsrc.php
@@ -0,0 +1,73 @@
+ 1) ? intval(argv(1)) : 0);
+        $json = ((argc() > 2 && argv(2) === 'json') ? true : false);
+        $dload = ((argc() > 2 && argv(2) === 'download') ? true : false);
+
+        if (!local_channel()) {
+            notice(t('Permission denied.') . EOL);
+        }
+
+        if (!$item_id) {
+            App::$error = 404;
+            notice(t('Item not found.') . EOL);
+        }
+
+        $item_normal = item_normal_search();
+
+        if (local_channel() && $item_id) {
+            $r = q(
+                "select id, item_flags, mimetype, item_obscured, body, llink, plink from item where uid in (%d , %d) and id = %d $item_normal limit 1",
+                intval(local_channel()),
+                intval($sys['channel_id']),
+                intval($item_id)
+            );
+
+            if ($r) {
+                if (intval($r[0]['item_obscured'])) {
+                    $dload = true;
+                }
+
+                if ($dload) {
+                    header('Content-type: ' . $r[0]['mimetype']);
+                    header('Content-Disposition: attachment; filename="' . t('item') . '-' . $item_id . '"');
+                    echo $r[0]['body'];
+                    killme();
+                }
+
+                $content = escape_tags($r[0]['body']);
+                $o = (($json) ? json_encode($content) : str_replace("\n", '
      ', $content));
+            }
+        }
+
+        $inspect = ((is_site_admin()) ? '| ' . t('Inspect') . '' : EMPTY_STR);
+
+
+        if (is_ajax()) {
+            echo '
      ';
+            echo '
      ' . t('Local id:') . ' ' . $r[0]['id'] . ' | ' . t('Permanent link') . ' | ' . t('Local link') . '' . $inspect . '
      ';
+            echo '
      ';
+            echo '
      ' . $o . '
      ';
+            echo '
      ';
+            killme();
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Vlists.php b/Code/Module/Vlists.php
new file mode 100644
index 000000000..7954296fb
--- /dev/null
+++ b/Code/Module/Vlists.php
@@ -0,0 +1,31 @@
+' . $desc . '
      ';
+
+        $o .= $text;
+
+
+        $text2 = '
      ' . t('This app is installed. ') . '
      ';
+
+        if (local_channel() && Apps::system_app_installed(local_channel(), 'Virtual Lists')) {
+            $o .= $text2;
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Module/Vote.php b/Code/Module/Vote.php
new file mode 100644
index 000000000..87ae3947d
--- /dev/null
+++ b/Code/Module/Vote.php
@@ -0,0 +1,135 @@
+ false, 'message' => EMPTY_STR];
+
+        $channel = App::get_channel();
+
+        if (!$channel) {
+            $ret['message'] = t('Permission denied.');
+            json_return_and_die($ret);
+        }
+
+
+        $fetch = null;
+        $id = argv(1);
+        $response = $_REQUEST['answer'];
+
+        if ($id) {
+            $fetch = q(
+                "select * from item where id = %d limit 1",
+                intval($id)
+            );
+        }
+
+        if ($fetch && $fetch[0]['obj_type'] === 'Question') {
+            $obj = json_decode($fetch[0]['obj'], true);
+        } else {
+            $ret['message'] = t('Poll not found.');
+            json_return_and_die($ret);
+        }
+
+        $valid = false;
+
+        if ($obj['oneOf']) {
+            foreach ($obj['oneOf'] as $selection) {
+                //      logger('selection: ' . $selection);
+                //      logger('response: ' . $response);
+                if ($selection['name'] && $selection['name'] === $response) {
+                    $valid = true;
+                }
+            }
+        }
+
+        $choices = [];
+        if ($obj['anyOf']) {
+            foreach ($obj['anyOf'] as $selection) {
+                $choices[] = $selection['name'];
+            }
+            foreach ($response as $res) {
+                if (!in_array($res, $choices)) {
+                    $valid = false;
+                    break;
+                }
+                $valid = true;
+            }
+        }
+
+        if (!$valid) {
+            $ret['message'] = t('Invalid response.');
+            json_return_and_die($ret);
+        }
+
+        if (!is_array($response)) {
+            $response = [$response];
+        }
+
+        foreach ($response as $res) {
+            $item = [];
+
+            $item['aid'] = $channel['channel_account_id'];
+            $item['uid'] = $channel['channel_id'];
+            $item['item_origin'] = true;
+            $item['parent'] = $fetch[0]['id'];
+            $item['parent_mid'] = $fetch[0]['mid'];
+            $item['thr_parent'] = $fetch[0]['mid'];
+            $item['uuid'] = new_uuid();
+            $item['mid'] = z_root() . '/item/' . $item['uuid'];
+            $item['verb'] = 'Create';
+            $item['title'] = $res;
+            $item['author_xchan'] = $channel['channel_hash'];
+            $item['owner_xchan'] = $fetch[0]['author_xchan'];
+//          $item['allow_cid'] = '<' . $fetch[0]['author_xchan'] . '>';
+//          $item['item_private'] = 1;
+
+            // These two are placeholder values that will be reset after
+            // we encode the item
+
+            $item['obj_type'] = 'Note';
+            $item['author'] = Channel::from_id($channel['channel_id']);
+
+            $item['obj'] = Activity::encode_item($item, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
+
+            // now reset the placeholders
+
+            $item['obj_type'] = 'Answer';
+            unset($item['author']);
+
+            $x = item_store($item);
+
+            retain_item($fetch[0]['id']);
+
+            if ($x['success']) {
+                $itemid = $x['item_id'];
+                Run::Summon(['Notifier', 'like', $itemid]);
+            }
+
+            $r = q(
+                "select * from item where id = %d",
+                intval($itemid)
+            );
+            if ($r) {
+                xchan_query($r);
+                $sync_item = fetch_post_tags($r);
+                Libsync::build_sync_packet($channel['channel_id'], ['item' => [encode_item($sync_item[0], true)]]);
+            }
+        }
+        $ret['success'] = true;
+        $ret['message'] = t('Response submitted. Updates may not appear instantly.');
+        json_return_and_die($ret);
+    }
+}
diff --git a/Code/Module/Wall_attach.php b/Code/Module/Wall_attach.php
new file mode 100644
index 000000000..2971f5b16
--- /dev/null
+++ b/Code/Module/Wall_attach.php
@@ -0,0 +1,180 @@
+ 1) {
+                $channel = Channel::from_username(argv(1));
+            }
+        }
+
+        if (!$channel) {
+            killme();
+        }
+
+        $matches = [];
+        $partial = false;
+
+        if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
+            $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
+            if ($pm) {
+                // logger('Content-Range: ' . print_r($matches,true));
+                $partial = true;
+            }
+        }
+
+        if ($partial) {
+            $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
+            if ($x['partial']) {
+                header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
+                json_return_and_die($x);
+            } else {
+                header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
+
+                $_FILES['userfile'] = [
+                    'name' => $x['name'],
+                    'type' => $x['type'],
+                    'tmp_name' => $x['tmp_name'],
+                    'error' => $x['error'],
+                    'size' => $x['size']
+                ];
+            }
+        } else {
+            if (!array_key_exists('userfile', $_FILES)) {
+                $_FILES['userfile'] = [
+                    'name' => $_FILES['files']['name'],
+                    'type' => $_FILES['files']['type'],
+                    'tmp_name' => $_FILES['files']['tmp_name'],
+                    'error' => $_FILES['files']['error'],
+                    'size' => $_FILES['files']['size']
+                ];
+            }
+        }
+
+        $observer = App::get_observer();
+
+
+        $def_album = get_pconfig($channel['channel_id'], 'system', 'photo_path');
+        $def_attach = get_pconfig($channel['channel_id'], 'system', 'attach_path');
+
+        $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [
+            'source' => 'editor',
+            'visible' => 0,
+            'album' => $def_album,
+            'directory' => $def_attach,
+            'flags' => 1, // indicates temporary permissions are created
+            'allow_cid' => '<' . $channel['channel_hash'] . '>'
+        ]);
+
+        if (!$r['success']) {
+            notice($r['message'] . EOL);
+            killme();
+        }
+
+        $s = EMPTY_STR;
+
+        if (intval($r['data']['is_photo'])) {
+            $s .= "\n\n" . $r['body'] . "\n\n";
+        }
+
+        $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
+
+        if (strpos($r['data']['filetype'], 'video') === 0) {
+            for ($n = 0; $n < 15; $n++) {
+                $thumb = Linkinfo::get_video_poster($url);
+                if ($thumb) {
+                    break;
+                }
+                sleep(1);
+                continue;
+            }
+
+            if ($thumb) {
+                $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n";
+            } else {
+                $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n";
+            }
+        }
+        if (strpos($r['data']['filetype'], 'audio') === 0) {
+            $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n";
+        }
+        if ($r['data']['filetype'] === 'image/svg+xml') {
+            $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+            if ($x) {
+                $bb = svg2bb($x);
+                if ($bb) {
+                    $s .= "\n\n" . $bb;
+                } else {
+                    logger('empty return from svgbb');
+                }
+            } else {
+                logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+            }
+        }
+        if ($r['data']['filetype'] === 'text/vnd.abc' && Addon::is_installed('abc')) {
+            $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+            if ($x) {
+                $s .= "\n\n" . '[abc]' . $x . '[/abc]';
+            } else {
+                logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+            }
+        }
+        if ($r['data']['filetype'] === 'text/calendar') {
+            $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+            if ($content) {
+                $ev = ical_to_ev($content);
+                if ($ev) {
+                    $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n";
+                }
+            }
+        }
+
+        $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+
+
+        if ($using_api) {
+            return $s;
+        }
+
+        $result['message'] = $s;
+        json_return_and_die($result);
+    }
+}
diff --git a/Code/Module/Wall_upload.php b/Code/Module/Wall_upload.php
new file mode 100644
index 000000000..59f3d568b
--- /dev/null
+++ b/Code/Module/Wall_upload.php
@@ -0,0 +1,62 @@
+ 1) {
+                $channel = Channel::from_username(argv(1));
+            }
+        }
+
+        if (!$channel) {
+            if ($using_api) {
+                return;
+            }
+            notice(t('Channel not found.') . EOL);
+            killme();
+        }
+
+        $observer = App::get_observer();
+
+        $args = array('source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
+
+        $ret = photo_upload($channel, $observer, $args);
+
+        if (!$ret['success']) {
+            if ($using_api) {
+                return;
+            }
+            notice($ret['message']);
+            killme();
+        }
+
+        if ($using_api) {
+            return ("\n\n" . $ret['body'] . "\n\n");
+        } else {
+            echo "\n\n" . $ret['body'] . "\n\n";
+        }
+        killme();
+    }
+}
diff --git a/Code/Module/Webfinger.php b/Code/Module/Webfinger.php
new file mode 100644
index 000000000..3b6227a66
--- /dev/null
+++ b/Code/Module/Webfinger.php
@@ -0,0 +1,194 @@
+ 3 && $arr[2] === 'zotid') {
+                $hash = $arr[3];
+                $channel_target = Channel::from_hash($hash);
+            }
+        }
+
+        if (strpos($resource, 'acct:') === 0) {
+            $channel_nickname = punify(str_replace('acct:', '', $resource));
+            if (strrpos($channel_nickname, '@') !== false) {
+                $host = punify(substr($channel_nickname, strrpos($channel_nickname, '@') + 1));
+
+                // If the webfinger address points off site, redirect to the correct site
+
+                if (strcasecmp($host, App::get_hostname())) {
+                    goaway('https://' . $host . '/.well-known/webfinger?f=&resource=' . $resource);
+                }
+                $channel_nickname = substr($channel_nickname, 0, strrpos($channel_nickname, '@'));
+            }
+        }
+        if (strpos($resource, 'http') === 0) {
+            $channel_nickname = str_replace(['~', '@'], ['', ''], basename($resource));
+        }
+
+        if ($channel_nickname) {
+            $channel_target = Channel::from_username($channel_nickname);
+        }
+
+        if ($channel_target || $site_query) {
+            $h = get_hubloc_addrs_by_hash($channel_target['channel_hash']);
+
+            if (!isset($result['subject'])) {
+                $result['subject'] = $resource;
+            }
+
+            $aliases = [
+                z_root() . '/channel/' . $channel_target['channel_address'],
+                z_root() . '/~' . $channel_target['channel_address'],
+                z_root() . '/@' . $channel_target['channel_address']
+
+            ];
+
+            if ($h) {
+                foreach ($h as $hh) {
+                    $aliases[] = 'acct:' . $hh['hubloc_addr'];
+                }
+            }
+
+            $result['aliases'] = [];
+
+            $result['properties'] = [
+                'http://webfinger.net/ns/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'],
+                'http://xmlns.com/foaf/0.1/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'],
+                'https://w3id.org/security/v1#publicKeyPem' => (($site_query) ? get_config('system', 'pubkey') : $channel_target['xchan_pubkey']),
+                'http://purl.org/zot/federation' => ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? 'nomad,zot6,activitypub' : 'nomad,zot6')
+            ];
+
+            if ($site_query) {
+                $aliases[] = z_root();
+                $aliases[] = 'acct:sys@' . App::get_hostname();
+            }
+
+            foreach ($aliases as $alias) {
+                if ($alias !== $result['subject']) {
+                    $result['aliases'][] = $alias;
+                }
+            }
+
+            $result['links'] = [
+
+                [
+                    'rel' => 'http://webfinger.net/rel/avatar',
+                    'type' => $channel_target['xchan_photo_mimetype'],
+                    'href' => $channel_target['xchan_photo_l']
+                ],
+
+                [
+                    'rel' => 'http://webfinger.net/rel/blog',
+                    'href' => z_root() . '/channel/' . $channel_target['channel_address'],
+                ],
+
+                [
+                    'rel' => 'http://openid.net/specs/connect/1.0/issuer',
+                    'href' => z_root()
+                ],
+
+                [
+                    'rel' => 'http://purl.org/zot/protocol/6.0',
+                    'type' => 'application/x-zot+json',
+                    'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']),
+                ],
+
+				[ 
+					'rel'  => 'http://purl.org/nomad', 
+					'type' => 'application/x-nomad+json', 
+					'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']),
+				],
+
+				[
+					'rel'  => 'http://purl.org/openwebauth/v1',
+					'type' => 'application/x-nomad+json',
+					'href' => z_root() . '/owa'
+				],
+
+                [
+                    'rel' => 'http://purl.org/openwebauth/v1',
+                    'type' => 'application/x-zot+json',
+                    'href' => z_root() . '/owa'
+                ],
+
+                [
+                    'rel' => 'self',
+                    'type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+                    'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address'])
+                ],
+
+                [
+                    'rel' => 'self',
+                    'type' => 'application/activity+json',
+                    'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address'])
+                ],
+
+                [
+                    'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+                    'template' => z_root() . '/follow?url={uri}'
+                ],
+            ];
+        }
+
+        if (!$result) {
+            header($_SERVER['SERVER_PROTOCOL'] . ' ' . 400 . ' ' . 'Bad Request');
+            killme();
+        }
+
+        $arr = ['channel' => $channel_target, 'request' => $_REQUEST, 'result' => $result];
+        Hook::call('webfinger', $arr);
+
+
+        json_return_and_die($arr['result'], 'application/jrd+json', true);
+    }
+}
diff --git a/Code/Module/Webpages.php b/Code/Module/Webpages.php
new file mode 100644
index 000000000..f1a18ec94
--- /dev/null
+++ b/Code/Module/Webpages.php
@@ -0,0 +1,731 @@
+ 1 && argv(1) === 'sys' && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                App::$is_sys = true;
+            }
+        }
+
+        if (argc() > 1) {
+            $which = argv(1);
+        } else {
+            return;
+        }
+
+        Libprofile::load($which);
+    }
+
+
+    public function get()
+    {
+
+        if (!App::$profile) {
+            notice(t('Requested profile is not available.') . EOL);
+            App::$error = 404;
+            return;
+        }
+
+        if (!Apps::system_app_installed(App::$profile_uid, 'Webpages')) {
+            //Do not display any associated widgets at this point
+            App::$pdl = '';
+
+            $o = 'Webpages App (Not Installed):
      ';
+            $o .= t('Provide managed web pages on your channel');
+            return $o;
+        }
+
+        Navbar::set_selected('Webpages');
+
+        $which = argv(1);
+
+        $_SESSION['return_url'] = App::$query_string;
+
+        $uid = local_channel();
+        $owner = 0;
+        $observer = App::get_observer();
+
+        $channel = App::get_channel();
+
+        switch ($_SESSION['action']) {
+            case 'import':
+                $_SESSION['action'] = null;
+                $o .= replace_macros(Theme::get_template('webpage_import.tpl'), array(
+                    '$title' => t('Import Webpage Elements'),
+                    '$importbtn' => t('Import selected'),
+                    '$action' => 'import',
+                    '$pages' => $_SESSION['pages'],
+                    '$layouts' => $_SESSION['layouts'],
+                    '$blocks' => $_SESSION['blocks'],
+                ));
+                return $o;
+
+            case 'importselected':
+                $_SESSION['action'] = null;
+                break;
+            case 'export_select_list':
+                $_SESSION['action'] = null;
+                if (!$uid) {
+                    $_SESSION['export'] = null;
+                    break;
+                }
+                require_once('include/import.php');
+
+                $pages = get_webpage_elements($channel, 'pages');
+                $layouts = get_webpage_elements($channel, 'layouts');
+                $blocks = get_webpage_elements($channel, 'blocks');
+                $o .= replace_macros(Theme::get_template('webpage_export_list.tpl'), array(
+                    '$title' => t('Export Webpage Elements'),
+                    '$exportbtn' => t('Export selected'),
+                    '$action' => $_SESSION['export'],    // value should be 'zipfile' or 'cloud'
+                    '$pages' => $pages['pages'],
+                    '$layouts' => $layouts['layouts'],
+                    '$blocks' => $blocks['blocks'],
+                ));
+                $_SESSION['export'] = null;
+                return $o;
+
+            default:
+                $_SESSION['action'] = null;
+                break;
+        }
+
+
+        if (App::$is_sys && is_site_admin()) {
+            $sys = Channel::get_system();
+            if ($sys && intval($sys['channel_id'])) {
+                $uid = $owner = intval($sys['channel_id']);
+                $channel = $sys;
+                $observer = $sys;
+            }
+        }
+
+        if (!$owner) {
+            // Figure out who the page owner is.
+            $r = q(
+                "select channel_id from channel where channel_address = '%s'",
+                dbesc($which)
+            );
+            if ($r) {
+                $owner = intval($r[0]['channel_id']);
+            }
+        }
+
+        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+        $perms = get_all_perms($owner, $ob_hash);
+
+        if (!$perms['write_pages']) {
+            notice(t('Permission denied.') . EOL);
+            return;
+        }
+
+        $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner, 'system', 'page_mimetype'));
+
+        $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner, 'system', 'page_layout'));
+
+        // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
+        // Nickname is set to the observers xchan, and profile_uid to the owner's.
+        // This lets you post pages at other people's channels.
+
+        if ((!$channel) && ($uid) && ($uid == App::$profile_uid)) {
+            $channel = App::get_channel();
+        }
+        if ($channel) {
+            $channel_acl = array(
+                'allow_cid' => $channel['channel_allow_cid'],
+                'allow_gid' => $channel['channel_allow_gid'],
+                'deny_cid' => $channel['channel_deny_cid'],
+                'deny_gid' => $channel['channel_deny_gid']
+            );
+        } else {
+            $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
+        }
+
+
+        $is_owner = ($uid && $uid == $owner);
+
+        $o = '';
+
+        $x = array(
+            'webpage' => ITEM_TYPE_WEBPAGE,
+            'is_owner' => true,
+            'nickname' => App::$profile['channel_address'],
+            'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+            'acl' => (($is_owner) ? Libacl::populate($channel_acl, false, PermissionDescription::fromGlobalPermission('view_pages')) : ''),
+            'permissions' => $channel_acl,
+            'showacl' => (($is_owner) ? true : false),
+            'visitor' => true,
+            'hide_location' => true,
+            'hide_voting' => true,
+            'profile_uid' => intval($owner),
+            'mimetype' => $mimetype,
+            'mimeselect' => true,
+            'layout' => $layout,
+            'layoutselect' => true,
+            'expanded' => true,
+            'novoting' => true,
+            'bbco_autocomplete' => 'bbcode',
+            'bbcode' => true
+        );
+
+        if ($_REQUEST['title']) {
+            $x['title'] = $_REQUEST['title'];
+        }
+        if ($_REQUEST['body']) {
+            $x['body'] = $_REQUEST['body'];
+        }
+        if ($_REQUEST['pagetitle']) {
+            $x['pagetitle'] = $_REQUEST['pagetitle'];
+        }
+
+
+        // Get a list of webpages.  We can't display all them because endless scroll makes that unusable,
+        // so just list titles and an edit link.
+
+
+        $sql_extra = item_permissions_sql($owner);
+
+        $r = q(
+            "select * from iconfig left join item on iconfig.iid = item.id 
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d 
+			$sql_extra order by item.created desc",
+            intval($owner),
+            intval(ITEM_TYPE_WEBPAGE)
+        );
+
+        if (!$r) {
+            $x['pagetitle'] = 'home';
+        }
+
+        $editor = status_editor($x);
+
+        $pages = null;
+
+        if ($r) {
+            $pages = [];
+            foreach ($r as $rr) {
+                unobscure($rr);
+
+                $lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock');
+
+                $element_arr = array(
+                    'type' => 'webpage',
+                    'title' => $rr['title'],
+                    'body' => $rr['body'],
+                    'created' => $rr['created'],
+                    'edited' => $rr['edited'],
+                    'mimetype' => $rr['mimetype'],
+                    'pageurl' => str_replace('%2f', '/', $rr['v']),
+                    'pagetitle' => urldecode($rr['v']),
+                    'mid' => $rr['mid'],
+                    'layout_mid' => $rr['layout_mid']
+                );
+                $pages[$rr['iid']][] = array(
+                    'url' => $rr['iid'],
+                    'pageurl' => str_replace('%2f', '/', $rr['v']),
+                    'pagetitle' => urldecode($rr['v']),
+                    'title' => $rr['title'],
+                    'created' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']),
+                    'edited' => datetime_convert('UTC', date_default_timezone_get(), $rr['edited']),
+                    'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]',
+                    'lockstate' => $lockstate
+                );
+            }
+        }
+
+
+        //Build the base URL for edit links
+        $url = z_root() . '/editwebpage/' . $which;
+
+        $o .= replace_macros(Theme::get_template('webpagelist.tpl'), array(
+            '$listtitle' => t('Webpages'),
+            '$baseurl' => $url,
+            '$create' => t('Create'),
+            '$edit' => t('Edit'),
+            '$share' => t('Share'),
+            '$delete' => t('Delete'),
+            '$pages' => $pages,
+            '$channel' => $which,
+            '$editor' => $editor,
+            '$view' => t('View'),
+            '$preview' => t('Preview'),
+            '$actions_txt' => t('Actions'),
+            '$pagelink_txt' => t('Page Link'),
+            '$title_txt' => t('Page Title'),
+            '$created_txt' => t('Created'),
+            '$edited_txt' => t('Edited')
+        ));
+
+        return $o;
+    }
+
+    public function post()
+    {
+        $action = $_REQUEST['action'];
+        if ($action) {
+            switch ($action) {
+                case 'scan':
+                    // the state of this variable tracks whether website files have been scanned (null, true, false)
+                    $cloud = null;
+
+                    // Website files are to be imported from an uploaded zip file
+                    if (($_FILES) && array_key_exists('zip_file', $_FILES) && isset($_POST['w_upload'])) {
+                        $source = $_FILES["zip_file"]["tmp_name"];
+                        $type = $_FILES["zip_file"]["type"];
+                        $okay = false;
+                        $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed');
+                        foreach ($accepted_types as $mime_type) {
+                            if ($mime_type == $type) {
+                                $okay = true;
+                                break;
+                            }
+                        }
+                        if (!$okay) {
+                            notice(t('Invalid file type.') . EOL);
+                            return;
+                        }
+                        $zip = new ZipArchive();
+                        if ($zip->open($source) === true) {
+                            $tmp_folder_name = random_string(5);
+                            $website = dirname($source) . '/' . $tmp_folder_name;
+                            $zip->extractTo($website); // change this to the correct site path
+                            $zip->close();
+                            @unlink($source);    // delete the compressed file now that the content has been extracted
+                            $cloud = false;
+                        } else {
+                            notice(t('Error opening zip file') . EOL);
+                            return null;
+                        }
+                    }
+
+                    // Website files are to be imported from the channel cloud files
+                    if (($_POST) && array_key_exists('path', $_POST) && isset($_POST['cloudsubmit'])) {
+                        $channel = App::get_channel();
+                        $dirpath = get_dirpath_by_cloudpath($channel, $_POST['path']);
+                        if (!$dirpath) {
+                            notice(t('Invalid folder path.') . EOL);
+                            return null;
+                        }
+                        $cloud = true;
+                    }
+
+                    // If the website files were uploaded or specified in the cloud files, then $cloud
+                    // should be either true or false
+                    if ($cloud !== null) {
+                        require_once('include/import.php');
+                        $elements = [];
+                        if ($cloud) {
+                            $path = $_POST['path'];
+                        } else {
+                            $path = $website;
+                        }
+                        $elements['pages'] = scan_webpage_elements($path, 'page', $cloud);
+                        $elements['layouts'] = scan_webpage_elements($path, 'layout', $cloud);
+                        $elements['blocks'] = scan_webpage_elements($path, 'block', $cloud);
+                        $_SESSION['blocks'] = $elements['blocks'];
+                        $_SESSION['layouts'] = $elements['layouts'];
+                        $_SESSION['pages'] = $elements['pages'];
+                        if (!(empty($elements['pages']) && empty($elements['blocks']) && empty($elements['layouts']))) {
+                            //info( t('Webpages elements detected.') . EOL);
+                            $_SESSION['action'] = 'import';
+                        } else {
+                            notice(t('No webpage elements detected.') . EOL);
+                            $_SESSION['action'] = null;
+                        }
+                    }
+
+                    // If the website elements were imported from a zip file, delete the temporary decompressed files
+                    if ($cloud === false && $website && $elements) {
+                        $_SESSION['tempimportpath'] = $website;
+                        //rrmdir($website); // Delete the temporary decompressed files
+                    }
+
+                    break;
+
+                case 'importselected':
+                    require_once('include/import.php');
+                    $channel = App::get_channel();
+
+                    // Import layout first so that pages that reference new layouts will find
+                    // the mid of layout items in the database
+
+                    // Obtain the user-selected layouts to import and import them
+                    $checkedlayouts = $_POST['layout'];
+                    $layouts = [];
+                    if (!empty($checkedlayouts)) {
+                        foreach ($checkedlayouts as $name) {
+                            foreach ($_SESSION['layouts'] as &$layout) {
+                                if ($layout['name'] === $name) {
+                                    $layout['import'] = 1;
+                                    $layoutstoimport[] = $layout;
+                                }
+                            }
+                        }
+                        foreach ($layoutstoimport as $elementtoimport) {
+                            $layouts[] = import_webpage_element($elementtoimport, $channel, 'layout');
+                        }
+                    }
+                    $_SESSION['import_layouts'] = $layouts;
+
+                    // Obtain the user-selected blocks to import and import them
+                    $checkedblocks = $_POST['block'];
+                    $blocks = [];
+                    if (!empty($checkedblocks)) {
+                        foreach ($checkedblocks as $name) {
+                            foreach ($_SESSION['blocks'] as &$block) {
+                                if ($block['name'] === $name) {
+                                    $block['import'] = 1;
+                                    $blockstoimport[] = $block;
+                                }
+                            }
+                        }
+                        foreach ($blockstoimport as $elementtoimport) {
+                            $blocks[] = import_webpage_element($elementtoimport, $channel, 'block');
+                        }
+                    }
+                    $_SESSION['import_blocks'] = $blocks;
+
+                    // Obtain the user-selected pages to import and import them
+                    $checkedpages = $_POST['page'];
+                    $pages = [];
+                    if (!empty($checkedpages)) {
+                        foreach ($checkedpages as $pagelink) {
+                            foreach ($_SESSION['pages'] as &$page) {
+                                if ($page['pagelink'] === $pagelink) {
+                                    $page['import'] = 1;
+                                    $pagestoimport[] = $page;
+                                }
+                            }
+                        }
+                        foreach ($pagestoimport as $elementtoimport) {
+                            $pages[] = import_webpage_element($elementtoimport, $channel, 'page');
+                        }
+                    }
+                    $_SESSION['import_pages'] = $pages;
+                    if (!(empty($_SESSION['import_pages']) && empty($_SESSION['import_blocks']) && empty($_SESSION['import_layouts']))) {
+                        info(t('Import complete.') . EOL);
+                    }
+                    if (isset($_SESSION['tempimportpath'])) {
+                        rrmdir($_SESSION['tempimportpath']);    // Delete the temporary decompressed files
+                        unset($_SESSION['tempimportpath']);
+                    }
+                    break;
+
+                case 'exportzipfile':
+                    if (isset($_POST['w_download'])) {
+                        $_SESSION['action'] = 'export_select_list';
+                        $_SESSION['export'] = 'zipfile';
+                        if (isset($_POST['zipfilename']) && $_POST['zipfilename'] !== '') {
+                            $filename = filter_var($_POST['zipfilename'], FILTER_SANITIZE_ENCODED);
+                        } else {
+                            $filename = 'website.zip';
+                        }
+                        $_SESSION['zipfilename'] = $filename;
+                    }
+
+                    break;
+
+                case 'exportcloud':
+                    if (isset($_POST['exportcloudpath']) && $_POST['exportcloudpath'] !== '') {
+                        $_SESSION['action'] = 'export_select_list';
+                        $_SESSION['export'] = 'cloud';
+                        $_SESSION['exportcloudpath'] = filter_var($_POST['exportcloudpath'], FILTER_SANITIZE_ENCODED);
+                    }
+
+                    break;
+
+                case 'cloud':
+                case 'zipfile':
+                    $channel = App::get_channel();
+
+                    $tmp_folder_name = random_string(10);
+                    $zip_folder_name = random_string(10);
+                    $zip_filename = $_SESSION['zipfilename'];
+                    $tmp_folderpath = '/tmp/' . $tmp_folder_name;
+                    $zip_folderpath = '/tmp/' . $zip_folder_name;
+                    if (!mkdir($zip_folderpath, 0770, false)) {
+                        logger('Error creating zip file export folder: ' . $zip_folderpath, LOGGER_NORMAL);
+                        json_return_and_die(array('message' => 'Error creating zip file export folder'));
+                    }
+                    $zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename;
+
+                    $checkedblocks = $_POST['block'];
+                    $blocks = [];
+                    if (!empty($checkedblocks)) {
+                        foreach ($checkedblocks as $mid) {
+                            $b = q(
+                                "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
+												left join item on item.id = iconfig.iid 
+												where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' order by iconfig.v asc limit 1",
+                                dbesc($mid),
+                                intval($channel['channel_id'])
+                            );
+                            if ($b) {
+                                $b = $b[0];
+                                $blockinfo = array(
+                                    'body' => $b['body'],
+                                    'mimetype' => $b['mimetype'],
+                                    'title' => $b['title'],
+                                    'name' => $b['v'],
+                                    'json' => array(
+                                        'title' => $b['title'],
+                                        'name' => $b['v'],
+                                        'mimetype' => $b['mimetype'],
+                                    )
+                                );
+                                switch ($blockinfo['mimetype']) {
+                                    case 'text/html':
+                                        $block_ext = 'html';
+                                        break;
+                                    case 'text/bbcode':
+									case 'text/x-multicode':
+                                        $block_ext = 'bbcode';
+                                        break;
+                                    case 'text/markdown':
+                                        $block_ext = 'md';
+                                        break;
+                                    case 'application/x-pdl':
+                                        $block_ext = 'pdl';
+                                        break;
+                                    case 'application/x-php':
+                                        $block_ext = 'php';
+                                        break;
+                                    default:
+                                        $block_ext = 'bbcode';
+                                        break;
+                                }
+                                $block_filename = $blockinfo['name'] . '.' . $block_ext;
+                                $tmp_blockfolder = $tmp_folderpath . '/blocks/' . $blockinfo['name'];
+                                $block_filepath = $tmp_blockfolder . '/' . $block_filename;
+                                $blockinfo['json']['contentfile'] = $block_filename;
+                                $block_jsonpath = $tmp_blockfolder . '/block.json';
+                                if (!is_dir($tmp_blockfolder) && !mkdir($tmp_blockfolder, 0770, true)) {
+                                    logger('Error creating temp export folder: ' . $tmp_blockfolder, LOGGER_NORMAL);
+                                    json_return_and_die(array('message' => 'Error creating temp export folder'));
+                                }
+                                file_put_contents($block_filepath, $blockinfo['body']);
+                                file_put_contents($block_jsonpath, json_encode($blockinfo['json'], JSON_UNESCAPED_SLASHES));
+                            }
+                        }
+                    }
+
+                    $checkedlayouts = $_POST['layout'];
+                    $layouts = [];
+                    if (!empty($checkedlayouts)) {
+                        foreach ($checkedlayouts as $mid) {
+                            $l = q(
+                                "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
+												left join item on item.id = iconfig.iid 
+												where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1",
+                                dbesc($mid),
+                                intval($channel['channel_id'])
+                            );
+                            if ($l) {
+                                $l = $l[0];
+                                $layoutinfo = array(
+                                    'body' => $l['body'],
+                                    'mimetype' => $l['mimetype'],
+                                    'description' => $l['title'],
+                                    'name' => $l['v'],
+                                    'json' => array(
+                                        'description' => $l['title'],
+                                        'name' => $l['v'],
+                                        'mimetype' => $l['mimetype'],
+                                    )
+                                );
+                                switch ($layoutinfo['mimetype']) {
+                                    case 'text/bbcode':
+                                    case 'text/x-multicode':
+                                    default:
+                                        $layout_ext = 'bbcode';
+                                        break;
+                                }
+                                $layout_filename = $layoutinfo['name'] . '.' . $layout_ext;
+                                $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name'];
+                                $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename;
+                                $layoutinfo['json']['contentfile'] = $layout_filename;
+                                $layout_jsonpath = $tmp_layoutfolder . '/layout.json';
+                                if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {
+                                    logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL);
+                                    json_return_and_die(array('message' => 'Error creating temp export folder'));
+                                }
+                                file_put_contents($layout_filepath, $layoutinfo['body']);
+                                file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));
+                            }
+                        }
+                    }
+
+                    $checkedpages = $_POST['page'];
+                    $pages = [];
+                    if (!empty($checkedpages)) {
+                        foreach ($checkedpages as $mid) {
+                            $p = q(
+                                "select * from iconfig left join item on iconfig.iid = item.id 
+												where item.uid = %d and item.mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d",
+                                intval($channel['channel_id']),
+                                dbesc($mid),
+                                intval(ITEM_TYPE_WEBPAGE)
+                            );
+
+                            if ($p) {
+                                foreach ($p as $pp) {
+                                    // Get the associated layout
+                                    $layoutinfo = [];
+                                    if ($pp['layout_mid']) {
+                                        $l = q(
+                                            "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
+																		left join item on item.id = iconfig.iid 
+																		where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1",
+                                            dbesc($pp['layout_mid']),
+                                            intval($channel['channel_id'])
+                                        );
+                                        if ($l) {
+                                            $l = $l[0];
+                                            $layoutinfo = array(
+                                                'body' => $l['body'],
+                                                'mimetype' => $l['mimetype'],
+                                                'description' => $l['title'],
+                                                'name' => $l['v'],
+                                                'json' => array(
+                                                    'description' => $l['title'],
+                                                    'name' => $l['v'],
+                                                )
+                                            );
+                                            switch ($layoutinfo['mimetype']) {
+                                                case 'text/bbcode':
+												case 'text/x-multicode':
+                                                default:
+                                                    $layout_ext = 'bbcode';
+                                                    break;
+                                            }
+                                            $layout_filename = $layoutinfo['name'] . '.' . $layout_ext;
+                                            $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name'];
+                                            $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename;
+                                            $layoutinfo['json']['contentfile'] = $layout_filename;
+                                            $layout_jsonpath = $tmp_layoutfolder . '/layout.json';
+                                            if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {
+                                                logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL);
+                                                json_return_and_die(array('message' => 'Error creating temp export folder'));
+                                            }
+                                            file_put_contents($layout_filepath, $layoutinfo['body']);
+                                            file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));
+                                        }
+                                    }
+                                    switch ($pp['mimetype']) {
+                                        case 'text/html':
+                                            $page_ext = 'html';
+                                            break;
+                                        case 'text/bbcode':
+										case 'text/x-multicode':
+                                            $page_ext = 'bbcode';
+                                            break;
+                                        case 'text/markdown':
+                                            $page_ext = 'md';
+                                            break;
+                                        case 'application/x-pdl':
+                                            $page_ext = 'pdl';
+                                            break;
+                                        case 'application/x-php':
+                                            $page_ext = 'php';
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                    $pageinfo = array(
+                                        'title' => $pp['title'],
+                                        'body' => $pp['body'],
+                                        'pagelink' => $pp['v'],
+                                        'mimetype' => $pp['mimetype'],
+                                        'contentfile' => $pp['v'] . '.' . $page_ext,
+                                        'layout' => ((x($layoutinfo, 'name')) ? $layoutinfo['name'] : ''),
+                                        'json' => array(
+                                            'title' => $pp['title'],
+                                            'pagelink' => $pp['v'],
+                                            'mimetype' => $pp['mimetype'],
+                                            'layout' => ((x($layoutinfo, 'name')) ? $layoutinfo['name'] : ''),
+                                        )
+                                    );
+                                    $page_filename = $pageinfo['pagelink'] . '.' . $page_ext;
+                                    $tmp_pagefolder = $tmp_folderpath . '/pages/' . $pageinfo['pagelink'];
+                                    $page_filepath = $tmp_pagefolder . '/' . $page_filename;
+                                    $page_jsonpath = $tmp_pagefolder . '/page.json';
+                                    $pageinfo['json']['contentfile'] = $page_filename;
+                                    if (!is_dir($tmp_pagefolder) && !mkdir($tmp_pagefolder, 0770, true)) {
+                                        logger('Error creating temp export folder: ' . $tmp_pagefolder, LOGGER_NORMAL);
+                                        json_return_and_die(array('message' => 'Error creating temp export folder'));
+                                    }
+                                    file_put_contents($page_filepath, $pageinfo['body']);
+                                    file_put_contents($page_jsonpath, json_encode($pageinfo['json'], JSON_UNESCAPED_SLASHES));
+                                }
+                            }
+                        }
+                    }
+                    if ($action === 'zipfile') {
+                        // Generate the zip file
+                        ExtendedZip::zipTree($tmp_folderpath, $zip_filepath, ZipArchive::CREATE);
+                        // Output the file for download
+                        header('Content-Disposition: attachment; filename="' . $zip_filename . '"');
+                        header("Content-Type: application/zip");
+                        $success = readfile($zip_filepath);
+                    } elseif ($action === 'cloud') { // Only zipfile or cloud should be possible values for $action here
+                        if (isset($_SESSION['exportcloudpath'])) {
+                            require_once('include/attach.php');
+                            $cloudpath = urldecode($_SESSION['exportcloudpath']);
+                            $channel = App::get_channel();
+                            $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath);
+                            if (!$dirpath) {
+                                $x = attach_mkdirp($channel, $channel['channel_hash'], array('pathname' => $cloudpath));
+                                $folder_hash = (($x['success']) ? $x['data']['hash'] : '');
+
+                                if (!$x['success']) {
+                                    logger('Failed to create cloud file folder', LOGGER_NORMAL);
+                                }
+                                $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath);
+                                if (!is_dir($dirpath)) {
+                                    logger('Failed to create cloud file folder', LOGGER_NORMAL);
+                                }
+                            }
+
+                            $success = copy_folder_to_cloudfiles($channel, $channel['channel_hash'], $tmp_folderpath, $cloudpath);
+                        }
+                    }
+                    if (!$success) {
+                        logger('Error exporting webpage elements', LOGGER_NORMAL);
+                    }
+
+                    rrmdir($zip_folderpath);
+                    rrmdir($tmp_folderpath);        // delete temporary files
+                    killme();
+
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+}
diff --git a/Code/Module/Well_known.php b/Code/Module/Well_known.php
new file mode 100644
index 000000000..8c722d5c9
--- /dev/null
+++ b/Code/Module/Well_known.php
@@ -0,0 +1,71 @@
+ 1) {
+            $arr = ['server' => $_SERVER, 'request' => $_REQUEST];
+            Hook::call('well_known', $arr);
+
+            if (!check_siteallowed($_SERVER['REMOTE_ADDR'])) {
+                logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']);
+                killme();
+            }
+
+            // from php.net re: REMOTE_HOST:
+            //     Note: Your web server must be configured to create this variable.
+            // For example in Apache you'll need HostnameLookups On inside httpd.conf
+            // for it to exist. See also gethostbyaddr().
+
+            if (get_config('system', 'siteallowed_remote_host') && (!check_siteallowed($_SERVER['REMOTE_HOST']))) {
+                logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']);
+                killme();
+            }
+
+            switch (argv(1)) {
+                case 'webfinger':
+                    App::$argc -= 1;
+                    array_shift(App::$argv);
+                    App::$argv[0] = 'webfinger';
+                    $module = new Webfinger();
+                    $module->init();
+                    break;
+
+                case 'oauth-authorization-server':
+                case 'openid-configuration':
+                    App::$argc -= 1;
+                    array_shift(App::$argv);
+                    App::$argv[0] = 'oauthinfo';
+                    $module = new Oauthinfo();
+                    $module->init();
+                    break;
+
+                case 'dnt-policy.txt':
+                    echo file_get_contents('doc/global/dnt-policy.txt');
+                    killme();
+
+                default:
+                    if (file_exists(App::$cmd)) {
+                        echo file_get_contents(App::$cmd);
+                        killme();
+                    } elseif (file_exists(App::$cmd . '.php')) {
+                        require_once(App::$cmd . '.php');
+                    }
+                    break;
+            }
+        }
+
+        http_status_exit(404);
+    }
+}
diff --git a/Code/Module/Xchan.php b/Code/Module/Xchan.php
new file mode 100644
index 000000000..9eadf0d07
--- /dev/null
+++ b/Code/Module/Xchan.php
@@ -0,0 +1,51 @@
+' . t('Xchan Lookup') . '';
+
+        $o .= '
      ';
+        $o .= t('Lookup xchan beginning with (or webbie): ');
+        $o .= '';
+        $o .= '
      ';
+        $o .= '

      ';
+
+        if (x($_GET, 'addr')) {
+            $addr = trim($_GET['addr']);
+
+            $r = q(
+                "select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash",
+                dbesc($addr),
+                dbesc($addr)
+            );
+
+            if ($r) {
+                foreach ($r as $rr) {
+                    $o .= str_replace(array("\n", " "), array("
      ", " "), print_r($rr, true)) . EOL;
+
+                    $s = q(
+                        "select * from hubloc where hubloc_hash like '%s'",
+                        dbesc($r[0]['xchan_hash'])
+                    );
+
+                    if ($s) {
+                        foreach ($s as $rrr) {
+                            $o .= str_replace(array("\n", " "), array("
      ", " "), print_r($rrr, true)) . EOL;
+                        }
+                    }
+                }
+            } else {
+                notice(t('Not found.') . EOL);
+            }
+        }
+        return $o;
+    }
+}
diff --git a/Code/Module/Xp.php b/Code/Module/Xp.php
new file mode 100644
index 000000000..c20aeabe4
--- /dev/null
+++ b/Code/Module/Xp.php
@@ -0,0 +1,66 @@
+ 1) {
+            $path = 'cache/xp/' . substr(argv(1), 0, 2) . '/' . substr(argv(1), 2, 2) . '/' . argv(1);
+
+            if (!file_exists($path)) {
+                // no longer cached for some reason, perhaps expired
+                $resolution = substr(argv(1), (-2), 2);
+                if ($resolution && substr($resolution, 0, 1) === '-') {
+                    switch (substr($resolution, 1, 1)) {
+                        case '4':
+                            $path = Channel::get_default_profile_photo();
+                            break;
+                        case '5':
+                            $path = Channel::get_default_profile_photo(80);
+                            break;
+                        case '6':
+                            $path = Channel::get_default_profile_photo(48);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            if (!file_exists($path)) {
+                http_status_exit(404, 'Not found');
+            }
+
+            $x = @getimagesize($path);
+            if ($x) {
+                header('Content-Type: ' . $x['mime']);
+            }
+
+            $cache = intval(get_config('system', 'photo_cache_time'));
+            if (!$cache) {
+                $cache = (3600 * 24); // 1 day
+            }
+            header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) . ' GMT');
+            // Set browser cache age as $cache.  But set timeout of 'shared caches'
+            // much lower in the event that infrastructure caching is present.
+            $smaxage = intval($cache / 12);
+            header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';');
+
+            $infile = fopen($path, 'rb');
+            $outfile = fopen('php://output', 'wb');
+            if ($infile && $outfile) {
+                pipe_streams($infile, $outfile);
+            }
+            fclose($infile);
+            fclose($outfile);
+            killme();
+        }
+
+        http_status_exit(404, 'Not found');
+    }
+}
diff --git a/Code/Module/Xref.php b/Code/Module/Xref.php
new file mode 100644
index 000000000..d866b8593
--- /dev/null
+++ b/Code/Module/Xref.php
@@ -0,0 +1,29 @@
+ 2) {
+            $url = argv(2);
+        }
+
+        goaway(z_root() . '/' . $url);
+    }
+}
diff --git a/Code/Module/Zot.php b/Code/Module/Zot.php
new file mode 100644
index 000000000..e3015da1a
--- /dev/null
+++ b/Code/Module/Zot.php
@@ -0,0 +1,28 @@
+run(),'application/x-nomad+json');
+	}
+
+}
diff --git a/Code/Module/Zot_probe.php b/Code/Module/Zot_probe.php
new file mode 100644
index 000000000..f0b538f3c
--- /dev/null
+++ b/Code/Module/Zot_probe.php
@@ -0,0 +1,53 @@
+ t('Zot6 Probe Diagnostic'),
+            '$resource' => ['resource', t('Object URL'), $_REQUEST['resource'], EMPTY_STR],
+            '$authf' => ['authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [t('No'), t('Yes')]],
+            '$submit' => t('Submit')
+        ]);
+
+        if (x($_GET, 'resource')) {
+            $resource = $_GET['resource'];
+            $channel = (($_GET['authf']) ? App::get_channel() : null);
+
+            if (strpos($resource, 'x-zot:') === 0) {
+                $x = ZotURL::fetch($resource, $channel);
+            } else {
+                $x = Zotfinger::exec($resource, $channel);
+
+                $o .= '
      ' . htmlspecialchars(print_array($x)) . '
      ';
+
+				$headers = 'Accept: application/x-nomad+json, application/x-zot+json, application/jrd+json, application/json';
+
+                $redirects = 0;
+                $x = z_fetch_url($resource, true, $redirects, ['headers' => [$headers]]);
+            }
+
+            if ($x['success']) {
+                $o .= '
      ' . htmlspecialchars($x['header']) . '
      ' . EOL;
+
+                $o .= 'verify returns: ' . str_replace("\n", EOL, print_r(HTTPSig::verify($x, EMPTY_STR, 'zot6'), true)) . EOL;
+
+                $o .= '
      ' . htmlspecialchars(json_encode(json_decode($x['body']), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
      ' . EOL;
+            }
+        }
+        return $o;
+    }
+}
diff --git a/Code/Module/Zotfinger.php b/Code/Module/Zotfinger.php
new file mode 100644
index 000000000..9f9a26074
--- /dev/null
+++ b/Code/Module/Zotfinger.php
@@ -0,0 +1,47 @@
+ t('Zotfinger Diagnostic'),
+            '$resource' => ['resource', t('Lookup URL'), $_GET['resource'], EMPTY_STR],
+            '$submit' => t('Submit')
+        ]);
+
+        if ($_GET['resource']) {
+            $channel = App::get_channel();
+            $resource = trim(escape_tags($_GET['resource']));
+            $do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false);
+
+            $j = Zfinger::exec($resource, $channel);
+
+            if ($do_import && $j) {
+                $x = Libzot::import_xchan($j['data']);
+            }
+            $o .= '
      ' . str_replace("\n", '
      ', print_array($j)) . '
      ';
+        }
+        return $o;
+    }
+}
diff --git a/Code/Photo/PhotoDriver.php b/Code/Photo/PhotoDriver.php
new file mode 100644
index 000000000..7470ec0c0
--- /dev/null
+++ b/Code/Photo/PhotoDriver.php
@@ -0,0 +1,581 @@
+types = $this->supportedTypes();
+        if (! array_key_exists($type, $this->types)) {
+            $type = 'image/jpeg';
+        }
+        $this->type = $type;
+        $this->valid = false;
+        $this->load($data, $type);
+    }
+
+    public function __destruct()
+    {
+        if ($this->is_valid()) {
+            $this->destroy();
+        }
+    }
+
+    /**
+     * @brief Is it a valid image object.
+     *
+     * @return bool
+     */
+    public function is_valid()
+    {
+        return $this->valid;
+    }
+
+    /**
+     * @brief Get the width of the image.
+     *
+     * @return bool|number Width of image in pixels, or false on failure
+     */
+    public function getWidth()
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+        return $this->width;
+    }
+
+    /**
+     * @brief Get the height of the image.
+     *
+     * @return bool|number Height of image in pixels, or false on failure
+     */
+    public function getHeight()
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+        return $this->height;
+    }
+
+    /**
+     * @brief Saves the image resource to a file in filesystem.
+     *
+     * @param string $path Path and filename where to save the image
+     * @return bool False on failure, otherwise true
+     */
+    public function saveImage($path, $animated = true)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+        return (file_put_contents($path, $this->imageString($animated)) ? true : false);
+    }
+
+    /**
+     * @brief Return mimetype of the image resource.
+     *
+     * @return bool|string False on failure, otherwise mimetype.
+     */
+    public function getType()
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+        return $this->type;
+    }
+
+    /**
+     * @brief Return file extension of the image resource.
+     *
+     * @return bool|string False on failure, otherwise file extension.
+     */
+    public function getExt()
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+        return $this->types[$this->getType()];
+    }
+
+    /**
+     * @brief Scale image to max pixel size in either dimension.
+     *
+     * @param int $max maximum pixel size in either dimension
+     * @param bool $float_height (optional)
+     *   If true allow height to float to any length on tall images, constraining
+     *   only the width
+     * @return bool|void false on failure, otherwise void
+     */
+    public function scaleImage($max, $float_height = true)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $width  = $this->width;
+        $height = $this->height;
+
+        $dest_width = $dest_height = 0;
+
+        if (! ($width && $height)) {
+            return false;
+        }
+
+        if ($width > $max && $height > $max) {
+            // very tall image (greater than 16:9)
+            // constrain the width - let the height float.
+
+            if (((($height * 9) / 16) > $width) && ($float_height)) {
+                $dest_width = $max;
+                $dest_height = intval(($height * $max) / $width);
+            } // else constrain both dimensions
+            elseif ($width > $height) {
+                $dest_width = $max;
+                $dest_height = intval(($height * $max) / $width);
+            } else {
+                $dest_width = intval(($width * $max) / $height);
+                $dest_height = $max;
+            }
+        } else {
+            if ($width > $max) {
+                $dest_width = $max;
+                $dest_height = intval(($height * $max) / $width);
+            } else {
+                if ($height > $max) {
+                    // very tall image (greater than 16:9)
+                    // but width is OK - don't do anything
+
+                    if (((($height * 9) / 16) > $width) && ($float_height)) {
+                        $dest_width = $width;
+                        $dest_height = $height;
+                    } else {
+                        $dest_width = intval(($width * $max) / $height);
+                        $dest_height = $max;
+                    }
+                } else {
+                    $dest_width = $width;
+                    $dest_height = $height;
+                }
+            }
+        }
+        $this->doScaleImage($dest_width, $dest_height);
+    }
+
+    public function scaleImageUp($min)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $width = $this->width;
+        $height = $this->height;
+
+        $dest_width = $dest_height = 0;
+
+        if (! ($width && $height)) {
+            return false;
+        }
+
+        if ($width < $min && $height < $min) {
+            if ($width > $height) {
+                $dest_width = $min;
+                $dest_height = intval(($height * $min) / $width);
+            } else {
+                $dest_width = intval(($width * $min) / $height);
+                $dest_height = $min;
+            }
+        } else {
+            if ($width < $min) {
+                $dest_width = $min;
+                $dest_height = intval(($height * $min) / $width);
+            } else {
+                if ($height < $min) {
+                    $dest_width = intval(($width * $min) / $height);
+                    $dest_height = $min;
+                } else {
+                    $dest_width = $width;
+                    $dest_height = $height;
+                }
+            }
+        }
+        $this->doScaleImage($dest_width, $dest_height);
+    }
+
+    /**
+     * @brief Scales image to a square.
+     *
+     * @param int $dim Pixel of square image
+     * @return bool|void false on failure, otherwise void
+     */
+    public function scaleImageSquare($dim)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+        $this->doScaleImage($dim, $dim);
+    }
+
+    /**
+     * @brief Crops a square image.
+     *
+     * @see cropImageRect()
+     *
+     * @param int $max size of the new image
+     * @param int $x x-offset for region
+     * @param int $y y-offset for region
+     * @param int $w width of region
+     * @param int $h height of region
+     *
+     * @return bool|void false on failure
+     */
+    public function cropImage($max, $x, $y, $w, $h)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+        $this->cropImageRect($max, $max, $x, $y, $w, $h);
+    }
+
+    /**
+     * @brief Reads exif data from a given filename.
+     *
+     * @param string $filename
+     * @return bool|array
+     */
+    public function exif($filename)
+    {
+        if ((! function_exists('exif_read_data')) || (! in_array($this->getType(), ['image/jpeg', 'image/tiff']))) {
+            return false;
+        }
+
+        /*
+         * PHP 7.2 allows you to use a stream resource, which should reduce/avoid
+         * memory exhaustion on large images.
+         */
+
+        if (version_compare(PHP_VERSION, '7.2.0') >= 0) {
+            $f = @fopen($filename, 'rb');
+        } else {
+            $f = $filename;
+        }
+
+        if ($f) {
+            return @exif_read_data($f, null, true);
+        }
+
+        return false;
+    }
+
+    /**
+     * @brief Orients current image based on exif orientation information.
+     *
+     * @param array $exif
+     * @return bool true if oriented, otherwise false
+     */
+    public function orient($exif)
+    {
+        if (! ($this->is_valid() && $exif)) {
+            return false;
+        }
+
+        $ort = ((array_key_exists('IFD0', $exif)) ? $exif['IFD0']['Orientation'] : $exif['Orientation']);
+
+        if (! $ort) {
+            return false;
+        }
+
+        switch ($ort) {
+            case 1: // nothing
+                break;
+            case 2: // horizontal flip
+                $this->flip();
+                break;
+            case 3: // 180 rotate left
+                $this->rotate(180);
+                break;
+            case 4: // vertical flip
+                $this->flip(false, true);
+                break;
+            case 5: // vertical flip + 90 rotate right
+                $this->flip(false, true);
+                $this->rotate(-90);
+                break;
+            case 6: // 90 rotate right
+                $this->rotate(-90);
+                break;
+            case 7: // horizontal flip + 90 rotate right
+                $this->flip();
+                $this->rotate(-90);
+                break;
+            case 8: // 90 rotate left
+                $this->rotate(90);
+                break;
+            default:
+                break;
+        }
+
+        return true;
+    }
+
+    /**
+     * @brief Save photo to database.
+     *
+     * @param array $arr
+     * @param bool $skipcheck (optional) default false
+     * @return bool|array
+     */
+    public function save($arr, $skipcheck = false)
+    {
+        if (! ($skipcheck || $this->is_valid())) {
+            logger('Attempt to store invalid photo.');
+            return false;
+        }
+
+        $p = [];
+
+        $p['aid'] = ((intval($arr['aid'])) ? intval($arr['aid']) : 0);
+        $p['uid'] = ((intval($arr['uid'])) ? intval($arr['uid']) : 0);
+        $p['xchan'] = (($arr['xchan']) ? $arr['xchan'] : '');
+        $p['resource_id'] = (($arr['resource_id']) ? $arr['resource_id'] : '');
+        $p['filename'] = (($arr['filename']) ? $arr['filename'] : '');
+        $p['mimetype'] = (($arr['mimetype']) ? $arr['mimetype'] : $this->getType());
+        $p['album'] = (($arr['album']) ? $arr['album'] : '');
+        $p['imgscale'] = ((intval($arr['imgscale'])) ? intval($arr['imgscale']) : 0);
+        $p['allow_cid'] = (($arr['allow_cid']) ? $arr['allow_cid'] : '');
+        $p['allow_gid'] = (($arr['allow_gid']) ? $arr['allow_gid'] : '');
+        $p['deny_cid'] = (($arr['deny_cid']) ? $arr['deny_cid'] : '');
+        $p['deny_gid'] = (($arr['deny_gid']) ? $arr['deny_gid'] : '');
+        $p['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert());
+        $p['title'] = (($arr['title']) ? $arr['title'] : '');
+        $p['description'] = (($arr['description']) ? $arr['description'] : '');
+        $p['photo_usage'] = intval($arr['photo_usage']);
+        $p['os_storage'] = intval($arr['os_storage']);
+        $p['os_path'] = $arr['os_path'];
+        $p['os_syspath'] = ((array_key_exists('os_syspath', $arr)) ? $arr['os_syspath'] : '');
+        $p['display_path'] = (($arr['display_path']) ? $arr['display_path'] : '');
+        $p['width'] = (($arr['width']) ? $arr['width'] : $this->getWidth());
+        $p['height'] = (($arr['height']) ? $arr['height'] : $this->getHeight());
+        $p['expires'] = (($arr['expires']) ? $arr['expires'] : gmdate('Y-m-d H:i:s', time() + get_config('system', 'photo_cache_time', 86400)));
+        $p['profile'] = ((array_key_exists('profile', $arr)) ? intval($arr['profile']) : 0);
+
+        if (! intval($p['imgscale'])) {
+            logger('save: ' . print_r($arr, true), LOGGER_DATA);
+        }
+        $x = q("select id, created from photo where resource_id = '%s' and uid = %d and xchan = '%s' and imgscale = %d limit 1", dbesc($p['resource_id']), intval($p['uid']), dbesc($p['xchan']), intval($p['imgscale']));
+
+        if ($x) {
+            $p['created'] = (($x['created']) ? $x['created'] : $p['edited']);
+            $r = q(
+                "UPDATE photo set
+				aid = %d,
+				uid = %d,
+				xchan = '%s',
+				resource_id = '%s',
+				created = '%s',
+				edited = '%s',
+				filename = '%s',
+				mimetype = '%s',
+				album = '%s',
+				height = %d,
+				width = %d,
+				content = '%s',
+				os_storage = %d,
+				filesize = %d,
+				imgscale = %d,
+				photo_usage = %d,
+				title = '%s',
+				description = '%s',
+				os_path = '%s',
+				display_path = '%s',
+				allow_cid = '%s',
+				allow_gid = '%s',
+				deny_cid = '%s',
+				deny_gid = '%s',
+				expires = '%s',
+				profile = %d
+				where id = %d",
+                intval($p['aid']),
+                intval($p['uid']),
+                dbesc($p['xchan']),
+                dbesc($p['resource_id']),
+                dbescdate($p['created']),
+                dbescdate($p['edited']),
+                dbesc(basename($p['filename'])),
+                dbesc($p['mimetype']),
+                dbesc($p['album']),
+                intval($p['height']),
+                intval($p['width']),
+                (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())),
+                intval($p['os_storage']),
+                (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())),
+                intval($p['imgscale']),
+                intval($p['photo_usage']),
+                dbesc($p['title']),
+                dbesc($p['description']),
+                dbesc($p['os_path']),
+                dbesc($p['display_path']),
+                dbesc($p['allow_cid']),
+                dbesc($p['allow_gid']),
+                dbesc($p['deny_cid']),
+                dbesc($p['deny_gid']),
+                dbescdate($p['expires']),
+                intval($p['profile']),
+                intval($x[0]['id'])
+            );
+        } else {
+            $p['created'] = (($arr['created']) ? $arr['created'] : $p['edited']);
+            $r = q("INSERT INTO photo
+				( aid, uid, xchan, resource_id, created, edited, filename, mimetype, album, height, width, content, os_storage, filesize, imgscale, photo_usage, title, description, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid, expires, profile )
+				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)", intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']), intval($p['profile']));
+        }
+        logger('Photo save imgscale ' . $p['imgscale'] . ' returned ' . intval($r));
+
+        return $r;
+    }
+
+    /**
+     * @brief Stores thumbnail to database or filesystem.
+     *
+     * @param array $arr
+     * @param scale int
+     * @return bool|array
+     */
+
+    public function storeThumbnail($arr, $scale = 0, $animated = true)
+    {
+
+        $arr['imgscale'] = $scale;
+
+        if (boolval(get_config('system', 'filesystem_storage_thumbnails', 1)) && $scale > 0) {
+            $channel = Channel::from_id($arr['uid']);
+            $arr['os_storage'] = 1;
+            $arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale;
+            if (! $this->saveImage($arr['os_syspath'], $animated)) {
+                return false;
+            }
+        }
+
+        if (! $this->save($arr)) {
+            if (array_key_exists('os_syspath', $arr)) {
+                @unlink($arr['os_syspath']);
+            }
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Code/Photo/PhotoGd.php b/Code/Photo/PhotoGd.php
new file mode 100644
index 000000000..95d79ff50
--- /dev/null
+++ b/Code/Photo/PhotoGd.php
@@ -0,0 +1,213 @@
+valid = false;
+        if (! $data) {
+            return;
+        }
+
+        $this->image = @imagecreatefromstring($data);
+
+        if ($this->image !== false) {
+            $this->valid  = true;
+            $this->setDimensions();
+            imagealphablending($this->image, false);
+            imagesavealpha($this->image, true);
+        } else {
+            logger('image load failed');
+        }
+    }
+
+    protected function setDimensions()
+    {
+        $this->width  = imagesx($this->image);
+        $this->height = imagesy($this->image);
+    }
+
+    /**
+     * @brief GD driver does not preserve EXIF, so not need to clear it.
+     *
+     * @return void
+     */
+    public function clearexif()
+    {
+        return;
+    }
+
+    protected function destroy()
+    {
+        if ($this->is_valid()) {
+            imagedestroy($this->image);
+        }
+    }
+
+    /**
+     * @brief Return a PHP image resource of the current image.
+     *
+     * @see \Code\Photo\PhotoDriver::getImage()
+     *
+     * @return bool|resource
+     */
+    public function getImage()
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        return $this->image;
+    }
+
+    public function doScaleImage($dest_width, $dest_height)
+    {
+
+        $dest = imagecreatetruecolor($dest_width, $dest_height);
+        $width = imagesx($this->image);
+        $height = imagesy($this->image);
+
+        imagealphablending($dest, false);
+        imagesavealpha($dest, true);
+        if ($this->type == 'image/png') {
+            imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+        }
+        imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+        if ($this->image) {
+            imagedestroy($this->image);
+        }
+
+        $this->image = $dest;
+        $this->setDimensions();
+    }
+
+    public function rotate($degrees)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $this->image = imagerotate($this->image, $degrees, 0);
+        $this->setDimensions();
+    }
+
+    public function flip($horiz = true, $vert = false)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $w = imagesx($this->image);
+        $h = imagesy($this->image);
+        $flipped = imagecreate($w, $h);
+        if ($horiz) {
+            for ($x = 0; $x < $w; $x++) {
+                imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
+            }
+        }
+        if ($vert) {
+            for ($y = 0; $y < $h; $y++) {
+                imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
+            }
+        }
+        $this->image = $flipped;
+        $this->setDimensions(); // Shouldn't really be necessary
+    }
+
+    public function cropImageRect($maxx, $maxy, $x, $y, $w, $h)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $dest = imagecreatetruecolor($maxx, $maxy);
+        imagealphablending($dest, false);
+        imagesavealpha($dest, true);
+        if ($this->type == 'image/png') {
+            imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+        }
+        imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $maxx, $maxy, $w, $h);
+        if ($this->image) {
+            imagedestroy($this->image);
+        }
+        $this->image = $dest;
+        $this->setDimensions();
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Code\Photo\PhotoDriver::imageString()
+     */
+    public function imageString($animated = true)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $quality = false;
+
+        ob_start();
+
+        switch ($this->getType()) {
+            case 'image/webp':
+                imagewebp($this->image);
+                break;
+
+            case 'image/png':
+                $quality = get_config('system', 'png_quality');
+                if ((! $quality) || ($quality > 9)) {
+                    $quality = PNG_QUALITY;
+                }
+
+                imagepng($this->image, null, $quality);
+                break;
+            case 'image/jpeg':
+            // gd can lack imagejpeg(), but we verify during installation it is available
+            default:
+                $quality = get_config('system', 'jpeg_quality');
+                if ((! $quality) || ($quality > 100)) {
+                    $quality = JPEG_QUALITY;
+                }
+
+                imagejpeg($this->image, null, $quality);
+                break;
+        }
+        $string = ob_get_contents();
+        ob_end_clean();
+
+        return $string;
+    }
+}
diff --git a/Code/Photo/PhotoImagick.php b/Code/Photo/PhotoImagick.php
new file mode 100644
index 000000000..f006b71c9
--- /dev/null
+++ b/Code/Photo/PhotoImagick.php
@@ -0,0 +1,233 @@
+ 'jpg',
+            'image/png'  => 'png',
+            'image/gif'  => 'gif',
+            'image/webp' => 'webp',
+        ];
+    }
+
+    private function get_FormatsMap()
+    {
+        return [
+            'image/jpeg' => 'JPG',
+            'image/png'  => 'PNG',
+            'image/gif'  => 'GIF',
+            'image/webp' => 'WEBP'
+        ];
+    }
+
+
+    protected function load($data, $type)
+    {
+        $this->valid = false;
+        $this->image = new Imagick();
+
+        if (! $data) {
+            return;
+        }
+
+        try {
+            $this->image->readImageBlob($data);
+        } catch (Exception $e) {
+            logger('Imagick read failed');
+            // logger('Imagick readImageBlob() exception:' . print_r($e, true));
+            return;
+        }
+
+        /*
+         * Setup the image to the format it will be saved to
+         */
+
+        $map = $this->get_FormatsMap();
+        $format = $map[$type];
+
+        if ($this->image) {
+            $this->image->setFormat($format);
+
+            // Always coalesce, if it is not a multi-frame image it won't hurt anyway
+            $this->image = $this->image->coalesceImages();
+
+            $this->valid = true;
+            $this->setDimensions();
+
+            /*
+             * setup the compression here, so we'll do it only once
+             */
+            switch ($this->getType()) {
+                case 'image/png':
+                    $quality = get_config('system', 'png_quality');
+                    if ((! $quality) || ($quality > 9)) {
+                        $quality = PNG_QUALITY;
+                    }
+                    /*
+                     * From http://www.imagemagick.org/script/command-line-options.php#quality:
+                     *
+                     * 'For the MNG and PNG image formats, the quality value sets
+                     * the zlib compression level (quality / 10) and filter-type (quality % 10).
+                     * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
+                     * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
+                     */
+                    $quality = $quality * 10;
+                    $this->image->setCompressionQuality($quality);
+                    break;
+                case 'image/jpeg':
+                    $quality = get_config('system', 'jpeg_quality');
+                    if ((! $quality) || ($quality > 100)) {
+                        $quality = JPEG_QUALITY;
+                    }
+                    $this->image->setCompressionQuality($quality);
+                default:
+                    break;
+            }
+        }
+    }
+
+    protected function destroy()
+    {
+        if ($this->is_valid()) {
+            $this->image->clear();
+            $this->image->destroy();
+        }
+    }
+
+    protected function setDimensions()
+    {
+        $this->width = $this->image->getImageWidth();
+        $this->height = $this->image->getImageHeight();
+    }
+
+    /**
+     * @brief Strips the image of all profiles and comments.
+     *
+     * Keep ICC profile for better colors.
+     *
+     * @see \Code\Photo\PhotoDriver::clearexif()
+     */
+    public function clearexif()
+    {
+        $profiles = $this->image->getImageProfiles('icc', true);
+
+        $this->image->stripImage();
+
+        if (! empty($profiles)) {
+            $this->image->profileImage('icc', $profiles['icc']);
+        }
+    }
+
+
+    /**
+     * @brief Return a \Imagick object of the current image.
+     *
+     * @see \Code\Photo\PhotoDriver::getImage()
+     *
+     * @return bool|Imagick
+     */
+    public function getImage()
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $this->image = $this->image->deconstructImages();
+        return $this->image;
+    }
+
+    public function doScaleImage($dest_width, $dest_height)
+    {
+        /*
+         * If it is not animated, there will be only one iteration here,
+         * so don't bother checking
+         */
+        // Don't forget to go back to the first frame
+        $this->image->setFirstIterator();
+        do {
+            $this->image->scaleImage($dest_width, $dest_height);
+        } while ($this->image->nextImage());
+
+        $this->setDimensions();
+    }
+
+    public function rotate($degrees)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $this->image->setFirstIterator();
+        do {
+            // ImageMagick rotates in the opposite direction of imagerotate()
+            $this->image->rotateImage(new ImagickPixel(), -$degrees);
+        } while ($this->image->nextImage());
+
+        $this->setDimensions();
+    }
+
+    public function flip($horiz = true, $vert = false)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $this->image->setFirstIterator();
+        do {
+            if ($horiz) {
+                $this->image->flipImage();
+            }
+            if ($vert) {
+                $this->image->flopImage();
+            }
+        } while ($this->image->nextImage());
+
+        $this->setDimensions(); // Shouldn't really be necessary
+    }
+
+    public function cropImageRect($maxx, $maxy, $x, $y, $w, $h)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        $this->image->setFirstIterator();
+        do {
+            $this->image->cropImage($w, $h, $x, $y);
+            /*
+             * We need to remove the canvas,
+             * or the image is not resized to the crop:
+             * http://php.net/manual/en/imagick.cropimage.php#97232
+             */
+            $this->image->setImagePage(0, 0, 0, 0);
+        } while ($this->image->nextImage());
+
+        $this->doScaleImage($maxx, $maxy);
+    }
+
+    public function imageString($animated = true)
+    {
+        if (! $this->is_valid()) {
+            return false;
+        }
+
+        /* Clean it */
+        $this->image = $this->image->deconstructImages();
+        if ($animated) {
+            return $this->image->getImagesBlob();
+        }
+        return $this->image->getImageBlob();
+    }
+}
diff --git a/Code/Render/Comanche.php b/Code/Render/Comanche.php
new file mode 100644
index 000000000..f6352adfd
--- /dev/null
+++ b/Code/Render/Comanche.php
@@ -0,0 +1,688 @@
+get_condition_var($mtch[1]);
+                $default = $mtch[3];
+                $cases = [];
+                $cntt = preg_match_all("/\[case (.*?)\](.*?)\[\/case\]/ism", $mtch[2], $cases, PREG_SET_ORDER);
+                if ($cntt) {
+                    foreach ($cases as $case) {
+                        if ($case[1] === $switch_var) {
+                            $switch_done = 1;
+                            $s = str_replace($mtch[0], $case[2], $s);
+                            break;
+                        }
+                    }
+                    if ($switch_done === 0) {
+                        $s = str_replace($mtch[0], $default, $s);
+                    }
+                }
+            }
+        }
+
+        $cnt = preg_match_all("/\[if (.*?)\](.*?)\[else\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                if ($this->test_condition($mtch[1])) {
+                    $s = str_replace($mtch[0], $mtch[2], $s);
+                } else {
+                    $s = str_replace($mtch[0], $mtch[3], $s);
+                }
+            }
+        } else {
+            $cnt = preg_match_all("/\[if (.*?)\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER);
+            if ($cnt) {
+                foreach ($matches as $mtch) {
+                    if ($this->test_condition($mtch[1])) {
+                        $s = str_replace($mtch[0], $mtch[2], $s);
+                    } else {
+                        $s = str_replace($mtch[0], '', $s);
+                    }
+                }
+            }
+        }
+        if ($pass == 0) {
+            $this->parse_pass0($s);
+        } else {
+            $this->parse_pass1($s);
+        }
+    }
+
+    public function parse_pass0($s)
+    {
+
+        $matches = null;
+
+        $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches);
+        if ($cnt) {
+            App::$page['template'] = trim($matches[1]);
+        }
+
+        $cnt = preg_match("/\[template=(.*?)\](.*?)\[\/template\]/ism", $s, $matches);
+        if ($cnt) {
+            App::$page['template'] = trim($matches[2]);
+            App::$page['template_style'] = trim($matches[2]) . '_' . $matches[1];
+        }
+
+        $cnt = preg_match("/\[template\](.*?)\[\/template\]/ism", $s, $matches);
+        if ($cnt) {
+            App::$page['template'] = trim($matches[1]);
+        }
+
+        $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches);
+        if ($cnt) {
+            App::$layout['schema'] = trim($matches[1]);
+            App::$layout['theme'] = trim($matches[2]);
+        }
+
+        $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches);
+        if ($cnt) {
+            App::$layout['theme'] = trim($matches[1]);
+        }
+
+        $cnt = preg_match("/\[navbar\](.*?)\[\/navbar\]/ism", $s, $matches);
+        if ($cnt) {
+            App::$layout['navbar'] = trim($matches[1]);
+        }
+
+        $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            // only the last webpage definition is used if there is more than one
+            foreach ($matches as $mtch) {
+                App::$layout['webpage'] = $this->webpage($a, $mtch[1]);
+            }
+        }
+    }
+
+    public function parse_pass1($s)
+    {
+        $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                App::$layout['region_' . $mtch[1]] = $this->region($mtch[2], $mtch[1]);
+            }
+        }
+    }
+
+    /**
+     * @brief Replace conditional variables with real values.
+     *
+     * Currently supported condition variables:
+     *   * $config.xxx.yyy - get_config with cat = xxx and k = yyy
+     *   * $request - request uri for this page
+     *   * $observer.language - viewer's preferred language (closest match)
+     *   * $observer.address - xchan_addr or false
+     *   * $observer.name - xchan_name or false
+     *   * $observer - xchan_hash of observer or empty string
+     *   * $local_channel - logged in channel_id or false
+     *
+     * @param string $v The conditional variable name
+     * @return string|bool
+     */
+    public function get_condition_var($v)
+    {
+        if ($v) {
+            $x = explode('.', $v);
+            if ($x[0] == 'config') {
+                return get_config($x[1], $x[2]);
+            } elseif ($x[0] === 'request') {
+                return $_SERVER['REQUEST_URI'];
+            } elseif ($x[0] === 'local_channel') {
+                return local_channel();
+            } elseif ($x[0] === 'observer') {
+                if (count($x) > 1) {
+                    if ($x[1] == 'language') {
+                        return App::$language;
+                    }
+                    $y = App::get_observer();
+                    if (!$y) {
+                        return false;
+                    }
+                    if ($x[1] == 'address') {
+                        return $y['xchan_addr'];
+                    } elseif ($x[1] == 'name') {
+                        return $y['xchan_name'];
+                    } elseif ($x[1] == 'webname') {
+                        return substr($y['xchan_addr'], 0, strpos($y['xchan_addr'], '@'));
+                    }
+                    return false;
+                }
+                return get_observer_hash();
+            } else {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @brief Test for Conditional Execution conditions.
+     *
+     * This is extensible. The first version of variable testing supports tests of the forms:
+     *
+     * - [if $config.system.foo ~= baz] which will check if get_config('system','foo') contains the string 'baz';
+     * - [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz';
+     * - [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz';
+     * - [if $config.system.foo >= 3] which will check if get_config('system','foo') is greater than or equal to 3;
+     * - [if $config.system.foo > 3] which will check if get_config('system','foo') is greater than 3;
+     * - [if $config.system.foo <= 3] which will check if get_config('system','foo') is less than or equal to 3;
+     * - [if $config.system.foo < 3] which will check if get_config('system','foo') is less than 3;
+     *
+     * - [if $config.system.foo {} baz] which will check if 'baz' is an array element in get_config('system','foo')
+     * - [if $config.system.foo {*} baz] which will check if 'baz' is an array key in get_config('system','foo')
+     * - [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo');
+     *
+     * The values 0, '', an empty array, and an unset value will all evaluate to false.
+     *
+     * @param int|string $s
+     * @return bool
+     */
+    public function test_condition($s)
+    {
+
+        if (preg_match('/[\$](.*?)\s\~\=\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if (stripos($x, trim($matches[2])) !== false) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\=\=\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if ($x == trim($matches[2])) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\!\=\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if ($x != trim($matches[2])) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\>\=\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if ($x >= trim($matches[2])) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\<\=\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if ($x <= trim($matches[2])) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\>\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if ($x > trim($matches[2])) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\>\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if ($x < trim($matches[2])) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\{\}\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if (is_array($x) && in_array(trim($matches[2]), $x)) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)\s\{\*\}\s(.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if (is_array($x) && array_key_exists(trim($matches[2]), $x)) {
+                return true;
+            }
+            return false;
+        }
+
+        if (preg_match('/[\$](.*?)$/', $s, $matches)) {
+            $x = $this->get_condition_var($matches[1]);
+            if ($x) {
+                return true;
+            }
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * @brief Return rendered menu for current channel_id.
+     *
+     * @param string $s
+     * @param string $class (optional) default empty
+     * @return string
+     * @see menu_render()
+     */
+    public function menu($s, $class = '')
+    {
+
+        $channel_id = $this->get_channel_id();
+        $name = $s;
+
+        $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $var[$mtch[1]] = $mtch[2];
+                $name = str_replace($mtch[0], '', $name);
+            }
+        }
+
+        if ($channel_id) {
+            $m = Menu::fetch($name, $channel_id, get_observer_hash());
+            return Menu::render($m, $class, $edit = false, $var);
+        }
+    }
+
+
+    public function replace_region($match)
+    {
+        if (array_key_exists($match[1], App::$page)) {
+            return App::$page[$match[1]];
+        }
+    }
+
+    /**
+     * @brief Returns the channel_id of the profile owner of the page.
+     *
+     * Returns the channel_id of the profile owner of the page, or the local_channel
+     * if there is no profile owner. Otherwise returns 0.
+     *
+     * @return int channel_id
+     */
+    public function get_channel_id()
+    {
+        $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0);
+
+        if ((!$channel_id) && (local_channel())) {
+            $channel_id = local_channel();
+        }
+        return $channel_id;
+    }
+
+    /**
+     * @brief Returns a parsed block.
+     *
+     * @param string $s
+     * @param string $class (optional) default empty
+     * @return string parsed HTML of block
+     */
+    public function block($s, $class = '')
+    {
+        $var = [];
+        $matches = [];
+        $name = $s;
+        $class = (($class) ? $class : 'bblock widget');
+
+        $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $var[$mtch[1]] = $mtch[2];
+                $name = str_replace($mtch[0], '', $name);
+            }
+        }
+
+        $o = '';
+        $channel_id = $this->get_channel_id();
+
+        if ($channel_id) {
+            $r = q(
+                "select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d
+				and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and iconfig.v = '%s' limit 1",
+                intval($channel_id),
+                dbesc($name)
+            );
+
+            if ($r) {
+                //check for eventual menus in the block and parse them
+                $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER);
+                if ($cnt) {
+                    foreach ($matches as $mtch) {
+                        $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[1])), $r[0]['body']);
+                    }
+                }
+                $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER);
+                if ($cnt) {
+                    foreach ($matches as $mtch) {
+                        $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[2]), $mtch[1]), $r[0]['body']);
+                    }
+                }
+
+                // emit the block
+                $o .= (($var['wrap'] == 'none') ? '' : '
      ');
+
+                if ($r[0]['title'] && trim($r[0]['body']) != '$content') {
+                    $o .= '
      ' . $r[0]['title'] . '
      ';
+                }
+
+                if (trim($r[0]['body']) === '$content') {
+                    $o .= App::$page['content'];
+                } else {
+                    $o .= prepare_text($r[0]['body'], $r[0]['mimetype']);
+                }
+
+                $o .= (($var['wrap'] == 'none') ? '' : '
      ');
+            }
+        }
+
+        return $o;
+    }
+
+    /**
+     * @brief Include JS depending on framework.
+     *
+     * @param string $s
+     * @return string
+     */
+    public function js($s)
+    {
+
+        switch ($s) {
+            case 'jquery':
+                $path = 'view/js/jquery.js';
+                break;
+            case 'bootstrap':
+                $path = 'vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js';
+                break;
+            case 'foundation':
+                $path = 'library/foundation/js/foundation.js';
+                $init = "\r\n" . '';
+                break;
+        }
+
+        $ret = '';
+        if ($init) {
+            $ret .= $init;
+        }
+        return $ret;
+    }
+
+    /**
+     * @brief Include CSS depending on framework.
+     *
+     * @param string $s
+     * @return string
+     */
+    public function css($s)
+    {
+
+        switch ($s) {
+            case 'bootstrap':
+                $path = 'vendor/twbs/bootstrap/dist/css/bootstrap.min.css';
+                break;
+            case 'foundation':
+                $path = 'library/foundation/css/foundation.min.css';
+                break;
+        }
+
+        $ret = '';
+
+        return $ret;
+    }
+
+    /**
+     * This doesn't really belong in Comanche, but it could also be argued that it is the perfect place.
+     * We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content.
+     * For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps
+     * 'full' to provide a social network style profile photo.
+     *
+     * But leave it open to have richer templating options and perhaps ultimately discard this one, once we have a better idea
+     * of what template and webpage options we might desire.
+     *
+     * @param[in,out] array $a
+     * @param string $s
+     * @return array
+     */
+    public function webpage(&$a, $s)
+    {
+        $ret = [];
+        $matches = [];
+
+        $cnt = preg_match_all("/\[authored\](.*?)\[\/authored\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $ret['authored'] = $mtch[1];
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * @brief Render a widget.
+     *
+     * @param string $name
+     * @param string $text
+     */
+    public function widget($name, $text)
+    {
+        $vars = [];
+        $matches = [];
+
+        $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $text, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $vars[$mtch[1]] = $mtch[2];
+            }
+        }
+
+        if (!purify_filename($name)) {
+            return '';
+        }
+
+        $clsname = ucfirst($name);
+        $nsname = "\\Code\\Widget\\" . $clsname;
+
+        $found = false;
+        $widgets = Widget::get();
+        if ($widgets) {
+            foreach ($widgets as $widget) {
+                if (is_array($widget) && strtolower($widget[1]) === strtolower($name) && file_exists($widget[0])) {
+                    require_once($widget[0]);
+                    $found = true;
+                }
+            }
+        }
+
+        if (!$found) {
+            if (file_exists('Code/SiteWidget/' . $clsname . '.php')) {
+                require_once('Code/SiteWidget/' . $clsname . '.php');
+            } elseif (file_exists('widget/' . $clsname . '/' . $clsname . '.php')) {
+                require_once('widget/' . $clsname . '/' . $clsname . '.php');
+            } elseif (file_exists('Code/Widget/' . $clsname . '.php')) {
+                require_once('Code/Widget/' . $clsname . '.php');
+            } else {
+                $pth = Theme::include($clsname . '.php');
+                if ($pth) {
+                    require_once($pth);
+                }
+            }
+        }
+
+        if (class_exists($nsname)) {
+            $x = new $nsname();
+            $f = 'widget';
+            if (method_exists($x, $f)) {
+                return $x->$f($vars);
+            }
+        }
+
+        $func = 'widget_' . trim($name);
+
+        if (!function_exists($func)) {
+            if (file_exists('widget/' . trim($name) . '.php')) {
+                require_once('widget/' . trim($name) . '.php');
+            } elseif (file_exists('widget/' . trim($name) . '/' . trim($name) . '.php')) {
+                require_once('widget/' . trim($name) . '/' . trim($name) . '.php');
+            }
+            if (!function_exists($func)) {
+                $theme_widget = $func . '.php';
+                if (Theme::include($theme_widget)) {
+                    require_once(Theme::include($theme_widget));
+                }
+            }
+        }
+
+        if (function_exists($func)) {
+            return $func($vars);
+        }
+    }
+
+
+    public function region($s, $region_name)
+    {
+
+        $s = str_replace('$region', $region_name, $s);
+
+        $matches = [];
+
+        $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $s = str_replace($mtch[0], $this->menu(trim($mtch[1])), $s);
+            }
+        }
+
+        // menu class e.g. [menu=horizontal]my_menu[/menu] or [menu=tabbed]my_menu[/menu]
+        // allows different menu renderings to be applied
+
+        $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $s = str_replace($mtch[0], $this->menu(trim($mtch[2]), $mtch[1]), $s);
+            }
+        }
+        $cnt = preg_match_all("/\[block\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $s = str_replace($mtch[0], $this->block(trim($mtch[1])), $s);
+            }
+        }
+
+        $cnt = preg_match_all("/\[block=(.*?)\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $s = str_replace($mtch[0], $this->block(trim($mtch[2]), trim($mtch[1])), $s);
+            }
+        }
+
+        $cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $s = str_replace($mtch[0], $this->js(trim($mtch[1])), $s);
+            }
+        }
+
+        $cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $s = str_replace($mtch[0], $this->css(trim($mtch[1])), $s);
+            }
+        }
+
+        $cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER);
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                $s = str_replace($mtch[0], $this->widget(trim($mtch[1]), $mtch[2]), $s);
+            }
+        }
+
+        return $s;
+    }
+
+
+    /**
+     * @brief Registers a page template/variant for use by Comanche selectors.
+     *
+     * @param array $arr
+     *    'template' => template name
+     *    'variant' => array(
+     *           'name' => variant name
+     *           'desc' => text description
+     *           'regions' => array(
+     *               'name' => name
+     *               'desc' => text description
+     *           )
+     *    )
+     */
+    public function register_page_template($arr)
+    {
+        App::$page_layouts[$arr['template']] = array($arr['variant']);
+        return;
+    }
+}
diff --git a/Code/Render/SimpleTemplate.php b/Code/Render/SimpleTemplate.php
new file mode 100644
index 000000000..d4b1ab678
--- /dev/null
+++ b/Code/Render/SimpleTemplate.php
@@ -0,0 +1,354 @@
+ 5.3, not certain how to code around it for unit tests
+//          case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+            default:
+                // die("Unknown preg error.");
+                return;
+        }
+        echo "
      ";
+        debug_print_backtrace();
+        die();
+    }
+
+    private function _push_stack()
+    {
+        $this->stack[] = [ $this->r, $this->nodes ];
+    }
+
+    private function _pop_stack()
+    {
+        list($this->r, $this->nodes) = array_pop($this->stack);
+    }
+
+    private function _get_var($name, $retNoKey = false)
+    {
+        $keys = array_map('trim', explode('.', $name));
+        if ($retNoKey && ! array_key_exists($keys[0], $this->r)) {
+            return KEY_NOT_EXISTS;
+        }
+
+        $val = $this->r;
+        foreach ($keys as $k) {
+            $val = (isset($val[$k]) ? $val[$k] : null);
+        }
+
+        return template_escape($val);
+    }
+
+    /**
+     * IF node
+     * \code
+     * {{ if <$var> }}...[{{ else }} ...] {{ endif }}
+     * {{ if <$var>== }}...[{{ else }} ...]{{ endif }}
+     * {{ if <$var>!= }}...[{{ else }} ...]{{ endif }}
+     * \endcode
+     */
+    private function _replcb_if($args)
+    {
+        if (strpos($args[2], '==') > 0) {
+            list($a,$b) = array_map('trim', explode('==', $args[2]));
+            $a = $this->_get_var($a);
+            if ($b[0] == '$') {
+                $b =  $this->_get_var($b);
+            }
+            $val = ($a == $b);
+        } elseif (strpos($args[2], '!=') > 0) {
+            list($a,$b) = array_map('trim', explode('!=', $args[2]));
+            $a = $this->_get_var($a);
+            if ($b[0] == '$') {
+                $b =  $this->_get_var($b);
+            }
+            $val = ($a != $b);
+        } else {
+            $val = $this->_get_var($args[2]);
+        }
+        $x = preg_split("|{{ *else *}}|", $args[3]);
+
+        return ( ($val) ? $x[0] : (isset($x[1]) ? $x[1] : EMPTY_STR));
+    }
+
+    /**
+     * FOR node
+     * \code
+     * {{ for <$var> as $name }}...{{ endfor }}
+     * {{ for <$var> as $key=>$name }}...{{ endfor }}
+     * \endcode
+     */
+    private function _replcb_for($args)
+    {
+        $m = array_map('trim', explode(" as ", $args[2]));
+        $x = explode('=>', $m[1]);
+        if (count($x) == 1) {
+            $varname = $x[0];
+            $keyname = EMPTY_STR;
+        } else {
+            list($keyname, $varname) = $x;
+        }
+        if ($m[0] == EMPTY_STR || $varname == EMPTY_STR || is_null($varname)) {
+            die("template error: 'for " . $m[0] . " as " . $varname . "'") ;
+        }
+
+        $vals = $this->_get_var($m[0]);
+        $ret = EMPTY_STR;
+        if (!is_array($vals)) {
+            return $ret;
+        }
+
+        foreach ($vals as $k => $v) {
+            $this->_push_stack();
+            $r = $this->r;
+            $r[$varname] = $v;
+            if ($keyname != EMPTY_STR) {
+                $r[$keyname] = (($k === 0) ? '0' : $k);
+            }
+            $ret .=  $this->replace($args[3], $r);
+            $this->_pop_stack();
+        }
+
+        return $ret;
+    }
+
+    /**
+     * INC node
+     * \code
+     * {{ inc  [with $var1=$var2] }}{{ endinc }}
+     * \endcode
+     */
+    private function _replcb_inc($args)
+    {
+        if (strpos($args[2], 'with')) {
+            list($tplfile, $newctx) = array_map('trim', explode("with", $args[2]));
+        } else {
+            $tplfile = trim($args[2]);
+            $newctx = null;
+        }
+
+        if ($tplfile[0] == '$') {
+            $tplfile = $this->_get_var($tplfile);
+        }
+
+        $this->_push_stack();
+        $r = $this->r;
+        if (! is_null($newctx)) {
+            list($a,$b) = array_map('trim', explode('=', $newctx));
+            $r[$a] = $this->_get_var($b);
+        }
+        $this->nodes = array();
+        $tpl = Theme::get_template($tplfile);
+        $ret = $this->replace($tpl, $r);
+        $this->_pop_stack();
+
+        return $ret;
+    }
+
+    /**
+     * DEBUG node
+     * \code
+     * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
+     * \endcode
+     * replace node with 
      var_dump($var, $var, ...);
      
+     */
+    private function _replcb_debug($args)
+    {
+        $vars = array_map('trim', explode(" ", $args[2]));
+        $vars[] = $args[1];
+
+        $ret = "
      ";
+        foreach ($vars as $var) {
+            $ret .= htmlspecialchars(var_export($this->_get_var($var), true));
+            $ret .= "\n";
+        }
+        $ret .= "
      ";
+
+        return $ret;
+    }
+
+    private function _replcb_node($m)
+    {
+        $node = $this->nodes[$m[1]];
+        if (method_exists($this, "_replcb_" . $node[1])) {
+            $s = call_user_func(array($this, "_replcb_" . $node[1]), $node);
+        } else {
+            $s = "";
+        }
+        $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+
+        return $s;
+    }
+
+    private function _replcb($m)
+    {
+        //var_dump(array_map('htmlspecialchars', $m));
+        $this->done = false;
+        $this->nodes[] = (array) $m;
+
+        return "||" . (count($this->nodes) - 1) . "||";
+    }
+
+    private function _build_nodes($s)
+    {
+        $this->done = false;
+        while (!$this->done) {
+            $this->done = true;
+            $s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s);
+            if ($s == null) {
+                $this->_preg_error();
+            }
+        }
+        //({{ *else *}}[^{]*)?
+        krsort($this->nodes);
+
+        return $s;
+    }
+
+    private function var_replace($s)
+    {
+        $m = [];
+        /** regexp:
+         * \$                       literal $
+         * (\[)?                    optional open square bracket
+         * ([a-zA-Z0-9-_]+\.?)+     var name, followed by optional
+         *                          dot, repeated at least 1 time
+         * (?(1)\])                 if there was opened square bracket
+         *                          (subgrup 1), match close bracket
+         */
+        if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s, $m)) {
+            foreach ($m[0] as $var) {
+                $exp = str_replace(array("[", "]"), array("", ""), $var);
+                $exptks = explode("|", $exp);
+
+                $varn = $exptks[0];
+                unset($exptks[0]);
+                $val = $this->_get_var($varn, true);
+                if ($val != KEY_NOT_EXISTS) {
+                    /* run filters */
+                    /*
+                     * Filter are in form of:
+                     * filtername:arg:arg:arg
+                     *
+                     * "filtername" is function name
+                     * "arg"s are optional, var value is appended to the end
+                     *          if one "arg"==='x' , is replaced with var value
+                     *
+                     * examples:
+                     * $item.body|htmlspecialchars              // escape html chars
+                     * $item.body|htmlspecialchars|strtoupper   // escape html and uppercase result
+                     * $item.created|date:%Y %M %j              // format date (created is a timestamp)
+                     * $item.body|str_replace:cat:dog           // replace all "cat" with "dog"
+                     * $item.body|str_replace:cat:dog:x:1       // replace one "cat" with "dog"
+                     */
+                    foreach ($exptks as $filterstr) {
+                        $filter = explode(":", $filterstr);
+                        $filtername = $filter[0];
+                        unset($filter[0]);
+                        $valkey = array_search("x", $filter);
+                        if ($valkey === false) {
+                            $filter[] = $val;
+                        } else {
+                            $filter[$valkey] = $val;
+                        }
+                        if (function_exists($filtername)) {
+                            $val = call_user_func_array($filtername, $filter);
+                        }
+                    }
+                    $s = str_replace($var, $val, $s);
+                }
+            }
+        }
+
+        return $s;
+    }
+
+    private function replace($s, $r)
+    {
+        $this->replace_macros($s, $r);
+    }
+
+    // TemplateEngine interface
+
+    public function replace_macros($s, $r)
+    {
+        $this->r = $r;
+
+        $s = $this->_build_nodes($s);
+
+        $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+        if ($s == null) {
+            $this->_preg_error();
+        }
+
+        // remove comments block
+        $s = preg_replace('/{#[^#]*#}/', "", $s);
+
+        //$t2 = dba_timer();
+
+        // replace strings recursively (limit to 10 loops)
+        $os = "";
+        $count = 0;
+        while (($os !== $s) && $count < 10) {
+            $os = $s;
+            $count++;
+            $s = $this->var_replace($s);
+        }
+
+        return $s;
+    }
+
+    public function get_template($file, $root = '')
+    {
+        $template_file = Theme::include($file, $root);
+        if ($template_file) {
+            $content = file_get_contents($template_file);
+        }
+
+        return $content;
+    }
+}
+
+
+function template_escape($s)
+{
+    return str_replace(array('$','{{'), array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'), $s);
+}
+
+function template_unescape($s)
+{
+    return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'), array('$','{{'), $s);
+}
diff --git a/Code/Render/SmartyInterface.php b/Code/Render/SmartyInterface.php
new file mode 100644
index 000000000..2b4733755
--- /dev/null
+++ b/Code/Render/SmartyInterface.php
@@ -0,0 +1,72 @@
+ "view/theme/$thname/tpl/"];
+        if (x(App::$theme_info, "extends")) {
+            $template_dirs = $template_dirs + ['extends' => "view/theme/" . App::$theme_info["extends"] . '/tpl/'];
+        }
+        $template_dirs = $template_dirs + array('base' => 'view/tpl/');
+        $this->setTemplateDir($template_dirs);
+
+        // Cannot use get_config() here because it is called during installation when there is no DB.
+        // FIXME: this may leak private information such as system pathnames.
+
+        $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system']))
+            ? App::$config['system']['smarty3_folder'] : '');
+        if (!$basecompiledir) {
+            $basecompiledir = str_replace('Code', '', dirname(__DIR__)) . TEMPLATE_BUILD_PATH;
+        }
+        if (!is_dir($basecompiledir)) {
+            @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true);
+        }
+        if (!is_dir($basecompiledir)) {
+            echo "ERROR: folder $basecompiledir does not exist.";
+            killme();
+        }
+
+        if (!is_writable($basecompiledir)) {
+            echo "ERROR: folder $basecompiledir must be writable by webserver.";
+            killme();
+        }
+        App::$config['system']['smarty3_folder'] = $basecompiledir;
+
+        $this->setCompileDir($basecompiledir . '/compiled/');
+        $this->setConfigDir($basecompiledir . '/config/');
+        $this->setCacheDir($basecompiledir . '/cache/');
+
+        $this->left_delimiter = App::get_template_ldelim('smarty3');
+        $this->right_delimiter = App::get_template_rdelim('smarty3');
+
+        // Don't report errors so verbosely
+        $this->error_reporting = (E_ERROR | E_PARSE);
+    }
+
+    public function parsed($template = '')
+    {
+        if ($template) {
+            return $this->fetch('string:' . $template);
+        }
+        return $this->fetch('file:' . $this->filename);
+    }
+}
diff --git a/Code/Render/SmartyTemplate.php b/Code/Render/SmartyTemplate.php
new file mode 100644
index 000000000..805d8939d
--- /dev/null
+++ b/Code/Render/SmartyTemplate.php
@@ -0,0 +1,98 @@
+ERROR: folder $basecompiledir does not exist.";
+                killme();
+            }
+        }
+        if (! is_writable($basecompiledir)) {
+            echo "ERROR: folder $basecompiledir must be writable by webserver.";
+            killme();
+        }
+        App::$config['system']['smarty3_folder'] = $basecompiledir;
+    }
+
+    // TemplateEngine interface
+
+    public function replace_macros($s, $r)
+    {
+        $template = '';
+
+        // macro or macros available for use in all templates
+
+        $r['$z_baseurl']     = z_root();
+
+        if (gettype($s) === 'string') {
+            $template = $s;
+            $s = new SmartyInterface();
+        }
+        foreach ($r as $key => $value) {
+            if ($key[0] === '$') {
+                $key = substr($key, 1);
+            }
+            $s->assign($key, $value);
+        }
+        return $s->parsed($template);
+    }
+
+    public function get_template($file, $root = '')
+    {
+        $template_file = Theme::include($file, $root);
+        if ($template_file) {
+            $template = new SmartyInterface();
+            $template->filename = $template_file;
+
+            return $template;
+        }
+        return EMPTY_STR;
+    }
+
+    public function get_email_template($file, $root = '')
+    {
+
+        $lang = App::$language;
+        if ($root != '' && substr($root, -1) != '/') {
+            $root .= '/';
+        }
+        foreach ([ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) {
+            if (is_file($template_file)) {
+                break;
+            }
+        }
+        if ($template_file == '') {
+            $template_file = Theme::include($file, $root);
+        }
+        if ($template_file) {
+            $template = new SmartyInterface();
+            $template->filename = $template_file;
+            return $template;
+        }
+        return EMPTY_STR;
+    }
+}
diff --git a/Code/Render/TemplateEngine.php b/Code/Render/TemplateEngine.php
new file mode 100644
index 000000000..b576945bd
--- /dev/null
+++ b/Code/Render/TemplateEngine.php
@@ -0,0 +1,13 @@
+ 1) ? $theme[1] : '');
+
+        $opts = '';
+        $opts = ((App::$profile_uid) ? '?f=&puid=' . App::$profile_uid : '');
+
+        $schema_str = ((x(App::$layout, 'schema')) ? '&schema=' . App::$layout['schema'] : '');
+        if (($s) && (!$schema_str)) {
+            $schema_str = '&schema=' . $s;
+        }
+
+        $opts .= $schema_str;
+
+        if (file_exists('view/theme/' . $t . '/php/style.php')) {
+            return ('/view/theme/' . $t . '/php/style.pcss' . $opts);
+        }
+
+        return ('/view/theme/' . $t . '/css/style.css');
+    }
+
+    public static function include($file, $root = '')
+    {
+
+        // Make sure $root ends with a slash / if it's not blank
+        if ($root) {
+            $root = rtrim($root,'/') . '/';
+        }
+    
+        $theme_info = App::$theme_info;
+
+        if (array_key_exists('extends', $theme_info)) {
+            $parent = $theme_info['extends'];
+        } else {
+            $parent = 'NOPATH';
+        }
+
+        $theme = self::current();
+        $thname = $theme[0];
+
+        $ext = substr($file, strrpos($file, '.') + 1);
+
+        $paths = array(
+            "{$root}view/theme/$thname/$ext/$file",
+            "{$root}view/theme/$parent/$ext/$file",
+            "{$root}view/site/$ext/$file",
+            "{$root}view/$ext/$file",
+        );
+
+        foreach ($paths as $p) {
+
+            if (strpos($p, 'NOPATH') !== false) {
+                continue;
+            }
+            if (file_exists($p)) {
+                return $p;
+            }
+        }
+
+        return '';
+    }
+
+    static public function get_info($theme) {
+
+        $info =  null;
+        if (is_file("view/theme/$theme/$theme.yml")) {
+            $info = Infocon::from_file("view/theme/$theme.yml");
+        }
+        elseif (is_file("view/theme/$theme/php/theme.php")) {
+            $info = Infocon::from_c_comment("view/theme/$theme/php/theme.php");
+        }
+        return $info ? $info : [ 'name' => $theme ] ;
+    
+    }
+
+    static public function get_email_template($s, $root = '')
+    {
+            $testroot = ($root=='') ? $testroot = "ROOT" : $root;
+            $t = App::template_engine();
+
+        if (isset(App::$override_intltext_templates[$testroot][$s]["content"])) {
+                return App::$override_intltext_templates[$testroot][$s]["content"];
+        } else {
+            if (isset(App::$override_intltext_templates[$testroot][$s]["root"]) &&
+                   isset(App::$override_intltext_templates[$testroot][$s]["file"])) {
+                    $s = App::$override_intltext_templates[$testroot][$s]["file"];
+                    $root = App::$override_intltext_templates[$testroot][$s]["root"];
+            } elseif (App::$override_templateroot) {
+                $newroot = App::$override_templateroot.$root;
+                if ($newroot != '' && substr($newroot, -1) != '/') {
+                               $newroot .= '/';
+                }
+                    $template = $t->Theme::get_email_template($s, $newroot);
+            }
+                $template = $t->Theme::get_email_template($s, $root);
+                return $template;
+        }
+    }
+
+    static public function get_template($s, $root = '')
+    {
+            $testroot = ($root=='') ? $testroot = "ROOT" : $root;
+
+            $t = App::template_engine();
+
+        if (isset(App::$override_markup_templates[$testroot][$s]["content"])) {
+                return App::$override_markup_templates[$testroot][$s]["content"];
+        } else {
+            if (isset(App::$override_markup_templates[$testroot][$s]["root"]) &&
+                   isset(App::$override_markup_templates[$testroot][$s]["file"])) {
+                    $s = App::$override_markup_templates[$testroot][$s]["file"];
+                    $root = App::$override_markup_templates[$testroot][$s]["root"];
+            } elseif (App::$override_templateroot) {
+                $newroot = App::$override_templateroot.$root;
+                if ($newroot != '' && substr($newroot, -1) != '/') {
+                               $newroot .= '/';
+                }
+                    $template = $t->get_template($s, $newroot);
+            }
+                $template = $t->get_template($s, $root);
+                return $template;
+        }
+    }
+
+
+
+    
+
+    public function debug()
+    {
+        logger('system_theme: ' . self::$system_theme);
+        logger('session_theme: ' . self::$session_theme);
+    }
+}
diff --git a/Code/Storage/BasicAuth.php b/Code/Storage/BasicAuth.php
new file mode 100644
index 000000000..59462acf8
--- /dev/null
+++ b/Code/Storage/BasicAuth.php
@@ -0,0 +1,291 @@
+check_module_access($channel['channel_id'])) {
+            return $this->setAuthenticated($channel);
+        }
+
+        if ($this->module_disabled)
+            $error = 'module not enabled for ' . $username;
+        else
+            $error = 'password failed for ' . $username;
+        logger($error);
+        log_failed_login($error);
+
+        return false;
+    }
+
+    /**
+     * @brief Sets variables and session parameters after successfull authentication.
+     *
+     * @param array $r
+     *  Array with the values for the authenticated channel.
+     * @return bool
+     */
+    protected function setAuthenticated($channel)
+    {
+        $this->channel_name = $channel['channel_address'];
+        $this->channel_id = $channel['channel_id'];
+        $this->channel_hash = $this->observer = $channel['channel_hash'];
+
+        if ($this->observer) {
+            $r = q("select * from xchan where xchan_hash = '%s' limit 1",
+                dbesc($this->observer)
+            );
+            if ($r) {
+                App::set_observer(array_shift($r));
+            }
+        }
+
+        $_SESSION['uid'] = $channel['channel_id'];
+        $_SESSION['account_id'] = $channel['channel_account_id'];
+        $_SESSION['authenticated'] = true;
+        return true;
+    }
+
+    /**
+     * When this method is called, the backend must check if authentication was
+     * successful.
+     *
+     * The returned value must be one of the following
+     *
+     * [true, "principals/username"]
+     * [false, "reason for failure"]
+     *
+     * If authentication was successful, it's expected that the authentication
+     * backend returns a so-called principal url.
+     *
+     * Examples of a principal url:
+     *
+     * principals/admin
+     * principals/user1
+     * principals/users/joe
+     * principals/uid/123457
+     *
+     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+     * return a string such as:
+     *
+     * principals/users/[username]
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    public function check(RequestInterface $request, ResponseInterface $response)
+    {
+
+        if (local_channel()) {
+            $this->setAuthenticated(App::get_channel());
+            return [true, $this->principalPrefix . $this->channel_name];
+        } elseif (remote_channel()) {
+            return [true, $this->principalPrefix . $this->observer];
+        }
+
+        $auth = new Basic(
+            $this->realm,
+            $request,
+            $response
+        );
+
+        $userpass = $auth->getCredentials();
+        if (!$userpass) {
+            return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
+        }
+        if (!$this->validateUserPass($userpass[0], $userpass[1])) {
+            return [false, "Username or password was incorrect"];
+        }
+        return [true, $this->principalPrefix . $userpass[0]];
+
+    }
+
+    protected function check_module_access($channel_id)
+    {
+        if ($channel_id && in_array(App::$module, ['dav', 'cdav', 'snap'])) {
+            return true;
+        }
+        $this->module_disabled = true;
+        return false;
+    }
+
+    /**
+     * Sets the channel_name from the currently logged-in channel.
+     *
+     * @param string $name
+     *  The channel's name
+     */
+    public function setCurrentUser($name)
+    {
+        $this->channel_name = $name;
+    }
+
+    /**
+     * Returns information about the currently logged-in channel.
+     *
+     * If nobody is currently logged in, this method should return null.
+     *
+     * @return string|null
+     * @see \\Sabre\\DAV\\Auth\\Backend\\AbstractBasic::getCurrentUser
+     */
+    public function getCurrentUser()
+    {
+        return $this->channel_name;
+    }
+
+    /**
+     * @brief Sets the timezone from the channel in BasicAuth.
+     *
+     * Set in mod/cloud.php if the channel has a timezone set.
+     *
+     * @param string $timezone
+     *  The channel's timezone.
+     * @return void
+     */
+    public function setTimezone($timezone)
+    {
+        $this->timezone = $timezone;
+    }
+
+    /**
+     * @brief Returns the timezone.
+     *
+     * @return string
+     *  Return the channel's timezone.
+     */
+    public function getTimezone()
+    {
+        return $this->timezone;
+    }
+
+    /**
+     * @brief Set browser plugin for SabreDAV.
+     *
+     * @param Plugin $browser
+     * @see RedBrowser::set_writeable()
+     */
+    public function setBrowserPlugin($browser)
+    {
+        $this->browser = $browser;
+    }
+
+    /**
+     * @brief Prints out all BasicAuth variables to logger().
+     *
+     * @return void
+     */
+    public function log()
+    {
+//		logger('channel_name ' . $this->channel_name, LOGGER_DATA);
+//		logger('channel_id ' . $this->channel_id, LOGGER_DATA);
+//		logger('channel_hash ' . $this->channel_hash, LOGGER_DATA);
+//		logger('observer ' . $this->observer, LOGGER_DATA);
+//		logger('owner_id ' . $this->owner_id, LOGGER_DATA);
+//		logger('owner_nick ' . $this->owner_nick, LOGGER_DATA);
+    }
+}
diff --git a/Code/Storage/Browser.php b/Code/Storage/Browser.php
new file mode 100644
index 000000000..82e93b03f
--- /dev/null
+++ b/Code/Storage/Browser.php
@@ -0,0 +1,500 @@
+auth = $auth;
+		parent::__construct(true, false);
+	}
+
+	/**
+	 * The DAV browser is instantiated after the auth module and directory classes
+	 * but before we know the current directory and who the owner and observer
+	 * are. So we add a pointer to the browser into the auth module and vice versa.
+	 * Then when we've figured out what directory is actually being accessed, we
+	 * call the following function to decide whether or not to show web elements
+	 * which include writeable objects.
+	 *
+	 * @fixme It only disable/enable the visible parts. Not the POST handler
+	 * which handels the actual requests when uploading files or creating folders.
+	 *
+	 * @todo Maybe this whole way of doing this can be solved with some
+	 * $server->subscribeEvent().
+	 */
+	public function set_writeable() {
+		if (! $this->auth->owner_id) {
+			$this->enablePost = false;
+		}
+
+		if (! perm_is_allowed($this->auth->owner_id, get_observer_hash(), 'write_storage')) {
+			$this->enablePost = false;
+		}
+		else {
+			$this->enablePost = true;
+		}
+	}
+
+	/**
+	 * @brief Creates the directory listing for the given path.
+	 *
+	 * @param string $path which should be displayed
+	 */
+	public function generateDirectoryIndex($path) {
+		// (owner_id = channel_id) is visitor owner of this directory?
+		$is_owner = ((local_channel() && $this->auth->owner_id == local_channel()) ? true : false);
+
+		if ($this->auth->getTimezone()) {
+			date_default_timezone_set($this->auth->getTimezone());
+		}
+
+		if ($this->auth->owner_nick) {
+			$html = '';
+		}
+
+		$files = $this->server->getPropertiesForPath($path, [
+			'{DAV:}displayname',
+			'{DAV:}resourcetype',
+			'{DAV:}getcontenttype',
+			'{DAV:}getcontentlength',
+			'{DAV:}getlastmodified',
+			], 1);
+
+		$parent = $this->server->tree->getNodeForPath($path);
+
+		$parentpath = [];
+		// only show parent if not leaving /cloud/; TODO how to improve this?
+		if ($path && $path != "cloud") {
+			list($parentUri) = \Sabre\Uri\split($path);
+			$fullPath = encodePath($this->server->getBaseUri() . $parentUri);
+
+			$parentpath['icon'] = $this->enableAssets ? '' . t('parent') . '' : '';
+			$parentpath['path'] = $fullPath;
+		}
+
+		$f = [];
+		foreach ($files as $file) {
+			$ft = [];
+			$type = null;
+
+			// This is the current directory, we can skip it
+			if (rtrim($file['href'], '/') == $path) {
+				continue;
+			}
+
+			list(, $name) = \Sabre\Uri\split($file['href']);
+
+			if (isset($file[200]['{DAV:}resourcetype'])) {
+				$type = $file[200]['{DAV:}resourcetype']->getValue();
+
+				// resourcetype can have multiple values
+				if (! is_array($type)) {
+					$type = [ $type ];
+				}
+
+				foreach ($type as $k => $v) {
+					// Some name mapping is preferred
+					switch ($v) {
+						case '{DAV:}collection' :
+							$type[$k] = t('Collection');
+							break;
+						case '{DAV:}principal' :
+							$type[$k] = t('Principal');
+							break;
+						case '{urn:ietf:params:xml:ns:carddav}addressbook' :
+							$type[$k] = t('Addressbook');
+							break;
+						case '{urn:ietf:params:xml:ns:caldav}calendar' :
+							$type[$k] = t('Calendar');
+							break;
+						case '{urn:ietf:params:xml:ns:caldav}schedule-inbox' :
+							$type[$k] = t('Schedule Inbox');
+							break;
+						case '{urn:ietf:params:xml:ns:caldav}schedule-outbox' :
+							$type[$k] = t('Schedule Outbox');
+							break;
+						case '{http://calendarserver.org/ns/}calendar-proxy-read' :
+							$type[$k] = 'Proxy-Read';
+							break;
+						case '{http://calendarserver.org/ns/}calendar-proxy-write' :
+							$type[$k] = 'Proxy-Write';
+							break;
+					}
+				}
+				$type = implode(', ', $type);
+			}
+
+			// If no resourcetype was found, we attempt to use
+			// the contenttype property
+			if (! $type && isset($file[200]['{DAV:}getcontenttype'])) {
+				$type = $file[200]['{DAV:}getcontenttype'];
+			}
+			if (! $type) {
+				$type = t('Unknown');
+			}
+
+			$size = isset($file[200]['{DAV:}getcontentlength']) ? (int)$file[200]['{DAV:}getcontentlength'] : '';
+			$lastmodified = ((isset($file[200]['{DAV:}getlastmodified'])) ? $file[200]['{DAV:}getlastmodified']->getTime()->format('Y-m-d H:i:s') : '');
+
+			$fullPath = encodePath('/' . trim($this->server->getBaseUri() . ($path ? $path . '/' : '') . $name, '/'));
+
+			$displayName = isset($file[200]['{DAV:}displayname']) ? $file[200]['{DAV:}displayname'] : $name;
+
+			$displayName = $this->escapeHTML($displayName);
+			$type = $this->escapeHTML($type);
+
+
+			$icon = '';
+
+			if ($this->enableAssets) {
+				$node = $this->server->tree->getNodeForPath(($path ? $path . '/' : '') . $name);
+				foreach (array_reverse($this->iconMap) as $class=>$iconName) {
+					if ($node instanceof $class) {
+						$icon = '';
+						break;
+					}
+				}
+			}
+
+			$folderHash = '';
+			$parentHash = '';
+			$owner = $this->auth->owner_id;
+			$splitPath = explode('/', $fullPath);
+			if (count($splitPath) > 3) {
+				for ($i = 3; $i < count($splitPath); $i++) {
+					$attachName = urldecode($splitPath[$i]);
+					$folderHash = $parentHash;
+					$attachHash = $this->findAttachHash($owner, $parentHash, $attachName);
+					$parentHash = $attachHash;
+				}
+			}
+
+
+			// generate preview icons for tile view. 
+			// SVG, PDF and office documents have some security concerns and should only be allowed on single-user sites with tightly controlled
+			// upload access. system.thumbnail_security should be set to 1 if you want to include these types 
+
+			$is_creator = false;
+			$photo_icon = '';
+			$preview_style = intval(get_config('system','thumbnail_security',0));
+
+			$r = q("select content, creator from attach where hash = '%s' and uid = %d limit 1",
+				dbesc($attachHash),
+				intval($owner)
+			);
+
+			if ($r) {
+				$is_creator = (($r[0]['creator'] === get_observer_hash()) ? true : false);
+			 	if (file_exists(dbunescbin($r[0]['content']) . '.thumb')) {
+					$photo_icon = 'data:image/jpeg;base64,' . base64_encode(file_get_contents(dbunescbin($r[0]['content']) . '.thumb'));
+				}
+			}
+
+			if (strpos($type,'image/') === 0 && $attachHash) {
+				$r = q("select resource_id, imgscale from photo where resource_id = '%s' and imgscale in ( %d, %d ) order by imgscale asc limit 1",
+					dbesc($attachHash),
+					intval(PHOTO_RES_320),
+					intval(PHOTO_RES_PROFILE_80)
+				);
+				if ($r) {
+					$photo_icon = 'photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale'];				
+				}
+				if ($type === 'image/svg+xml' && $preview_style > 0) {
+					$photo_icon = $fullPath;
+				}
+			}
+
+			$g = [ 'resource_id' => $attachHash, 'thumbnail' => $photo_icon, 'security' => $preview_style ];
+			Hook::call('file_thumbnail', $g);
+			$photo_icon = $g['thumbnail'];
+
+
+			$attachIcon = ""; 
+
+			// put the array for this file together
+			$ft['attachId'] = $this->findAttachIdByHash($attachHash);
+			$ft['fileStorageUrl'] = substr($fullPath, 0, strpos($fullPath, "cloud/")) . "filestorage/" . $this->auth->owner_nick;
+			$ft['icon'] = $icon;
+			$ft['photo_icon'] = $photo_icon;
+			$ft['attachIcon'] = (($size) ? $attachIcon : '');
+			// @todo Should this be an item value, not a global one?
+			$ft['is_owner'] = $is_owner;
+			$ft['is_creator'] = $is_creator;
+			$ft['fullPath'] = $fullPath;
+			$ft['displayName'] = $displayName;
+			$ft['type'] = $type;
+			$ft['size'] = $size;
+			$ft['sizeFormatted'] = userReadableSize($size);
+			$ft['lastmodified'] = (($lastmodified) ? datetime_convert('UTC', date_default_timezone_get(), $lastmodified) : '');
+			$ft['iconFromType'] = getIconFromType($type);
+
+			$f[] = $ft;
+
+		}
+
+
+		$output = '';
+		if ($this->enablePost && $parentpath) {
+			$this->server->emit('onHTMLActionsPanel', array($parent, &$output, $path));
+		}
+
+		// "display as tiles" is the default for visitors, and changes to this setting are stored in the session
+		// so that they apply even to unauthenticated visitors.
+
+		$deftiles = (($is_owner) ? 0 : 1);
+		$tiles = ((array_key_exists('cloud_tiles',$_SESSION)) ? intval($_SESSION['cloud_tiles']) : $deftiles);
+		$_SESSION['cloud_tiles'] = $tiles;
+	
+		$html .= replace_macros(Theme::get_template('cloud.tpl'), [
+				'$header' => t('Files') . ": " . $this->escapeHTML($path) . "/",
+				'$total' => t('Total'),
+				'$actionspanel' => $output,
+				'$shared' => t('Shared'),
+				'$create' => t('Create'),
+				'$upload' => t('Add Files'),
+				'$is_owner' => $is_owner,
+				'$is_admin' => is_site_admin(),
+				'$admin_delete' => t('Admin Delete'),
+				'$parentpath' => $parentpath,
+				'$cpath' => bin2hex(App::$query_string),
+				'$tiles' => intval($_SESSION['cloud_tiles']),
+				'$photo_view' => (($parentpath) ? t('View photos') : EMPTY_STR),
+				'$photos_path' => z_root() . '/photos/' . $this->auth->owner_nick . '/album/' . $folderHash,
+				'$entries' => $f,
+				'$name' => t('Name'),
+				'$type' => t('Type'),
+				'$size' => t('Size'),
+				'$lastmod' => t('Last Modified'),
+				'$parent' => t('parent'),
+				'$edit' => t('Edit'),
+				'$delete' => t('Delete'),
+				'$nick' => $this->auth->getCurrentUser()
+			]
+		);
+
+
+		$a = false;
+
+		Navbar::set_selected('Files');
+
+		App::$page['content'] = $html;
+		load_pdl();
+
+		$current_theme = Theme::current();
+
+		$theme_info_file = 'view/theme/' . $current_theme[0] . '/php/theme.php';
+		if (file_exists($theme_info_file)) {
+			require_once($theme_info_file);
+			if (function_exists(str_replace('-', '_', $current_theme[0]) . '_init')) {
+				$func = str_replace('-', '_', $current_theme[0]) . '_init';
+				$func($a);
+			}
+		}
+		$this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
+		$this->build_page = true;
+	}
+
+	/**
+	 * @brief Creates a form to add new folders and upload files.
+	 *
+	 * @param INode $node
+	 * @param[in,out] string &$output
+	 * @param string $path
+	 */
+	public function htmlActionsPanel(INode $node, &$output, $path) {
+		if (! $node instanceof DAV\ICollection) {
+			return;
+		}
+
+		// We also know fairly certain that if an object is a non-extended
+		// SimpleCollection, we won't need to show the panel either.
+
+		if (get_class($node) === 'Sabre\\DAV\\SimpleCollection') {
+			return;
+		}
+		
+		$aclselect = null;
+		$lockstate = '';
+		$limit = 0;
+
+		if ($this->auth->owner_id) {
+			$channel = Channel::from_id($this->auth->owner_id);
+			if ($channel) {
+				$acl = new AccessControl($channel);
+				$channel_acl = $acl->get();
+				$lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+
+				$aclselect = ((local_channel() == $this->auth->owner_id) ? Libacl::populate($channel_acl,false,PermissionDescription::fromGlobalPermission('view_storage')) : '');
+			}
+
+			// Storage and quota for the account (all channels of the owner of this directory)!
+			$limit = engr_units_to_bytes(ServiceClass::fetch($this->auth->owner_id, 'attach_upload_limit'));
+		}
+
+		if ((! $limit) && get_config('system','cloud_report_disksize')) {
+			$limit = engr_units_to_bytes(disk_free_space('store'));
+		}
+
+		$r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d",
+			intval($this->auth->channel_account_id)
+		);
+		$used = $r[0]['total'];
+		if ($used) {
+			$quotaDesc = t('You are using %1$s of your available file storage.');
+			$quotaDesc = sprintf($quotaDesc,userReadableSize($used));
+		}
+		if ($limit && $used) {
+			$quotaDesc = t('You are using %1$s of %2$s available file storage. (%3$s%)');
+			$quotaDesc = sprintf($quotaDesc,
+				userReadableSize($used),
+				userReadableSize($limit),
+				round($used / $limit, 1) * 100);
+		}
+		// prepare quota for template
+		$quota = [];
+		$quota['used'] = $used;
+		$quota['limit'] = $limit;
+		$quota['desc'] = $quotaDesc;
+		$quota['warning'] = ((($limit) && ((round($used / $limit, 1) * 100) >= 90)) ? t('WARNING:') : ''); // 10485760 bytes = 100MB
+
+		// strip 'cloud/nickname', but only at the beginning of the path
+
+		$special = 'cloud/' . $this->auth->owner_nick;
+		$count   = strlen($special);
+
+		if (strpos($path,$special) === 0) {
+			$path = trim(substr($path,$count),'/');
+		}
+
+		$output .= replace_macros(Theme::get_template('cloud_actionspanel.tpl'), array(
+				'$folder_header' => t('Create new folder'),
+				'$folder_submit' => t('Create'),
+				'$upload_header' => t('Upload file'),
+				'$upload_submit' => t('Upload'),
+				'$quota' => $quota,
+				'$channick' => $this->auth->owner_nick,
+				'$aclselect' => $aclselect,
+				'$allow_cid' => acl2json($channel_acl['allow_cid']),
+				'$allow_gid' => acl2json($channel_acl['allow_gid']),
+				'$deny_cid' => acl2json($channel_acl['deny_cid']),
+				'$deny_gid' => acl2json($channel_acl['deny_gid']),
+				'$lockstate' => $lockstate,
+				'$return_url' => App::$cmd,
+				'$path' => $path,
+				'$folder' => find_folder_hash_by_path($this->auth->owner_id, $path),
+				'$dragdroptext' => t('Drop files here to immediately upload'),
+				'$notify' => ['notify', t('Show in your contacts shared folder'), 0, '', [t('No'), t('Yes')]]
+			));
+	}
+
+	/**
+	 * This method takes a path/name of an asset and turns it into url
+	 * suiteable for http access.
+	 *
+	 * @param string $assetName
+	 * @return string
+	 */
+	protected function getAssetUrl($assetName) {
+		return z_root() . '/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
+	}
+
+	/**
+	 * @brief Return the hash of an attachment.
+	 *
+	 * Given the owner, the parent folder and and attach name get the attachment
+	 * hash.
+	 *
+	 * @param int $owner
+	 *  The owner_id
+	 * @param string $parentHash
+	 *  The parent's folder hash
+	 * @param string $attachName
+	 *  The name of the attachment
+	 * @return string
+	 */
+	protected function findAttachHash($owner, $parentHash, $attachName) {
+		$r = q("SELECT hash FROM attach WHERE uid = %d AND folder = '%s' AND filename = '%s' ORDER BY edited DESC LIMIT 1",
+			intval($owner),
+			dbesc($parentHash),
+			dbesc($attachName)
+		);
+		$hash = '';
+		if ($r) {
+			foreach ($r as $rr) {
+				$hash = $rr['hash'];
+			}
+		}
+
+		return $hash;
+	}
+
+	/**
+	 * @brief Returns an attachment's id for a given hash.
+	 *
+	 * This id is used to access the attachment in filestorage/
+	 *
+	 * @param string $attachHash
+	 *  The hash of an attachment
+	 * @return string
+	 */
+	 
+	protected function findAttachIdByHash($attachHash) {
+		$r = q("SELECT id FROM attach WHERE hash = '%s' ORDER BY edited DESC LIMIT 1",
+			dbesc($attachHash)
+		);
+		$id = EMPTY_STR;
+		if ($r) {
+			$id = $r[0]['id'];
+		}
+		return $id;
+	}
+}
diff --git a/Code/Storage/CalDAVClient.php b/Code/Storage/CalDAVClient.php
new file mode 100644
index 000000000..5ca2f305e
--- /dev/null
+++ b/Code/Storage/CalDAVClient.php
@@ -0,0 +1,746 @@
+username = $user;
+        $this->password = $pass;
+        $this->url = $url;
+    }
+
+    private function set_data($s)
+    {
+        $this->request_data = $s;
+        $this->filepos = 0;
+    }
+
+    public function curl_read($ch, $fh, $size)
+    {
+
+        if ($this->filepos < 0) {
+            unset($fh);
+            return '';
+        }
+
+        $s = substr($this->request_data, $this->filepos, $size);
+
+        if (strlen($s) < $size) {
+            $this->filepos = (-1);
+        } else {
+            $this->filepos = $this->filepos + $size;
+        }
+
+        return $s;
+    }
+
+    public function ctag_fetch()
+    {
+        $headers = ['Depth: 0', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
+
+        // recommended ctag fetch by sabre
+
+        $this->set_data('
+
+  
+     
+     
+	
+  
+');
+
+        // thunderbird uses this - it's a bit more verbose on what capabilities
+        // are provided by the server
+
+        $this->set_data('
+
+
+    
+    
+    
+    
+    
+    
+
+');
+
+
+        $auth = $this->username . ':' . $this->password;
+
+        $recurse = 0;
+
+        $x = z_fetch_url(
+            $this->url,
+            true,
+            $recurse,
+            ['headers' => $headers,
+                'http_auth' => $auth,
+                'custom' => 'PROPFIND',
+                'upload' => true,
+                'infile' => 3,
+                'infilesize' => strlen($this->request_data),
+                'readfunc' => [$this, 'curl_read']
+            ]
+        );
+
+        return $x;
+    }
+
+
+    public function detail_fetch()
+    {
+        $headers = ['Depth: 1', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
+
+        // this query should return all objects in the given calendar, you can filter it appropriately
+        // using filter options
+
+        $this->set_data('
+
+  
+     
+     
+  
+  
+        
+    
+');
+
+        $auth = $this->username . ':' . $this->password;
+
+        $recurse = 0;
+        $x = z_fetch_url(
+            $this->url,
+            true,
+            $recurse,
+            ['headers' => $headers,
+                'http_auth' => $auth,
+                'custom' => 'REPORT',
+                'upload' => true,
+                'infile' => 3,
+                'infilesize' => strlen($this->request_data),
+                'readfunc' => [$this, 'curl_read']
+            ]
+        );
+
+
+        return $x;
+    }
+}
+
+
+
+/*
+
+PROPFIND /calendars/johndoe/home/ HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+  
+     
+     
+  
+
+
+// Responses: success
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        /calendars/johndoe/home/
+        
+            
+                Home calendar
+                3145
+            
+            HTTP/1.1 200 OK
+        
+    
+
+
+// Responses: fail
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        /calendars/johndoe/home/
+        
+            
+                
+                
+            
+            HTTP/1.1 403 Forbidden
+        
+    
+
+
+
+// sample request body in DOM
+// prepare request body
+$doc  = new DOMDocument('1.0', 'utf-8');
+$doc->formatOutput = true;
+
+$query = $doc->createElement('c:calendar-query');
+$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:c', 'urn:ietf:params:xml:ns:caldav');
+$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:d', 'DAV:');
+
+$prop = $doc->createElement('d:prop');
+$prop->appendChild($doc->createElement('d:getetag'));
+$prop->appendChild($doc->createElement('c:calendar-data'));
+$query->appendChild($prop);
+$doc->appendChild($query);
+$body = $doc->saveXML();
+
+echo "Body: " . $body . "
      ";
+
+
+Now we download every single object in this calendar. To do this, we use a REPORT method.
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        
+        
+    
+    
+        
+    
+
+
+This request will give us every object that's a VCALENDAR object, and its etag.
+
+If you're only interested in VTODO (because you're writing a todo app) you can also filter for just those:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        
+        
+    
+    
+        
+            
+        
+    
+
+
+Similarly it's also possible to filter to just events, or only get events within a specific time-range.
+
+This report will return a multi-status object again:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        /calendars/johndoe/home/132456762153245.ics
+        
+            
+                "2134-314"
+                BEGIN:VCALENDAR
+                    VERSION:2.0
+                    CALSCALE:GREGORIAN
+                    BEGIN:VTODO
+                    UID:132456762153245
+                    SUMMARY:Do the dishes
+                    DUE:20121028T115600Z
+                    END:VTODO
+                    END:VCALENDAR
+                
+            
+            HTTP/1.1 200 OK
+        
+    
+    
+        /calendars/johndoe/home/132456-34365.ics
+        
+            
+                "5467-323"
+                BEGIN:VCALENDAR
+                    VERSION:2.0
+                    CALSCALE:GREGORIAN
+                    BEGIN:VEVENT
+                    UID:132456-34365
+                    SUMMARY:Weekly meeting
+                    DTSTART:20120101T120000
+                    DURATION:PT1H
+                    RRULE:FREQ=WEEKLY
+                    END:VEVENT
+                    END:VCALENDAR
+                
+            
+            HTTP/1.1 200 OK
+        
+    
+
+
+This calendar only contained 2 objects. A todo and a weekly event.
+
+So after you retrieved and processed these, for each object you must retain:
+
+    The calendar data itself
+    The url
+    The etag
+
+In this case all urls ended with .ics. This is often the case, but you must not rely on this. In this case the UID in the calendar object was also identical to a part of the url. This too is often the case, but again not something you can rely on, so don't make any assumptions.
+
+The url and the UID have no meaningful relationship, so treat both those items as separate unique identifiers.
+Finding out if anything changed
+
+To see if anything in a calendar changed, we simply request the ctag again on the calendar. If the ctag did not change, you still have the latest copy.
+
+If it did change, you must request all the etags in the entire calendar again:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        
+    
+    
+        
+            
+        
+    
+
+
+Note that this last request is extremely similar to a previous one, but we are only asking fo the etag, not the calendar-data.
+
+The reason for this, is that calendars can be rather huge. It will save a TON of bandwidth to only check the etag first.
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        /calendars/johndoe/home/132456762153245.ics
+        
+            
+                "xxxx-xxx"
+            
+            HTTP/1.1 200 OK
+        
+    
+    
+        /calendars/johndoe/home/fancy-caldav-client-1234253678.ics
+        
+            
+                "5-12"
+            
+            HTTP/1.1 200 OK
+        
+    
+
+
+Judging from this last request, 3 things have changed:
+
+    The etag for the task has changed, so the contents must be different
+    There's a new url, some other client must have added an object
+    One object is missing, something must have deleted it.
+
+So based on those 3 items we know that we need to delete an object from our local list, and fetch the contents for the new item, and the updated one.
+
+To fetch the data for these, you can simply issue GET requests:
+
+GET /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+
+But, because in a worst-case scenario this could result in a LOT of GET requests we can do a 'multiget'.
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        
+        
+    
+    /calendars/johndoe/home/132456762153245.ics
+    /calendars/johndoe/home/fancy-caldav-client-1234253678.ics
+
+
+This request will simply return a multi-status again with the calendar-data and etag.
+A small note about application design
+
+If you read this far and understood what's been said, you may have realized that it's a bit cumbersome to have a separate step for the initial sync, and subsequent updates.
+
+It would totally be possible to skip the 'initial sync', and just use calendar-query and calendar-multiget REPORTS for the initial sync as well.
+Updating a calendar object
+
+Updating a calendar object is rather simple:
+
+PUT /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+Content-Type: text/calendar; charset=utf-8
+If-Match: "2134-314"
+
+BEGIN:VCALENDAR
+....
+END:VCALENDAR
+
+A response to this will be something like this:
+
+HTTP/1.1 204 No Content
+ETag: "2134-315"
+
+The update gave us back the new ETag. SabreDAV gives this ETag on updates back most of the time, but not always.
+
+There are cases where the caldav server must modify the iCalendar object right after storage. In those cases an ETag will not be returned, and you should issue a GET request immediately to get the correct object.
+
+A few notes:
+
+    You must not change the UID of the original object
+    Every object should hold only 1 event or task.
+    You cannot change an VEVENT into a VTODO.
+
+Creating a calendar object
+
+Creating a calendar object is almost identical, except that you don't have a url yet to a calendar object.
+
+Instead, it is up to you to determine the new url.
+
+PUT /calendars/johndoe/home/somerandomstring.ics HTTP/1.1
+Content-Type: text/calendar; charset=utf-8
+
+BEGIN:VCALENDAR
+....
+END:VCALENDAR
+
+A response to this will be something like this:
+
+HTTP/1.1 201 Created
+ETag: "21345-324"
+
+Similar to updating, an ETag is often returned, but there are cases where this is not true.
+Deleting a calendar object
+
+Deleting is simple enough:
+
+DELETE /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+If-Match: "2134-314"
+
+Speeding up Sync with WebDAV-Sync
+
+WebDAV-Sync is a protocol extension that is defined in rfc6578. Because this extension was defined later, some servers may not support this yet.
+
+SabreDAV supports this since 2.0.
+
+WebDAV-Sync allows a client to ask just for calendars that have changed. The process on a high-level is as follows:
+
+    Client requests sync-token from server.
+    Server reports token 15.
+    Some time passes.
+    Client does a Sync REPORT on an calendar, and supplied token 15.
+    Server returns vcard urls that have changed or have been deleted and returns token 17.
+
+As you can see, after the initial sync, only items that have been created, modified or deleted will ever be sent.
+
+This has a lot of advantages. The transmitted xml bodies can generally be a lot shorter, and is also easier on both client and server in terms of memory and CPU usage, because only a limited set of items will have to be compared.
+
+It's important to note, that a client should only do Sync operations, if the server reports that it has support for it. The quickest way to do so, is to request {DAV}sync-token on the calendar you wish to sync.
+
+Technically, a server may support 'sync' on one calendar, and it may not support it on another, although this is probably rare.
+Getting the first sync-token
+
+Initially, we just request a sync token when asking for calendar information:
+
+PROPFIND /calendars/johndoe/home/ HTTP/1.1
+Depth: 0
+Content-Type: application/xml; charset=utf-8
+
+
+  
+     
+     
+     
+  
+
+
+This would return something as follows:
+
+
+    
+        /calendars/johndoe/home/
+        
+            
+                My calendar
+                3145
+                http://sabredav.org/ns/sync-token/3145
+            
+            HTTP/1.1 200 OK
+        
+    
+
+
+As you can see, the sync-token is a url. It always should be a url. Even though a number appears in the url, you are not allowed to attach any meaning to that url. Some servers may have use an increasing number, another server may use a completely random string.
+Receiving changes
+
+After a sync token has been obtained, and the client already has the initial copy of the calendar, the client is able to request all changes since the token was issued.
+
+This is done with a REPORT request that may look like this:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Host: dav.example.org
+Content-Type: application/xml; charset="utf-8"
+
+
+
+  http://sabredav.org/ns/sync/3145
+  1
+  
+    
+  
+
+
+This requests all the changes since sync-token identified by http://sabredav.org/ns/sync/3145, and for the calendar objects that have been added or modified, we're requesting the etag.
+
+The response to a query like this is another multistatus xml body. Example:
+
+HTTP/1.1 207 Multi-Status
+Content-Type: application/xml; charset="utf-8"
+
+
+
+    
+        /calendars/johndoe/home/newevent.ics
+        
+            
+                "33441-34321"
+            
+            HTTP/1.1 200 OK
+        
+    
+    
+        /calendars/johndoe/home/updatedevent.ics
+        
+            
+                "33541-34696"
+            
+            HTTP/1.1 200 OK
+        
+    
+    
+        /calendars/johndoe/home/deletedevent.ics
+        HTTP/1.1 404 Not Found
+    
+    http://sabredav.org/ns/sync/5001
+ 
+
+The last response reported two changes: newevent.ics and updatedevent.ics. There's no way to tell from the response wether those cards got created or updated, you, as a client can only infer this based on the vcards you are already aware of.
+
+The entry with name deletedevent.ics got deleted as indicated by the 404 status. Note that the status element is here a child of d:response when in all previous examples it has been a child of d:propstat.
+
+The other difference with the other multi-status examples, is that this one has a sync-token element with the latest sync-token.
+Caveats
+
+Note that a server is free to 'forget' any sync-tokens that have been previously issued. In this case it may be needed to do a full-sync again.
+
+In case the supplied sync-token is not recognized by the server, a HTTP error is emitted. SabreDAV emits a 403.
+Discovery
+
+Ideally you will want to make sure that all the calendars in an account are automatically discovered. The best user interface would be to just have to ask for three items:
+
+    Username
+    Password
+    Server
+
+And the server should be as short as possible. This is possible with most servers.
+
+If, for example a user specified 'dav.example.org' for the server, the first thing you should do is attempt to send a PROPFIND request to https://dav.example.org/. Note that you SHOULD try the https url before the http url.
+
+This PROPFIND request looks as follows:
+
+PROPFIND / HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+  
+     
+  
+
+
+This will return a response such as the following:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        /
+        
+            
+                
+                    /principals/users/johndoe/
+                
+            
+            HTTP/1.1 200 OK
+        
+    
+
+
+A 'principal' is a user. The url that's being returned, is a url that refers to the current user. On this url you can request additional information about the user.
+
+What we need from this url, is their 'calendar home'. The calendar home is a collection that contains all of the users' calendars.
+
+To request that, issue the following request:
+
+PROPFIND /principals/users/johndoe/ HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+  
+     
+  
+
+
+This will return a response such as the following:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        /principals/users/johndoe/
+        
+            
+                
+                    /calendars/johndoe/
+                
+            
+            HTTP/1.1 200 OK
+        
+    
+
+
+Lastly, to list all the calendars for the user, issue a PROPFIND request with Depth: 1.
+
+PROPFIND /calendars/johndoe/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+
+  
+     
+     
+     
+     
+  
+
+
+In that last request, we asked for 4 properties.
+
+The resourcetype tells us what type of object we're getting back. You must read out the resourcetype and ensure that it contains at least a calendar element in the CalDAV namespace. Other items may be returned, including non- calendar, which your application should ignore.
+
+The displayname is a human-readable string for the calendarname, the ctag was already covered in an earlier section.
+
+Lastly, supported-calendar-component-set. This gives us a list of components that the calendar accepts. This could be just VTODO, VEVENT, VJOURNAL or a combination of these three.
+
+If you are just creating a todo-list application, this means you should only list the calendars that support the VTODO component.
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+
+    
+        /calendars/johndoe/
+        
+            
+                
+                    
+                
+            
+            HTTP/1.1 200 OK
+        
+    
+    
+        /calendars/johndoe/home/
+        
+            
+                
+                    
+                    
+                
+                Home calendar
+                3145
+                
+                    
+                
+            
+            HTTP/1.1 200 OK
+        
+    
+    
+        /calendars/johndoe/tasks/
+        
+            
+                
+                    
+                    
+                
+                My TODO list
+                3345
+                
+                    
+                
+            
+            HTTP/1.1 200 OK
+        
+    
+
+*/
diff --git a/Code/Storage/Directory.php b/Code/Storage/Directory.php
new file mode 100644
index 000000000..8ab901574
--- /dev/null
+++ b/Code/Storage/Directory.php
@@ -0,0 +1,952 @@
+ext_path = $ext_path;
+        // remove "/cloud" from the beginning of the path
+        $modulename = App::$module;
+        $this->red_path = ((strpos($ext_path, '/' . $modulename) === 0) ? substr($ext_path, strlen($modulename) + 1) : $ext_path);
+        if (!$this->red_path) {
+            $this->red_path = '/';
+        }
+        $this->auth = $auth_plugin;
+        $this->folder_hash = '';
+        $this->getDir();
+
+        if ($this->auth->browser) {
+            $this->auth->browser->set_writeable();
+        }
+    }
+
+    private function log()
+    {
+        logger('ext_path ' . $this->ext_path, LOGGER_DATA);
+        logger('os_path  ' . $this->os_path, LOGGER_DATA);
+        logger('red_path ' . $this->red_path, LOGGER_DATA);
+    }
+
+    /**
+     * @brief Returns an array with all the child nodes.
+     *
+     * @throw "\Sabre\DAV\Exception\Forbidden"
+     * @return array \\Sabre\\DAV\\INode[]
+     */
+    public function getChildren()
+    {
+        logger('children for ' . $this->ext_path, LOGGER_DATA);
+        $this->log();
+
+        if (get_config('system', 'block_public') && (!$this->auth->channel_id) && (!$this->auth->observer)) {
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        if (($this->auth->owner_id) && (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'view_storage'))) {
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        $contents = $this->CollectionData($this->red_path, $this->auth);
+        return $contents;
+    }
+
+    /**
+     * @brief Returns a child by name.
+     *
+     * @throw "\Sabre\DAV\Exception\Forbidden"
+     * @throw "\Sabre\DAV\Exception\NotFound"
+     * @param string $name
+     */
+    public function getChild($name)
+    {
+        logger($name, LOGGER_DATA);
+
+        if (get_config('system', 'block_public') && (!$this->auth->channel_id) && (!$this->auth->observer)) {
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        if (($this->auth->owner_id) && (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'view_storage'))) {
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        $modulename = App::$module;
+        if ($this->red_path === '/' && $name === $modulename) {
+            return new Directory('/' . $modulename, $this->auth);
+        }
+
+        $x = $this->FileData($this->ext_path . '/' . $name, $this->auth);
+        if ($x) {
+            return $x;
+        }
+
+        throw new DAV\Exception\NotFound('The file with name: ' . $name . ' could not be found.');
+    }
+
+    /**
+     * @brief Returns the name of the directory.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return (basename($this->red_path));
+    }
+
+    /**
+     * @brief Renames the directory.
+     *
+     * @param string $name The new name of the directory.
+     * @return void
+     * @todo handle duplicate directory name
+     *
+     * @throw "\Sabre\DAV\Exception\Forbidden"
+     */
+    public function setName($name)
+    {
+        logger('old name ' . basename($this->red_path) . ' -> ' . $name, LOGGER_DATA);
+
+        if ((!$name) || (!$this->auth->owner_id)) {
+            logger('permission denied ' . $name);
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        if (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage')) {
+            logger('permission denied ' . $name);
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        list($parent_path,) = \Sabre\Uri\split($this->red_path);
+        $new_path = $parent_path . '/' . $name;
+
+        $r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND uid = %d",
+            dbesc($name),
+            dbesc($this->folder_hash),
+            intval($this->auth->owner_id)
+        );
+
+        $x = attach_syspaths($this->auth->owner_id, $this->folder_hash);
+
+        $y = q("update attach set display_path = '%s' where hash = '%s' and uid = %d",
+            dbesc($x['path']),
+            dbesc($this->folder_hash),
+            intval($this->auth->owner_id)
+        );
+
+        $ch = Channel::from_id($this->auth->owner_id);
+        if ($ch) {
+            $sync = attach_export_data($ch, $this->folder_hash);
+            if ($sync) {
+                Libsync::build_sync_packet($ch['channel_id'], array('file' => array($sync)));
+            }
+        }
+
+        $this->red_path = $new_path;
+    }
+
+    /**
+     * @brief Creates a new file in the directory.
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After successful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * @throw "\Sabre\DAV\Exception\Forbidden"
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string ETag
+     */
+    public function createFile($name, $data = null)
+    {
+        logger('create file in directory ' . $name, LOGGER_DEBUG);
+
+        if (!$this->auth->owner_id) {
+            logger('permission denied ' . $name);
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        if (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage')) {
+            logger('permission denied ' . $name);
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        $mimetype = z_mime_content_type($name);
+
+        $channel = Channel::from_id($this->auth->owner_id);
+
+        if (!$channel) {
+            logger('no channel');
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        $filesize = 0;
+        $hash = new_uuid();
+
+        $f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $hash;
+
+        $direct = null;
+
+        if ($this->folder_hash) {
+            $r = q("select * from attach where hash = '%s' and is_dir = 1 and uid = %d limit 1",
+                dbesc($this->folder_hash),
+                intval($channel['channel_id'])
+            );
+            if ($r) {
+                $direct = array_shift($r);
+            }
+        }
+
+        if (($direct) && (($direct['allow_cid']) || ($direct['allow_gid']) || ($direct['deny_cid']) || ($direct['deny_gid']))) {
+            $allow_cid = $direct['allow_cid'];
+            $allow_gid = $direct['allow_gid'];
+            $deny_cid = $direct['deny_cid'];
+            $deny_gid = $direct['deny_gid'];
+        } else {
+            $allow_cid = $channel['channel_allow_cid'];
+            $allow_gid = $channel['channel_allow_gid'];
+            $deny_cid = $channel['channel_deny_cid'];
+            $deny_gid = $channel['channel_deny_gid'];
+        }
+
+        $created = $edited = datetime_convert();
+
+        $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
+			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+            intval($channel['channel_account_id']),
+            intval($channel['channel_id']),
+            dbesc($hash),
+            dbesc($this->auth->observer),
+            dbesc($name),
+            dbesc($this->folder_hash),
+            intval(1),
+            dbesc($mimetype),
+            intval($filesize),
+            intval(0),
+            intval(0),
+            dbesc($f),
+            dbesc($created),
+            dbesc($edited),
+            '',
+            '',
+            dbesc($allow_cid),
+            dbesc($allow_gid),
+            dbesc($deny_cid),
+            dbesc($deny_gid)
+        );
+
+        // fetch the actual storage paths
+
+        $xpath = attach_syspaths($this->auth->owner_id, $hash);
+
+        if (is_resource($data)) {
+            $fp = fopen($f, 'wb');
+            if ($fp) {
+                pipe_streams($data, $fp);
+                fclose($fp);
+            }
+            $size = filesize($f);
+        } else {
+            $size = file_put_contents($f, $data);
+        }
+
+        // delete attach entry if file_put_contents() failed
+        if ($size === false) {
+            logger('file_put_contents() failed to ' . $f);
+            attach_delete($channel['channel_id'], $hash);
+            return;
+        }
+
+        $is_photo = 0;
+        $gis = @getimagesize($f);
+        logger('getimagesize: ' . print_r($gis, true), LOGGER_DATA);
+        if (($gis) && supported_imagetype($gis[2])) {
+            $is_photo = 1;
+        }
+
+        // If we know it's a photo, over-ride the type in case the source system could not determine what it was
+
+        if ($is_photo) {
+            q("update attach set filetype = '%s' where hash = '%s' and uid = %d",
+                dbesc($gis['mime']),
+                dbesc($hash),
+                intval($channel['channel_id'])
+            );
+        }
+
+        // updates entry with path and filesize
+        $d = q("UPDATE attach SET filesize = '%s', os_path = '%s', display_path = '%s', is_photo = %d WHERE hash = '%s' AND uid = %d",
+            dbesc($size),
+            dbesc($xpath['os_path']),
+            dbesc($xpath['path']),
+            intval($is_photo),
+            dbesc($hash),
+            intval($channel['channel_id'])
+        );
+
+        // update the parent folder's lastmodified timestamp
+        $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d",
+            dbesc($edited),
+            dbesc($this->folder_hash),
+            intval($channel['channel_id'])
+        );
+
+        $maxfilesize = get_config('system', 'maxfilesize');
+        if (($maxfilesize) && ($size > $maxfilesize)) {
+            logger('system maxfilesize exceeded. Deleting uploaded file.');
+            attach_delete($channel['channel_id'], $hash);
+            return;
+        }
+
+        // check against service class quota
+        $limit = engr_units_to_bytes(ServiceClass::fetch($channel['channel_id'], 'attach_upload_limit'));
+        if ($limit !== false) {
+            $z = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d ",
+                intval($channel['channel_account_id'])
+            );
+            if (($z) && ($z[0]['total'] + $size > $limit)) {
+                logger('service class limit exceeded for ' . $channel['channel_name'] . ' total usage is ' . $z[0]['total'] . ' limit is ' . userReadableSize($limit));
+                attach_delete($channel['channel_id'], $hash);
+                return;
+            }
+        }
+
+        if ($is_photo) {
+            $album = '';
+            if ($this->folder_hash) {
+                $f1 = q("select filename, display_path from attach WHERE hash = '%s' AND uid = %d",
+                    dbesc($this->folder_hash),
+                    intval($channel['channel_id'])
+                );
+                if ($f1) {
+                    $album = (($f1[0]['display_path']) ? $f1[0]['display_path'] : $f1[0]['filename']);
+                }
+            }
+
+            $args = [
+                'resource_id' => $hash,
+                'album' => $album,
+                'folder' => $this->folder_hash,
+                'os_syspath' => $f,
+                'os_path' => $xpath['os_path'],
+                'display_path' => $xpath['path'],
+                'filename' => $name,
+                'getimagesize' => $gis,
+                'directory' => $direct
+            ];
+            $p = photo_upload($channel, App::get_observer(), $args);
+        }
+
+        Run::Summon(['Thumbnail', $hash]);
+
+        $sync = attach_export_data($channel, $hash);
+
+        if ($sync) {
+            Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
+        }
+    }
+
+    /**
+     * @brief Creates a new subdirectory.
+     *
+     * @param string $name the directory to create
+     * @return void
+     */
+    public function createDirectory($name)
+    {
+        logger('create directory ' . $name, LOGGER_DEBUG);
+
+        if ((!$this->auth->owner_id) || (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        $channel = Channel::from_id($this->auth->owner_id);
+
+        if ($channel) {
+
+            // When initiated from DAV, set the 'force' flag on attach_mkdir(). This will cause the operation to report success even if the
+            // folder already exists.
+
+            require_once('include/attach.php');
+            $result = attach_mkdir($channel, $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash, 'force' => true));
+
+            if ($result['success']) {
+                $sync = attach_export_data($channel, $result['data']['hash']);
+                logger('createDirectory: attach_export_data returns $sync:' . print_r($sync, true), LOGGER_DEBUG);
+
+                if ($sync) {
+                    Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
+                }
+            } else {
+                logger('error ' . print_r($result, true), LOGGER_DEBUG);
+            }
+        }
+    }
+
+    /**
+     * @brief delete directory
+     */
+    public function delete()
+    {
+        logger('delete file ' . basename($this->red_path), LOGGER_DEBUG);
+
+        if ((!$this->auth->owner_id) || (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
+            throw new DAV\Exception\Forbidden('Permission denied.');
+        }
+
+        if ($this->auth->owner_id !== $this->auth->channel_id) {
+            if (($this->auth->observer !== $this->data['creator']) || intval($this->data['is_dir'])) {
+                throw new DAV\Exception\Forbidden('Permission denied.');
+            }
+        }
+
+        attach_delete($this->auth->owner_id, $this->folder_hash);
+
+        $channel = Channel::from_id($this->auth->owner_id);
+        if ($channel) {
+            $sync = attach_export_data($channel, $this->folder_hash, true);
+            if ($sync) {
+                Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
+            }
+        }
+    }
+
+
+    /**
+     * @brief Checks if a child exists.
+     *
+     * @param string $name
+     *  The name to check if it exists.
+     * @return bool
+     */
+    public function childExists($name)
+    {
+        // On /cloud we show a list of available channels.
+        // @todo what happens if no channels are available?
+        $modulename = App::$module;
+        if ($this->red_path === '/' && $name === $modulename) {
+            //logger('We are at ' $modulename . ' show a channel list', LOGGER_DEBUG);
+            return true;
+        }
+
+        $x = $this->FileData($this->ext_path . '/' . $name, $this->auth, true);
+        //logger('FileData returns: ' . print_r($x, true), LOGGER_DATA);
+        if ($x) {
+            return true;
+        }
+        return false;
+    }
+
+
+    public function moveInto($targetName, $sourcePath, DAV\INode $sourceNode)
+    {
+
+        if (!$this->auth->owner_id) {
+            return false;
+        }
+
+        if (!($sourceNode->data && $sourceNode->data['hash'])) {
+            return false;
+        }
+
+        return attach_move($this->auth->owner_id, $sourceNode->data['hash'], $this->folder_hash);
+    }
+
+
+    /**
+     * @return void
+     * @todo add description of what this function does.
+     *
+     * @throw "\Sabre\DAV\Exception\NotFound"
+     */
+    public function getDir()
+    {
+
+        logger('GetDir: ' . $this->ext_path, LOGGER_DEBUG);
+        $this->auth->log();
+        $modulename = App::$module;
+
+        $file = $this->ext_path;
+
+        $x = strpos($file, '/' . $modulename);
+        if ($x === 0) {
+            $file = substr($file, strlen($modulename) + 1);
+        }
+
+        if ((!$file) || ($file === '/')) {
+            return;
+        }
+
+        $file = trim($file, '/');
+        $path_arr = explode('/', $file);
+
+        if (!$path_arr)
+            return;
+
+        logger('paths: ' . print_r($path_arr, true), LOGGER_DATA);
+
+        $channel_name = $path_arr[0];
+
+        $channel = Channel::from_username($channel_name);
+
+        if (!$channel) {
+            throw new DAV\Exception\NotFound('The file with name: ' . $channel_name . ' could not be found.');
+        }
+
+        $channel_id = $channel['channel_id'];
+        $this->auth->owner_id = $channel_id;
+        $this->auth->owner_nick = $channel_name;
+
+        $path = '/' . $channel_name;
+        $folder = '';
+        $os_path = '';
+
+        for ($x = 1; $x < count($path_arr); $x++) {
+            $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0",
+                dbesc($folder),
+                dbesc($path_arr[$x]),
+                intval($channel_id)
+            );
+            if ($r && intval($r[0]['is_dir'])) {
+                $folder = $r[0]['hash'];
+                if (strlen($os_path)) {
+                    $os_path .= '/';
+                }
+                $os_path .= $folder;
+                $path = $path . '/' . $r[0]['filename'];
+            }
+        }
+        $this->folder_hash = $folder;
+        $this->os_path = $os_path;
+    }
+
+    /**
+     * @brief Returns the last modification time for the directory, as a UNIX
+     * timestamp.
+     *
+     * It looks for the last edited file in the folder. If it is an empty folder
+     * it returns the lastmodified time of the folder itself, to prevent zero
+     * timestamps.
+     *
+     * @return int last modification time in UNIX timestamp
+     */
+    public function getLastModified()
+    {
+        $r = q("SELECT edited FROM attach WHERE folder = '%s' AND uid = %d ORDER BY edited DESC LIMIT 1",
+            dbesc($this->folder_hash),
+            intval($this->auth->owner_id)
+        );
+        if (!$r) {
+            $r = q("SELECT edited FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+                dbesc($this->folder_hash),
+                intval($this->auth->owner_id)
+            );
+            if (!$r)
+                return '';
+        }
+        return datetime_convert('UTC', 'UTC', $r[0]['edited'], 'U');
+    }
+
+
+    /**
+     * @brief Array with all Directory and File DAV\\Node items for the given path.
+     *
+     * @param string $file path to a directory
+     * @param BasicAuth &$auth
+     * @returns null|array \\Sabre\\DAV\\INode[]
+     * @throw "\Sabre\DAV\Exception\Forbidden"
+     * @throw "\Sabre\DAV\Exception\NotFound"
+     */
+    public function CollectionData($file, &$auth)
+    {
+        $ret = [];
+
+        $x = strpos($file, '/cloud');
+        if ($x === 0) {
+            $file = substr($file, 6);
+        }
+
+        // return a list of channel if we are not inside a channel
+        if ((!$file) || ($file === '/')) {
+            return $this->ChannelList($auth);
+        }
+
+        $file = trim($file, '/');
+        $path_arr = explode('/', $file);
+
+        if (!$path_arr) {
+            return null;
+        }
+
+        $channel_name = $path_arr[0];
+
+        $channel = Channel::from_username($channel_name);
+
+        if (!$channel) {
+            return null;
+        }
+
+        $channel_id = $channel['channel_id'];
+        $perms = permissions_sql($channel_id);
+
+        $auth->owner_id = $channel_id;
+
+        $path = '/' . $channel_name;
+
+        $folder = '';
+        $errors = false;
+        $permission_error = false;
+
+        for ($x = 1; $x < count($path_arr); $x++) {
+            $r = q("SELECT id, hash, filename, flags, is_dir FROM attach WHERE folder = '%s' AND filename = '%s' AND uid = %d AND is_dir != 0 $perms LIMIT 1",
+                dbesc($folder),
+                dbesc($path_arr[$x]),
+                intval($channel_id)
+            );
+            if (!$r) {
+                // path wasn't found. Try without permissions to see if it was the result of permissions.
+                $errors = true;
+                $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 limit 1",
+                    dbesc($folder),
+                    basename($path_arr[$x]),
+                    intval($channel_id)
+                );
+                if ($r) {
+                    $permission_error = true;
+                }
+                break;
+            }
+
+            if ($r && intval($r[0]['is_dir'])) {
+                $folder = $r[0]['hash'];
+                $path = $path . '/' . $r[0]['filename'];
+            }
+        }
+
+        if ($errors) {
+            if ($permission_error) {
+                throw new DAV\Exception\Forbidden('Permission denied.');
+            } else {
+                throw new DAV\Exception\NotFound('A component of the requested file path could not be found.');
+            }
+        }
+
+        // This should no longer be needed since we just returned errors for paths not found
+        if ($path !== '/' . $file) {
+            logger("Path mismatch: $path !== /$file");
+            return NULL;
+        }
+
+        $prefix = '';
+
+        if (!array_key_exists('cloud_sort', $_SESSION))
+            $_SESSION['cloud_sort'] = 'name';
+
+        switch ($_SESSION['cloud_sort']) {
+            case 'size':
+                $suffix = ' order by is_dir desc, filesize asc ';
+                break;
+            // The following provides inconsistent results for directories because we re-calculate the date for directories based on the most recent change
+            case 'date':
+                $suffix = ' order by is_dir desc, edited asc ';
+                break;
+            case 'name':
+            default:
+                $suffix = ' order by is_dir desc, filename asc ';
+                break;
+        }
+
+        $r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix",
+            dbesc($folder),
+            intval($channel_id)
+        );
+
+        foreach ($r as $rr) {
+            if (App::$module === 'cloud' && (strpos($rr['filename'], '.') === 0) && (!get_pconfig($channel_id, 'system', 'show_dot_files'))) {
+                continue;
+            }
+
+            // @FIXME I don't think we use revisions currently in attach structures.
+            // In case we see any in the wild provide a unique filename. This
+            // name may or may not be accessible
+
+            if ($rr['revision']) {
+                $rr['filename'] .= '-' . $rr['revision'];
+            }
+
+            // logger('filename: ' . $rr['filename'], LOGGER_DEBUG);
+            if (intval($rr['is_dir'])) {
+                $ret[] = new Directory($path . '/' . $rr['filename'], $auth);
+            } else {
+                $ret[] = new File($path . '/' . $rr['filename'], $rr, $auth);
+            }
+        }
+
+        return $ret;
+    }
+
+
+    /**
+     * @brief Returns an array with viewable channels.
+     *
+     * Get a list of Directory objects with all the channels where the visitor
+     * has view_storage perms.
+     *
+     *
+     * @param BasicAuth &$auth
+     * @return array Directory[]
+     */
+    public function ChannelList(&$auth)
+    {
+        $ret = [];
+
+        $disabled = intval(get_config('system', 'cloud_disable_siteroot', true));
+
+        $r = q("SELECT channel_id, channel_address, profile.publish FROM channel left join profile on profile.uid = channel.channel_id WHERE channel_removed = 0 AND channel_system = 0 AND (channel_pageflags & %d) = 0 and profile.is_default = 1",
+            intval(PAGE_HIDDEN)
+        );
+        if ($r) {
+            foreach ($r as $rr) {
+                if ((perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage') && $rr['publish']) || $rr['channel_id'] == $this->auth->channel_id) {
+                    logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA);
+                    if ($disabled) {
+                        $conn = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' and abook_pending = 0",
+                            intval($rr['channel_id']),
+                            dbesc($auth->observer)
+                        );
+                        if (!$conn) {
+                            continue;
+                        }
+                    }
+
+                    $ret[] = new Directory($rr['channel_address'], $auth);
+                }
+            }
+        }
+        return $ret;
+    }
+
+
+    /**
+     * @brief
+     *
+     * @param string $file
+     *  path to file or directory
+     * @param BasicAuth &$auth
+     * @param bool $test (optional) enable test mode
+     * @return File|Directory|bool|null
+     * @throw "\Sabre\DAV\Exception\Forbidden"
+     */
+    public function FileData($file, &$auth, $test = false)
+    {
+        logger($file . (($test) ? ' (test mode) ' : ''), LOGGER_DATA);
+
+        $x = strpos($file, '/cloud');
+        if ($x === 0) {
+            $file = substr($file, 6);
+        } else {
+            $x = strpos($file, '/dav');
+            if ($x === 0)
+                $file = substr($file, 4);
+        }
+
+        if ((!$file) || ($file === '/')) {
+            return new Directory('/', $auth);
+        }
+
+        $file = trim($file, '/');
+
+        $path_arr = explode('/', $file);
+
+        if (!$path_arr)
+            return null;
+
+        $channel_name = $path_arr[0];
+
+        $r = q("select channel_id from channel where channel_address = '%s' limit 1",
+            dbesc($channel_name)
+        );
+
+        if (!$r)
+            return null;
+
+        $channel_id = $r[0]['channel_id'];
+
+        $path = '/' . $channel_name;
+
+        $auth->owner_id = $channel_id;
+
+        $permission_error = false;
+
+        $folder = '';
+
+        require_once('include/security.php');
+        $perms = permissions_sql($channel_id);
+
+        $errors = false;
+
+        for ($x = 1; $x < count($path_arr); $x++) {
+            $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 $perms",
+                dbesc($folder),
+                dbesc($path_arr[$x]),
+                intval($channel_id)
+            );
+
+            if ($r && intval($r[0]['is_dir'])) {
+                $folder = $r[0]['hash'];
+                $path = $path . '/' . $r[0]['filename'];
+            }
+            if (!$r) {
+                $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach
+					where folder = '%s' and filename = '%s' and uid = %d $perms order by filename limit 1",
+                    dbesc($folder),
+                    dbesc(basename($file)),
+                    intval($channel_id)
+                );
+            }
+            if (!$r) {
+                $errors = true;
+                $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach
+					where folder = '%s' and filename = '%s' and uid = %d order by filename limit 1",
+                    dbesc($folder),
+                    dbesc(basename($file)),
+                    intval($channel_id)
+                );
+                if ($r)
+                    $permission_error = true;
+            }
+        }
+
+        if ($path === '/' . $file) {
+            if ($test)
+                return true;
+            // final component was a directory.
+            return new Directory($file, $auth);
+        }
+
+        if ($errors) {
+            logger('not found ' . $file);
+            if ($test)
+                return false;
+            if ($permission_error) {
+                logger('permission error ' . $file);
+                throw new DAV\Exception\Forbidden('Permission denied.');
+            }
+            return;
+        }
+
+        if ($r) {
+            if ($test)
+                return true;
+
+            if (intval($r[0]['is_dir'])) {
+                return new Directory($path . '/' . $r[0]['filename'], $auth);
+            } else {
+                return new File($path . '/' . $r[0]['filename'], $r[0], $auth);
+            }
+        }
+        return false;
+    }
+
+    public function getQuotaInfo()
+    {
+
+        /**
+         * Returns the quota information
+         *
+         * This method MUST return an array with 2 values, the first being the total used space,
+         * the second the available space (in bytes)
+         */
+
+        $used = 0;
+        $limit = 0;
+        $free = 0;
+
+        if ($this->auth->owner_id) {
+            $channel = Channel::from_id($this->auth->owner_id);
+            if ($channel) {
+                $r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d",
+                    intval($channel['channel_account_id'])
+                );
+                $used = (($r) ? (float)$r[0]['total'] : 0);
+                $limit = (float)engr_units_to_bytes(ServiceClass::fetch($this->auth->owner_id, 'attach_upload_limit'));
+                if ($limit) {
+                    // Don't let the result go negative
+                    $free = (($limit > $used) ? $limit - $used : 0);
+                }
+            }
+        }
+
+        if (!$limit) {
+            $free = disk_free_space('store');
+            $used = disk_total_space('store') - $free;
+        }
+
+        // prevent integer overflow on 32-bit systems
+
+        if ($used > (float)PHP_INT_MAX)
+            $used = PHP_INT_MAX;
+        if ($free > (float)PHP_INT_MAX)
+            $free = PHP_INT_MAX;
+
+        return [(int)$used, (int)$free];
+
+    }
+
+}
diff --git a/Code/Storage/File.php b/Code/Storage/File.php
new file mode 100644
index 000000000..99e8d69f4
--- /dev/null
+++ b/Code/Storage/File.php
@@ -0,0 +1,446 @@
+name = $name;
+		$this->data = $data;
+		$this->auth = $auth;
+	}
+
+	/**
+	 * @brief Returns the name of the file.
+	 *
+	 * @return string
+	 */
+
+	public function getName() {
+		return basename($this->name);
+	}
+
+	/**
+	 * @brief Renames the file.
+	 *
+	 * @throw "\Sabre\DAV\Exception\Forbidden"
+	 * @param string $newName The new name of the file.
+	 * @return void
+	 */
+
+	public function setName($newName) {
+		logger('old name ' . basename($this->name) . ' -> ' . $newName, LOGGER_DATA);
+
+		if ((! $newName) || (! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
+			logger('permission denied '. $newName);
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+
+		$newName = str_replace('/', '%2F', $newName);
+
+		$r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND id = %d",
+			dbesc($newName),
+			dbesc($this->data['hash']),
+			intval($this->data['id'])
+		);
+
+		$x = attach_syspaths($this->auth->owner_id,$this->data['hash']);
+
+		$y = q("update attach set display_path = '%s where hash = '%s' and uid = %d",
+			dbesc($x['path']),
+			dbesc($this->data['hash']),
+			intval($this->auth->owner_id)
+		);
+
+		if ($this->data->is_photo) {
+			$r = q("update photo set filename = '%s', display_path = '%s' where resource_id = '%s' and uid = %d",
+				dbesc($newName),
+				dbesc($x['path']),
+				dbesc($this->data['hash']),
+				intval($this->auth->owner_id)
+			);
+		}
+
+		$ch = Channel::from_id($this->auth->owner_id);
+		if ($ch) {
+			$sync = attach_export_data($ch,$this->data['hash']);
+			if ($sync) {
+				Libsync::build_sync_packet($ch['channel_id'], [ 'file' => [ $sync ] ]);
+			}
+		}
+	}
+
+	/**
+	 * @brief Updates the data of the file.
+	 *
+	 * @param resource $data
+	 * @return void
+	 */
+
+	public function put($data) {
+		logger('put file: ' . basename($this->name), LOGGER_DEBUG);
+		$size = 0;
+
+
+		if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
+			logger('permission denied for put operation');
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+
+		$channel = Channel::from_id($this->auth->owner_id);
+
+		if (! $channel) {
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+
+		$is_photo = false;
+		$album = '';
+		$os_path = '';
+
+
+		// This hidden config allows you to protect your dav contents from cryptolockers by preventing over-write
+		// and delete from a networked operating system. In this case you are only allowed to over-write the file
+		// if it is empty. Some DAV clients create the file and then store the contents so these would be allowed. 
+
+		if (get_pconfig($this->auth->owner_id,'system','os_delete_prohibit') && App::$module == 'dav') {
+			$r = q("select filesize from attach where hash = '%s' and uid = %d limit 1",
+				dbesc($this->data['hash']),
+				intval($channel['channel_id'])
+			);
+			if ($r && intval($r[0]['filesize'])) { 	
+				throw new DAV\Exception\Forbidden('Permission denied.');
+			}
+		}
+
+		$r = q("SELECT flags, folder, os_storage, os_path, display_path, filename, is_photo FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+			dbesc($this->data['hash']),
+			intval($channel['channel_id'])
+		);
+		if ($r) {
+
+			$os_path = $r[0]['os_path'];
+			$display_path = $r[0]['display_path'];
+			$filename = $r[0]['filename'];
+			$folder_hash = $r[0]['folder'];
+
+			if (intval($r[0]['os_storage'])) {
+				$d = q("select folder, content from attach where hash = '%s' and uid = %d limit 1",
+					dbesc($this->data['hash']),
+					intval($channel['channel_id'])
+				);
+				if ($d) {
+					if ($d[0]['folder']) {
+						$f1 = q("select * from attach where is_dir = 1 and hash = '%s' and uid = %d limit 1",
+							dbesc($d[0]['folder']),
+							intval($channel['channel_id'])
+						);
+						if ($f1) {
+							$album = $f1[0]['filename'];
+							$direct = $f1[0];
+						}
+					}
+					$fname = dbunescbin($d[0]['content']);
+					if (strpos($fname,'store/') === false) {
+						$f = 'store/' . $this->auth->owner_nick . '/' . $fname ;
+					}
+					else {
+						$f = $fname;
+					}
+					
+					if (is_resource($data)) {
+						$fp = fopen($f,'wb');
+						if ($fp) {
+							pipe_streams($data,$fp);
+							fclose($fp);
+						}
+					}
+					else {
+						file_put_contents($f, $data);
+					}
+
+					$size = @filesize($f);
+
+					logger('filename: ' . $f . ' size: ' . $size, LOGGER_DEBUG);
+				}
+				$gis = @getimagesize($f);
+				logger('getimagesize: ' . print_r($gis,true), LOGGER_DATA);
+				if ($gis && supported_imagetype($gis[2])) {
+					$is_photo = 1;
+				}
+
+				// If we know it's a photo, over-ride the type in case the source system could not determine what it was
+
+				if ($is_photo) {
+					q("update attach set filetype = '%s' where hash = '%s' and uid = %d",
+						dbesc($gis['mime']),
+						dbesc($this->data['hash']),
+						intval($this->data['uid'])
+					);
+				}
+
+			}
+			else {
+				// this shouldn't happen any more
+				$r = q("UPDATE attach SET content = '%s' WHERE hash = '%s' AND uid = %d",
+					dbescbin(stream_get_contents($data)),
+					dbesc($this->data['hash']),
+					intval($this->data['uid'])
+				);
+				$r = q("SELECT length(content) AS fsize FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+					dbesc($this->data['hash']),
+					intval($this->data['uid'])
+				);
+				if ($r) {
+					$size = $r[0]['fsize'];
+				}
+			}
+		}
+
+		// returns now()
+		$edited = datetime_convert();
+
+		$d = q("UPDATE attach SET filesize = '%s', is_photo = %d, edited = '%s' WHERE hash = '%s' AND uid = %d",
+			dbesc($size),
+			intval($is_photo),
+			dbesc($edited),
+			dbesc($this->data['hash']),
+			intval($channel['channel_id'])
+		);
+
+		if ($is_photo) {
+			$args = [
+				'resource_id'  => $this->data['hash'],
+				'album'        => $album,
+				'folder'       => $folder_hash,
+				'os_syspath'   => $f,
+				'os_path'      => $os_path,
+				'display_path' => $display_path,
+				'filename'     => $filename,
+				'getimagesize' => $gis,
+				'directory'    => $direct
+			];
+			$p = photo_upload($channel, App::get_observer(), $args);
+			logger('photo_upload: ' . print_r($p,true), LOGGER_DATA);
+		}
+
+		// update the folder's lastmodified timestamp
+		$e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d",
+			dbesc($edited),
+			dbesc($r[0]['folder']),
+			intval($channel['channel_id'])
+		);
+
+		// @todo do we really want to remove the whole file if an update fails
+		// because of maxfilesize or quota?
+		// There is an Exception "InsufficientStorage" or "PaymentRequired" for
+		// our service class from SabreDAV we could use.
+
+		$maxfilesize = get_config('system', 'maxfilesize');
+		if (($maxfilesize) && ($size > $maxfilesize)) {
+			attach_delete($channel['channel_id'], $this->data['hash']);
+			return;
+		}
+
+		$limit = engr_units_to_bytes(ServiceClass::fetch($channel['channel_id'], 'attach_upload_limit'));
+		if ($limit !== false) {
+			$x = q("select sum(filesize) as total from attach where aid = %d ",
+				intval($channel['channel_account_id'])
+			);
+			if (($x) && ($x[0]['total'] + $size > $limit)) {
+				logger('service class limit exceeded for ' . $channel['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . userReadableSize($limit));
+				attach_delete($channel['channel_id'], $this->data['hash']);
+				return;
+			}
+		}
+
+		Run::Summon([ 'Thumbnail' , $this->data['hash'] ]);
+
+		$sync = attach_export_data($channel,$this->data['hash']);
+
+		if ($sync) {
+			Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync)));
+		}
+	}
+
+	/**
+	 * @brief Returns the raw data.
+	 *
+	 * @return string || resource
+	 */
+
+	public function get() {
+		logger('get file ' . basename($this->name), LOGGER_DEBUG);
+		logger('os_path: ' . $this->os_path, LOGGER_DATA);
+
+		$r = q("SELECT content, flags, os_storage, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+			dbesc($this->data['hash']),
+			intval($this->data['uid'])
+		);
+		if ($r) {
+			// @todo this should be a global definition
+			$unsafe_types = array('text/html', 'text/css', 'application/javascript', 'image/svg+xml');
+
+			if (in_array($r[0]['filetype'], $unsafe_types) && (!Channel::codeallowed($this->data['uid']))) {
+				header('Content-Disposition: attachment; filename="' . $r[0]['filename'] . '"');
+				header('Content-type: ' . $r[0]['filetype']);
+			}
+
+			if (intval($r[0]['os_storage'])) {
+				$x = dbunescbin($r[0]['content']);
+				if (strpos($x,'store') === false) {
+					$f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x;
+				}
+				else {
+					$f = $x;
+				}
+				return @fopen($f, 'rb');
+			}
+			return dbunescbin($r[0]['content']);
+		}
+	}
+
+	/**
+	 * @brief Returns the ETag for a file.
+	 *
+	 * An ETag is a unique identifier representing the current version of the file.
+	 * If the file changes, the ETag MUST change.
+	 * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+	 *
+	 * Return null if the ETag can not effectively be determined.
+	 *
+	 * @return null|string
+	 */
+	public function getETag() {
+		$ret = null;
+		if ($this->data['hash']) {
+			$ret = '"' . $this->data['hash'] . '"';
+		}
+		return $ret;
+	}
+
+	/**
+	 * @brief Returns the mime-type for a file.
+	 *
+	 * If null is returned, we'll assume application/octet-stream
+	 *
+	 * @return mixed
+	 */
+
+	public function getContentType() {
+		return $this->data['filetype'];
+	}
+
+	/**
+	 * @brief Returns the size of the node, in bytes.
+	 *
+	 * @return int
+	 *  filesize in bytes
+	 */
+	public function getSize() {
+		return intval($this->data['filesize']);
+	}
+
+	/**
+	 * @brief Returns the last modification time for the file, as a unix
+	 *        timestamp.
+	 *
+	 * @return int last modification time in UNIX timestamp
+	 */
+
+	public function getLastModified() {
+		return datetime_convert('UTC', 'UTC', $this->data['edited'], 'U');
+	}
+
+	/**
+	 * @brief Delete the file.
+	 *
+	 * This method checks the permissions and then calls attach_delete() function
+	 * to actually remove the file.
+	 *
+	 * @throw "\Sabre\DAV\Exception\Forbidden"
+	 */
+	public function delete() {
+		logger('delete file ' . basename($this->name), LOGGER_DEBUG);
+
+		if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+
+		if ($this->auth->owner_id !== $this->auth->channel_id) {
+			if (($this->auth->observer !== $this->data['creator']) || intval($this->data['is_dir'])) {
+				throw new DAV\Exception\Forbidden('Permission denied.');
+			}
+		}
+
+		// This is a subtle solution to crypto-lockers which can wreak havoc on network resources when
+		// invoked on a dav-mounted filesystem. By setting system.os_delete_prohibit, one can remove files
+		// via the web interface but from their operating system the filesystem is treated as read-only. 
+		
+		if (get_pconfig($this->auth->owner_id,'system','os_delete_prohibit') && App::$module == 'dav') {
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+
+		attach_delete($this->auth->owner_id, $this->data['hash']);
+
+		$channel = Channel::from_id($this->auth->owner_id);
+		if ($channel) {
+			$sync = attach_export_data($channel, $this->data['hash'], true);
+			if ($sync) {
+				Libsync::build_sync_packet($channel['channel_id'], [ 'file' => [ $sync ] ]);
+			}
+		}
+	}
+}
diff --git a/Code/Storage/GitRepo.php b/Code/Storage/GitRepo.php
new file mode 100644
index 000000000..e9c63b280
--- /dev/null
+++ b/Code/Storage/GitRepo.php
@@ -0,0 +1,171 @@
+
+ */
+class GitRepo
+{
+
+    public $url = null;
+    public $name = null;
+    private $path = null;
+    private $channel = null;
+    public $git = null;
+    private $repoBasePath = null;
+
+    public function __construct($channel = 'sys', $url = null, $clone = false, $name = null, $path = null)
+    {
+
+        if ($channel === 'sys' && !is_site_admin()) {
+            logger('Only admin can use channel sys');
+            return null;
+        }
+
+        $this->repoBasePath = 'store/git';
+        $this->channel = $channel;
+        $this->git = new PHPGit();
+
+        // Allow custom path for repo in the case of , for example
+        if ($path) {
+            $this->path = $path;
+        } else {
+            $this->path = $this->repoBasePath . "/" . $this->channel . "/" . $this->name;
+        }
+
+        if ($this->isValidGitRepoURL($url)) {
+            $this->url = $url;
+        }
+
+        if ($name) {
+            $this->name = $name;
+        } else {
+            $this->name = $this->getRepoNameFromURL($url);
+        }
+        if (!$this->name) {
+            logger('Error creating GitRepo. No repo name found.');
+            return null;
+        }
+
+        if (is_dir($this->path)) {
+            // ignore the $url input if it exists
+            // TODO: Check if the path is either empty or is a valid git repo and error if not
+            $this->git->setRepository($this->path);
+            // TODO: get repo metadata
+            return;
+        }
+
+        if ($this->url) {
+            // create the folder and clone the repo at url to that folder if $clone is true
+            if ($clone) {
+                if (mkdir($this->path, 0770, true)) {
+                    $this->git->setRepository($this->path);
+                    if (!$this->cloneRepo()) {
+                        // TODO: throw error
+                        logger('git clone failed: ' . json_encode($this->git));
+                    }
+                } else {
+                    logger('git repo path could not be created: ' . json_encode($this->git));
+                }
+            }
+        }
+    }
+
+    public function initRepo()
+    {
+        if (!$this->path) {
+            return false;
+        }
+        try {
+            return $this->git->init($this->path);
+        } catch (GitException $ex) {
+            return false;
+        }
+    }
+
+    public function pull()
+    {
+        try {
+            $success = $this->git->pull();
+        } catch (GitException $ex) {
+            return false;
+        }
+        return $success;
+    }
+
+    public function getRepoPath()
+    {
+        return $this->path;
+    }
+
+    public function setRepoPath($directory)
+    {
+        if (is_dir($directory)) {
+            $this->path->$directory;
+            $this->git->setRepository($directory);
+            return true;
+        }
+        return false;
+    }
+
+    public function setIdentity($user_name, $user_email)
+    {
+        // setup user for commit messages
+        $this->git->config->set("user.name", $user_name, ['global' => false, 'system' => false]);
+        $this->git->config->set("user.email", $user_email, ['global' => false, 'system' => false]);
+    }
+
+    public function cloneRepo()
+    {
+        if (validate_url($this->url) && $this->isValidGitRepoURL($this->url) && is_dir($this->path)) {
+            return $this->git->clone($this->url, $this->path);
+        }
+    }
+
+    public function probeRepo()
+    {
+        $git = $this->git;
+        $repo = [];
+        $repo['remote'] = $git->remote();
+        $repo['branches'] = $git->branch(['all' => true]);
+        $repo['logs'] = $git->log(array('limit' => 50));
+        return $repo;
+    }
+
+    // Commit changes to the repo. Default is to stage all changes and commit everything.
+    public function commit($msg, $options = [])
+    {
+        try {
+            return $this->git->commit($msg, $options);
+        } catch (GitException $ex) {
+            return false;
+        }
+    }
+
+    public static function isValidGitRepoURL($url)
+    {
+        if (validate_url($url) && strrpos(parse_url($url, PHP_URL_PATH), '.')) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public static function getRepoNameFromURL($url)
+    {
+        $urlpath = parse_url($url, PHP_URL_PATH);
+        $lastslash = strrpos($urlpath, '/') + 1;
+        $gitext = strrpos($urlpath, '.');
+        if ($gitext) {
+            return substr($urlpath, $lastslash, $gitext - $lastslash);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/Code/Storage/ZotOauth2Pdo.php b/Code/Storage/ZotOauth2Pdo.php
new file mode 100644
index 000000000..cf80a7a47
--- /dev/null
+++ b/Code/Storage/ZotOauth2Pdo.php
@@ -0,0 +1,13 @@
+config;
+    }
+}
diff --git a/Code/Text/Tagadelic.php b/Code/Text/Tagadelic.php
new file mode 100644
index 000000000..0d306514e
--- /dev/null
+++ b/Code/Text/Tagadelic.php
@@ -0,0 +1,47 @@
+Cover();
+
+        if ($data['found']) {
+            $photo = $data['data'];
+        }
+
+        if ($photo) {
+            $image = imagecreatefromstring($photo);
+            $dest = imagecreatetruecolor($width, $height);
+            $srcwidth = imagesx($image);
+            $srcheight = imagesy($image);
+
+            imagealphablending($dest, false);
+            imagesavealpha($dest, true);
+            imagecopyresampled($dest, $image, 0, 0, 0, 0, $width, $height, $srcwidth, $srcheight);
+            imagedestroy($image);
+            imagejpeg($dest, dbunescbin($attach['content']) . '.thumb');
+        }
+    }
+}
diff --git a/Code/Thumbs/Mp3audio.php b/Code/Thumbs/Mp3audio.php
new file mode 100644
index 000000000..191f40734
--- /dev/null
+++ b/Code/Thumbs/Mp3audio.php
@@ -0,0 +1,49 @@
+readAllTags();
+
+        $image = $id3->getImage();
+        if (is_array($image)) {
+            $photo = $image[1];
+        }
+
+        fclose($fh);
+
+        if ($photo) {
+            $image = imagecreatefromstring($photo);
+            $dest = imagecreatetruecolor($width, $height);
+            $srcwidth = imagesx($image);
+            $srcheight = imagesy($image);
+
+            imagealphablending($dest, false);
+            imagesavealpha($dest, true);
+            imagecopyresampled($dest, $image, 0, 0, 0, 0, $width, $height, $srcwidth, $srcheight);
+            imagedestroy($image);
+            imagejpeg($dest, dbunescbin($attach['content']) . '.thumb');
+        }
+    }
+}
diff --git a/Code/Thumbs/Pdf.php b/Code/Thumbs/Pdf.php
new file mode 100644
index 000000000..89bd020e1
--- /dev/null
+++ b/Code/Thumbs/Pdf.php
@@ -0,0 +1,49 @@
+ $t) {
+                $l = $l + 1;
+                $x = 3;
+                $y = ($l * $lsize) + 3 - $fsize;
+                imagestring($image, 1, $x, $y, $t, $colour);
+                if (($l * $lsize) >= $height) {
+                    break;
+                }
+            }
+            imagejpeg($image, dbunescbin($attach['content']) . '.thumb');
+        }
+    }
+}
diff --git a/Code/Thumbs/Video.php b/Code/Thumbs/Video.php
new file mode 100644
index 000000000..adee677e6
--- /dev/null
+++ b/Code/Thumbs/Video.php
@@ -0,0 +1,67 @@
+ 0 ");
+
+        if ($r1 && $r2 && $r3) {
+            return UPDATE_SUCCESS;
+        }
+        return UPDATE_FAILED;
+    }
+}
diff --git a/Code/Update/_1137.php b/Code/Update/_1137.php
new file mode 100644
index 000000000..4a351c529
--- /dev/null
+++ b/Code/Update/_1137.php
@@ -0,0 +1,16 @@
+0");
+
+        // this will fix peertube hubloc_url
+        $r2 = q("UPDATE hubloc SET hubloc_url = LEFT(hubloc_url, POSITION('/account' IN hubloc_url)-1) WHERE POSITION('/account' IN hubloc_url)>0");
+
+        if ($r1 && $r2) {
+            q("COMMIT");
+            return UPDATE_SUCCESS;
+        } else {
+            q("ROLLBACK");
+            return UPDATE_FAILED;
+        }
+    }
+}
diff --git a/Code/Update/_1216.php b/Code/Update/_1216.php
new file mode 100644
index 000000000..905b9c68a
--- /dev/null
+++ b/Code/Update/_1216.php
@@ -0,0 +1,19 @@
+ intval($rv['channel_id']),
+                                    'block_type' => 0,
+                                    'block_entity' => trim($l),
+                                    'block_comment' => t('Added by superblock')
+                                ]);
+                            }
+                        }
+                    }
+                    del_pconfig($rv['channel_id'], 'system', 'blocked');
+                }
+            }
+        }
+        return UPDATE_SUCCESS;
+    }
+
+
+    public function verify()
+    {
+
+        $r = q("select * from pconfig where cat = 'system' and k = 'blocked'");
+        if ($r) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/Code/Update/_1240.php b/Code/Update/_1240.php
new file mode 100644
index 000000000..c307cfc8a
--- /dev/null
+++ b/Code/Update/_1240.php
@@ -0,0 +1,43 @@
+in_progress['k'])) {
+                        $this->in_progress['v'] .= ' ' . ltrim($line);
+                        continue;
+                    }
+                } else {
+                    if (isset($this->in_progress['k'])) {
+                        $this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
+                        $this->in_progress = [];
+                    }
+                    $key = strtolower(substr($line, 0, strpos($line, ':')));
+                    if ($key) {
+                        $this->in_progress['k'] = $key;
+                        $this->in_progress['v'] = ltrim(substr($line, strpos($line, ':') + 1));
+                    }
+                }
+            }
+            if (isset($this->in_progress['k'])) {
+                $this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
+                $this->in_progress = [];
+            }
+        }
+    }
+
+    public function fetch()
+    {
+        return $this->parsed;
+    }
+
+    public function fetcharr()
+    {
+        $ret = [];
+        if ($this->parsed) {
+            foreach ($this->parsed as $x) {
+                foreach ($x as $y => $z) {
+                    $ret[$y] = $z;
+                }
+            }
+        }
+        return $ret;
+    }
+}
diff --git a/Code/Web/HTTPSig.php b/Code/Web/HTTPSig.php
new file mode 100644
index 000000000..23dd0cc92
--- /dev/null
+++ b/Code/Web/HTTPSig.php
@@ -0,0 +1,699 @@
+fetcharr();
+            $body = $data['body'];
+            $headers['(request-target)'] = $data['request_target'];
+        } else {
+            $headers = [];
+            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
+            $headers['content-type'] = $_SERVER['CONTENT_TYPE'];
+            $headers['content-length'] = $_SERVER['CONTENT_LENGTH'];
+
+            foreach ($_SERVER as $k => $v) {
+                if (strpos($k, 'HTTP_') === 0) {
+                    $field = str_replace('_', '-', strtolower(substr($k, 5)));
+                    $headers[$field] = $v;
+                }
+            }
+        }
+
+        //logger('SERVER: ' . print_r($_SERVER,true), LOGGER_ALL);
+        //logger('headers: ' . print_r($headers,true), LOGGER_ALL);
+
+        return $headers;
+    }
+
+
+    // See draft-cavage-http-signatures-10
+
+    public static function verify($data, $key = '', $keytype = '')
+    {
+
+        $body = $data;
+        $headers = null;
+
+        $result = [
+            'signer' => '',
+            'portable_id' => '',
+            'header_signed' => false,
+            'header_valid' => false,
+            'content_signed' => false,
+            'content_valid' => false
+        ];
+
+
+        $headers = self::find_headers($data, $body);
+
+        if (!$headers) {
+            return $result;
+        }
+
+        if (is_array($body)) {
+            btlogger('body is array!' . print_r($body, true));
+        }
+
+
+        $sig_block = null;
+
+        if (array_key_exists('signature', $headers)) {
+            $sig_block = self::parse_sigheader($headers['signature']);
+        } elseif (array_key_exists('authorization', $headers)) {
+            $sig_block = self::parse_sigheader($headers['authorization']);
+        }
+
+        if (!$sig_block) {
+            logger('no signature provided.', LOGGER_DEBUG);
+            return $result;
+        }
+
+        // Warning: This log statement includes binary data
+        // logger('sig_block: ' . print_r($sig_block,true), LOGGER_DATA);
+
+        $result['header_signed'] = true;
+
+        $signed_headers = $sig_block['headers'];
+        if (!$signed_headers) {
+            $signed_headers = ['date'];
+        }
+        $signed_data = '';
+        foreach ($signed_headers as $h) {
+            if (array_key_exists($h, $headers)) {
+                $signed_data .= $h . ': ' . $headers[$h] . "\n";
+            }
+            if ($h === '(created)') {
+                if ($sig_block['algorithm'] && (strpos($sig_block['algorithm'], 'rsa') !== false || strpos($sig_block['algorithm'], 'hmac') !== false || strpos($sig_block['algorithm'], 'ecdsa') !== false)) {
+                    logger('created not allowed here');
+                    return $result;
+                }
+                if ((!isset($sig_block['(created)'])) || (!intval($sig_block['(created)'])) || intval($sig_block['(created)']) > time()) {
+                    logger('created in future');
+                    return $result;
+                }
+                $signed_data .= '(created): ' . $sig_block['(created)'] . "\n";
+            }
+            if ($h === '(expires)') {
+                if ($sig_block['algorithm'] && (strpos($sig_block['algorithm'], 'rsa') !== false || strpos($sig_block['algorithm'], 'hmac') !== false || strpos($sig_block['algorithm'], 'ecdsa') !== false)) {
+                    logger('expires not allowed here');
+                    return $result;
+                }
+                if ((!isset($sig_block['(expires)'])) || (!intval($sig_block['(expires)'])) || intval($sig_block['(expires)']) < time()) {
+                    logger('signature expired');
+                    return $result;
+                }
+                $signed_data .= '(expires): ' . $sig_block['(expires)'] . "\n";
+            }
+            if ($h === 'date') {
+                $d = new DateTime($headers[$h]);
+                $d->setTimeZone(new DateTimeZone('UTC'));
+                $dplus = datetime_convert('UTC', 'UTC', 'now + 1 day');
+                $dminus = datetime_convert('UTC', 'UTC', 'now - 1 day');
+                $c = $d->format('Y-m-d H:i:s');
+                if ($c > $dplus || $c < $dminus) {
+                    logger('bad time: ' . $c);
+                    return $result;
+                }
+            }
+        }
+        $signed_data = rtrim($signed_data, "\n");
+
+        $algorithm = null;
+
+        if ($sig_block['algorithm'] === 'rsa-sha256') {
+            $algorithm = 'sha256';
+        }
+        if ($sig_block['algorithm'] === 'rsa-sha512') {
+            $algorithm = 'sha512';
+        }
+
+        if (!array_key_exists('keyId', $sig_block)) {
+            return $result;
+        }
+
+        $result['signer'] = $sig_block['keyId'];
+
+        $fkey = self::get_key($key, $keytype, $result['signer']);
+
+        if ($sig_block['algorithm'] === 'hs2019') {
+            if (isset($fkey['algorithm'])) {
+                if (strpos($fkey['algorithm'], 'rsa-sha256') !== false) {
+                    $algorithm = 'sha256';
+                }
+                if (strpos($fkey['algorithm'], 'rsa-sha512') !== false) {
+                    $algorithm = 'sha512';
+                }
+            }
+        }
+
+
+        if (!($fkey && $fkey['public_key'])) {
+            return $result;
+        }
+
+        $x = Crypto::verify($signed_data, $sig_block['signature'], $fkey['public_key'], $algorithm);
+
+        logger('verified: ' . $x, LOGGER_DEBUG);
+
+        if (!$x) {
+            // try again, ignoring the local actor (xchan) cache and refetching the key
+            // from its source
+
+            $fkey = self::get_key($key, $keytype, $result['signer'], true);
+
+            if ($fkey && $fkey['public_key']) {
+                $y = Crypto::verify($signed_data, $sig_block['signature'], $fkey['public_key'], $algorithm);
+                logger('verified: (cache reload) ' . $x, LOGGER_DEBUG);
+            }
+
+            if (!$y) {
+                logger('verify failed for ' . $result['signer'] . ' alg=' . $algorithm . (($fkey['public_key']) ? '' : ' no key'));
+                $sig_block['signature'] = base64_encode($sig_block['signature']);
+                logger('affected sigblock: ' . print_r($sig_block, true));
+                logger('headers: ' . print_r($headers, true));
+                logger('server: ' . print_r($_SERVER, true));
+                return $result;
+            }
+        }
+
+        $result['portable_id'] = $fkey['portable_id'];
+        $result['header_valid'] = true;
+
+        if (in_array('digest', $signed_headers)) {
+            $result['content_signed'] = true;
+            $digest = explode('=', $headers['digest'], 2);
+            if ($digest[0] === 'SHA-256') {
+                $hashalg = 'sha256';
+            }
+            if ($digest[0] === 'SHA-512') {
+                $hashalg = 'sha512';
+            }
+
+            if (base64_encode(hash($hashalg, $body, true)) === $digest[1]) {
+                $result['content_valid'] = true;
+            }
+
+            logger('Content_Valid: ' . (($result['content_valid']) ? 'true' : 'false'));
+            if (!$result['content_valid']) {
+                logger('invalid content signature: data ' . print_r($data, true));
+                logger('invalid content signature: headers ' . print_r($headers, true));
+                logger('invalid content signature: body ' . print_r($body, true));
+            }
+        }
+
+        return $result;
+    }
+
+    public static function get_key($key, $keytype, $id, $force = false)
+    {
+
+        if ($key) {
+            if (function_exists($key)) {
+                return $key($id);
+            }
+            return ['public_key' => $key];
+        }
+
+        if ($keytype === 'zot6') {
+            $key = self::get_zotfinger_key($id, $force);
+            if ($key) {
+                return $key;
+            }
+        }
+
+
+        if (strpos($id, '#') === false) {
+            $key = self::get_webfinger_key($id, $force);
+            if ($key) {
+                return $key;
+            }
+        }
+
+        $key = self::get_activitystreams_key($id, $force);
+        return $key;
+    }
+
+
+    public static function convertKey($key)
+    {
+
+        if (strstr($key, 'RSA ')) {
+            return Keyutils::rsatopem($key);
+        } elseif (substr($key, 0, 5) === 'data:') {
+            return Keyutils::convertSalmonKey($key);
+        } else {
+            return $key;
+        }
+    }
+
+
+    /**
+     * @brief
+     *
+     * @param string $id
+     * @return bool|string
+     *   false if no pub key found, otherwise return the pub key
+     */
+
+    public static function get_activitystreams_key($id, $force = false)
+    {
+
+        // Check the local cache first, but remove any fragments like #main-key since these won't be present in our cached data
+
+        $cache_url = ((strpos($id, '#')) ? substr($id, 0, strpos($id, '#')) : $id);
+
+        // $force is used to ignore the local cache and only use the remote data; for instance the cached key might be stale
+
+        if (!$force) {
+            $x = q(
+                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s') order by hubloc_id desc",
+                dbesc(str_replace('acct:', '', $cache_url)),
+                dbesc($cache_url),
+                dbesc($cache_url)
+            );
+
+            if ($x) {
+                $best = Libzot::zot_record_preferred($x);
+            }
+
+            if ($best && $best['xchan_pubkey']) {
+                return ['portable_id' => $best['xchan_hash'], 'public_key' => $best['xchan_pubkey'], 'algorithm' => get_xconfig($best['xchan_hash'], 'system', 'signing_algorithm'), 'hubloc' => $best];
+            }
+        }
+
+        // The record wasn't in cache. Fetch it now.
+
+        $r = Activity::fetch($id);
+        $signatureAlgorithm = EMPTY_STR;
+
+        if ($r) {
+            if (array_key_exists('publicKey', $r) && array_key_exists('publicKeyPem', $r['publicKey']) && array_key_exists('id', $r['publicKey'])) {
+                if ($r['publicKey']['id'] === $id || $r['id'] === $id) {
+                    $portable_id = ((array_key_exists('owner', $r['publicKey'])) ? $r['publicKey']['owner'] : EMPTY_STR);
+
+                    // the w3c sec context has conflicting names and no defined values for this property except
+                    // "http://www.w3.org/2000/09/xmldsig#rsa-sha1"
+
+                    // Since the names conflict, it could mess up LD-signatures but we will accept both, and at this
+                    // time we will only look for the substrings 'rsa-sha256' and 'rsa-sha512' within those properties.
+                    // We will also accept a toplevel 'sigAlgorithm' regardless of namespace with the same constraints.
+                    // Default to rsa-sha256 if we can't figure out. If they're sending 'hs2019' we have to
+                    // look for something.
+
+                    if (isset($r['publicKey']['signingAlgorithm'])) {
+                        $signatureAlgorithm = $r['publicKey']['signingAlgorithm'];
+                        set_xconfig($portable_id, 'system', 'signing_algorithm', $signatureAlgorithm);
+                    }
+                    if (isset($r['publicKey']['signatureAlgorithm'])) {
+                        $signatureAlgorithm = $r['publicKey']['signatureAlgorithm'];
+                        set_xconfig($portable_id, 'system', 'signing_algorithm', $signatureAlgorithm);
+                    }
+
+                    if (isset($r['sigAlgorithm'])) {
+                        $signatureAlgorithm = $r['sigAlgorithm'];
+                        set_xconfig($portable_id, 'system', 'signing_algorithm', $signatureAlgorithm);
+                    }
+
+                    return ['public_key' => self::convertKey($r['publicKey']['publicKeyPem']), 'portable_id' => $portable_id, 'algorithm' => (($signatureAlgorithm) ? $signatureAlgorithm : 'rsa-sha256'), 'hubloc' => []];
+                }
+            }
+        }
+
+        // No key was found
+
+        return false;
+    }
+
+
+    public static function get_webfinger_key($id, $force = false)
+    {
+
+        if (!$force) {
+            $x = q(
+                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s') order by hubloc_id desc",
+                dbesc(str_replace('acct:', '', $id)),
+                dbesc($id),
+                dbesc($id)
+            );
+
+            if ($x) {
+                $best = Libzot::zot_record_preferred($x);
+            }
+
+            if ($best && $best['xchan_pubkey']) {
+                return ['portable_id' => $best['xchan_hash'], 'public_key' => $best['xchan_pubkey'], 'algorithm' => get_xconfig($best['xchan_hash'], 'system', 'signing_algorithm'), 'hubloc' => $best];
+            }
+        }
+
+        $wf = Webfinger::exec($id);
+        $key = ['portable_id' => '', 'public_key' => '', 'algorithm' => '', 'hubloc' => []];
+
+        if ($wf) {
+            if (array_key_exists('properties', $wf) && array_key_exists('https://w3id.org/security/v1#publicKeyPem', $wf['properties'])) {
+                $key['public_key'] = self::convertKey($wf['properties']['https://w3id.org/security/v1#publicKeyPem']);
+            }
+            if (array_key_exists('links', $wf) && is_array($wf['links'])) {
+                foreach ($wf['links'] as $l) {
+                    if (!(is_array($l) && array_key_exists('rel', $l))) {
+                        continue;
+                    }
+                    if ($l['rel'] === 'magic-public-key' && array_key_exists('href', $l) && $key['public_key'] === EMPTY_STR) {
+                        $key['public_key'] = self::convertKey($l['href']);
+                    }
+                }
+            }
+        }
+
+        return (($key['public_key']) ? $key : false);
+    }
+
+
+    public static function get_zotfinger_key($id, $force = false)
+    {
+
+        if (!$force) {
+            $x = q(
+                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and and hubloc_network in ('nomad','zot6') order by hubloc_id desc",
+                dbesc(str_replace('acct:', '', $id)),
+                dbesc($id)
+            );
+
+            if ($x) {
+                $best = Libzot::zot_record_preferred($x);
+            }
+
+            if ($best && $best['xchan_pubkey']) {
+                return ['portable_id' => $best['xchan_hash'], 'public_key' => $best['xchan_pubkey'], 'algorithm' => get_xconfig($best['xchan_hash'], 'system', 'signing_algorithm'), 'hubloc' => $best];
+            }
+        }
+
+        $wf = Webfinger::exec($id);
+        $key = ['portable_id' => '', 'public_key' => '', 'algorithm' => '', 'hubloc' => []];
+
+        if ($wf) {
+            if (array_key_exists('properties', $wf) && array_key_exists('https://w3id.org/security/v1#publicKeyPem', $wf['properties'])) {
+                $key['public_key'] = self::convertKey($wf['properties']['https://w3id.org/security/v1#publicKeyPem']);
+            }
+            if (array_key_exists('links', $wf) && is_array($wf['links'])) {
+                foreach ($wf['links'] as $l) {
+                    if (!(is_array($l) && array_key_exists('rel', $l))) {
+                        continue;
+                    }
+                    if (in_array($l['rel'], ['http://purl.org/nomad', 'http://purl.org/zot/protocol/6.0']) && array_key_exists('href',$l) && $l['href'] !== EMPTY_STR) {
+                        // The third argument to Zotfinger::exec() tells it not to verify signatures
+                        // Since we're inside a function that is fetching keys with which to verify signatures,
+                        // this is necessary to prevent infinite loops.
+
+                        $z = Zotfinger::exec($l['href'], null, false);
+                        if ($z) {
+                            $i = Libzot::import_xchan($z['data']);
+                            if ($i['success']) {
+                                $key['portable_id'] = $i['hash'];
+
+                                $x = q(
+                                    "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' order by hubloc_id desc limit 1",
+                                    dbesc($l['href'])
+                                );
+                                if ($x) {
+                                    $key['hubloc'] = $x[0];
+                                }
+                                $key['algorithm'] = get_xconfig($i['hash'], 'system', 'signing_algorithm');
+                            }
+                        }
+                    }
+                    if ($l['rel'] === 'magic-public-key' && array_key_exists('href', $l) && $key['public_key'] === EMPTY_STR) {
+                        $key['public_key'] = self::convertKey($l['href']);
+                    }
+                }
+            }
+        }
+
+        return (($key['public_key']) ? $key : false);
+    }
+
+
+    /**
+     * @brief
+     *
+     * @param array $head
+     * @param string $prvkey
+     * @param string $keyid (optional, default '')
+     * @param bool $auth (optional, default false)
+     * @param string $alg (optional, default 'sha256')
+     * @param array $encryption [ 'key', 'algorithm' ] or false
+     * @return array
+     */
+    public static function create_sig($head, $prvkey, $keyid = EMPTY_STR, $auth = false, $alg = 'sha256', $encryption = false)
+    {
+
+        $return_headers = [];
+
+        if ($alg === 'sha256') {
+            $algorithm = 'rsa-sha256';
+        }
+        if ($alg === 'sha512') {
+            $algorithm = 'rsa-sha512';
+        }
+
+        $x = self::sign($head, $prvkey, $alg);
+
+        $headerval = 'keyId="' . $keyid . '",algorithm="' . (($algorithm === 'rsa-sha256') ? 'hs2019' : $algorithm) . '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
+
+        if ($encryption) {
+            $x = Crypto::encapsulate($headerval, $encryption['key'], $encryption['algorithm']);
+            if (is_array($x)) {
+                $headerval = 'iv="' . $x['iv'] . '",key="' . $x['key'] . '",alg="' . $x['alg'] . '",data="' . $x['data'] . '"';
+            }
+        }
+
+        if ($auth) {
+            $sighead = 'Authorization: Signature ' . $headerval;
+        } else {
+            $sighead = 'Signature: ' . $headerval;
+        }
+
+        if ($head) {
+            foreach ($head as $k => $v) {
+                // strip the request-target virtual header from the output headers
+                if ($k === '(request-target)') {
+                    continue;
+                }
+                $return_headers[] = $k . ': ' . $v;
+            }
+        }
+        $return_headers[] = $sighead;
+
+        return $return_headers;
+    }
+
+    /**
+     * @brief set headers
+     *
+     * @param array $headers
+     * @return void
+     */
+
+    public static function set_headers($headers)
+    {
+        if ($headers && is_array($headers)) {
+            foreach ($headers as $h) {
+                header($h);
+            }
+        }
+    }
+
+
+    /**
+     * @brief
+     *
+     * @param array $head
+     * @param string $prvkey
+     * @param string $alg (optional) default 'sha256'
+     * @return array
+     */
+
+    public static function sign($head, $prvkey, $alg = 'sha256')
+    {
+
+        $ret = [];
+
+        $headers = '';
+        $fields = '';
+
+        logger('signing: ' . print_r($head, true), LOGGER_DATA);
+
+        if ($head) {
+            foreach ($head as $k => $v) {
+                $headers .= strtolower($k) . ': ' . trim($v) . "\n";
+                if ($fields) {
+                    $fields .= ' ';
+                }
+                $fields .= strtolower($k);
+            }
+            // strip the trailing linefeed
+            $headers = rtrim($headers, "\n");
+        }
+
+        $sig = base64_encode(Crypto::sign($headers, $prvkey, $alg));
+
+        $ret['headers'] = $fields;
+        $ret['signature'] = $sig;
+
+        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
+     */
+
+    public static function parse_sigheader($header)
+    {
+
+        $ret = [];
+        $matches = [];
+
+        // if the header is encrypted, decrypt with (default) site private key and continue
+
+        if (preg_match('/iv="(.*?)"/ism', $header, $matches)) {
+            $header = self::decrypt_sigheader($header);
+        }
+
+        if (preg_match('/keyId="(.*?)"/ism', $header, $matches)) {
+            $ret['keyId'] = $matches[1];
+        }
+        if (preg_match('/created=([0-9]*)/ism', $header, $matches)) {
+            $ret['(created)'] = $matches[1];
+        }
+        if (preg_match('/expires=([0-9]*)/ism', $header, $matches)) {
+            $ret['(expires)'] = $matches[1];
+        }
+        if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) {
+            $ret['algorithm'] = $matches[1];
+        }
+        if (preg_match('/headers="(.*?)"/ism', $header, $matches)) {
+            $ret['headers'] = explode(' ', $matches[1]);
+        }
+        if (preg_match('/signature="(.*?)"/ism', $header, $matches)) {
+            $ret['signature'] = base64_decode(preg_replace('/\s+/', '', $matches[1]));
+        }
+
+        if (($ret['signature']) && ($ret['algorithm']) && (!$ret['headers'])) {
+            $ret['headers'] = ['date'];
+        }
+
+        return $ret;
+    }
+
+
+    /**
+     * @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
+     */
+
+    public static function decrypt_sigheader($header, $prvkey = null)
+    {
+
+        $iv = $key = $alg = $data = null;
+
+        if (!$prvkey) {
+            $prvkey = get_config('system', 'prvkey');
+        }
+
+        $matches = [];
+
+        if (preg_match('/iv="(.*?)"/ism', $header, $matches)) {
+            $iv = $matches[1];
+        }
+        if (preg_match('/key="(.*?)"/ism', $header, $matches)) {
+            $key = $matches[1];
+        }
+        if (preg_match('/alg="(.*?)"/ism', $header, $matches)) {
+            $alg = $matches[1];
+        }
+        if (preg_match('/data="(.*?)"/ism', $header, $matches)) {
+            $data = $matches[1];
+        }
+
+        if ($iv && $key && $alg && $data) {
+            return Crypto::unencapsulate(['encrypted' => true, 'iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data], $prvkey);
+        }
+
+        return '';
+    }
+}
diff --git a/Code/Web/HttpMeta.php b/Code/Web/HttpMeta.php
new file mode 100644
index 000000000..911ea74c1
--- /dev/null
+++ b/Code/Web/HttpMeta.php
@@ -0,0 +1,113 @@
+vars = [];
+        $this->og = [];
+        $this->ogproperties = [];
+    }
+
+    //Set Meta Value
+    //   Mode:
+    //      0 = Default - set if no value currently exists
+    //  1 = Overwrite - replace existing value(s)
+    //  2 = Multi - append to the array of values
+    public function set($property, $value, $mode = 0)
+    {
+        $ogallowsmulti = ['image', 'audio', 'video'];
+        if (strpos($property, 'og:') === 0) {
+            $count = 0;
+            foreach ($this->og as $ogk => $ogdata) {
+                if (strpos($ogdata['property'], $property) === 0) {
+                    if ($mode == 1) {
+                        unset($this->og[$ogk]);
+                        unset($this->ogproperties[$property]);
+                    } elseif ($mode == 0) {
+                        return;
+                    } elseif ($value == $ogdata['value']) {
+                        return;
+                    } else {
+                        $count++;
+                    }
+                }
+            }
+
+            if ($value !== null) {
+                //mode = 1 with value === null will delete the property entirely.
+                $components = explode(':', $property);
+                $ogp = $components[1];
+
+                if (!$count || in_array($ogp, $ogallowsmulti)) {
+                    $this->og[] = ['property' => $property, 'value' => $value];
+                    $this->ogproperties[$property] = $property;
+                }
+            }
+        } else {
+            $this->vars[$property] = $value;
+        }
+    }
+
+    public function check_required()
+    {
+        if (
+            in_array('og:title', $this->ogproperties)
+            && in_array('og:type', $this->ogproperties)
+            && (in_array('og:image', $this->ogproperties)
+                || in_array('og:image:url', $this->ogproperties))
+            && (array_key_exists('og:url', $this->ogproperties)
+                || array_key_exists('og:url:secure_url', $this->ogproperties))
+            && array_key_exists('og:description', $this->ogproperties)
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    public function get_field($field)
+    {
+        if (strpos($field, 'og:') === 0) {
+            foreach ($this->og as $ogdata) {
+                if (strpos($ogdata['property'], $field) === 0) {
+                    $arr[$field][] = $ogdata['value'];
+                }
+            }
+        } else {
+            $arr = $this->vars;
+        }
+
+        if (isset($arr) && is_array($arr) && array_key_exists($field, $arr) && $arr[$field]) {
+            return $arr[$field];
+        }
+        return false;
+    }
+
+
+    public function get()
+    {
+        // use 'name' for most meta fields, and 'property' for opengraph properties
+        $o = '';
+        if ($this->vars) {
+            foreach ($this->vars as $k => $v) {
+                $o .= '' . "\r\n";
+            }
+        }
+        if ($this->check_required()) {
+            foreach ($this->og as $ogdata) {
+                $o .= '' . "\r\n";
+            }
+        }
+        if ($o) {
+            return "\r\n" . $o;
+        }
+        return $o;
+    }
+}
diff --git a/Code/Web/Router.php b/Code/Web/Router.php
new file mode 100644
index 000000000..a0ea4d7a7
--- /dev/null
+++ b/Code/Web/Router.php
@@ -0,0 +1,267 @@
+controller = new $modname();
+                            App::$module_loaded = true;
+                        }
+                    }
+                }
+            }
+
+
+            /*
+             * If the site has a custom module to over-ride the standard module, use it.
+             * Otherwise, look for the standard program module
+             */
+
+            if (!(App::$module_loaded)) {
+                try {
+                    $filename = 'Code/SiteModule/' . ucfirst($module) . '.php';
+                    if (file_exists($filename)) {
+                        // This won't be picked up by the autoloader, so load it explicitly
+                        require_once($filename);
+                        $this->controller = new $modname();
+                        App::$module_loaded = true;
+                    } else {
+                        $filename = 'Code/Module/' . ucfirst($module) . '.php';
+                        if (file_exists($filename)) {
+                            $this->controller = new $modname();
+                            App::$module_loaded = true;
+                        }
+                    }
+                    if (!App::$module_loaded) {
+                        throw new Exception('Module not found');
+                    }
+                } catch (Exception $e) {
+                }
+            }
+
+            $x = [
+                'module' => $module,
+                'installed' => App::$module_loaded,
+                'controller' => $this->controller
+            ];
+
+            /**
+             * @hooks module_loaded
+             *   Called when a module has been successfully locate to server a URL request.
+             *   This provides a place for plugins to register module handlers which don't otherwise exist
+             *   on the system, or to completely over-ride an existing module.
+             *   If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if
+             *   there is no specific module file or matching plugin name.
+             *   The plugin should catch at least one of the module hooks for this URL.
+             *   * \e string \b module
+             *   * \e boolean \b installed
+             *   * \e mixed \b controller - The initialized module object
+             */
+            Hook::call('module_loaded', $x);
+            if ($x['installed']) {
+                App::$module_loaded = true;
+                $this->controller = $x['controller'];
+            }
+
+            /*
+             * The URL provided does not resolve to a valid module.
+              */
+
+            if (!(App::$module_loaded)) {
+                // undo the setting of a letsencrypt acme-challenge rewrite rule
+                // which blocks access to our .well-known routes.
+                // Also provide a config setting for sites that have a legitimate need
+                // for a custom .htaccess in the .well-known directory; but they should
+                // make the file read-only so letsencrypt doesn't modify it
+
+                if (strpos($_SERVER['REQUEST_URI'], '/.well-known/') === 0) {
+                    if (file_exists('.well-known/.htaccess') && get_config('system', 'fix_apache_acme', true)) {
+                        rename('.well-known/.htaccess', '.well-known/.htaccess.old');
+                    }
+                }
+
+                $x = [
+                    'module' => $module,
+                    'installed' => App::$module_loaded,
+                    'controller' => $this->controller
+                ];
+                Hook::call('page_not_found', $x);
+
+                // Stupid browser tried to pre-fetch our Javascript img template.
+                // Don't log the event or return anything - just quietly exit.
+
+                if ((x($_SERVER, 'QUERY_STRING')) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
+                    killme();
+                }
+
+                if (get_config('system', 'log_404', true)) {
+                    logger("Module {$module} not found.", LOGGER_DEBUG, LOG_WARNING);
+                    logger('index.php: page not found: ' . $_SERVER['REQUEST_URI']
+                        . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: '
+                        . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
+                }
+
+                header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
+                $tpl = Theme::get_template('404.tpl');
+                App::$page['content'] = replace_macros(Theme::get_template('404.tpl'), ['$message' => t('Page not found.')]);
+
+                // pretend this is a module so it will initialise the theme
+                App::$module = '404';
+                App::$module_loaded = true;
+                App::$error = true;
+            }
+        }
+    }
+
+    /**
+     * @brief
+     *
+     */
+    public function Dispatch()
+    {
+
+        /**
+         * Call module functions
+         */
+
+        if (App::$module_loaded) {
+            App::$page['page_title'] = App::$module;
+            $placeholder = '';
+
+            /*
+             * No theme has been specified when calling the module_init functions
+             * For this reason, please restrict the use of templates to those which
+             * do not provide any presentation details - as themes will not be able
+             * to over-ride them.
+             */
+
+            $arr = ['init' => true, 'replace' => false];
+            Hook::call(App::$module . '_mod_init', $arr);
+            if (!$arr['replace']) {
+                if ($this->controller && method_exists($this->controller, 'init')) {
+                    $this->controller->init();
+                }
+            }
+
+            /*
+             * Do all theme initialisation here before calling any additional module functions.
+             * The module_init function may have changed the theme.
+             * Additionally any page with a Comanche template may alter the theme.
+             * So we'll check for those now.
+             */
+
+
+            /*
+             * In case a page has overloaded a module, see if we already have a layout defined
+             * otherwise, if a PDL file exists for this module, use it
+             * The member may have also created a customised PDL that's stored in the config
+             */
+
+            load_pdl();
+
+            /*
+              * load current theme info
+              */
+
+            $current_theme = Theme::current();
+
+            $theme_info_file = 'view/theme/' . $current_theme[0] . '/php/theme.php';
+            if (file_exists($theme_info_file)) {
+                require_once($theme_info_file);
+            }
+
+            if (function_exists(str_replace('-', '_', $current_theme[0]) . '_init')) {
+                $func = str_replace('-', '_', $current_theme[0]) . '_init';
+                $func($a);
+            } elseif (x(App::$theme_info, 'extends') && file_exists('view/theme/' . App::$theme_info['extends'] . '/php/theme.php')) {
+                require_once('view/theme/' . App::$theme_info['extends'] . '/php/theme.php');
+                if (function_exists(str_replace('-', '_', App::$theme_info['extends']) . '_init')) {
+                    $func = str_replace('-', '_', App::$theme_info['extends']) . '_init';
+                    $func($a);
+                }
+            }
+
+            if (($_SERVER['REQUEST_METHOD'] === 'POST') && (!App::$error) && (!x($_POST, 'auth-params'))) {
+                Hook::call(App::$module . '_mod_post', $_POST);
+                if ($this->controller && method_exists($this->controller, 'post')) {
+                    $this->controller->post();
+                }
+            }
+
+            if (!App::$error) {
+                $arr = ['content' => App::$page['content'], 'replace' => false];
+                Hook::call(App::$module . '_mod_content', $arr);
+
+                if (!$arr['replace']) {
+                    if ($this->controller && method_exists($this->controller, 'get')) {
+                        $arr = ['content' => $this->controller->get(), 'replace' => false];
+                    }
+                }
+                Hook::call(App::$module . '_mod_aftercontent', $arr);
+                App::$page['content'] = (($arr['replace']) ? $arr['content'] : App::$page['content'] . $arr['content']);
+            }
+        }
+    }
+}
diff --git a/Code/Web/Session.php b/Code/Web/Session.php
new file mode 100644
index 000000000..8f461b565
--- /dev/null
+++ b/Code/Web/Session.php
@@ -0,0 +1,238 @@
+custom_handler = boolval(get_config('system', 'session_custom', false));
+
+        /*
+         * Set our session storage functions.
+         */
+
+        if ($this->custom_handler) {
+           /* Custom handler (files, memached, redis..) */
+
+            $session_save_handler = strval(get_config('system', 'session_save_handler', null));
+            $session_save_path = strval(get_config('system', 'session_save_path', null));
+            if ($session_save_handler && $session_save_path) {
+                ini_set('session.save_handler', $session_save_handler);
+                ini_set('session.save_path', $session_save_path);
+            } else {
+                logger('Session save handler or path not set.', LOGGER_NORMAL, LOG_ERR);
+            }
+        } else {
+            $handler = new SessionHandler();
+
+            $this->handler = $handler;
+
+            $x = session_set_save_handler($handler, false);
+            if (! $x) {
+                logger('Session save handler initialisation failed.', LOGGER_NORMAL, LOG_ERR);
+            }
+        }
+
+        // Force cookies to be secure (https only) if this site is SSL enabled.
+        // Must be done before session_start().
+
+        $arr = session_get_cookie_params();
+
+        // Note when setting cookies: set the domain to false which creates a single domain
+        // cookie. If you use a hostname it will create a .domain.com wildcard which will
+        // have some nasty side effects if you have any other subdomains running the same software.
+
+		session_set_cookie_params([
+			'lifetime' => ((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
+			'path' => ((isset($arr['path'])) ? $arr['path'] : '/'),
+			'domain' => (($arr['domain']) ? $arr['domain'] : false),
+			'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
+			'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
+			'samesite' => 'None'
+		]);
+
+    
+        register_shutdown_function('session_write_close');
+    }
+
+    public function start()
+    {
+        session_start();
+        $this->session_started = true;
+    }
+
+    /**
+     * @brief Resets the current session.
+     *
+     * @return void
+     */
+
+    public function nuke()
+    {
+        $this->new_cookie(0); // 0 means delete on browser exit
+        if ($_SESSION && count($_SESSION)) {
+            foreach ($_SESSION as $k => $v) {
+                unset($_SESSION[$k]);
+            }
+        }
+    }
+
+    public function new_cookie($xtime)
+    {
+
+        $newxtime = (($xtime > 0) ? (time() + $xtime) : 0);
+
+        $old_sid = session_id();
+
+        $arr = session_get_cookie_params();
+
+        if (($this->handler || $this->custom_handler) && $this->session_started) {
+            session_regenerate_id(true);
+
+            // force SessionHandler record creation with the new session_id
+            // which occurs as a side effect of read()
+            if (! $this->custom_handler) {
+                $this->handler->read(session_id());
+            }
+        } else {
+            logger('no session handler');
+        }
+
+        if (x($_COOKIE, 'jsdisabled')) {
+			setcookie(
+				'jsdisabled',
+				$_COOKIE['jsdisabled'],
+				[
+					'expires' => $newxtime,
+					'path' => '/',
+					'domain' => false,
+					'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
+					'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
+					'samesite' => 'None'
+				]
+			);
+		}    
+
+		setcookie(
+			session_name(),
+			session_id(),
+			[
+				'expires' => $newxtime,
+				'path' => '/',
+				'domain' => false,
+				'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
+				'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
+				'samesite' => 'None'
+			]
+		);
+
+        $arr = array('expire' => $xtime);
+        Hook::call('new_cookie', $arr);
+    }
+
+    public function extend_cookie()
+    {
+
+        $arr = session_get_cookie_params();
+
+        // if there's a long-term cookie, extend it
+
+        $xtime = (($_SESSION['remember_me']) ? (60 * 60 * 24 * 365) : 0 );
+
+        if ($xtime) {
+			setcookie(
+				session_name(),
+				session_id(),
+				[
+					'expires' => time() + $xtime,
+					'path' => '/',
+					'domain' => false,
+					'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
+					'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
+					'samesite' => 'None'
+				]
+			);
+		}
+
+        $arr = array('expire' => $xtime);
+        Hook::call('extend_cookie', $arr);
+    }
+
+
+    public function return_check()
+    {
+
+        // check a returning visitor against IP changes.
+        // If the change results in being blocked from re-entry with the current cookie
+        // nuke the session and logout.
+        // Returning at all indicates the session is still valid.
+
+        // first check if we're enforcing that sessions can't change IP address
+        // @todo what to do with IPv6 addresses
+
+        if ($_SESSION['addr'] && $_SESSION['addr'] != $_SERVER['REMOTE_ADDR']) {
+            logger('SECURITY: Session IP address changed: ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
+
+            $partial1 = substr($_SESSION['addr'], 0, strrpos($_SESSION['addr'], '.'));
+            $partial2 = substr($_SERVER['REMOTE_ADDR'], 0, strrpos($_SERVER['REMOTE_ADDR'], '.'));
+
+            $paranoia = intval(get_pconfig($_SESSION['uid'], 'system', 'paranoia'));
+
+            if (! $paranoia) {
+                $paranoia = intval(get_config('system', 'paranoia'));
+            }
+
+            switch ($paranoia) {
+                case 0:
+                    // no IP checking
+                    break;
+                case 2:
+                    // check 2 octets
+                    $partial1 = substr($partial1, 0, strrpos($partial1, '.'));
+                    $partial2 = substr($partial2, 0, strrpos($partial2, '.'));
+                    if ($partial1 == $partial2) {
+                        break;
+                    }
+                case 1:
+                    // check 3 octets
+                    if ($partial1 == $partial2) {
+                        break;
+                    }
+                case 3:
+                default:
+                    // check any difference at all
+                    logger('Session address changed. Paranoid setting in effect, blocking session. ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
+                    $this->nuke();
+                    goaway(z_root());
+                    break;
+            }
+        }
+        return true;
+    }
+}
diff --git a/Code/Web/SessionHandler.php b/Code/Web/SessionHandler.php
new file mode 100644
index 000000000..bd92518fa
--- /dev/null
+++ b/Code/Web/SessionHandler.php
@@ -0,0 +1,101 @@
+controller = new $modname();
+        }
+
+        $routes = Route::get();
+
+        if ($routes) {
+            foreach ($routes as $route) {
+                if (is_array($route) && strtolower($route[1]) === strtolower(argv(0)) . '/' . strtolower(argv($whicharg))) {
+                    include_once($route[0]);
+                    if (class_exists($modname)) {
+                        $this->controller = new $modname();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @brief
+     *
+     * @param string $method
+     * @return bool|mixed
+     */
+    public function call($method)
+    {
+
+        if (!$this->controller) {
+            return false;
+        }
+
+        if (method_exists($this->controller, $method)) {
+            return $this->controller->$method();
+        }
+
+        return false;
+    }
+}
diff --git a/Code/Web/WebServer.php b/Code/Web/WebServer.php
new file mode 100644
index 000000000..4eca6e909
--- /dev/null
+++ b/Code/Web/WebServer.php
@@ -0,0 +1,244 @@
+start_session();
+
+        $this->set_language();
+
+        $this->set_identities();
+
+        $this->initialise_notifications();
+
+        if (App::$install) {
+            /*
+             * During installation, only permit the view module and setup module.
+             * The view module is required to expand/replace variables in style.css
+             */
+
+            if (App::$module !== 'view') {
+                App::$module = 'setup';
+            }
+        } else {
+            /*
+             * check_config() is responsible for running update scripts. These automatically
+             * update the DB schema whenever we push a new one out. It also checks to see if
+             * any plugins have been added or removed and reacts accordingly.
+             */
+
+            check_config();
+        }
+
+        $this->create_channel_links();
+
+        $this->initialise_content();
+
+        $Router = new Router();
+        $Router->Dispatch();
+
+        // if the observer is a visitor, add some javascript to the page to let
+        // the application take them home.
+
+        $this->set_homebase();
+
+        // now that we've been through the module content, see if the page reported
+        // a permission problem via session based notifications and if so, a 403
+        // response would seem to be in order.
+
+        if (is_array($_SESSION['sysmsg']) && stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) {
+            header($_SERVER['SERVER_PROTOCOL'] . ' 403 ' . t('Permission denied.'));
+        }
+
+        construct_page();
+
+        killme();
+    }
+
+    private function start_session()
+    {
+
+        if (App::$session) {
+            App::$session->start();
+        } else {
+            session_start();
+            register_shutdown_function('session_write_close');
+        }
+    }
+
+    private function set_language()
+    {
+
+        /*
+         * Determine the language of the interface
+         */
+
+        // First use the browser preference, if available. This will fall back to 'en'
+        // if there is no built-in language support for the preferred languagge
+
+
+        App::$language = get_best_language();
+        load_translation_table(App::$language, App::$install);
+
+        // See if there's a request to over-ride the language
+        // store it in the session.
+
+        if (array_key_exists('system_language', $_REQUEST)) {
+            if (strlen($_REQUEST['system_language'])) {
+                $_SESSION['language'] = $_REQUEST['system_language'];
+            } else {
+                // reset to default if it's an empty string
+                unset($_SESSION['language']);
+            }
+        }
+
+        // If we've over-ridden the language, set it now.
+
+        if ((x($_SESSION, 'language')) && ($_SESSION['language'] !== App::$language)) {
+            App::$language = $_SESSION['language'];
+            load_translation_table(App::$language);
+        }
+    }
+
+    private function set_identities()
+    {
+
+        if ((x($_GET, 'zid')) && (! App::$install)) {
+            App::$query_string = strip_zids(App::$query_string);
+            if (! local_channel()) {
+                if ($_SESSION['my_address'] !== $_GET['zid']) {
+                    $_SESSION['my_address'] = $_GET['zid'];
+                    $_SESSION['authenticated'] = 0;
+                }
+                Channel::zid_init();
+            }
+        }
+
+        if ((x($_GET, 'zat')) && (! App::$install)) {
+            App::$query_string = strip_zats(App::$query_string);
+            if (! local_channel()) {
+                Channel::zat_init();
+            }
+        }
+
+        if ((x($_REQUEST, 'owt')) && (! App::$install)) {
+            $token = $_REQUEST['owt'];
+            App::$query_string = strip_query_param(App::$query_string, 'owt');
+            owt_init($token);
+        }
+
+        if ((x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || (App::$module === 'login')) {
+            require('include/auth.php');
+        }
+    }
+
+    private function initialise_notifications()
+    {
+        if (! x($_SESSION, 'sysmsg')) {
+            $_SESSION['sysmsg'] = [];
+        }
+
+        if (! x($_SESSION, 'sysmsg_info')) {
+            $_SESSION['sysmsg_info'] = [];
+        }
+    }
+
+    private function initialise_content()
+    {
+
+        /* initialise content region */
+
+        if (! x(App::$page, 'content')) {
+            App::$page['content'] = EMPTY_STR;
+        }
+
+        Hook::call('page_content_top', App::$page['content']);
+    }
+
+    private function create_channel_links()
+    {
+
+        /* Initialise the Link: response header if this is a channel page.
+         * This cannot be done inside the channel module because some protocol
+         * addons over-ride the module functions and these links are common
+         * to all protocol drivers; thus doing it here avoids duplication.
+         */
+
+        if (( App::$module === 'channel' ) && argc() > 1) {
+            App::$channel_links = [
+                [
+                    'rel'  => 'jrd',
+                    'type' => 'application/jrd+json',
+                    'href'  => z_root() . '/.well-known/webfinger?f=&resource=acct%3A' . argv(1) . '%40' . App::get_hostname()
+                ],
+
+                [
+                    'rel'  => 'alternate',
+                    'type' => 'application/x-zot+json',
+                    'href'  => z_root() . '/channel/' . argv(1)
+                ],
+
+				[
+					'rel'  => 'alternate',
+					'type' => 'application/x-nomad+json',
+					'href'  => z_root() . '/channel/' . argv(1)
+				],
+
+                [
+                    'rel'  => 'self',
+                    'type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+                    'href' => z_root() . '/channel/' . argv(1)
+                ],
+
+                [
+                    'rel'  => 'self',
+                    'type' => 'application/activity+json',
+                    'href' => z_root() . '/channel/' . argv(1)
+                ]
+            ];
+
+            $x = [ 'channel_address' => argv(1), 'channel_links' => App::$channel_links ];
+            Hook::call('channel_links', $x);
+            App::$channel_links = $x['channel_links'];
+            header('Link: ' . App::get_channel_links());
+        }
+    }
+
+    private function set_homebase()
+    {
+
+        // If you're just visiting, let javascript take you home
+
+        if (x($_SESSION, 'visitor_home')) {
+            $homebase = $_SESSION['visitor_home'];
+        } elseif (local_channel()) {
+            $homebase = z_root() . '/channel/' . App::$channel['channel_address'];
+        }
+
+        if (isset($homebase)) {
+            App::$page['content'] .= '';
+        }
+    }
+}
diff --git a/Code/Widget/Activity.php b/Code/Widget/Activity.php
new file mode 100644
index 000000000..b62cd9201
--- /dev/null
+++ b/Code/Widget/Activity.php
@@ -0,0 +1,68 @@
+ $v) {
+                if (!LibBlock::fetch_by_entity(local_channel(), $k)) {
+                    $arr[] = ['author_xchan' => $k, 'total' => $v];
+                }
+            }
+            usort($arr, 'total_sort');
+            xchan_query($arr);
+        }
+
+        $x = ['entries' => $arr];
+        Hook::call('activity_widget', $x);
+        $arr = $x['entries'];
+
+        if ($arr) {
+            $o .= '
      ';
+            $o .= '
      ' . t('Activity', 'widget') . '
      ';
+        }
+        return $o;
+    }
+}
diff --git a/Code/Widget/Activity_filter.php b/Code/Widget/Activity_filter.php
new file mode 100644
index 000000000..659404bc6
--- /dev/null
+++ b/Code/Widget/Activity_filter.php
@@ -0,0 +1,338 @@
+ t('Direct Messages'),
+            'icon' => 'envelope-o',
+            'url' => z_root() . '/' . $cmd . '/?dm=1',
+            'sel' => $dm_active,
+            'title' => t('Show direct (private) messages')
+        ];
+
+
+        $conv_active = ((isset($_GET['conv']) && intval($_GET['conv'])) ? 'active' : '');
+        if ($conv_active) {
+            $filter_active = 'personal';
+        }
+
+        $tabs[] = [
+            'label' => t('Personal Posts'),
+            'icon' => 'user-circle',
+            'url' => z_root() . '/' . $cmd . '/?conv=1',
+            'sel' => $conv_active,
+            'title' => t('Show posts that mention or involve me')
+        ];
+
+        $starred_active = ((isset($_GET['star']) && intval($_GET['star'])) ? 'active' : '');
+        if ($starred_active) {
+            $filter_active = 'star';
+        }
+
+        $tabs[] = [
+            'label' => t('Saved Posts'),
+            'icon' => 'star',
+            'url' => z_root() . '/' . $cmd . '/?star=1',
+            'sel' => $starred_active,
+            'title' => t('Show posts that I have saved')
+        ];
+
+        if (local_channel() && Apps::system_app_installed(local_channel(), 'Drafts')) {
+            $drafts_active = ((isset($_GET['draft']) && intval($_GET['draft'])) ? 'active' : '');
+            if ($drafts_active) {
+                $filter_active = 'drafts';
+            }
+
+            $tabs[] = [
+                'label' => t('Drafts'),
+                'icon' => 'floppy-o',
+                'url' => z_root() . '/' . $cmd . '/?draft=1',
+                'sel' => $drafts_active,
+                'title' => t('Show drafts that I have saved')
+            ];
+        }
+
+        if (x($_GET, 'search')) {
+            $video_active = (($_GET['search'] == 'video]') ? 'active' : '');
+            $filter_active = (($events_active) ? 'videos' : 'search');
+        }
+
+        $tabs[] = [
+            'label' => t('Videos'),
+            'icon' => 'video',
+            'url' => z_root() . '/' . $cmd . '/?search=video%5D',
+            'sel' => $video_active,
+            'title' => t('Show posts that include videos')
+        ];
+
+        if (x($_GET, 'verb')) {
+            $events_active = (($_GET['verb'] == '.Event') ? 'active' : '');
+            $polls_active = (($_GET['verb'] == '.Question') ? 'active' : '');
+            $filter_active = (($events_active) ? 'events' : 'polls');
+        }
+
+        $tabs[] = [
+            'label' => t('Events'),
+            'icon' => 'calendar',
+            'url' => z_root() . '/' . $cmd . '/?verb=%2EEvent',
+            'sel' => $events_active,
+            'title' => t('Show posts that include events')
+        ];
+
+        $tabs[] = [
+            'label' => t('Polls'),
+            'icon' => 'bar-chart',
+            'url' => z_root() . '/' . $cmd . '/?verb=%2EQuestion',
+            'sel' => $polls_active,
+            'title' => t('Show posts that include polls')
+        ];
+
+
+        $groups = q(
+            "SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
+            intval(local_channel())
+        );
+
+        if ($groups || Apps::system_app_installed(local_channel(), 'Virtual Lists')) {
+            if ($groups) {
+                foreach ($groups as $g) {
+                    if (x($_GET, 'gid')) {
+                        $group_active = (($_GET['gid'] == $g['id']) ? 'active' : '');
+                        $filter_active = 'group';
+                    }
+                    $gsub[] = [
+                        'label' => $g['gname'],
+                        'icon' => '',
+                        'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'],
+                        'sel' => $group_active,
+                        'title' => sprintf(t('Show posts related to the %s access list'), $g['gname'])
+                    ];
+                }
+            }
+            if (Apps::system_app_installed(local_channel(), 'Virtual Lists')) {
+                foreach ([':1', ':2', ':3'] as $l) {
+                    switch ($l) {
+                        case ':1':
+                            $gname = t('Connections');
+                            break;
+                        case ':2':
+                            $gname = t('Nomad');
+                            break;
+                        case ':3':
+                            $gname = t('ActivityPub');
+                            break;
+                        default:
+                            break;
+                    }
+
+                    if (x($_GET, 'gid')) {
+                        $group_active = (($_GET['gid'] == $l) ? 'active' : '');
+                        $filter_active = 'group';
+                    }
+
+                    $gsub[] = [
+                        'label' => $gname,
+                        'icon' => '',
+                        'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $l,
+                        'sel' => $group_active,
+                        'title' => sprintf(t('Show posts related to the %s access list'), $gname)
+                    ];
+                }
+            }
+            $tabs[] = [
+                'id' => 'privacy_groups',
+                'label' => t('Lists'),
+                'icon' => 'users',
+                'url' => '#',
+                'sel' => (($filter_active == 'group') ? true : false),
+                'title' => t('Show my access lists'),
+                'sub' => $gsub
+            ];
+        }
+
+        $forums = get_forum_channels(local_channel(), 1);
+
+        if ($forums) {
+            foreach ($forums as $f) {
+                if (x($_GET, 'pf') && x($_GET, 'cid')) {
+                    $forum_active = ((x($_GET, 'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : '');
+                    $filter_active = 'forums';
+                }
+                $fsub[] = [
+                    'label' => $f['xchan_name'],
+                    'img' => $f['xchan_photo_s'],
+                    'url' => z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id'],
+                    'sel' => $forum_active,
+                    'title' => t('Show posts to this group'),
+                    'lock' => ((isset($f['private_forum']) && $f['private_forum']) ? 'lock' : ''),
+                    'edit' => t('New post'),
+                    'edit_url' => $f['xchan_url']
+                ];
+            }
+
+            $tabs[] = [
+                'id' => 'forums',
+                'label' => t('Groups'),
+                'icon' => 'comments-o',
+                'url' => '#',
+                'sel' => (($filter_active == 'forums') ? true : false),
+                'title' => t('Show groups'),
+                'sub' => $fsub
+            ];
+        }
+
+        if (Features::enabled(local_channel(), 'filing')) {
+            $terms = q(
+                "select distinct term from term where uid = %d and ttype = %d order by term asc",
+                intval(local_channel()),
+                intval(TERM_FILE)
+            );
+
+            if ($terms) {
+                foreach ($terms as $t) {
+                    if (x($_GET, 'file')) {
+                        $file_active = (($_GET['file'] == $t['term']) ? 'active' : '');
+                        $filter_active = 'file';
+                    }
+                    $tsub[] = [
+                        'label' => $t['term'],
+                        'icon' => '',
+                        'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'],
+                        'sel' => $file_active,
+                        'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']),
+                    ];
+                }
+
+                $tabs[] = [
+                    'id' => 'saved_folders',
+                    'label' => t('Saved Folders'),
+                    'icon' => 'folder',
+                    'url' => '#',
+                    'sel' => (($filter_active == 'file') ? true : false),
+                    'title' => t('Show filed post categories'),
+                    'sub' => $tsub
+
+                ];
+            }
+        }
+
+        $ft = get_pconfig(local_channel(), 'system', 'followed_tags', EMPTY_STR);
+        if (is_array($ft) && $ft) {
+            foreach ($ft as $t) {
+                $tag_active = ((isset($_GET['netsearch']) && $_GET['netsearch'] === '#' . $t) ? 'active' : '');
+                if ($tag_active) {
+                    $filter_active = 'tags';
+                }
+
+                $tsub[] = [
+                    'label' => '#' . $t,
+                    'icon' => '',
+                    'url' => z_root() . '/' . $cmd . '/?search=' . '%23' . $t,
+                    'sel' => $tag_active,
+                    'title' => sprintf(t('Show posts with hashtag %s'), '#' . $t),
+                ];
+            }
+
+            $tabs[] = [
+                'id' => 'followed_tags',
+                'label' => t('Followed Hashtags'),
+                'icon' => 'bookmark',
+                'url' => '#',
+                'sel' => (($filter_active == 'tags') ? true : false),
+                'title' => t('Show followed hashtags'),
+                'sub' => $tsub
+            ];
+        }
+
+
+//      if(x($_GET,'search')) {
+//          $filter_active = 'search';
+//          $tabs[] = [
+//              'label' => t('Search'),
+//              'icon' => 'search',
+//              'url' => z_root() . '/' . $cmd . '/?search=' . $_GET['search'],
+//              'sel' => 'active disabled',
+//              'title' => t('Panel search')
+//          ];
+//      }
+
+        $name = [];
+        if (isset($_GET['name']) && $_GET['name']) {
+            $filter_active = 'name';
+        }
+        $name = [
+            'label' => x($_GET, 'name') ? $_GET['name'] : t('Name'),
+            'icon' => 'filter',
+            'url' => z_root() . '/' . $cmd . '/',
+            'sel' => $filter_active == 'name' ? 'is-valid' : '',
+            'title' => ''
+        ];
+
+        $reset = [];
+        if ($filter_active) {
+            $reset = [
+                'label' => '',
+                'icon' => 'remove',
+                'url' => z_root() . '/' . $cmd,
+                'sel' => '',
+                'title' => t('Remove active filter')
+            ];
+        }
+
+        $arr = ['tabs' => $tabs];
+
+        Hook::call('activity_filter', $arr);
+
+        $o = '';
+
+        if ($arr['tabs']) {
+            $content = replace_macros(Theme::get_template('common_pills.tpl'), [
+                '$pills' => $arr['tabs']
+            ]);
+
+            $o .= replace_macros(Theme::get_template('activity_filter_widget.tpl'), [
+                '$title' => t('Stream Filters'),
+    			'$content_id' => 'activity-filter-widget',
+                '$reset' => $reset,
+                '$content' => $content,
+                '$name' => $name
+            ]);
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Admin.php b/Code/Widget/Admin.php
new file mode 100644
index 000000000..456d61983
--- /dev/null
+++ b/Code/Widget/Admin.php
@@ -0,0 +1,75 @@
+ array(z_root() . '/admin/site/', t('Site'), 'site'),
+//          'profile_photo' => array(z_root() . '/admin/profile_photo', t('Site icon/logo'), 'profile_photo'),
+//          'cover_photo'   => array(z_root() . '/admin/cover_photo', t('Site photo'), 'cover_photo'),
+            'accounts' => array(z_root() . '/admin/accounts/', t('Accounts'), 'accounts', 'pending-update', t('Member registrations waiting for confirmation')),
+            'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'),
+            'security' => array(z_root() . '/admin/security/', t('Security'), 'security'),
+//          'features'      => array(z_root() . '/admin/features/', t('Features'),       'features'),
+            'addons' => array(z_root() . '/admin/addons/', t('Addons'), 'addons'),
+            'themes' => array(z_root() . '/admin/themes/', t('Themes'), 'themes'),
+            'queue' => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'),
+//          'profs'         => array(z_root() . '/admin/profs',     t('Profile Fields'), 'profs'),
+            'dbsync' => array(z_root() . '/admin/dbsync/', t('DB updates'), 'dbsync')
+        ];
+
+        /* get plugins admin page */
+
+        $r = q("SELECT * FROM addon WHERE plugin_admin = 1");
+
+        $plugins = [];
+        if ($r) {
+            foreach ($r as $h) {
+                $plugin = $h['aname'];
+                $plugins[] = array(z_root() . '/admin/addons/' . $plugin, $plugin, 'plugin');
+                // temp plugins with admin
+                App::$addons_admin[] = $plugin;
+            }
+        }
+
+        $logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs');
+
+        $arr = array('links' => $aside, 'plugins' => $plugins, 'logs' => $logs);
+        Hook::call('admin_aside', $arr);
+
+        $o .= replace_macros(Theme::get_template('admin_aside.tpl'), array(
+            '$admin' => $aside,
+            '$admtxt' => t('Admin'),
+            '$plugadmtxt' => t('Addon Features'),
+            '$plugins' => $plugins,
+            '$logtxt' => t('Logs'),
+            '$logs' => $logs,
+            '$h_pending' => t('Member registrations waiting for confirmation'),
+            '$admurl' => z_root() . '/admin/'
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Affinity.php b/Code/Widget/Affinity.php
new file mode 100644
index 000000000..361fb27f7
--- /dev/null
+++ b/Code/Widget/Affinity.php
@@ -0,0 +1,53 @@
+ t('Me'),
+                20 => t('Family'),
+                40 => t('Friends'),
+                60 => t('Peers'),
+                80 => t('Connections'),
+                99 => t('All')
+            );
+            Hook::call('affinity_labels', $labels);
+
+            $tpl = Theme::get_template('main_slider.tpl');
+            $x = replace_macros($tpl, [
+                '$cmin' => $cmin,
+                '$cmax' => $cmax,
+                '$lbl' => t('Friend zoom in/out'),
+                '$refresh' => t('Refresh'),
+                '$labels' => $labels,
+            ]);
+
+            $arr = array('html' => $x);
+            Hook::call('main_slider', $arr);
+            return $arr['html'];
+        }
+        return '';
+    }
+}
diff --git a/Code/Widget/Album.php b/Code/Widget/Album.php
new file mode 100644
index 000000000..1b21601f0
--- /dev/null
+++ b/Code/Widget/Album.php
@@ -0,0 +1,117 @@
+ $rr['id'],
+                    'twist' => ' ' . $twist . rand(2, 4),
+                    'link' => $imagelink,
+                    'title' => t('View Photo'),
+                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
+                    'alt' => $imgalt_e,
+                    'desc' => $desc_e,
+                    'ext' => $ext,
+                    'hash' => $rr['resource_id'],
+                    'unknown' => t('Unknown')
+                );
+            }
+        }
+
+
+        $tpl = Theme::get_template('photo_album.tpl');
+        $o .= replace_macros($tpl, array(
+            '$photos' => $photos,
+            '$album' => (($title) ? $title : $album),
+            '$album_id' => rand(),
+            '$album_edit' => array(t('Edit Album'), $album_edit),
+            '$can_post' => false,
+            '$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
+            '$order' => false,
+            '$upload_form' => $upload_form,
+            '$usage' => $usage_message
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Appcategories.php b/Code/Widget/Appcategories.php
new file mode 100644
index 000000000..db09bc9f9
--- /dev/null
+++ b/Code/Widget/Appcategories.php
@@ -0,0 +1,62 @@
+ 1 && argv(1) === 'available') {
+            $srchurl .= '/available';
+        }
+
+
+        $terms = [];
+
+        $r = q(
+            "select distinct(term.term)
+	        from term join app on term.oid = app.id
+    	    where app_channel = %d
+        	and term.uid = app_channel
+	        and term.otype = %d
+    	    and term.term != 'nav_featured_app'
+    	    and term.term != 'nav_pinned_app'
+        	order by term.term asc",
+            intval(local_channel()),
+            intval(TERM_OBJ_APP)
+        );
+
+        if ($r) {
+            foreach ($r as $rr) {
+                $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
+            }
+
+            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
+                '$title' => t('Categories'),
+                '$desc' => '',
+                '$sel_all' => (($selected == '') ? 'selected' : ''),
+                '$all' => t('Everything'),
+                '$terms' => $terms,
+                '$base' => $srchurl,
+
+            ));
+        }
+    }
+}
diff --git a/Code/Widget/Appcloud.php b/Code/Widget/Appcloud.php
new file mode 100644
index 000000000..a6e45fda0
--- /dev/null
+++ b/Code/Widget/Appcloud.php
@@ -0,0 +1,15 @@
+ 1 && argv(1) === 'available') ? 1 : 0);
+        return replace_macros(Theme::get_template('appstore.tpl'), [
+            '$title' => t('App Collections'),
+            '$options' => [
+                [z_root() . '/apps', t('Installed Apps'), 1 - $store],
+                [z_root() . '/apps/available', t('Available Apps'), $store]
+            ]
+        ]);
+    }
+}
diff --git a/Code/Widget/Archive.php b/Code/Widget/Archive.php
new file mode 100644
index 000000000..5ae184e16
--- /dev/null
+++ b/Code/Widget/Archive.php
@@ -0,0 +1,63 @@
+ t('Archives'),
+            '$size' => $visible_years,
+            '$cutoff_year' => $cutoff_year,
+            '$cutoff' => $cutoff,
+            '$url' => $url,
+            '$style' => $style,
+            '$showend' => $showend,
+            '$dates' => $ret
+        ));
+        return $o;
+    }
+}
diff --git a/Code/Widget/Bookmarkedchats.php b/Code/Widget/Bookmarkedchats.php
new file mode 100644
index 000000000..f86f1bfcc
--- /dev/null
+++ b/Code/Widget/Bookmarkedchats.php
@@ -0,0 +1,38 @@
+ t('Bookmarked Chatrooms'),
+            '$rooms' => $r
+        ));
+    }
+}
diff --git a/Code/Widget/Catcloud.php b/Code/Widget/Catcloud.php
new file mode 100644
index 000000000..61edbc19a
--- /dev/null
+++ b/Code/Widget/Catcloud.php
@@ -0,0 +1,48 @@
+ $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
+            }
+
+            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
+                '$title' => t('Categories'),
+                '$desc' => '',
+                '$sel_all' => (($selected == '') ? 'selected' : ''),
+                '$all' => t('Everything'),
+                '$terms' => $terms,
+                '$base' => $baseurl,
+
+            ));
+        }
+        return '';
+    }
+
+    public static function cardcategories_widget($baseurl, $selected = '')
+    {
+
+        if (!Apps::system_app_installed(App::$profile['profile_uid'], 'Categories')) {
+            return '';
+        }
+
+        $sql_extra = item_permissions_sql(App::$profile['profile_uid']);
+
+        $item_normal = "and item.item_hidden = 0 and item.item_type = 6 and item.item_deleted = 0
+			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
+			and item.item_blocked = 0 ";
+
+        $terms = [];
+        $r = q(
+            "select distinct(term.term)
+			from term join item on term.oid = item.id
+			where item.uid = %d
+			and term.uid = item.uid
+			and term.ttype = %d
+			and term.otype = %d
+			and item.owner_xchan = '%s'
+			$item_normal
+			$sql_extra
+			order by term.term asc",
+            intval(App::$profile['profile_uid']),
+            intval(TERM_CATEGORY),
+            intval(TERM_OBJ_POST),
+            dbesc(App::$profile['channel_hash'])
+        );
+        if ($r && count($r)) {
+            foreach ($r as $rr) {
+                $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
+            }
+
+            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
+                '$title' => t('Categories'),
+                '$desc' => '',
+                '$sel_all' => (($selected == '') ? 'selected' : ''),
+                '$all' => t('Everything'),
+                '$terms' => $terms,
+                '$base' => $baseurl,
+
+            ));
+        }
+        return '';
+    }
+
+
+    public static function categories_widget($baseurl, $selected = '')
+    {
+
+        if (!Apps::system_app_installed(App::$profile['profile_uid'], 'Categories')) {
+            return '';
+        }
+
+        require_once('include/security.php');
+
+        $sql_extra = item_permissions_sql(App::$profile['profile_uid']);
+
+        $item_normal = item_normal();
+
+        $terms = [];
+        $r = q(
+            "select distinct(term.term) from term join item on term.oid = item.id
+			where item.uid = %d
+			and term.uid = item.uid
+			and term.ttype = %d
+			and term.otype = %d
+			and item.owner_xchan = '%s'
+			and item.item_wall = 1
+			and item.verb != '%s'
+			$item_normal
+			$sql_extra
+			order by term.term asc",
+            intval(App::$profile['profile_uid']),
+            intval(TERM_CATEGORY),
+            intval(TERM_OBJ_POST),
+            dbesc(App::$profile['channel_hash']),
+            dbesc(ACTIVITY_UPDATE)
+        );
+        if ($r && count($r)) {
+            foreach ($r as $rr) {
+                $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
+            }
+
+            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
+                '$title' => t('Categories'),
+                '$desc' => '',
+                '$sel_all' => (($selected == '') ? 'selected' : ''),
+                '$all' => t('Everything'),
+                '$terms' => $terms,
+                '$base' => $baseurl,
+
+            ));
+        }
+        return '';
+    }
+}
diff --git a/Code/Widget/Cdav.php b/Code/Widget/Cdav.php
new file mode 100644
index 000000000..6ffd19bdc
--- /dev/null
+++ b/Code/Widget/Cdav.php
@@ -0,0 +1,197 @@
+db;
+
+        require_once 'vendor/autoload.php';
+
+        $o = '';
+
+        if (argc() <= 3 && argv(1) === 'calendar') {
+            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+
+            $sabrecals = $caldavBackend->getCalendarsForUser($principalUri);
+
+            //TODO: we should probably also check for permission to send stream here
+            $local_channels = q(
+                "SELECT * FROM channel LEFT JOIN abook ON abook_xchan = channel_hash WHERE channel_system = 0 AND channel_removed = 0 AND channel_hash != '%s' AND abook_channel = %d",
+                dbesc($channel['channel_hash']),
+                intval($channel['channel_id'])
+            );
+
+            $sharee_options .= '' . "\r\n";
+            foreach ($local_channels as $local_channel) {
+                $sharee_options .= '' . "\r\n";
+            }
+
+            $access_options = '' . "\r\n";
+            $access_options .= '' . "\r\n";
+
+            //list calendars
+            foreach ($sabrecals as $sabrecal) {
+                if ($sabrecal['share-access'] == 1) {
+                    $access = '';
+                }
+                if ($sabrecal['share-access'] == 2) {
+                    $access = 'read';
+                }
+                if ($sabrecal['share-access'] == 3) {
+                    $access = 'read-write';
+                }
+
+                $invites = $caldavBackend->getInvites($sabrecal['id']);
+
+                $json_source = '/cdav/calendar/json/' . $sabrecal['id'][0] . '/' . $sabrecal['id'][1];
+
+                $switch = get_pconfig(local_channel(), 'cdav_calendar', $sabrecal['id'][0]);
+
+                $color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39');
+
+                $editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript
+
+                $sharees = [];
+                $share_displayname = [];
+
+                foreach ($invites as $invite) {
+                    if (strpos($invite->href, 'mailto:') !== false) {
+                        $sharee = Channel::from_username(substr($invite->principal, 11));
+                        $sharees[] = [
+                            'name' => $sharee['channel_name'],
+                            'access' => (($invite->access == 3) ? ' (RW)' : ' (R)'),
+                            'hash' => $sharee['channel_hash']
+                        ];
+                    }
+                }
+
+                if (!$access) {
+                    $my_calendars[] = [
+                        'ownernick' => $channel['channel_address'],
+                        'uri' => $sabrecal['uri'],
+                        'displayname' => $sabrecal['{DAV:}displayname'],
+                        'calendarid' => $sabrecal['id'][0],
+                        'instanceid' => $sabrecal['id'][1],
+                        'json_source' => $json_source,
+                        'color' => $color,
+                        'editable' => $editable,
+                        'switch' => $switch,
+                        'sharees' => $sharees
+                    ];
+                } else {
+                    $shared_calendars[] = [
+                        'ownernick' => $channel['channel_address'],
+                        'uri' => $sabrecal['uri'],
+                        'displayname' => $sabrecal['{DAV:}displayname'],
+                        'calendarid' => $sabrecal['id'][0],
+                        'instanceid' => $sabrecal['id'][1],
+                        'json_source' => $json_source,
+                        'color' => $color,
+                        'editable' => $editable,
+                        'switch' => $switch,
+                        'sharer' => $sabrecal['{urn:ietf:params:xml:ns:caldav}calendar-description'],
+                        'access' => $access
+                    ];
+                }
+
+                if (!$access || $access === 'read-write') {
+                    $writable_calendars[] = [
+                        'displayname' => ((!$access) ? $sabrecal['{DAV:}displayname'] : $share_displayname[0]),
+                        'id' => $sabrecal['id']
+                    ];
+                }
+            }
+
+            $calendars[] = [
+                'ownernick' => $channel['channel_address'],
+                'displayname' => $channel['channel_name'],
+                'calendarid' => 'calendar',
+                'json_source' => '/calendar/json',
+                'color' => '#3a87ad',
+                'editable' => true,
+                'switch' => get_pconfig(local_channel(), 'cdav_calendar', 'calendar')
+            ];
+
+            $o .= replace_macros(Theme::get_template('cdav_widget_calendar.tpl'), [
+                '$calendars_label' => t('Channel Calendar'),
+                '$calendars' => $calendars,
+                '$my_calendars_label' => t('CalDAV Calendars'),
+                '$my_calendars' => $my_calendars,
+                '$shared_calendars_label' => t('Shared CalDAV Calendars'),
+                '$shared_calendars' => $shared_calendars,
+                '$sharee_options' => $sharee_options,
+                '$access_options' => $access_options,
+                '$share_label' => t('Share this calendar'),
+                '$share' => t('Share'),
+                '$edit_label' => t('Calendar name and color'),
+                '$edit' => t('Edit'),
+                '$create_label' => t('Create new CalDAV calendar'),
+                '$create' => t('Create'),
+                '$create_placeholder' => t('Calendar Name'),
+                '$tools_label' => t('Calendar Tools'),
+                '$tools_options_label' => [t('Channel Calendars'), t('CalDAV Calendars')],
+                '$import_label' => t('Import calendar'),
+                '$import_placeholder' => t('Select a calendar to import to'),
+                '$upload' => t('Upload'),
+                '$writable_calendars' => $writable_calendars
+            ]);
+
+            return $o;
+        }
+
+        if (argc() >= 2 && argv(1) === 'addressbook') {
+            $carddavBackend = new PDO($pdo);
+
+            $sabreabooks = $carddavBackend->getAddressBooksForUser($principalUri);
+
+            //list addressbooks
+            foreach ($sabreabooks as $sabreabook) {
+                $addressbooks[] = [
+                    'ownernick' => $channel['channel_address'],
+                    'uri' => $sabreabook['uri'],
+                    'displayname' => $sabreabook['{DAV:}displayname'],
+                    'id' => $sabreabook['id']
+
+                ];
+            }
+
+            $o .= replace_macros(Theme::get_template('cdav_widget_addressbook.tpl'), [
+                '$addressbooks_label' => t('Addressbooks'),
+                '$addressbooks' => $addressbooks,
+                '$edit_label' => t('Addressbook name'),
+                '$edit' => t('Edit'),
+                '$create_label' => t('Create new addressbook'),
+                '$create_placeholder' => t('Addressbook Name'),
+                '$create' => t('Create'),
+                '$tools_label' => t('Addressbook Tools'),
+                '$import_label' => t('Import addressbook'),
+                '$import_placeholder' => t('Select an addressbook to import to'),
+                '$upload' => t('Upload')
+            ]);
+
+            return $o;
+        }
+    }
+}
diff --git a/Code/Widget/Chatroom_list.php b/Code/Widget/Chatroom_list.php
new file mode 100644
index 000000000..3b74b07d6
--- /dev/null
+++ b/Code/Widget/Chatroom_list.php
@@ -0,0 +1,32 @@
+ t('Chatrooms'),
+                '$baseurl' => z_root(),
+                '$nickname' => App::$profile['channel_address'],
+                '$items' => $r,
+                '$overview' => t('Overview')
+            ));
+        }
+    }
+}
diff --git a/Code/Widget/Chatroom_members.php b/Code/Widget/Chatroom_members.php
new file mode 100644
index 000000000..79e35a6ad
--- /dev/null
+++ b/Code/Widget/Chatroom_members.php
@@ -0,0 +1,19 @@
+ t('Chat Members')
+        ));
+    }
+}
diff --git a/Code/Widget/Clock.php b/Code/Widget/Clock.php
new file mode 100644
index 000000000..ba6d55e41
--- /dev/null
+++ b/Code/Widget/Clock.php
@@ -0,0 +1,62 @@
+
+
      
+
+
+EOT;
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Collections.php b/Code/Widget/Collections.php
new file mode 100644
index 000000000..543f13e93
--- /dev/null
+++ b/Code/Widget/Collections.php
@@ -0,0 +1,59 @@
+ t('Common Connections'),
+            '$base' => z_root(),
+            '$uid' => $profile_uid,
+            '$cid' => $observer,
+            '$linkmore' => (($t > $cnt) ? 'true' : ''),
+            '$more' => sprintf(t('View all %d common connections'), $t),
+            '$items' => $r
+        ));
+    }
+}
diff --git a/Code/Widget/Cover_photo.php b/Code/Widget/Cover_photo.php
new file mode 100644
index 000000000..1f40e6dcc
--- /dev/null
+++ b/Code/Widget/Cover_photo.php
@@ -0,0 +1,102 @@
+') !== false) {
+            $style = '';
+        }
+
+        if (array_key_exists('title', $arr) && isset($arr['title'])) {
+            $title = $arr['title'];
+        } else {
+            $title = $channel['channel_name'];
+        }
+
+
+        if (array_key_exists('subtitle', $arr) && isset($arr['subtitle'])) {
+            $subtitle = $arr['subtitle'];
+        } else {
+            $subtitle = str_replace('@', '@', $channel['xchan_addr']);
+        }
+
+
+        if ($site_banner) {
+            $title = $site_banner;
+            $subtitle = '';
+        }
+
+        $c = Channel::get_cover_photo($channel_id, 'html');
+
+        if ($c) {
+            $c = str_replace('src=', 'data-src=', $c);
+            $photo_html = (($style) ? str_replace('alt=', ' style="' . $style . '" alt=', $c) : $c);
+
+            $o = replace_macros(Theme::get_template('cover_photo_widget.tpl'), array(
+                '$photo_html' => $photo_html,
+                '$title' => $title,
+                '$subtitle' => $subtitle,
+                '$hovertitle' => t('Click to show more'),
+                '$hide_cover' => $hide_cover
+            ));
+        }
+        return $o;
+    }
+}
diff --git a/Code/Widget/Design_tools.php b/Code/Widget/Design_tools.php
new file mode 100644
index 000000000..714407329
--- /dev/null
+++ b/Code/Widget/Design_tools.php
@@ -0,0 +1,19 @@
+ t('Events Tools'),
+            '$export' => t('Export Calendar'),
+            '$import' => t('Import Calendar'),
+            '$submit' => t('Submit')
+        ));
+    }
+}
diff --git a/Code/Widget/Filer.php b/Code/Widget/Filer.php
new file mode 100644
index 000000000..a8400a4ba
--- /dev/null
+++ b/Code/Widget/Filer.php
@@ -0,0 +1,44 @@
+ $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
+        }
+
+        return replace_macros(Theme::get_template('fileas_widget.tpl'), array(
+            '$title' => t('Saved Folders'),
+            '$desc' => '',
+            '$sel_all' => (($selected == '') ? 'selected' : ''),
+            '$all' => t('Everything'),
+            '$terms' => $terms,
+            '$base' => z_root() . '/' . App::$cmd
+        ));
+    }
+}
diff --git a/Code/Widget/Findpeople.php b/Code/Widget/Findpeople.php
new file mode 100644
index 000000000..38e7e0f8f
--- /dev/null
+++ b/Code/Widget/Findpeople.php
@@ -0,0 +1,47 @@
+'
+                    . sprintf(tt('%d invitation available', '%d invitations available', $x), $x)
+                    . '' . $inv;
+            }
+        }
+
+        $advanced_search = ((local_channel() && Features::enabled(local_channel(), 'advanced_dirsearch')) ? t('Advanced') : false);
+
+        return replace_macros(Theme::get_template('peoplefind.tpl'), array(
+            '$findpeople' => t('Find Channels'),
+            '$desc' => t('Enter name or interest'),
+            '$label' => t('Connect/Follow'),
+            '$hint' => t('Examples: Robert Morgenstein, Fishing'),
+            '$findthem' => t('Find'),
+            '$suggest' => t('Channel Suggestions'),
+            '$similar' => '', // FIXME and uncomment when mod/match working // t('Similar Interests'),
+            '$random' => '', // t('Random Profile'),
+            '$sites' => t('Affiliated sites'),
+            '$inv' => '', // t('Invite Friends'),
+            '$advanced_search' => $advanced_search,
+            '$advanced_hint' => "\r\n" . t('Advanced example: name=fred and country=iceland'),
+            '$loggedin' => local_channel()
+        ));
+    }
+}
diff --git a/Code/Widget/Follow.php b/Code/Widget/Follow.php
new file mode 100644
index 000000000..6430c8d43
--- /dev/null
+++ b/Code/Widget/Follow.php
@@ -0,0 +1,45 @@
+ t('Add New Connection'),
+            '$desc' => t('Enter channel address'),
+            '$hint' => t('Examples: bob@example.com, https://example.com/barbara'),
+            '$follow' => t('Connect'),
+            '$abook_usage_message' => $abook_usage_message
+        ]);
+    }
+}
diff --git a/Code/Widget/Fullprofile.php b/Code/Widget/Fullprofile.php
new file mode 100644
index 000000000..69c12aaec
--- /dev/null
+++ b/Code/Widget/Fullprofile.php
@@ -0,0 +1,20 @@
+= 0) {
+            $limit = " limit " . intval($arr['limit']) . " ";
+        } else {
+            $limit = EMPTY_STR;
+        }
+
+        $unseen = 0;
+        if (is_array($arr) && array_key_exists('unseen', $arr) && intval($arr['unseen'])) {
+            $unseen = 1;
+        }
+
+        $perms_sql = item_permissions_sql(local_channel()) . item_normal();
+
+        $xf = false;
+
+        $x1 = q(
+            "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and not v like '%s'",
+            intval(local_channel()),
+            dbesc('%send_stream%')
+        );
+        if ($x1) {
+            $xc = ids_to_querystr($x1, 'xchan', true);
+
+            $x2 = q(
+                "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s' and xchan in (" . $xc . ") ",
+                intval(local_channel()),
+                dbesc('%tag_deliver%')
+            );
+
+            if ($x2) {
+                $xf = ids_to_querystr($x2, 'xchan', true);
+
+                // private forums
+                $x3 = q(
+                    "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s' and xchan in (" . $xc . ") and not xchan in (" . $xf . ") ",
+                    intval(local_channel()),
+                    dbesc('%post_wall%')
+                );
+                if ($x3) {
+                    $xf = ids_to_querystr(array_merge($x2, $x3), 'xchan', true);
+                }
+            }
+        }
+
+        // note: XCHAN_TYPE_GROUP = 1
+        $sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_type = 1 ) " : " and xchan_type = 1 ");
+
+        $r1 = q(
+            "select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name $limit ",
+            intval(local_channel())
+        );
+
+        if (!$r1) {
+            return $output;
+        }
+
+        $str = EMPTY_STR;
+
+        // Trying to cram all this into a single query with joins and the proper group by's is tough.
+        // There also should be a way to update this via ajax.
+
+        for ($x = 0; $x < count($r1); $x++) {
+            $r = q(
+                "select sum(item_unseen) as unseen from item 
+				where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ",
+                intval(local_channel()),
+                dbesc($r1[$x]['xchan_hash'])
+            );
+            if ($r) {
+                $r1[$x]['unseen'] = $r[0]['unseen'];
+            }
+        }
+
+        /**
+         * @FIXME
+         * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
+         * (like personal channels). However the stream query for these posts doesn't yet include this
+         * correction and it makes the SQL for that query pretty hairy so this is left as a future exercise.
+         * It may make more sense in that query to look for the mention in the body rather than another join,
+         * but that makes it very inefficient.
+         *
+         *        $r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
+         *            intval(TERM_OBJ_POST),
+         *            dbesc($r1[$x]['xchan_hash']),
+         *            intval(local_channel()),
+         *            dbesc($r1[$x]['xchan_url']),
+         *            intval(TERM_MENTION)
+         *        );
+         *        if($r)
+         *            $r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
+         *
+         * end @FIXME
+         */
+
+        if ($r1) {
+            $output .= '
      ';
+            $output .= '
      ' . t('Groups') . '
      ';
+        }
+        return $output;
+    }
+}
diff --git a/Code/Widget/Helpindex.php b/Code/Widget/Helpindex.php
new file mode 100644
index 000000000..602d620c5
--- /dev/null
+++ b/Code/Widget/Helpindex.php
@@ -0,0 +1,59 @@
+';
+
+        $level_0 = get_help_content('sitetoc');
+        if (!$level_0) {
+            $path = 'toc';
+            $x = determine_help_language();
+            $lang = $x['language'];
+            if ($lang !== 'en') {
+                $path = $lang . '/toc';
+            }
+            $level_0 = get_help_content($path);
+        }
+
+        $level_0 = preg_replace('/\/', '
        ', $level_0);
+
+        $levels = [];
+
+
+        // TODO: Implement support for translations in hierarchical table of content files
+        /*
+        if(argc() > 2) {
+            $path = '';
+            for($x = 1; $x < argc(); $x ++) {
+                $path .= argv($x) . '/';
+                $y = get_help_content($path . 'sitetoc');
+                if(! $y)
+                    $y = get_help_content($path . 'toc');
+                if($y)
+                    $levels[] = preg_replace('/\/','
          ',$y);
+            }
+        }
+        */
+
+        if ($level_0) {
+            $o .= $level_0;
+        }
+        if ($levels) {
+            foreach ($levels as $l) {
+                $o .= '

          ';
+                $o .= $l;
+            }
+        }
+
+        $o .= '';
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Hq_controls.php b/Code/Widget/Hq_controls.php
new file mode 100644
index 000000000..20dbf55ac
--- /dev/null
+++ b/Code/Widget/Hq_controls.php
@@ -0,0 +1,33 @@
+ t('HQ Control Panel'),
+                '$menu' => [
+                    'create' => [
+                        'label' => t('Create a new post'),
+                        'id' => 'jot-toggle',
+                        'href' => '#',
+                        'class' => ''
+                    ]
+                ]
+            ]
+        );
+    }
+}
diff --git a/Code/Widget/Item.php b/Code/Widget/Item.php
new file mode 100644
index 000000000..4506ab26e
--- /dev/null
+++ b/Code/Widget/Item.php
@@ -0,0 +1,65 @@
+ t('Private Mail Menu'),
+            '$combined' => array(
+                'label' => t('Combined View'),
+                'url' => z_root() . '/mail/combined',
+                'sel' => (argv(1) == 'combined'),
+            ),
+            '$inbox' => array(
+                'label' => t('Inbox'),
+                'url' => z_root() . '/mail/inbox',
+                'sel' => (argv(1) == 'inbox'),
+            ),
+            '$outbox' => array(
+                'label' => t('Outbox'),
+                'url' => z_root() . '/mail/outbox',
+                'sel' => (argv(1) == 'outbox'),
+            ),
+            '$new' => array(
+                'label' => t('New Message'),
+                'url' => z_root() . '/mail/new',
+                'sel' => (argv(1) == 'new'),
+            )
+        ));
+    }
+}
diff --git a/Code/Widget/Menu_preview.php b/Code/Widget/Menu_preview.php
new file mode 100644
index 000000000..a60ad4df0
--- /dev/null
+++ b/Code/Widget/Menu_preview.php
@@ -0,0 +1,20 @@
+ 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/' . $c['channel_address'] => t('View your channel homepage'),
+                'stream' => t('View your stream'),
+            ],
+
+            t('Miscellaneous'),
+            [
+                'settings' => t('Settings'),
+            ]
+        ];
+
+        $public_stream_mode = intval(get_config('system', 'public_stream_mode', PUBLIC_STREAM_NONE));
+        // hack to put this in the correct spot of the array
+
+        if ($public_stream_mode) {
+            $options[5]['pubstream'] = t('View public stream');
+        }
+
+
+        $content = replace_macros(Theme::get_template('new_member.tpl'), [ '$options' => $options ]);
+    
+        $o = replace_macros(Theme::get_template('common_widget.tpl'), [
+            '$title' => t('New Member Links'),
+            '$content_id' => 'widget-new-member',
+            '$content' => $content,
+        ]);
+
+ 
+        return $o;
+    }
+}
diff --git a/Code/Widget/Notes.php b/Code/Widget/Notes.php
new file mode 100644
index 000000000..c2c9bd86e
--- /dev/null
+++ b/Code/Widget/Notes.php
@@ -0,0 +1,31 @@
+ t('Notes'),
+            '$text' => $text,
+            '$save' => t('Save'),
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Notifications.php b/Code/Widget/Notifications.php
new file mode 100644
index 000000000..52118c5b7
--- /dev/null
+++ b/Code/Widget/Notifications.php
@@ -0,0 +1,160 @@
+ 'stream',
+                'icon' => 'th',
+                'severity' => 'secondary',
+                'label' => t('New Stream Activity'),
+                'title' => t('New Stream Activity Notifications'),
+                'viewall' => [
+                    'url' => 'stream',
+                    'label' => t('View your stream activity')
+                ],
+                'markall' => [
+                    'label' => t('Mark all notifications read')
+                ],
+                'filter' => [
+                    'posts_label' => t('Show new posts only'),
+                    'name_label' => t('Filter by name')
+                ]
+            ];
+
+            $notifications[] = [
+                'type' => 'home',
+                'icon' => 'home',
+                'severity' => 'danger',
+                'label' => t('New Home Activity'),
+                'title' => t('New Home Activity Notifications'),
+                'viewall' => [
+                    'url' => 'channel/' . $channel['channel_address'],
+                    'label' => t('View your home activity')
+                ],
+                'markall' => [
+                    'label' => t('Mark all notifications seen')
+                ],
+                'filter' => [
+                    'posts_label' => t('Show new posts only'),
+                    'name_label' => t('Filter by name')
+                ]
+            ];
+
+            $notifications[] = [
+                'type' => 'all_events',
+                'icon' => 'calendar',
+                'severity' => 'secondary',
+                'label' => t('New Events'),
+                'title' => t('New Events Notifications'),
+                'viewall' => [
+                    'url' => 'events',
+                    'label' => t('View events')
+                ],
+                'markall' => [
+                    'label' => t('Mark all events seen')
+                ]
+            ];
+
+            $notifications[] = [
+                'type' => 'intros',
+                'icon' => 'users',
+                'severity' => 'danger',
+                'label' => t('New Connections'),
+                'title' => t('New Connections Notifications'),
+                'viewall' => [
+                    'url' => 'connections',
+                    'label' => t('View all connections')
+                ]
+            ];
+
+            $notifications[] = [
+                'type' => 'files',
+                'icon' => 'folder',
+                'severity' => 'danger',
+                'label' => t('New Files'),
+                'title' => t('New Files Notifications'),
+            ];
+
+            $notifications[] = [
+                'type' => 'notify',
+                'icon' => 'exclamation',
+                'severity' => 'danger',
+                'label' => t('Notices'),
+                'title' => t('Notices'),
+                'viewall' => [
+                    'url' => 'notifications/system',
+                    'label' => t('View all notices')
+                ],
+                'markall' => [
+                    'label' => t('Mark all notices seen')
+                ]
+            ];
+
+            $notifications[] = [
+                'type' => 'forums',
+                'icon' => 'comments-o',
+                'severity' => 'secondary',
+                'label' => t('Groups'),
+                'title' => t('Groups'),
+                'filter' => [
+                    'name_label' => t('Filter by name')
+                ]
+            ];
+        }
+
+        if (local_channel() && is_site_admin()) {
+            $notifications[] = [
+                'type' => 'register',
+                'icon' => 'user-o',
+                'severity' => 'danger',
+                'label' => t('New Registrations'),
+                'title' => t('New Registrations Notifications'),
+            ];
+        }
+
+        if (can_view_public_stream()) {
+            $notifications[] = [
+                'type' => 'pubs',
+                'icon' => 'globe',
+                'severity' => 'secondary',
+                'label' => t('Public Stream'),
+                'title' => t('Public Stream Notifications'),
+                'viewall' => [
+                    'url' => 'pubstream',
+                    'label' => t('View the public stream')
+                ],
+                'markall' => [
+                    'label' => t('Mark all notifications seen')
+                ],
+                'filter' => [
+                    'posts_label' => t('Show new posts only'),
+                    'name_label' => t('Filter by name')
+                ]
+            ];
+        }
+
+        $o = replace_macros(Theme::get_template('notifications_widget.tpl'), array(
+            '$module' => App::$module,
+            '$notifications' => $notifications,
+			'$notifications_label' => t('Notifications'),
+            '$no_notifications' => t('Sorry, you have got no notifications at the moment'),
+            '$loading' => t('Loading'),
+            '$startpage' => get_pconfig(local_channel(), 'system', 'startpage')
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Photo.php b/Code/Widget/Photo.php
new file mode 100644
index 000000000..c1ad6ee68
--- /dev/null
+++ b/Code/Widget/Photo.php
@@ -0,0 +1,61 @@
+') !== false) {
+            $style = '';
+        }
+
+        if (array_key_exists('zrl', $arr) && isset($arr['zrl'])) {
+            $zrl = (($arr['zrl']) ? true : false);
+        }
+
+        if ($zrl) {
+            $url = zid($url);
+        }
+
+        $o = '
          ';
+
+        $o .= '' . t('photo/image') . '';
+
+        $o .= '
          ';
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Photo_albums.php b/Code/Widget/Photo_albums.php
new file mode 100644
index 000000000..ca2e4f321
--- /dev/null
+++ b/Code/Widget/Photo_albums.php
@@ -0,0 +1,31 @@
+ $channel_id), App::get_observer(), $album);
+
+        $filtered = [];
+        if ($ret['success'] && $ret['photos']) {
+            foreach ($ret['photos'] as $p) {
+                if ($p['imgscale'] == $scale) {
+                    $filtered[] = $p['src'];
+                }
+            }
+        }
+
+        if ($filtered) {
+            $e = mt_rand(0, count($filtered) - 1);
+            $url = $filtered[$e];
+        }
+
+        if (strpos($url, 'http') !== 0) {
+            return '';
+        }
+
+        if (array_key_exists('style', $arr) && isset($arr['style'])) {
+            $style = $arr['style'];
+        }
+
+        // ensure they can't sneak in an eval(js) function
+
+        if (strpos($style, '(') !== false) {
+            return '';
+        }
+
+        $url = zid($url);
+
+        $o = '
          ';
+
+        $o .= '' . t('photo/image') . '';
+
+        $o .= '
          ';
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Pinned.php b/Code/Widget/Pinned.php
new file mode 100644
index 000000000..eb95f104a
--- /dev/null
+++ b/Code/Widget/Pinned.php
@@ -0,0 +1,113 @@
+allowed_types = get_config('system', 'pin_types', [ITEM_TYPE_POST]);
+
+        $this->uid = App::$profile_uid;
+
+        $types = (($args['types']) ?: [ITEM_TYPE_POST]);
+
+        $id_list = $this->list($types);
+
+        // logger('id_list: ' . print_r($id_list,true));
+
+        if (empty($id_list)) {
+            return $ret;
+        }
+
+        $o = conversation($id_list, 'stream-new', 0, 'traditional');
+
+        // change some id and class names so that auto-update doesn't stumble over them
+
+        $o = str_replace('
          ', '
          ', $o);
+        $o = str_replace('
          ', '
          ', $o);
+        $o = str_replace('
          ', '
          ', $o);
+        $o = str_replace('class="thread-wrapper ', 'class="pin-thread-wrapper ', $o);
+        $o = str_replace('class="wall-item-ago', 'class="wall-item-ago pinned', $o);
+
+        // logger('output: ' . $o);
+        return '
          ' . $o . '
          ';
+    }
+
+
+    /*
+     * @brief List pinned items depend on type
+     *
+     * @param $types
+     * @return array of pinned items
+     *
+     */
+    private function list($types)
+    {
+
+        if (empty($types) || (!is_array($types))) {
+            return [];
+        }
+
+        $item_types = array_intersect($this->allowed_types, $types);
+
+        if (empty($item_types)) {
+            return [];
+        }
+
+        $mids_list = [];
+
+        foreach ($item_types as $type) {
+            $mids = get_pconfig($this->uid, 'pinned', $type, []);
+            if ($mids) {
+                foreach ($mids as $mid) {
+                    if ($mid) {
+                        $mids_list[] = $mid;
+                    }
+                }
+            }
+        }
+        if (empty($mids_list)) {
+            return [];
+        }
+
+        $item_normal = item_normal();
+        $sql_extra = item_permissions_sql($this->uid);
+
+        $r = q(
+            "SELECT *, id as item_id FROM item WHERE parent_mid IN (" . protect_sprintf(stringify_array($mids_list, true)) . ") AND uid = %d AND id = parent $item_normal $sql_extra ORDER BY created DESC",
+            intval($this->uid)
+        );
+        if ($r) {
+            xchan_query($r, true);
+            $items = fetch_post_tags($r, true);
+
+            for ($x = 0; $x < count($items); $x++) {
+                $items[$x]['item_id'] = 'pin-' . $items[$x]['item_id'];
+            }
+
+            return $items;
+        }
+        return [];
+    }
+}
diff --git a/Code/Widget/Portfolio.php b/Code/Widget/Portfolio.php
new file mode 100644
index 000000000..2b7f4c1aa
--- /dev/null
+++ b/Code/Widget/Portfolio.php
@@ -0,0 +1,132 @@
+ $rr['id'],
+                    'twist' => ' ' . $twist . rand(2, 4),
+                    'link' => $imagelink,
+                    'title' => t('View Photo'),
+                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
+                    'fullsrc' => z_root() . '/photo/' . $rr['resource_id'] . '-' . '1' . '.' . $ext,
+                    'resource_id' => $rr['resource_id'],
+                    'alt' => $imgalt_e,
+                    'desc' => $desc_e,
+                    'ext' => $ext,
+                    'hash' => $rr['resource_id'],
+                    'unknown' => t('Unknown')
+                );
+            }
+        }
+
+
+        $tpl = Theme::get_template('photo_album_portfolio.tpl');
+        $o .= replace_macros($tpl, array(
+            '$photos' => $photos,
+            '$mode' => $mode,
+            '$count' => $count,
+            '$album' => (($title) ? $title : $album),
+            '$album_id' => rand(),
+            '$album_edit' => array(t('Edit Album'), $album_edit),
+            '$can_post' => false,
+            '$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
+            '$order' => false,
+            '$upload_form' => $upload_form,
+            '$usage' => $usage_message
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Profile.php b/Code/Widget/Profile.php
new file mode 100644
index 000000000..491aa1656
--- /dev/null
+++ b/Code/Widget/Profile.php
@@ -0,0 +1,20 @@
+';
+            if ($r[0]['title']) {
+                $o .= '
          ' . $r[0]['title'] . '
          ';
+            }
+
+            $o .= prepare_text($r[0]['body'], $r[0]['mimetype']);
+            $o .= '
          ';
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Rating.php b/Code/Widget/Rating.php
new file mode 100644
index 000000000..0fcbbcab6
--- /dev/null
+++ b/Code/Widget/Rating.php
@@ -0,0 +1,74 @@
+';
+        $o .= '
          ' . t('Rating Tools') . '
          ';
+
+        if ((($remote) || (local_channel())) && (!$self)) {
+            if ($remote) {
+                $o .= ' ' . t('Rate Me') . '';
+            } else {
+                $o .= '
           ' . t('Rate Me') . '
          ';
+            }
+        }
+
+        $o .= ' ' . t('View Ratings') . '';
+        $o .= '
          ';
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Savedsearch.php b/Code/Widget/Savedsearch.php
new file mode 100644
index 000000000..da121e3d7
--- /dev/null
+++ b/Code/Widget/Savedsearch.php
@@ -0,0 +1,105 @@
+ $rr['tid'],
+                    'term' => $rr['term'],
+                    'dellink' => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&searchremove=1&search=' . urlencode($rr['term']),
+                    'srchlink' => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&search=' . urlencode($rr['term']),
+                    'displayterm' => htmlspecialchars($rr['term'], ENT_COMPAT, 'UTF-8'),
+                    'encodedterm' => urlencode($rr['term']),
+                    'delete' => t('Remove term'),
+                    'selected' => ($search == $rr['term']),
+                );
+            }
+        }
+
+        $tpl = Theme::get_template("saved_searches.tpl");
+        $o = replace_macros($tpl, array(
+            '$title' => t('Saved Searches'),
+            '$add' => t('add'),
+            '$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), true),
+            '$saved' => $saved,
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Sblock.php b/Code/Widget/Sblock.php
new file mode 100644
index 000000000..125d89df6
--- /dev/null
+++ b/Code/Widget/Sblock.php
@@ -0,0 +1,27 @@
+ t('Block channel or site'),
+            '$desc' => t('Enter channel address or URL'),
+            '$hint' => t('Examples: bob@example.com, https://example.com/barbara'),
+            '$follow' => t('Block'),
+            '$abook_usage_message' => '',
+        ]);
+    }
+}
diff --git a/Code/Widget/Settings_menu.php b/Code/Widget/Settings_menu.php
new file mode 100644
index 000000000..200357fbc
--- /dev/null
+++ b/Code/Widget/Settings_menu.php
@@ -0,0 +1,143 @@
+ 1) ? true : false);
+
+        $tabs = array(
+            array(
+                'label' => t('Account settings'),
+                'url' => z_root() . '/settings/account',
+                'selected' => ((argv(1) === 'account') ? 'active' : ''),
+            ),
+
+            array(
+                'label' => t('Channel settings'),
+                'url' => z_root() . '/settings/channel',
+                'selected' => ((argv(1) === 'channel') ? 'active' : ''),
+            ),
+
+        );
+
+        $tabs[] = array(
+            'label' => t('Display settings'),
+            'url' => z_root() . '/settings/display',
+            'selected' => ((argv(1) === 'display') ? 'active' : ''),
+        );
+
+        $tabs[] = array(
+            'label' => t('Manage Blocks'),
+            'url' => z_root() . '/superblock',
+            'selected' => ((argv(0) === 'superblock') ? 'active' : ''),
+        );
+
+
+        if ($hublocs) {
+            $tabs[] = array(
+                'label' => t('Manage locations'),
+                'url' => z_root() . '/locs',
+                'selected' => ((argv(1) === 'locs') ? 'active' : ''),
+            );
+        }
+
+        $tabs[] = array(
+            'label' => t('Export channel'),
+            'url' => z_root() . '/uexport',
+            'selected' => ''
+        );
+
+//      if(Features::enabled(local_channel(),'oauth_clients')) {
+//          $tabs[] =   array(
+//              'label' => t('OAuth1 apps'),
+//              'url' => z_root() . '/settings/oauth',
+//              'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
+//          );
+//      }
+
+        if (Apps::system_app_installed(local_channel(), 'Clients')) {
+            $tabs[] = array(
+                'label' => t('Client apps'),
+                'url' => z_root() . '/settings/oauth2',
+                'selected' => ((argv(1) === 'oauth2') ? 'active' : ''),
+            );
+        }
+
+//      if(Features::enabled(local_channel(),'access_tokens')) {
+//          $tabs[] =   array(
+//              'label' => t('Guest Access Tokens'),
+//              'url' => z_root() . '/settings/tokens',
+//              'selected' => ((argv(1) === 'tokens') ? 'active' : ''),
+//          );
+//      }
+
+      if(Apps::system_app_installed(local_channel(),'Roles')) {
+          $tabs[] = array(
+              'label' => t('Permission Roles'),
+              'url' => z_root() . '/settings/permcats',
+              'selected' => ((argv(1) === 'permcats') ? 'active' : ''),
+          );
+      }
+
+
+//      if($role === false || $role === 'custom') {
+//          $tabs[] = array(
+//              'label' => t('Connection Default Permissions'),
+//              'url' => z_root() . '/defperms',
+//              'selected' => ''
+//          );
+//      }
+
+//      if(Features::enabled(local_channel(),'channel_sources')) {
+//          $tabs[] = array(
+//              'label' => t('Channel Sources'),
+//              'url' => z_root() . '/sources',
+//              'selected' => ''
+//          );
+//      }
+
+        $tabtpl = Theme::get_template("generic_links_widget.tpl");
+        return replace_macros($tabtpl, array(
+            '$title' => t('Settings'),
+            '$class' => 'settings-widget',
+            '$items' => $tabs,
+        ));
+    }
+}
diff --git a/Code/Widget/Shortprofile.php b/Code/Widget/Shortprofile.php
new file mode 100644
index 000000000..7b23baf9e
--- /dev/null
+++ b/Code/Widget/Shortprofile.php
@@ -0,0 +1,18 @@
+ t('Projects'),
+                '$desc' => '',
+                '$all' => t('All projects'),
+                'base' => z_root() . '/sites',
+                '$sel_all' => (($_REQUEST['project']) ? false : true),
+                '$terms' => $results
+            ]);
+
+            return $o;
+        }
+    }
+
+    public static function site_sort($a, $b)
+    {
+        if ($a['site_type'] === $b['site_type']) {
+            return strcasecmp($b['site_project'], $a['site_project']);
+        }
+        return (($a['site_type'] < $b['site_type']) ? -1 : 1);
+    }
+}
diff --git a/Code/Widget/Sitesearch.php b/Code/Widget/Sitesearch.php
new file mode 100644
index 000000000..ee9f64320
--- /dev/null
+++ b/Code/Widget/Sitesearch.php
@@ -0,0 +1,44 @@
+ t('Search'),
+            '$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), false),
+            '$saved' => $saved,
+        ));
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Stream_order.php b/Code/Widget/Stream_order.php
new file mode 100644
index 000000000..383878164
--- /dev/null
+++ b/Code/Widget/Stream_order.php
@@ -0,0 +1,147 @@
+ t('Commented Date'),
+            'icon' => '',
+            'url' => z_root() . '/' . $cmd . '?f=&order=comment' . $filter,
+            'sel' => $commentord_active,
+            'title' => t('Order by last commented date'),
+        ];
+        $tabs[] = [
+            'label' => t('Posted Date'),
+            'icon' => '',
+            'url' => z_root() . '/' . $cmd . '?f=&order=post' . $filter,
+            'sel' => $postord_active,
+            'title' => t('Order by last posted date'),
+        ];
+        $tabs[] = array(
+            'label' => t('Date Unthreaded'),
+            'icon' => '',
+            'url' => z_root() . '/' . $cmd . '?f=&order=unthreaded' . $filter,
+            'sel' => $unthreaded_active,
+            'title' => t('Order unthreaded by date'),
+        );
+
+        $arr = ['tabs' => $tabs];
+
+        Hook::call('activity_order', $arr);
+
+        $o = '';
+
+        if ($arr['tabs']) {
+            $content = replace_macros(Theme::get_template('common_pills.tpl'), [
+                '$pills' => $arr['tabs'],
+            ]);
+
+            $o = replace_macros(Theme::get_template('common_widget.tpl'), [
+                '$title' => t('Stream Order'),
+    			'$content_id' => 'widget-stream-order',
+                '$content' => $content,
+            ]);
+        }
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Suggestedchats.php b/Code/Widget/Suggestedchats.php
new file mode 100644
index 000000000..d3479f8eb
--- /dev/null
+++ b/Code/Widget/Suggestedchats.php
@@ -0,0 +1,45 @@
+ t('Suggested Chatrooms'),
+            '$rooms' => $r
+        ));
+    }
+}
diff --git a/Code/Widget/Suggestions.php b/Code/Widget/Suggestions.php
new file mode 100644
index 000000000..4077f617c
--- /dev/null
+++ b/Code/Widget/Suggestions.php
@@ -0,0 +1,63 @@
+ 2) ? mt_rand(0, count($r) - 2) : 0);
+
+        for ($x = $index; $x <= ($index + 1); $x++) {
+            $rr = $r[$x];
+            if (!$rr['xchan_url']) {
+                break;
+            }
+
+            $connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr'];
+
+            $arr[] = [
+                'url' => chanlink_url($rr['xchan_url']),
+                'profile' => $rr['xchan_url'],
+                'name' => $rr['xchan_name'],
+                'photo' => $rr['xchan_photo_m'],
+                'ignlnk' => z_root() . '/directory?return=' . base64_encode(App::$query_string) . '&ignore=' . $rr['xchan_hash'],
+                'conntxt' => t('Connect'),
+                'connlnk' => $connlnk,
+                'ignore' => t('Ignore/Hide')
+            ];
+        }
+
+        $o = replace_macros(Theme::get_template('suggest_widget.tpl'), [
+            '$title' => t('Suggestions'),
+            '$more' => t('See more...'),
+            '$entries' => $arr
+        ]);
+
+        return $o;
+    }
+}
diff --git a/Code/Widget/Tagcloud.php b/Code/Widget/Tagcloud.php
new file mode 100644
index 000000000..a2c435f3f
--- /dev/null
+++ b/Code/Widget/Tagcloud.php
@@ -0,0 +1,33 @@
+
          ' . t('Tags') . '
          ';
+            foreach ($r as $rv) {
+                $o .= '' . $rv[0] . '  ' . "\r\n";
+            }
+            $o .= '
          ';
+        }
+        return $o;
+    }
+}
diff --git a/Code/Widget/Tagcloud_wall.php b/Code/Widget/Tagcloud_wall.php
new file mode 100644
index 000000000..c36948e7c
--- /dev/null
+++ b/Code/Widget/Tagcloud_wall.php
@@ -0,0 +1,28 @@
+var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});';
+        $o .= '';
+
+        $o .= '
          ' . '
          ' . t('Tasks') . '
          ';
+        $o .= '
          ';
+        $o .= '
          ';
+        return $o;
+    }
+}
diff --git a/Code/Widget/Vcard.php b/Code/Widget/Vcard.php
new file mode 100644
index 000000000..8e4709e0c
--- /dev/null
+++ b/Code/Widget/Vcard.php
@@ -0,0 +1,13 @@
+ 875));
+    }
+}
diff --git a/Code/Zot6/IHandler.php b/Code/Zot6/IHandler.php
new file mode 100644
index 000000000..86ba1abc7
--- /dev/null
+++ b/Code/Zot6/IHandler.php
@@ -0,0 +1,15 @@
+error = false;
+        $this->validated = false;
+        $this->messagetype = '';
+        $this->response = ['success' => false];
+        $this->handler = $handler;
+        $this->data = null;
+        $this->rawdata = null;
+        $this->site_id = null;
+        $this->prvkey = Config::get('system', 'prvkey');
+
+        if ($localdata) {
+            $this->rawdata = $localdata;
+        } else {
+            $this->rawdata = file_get_contents('php://input');
+
+            // All access to the zot endpoint must use http signatures
+
+            if (!$this->Valid_Httpsig()) {
+                logger('signature failed');
+                $this->error = true;
+                $this->response['message'] = 'signature invalid';
+                return;
+            }
+        }
+
+        logger('received raw: ' . print_r($this->rawdata, true), LOGGER_DATA);
+
+
+        if ($this->rawdata) {
+            $this->data = json_decode($this->rawdata, true);
+            if (($this->data) && (!is_array($this->data)) && (substr($this->data, 0, 1) === "{")) {
+                // Multiple json encoding has been seen in the wild and needs to be fixed on the sending side.
+                // Proceed anyway and log the event with a backtrace.
+
+                btlogger('multiple encoding detected');
+                $this->data = json_decode($this->data, true);
+            }
+        } else {
+            $this->error = true;
+            $this->response['message'] = 'no data';
+        }
+
+        logger('received_json: ' . json_encode($this->data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES), LOGGER_DATA);
+
+        logger('received: ' . print_r($this->data, true), LOGGER_DATA);
+
+        if ($this->data && is_array($this->data)) {
+            $this->encrypted = ((array_key_exists('encrypted', $this->data) && intval($this->data['encrypted'])) ? true : false);
+
+            if ($this->encrypted && $this->prvkey) {
+                $uncrypted = Crypto::unencapsulate($this->data, $this->prvkey);
+                if ($uncrypted) {
+                    $this->data = json_decode($uncrypted, true);
+                } else {
+                    $this->error = true;
+                    $this->response['message'] = 'no data';
+                }
+            }
+        }
+    }
+
+
+    public function run()
+    {
+
+        if ($this->error) {
+            // make timing attacks on the decryption engine a bit more difficult
+            usleep(mt_rand(10000, 100000));
+            return ($this->response);
+        }
+
+        if ($this->data) {
+            if (array_key_exists('type', $this->data)) {
+                $this->messagetype = $this->data['type'];
+            }
+
+            if (!$this->messagetype) {
+                $this->error = true;
+                $this->response['message'] = 'no datatype';
+                return $this->response;
+            }
+
+            $this->sender = ((array_key_exists('sender', $this->data)) ? $this->data['sender'] : null);
+            $this->recipients = ((array_key_exists('recipients', $this->data)) ? $this->data['recipients'] : null);
+            $this->site_id = ((array_key_exists('site_id', $this->data)) ? $this->data['site_id'] : null);
+        }
+
+        if ($this->sender) {
+            $result = $this->ValidateSender();
+            if (!$result) {
+                $this->error = true;
+                return $this->response;
+            }
+        }
+
+        return $this->Dispatch();
+    }
+
+    public function ValidateSender()
+    {
+
+        $hub = Libzot::valid_hub($this->sender, $this->site_id);
+
+        if (!$hub) {
+            $x = Libzot::register_hub($this->sigdata['signer']);
+            if ($x['success']) {
+                $hub = Libzot::valid_hub($this->sender, $this->site_id);
+            }
+            if (!$hub) {
+                $this->response['message'] = 'sender unknown';
+                return false;
+            }
+        }
+
+        if (!check_siteallowed($hub['hubloc_url'])) {
+            $this->response['message'] = 'forbidden';
+            return false;
+        }
+
+        if (!check_channelallowed($this->sender)) {
+            $this->response['message'] = 'forbidden';
+            return false;
+        }
+
+        Libzot::update_hub_connected($hub, $this->site_id);
+
+        $this->validated = true;
+        $this->hub = $hub;
+        return true;
+    }
+
+
+    public function Valid_Httpsig()
+    {
+
+        $result = false;
+
+        $this->sigdata = HTTPSig::verify($this->rawdata, EMPTY_STR, 'zot6');
+
+        if ($this->sigdata && $this->sigdata['header_signed'] && $this->sigdata['header_valid']) {
+            $result = true;
+
+            // It is OK to not have signed content - not all messages provide content.
+            // But if it is signed, it has to be valid
+
+            if (($this->sigdata['content_signed']) && (!$this->sigdata['content_valid'])) {
+                $result = false;
+            }
+        }
+        return $result;
+    }
+
+    public function Dispatch()
+    {
+
+        switch ($this->messagetype) {
+            case 'purge':
+                $this->response = $this->handler->Purge($this->sender, $this->recipients, $this->hub);
+                break;
+
+            case 'refresh':
+                $this->response = $this->handler->Refresh($this->sender, $this->recipients, $this->hub, false);
+                break;
+
+            case 'force_refresh':
+                $this->response = $this->handler->Refresh($this->sender, $this->recipients, $this->hub, true);
+                break;
+
+            case 'rekey':
+                $this->response = $this->handler->Rekey($this->sender, $this->data, $this->hub);
+                break;
+
+            case 'activity':
+            case 'response': // upstream message
+            case 'sync':
+            default:
+                // Only accept these message types with a valid sender
+                if ($this->sender) {
+                    $this->response = $this->handler->Notify($this->data, $this->hub);
+                }
+                break;
+        }
+
+        logger('response_to_return: ' . print_r($this->response, true), LOGGER_DATA);
+
+        if ($this->encrypted) {
+            $this->EncryptResponse();
+        }
+
+        return ($this->response);
+    }
+
+    public function EncryptResponse()
+    {
+        $algorithm = Libzot::best_algorithm($this->hub['site_crypto']);
+        if ($algorithm) {
+            $this->response = Crypto::encapsulate(json_encode($this->response), $this->hub['hubloc_sitekey'], $algorithm);
+        }
+    }
+}
diff --git a/Code/Zot6/Zot6Handler.php b/Code/Zot6/Zot6Handler.php
new file mode 100644
index 000000000..668f014b1
--- /dev/null
+++ b/Code/Zot6/Zot6Handler.php
@@ -0,0 +1,200 @@
+ false];
+
+        logger('notify received from ' . $hub['hubloc_url']);
+
+        $x = Libzot::fetch($data, $hub);
+        $ret['delivery_report'] = $x;
+
+
+        $ret['success'] = true;
+        return $ret;
+    }
+
+
+    /**
+     * @brief Remote channel info (such as permissions or photo or something)
+     * has been updated. Grab a fresh copy and sync it.
+     *
+     * The difference between refresh and force_refresh is that force_refresh
+     * unconditionally creates a directory update record, even if no changes were
+     * detected upon processing.
+     *
+     * @param array $sender
+     * @param array $recipients
+     *
+     * @return json_return_and_die()
+     */
+
+    public static function reply_refresh($sender, $recipients, $hub, $force)
+    {
+        $ret = array('success' => false);
+
+        if ($recipients) {
+            // This would be a permissions update, typically for one connection
+
+            foreach ($recipients as $recip) {
+                $r = q(
+                    "select channel.*,xchan.* from channel
+					left join xchan on channel_hash = xchan_hash
+					where channel_hash ='%s' limit 1",
+                    dbesc($recip)
+                );
+
+                $x = Libzot::refresh(['hubloc_id_url' => $hub['hubloc_id_url']], $r[0], $force);
+            }
+        } else {
+            // system wide refresh
+            $x = Libzot::refresh(['hubloc_id_url' => $hub['hubloc_id_url']], null, $force);
+        }
+
+        $ret['success'] = true;
+        return $ret;
+    }
+
+
+    public static function rekey_request($sender, $data, $hub)
+    {
+
+        $ret = array('success' => false);
+
+        //  newsig is newkey signed with oldkey
+
+        // The original xchan will remain. In Zot/Receiver we will have imported the new xchan and hubloc to verify
+        // the packet authenticity. What we will do now is verify that the keychange operation was signed by the
+        // oldkey, and if so change all the abook, abconfig, group, and permission elements which reference the
+        // old xchan_hash.
+
+        if ((!$data['old_key']) && (!$data['new_key']) && (!$data['new_sig'])) {
+            return $ret;
+        }
+
+
+        $old = null;
+
+        if (Libzot::verify($data['old_guid'], $data['old_guid_sig'], $data['old_key'])) {
+            $oldhash = make_xchan_hash($data['old_guid'], $data['old_key']);
+            $old = q(
+                "select * from xchan where xchan_hash = '%s' limit 1",
+                dbesc($oldhash)
+            );
+        } else {
+            return $ret;
+        }
+
+
+        if (!$old) {
+            return $ret;
+        }
+
+        $xchan = $old[0];
+
+        if (!Libzot::verify($data['new_key'], $data['new_sig'], $xchan['xchan_pubkey'])) {
+            return $ret;
+        }
+
+        $r = q(
+            "select * from xchan where xchan_hash = '%s' limit 1",
+            dbesc($sender)
+        );
+
+        $newxchan = $r[0];
+
+        // @todo
+        // if ! $update create a linked identity
+
+
+        xchan_change_key($xchan, $newxchan, $data);
+
+        $ret['success'] = true;
+        return $ret;
+    }
+
+
+    /**
+     * @brief
+     *
+     * @param array $sender
+     * @param array $recipients
+     *
+     * return json_return_and_die()
+     */
+
+    public static function reply_purge($sender, $recipients, $hub)
+    {
+
+        $ret = array('success' => false);
+
+        if (!$sender) {
+            return $ret;
+        }
+
+        if ($recipients) {
+            // basically this means "unfriend"
+            foreach ($recipients as $recip) {
+                $channel = q(
+                    "select channel.*,xchan.* from channel
+					left join xchan on channel_hash = xchan_hash
+					where channel_hash = '%s' limit 1",
+                    dbesc($recip)
+                );
+                if ($channel) {
+                    $abook = q(
+                        "select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
+                        intval($channel[0]['channel_id']),
+                        dbesc($sender)
+                    );
+                    if ($abook) {
+                        contact_remove($channel[0]['channel_id'], $abook[0]['abook_id']);
+                    }
+                }
+            }
+            $ret['success'] = true;
+        } else {
+            // Unfriend everybody - basically this means the channel has committed suicide
+
+            remove_all_xchan_resources($sender);
+
+            $ret['success'] = true;
+        }
+
+        return $ret;
+    }
+}
diff --git a/Zotlabs/Access/AccessControl.php b/Zotlabs/Access/AccessControl.php
deleted file mode 100644
index 9eeef3594..000000000
--- a/Zotlabs/Access/AccessControl.php
+++ /dev/null
@@ -1,169 +0,0 @@
- string of allowed cids
-     *   * \e string \b channel_allow_gid => string of allowed gids
-     *   * \e string \b channel_deny_cid => string of denied cids
-     *   * \e string \b channel_deny_gid => string of denied gids
-     */
-    public function __construct($channel)
-    {
-        if ($channel) {
-            $this->allow_cid = $channel['channel_allow_cid'];
-            $this->allow_gid = $channel['channel_allow_gid'];
-            $this->deny_cid = $channel['channel_deny_cid'];
-            $this->deny_gid = $channel['channel_deny_gid'];
-        } else {
-            $this->allow_cid = '';
-            $this->allow_gid = '';
-            $this->deny_cid = '';
-            $this->deny_gid = '';
-        }
-
-        $this->explicit = false;
-    }
-
-    /**
-     * @brief Get if we are using the default constructor values
-     * or values that have been set explicitly.
-     *
-     * @return bool
-     */
-    public function get_explicit()
-    {
-        return $this->explicit;
-    }
-
-    /**
-     * @brief Set access list from strings such as those in already
-     * existing stored data items.
-     *
-     * @note The array to pass to this set function is different from the array
-     * that you provide to the constructor or set_from_array().
-     *
-     * @param array $arr
-     *   * \e string \b allow_cid => string of allowed cids
-     *   * \e string \b allow_gid => string of allowed gids
-     *   * \e string \b deny_cid  => string of denied cids
-     *   * \e string \b deny_gid  => string of denied gids
-     * @param bool $explicit (optional) default true
-     */
-    public function set($arr, $explicit = true)
-    {
-        $this->allow_cid = $arr['allow_cid'];
-        $this->allow_gid = $arr['allow_gid'];
-        $this->deny_cid = $arr['deny_cid'];
-        $this->deny_gid = $arr['deny_gid'];
-
-        $this->explicit = $explicit;
-    }
-
-    /**
-     * @brief Return an array consisting of the current access list components
-     * where the elements are directly storable.
-     *
-     * @return array An associative array with:
-     *   * \e string \b allow_cid => string of allowed cids
-     *   * \e string \b allow_gid => string of allowed gids
-     *   * \e string \b deny_cid  => string of denied cids
-     *   * \e string \b deny_gid  => string of denied gids
-     */
-    public function get()
-    {
-        return [
-            'allow_cid' => $this->allow_cid,
-            'allow_gid' => $this->allow_gid,
-            'deny_cid' => $this->deny_cid,
-            'deny_gid' => $this->deny_gid,
-        ];
-    }
-
-    /**
-     * @brief Set access list components from arrays, such as those provided by
-     * acl_selector().
-     *
-     * For convenience, a string (or non-array) input is assumed to be a
-     * comma-separated list and auto-converted into an array.
-     *
-     * @note The array to pass to this set function is different from the array
-     * that you provide to the constructor or set().
-     *
-     * @param array $arr An associative array with:
-     *   * \e array|string \b contact_allow => array with cids or comma-seperated string
-     *   * \e array|string \b group_allow   => array with gids or comma-seperated string
-     *   * \e array|string \b contact_deny  => array with cids or comma-seperated string
-     *   * \e array|string \b group_deny    => array with gids or comma-seperated string
-     * @param bool $explicit (optional) default true
-     */
-    public function set_from_array($arr, $explicit = true)
-    {
-        $this->allow_cid = perms2str((is_array($arr['contact_allow']))
-            ? $arr['contact_allow'] : explode(',', $arr['contact_allow']));
-        $this->allow_gid = perms2str((is_array($arr['group_allow']))
-            ? $arr['group_allow'] : explode(',', $arr['group_allow']));
-        $this->deny_cid = perms2str((is_array($arr['contact_deny']))
-            ? $arr['contact_deny'] : explode(',', $arr['contact_deny']));
-        $this->deny_gid = perms2str((is_array($arr['group_deny']))
-            ? $arr['group_deny'] : explode(',', $arr['group_deny']));
-
-        $this->explicit = $explicit;
-    }
-
-    /**
-     * @brief Returns true if any access lists component is set.
-     *
-     * @return bool Return true if any of allow_* deny_* values is set.
-     */
-    public function is_private()
-    {
-        return (($this->allow_cid || $this->allow_gid || $this->deny_cid || $this->deny_gid) ? true : false);
-    }
-}
diff --git a/Zotlabs/Access/PermissionLimits.php b/Zotlabs/Access/PermissionLimits.php
deleted file mode 100644
index a47621e5d..000000000
--- a/Zotlabs/Access/PermissionLimits.php
+++ /dev/null
@@ -1,109 +0,0 @@
- $v) {
-            if (strstr($k, 'view')) {
-                $limits[$k] = PERMS_PUBLIC;
-            } else {
-                $limits[$k] = PERMS_SPECIFIC;
-            }
-        }
-
-        return $limits;
-    }
-
-    /**
-     * @brief Sets a permission limit for a channel.
-     *
-     * @param int $channel_id
-     * @param string $perm
-     * @param int $perm_limit one of PERMS_* constants
-     */
-    public static function Set($channel_id, $perm, $perm_limit)
-    {
-        PConfig::Set($channel_id, 'perm_limits', $perm, $perm_limit);
-    }
-
-    /**
-     * @brief Get a channel's permission limits.
-     *
-     * Return a channel's permission limits from PConfig. If $perm is set just
-     * return this permission limit, if not set, return an array with all
-     * permission limits.
-     *
-     * @param int $channel_id
-     * @param string $perm (optional)
-     * @return
-     *   * \b false if no perm_limits set for this channel
-     *   * \b int if $perm is set, return one of PERMS_* constants for this permission, default 0
-     *   * \b array with all permission limits, if $perm is not set
-     */
-    public static function Get($channel_id, $perm = '')
-    {
-
-        if (! intval($channel_id)) {
-            return false;
-        }
-        
-        if ($perm) {
-            $x = PConfig::Get($channel_id, 'perm_limits', $perm);
-            if ($x === false) {
-                $a = [ 'channel_id' => $channel_id, 'permission' => $perm, 'value' => $x ];
-                Hook::call('permission_limits_get', $a);
-                return intval($a['value']);
-            }
-            return intval($x);
-        }
-
-        PConfig::Load($channel_id);
-        if (array_key_exists($channel_id, App::$config) && array_key_exists('perm_limits', App::$config[$channel_id])) {
-            return App::$config[$channel_id]['perm_limits'];
-        }
-
-        return false;
-    }
-}
diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php
deleted file mode 100644
index 03c1fdd04..000000000
--- a/Zotlabs/Access/PermissionRoles.php
+++ /dev/null
@@ -1,155 +0,0 @@
- $role, 'result' => $ret];
-
-        Hook::call('get_role_perms', $x);
-
-        return $x['result'];
-    }
-
-
-    /**
-     * @brief Array with translated role names and grouping.
-     *
-     * Return an associative array with grouped role names that can be used
-     * to create select groups like in \e field_select_grouped.tpl.
-     *
-     * @return array
-     */
-    public static function roles()
-    {
-        $roles = [
-            t('Social Networking') => [
-                'social' => t('Social - Normal'),
-                'social_restricted' => t('Social - Restricted')
-            ],
-
-            t('Community Group') => [
-                'forum' => t('Group - Normal'),
-                'forum_restricted' => t('Group - Restricted'),
-                'forum_moderated' => t('Group - Moderated')
-            ],
-        ];
-
-        Hook::call('list_permission_roles', $roles);
-
-        return $roles;
-    }
-
-}
diff --git a/Zotlabs/Access/Permissions.php b/Zotlabs/Access/Permissions.php
deleted file mode 100644
index 8631f070f..000000000
--- a/Zotlabs/Access/Permissions.php
+++ /dev/null
@@ -1,298 +0,0 @@
- t('Grant viewing access to and delivery of your channel stream and posts'),
-            'view_profile'  => t('Grant viewing access to your default channel profile'),
-            'view_contacts' => t('Grant viewing access to your address book (connections)'),
-            'view_storage'  => t('Grant viewing access to your file storage and photos'),
-            'post_wall'     => t('Grant permission to post on your channel (wall) page'),
-            'post_mail'     => t('Accept delivery of direct messages and personal mail'),
-            'send_stream'   => t('Accept delivery of their posts and all comments to their posts'),
-            'post_comments' => t('Accept delivery of their comments and likes on your posts'),
-            'write_storage' => t('Grant upload permissions to your file storage and photos'),
-            'republish'     => t('Grant permission to republish/mirror your posts'),
-            'moderated'     => t('Accept comments and wall posts only after approval (moderation)'),
-            'delegate'      => t('Grant channel administration (delegation) permission')
-        ];
-
-        $x = [
-            'permissions' => $perms,
-            'filter' => $filter
-        ];
-        /**
-         * @hooks permissions_list
-         *   * \e array \b permissions
-         *   * \e string \b filter
-         */
-        Hook::call('permissions_list', $x);
-
-        return($x['permissions']);
-    }
-
-    /**
-     * @brief Perms from the above list that are blocked from anonymous observers.
-     *
-     * e.g. you must be authenticated.
-     *
-     * @return array Associative array with permissions and short description.
-     */
-    public static function BlockedAnonPerms()
-    {
-
-        $res = [];
-        $perms = PermissionLimits::Std_limits();
-        foreach ($perms as $perm => $limit) {
-            if ($limit != PERMS_PUBLIC) {
-                $res[] = $perm;
-            }
-        }
-
-        $x = ['permissions' => $res];
-        /**
-         * @hooks write_perms
-         *   * \e array \b permissions
-         */
-        Hook::call('write_perms', $x);
-
-        return($x['permissions']);
-    }
-
-    /**
-     * @brief Converts indexed perms array to associative perms array.
-     *
-     * Converts [ 0 => 'view_stream', ... ]
-     * to [ 'view_stream' => 1 ] for any permissions in $arr;
-     * Undeclared permissions which exist in Perms() are added and set to 0.
-     *
-     * @param array $arr
-     * @return array
-     */
-    public static function FilledPerms($arr)
-    {
-        if (is_null($arr) || (! is_array($arr))) {
-            btlogger('FilledPerms: ' . print_r($arr, true));
-            $arr = [];
-        }
-
-        $everything = self::Perms();
-        $ret = [];
-        foreach ($everything as $k => $v) {
-            if (in_array($k, $arr)) {
-                $ret[$k] = 1;
-            } else {
-                $ret[$k] = 0;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @brief Convert perms array to indexed array.
-     *
-     * Converts [ 'view_stream' => 1 ] for any permissions in $arr
-     * to [ 0 => ['name' => 'view_stream', 'value' => 1], ... ]
-     *
-     * @param array $arr associative perms array 'view_stream' => 1
-     * @return array Indexed array with elements that look like
-     *   * \e string \b name the perm name (e.g. view_stream)
-     *   * \e int \b value the value of the perm (e.g. 1)
-     */
-    public static function OPerms($arr)
-    {
-        $ret = [];
-        if ($arr) {
-            foreach ($arr as $k => $v) {
-                $ret[] = [ 'name' => $k, 'value' => $v ];
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * @brief
-     *
-     * @param int $channel_id
-     * @return bool|array
-     */
-    public static function FilledAutoperms($channel_id)
-    {
-        if (! intval(get_pconfig($channel_id, 'system', 'autoperms'))) {
-            return false;
-        }
-
-        $arr = [];
-        $r = q(
-            "select * from pconfig where uid = %d and cat = 'autoperms'",
-            intval($channel_id)
-        );
-        if ($r) {
-            foreach ($r as $rr) {
-                $arr[$rr['k']] = intval($rr['v']);
-            }
-        }
-        return $arr;
-    }
-
-    /**
-     * @brief Compares that all Permissions from $p1 exist also in $p2.
-     *
-     * @param array $p1 The perms that have to exist in $p2
-     * @param array $p2 The perms to compare against
-     * @return bool true if all perms from $p1 exist also in $p2
-     */
-    public static function PermsCompare($p1, $p2)
-    {
-        foreach ($p1 as $k => $v) {
-            if (! array_key_exists($k, $p2)) {
-                return false;
-            }
-
-            if ($p1[$k] != $p2[$k]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @brief
-     *
-     * @param int $channel_id A channel id
-     * @return array Associative array with
-     *   * \e array \b perms Permission array
-     *   * \e int \b automatic 0 or 1
-     */
-    public static function connect_perms($channel_id)
-    {
-
-        $my_perms = [];
-        $permcat = null;
-        $automatic = 0;
-
-        // If a default permcat exists, use that
-
-        $pc = ((Zlib\Apps::system_app_installed($channel_id, 'Roles')) ? get_pconfig($channel_id, 'system', 'default_permcat') : 'default');
-        if (! in_array($pc, [ '','default' ])) {
-            $pcp = new Zlib\Permcat($channel_id);
-            $permcat = $pcp->fetch($pc);
-            if ($permcat && $permcat['perms']) {
-                foreach ($permcat['perms'] as $p) {
-                    $my_perms[$p['name']] = $p['value'];
-                }
-            }
-        }
-
-        $automatic = intval(get_pconfig($channel_id, 'system', 'autoperms'));
-
-        // look up the permission role to see if it specified auto-connect
-        // and if there was no permcat or a default permcat, set the perms
-        // from the role
-
-        $role = get_pconfig($channel_id, 'system', 'permissions_role');
-        if ($role) {
-            $xx = PermissionRoles::role_perms($role);
-
-            if ((! $my_perms) && ($xx['perms_connect'])) {
-                $default_perms = $xx['perms_connect'];
-                $my_perms = Permissions::FilledPerms($default_perms);
-            }
-        }
-
-        // If we reached this point without having any permission information,
-        // it is likely a custom permissions role. First see if there are any
-        // automatic permissions.
-
-        if (! $my_perms) {
-            $m = Permissions::FilledAutoperms($channel_id);
-            if ($m) {
-                $my_perms = $m;
-            }
-        }
-
-        // If we reached this point with no permissions, the channel is using
-        // custom perms but they are not automatic. They will be stored in abconfig with
-        // the channel's channel_hash (the 'self' connection).
-
-        if (! $my_perms) {
-            $c = Channel::from_id($channel_id);
-            if ($c) {
-                $my_perms = Permissions::FilledPerms(explode(',', get_abconfig($channel_id, $c['channel_hash'], 'system', 'my_perms', EMPTY_STR)));
-            }
-        }
-
-        return ( [ 'perms' => $my_perms, 'automatic' => $automatic ] );
-    }
-
-
-    public static function serialise($p)
-    {
-        $n = [];
-        if ($p) {
-            foreach ($p as $k => $v) {
-                if (intval($v)) {
-                    $n[] = $k;
-                }
-            }
-        }
-        return implode(',', $n);
-    }
-}
diff --git a/Zotlabs/Daemon/Addon.php b/Zotlabs/Daemon/Addon.php
deleted file mode 100644
index 64d550adf..000000000
--- a/Zotlabs/Daemon/Addon.php
+++ /dev/null
@@ -1,15 +0,0 @@
- $max_thumb || $height > $max_thumb) {
-            $imagick_path = get_config('system', 'imagick_convert_path');
-            if ($imagick_path && @file_exists($imagick_path)) {
-                $tmp_name = $path . '-001';
-                $newsize = photo_calculate_scale(array_merge($is, ['max' => $max_thumb]));
-                $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $path) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
-
-                for ($x = 0; $x < 4; $x++) {
-                    exec($cmd);
-                    if (file_exists($tmp_name)) {
-                        break;
-                    }
-                    continue;
-                }
-
-                if (! file_exists($tmp_name)) {
-                    return;
-                }
-                @rename($tmp_name, $path);
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Daemon/Cache_embeds.php b/Zotlabs/Daemon/Cache_embeds.php
deleted file mode 100644
index 1698f9741..000000000
--- a/Zotlabs/Daemon/Cache_embeds.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 1) && ($argv[1])) {
-            $site_id = $argv[1];
-        }
-
-        if ($site_id) {
-            $sql_options = " and site_url = '" . dbesc($argv[1]) . "' ";
-        }
-
-        $days = intval(get_config('system', 'sitecheckdays'));
-        if ($days < 1) {
-            $days = 30;
-        }
-
-        $r = q(
-            "select * from site where site_dead = 0 and site_update < %s - INTERVAL %s and site_type = %d $sql_options ",
-            db_utcnow(),
-            db_quoteinterval($days . ' DAY'),
-            intval(SITE_TYPE_ZOT)
-        );
-
-        if (! $r) {
-            return;
-        }
-
-        foreach ($r as $rr) {
-            if (! strcasecmp($rr['site_url'], z_root())) {
-                continue;
-            }
-
-            $x = ping_site($rr['site_url']);
-            if ($x['success']) {
-                logger('checksites: ' . $rr['site_url']);
-                q(
-                    "update site set site_update = '%s' where site_url = '%s' ",
-                    dbesc(datetime_convert()),
-                    dbesc($rr['site_url'])
-                );
-            } else {
-                logger('marking dead site: ' . $x['message']);
-                q(
-                    "update site set site_dead = 1 where site_url = '%s' ",
-                    dbesc($rr['site_url'])
-                );
-            }
-        }
-
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Content_importer.php b/Zotlabs/Daemon/Content_importer.php
deleted file mode 100644
index 6807a59a9..000000000
--- a/Zotlabs/Daemon/Content_importer.php
+++ /dev/null
@@ -1,63 +0,0 @@
- random_string(),
-            'X-API-Request'    => $hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page ,
-            'Host'             => $m['host'],
-            '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page ,
-        ];
-
-        $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
-
-        $x = z_fetch_url($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, false, $redirects, [ 'headers' => $headers ]);
-
-        if (! $x['success']) {
-            logger('no API response', LOGGER_DEBUG);
-            killme();
-        }
-
-        $j = json_decode($x['body'], true);
-
-        if (! $j) {
-            killme();
-        }
-
-        if (! ($j['item'] || count($j['item']))) {
-            killme();
-        }
-
-        import_items($channel, $j['item'], false, ((array_key_exists('relocate', $j)) ? $j['relocate'] : null));
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Daemon/Convo.php b/Zotlabs/Daemon/Convo.php
deleted file mode 100644
index d7a964ddc..000000000
--- a/Zotlabs/Daemon/Convo.php
+++ /dev/null
@@ -1,62 +0,0 @@
-get();
-
-        if ($messages) {
-            foreach ($messages as $message) {
-                if (is_string($message)) {
-                    $message = Activity::fetch($message, $channel);
-                }
-                // set client flag because comments will probably just be objects and not full blown activities
-                // and that lets us use implied_create
-                $AS = new ActivityStreams($message, null, true);
-                if ($AS->is_valid() && is_array($AS->obj)) {
-                    $item = Activity::decode_note($AS, true);
-                    Activity::store($channel, $contact['abook_xchan'], $AS, $item, true, true);
-                }
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
deleted file mode 100644
index 11b7e4534..000000000
--- a/Zotlabs/Daemon/Cron.php
+++ /dev/null
@@ -1,223 +0,0 @@
- $maxsysload) {
-                logger('system: load ' . $load . ' too high. Cron deferred to next scheduled run.');
-                return;
-            }
-        }
-
-        // Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
-        $lockfile = 'cache/cron';
-        if (
-            (file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))
-            && (! get_config('system', 'override_cron_lockfile'))
-        ) {
-            logger("cron: Already running");
-            return;
-        }
-
-        // Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
-        file_put_contents($lockfile, $x);
-
-        logger('cron: start');
-
-        // run queue delivery process in the background
-
-        Run::Summon([ 'Queue' ]);
-
-        Run::Summon([ 'Poller' ]);
-
-        // maintenance for mod sharedwithme - check for updated items and remove them
-
-        require_once('include/sharedwithme.php');
-        apply_updates();
-
-        // expire any expired items
-
-        $r = q(
-            "select id,item_wall from item where expires > '2001-01-01 00:00:00' and expires < %s 
-			and item_deleted = 0 ",
-            db_utcnow()
-        );
-        if ($r) {
-            require_once('include/items.php');
-            foreach ($r as $rr) {
-                drop_item($rr['id'], false, (($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL));
-                if ($rr['item_wall']) {
-                    // The notifier isn't normally invoked unless item_drop is interactive.
-                    Run::Summon([ 'Notifier', 'drop', $rr['id'] ]);
-                }
-            }
-        }
-
-
-        // delete expired access tokens
-
-        $r = q(
-            "select atoken_id from atoken where atoken_expires > '%s' and atoken_expires < %s",
-            dbesc(NULL_DATE),
-            db_utcnow()
-        );
-        if ($r) {
-            require_once('include/security.php');
-            foreach ($r as $rr) {
-                atoken_delete($rr['atoken_id']);
-            }
-        }
-
-        // Ensure that every channel pings their directory occasionally.
-
-        $r = q(
-            "select channel_id from channel where channel_dirdate < %s - INTERVAL %s and channel_removed = 0",
-            db_utcnow(),
-            db_quoteinterval('7 DAY')
-        );
-        if ($r) {
-            foreach ($r as $rr) {
-                Run::Summon([ 'Directory', $rr['channel_id'], 'force' ]);
-                if ($interval) {
-                    @time_sleep_until(microtime(true) + (float) $interval);
-                }
-            }
-        }
-
-        // publish any applicable items that were set to be published in the future
-        // (time travel posts). Restrict to items that have come of age in the last
-        // couple of days to limit the query to something reasonable.
-
-        $r = q(
-            "select id from item where item_delayed = 1 and created <= %s  and created > '%s' ",
-            db_utcnow(),
-            dbesc(datetime_convert('UTC', 'UTC', 'now - 2 days'))
-        );
-        if ($r) {
-            foreach ($r as $rr) {
-                $x = q(
-                    "update item set item_delayed = 0 where id = %d",
-                    intval($rr['id'])
-                );
-                if ($x) {
-                    $z = q(
-                        "select * from item where id = %d",
-                        intval($message_id)
-                    );
-                    if ($z) {
-                        xchan_query($z);
-                        $sync_item = fetch_post_tags($z);
-                        Libsync::build_sync_packet(
-                            $sync_item[0]['uid'],
-                            [
-                                'item' => [ encode_item($sync_item[0], true) ]
-                            ]
-                        );
-                    }
-                    Run::Summon([ 'Notifier','wall-new',$rr['id'] ]);
-                }
-            }
-        }
-
-        require_once('include/attach.php');
-        attach_upgrade();
-
-        $abandon_days = intval(get_config('system', 'account_abandon_days'));
-        if ($abandon_days < 1) {
-            $abandon_days = 0;
-        }
-
-
-        // once daily run birthday_updates and then expire in background
-
-        // FIXME: add birthday updates, both locally and for xprof for use
-        // by directory servers
-
-        $d1 = intval(get_config('system', 'last_expire_day'));
-        $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd'));
-
-        // Allow somebody to staggger daily activities if they have more than one site on their server,
-        // or if it happens at an inconvenient (busy) hour.
-
-        $h1 = intval(get_config('system', 'cron_hour'));
-        $h2 = intval(datetime_convert('UTC', 'UTC', 'now', 'G'));
-
-
-        if (($d2 != $d1) && ($h1 == $h2)) {
-            Run::Summon([ 'Cron_daily' ]);
-        }
-
-        // update any photos which didn't get imported properly
-        // This should be rare
-
-        $r = q(
-            "select xchan_photo_l, xchan_hash from xchan where xchan_photo_l != '' and xchan_photo_m = '' 
-			and xchan_photo_date < %s - INTERVAL %s",
-            db_utcnow(),
-            db_quoteinterval('1 DAY')
-        );
-        if ($r) {
-            require_once('include/photo_factory.php');
-            foreach ($r as $rr) {
-                $photos = import_remote_xchan_photo($rr['xchan_photo_l'], $rr['xchan_hash']);
-                if ($photos) {
-                    $x = q(
-                        "update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
-						where xchan_hash = '%s'",
-                        dbesc($photos[0]),
-                        dbesc($photos[1]),
-                        dbesc($photos[2]),
-                        dbesc($photos[3]),
-                        dbesc($rr['xchan_hash'])
-                    );
-                }
-            }
-        }
-
-        $generation = 0;
-
-        $restart    = false;
-
-        if (($argc > 1) && ($argv[1] == 'restart')) {
-            $restart = true;
-            $generation = intval($argv[2]);
-            if (! $generation) {
-                return;
-            }
-        }
-
-        Addon::reload_all();
-
-        $d = datetime_convert();
-
-        // TODO check to see if there are any cronhooks before wasting a process
-
-        if (! $restart) {
-            Run::Summon([ 'Cronhooks' ]);
-        }
-
-        set_config('system', 'lastcron', datetime_convert());
-
-        //All done - clear the lockfile
-        @unlink($lockfile);
-
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php
deleted file mode 100644
index 83f75b996..000000000
--- a/Zotlabs/Daemon/Cron_daily.php
+++ /dev/null
@@ -1,117 +0,0 @@
-  %s - INTERVAL %s and channel_deleted < %s - INTERVAL %s",
-            db_utcnow(),
-            db_quoteinterval('21 DAY'),
-            db_utcnow(),
-            db_quoteinterval('10 DAY')
-        );
-        if ($r) {
-            foreach ($r as $rv) {
-                Channel::channel_remove_final($rv['channel_id']);
-            }
-        }
-
-        // get rid of really old poco records
-
-        q(
-            "delete from xlink where xlink_updated < %s - INTERVAL %s and xlink_static = 0 ",
-            db_utcnow(),
-            db_quoteinterval('14 DAY')
-        );
-
-        // Check for dead sites
-        Run::Summon(['Checksites' ]);
-
-
-        // clean up image cache - use site expiration or 60 days if not set or zero
-
-        $files = glob('cache/img/*/*');
-        $expire_days = intval(get_config('system', 'default_expire_days'));
-        if ($expire_days <= 0) {
-            $expire_days = 60;
-        }
-        $now = time();
-        $maxage = 86400 * $expire_days;
-        if ($files) {
-            foreach ($files as $file) {
-                if (is_file($file)) {
-                    if ($now - filemtime($file) >= $maxage) {
-                        unlink($file);
-                    }
-                }
-            }
-        }
-
-        // update searchable doc indexes
-
-        Run::Summon([ 'Importdoc']);
-
-        /**
-         * End Cron Weekly
-         */
-    }
-}
diff --git a/Zotlabs/Daemon/Cronhooks.php b/Zotlabs/Daemon/Cronhooks.php
deleted file mode 100644
index 242f69981..000000000
--- a/Zotlabs/Daemon/Cronhooks.php
+++ /dev/null
@@ -1,22 +0,0 @@
-start();
-
-        $_SESSION['authenticated'] = 1;
-        $_SESSION['uid'] = $argv[1];
-
-        $x = session_id();
-
-        $f = 'cache/cookie_' . $argv[1];
-        $c = 'cache/cookien_' . $argv[1];
-
-        $e = file_exists($f);
-
-        $output = '';
-
-        if ($e) {
-            $lines = file($f);
-            if ($lines) {
-                foreach ($lines as $line) {
-                    if (strlen($line) > 0 && $line[0] != '#' && substr_count($line, "\t") == 6) {
-                        $tokens = explode("\t", $line);
-                        $tokens = array_map('trim', $tokens);
-                        if ($tokens[4] > time()) {
-                            $output .= $line . "\n";
-                        }
-                    } else {
-                        $output .= $line;
-                    }
-                }
-            }
-        }
-        $t = time() + (24 * 3600);
-        file_put_contents($f, $output . 'HttpOnly_' . App::get_hostname() . "\tFALSE\t/\tTRUE\t$t\tPHPSESSID\t" . $x, (($e) ? FILE_APPEND : 0));
-
-        file_put_contents($c, $x);
-
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php
deleted file mode 100644
index 2aecaa1b9..000000000
--- a/Zotlabs/Daemon/Deliver.php
+++ /dev/null
@@ -1,36 +0,0 @@
- 2) {
-            if ($argv[2] === 'force') {
-                $force = true;
-            }
-            if ($argv[2] === 'nopush') {
-                $pushall = false;
-            }
-        }
-
-        logger('directory update', LOGGER_DEBUG);
-
-        $channel = Channel::from_id($argv[1]);
-        if (! $channel) {
-            return;
-        }
-
-        // update the local directory - was optional, but now done regardless
-
-        Libzotdir::local_dir_update($argv[1], $force);
-
-        q(
-            "update channel set channel_dirdate = '%s' where channel_id = %d",
-            dbesc(datetime_convert()),
-            intval($channel['channel_id'])
-        );
-
-        // Now update all the connections
-        if ($pushall) {
-            Run::Summon([ 'Notifier','refresh_all',$channel['channel_id'] ]);
-        }
-    }
-}
diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php
deleted file mode 100644
index ac73d24d3..000000000
--- a/Zotlabs/Daemon/Expire.php
+++ /dev/null
@@ -1,98 +0,0 @@
- random_string(),
-            'X-API-Request'    => $hz_server . '/api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id,
-            'Host'             => $m['host'],
-            '(request-target)' => 'get /api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id,
-        ];
-
-        $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
-        $x = z_fetch_url($hz_server . '/api/z/1.0/file/export?f=&zap_compat=1&file_id=' . $attach_id, false, $redirects, [ 'headers' => $headers ]);
-
-        if (! $x['success']) {
-            logger('no API response', LOGGER_DEBUG);
-            return;
-        }
-
-        $j = json_decode($x['body'], true);
-
-        $r = sync_files($channel, [$j]);
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Daemon/Gprobe.php b/Zotlabs/Daemon/Gprobe.php
deleted file mode 100644
index a42a14c5b..000000000
--- a/Zotlabs/Daemon/Gprobe.php
+++ /dev/null
@@ -1,66 +0,0 @@
- 3) ? $argv[3] : '');
-        $dstname = (($argc > 4) ? $argv[4] : '');
-
-        $hash = random_string();
-
-        $arr = [
-            'src'               => $srcfile,
-            'filename'          => (($dstname) ? $dstname : basename($srcfile)),
-            'hash'              => $hash,
-            'allow_cid'         => $channel['channel_allow_cid'],
-            'allow_gid'         => $channel['channel_allow_gid'],
-            'deny_cid'          => $channel['channel_deny_cid'],
-            'deny_gid'          => $channel['channel_deny_gid'],
-            'preserve_original' => true,
-            'replace'           => true
-        ];
-
-        if ($folder) {
-            $arr['folder'] = $folder;
-        }
-
-        attach_store($channel, $channel['channel_hash'], 'import', $arr);
-
-        $sync = attach_export_data($channel, $hash);
-        if ($sync) {
-            Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
-        }
-
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
deleted file mode 100644
index 5ca85b705..000000000
--- a/Zotlabs/Daemon/Notifier.php
+++ /dev/null
@@ -1,816 +0,0 @@
- $argv[4] ];
-            self::$encoding = 'zot';
-            $normal_mode = false;
-        } elseif ($cmd === 'keychange') {
-            self::$channel = Channel::from_id($item_id);
-            $r = q(
-                "select abook_xchan from abook where abook_channel = %d",
-                intval($item_id)
-            );
-            if ($r) {
-                foreach ($r as $rr) {
-                    self::$recipients[] = $rr['abook_xchan'];
-                }
-            }
-            self::$private = false;
-            self::$packet_type = 'keychange';
-            self::$encoded_item = get_pconfig(self::$channel['channel_id'], 'system', 'keychange');
-            self::$encoding = 'zot';
-            $normal_mode = false;
-        } elseif (in_array($cmd, [ 'permissions_update', 'permissions_reject', 'permissions_accept', 'permissions_create' ])) {
-            // Get the (single) recipient
-            
-            $r = q(
-                "select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0",
-                intval($item_id)
-            );
-            if ($r) {
-                $recip = array_shift($r);
-                $uid = $recip['abook_channel'];
-                // Get the sender
-                self::$channel = Channel::from_id($uid);
-                if (self::$channel) {
-                    $perm_update = [ 'sender' => self::$channel, 'recipient' => $recip, 'success' => false, 'deliveries' => '' ];
-
-                    switch ($cmd) {
-                        case 'permissions_create':
-                            ActivityPub::permissions_create($perm_update);
-                            break;
-                        case 'permissions_accept':
-                            ActivityPub::permissions_accept($perm_update);
-                            break;
-                        case 'permissions_update':
-                            ActivityPub::permissions_update($perm_update);
-                            break;
-
-                        default:
-                            break;
-                    }
-                    if (! $perm_update['success']) {
-                        Hook::call($cmd, $perm_update);
-                    }
-
-                    if ($perm_update['success']) {
-                        if ($perm_update['deliveries']) {
-                            self::$deliveries[] = $perm_update['deliveries'];
-                            do_delivery(self::$deliveries);
-                        }
-                        return;
-                    } else {
-                        self::$recipients[] = $recip['abook_xchan'];
-                        self::$private = false;
-                        self::$packet_type = 'refresh';
-                        self::$env_recips = [ $recip['xchan_hash'] ];
-                    }
-                }
-            }
-        } elseif ($cmd === 'refresh_all') {
-            logger('notifier: refresh_all: ' . $item_id);
-
-            self::$channel = Channel::from_id($item_id, true);
-            $r = q(
-                "select abook_xchan from abook where abook_channel = %d",
-                intval($item_id)
-            );
-            if ($r) {
-                foreach ($r as $rr) {
-                    self::$recipients[] = $rr['abook_xchan'];
-                }
-            }
-            self::$recipients[] = self::$channel['channel_hash'];
-            self::$private = false;
-            self::$packet_type = 'refresh';
-        } elseif ($cmd === 'purge') {
-            $xchan = $argv[3];
-            logger('notifier: purge: ' . $item_id . ' => ' . $xchan);
-            if (! $xchan) {
-                return;
-            }
-            
-            self::$channel     = Channel::from_id($item_id, true);
-            self::$recipients  = [ $xchan ];
-            self::$private     = true;
-            self::$packet_type = 'purge';
-        } elseif ($cmd === 'purge_all') {
-            logger('notifier: purge_all: ' . $item_id);
-            self::$channel = Channel::from_id($item_id, true);
-
-            self::$recipients = [];
-            $r = q(
-                "select abook_xchan from abook where abook_channel = %d and abook_self = 0",
-                intval($item_id)
-            );
-            if (! $r) {
-                return;
-            }
-            foreach ($r as $rr) {
-                self::$recipients[] = $rr['abook_xchan'];
-            }
-
-            self::$private = false;
-            self::$packet_type = 'purge';
-        } else {
-            // Normal items
-
-            // Fetch the target item
-
-            $r = q(
-                "SELECT * FROM item WHERE id = %d and parent != 0 LIMIT 1",
-                intval($item_id)
-            );
-
-            if (! $r) {
-                return;
-            }
-
-            xchan_query($r);
-            $r = fetch_post_tags($r);
-        
-            $target_item = array_shift($r);
-
-            if ($target_item['author']['xchan_network'] === 'anon') {
-                logger('notifier: target item author is not a fetchable actor', LOGGER_DEBUG);
-                return;
-            }
-
-            $deleted_item = false;
-
-            if (intval($target_item['item_deleted'])) {
-                logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
-                $deleted_item = true;
-            }
-
-            if (! in_array(intval($target_item['item_type']), [ ITEM_TYPE_POST, ITEM_TYPE_MAIL ])) {
-                if (intval($target_item['item_type'] == ITEM_TYPE_CUSTOM)) {
-                    $hookinfo=[
-                        'targetitem' => $target_item,
-                        'deliver'    => false
-                    ];
-
-                    Hook::call('customitem_deliver', $hookinfo);
-                }
-
-                if (! $hookinfo['deliver']) {
-                    logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
-                    return;
-                }
-            }
-
-            // Check for non published items, but allow an exclusion for transmitting hidden file activities
-
-            if (intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) ||
-                intval($target_item['item_blocked']) ||
-                ( intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) {
-                logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
-                return;
-            }
-
-            if (in_array($target_item['verb'], [ ACTIVITY_FOLLOW, ACTIVITY_IGNORE ])) {
-                logger('not fowarding follow|unfollow->note activity');
-                return;
-            }
-
-            $s = q(
-                "select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
-                intval($target_item['uid'])
-            );
-            if ($s) {
-                self::$channel = array_shift($s);
-            }
-
-            if (self::$channel['channel_hash'] !== $target_item['author_xchan'] && self::$channel['channel_hash'] !== $target_item['owner_xchan']) {
-                logger("notifier: Sending channel is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}", LOGGER_NORMAL, LOG_WARNING);
-                return;
-            }
-
-            $thread_is_public = false;
-
-            if ($target_item['mid'] === $target_item['parent_mid']) {
-                $parent_item = $target_item;
-                $top_level_post = true;
-            } else {
-                // fetch the parent item
-                $r = q(
-                    "SELECT * from item where id = %d order by id asc",
-                    intval($target_item['parent'])
-                );
-
-                if (! $r) {
-                    return;
-                }
-
-                xchan_query($r);
-                $r = fetch_post_tags($r);
-        
-                $parent_item = array_shift($r);
-                $top_level_post = false;
-                $thread_is_public = ((intval($parent_item['item_private'])) ? false : true) ;
-            }
-
-            // avoid looping of discover items 12/4/2014
-
-            if ($sys && $parent_item['uid'] == $sys['channel_id']) {
-                return;
-            }
-
-            $m = get_iconfig($target_item, 'activitypub', 'signed_data');
-            // Re-use existing signature unless the activity type changed to a Tombstone, which won't verify.
-            if ($m && (! intval($target_item['item_deleted']))) {
-                self::$encoded_item = json_decode($m, true);
-            } else {
-                self::$encoded_item = array_merge(['@context' => [
-                    ACTIVITYSTREAMS_JSONLD_REV,
-                    'https://w3id.org/security/v1',
-                    Activity::ap_schema()
-                    ]], Activity::encode_activity($target_item, true));
-                self::$encoded_item['signature'] = LDSignatures::sign(self::$encoded_item, self::$channel);
-            }
-
-
-            logger('target_item: ' . print_r($target_item, true), LOGGER_DEBUG);
-            logger('encoded: ' . print_r(self::$encoded_item, true), LOGGER_DEBUG);
-        
-            // Send comments to the owner to re-deliver to everybody in the conversation
-            // We only do this if the item in question originated on this site. This prevents looping.
-            // To clarify, a site accepting a new comment is responsible for sending it to the owner for relay.
-            // Relaying should never be initiated on a post that arrived from elsewhere.
-
-            // We should normally be able to rely on ITEM_ORIGIN, but start_delivery_chain() incorrectly set this
-            // flag on comments for an extended period. So we'll also call comment_local_origin() which looks at
-            // the hostname in the message_id and provides a second (fallback) opinion.
-
-            $relay_to_owner = (((! $top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item) && $cmd !== 'hyper') ? true : false);
-
-            $uplink = false;
-
-            // $cmd === 'relay' indicates the owner is sending it to the original recipients
-            // don't allow the item in the relay command to relay to owner under any circumstances, it will loop
-
-            logger('notifier: relay_to_owner: ' . (($relay_to_owner) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG);
-            logger('notifier: top_level_post: ' . (($top_level_post) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG);
-
-            // tag_deliver'd post which needs to be sent back to the original author
-
-            if (($cmd === 'uplink') && intval($parent_item['item_uplink']) && (! $top_level_post)) {
-                logger('notifier: uplink');
-                $uplink = true;
-                self::$packet_type = 'response';
-            }
-
-            if (($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
-                logger('followup relay (upstream delivery)', LOGGER_DEBUG);
-                $sendto = ($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan'];
-                self::$recipients = [ $sendto ];
-                // over-ride upstream recipients if 'replyTo' was set in the parent.
-                if ($parent_item['replyto'] && (! $uplink)) {
-                    logger('replyto: over-riding owner '  . $sendto, LOGGER_DEBUG);
-                    // unserialise is a no-op if presented with data that wasn't serialised.
-                    $ptr = unserialise($parent_item['replyto']);
-                    if (is_string($ptr)) {
-                        if (ActivityStreams::is_url($sendto)) {
-                            $sendto = $ptr;
-                            self::$recipients = [ $sendto ];
-                        }
-                    } elseif (is_array($ptr)) {
-                        $sendto = [];
-                        foreach ($ptr as $rto) {
-                            if (is_string($rto)) {
-                                $sendto[] = $rto;
-                            } elseif (is_array($rto) && isset($rto['id'])) {
-                                $sendto[] = $rto['id'];
-                            }
-                        }
-                        self::$recipients = $sendto;
-                    }
-                }
-                
-                logger('replyto: upstream recipients ' . print_r($sendto, true), LOGGER_DEBUG);
-                
-
-                self::$private = true;
-                $upstream = true;
-                self::$packet_type = 'response';
-                $is_moderated = their_perms_contains($parent_item['uid'], $sendto, 'moderated');
-                if ($relay_to_owner && $thread_is_public && (! $is_moderated) && (! Channel::is_group($parent_item['uid']))) {
-                    if (get_pconfig($target_item['uid'], 'system', 'hyperdrive', true)) {
-                        Run::Summon([ 'Notifier' , 'hyper', $item_id ]);
-                    }
-                }
-            } else {
-                if ($cmd === 'relay') {
-                    logger('owner relay (downstream delivery)');
-                } else {
-                    logger('normal (downstream) distribution', LOGGER_DEBUG);
-                }
-                $upstream = false;
-
-                if ($parent_item && $parent_item['item_private'] !== $target_item['item_private']) {
-                    logger('parent_item: ' . $parent_item['id'] . ' item_private: ' . $parent_item['item_private']);
-                    logger('target_item: ' . $target_item['id'] . ' item_private: ' . $target_item['item_private']);
-                    
-                    logger('conversation privacy mismatch - downstream delivery prevented');
-                    return;
-                }
-
-                // if our parent is a tag_delivery recipient, uplink to the original author causing
-                // a delivery fork.
-    
-                if (($parent_item) && intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) {
-                    // don't uplink a relayed post to the relay owner
-                    if ($parent_item['source_xchan'] !== $parent_item['owner_xchan']) {
-                        logger('notifier: uplinking this item');
-                        Run::Summon([ 'Notifier','uplink',$item_id ]);
-                    }
-                }
-
-                if ($thread_is_public && $cmd === 'hyper') {
-                    self::$recipients = [];
-                    $r = q(
-                        "select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and abook_pending = 0 and abook_archived = 0 and not abook_xchan in ( '%s', '%s', '%s' ) ",
-                        intval($target_item['uid']),
-                        dbesc($target_item['author_xchan']),
-                        dbesc($target_item['owner_xchan']),
-                        dbesc($target_item['source_xchan'])
-                    );
-                    if ($r) {
-                        foreach ($r as $rv) {
-                            self::$recipients[] = $rv['abook_xchan'];
-                        }
-                    }
-                    self::$private = false;
-                } else {
-                    self::$private = false;
-                    self::$recipients = collect_recipients($parent_item, self::$private);
-                }
-
-                // @FIXME add any additional recipients such as mentions, etc.
-
-                if ($top_level_post) {
-                    // remove clones who will receive the post via sync
-                    self::$recipients = array_values(array_diff(self::$recipients, [ $target_item['owner_xchan'] ]));
-                }
-
-                // don't send deletions onward for other people's stuff
-
-                if (intval($target_item['item_deleted']) && (! intval($target_item['item_wall']))) {
-                    logger('notifier: ignoring delete notification for non-wall item', LOGGER_NORMAL, LOG_NOTICE);
-                    return;
-                }
-            }
-        }
-
-        // Generic delivery section, we have an encoded item and recipients
-        // Now start the delivery process
-
-        logger('encoded item: ' . print_r(self::$encoded_item, true), LOGGER_DATA, LOG_DEBUG);
-
-		// This addresses an issue that crossposting addons weren't being called if the sender had no friends
-		// and only wanted to crosspost. 
-		
-		$crossposting = (isset($target_item['postopts']) && $target_item['postopts']) ? true : false;
-
-		stringify_array_elms(self::$recipients);
-		if ( (! self::$recipients && ! $crossposting)) {
-			logger('no recipients');
-			return;
-		}
-
-        //  logger('recipients: ' . print_r(self::$recipients,true), LOGGER_NORMAL, LOG_DEBUG);
-
-        if (! count(self::$env_recips)) {
-            self::$env_recips = ((self::$private) ? [] : null);
-        }
-
-        $recip_list = [];
-
-		if (self::$recipients) {
-	        $details = q("select xchan_hash, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan 
-				where xchan_hash in (" . protect_sprintf(implode(',', self::$recipients)) . ")");
-		}
-		else {
-			$details = [];
-		}
-
-        if ($details) {
-            foreach ($details as $d) {
-                $recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
-                if (self::$private) {
-                    self::$env_recips[] = $d['xchan_hash'];
-                }
-            }
-        }
-
-
-        $narr = [
-            'channel'        => self::$channel,
-            'upstream'       => $upstream,
-            'env_recips'     => self::$env_recips,
-            'recipients'     => self::$recipients,
-            'item'           => $item,
-            'target_item'    => $target_item,
-            'parent_item'    => $parent_item,
-            'top_level_post' => $top_level_post,
-            'private'        => self::$private,
-            'relay_to_owner' => $relay_to_owner,
-            'uplink'         => $uplink,
-            'cmd'            => $cmd,
-            'single'         => (($cmd === 'single_activity') ? true : false),
-            'request'        => $request,
-            'normal_mode'    => $normal_mode,
-            'packet_type'    => self::$packet_type,
-            'queued'         => []
-        ];
-
-        Hook::call('notifier_process', $narr);
-        if ($narr['queued']) {
-            foreach ($narr['queued'] as $pq) {
-                self::$deliveries[] = $pq;
-            }
-        }
-
-        // notifier_process can alter the recipient list
-
-        self::$recipients    = $narr['recipients'];
-        self::$env_recips    = $narr['env_recips'];
-
-        if ((self::$private) && (! self::$env_recips)) {
-            // shouldn't happen
-            logger('private message with no envelope recipients.' . print_r($argv, true), LOGGER_NORMAL, LOG_NOTICE);
-            return;
-        }
-    
-        logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list, true), LOGGER_DEBUG);
-    
-        // Now we have collected recipients (except for external mentions, @FIXME)
-        // Let's reduce this to a set of hubs; checking that the site is not dead.
-
-		if (self::$recipients) {
-	        $hubs = q("select hubloc.*, site.site_crypto, site.site_flags from hubloc left join site on site_url = hubloc_url 
-				where hubloc_hash in (" . protect_sprintf(implode(',', self::$recipients)) . ") 
-				and hubloc_error = 0 and hubloc_deleted = 0 ");
-		}
-		else {
-			$hubs = [];
-		}
-        // public posts won't make it to the local public stream unless there's a recipient on this site.
-        // This code block sees if it's a public post and localhost is missing, and if so adds an entry for the local sys channel to the $hubs list
-        
-        if (! self::$private) {
-            $found_localhost = false;
-            if ($hubs) {
-                foreach ($hubs as $h) {
-                    if ($h['hubloc_url'] === z_root()) {
-                        $found_localhost = true;
-                        break;
-                    }
-                }
-            }
-            if (! $found_localhost) {
-                $localhub = q(
-                    "select hubloc.*, site.site_crypto, site.site_flags, site.site_dead from hubloc 
-					left join site on site_url = hubloc_url where hubloc_id_url = '%s' and hubloc_error = 0 and hubloc_deleted = 0 ",
-                    dbesc(z_root() . '/channel/sys')
-                );
-                if ($localhub) {
-                    $hubs = array_merge($hubs, $localhub);
-                }
-            }
-        }
-
-        if (! $hubs) {
-            logger('notifier: no hubs', LOGGER_NORMAL, LOG_NOTICE);
-            return;
-        }
-
-        /**
-         * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey,
-         * since it may have been a re-install which has not yet been detected and pruned.
-         * For other networks which don't have or require sitekeys, we'll have to use the URL
-         */
-
-
-        $hublist = []; // this provides an easily printable list for the logs
-        $dhubs   = []; // delivery hubs where we store our resulting unique array
-        $keys    = []; // array of keys to check uniquness for zot hubs
-        $urls    = []; // array of urls to check uniqueness of hubs from other networks
-        $hub_env = []; // per-hub envelope so we don't broadcast the entire envelope to all
-        $dead    = []; // known dead hubs - report them as undeliverable
-        
-        foreach ($hubs as $hub) {
-            if (isset($hub['site_dead']) && intval($hub['site_dead'])) {
-                $dead[] = $hub;
-                continue;
-            }
-
-            if (self::$env_recips) {
-                foreach (self::$env_recips as $er) {
-                    if ($hub['hubloc_hash'] === $er) {
-                        if (! array_key_exists($hub['hubloc_site_id'], $hub_env)) {
-                            $hub_env[$hub['hubloc_site_id']] = [];
-                        }
-                        $hub_env[$hub['hubloc_site_id']][] = $er;
-                    }
-                }
-            }
-            
-			if (in_array($hub['hubloc_network'],['nomad','zot6'])) {
-                if (! in_array($hub['hubloc_sitekey'], $keys)) {
-                    $hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
-                    $dhubs[]   = $hub;
-                    $keys[]    = $hub['hubloc_sitekey'];
-                }
-            } else {
-                if (! in_array($hub['hubloc_url'], $urls)) {
-                    $hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
-                    $dhubs[]   = $hub;
-                    $urls[]    = $hub['hubloc_url'];
-                }
-            }
-        }
-
-        logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist, true), LOGGER_DEBUG, LOG_DEBUG);
-
-        foreach ($dhubs as $hub) {
-            logger('notifier_hub: ' . $hub['hubloc_url'], LOGGER_DEBUG, LOG_DEBUG);
-
-            // deliver to any non-zot networks
-
-            if (! in_array($hub['hubloc_network'], ['zot6', 'nomad' ])) {
-                $narr = [
-                    'channel'        => self::$channel,
-                    'upstream'       => $upstream,
-                    'env_recips'     => self::$env_recips,
-                    'recipients'     => self::$recipients,
-                    'item'           => $item,
-                    'target_item'    => $target_item,
-                    'parent_item'    => $parent_item,
-                    'hub'            => $hub,
-                    'top_level_post' => $top_level_post,
-                    'private'        => self::$private,
-                    'relay_to_owner' => $relay_to_owner,
-                    'uplink'         => $uplink,
-                    'cmd'            => $cmd,
-                    'single'         => (($cmd === 'single_activity') ? true : false),
-                    'request'        => $request,
-                    'normal_mode'    => $normal_mode,
-                    'packet_type'    => self::$packet_type,
-                    'queued'         => []
-                ];
-
-                ActivityPub::notifier_process($narr);
-
-                Hook::call('notifier_hub', $narr);
-                if ($narr['queued']) {
-                    foreach ($narr['queued'] as $pq) {
-                        self::$deliveries[] = $pq;
-                    }
-                }
-                continue;
-            }
-
-
-            // Single deliveries are for non-nomadic federated networks and we're essentially
-            // delivering only to those that have this site url in their abook_instance
-            // and only from within a sync operation. This means if you post from a clone,
-            // and a connection is connected to one of your other clones; assuming that hub
-            // is running it will receive a sync packet. On receipt of this sync packet it
-            // will invoke a delivery to those connections which are connected to just that
-            // hub instance.
-
-            if ($cmd === 'single_activity') {
-                continue;
-            }
-
-            // default: zot or nomad protocol
-
-            // Prevent zot6/Nomad delivery of group comment boosts, which are not required for conversational platforms.
-            // ActivityPub conversational platforms may wish to filter these if they don't want or require them.
-            // We will assume here that if $target_item exists and has a verb that it is an actual item structure
-            // so we won't need to check the existence of the other item fields prior to evaluation.
-
-            // This shouldn't produce false positives on comment boosts that were generated on other platforms
-            // because we won't be delivering them.
-            
-            if (isset($target_item) && isset($target_item['verb']) && $target_item['verb'] === 'Announce' && $target_item['author_xchan'] === $target_item['owner_xchan'] && ! intval($target_item['item_thread_top'])) {
-                continue;
-            }
-
-            $hash = new_uuid();
-
-            $env = (($hub_env && $hub_env[$hub['hubloc_site_id']]) ? $hub_env[$hub['hubloc_site_id']] : '');
-            if ((self::$private) && (! $env)) {
-                continue;
-            }
-
-            $packet = Libzot::build_packet(
-                self::$channel,
-                self::$packet_type,
-                $env,
-                self::$encoded_item,
-                self::$encoding,
-                ((self::$private) ? $hub['hubloc_sitekey'] : null),
-                $hub['site_crypto']
-            );
-
-            Queue::insert(
-                [
-                    'hash'       => $hash,
-                    'account_id' => self::$channel['channel_account_id'],
-                    'channel_id' => self::$channel['channel_id'],
-                    'posturl'    => $hub['hubloc_callback'],
-                    'driver'     => $hub['hubloc_network'],
-                    'notify'     => $packet,
-                    'msg'        => EMPTY_STR
-                ]
-            );
-
-            // only create delivery reports for normal undeleted items
-            if (is_array($target_item) && (! $target_item['item_deleted']) && (! get_config('system', 'disable_dreport'))) {
-                q(
-                    "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue, dreport_log ) 
-					values ( '%s', '%s','%s','%s','%s','%s','%s','%s', '%s' ) ",
-                    dbesc($target_item['mid']),
-                    dbesc($hub['hubloc_host']),
-                    dbesc($hub['hubloc_host']),
-                    dbesc($hub['hubloc_host']),
-                    dbesc('queued'),
-                    dbesc(datetime_convert()),
-                    dbesc(self::$channel['channel_hash']),
-                    dbesc($hash),
-                    dbesc(EMPTY_STR)
-                );
-            }
-
-            self::$deliveries[] = $hash;
-        }
-    
-        if ($normal_mode) {
-            // This wastes a process if there are no delivery hooks configured, so check this before launching the new process
-            $x = q("select * from hook where hook = 'notifier_normal'");
-            if ($x) {
-                Run::Summon([ 'Deliver_hooks', $target_item['id'] ]);
-            }
-        }
-
-        if (self::$deliveries) {
-            do_delivery(self::$deliveries);
-        }
-
-        if ($dead) {
-            foreach ($dead as $deceased) {
-                if (is_array($target_item) && (! $target_item['item_deleted']) && (! get_config('system', 'disable_dreport'))) {
-                    q(
-                        "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue, dreport_log ) 
-						values ( '%s', '%s','%s','%s','%s','%s','%s','%s','%s' ) ",
-                        dbesc($target_item['mid']),
-                        dbesc($deceased['hubloc_host']),
-                        dbesc($deceased['hubloc_host']),
-                        dbesc($deceased['hubloc_host']),
-                        dbesc('undeliverable/unresponsive site'),
-                        dbesc(datetime_convert()),
-                        dbesc(self::$channel['channel_hash']),
-                        dbesc(new_uuid()),
-                        dbesc(EMPTY_STR)
-                    );
-                }
-            }
-        }
-
-        Hook::call('notifier_end', $target_item);
-
-        logger('notifer: complete.');
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Onedirsync.php b/Zotlabs/Daemon/Onedirsync.php
deleted file mode 100644
index 16f7f9f5d..000000000
--- a/Zotlabs/Daemon/Onedirsync.php
+++ /dev/null
@@ -1,87 +0,0 @@
- 1) && (intval($argv[1]))) {
-            $update_id = intval($argv[1]);
-        }
-
-        if (! $update_id) {
-            logger('onedirsync: no update');
-            return;
-        }
-
-        $r = q(
-            "select * from updates where ud_id = %d limit 1",
-            intval($update_id)
-        );
-
-        if (! $r) {
-            return;
-        }
-        if (($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr'])) {
-            return;
-        }
-
-        // Have we probed this channel more recently than the other directory server
-        // (where we received this update from) ?
-        // If we have, we don't need to do anything except mark any older entries updated
-
-        $x = q(
-            "select * from updates where ud_addr = '%s' and ud_date > '%s' and ( ud_flags & %d )>0 order by ud_date desc limit 1",
-            dbesc($r[0]['ud_addr']),
-            dbesc($r[0]['ud_date']),
-            intval(UPDATE_FLAGS_UPDATED)
-        );
-        if ($x) {
-            $y = q(
-                "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date != '%s'",
-                intval(UPDATE_FLAGS_UPDATED),
-                dbesc($r[0]['ud_addr']),
-                intval(UPDATE_FLAGS_UPDATED),
-                dbesc($x[0]['ud_date'])
-            );
-            return;
-        }
-
-        // ignore doing an update if this ud_addr refers to a known dead hubloc
-
-        $h = q(
-            "select * from hubloc where hubloc_addr = '%s' limit 1",
-            dbesc($r[0]['ud_addr'])
-        );
-        if (($h) && ($h[0]['hubloc_status'] & HUBLOC_OFFLINE)) {
-            $y = q(
-                "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ",
-                intval(UPDATE_FLAGS_UPDATED),
-                dbesc($r[0]['ud_addr']),
-                intval(UPDATE_FLAGS_UPDATED)
-            );
-
-            return;
-        }
-
-        // we might have to pull this out some day, but for now update_directory_entry()
-        // runs zot_finger() and is kind of zot specific
-
-		if ($h && in_array($h[0]['hubloc_network'],['nomad','zot6'])) {
-			return;
-		}
-
-        Libzotdir::update_directory_entry($r[0]);
-
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php
deleted file mode 100644
index f796f9303..000000000
--- a/Zotlabs/Daemon/Onepoll.php
+++ /dev/null
@@ -1,178 +0,0 @@
- 1) && (intval($argv[1]))) {
-            $contact_id = intval($argv[1]);
-        }
-
-        if (! $contact_id) {
-            logger('onepoll: no contact');
-            return;
-        }
-
-        $d = datetime_convert();
-
-        $contacts = q(
-            "SELECT abook.*, xchan.*, account.*
-			FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan 
-			where abook_id = %d
-			and abook_pending = 0 and abook_archived = 0 and abook_blocked = 0 and abook_ignored = 0
-			AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1",
-            intval($contact_id),
-            intval(ACCOUNT_OK),
-            intval(ACCOUNT_UNVERIFIED)
-        );
-
-        if (! $contacts) {
-            logger('onepoll: abook_id not found: ' . $contact_id);
-            return;
-        }
-
-        $contact = array_shift($contacts);
-
-        $t = $contact['abook_updated'];
-
-        $importer_uid = $contact['abook_channel'];
-
-        $r = q(
-            "SELECT * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
-            intval($importer_uid)
-        );
-
-        if (! $r) {
-            return;
-        }
-
-        $importer = $r[0];
-
-        logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}");
-
-        $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE))
-            ? datetime_convert('UTC', 'UTC', 'now - 7 days')
-            : datetime_convert('UTC', 'UTC', $contact['abook_updated'] . ' - 2 days')
-        );
-
-		if (in_array($contact['xchan_network'],['nomad']['zot6'])) {
-            // update permissions
-
-            $x = Libzot::refresh($contact, $importer);
-
-            $responded = false;
-            $updated   = datetime_convert();
-            $connected = datetime_convert();
-            if (! $x) {
-                // mark for death by not updating abook_connected, this is caught in include/poller.php
-                q(
-                    "update abook set abook_updated = '%s' where abook_id = %d",
-                    dbesc($updated),
-                    intval($contact['abook_id'])
-                );
-            } else {
-                q(
-                    "update abook set abook_updated = '%s', abook_connected = '%s' where abook_id = %d",
-                    dbesc($updated),
-                    dbesc($connected),
-                    intval($contact['abook_id'])
-                );
-                $responded = true;
-            }
-
-            if (! $responded) {
-                return;
-            }
-        }
-
-        $fetch_feed = true;
-
-        // They haven't given us permission to see their stream
-
-        $can_view_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'their_perms', 'view_stream'));
-
-        if (! $can_view_stream) {
-            $fetch_feed = false;
-        }
-
-        // we haven't given them permission to send us their stream
-
-        $can_send_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'my_perms', 'send_stream'));
-
-        if (! $can_send_stream) {
-            $fetch_feed = false;
-        }
-
-        if ($contact['abook_created'] < datetime_convert('UTC', 'UTC', 'now - 1 week')) {
-            $fetch_feed = false;
-        }
-
-        // In previous releases there was a mechanism to fetch 'external' or public stream posts from a site
-        // (as opposed to a channel). This mechanism was deprecated as there is no reliable/scalable method
-        // for informing downstream publishers when/if the content has expired or been deleted.
-        // We can use the ThreadListener interface to implement this on the owner's outbox, however this is still a
-        // work in progress and may present scaling issues. Making this work correctly with third-party fetches is
-        // prohibitive as deletion requests would need to be relayed over potentially hostile networks.
-
-        if ($fetch_feed) {
-            $max = intval(get_config('system', 'max_imported_posts', 20));
-            if (intval($max)) {
-                $cl = get_xconfig($xchan, 'activitypub', 'collections');
-                if (is_array($cl) && $cl) {
-                    $url = ((array_key_exists('outbox', $cl)) ? $cl['outbox'] : '');
-                    if ($url) {
-                        logger('fetching outbox');
-                        $url = $url . '?date_begin=' .  urlencode($last_update);
-                        $obj = new ASCollection($url, $importer, 0, $max);
-                        $messages = $obj->get();
-                        if ($messages) {
-                            foreach ($messages as $message) {
-                                if (is_string($message)) {
-                                    $message = Activity::fetch($message, $importer);
-                                }
-                                if (is_array($message)) {
-                                    $AS = new ActivityStreams($message, null, true);
-                                    if ($AS->is_valid() && is_array($AS->obj)) {
-                                        $item = Activity::decode_note($AS, true);
-                                        if ($item) {
-                                            Activity::store($importer, $contact['abook_xchan'], $AS, $item, true, true);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // update the poco details for this connection
-
-        $r = q(
-            "SELECT xlink_id from xlink 
-			where xlink_xchan = '%s' and xlink_updated > %s - INTERVAL %s and xlink_static = 0 limit 1",
-            intval($contact['xchan_hash']),
-            db_utcnow(),
-            db_quoteinterval('7 DAY')
-        );
-        if (! $r) {
-            Socgraph::poco_load($contact['xchan_hash'], $contact['xchan_connurl']);
-        }
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php
deleted file mode 100644
index 003bb6b56..000000000
--- a/Zotlabs/Daemon/Poller.php
+++ /dev/null
@@ -1,206 +0,0 @@
- $maxsysload) {
-                logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
-                return;
-            }
-        }
-
-        $interval = intval(get_config('system', 'poll_interval'));
-        if (! $interval) {
-            $interval = ((get_config('system', 'delivery_interval') === false) ? 3 : intval(get_config('system', 'delivery_interval')));
-        }
-
-        // Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
-        $lockfile = 'cache/poller';
-        if (
-            (file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))
-            && (! get_config('system', 'override_poll_lockfile'))
-        ) {
-            logger("poller: Already running");
-            return;
-        }
-
-        // Create a lockfile.
-        file_put_contents($lockfile, EMPTY_STR);
-
-        logger('poller: start');
-
-        $manual_id  = 0;
-        $generation = 0;
-
-        $force      = false;
-        $restart    = false;
-
-        if (($argc > 1) && ($argv[1] == 'force')) {
-            $force = true;
-        }
-
-        if (($argc > 1) && ($argv[1] == 'restart')) {
-            $restart = true;
-            $generation = intval($argv[2]);
-            if (! $generation) {
-                return;
-            }
-        }
-
-        if (($argc > 1) && intval($argv[1])) {
-            $manual_id = intval($argv[1]);
-            $force     = true;
-        }
-
-
-        $sql_extra = (($manual_id) ? " AND abook_id = " . intval($manual_id) . " " : "");
-
-        Addon::reload_all();
-
-        $d = datetime_convert();
-
-        // Only poll from those with suitable relationships
-
-//      $abandon_sql = (($abandon_days)
-//          ? sprintf(" AND account_lastlog > %s - INTERVAL %s ", db_utcnow(), db_quoteinterval(intval($abandon_days).' DAY'))
-//          : ''
-//      );
-
-        $abandon_sql = EMPTY_STR;
-
-        $randfunc = db_getfunc('RAND');
-
-        $contacts = q(
-            "SELECT abook.abook_updated, abook.abook_connected, abook.abook_feed,
-			abook.abook_channel, abook.abook_id, abook.abook_archived, abook.abook_pending,
-			abook.abook_ignored, abook.abook_blocked,
-			xchan.xchan_network,
-			account.account_lastlog, account.account_flags 
-			FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash 
-			LEFT JOIN account on abook_account = account_id
-			where abook_self = 0
-			$sql_extra 
-			AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc",
-            intval(ACCOUNT_OK),
-            intval(ACCOUNT_UNVERIFIED)     // FIXME
-        );
-
-        if ($contacts) {
-            foreach ($contacts as $contact) {
-                $update  = false;
-
-                $t = $contact['abook_updated'];
-                $c = $contact['abook_connected'];
-
-                if (intval($contact['abook_feed'])) {
-                    $min = ServiceClass::fetch($contact['abook_channel'], 'minimum_feedcheck_minutes');
-                    if (! $min) {
-                        $min = intval(get_config('system', 'minimum_feedcheck_minutes'));
-                    }
-                    if (! $min) {
-                        $min = 60;
-                    }
-                    $x = datetime_convert('UTC', 'UTC', "now - $min minutes");
-                    if ($c < $x) {
-                        Run::Summon([ 'Onepoll', $contact['abook_id'] ]);
-                        if ($interval) {
-                            @time_sleep_until(microtime(true) + (float) $interval);
-                        }
-                    }
-                    continue;
-                }
-
-				if (! in_array($contact['xchan_network'],['nomad','zot6'])) {
-					continue;
-				}
-
-                if ($c == $t) {
-                    if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {
-                        $update = true;
-                    }
-                } else {
-                    // if we've never connected with them, start the mark for death countdown from now
-
-                    if ($c <= NULL_DATE) {
-                        $r = q(
-                            "update abook set abook_connected = '%s'  where abook_id = %d",
-                            dbesc(datetime_convert()),
-                            intval($contact['abook_id'])
-                        );
-                        $c = datetime_convert();
-                        $update = true;
-                    }
-
-                    // He's dead, Jim
-
-                    if (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $c . " + 30 day")) > 0) {
-                        $r = q(
-                            "update abook set abook_archived = 1 where abook_id = %d",
-                            intval($contact['abook_id'])
-                        );
-                        $update = false;
-                        continue;
-                    }
-
-                    if (intval($contact['abook_archived'])) {
-                        $update = false;
-                        continue;
-                    }
-
-                    // might be dead, so maybe don't poll quite so often
-
-                    // recently deceased, so keep up the regular schedule for 3 days
-
-                    if (
-                        (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $c . " + 3 day")) > 0)
-                        && (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $t . " + 1 day")) > 0)
-                    ) {
-                        $update = true;
-                    }
-
-                    // After that back off and put them on a morphine drip
-
-                    if (strcmp(datetime_convert('UTC', 'UTC', 'now'), datetime_convert('UTC', 'UTC', $t . " + 2 day")) > 0) {
-                        $update = true;
-                    }
-                }
-
-                if (intval($contact['abook_pending']) || intval($contact['abook_archived']) || intval($contact['abook_ignored']) || intval($contact['abook_blocked'])) {
-                    continue;
-                }
-
-                if ((! $update) && (! $force)) {
-                        continue;
-                }
-
-                Run::Summon([ 'Onepoll',$contact['abook_id'] ]);
-                if ($interval) {
-                    @time_sleep_until(microtime(true) + (float) $interval);
-                }
-            }
-        }
-
-        set_config('system', 'lastpoll', datetime_convert());
-
-        //All done - clear the lockfile
-        @unlink($lockfile);
-
-        return;
-    }
-}
diff --git a/Zotlabs/Daemon/Queue.php b/Zotlabs/Daemon/Queue.php
deleted file mode 100644
index 7490724a7..000000000
--- a/Zotlabs/Daemon/Queue.php
+++ /dev/null
@@ -1,94 +0,0 @@
- 1) {
-            $queue_id = $argv[1];
-        } else {
-            $queue_id = EMPTY_STR;
-        }
-
-        logger('queue: start');
-
-        // delete all queue items more than 3 days old
-        // but first mark these sites dead if we haven't heard from them in a month
-
-        $r = q(
-            "select outq_posturl from outq where outq_created < %s - INTERVAL %s",
-            db_utcnow(),
-            db_quoteinterval('3 DAY')
-        );
-        if ($r) {
-            foreach ($r as $rr) {
-                $site_url = '';
-                $h = parse_url($rr['outq_posturl']);
-                $desturl = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
-                q(
-                    "update site set site_dead = 1 where site_dead = 0 and site_url = '%s' and site_update < %s - INTERVAL %s",
-                    dbesc($desturl),
-                    db_utcnow(),
-                    db_quoteinterval('1 MONTH')
-                );
-            }
-        }
-
-        $r = q(
-            "DELETE FROM outq WHERE outq_created < %s - INTERVAL %s",
-            db_utcnow(),
-            db_quoteinterval('3 DAY')
-        );
-
-        if ($queue_id) {
-            $r = q(
-                "SELECT * FROM outq WHERE outq_hash = '%s' LIMIT 1",
-                dbesc($queue_id)
-            );
-        } else {
-            // For the first 12 hours we'll try to deliver every 15 minutes
-            // After that, we'll only attempt delivery once per hour.
-            // This currently only handles the default queue drivers ('zot' or '') which we will group by posturl
-            // so that we don't start off a thousand deliveries for a couple of dead hubs.
-            // The zot driver will deliver everything destined for a single hub once contact is made (*if* contact is made).
-            // Other drivers will have to do something different here and may need their own query.
-
-            // Note: this requires some tweaking as new posts to long dead hubs once a day will keep them in the
-            // "every 15 minutes" category. We probably need to prioritise them when inserted into the queue
-            // or just prior to this query based on recent and long-term delivery history. If we have good reason to believe
-            // the site is permanently down, there's no reason to attempt delivery at all, or at most not more than once
-            // or twice a day.
-
-            $sqlrandfunc = db_getfunc('rand');
-
-            $r = q(
-                "SELECT *,$sqlrandfunc as rn FROM outq WHERE outq_delivered = 0 and outq_scheduled < %s order by rn limit 1",
-                db_utcnow()
-            );
-            while ($r) {
-                foreach ($r as $rv) {
-                    Zlib\Queue::deliver($rv);
-                }
-                $r = q(
-                    "SELECT *,$sqlrandfunc as rn FROM outq WHERE outq_delivered = 0 and outq_scheduled < %s order by rn limit 1",
-                    db_utcnow()
-                );
-            }
-        }
-        if (! $r) {
-            return;
-        }
-
-        foreach ($r as $rv) {
-            Zlib\Queue::deliver($rv);
-        }
-    }
-}
diff --git a/Zotlabs/Daemon/README.md b/Zotlabs/Daemon/README.md
deleted file mode 100644
index f9c856c70..000000000
--- a/Zotlabs/Daemon/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Daemon (background) Processes
-=============================
-
-
-This directory provides background tasks which are executed by a 
-command-line process and detached from normal web processing.
-
-Background tasks are invoked by calling
-
-
-	Zotlabs\Daemon\Run::Summon([ $cmd, $arg1, $argn... ]); 
-
-The Run class loads the desired command file and passes the arguments.
-
-
-To create a background task 'Foo' use the following template.
-
-	 $arr,
-            'long_running' => self::$long_running
-        ];
-
-        Hook::call('daemon_summon', $hookinfo);
-
-        $arr  = $hookinfo['argv'];
-        $argc = count($arr);
-
-        if ((! is_array($arr) || ($argc < 1))) {
-            logger("Summon handled by hook.", LOGGER_DEBUG);
-            return;
-        }
-
-        proc_run('php', 'Zotlabs/Daemon/Run.php', $arr);
-    }
-
-    public static function Release($argc, $argv)
-    {
-        cli_startup();
-
-        $hookinfo = [
-            'argv' => $argv,
-            'long_running' => self::$long_running
-        ];
-
-        Hook::call('daemon_release', $hookinfo);
-
-        $argv = $hookinfo['argv'];
-        $argc = count($argv);
-
-        if ((! is_array($argv) || ($argc < 1))) {
-            logger("Release handled by hook.", LOGGER_DEBUG);
-            return;
-        }
-
-        logger('Run: release: ' . print_r($argv, true), LOGGER_ALL, LOG_DEBUG);
-        $cls = '\\Zotlabs\\Daemon\\' . $argv[0];
-        $cls::run($argc, $argv);
-    }
-}
diff --git a/Zotlabs/Daemon/Thumbnail.php b/Zotlabs/Daemon/Thumbnail.php
deleted file mode 100644
index 25bd3790f..000000000
--- a/Zotlabs/Daemon/Thumbnail.php
+++ /dev/null
@@ -1,87 +0,0 @@
- $attach,
-            'preview_style'  => $preview_style,
-            'preview_width'  => $preview_width,
-            'preview_height' => $preview_height,
-            'thumbnail' => null
-        ];
-
-        /**
-         * @hooks thumbnail
-         *  * \e array \b attach
-         *  * \e int \b preview_style
-         *  * \e int \b preview_width
-         *  * \e int \b preview_height
-         *  * \e string \b thumbnail
-         */
-
-        Hook::call('thumbnail', $p);
-        if ($p['thumbnail']) {
-            return;
-        }
-
-        $default_controller = null;
-
-        $files = glob('Zotlabs/Thumbs/*.php');
-        if ($files) {
-            foreach ($files as $f) {
-                $clsname = '\\Zotlabs\\Thumbs\\' . ucfirst(basename($f, '.php'));
-                if (class_exists($clsname)) {
-                    $x = new $clsname();
-                    if (method_exists($x, 'Match')) {
-                        $matched = $x->Match($attach['filetype']);
-                        if ($matched) {
-                            $x->Thumb($attach, $preview_style, $preview_width, $preview_height);
-                        }
-                    }
-                    if (method_exists($x, 'MatchDefault')) {
-                        $default_matched = $x->MatchDefault(substr($attach['filetype'], 0, strpos($attach['filetype'], '/')));
-                        if ($default_matched) {
-                            $default_controller = $x;
-                        }
-                    }
-                }
-            }
-        }
-        if (
-            ($default_controller)
-            && ((! file_exists(dbunescbin($attach['content']) . '.thumb'))
-                || (filectime(dbunescbin($attach['content']) . 'thumb') < (time() - 60)))
-        ) {
-            $default_controller->Thumb($attach, $preview_style, $preview_width, $preview_height);
-        }
-    }
-}
diff --git a/Zotlabs/Daemon/Xchan_photo.php b/Zotlabs/Daemon/Xchan_photo.php
deleted file mode 100644
index f943a498b..000000000
--- a/Zotlabs/Daemon/Xchan_photo.php
+++ /dev/null
@@ -1,39 +0,0 @@
- $v) {
-                self::register($k, $file, $v);
-            }
-        }
-    }
-
-
-    public static function unregister($hook, $file, $function, $version = 1, $priority = 0)
-    {
-        if (is_array($function)) {
-            $function = serialize($function);
-        }
-        $r = q(
-            "DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s' and priority = %d and hook_version = %d",
-            dbesc($hook),
-            dbesc($file),
-            dbesc($function),
-            intval($priority),
-            intval($version)
-        );
-
-        return $r;
-    }
-
-    /**
-     * @brief Unregister all hooks with this file component.
-     *
-     * Useful for addon upgrades where you want to clean out old interfaces.
-     *
-     * @param string $file
-     */
-
-    public static function unregister_by_file($file)
-    {
-        $r = q(
-            "DELETE FROM hook WHERE file = '%s' ",
-            dbesc($file)
-        );
-
-        return $r;
-    }
-
-    /**
-     * @brief Inserts a hook into a page request.
-     *
-     * Insert a short-lived hook into the running page request.
-     * Hooks are normally persistent so that they can be called
-     * across asynchronous processes such as delivery and poll
-     * processes.
-     *
-     * insert_hook lets you attach a hook callback immediately
-     * which will not persist beyond the life of this page request
-     * or the current process.
-     *
-     * @param string $hook
-     *     name of hook to attach callback
-     * @param string $fn
-     *     function name of callback handler
-     * @param int $version
-     *     hook interface version, 0 uses two callback params, 1 uses one callback param
-     * @param int $priority
-     *     currently not implemented in this function, would require the hook array to be resorted
-     */
-    public static function insert($hook, $fn, $version = 0, $priority = 0)
-    {
-        if (is_array($fn)) {
-            $fn = serialize($fn);
-        }
-
-        if (! is_array(App::$hooks)) {
-            App::$hooks = [];
-        }
-
-        if (! array_key_exists($hook, App::$hooks)) {
-            App::$hooks[$hook] = [];
-        }
-
-        App::$hooks[$hook][] = [ '', $fn, $priority, $version ];
-    }
-
-
-    /**
-     * @brief loads all active hooks into memory
-     * alters: App::$hooks
-     * Called during initialisation
-     * Duplicated hooks are removed and the duplicates ignored
-     *
-     * It might not be obvious but themes can manually add hooks to the App::$hooks
-     * array in their theme_init() and use this to customise the app behaviour.
-     * use insert_hook($hookname,$function_name) to do this.
-     */
-
-
-    public static function load()
-    {
-
-        App::$hooks = [];
-
-        $r = q("SELECT * FROM hook WHERE true ORDER BY priority DESC");
-        if ($r) {
-            foreach ($r as $rv) {
-                $duplicated = false;
-                if (! array_key_exists($rv['hook'], App::$hooks)) {
-                    App::$hooks[$rv['hook']] = [];
-                } else {
-                    foreach (App::$hooks[$rv['hook']] as $h) {
-                        if ($h[0] === $rv['file'] && $h[1] === $rv['fn']) {
-                            $duplicated = true;
-                            q(
-                                "delete from hook where id = %d",
-                                intval($rv['id'])
-                            );
-                            logger('duplicate hook ' . $h[1] . ' removed');
-                        }
-                    }
-                }
-                if (! $duplicated) {
-                    App::$hooks[$rv['hook']][] = [ $rv['file'], $rv['fn'], $rv['priority'], $rv['hook_version']];
-                }
-            }
-        }
-        //  logger('hooks: ' . print_r(App::$hooks,true));
-    }
-
-    /**
-     * @brief Calls a hook.
-     *
-     * Use this function when you want to be able to allow a hook to manipulate
-     * the provided data.
-     *
-     * @param string $name of the hook to call
-     * @param[in,out] string|array &$data to transmit to the callback handler
-     */
-    static public function call($name, &$data = null)
-    {
-        $a = 0;
-
-        if (isset(App::$hooks[$name])) {
-            foreach (App::$hooks[$name] as $hook) {
-                $origfn = $hook[1];
-                if ($hook[0]) {
-                    @include_once($hook[0]);
-                }
-                if (preg_match('|^a:[0-9]+:{.*}$|s', $hook[1])) {
-                    $hook[1] = unserialize($hook[1]);
-                } elseif (strpos($hook[1], '::')) {
-                    // We shouldn't need to do this, but it appears that PHP
-                    // isn't able to directly execute a string variable with a class
-                    // method in the manner we are attempting it, so we'll
-                    // turn it into an array.
-                    $hook[1] = explode('::', $hook[1]);
-                }
-
-                if (is_callable($hook[1])) {
-                    $func = $hook[1];
-                    if ($hook[3]) {
-                        $func($data);
-                    } else {
-                        $func($a, $data);
-                    }
-                } else {
-                    // Don't do any DB write calls if we're currently logging a possibly failed DB call.
-                    if (! DBA::$logging) {
-                        // The hook should be removed so we don't process it.
-                        q(
-                            "DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'",
-                            dbesc($name),
-                            dbesc($hook[0]),
-                            dbesc($origfn)
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-
-
-
-}
diff --git a/Zotlabs/Extend/Route.php b/Zotlabs/Extend/Route.php
deleted file mode 100644
index 695c0d2bb..000000000
--- a/Zotlabs/Extend/Route.php
+++ /dev/null
@@ -1,52 +0,0 @@
- true,
-                'issuer' => System::get_site_name(),
-//              'use_jwt_access_tokens' => true,
-//              'enforce_state' => false
-            ];
-        }
-
-        parent::__construct($storage, $config);
-
-        // Add the "Client Credentials" grant type (it is the simplest of the grant types)
-        $this->addGrantType(new ClientCredentials($storage));
-
-        // Add the "Authorization Code" grant type (this is where the oauth magic happens)
-        // Need to use OpenID\GrantType to return id_token
-        // (see:https://github.com/bshaffer/oauth2-server-php/issues/443)
-        $this->addGrantType(new AuthorizationCode($storage));
-
-        $keyStorage = new Memory([
-            'keys' => [
-                'public_key'  => get_config('system', 'pubkey'),
-                'private_key' => get_config('system', 'prvkey')
-            ]
-        ]);
-
-        $this->addStorage($keyStorage, 'public_key');
-    }
-}
diff --git a/Zotlabs/Identity/OAuth2Storage.php b/Zotlabs/Identity/OAuth2Storage.php
deleted file mode 100644
index 92921402b..000000000
--- a/Zotlabs/Identity/OAuth2Storage.php
+++ /dev/null
@@ -1,171 +0,0 @@
-getUser($username)) {
-            return $this->checkPassword($user, $password);
-        }
-
-        return false;
-    }
-
-    /**
-     * @param string $username
-     * @return array|bool
-     */
-    public function getUserDetails($username)
-    {
-        return $this->getUser($username);
-    }
-
-
-    /**
-     *
-     * @param array $user
-     * @param string $password
-     * @return bool
-     */
-    protected function checkPassword($user, $password)
-    {
-
-        $x = account_verify_password($user, $password);
-        return((array_key_exists('channel', $x) && ! empty($x['channel'])) ? true : false);
-    }
-
-    /**
-     * @param string $username
-     * @return array|bool
-     */
-    public function getUser($username)
-    {
-
-        $x = Channel::from_id($username);
-        if (! $x) {
-            return false;
-        }
-
-        $a = q(
-            "select * from account where account_id = %d",
-            intval($x['channel_account_id'])
-        );
-
-        $n = explode(' ', $x['channel_name']);
-
-        return( [
-            'webfinger'   => Channel::get_webfinger($x),
-            'portable_id' => $x['channel_hash'],
-            'email'       => $a[0]['account_email'],
-            'username'    => $x['channel_address'],
-            'user_id'     => $x['channel_id'],
-            'name'        => $x['channel_name'],
-            'firstName'   => ((count($n) > 1) ? $n[1] : $n[0]),
-            'lastName'    => ((count($n) > 2) ? $n[count($n) - 1] : ''),
-            'picture'     => $x['xchan_photo_l']
-        ] );
-    }
-
-    public function scopeExists($scope)
-    {
-      // Report that the scope is valid even if it's not.
-      // We will only return a very small subset no matter what.
-      // @TODO: Truly validate the scope
-      //    see vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ScopeInterface.php and
-      //        vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Pdo.php
-      //    for more info.
-        return true;
-    }
-
-    public function getDefaultScope($client_id = null)
-    {
-      // Do not REQUIRE a scope
-      //    see vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ScopeInterface.php and
-      //    for more info.
-        return null;
-    }
-
-    public function getUserClaims($user_id, $claims)
-    {
-        // Populate the CLAIMS requested (if any).
-        // @TODO: create a more reasonable/comprehensive list.
-        // @TODO: present claims on the AUTHORIZATION screen
-
-        $userClaims = [];
-        $claims = explode(' ', trim($claims));
-        $validclaims = [ "name", "preferred_username", "webfinger", "portable_id", "email", "picture", "firstName", "lastName" ];
-        $claimsmap = [
-            "webfinger"          => 'webfinger',
-            "portable_id"        => 'portable_id',
-            "name"               => 'name',
-            "email"              => 'email',
-            "preferred_username" => 'username',
-            "picture"            => 'picture',
-            "given_name"         => 'firstName',
-            "family_name"        => 'lastName'
-        ];
-        $userinfo = $this->getUser($user_id);
-        foreach ($validclaims as $validclaim) {
-            if (in_array($validclaim, $claims)) {
-                $claimkey = $claimsmap[$validclaim];
-                $userClaims[$validclaim] = $userinfo[$claimkey];
-            } else {
-                $userClaims[$validclaim] = $validclaim;
-            }
-        }
-        $userClaims["sub"] = $user_id;
-        return $userClaims;
-    }
-
-    /**
-     * plaintext passwords are bad!  Override this for your application
-     *
-     * @param string $username
-     * @param string $password
-     * @param string $firstName
-     * @param string $lastName
-     * @return bool
-     */
-    public function setUser($username, $password, $firstName = null, $lastName = null)
-    {
-        return true;
-    }
-
-    public function setClientDetails($client_id, $client_secret = null, $redirect_uri = null, $grant_types = null, $scope = null, $user_id = null, $client_name = null)
-    {
-        // if it exists, update it.
-        if ($this->getClientDetails($client_id)) {
-            $stmt = $this->db->prepare($sql = sprintf('UPDATE %s SET client_secret=:client_secret, redirect_uri=:redirect_uri, grant_types=:grant_types, scope=:scope, user_id=:user_id, client_name=:client_name where client_id=:client_id', $this->config['client_table']));
-        } else {
-            $stmt = $this->db->prepare(sprintf('INSERT INTO %s (client_id, client_secret, redirect_uri, grant_types, scope, user_id, client_name) VALUES (:client_id, :client_secret, :redirect_uri, :grant_types, :scope, :user_id, :client_name)', $this->config['client_table']));
-        }
-
-        return $stmt->execute(compact('client_id', 'client_secret', 'redirect_uri', 'grant_types', 'scope', 'user_id', 'client_name'));
-    }
-
-
-
-
-    public function checkRestrictedGrantType($client_id, $grant_type)
-    {
-        $details = $this->getClientDetails($client_id);
-        if ($details['grant_types']) {
-            $grant_types = explode(' ', $details['grant_types']);
-            return in_array($grant_type, (array) $grant_types);
-        }
-
-        // if grant_types are not defined, then none are restricted
-        return true;
-    }
-}
diff --git a/Zotlabs/Import/Friendica.php b/Zotlabs/Import/Friendica.php
deleted file mode 100644
index 6118363fe..000000000
--- a/Zotlabs/Import/Friendica.php
+++ /dev/null
@@ -1,368 +0,0 @@
-data = $data;
-        $this->settings = $settings;
-        $this->extract();
-    }
-
-    public function extract()
-    {
-
-        // channel stuff
-
-        $channel = [
-            'channel_name' => escape_tags($this->data['user']['username']),
-            'channel_address' => escape_tags($this->data['user']['nickname']),
-            'channel_guid' => escape_tags($this->data['user']['guid']),
-            'channel_guid_sig' => Libzot::sign($this->data['user']['guid'], $this->data['user']['prvkey']),
-            'channel_hash' => Libzot::make_xchan_hash($this->data['user']['guid'], $this->data['user']['pubkey']),
-            'channel_prvkey' => $this->data['user']['prvkey'],
-            'channel_pubkey' => $this->data['user']['pubkey'],
-            'channel_pageflags' => PAGE_NORMAL,
-            'channel_expire_days' => intval($this->data['user']['expire']),
-            'channel_timezone' => escape_tags($this->data['user']['timezone']),
-            'channel_location' => escape_tags($this->data['user']['default-location'])
-        ];
-
-        $account_id = $this->settings['account_id'];
-
-        $max_identities = ServiceClass::account_fetch($account_id, 'total_identities');
-
-        if ($max_identities !== false) {
-            $r = q(
-                "select channel_id from channel where channel_account_id = %d and channel_removed = 0 ",
-                intval($account_id)
-            );
-            if ($r && count($r) > $max_identities) {
-                notice(sprintf(t('Your service plan only allows %d channels.'), $max_identities) . EOL);
-                return;
-            }
-        }
-
-        // save channel or die
-
-
-        $channel = import_channel($channel, $this->settings['account_id'], $this->settings['sieze'], $this->settings['newname']);
-        if (!$channel) {
-            logger('no channel');
-            return;
-        }
-
-
-        // figure out channel permission roles
-
-        $permissions_role = 'social';
-
-        $pageflags = ((isset($this->data['user']['page-flags'])) ? intval($this->data['user']['page-flags']) : 0);
-
-        if ($pageflags === 2) {
-            $permissions_role = 'forum';
-        }
-        if ($pageflags === 5) {
-            $permissions_role = 'forum_restricted';
-        }
-
-        if ($pageflags === 0 && isset($this->data['user']['allow_gid']) && $this->data['user']['allow_gid']) {
-            $permissions_role = 'social_restricted';
-        }
-
-        // Friendica folks only have PERMS_AUTHED and "just me"
-
-        $post_comments = (($pageflags === 1) ? 0 : PERMS_AUTHED);
-        PermissionLimits::Set(local_channel(), 'post_comments', $post_comments);
-
-        PConfig::Set($channel['channel_id'], 'system', 'permissions_role', $permissions_role);
-        PConfig::Set($channel['channel_id'], 'system', 'use_browser_location', (string)intval($this->data['user']['allow_location']));
-
-        // find the self contact
-
-        $self_contact = null;
-
-        if (isset($this->data['contact']) && is_array($this->data['contact'])) {
-            foreach ($this->data['contact'] as $contact) {
-                if (isset($contact['self']) && intval($contact['self'])) {
-                    $self_contact = $contact;
-                    break;
-                }
-            }
-        }
-
-        if (!is_array($self_contact)) {
-            logger('self contact not found.');
-            return;
-        }
-
-        // Create a verified hub location pointing to this site.
-
-        $r = hubloc_store_lowlevel(
-            [
-                'hubloc_guid' => $channel['channel_guid'],
-                'hubloc_guid_sig' => $channel['channel_guid_sig'],
-                'hubloc_id_url' => Channel::url($channel),
-                'hubloc_hash' => $channel['channel_hash'],
-                'hubloc_addr' => Channel::get_webfinger($channel),
-                'hubloc_primary' => 1,
-                'hubloc_url' => z_root(),
-                'hubloc_url_sig' => Libzot::sign(z_root(), $channel['channel_prvkey']),
-                'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')),
-                'hubloc_host' => App::get_hostname(),
-                'hubloc_callback' => z_root() . '/zot',
-                'hubloc_sitekey' => get_config('system', 'pubkey'),
-                'hubloc_network' => 'nomad',
-                'hubloc_updated' => datetime_convert()
-            ]
-        );
-        if (!$r) {
-            logger('Unable to store hub location');
-        }
-
-
-        if ($self_contact['avatar']) {
-            $p = z_fetch_url($self_contact['avatar'], true);
-            if ($p['success']) {
-                $h = explode("\n", $p['header']);
-                foreach ($h as $l) {
-                    list($k, $v) = array_map("trim", explode(":", trim($l), 2));
-                    $hdrs[strtolower($k)] = $v;
-                }
-                if (array_key_exists('content-type', $hdrs)) {
-                    $phototype = $hdrs['content-type'];
-                } else {
-                    $phototype = 'image/jpeg';
-                }
-
-                import_channel_photo($p['body'], $phototype, $account_id, $channel['channel_id']);
-            }
-        }
-
-        $newuid = $channel['channel_id'];
-
-        $r = xchan_store_lowlevel(
-            [
-                'xchan_hash' => $channel['channel_hash'],
-                'xchan_guid' => $channel['channel_guid'],
-                'xchan_guid_sig' => $channel['channel_guid_sig'],
-                'xchan_pubkey' => $channel['channel_pubkey'],
-                'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'),
-                'xchan_photo_l' => z_root() . "/photo/profile/l/{$newuid}",
-                'xchan_photo_m' => z_root() . "/photo/profile/m/{$newuid}",
-                'xchan_photo_s' => z_root() . "/photo/profile/s/{$newuid}",
-                'xchan_addr' => Channel::get_webfinger($channel),
-                'xchan_url' => Channel::url($channel),
-                'xchan_follow' => z_root() . '/follow?f=&url=%s',
-                'xchan_connurl' => z_root() . '/poco/' . $channel['channel_address'],
-                'xchan_name' => $channel['channel_name'],
-                'xchan_network' => 'nomad',
-                'xchan_updated' => datetime_convert(),
-                'xchan_photo_date' => datetime_convert(),
-                'xchan_name_date' => datetime_convert(),
-                'xchan_system' => 0
-            ]
-        );
-
-        $r = Channel::profile_store_lowlevel(
-            [
-                'aid' => intval($channel['channel_account_id']),
-                'uid' => intval($newuid),
-                'profile_guid' => new_uuid(),
-                'profile_name' => t('Default Profile'),
-                'is_default' => 1,
-                'publish' => ((isset($this->data['profile']['publish'])) ? $this->data['profile']['publish'] : 1),
-                'fullname' => $channel['channel_name'],
-                'photo' => z_root() . "/photo/profile/l/{$newuid}",
-                'thumb' => z_root() . "/photo/profile/m/{$newuid}",
-                'homepage' => ((isset($this->data['profile']['homepage'])) ? $this->data['profile']['homepage'] : EMPTY_STR),
-            ]
-        );
-
-        if ($role_permissions) {
-            $myperms = ((array_key_exists('perms_connect', $role_permissions)) ? $role_permissions['perms_connect'] : []);
-        } else {
-            $x = PermissionRoles::role_perms('social');
-            $myperms = $x['perms_connect'];
-        }
-
-        $r = abook_store_lowlevel(
-            [
-                'abook_account' => intval($channel['channel_account_id']),
-                'abook_channel' => intval($newuid),
-                'abook_xchan' => $channel['channel_hash'],
-                'abook_closeness' => 0,
-                'abook_created' => datetime_convert(),
-                'abook_updated' => datetime_convert(),
-                'abook_self' => 1
-            ]
-        );
-
-
-        $x = Permissions::serialise(Permissions::FilledPerms($myperms));
-        set_abconfig($newuid, $channel['channel_hash'], 'system', 'my_perms', $x);
-
-        if (intval($channel['channel_account_id'])) {
-            // Save our permissions role so we can perhaps call it up and modify it later.
-
-            if ($role_permissions) {
-                if (array_key_exists('online', $role_permissions)) {
-                    set_pconfig($newuid, 'system', 'hide_presence', 1 - intval($role_permissions['online']));
-                }
-                if (array_key_exists('perms_auto', $role_permissions)) {
-                    $autoperms = intval($role_permissions['perms_auto']);
-                    set_pconfig($newuid, 'system', 'autoperms', $autoperms);
-                }
-            }
-
-            // Create a group with yourself as a member. This allows somebody to use it
-            // right away as a default group for new contacts.
-
-            AccessList::add($newuid, t('Friends'));
-            AccessList::member_add($newuid, t('Friends'), $ret['channel']['channel_hash']);
-
-            // if our role_permissions indicate that we're using a default collection ACL, add it.
-
-            if (is_array($role_permissions) && $role_permissions['default_collection']) {
-                $r = q(
-                    "select hash from pgrp where uid = %d and gname = '%s' limit 1",
-                    intval($newuid),
-                    dbesc(t('Friends'))
-                );
-                if ($r) {
-                    q(
-                        "update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d",
-                        dbesc($r[0]['hash']),
-                        dbesc('<' . $r[0]['hash'] . '>'),
-                        intval($newuid)
-                    );
-                }
-            }
-
-            set_pconfig($channel['channel_id'], 'system', 'photo_path', '%Y/%Y-%m');
-            set_pconfig($channel['channel_id'], 'system', 'attach_path', '%Y/%Y-%m');
-
-
-            // auto-follow any of the hub's pre-configured channel choices.
-            // Only do this if it's the first channel for this account;
-            // otherwise it could get annoying. Don't make this list too big
-            // or it will impact registration time.
-
-            $accts = get_config('system', 'auto_follow');
-            if (($accts) && (!$total_identities)) {
-                if (!is_array($accts)) {
-                    $accts = array($accts);
-                }
-
-                foreach ($accts as $acct) {
-                    if (trim($acct)) {
-                        $f = Channel::connect_and_sync($channel, trim($acct));
-                        if ($f['success']) {
-                            $can_view_stream = their_perms_contains($channel['channel_id'], $f['abook']['abook_xchan'], 'view_stream');
-
-                            // If we can view their stream, pull in some posts
-
-                            if (($can_view_stream) || ($f['abook']['xchan_network'] === 'rss')) {
-                                Run::Summon(['Onepoll', $f['abook']['abook_id']]);
-                            }
-                        }
-                    }
-                }
-            }
-
-            Hook::call('create_identity', $newuid);
-        }
-
-        $this->groups = ((isset($this->data['group'])) ? $this->data['group'] : null);
-        $this->members = ((isset($this->data['group_member'])) ? $this->data['group_member'] : null);
-
-        // import contacts
-
-        if (isset($this->data['contact']) && is_array($this->data['contact'])) {
-            foreach ($this->data['contact'] as $contact) {
-                if (isset($contact['self']) && intval($contact['self'])) {
-                    continue;
-                }
-                logger('connecting: ' . $contact['url'], LOGGER_DEBUG);
-                $result = Connect::connect($channel, (($contact['addr']) ? $contact['addr'] : $contact['url']));
-                if ($result['success'] && isset($result['abook'])) {
-                    $contact['xchan_hash'] = $result['abook']['abook_xchan'];
-                    $this->contacts[] = $contact;
-                }
-            }
-        }
-
-        // import pconfig
-        // it is unlikely we can make use of these unless we recongise them.
-
-        if (isset($this->data['pconfig']) && is_array($this->data['pconfig'])) {
-            foreach ($this->data['pconfig'] as $pc) {
-                $entry = [
-                    'cat' => escape_tags(str_replace('.', '__', $pc['cat'])),
-                    'k' => escape_tags(str_replace('.', '__', $pc['k'])),
-                    'v' => ((preg_match('|^a:[0-9]+:{.*}$|s', $pc['v'])) ? serialise(unserialize($pc['v'])) : $pc['v']),
-                ];
-                PConfig::Set($channel['channel_id'], $entry['cat'], $entry['k'], $entry['v']);
-            }
-        }
-
-        // The default 'Friends' group is already created and possibly populated.
-        // So some of the following code is redundant in that regard.
-        // Mostly this is used to create and populate any other groups.
-
-        if ($this->groups) {
-            foreach ($this->groups as $group) {
-                if (!intval($group['deleted'])) {
-                    AccessList::add($channel['channel_id'], $group['name'], intval($group['visible']));
-                    if ($this->members) {
-                        foreach ($this->members as $member) {
-                            if (intval($member['gid']) === intval(AccessList::byname($channel['channel_id'], $group['name']))) {
-                                $contact_id = $member['contact-id'];
-                                if ($this->contacts) {
-                                    foreach ($this->contacts as $contact) {
-                                        if (intval($contact['id']) === intval($contact_id)) {
-                                            AccessList::member_add($channel['channel_id'], $group['name'], $contact['xchan_hash']);
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        change_channel($channel['channel_id']);
-        notice(t('Import complete.') . EOL);
-
-        goaway(z_root() . '/stream');
-    }
-}
-
diff --git a/Zotlabs/Lib/AConfig.php b/Zotlabs/Lib/AConfig.php
deleted file mode 100644
index 417f3034d..000000000
--- a/Zotlabs/Lib/AConfig.php
+++ /dev/null
@@ -1,29 +0,0 @@
-get() to return an array of collection members.
- */
-class ASCollection
-{
-
-    private $channel = null;
-    private $nextpage = null;
-    private $limit = 0;
-    private $direction = 0;  // 0 = forward, 1 = reverse
-    private $data = [];
-    private $history = [];
-
-
-    public function __construct($obj, $channel = null, $direction = 0, $limit = 0)
-    {
-
-        $this->channel = $channel;
-        $this->direction = $direction;
-        $this->limit = $limit;
-
-        if (is_array($obj)) {
-            $data = $obj;
-        }
-
-        if (is_string($obj)) {
-            $data = Activity::fetch($obj, $channel);
-            $this->history[] = $obj;
-        }
-
-        if (!is_array($data)) {
-            return;
-        }
-
-        if (!in_array($data['type'], ['Collection', 'OrderedCollection'])) {
-            return false;
-        }
-
-        if ($this->direction) {
-            if (array_key_exists('last', $data) && $data['last']) {
-                $this->nextpage = $data['last'];
-            }
-        } else {
-            if (array_key_exists('first', $data) && $data['first']) {
-                $this->nextpage = $data['first'];
-            }
-        }
-
-        if (isset($data['items']) && is_array($data['items'])) {
-            $this->data = (($this->direction) ? array_reverse($data['items']) : $data['items']);
-        } elseif (isset($data['orderedItems']) && is_array($data['orderedItems'])) {
-            $this->data = (($this->direction) ? array_reverse($data['orderedItems']) : $data['orderedItems']);
-        }
-
-        if ($limit) {
-            if (count($this->data) > $limit) {
-                $this->data = array_slice($this->data, 0, $limit);
-                return;
-            }
-        }
-
-        do {
-            $x = $this->next();
-        } while ($x);
-    }
-
-    public function get()
-    {
-        return $this->data;
-    }
-
-    public function next()
-    {
-
-        if (!$this->nextpage) {
-            return false;
-        }
-
-        if (is_array($this->nextpage)) {
-            $data = $this->nextpage;
-        }
-
-        if (is_string($this->nextpage)) {
-            if (in_array($this->nextpage, $this->history)) {
-                // recursion detected
-                return false;
-            }
-            $data = Activity::fetch($this->nextpage, $this->channel);
-            $this->history[] = $this->nextpage;
-        }
-
-        if (!is_array($data)) {
-            return false;
-        }
-
-        if (!in_array($data['type'], ['CollectionPage', 'OrderedCollectionPage'])) {
-            return false;
-        }
-
-        $this->setnext($data);
-
-        if (isset($data['items']) && is_array($data['items'])) {
-            $this->data = array_merge($this->data, (($this->direction) ? array_reverse($data['items']) : $data['items']));
-        } elseif (isset($data['orderedItems']) && is_array($data['orderedItems'])) {
-            $this->data = array_merge($this->data, (($this->direction) ? array_reverse($data['orderedItems']) : $data['orderedItems']));
-        }
-
-        if ($limit) {
-            if (count($this->data) > $limit) {
-                $this->data = array_slice($this->data, 0, $limit);
-                $this->nextpage = false;
-                return true;
-            }
-        }
-
-        return true;
-    }
-
-    public function setnext($data)
-    {
-        if ($this->direction) {
-            if (array_key_exists('prev', $data) && $data['prev']) {
-                $this->nextpage = $data['prev'];
-            } elseif (array_key_exists('first', $data) && $data['first']) {
-                $this->nextpage = $data['first'];
-            } else {
-                $this->nextpage = false;
-            }
-        } else {
-            if (array_key_exists('next', $data) && $data['next']) {
-                $this->nextpage = $data['next'];
-            } elseif (array_key_exists('last', $data) && $data['last']) {
-                $this->nextpage = $data['last'];
-            } else {
-                $this->nextpage = false;
-            }
-        }
-        logger('nextpage: ' . $this->nextpage, LOGGER_DEBUG);
-    }
-}
diff --git a/Zotlabs/Lib/AbConfig.php b/Zotlabs/Lib/AbConfig.php
deleted file mode 100644
index 391ae1af9..000000000
--- a/Zotlabs/Lib/AbConfig.php
+++ /dev/null
@@ -1,84 +0,0 @@
-may apply to this list and any future members. If this is not what you intended, please create another list with a different name.') . EOL);
-                }
-                $hash = self::by_id($uid, $r);
-                return $hash;
-            }
-
-            $hash = new_uuid();
-
-            $r = q(
-                "INSERT INTO pgrp ( hash, uid, visible, gname, rule )
-				VALUES( '%s', %d, %d, '%s', '' ) ",
-                dbesc($hash),
-                intval($uid),
-                intval($public),
-                dbesc($name)
-            );
-            $ret = $r;
-        }
-
-        Libsync::build_sync_packet($uid, null, true);
-
-        return (($ret) ? $hash : $ret);
-    }
-
-
-    public static function remove($uid, $name)
-    {
-        $ret = false;
-        if ($uid && $name) {
-            $r = q(
-                "SELECT id, hash FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1",
-                intval($uid),
-                dbesc($name)
-            );
-            if ($r) {
-                $group_id = $r[0]['id'];
-                $group_hash = $r[0]['hash'];
-            } else {
-                return false;
-            }
-
-            // remove group from default posting lists
-            $r = q(
-                "SELECT channel_default_group, channel_allow_gid, channel_deny_gid FROM channel WHERE channel_id = %d LIMIT 1",
-                intval($uid)
-            );
-            if ($r) {
-                $user_info = array_shift($r);
-                $change = false;
-
-                if ($user_info['channel_default_group'] == $group_hash) {
-                    $user_info['channel_default_group'] = '';
-                    $change = true;
-                }
-                if (strpos($user_info['channel_allow_gid'], '<' . $group_hash . '>') !== false) {
-                    $user_info['channel_allow_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_allow_gid']);
-                    $change = true;
-                }
-                if (strpos($user_info['channel_deny_gid'], '<' . $group_hash . '>') !== false) {
-                    $user_info['channel_deny_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_deny_gid']);
-                    $change = true;
-                }
-
-                if ($change) {
-                    q(
-                        "UPDATE channel SET channel_default_group = '%s', channel_allow_gid = '%s', channel_deny_gid = '%s' 
-						WHERE channel_id = %d",
-                        intval($user_info['channel_default_group']),
-                        dbesc($user_info['channel_allow_gid']),
-                        dbesc($user_info['channel_deny_gid']),
-                        intval($uid)
-                    );
-                }
-            }
-
-            // remove all members
-            $r = q(
-                "DELETE FROM pgrp_member WHERE uid = %d AND gid = %d ",
-                intval($uid),
-                intval($group_id)
-            );
-
-            // remove group
-            $r = q(
-                "UPDATE pgrp SET deleted = 1 WHERE uid = %d AND gname = '%s'",
-                intval($uid),
-                dbesc($name)
-            );
-
-            $ret = $r;
-        }
-
-        Libsync::build_sync_packet($uid, null, true);
-
-        return $ret;
-    }
-
-    // returns the integer id of an access group owned by $uid and named $name
-    // or false.
-
-    public static function byname($uid, $name)
-    {
-        if (!($uid && $name)) {
-            return false;
-        }
-        $r = q(
-            "SELECT id FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1",
-            intval($uid),
-            dbesc($name)
-        );
-        if ($r) {
-            return $r[0]['id'];
-        }
-        return false;
-    }
-
-    public static function by_id($uid, $id)
-    {
-        if (!($uid && $id)) {
-            return false;
-        }
-
-        $r = q(
-            "SELECT * FROM pgrp WHERE uid = %d AND id = %d and deleted = 0",
-            intval($uid),
-            intval($id)
-        );
-        if ($r) {
-            return array_shift($r);
-        }
-        return false;
-    }
-
-
-    public static function rec_byhash($uid, $hash)
-    {
-        if (!($uid && $hash)) {
-            return false;
-        }
-        $r = q(
-            "SELECT * FROM pgrp WHERE uid = %d AND hash = '%s' LIMIT 1",
-            intval($uid),
-            dbesc($hash)
-        );
-        if ($r) {
-            return array_shift($r);
-        }
-        return false;
-    }
-
-
-    public static function member_remove($uid, $name, $member)
-    {
-        $gid = self::byname($uid, $name);
-        if (!$gid) {
-            return false;
-        }
-        if (!($uid && $gid && $member)) {
-            return false;
-        }
-        $r = q(
-            "DELETE FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' ",
-            intval($uid),
-            intval($gid),
-            dbesc($member)
-        );
-
-        Libsync::build_sync_packet($uid, null, true);
-
-        return $r;
-    }
-
-
-    public static function member_add($uid, $name, $member, $gid = 0)
-    {
-        if (!$gid) {
-            $gid = self::byname($uid, $name);
-        }
-        if (!($gid && $uid && $member)) {
-            return false;
-        }
-
-        $r = q(
-            "SELECT * FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' LIMIT 1",
-            intval($uid),
-            intval($gid),
-            dbesc($member)
-        );
-        if ($r) {
-            return true;    // You might question this, but
-            // we indicate success because the group member was in fact created
-            // -- It was just created at another time
-        } else {
-            $r = q(
-                "INSERT INTO pgrp_member (uid, gid, xchan)
-				VALUES( %d, %d, '%s' ) ",
-                intval($uid),
-                intval($gid),
-                dbesc($member)
-            );
-        }
-        Libsync::build_sync_packet($uid, null, true);
-        return $r;
-    }
-
-
-    public static function members($uid, $gid, $total = false, $start = 0, $records = 0)
-    {
-        $ret = [];
-        if ($records) {
-            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval($records), intval($start));
-        }
-
-        // process virtual groups
-        if (strpos($gid, ':') === 0) {
-            $vg = substr($gid, 1);
-            switch ($vg) {
-                case '1':
-                    $sql_extra = EMPTY_STR;
-                    break;
-                case '2':
-					$sql_extra = " and xchan_network in ('nomad','zot6') ";
-                    break;
-                case '3':
-                    $sql_extra = " and xchan_network = 'activitypub' ";
-                    break;
-                default:
-                    break;
-            }
-            if ($total) {
-                $r = q(
-                    "SELECT count(*) FROM abook left join xchan on xchan_hash = abook_xchan WHERE abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 $sql_extra ORDER BY xchan_name ASC $pager_sql",
-                    intval($uid)
-                );
-                return ($r) ? $r[0]['total'] : false;
-            }
-
-            $r = q(
-                "SELECT * FROM abook left join xchan on xchan_hash = abook_xchan
-				WHERE abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 $sql_extra ORDER BY xchan_name ASC $pager_sql",
-                intval($uid)
-            );
-            if ($r) {
-                for ($x = 0; $x < count($r); $x++) {
-                    $r[$x]['xchan'] = $r[$x]['abook_xchan'];
-                }
-            }
-            return $r;
-        }
-
-        if (intval($gid)) {
-            if ($total) {
-                $r = q(
-                    "SELECT count(xchan) as total FROM pgrp_member 
-					LEFT JOIN abook ON abook_xchan = pgrp_member.xchan left join xchan on xchan_hash = abook_xchan
-					WHERE gid = %d AND abook_channel = %d and pgrp_member.uid = %d and xchan_deleted = 0 and abook_self = 0
-					and abook_blocked = 0 and abook_pending = 0",
-                    intval($gid),
-                    intval($uid),
-                    intval($uid)
-                );
-                if ($r) {
-                    return $r[0]['total'];
-                }
-            }
-
-            $r = q(
-                "SELECT * FROM pgrp_member 
-				LEFT JOIN abook ON abook_xchan = pgrp_member.xchan left join xchan on xchan_hash = abook_xchan
-				WHERE gid = %d AND abook_channel = %d and pgrp_member.uid = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC $pager_sql",
-                intval($gid),
-                intval($uid),
-                intval($uid)
-            );
-            if ($r) {
-                $ret = $r;
-            }
-        }
-        return $ret;
-    }
-
-    public static function members_xchan($uid, $gid)
-    {
-        $ret = [];
-        if (intval($gid)) {
-            $r = q(
-                "SELECT xchan FROM pgrp_member WHERE gid = %d AND uid = %d",
-                intval($gid),
-                intval($uid)
-            );
-            if ($r) {
-                foreach ($r as $rv) {
-                    $ret[] = $rv['xchan'];
-                }
-            }
-        }
-        return $ret;
-    }
-
-    public static function select($uid, $group = '')
-    {
-
-        $grps = [];
-
-        $r = q(
-            "SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
-            intval($uid)
-        );
-        $grps[] = ['name' => '', 'hash' => '0', 'selected' => ''];
-        if ($r) {
-            foreach ($r as $rr) {
-                $grps[] = ['name' => $rr['gname'], 'id' => $rr['hash'], 'selected' => (($group == $rr['hash']) ? 'true' : '')];
-            }
-        }
-
-        return replace_macros(Theme::get_template('group_selection.tpl'), [
-            '$label' => t('Add new connections to this access list'),
-            '$groups' => $grps
-        ]);
-    }
-
-
-    public static function widget($every = "connections", $each = "lists", $edit = false, $group_id = 0, $cid = '', $mode = 1)
-    {
-
-        $o = '';
-
-        $groups = [];
-
-        $r = q(
-            "SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
-            intval($_SESSION['uid'])
-        );
-        $member_of = [];
-        if ($cid) {
-            $member_of = self::containing(local_channel(), $cid);
-        }
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $selected = (($group_id == $rr['id']) ? ' group-selected' : '');
-
-                if ($edit) {
-                    $groupedit = ['href' => "lists/" . $rr['id'], 'title' => t('edit')];
-                } else {
-                    $groupedit = null;
-                }
-
-                $groups[] = [
-                    'id' => $rr['id'],
-                    'enc_cid' => base64url_encode($cid),
-                    'cid' => $cid,
-                    'text' => $rr['gname'],
-                    'selected' => $selected,
-                    'href' => (($mode == 0) ? $each . '?f=&gid=' . $rr['id'] : $each . "/" . $rr['id']) . ((x($_GET, 'new')) ? '&new=' . $_GET['new'] : '') . ((x($_GET, 'order')) ? '&order=' . $_GET['order'] : ''),
-                    'edit' => $groupedit,
-                    'ismember' => in_array($rr['id'], $member_of),
-                ];
-            }
-        }
-
-        return replace_macros(Theme::get_template('group_side.tpl'), [
-            '$title' => t('Lists'),
-            '$edittext' => t('Edit list'),
-            '$createtext' => t('Create new list'),
-            '$ungrouped' => (($every === 'contacts') ? t('Channels not in any access list') : ''),
-            '$groups' => $groups,
-            '$add' => t('add'),
-        ]);
-    }
-
-
-    public static function expand($g)
-    {
-        if (!(is_array($g) && count($g))) {
-            return [];
-        }
-
-        $ret = [];
-        $x = [];
-
-        foreach ($g as $gv) {
-            // virtual access lists
-            // connections:abc is all the connection sof the channel with channel_hash abc
-            // zot:abc is all of abc's zot6 connections
-            // activitypub:abc is all of abc's activitypub connections
-
-            if (strpos($gv, 'connections:') === 0 || strpos($gv, 'zot:') === 0 || strpos($gv, 'activitypub:') === 0) {
-                $sql_extra = EMPTY_STR;
-                $channel_hash = substr($gv, strpos($gv, ':') + 1);
-                if (strpos($gv, 'zot:') === 0) {
-					$sql_extra = " and xchan_network in ('nomad','zot6') ";
-                }
-                if (strpos($gv, 'activitypub:') === 0) {
-                    $sql_extra = " and xchan_network = 'activitypub' ";
-                }
-                $r = q(
-                    "select channel_id from channel where channel_hash = '%s' ",
-                    dbesc($channel_hash)
-                );
-                if ($r) {
-                    foreach ($r as $rv) {
-                        $y = q(
-                            "select abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and abook_pending = 0 and abook_archived = 0 $sql_extra",
-                            intval($rv['channel_id'])
-                        );
-                        if ($y) {
-                            foreach ($y as $yv) {
-                                $ret[] = $yv['abook_xchan'];
-                            }
-                        }
-                    }
-                }
-            } else {
-                $x[] = $gv;
-            }
-        }
-
-        if ($x) {
-            stringify_array_elms($x, true);
-            $groups = implode(',', $x);
-            if ($groups) {
-                $r = q("SELECT xchan FROM pgrp_member WHERE gid IN ( select id from pgrp where hash in ( $groups ))");
-                if ($r) {
-                    foreach ($r as $rv) {
-                        $ret[] = $rv['xchan'];
-                    }
-                }
-            }
-        }
-        return $ret;
-    }
-
-
-    public static function member_of($c)
-    {
-        $r = q(
-            "SELECT pgrp.gname, pgrp.id FROM pgrp LEFT JOIN pgrp_member ON pgrp_member.gid = pgrp.id 
-			WHERE pgrp_member.xchan = '%s' AND pgrp.deleted = 0 ORDER BY pgrp.gname  ASC ",
-            dbesc($c)
-        );
-
-        return $r;
-    }
-
-    public static function containing($uid, $c)
-    {
-
-        $r = q(
-            "SELECT gid FROM pgrp_member WHERE uid = %d AND pgrp_member.xchan = '%s' ",
-            intval($uid),
-            dbesc($c)
-        );
-
-        $ret = [];
-        if ($r) {
-            foreach ($r as $rv) {
-                $ret[] = $rv['gid'];
-            }
-        }
-
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Lib/Account.php b/Zotlabs/Lib/Account.php
deleted file mode 100644
index 15c7cc1ff..000000000
--- a/Zotlabs/Lib/Account.php
+++ /dev/null
@@ -1,707 +0,0 @@
- false, 'message' => '' ];
-
-        // Caution: empty email isn't counted as an error in this function.
-        // Check for empty value separately.
-
-        if (! strlen($email)) {
-            return $result;
-        }
-
-        if (! validate_email($email)) {
-            $result['message'] .= t('Not a valid email address') . EOL;
-        } elseif (! allowed_email($email)) {
-            $result['message'] = t('Your email domain is not among those allowed on this site');
-        } else {
-            $r = q(
-                "select account_email from account where account_email = '%s' limit 1",
-                dbesc($email)
-            );
-            if ($r) {
-                $result['message'] .= t('Your email address is already registered at this site.');
-            }
-        }
-        if ($result['message']) {
-            $result['error'] = true;
-        }
-
-        $arr = array('email' => $email, 'result' => $result);
-        Hook::call('check_account_email', $arr);
-
-        return $arr['result'];
-    }
-
-    public static function check_password($password)
-    {
-        $result = [ 'error' => false, 'message' => '' ];
-
-        // The only validation we perform by default is pure Javascript to
-        // check minimum length and that both entered passwords match.
-        // Use hooked functions to perform complexity requirement checks.
-
-        $arr = [ 'password' => $password, 'result' => $result ];
-        Hook::call('check_account_password', $arr);
-
-        return $arr['result'];
-    }
-
-    public static function check_invite($invite_code)
-    {
-        $result = [ 'error' => false, 'message' => '' ];
-
-        $using_invites = get_config('system', 'invitation_only');
-
-        if ($using_invites && defined('INVITE_WORKING')) {
-            if (! $invite_code) {
-                $result['message'] .= t('An invitation is required.') . EOL;
-            }
-            $r = q("select * from register where hash = '%s' limit 1", dbesc($invite_code));
-            if (! $r) {
-                $result['message'] .= t('Invitation could not be verified.') . EOL;
-            }
-        }
-        if (strlen($result['message'])) {
-            $result['error'] = true;
-        }
-
-        $arr = [ 'invite_code' => $invite_code, 'result' => $result ];
-        Hook::call('check_account_invite', $arr);
-
-        return $arr['result'];
-    }
-
-    public static function check_admin($arr)
-    {
-        if (is_site_admin()) {
-            return true;
-        }
-        $admin_email = trim(get_config('system', 'admin_email', ''));
-        if (strlen($admin_email) && $admin_email === trim($arr['email'])) {
-            return true;
-        }
-        return false;
-    }
-
-    public static function account_total()
-    {
-        $r = q("select account_id from account where true");
-        // Distinguish between an empty array and an error
-        if (is_array($r)) {
-            return count($r);
-        }
-        return false;
-    }
-
-
-    public static function account_store_lowlevel($arr)
-    {
-
-        $store = [
-            'account_parent'           => ((array_key_exists('account_parent', $arr))           ? $arr['account_parent']           : '0'),
-            'account_default_channel'  => ((array_key_exists('account_default_channel', $arr))  ? $arr['account_default_channel']  : '0'),
-            'account_salt'             => ((array_key_exists('account_salt', $arr))             ? $arr['account_salt']             : ''),
-            'account_password'         => ((array_key_exists('account_password', $arr))         ? $arr['account_password']         : ''),
-            'account_email'            => ((array_key_exists('account_email', $arr))            ? $arr['account_email']            : ''),
-            'account_external'         => ((array_key_exists('account_external', $arr))         ? $arr['account_external']         : ''),
-            'account_language'         => ((array_key_exists('account_language', $arr))         ? $arr['account_language']         : 'en'),
-            'account_created'          => ((array_key_exists('account_created', $arr))          ? $arr['account_created']          : '0001-01-01 00:00:00'),
-            'account_lastlog'          => ((array_key_exists('account_lastlog', $arr))          ? $arr['account_lastlog']          : '0001-01-01 00:00:00'),
-            'account_flags'            => ((array_key_exists('account_flags', $arr))            ? $arr['account_flags']            : '0'),
-            'account_roles'            => ((array_key_exists('account_roles', $arr))            ? $arr['account_roles']            : '0'),
-            'account_reset'            => ((array_key_exists('account_reset', $arr))            ? $arr['account_reset']            : ''),
-            'account_expires'          => ((array_key_exists('account_expires', $arr))          ? $arr['account_expires']          : '0001-01-01 00:00:00'),
-            'account_expire_notified'  => ((array_key_exists('account_expire_notified', $arr))  ? $arr['account_expire_notified']  : '0001-01-01 00:00:00'),
-            'account_service_class'    => ((array_key_exists('account_service_class', $arr))    ? $arr['account_service_class']    : ''),
-            'account_level'            => ((array_key_exists('account_level', $arr))            ? $arr['account_level']            : '0'),
-            'account_password_changed' => ((array_key_exists('account_password_changed', $arr)) ? $arr['account_password_changed'] : '0001-01-01 00:00:00')
-        ];
-
-        return create_table_from_array('account', $store);
-    }
-
-
-    public static function create($arr)
-    {
-
-        // Required: { email, password }
-
-        $result = [ 'success' => false, 'email' => '', 'password' => '', 'message' => '' ];
-
-        $invite_code = ((isset($arr['invite_code']))   ? notags(trim($arr['invite_code']))  : '');
-        $email       = ((isset($arr['email']))         ? notags(punify(trim($arr['email']))) : '');
-        $password    = ((isset($arr['password']))      ? trim($arr['password'])             : '');
-        $password2   = ((isset($arr['password2']))     ? trim($arr['password2'])            : '');
-        $parent      = ((isset($arr['parent']))        ? intval($arr['parent'])             : 0 );
-        $flags       = ((isset($arr['account_flags'])) ? intval($arr['account_flags'])      : ACCOUNT_OK);
-        $roles       = ((isset($arr['account_roles'])) ? intval($arr['account_roles'])      : 0 );
-        $expires     = ((isset($arr['expires']))       ? intval($arr['expires'])            : NULL_DATE);
-
-        $default_service_class = get_config('system', 'default_service_class', EMPTY_STR);
-
-        if (! ($email && $password)) {
-            $result['message'] = t('Please enter the required information.');
-            return $result;
-        }
-
-        // prevent form hackery
-
-        if (($roles & ACCOUNT_ROLE_ADMIN) && (! self::check_admin($arr))) {
-            $roles = $roles - ACCOUNT_ROLE_ADMIN;
-        }
-
-        // allow the admin_email account to be admin, but only if it's the first account.
-
-        $c = self::account_total();
-        if (($c === 0) && (self::check_admin($arr))) {
-            $roles |= ACCOUNT_ROLE_ADMIN;
-        }
-
-        // Ensure that there is a host keypair.
-
-        if ((! get_config('system', 'pubkey')) && (! get_config('system', 'prvkey'))) {
-            $hostkey = Crypto::new_keypair(4096);
-            set_config('system', 'pubkey', $hostkey['pubkey']);
-            set_config('system', 'prvkey', $hostkey['prvkey']);
-        }
-
-        $invite_result = check_account_invite($invite_code);
-        if ($invite_result['error']) {
-            $result['message'] = $invite_result['message'];
-            return $result;
-        }
-
-        $email_result = check_account_email($email);
-
-        if ($email_result['error']) {
-            $result['message'] = $email_result['message'];
-            return $result;
-        }
-
-        $password_result = check_account_password($password);
-
-        if ($password_result['error']) {
-            $result['message'] = $password_result['message'];
-            return $result;
-        }
-
-        $salt = random_string(32);
-        $password_encoded = hash('whirlpool', $salt . $password);
-
-        $r = self::account_store_lowlevel(
-            [
-                'account_parent'        => intval($parent),
-                'account_salt'          => $salt,
-                'account_password'      => $password_encoded,
-                'account_email'         => $email,
-                'account_language'      => get_best_language(),
-                'account_created'       => datetime_convert(),
-                'account_flags'         => intval($flags),
-                'account_roles'         => intval($roles),
-                'account_expires'       => $expires,
-                'account_service_class' => $default_service_class
-            ]
-        );
-        if (! $r) {
-            logger('create_account: DB INSERT failed.');
-            $result['message'] = t('Failed to store account information.');
-            return($result);
-        }
-
-        $r = q(
-            "select * from account where account_email = '%s' and account_password = '%s' limit 1",
-            dbesc($email),
-            dbesc($password_encoded)
-        );
-        if ($r && is_array($r) && count($r)) {
-            $result['account'] = $r[0];
-        } else {
-            logger('create_account: could not retrieve newly created account');
-        }
-
-        // Set the parent record to the current record_id if no parent was provided
-
-        if (! $parent) {
-            $r = q(
-                "update account set account_parent = %d where account_id = %d",
-                intval($result['account']['account_id']),
-                intval($result['account']['account_id'])
-            );
-            if (! $r) {
-                logger('create_account: failed to set parent');
-            }
-            $result['account']['parent'] = $result['account']['account_id'];
-        }
-
-        $result['success']  = true;
-        $result['email']    = $email;
-        $result['password'] = $password;
-
-        Hook::call('register_account', $result);
-
-        return $result;
-    }
-
-
-
-    public static function verify_email_address($arr)
-    {
-
-        if (array_key_exists('resend', $arr)) {
-            $email = $arr['email'];
-            $a = q(
-                "select * from account where account_email = '%s' limit 1",
-                dbesc($arr['email'])
-            );
-            if (! ($a && ($a[0]['account_flags'] & ACCOUNT_UNVERIFIED))) {
-                return false;
-            }
-            $account = array_shift($a);
-            $v = q(
-                "select * from register where uid = %d and password = 'verify' limit 1",
-                intval($account['account_id'])
-            );
-            if ($v) {
-                $hash = $v[0]['hash'];
-            } else {
-                return false;
-            }
-        } else {
-            $hash = random_string(24);
-
-            $r = q(
-                "INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
-                dbesc($hash),
-                dbesc(datetime_convert()),
-                intval($arr['account']['account_id']),
-                dbesc('verify'),
-                dbesc($arr['account']['account_language'])
-            );
-            $account = $arr['account'];
-        }
-
-        push_lang(($account['account_language']) ? $account['account_language'] : 'en');
-
-        $email_msg = replace_macros(
-            Theme::get_email_template('register_verify_member.tpl'),
-            [
-                '$sitename' => System::get_site_name(),
-                '$siteurl'  => z_root(),
-                '$email'    => $arr['email'],
-                '$uid'      => $account['account_id'],
-                '$hash'     => $hash,
-                '$details'  => $details
-            ]
-        );
-
-        $res = z_mail(
-            [
-            'toEmail' => $arr['email'],
-            'messageSubject' => sprintf(t('Registration confirmation for %s'), System::get_site_name()),
-            'textVersion' => $email_msg,
-            ]
-        );
-
-        pop_lang();
-
-        if ($res) {
-            $delivered ++;
-        } else {
-            logger('send_reg_approval_email: failed to account_id: ' . $arr['account']['account_id']);
-        }
-        return $res;
-    }
-
-
-
-
-    public static function send_reg_approval_email($arr)
-    {
-
-        $r = q(
-            "select * from account where (account_roles & %d) >= 4096",
-            intval(ACCOUNT_ROLE_ADMIN)
-        );
-        if (! ($r && is_array($r) && count($r))) {
-            return false;
-        }
-
-        $admins = [];
-
-        foreach ($r as $rr) {
-            if (strlen($rr['account_email'])) {
-                $admins[] = [ 'email' => $rr['account_email'], 'lang' => $rr['account_lang'] ];
-            }
-        }
-
-        if (! count($admins)) {
-            return false;
-        }
-
-        $hash = random_string();
-
-        $r = q(
-            "INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
-            dbesc($hash),
-            dbesc(datetime_convert()),
-            intval($arr['account']['account_id']),
-            dbesc(''),
-            dbesc($arr['account']['account_language'])
-        );
-
-        $ip = ((isset($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : EMPTY_STR);
-
-        $details = (($ip) ? $ip . ' [' . gethostbyaddr($ip) . ']' : '[unknown or stealth IP]');
-
-        $delivered = 0;
-
-        foreach ($admins as $admin) {
-            if (strlen($admin['lang'])) {
-                push_lang($admin['lang']);
-            } else {
-                push_lang('en');
-            }
-
-            $email_msg = replace_macros(Theme::get_email_template('register_verify_eml.tpl'), [
-                '$sitename' => get_config('system', 'sitename'),
-                '$siteurl'  =>  z_root(),
-                '$email'    => $arr['email'],
-                '$uid'      => $arr['account']['account_id'],
-                '$hash'     => $hash,
-                '$details'  => $details
-             ]);
-
-            $res = z_mail(
-                [
-                'toEmail' => $admin['email'],
-                'messageSubject' => sprintf(t('Registration request at %s'), get_config('system', 'sitename')),
-                'textVersion' => $email_msg,
-                ]
-            );
-
-            if ($res) {
-                $delivered ++;
-            } else {
-                logger('send_reg_approval_email: failed to ' . $admin['email'] . 'account_id: ' . $arr['account']['account_id']);
-            }
-            
-            pop_lang();
-        }
-
-        return ($delivered ? true : false);
-    }
-
-    public static function send_register_success_email($email, $password)
-    {
-
-        $email_msg = replace_macros(Theme::get_email_template('register_open_eml.tpl'), [
-            '$sitename' => System::get_site_name(),
-            '$siteurl' =>  z_root(),
-            '$email'    => $email,
-            '$password' => t('your registration password'),
-        ]);
-
-        $res = z_mail(
-            [
-                'toEmail' => $email,
-                'messageSubject' => sprintf(t('Registration details for %s'), System::get_site_name()),
-                'textVersion' => $email_msg,
-            ]
-        );
-
-        return ($res ? true : false);
-    }
-
-    /**
-     * @brief Allows a user registration.
-     *
-     * @param string $hash
-     * @return array|bool
-     */
-    public static function allow($hash)
-    {
-
-        $ret = array('success' => false);
-
-        $register = q(
-            "SELECT * FROM register WHERE hash = '%s' LIMIT 1",
-            dbesc($hash)
-        );
-
-        if (! $register) {
-            return $ret;
-        }
-
-        $account = q(
-            "SELECT * FROM account WHERE account_id = %d LIMIT 1",
-            intval($register[0]['uid'])
-        );
-
-        if (! $account) {
-            return $ret;
-        }
-
-        $r = q(
-            "DELETE FROM register WHERE hash = '%s'",
-            dbesc($register[0]['hash'])
-        );
-
-        $r = q(
-            "update account set account_flags = (account_flags & ~%d) where (account_flags & %d) > 0 and account_id = %d",
-            intval(ACCOUNT_BLOCKED),
-            intval(ACCOUNT_BLOCKED),
-            intval($register[0]['uid'])
-        );
-        $r = q(
-            "update account set account_flags = (account_flags & ~%d) where (account_flags & %d) > 0 and account_id = %d",
-            intval(ACCOUNT_PENDING),
-            intval(ACCOUNT_PENDING),
-            intval($register[0]['uid'])
-        );
-
-        push_lang($register[0]['lang']);
-
-        $email_tpl = Theme::get_email_template("register_open_eml.tpl");
-        $email_msg = replace_macros($email_tpl, [
-            '$sitename' => System::get_site_name(),
-            '$siteurl'  =>  z_root(),
-            '$username' => $account[0]['account_email'],
-            '$email'    => $account[0]['account_email'],
-            '$password' => '',
-            '$uid'      => $account[0]['account_id']
-        ]);
-
-        $res = z_mail(
-            [
-            'toEmail' => $account[0]['account_email'],
-            'messageSubject' => sprintf(t('Registration details for %s'), System::get_site_name()),
-            'textVersion' => $email_msg,
-            ]
-        );
-
-        pop_lang();
-
-        if (get_config('system', 'auto_channel_create')) {
-            Channel::auto_create($register[0]['uid']);
-        }
-
-        if ($res) {
-            info(t('Account approved.') . EOL);
-            return true;
-        }
-    }
-
-
-    /**
-     * @brief Denies an account registration.
-     *
-     * This does not have to go through user_remove() and save the nickname
-     * permanently against re-registration, as the person was not yet
-     * allowed to have friends on this system
-     *
-     * @param string $hash
-     * @return bool
-     */
-
-    public static function deny($hash)
-    {
-
-        $register = q(
-            "SELECT * FROM register WHERE hash = '%s' LIMIT 1",
-            dbesc($hash)
-        );
-
-        if (! $register) {
-            return false;
-        }
-
-        $account = q(
-            "SELECT account_id, account_email FROM account WHERE account_id = %d LIMIT 1",
-            intval($register[0]['uid'])
-        );
-
-        if (! $account) {
-            return false;
-        }
-
-        $r = q(
-            "DELETE FROM account WHERE account_id = %d",
-            intval($register[0]['uid'])
-        );
-
-        $r = q(
-            "DELETE FROM register WHERE id = %d",
-            intval($register[0]['id'])
-        );
-        notice(sprintf(t('Registration revoked for %s'), $account[0]['account_email']) . EOL);
-
-        return true;
-    }
-
-    // called from regver to activate an account from the email verification link
-
-    public static function approve($hash)
-    {
-
-        $ret = false;
-
-        // Note: when the password in the register table is 'verify', the uid actually contains the account_id
-
-        $register = q(
-            "SELECT * FROM register WHERE hash = '%s' and password = 'verify' LIMIT 1",
-            dbesc($hash)
-        );
-
-        if (! $register) {
-            return $ret;
-        }
-
-        $account = q(
-            "SELECT * FROM account WHERE account_id = %d LIMIT 1",
-            intval($register[0]['uid'])
-        );
-
-        if (! $account) {
-            return $ret;
-        }
-
-        $r = q(
-            "DELETE FROM register WHERE hash = '%s' and password = 'verify'",
-            dbesc($register[0]['hash'])
-        );
-
-        $r = q(
-            "update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d",
-            intval(ACCOUNT_BLOCKED),
-            intval(ACCOUNT_BLOCKED),
-            intval($register[0]['uid'])
-        );
-        $r = q(
-            "update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d",
-            intval(ACCOUNT_PENDING),
-            intval(ACCOUNT_PENDING),
-            intval($register[0]['uid'])
-        );
-        $r = q(
-            "update account set account_flags = (account_flags & ~%d) where (account_flags & %d)>0 and account_id = %d",
-            intval(ACCOUNT_UNVERIFIED),
-            intval(ACCOUNT_UNVERIFIED),
-            intval($register[0]['uid'])
-        );
-
-        // get a fresh copy after we've modified it.
-
-        $account = q(
-            "SELECT * FROM account WHERE account_id = %d LIMIT 1",
-            intval($register[0]['uid'])
-        );
-
-        if (! $account) {
-            return $ret;
-        }
-
-        if (get_config('system', 'auto_channel_create')) {
-            Channel::auto_create($register[0]['uid']);
-        } else {
-            $_SESSION['login_return_url'] = 'new_channel';
-            authenticate_success($account[0], null, true, true, false, true);
-        }
-
-        return true;
-    }
-
-        /**
-     * Included here for completeness, but this is a very dangerous operation.
-     * It is the caller's responsibility to confirm the requestor's intent and
-     * authorisation to do this.
-     *
-     * @param int $account_id
-     * @param bool $local (optional) default true
-     * @param bool $unset_session (optional) default true
-     * @return bool|array
-     */
-
-    public static function remove($account_id, $local = true, $unset_session = true)
-    {
-
-        logger('account_remove: ' . $account_id);
-
-        // Global removal (all clones) not currently supported
-        $local = true;
-
-        if (! intval($account_id)) {
-            logger('No account.');
-            return false;
-        }
-
-        // Don't let anybody nuke the only admin account.
-
-        $r = q(
-            "select account_id from account where (account_roles & %d) > 0",
-            intval(ACCOUNT_ROLE_ADMIN)
-        );
-
-        if ($r !== false && count($r) == 1 && $r[0]['account_id'] == $account_id) {
-            logger("Unable to remove the only remaining admin account");
-            return false;
-        }
-
-        $r = q(
-            "select * from account where account_id = %d limit 1",
-            intval($account_id)
-        );
-
-        if (! $r) {
-            logger('No account with id: ' . $account_id);
-            return false;
-        }
-
-        $account_email = $r[0]['account_email'];
-
-        $x = q(
-            "select channel_id from channel where channel_account_id = %d",
-            intval($account_id)
-        );
-        if ($x) {
-            foreach ($x as $xx) {
-                Channel::channel_remove($xx['channel_id'], $local, false);
-            }
-        }
-
-        $r = q(
-            "delete from account where account_id = %d",
-            intval($account_id)
-        );
-
-        if ($unset_session) {
-            App::$session->nuke();
-            notice(sprintf(t('Account \'%s\' deleted'), $account_email) . EOL);
-            goaway(z_root());
-        }
-
-        return $r;
-    }
-
-
-}
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
deleted file mode 100644
index dc66e7578..000000000
--- a/Zotlabs/Lib/Activity.php
+++ /dev/null
@@ -1,4376 +0,0 @@
- 'application/activity+json, application/x-zot-activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
-                'Host' => $parsed['host'],
-                'Date' => datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'),
-                '(request-target)' => 'get ' . get_request_string($url)
-            ];
-
-            if (isset($token)) {
-                $headers['Authorization'] = 'Bearer ' . $token;
-            }
-            $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false);
-            $x = z_fetch_url($url, true, $redirects, ['headers' => $h]);
-        }
-
-        if ($x['success']) {
-            $y = json_decode($x['body'], true);
-            logger('returned: ' . json_encode($y, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
-
-            $site_url = unparse_url(['scheme' => $parsed['scheme'], 'host' => $parsed['host'], 'port' => ((array_key_exists('port', $parsed) && intval($parsed['port'])) ? $parsed['port'] : 0)]);
-            q(
-                "update site set site_update = '%s' where site_url = '%s' and site_update < %s - INTERVAL %s",
-                dbesc(datetime_convert()),
-                dbesc($site_url),
-                db_utcnow(),
-                db_quoteinterval('1 DAY')
-            );
-
-            // check for a valid signature, but only if this is not an actor object. If it is signed, it must be valid.
-            // Ignore actors because of the potential for infinite recursion if we perform this step while
-            // fetching an actor key to validate a signature elsewhere. This should validate relayed activities
-            // over litepub which arrived at our inbox that do not use LD signatures
-
-            if (($y['type']) && (!ActivityStreams::is_an_actor($y['type']))) {
-                $sigblock = HTTPSig::verify($x);
-
-                if (($sigblock['header_signed']) && (!$sigblock['header_valid'])) {
-                    return null;
-                }
-            }
-
-            return json_decode($x['body'], true);
-        } else {
-            logger('fetch failed: ' . $url);
-            if ($debug) {
-                return $x;
-            }
-        }
-        return null;
-    }
-
-
-    public static function fetch_person($x)
-    {
-        return self::fetch_profile($x);
-    }
-
-    public static function fetch_profile($x)
-    {
-        $r = q(
-            "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' limit 1",
-            dbesc($x['id'])
-        );
-        if (!$r) {
-            $r = q(
-                "select * from xchan where xchan_hash = '%s' limit 1",
-                dbesc($x['id'])
-            );
-        }
-        if (!$r) {
-            return [];
-        }
-
-        return self::encode_person($r[0], false);
-    }
-
-    public static function fetch_thing($x)
-    {
-
-        $r = q(
-            "select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
-            intval(TERM_OBJ_THING),
-            dbesc($x['id'])
-        );
-
-        if (!$r) {
-            return [];
-        }
-
-        $x = [
-            'type' => 'Object',
-            'id' => z_root() . '/thing/' . $r[0]['obj_obj'],
-            'name' => $r[0]['obj_term']
-        ];
-
-        if ($r[0]['obj_image']) {
-            $x['image'] = $r[0]['obj_image'];
-        }
-        return $x;
-    }
-
-    public static function fetch_item($x, $activitypub = false)
-    {
-
-        if (array_key_exists('source', $x)) {
-            // This item is already processed and encoded
-            return $x;
-        }
-
-        $r = q(
-            "select * from item where mid = '%s' limit 1",
-            dbesc($x['id'])
-        );
-        if ($r) {
-            xchan_query($r, true);
-            $r = fetch_post_tags($r, true);
-            if ($r[0]['verb'] === 'Invite') {
-                return self::encode_activity($r[0], $activitypub);
-            }
-            return self::encode_item($r[0], $activitypub);
-        }
-    }
-
-    public static function paged_collection_init($total, $id, $type = 'OrderedCollection')
-    {
-
-        $ret = [
-            'id' => z_root() . '/' . $id,
-            'type' => $type,
-            'totalItems' => $total,
-        ];
-
-        $numpages = $total / App::$pager['itemspage'];
-        $lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages);
-
-        $ret['first'] = z_root() . '/' . App::$query_string . '?page=1';
-        $ret['last'] = z_root() . '/' . App::$query_string . '?page=' . $lastpage;
-
-        return $ret;
-    }
-
-
-    public static function encode_item_collection($items, $id, $type, $activitypub = false, $total = 0)
-    {
-
-        if ($total > 100) {
-            $ret = [
-                'id' => z_root() . '/' . $id,
-                'type' => $type . 'Page',
-            ];
-
-            $numpages = $total / App::$pager['itemspage'];
-            $lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages);
-
-            $url_parts = parse_url($id);
-
-            $ret['partOf'] = z_root() . '/' . $url_parts['path'];
-
-            $extra_query_args = '';
-            $query_args = null;
-            if (isset($url_parts['query'])) {
-                parse_str($url_parts['query'], $query_args);
-            }
-
-            if (is_array($query_args)) {
-                unset($query_args['page']);
-                foreach ($query_args as $k => $v) {
-                    $extra_query_args .= '&' . urlencode($k) . '=' . urlencode($v);
-                }
-            }
-
-            if (App::$pager['page'] < $lastpage) {
-                $ret['next'] = z_root() . '/' . $url_parts['path'] . '?page=' . (intval(App::$pager['page']) + 1) . $extra_query_args;
-            }
-            if (App::$pager['page'] > 1) {
-                $ret['prev'] = z_root() . '/' . $url_parts['path'] . '?page=' . (intval(App::$pager['page']) - 1) . $extra_query_args;
-            }
-        } else {
-            $ret = [
-                'id' => z_root() . '/' . $id,
-                'type' => $type,
-                'totalItems' => $total,
-            ];
-        }
-
-
-        if ($items) {
-            $x = [];
-            foreach ($items as $i) {
-                $m = get_iconfig($i['id'], 'activitypub', 'rawmsg');
-                if ($m) {
-                    $t = json_decode($m, true);
-                } else {
-                    $t = self::encode_activity($i, $activitypub);
-                }
-                if ($t) {
-                    $x[] = $t;
-                }
-            }
-            if ($type === 'OrderedCollection') {
-                $ret['orderedItems'] = $x;
-            } else {
-                $ret['items'] = $x;
-            }
-        }
-
-        return $ret;
-    }
-
-    public static function encode_follow_collection($items, $id, $type, $total = 0, $extra = null)
-    {
-
-        if ($total > 100) {
-            $ret = [
-                'id' => z_root() . '/' . $id,
-                'type' => $type . 'Page',
-            ];
-
-            $numpages = $total / App::$pager['itemspage'];
-            $lastpage = (($numpages > intval($numpages)) ? intval($numpages) + 1 : $numpages);
-
-            $stripped = preg_replace('/([&|\?]page=[0-9]*)/', '', $id);
-            $stripped = rtrim($stripped, '/');
-
-            $ret['partOf'] = z_root() . '/' . $stripped;
-
-            if (App::$pager['page'] < $lastpage) {
-                $ret['next'] = z_root() . '/' . $stripped . '?page=' . (intval(App::$pager['page']) + 1);
-            }
-            if (App::$pager['page'] > 1) {
-                $ret['prev'] = z_root() . '/' . $stripped . '?page=' . (intval(App::$pager['page']) - 1);
-            }
-        } else {
-            $ret = [
-                'id' => z_root() . '/' . $id,
-                'type' => $type,
-                'totalItems' => $total,
-            ];
-        }
-
-        if ($extra) {
-            $ret = array_merge($ret, $extra);
-        }
-
-        if ($items) {
-            $x = [];
-            foreach ($items as $i) {
-                if ($i['xchan_network'] === 'activitypub') {
-                    $x[] = $i['xchan_hash'];
-                } else {
-                    $x[] = $i['xchan_url'];
-                }
-            }
-
-            if ($type === 'OrderedCollection') {
-                $ret['orderedItems'] = $x;
-            } else {
-                $ret['items'] = $x;
-            }
-        }
-
-        return $ret;
-    }
-
-
-    public static function encode_simple_collection($items, $id, $type, $total = 0, $extra = null)
-    {
-
-        $ret = [
-            'id' => z_root() . '/' . $id,
-            'type' => $type,
-            'totalItems' => $total,
-        ];
-
-        if ($extra) {
-            $ret = array_merge($ret, $extra);
-        }
-
-        if ($items) {
-            if ($type === 'OrderedCollection') {
-                $ret['orderedItems'] = $items;
-            } else {
-                $ret['items'] = $items;
-            }
-        }
-
-        return $ret;
-    }
-
-
-    public static function decode_taxonomy($item)
-    {
-
-        $ret = [];
-
-        if (array_key_exists('tag', $item) && is_array($item['tag'])) {
-            $ptr = $item['tag'];
-            if (!array_key_exists(0, $ptr)) {
-                $ptr = [$ptr];
-            }
-            foreach ($ptr as $t) {
-                if (!is_array($t)) {
-                    continue;
-                }
-                if (!array_key_exists('type', $t)) {
-                    $t['type'] = 'Hashtag';
-                }
-                if (!(array_key_exists('name', $t))) {
-                    continue;
-                }
-                if (!(array_path_exists('icon/url', $t) || array_key_exists('href', $t))) {
-                    continue;
-                }
-
-                switch ($t['type']) {
-                    case 'Hashtag':
-                        $ret[] = ['ttype' => TERM_HASHTAG, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '#') ? substr($t['name'], 1) : $t['name'])];
-                        break;
-
-                    case 'topicalCollection':
-                        $ret[] = ['ttype' => TERM_PCATEGORY, 'url' => $t['href'], 'term' => escape_tags($t['name'])];
-                        break;
-
-                    case 'Category':
-                        $ret[] = ['ttype' => TERM_CATEGORY, 'url' => $t['href'], 'term' => escape_tags($t['name'])];
-                        break;
-
-                    case 'Mention':
-                        $mention_type = substr($t['name'], 0, 1);
-                        if ($mention_type === '!') {
-                            $ret[] = ['ttype' => TERM_FORUM, 'url' => $t['href'], 'term' => escape_tags(substr($t['name'], 1))];
-                        } else {
-                            $ret[] = ['ttype' => TERM_MENTION, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '@') ? substr($t['name'], 1) : $t['name'])];
-                        }
-                        break;
-
-                    case 'Emoji':
-                        $ret[] = ['ttype' => TERM_EMOJI, 'url' => $t['icon']['url'], 'term' => escape_tags($t['name'])];
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-
-    public static function encode_taxonomy($item)
-    {
-
-        $ret = [];
-
-        if (isset($item['term']) && is_array($item['term']) && $item['term']) {
-            foreach ($item['term'] as $t) {
-                switch ($t['ttype']) {
-                    case TERM_HASHTAG:
-                        // An id is required so if we don't have a url in the taxonomy, ignore it and keep going.
-                        if ($t['url']) {
-                            $ret[] = ['id' => $t['url'], 'name' => '#' . $t['term']];
-                        }
-                        break;
-
-                    case TERM_PCATEGORY:
-                        if ($t['url'] && $t['term']) {
-                            $ret[] = ['type' => 'topicalCollection', 'href' => $t['url'], 'name' => $t['term']];
-                        }
-                        break;
-
-                    case TERM_CATEGORY:
-                        if ($t['url'] && $t['term']) {
-                            $ret[] = ['type' => 'Category', 'href' => $t['url'], 'name' => $t['term']];
-                        }
-                        break;
-
-                    case TERM_FORUM:
-                        $term = self::lookup_term_addr($t['url'], $t['term']);
-                        $ret[] = ['type' => 'Mention', 'href' => $t['url'], 'name' => '!' . (($term) ? $term : $t['term'])];
-                        break;
-
-                    case TERM_MENTION:
-                        $term = self::lookup_term_addr($t['url'], $t['term']);
-                        $ret[] = ['type' => 'Mention', 'href' => $t['url'], 'name' => '@' . (($term) ? $term : $t['term'])];
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-
-    public static function lookup_term_addr($url, $name)
-    {
-
-        // The visible mention in our activities is always the full name.
-        // In the object taxonomy change this to the webfinger handle in case
-        // platforms expect the Mastodon form in order to generate notifications
-        // Try a couple of different things in case the url provided isn't the canonical id.
-        // If all else fails, try to match the name.
-
-        $r = false;
-
-        if ($url) {
-            $r = q(
-                "select xchan_addr from xchan where ( xchan_url = '%s' OR xchan_hash = '%s' ) limit 1",
-                dbesc($url),
-                dbesc($url)
-            );
-
-            if ($r) {
-                return $r[0]['xchan_addr'];
-            }
-        }
-        if ($name) {
-            $r = q(
-                "select xchan_addr from xchan where xchan_name = '%s' limit 1",
-                dbesc($name)
-            );
-            if ($r) {
-                return $r[0]['xchan_addr'];
-            }
-        }
-
-        return EMPTY_STR;
-    }
-
-
-    public static function lookup_term_url($url)
-    {
-
-        // The xchan_url for mastodon is a text/html rendering. This is called from map_mentions where we need
-        // to convert the mention url to an ActivityPub id. If this fails for any reason, return the url we have
-
-        $r = q(
-            "select * from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1",
-            dbesc($url),
-            dbesc($url)
-        );
-
-        if ($r) {
-            if ($r[0]['hubloc_network'] === 'activitypub') {
-                return $r[0]['hubloc_hash'];
-            }
-            return $r[0]['hubloc_id_url'];
-        }
-
-        return $url;
-    }
-
-
-    public static function encode_attachment($item)
-    {
-
-        $ret = [];
-
-        if (array_key_exists('attach', $item)) {
-            $atts = ((is_array($item['attach'])) ? $item['attach'] : json_decode($item['attach'], true));
-            if ($atts) {
-                foreach ($atts as $att) {
-                    if (strpos($att['type'], 'image')) {
-                        $ret[] = ['type' => 'Image', 'url' => $att['href']];
-                    } else {
-                        $ret[] = ['type' => 'Link', 'mediaType' => $att['type'], 'href' => $att['href']];
-                    }
-                }
-            }
-        }
-        if (array_key_exists('iconfig', $item) && is_array($item['iconfig'])) {
-            foreach ($item['iconfig'] as $att) {
-                if ($att['sharing']) {
-                    $ret[] = ['type' => 'PropertyValue', 'name' => 'zot.' . $att['cat'] . '.' . $att['k'], 'value' => unserialise($att['v'])];
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-
-    public static function decode_iconfig($item)
-    {
-
-        $ret = [];
-
-        if (is_array($item['attachment']) && $item['attachment']) {
-            $ptr = $item['attachment'];
-            if (!array_key_exists(0, $ptr)) {
-                $ptr = [$ptr];
-            }
-            foreach ($ptr as $att) {
-                $entry = [];
-                if ($att['type'] === 'PropertyValue') {
-                    if (array_key_exists('name', $att) && $att['name']) {
-                        $key = explode('.', $att['name']);
-                        if (count($key) === 3 && $key[0] === 'zot') {
-                            $entry['cat'] = $key[1];
-                            $entry['k'] = $key[2];
-                            $entry['v'] = $att['value'];
-                            $entry['sharing'] = '1';
-                            $ret[] = $entry;
-                        }
-                    }
-                }
-            }
-        }
-        return $ret;
-    }
-
-
-    public static function decode_attachment($item)
-    {
-
-        $ret = [];
-
-        if (array_key_exists('attachment', $item) && is_array($item['attachment'])) {
-            $ptr = $item['attachment'];
-            if (!array_key_exists(0, $ptr)) {
-                $ptr = [$ptr];
-            }
-            foreach ($ptr as $att) {
-                $entry = [];
-                if (array_key_exists('href', $att) && $att['href']) {
-                    $entry['href'] = $att['href'];
-                } elseif (array_key_exists('url', $att) && $att['url']) {
-                    $entry['href'] = $att['url'];
-                }
-                if (array_key_exists('mediaType', $att) && $att['mediaType']) {
-                    $entry['type'] = $att['mediaType'];
-                } elseif (array_key_exists('type', $att) && $att['type'] === 'Image') {
-                    $entry['type'] = 'image/jpeg';
-                }
-                if (array_key_exists('name', $att) && $att['name']) {
-                    $entry['name'] = html2plain(purify_html($att['name']), 256);
-                }
-                if ($entry) {
-                    $ret[] = $entry;
-                }
-            }
-        } elseif (is_string($item['attachment'])) {
-            btlogger('not an array: ' . $item['attachment']);
-        }
-
-        return $ret;
-    }
-
-
-    // the $recurse flag encodes the original non-deleted object of a deleted activity
-
-    public static function encode_activity($i, $activitypub = false, $recurse = false)
-    {
-
-        $ret = [];
-        $reply = false;
-
-        if (intval($i['item_deleted']) && (!$recurse)) {
-            $is_response = ActivityStreams::is_response_activity($i['verb']);
-
-            if ($is_response) {
-                $ret['type'] = 'Undo';
-                $fragment = '#undo';
-            } else {
-                $ret['type'] = 'Delete';
-                $fragment = '#delete';
-            }
-
-            $ret['id'] = str_replace('/item/', '/activity/', $i['mid']) . $fragment;
-            $actor = self::encode_person($i['author'], false);
-            if ($actor) {
-                $ret['actor'] = $actor;
-            } else {
-                return [];
-            }
-
-            $obj = (($is_response) ? self::encode_activity($i, $activitypub, true) : self::encode_item($i, $activitypub));
-            if ($obj) {
-                if (array_path_exists('object/id', $obj)) {
-                    $obj['object'] = $obj['object']['id'];
-                }
-                if ($obj) {
-                    $ret['object'] = $obj;
-                }
-            } else {
-                return [];
-            }
-
-            $ret['to'] = [ACTIVITY_PUBLIC_INBOX];
-            return $ret;
-        }
-
-        $ret['type'] = self::activity_mapper($i['verb']);
-
-        if (strpos($i['mid'], z_root() . '/item/') !== false) {
-            $ret['id'] = str_replace('/item/', '/activity/', $i['mid']);
-        } elseif (strpos($i['mid'], z_root() . '/event/') !== false) {
-            $ret['id'] = str_replace('/event/', '/activity/', $i['mid']);
-        } else {
-            $ret['id'] = $i['mid'];
-        }
-
-        if ($i['title']) {
-            $ret['name'] = $i['title'];
-        }
-
-        if ($i['summary']) {
-            $ret['summary'] = bbcode($i['summary'], ['export' => true]);
-        }
-
-        if ($ret['type'] === 'Announce') {
-            $tmp = $i['body'];
-            $ret['content'] = bbcode($tmp, ['export' => true]);
-            $ret['source'] = [
-                'content' => $i['body'],
-                'mediaType' => 'text/x-multicode'
-            ];
-            if ($i['summary']) {
-                $ret['source']['summary'] = $i['summary'];
-            }
-        }
-
-        $ret['published'] = datetime_convert('UTC', 'UTC', $i['created'], ATOM_TIME);
-        if ($i['created'] !== $i['edited']) {
-            $ret['updated'] = datetime_convert('UTC', 'UTC', $i['edited'], ATOM_TIME);
-            if ($ret['type'] === 'Create') {
-                $ret['type'] = 'Update';
-            }
-        }
-        if ($i['app']) {
-            $ret['generator'] = ['type' => 'Application', 'name' => $i['app']];
-        }
-        if ($i['location'] || $i['coord']) {
-            $ret['location'] = ['type' => 'Place'];
-            if ($i['location']) {
-                $ret['location']['name'] = $i['location'];
-            }
-            if ($i['coord']) {
-                $l = explode(' ', $i['coord']);
-                $ret['location']['latitude'] = $l[0];
-                $ret['location']['longitude'] = $l[1];
-            }
-        }
-
-        if ($i['mid'] !== $i['parent_mid']) {
-            $reply = true;
-
-            // inReplyTo needs to be set in the activity for followup actions (Like, Dislike, Announce, etc.),
-            // but *not* for comments and RSVPs, where it should only be present in the object
-
-            if (!in_array($ret['type'], ['Create', 'Update', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject'])) {
-                $ret['inReplyTo'] = $i['thr_parent'];
-                $cnv = get_iconfig($i['parent'], 'activitypub', 'context');
-                if (!$cnv) {
-                    $cnv = get_iconfig($i['parent'], 'ostatus', 'conversation');
-                }
-                if (!$cnv) {
-                    $cnv = $ret['parent_mid'];
-                }
-            }
-        }
-
-        if (!(isset($cnv) && $cnv)) {
-            $cnv = get_iconfig($i, 'activitypub', 'context');
-            if (!$cnv) {
-                $cnv = get_iconfig($i, 'ostatus', 'conversation');
-            }
-            if (!$cnv) {
-                $cnv = $i['parent_mid'];
-            }
-        }
-        if (isset($cnv) && $cnv) {
-            if (strpos($cnv, z_root()) === 0) {
-                $cnv = str_replace(['/item/', '/activity/'], ['/conversation/', '/conversation/'], $cnv);
-            }
-            $ret['context'] = $cnv;
-            $ret['conversation'] = $cnv;
-        }
-
-        if (intval($i['item_private']) === 2) {
-            $ret['directMessage'] = true;
-        }
-
-        $actor = self::encode_person($i['author'], false);
-        if ($actor) {
-            $ret['actor'] = $actor;
-        } else {
-            return [];
-        }
-
-
-        $replyto = unserialise($i['replyto']);
-        if ($replyto) {
-            $ret['replyTo'] = $replyto;
-        }
-
-
-        if (!isset($ret['url'])) {
-            $urls = [];
-            if (intval($i['item_wall'])) {
-                $locs = self::nomadic_locations($i);
-                if ($locs) {
-                    foreach ($locs as $l) {
-                        if (strpos($ret['id'], $l['hubloc_url']) !== false) {
-                            continue;
-                        }
-                        $urls[] = [
-                            'type' => 'Link',
-                            'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']),
-                            'rel' => 'alternate',
-                            'mediaType' => 'text/html'
-                        ];
-                        $urls[] = [
-                            'type' => 'Link',
-                            'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']),
-                            'rel' => 'alternate',
-                            'mediaType' => 'application/activity+json'
-                        ];
-                        $urls[] = [
-                            'type' => 'Link',
-                            'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']),
-                            'rel' => 'alternate',
-                            'mediaType' => 'application/x-zot+json'
-                        ];
-                        $urls[] = [
-                            'type' => 'Link',
-                            'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']),
-                            'rel' => 'alternate',
-                            'mediaType' => 'application/x-nomad+json'
-                        ];
-                    }
-                }
-            }
-            if ($urls) {
-                $curr[] = [
-                    'type' => 'Link',
-                    'href' => $ret['id'],
-                    'rel' => 'alternate',
-                    'mediaType' => 'text/html'
-                ];
-                $ret['url'] = array_merge($curr, $urls);
-            } else {
-                $ret['url'] = $ret['id'];
-            }
-        }
-
-
-        if ($i['obj']) {
-            if (is_string($i['obj'])) {
-                $tmp = json_decode($i['obj'], true);
-                if ($tmp !== null) {
-                    $i['obj'] = $tmp;
-                }
-            }
-            $obj = self::encode_object($i['obj']);
-            if ($obj) {
-                $ret['object'] = $obj;
-            } else {
-                return [];
-            }
-        } else {
-            $obj = self::encode_item($i, $activitypub);
-            if ($obj) {
-                $ret['object'] = $obj;
-            } else {
-                return [];
-            }
-        }
-
-        if ($i['target']) {
-            if (is_string($i['target'])) {
-                $tmp = json_decode($i['target'], true);
-                if ($tmp !== null) {
-                    $i['target'] = $tmp;
-                }
-            }
-            $tgt = self::encode_object($i['target']);
-            if ($tgt) {
-                $ret['target'] = $tgt;
-            }
-        }
-
-        $t = self::encode_taxonomy($i);
-        if ($t) {
-            $ret['tag'] = $t;
-        }
-
-        $a = self::encode_attachment($i);
-        if ($a) {
-            $ret['attachment'] = $a;
-        }
-
-    
-        // addressing madness
-
-        if ($activitypub) {
-            $parent_i = [];
-            $public = (($i['item_private']) ? false : true);
-            $top_level = (($reply) ? false : true);
-            $ret['to'] = [];
-            $ret['cc'] = [];
-
-            if (!$top_level) {
-                $recips = get_iconfig($i['parent'], 'activitypub', 'recips');
-                if ($recips) {
-                    $parent_i['to'] = $recips['to'];
-                    $parent_i['cc'] = $recips['cc'];
-                }
-            }
-
-            if ($public) {
-                $ret['to'] = [ACTIVITY_PUBLIC_INBOX];
-                if (isset($parent_i['to']) && is_array($parent_i['to'])) {
-                    $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to'])));
-                }
-                if ($i['item_origin']) {
-                    $ret['cc'] = [z_root() . '/followers/' . substr($i['author']['xchan_addr'], 0, strpos($i['author']['xchan_addr'], '@'))];
-                }
-                if (isset($parent_i['cc']) && is_array($parent_i['cc'])) {
-                    $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc'])));
-                }
-            } else {
-                // private activity
-
-                if ($top_level) {
-                    $ret['to'] = self::map_acl($i);
-                    if (isset($parent_i['to']) && is_array($parent_i['to'])) {
-                        $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to'])));
-                    }
-                } else {
-                    $ret['cc'] = self::map_acl($i);
-                    if (isset($parent_i['cc']) && is_array($parent_i['cc'])) {
-                        $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc'])));
-                    }
-
-                    if ($ret['tag']) {
-                        foreach ($ret['tag'] as $mention) {
-                            if (is_array($mention) && array_key_exists('ttype', $mention) && in_array($mention['ttype'], [TERM_FORUM, TERM_MENTION]) && array_key_exists('href', $mention) && $mention['href']) {
-                                $h = q(
-                                    "select * from hubloc where hubloc_id_url = '%s' limit 1",
-                                    dbesc($mention['href'])
-                                );
-                                if ($h) {
-                                    if ($h[0]['hubloc_network'] === 'activitypub') {
-                                        $addr = $h[0]['hubloc_hash'];
-                                    } else {
-                                        $addr = $h[0]['hubloc_id_url'];
-                                    }
-                                    if (!in_array($addr, $ret['to'])) {
-                                        $ret['to'][] = $addr;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    $d = q(
-                        "select hubloc.*  from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1",
-                        dbesc($i['parent_mid']),
-                        intval($i['uid'])
-                    );
-                    if ($d) {
-                        if ($d[0]['hubloc_network'] === 'activitypub') {
-                            $addr = $d[0]['hubloc_hash'];
-                        } else {
-                            $addr = $d[0]['hubloc_id_url'];
-                        }
-                        $ret['cc'][] = $addr;
-                    }
-                }
-            }
-
-            $mentions = self::map_mentions($i);
-            if (count($mentions) > 0) {
-                if (!$ret['to']) {
-                    $ret['to'] = $mentions;
-                } else {
-                    $ret['to'] = array_values(array_unique(array_merge($ret['to'], $mentions)));
-                }
-            }
-        }
-
-        $cc = [];
-        if ($ret['cc'] && is_array($ret['cc'])) {
-            foreach ($ret['cc'] as $e) {
-                if (!is_array($ret['to'])) {
-                    $cc[] = $e;
-                } elseif (!in_array($e, $ret['to'])) {
-                    $cc[] = $e;
-                }
-            }
-        }
-        $ret['cc'] = $cc;
-
-        return $ret;
-    }
-
-
-    public static function nomadic_locations($item)
-    {
-        $synchubs = [];
-        $h = q(
-            "select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url 
-			where hubloc_hash = '%s' and hubloc_network in ('zot6','nomad') and hubloc_deleted = 0",
-            dbesc($item['author_xchan'])
-        );
-
-        if (!$h) {
-            return [];
-        }
-
-        foreach ($h as $x) {
-            $y = q(
-                "select site_dead from site where site_url = '%s' limit 1",
-                dbesc($x['hubloc_url'])
-            );
-
-            if ((!$y) || intval($y[0]['site_dead']) === 0) {
-                $synchubs[] = $x;
-            }
-        }
-
-        return $synchubs;
-    }
-
-
-    public static function encode_item($i, $activitypub = false)
-    {
-
-        $ret = [];
-        $reply = false;
-        $is_directmessage = false;
-
-        $bbopts = (($activitypub) ? 'activitypub' : 'export');
-
-        $objtype = self::activity_obj_mapper($i['obj_type']);
-
-        if (intval($i['item_deleted'])) {
-            $ret['type'] = 'Tombstone';
-            $ret['formerType'] = $objtype;
-            $ret['id'] = $i['mid'];
-            $ret['to'] = [ACTIVITY_PUBLIC_INBOX];
-            return $ret;
-        }
-
-        if (isset($i['obj']) && $i['obj']) {
-            if (is_string($i['obj'])) {
-                $tmp = json_decode($i['obj'], true);
-                if ($tmp !== null) {
-                    $i['obj'] = $tmp;
-                }
-            }
-            $ret = $i['obj'];
-            if (is_string($ret)) {
-                return $ret;
-            }
-        }
-
-
-        $ret['type'] = $objtype;
-
-        if ($objtype === 'Question') {
-            if ($i['obj']) {
-                if (is_array($i['obj'])) {
-                    $ret = $i['obj'];
-                } else {
-                    $ret = json_decode($i['obj'], true);
-                }
-
-                if (array_path_exists('actor/id', $ret)) {
-                    $ret['actor'] = $ret['actor']['id'];
-                }
-            }
-        }
-
-
-        $images = false;
-        $has_images = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism', $i['body'], $images, PREG_SET_ORDER);
-
-        $ret['id'] = $i['mid'];
-
-//      $token = IConfig::get($i,'ocap','relay');
-//      if ($token) {
-//          if (defined('USE_BEARCAPS')) {
-//              $ret['id'] = 'bear:?u=' . $ret['id'] . '&t=' . $token;
-//          }
-//          else {
-//              $ret['id'] = $ret['id'] . '?token=' . $token;
-//          }
-//      }
-
-        $ret['published'] = datetime_convert('UTC', 'UTC', $i['created'], ATOM_TIME);
-        if ($i['created'] !== $i['edited']) {
-            $ret['updated'] = datetime_convert('UTC', 'UTC', $i['edited'], ATOM_TIME);
-        }
-        if ($i['expires'] > NULL_DATE) {
-            $ret['expires'] = datetime_convert('UTC', 'UTC', $i['expires'], ATOM_TIME);
-        }
-        if ($i['app']) {
-            $ret['generator'] = ['type' => 'Application', 'name' => $i['app']];
-        }
-        if ($i['location'] || $i['coord']) {
-            $ret['location'] = ['type' => 'Place'];
-            if ($i['location']) {
-                $ret['location']['name'] = $i['location'];
-            }
-            if ($i['coord']) {
-                $l = explode(' ', $i['coord']);
-                $ret['location']['latitude'] = $l[0];
-                $ret['location']['longitude'] = $l[1];
-            }
-        }
-
-        if (intval($i['item_wall']) && $i['mid'] === $i['parent_mid']) {
-            $ret['commentPolicy'] = $i['comment_policy'];
-        }
-
-        if (intval($i['item_private']) === 2) {
-            $ret['directMessage'] = true;
-        }
-
-        if (intval($i['item_nocomment'])) {
-            if ($ret['commentPolicy']) {
-                $ret['commentPolicy'] .= ' ';
-            }
-            $ret['commentPolicy'] .= 'until=' . datetime_convert('UTC', 'UTC', $i['created'], ATOM_TIME);
-        } elseif (array_key_exists('comments_closed', $i) && $i['comments_closed'] !== EMPTY_STR && $i['comments_closed'] > NULL_DATE) {
-            if ($ret['commentPolicy']) {
-                $ret['commentPolicy'] .= ' ';
-            }
-            $ret['commentPolicy'] .= 'until=' . datetime_convert('UTC', 'UTC', $i['comments_closed'], ATOM_TIME);
-        }
-
-        $ret['attributedTo'] = ((in_array($i['author']['xchan_network'],['zot6','nomad'])) ? $i['author']['xchan_url'] : $i['author']['xchan_hash']);
-
-        if ($i['mid'] !== $i['parent_mid']) {
-            $ret['inReplyTo'] = $i['thr_parent'];
-            $cnv = get_iconfig($i['parent'], 'activitypub', 'context');
-            if (!$cnv) {
-                $cnv = get_iconfig($i['parent'], 'ostatus', 'conversation');
-            }
-            if (!$cnv) {
-                $cnv = $ret['parent_mid'];
-            }
-
-            $reply = true;
-
-            if ($i['item_private']) {
-                $d = q(
-                    "select xchan_url, xchan_addr, xchan_name from item left join xchan on xchan_hash = author_xchan where id = %d limit 1",
-                    intval($i['parent'])
-                );
-                if ($d) {
-                    $recips = get_iconfig($i['parent'], 'activitypub', 'recips');
-
-                    if (is_array($recips) && in_array($i['author']['xchan_url'], $recips['to'])) {
-                        $reply_url = $d[0]['xchan_url'];
-                        $is_directmessage = true;
-                    } else {
-                        $reply_url = z_root() . '/followers/' . substr($i['author']['xchan_addr'], 0, strpos($i['author']['xchan_addr'], '@'));
-                    }
-                    $reply_addr = (($d[0]['xchan_addr']) ? $d[0]['xchan_addr'] : $d[0]['xchan_name']);
-                }
-            }
-        }
-        if (!isset($cnv)) {
-            $cnv = get_iconfig($i, 'activitypub', 'context');
-            if (!$cnv) {
-                $cnv = get_iconfig($i, 'ostatus', 'conversation');
-            }
-            if (!$cnv) {
-                $cnv = $i['parent_mid'];
-            }
-        }
-        if (isset($cnv) && $cnv) {
-            if (strpos($cnv, z_root()) === 0) {
-                $cnv = str_replace(['/item/', '/activity/'], ['/conversation/', '/conversation/'], $cnv);
-            }
-            $ret['context'] = $cnv;
-            $ret['conversation'] = $cnv;
-        }
-
-        // provide ocap access token for private media.
-        // set this for descendants even if the current item is not private
-        // because it may have been relayed from a private item.
-
-        $token = get_iconfig($i, 'ocap', 'relay');
-        if ($token && $has_images) {
-            for ($n = 0; $n < count($images); $n++) {
-                $match = $images[$n];
-                if (strpos($match[1], '=http') === 0 && strpos($match[1], '/photo/' !== false)) {
-                    $i['body'] = str_replace($match[1], $match[1] . '?token=' . $token, $i['body']);
-                    $images[$n][2] = substr($match[1], 1) . '?token=' . $token;
-                } elseif (strpos($match[2], z_root() . '/photo/') !== false) {
-                    $i['body'] = str_replace($match[2], $match[2] . '?token=' . $token, $i['body']);
-                    $images[$n][2] = $match[2] . '?token=' . $token;
-                }
-            }
-        }
-
-        if ($i['title']) {
-            $ret['name'] = $i['title'];
-        }
-
-        if (in_array($i['mimetype'], [ 'text/bbcode', 'text/x-multicode' ])) {
-            if ($i['summary']) {
-                $ret['summary'] = bbcode($i['summary'], [$bbopts => true]);
-            }
-            $opts = [$bbopts => true];
-            $ret['content'] = bbcode($i['body'], $opts);
-            $ret['source'] = ['content' => $i['body'], 'mediaType' => 'text/x-multicode'];
-            if (isset($ret['summary'])) {
-                $ret['source']['summary'] = $i['summary'];
-            }
-        } else {
-            $ret['mediaType'] = $i['mimetype'];
-            $ret['content'] = $i['body'];
-        }
-
-        if (!(isset($ret['actor']) || isset($ret['attributedTo']))) {
-            $actor = self::encode_person($i['author'], false);
-            if ($actor) {
-                $ret['actor'] = $actor;
-            } else {
-                return [];
-            }
-        }
-
-        $replyto = unserialise($i['replyto']);
-        if ($replyto) {
-            $ret['replyTo'] = $replyto;
-        }
-
-        if (!isset($ret['url'])) {
-            $urls = [];
-            if (intval($i['item_wall'])) {
-                $locs = self::nomadic_locations($i);
-                if ($locs) {
-                    foreach ($locs as $l) {
-                        if (strpos($i['mid'], $l['hubloc_url']) !== false) {
-                            continue;
-                        }
-                        $urls[] = [
-                            'type' => 'Link',
-                            'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']),
-                            'rel' => 'alternate',
-                            'mediaType' => 'text/html'
-                        ];
-                        $urls[] = [
-                            'type' => 'Link',
-                            'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']),
-                            'rel' => 'alternate',
-                            'mediaType' => 'application/activity+json'
-                        ];
-                        $urls[] = [
-                            'type' => 'Link',
-                            'href' => str_replace(z_root(), $l['hubloc_url'], $ret['id']),
-                            'rel' => 'alternate',
-                            'mediaType' => 'application/x-nomad+json'
-                        ];
-                    }
-                }
-            }
-            if ($urls) {
-                $curr[] = [
-                    'type' => 'Link',
-                    'href' => $ret['id'],
-                    'rel' => 'alternate',
-                    'mediaType' => 'text/html'
-                ];
-                $ret['url'] = array_merge($curr, $urls);
-            } else {
-                $ret['url'] = $ret['id'];
-            }
-        }
-
-        $t = self::encode_taxonomy($i);
-        if ($t) {
-            $ret['tag'] = $t;
-        }
-
-        $a = self::encode_attachment($i);
-        if ($a) {
-            $ret['attachment'] = $a;
-        }
-
-
-        if ($activitypub && $has_images && $ret['type'] === 'Note') {
-            foreach ($images as $match) {
-                $img = [];
-                // handle Friendica/Hubzilla style img links with [img=$url]$alttext[/img]
-                if (strpos($match[1], '=http') === 0) {
-                    $img[] = ['type' => 'Image', 'url' => substr($match[1], 1), 'name' => $match[2]];
-                } // preferred mechanism for adding alt text
-                elseif (strpos($match[1], 'alt=') !== false) {
-                    $txt = str_replace('"', '"', $match[1]);
-                    $txt = substr($match[1], strpos($match[1], 'alt="') + 5, -1);
-                    $img[] = ['type' => 'Image', 'url' => $match[2], 'name' => $txt];
-                } else {
-                    $img[] = ['type' => 'Image', 'url' => $match[2]];
-                }
-
-                if (!$ret['attachment']) {
-                    $ret['attachment'] = [];
-                }
-                $already_added = false;
-                if ($img) {
-                    for ($pc = 0; $pc < count($ret['attachment']); $pc++) {
-                        // caution: image attachments use url and links use href, and our own links will be 'attach' links based on the image href
-                        // We could alternatively supply the correct attachment info when item is saved, but by replacing here we will pick up
-                        // any "per-post" or manual changes to the image alt-text before sending.
-
-                        if ((isset($ret['attachment'][$pc]['href']) && strpos($img[0]['url'], str_replace('/attach/', '/photo/', $ret['attachment'][$pc]['href'])) !== false) || (isset($ret['attachment'][$pc]['url']) && $ret['attachment'][$pc]['url'] === $img[0]['url'])) {
-                            // if it's already there, replace it with our alt-text aware version
-                            $ret['attachment'][$pc] = $img[0];
-                            $already_added = true;
-                        }
-                    }
-                    if (!$already_added) {
-                        // add it
-                        $ret['attachment'] = array_merge($img, $ret['attachment']);
-                    }
-                }
-            }
-        }
-
-        // addressing madness
-
-        if ($activitypub) {
-            $parent_i = [];
-            $ret['to'] = [];
-            $ret['cc'] = [];
-
-            $public = (($i['item_private']) ? false : true);
-            $top_level = (($i['mid'] === $i['parent_mid']) ? true : false);
-
-            if (!$top_level) {
-                if (intval($i['parent'])) {
-                    $recips = get_iconfig($i['parent'], 'activitypub', 'recips');
-                } else {
-                    // if we are encoding this item for storage there won't be a parent.
-                    $p = q(
-                        "select parent from item where parent_mid = '%s' and uid = %d",
-                        dbesc($i['parent_mid']),
-                        intval($i['uid'])
-                    );
-                    if ($p) {
-                        $recips = get_iconfig($p[0]['parent'], 'activitypub', 'recips');
-                    }
-                }
-                if ($recips) {
-                    $parent_i['to'] = $recips['to'];
-                    $parent_i['cc'] = $recips['cc'];
-                }
-            }
-
-
-            if ($public) {
-                $ret['to'] = [ACTIVITY_PUBLIC_INBOX];
-                if (isset($parent_i['to']) && is_array($parent_i['to'])) {
-                    $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to'])));
-                }
-                if ($i['item_origin']) {
-                    $ret['cc'] = [z_root() . '/followers/' . substr($i['author']['xchan_addr'], 0, strpos($i['author']['xchan_addr'], '@'))];
-                }
-                if (isset($parent_i['cc']) && is_array($parent_i['cc'])) {
-                    $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc'])));
-                }
-            } else {
-                // private activity
-
-                if ($top_level) {
-                    $ret['to'] = self::map_acl($i);
-                    if (isset($parent_i['to']) && is_array($parent_i['to'])) {
-                        $ret['to'] = array_values(array_unique(array_merge($ret['to'], $parent_i['to'])));
-                    }
-                } else {
-                    $ret['cc'] = self::map_acl($i);
-                    if (isset($parent_i['cc']) && is_array($parent_i['cc'])) {
-                        $ret['cc'] = array_values(array_unique(array_merge($ret['cc'], $parent_i['cc'])));
-                    }
-                    if ($ret['tag']) {
-                        foreach ($ret['tag'] as $mention) {
-                            if (is_array($mention) && array_key_exists('ttype', $mention) && in_array($mention['ttype'], [TERM_FORUM, TERM_MENTION]) && array_key_exists('href', $mention) && $mention['href']) {
-                                $h = q(
-                                    "select * from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1",
-                                    dbesc($mention['href']),
-                                    dbesc($mention['href'])
-                                );
-                                if ($h) {
-                                    if ($h[0]['hubloc_network'] === 'activitypub') {
-                                        $addr = $h[0]['hubloc_hash'];
-                                    } else {
-                                        $addr = $h[0]['hubloc_id_url'];
-                                    }
-                                    if (!in_array($addr, $ret['to'])) {
-                                        $ret['to'][] = $addr;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-
-                    $d = q(
-                        "select hubloc.*  from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1",
-                        dbesc($i['parent_mid']),
-                        intval($i['uid'])
-                    );
-
-                    if ($d) {
-                        if ($d[0]['hubloc_network'] === 'activitypub') {
-                            $addr = $d[0]['hubloc_hash'];
-                        } else {
-                            $addr = $d[0]['hubloc_id_url'];
-                        }
-                        $ret['cc'][] = $addr;
-                    }
-                }
-            }
-
-            $mentions = self::map_mentions($i);
-            if (count($mentions) > 0) {
-                if (!$ret['to']) {
-                    $ret['to'] = $mentions;
-                } else {
-                    $ret['to'] = array_values(array_unique(array_merge($ret['to'], $mentions)));
-                }
-            }
-        }
-
-        // remove any duplicates from 'cc' that are present in 'to'
-        // as this may indicate that mentions changed the audience from secondary to primary
-
-        $cc = [];
-        if ($ret['cc'] && is_array($ret['cc'])) {
-            foreach ($ret['cc'] as $e) {
-                if (!is_array($ret['to'])) {
-                    $cc[] = $e;
-                } elseif (!in_array($e, $ret['to'])) {
-                    $cc[] = $e;
-                }
-            }
-        }
-        $ret['cc'] = $cc;
-
-        return $ret;
-    }
-
-
-    // Returns an array of URLS for any mention tags found in the item array $i.
-
-    public static function map_mentions($i)
-    {
-        if (!(array_key_exists('term', $i) && is_array($i['term']))) {
-            return [];
-        }
-
-        $list = [];
-
-        foreach ($i['term'] as $t) {
-            if (!(array_key_exists('url', $t) && $t['url'])) {
-                continue;
-            }
-            if (array_key_exists('ttype', $t) && $t['ttype'] == TERM_MENTION) {
-                $url = self::lookup_term_url($t['url']);
-                $list[] = (($url) ? $url : $t['url']);
-            }
-        }
-
-        return $list;
-    }
-
-    // Returns an array of all recipients targeted by private item array $i.
-
-    public static function map_acl($i)
-    {
-        $ret = [];
-
-        if (!$i['item_private']) {
-            return $ret;
-        }
-
-        if ($i['mid'] !== $i['parent_mid']) {
-            $i = q(
-                "select * from item where parent_mid = '%s' and uid = %d",
-                dbesc($i['parent_mid']),
-                intval($i['uid'])
-            );
-            if ($i) {
-                $i = array_shift($i);
-            }
-        }
-        if ($i['allow_gid']) {
-            $tmp = expand_acl($i['allow_gid']);
-            if ($tmp) {
-                foreach ($tmp as $t) {
-                    $ret[] = z_root() . '/lists/' . $t;
-                }
-            }
-        }
-
-        if ($i['allow_cid']) {
-            $tmp = expand_acl($i['allow_cid']);
-            $list = stringify_array($tmp, true);
-            if ($list) {
-                $details = q("select hubloc_id_url, hubloc_hash, hubloc_network from hubloc where hubloc_hash in (" . $list . ") ");
-                if ($details) {
-                    foreach ($details as $d) {
-                        if ($d['hubloc_network'] === 'activitypub') {
-                            $ret[] = $d['hubloc_hash'];
-                        } else {
-                            $ret[] = $d['hubloc_id_url'];
-                        }
-                    }
-                }
-            }
-        }
-
-        $x = get_iconfig($i['id'], 'activitypub', 'recips');
-        if ($x) {
-            foreach (['to', 'cc'] as $k) {
-                if (isset($x[$k])) {
-                    if (is_string($x[$k])) {
-                        $ret[] = $x[$k];
-                    } else {
-                        $ret = array_merge($ret, $x[$k]);
-                    }
-                }
-            }
-        }
-
-        return array_values(array_unique($ret));
-    }
-
-
-    public static function encode_person($p, $extended = true, $activitypub = false)
-    {
-
-        $ret = [];
-
-        if (!$p['xchan_url']) {
-            return $ret;
-        }
-
-        if (!$extended) {
-            return $p['xchan_url'];
-        }
-
-        $c = ((array_key_exists('channel_id', $p)) ? $p : Channel::from_hash($p['xchan_hash']));
-
-        $ret['type'] = 'Person';
-        $auto_follow = false;
-
-        if ($c) {
-            $role = PConfig::Get($c['channel_id'], 'system', 'permissions_role');
-            if (strpos($role, 'forum') !== false) {
-                $ret['type'] = 'Group';
-            }
-            $auto_follow = intval(PConfig::Get($c['channel_id'],'system','autoperms'));
-        }
-
-        if ($c) {
-            $ret['id'] = Channel::url($c);
-        } else {
-            $ret['id'] = ((strpos($p['xchan_hash'], 'http') === 0) ? $p['xchan_hash'] : $p['xchan_url']);
-        }
-        if ($p['xchan_addr'] && strpos($p['xchan_addr'], '@')) {
-            $ret['preferredUsername'] = substr($p['xchan_addr'], 0, strpos($p['xchan_addr'], '@'));
-        }
-        $ret['name'] = $p['xchan_name'];
-        $ret['updated'] = datetime_convert('UTC', 'UTC', $p['xchan_name_date'], ATOM_TIME);
-        $ret['icon'] = [
-            'type' => 'Image',
-            'mediaType' => (($p['xchan_photo_mimetype']) ? $p['xchan_photo_mimetype'] : 'image/png'),
-            'updated' => datetime_convert('UTC', 'UTC', $p['xchan_photo_date'], ATOM_TIME),
-            'url' => $p['xchan_photo_l'],
-            'height' => 300,
-            'width' => 300,
-        ];
-        $ret['url'] = $p['xchan_url'];
-        if (isset($p['channel_location']) && $p['channel_location']) {
-            $ret['location'] = ['type' => 'Place', 'name' => $p['channel_location']];
-        }
-
-        $ret['tag'] = [['type' => 'PropertyValue', 'name' => 'Protocol', 'value' => 'zot6']];
-        $ret['tag'][] = ['type' => 'PropertyValue', 'name' => 'Protocol', 'value' => 'nomad'];
-
-        if ($activitypub && get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) {
-            if ($c) {
-                if (get_pconfig($c['channel_id'], 'system', 'activitypub', ACTIVITYPUB_ENABLED)) {
-                    $ret['inbox'] = z_root() . '/inbox/' . $c['channel_address'];
-                    $ret['tag'][] = ['type' => 'PropertyValue', 'name' => 'Protocol', 'value' => 'activitypub'];
-                } else {
-                    $ret['inbox'] = null;
-                }
-
-                $ret['outbox'] = z_root() . '/outbox/' . $c['channel_address'];
-                $ret['followers'] = z_root() . '/followers/' . $c['channel_address'];
-                $ret['following'] = z_root() . '/following/' . $c['channel_address'];
-
-                $ret['endpoints'] = [
-                    'sharedInbox' => z_root() . '/inbox',
-                    'oauthRegistrationEndpoint' => z_root() . '/api/client/register',
-                    'oauthAuthorizationEndpoint' => z_root() . '/authorize',
-                    'oauthTokenEndpoint' => z_root() . '/token'
-                ];
-
-                $ret['discoverable'] = ((1 - intval($p['xchan_hidden'])) ? true : false);
-                $ret['publicKey'] = [
-                    'id' => $p['xchan_url'] . '?operation=getkey',
-                    'owner' => $p['xchan_url'],
-                    'signatureAlgorithm' => 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256',
-                    'publicKeyPem' => $p['xchan_pubkey']
-                ];
-
-                $ret['manuallyApprovesFollowers'] = (($auto_follow) ? false : true);
-                if ($ret['type'] === 'Group') {
-                    $ret['capabilities'] = ['acceptsJoins' => true];
-                }
-                // map other nomadic identities linked with this channel
-
-                $locations = [];
-                $locs = Libzot::encode_locations($c);
-                if ($locs) {
-                    foreach ($locs as $loc) {
-                        if ($loc['url'] !== z_root()) {
-                            $locations[] = $loc['id_url'];
-                        }
-                    }
-                }
-
-                if ($locations) {
-                    if (count($locations) === 1) {
-                        $locations = array_shift($locations);
-                    }
-                    $ret['copiedTo'] = $locations;
-                    $ret['alsoKnownAs'] = $locations;
-                }
-
-                $cp = Channel::get_cover_photo($c['channel_id'], 'array');
-                if ($cp) {
-                    $ret['image'] = [
-                        'type' => 'Image',
-                        'mediaType' => $cp['type'],
-                        'url' => $cp['url']
-                    ];
-                }
-                // only fill in profile information if the profile is publicly visible
-                if (perm_is_allowed($c['channel_id'], EMPTY_STR, 'view_profile')) {
-                    $dp = q(
-                        "select * from profile where uid = %d and is_default = 1",
-                        intval($c['channel_id'])
-                    );
-                    if ($dp) {
-                        if ($dp[0]['about']) {
-                            $ret['summary'] = bbcode($dp[0]['about'], ['export' => true]);
-                        }
-                        foreach (
-                            ['pdesc', 'address', 'locality', 'region', 'postal_code', 'country_name',
-                                     'hometown', 'gender', 'marital', 'sexual', 'politic', 'religion', 'pronouns',
-                                     'homepage', 'contact', 'dob'] as $k
-                        ) {
-                            if ($dp[0][$k]) {
-                                $key = $k;
-                                if ($key === 'pdesc') {
-                                    $key = 'description';
-                                }
-                                if ($key == 'politic') {
-                                    $key = 'political';
-                                }
-                                if ($key === 'dob') {
-                                    $key = 'birthday';
-                                }
-                                $ret['attachment'][] = ['type' => 'PropertyValue', 'name' => $key, 'value' => $dp[0][$k]];
-                            }
-                        }
-                        if ($dp[0]['keywords']) {
-                            $kw = explode(' ', $dp[0]['keywords']);
-                            if ($kw) {
-                                foreach ($kw as $k) {
-                                    $k = trim($k);
-                                    $k = trim($k, '#,');
-                                    $ret['tag'][] = ['id' => z_root() . '/search?tag=' . urlencode($k), 'name' => '#' . urlencode($k)];
-                                }
-                            }
-                        }
-                    }
-                }
-            } else {
-                $collections = get_xconfig($p['xchan_hash'], 'activitypub', 'collections', []);
-                if ($collections) {
-                    $ret = array_merge($ret, $collections);
-                } else {
-                    $ret['inbox'] = null;
-                    $ret['outbox'] = null;
-                }
-            }
-        } else {
-            $ret['publicKey'] = [
-                'id' => $p['xchan_url'],
-                'owner' => $p['xchan_url'],
-                'publicKeyPem' => $p['xchan_pubkey']
-            ];
-        }
-
-        $arr = ['xchan' => $p, 'encoded' => $ret, 'activitypub' => $activitypub];
-        Hook::call('encode_person', $arr);
-        $ret = $arr['encoded'];
-
-
-        return $ret;
-    }
-
-
-    public static function encode_site()
-    {
-
-
-        $sys = Channel::get_system();
-
-        // encode  the sys channel information and over-ride with site
-        // information
-        $ret = self::encode_person($sys, true, true);
-
-        $ret['type'] = ((Channel::is_group($sys['channel_id'])) ? 'Group' : 'Service');
-        $ret['id'] = z_root();
-        $ret['alsoKnownAs'] = z_root() . '/channel/sys';
-        $auto_follow = false;
-
-        $ret['preferredUsername'] = 'sys';
-        $ret['name'] = System::get_site_name();
-
-        $ret['icon'] = [
-            'type' => 'Image',
-            'url' => System::get_site_icon(),
-        ];
-
-        $ret['generator'] = ['type' => 'Application', 'name' => System::get_project_name()];
-
-        $ret['url'] = z_root();
-
-        $ret['manuallyApprovesFollowers'] = ((get_config('system', 'allowed_sites')) ? true : false);
-
-        $cp = Channel::get_cover_photo($sys['channel_id'], 'array');
-        if ($cp) {
-            $ret['image'] = [
-                'type' => 'Image',
-                'mediaType' => $cp['type'],
-                'url' => $cp['url']
-            ];
-        }
-
-        $ret['summary'] = bbcode(get_config('system', 'siteinfo', ''), ['export' => true]);
-        $ret['source'] = [
-            'mediaType' => 'text/x-multicode',
-            'summary' => get_config('system', 'siteinfo', '')
-        ];
-
-        $ret['publicKey'] = [
-            'id' => z_root() . '?operation=getkey',
-            'owner' => z_root(),
-            'publicKeyPem' => get_config('system', 'pubkey')
-        ];
-
-        return $ret;
-    }
-
-
-    public static function activity_mapper($verb)
-    {
-
-        if (strpos($verb, '/') === false) {
-            return $verb;
-        }
-
-        $acts = [
-            'http://activitystrea.ms/schema/1.0/post' => 'Create',
-            'http://activitystrea.ms/schema/1.0/share' => 'Announce',
-            'http://activitystrea.ms/schema/1.0/update' => 'Update',
-            'http://activitystrea.ms/schema/1.0/like' => 'Like',
-            'http://activitystrea.ms/schema/1.0/favorite' => 'Like',
-            'http://purl.org/zot/activity/dislike' => 'Dislike',
-            'http://activitystrea.ms/schema/1.0/tag' => 'Add',
-            'http://activitystrea.ms/schema/1.0/follow' => 'Follow',
-            'http://activitystrea.ms/schema/1.0/unfollow' => 'Ignore',
-        ];
-
-        Hook::call('activity_mapper', $acts);
-
-        if (array_key_exists($verb, $acts) && $acts[$verb]) {
-            return $acts[$verb];
-        }
-
-        // Reactions will just map to normal activities
-
-        if (strpos($verb, ACTIVITY_REACT) !== false) {
-            return 'Create';
-        }
-        if (strpos($verb, ACTIVITY_MOOD) !== false) {
-            return 'Create';
-        }
-
-        if (strpos($verb, ACTIVITY_POKE) !== false) {
-            return 'Activity';
-        }
-
-        // We should return false, however this will trigger an uncaught exception  and crash
-        // the delivery system if encountered by the JSON-LDSignature library
-
-        logger('Unmapped activity: ' . $verb);
-        return 'Create';
-        //  return false;
-    }
-
-
-    public static function activity_obj_mapper($obj)
-    {
-
-
-        $objs = [
-            'http://activitystrea.ms/schema/1.0/note' => 'Note',
-            'http://activitystrea.ms/schema/1.0/comment' => 'Note',
-            'http://activitystrea.ms/schema/1.0/person' => 'Person',
-            'http://purl.org/zot/activity/profile' => 'Profile',
-            'http://activitystrea.ms/schema/1.0/photo' => 'Image',
-            'http://activitystrea.ms/schema/1.0/profile-photo' => 'Icon',
-            'http://activitystrea.ms/schema/1.0/event' => 'Event',
-            'http://activitystrea.ms/schema/1.0/wiki' => 'Document',
-            'http://purl.org/zot/activity/location' => 'Place',
-            'http://purl.org/zot/activity/chessgame' => 'Game',
-            'http://purl.org/zot/activity/tagterm' => 'zot:Tag',
-            'http://purl.org/zot/activity/thing' => 'Object',
-            'http://purl.org/zot/activity/file' => 'zot:File',
-            'http://purl.org/zot/activity/mood' => 'zot:Mood',
-
-        ];
-
-        Hook::call('activity_obj_mapper', $objs);
-
-        if ($obj === 'Answer') {
-            return 'Note';
-        }
-
-        if (strpos($obj, '/') === false) {
-            return $obj;
-        }
-
-        if (array_key_exists($obj, $objs)) {
-            return $objs[$obj];
-        }
-
-        logger('Unmapped activity object: ' . $obj);
-        return 'Note';
-
-        //  return false;
-    }
-
-
-    public static function follow($channel, $act)
-    {
-
-        $contact = null;
-        $their_follow_id = null;
-
-        if (intval($channel['channel_system'])) {
-            // The system channel ignores all follow requests
-            return;
-        }
-
-        /*
-         *
-         * if $act->type === 'Follow', actor is now following $channel
-         * if $act->type === 'Accept', actor has approved a follow request from $channel
-         *
-         */
-
-        $person_obj = $act->actor;
-
-        if (in_array($act->type, ['Follow', 'Invite', 'Join'])) {
-            $their_follow_id = $act->id;
-        } elseif ($act->type === 'Accept') {
-            $my_follow_id = z_root() . '/follow/' . $contact['id'];
-        }
-
-        if (is_array($person_obj)) {
-            // store their xchan and hubloc
-
-            self::actor_store($person_obj['id'], $person_obj);
-
-            // Find any existing abook record
-
-            $r = q(
-                "select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d limit 1",
-                dbesc($person_obj['id']),
-                intval($channel['channel_id'])
-            );
-            if ($r) {
-                $contact = $r[0];
-            }
-        }
-
-        $x = PermissionRoles::role_perms('social');
-        $p = Permissions::FilledPerms($x['perms_connect']);
-
-        // add tag_deliver permissions to remote groups
-
-        if (is_array($person_obj) && $person_obj['type'] === 'Group') {
-            $p['tag_deliver'] = 1;
-        }
-
-        $their_perms = Permissions::serialise($p);
-
-
-        if ($contact && $contact['abook_id']) {
-            // A relationship of some form already exists on this site.
-
-            switch ($act->type) {
-                case 'Follow':
-                case 'Invite':
-                case 'Join':
-                    // A second Follow request, but we haven't approved the first one
-
-                    if ($contact['abook_pending']) {
-                        return;
-                    }
-
-                    // We've already approved them or followed them first
-                    // Send an Accept back to them
-
-                    set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_id', $their_follow_id);
-                    set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_type', $act->type);
-                    Run::Summon(['Notifier', 'permissions_accept', $contact['abook_id']]);
-                    return;
-
-                case 'Accept':
-                    // They accepted our Follow request - set default permissions
-
-                    set_abconfig($channel['channel_id'], $contact['abook_xchan'], 'system', 'their_perms', $their_perms);
-
-                    $abook_instance = $contact['abook_instance'];
-
-                    if (strpos($abook_instance, z_root()) === false) {
-                        if ($abook_instance) {
-                            $abook_instance .= ',';
-                        }
-                        $abook_instance .= z_root();
-
-                        $r = q(
-                            "update abook set abook_instance = '%s', abook_not_here = 0 
-							where abook_id = %d and abook_channel = %d",
-                            dbesc($abook_instance),
-                            intval($contact['abook_id']),
-                            intval($channel['channel_id'])
-                        );
-                    }
-
-                    return;
-                default:
-                    return;
-            }
-        }
-
-        // No previous relationship exists.
-
-        if ($act->type === 'Accept') {
-            // This should not happen unless we deleted the connection before it was accepted.
-            return;
-        }
-
-        // From here on out we assume a Follow activity to somebody we have no existing relationship with
-
-        set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_id', $their_follow_id);
-        set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_type', $act->type);
-
-        // The xchan should have been created by actor_store() above
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' and xchan_network = 'activitypub' limit 1",
-            dbesc($person_obj['id'])
-        );
-
-        if (!$r) {
-            logger('xchan not found for ' . $person_obj['id']);
-            return;
-        }
-        $ret = $r[0];
-
-        $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER);
-        if ($blocked) {
-            foreach ($blocked as $b) {
-                if (strpos($ret['xchan_url'], $b['block_entity']) !== false) {
-                    logger('siteblock - follower denied');
-                    return;
-                }
-            }
-        }
-        if (LibBlock::fetch_by_entity($channel['channel_id'], $ret['xchan_hash'])) {
-            logger('actorblock - follower denied');
-            return;
-        }
-
-        $p = Permissions::connect_perms($channel['channel_id']);
-        $my_perms = Permissions::serialise($p['perms']);
-        $automatic = $p['automatic'];
-
-        $closeness = PConfig::Get($channel['channel_id'], 'system', 'new_abook_closeness', 80);
-
-        $r = abook_store_lowlevel(
-            [
-                'abook_account' => intval($channel['channel_account_id']),
-                'abook_channel' => intval($channel['channel_id']),
-                'abook_xchan' => $ret['xchan_hash'],
-                'abook_closeness' => intval($closeness),
-                'abook_created' => datetime_convert(),
-                'abook_updated' => datetime_convert(),
-                'abook_connected' => datetime_convert(),
-                'abook_dob' => NULL_DATE,
-                'abook_pending' => intval(($automatic) ? 0 : 1),
-                'abook_instance' => z_root()
-            ]
-        );
-
-        if ($my_perms) {
-            AbConfig::Set($channel['channel_id'], $ret['xchan_hash'], 'system', 'my_perms', $my_perms);
-        }
-
-        if ($their_perms) {
-            AbConfig::Set($channel['channel_id'], $ret['xchan_hash'], 'system', 'their_perms', $their_perms);
-        }
-
-
-        if ($r) {
-            logger("New ActivityPub follower for {$channel['channel_name']}");
-
-            $new_connection = q(
-                "select * from abook left join xchan on abook_xchan = xchan_hash left join hubloc on hubloc_hash = xchan_hash where abook_channel = %d and abook_xchan = '%s' order by abook_created desc limit 1",
-                intval($channel['channel_id']),
-                dbesc($ret['xchan_hash'])
-            );
-            if ($new_connection) {
-                Enotify::submit(
-                    [
-                        'type' => NOTIFY_INTRO,
-                        'from_xchan' => $ret['xchan_hash'],
-                        'to_xchan' => $channel['channel_hash'],
-                        'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'],
-                    ]
-                );
-
-                if ($my_perms && $automatic) {
-                    // send an Accept for this Follow activity
-                    Run::Summon(['Notifier', 'permissions_accept', $new_connection[0]['abook_id']]);
-                    // Send back a Follow notification to them
-                    Run::Summon(['Notifier', 'permissions_create', $new_connection[0]['abook_id']]);
-                }
-
-                $clone = [];
-                foreach ($new_connection[0] as $k => $v) {
-                    if (strpos($k, 'abook_') === 0) {
-                        $clone[$k] = $v;
-                    }
-                }
-                unset($clone['abook_id']);
-                unset($clone['abook_account']);
-                unset($clone['abook_channel']);
-
-                $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
-
-                if ($abconfig) {
-                    $clone['abconfig'] = $abconfig;
-                }
-                Libsync::build_sync_packet($channel['channel_id'], ['abook' => [$clone]]);
-            }
-        }
-
-
-        /* If there is a default group for this channel and permissions are automatic, add this member to it */
-
-        if ($channel['channel_default_group'] && $automatic) {
-            $g = AccessList::rec_byhash($channel['channel_id'], $channel['channel_default_group']);
-            if ($g) {
-                AccessList::member_add($channel['channel_id'], '', $ret['xchan_hash'], $g['id']);
-            }
-        }
-
-        return;
-    }
-
-
-    public static function unfollow($channel, $act)
-    {
-
-        $contact = null;
-
-        /* actor is unfollowing $channel */
-
-        $person_obj = $act->actor;
-
-        if (is_array($person_obj)) {
-            $r = q(
-                "select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d limit 1",
-                dbesc($person_obj['id']),
-                intval($channel['channel_id'])
-            );
-            if ($r) {
-                // remove all permissions they provided
-                del_abconfig($channel['channel_id'], $r[0]['xchan_hash'], 'system', 'their_perms', EMPTY_STR);
-            }
-        }
-
-        return;
-    }
-
-
-    public static function actor_store($url, $person_obj, $force = false)
-    {
-
-        if (!is_array($person_obj)) {
-            return;
-        }
-
-//      logger('person_obj: ' . print_r($person_obj,true));
-
-        if (array_key_exists('movedTo', $person_obj) && $person_obj['movedTo'] && !is_array($person_obj['movedTo'])) {
-            $tgt = self::fetch($person_obj['movedTo']);
-            if (is_array($tgt)) {
-                self::actor_store($person_obj['movedTo'], $tgt);
-                ActivityPub::move($person_obj['id'], $tgt);
-            }
-            return;
-        }
-
-
-        $ap_hubloc = null;
-
-        $hublocs = self::get_actor_hublocs($url);
-        if ($hublocs) {
-            foreach ($hublocs as $hub) {
-                if ($hub['hubloc_network'] === 'activitypub') {
-                    $ap_hubloc = $hub;
-                }
-                if (in_array($hub['hubloc_network'],['zot6','nomad'])) {
-                    Libzot::update_cached_hubloc($hub);
-                }
-            }
-        }
-
-        if ($ap_hubloc) {
-            // we already have a stored record. Determine if it needs updating.
-            if ($ap_hubloc['hubloc_updated'] < datetime_convert('UTC', 'UTC', ' now - ' . self::$ACTOR_CACHE_DAYS . ' days') || $force) {
-                $person_obj = self::fetch($url);
-                // ensure we received something
-                if (!is_array($person_obj)) {
-                    return;
-                }
-            } else {
-                return;
-            }
-        }
-
-
-        if (isset($person_obj['id'])) {
-            $url = $person_obj['id'];
-        }
-
-        if (!$url) {
-            return;
-        }
-
-        // store the actor record in XConfig
-        XConfig::Set($url, 'system', 'actor_record', $person_obj);
-
-        $name = escape_tags($person_obj['name']);
-        if (!$name) {
-            $name = escape_tags($person_obj['preferredUsername']);
-        }
-        if (!$name) {
-            $name = escape_tags(t('Unknown'));
-        }
-
-        $username = escape_tags($person_obj['preferredUsername']);
-        $h = parse_url($url);
-        if ($h && $h['host']) {
-            $username .= '@' . $h['host'];
-        }
-
-        if ($person_obj['icon']) {
-            if (is_array($person_obj['icon'])) {
-                if (array_key_exists('url', $person_obj['icon'])) {
-                    $icon = $person_obj['icon']['url'];
-                } else {
-                    if (is_string($person_obj['icon'][0])) {
-                        $icon = $person_obj['icon'][0];
-                    } elseif (array_key_exists('url', $person_obj['icon'][0])) {
-                        $icon = $person_obj['icon'][0]['url'];
-                    }
-                }
-            } else {
-                $icon = $person_obj['icon'];
-            }
-        }
-        if (!(isset($icon) && $icon)) {
-            $icon = z_root() . '/' . Channel::get_default_profile_photo();
-        }
-
-        $cover_photo = false;
-
-        if (isset($person_obj['image'])) {
-            if (is_string($person_obj['image'])) {
-                $cover_photo = $person_obj['image'];
-            }
-            if (isset($person_obj['image']['url'])) {
-                $cover_photo = $person_obj['image']['url'];
-            }
-        }
-
-        $hidden = false;
-        if (array_key_exists('discoverable', $person_obj) && (!intval($person_obj['discoverable']))) {
-            $hidden = true;
-        }
-
-        $links = false;
-        $profile = false;
-
-        if (is_array($person_obj['url'])) {
-            if (!array_key_exists(0, $person_obj['url'])) {
-                $links = [$person_obj['url']];
-            } else {
-                $links = $person_obj['url'];
-            }
-        }
-
-        if (is_array($links) && $links) {
-            foreach ($links as $link) {
-                if (is_array($link) && array_key_exists('mediaType', $link) && $link['mediaType'] === 'text/html') {
-                    $profile = $link['href'];
-                }
-            }
-            if (!$profile) {
-                $profile = $links[0]['href'];
-            }
-        } elseif (isset($person_obj['url']) && is_string($person_obj['url'])) {
-            $profile = $person_obj['url'];
-        }
-
-        if (!$profile) {
-            $profile = $url;
-        }
-
-        $inbox = ((array_key_exists('inbox', $person_obj)) ? $person_obj['inbox'] : null);
-
-        // either an invalid identity or a cached entry of some kind which didn't get caught above
-
-        if ((!$inbox) || strpos($inbox, z_root()) !== false) {
-            return;
-        }
-
-
-        $collections = [];
-
-        if ($inbox) {
-            $collections['inbox'] = $inbox;
-            if (array_key_exists('outbox', $person_obj) && is_string($person_obj['outbox'])) {
-                $collections['outbox'] = $person_obj['outbox'];
-            }
-            if (array_key_exists('followers', $person_obj) && is_string($person_obj['followers'])) {
-                $collections['followers'] = $person_obj['followers'];
-            }
-            if (array_key_exists('following', $person_obj) && is_string($person_obj['following'])) {
-                $collections['following'] = $person_obj['following'];
-            }
-            if (array_key_exists('wall', $person_obj) && is_string($person_obj['wall'])) {
-                $collections['wall'] = $person_obj['wall'];
-            }
-            if (array_path_exists('endpoints/sharedInbox', $person_obj) && is_string($person_obj['endpoints']['sharedInbox'])) {
-                $collections['sharedInbox'] = $person_obj['endpoints']['sharedInbox'];
-            }
-        }
-
-        if (isset($person_obj['publicKey']['publicKeyPem'])) {
-            if ($person_obj['id'] === $person_obj['publicKey']['owner']) {
-                $pubkey = $person_obj['publicKey']['publicKeyPem'];
-                if (strstr($pubkey, 'RSA ')) {
-                    $pubkey = Keyutils::rsatopem($pubkey);
-                }
-            }
-        }
-
-        $keywords = [];
-
-        if (isset($person_obj['tag']) && is_array($person_obj['tag'])) {
-            foreach ($person_obj['tag'] as $t) {
-                if (is_array($t) && isset($t['type']) && $t['type'] === 'Hashtag') {
-                    if (isset($t['name'])) {
-                        $tag = escape_tags((substr($t['name'], 0, 1) === '#') ? substr($t['name'], 1) : $t['name']);
-                        if ($tag) {
-                            $keywords[] = $tag;
-                        }
-                    }
-                }
-                if (is_array($t) && isset($t['type']) && $t['type'] === 'PropertyValue') {
-                    if (isset($t['name']) && isset($t['value']) && $t['name'] === 'Protocol') {
-                        self::update_protocols($url, trim($t['value']));
-                    }
-                }
-            }
-        }
-
-        $xchan_type = self::get_xchan_type($person_obj['type']);
-        $about = ((isset($person_obj['summary'])) ? html2bbcode(purify_html($person_obj['summary'])) : EMPTY_STR);
-
-        $p = q(
-            "select * from xchan where xchan_url = '%s' and xchan_network in ('zot6','nomad') limit 1",
-            dbesc($url)
-        );
-        if ($p) {
-            set_xconfig($url, 'system', 'protocols', 'nomad,zot6,activitypub');
-        }
-
-        // there is no standard way to represent an 'instance actor' but this will at least subdue the multiple
-        // pages of Mastodon and Pleroma instance actors in the directory.
-        // @TODO - (2021-08-27) remove this if they provide a non-person xchan_type
-        // once extended xchan_type directory filtering is implemented.
-        $censored = ((strpos($profile, 'instance_actor') || strpos($profile, '/internal/fetch')) ? 1 : 0);
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($url)
-        );
-        if (!$r) {
-            // create a new record
-            $r = xchan_store_lowlevel(
-                [
-                    'xchan_hash' => $url,
-                    'xchan_guid' => $url,
-                    'xchan_pubkey' => $pubkey,
-                    'xchan_addr' => ((strpos($username, '@')) ? $username : ''),
-                    'xchan_url' => $profile,
-                    'xchan_name' => $name,
-                    'xchan_hidden' => intval($hidden),
-                    'xchan_updated' => datetime_convert(),
-                    'xchan_name_date' => datetime_convert(),
-                    'xchan_network' => 'activitypub',
-                    'xchan_type' => $xchan_type,
-                    'xchan_photo_date' => datetime_convert('UTC', 'UTC', '1968-01-01'),
-                    'xchan_photo_l' => z_root() . '/' . Channel::get_default_profile_photo(),
-                    'xchan_photo_m' => z_root() . '/' . Channel::get_default_profile_photo(80),
-                    'xchan_photo_s' => z_root() . '/' . Channel::get_default_profile_photo(48),
-                    'xchan_photo_mimetype' => 'image/png',
-                    'xchan_censored' => $censored
-
-                ]
-            );
-        } else {
-            // Record exists. Cache existing records for a set number of days
-            // then refetch to catch updated profile photos, names, etc.
-
-            if ($r[0]['xchan_name_date'] >= datetime_convert('UTC', 'UTC', 'now - ' . self::$ACTOR_CACHE_DAYS . ' days') && (!$force)) {
-                return;
-            }
-
-            // update existing record
-            $u = q(
-                "update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_pubkey = '%s', xchan_network = '%s', xchan_name_date = '%s', xchan_hidden = %d, xchan_type = %d, xchan_censored = %d where xchan_hash = '%s'",
-                dbesc(datetime_convert()),
-                dbesc($name),
-                dbesc($pubkey),
-                dbesc('activitypub'),
-                dbesc(datetime_convert()),
-                intval($hidden),
-                intval($xchan_type),
-                intval($censored),
-                dbesc($url)
-            );
-
-            if (strpos($username, '@') && ($r[0]['xchan_addr'] !== $username)) {
-                $r = q(
-                    "update xchan set xchan_addr = '%s' where xchan_hash = '%s'",
-                    dbesc($username),
-                    dbesc($url)
-                );
-            }
-        }
-
-        if ($cover_photo) {
-            set_xconfig($url, 'system', 'cover_photo', $cover_photo);
-        }
-
-
-        $m = parse_url($url);
-        if ($m['scheme'] && $m['host']) {
-            $site_url = $m['scheme'] . '://' . $m['host'];
-            $ni = Nodeinfo::fetch($site_url);
-            if ($ni && is_array($ni)) {
-                $software = ((array_path_exists('software/name', $ni)) ? $ni['software']['name'] : '');
-                $version = ((array_path_exists('software/version', $ni)) ? $ni['software']['version'] : '');
-                $register = $ni['openRegistrations'];
-
-                $site = q(
-                    "select * from site where site_url = '%s'",
-                    dbesc($site_url)
-                );
-                if ($site) {
-                    q(
-                        "update site set site_project = '%s', site_update = '%s', site_version = '%s' where site_url = '%s'",
-                        dbesc($software),
-                        dbesc(datetime_convert()),
-                        dbesc($version),
-                        dbesc($site_url)
-                    );
-                    // it may have been saved originally as an unknown type, but we now know what it is
-                    if (intval($site[0]['site_type']) === SITE_TYPE_UNKNOWN) {
-                        q(
-                            "update site set site_type = %d where site_url = '%s'",
-                            intval(SITE_TYPE_NOTZOT),
-                            dbesc($site_url)
-                        );
-                    }
-                } else {
-                    site_store_lowlevel(
-                        [
-                            'site_url' => $site_url,
-                            'site_update' => datetime_convert(),
-                            'site_dead' => 0,
-                            'site_type' => SITE_TYPE_NOTZOT,
-                            'site_project' => $software,
-                            'site_version' => $version,
-                            'site_access' => (($register) ? ACCESS_FREE : ACCESS_PRIVATE),
-                            'site_register' => (($register) ? REGISTER_OPEN : REGISTER_CLOSED)
-                        ]
-                    );
-                }
-            }
-        }
-
-        Libzotdir::import_directory_profile($url, ['about' => $about, 'keywords' => $keywords, 'dob' => '0000-00-00'], null, 0, true);
-
-        if ($collections) {
-            set_xconfig($url, 'activitypub', 'collections', $collections);
-        }
-
-        $h = q(
-            "select * from hubloc where hubloc_hash = '%s' limit 1",
-            dbesc($url)
-        );
-
-
-        $m = parse_url($url);
-        if ($m) {
-            $hostname = $m['host'];
-            $baseurl = $m['scheme'] . '://' . $m['host'] . ((isset($m['port']) && intval($m['port'])) ? ':' . $m['port'] : '');
-        }
-
-        if (!$h) {
-            $r = hubloc_store_lowlevel(
-                [
-                    'hubloc_guid' => $url,
-                    'hubloc_hash' => $url,
-                    'hubloc_id_url' => $profile,
-                    'hubloc_addr' => ((strpos($username, '@')) ? $username : ''),
-                    'hubloc_network' => 'activitypub',
-                    'hubloc_url' => $baseurl,
-                    'hubloc_host' => $hostname,
-                    'hubloc_callback' => $inbox,
-                    'hubloc_updated' => datetime_convert(),
-                    'hubloc_primary' => 1
-                ]
-            );
-        } else {
-            if (strpos($username, '@') && ($h[0]['hubloc_addr'] !== $username)) {
-                $r = q(
-                    "update hubloc set hubloc_addr = '%s' where hubloc_hash = '%s'",
-                    dbesc($username),
-                    dbesc($url)
-                );
-            }
-            if ($inbox !== $h[0]['hubloc_callback']) {
-                $r = q(
-                    "update hubloc set hubloc_callback = '%s' where hubloc_hash = '%s'",
-                    dbesc($inbox),
-                    dbesc($url)
-                );
-            }
-            if ($profile !== $h[0]['hubloc_id_url']) {
-                $r = q(
-                    "update hubloc set hubloc_id_url = '%s' where hubloc_hash = '%s'",
-                    dbesc($profile),
-                    dbesc($url)
-                );
-            }
-            $r = q(
-                "update hubloc set hubloc_updated = '%s' where hubloc_hash = '%s'",
-                dbesc(datetime_convert()),
-                dbesc($url)
-            );
-        }
-
-        if (!$icon) {
-            $icon = z_root() . '/' . Channel::get_default_profile_photo(300);
-        }
-
-        // We store all ActivityPub actors we can resolve. Some of them may be able to communicate over Zot6. Find them.
-        // Only probe if it looks like it looks something like a zot6 URL as there isn't anything in the actor record which we can reliably use for this purpose
-        // and adding zot discovery urls to the actor record will cause federation to fail with the 20-30 projects which don't accept arrays in the url field.
-
-        if (strpos($url, '/channel/') !== false) {
-            $zx = q(
-                "select * from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad')",
-                dbesc($url)
-            );
-            if (($username) && strpos($username, '@') && (!$zx)) {
-                Run::Summon(['Gprobe', bin2hex($username)]);
-            }
-        }
-
-        Run::Summon(['Xchan_photo', bin2hex($icon), bin2hex($url)]);
-    }
-
-    public static function update_protocols($xchan, $str)
-    {
-        $existing = explode(',', get_xconfig($xchan, 'system', 'protocols', EMPTY_STR));
-        if (!in_array($str, $existing)) {
-            $existing[] = $str;
-            set_xconfig($xchan, 'system', 'protocols', implode(',', $existing));
-        }
-    }
-
-
-    public static function drop($channel, $observer, $act)
-    {
-        $r = q(
-            "select * from item where mid = '%s' and uid = %d limit 1",
-            dbesc((is_array($act->obj)) ? $act->obj['id'] : $act->obj),
-            intval($channel['channel_id'])
-        );
-
-        if (!$r) {
-            return;
-        }
-
-        if (in_array($observer, [$r[0]['author_xchan'], $r[0]['owner_xchan']])) {
-            drop_item($r[0]['id'], false);
-        } elseif (in_array($act->actor['id'], [$r[0]['author_xchan'], $r[0]['owner_xchan']])) {
-            drop_item($r[0]['id'], false);
-        }
-    }
-
-
-    // sort function width decreasing
-
-    public static function vid_sort($a, $b)
-    {
-        if ($a['width'] === $b['width']) {
-            return 0;
-        }
-        return (($a['width'] > $b['width']) ? -1 : 1);
-    }
-
-    public static function share_bb($obj)
-    {
-        // @fixme - error check and set defaults
-
-        $name = urlencode($obj['actor']['name']);
-        $profile = $obj['actor']['id'];
-        $photo = $obj['icon']['url'];
-
-        $s = "\r\n[share author='" . $name .
-            "' profile='" . $profile .
-            "' avatar='" . $photo .
-            "' link='" . $act->obj['id'] .
-            "' auth='" . ((is_matrix_url($act->obj['id'])) ? 'true' : 'false') .
-            "' posted='" . $act->obj['published'] .
-            "' message_id='" . $act->obj['id'] .
-            "']";
-
-        return $s;
-    }
-
-    public static function get_actor_bbmention($id)
-    {
-
-        $x = q(
-            "select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_hash = '%s' or hubloc_id_url = '%s' limit 1",
-            dbesc($id),
-            dbesc($id)
-        );
-
-        if ($x) {
-            // a name starting with a left paren can trick the markdown parser into creating a link so insert a zero-width space
-            if (substr($x[0]['xchan_name'], 0, 1) === '(') {
-                $x[0]['xchan_name'] = htmlspecialchars_decode('​', ENT_QUOTES) . $x[0]['xchan_name'];
-            }
-
-            return sprintf('@[zrl=%s]%s[/zrl]', $x[0]['xchan_url'], $x[0]['xchan_name']);
-        }
-        return '@{' . $id . '}';
-    }
-
-    public static function update_poll($item, $post)
-    {
-
-        logger('updating poll');
-
-        $multi = false;
-        $mid = $post['mid'];
-        $content = $post['title'];
-
-        if (!$item) {
-            return false;
-        }
-
-        $o = json_decode($item['obj'], true);
-        if ($o && array_key_exists('anyOf', $o)) {
-            $multi = true;
-        }
-
-        $r = q(
-            "select mid, title from item where parent_mid = '%s' and author_xchan = '%s' and mid != parent_mid ",
-            dbesc($item['mid']),
-            dbesc($post['author_xchan'])
-        );
-
-        // prevent any duplicate votes by same author for oneOf and duplicate votes with same author and same answer for anyOf
-
-        if ($r) {
-            if ($multi) {
-                foreach ($r as $rv) {
-                    if ($rv['title'] === $content && $rv['mid'] !== $mid) {
-                        return false;
-                    }
-                }
-            } else {
-                foreach ($r as $rv) {
-                    if ($rv['mid'] !== $mid) {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        $answer_found = false;
-        $found = false;
-        if ($multi) {
-            for ($c = 0; $c < count($o['anyOf']); $c++) {
-                if ($o['anyOf'][$c]['name'] === $content) {
-                    $answer_found = true;
-                    if (is_array($o['anyOf'][$c]['replies'])) {
-                        foreach ($o['anyOf'][$c]['replies'] as $reply) {
-                            if (is_array($reply) && array_key_exists('id', $reply) && $reply['id'] === $mid) {
-                                $found = true;
-                            }
-                        }
-                    }
-
-                    if (!$found) {
-                        $o['anyOf'][$c]['replies']['totalItems']++;
-                        $o['anyOf'][$c]['replies']['items'][] = ['id' => $mid, 'type' => 'Note'];
-                    }
-                }
-            }
-        } else {
-            for ($c = 0; $c < count($o['oneOf']); $c++) {
-                if ($o['oneOf'][$c]['name'] === $content) {
-                    $answer_found = true;
-                    if (is_array($o['oneOf'][$c]['replies'])) {
-                        foreach ($o['oneOf'][$c]['replies'] as $reply) {
-                            if (is_array($reply) && array_key_exists('id', $reply) && $reply['id'] === $mid) {
-                                $found = true;
-                            }
-                        }
-                    }
-
-                    if (!$found) {
-                        $o['oneOf'][$c]['replies']['totalItems']++;
-                        $o['oneOf'][$c]['replies']['items'][] = ['id' => $mid, 'type' => 'Note'];
-                    }
-                }
-            }
-        }
-
-        if ($item['comments_closed'] > NULL_DATE) {
-            if ($item['comments_closed'] > datetime_convert()) {
-                $o['closed'] = datetime_convert('UTC', 'UTC', $item['comments_closed'], ATOM_TIME);
-                // set this to force an update
-                $answer_found = true;
-            }
-        }
-
-        logger('updated_poll: ' . print_r($o, true), LOGGER_DATA);
-        if ($answer_found && !$found) {
-            $x = q(
-                "update item set obj = '%s', edited = '%s' where id = %d",
-                dbesc(json_encode($o)),
-                dbesc(datetime_convert()),
-                intval($item['id'])
-            );
-            Run::Summon(['Notifier', 'wall-new', $item['id']]);
-            return true;
-        }
-
-        return false;
-    }
-
-
-    public static function decode_note($act, $cacheable = false)
-    {
-
-        $response_activity = false;
-        $poll_handled = false;
-
-        $s = [];
-
-        if (is_array($act->obj)) {
-            $binary = false;
-            $markdown = false;
-
-            if (array_key_exists('mediaType', $act->obj) && $act->obj['mediaType'] !== 'text/html') {
-                if ($act->obj['mediaType'] === 'text/markdown') {
-                    $markdown = true;
-                } else {
-                    $s['mimetype'] = escape_tags($act->obj['mediaType']);
-                    $binary = true;
-                }
-            }
-
-            $content = self::get_content($act->obj, $binary);
-
-            if ($cacheable) {
-                // Zot6 activities will all be rendered from bbcode source in order to generate dynamic content.
-                // If the activity came from ActivityPub (hence $cacheable is set), use the HTML rendering
-                // and discard the bbcode source since it is unlikely that it is compatible with our implementation.
-                // Friendica for example.
-
-                unset($content['bbcode']);
-            }
-
-            // handle markdown conversion inline (peertube)
-
-            if ($markdown) {
-                foreach (['summary', 'content'] as $t) {
-                    $content[$t] = Markdown::to_bbcode($content[$t], true, ['preserve_lf' => true]);
-                }
-            }
-        }
-
-        // These activities should have been handled separately in the Inbox module and should not be turned into posts
-
-        if (
-            in_array($act->type, ['Follow', 'Accept', 'Reject', 'Create', 'Update']) && is_array($act->obj) && array_key_exists('type', $act->obj)
-            && ($act->obj['type'] === 'Follow' || ActivityStreams::is_an_actor($act->obj['type']))
-        ) {
-            return false;
-        }
-
-        // Within our family of projects, Follow/Unfollow of a thread is an internal activity which should not be transmitted,
-        // hence if we receive it - ignore or reject it.
-        // This may have to be revisited if AP projects start using Follow for objects other than actors.
-
-        if (in_array($act->type, [ACTIVITY_FOLLOW, ACTIVITY_IGNORE])) {
-            return false;
-        }
-
-        // Do not proceed further if there is no actor.
-
-        if (!isset($act->actor['id'])) {
-            logger('No actor!');
-            return false;
-        }
-
-        $s['owner_xchan'] = $act->actor['id'];
-        $s['author_xchan'] = $act->actor['id'];
-
-        // ensure we store the original actor
-        self::actor_store($act->actor['id'], $act->actor);
-
-        $s['mid'] = ((is_array($act->obj) && isset($act->obj['id'])) ? $act->obj['id'] : $act->obj);
-
-        if (!$s['mid']) {
-            return false;
-        }
-
-        $s['parent_mid'] = $act->parent_id;
-
-        if (array_key_exists('published', $act->data) && $act->data['published']) {
-            $s['created'] = datetime_convert('UTC', 'UTC', $act->data['published']);
-        } elseif (array_key_exists('published', $act->obj) && $act->obj['published']) {
-            $s['created'] = datetime_convert('UTC', 'UTC', $act->obj['published']);
-        }
-        if (array_key_exists('updated', $act->data) && $act->data['updated']) {
-            $s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']);
-        } elseif (array_key_exists('updated', $act->obj) && $act->obj['updated']) {
-            $s['edited'] = datetime_convert('UTC', 'UTC', $act->obj['updated']);
-        }
-        if (array_key_exists('expires', $act->data) && $act->data['expires']) {
-            $s['expires'] = datetime_convert('UTC', 'UTC', $act->data['expires']);
-        } elseif (array_key_exists('expires', $act->obj) && $act->obj['expires']) {
-            $s['expires'] = datetime_convert('UTC', 'UTC', $act->obj['expires']);
-        }
-
-        if ($act->type === 'Invite' && is_array($act->obj) && array_key_exists('type', $act->obj) && $act->obj['type'] === 'Event') {
-            $s['mid'] = $s['parent_mid'] = $act->id;
-        }
-
-        if (isset($act->replyto) && !empty($act->replyto)) {
-            if (is_array($act->replyto) && isset($act->replyto['id'])) {
-                $s['replyto'] = $act->replyto['id'];
-            } else {
-                $s['replyto'] = $act->replyto;
-            }
-        }
-
-        if (ActivityStreams::is_response_activity($act->type)) {
-            $response_activity = true;
-
-            $s['mid'] = $act->id;
-            $s['parent_mid'] = ((is_array($act->obj) && isset($act->obj['id'])) ? $act->obj['id'] : $act->obj);
-
-
-            // over-ride the object timestamp with the activity
-
-            if (isset($act->data['published']) && $act->data['published']) {
-                $s['created'] = datetime_convert('UTC', 'UTC', $act->data['published']);
-            }
-
-            if (isset($act->data['updated']) && $act->data['updated']) {
-                $s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']);
-            }
-
-            $obj_actor = ((isset($act->obj['actor'])) ? $act->obj['actor'] : $act->get_actor('attributedTo', $act->obj));
-
-            // Actor records themselves do not have an actor or attributedTo
-            if ((!$obj_actor) && isset($act->obj['type']) && Activitystreams::is_an_actor($act->obj['type'])) {
-                $obj_actor = $act->obj;
-            }
-
-            // We already check for admin blocks of third-party objects when fetching them explicitly.
-            // Repeat here just in case the entire object was supplied inline and did not require fetching
-
-            if ($obj_actor && array_key_exists('id', $obj_actor)) {
-                $m = parse_url($obj_actor['id']);
-                if ($m && $m['scheme'] && $m['host']) {
-                    if (!check_siteallowed($m['scheme'] . '://' . $m['host'])) {
-                        return;
-                    }
-                }
-                if (!check_channelallowed($obj_actor['id'])) {
-                    return;
-                }
-            }
-
-            // if the object is an actor, it is not really a response activity, so reset it to a top level post
-
-            if (ActivityStreams::is_an_actor($act->obj['type'])) {
-                $s['parent_mid'] = $s['mid'];
-            }
-
-
-            // ensure we store the original actor of the associated (parent) object
-            self::actor_store($obj_actor['id'], $obj_actor);
-
-            $mention = self::get_actor_bbmention($obj_actor['id']);
-
-            $quoted_content = '[quote]' . $content['content'] . '[/quote]';
-
-            if ($act->type === 'Like') {
-                $content['content'] = sprintf(t('Likes %1$s\'s %2$s'), $mention, ((ActivityStreams::is_an_actor($act->obj['type'])) ? t('Profile') : $act->obj['type'])) . EOL . EOL . $quoted_content;
-            }
-            if ($act->type === 'Dislike') {
-                $content['content'] = sprintf(t('Doesn\'t like %1$s\'s %2$s'), $mention, ((ActivityStreams::is_an_actor($act->obj['type'])) ? t('Profile') : $act->obj['type'])) . EOL . EOL . $quoted_content;
-            }
-
-            // handle event RSVPs
-            if (($act->obj['type'] === 'Event') || ($act->obj['type'] === 'Invite' && array_path_exists('object/type', $act->obj) && $act->obj['object']['type'] === 'Event')) {
-                if ($act->type === 'Accept') {
-                    $content['content'] = sprintf(t('Will attend %s\'s event'), $mention) . EOL . EOL . $quoted_content;
-                }
-                if ($act->type === 'Reject') {
-                    $content['content'] = sprintf(t('Will not attend %s\'s event'), $mention) . EOL . EOL . $quoted_content;
-                }
-                if ($act->type === 'TentativeAccept') {
-                    $content['content'] = sprintf(t('May attend %s\'s event'), $mention) . EOL . EOL . $quoted_content;
-                }
-                if ($act->type === 'TentativeReject') {
-                    $content['content'] = sprintf(t('May not attend %s\'s event'), $mention) . EOL . EOL . $quoted_content;
-                }
-            }
-
-            if ($act->type === 'Announce') {
-                $content['content'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, ((ActivityStreams::is_an_actor($act->obj['type'])) ? t('Profile') : $act->obj['type']));
-            }
-
-            if ($act->type === 'emojiReaction') {
-                // Hubzilla reactions
-                $content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';');
-            }
-
-            if (in_array($act->type, ['EmojiReaction', 'EmojiReact'])) {
-                // Pleroma reactions
-                $t = trim(self::get_textfield($act->data, 'content'));
-                $e = Emoji\is_single_emoji($t) || mb_strlen($t) === 1;
-                if ($e) {
-                    $content['content'] = $t;
-                }
-            }
-
-            $a = self::decode_taxonomy($act->data);
-            if ($a) {
-                $s['term'] = $a;
-                foreach ($a as $b) {
-                    if ($b['ttype'] === TERM_EMOJI) {
-                        $s['summary'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['summary']);
-
-                        // @todo - @bug
-                        // The emoji reference in the body might be inside a code block. In that case we shouldn't replace it.
-                        // Currently we do.
-
-                        $s['body'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['body']);
-                    }
-                }
-            }
-
-            $a = self::decode_attachment($act->data);
-            if ($a) {
-                $s['attach'] = $a;
-            }
-
-            $a = self::decode_iconfig($act->data);
-            if ($a) {
-                $s['iconfig'] = $a;
-            }
-        }
-
-        $s['comment_policy'] = 'authenticated';
-
-        if ($s['mid'] === $s['parent_mid']) {
-            // it is a parent node - decode the comment policy info if present
-            if (isset($act->obj['commentPolicy'])) {
-                $until = strpos($act->obj['commentPolicy'], 'until=');
-                if ($until !== false) {
-                    $s['comments_closed'] = datetime_convert('UTC', 'UTC', substr($act->obj['commentPolicy'], $until + 6));
-                    if ($s['comments_closed'] < datetime_convert()) {
-                        $s['nocomment'] = true;
-                    }
-                }
-                $remainder = substr($act->obj['commentPolicy'], 0, (($until) ? $until : strlen($act->obj['commentPolicy'])));
-                if ($remainder) {
-                    $s['comment_policy'] = $remainder;
-                }
-                if (!(isset($item['comment_policy']) && strlen($item['comment_policy']))) {
-                    $s['comment_policy'] = 'contacts';
-                }
-            }
-        }
-
-        if (!(array_key_exists('created', $s) && $s['created'])) {
-            $s['created'] = datetime_convert();
-        }
-        if (!(array_key_exists('edited', $s) && $s['edited'])) {
-            $s['edited'] = $s['created'];
-        }
-        $s['title'] = (($response_activity) ? EMPTY_STR : self::bb_content($content, 'name'));
-        $s['summary'] = self::bb_content($content, 'summary');
-
-        if (array_key_exists('mimetype', $s) && (!in_array($s['mimetype'], ['text/bbcode', 'text/x-multicode']))) {
-            $s['body'] = $content['content'];
-        } else {
-            $s['body'] = ((self::bb_content($content, 'bbcode') && (!$response_activity)) ? self::bb_content($content, 'bbcode') : self::bb_content($content, 'content'));
-        }
-
-
-        // handle some of the more widely used of the numerous and varied ways of deleting something
-
-        if (in_array($act->type, ['Delete', 'Undo', 'Tombstone'])) {
-            $s['item_deleted'] = 1;
-        }
-
-        if ($act->type === 'Create' && $act->obj['type'] === 'Tombstone') {
-            $s['item_deleted'] = 1;
-        }
-
-        if ($act->obj && array_key_exists('sensitive', $act->obj) && boolval($act->obj['sensitive'])) {
-            $s['item_nsfw'] = 1;
-        }
-
-        $s['verb'] = self::activity_mapper($act->type);
-
-        // Mastodon does not provide update timestamps when updating poll tallies which means race conditions may occur here.
-        if (in_array($act->type,['Create','Update']) && $act->obj['type'] === 'Question' && $s['edited'] === $s['created']) {
-			if (isset($act->obj['votersCount']) && intval($act->obj['votersCount'])) {
-	            $s['edited'] = datetime_convert();
-			}
-        }
-
-
-        $s['obj_type'] = self::activity_obj_mapper($act->obj['type']);
-        $s['obj'] = $act->obj;
-        if (is_array($s['obj']) && array_path_exists('actor/id', $s['obj'])) {
-            $s['obj']['actor'] = $s['obj']['actor']['id'];
-        }
-
-        if (is_array($act->tgt) && $act->tgt) {
-            if (array_key_exists('type', $act->tgt)) {
-                $s['tgt_type'] = self::activity_obj_mapper($act->tgt['type']);
-            }
-            // We shouldn't need to store collection contents which could be large. We will often only require the meta-data
-            if (isset($s['tgt_type']) && strpos($s['tgt_type'], 'Collection') !== false) {
-                $s['target'] = ['id' => $act->tgt['id'], 'type' => $s['tgt_type'], 'attributedTo' => ((isset($act->tgt['attributedTo'])) ? $act->tgt['attributedTo'] : $act->tgt['actor'])];
-            }
-        }
-
-        $generator = $act->get_property_obj('generator');
-        if ((!$generator) && (!$response_activity)) {
-            $generator = $act->get_property_obj('generator', $act->obj);
-        }
-
-        if (
-            $generator && array_key_exists('type', $generator)
-            && in_array($generator['type'], ['Application', 'Service']) && array_key_exists('name', $generator)
-        ) {
-            $s['app'] = escape_tags($generator['name']);
-        }
-
-        $location = $act->get_property_obj('location');
-        if (is_array($location) && array_key_exists('type', $location) && $location['type'] === 'Place') {
-            if (array_key_exists('name', $location)) {
-                $s['location'] = escape_tags($location['name']);
-            }
-            if (array_key_exists('content', $location)) {
-                $s['location'] = html2plain(purify_html($location['content']), 256);
-            }
-
-            if (array_key_exists('latitude', $location) && array_key_exists('longitude', $location)) {
-                $s['coord'] = escape_tags($location['latitude']) . ' ' . escape_tags($location['longitude']);
-            }
-        }
-
-        if (!$response_activity) {
-            $a = self::decode_taxonomy($act->obj);
-            if ($a) {
-                $s['term'] = $a;
-                foreach ($a as $b) {
-                    if ($b['ttype'] === TERM_EMOJI) {
-                        $s['summary'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['summary']);
-
-                        // @todo - @bug
-                        // The emoji reference in the body might be inside a code block. In that case we shouldn't replace it.
-                        // Currently we do.
-
-                        $s['body'] = str_replace($b['term'], '[img=16x16]' . $b['url'] . '[/img]', $s['body']);
-                    }
-                }
-            }
-
-            $a = self::decode_attachment($act->obj);
-            if ($a) {
-                $s['attach'] = $a;
-            }
-
-            $a = self::decode_iconfig($act->obj);
-            if ($a) {
-                $s['iconfig'] = $a;
-            }
-        }
-
-        // Objects that might have media attachments which aren't already provided in the content element.
-        // We'll check specific media objects separately.
-
-        if (in_array($act->obj['type'], ['Article', 'Document', 'Event', 'Note', 'Page', 'Place', 'Question']) && isset($s['attach']) && $s['attach']) {
-            $s['body'] .= self::bb_attach($s['attach'], $s['body']);
-        }
-
-        if ($act->obj['type'] === 'Question' && in_array($act->type, ['Create', 'Update'])) {
-            if ($act->obj['endTime']) {
-                $s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['endTime']);
-            }
-        }
-
-        if (array_key_exists('closed', $act->obj) && $act->obj['closed']) {
-            $s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['closed']);
-        }
-
-
-        // we will need a hook here to extract magnet links e.g. peertube
-        // right now just link to the largest mp4 we find that will fit in our
-        // standard content region
-
-        if (!$response_activity) {
-            if ($act->obj['type'] === 'Video') {
-                $vtypes = [
-                    'video/mp4',
-                    'video/ogg',
-                    'video/webm'
-                ];
-
-                $mps = [];
-                $poster = null;
-                $ptr = null;
-
-                // try to find a poster to display on the video element
-
-                if (array_key_exists('icon', $act->obj)) {
-                    if (is_array($act->obj['icon'])) {
-                        if (array_key_exists(0, $act->obj['icon'])) {
-                            $ptr = $act->obj['icon'];
-                        } else {
-                            $ptr = [$act->obj['icon']];
-                        }
-                    }
-                    if ($ptr) {
-                        foreach ($ptr as $foo) {
-                            if (is_array($foo) && array_key_exists('type', $foo) && $foo['type'] === 'Image' && is_string($foo['url'])) {
-                                $poster = $foo['url'];
-                            }
-                        }
-                    }
-                }
-
-                $tag = (($poster) ? '[video poster="' . $poster . '"]' : '[video]');
-                $ptr = null;
-
-                if (array_key_exists('url', $act->obj)) {
-                    if (is_array($act->obj['url'])) {
-                        if (array_key_exists(0, $act->obj['url'])) {
-                            $ptr = $act->obj['url'];
-                        } else {
-                            $ptr = [$act->obj['url']];
-                        }
-                        // handle peertube's weird url link tree if we find it here
-                        // 0 => html link, 1 => application/x-mpegURL with 'tag' set to an array of actual media links
-                        foreach ($ptr as $idex) {
-                            if (is_array($idex) && array_key_exists('mediaType', $idex)) {
-                                if ($idex['mediaType'] === 'application/x-mpegURL' && isset($idex['tag']) && is_array($idex['tag'])) {
-                                    $ptr = $idex['tag'];
-                                    break;
-                                }
-                            }
-                        }
-                        foreach ($ptr as $vurl) {
-                            if (array_key_exists('mediaType', $vurl)) {
-                                if (in_array($vurl['mediaType'], $vtypes)) {
-                                    if (!array_key_exists('width', $vurl)) {
-                                        $vurl['width'] = 0;
-                                    }
-                                    $mps[] = $vurl;
-                                }
-                            }
-                        }
-                    }
-                    if ($mps) {
-                        usort($mps, [__CLASS__, 'vid_sort']);
-                        foreach ($mps as $m) {
-                            if (intval($m['width']) < 500 && self::media_not_in_body($m['href'], $s['body'])) {
-                                $s['body'] .= "\n\n" . $tag . $m['href'] . '[/video]';
-                                break;
-                            }
-                        }
-                    } elseif (is_string($act->obj['url']) && self::media_not_in_body($act->obj['url'], $s['body'])) {
-                        $s['body'] .= "\n\n" . $tag . $act->obj['url'] . '[/video]';
-                    }
-                }
-            }
-
-            if ($act->obj['type'] === 'Audio') {
-                $atypes = [
-                    'audio/mpeg',
-                    'audio/ogg',
-                    'audio/wav'
-                ];
-
-                $ptr = null;
-
-                if (array_key_exists('url', $act->obj)) {
-                    if (is_array($act->obj['url'])) {
-                        if (array_key_exists(0, $act->obj['url'])) {
-                            $ptr = $act->obj['url'];
-                        } else {
-                            $ptr = [$act->obj['url']];
-                        }
-                        foreach ($ptr as $vurl) {
-                            if (isset($vurl['mediaType']) && in_array($vurl['mediaType'], $atypes) && self::media_not_in_body($vurl['href'], $s['body'])) {
-                                $s['body'] .= "\n\n" . '[audio]' . $vurl['href'] . '[/audio]';
-                                break;
-                            }
-                        }
-                    } elseif (is_string($act->obj['url']) && self::media_not_in_body($act->obj['url'], $s['body'])) {
-                        $s['body'] .= "\n\n" . '[audio]' . $act->obj['url'] . '[/audio]';
-                    }
-                } // Pleroma audio scrobbler
-                elseif ($act->type === 'Listen' && array_key_exists('artist', $act->obj) && array_key_exists('title', $act->obj) && $s['body'] === EMPTY_STR) {
-                    $s['body'] .= "\n\n" . sprintf('Listening to \"%1$s\" by %2$s', escape_tags($act->obj['title']), escape_tags($act->obj['artist']));
-                    if (isset($act->obj['album'])) {
-                        $s['body'] .= "\n" . sprintf('(%s)', escape_tags($act->obj['album']));
-                    }
-                }
-            }
-
-            if ($act->obj['type'] === 'Image' && strpos($s['body'], 'zrl=') === false) {
-                $ptr = null;
-
-                if (array_key_exists('url', $act->obj)) {
-                    if (is_array($act->obj['url'])) {
-                        if (array_key_exists(0, $act->obj['url'])) {
-                            $ptr = $act->obj['url'];
-                        } else {
-                            $ptr = [$act->obj['url']];
-                        }
-                        foreach ($ptr as $vurl) {
-                            if (is_array($vurl) && isset($vurl['href']) && strpos($s['body'], $vurl['href']) === false) {
-                                $s['body'] .= "\n\n" . '[zmg]' . $vurl['href'] . '[/zmg]';
-                                break;
-                            }
-                        }
-                    } elseif (is_string($act->obj['url'])) {
-                        if (strpos($s['body'], $act->obj['url']) === false) {
-                            $s['body'] .= "\n\n" . '[zmg]' . $act->obj['url'] . '[/zmg]';
-                        }
-                    }
-                }
-            }
-
-
-            if ($act->obj['type'] === 'Page' && !$s['body']) {
-                $ptr = null;
-                $purl = EMPTY_STR;
-
-                if (array_key_exists('url', $act->obj)) {
-                    if (is_array($act->obj['url'])) {
-                        if (array_key_exists(0, $act->obj['url'])) {
-                            $ptr = $act->obj['url'];
-                        } else {
-                            $ptr = [$act->obj['url']];
-                        }
-                        foreach ($ptr as $vurl) {
-                            if (is_array($vurl) && array_key_exists('mediaType', $vurl) && $vurl['mediaType'] === 'text/html') {
-                                $purl = $vurl['href'];
-                                break;
-                            } elseif (array_key_exists('mimeType', $vurl) && $vurl['mimeType'] === 'text/html') {
-                                $purl = $vurl['href'];
-                                break;
-                            }
-                        }
-                    } elseif (is_string($act->obj['url'])) {
-                        $purl = $act->obj['url'];
-                    }
-                    if ($purl) {
-                        $li = z_fetch_url(z_root() . '/linkinfo?binurl=' . bin2hex($purl));
-                        if ($li['success'] && $li['body']) {
-                            $s['body'] .= "\n" . $li['body'];
-                        } else {
-                            $s['body'] .= "\n\n" . $purl;
-                        }
-                    }
-                }
-            }
-        }
-
-
-        if (in_array($act->obj['type'], ['Note', 'Article', 'Page'])) {
-            $ptr = null;
-
-            if (array_key_exists('url', $act->obj)) {
-                if (is_array($act->obj['url'])) {
-                    if (array_key_exists(0, $act->obj['url'])) {
-                        $ptr = $act->obj['url'];
-                    } else {
-                        $ptr = [$act->obj['url']];
-                    }
-                    foreach ($ptr as $vurl) {
-                        if (is_array($vurl) && array_key_exists('mediaType', $vurl) && $vurl['mediaType'] === 'text/html') {
-                            $s['plink'] = $vurl['href'];
-                            break;
-                        }
-                    }
-                } elseif (is_string($act->obj['url'])) {
-                    $s['plink'] = $act->obj['url'];
-                }
-            }
-        }
-
-        if (!(isset($s['plink']) && $s['plink'])) {
-            $s['plink'] = $s['mid'];
-        }
-
-        // assume this is private unless specifically told otherwise.
-
-        $s['item_private'] = 1;
-
-        if ($act->recips && (in_array(ACTIVITY_PUBLIC_INBOX, $act->recips) || in_array('Public', $act->recips) || in_array('as:Public', $act->recips))) {
-            $s['item_private'] = 0;
-        }
-
-        if (is_array($act->obj)) {
-            if (array_key_exists('directMessage', $act->obj) && intval($act->obj['directMessage'])) {
-                $s['item_private'] = 2;
-            }
-        }
-
-        set_iconfig($s, 'activitypub', 'recips', $act->raw_recips);
-
-        if (array_key_exists('directMessage', $act->data) && intval($act->data['directMessage'])) {
-            $s['item_private'] = 2;
-        }
-
-
-        set_iconfig($s, 'activitypub', 'rawmsg', $act->raw, 1);
-
-        // Restrict html caching to ActivityPub senders.
-        // Zot has dynamic content and this library is used by both.
-
-        if ($cacheable) {
-            if ((!array_key_exists('mimetype', $s)) || (in_array($s['mimetype'], ['text/bbcode', 'text/x-multicode']))) {
-                // preserve the original purified HTML content *unless* we've modified $s['body']
-                // within this function (to add attachments or reaction descriptions or mention rewrites).
-                // This avoids/bypasses some markdown rendering issues which can occur when
-                // converting to our markdown-enhanced bbcode and then back to HTML again.
-                // Also if we do need bbcode, use the 'bbonly' flag to ignore markdown and only
-                // interpret bbcode; which is much less susceptible to false positives in the
-                // conversion regexes.
-
-                if ($s['body'] === self::bb_content($content, 'content')) {
-                    $s['html'] = $content['content'];
-                } else {
-                    $s['html'] = bbcode($s['body'], ['bbonly' => true]);
-                }
-            }
-        }
-
-        $hookinfo = [
-            'act' => $act,
-            's' => $s
-        ];
-
-        Hook::call('decode_note', $hookinfo);
-
-        $s = $hookinfo['s'];
-
-        return $s;
-    }
-
-    public static function rewrite_mentions_sub(&$s, $pref, &$obj = null)
-    {
-
-        if (isset($s['term']) && is_array($s['term'])) {
-            foreach ($s['term'] as $tag) {
-                $txt = EMPTY_STR;
-                if (intval($tag['ttype']) === TERM_MENTION) {
-                    // some platforms put the identity url into href rather than the profile url. Accept either form.
-                    $x = q(
-                        "select * from xchan where xchan_url = '%s' or xchan_hash = '%s' limit 1",
-                        dbesc($tag['url']),
-                        dbesc($tag['url'])
-                    );
-                    if ($x) {
-                        switch ($pref) {
-                            case 0:
-                                $txt = $x[0]['xchan_name'];
-                                break;
-                            case 1:
-                                $txt = (($x[0]['xchan_addr']) ? $x[0]['xchan_addr'] : $x[0]['xchan_name']);
-                                break;
-                            case 2:
-                            default;
-                                if ($x[0]['xchan_addr']) {
-                                    $txt = sprintf(t('%1$s (%2$s)'), $x[0]['xchan_name'], $x[0]['xchan_addr']);
-                                } else {
-                                    $txt = $x[0]['xchan_name'];
-                                }
-                                break;
-                        }
-                    }
-                }
-
-                if ($txt) {
-                    // the Markdown filter will get tripped up and think this is a markdown link
-                    // if $txt begins with parens so put it behind a zero-width space
-                    if (substr($txt, 0, 1) === '(') {
-                        $txt = htmlspecialchars_decode('​', ENT_QUOTES) . $txt;
-                    }
-                    $s['body'] = preg_replace(
-                        '/\@\[zrl\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/zrl\]/ism',
-                        '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]',
-                        $s['body']
-                    );
-                    $s['body'] = preg_replace(
-                        '/\@\[url\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/url\]/ism',
-                        '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]',
-                        $s['body']
-                    );
-                    $s['body'] = preg_replace(
-                        '/\[zrl\=' . preg_quote($x[0]['xchan_url'], '/') . '\]@(.*?)\[\/zrl\]/ism',
-                        '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]',
-                        $s['body']
-                    );
-                    $s['body'] = preg_replace(
-                        '/\[url\=' . preg_quote($x[0]['xchan_url'], '/') . '\]@(.*?)\[\/url\]/ism',
-                        '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]',
-                        $s['body']
-                    );
-
-                    // replace these just in case the sender (in this case Friendica) got it wrong
-                    $s['body'] = preg_replace(
-                        '/\@\[zrl\=' . preg_quote($x[0]['xchan_hash'], '/') . '\](.*?)\[\/zrl\]/ism',
-                        '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]',
-                        $s['body']
-                    );
-                    $s['body'] = preg_replace(
-                        '/\@\[url\=' . preg_quote($x[0]['xchan_hash'], '/') . '\](.*?)\[\/url\]/ism',
-                        '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]',
-                        $s['body']
-                    );
-                    $s['body'] = preg_replace(
-                        '/\[zrl\=' . preg_quote($x[0]['xchan_hash'], '/') . '\]@(.*?)\[\/zrl\]/ism',
-                        '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]',
-                        $s['body']
-                    );
-                    $s['body'] = preg_replace(
-                        '/\[url\=' . preg_quote($x[0]['xchan_hash'], '/') . '\]@(.*?)\[\/url\]/ism',
-                        '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]',
-                        $s['body']
-                    );
-
-                    if ($obj && $txt) {
-                        if (!is_array($obj)) {
-                            $obj = json_decode($obj, true);
-                        }
-                        if (array_path_exists('source/content', $obj)) {
-                            $obj['source']['content'] = preg_replace(
-                                '/\@\[zrl\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/zrl\]/ism',
-                                '@[zrl=' . $x[0]['xchan_url'] . ']' . $txt . '[/zrl]',
-                                $obj['source']['content']
-                            );
-                            $obj['source']['content'] = preg_replace(
-                                '/\@\[url\=' . preg_quote($x[0]['xchan_url'], '/') . '\](.*?)\[\/url\]/ism',
-                                '@[url=' . $x[0]['xchan_url'] . ']' . $txt . '[/url]',
-                                $obj['source']['content']
-                            );
-                        }
-                        $obj['content'] = preg_replace(
-                            '/\@(.*?)\(.*?)\<\/a\>/ism',
-                            '@$1' . $txt . '',
-                            $obj['content']
-                        );
-                    }
-                }
-            }
-        }
-
-        // $s['html'] will be populated if caching was enabled.
-        // This is usually the case for ActivityPub sourced content, while Zot6 content is not cached.
-
-        if (isset($s['html']) && $s['html']) {
-            $s['html'] = bbcode($s['body'], ['bbonly' => true]);
-        }
-
-        return;
-    }
-
-    public static function rewrite_mentions(&$s)
-    {
-        // rewrite incoming mentions in accordance with system.tag_username setting
-        // 0 - displayname
-        // 1 - username
-        // 2 - displayname (username)
-        // 127 - default
-
-        $pref = intval(PConfig::Get($s['uid'], 'system', 'tag_username', Config::Get('system', 'tag_username', false)));
-
-        if ($pref === 127) {
-            return;
-        }
-
-        self::rewrite_mentions_sub($s, $pref);
-
-
-        return;
-    }
-
-    // $force is used when manually fetching a remote item - it assumes you are granting one-time
-    // permission for the selected item/conversation regardless of your relationship with the author and
-    // assumes that you are in fact the sender. Please do not use it for anything else. The only permission
-    // checking that is performed is that the author isn't blocked by the site admin.
-
-    public static function store($channel, $observer_hash, $act, $item, $fetch_parents = true, $force = false)
-    {
-
-        if ($act && $act->implied_create && !$force) {
-            // This is originally a S2S object with no associated activity
-            logger('Not storing implied create activity!');
-            return;
-        }
-
-        $is_system = Channel::is_system($channel['channel_id']);
-        $is_child_node = false;
-
-        // Pleroma scrobbles can be really noisy and contain lots of duplicate activities. Disable them by default.
-
-        if (($act->type === 'Listen') && ($is_system || get_pconfig($channel['channel_id'], 'system', 'allow_scrobbles', false))) {
-            return;
-        }
-
-        // Mastodon only allows visibility in public timelines if the public inbox is listed in the 'to' field.
-        // They are hidden in the public timeline if the public inbox is listed in the 'cc' field.
-        // This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point.
-
-        $pubstream = ((is_array($act->obj) && array_key_exists('to', $act->obj) && is_array($act->obj['to']) && (in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to']) || in_array('Public', $act->obj['to']) || in_array('as:Public', $act->obj['to']))) ? true : false);
-
-        // very unpleasant and imperfect way of determining a Mastodon DM
-
-        if ($act->raw_recips && array_key_exists('to', $act->raw_recips) && is_array($act->raw_recips['to']) && count($act->raw_recips['to']) === 1 && $act->raw_recips['to'][0] === Channel::url($channel) && !$act->raw_recips['cc']) {
-            $item['item_private'] = 2;
-        }
-
-
-        if ($item['parent_mid'] && $item['parent_mid'] !== $item['mid']) {
-            $is_child_node = true;
-        }
-
-        $allowed = false;
-        $reason = ['init'];
-        $permit_mentions = intval(PConfig::Get($channel['channel_id'], 'system', 'permit_all_mentions') && i_am_mentioned($channel, $item));
-
-        if ($is_child_node) {
-            $p = q(
-                "select * from item where mid = '%s' and uid = %d and item_wall = 1",
-                dbesc($item['parent_mid']),
-                intval($channel['channel_id'])
-            );
-            if ($p) {
-                // set the owner to the owner of the parent
-                $item['owner_xchan'] = $p[0]['owner_xchan'];
-
-                // quietly reject group comment boosts by group owner
-                // (usually only sent via ActivityPub so groups will work on microblog platforms)
-                // This catches those activities if they slipped in via a conversation fetch
-
-                if ($p[0]['parent_mid'] !== $item['parent_mid']) {
-                    if ($item['verb'] === 'Announce' && $item['author_xchan'] === $item['owner_xchan']) {
-                        logger('group boost activity by group owner rejected');
-                        return;
-                    }
-                }
-
-                // check permissions against the author, not the sender
-                $allowed = perm_is_allowed($channel['channel_id'], $item['author_xchan'], 'post_comments');
-                if (!$allowed) {
-                    $reason[] = 'post_comments perm';
-                }
-                if ((!$allowed) && $permit_mentions) {
-                    if ($p[0]['owner_xchan'] === $channel['channel_hash']) {
-                        $allowed = false;
-                        $reason[] = 'ownership';
-                    } else {
-                        $allowed = true;
-                    }
-                }
-                if (absolutely_no_comments($p[0])) {
-                    $allowed = false;
-                    $reason[] = 'absolutely';
-                }
-
-                if (!$allowed) {
-                    logger('rejected comment from ' . $item['author_xchan'] . ' for ' . $channel['channel_address']);
-                    logger('rejected reason ' . print_r($reason, true));
-                    logger('rejected: ' . print_r($item, true), LOGGER_DATA);
-                    // let the sender know we received their comment but we don't permit spam here.
-                    self::send_rejection_activity($channel, $item['author_xchan'], $item);
-                    return;
-                }
-
-                if (perm_is_allowed($channel['channel_id'], $item['author_xchan'], 'moderated')) {
-                    $item['item_blocked'] = ITEM_MODERATED;
-                }
-            } else {
-                // By default if we allow you to send_stream and comments and this is a comment, it is allowed.
-                // A side effect of this action is that if you take away send_stream permission, comments to those
-                // posts you previously allowed will still be accepted. It is possible but might be difficult to fix this.
-
-                $allowed = true;
-
-                // reject public stream comments that weren't sent by the conversation owner
-                // but only on remote message deliveries to our site ($fetch_parents === true)
-
-                if ($is_system && $pubstream && $item['owner_xchan'] !== $observer_hash && !$fetch_parents) {
-                    $allowed = false;
-                    $reason[] = 'sender ' . $observer_hash . ' not owner ' . $item['owner_xchan'];
-                }
-            }
-
-            if ($p && $p[0]['obj_type'] === 'Question') {
-                if ($item['obj_type'] === 'Note' && $item['title'] && (!$item['content'])) {
-                    $item['obj_type'] = 'Answer';
-                }
-            }
-        } else {
-            if (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') || ($is_system && $pubstream)) {
-                logger('allowed: permission allowed', LOGGER_DATA);
-                $allowed = true;
-            }
-            if ($permit_mentions) {
-                logger('allowed: permitted mention', LOGGER_DATA);
-                $allowed = true;
-            }
-        }
-
-        if (tgroup_check($channel['channel_id'], $item) && (!$is_child_node)) {
-            // for forum deliveries, make sure we keep a copy of the signed original
-            set_iconfig($item, 'activitypub', 'rawmsg', $act->raw, 1);
-            logger('allowed: tgroup');
-            $allowed = true;
-        }
-
-        if (get_abconfig($channel['channel_id'], $observer_hash, 'system', 'block_announce', false)) {
-            if ($item['verb'] === 'Announce' || strpos($item['body'], '[/share]')) {
-                $allowed = false;
-            }
-        }
-
-        if (intval($item['item_private']) === 2) {
-            if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'post_mail')) {
-                $allowed = false;
-            }
-        }
-
-        if ($is_system) {
-            if (!check_pubstream_channelallowed($observer_hash)) {
-                $allowed = false;
-                $reason[] = 'pubstream channel blocked';
-            }
-
-            // don't allow pubstream posts if the sender even has a clone on a pubstream denied site
-
-            $h = q(
-                "select hubloc_url from hubloc where hubloc_hash = '%s'",
-                dbesc($observer_hash)
-            );
-            if ($h) {
-                foreach ($h as $hub) {
-                    if (!check_pubstream_siteallowed($hub['hubloc_url'])) {
-                        $allowed = false;
-                        $reason = 'pubstream site blocked';
-                        break;
-                    }
-                }
-            }
-            if (intval($item['item_private'])) {
-                $allowed = false;
-                $reason[] = 'private item';
-            }
-        }
-
-        $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER);
-        if ($blocked) {
-            foreach ($blocked as $b) {
-                if (strpos($observer_hash, $b['block_entity']) !== false) {
-                    $allowed = false;
-                    $reason[] = 'blocked';
-                }
-            }
-        }
-
-        if (!$allowed && !$force) {
-            logger('no permission: channel ' . $channel['channel_address'] . ', id = ' . $item['mid']);
-            logger('no permission: reason ' . print_r($reason, true));
-            return;
-        }
-
-        $item['aid'] = $channel['channel_account_id'];
-        $item['uid'] = $channel['channel_id'];
-
-
-        // Some authors may be zot6 authors in which case we want to store their nomadic identity
-        // instead of their ActivityPub identity
-
-        $item['author_xchan'] = self::find_best_identity($item['author_xchan']);
-        $item['owner_xchan'] = self::find_best_identity($item['owner_xchan']);
-
-        if (!($item['author_xchan'] && $item['owner_xchan'])) {
-            logger('owner or author missing.');
-            return;
-        }
-
-        if ($channel['channel_system']) {
-            if (!MessageFilter::evaluate($item, get_config('system', 'pubstream_incl'), get_config('system', 'pubstream_excl'))) {
-                logger('post is filtered');
-                return;
-            }
-        }
-
-        // fetch allow/deny lists for the sender, author, or both
-        // if you have them. post_is_importable() assumes true
-        // and only fails if there was intentional rejection
-        // due to this channel's filtering rules for content
-        // provided by either of these entities.
-
-        $abook = q(
-            "select * from abook where ( abook_xchan = '%s' OR abook_xchan  = '%s') and abook_channel = %d ",
-            dbesc($item['author_xchan']),
-            dbesc($item['owner_xchan']),
-            intval($channel['channel_id'])
-        );
-
-
-        if (!post_is_importable($channel['channel_id'], $item, $abook)) {
-            logger('post is filtered');
-            return;
-        }
-
-        $maxlen = get_max_import_size();
-
-        if ($maxlen && mb_strlen($item['body']) > $maxlen) {
-            $item['body'] = mb_substr($item['body'], 0, $maxlen, 'UTF-8');
-            logger('message length exceeds max_import_size: truncated');
-        }
-
-        if ($maxlen && mb_strlen($item['summary']) > $maxlen) {
-            $item['summary'] = mb_substr($item['summary'], 0, $maxlen, 'UTF-8');
-            logger('message summary length exceeds max_import_size: truncated');
-        }
-
-        if ($act->obj['context']) {
-            set_iconfig($item, 'activitypub', 'context', $act->obj['context'], 1);
-        }
-
-        if ($act->obj['conversation']) {
-            set_iconfig($item, 'ostatus', 'conversation', $act->obj['conversation'], 1);
-        }
-
-        set_iconfig($item, 'activitypub', 'recips', $act->raw_recips);
-
-        if (intval($act->sigok)) {
-            $item['item_verified'] = 1;
-        }
-
-        $parent = null;
-
-        if ($is_child_node) {
-            $parent = q(
-                "select * from item where mid = '%s' and uid = %d limit 1",
-                dbesc($item['parent_mid']),
-                intval($item['uid'])
-            );
-            if (!$parent) {
-                if (!get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) {
-                    return;
-                } else {
-                    $fetch = false;
-                    if (intval($channel['channel_system']) || (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && (PConfig::Get($channel['channel_id'], 'system', 'hyperdrive', true) || $act->type === 'Announce'))) {
-                        $fetch = (($fetch_parents) ? self::fetch_and_store_parents($channel, $observer_hash, $act, $item) : false);
-                    }
-                    if ($fetch) {
-                        $parent = q(
-                            "select * from item where mid = '%s' and uid = %d limit 1",
-                            dbesc($item['parent_mid']),
-                            intval($item['uid'])
-                        );
-                    } else {
-                        logger('no parent');
-                        return;
-                    }
-                }
-            }
-
-            $item['comment_policy'] = $parent[0]['comment_policy'];
-            $item['item_nocomment'] = $parent[0]['item_nocomment'];
-            $item['comments_closed'] = $parent[0]['comments_closed'];
-
-            if ($parent[0]['parent_mid'] !== $item['parent_mid']) {
-                $item['thr_parent'] = $item['parent_mid'];
-            } else {
-                $item['thr_parent'] = $parent[0]['parent_mid'];
-            }
-            $item['parent_mid'] = $parent[0]['parent_mid'];
-
-            /*
-             *
-             * Check for conversation privacy mismatches
-             * We can only do this if we have a channel and we have fetched the parent
-             *
-             */
-
-            // public conversation, but this comment went rogue and was published privately
-            // hide it from everybody except the channel owner
-
-            if (intval($parent[0]['item_private']) === 0) {
-                if (intval($item['item_private'])) {
-                    $item['item_restrict'] = $item['item_restrict'] | 1;
-                    $item['allow_cid'] = '<' . $channel['channel_hash'] . '>';
-                    $item['allow_gid'] = $item['deny_cid'] = $item['deny_gid'] = '';
-                }
-            }
-
-            // Private conversation, but this comment went rogue and was published publicly
-            // Set item_restrict to indicate this condition so we can flag it in the UI
-
-            if (intval($parent[0]['item_private']) !== 0 && $act->recips && (in_array(ACTIVITY_PUBLIC_INBOX, $act->recips) || in_array('Public', $act->recips) || in_array('as:Public', $act->recips))) {
-                $item['item_restrict'] = $item['item_restrict'] | 2;
-            }
-        }
-
-        self::rewrite_mentions($item);
-
-        $r = q(
-            "select id, created, edited from item where mid = '%s' and uid = %d limit 1",
-            dbesc($item['mid']),
-            intval($item['uid'])
-        );
-        if ($r) {
-            if ($item['edited'] > $r[0]['edited']) {
-                $item['id'] = $r[0]['id'];
-                $x = item_store_update($item);
-            } else {
-                return;
-            }
-        } else {
-            $x = item_store($item);
-        }
-
-
-// experimental code that needs more work. What this did was once we fetched a conversation to find the root node,
-// start at that root node and fetch children so you get all the branches and not just the branch related to the current node.
-// Unfortunately there is no standard method for achieving this. Mastodon provides a 'replies' collection and Nomad projects
-// can fetch the 'context'. For other platforms it's a wild guess. Additionally when we tested this, it started an infinite
-// recursion and has been disabled until the recursive behaviour is tracked down and fixed.
-
-//      if ($fetch_parents && $parent && ! intval($parent[0]['item_private'])) {
-//          logger('topfetch', LOGGER_DEBUG);
-//          // if the thread owner is a connnection, we will already receive any additional comments to their posts
-//          // but if they are not we can try to fetch others in the background
-//          $x = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
-//              WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
-//              intval($channel['channel_id']),
-//              dbesc($parent[0]['owner_xchan'])
-//          );
-//          if (! $x) {
-//              // determine if the top-level post provides a replies collection
-//              if ($parent[0]['obj']) {
-//                  $parent[0]['obj'] = json_decode($parent[0]['obj'],true);
-//              }
-//              logger('topfetch: ' . print_r($parent[0],true), LOGGER_ALL);
-//              $id = ((array_path_exists('obj/replies/id',$parent[0])) ? $parent[0]['obj']['replies']['id'] : false);
-//              if (! $id) {
-//                  $id = ((array_path_exists('obj/replies',$parent[0]) && is_string($parent[0]['obj']['replies'])) ? $parent[0]['obj']['replies'] : false);
-//              }
-//              if ($id) {
-//                  Run::Summon( [ 'Convo', $id, $channel['channel_id'], $observer_hash ] );
-//              }
-//          }
-//      }
-
-        if (is_array($x) && $x['item_id']) {
-            if ($is_child_node) {
-                if ($item['owner_xchan'] === $channel['channel_hash']) {
-                    // We are the owner of this conversation, so send all received comments back downstream
-                    Run::Summon(['Notifier', 'comment-import', $x['item_id']]);
-                }
-                $r = q(
-                    "select * from item where id = %d limit 1",
-                    intval($x['item_id'])
-                );
-                if ($r) {
-                    send_status_notifications($x['item_id'], $r[0]);
-                }
-            }
-            sync_an_item($channel['channel_id'], $x['item_id']);
-        }
-    }
-
-    public static function find_best_identity($xchan)
-    {
-
-        $r = q(
-            "select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1",
-            dbesc($xchan)
-        );
-        if ($r) {
-            return $r[0]['hubloc_hash'];
-        }
-        return $xchan;
-    }
-
-
-    public static function fetch_and_store_parents($channel, $observer_hash, $act, $item)
-    {
-
-        logger('fetching parents');
-
-        $p = [];
-
-        $current_act = $act;
-        $current_item = $item;
-
-        while ($current_item['parent_mid'] !== $current_item['mid']) {
-            $n = self::fetch($current_item['parent_mid']);
-            if (!$n) {
-                break;
-            }
-            // set client flag to convert objects to implied activities
-            $a = new ActivityStreams($n, null, true);
-            if (
-                $a->type === 'Announce' && is_array($a->obj)
-                && array_key_exists('object', $a->obj) && array_key_exists('actor', $a->obj)
-            ) {
-                // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
-                // Reparse the encapsulated Activity and use that instead
-                logger('relayed activity', LOGGER_DEBUG);
-                $a = new ActivityStreams($a->obj, null, true);
-            }
-
-            logger($a->debug(), LOGGER_DATA);
-
-            if (!$a->is_valid()) {
-                logger('not a valid activity');
-                break;
-            }
-            if (is_array($a->actor) && array_key_exists('id', $a->actor)) {
-                self::actor_store($a->actor['id'], $a->actor);
-            }
-
-            // ActivityPub sourced items are cacheable
-            $item = self::decode_note($a, true);
-
-            if (!$item) {
-                break;
-            }
-
-            $hookinfo = [
-                'a' => $a,
-                'item' => $item
-            ];
-
-            Hook::call('fetch_and_store', $hookinfo);
-
-            $item = $hookinfo['item'];
-
-            if ($item) {
-                // don't leak any private conversations to the public stream
-                // even if they contain publicly addressed comments/reactions
-
-                if (intval($channel['channel_system']) && intval($item['item_private'])) {
-                    logger('private conversation ignored');
-                    $p = [];
-                    break;
-                }
-
-                if (count($p) > 100) {
-                    logger('Conversation overflow');
-                    $p = [];
-                    break;
-                }
-
-                array_unshift($p, [$a, $item]);
-
-                if ($item['parent_mid'] === $item['mid']) {
-                    break;
-                }
-            }
-
-            $current_act = $a;
-            $current_item = $item;
-        }
-
-
-        if ($p) {
-            foreach ($p as $pv) {
-                if ($pv[0]->is_valid()) {
-                    self::store($channel, $observer_hash, $pv[0], $pv[1], false);
-                }
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-
-    // This function is designed to work with Zot attachments and item body
-
-    public static function bb_attach($attach, $body)
-    {
-
-        $ret = false;
-
-        if (!(is_array($attach) && $attach)) {
-            return EMPTY_STR;
-        }
-
-        foreach ($attach as $a) {
-            if (array_key_exists('type', $a) && stripos($a['type'], 'image') !== false) {
-                // don't add inline image if it's an svg and we already have an inline svg
-                if ($a['type'] === 'image/svg+xml' && strpos($body, '[/svg]')) {
-                    continue;
-                }
-                if (self::media_not_in_body($a['href'], $body)) {
-                    if (isset($a['name']) && $a['name']) {
-                        $alt = htmlspecialchars($a['name'], ENT_QUOTES);
-                        $ret .= "\n\n" . '[img alt="' . $alt . '"]' . $a['href'] . '[/img]';
-                    } else {
-                        $ret .= "\n\n" . '[img]' . $a['href'] . '[/img]';
-                    }
-                }
-            }
-            if (array_key_exists('type', $a) && stripos($a['type'], 'video') !== false) {
-                if (self::media_not_in_body($a['href'], $body)) {
-                    $ret .= "\n\n" . '[video]' . $a['href'] . '[/video]';
-                }
-            }
-            if (array_key_exists('type', $a) && stripos($a['type'], 'audio') !== false) {
-                if (self::media_not_in_body($a['href'], $body)) {
-                    $ret .= "\n\n" . '[audio]' . $a['href'] . '[/audio]';
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-
-    // check for the existence of existing media link in body
-
-    public static function media_not_in_body($s, $body)
-    {
-
-        $s_alt = htmlspecialchars($s, ENT_QUOTES, 'UTF-8');
-
-        if (
-            (strpos($body, ']' . $s . '[/img]') === false) &&
-            (strpos($body, ']' . $s . '[/zmg]') === false) &&
-            (strpos($body, ']' . $s . '[/video]') === false) &&
-            (strpos($body, ']' . $s . '[/zvideo]') === false) &&
-            (strpos($body, ']' . $s . '[/audio]') === false) &&
-            (strpos($body, ']' . $s . '[/zaudio]') === false) &&
-            (strpos($body, ']' . $s_alt . '[/img]') === false) &&
-            (strpos($body, ']' . $s_alt . '[/zmg]') === false) &&
-            (strpos($body, ']' . $s_alt . '[/video]') === false) &&
-            (strpos($body, ']' . $s_alt . '[/zvideo]') === false) &&
-            (strpos($body, ']' . $s_alt . '[/audio]') === false) &&
-            (strpos($body, ']' . $s_alt . '[/zaudio]') === false)
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-
-    public static function bb_content($content, $field)
-    {
-
-        $ret = false;
-
-        if (!is_array($content)) {
-            btlogger('content not initialised');
-            return $ret;
-        }
-
-        if (array_key_exists($field, $content) && is_array($content[$field])) {
-            foreach ($content[$field] as $k => $v) {
-                $ret .= html2bbcode($v);
-                // save this for auto-translate or dynamic filtering
-                // $ret .= '[language=' . $k . ']' . html2bbcode($v) . '[/language]';
-            }
-        } elseif (isset($content[$field])) {
-            if ($field === 'bbcode' && array_key_exists('bbcode', $content)) {
-                $ret = $content[$field];
-            } else {
-                $ret = html2bbcode($content[$field]);
-            }
-        } else {
-            $ret = EMPTY_STR;
-        }
-        if ($field === 'content' && isset($content['event']) && (!strpos($ret, '[event'))) {
-            $ret .= format_event_bbcode($content['event']);
-        }
-
-        return $ret;
-    }
-
-
-    public static function get_content($act, $binary = false)
-    {
-
-        $content = [];
-        $event = null;
-
-        if ((!$act) || (!is_array($act))) {
-            return $content;
-        }
-
-
-        if ($act['type'] === 'Event') {
-            $adjust = false;
-            $event = [];
-            $event['event_hash'] = $act['id'];
-            if (array_key_exists('startTime', $act) && strpos($act['startTime'], -1, 1) === 'Z') {
-                $adjust = true;
-                $event['adjust'] = 1;
-                $event['dtstart'] = datetime_convert('UTC', 'UTC', $event['startTime'] . (($adjust) ? '' : 'Z'));
-            }
-            if (array_key_exists('endTime', $act)) {
-                $event['dtend'] = datetime_convert('UTC', 'UTC', $event['endTime'] . (($adjust) ? '' : 'Z'));
-            } else {
-                $event['nofinish'] = true;
-            }
-
-            if (array_key_exists('eventRepeat', $act)) {
-                $event['event_repeat'] = $act['eventRepeat'];
-            }
-        }
-
-        foreach (['name', 'summary', 'content'] as $a) {
-            if (($x = self::get_textfield($act, $a, $binary)) !== false) {
-                $content[$a] = $x;
-            }
-            if (isset($content['name'])) {
-                $content['name'] = html2plain(purify_html($content['name']), 256);
-            }
-        }
-
-        if ($event && !$binary) {
-            $event['summary'] = html2plain(purify_html($content['summary']), 256);
-            if (!$event['summary']) {
-                if ($content['name']) {
-                    $event['summary'] = html2plain(purify_html($content['name']), 256);
-                }
-            }
-            if (!$event['summary']) {
-                if ($content['content']) {
-                    $event['summary'] = html2plain(purify_html($content['content']), 256);
-                }
-            }
-            if ($event['summary']) {
-                $event['summary'] = substr($event['summary'], 0, 256);
-            }
-            $event['description'] = html2bbcode($content['content']);
-            if ($event['summary'] && $event['dtstart']) {
-                $content['event'] = $event;
-            }
-        }
-
-        if (array_path_exists('source/mediaType', $act) && array_path_exists('source/content', $act)) {
-            if (in_array($act['source']['mediaType'], ['text/bbcode', 'text/x-multicode'])) {
-                if (is_string($act['source']['content']) && strpos($act['source']['content'], '<') !== false) {
-                    $content['bbcode'] = multicode_purify($act['source']['content']);
-                } else {
-                    $content['bbcode'] = purify_html($act['source']['content'], ['escape']);
-                }
-            }
-        }
-
-        return $content;
-    }
-
-
-    public static function get_textfield($act, $field, $binary = false)
-    {
-
-        $content = false;
-
-        if (array_key_exists($field, $act) && $act[$field]) {
-            $content = (($binary) ? $act[$field] : purify_html($act[$field]));
-        } elseif (array_key_exists($field . 'Map', $act) && $act[$field . 'Map']) {
-            foreach ($act[$field . 'Map'] as $k => $v) {
-                $content[escape_tags($k)] = (($binary) ? $v : purify_html($v));
-            }
-        }
-        return $content;
-    }
-
-    public static function send_rejection_activity($channel, $observer_hash, $item)
-    {
-
-        $recip = q(
-            "select * from hubloc where hubloc_hash = '%s' limit 1",
-            dbesc($observer_hash)
-        );
-        if (!$recip) {
-            return;
-        }
-
-        $arr = [
-            'id' => z_root() . '/bounces/' . new_uuid(),
-            'to' => [$observer_hash],
-            'type' => 'Reject',
-            'actor' => Channel::url($channel),
-            'name' => 'Permission denied',
-            'object' => $item['message_id']
-        ];
-
-        $msg = array_merge(['@context' => [
-            ACTIVITYSTREAMS_JSONLD_REV,
-            'https://w3id.org/security/v1',
-            self::ap_schema()
-        ]], $arr);
-
-        $queue_id = ActivityPub::queue_message(json_encode($msg, JSON_UNESCAPED_SLASHES), $channel, $recip[0]);
-        do_delivery([$queue_id]);
-    }
-
-    // Find either an Authorization: Bearer token or 'token' request variable
-    // in the current web request and return it
-
-    public static function token_from_request()
-    {
-
-        foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $s) {
-            $auth = ((array_key_exists($s, $_SERVER) && strpos($_SERVER[$s], 'Bearer ') === 0)
-                ? str_replace('Bearer ', EMPTY_STR, $_SERVER[$s])
-                : EMPTY_STR
-            );
-            if ($auth) {
-                break;
-            }
-        }
-
-        if (!$auth) {
-            if (array_key_exists('token', $_REQUEST) && $_REQUEST['token']) {
-                $auth = $_REQUEST['token'];
-            }
-        }
-
-        return $auth;
-    }
-
-    public static function get_xchan_type($type)
-    {
-        switch ($type) {
-            case 'Person':
-                return XCHAN_TYPE_PERSON;
-            case 'Group':
-                return XCHAN_TYPE_GROUP;
-            case 'Service':
-                return XCHAN_TYPE_SERVICE;
-            case 'Organization':
-                return XCHAN_TYPE_ORGANIZATION;
-            case 'Application':
-                return XCHAN_TYPE_APPLICATION;
-            default:
-                return XCHAN_TYPE_UNKNOWN;
-        }
-    }
-
-    public static function get_cached_actor($id)
-    {
-        return (XConfig::Get($id, 'system', 'actor_record'));
-    }
-
-
-    public static function get_actor_hublocs($url, $options = 'all,not_deleted')
-    {
-
-        $hublocs = false;
-        $sql_options = EMPTY_STR;
-
-        $options_arr = explode(',', $options);
-        if (count($options_arr) > 1) {
-            for ($x = 1; $x < count($options_arr); $x++) {
-                switch (trim($options_arr[$x])) {
-                    case 'not_deleted':
-                        $sql_options .= ' and hubloc_deleted = 0 ';
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        switch (trim($options_arr[0])) {
-            case 'activitypub':
-                $hublocs = q(
-                    "select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_hash = '%s' $sql_options ",
-                    dbesc($url)
-                );
-                break;
-            case 'zot6':
-			case 'nomad':
-                $hublocs = q(
-                    "select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_id_url = '%s' $sql_options ",
-                    dbesc($url)
-                );
-                break;
-            case 'all':
-            default:
-                $hublocs = q(
-                    "select * from hubloc left join xchan on hubloc_hash = xchan_hash where ( hubloc_id_url = '%s' OR hubloc_hash = '%s' ) $sql_options ",
-                    dbesc($url),
-                    dbesc($url)
-                );
-                break;
-        }
-
-        return $hublocs;
-    }
-
-    public static function get_actor_collections($url)
-    {
-        $ret = [];
-        $actor_record = XConfig::Get($url, 'system', 'actor_record');
-        if (!$actor_record) {
-            return $ret;
-        }
-
-        foreach (['inbox', 'outbox', 'followers', 'following'] as $collection) {
-            if (isset($actor_record[$collection]) && $actor_record[$collection]) {
-                $ret[$collection] = $actor_record[$collection];
-            }
-        }
-        if (array_path_exists('endpoints/sharedInbox', $actor_record) && $actor_record['endpoints']['sharedInbox']) {
-            $ret['sharedInbox'] = $actor_record['endpoints']['sharedInbox'];
-        }
-
-        return $ret;
-    }
-
-    public static function ap_schema()
-    {
-
-        return [
-            'zot' => z_root() . '/apschema#',
-            'toot' => 'http://joinmastodon.org/ns#',
-            'ostatus' => 'http://ostatus.org#',
-            'schema' => 'http://schema.org#',
-            'litepub' => 'http://litepub.social/ns#',
-            'sm' => 'http://smithereen.software/ns#',
-            'conversation' => 'ostatus:conversation',
-            'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
-            'oauthRegistrationEndpoint' => 'litepub:oauthRegistrationEndpoint',
-            'sensitive' => 'as:sensitive',
-            'movedTo' => 'as:movedTo',
-            'copiedTo' => 'as:copiedTo',
-            'alsoKnownAs' => 'as:alsoKnownAs',
-            'EmojiReact' => 'as:EmojiReact',
-            'commentPolicy' => 'zot:commentPolicy',
-            'topicalCollection' => 'zot:topicalCollection',
-            'eventRepeat' => 'zot:eventRepeat',
-            'emojiReaction' => 'zot:emojiReaction',
-            'expires' => 'zot:expires',
-            'directMessage' => 'zot:directMessage',
-            'Category' => 'zot:Category',
-            'replyTo' => 'zot:replyTo',
-            'PropertyValue' => 'schema:PropertyValue',
-            'value' => 'schema:value',
-            'discoverable' => 'toot:discoverable',
-            'wall' => 'sm:wall',
-            'capabilities' => 'litepub:capabilities',
-            'acceptsJoins' => 'litepub:acceptsJoins',
-        ];
-    }
-}
diff --git a/Zotlabs/Lib/ActivityPub.php b/Zotlabs/Lib/ActivityPub.php
deleted file mode 100644
index dfd15eee3..000000000
--- a/Zotlabs/Lib/ActivityPub.php
+++ /dev/null
@@ -1,600 +0,0 @@
- Channel::url($arr['channel']) . '?operation=delete',
-                'actor' => Channel::url($arr['channel']),
-                'type' => 'Delete',
-                'object' => Channel::url($arr['channel']),
-                'to' => ['https://www.w3.org/ns/activitystreams#Public'],
-                'cc' => []
-            ];
-
-            $msg = array_merge(['@context' => [
-                ACTIVITYSTREAMS_JSONLD_REV,
-                'https://w3id.org/security/v1',
-                Activity::ap_schema()
-            ]], $ti);
-
-            $msg['signature'] = LDSignatures::sign($msg, $arr['channel']);
-
-            logger('ActivityPub_encoded (purge_all): ' . json_encode($msg, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-
-            $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES);
-        } else {
-            $target_item = $arr['target_item'];
-
-            if (!$target_item['mid']) {
-                return;
-            }
-
-            $prv_recips = $arr['env_recips'];
-
-
-            if ($signed_msg) {
-                $jmsg = $signed_msg;
-            } else {
-                // Rewrite outbound mentions so they match the ActivityPub convention, which
-                // is to pretend that the preferred display name doesn't exist and instead use
-                // the username or webfinger address when displaying names. This is likely to
-                // only cause confusion on nomadic networks where there could be any number
-                // of applicable webfinger addresses for a given identity.
-
-
-                Activity::rewrite_mentions_sub($target_item, 1, $target_item['obj']);
-
-                $ti = Activity::encode_activity($target_item, true);
-
-                if (!$ti) {
-                    return;
-                }
-
-//              $token = IConfig::get($target_item['id'],'ocap','relay');
-//              if ($token) {
-//                  if (defined('USE_BEARCAPS')) {
-//                      $ti['id'] = 'bear:?u=' . $ti['id'] . '&t=' . $token;
-//                  }
-//                  else {
-//                      $ti['id'] = $ti['id'] . '?token=' . $token;
-//                  }
-//                  if ($ti['url'] && is_string($ti['url'])) {
-//                      $ti['url'] .= '?token=' . $token;
-//                  }
-//              }
-
-                $msg = array_merge(['@context' => [
-                    ACTIVITYSTREAMS_JSONLD_REV,
-                    'https://w3id.org/security/v1',
-                    Activity::ap_schema()
-                ]], $ti);
-
-                $msg['signature'] = LDSignatures::sign($msg, $arr['channel']);
-
-                logger('ActivityPub_encoded: ' . json_encode($msg, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-
-                $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES);
-            }
-        }
-        if ($prv_recips) {
-            $hashes = [];
-
-            // re-explode the recipients, but only for this hub/pod
-
-            foreach ($prv_recips as $recip) {
-                $hashes[] = "'" . $recip . "'";
-            }
-
-            $r = q(
-                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s'
-				and xchan_hash in (" . implode(',', $hashes) . ") and xchan_network = 'activitypub' ",
-                dbesc($arr['hub']['hubloc_url'])
-            );
-
-            if (!$r) {
-                logger('activitypub_process_outbound: no recipients');
-                return;
-            }
-
-            foreach ($r as $contact) {
-                // is $contact connected with this channel - and if the channel is cloned, also on this hub?
-                // 2018-10-19 this probably doesn't apply to activitypub anymore, just send the thing.
-                // They'll reject it if they don't like it.
-                // $single = deliverable_singleton($arr['channel']['channel_id'],$contact);
-
-                if (!$arr['normal_mode']) {
-                    continue;
-                }
-
-                $qi = self::queue_message($jmsg, $arr['channel'], $contact, $target_item['mid']);
-                if ($qi) {
-                    $arr['queued'][] = $qi;
-                }
-                continue;
-            }
-        } else {
-            // public message
-
-            // See if we can deliver all of them at once
-
-            $x = get_xconfig($arr['hub']['hubloc_hash'], 'activitypub', 'collections');
-            if ($x && $x['sharedInbox']) {
-                logger('using publicInbox delivery for ' . $arr['hub']['hubloc_url'], LOGGER_DEBUG);
-                $contact['hubloc_callback'] = $x['sharedInbox'];
-                $qi = self::queue_message($jmsg, $arr['channel'], $contact, $target_item['mid']);
-                if ($qi) {
-                    $arr['queued'][] = $qi;
-                }
-            } else {
-                $r = q(
-                    "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s' and xchan_network = 'activitypub' ",
-                    dbesc($arr['hub']['hubloc_url'])
-                );
-
-                if (!$r) {
-                    logger('activitypub_process_outbound: no recipients');
-                    return;
-                }
-
-                foreach ($r as $contact) {
-                    // $single = deliverable_singleton($arr['channel']['channel_id'],$contact);
-
-                    $qi = self::queue_message($jmsg, $arr['channel'], $contact, $target_item['mid']);
-                    if ($qi) {
-                        $arr['queued'][] = $qi;
-                    }
-                }
-            }
-        }
-
-        return;
-    }
-
-
-    public static function queue_message($msg, $sender, $recip, $message_id = '')
-    {
-
-        $dest_url = $recip['hubloc_callback'];
-
-        logger('URL: ' . $dest_url, LOGGER_DEBUG);
-        logger('DATA: ' . jindent($msg), LOGGER_DATA);
-
-        if (intval(get_config('system', 'activitypub_test')) || intval(get_pconfig($sender['channel_id'], 'system', 'activitypub_test'))) {
-            logger('test mode - delivery disabled');
-            return false;
-        }
-
-        $hash = random_string();
-
-        logger('queue: ' . $hash . ' ' . $dest_url, LOGGER_DEBUG);
-        Queue::insert([
-            'hash' => $hash,
-            'account_id' => $sender['channel_account_id'],
-            'channel_id' => $sender['channel_id'],
-            'driver' => 'activitypub',
-            'posturl' => $dest_url,
-            'notify' => '',
-            'msg' => $msg
-        ]);
-
-        if ($message_id && (!get_config('system', 'disable_dreport'))) {
-            q(
-                "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue, dreport_log ) values ( '%s','%s','%s','%s','%s','%s','%s','%s' ) ",
-                dbesc($message_id),
-                dbesc($dest_url),
-                dbesc($dest_url),
-                dbesc('queued'),
-                dbesc(datetime_convert()),
-                dbesc($sender['channel_hash']),
-                dbesc($hash),
-                dbesc(EMPTY_STR)
-            );
-        }
-
-        return $hash;
-    }
-
-
-    public static function permissions_update(&$x)
-    {
-
-        if ($x['recipient']['xchan_network'] !== 'activitypub') {
-            return;
-        }
-        self::discover($x['recipient']['xchan_hash'], true);
-        $x['success'] = true;
-    }
-
-
-    public static function permissions_create(&$x)
-    {
-
-        // send a follow activity to the followee's inbox
-
-        if ($x['recipient']['xchan_network'] !== 'activitypub') {
-            return;
-        }
-
-        $p = Activity::encode_person($x['sender'], false);
-        if (!$p) {
-            return;
-        }
-
-        $orig_follow = get_abconfig($x['sender']['channel_id'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_id');
-        $orig_follow_type = get_abconfig($x['sender']['channel_id'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_type');
-
-        $msg = array_merge(
-            ['@context' => [
-            ACTIVITYSTREAMS_JSONLD_REV,
-            'https://w3id.org/security/v1',
-            Activity::ap_schema()
-            ]],
-            [
-                'id' => z_root() . '/follow/' . $x['recipient']['abook_id'] . (($orig_follow) ? '/' . md5($orig_follow) : EMPTY_STR),
-                'type' => (($orig_follow_type) ? $orig_follow_type : 'Follow'),
-                'actor' => $p,
-                'object' => $x['recipient']['xchan_hash'],
-                'to' => [$x['recipient']['xchan_hash']],
-                'cc' => []
-            ]
-        );
-
-        // for Group actors, send both a Follow and a Join because some platforms only support one and there's
-        // no way of discovering/knowing in advance which type they support
-
-        $join_msg = null;
-
-        if (intval($x['recipient']['xchan_type']) === XCHAN_TYPE_GROUP) {
-            $join_msg = $msg;
-            $join_msg['type'] = 'Join';
-            $join_msg['signature'] = LDSignatures::sign($join_msg, $x['sender']);
-            $jmsg2 = json_encode($join_msg, JSON_UNESCAPED_SLASHES);
-        }
-
-        $msg['signature'] = LDSignatures::sign($msg, $x['sender']);
-        $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES);
-
-        $h = q(
-            "select * from hubloc where hubloc_hash = '%s' limit 1",
-            dbesc($x['recipient']['xchan_hash'])
-        );
-
-        if ($h) {
-            $qi = self::queue_message($jmsg, $x['sender'], $h[0]);
-            if ($qi) {
-                $x['deliveries'] = $qi;
-            }
-            if ($join_msg) {
-                $qi = self::queue_message($jmsg2, $x['sender'], $h[0]);
-                if ($qi) {
-                    $x['deliveries'] = $qi;
-                }
-            }
-        }
-
-        $x['success'] = true;
-    }
-
-
-    public static function permissions_accept(&$x)
-    {
-
-        // send an accept activity to the followee's inbox
-
-        if ($x['recipient']['xchan_network'] !== 'activitypub') {
-            return;
-        }
-
-        // we currently are not handling send of reject follow activities; this is permitted by protocol
-
-        $accept = get_abconfig($x['recipient']['abook_channel'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_id');
-        $follow_type = get_abconfig($x['recipient']['abook_channel'], $x['recipient']['xchan_hash'], 'activitypub', 'their_follow_type');
-        if (!$accept) {
-            return;
-        }
-
-        $p = Activity::encode_person($x['sender'], false);
-        if (!$p) {
-            return;
-        }
-
-        $msg = array_merge(
-            ['@context' => [
-            ACTIVITYSTREAMS_JSONLD_REV,
-            'https://w3id.org/security/v1',
-            Activity::ap_schema()
-            ]],
-            [
-                'id' => z_root() . '/follow/' . $x['recipient']['abook_id'] . '/' . md5($accept),
-                'type' => 'Accept',
-                'actor' => $p,
-                'object' => [
-                    'type' => (($follow_type) ? $follow_type : 'Follow'),
-                    'id' => $accept,
-                    'actor' => $x['recipient']['xchan_hash'],
-                    'object' => z_root() . '/channel/' . $x['sender']['channel_address']
-                ],
-                'to' => [$x['recipient']['xchan_hash']],
-                'cc' => []
-            ]
-        );
-
-        $msg['signature'] = LDSignatures::sign($msg, $x['sender']);
-
-        $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES);
-
-        $h = q(
-            "select * from hubloc where hubloc_hash = '%s' limit 1",
-            dbesc($x['recipient']['xchan_hash'])
-        );
-
-        if ($h) {
-            $qi = self::queue_message($jmsg, $x['sender'], $h[0]);
-            if ($qi) {
-                $x['deliveries'] = $qi;
-            }
-        }
-
-        $x['success'] = true;
-    }
-
-    public static function contact_remove($channel_id, $abook)
-    {
-
-        $recip = q(
-            "select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d",
-            intval($abook['abook_id'])
-        );
-
-        if ((!$recip) || $recip[0]['xchan_network'] !== 'activitypub') {
-            return;
-        }
-
-        $channel = Channel::from_id($recip[0]['abook_channel']);
-        if (!$channel) {
-            return;
-        }
-
-        $p = Activity::encode_person($channel, true, true);
-        if (!$p) {
-            return;
-        }
-
-        // send an unfollow activity to the followee's inbox
-
-        $orig_activity = get_abconfig($recip[0]['abook_channel'], $recip[0]['xchan_hash'], 'activitypub', 'follow_id');
-
-        if ($orig_activity && $recip[0]['abook_pending']) {
-            // was never approved
-
-            $msg = array_merge(
-                ['@context' => [
-                ACTIVITYSTREAMS_JSONLD_REV,
-                'https://w3id.org/security/v1',
-                Activity::ap_schema()
-                ]],
-                [
-                    'id' => z_root() . '/follow/' . $recip[0]['abook_id'] . '/' . md5($orig_activity) . '?operation=reject',
-                    'type' => 'Reject',
-                    'actor' => $p,
-                    'object' => [
-                        'type' => 'Follow',
-                        'id' => $orig_activity,
-                        'actor' => $recip[0]['xchan_hash'],
-                        'object' => $p
-                    ],
-                    'to' => [$recip[0]['xchan_hash']],
-                    'cc' => []
-                ]
-            );
-            del_abconfig($recip[0]['abook_channel'], $recip[0]['xchan_hash'], 'activitypub', 'follow_id');
-        } else {
-            // send an unfollow
-
-            $msg = array_merge(
-                ['@context' => [
-                ACTIVITYSTREAMS_JSONLD_REV,
-                'https://w3id.org/security/v1',
-                Activity::ap_schema()
-                ]],
-                [
-                    'id' => z_root() . '/follow/' . $recip[0]['abook_id'] . (($orig_activity) ? '/' . md5($orig_activity) : EMPTY_STR) . '?operation=unfollow',
-                    'type' => 'Undo',
-                    'actor' => $p,
-                    'object' => [
-                        'id' => z_root() . '/follow/' . $recip[0]['abook_id'] . (($orig_activity) ? '/' . md5($orig_activity) : EMPTY_STR),
-                        'type' => 'Follow',
-                        'actor' => $p,
-                        'object' => $recip[0]['xchan_hash']
-                    ],
-                    'to' => [$recip[0]['xchan_hash']],
-                    'cc' => []
-                ]
-            );
-        }
-
-        $msg['signature'] = LDSignatures::sign($msg, $channel);
-
-        $jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES);
-
-        $h = q(
-            "select * from hubloc where hubloc_hash = '%s' limit 1",
-            dbesc($recip[0]['xchan_hash'])
-        );
-
-        if ($h) {
-            $qi = self::queue_message($jmsg, $channel, $h[0]);
-            if ($qi) {
-                Run::Summon(['Deliver', $qi]);
-            }
-        }
-    }
-
-    public static function discover($apurl, $force = false)
-    {
-
-        $person_obj = null;
-        $ap = Activity::fetch($apurl);
-        if ($ap) {
-            $AS = new ActivityStreams($ap);
-            if ($AS->is_valid()) {
-                if (ActivityStreams::is_an_actor($AS->type)) {
-                    $person_obj = $AS->data;
-                } elseif ($AS->obj && ActivityStreams::is_an_actor($AS->obj['type'])) {
-                    $person_obj = $AS->obj;
-                }
-            }
-        }
-
-        if (isset($person_obj)) {
-            Activity::actor_store($person_obj['id'], $person_obj, $force);
-            return $person_obj['id'];
-        }
-        return false;
-    }
-
-    public static function move($src, $dst)
-    {
-
-        if (!($src && $dst)) {
-            return;
-        }
-
-        if ($src && !is_array($src)) {
-            $src = Activity::fetch($src);
-            if (is_array($src)) {
-                $src_xchan = $src['id'];
-            }
-        }
-
-        $approvals = null;
-
-        if ($dst && !is_array($dst)) {
-            $dst = Activity::fetch($dst);
-            if (is_array($dst)) {
-                $dst_xchan = $dst['id'];
-                if (array_key_exists('alsoKnownAs', $dst)) {
-                    if (!is_array($dst['alsoKnownAs'])) {
-                        $dst['alsoKnownAs'] = [$dst['alsoKnownAs']];
-                    }
-                    $approvals = $dst['alsoKnownAs'];
-                }
-            }
-        }
-
-        if (!($src_xchan && $dst_xchan)) {
-            return;
-        }
-
-        if ($approvals) {
-            foreach ($approvals as $approval) {
-                if ($approval === $src_xchan) {
-                    $abooks = q(
-                        "select abook_channel from abook where abook_xchan = '%s'",
-                        dbesc($src_xchan)
-                    );
-                    if ($abooks) {
-                        foreach ($abooks as $abook) {
-                            // check to see if we already performed this action
-                            $x = q(
-                                "select * from abook where abook_xchan = '%s' and abook_channel = %d",
-                                dbesc($dst_xchan),
-                                intval($abook['abook_channel'])
-                            );
-                            if ($x) {
-                                continue;
-                            }
-                            // update the local abook
-                            q(
-                                "update abconfig set xchan = '%s' where chan = %d and xchan = '%s'",
-                                dbesc($dst_xchan),
-                                intval($abook['abook_channel']),
-                                dbesc($src_xchan)
-                            );
-                            q(
-                                "update pgrp_member set xchan = '%s' where uid = %d and xchan = '%s'",
-                                dbesc($dst_xchan),
-                                intval($abook['abook_channel']),
-                                dbesc($src_xchan)
-                            );
-                            $r = q(
-                                "update abook set abook_xchan = '%s' where abook_xchan = '%s' and abook_channel = %d ",
-                                dbesc($dst_xchan),
-                                dbesc($src_xchan),
-                                intval($abook['abook_channel'])
-                            );
-
-                            $r = q(
-                                "SELECT abook.*, xchan.*
-								FROM abook left join xchan on abook_xchan = xchan_hash
-								WHERE abook_channel = %d and abook_id = %d LIMIT 1",
-                                intval(abook['abook_channel']),
-                                intval($dst_xchan)
-                            );
-                            if ($r) {
-                                $clone = array_shift($r);
-                                unset($clone['abook_id']);
-                                unset($clone['abook_account']);
-                                unset($clone['abook_channel']);
-                                $abconfig = load_abconfig($abook['abook_channel'], $clone['abook_xchan']);
-                                if ($abconfig) {
-                                    $clone['abconfig'] = $abconfig;
-                                }
-                                Libsync::build_sync_packet($abook['abook_channel'], ['abook' => [$clone]]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
deleted file mode 100644
index edfb50abf..000000000
--- a/Zotlabs/Lib/ActivityStreams.php
+++ /dev/null
@@ -1,502 +0,0 @@
-raw = $string;
-        $this->hub = $hub;
-
-        if (is_array($string)) {
-            $this->data = $string;
-            $this->raw = json_encode($string, JSON_UNESCAPED_SLASHES);
-        } else {
-            $this->data = json_decode($string, true);
-        }
-
-        if ($this->data) {
-            // verify and unpack JSalmon signature if present
-            // This will only be the case for Zot6 packets
-
-            if (is_array($this->data) && array_key_exists('signed', $this->data)) {
-                $ret = JSalmon::verify($this->data);
-                $tmp = JSalmon::unpack($this->data['data']);
-                if ($ret && $ret['success']) {
-                    if ($ret['signer']) {
-                        logger('Unpacked: ' . json_encode($tmp, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT), LOGGER_DATA, LOG_DEBUG);
-                        $saved = json_encode($this->data, JSON_UNESCAPED_SLASHES);
-                        $this->data = $tmp;
-                        $this->meta['signer'] = $ret['signer'];
-                        $this->meta['signed_data'] = $saved;
-                        if ($ret['hubloc']) {
-                            $this->meta['hubloc'] = $ret['hubloc'];
-                        }
-                    }
-                }
-            }
-
-            // This indicates only that we have sucessfully decoded JSON.
-            $this->valid = true;
-
-            // Special handling for Mastodon "delete actor" activities which will often fail to verify
-            // because the key cannot be fetched. We will catch this condition elsewhere.
-
-            if (array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) {
-                if ($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) {
-                    $this->deleted = $this->data['actor'];
-                    $this->valid = false;
-                }
-            }
-        }
-
-        // Attempt to assemble an Activity from what we were given.
-
-        if ($this->is_valid()) {
-            $this->id = $this->get_property_obj('id');
-            $this->type = $this->get_primary_type();
-            $this->actor = $this->get_actor('actor', '', '');
-            $this->obj = $this->get_compound_property('object');
-            $this->tgt = $this->get_compound_property('target');
-            $this->origin = $this->get_compound_property('origin');
-            $this->recips = $this->collect_recips();
-            $this->replyto = $this->get_property_obj('replyTo');
-
-            $this->ldsig = $this->get_compound_property('signature');
-            if ($this->ldsig) {
-                $this->signer = $this->get_compound_property('creator', $this->ldsig);
-                if (
-                    $this->signer && is_array($this->signer) && array_key_exists('publicKey', $this->signer)
-                    && is_array($this->signer['publicKey']) && $this->signer['publicKey']['publicKeyPem']
-                ) {
-                    $this->sigok = LDSignatures::verify($this->data, $this->signer['publicKey']['publicKeyPem']);
-                }
-            }
-
-            // Implied create activity required by C2S specification if no object is present
-
-            if (!$this->obj) {
-                if (!$client) {
-                    $this->implied_create = true;
-                }
-                $this->obj = $this->data;
-                $this->type = 'Create';
-                if (!$this->actor) {
-                    $this->actor = $this->get_actor('attributedTo', $this->obj);
-                }
-            }
-
-            // fetch recursive or embedded activities
-
-            if ($this->obj && is_array($this->obj) && array_key_exists('object', $this->obj)) {
-                $this->obj['object'] = $this->get_compound_property($this->obj['object']);
-            }
-
-            // Enumerate and store actors in referenced objects
-
-            if ($this->obj && is_array($this->obj) && isset($this->obj['actor'])) {
-                $this->obj['actor'] = $this->get_actor('actor', $this->obj);
-            }
-            if ($this->tgt && is_array($this->tgt) && isset($this->tgt['actor'])) {
-                $this->tgt['actor'] = $this->get_actor('actor', $this->tgt);
-            }
-
-            // Determine if this is a followup or response activity
-
-            $this->parent_id = $this->get_property_obj('inReplyTo');
-
-            if ((!$this->parent_id) && is_array($this->obj)) {
-                $this->parent_id = $this->obj['inReplyTo'];
-            }
-            if ((!$this->parent_id) && is_array($this->obj)) {
-                $this->parent_id = $this->obj['id'];
-            }
-        }
-    }
-
-    /**
-     * @brief Return if instantiated ActivityStream is valid.
-     *
-     * @return bool Return true if the JSON string could be decoded.
-     */
-
-    public function is_valid()
-    {
-        return $this->valid;
-    }
-
-    public function set_recips($arr)
-    {
-        $this->saved_recips = $arr;
-    }
-
-    /**
-     * @brief Collects all recipients.
-     *
-     * @param string $base
-     * @param string $namespace (optional) default empty
-     * @return array
-     */
-    public function collect_recips($base = '', $namespace = '')
-    {
-        $x = [];
-
-        $fields = ['to', 'cc', 'bto', 'bcc', 'audience'];
-        foreach ($fields as $f) {
-            // don't expand these yet
-            $y = $this->get_property_obj($f, $base, $namespace);
-            if ($y) {
-                if (!is_array($this->raw_recips)) {
-                    $this->raw_recips = [];
-                }
-                if (!is_array($y)) {
-                    $y = [$y];
-                }
-                $this->raw_recips[$f] = $y;
-                $x = array_merge($x, $y);
-            }
-        }
-
-// not yet ready for prime time
-//      $x = $this->expand($x,$base,$namespace);
-        return $x;
-    }
-
-    public function expand($arr, $base = '', $namespace = '')
-    {
-        $ret = [];
-
-        // right now use a hardwired recursion depth of 5
-
-        for ($z = 0; $z < 5; $z++) {
-            if (is_array($arr) && $arr) {
-                foreach ($arr as $a) {
-                    if (is_array($a)) {
-                        $ret[] = $a;
-                    } else {
-                        $x = $this->get_compound_property($a, $base, $namespace);
-                        if ($x) {
-                            $ret = array_merge($ret, $x);
-                        }
-                    }
-                }
-            }
-        }
-
-        /// @fixme de-duplicate
-
-        return $ret;
-    }
-
-    /**
-     * @brief
-     *
-     * @param array $base
-     * @param string $namespace if not set return empty string
-     * @return string|NULL
-     */
-
-    public function get_namespace($base, $namespace)
-    {
-
-        if (!$namespace) {
-            return EMPTY_STR;
-        }
-
-        $key = null;
-
-        foreach ([$this->data, $base] as $b) {
-            if (!$b) {
-                continue;
-            }
-
-            if (array_key_exists('@context', $b)) {
-                if (is_array($b['@context'])) {
-                    foreach ($b['@context'] as $ns) {
-                        if (is_array($ns)) {
-                            foreach ($ns as $k => $v) {
-                                if ($namespace === $v) {
-                                    $key = $k;
-                                }
-                            }
-                        } else {
-                            if ($namespace === $ns) {
-                                $key = '';
-                            }
-                        }
-                    }
-                } else {
-                    if ($namespace === $b['@context']) {
-                        $key = '';
-                    }
-                }
-            }
-        }
-
-        return $key;
-    }
-
-    /**
-     * @brief
-     *
-     * @param string $property
-     * @param array $base (optional)
-     * @param string $namespace (optional) default empty
-     * @return NULL|mixed
-     */
-
-    public function get_property_obj($property, $base = '', $namespace = '')
-    {
-        $prefix = $this->get_namespace($base, $namespace);
-        if ($prefix === null) {
-            return null;
-        }
-
-        $base = (($base) ? $base : $this->data);
-        $propname = (($prefix) ? $prefix . ':' : '') . $property;
-
-        if (!is_array($base)) {
-            btlogger('not an array: ' . print_r($base, true));
-            return null;
-        }
-
-        return ((array_key_exists($propname, $base)) ? $base[$propname] : null);
-    }
-
-
-    /**
-     * @brief Fetches a property from an URL.
-     *
-     * @param string $url
-     * @param array $channel (signing channel, default system channel)
-     * @return NULL|mixed
-     */
-
-    public function fetch_property($url, $channel = null, $hub = null)
-    {
-        $x = Activity::fetch($url, $channel, $hub);
-        if ($x === null && strpos($url, '/channel/')) {
-            // look for other nomadic channels which might be alive
-            $zf = Zotfinger::exec($url, $channel);
-
-            $url = $zf['signature']['signer'];
-            $x = Activity::fetch($url, $channel);
-        }
-
-        return $x;
-    }
-
-    /**
-     * @brief given a type, determine if this object represents an actor
-	 *
-	 * If $type is an array, recurse through each element and return true if any
-	 * of the elements are a known actor type
-	 *
-	 * @param string|array $type
-	 * @return boolean
-	 */
-
-    public static function is_an_actor($type)
-    {
-        if (!$type) {
-            return false;
-        }
-		if (is_array($type)) {
-			foreach ($type as $x) {
-				if (self::is_an_actor($x)) {
-					return true;
-				}
-			}
-			return false;
-		}
-        return (in_array($type, ['Application', 'Group', 'Organization', 'Person', 'Service']));
-    }
-
-    public static function is_response_activity($s)
-    {
-        if (!$s) {
-            return false;
-        }
-        return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param string $property
-     * @param array $base
-     * @param string $namespace (optional) default empty
-     * @return NULL|mixed
-     */
-
-    public function get_actor($property, $base = '', $namespace = '')
-    {
-        $x = $this->get_property_obj($property, $base, $namespace);
-        if (self::is_url($x)) {
-            $y = Activity::get_cached_actor($x);
-            if ($y) {
-                return $y;
-            }
-        }
-
-        $actor = $this->get_compound_property($property, $base, $namespace, true);
-        if (is_array($actor) && self::is_an_actor($actor['type'])) {
-            if (array_key_exists('id', $actor) && (!array_key_exists('inbox', $actor))) {
-                $actor = $this->fetch_property($actor['id']);
-            }
-            return $actor;
-        }
-        return null;
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param string $property
-     * @param array $base
-     * @param string $namespace (optional) default empty
-     * @param bool $first (optional) default false, if true and result is a sequential array return only the first element
-     * @return NULL|mixed
-     */
-
-    public function get_compound_property($property, $base = '', $namespace = '', $first = false)
-    {
-        $x = $this->get_property_obj($property, $base, $namespace);
-        if (self::is_url($x)) {
-            $y = $this->fetch_property($x);
-            if (is_array($y)) {
-                $x = $y;
-            }
-        }
-
-        // verify and unpack JSalmon signature if present
-        // This may be present in Zot6 packets
-
-        if (is_array($x) && array_key_exists('signed', $x)) {
-            $ret = JSalmon::verify($x);
-            $tmp = JSalmon::unpack($x['data']);
-            if ($ret && $ret['success']) {
-                if ($ret['signer']) {
-                    logger('Unpacked: ' . json_encode($tmp, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT), LOGGER_DATA, LOG_DEBUG);
-                    $saved = json_encode($x, JSON_UNESCAPED_SLASHES);
-                    $x = $tmp;
-                    $x['meta']['signer'] = $ret['signer'];
-                    $x['meta']['signed_data'] = $saved;
-                    if ($ret['hubloc']) {
-                        $x['meta']['hubloc'] = $ret['hubloc'];
-                    }
-                }
-            }
-        }
-        if ($first && is_array($x) && array_key_exists(0, $x)) {
-            return $x[0];
-        }
-
-        return $x;
-    }
-
-    /**
-     * @brief Check if string starts with http.
-     *
-     * @param string $url
-     * @return bool
-     */
-
-    public static function is_url($url)
-    {
-        if (($url) && (!is_array($url)) && ((strpos($url, 'http') === 0) || (strpos($url, 'x-zot') === 0) || (strpos($url, 'bear') === 0))) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @brief Gets the type property.
-     *
-     * @param array $base
-     * @param string $namespace (optional) default empty
-     * @return NULL|mixed
-     */
-
-    public function get_primary_type($base = '', $namespace = '')
-    {
-        if (!$base) {
-            $base = $this->data;
-        }
-        $x = $this->get_property_obj('type', $base, $namespace);
-        if (is_array($x)) {
-            foreach ($x as $y) {
-                if (strpos($y, ':') === false) {
-                    return $y;
-                }
-            }
-        }
-
-        return $x;
-    }
-
-    public function debug()
-    {
-        $x = var_export($this, true);
-        return $x;
-    }
-
-
-    public static function is_as_request()
-    {
-
-        $x = getBestSupportedMimeType([
-            'application/ld+json;profile="https://www.w3.org/ns/activitystreams"',
-            'application/activity+json',
-            'application/ld+json;profile="http://www.w3.org/ns/activitystreams"',
-            'application/ld+json', // required for Friendica ~2021-09, can possibly be removed after next release of that project
-            'application/x-zot-activity+json'
-        ]);
-
-        return (($x) ? true : false);
-    }
-}
diff --git a/Zotlabs/Lib/Addon.php b/Zotlabs/Lib/Addon.php
deleted file mode 100644
index aacbd4472..000000000
--- a/Zotlabs/Lib/Addon.php
+++ /dev/null
@@ -1,370 +0,0 @@
-getMessage());
-            }
-        }
-    }
-
-    /**
-     * @brief Uninstalls an addon.
-     *
-     * @param string $addon name of the addon
-     * @return bool
-     */
-    public static  function uninstall($addon)
-    {
-
-        self::unload($addon);
-
-        if (! file_exists('addon/' . $addon . '/' . $addon . '.php')) {
-            q(
-                "DELETE FROM addon WHERE aname = '%s' ",
-                dbesc($addon)
-            );
-            return false;
-        }
-
-        logger("Addons: uninstalling " . $addon);
-        //$t = @filemtime('addon/' . $addon . '/' . $addon . '.php');
-        @include_once('addon/' . $addon . '/' . $addon . '.php');
-        if (function_exists($addon . '_uninstall')) {
-            $func = $addon . '_uninstall';
-            try {
-                $func();
-            } catch (Exception $e) {
-                self::ErrorHandler($addon, "Unable to uninstall.", "Unable to run _uninstall : ".$e->getMessage());
-            }
-        }
-
-        q(
-            "DELETE FROM addon WHERE aname = '%s' ",
-            dbesc($addon)
-        );
-    }
-
-    /**
-     * @brief Installs an addon.
-     *
-     * This function is called once to install the addon (either from the cli or via
-     * the web admin). This will also call load_plugin() once.
-     *
-     * @param string $addon name of the addon
-     * @return bool
-     */
-    public static function install($addon)
-    {
-        if (! file_exists('addon/' . $addon . '/' . $addon . '.php')) {
-            return false;
-        }
-
-        logger("Addons: installing " . $addon);
-        $t = @filemtime('addon/' . $addon . '/' . $addon . '.php');
-        @include_once('addon/' . $addon . '/' . $addon . '.php');
-        if (function_exists($addon . '_install')) {
-            $func = $addon . '_install';
-            try {
-                $func();
-            } catch (Exception $e) {
-                self::ErrorHandler($addon, "Install failed.", "Install failed : ".$e->getMessage());
-                return;
-            }
-        }
-
-        $addon_admin = (function_exists($addon . '_plugin_admin') ? 1 : 0);
-
-        $d = q(
-            "select * from addon where aname = '%s' limit 1",
-            dbesc($addon)
-        );
-        if (! $d) {
-            q(
-                "INSERT INTO addon (aname, installed, tstamp, plugin_admin) VALUES ( '%s', 1, %d , %d ) ",
-                dbesc($addon),
-                intval($t),
-                $addon_admin
-            );
-        }
-
-        self::load($addon);
-    }
-
-    /**
-     * @brief loads an addon by it's name.
-     *
-     * @param string $addon name of the addon
-     * @return bool
-     */
-    public static function load($addon)
-    {
-        // silently fail if plugin was removed
-        if (! file_exists('addon/' . $addon . '/' . $addon . '.php')) {
-            return false;
-        }
-
-        logger("Addons: loading " . $addon, LOGGER_DEBUG);
-        //$t = @filemtime('addon/' . $addon . '/' . $addon . '.php');
-        @include_once('addon/' . $addon . '/' . $addon . '.php');
-        if (function_exists($addon . '_load')) {
-            $func = $addon . '_load';
-            try {
-                $func();
-            } catch (Exception $e) {
-                self::ErrorHandler($addon, "Unable to load.", "FAILED loading : ".$e->getMessage(), true);
-                return;
-            }
-
-            // we can add the following with the previous SQL
-            // once most site tables have been updated.
-            // This way the system won't fall over dead during the update.
-
-            if (file_exists('addon/' . $addon . '/.hidden')) {
-                q(
-                    "update addon set hidden = 1 where name = '%s'",
-                    dbesc($addon)
-                );
-            }
-            return true;
-        } else {
-            logger("Addons: FAILED loading " . $addon . " (missing _load function)");
-            return false;
-        }
-    }
-
-    /**
-     * @brief Check if addon is installed.
-     *
-     * @param string $name
-     * @return bool
-     */
-
-    public static function is_installed($name)
-    {
-        $r = q(
-            "select aname from addon where aname = '%s' and installed = 1 limit 1",
-            dbesc($name)
-        );
-        if ($r) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * @brief Reload all updated plugins.
-     */
-    public static  function reload_all()
-    {
-        $addons = get_config('system', 'addon');
-        if (strlen($addons)) {
-            $r = q("SELECT * FROM addon WHERE installed = 1");
-            if (count($r)) {
-                $installed = $r;
-            } else {
-                $installed = [];
-            }
-
-            $parr = explode(',', $addons);
-
-            if (count($parr)) {
-                foreach ($parr as $pl) {
-                    $pl = trim($pl);
-
-                    $fname = 'addon/' . $pl . '/' . $pl . '.php';
-
-                    if (file_exists($fname)) {
-                        $t = @filemtime($fname);
-                        foreach ($installed as $i) {
-                            if (($i['aname'] == $pl) && ($i['tstamp'] != $t)) {
-                                logger('Reloading plugin: ' . $i['aname']);
-                                @include_once($fname);
-
-                                if (function_exists($pl . '_unload')) {
-                                    $func = $pl . '_unload';
-                                    try {
-                                            $func();
-                                    } catch (Exception $e) {
-                                        self::ErrorHandler($addon, "", "UNLOAD FAILED (uninstalling) : ".$e->getMessage(), true);
-                                                                            continue;
-                                    }
-                                }
-                                if (function_exists($pl . '_load')) {
-                                    $func = $pl . '_load';
-                                    try {
-                                            $func();
-                                    } catch (Exception $e) {
-                                        self::ErrorHandler($addon, "", "LOAD FAILED (uninstalling): ".$e->getMessage(), true);
-                                                                            continue;
-                                    }
-                                }
-                                q(
-                                    "UPDATE addon SET tstamp = %d WHERE id = %d",
-                                    intval($t),
-                                    intval($i['id'])
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    public static function list_installed()
-    {
-
-        $r = q("select * from addon where installed = 1 order by aname asc");
-        return(($r) ? ids_to_array($r, 'aname') : []);
-    }
-
-
-    /**
-     * @brief Get a list of non hidden addons.
-     *
-     * @return array
-     */
-    public static function list_visible()
-    {
-        
-        $r = q("select * from addon where hidden = 0 order by aname asc");
-        $x = (($r) ? ids_to_array($r, 'aname') : []);
-        $y = [];
-        if ($x) {
-            foreach ($x as $xv) {
-                if (is_dir('addon/' . $xv)) {
-                    $y[] = $xv;
-                }
-            }
-        }
-        return $y;
-    }
-
-    /**
-     * @brief Parse plugin comment in search of plugin infos.
-     *
-     * like
-     * \code
-     *   * Name: Plugin
-     *   * Description: A plugin which plugs in
-     *   * Version: 1.2.3
-     *   * Author: John 
-     *   * Author: Jane 
-     *   *
-     *\endcode
-     * @param string $plugin the name of the plugin
-     * @return array with the plugin information
-     */
-    public static function get_info($plugin)
-    {
-
-        $info =  null;
-        if (is_file("addon/$plugin/$plugin.yml")) {
-            $info = Infocon::from_file("addon/$plugin/$plugin.yml");
-        }
-        elseif (is_file("addon/$plugin/$plugin.php")) {
-            $info = Infocon::from_c_comment("addon/$plugin/$plugin.php");
-        }
-        return $info ? $info : [ 'name' => $plugin ] ;
-    }
-
-        
-    public static function check_versions($info)
-    {
-
-        if (! is_array($info)) {
-            return true;
-        }
-
-        if (array_key_exists('minversion', $info) && $info['minversion']) {
-            if (! version_compare(STD_VERSION, trim($info['minversion']), '>=')) {
-                logger('minversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING);
-                return false;
-            }
-        }
-        if (array_key_exists('maxversion', $info) && $info['maxversion']) {
-            if (! version_compare(STD_VERSION, trim($info['maxversion']), '<')) {
-                logger('maxversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING);
-                return false;
-            }
-        }
-        if (array_key_exists('minphpversion', $info) && $info['minphpversion']) {
-            if (! version_compare(PHP_VERSION, trim($info['minphpversion']), '>=')) {
-                logger('minphpversion limit: ' . $info['name'], LOGGER_NORMAL, LOG_WARNING);
-                return false;
-            }
-        }
-
-        if (array_key_exists('requires', $info)) {
-            $arr = explode(',', $info['requires']);
-            $found = true;
-            if ($arr) {
-                foreach ($arr as $test) {
-                    $test = trim($test);
-                    if (! $test) {
-                        continue;
-                    }
-                    if (strpos($test, '.')) {
-                        $conf = explode('.', $test);
-                        if (get_config(trim($conf[0]), trim($conf[1]))) {
-                            return true;
-                        } else {
-                            return false;
-                        }
-                    }
-                    if (! in_array($test, Addon::list_installed())) {
-                        $found = false;
-                    }
-                }
-            }
-            if (! $found) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/Zotlabs/Lib/Api_router.php b/Zotlabs/Lib/Api_router.php
deleted file mode 100644
index 4c238a49d..000000000
--- a/Zotlabs/Lib/Api_router.php
+++ /dev/null
@@ -1,34 +0,0 @@
- $fn, 'auth' => $auth_required];
-    }
-
-    public static function find($path)
-    {
-        if (array_key_exists($path, self::$routes)) {
-            return self::$routes[$path];
-        }
-
-        $with_params = dirname($path) . '/[id]';
-
-        if (array_key_exists($with_params, self::$routes)) {
-            return self::$routes[$with_params];
-        }
-
-        return null;
-    }
-
-    public static function dbg()
-    {
-        return self::$routes;
-    }
-}
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
deleted file mode 100644
index 1443afe93..000000000
--- a/Zotlabs/Lib/Apps.php
+++ /dev/null
@@ -1,1404 +0,0 @@
- $v) {
-            if (strpos($v, 'http') === 0) {
-                if (!(local_channel() && strpos($v, z_root()) === 0)) {
-                    $ret[$k] = zid($v);
-                }
-            }
-        }
-
-        if (array_key_exists('desc', $ret)) {
-            $ret['desc'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['desc']);
-        }
-        if (array_key_exists('target', $ret)) {
-            $ret['target'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['target']);
-        }
-        if (array_key_exists('version', $ret)) {
-            $ret['version'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['version']);
-        }
-        if (array_key_exists('categories', $ret)) {
-            $ret['categories'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $ret['categories']);
-        }
-        if (array_key_exists('requires', $ret)) {
-            $requires = explode(',', $ret['requires']);
-            foreach ($requires as $require) {
-                $require = trim(strtolower($require));
-                $config = false;
-
-                if (substr($require, 0, 7) == 'config:') {
-                    $config = true;
-                    $require = ltrim($require, 'config:');
-                    $require = explode('=', $require);
-                }
-
-                switch ($require) {
-                    case 'nologin':
-                        if (local_channel()) {
-                            unset($ret);
-                        }
-                        break;
-                    case 'admin':
-                        if (!is_site_admin()) {
-                            unset($ret);
-                        }
-                        break;
-                    case 'local_channel':
-                        if (!local_channel()) {
-                            unset($ret);
-                        }
-                        break;
-                    case 'public_profile':
-                        if (!Channel::is_public_profile()) {
-                            unset($ret);
-                        }
-                        break;
-                    case 'public_stream':
-                        if (!can_view_public_stream()) {
-                            unset($ret);
-                        }
-                        break;
-                    case 'custom_role':
-                        if (get_pconfig(local_channel(), 'system', 'permissions_role') !== 'custom') {
-                            unset($ret);
-                        }
-                        break;
-                    case 'observer':
-                        if (!$observer) {
-                            unset($ret);
-                        }
-                        break;
-                    default:
-                        if ($config) {
-                            $unset = ((get_config('system', $require[0]) == $require[1]) ? false : true);
-                        } else {
-                            $unset = ((local_channel() && Features::enabled(local_channel(), $require)) ? false : true);
-                        }
-                        if ($unset) {
-                            unset($ret);
-                        }
-                        break;
-                }
-            }
-        }
-        if (isset($ret)) {
-            if ($translate) {
-                self::translate_system_apps($ret);
-            }
-            return $ret;
-        }
-        return false;
-    }
-
-
-    public static function translate_system_apps(&$arr)
-    {
-        $apps = array(
-            'Admin' => t('Site Admin'),
-            'Apps' => t('Apps'),
-            'Articles' => t('Articles'),
-            'CalDAV' => t('CalDAV'),
-            'CardDAV' => t('CardDAV'),
-            'Cards' => t('Cards'),
-            'Calendar' => t('Calendar'),
-            'Categories' => t('Categories'),
-            'Channel Home' => t('Channel Home'),
-            'Channel Manager' => t('Channel Manager'),
-            'Channel Sources' => t('Channel Sources'),
-            'Chat' => t('Chat'),
-            'Chatrooms' => t('Chatrooms'),
-            'Clients' => t('Clients'),
-            'Comment Control' => t('Comment Control'),
-            'Connections' => t('Connections'),
-            'Content Filter' => t('Content Filter'),
-            'Content Import' => t('Content Import'),
-            'Directory' => t('Directory'),
-            'Drafts' => t('Drafts'),
-            'Events' => t('Events'),
-            'Expire Posts' => t('Expire Posts'),
-            'Features' => t('Features'),
-            'Files' => t('Files'),
-            'Followlist' => t('Followlist'),
-            'Friend Zoom' => t('Friend Zoom'),
-            'Future Posting' => t('Future Posting'),
-            'Gallery' => t('Gallery'),
-            'Guest Pass' => t('Guest Pass'),
-            'Help' => t('Help'),
-            'Invite' => t('Invite'),
-            'Language' => t('Language'),
-            'Lists' => t('Lists'),
-            'Login' => t('Login'),
-            'Mail' => t('Mail'),
-            'Markup' => t('Markup'),
-            'Mood' => t('Mood'),
-            'My Chatrooms' => t('My Chatrooms'),
-            'No Comment' => t('No Comment'),
-            'Notes' => t('Notes'),
-            'Notifications' => t('Notifications'),
-            'OAuth Apps Manager' => t('OAuth Apps Manager'),
-            'OAuth2 Apps Manager' => t('OAuth2 Apps Manager'),
-            'Order Apps' => t('Order Apps'),
-            'PDL Editor' => t('PDL Editor'),
-            'Permission Categories' => t('Permission Categories'),
-            'Photos' => t('Photos'),
-            'Photomap' => t('Photomap'),
-            'Poke' => t('Poke'),
-            'Post' => t('Post'),
-            'Premium Channel' => t('Premium Channel'),
-            'Probe' => t('Probe'),
-            'Profile' => t('Profile'),
-            'Profile Photo' => t('Profile Photo'),
-            'Profiles' => t('Profiles'),
-            'Public Stream' => t('Public Stream'),
-            'Random Channel' => t('Random Channel'),
-            'Remote Diagnostics' => t('Remote Diagnostics'),
-            'Report Bug' => t('Report Bug'),
-            'Roles' => t('Roles'),
-            'Search' => t('Search'),
-            'Secrets' => t('Secrets'),
-            'Settings' => t('Settings'),
-            'Sites' => t('Sites'),
-            'Stream' => t('Stream'),
-            'Stream Order' => t('Stream Order'),
-            'Suggest' => t('Suggest'),
-            'Suggest Channels' => t('Suggest Channels'),
-            'Tagadelic' => t('Tagadelic'),
-            'Tasks' => t('Tasks'),
-            'View Bookmarks' => t('View Bookmarks'),
-            'View Profile' => t('View Profile'),
-            'Virtual Lists' => t('Virtual Lists'),
-            'Webpages' => t('Webpages'),
-            'Wiki' => t('Wiki'),
-            'ZotPost' => t('ZotPost'),
-        );
-
-        if (array_key_exists('name', $arr)) {
-            if (array_key_exists($arr['name'], $apps)) {
-                $arr['name'] = $apps[$arr['name']];
-            }
-        } else {
-            for ($x = 0; $x < count($arr); $x++) {
-                if (array_key_exists($arr[$x]['name'], $apps)) {
-                    $arr[$x]['name'] = $apps[$arr[$x]['name']];
-                } else {
-                    // Try to guess by app name if not in list
-                    $arr[$x]['name'] = t(trim($arr[$x]['name']));
-                }
-            }
-        }
-    }
-
-
-    // papp is a portable app
-
-    public static function app_render($papp, $mode = 'view')
-    {
-
-        /**
-         * modes:
-         *    view: normal mode for viewing an app via bbcode from a conversation or page
-         *       provides install/update button if you're logged in locally
-         *    install: like view but does not display app-bin options if they are present
-         *    list: normal mode for viewing an app on the app page
-         *       no buttons are shown
-         *    edit: viewing the app page in editing mode provides a delete button
-         *    nav: render apps for app-bin
-         */
-
-		$channel_id = local_channel();
-		$sys_channel = Channel::is_system($channel_id);
-
-        $installed = false;
-
-        if (!$papp) {
-            return;
-        }
-
-        if (!$papp['photo']) {
-            $papp['photo'] = 'icon:gear';
-        }
-
-        self::translate_system_apps($papp);
-
-        if (isset($papp['plugin']) && trim($papp['plugin']) && (!Addon::is_installed(trim($papp['plugin'])))) {
-            return '';
-        }
-
-        $papp['papp'] = self::papp_encode($papp);
-
-        // This will catch somebody clicking on a system "available" app that hasn't had the path macros replaced
-        // and they are allowed to see the app
-
-
-        if (strpos($papp['url'], '$baseurl') !== false || strpos($papp['url'], '$nick') !== false || strpos($papp['photo'], '$baseurl') !== false || strpos($papp['photo'], '$nick') !== false) {
-            $view_channel = $channel_id;
-            if (!$view_channel) {
-                $sys = Channel::get_system();
-                $view_channel = $sys['channel_id'];
-            }
-            self::app_macros($view_channel, $papp);
-        }
-
-        if (strpos($papp['url'], ',')) {
-            $urls = explode(',', $papp['url']);
-            $papp['url'] = trim($urls[0]);
-            $papp['settings_url'] = trim($urls[1]);
-        }
-
-        if (!strstr($papp['url'], '://')) {
-            $papp['url'] = z_root() . ((strpos($papp['url'], '/') === 0) ? '' : '/') . $papp['url'];
-        }
-
-
-        foreach ($papp as $k => $v) {
-            if (strpos($v, 'http') === 0 && $k != 'papp') {
-                if (!($channel_id && strpos($v, z_root()) === 0)) {
-                    $papp[$k] = zid($v);
-                }
-            }
-            if ($k === 'desc') {
-                $papp['desc'] = str_replace(array('\'', '"'), array(''', '&dquot;'), $papp['desc']);
-            }
-
-            if ($k === 'requires') {
-                $requires = explode(',', $v);
-
-                foreach ($requires as $require) {
-                    $require = trim(strtolower($require));
-                    $config = false;
-
-                    if (substr($require, 0, 7) == 'config:') {
-                        $config = true;
-                        $require = ltrim($require, 'config:');
-                        $require = explode('=', $require);
-                    }
-
-                    switch ($require) {
-                        case 'nologin':
-                            if ($channel_id) {
-                                return '';
-                            }
-                            break;
-                        case 'admin':
-                            if (!(is_site_admin() || $sys_channel)) {
-                                return '';
-                            }
-                            break;
-                        case 'local_channel':
-                            if (!$channel_id) {
-                                return '';
-                            }
-                            break;
-                        case 'public_profile':
-                            if (!Channel::is_public_profile()) {
-                                return '';
-                            }
-                            break;
-                        case 'public_stream':
-                            if (!can_view_public_stream()) {
-                                return '';
-                            }
-                            break;
-                        case 'custom_role':
-                            if (get_pconfig($channel_id, 'system', 'permissions_role') != 'custom') {
-                                return '';
-                            }
-                            break;
-                        case 'observer':
-                            $observer = App::get_observer();
-                            if (!$observer) {
-                                return '';
-                            }
-                            break;
-                        default:
-                            if ($config) {
-                                $unset = ((get_config('system', $require[0]) === $require[1]) ? false : true);
-                            } else {
-                                $unset = (($channel_id && Features::enabled($channnel_id, $require)) ? false : true);
-                            }
-                            if ($unset) {
-                                return '';
-                            }
-                            break;
-                    }
-                }
-            }
-        }
-
-        $hosturl = '';
-
-        if ($channel_id || $sys_channel) {
-            if (self::app_installed(($sys_channel) ? 0 : $channel_id, $papp)) {
-                $installed = true;
-                if ($mode === 'install') {
-                    return '';
-                }
-            }
-            $hosturl = z_root() . '/';
-        } elseif (remote_channel()) {
-            $observer = App::get_observer();
-			if ($observer && in_array($observer['xchan_network'],['nomad','zot6'])) {
-                // some folks might have xchan_url redirected offsite, use the connurl
-                $x = parse_url($observer['xchan_connurl']);
-                if ($x) {
-                    $hosturl = $x['scheme'] . '://' . $x['host'] . '/';
-                }
-            }
-        }
-
-        $install_action = (($installed) ? t('Installed') : t('Install'));
-        $icon = ((strpos($papp['photo'], 'icon:') === 0) ? substr($papp['photo'], 5) : '');
-
-        if ($mode === 'navbar') {
-            return replace_macros(Theme::get_template('app_nav.tpl'), [
-                '$app' => $papp,
-                '$icon' => $icon,
-            ]);
-        }
-
-        if ($mode === 'install') {
-            $papp['embed'] = true;
-        }
-
-        $featured = $pinned = false;
-        if (isset($papp['categories'])) {
-            $featured = ((strpos($papp['categories'], 'nav_featured_app') !== false) ? true : false);
-            $pinned = ((strpos($papp['categories'], 'nav_pinned_app') !== false) ? true : false);
-        }
-
-        return replace_macros(Theme::get_template('app.tpl'), [
-            '$app' => $papp,
-            '$icon' => $icon,
-            '$hosturl' => $hosturl,
-            '$purchase' => ((isset($papp['page']) && $papp['page'] && (!$installed)) ? t('Purchase') : ''),
-            '$installed' => $installed,
-            '$action_label' => (($hosturl && in_array($mode, ['view', 'install'])) ? $install_action : ''),
-            '$edit' => (($channel_id && $installed && $mode === 'edit') ? t('Edit') : ''),
-            '$delete' => (($channel_id && $installed && $mode === 'edit') ? t('Delete') : ''),
-            '$undelete' => (($channel_id && $installed && $mode === 'edit') ? t('Undelete') : ''),
-            '$settings_url' => (($channel_id && $installed && $mode === 'list' && isset($papp['settings_url'])) ? $papp['settings_url'] : ''),
-            '$deleted' => ((isset($papp['deleted'])) ? intval($papp['deleted']) : false),
-            '$feature' => (((isset($papp['embed']) && $papp['embed']) || $mode === 'edit') ? false : true),
-            '$pin' => (((isset($papp['embed']) && $papp['embed']) || $mode === 'edit') ? false : true),
-            '$featured' => $featured,
-            '$pinned' => $pinned,
-            '$navapps' => (($mode === 'nav') ? true : false),
-            '$order' => (($mode === 'nav-order' || $mode === 'nav-order-pinned') ? true : false),
-            '$mode' => $mode,
-            '$add' => t('Add to app-tray'),
-            '$remove' => t('Remove from app-tray'),
-            '$add_nav' => t('Pin to navbar'),
-            '$remove_nav' => t('Unpin from navbar')
-        ]);
-    }
-
-    public static function app_install($uid, $app)
-    {
-
-        if (!is_array($app)) {
-            $r = q(
-                "select * from app where app_name = '%s' and app_channel = 0",
-                dbesc($app)
-            );
-            if (!$r) {
-                return false;
-            }
-
-            $app = self::app_encode($r[0]);
-        }
-
-        $app['uid'] = $uid;
-
-        if (self::app_installed($uid, $app, true)) {
-			// preserve the existing deleted status across app updates
-			if (isset($app['guid'])) {
-				$check = q("select * from app where app_id = '%s' and app_channel = %d",
-					dbesc($app['guid']),
-					intval($uid)
-				);
-				if ($check) {
-					$app['deleted'] = intval($check[0]['app_deleted']);
-				}
-			}
-            $x = self::app_update($app);
-        } else {
-            $x = self::app_store($app);
-        }
-
-        if ($x['success']) {
-            $r = q(
-                "select * from app where app_id = '%s' and app_channel = %d limit 1",
-                dbesc($x['app_id']),
-                intval($uid)
-            );
-            if ($r) {
-                if (($app['uid']) && (!$r[0]['app_system'])) {
-                    if ($app['categories'] && (!$app['term'])) {
-                        $r[0]['term'] = q(
-                            "select * from term where otype = %d and oid = %d",
-                            intval(TERM_OBJ_APP),
-                            intval($r[0]['id'])
-                        );
-                        if (intval($r[0]['app_system'])) {
-                            Libsync::build_sync_packet($uid, array('sysapp' => $r[0]));
-                        } else {
-                            Libsync::build_sync_packet($uid, array('app' => $r[0]));
-                        }
-                    }
-                }
-            }
-            return $x['app_id'];
-        }
-        return false;
-    }
-
-
-    public static function can_delete($uid, $app)
-    {
-		// $uid 0 cannot delete, only archive
-
-        if (!$uid) {
-            return false;
-        }
-
-        $base_apps = self::get_base_apps();
-        if ($base_apps) {
-            foreach ($base_apps as $b) {
-                if ($app['guid'] === hash('whirlpool', $b)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-
-    public static function app_destroy($uid, $app)
-    {
-
-        if ($app['guid']) {
-            $x = q(
-                "select * from app where app_id = '%s' and app_channel = %d limit 1",
-                dbesc($app['guid']),
-                intval($target_uid)
-            );
-            if ($x) {
-                if (!intval($x[0]['app_deleted'])) {
-                    $x[0]['app_deleted'] = 1;
-                    if (self::can_delete($uid, $app)) {
-                        $r = q(
-                            "delete from app where app_id = '%s' and app_channel = %d",
-                            dbesc($app['guid']),
-                            intval($uid)
-                        );
-                        q(
-                            "delete from term where otype = %d and oid = %d",
-                            intval(TERM_OBJ_APP),
-                            intval($x[0]['id'])
-                        );
-                        Hook::call('app_destroy', $x[0]);
-                    } else {
-                        $r = q(
-                            "update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
-                            dbesc($app['guid']),
-                            intval($target_uid)
-                        );
-                    }
-					if ($uid) {
-	                    if (intval($x[0]['app_system'])) {
-    	                    Libsync::build_sync_packet($uid, array('sysapp' => $x));
-        	            } else {
-            	            Libsync::build_sync_packet($uid, array('app' => $x));
-                	    }
-					}
-                } else {
-                    self::app_undestroy($uid, $app);
-                }
-            }
-        }
-    }
-
-    public static function app_undestroy($uid, $app)
-    {
-
-        // undelete a system app
-
-        if ($app['guid']) {
-            $x = q(
-                "select * from app where app_id = '%s' and app_channel = %d limit 1",
-                dbesc($app['guid']),
-                intval($uid)
-            );
-            if ($x) {
-                if ($x[0]['app_system']) {
-                    $r = q(
-                        "update app set app_deleted = 0 where app_id = '%s' and app_channel = %d",
-                        dbesc($app['guid']),
-                        intval($uid)
-                    );
-                }
-            }
-        }
-    }
-
-    public static function app_feature($uid, $app, $term)
-    {
-        $r = q(
-            "select id from app where app_id = '%s' and app_channel = %d limit 1",
-            dbesc($app['guid']),
-            intval($uid)
-        );
-
-        $x = q(
-            "select * from term where otype = %d and oid = %d and term = '%s' limit 1",
-            intval(TERM_OBJ_APP),
-            intval($r[0]['id']),
-            dbesc($term)
-        );
-
-        if ($x) {
-            q(
-                "delete from term where otype = %d and oid = %d and term = '%s'",
-                intval(TERM_OBJ_APP),
-                intval($x[0]['oid']),
-                dbesc($term)
-            );
-        } else {
-            store_item_tag($uid, $r[0]['id'], TERM_OBJ_APP, TERM_CATEGORY, $term, escape_tags(z_root() . '/apps/?f=&cat=' . $term));
-        }
-    }
-
-    public static function app_installed($uid, $app, $bypass_filter = false)
-    {
-        $r = q(
-            "select id from app where app_id = '%s' and app_channel = %d limit 1",
-            dbesc((array_key_exists('guid', $app)) ? $app['guid'] : ''),
-            intval($uid)
-        );
-        if (!$bypass_filter) {
-            $filter_arr = [
-                'uid' => $uid,
-                'app' => $app,
-                'installed' => $r
-            ];
-            Hook::call('app_installed_filter', $filter_arr);
-            $r = $filter_arr['installed'];
-        }
-
-        return (($r) ? true : false);
-    }
-
-    public static function addon_app_installed($uid, $app, $bypass_filter = false)
-    {
-
-        $r = q(
-            "select id from app where app_plugin = '%s' and app_channel = %d limit 1",
-            dbesc($app),
-            intval($uid)
-        );
-        if (!$bypass_filter) {
-            $filter_arr = [
-                'uid' => $uid,
-                'app' => $app,
-                'installed' => $r
-            ];
-            Hook::call('addon_app_installed_filter', $filter_arr);
-            $r = $filter_arr['installed'];
-        }
-
-        return (($r) ? true : false);
-    }
-
-    public static function system_app_installed($uid, $app, $bypass_filter = false)
-    {
-
-        $r = q(
-            "select id from app where app_id = '%s' and app_channel = %d and app_deleted = 0 limit 1",
-            dbesc(hash('whirlpool', $app)),
-            intval($uid)
-        );
-        if (!$bypass_filter) {
-            $filter_arr = [
-                'uid' => $uid,
-                'app' => $app,
-                'installed' => $r
-            ];
-            Hook::call('system_app_installed_filter', $filter_arr);
-            $r = $filter_arr['installed'];
-        }
-
-        return (($r) ? true : false);
-    }
-
-    public static function app_list($uid, $deleted = false, $cats = [])
-    {
-        if ($deleted) {
-            $sql_extra = "";
-        } else {
-            $sql_extra = " and app_deleted = 0 ";
-        }
-        if ($cats) {
-            $cat_sql_extra = " and ( ";
-
-            foreach ($cats as $cat) {
-                if (strpos($cat_sql_extra, 'term')) {
-                    $cat_sql_extra .= "or ";
-                }
-
-                $cat_sql_extra .= "term = '" . dbesc($cat) . "' ";
-            }
-
-            $cat_sql_extra .= ") ";
-
-            $r = q(
-                "select oid from term where otype = %d $cat_sql_extra",
-                intval(TERM_OBJ_APP)
-            );
-            if (!$r) {
-                return $r;
-            }
-            $sql_extra .= " and app.id in ( " . array_elm_to_str($r, 'oid') . ') ';
-        }
-
-        $r = q(
-            "select * from app where app_channel = %d $sql_extra order by app_name asc",
-            intval($uid)
-        );
-
-        if ($r) {
-            $hookinfo = ['uid' => $uid, 'deleted' => $deleted, 'cats' => $cats, 'apps' => $r];
-            Hook::call('app_list', $hookinfo);
-            $r = $hookinfo['apps'];
-            for ($x = 0; $x < count($r); $x++) {
-                if (!$r[$x]['app_system']) {
-                    $r[$x]['type'] = 'personal';
-                }
-                $r[$x]['term'] = q(
-                    "select * from term where otype = %d and oid = %d",
-                    intval(TERM_OBJ_APP),
-                    intval($r[$x]['id'])
-                );
-            }
-        }
-
-        return ($r);
-    }
-
-
-    public static function app_search_available($str)
-    {
-
-        // not yet finished
-        // somehow need to account for translations
-
-        $r = q(
-            "select * from app where app_channel = 0 $sql_extra order by app_name asc",
-            intval($uid)
-        );
-
-        return ($r);
-    }
-
-
-    public static function app_order($uid, $apps, $menu)
-    {
-
-        if (!$apps) {
-            return $apps;
-        }
-
-        $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order');
-
-        $x = (($uid) ? get_pconfig($uid, 'system', $conf) : get_config('system', $conf));
-        if (($x) && (!is_array($x))) {
-            $y = explode(',', $x);
-            $y = array_map('trim', $y);
-            $x = $y;
-        }
-
-        if (!(is_array($x) && ($x))) {
-            return $apps;
-        }
-
-        $ret = [];
-        foreach ($x as $xx) {
-            $y = self::find_app_in_array($xx, $apps);
-            if ($y) {
-                $ret[] = $y;
-            }
-        }
-        foreach ($apps as $ap) {
-            if (!self::find_app_in_array($ap['name'], $ret)) {
-                $ret[] = $ap;
-            }
-        }
-        return $ret;
-    }
-
-    public static function find_app_in_array($name, $arr)
-    {
-        if (!$arr) {
-            return false;
-        }
-        foreach ($arr as $x) {
-            if ($x['name'] === $name) {
-                return $x;
-            }
-        }
-        return false;
-    }
-
-    public static function moveup($uid, $guid, $menu)
-    {
-        $syslist = [];
-
-        $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order');
-
-        $list = self::app_list($uid, false, [$menu]);
-        if ($list) {
-            foreach ($list as $li) {
-                $papp = self::app_encode($li);
-                $syslist[] = $papp;
-            }
-        }
-        self::translate_system_apps($syslist);
-
-        usort($syslist, 'self::app_name_compare');
-
-        $syslist = self::app_order($uid, $syslist, $menu);
-
-        if (!$syslist) {
-            return;
-        }
-
-        $newlist = [];
-
-        foreach ($syslist as $k => $li) {
-            if ($li['guid'] === $guid) {
-                $position = $k;
-                break;
-            }
-        }
-        if (!$position) {
-            return;
-        }
-        $dest_position = $position - 1;
-        $saved = $syslist[$dest_position];
-        $syslist[$dest_position] = $syslist[$position];
-        $syslist[$position] = $saved;
-
-        $narr = [];
-        foreach ($syslist as $x) {
-            $narr[] = $x['name'];
-        }
-
-        set_pconfig($uid, 'system', $conf, implode(',', $narr));
-    }
-
-    public static function movedown($uid, $guid, $menu)
-    {
-        $syslist = [];
-
-        $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order');
-
-        $list = self::app_list($uid, false, [$menu]);
-        if ($list) {
-            foreach ($list as $li) {
-                $papp = self::app_encode($li);
-                $syslist[] = $papp;
-            }
-        }
-        self::translate_system_apps($syslist);
-
-        usort($syslist, 'self::app_name_compare');
-
-        $syslist = self::app_order($uid, $syslist, $menu);
-
-        if (!$syslist) {
-            return;
-        }
-
-        $newlist = [];
-
-        foreach ($syslist as $k => $li) {
-            if ($li['guid'] === $guid) {
-                $position = $k;
-                break;
-            }
-        }
-        if ($position >= count($syslist) - 1) {
-            return;
-        }
-        $dest_position = $position + 1;
-        $saved = $syslist[$dest_position];
-        $syslist[$dest_position] = $syslist[$position];
-        $syslist[$position] = $saved;
-
-        $narr = [];
-        foreach ($syslist as $x) {
-            $narr[] = $x['name'];
-        }
-
-        set_pconfig($uid, 'system', $conf, implode(',', $narr));
-    }
-
-    public static function app_decode($s)
-    {
-        $x = base64_decode(str_replace(array('
          ', "\r", "\n", ' '), array('', '', '', ''), $s));
-        return json_decode($x, true);
-    }
-
-
-    public static function app_macros($uid, &$arr)
-    {
-
-        if (!intval($uid)) {
-            return;
-        }
-
-        $baseurl = z_root();
-        $channel = Channel::from_id($uid);
-        $address = (($channel) ? $channel['channel_address'] : '');
-
-        // future expansion
-
-        $observer = App::get_observer();
-
-        $arr['url'] = str_replace(array('$baseurl', '$nick'), array($baseurl, $address), $arr['url']);
-        $arr['photo'] = str_replace(array('$baseurl', '$nick'), array($baseurl, $address), $arr['photo']);
-    }
-
-
-    public static function app_store($arr)
-    {
-
-        // logger('app_store: ' . print_r($arr,true));
-
-        $darray = [];
-        $ret = ['success' => false];
-
-        $sys = Channel::get_system();
-
-        self::app_macros($arr['uid'], $arr);
-
-        $darray['app_url'] = ((x($arr, 'url')) ? $arr['url'] : '');
-        $darray['app_channel'] = ((x($arr, 'uid')) ? $arr['uid'] : 0);
-
-        if (!$darray['app_url']) {
-            return $ret;
-        }
-
-        if ((!$arr['uid']) && (!$arr['author'])) {
-            $arr['author'] = $sys['channel_hash'];
-        }
-
-        if ($arr['photo'] && (strpos($arr['photo'], 'icon:') === false) && (strpos($arr['photo'], z_root()) === false)) {
-            $x = import_remote_xchan_photo(str_replace('$baseurl', z_root(), $arr['photo']), get_observer_hash(), true);
-            if ((!$x) || ($x[4])) {
-                // $x[4] = true indicates storage failure of our cached/resized copy. If this failed, just keep the original url.
-                $arr['photo'] = $x[1];
-            }
-        }
-
-
-        $darray['app_id'] = ((x($arr, 'guid')) ? $arr['guid'] : random_string() . '.' . App::get_hostname());
-        $darray['app_sig'] = ((x($arr, 'sig')) ? $arr['sig'] : '');
-        $darray['app_author'] = ((x($arr, 'author')) ? $arr['author'] : get_observer_hash());
-        $darray['app_name'] = ((x($arr, 'name')) ? escape_tags($arr['name']) : t('Unknown'));
-        $darray['app_desc'] = ((x($arr, 'desc')) ? escape_tags($arr['desc']) : '');
-        $darray['app_photo'] = ((x($arr, 'photo')) ? $arr['photo'] : z_root() . '/' . Channel::get_default_profile_photo(80));
-        $darray['app_version'] = ((x($arr, 'version')) ? escape_tags($arr['version']) : '');
-        $darray['app_addr'] = ((x($arr, 'addr')) ? escape_tags($arr['addr']) : '');
-        $darray['app_price'] = ((x($arr, 'price')) ? escape_tags($arr['price']) : '');
-        $darray['app_page'] = ((x($arr, 'page')) ? escape_tags($arr['page']) : '');
-        $darray['app_plugin'] = ((x($arr, 'plugin')) ? escape_tags(trim($arr['plugin'])) : '');
-        $darray['app_requires'] = ((x($arr, 'requires')) ? escape_tags($arr['requires']) : '');
-        $darray['app_system'] = ((x($arr, 'system')) ? intval($arr['system']) : 0);
-        $darray['app_deleted'] = ((x($arr, 'deleted')) ? intval($arr['deleted']) : 0);
-        $darray['app_options'] = ((x($arr, 'options')) ? intval($arr['options']) : 0);
-
-        $created = datetime_convert();
-
-        $r = q(
-            "insert into app ( app_id, app_sig, app_author, app_name, app_desc, app_url, app_photo, app_version, app_channel, app_addr, app_price, app_page, app_requires, app_created, app_edited, app_system, app_plugin, app_deleted, app_options ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d )",
-            dbesc($darray['app_id']),
-            dbesc($darray['app_sig']),
-            dbesc($darray['app_author']),
-            dbesc($darray['app_name']),
-            dbesc($darray['app_desc']),
-            dbesc($darray['app_url']),
-            dbesc($darray['app_photo']),
-            dbesc($darray['app_version']),
-            intval($darray['app_channel']),
-            dbesc($darray['app_addr']),
-            dbesc($darray['app_price']),
-            dbesc($darray['app_page']),
-            dbesc($darray['app_requires']),
-            dbesc($created),
-            dbesc($created),
-            intval($darray['app_system']),
-            dbesc($darray['app_plugin']),
-            intval($darray['app_deleted']),
-            intval($darray['app_options'])
-        );
-
-        if ($r) {
-            $ret['success'] = true;
-            $ret['app_id'] = $darray['app_id'];
-        }
-
-        if ($arr['categories']) {
-            $x = q(
-                "select id from app where app_id = '%s' and app_channel = %d limit 1",
-                dbesc($darray['app_id']),
-                intval($darray['app_channel'])
-            );
-            $y = explode(',', $arr['categories']);
-            if ($y) {
-                foreach ($y as $t) {
-                    $t = trim($t);
-                    if ($t) {
-                        store_item_tag($darray['app_channel'], $x[0]['id'], TERM_OBJ_APP, TERM_CATEGORY, escape_tags($t), escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
-                    }
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-
-    public static function app_update($arr)
-    {
-
-        // logger('app_update: ' . print_r($arr,true));
-        $darray = [];
-        $ret = ['success' => false];
-
-        self::app_macros($arr['uid'], $arr);
-
-
-        $darray['app_url'] = ((x($arr, 'url')) ? $arr['url'] : '');
-        $darray['app_channel'] = ((x($arr, 'uid')) ? $arr['uid'] : 0);
-        $darray['app_id'] = ((x($arr, 'guid')) ? $arr['guid'] : 0);
-
-        if ((!$darray['app_url']) || (!$darray['app_id'])) {
-            return $ret;
-        }
-
-        if ($arr['photo'] && (strpos($arr['photo'], 'icon:') === false) && (strpos($arr['photo'], z_root()) === false)) {
-            $x = import_remote_xchan_photo(str_replace('$baseurl', z_root(), $arr['photo']), get_observer_hash(), true);
-            if ((!$x) || ($x[4])) {
-                // $x[4] = true indicates storage failure of our cached/resized copy. If this failed, just keep the original url.
-                $arr['photo'] = $x[1];
-            }
-        }
-
-        $darray['app_sig'] = ((x($arr, 'sig')) ? $arr['sig'] : '');
-        $darray['app_author'] = ((x($arr, 'author')) ? $arr['author'] : get_observer_hash());
-        $darray['app_name'] = ((x($arr, 'name')) ? escape_tags($arr['name']) : t('Unknown'));
-        $darray['app_desc'] = ((x($arr, 'desc')) ? escape_tags($arr['desc']) : '');
-        $darray['app_photo'] = ((x($arr, 'photo')) ? $arr['photo'] : z_root() . '/' . Channel::get_default_profile_photo(80));
-        $darray['app_version'] = ((x($arr, 'version')) ? escape_tags($arr['version']) : '');
-        $darray['app_addr'] = ((x($arr, 'addr')) ? escape_tags($arr['addr']) : '');
-        $darray['app_price'] = ((x($arr, 'price')) ? escape_tags($arr['price']) : '');
-        $darray['app_page'] = ((x($arr, 'page')) ? escape_tags($arr['page']) : '');
-        $darray['app_plugin'] = ((x($arr, 'plugin')) ? escape_tags(trim($arr['plugin'])) : '');
-        $darray['app_requires'] = ((x($arr, 'requires')) ? escape_tags($arr['requires']) : '');
-        $darray['app_system'] = ((x($arr, 'system')) ? intval($arr['system']) : 0);
-        $darray['app_deleted'] = ((x($arr, 'deleted')) ? intval($arr['deleted']) : 0);
-        $darray['app_options'] = ((x($arr, 'options')) ? intval($arr['options']) : 0);
-
-        $edited = datetime_convert();
-
-        $r = q(
-            "update app set app_sig = '%s', app_author = '%s', app_name = '%s', app_desc = '%s', app_url = '%s', app_photo = '%s', app_version = '%s', app_addr = '%s', app_price = '%s', app_page = '%s', app_requires = '%s', app_edited = '%s', app_system = %d, app_plugin = '%s', app_deleted = %d, app_options = %d where app_id = '%s' and app_channel = %d",
-            dbesc($darray['app_sig']),
-            dbesc($darray['app_author']),
-            dbesc($darray['app_name']),
-            dbesc($darray['app_desc']),
-            dbesc($darray['app_url']),
-            dbesc($darray['app_photo']),
-            dbesc($darray['app_version']),
-            dbesc($darray['app_addr']),
-            dbesc($darray['app_price']),
-            dbesc($darray['app_page']),
-            dbesc($darray['app_requires']),
-            dbesc($edited),
-            intval($darray['app_system']),
-            dbesc($darray['app_plugin']),
-            intval($darray['app_deleted']),
-            intval($darray['app_options']),
-            dbesc($darray['app_id']),
-            intval($darray['app_channel'])
-        );
-        if ($r) {
-            $ret['success'] = true;
-            $ret['app_id'] = $darray['app_id'];
-        }
-
-        $x = q(
-            "select id from app where app_id = '%s' and app_channel = %d limit 1",
-            dbesc($darray['app_id']),
-            intval($darray['app_channel'])
-        );
-
-        // if updating an embed app and we don't have a 0 channel_id don't mess with any existing categories
-
-        if (array_key_exists('embed', $arr) && intval($arr['embed']) && (intval($darray['app_channel']))) {
-            return $ret;
-        }
-
-        if ($x) {
-            q(
-                "delete from term where otype = %d and oid = %d",
-                intval(TERM_OBJ_APP),
-                intval($x[0]['id'])
-            );
-            if (isset($arr['categories']) && $arr['categories']) {
-                $y = explode(',', $arr['categories']);
-                if ($y) {
-                    foreach ($y as $t) {
-                        $t = trim($t);
-                        if ($t) {
-                            store_item_tag($darray['app_channel'], $x[0]['id'], TERM_OBJ_APP, TERM_CATEGORY, escape_tags($t), escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
-                        }
-                    }
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-
-    public static function app_encode($app, $embed = false)
-    {
-
-        $ret = [];
-
-        $ret['type'] = 'personal';
-
-        if (isset($app['app_id']) && $app['app_id']) {
-            $ret['guid'] = $app['app_id'];
-        }
-        if (isset($app['app_sig']) && $app['app_sig']) {
-            $ret['sig'] = $app['app_sig'];
-        }
-        if (isset($app['app_author']) && $app['app_author']) {
-            $ret['author'] = $app['app_author'];
-        }
-        if (isset($app['app_name']) && $app['app_name']) {
-            $ret['name'] = $app['app_name'];
-        }
-        if (isset($app['app_desc']) && $app['app_desc']) {
-            $ret['desc'] = $app['app_desc'];
-        }
-        if (isset($app['app_url']) && $app['app_url']) {
-            $ret['url'] = $app['app_url'];
-        }
-        if (isset($app['app_photo']) && $app['app_photo']) {
-            $ret['photo'] = $app['app_photo'];
-        }
-        if (isset($app['app_icon']) && $app['app_icon']) {
-            $ret['icon'] = $app['app_icon'];
-        }
-        if (isset($app['app_version']) && $app['app_version']) {
-            $ret['version'] = $app['app_version'];
-        }
-        if (isset($app['app_addr']) && $app['app_addr']) {
-            $ret['addr'] = $app['app_addr'];
-        }
-        if (isset($app['app_price']) && $app['app_price']) {
-            $ret['price'] = $app['app_price'];
-        }
-        if (isset($app['app_page']) && $app['app_page']) {
-            $ret['page'] = $app['app_page'];
-        }
-        if (isset($app['app_requires']) && $app['app_requires']) {
-            $ret['requires'] = $app['app_requires'];
-        }
-        if (isset($app['app_system']) && $app['app_system']) {
-            $ret['system'] = $app['app_system'];
-        }
-        if (isset($app['app_options']) && $app['app_options']) {
-            $ret['options'] = $app['app_options'];
-        }
-        if (isset($app['app_plugin']) && $app['app_plugin']) {
-            $ret['plugin'] = trim($app['app_plugin']);
-        }
-        if (isset($app['app_deleted']) && $app['app_deleted']) {
-            $ret['deleted'] = $app['app_deleted'];
-        }
-        if (isset($app['term']) && $app['term']) {
-            $ret['categories'] = array_elm_to_str($app['term'], 'term');
-        }
-
-
-        if (!$embed) {
-            return $ret;
-        }
-        $ret['embed'] = true;
-
-        if (array_key_exists('categories', $ret)) {
-            unset($ret['categories']);
-        }
-
-        $j = json_encode($ret);
-        return '[app]' . chunk_split(base64_encode($j), 72, "\n") . '[/app]';
-    }
-
-
-    public static function papp_encode($papp)
-    {
-        return chunk_split(base64_encode(json_encode($papp)), 72, "\n");
-    }
-}
diff --git a/Zotlabs/Lib/Cache.php b/Zotlabs/Lib/Cache.php
deleted file mode 100644
index f3c227261..000000000
--- a/Zotlabs/Lib/Cache.php
+++ /dev/null
@@ -1,63 +0,0 @@
- 191) {
-            return t('Name too long');
-        }
-
-        $arr = ['name' => $name];
-        /**
-         * @hooks validate_channelname
-         *   Used to validate the names used by a channel.
-         *   * \e string \b name
-         *   * \e string \b message - return error message
-         */
-        Hook::call('validate_channelname', $arr);
-
-        if (x($arr, 'message')) {
-            return $arr['message'];
-        }
-    }
-
-
-    /**
-     * @brief Create a system channel - which has no account attached.
-     *
-     */
-    public static function create_system()
-    {
-
-        // Ensure that there is a host keypair.
-
-        if ((! get_config('system', 'pubkey')) || (! get_config('system', 'prvkey'))) {
-            $hostkey = Crypto::new_keypair(4096);
-            set_config('system', 'pubkey', $hostkey['pubkey']);
-            set_config('system', 'prvkey', $hostkey['prvkey']);
-        }
-
-        $sys = self::get_system();
-
-        if ($sys) {
-            if (isset($sys['channel_pubkey']) && $sys['channel_pubkey'] === get_config('system', 'pubkey')) {
-                return;
-            } else {
-                // upgrade the sys channel and return
-                $pubkey = get_config('system', 'pubkey');
-                $prvkey = get_config('system', 'prvkey');
-                $guid_sig = Libzot::sign($sys['channel_guid'], $prvkey);
-                $hash = Libzot::make_xchan_hash($sys['channel_guid'], $pubkey);
-
-                q(
-                    "update channel set channel_guid_sig = '%s', channel_hash = '%s', channel_pubkey = '%s', channel_prvkey = '%s' where channel_id = %d",
-                    dbesc($guid_sig),
-                    dbesc($hash),
-                    dbesc($pubkey),
-                    dbesc($prvkey),
-                    dbesc($sys['channel_id'])
-                );
-
-                q(
-                    "update xchan set xchan_guid_sig = '%s', xchan_hash = '%s', xchan_pubkey = '%s', xchan_url = '%s' where xchan_hash = '%s'",
-                    dbesc($guid_sig),
-                    dbesc($hash),
-                    dbesc($pubkey),
-                    dbesc(z_root()),
-                    dbesc($sys['channel_hash'])
-                );
-                q(
-                    "update hubloc set hubloc_guid_sig = '%s', hubloc_hash = '%s', hubloc_id_url = '%s', hubloc_url_sig = '%s', hubloc_url = '%s', hubloc_callback = '%s', hubloc_site_id = '%s', hubloc_orphancheck = 0, hubloc_error = 0, hubloc_deleted = 0 where hubloc_hash = '%s'",
-                    dbesc($guid_sig),
-                    dbesc($hash),
-                    dbesc(z_root()),
-                    dbesc(Libzot::sign(z_root(), $prvkey)),
-                    dbesc(z_root()),
-                    dbesc(z_root() . '/zot'),
-                    dbesc(Libzot::make_xchan_hash(z_root(), $pubkey)),
-                    dbesc($sys['channel_hash'])
-                );
-
-                q(
-                    "update abook set abook_xchan = '%s' where abook_xchan = '%s'",
-                    dbesc($hash),
-                    dbesc($sys['channel_hash'])
-                );
-
-                q(
-                    "update abconfig set xchan = '%s' where xchan = '%s'",
-                    dbesc($hash),
-                    dbesc($sys['channel_hash'])
-                );
-
-                return;
-            }
-        }
-
-        self::create([
-                'account_id'       => 'xxx',  // Typecast trickery: account_id is required. This will create an identity with an (integer) account_id of 0
-                'nickname'         => 'sys',
-                'name'             => 'System',
-                'permissions_role' => 'social',
-                'pageflags'        => 0,
-                'publish'          => 0,
-                'system'           => 1
-        ]);
-    }
-
-
-    /**
-     * @brief Returns the sys channel.
-     *
-     * @return array|bool
-     */
-    public static function get_system()
-    {
-
-        // App::$sys_channel caches this lookup
-
-        if (is_array(App::$sys_channel)) {
-            return App::$sys_channel;
-        }
-
-        $r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_system = 1 limit 1");
-
-        if ($r) {
-            App::$sys_channel = array_shift($r);
-            return App::$sys_channel;
-        }
-        return false;
-    }
-
-
-    /**
-     * @brief Checks if $channel_id is sys channel.
-     *
-     * @param int $channel_id
-     * @return bool
-     */
-    public static function is_system($channel_id)
-    {
-        $s = self::get_system();
-        if ($s) {
-            return (intval($s['channel_id']) === intval($channel_id));
-        }
-        return false;
-    }
-
-
-    /**
-     * @brief Return the total number of channels on this site.
-     *
-     * No filtering is performed except to check PAGE_REMOVED.
-     *
-     * @returns int|booleean
-     *   on error returns boolean false
-     */
-    public static function channel_total()
-    {
-        $r = q("select channel_id from channel where channel_removed = 0");
-
-        if (is_array($r)) {
-            return count($r);
-        }
-
-        return false;
-    }
-
-
-    /**
-     * @brief Create a new channel.
-     *
-     * Also creates the related xchan, hubloc, profile, and "self" abook records,
-     * and an empty "Friends" group/collection for the new channel.
-     *
-     * @param array $arr associative array with:
-     *  * \e string \b name full name of channel
-     *  * \e string \b nickname "email/url-compliant" nickname
-     *  * \e int \b account_id to attach with this channel
-     *  * [other identity fields as desired]
-     *
-     * @returns array
-     *     'success' => boolean true or false
-     *     'message' => optional error text if success is false
-     *     'channel' => if successful the created channel array
-     */
-    public static function create($arr)
-    {
-
-        $ret = array('success' => false);
-
-        if (! $arr['account_id']) {
-            $ret['message'] = t('No account identifier');
-            return $ret;
-        }
-        $ret = ServiceClass::identity_check_service_class($arr['account_id']);
-        if (!$ret['success']) {
-            return $ret;
-        }
-        // save this for auto_friending
-        $total_identities = $ret['total_identities'];
-
-        $nick = mb_strtolower(trim($arr['nickname']));
-        if (! $nick) {
-            $ret['message'] = t('Nickname is required.');
-            return $ret;
-        }
-
-        $name = escape_tags($arr['name']);
-        $pageflags = ((x($arr, 'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL);
-        $system = ((x($arr, 'system')) ? intval($arr['system']) : 0);
-        $name_error = self::validate_channelname($arr['name']);
-        if ($name_error) {
-            $ret['message'] = $name_error;
-            return $ret;
-        }
-
-        if ($nick === 'sys' && (! $system)) {
-            $ret['message'] = t('Reserved nickname. Please choose another.');
-            return $ret;
-        }
-
-        if (check_webbie(array($nick)) !== $nick) {
-            $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.');
-            return $ret;
-        }
-
-        $guid = Libzot::new_uid($nick);
-
-        if ($system) {
-            $key = [ 'pubkey' => get_config('system', 'pubkey'), 'prvkey' => get_config('system', 'prvkey') ];
-        } else {
-            $key = Crypto::new_keypair(4096);
-        }
-
-        $sig = Libzot::sign($guid, $key['prvkey']);
-        $hash = Libzot::make_xchan_hash($guid, $key['pubkey']);
-
-        // Force a few things on the short term until we can provide a theme or app with choice
-
-        $publish = 1;
-
-        if (array_key_exists('publish', $arr)) {
-            $publish = intval($arr['publish']);
-        }
-
-        $role_permissions = null;
-        $parent_channel_hash = EMPTY_STR;
-
-        if (array_key_exists('permissions_role', $arr) && $arr['permissions_role']) {
-            $role_permissions = PermissionRoles::role_perms($arr['permissions_role']);
-            if (isset($role_permissions['channel_type']) && $role_permissions['channel_type'] === 'collection') {
-                $parent_channel_hash = $arr['parent_hash'];
-            }
-        }
-
-        if ($role_permissions && array_key_exists('directory_publish', $role_permissions)) {
-            $publish = intval($role_permissions['directory_publish']);
-        }
-
-        $primary = true;
-
-        if (array_key_exists('primary', $arr)) {
-            $primary = intval($arr['primary']);
-        }
-
-        $expire = 0;
-
-        $r = self::channel_store_lowlevel(
-            [
-                'channel_account_id'  => intval($arr['account_id']),
-                'channel_primary'     => intval($primary),
-                'channel_name'        => $name,
-                'channel_parent'      => $parent_channel_hash,
-                'channel_address'     => $nick,
-                'channel_guid'        => $guid,
-                'channel_guid_sig'    => $sig,
-                'channel_hash'        => $hash,
-                'channel_prvkey'      => $key['prvkey'],
-                'channel_pubkey'      => $key['pubkey'],
-                'channel_pageflags'   => intval($pageflags),
-                'channel_system'      => intval($system),
-                'channel_expire_days' => intval($expire),
-                'channel_timezone'    => App::$timezone
-            ]
-        );
-
-        $r = q(
-            "select * from channel where channel_account_id = %d
-    		and channel_guid = '%s' limit 1",
-            intval($arr['account_id']),
-            dbesc($guid)
-        );
-
-        if (! $r) {
-            $ret['message'] = t('Unable to retrieve created identity');
-            return $ret;
-        }
-
-        $a = q(
-            "select * from account where account_id = %d",
-            intval($arr['account_id'])
-        );
-
-        $photo_type = null;
-
-        $z = [
-                'account' => $a[0],
-                'channel' => $r[0],
-                'photo_url' => ''
-        ];
-        /**
-         * @hooks create_channel_photo
-         *   * \e array \b account
-         *   * \e array \b channel
-         *   * \e string \b photo_url - Return value
-         */
-        Hook::call('create_channel_photo', $z);
-    
-        // The site channel gets the project logo as a profile photo.
-        if ($arr['account_id'] === 'xxx') {
-            $photo_type = import_channel_photo_from_url(z_root() . '/images/' . PLATFORM_NAME . '.png', 0, $r[0]['channel_id']);
-        }
-        elseif ($z['photo_url']) {
-            $photo_type = import_channel_photo_from_url($z['photo_url'], $arr['account_id'], $r[0]['channel_id']);    
-        }
-
-        if ($role_permissions && array_key_exists('limits', $role_permissions)) {
-            $perm_limits = $role_permissions['limits'];
-        } else {
-            $perm_limits = site_default_perms();
-        }
-
-        foreach ($perm_limits as $p => $v) {
-            PermissionLimits::Set($r[0]['channel_id'], $p, $v);
-        }
-
-        if ($role_permissions && array_key_exists('perms_auto', $role_permissions)) {
-            set_pconfig($r[0]['channel_id'], 'system', 'autoperms', intval($role_permissions['perms_auto']));
-        }
-
-        $ret['channel'] = $r[0];
-
-        if (intval($arr['account_id'])) {
-            self::set_default($arr['account_id'], $ret['channel']['channel_id'], false);
-        }
-
-        // Create a verified hub location pointing to this site.
-
-        $r = hubloc_store_lowlevel(
-            [
-                'hubloc_guid'     => $guid,
-                'hubloc_guid_sig' => $sig,
-                'hubloc_id_url'   => (($system) ? z_root() : Channel::url($ret['channel'])),
-                'hubloc_hash'     => $hash,
-                'hubloc_addr'     => self::get_webfinger($ret['channel']),
-                'hubloc_primary'  => intval($primary),
-                'hubloc_url'      => z_root(),
-                'hubloc_url_sig'  => Libzot::sign(z_root(), $ret['channel']['channel_prvkey']),
-                'hubloc_site_id'  => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')),
-                'hubloc_host'     => App::get_hostname(),
-                'hubloc_callback' => z_root() . '/zot',
-                'hubloc_sitekey'  => get_config('system', 'pubkey'),
-                'hubloc_network'  => 'nomad',
-                'hubloc_updated'  => datetime_convert()
-            ]
-        );
-        if (! $r) {
-            logger('Unable to store hub location');
-        }
-
-        $newuid = $ret['channel']['channel_id'];
-
-        $r = xchan_store_lowlevel(
-            [
-                'xchan_hash'       => $hash,
-                'xchan_guid'       => $guid,
-                'xchan_guid_sig'   => $sig,
-                'xchan_pubkey'     => $key['pubkey'],
-                'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'),
-                'xchan_photo_l'    => z_root() . "/photo/profile/l/{$newuid}",
-                'xchan_photo_m'    => z_root() . "/photo/profile/m/{$newuid}",
-                'xchan_photo_s'    => z_root() . "/photo/profile/s/{$newuid}",
-                'xchan_addr'       => self::get_webfinger($ret['channel']),
-                'xchan_url'        => (($system) ? z_root() : Channel::url($ret['channel'])),
-                'xchan_follow'     => z_root() . '/follow?f=&url=%s',
-                'xchan_connurl'    => z_root() . '/poco/' . $ret['channel']['channel_address'],
-                'xchan_name'       => $ret['channel']['channel_name'],
-                'xchan_network'    => 'nomad',
-                'xchan_updated'    => datetime_convert(),
-                'xchan_photo_date' => datetime_convert(),
-                'xchan_name_date'  => datetime_convert(),
-                'xchan_system'     => $system
-            ]
-        );
-
-        // Not checking return value.
-        // It's ok for this to fail if it's an imported channel, and therefore the hash is a duplicate
-
-        $r = self::profile_store_lowlevel(
-            [
-                'aid'          => intval($ret['channel']['channel_account_id']),
-                'uid'          => intval($newuid),
-                'profile_guid' => new_uuid(),
-                'profile_name' => t('Default Profile'),
-                'is_default'   => 1,
-                'publish'      => $publish,
-                'fullname'     => $ret['channel']['channel_name'],
-                'photo'        => z_root() . "/photo/profile/l/{$newuid}",
-                'thumb'        => z_root() . "/photo/profile/m/{$newuid}"
-            ]
-        );
-
-        if ($role_permissions) {
-            $myperms = ((array_key_exists('perms_connect', $role_permissions)) ? $role_permissions['perms_connect'] : [] );
-        } else {
-            $x = PermissionRoles::role_perms('social');
-            $myperms = $x['perms_connect'];
-        }
-
-        $r = abook_store_lowlevel(
-            [
-                'abook_account'   => intval($ret['channel']['channel_account_id']),
-                'abook_channel'   => intval($newuid),
-                'abook_xchan'     => $hash,
-                'abook_closeness' => 0,
-                'abook_created'   => datetime_convert(),
-                'abook_updated'   => datetime_convert(),
-                'abook_self'      => 1
-            ]
-        );
-
-
-        $x = Permissions::serialise(Permissions::FilledPerms($myperms));
-        set_abconfig($newuid, $hash, 'system', 'my_perms', $x);
-
-        if (intval($ret['channel']['channel_account_id'])) {
-            // Save our permissions role so we can perhaps call it up and modify it later.
-
-            if ($role_permissions) {
-                set_pconfig($newuid, 'system', 'permissions_role', $arr['permissions_role']);
-                if (array_key_exists('online', $role_permissions)) {
-                    set_pconfig($newuid, 'system', 'hide_presence', 1 - intval($role_permissions['online']));
-                }
-                if (array_key_exists('perms_auto', $role_permissions)) {
-                    $autoperms = intval($role_permissions['perms_auto']);
-                    set_pconfig($newuid, 'system', 'autoperms', $autoperms);
-                }
-            }
-
-            // Create a group with yourself as a member. This allows somebody to use it
-            // right away as a default group for new contacts.
-
-            $group_hash = AccessList::add($newuid, t('Friends'));
-            if ($group_hash) {
-                AccessList::member_add($newuid, t('Friends'), $ret['channel']['channel_hash']);
-
-                // if our role_permissions indicate that we're using a default collection ACL, add it.
-
-                if (is_array($role_permissions) && $role_permissions['default_collection']) {
-                    $default_collection_str = '<' . $group_hash . '>';
-                }
-                q(
-                    "update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d",
-                    dbesc($group_hash),
-                    dbesc(($default_collection_str) ? $default_collection_str : EMPTY_STR),
-                    intval($newuid)
-                );
-            }
-
-            set_pconfig($ret['channel']['channel_id'], 'system', 'photo_path', '%Y/%Y-%m');
-            set_pconfig($ret['channel']['channel_id'], 'system', 'attach_path', '%Y/%Y-%m');
-
-            // If this channel has a parent, auto follow them.
-
-            if ($parent_channel_hash) {
-                $ch = self::from_hash($parent_channel_hash);
-                if ($ch) {
-                    self::connect_and_sync($ret['channel'], self::get_webfinger($ch), true);
-                }
-            }
-
-            // auto-follow any of the hub's pre-configured channel choices.
-            // Only do this if it's the first channel for this account;
-            // otherwise it could get annoying. Don't make this list too big
-            // or it will impact registration time.
-
-            $accts = get_config('system', 'auto_follow');
-            if (($accts) && (! $total_identities)) {
-                if (! is_array($accts)) {
-                    $accts = array($accts);
-                }
-
-                foreach ($accts as $acct) {
-                    if (trim($acct)) {
-                        $f = self::connect_and_sync($ret['channel'], trim($acct));
-                        if ($f['success']) {
-                            $can_view_stream = their_perms_contains($ret['channel']['channel_id'], $f['abook']['abook_xchan'], 'view_stream');
-
-                            // If we can view their stream, pull in some posts
-
-                            if (($can_view_stream) || ($f['abook']['xchan_network'] === 'rss')) {
-                                Run::Summon([ 'Onepoll',$f['abook']['abook_id'] ]);
-                            }
-                        }
-                    }
-                }
-            }
-
-            /**
-             * @hooks create_identity
-             *   Called when creating a channel.
-             *   * \e int - The UID of the created identity
-             */
-
-            Hook::call('create_identity', $newuid);
-
-            Run::Summon([ 'Directory', $ret['channel']['channel_id'] ]);
-        }
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-
-
-    public static function connect_and_sync($channel, $address, $sub_channel = false)
-    {
-
-        if ((! $channel) || (! $address)) {
-            return false;
-        }
-
-        $f = Connect::connect($channel, $address, $sub_channel);
-        if ($f['success']) {
-            $clone = [];
-            foreach ($f['abook'] as $k => $v) {
-                if (strpos($k, 'abook_') === 0) {
-                    $clone[$k] = $v;
-                }
-            }
-            unset($clone['abook_id']);
-            unset($clone['abook_account']);
-            unset($clone['abook_channel']);
-
-            $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
-            if ($abconfig) {
-                $clone['abconfig'] = $abconfig;
-            }
-
-            Libsync::build_sync_packet($channel['channel_id'], [ 'abook' => [ $clone ] ], true);
-            return $f;
-        }
-        return false;
-    }
-
-
-    public static function change_channel_keys($channel)
-    {
-
-        $ret = array('success' => false);
-
-        $stored = [];
-
-        $key = Crypto::new_keypair(4096);
-
-        $sig = Libzot::sign($channel['channel_guid'], $key['prvkey']);
-        $hash = Libzot::make_xchan_hash($channel['channel_guid'], $channel['channel_pubkey']);
-
-        $stored['old_guid']     = $channel['channel_guid'];
-        $stored['old_guid_sig'] = $channel['channel_guid_sig'];
-        $stored['old_key']      = $channel['channel_pubkey'];
-        $stored['old_hash']     = $channel['channel_hash'];
-
-        $stored['new_key']      = $key['pubkey'];
-        $stored['new_sig']      = Libzot::sign($key['pubkey'], $channel['channel_prvkey']);
-
-        // Save this info for the notifier to collect
-
-        set_pconfig($channel['channel_id'], 'system', 'keychange', $stored);
-
-        $r = q(
-            "update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s', channel_hash = '%s' where channel_id = %d",
-            dbesc($key['prvkey']),
-            dbesc($key['pubkey']),
-            dbesc($sig),
-            dbesc($hash),
-            intval($channel['channel_id'])
-        );
-        if (! $r) {
-            return $ret;
-        }
-
-        $r = q(
-            "select * from channel where channel_id = %d",
-            intval($channel['channel_id'])
-        );
-
-        if (! $r) {
-            $ret['message'] = t('Unable to retrieve modified identity');
-            return $ret;
-        }
-
-        $modified = $r[0];
-
-        $h = q(
-            "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ",
-            dbesc($stored['old_hash']),
-            dbesc(z_root())
-        );
-
-        if ($h) {
-            foreach ($h as $hv) {
-                $hv['hubloc_guid_sig'] = $sig;
-                $hv['hubloc_hash']     = $hash;
-                $hv['hubloc_url_sig']  = Libzot::sign(z_root(), $modifed['channel_prvkey']);
-                hubloc_store_lowlevel($hv);
-            }
-        }
-
-        $x = q(
-            "select * from xchan where xchan_hash = '%s' ",
-            dbesc($stored['old_hash'])
-        );
-
-        $check = q(
-            "select * from xchan where xchan_hash = '%s'",
-            dbesc($hash)
-        );
-
-        if (($x) && (! $check)) {
-            $oldxchan = $x[0];
-            foreach ($x as $xv) {
-                $xv['xchan_guid_sig']  = $sig;
-                $xv['xchan_hash']      = $hash;
-                $xv['xchan_pubkey']    = $key['pubkey'];
-                $xv['xchan_updated']   = datetime_convert();
-                xchan_store_lowlevel($xv);
-                $newxchan = $xv;
-            }
-        }
-
-        Libsync::build_sync_packet($channel['channel_id'], [ 'keychange' => $stored ]);
-
-        $a = q(
-            "select * from abook where abook_xchan = '%s' and abook_self = 1",
-            dbesc($stored['old_hash'])
-        );
-
-        if ($a) {
-            q(
-                "update abook set abook_xchan = '%s' where abook_id = %d",
-                dbesc($hash),
-                intval($a[0]['abook_id'])
-            );
-        }
-
-        xchan_change_key($oldxchan, $newxchan, $stored);
-
-        Run::Summon([ 'Notifier', 'keychange', $channel['channel_id'] ]);
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-    public static function change_address($channel, $new_address)
-    {
-
-        $ret = array('success' => false);
-
-        $old_address = $channel['channel_address'];
-
-        if ($new_address === 'sys') {
-            $ret['message'] = t('Reserved nickname. Please choose another.');
-            return $ret;
-        }
-
-        if (check_webbie(array($new_address)) !== $new_address) {
-            $ret['message'] = t('Nickname has unsupported characters or is already being used on this site.');
-            return $ret;
-        }
-
-        $r = q(
-            "update channel set channel_address = '%s' where channel_id = %d",
-            dbesc($new_address),
-            intval($channel['channel_id'])
-        );
-        if (! $r) {
-            return $ret;
-        }
-
-        $r = q(
-            "select * from channel where channel_id = %d",
-            intval($channel['channel_id'])
-        );
-
-        if (! $r) {
-            $ret['message'] = t('Unable to retrieve modified identity');
-            return $ret;
-        }
-
-        $r = q(
-            "update xchan set xchan_addr = '%s' where xchan_hash = '%s'",
-            dbesc($new_address . '@' . App::get_hostname()),
-            dbesc($channel['channel_hash'])
-        );
-
-        $h = q(
-            "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ",
-            dbesc($channel['channel_hash']),
-            dbesc(z_root())
-        );
-
-        if ($h) {
-            foreach ($h as $hv) {
-                if ($hv['hubloc_primary']) {
-                    q(
-                        "update hubloc set hubloc_primary = 0 where hubloc_id = %d",
-                        intval($hv['hubloc_id'])
-                    );
-                }
-                q(
-                    "update hubloc set hubloc_deleted = 1 where hubloc_id = %d",
-                    intval($hv['hubloc_id'])
-                );
-
-                unset($hv['hubloc_id']);
-                $hv['hubloc_addr'] = $new_address . '@' . App::get_hostname();
-                hubloc_store_lowlevel($hv);
-            }
-        }
-
-        // fix apps which were stored with the actual name rather than a macro
-
-        $r = q(
-            "select * from app where app_channel = %d and app_system = 1",
-            intval($channel['channel_id'])
-        );
-        if ($r) {
-            foreach ($r as $rv) {
-                $replace = preg_replace('/([\=\/])(' . $old_address . ')($|[\%\/])/ism', '$1' . $new_address . '$3', $rv['app_url']);
-                if ($replace != $rv['app_url']) {
-                    q(
-                        "update app set app_url = '%s' where id = %d",
-                        dbesc($replace),
-                        intval($rv['id'])
-                    );
-                }
-            }
-        }
-
-        Run::Summon([ 'Notifier', 'refresh_all', $channel['channel_id'] ]);
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-
-    /**
-     * @brief Set default channel to be used on login.
-     *
-     * @param int $account_id
-     *       login account
-     * @param int $channel_id
-     *       channel id to set as default for this account
-     * @param bool $force (optional) default true
-     *       - if true, set this default unconditionally
-     *       - if $force is false only do this if there is no existing default
-     */
-    public static function set_default($account_id, $channel_id, $force = true)
-    {
-        $r = q(
-            "select account_default_channel from account where account_id = %d limit 1",
-            intval($account_id)
-        );
-        if ($r) {
-            if ((intval($r[0]['account_default_channel']) == 0) || ($force)) {
-                $r = q(
-                    "update account set account_default_channel = %d where account_id = %d",
-                    intval($channel_id),
-                    intval($account_id)
-                );
-            }
-        }
-    }
-
-    /**
-     * @brief Return an array with default list of sections to export.
-     *
-     * @return array with default section names to export
-     */
-    public static function get_default_export_sections()
-    {
-        $sections = [
-                'channel',
-                'connections',
-                'config',
-                'apps',
-                'chatrooms',
-                'events'
-        ];
-
-        $cb = [ 'sections' => $sections ];
-        /**
-         * @hooks get_default_export_sections
-         *   Called to get the default list of functional data groups to export in Channel::basic_export().
-         *   * \e array \b sections - return value
-         */
-        Hook::call('get_default_export_sections', $cb);
-
-        return $cb['sections'];
-    }
-
-
-    /**
-     * @brief Create an array representing the important channel information
-     * which would be necessary to create a nomadic identity clone. This includes
-     * most channel resources and connection information with the exception of content.
-     *
-     * @param int $channel_id
-     *     Channel_id to export
-     * @param array $sections (optional)
-     *     Which sections to include in the export, default see get_default_export_sections()
-     * @return array
-     *     See function for details
-     */
-    public static function basic_export($channel_id, $sections = null)
-    {
-
-        /*
-         * basic channel export
-         */
-
-        if (! $sections) {
-            $sections = self::get_default_export_sections();
-        }
-
-        $ret = [];
-
-        // use constants here as otherwise we will have no idea if we can import from a site
-        // with a non-standard platform and version.
-
-        $ret['compatibility'] = [
-            'project'     => PLATFORM_NAME,
-            'codebase'    => 'zap',
-            'version'     => STD_VERSION,
-            'database'    => DB_UPDATE_VERSION
-        ];
-
-        /*
-         * Process channel information regardless of it is one of the sections desired
-         * because we need the channel relocation information in all export files/streams.
-         */
-
-        $r = q(
-            "select * from channel where channel_id = %d limit 1",
-            intval($channel_id)
-        );
-        if ($r) {
-            $ret['relocate'] = [ 'channel_address' => $r[0]['channel_address'], 'url' => z_root()];
-            if (in_array('channel', $sections)) {
-                $ret['channel'] = $r[0];
-                unset($ret['channel']['channel_password']);
-                unset($ret['channel']['channel_salt']);
-            }
-        }
-
-        if (in_array('channel', $sections) || in_array('profile', $sections)) {
-            $r = q(
-                "select * from profile where uid = %d",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['profile'] = $r;
-            }
-
-            $r = q(
-                "select mimetype, content, os_storage from photo
-    			where imgscale = 4 and photo_usage = %d and uid = %d limit 1",
-                intval(PHOTO_PROFILE),
-                intval($channel_id)
-            );
-
-            if ($r) {
-                $ret['photo'] = [
-                    'type' => $r[0]['mimetype'],
-                    'data' => (($r[0]['os_storage'])
-                        ? base64url_encode(file_get_contents($r[0]['content'])) : base64url_encode(dbunescbin($r[0]['content'])))
-                ];
-            }
-        }
-
-        if (in_array('connections', $sections)) {
-            $r = q(
-                "select * from atoken where atoken_uid = %d",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['atoken'] = $r;
-            }
-
-            $xchans = [];
-            $r = q(
-                "select * from abook where abook_channel = %d ",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['abook'] = $r;
-
-                for ($x = 0; $x < count($ret['abook']); $x++) {
-                    $xchans[] = $ret['abook'][$x]['abook_xchan'];
-                    $abconfig = load_abconfig($channel_id, $ret['abook'][$x]['abook_xchan']);
-                    if ($abconfig) {
-                        $ret['abook'][$x]['abconfig'] = $abconfig;
-                    }
-                }
-                stringify_array_elms($xchans);
-            }
-
-            if ($xchans) {
-                $r = q("select * from xchan where xchan_hash in ( " . implode(',', $xchans) . " ) ");
-                if ($r) {
-                    $ret['xchan'] = $r;
-                }
-
-                $r = q("select * from hubloc where hubloc_hash in ( " . implode(',', $xchans) . " ) ");
-                if ($r) {
-                    $ret['hubloc'] = $r;
-                }
-            }
-
-            $r = q(
-                "select * from pgrp where uid = %d ",
-                intval($channel_id)
-            );
-
-            if ($r) {
-                $ret['group'] = $r;
-            }
-
-            $r = q(
-                "select * from pgrp_member where uid = %d ",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['group_member'] = $r;
-            }
-
-            $r = q(
-                "select * from xign where uid = %d ",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['xign'] = $r;
-            }
-
-            $r = q(
-                "select * from block where block_channel_id = %d ",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['block'] = $r;
-            }
-        }
-
-        if (in_array('config', $sections)) {
-            $r = q(
-                "select * from pconfig where uid = %d",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['config'] = $r;
-            }
-
-            // All other term types will be included in items, if requested.
-
-            $r = q(
-                "select * from term where ttype in (%d,%d) and uid = %d",
-                intval(TERM_SAVEDSEARCH),
-                intval(TERM_THING),
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['term'] = $r;
-            }
-            // add psuedo-column obj_baseurl to aid in relocations
-
-            $r = q(
-                "select obj.*, '%s' as obj_baseurl from obj where obj_channel = %d",
-                dbesc(z_root()),
-                intval($channel_id)
-            );
-
-            if ($r) {
-                $ret['obj'] = $r;
-            }
-
-            $r = q(
-                "select * from likes where channel_id = %d",
-                intval($channel_id)
-            );
-
-            if ($r) {
-                $ret['likes'] = $r;
-            }
-        }
-
-        if (in_array('apps', $sections)) {
-            $r = q(
-                "select * from app where app_channel = %d and app_system = 0",
-                intval($channel_id)
-            );
-            if ($r) {
-                for ($x = 0; $x < count($r); $x++) {
-                    $r[$x]['term'] = q(
-                        "select * from term where otype = %d and oid = %d",
-                        intval(TERM_OBJ_APP),
-                        intval($r[$x]['id'])
-                    );
-                }
-                $ret['app'] = $r;
-            }
-            $r = q(
-                "select * from app where app_channel = %d and app_system = 1",
-                intval($channel_id)
-            );
-            if ($r) {
-                for ($x = 0; $x < count($r); $x++) {
-                    $r[$x]['term'] = q(
-                        "select * from term where otype = %d and oid = %d",
-                        intval(TERM_OBJ_APP),
-                        intval($r[$x]['id'])
-                    );
-                }
-                $ret['sysapp'] = $r;
-            }
-        }
-
-        if (in_array('chatrooms', $sections)) {
-            $r = q(
-                "select * from chatroom where cr_uid = %d",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['chatroom'] = $r;
-            }
-        }
-
-        if (in_array('events', $sections)) {
-            $r = q(
-                "select * from event where uid = %d",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['event'] = $r;
-            }
-
-            $r = q(
-                "select * from item where resource_type = 'event' and uid = %d",
-                intval($channel_id)
-            );
-            if ($r) {
-                $ret['event_item'] = [];
-                xchan_query($r);
-                $r = fetch_post_tags($r, true);
-                foreach ($r as $rr) {
-                    $ret['event_item'][] = encode_item($rr, true);
-                }
-            }
-        }
-
-        if (in_array('items', $sections)) {
-            /** @warning this may run into memory limits on smaller systems */
-
-            /** export three months of posts. If you want to export and import all posts you have to start with
-             * the first year and export/import them in ascending order.
-             *
-             * Don't export linked resource items. we'll have to pull those out separately.
-             */
-
-            $r = q(
-                "select * from item where item_wall = 1 and item_deleted = 0 and uid = %d
-    			and created > %s - INTERVAL %s and resource_type = '' order by created",
-                intval($channel_id),
-                db_utcnow(),
-                db_quoteinterval('3 MONTH')
-            );
-            if ($r) {
-                $ret['item'] = [];
-                xchan_query($r);
-                $r = fetch_post_tags($r, true);
-                foreach ($r as $rr) {
-                    $ret['item'][] = encode_item($rr, true);
-                }
-            }
-        }
-
-        $addon = [
-                'channel_id' => $channel_id,
-                'sections' => $sections,
-                'data' => $ret
-        ];
-        /**
-         * @hooks identity_basic_export
-         *   Called when exporting a channel's basic information for backup or transfer.
-         *   * \e number \b channel_id - The channel ID
-         *   * \e array \b sections
-         *   * \e array \b data - The data will get returned
-         */
-        Hook::call('identity_basic_export', $addon);
-        $ret = $addon['data'];
-
-        return $ret;
-    }
-
-    /**
-     * @brief Export items for a year, or a month of a year.
-     *
-     * @param int $channel_id The channel ID
-     * @param number $year YYYY
-     * @param number $month (optional) 0-12, default 0 complete year
-     * @return array An associative array
-     *   * \e array \b relocate - (optional)
-     *   * \e array \b item - array with items encoded_item()
-     */
-    public static function export_year($channel_id, $year, $month = 0)
-    {
-
-        if (! $year) {
-            return [];
-        }
-
-        if ($month && $month <= 12) {
-            $target_month = sprintf('%02d', $month);
-            $target_month_plus = sprintf('%02d', $month + 1);
-        } else {
-            $target_month = '01';
-        }
-
-        $mindate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month . '-01 00:00:00');
-        if ($month && $month < 12) {
-            $maxdate = datetime_convert('UTC', 'UTC', $year . '-' . $target_month_plus . '-01 00:00:00');
-        } else {
-            $maxdate = datetime_convert('UTC', 'UTC', $year + 1 . '-01-01 00:00:00');
-        }
-
-        return self::export_items_date($channel_id, $mindate, $maxdate);
-    }
-
-    /**
-     * @brief Export items within an arbitrary date range.
-     *
-     * Date/time is in UTC.
-     *
-     * @param int $channel_id The channel ID
-     * @param string $start
-     * @param string $finish
-     * @return array
-     */
-
-    public static function export_items_date($channel_id, $start, $finish)
-    {
-
-        if (! $start) {
-            return [];
-        } else {
-            $start = datetime_convert('UTC', 'UTC', $start);
-        }
-
-        $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now'));
-        if ($finish < $start) {
-            return [];
-        }
-
-        $ret = [];
-
-        $ch = self::from_id($channel_id);
-        if ($ch) {
-            $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()];
-        }
-
-        $ret['compatibility']['codebase'] = 'zap';
-
-        $r = q(
-            "select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created <= '%s'  and resource_type = '' order by created",
-            intval(ITEM_TYPE_POST),
-            intval($channel_id),
-            dbesc($start),
-            dbesc($finish)
-        );
-
-        if ($r) {
-            $ret['item'] = [];
-            xchan_query($r);
-            $r = fetch_post_tags($r, true);
-            foreach ($r as $rr) {
-                $ret['item'][] = encode_item($rr, true);
-            }
-        }
-
-        return $ret;
-    }
-
-
-
-    /**
-     * @brief Export items with pagination
-     *
-     *
-     * @param int $channel_id The channel ID
-     * @param int $page
-     * @param int $limit (default 50)
-     * @return array
-     */
-
-    public static function export_items_page($channel_id, $start, $finish, $page = 0, $limit = 50)
-    {
-
-        if (intval($page) < 1) {
-            $page = 0;
-        }
-
-        if (intval($limit) < 1) {
-            $limit = 1;
-        }
-
-        if (intval($limit) > 5000) {
-            $limit = 5000;
-        }
-
-        if (! $start) {
-            $start = NULL_DATE;
-        } else {
-            $start = datetime_convert('UTC', 'UTC', $start);
-        }
-
-        $finish = datetime_convert('UTC', 'UTC', (($finish) ? $finish : 'now'));
-        if ($finish < $start) {
-            return [];
-        }
-
-        $offset = intval($limit) * intval($page);
-
-        $ret = [];
-
-        $ch = self::from_id($channel_id);
-        if ($ch) {
-            $ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()];
-        }
-
-        $ret['compatibility']['codebase'] = 'zap';
-
-
-        $r = q(
-            "select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and resource_type = '' and created >= '%s' and created <= '%s' order by created limit %d offset %d",
-            intval(ITEM_TYPE_POST),
-            intval($channel_id),
-            dbesc($start),
-            dbesc($finish),
-            intval($limit),
-            intval($offset)
-        );
-
-        if ($r) {
-            $ret['item'] = [];
-            xchan_query($r);
-            $r = fetch_post_tags($r, true);
-            foreach ($r as $rr) {
-                $ret['item'][] = encode_item($rr, true);
-            }
-        }
-
-        return $ret;
-    }
-
-
-
-    public static function get_my_url()
-    {
-        if (x($_SESSION, 'zrl_override')) {
-            return $_SESSION['zrl_override'];
-        }
-        if (x($_SESSION, 'my_url')) {
-            return $_SESSION['my_url'];
-        }
-
-        return false;
-    }
-
-    public static function get_my_address()
-    {
-        if (x($_SESSION, 'zid_override')) {
-            return $_SESSION['zid_override'];
-        }
-        if (x($_SESSION, 'my_address')) {
-            return $_SESSION['my_address'];
-        }
-
-        return false;
-    }
-
-    /**
-     * @brief Add visitor's zid to our xchan and attempt authentication.
-     *
-     * If somebody arrives at our site using a zid, add their xchan to our DB if we
-     * don't have it already.
-     * And if they aren't already authenticated here, attempt reverse magic auth.
-     */
-    public static function zid_init()
-    {
-        $tmp_str = self::get_my_address();
-        if (validate_email($tmp_str)) {
-            $arr = [
-                    'zid' => $tmp_str,
-                    'url' => App::$cmd
-            ];
-            /**
-            * @hooks zid_init
-            *   * \e string \b zid - their zid
-            *   * \e string \b url - the destination url
-            */
-            Hook::call('zid_init', $arr);
-
-            if (! local_channel()) {
-                $r = q(
-                    "select * from hubloc where hubloc_addr = '%s' order by hubloc_connected desc limit 1",
-                    dbesc($tmp_str)
-                );
-                if (! $r) {
-                    Run::Summon([ 'Gprobe', bin2hex($tmp_str) ]);
-                }
-                if ($r && remote_channel() && remote_channel() === $r[0]['hubloc_hash']) {
-                    return;
-                }
-
-                logger('Not authenticated. Invoking reverse magic-auth for ' . $tmp_str);
-                // try to avoid recursion - but send them home to do a proper magic auth
-                $query = App::$query_string;
-                $query = str_replace(array('?zid=','&zid='), array('?rzid=','&rzid='), $query);
-                $dest = '/' . $query;
-                if ($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest, '/magic')) && (! strstr($dest, '/rmagic'))) {
-                    goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&owa=1&bdest=' . bin2hex(z_root() . $dest));
-                } else {
-                    logger('No hubloc found.');
-                }
-            }
-        }
-    }
-
-    /**
-     * @brief If somebody arrives at our site using a zat, authenticate them.
-     *
-     */
-    public static function zat_init()
-    {
-        if (local_channel() || remote_channel()) {
-            return;
-        }
-
-        $r = q(
-            "select * from atoken where atoken_token = '%s' limit 1",
-            dbesc($_REQUEST['zat'])
-        );
-        if ($r) {
-            $xchan = atoken_xchan($r[0]);
-            atoken_login($xchan);
-        }
-    }
-
-    public static function atoken_delete_and_sync($channel_id, $atoken_guid)
-    {
-        $r = q(
-            "select * from atoken where atoken_guid = '%s' and atoken_uid = %d",
-            dbesc($atoken_guid),
-            intval($channel_id)
-        );
-        if ($r) {
-            $atok = array_shift($r);
-            $atok['deleted'] = true;
-            atoken_delete($atok['atoken_id']);
-            Libsync::build_sync_packet($channel_id, [ 'atoken' => [ $atok ] ]);
-        }
-    }
-
-    /**
-     * @brief Used from within PCSS themes to set theme parameters.
-     *
-     * If there's a puid request variable, that is the "page owner" and normally
-     * their theme settings take precedence; unless a local user sets the "always_my_theme"
-     * system pconfig, which means they don't want to see anybody else's theme
-     * settings except their own while on this site.
-     *
-     * @return int
-     */
-    public static function get_theme_uid()
-    {
-        $uid = ((isset($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
-        if (local_channel()) {
-            if ((get_pconfig(local_channel(), 'system', 'always_my_theme')) || (! $uid)) {
-                return local_channel();
-            }
-        }
-        if (! $uid) {
-            $x = self::get_system();
-            if ($x) {
-                return $x['channel_id'];
-            }
-        }
-
-        return $uid;
-    }
-
-    /**
-    * @brief Retrieves the path of the default_profile_photo for this system
-    * with the specified size.
-    *
-    * @param int $size (optional) default 300
-    *   one of (300, 80, 48)
-    * @return string with path to profile photo
-    */
-    public static function get_default_profile_photo($size = 300)
-    {
-        $scheme = get_config('system', 'default_profile_photo');
-        if (! $scheme) {
-            $scheme = 'rainbow_man';
-        }
-
-        if (! is_dir('images/default_profile_photos/' . $scheme)) {
-            $x = [ 'scheme' => $scheme, 'size' => $size, 'url' => '' ];
-            Hook::call('default_profile_photo', $x);
-            if ($x['url']) {
-                return $x['url'];
-            } else {
-                $scheme = 'rainbow_man';
-            }
-        }
-
-        return 'images/default_profile_photos/' . $scheme . '/' . $size . '.png';
-    }
-
-    /**
-     * @brief Test whether a given identity is NOT a member of the Hubzilla.
-     *
-     * @param string $s
-     *    xchan_hash of the identity in question
-     * @return bool true or false
-     */
-    public static function is_foreigner($s)
-    {
-        return((strpbrk($s, '.:@')) ? true : false);
-    }
-
-    /**
-     * @brief Test whether a given identity is a member of the Hubzilla.
-     *
-     * @param string $s
-     *    xchan_hash of the identity in question
-     * @return bool true or false
-     */
-    public static function is_member($s)
-    {
-        return((self::is_foreigner($s)) ? false : true);
-    }
-
-    /**
-     * @brief Get chatpresence status for nick.
-     *
-     * @param string $nick
-     * @return array An associative array with
-     *   * \e bool \b result
-     */
-    public static function get_online_status($nick)
-    {
-
-        $ret = array('result' => false);
-
-        if (observer_prohibited()) {
-            return $ret;
-        }
-
-        $r = q(
-            "select channel_id, channel_hash from channel where channel_address = '%s' limit 1",
-            dbesc($nick)
-        );
-        if ($r) {
-            $hide = get_pconfig($r[0]['channel_id'], 'system', 'hide_online_status');
-            if ($hide) {
-                return $ret;
-            }
-            $x = q(
-                "select cp_status from chatpresence where cp_xchan = '%s' and cp_room = 0 limit 1",
-                dbesc($r[0]['channel_hash'])
-            );
-            if ($x) {
-                $ret['result'] = $x[0]['cp_status'];
-            }
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param string $webbie
-     * @return array|bool|string
-     */
-    public static function remote_online_status($webbie)
-    {
-
-        $result = false;
-        $r = q(
-            "select * from hubloc where hubloc_addr = '%s' limit 1",
-            dbesc($webbie)
-        );
-        if (! $r) {
-            return $result;
-        }
-        $url = $r[0]['hubloc_url'] . '/online/' . substr($webbie, 0, strpos($webbie, '@'));
-
-        $x = z_fetch_url($url);
-        if ($x['success']) {
-            $j = json_decode($x['body'], true);
-            if ($j) {
-                $result = (($j['result']) ? $j['result'] : false);
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * @brief Return the parsed identity selector HTML template.
-     *
-     * @return string with parsed HTML channel_id_selet template
-     */
-    public static function identity_selector()
-    {
-        if (local_channel()) {
-            $r = q(
-                "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
-                intval(get_account_id())
-            );
-            if ($r && count($r) > 1) {
-                $o = replace_macros(Theme::get_template('channel_id_select.tpl'), array(
-                    '$channels' => $r,
-                    '$selected' => local_channel()
-                ));
-
-                return $o;
-            }
-        }
-
-        return '';
-    }
-
-
-    public static function is_public_profile()
-    {
-        if (! local_channel()) {
-            return false;
-        }
-
-        if (intval(get_config('system', 'block_public'))) {
-            return false;
-        }
-
-        $channel = App::get_channel();
-        if ($channel) {
-            $perm = PermissionLimits::Get($channel['channel_id'], 'view_profile');
-            if ($perm == PERMS_PUBLIC) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static function get_profile_fields_basic($filter = 0)
-    {
-
-        $profile_fields_basic = (($filter == 0) ? get_config('system', 'profile_fields_basic') : null);
-
-        if (! $profile_fields_basic) {
-            $profile_fields_basic = array('fullname','pdesc','chandesc','basic_gender','pronouns','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact');
-        }
-
-        $x = [];
-        if ($profile_fields_basic) {
-            foreach ($profile_fields_basic as $f) {
-                $x[$f] = 1;
-            }
-        }
-
-        return $x;
-    }
-
-
-    public static function get_profile_fields_advanced($filter = 0)
-    {
-        $basic = self::get_profile_fields_basic($filter);
-        $profile_fields_advanced = (($filter == 0) ? get_config('system', 'profile_fields_advanced') : null);
-        if (! $profile_fields_advanced) {
-            $profile_fields_advanced = array('comms', 'address','locality','postal_code','advanced_gender', 'partner','howlong','politic','religion','likes','dislikes','interest','channels','music','book','film','tv','romance','employment','education');
-        }
-        $x = [];
-        if ($basic) {
-            foreach ($basic as $f => $v) {
-                $x[$f] = $v;
-            }
-        }
-
-        if ($profile_fields_advanced) {
-            foreach ($profile_fields_advanced as $f) {
-                $x[$f] = 1;
-            }
-        }
-
-        return $x;
-    }
-
-    /**
-     * @brief Clear notifyflags for a channel.
-     *
-     * Most likely during bulk import of content or other activity that is likely
-     * to generate huge amounts of undesired notifications.
-     *
-     * @param int $channel_id
-     *    The channel to disable notifications for
-     * @return int
-     *    Current notification flag value. Send this to notifications_on() to restore the channel settings when finished
-     *    with the activity requiring notifications_off();
-     */
-    public static function notifications_off($channel_id)
-    {
-        $r = q(
-            "select channel_notifyflags from channel where channel_id = %d limit 1",
-            intval($channel_id)
-        );
-        q(
-            "update channel set channel_notifyflags = 0 where channel_id = %d",
-            intval($channel_id)
-        );
-
-        return intval($r[0]['channel_notifyflags']);
-    }
-
-
-    public static function notifications_on($channel_id, $value)
-    {
-        $x = q(
-            "update channel set channel_notifyflags = %d where channel_id = %d",
-            intval($value),
-            intval($channel_id)
-        );
-
-        return $x;
-    }
-
-
-    public static function get_default_perms($uid)
-    {
-
-        $ret = [];
-
-        $r = q(
-            "select abook_xchan from abook where abook_channel = %d and abook_self = 1 limit 1",
-            intval($uid)
-        );
-        if ($r) {
-            $ret = Permissions::FilledPerms(get_abconfig($uid, $r[0]['abook_xchan'], 'system', 'my_perms', EMPTY_STR));
-        }
-
-        return $ret;
-    }
-
-
-    public static function profiles_build_sync($channel_id, $send = true)
-    {
-        $r = q(
-            "select * from profile where uid = %d",
-            intval($channel_id)
-        );
-        if ($r) {
-            if ($send) {
-                Libsync::build_sync_packet($channel_id, array('profile' => $r));
-            } else {
-                return $r;
-            }
-        }
-    }
-
-
-    public static function auto_create($account_id)
-    {
-
-        if (! $account_id) {
-            return false;
-        }
-
-        $arr = [];
-        $arr['account_id'] = $account_id;
-        $arr['name'] = get_aconfig($account_id, 'register', 'channel_name');
-        $arr['nickname'] = legal_webbie(get_aconfig($account_id, 'register', 'channel_address'));
-        $arr['permissions_role'] = get_aconfig($account_id, 'register', 'permissions_role');
-
-        del_aconfig($account_id, 'register', 'channel_name');
-        del_aconfig($account_id, 'register', 'channel_address');
-        del_aconfig($account_id, 'register', 'permissions_role');
-
-        if ((! $arr['name']) || (! $arr['nickname'])) {
-            $x = q(
-                "select * from account where account_id = %d limit 1",
-                intval($account_id)
-            );
-            if ($x) {
-                if (! $arr['name']) {
-                    $arr['name'] = substr($x[0]['account_email'], 0, strpos($x[0]['account_email'], '@'));
-                }
-                if (! $arr['nickname']) {
-                    $arr['nickname'] = legal_webbie(substr($x[0]['account_email'], 0, strpos($x[0]['account_email'], '@')));
-                }
-            }
-        }
-        if (! $arr['permissions_role']) {
-            $arr['permissions_role'] = 'social';
-        }
-
-        if (self::validate_channelname($arr['name'])) {
-            return false;
-        }
-        if ($arr['nickname'] === 'sys') {
-            $arr['nickname'] = $arr['nickname'] . mt_rand(1000, 9999);
-        }
-
-        $arr['nickname'] = check_webbie(array($arr['nickname'], $arr['nickname'] . mt_rand(1000, 9999)));
-
-        return self::create($arr);
-    }
-
-    public static function get_cover_photo($channel_id, $format = 'bbcode', $res = PHOTO_RES_COVER_1200)
-    {
-
-        $r = q(
-            "select height, width, resource_id, edited, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d",
-            intval($channel_id),
-            intval($res),
-            intval(PHOTO_COVER)
-        );
-        if (! $r) {
-            return false;
-        }
-
-        $output = false;
-
-        $url = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $res ;
-
-        switch ($format) {
-            case 'bbcode':
-                $output = '[zrl=' . $r[0]['width'] . 'x' . $r[0]['height'] . ']' . $url . '[/zrl]';
-                break;
-            case 'html':
-                $output = '' . t('cover photo') . '';
-                break;
-            case 'array':
-            default:
-                $output = array(
-                    'width' => $r[0]['width'],
-                    'height' => $r[0]['height'],
-                    'type' => $r[0]['mimetype'],
-                    'updated' => $r[0]['edited'],
-                    'url' => $url
-                );
-                break;
-        }
-
-        return $output;
-    }
-
-
-    /**
-     * @brief Return parsed HTML zcard template.
-     *
-     * @param array $channel
-     * @param string $observer_hash (optional)
-     * @param array $args (optional)
-     * @return string parsed HTML from \e zcard template
-     */
-    public static function get_zcard($channel, $observer_hash = '', $args = [])
-    {
-
-        logger('get_zcard');
-
-        $maxwidth = (($args['width']) ? intval($args['width']) : 0);
-        $maxheight = (($args['height']) ? intval($args['height']) : 0);
-
-        if (($maxwidth > 1200) || ($maxwidth < 1)) {
-            $maxwidth = 1200;
-            $cover_width = 1200;
-        }
-
-        if ($maxwidth <= 425) {
-            $width = 425;
-            $cover_width = 425;
-            $size = 'hz_small';
-            $cover_size = PHOTO_RES_COVER_425;
-            $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m'] . '?rev=' . strtotime($channel['xchan_photo_date']));
-        } elseif ($maxwidth <= 900) {
-            $width = 900;
-            $cover_width = 850;
-            $size = 'hz_medium';
-            $cover_size = PHOTO_RES_COVER_850;
-            $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 160 , 'height' => 160, 'href' => $channel['xchan_photo_l'] . '?rev=' . strtotime($channel['xchan_photo_date']));
-        } elseif ($maxwidth <= 1200) {
-            $width = 1200;
-            $cover_width = 1200;
-            $size = 'hz_large';
-            $cover_size = PHOTO_RES_COVER_1200;
-            $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'], 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l'] . '?rev=' . strtotime($channel['xchan_photo_date']));
-        }
-
-        //  $scale = (float) $maxwidth / $width;
-        //  $translate = intval(($scale / 1.0) * 100);
-
-        $channel['channel_addr'] = self::get_webfinger($channel);
-        $zcard = array('chan' => $channel);
-
-        $r = q(
-            "select height, width, resource_id, imgscale, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d",
-            intval($channel['channel_id']),
-            intval($cover_size),
-            intval(PHOTO_COVER)
-        );
-
-        if ($r) {
-            $cover = $r[0];
-            $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale'];
-        } else {
-            $default_cover = get_config('system', 'default_cover_photo', 'pexels-94622');
-            $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.jpg' ];
-        }
-
-        $o .= replace_macros(Theme::get_template('zcard.tpl'), array(
-            '$maxwidth' => $maxwidth,
-            '$scale' => $scale,
-            '$translate' => $translate,
-            '$size' => $size,
-            '$cover' => $cover,
-            '$pphoto' => $pphoto,
-            '$zcard' => $zcard
-        ));
-
-        return $o;
-    }
-
-
-    /**
-     * @brief Return parsed HTML embed zcard template.
-     *
-     * @param array $channel
-     * @param string $observer_hash (optional)
-     * @param array $args (optional)
-     * @return string parsed HTML from \e zcard_embed template
-     */
-    public static function get_zcard_embed($channel, $observer_hash = '', $args = [])
-    {
-
-        logger('get_zcard_embed');
-
-        $maxwidth = (($args['width']) ? intval($args['width']) : 0);
-        $maxheight = (($args['height']) ? intval($args['height']) : 0);
-
-        if (($maxwidth > 1200) || ($maxwidth < 1)) {
-            $maxwidth = 1200;
-            $cover_width = 1200;
-        }
-
-        if ($maxwidth <= 425) {
-            $width = 425;
-            $cover_width = 425;
-            $size = 'hz_small';
-            $cover_size = PHOTO_RES_COVER_425;
-            $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'],  'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m']);
-        } elseif ($maxwidth <= 900) {
-            $width = 900;
-            $cover_width = 850;
-            $size = 'hz_medium';
-            $cover_size = PHOTO_RES_COVER_850;
-            $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'],  'width' => 160 , 'height' => 160, 'href' => $channel['xchan_photo_l']);
-        } elseif ($maxwidth <= 1200) {
-            $width = 1200;
-            $cover_width = 1200;
-            $size = 'hz_large';
-            $cover_size = PHOTO_RES_COVER_1200;
-            $pphoto = array('mimetype' => $channel['xchan_photo_mimetype'],  'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l']);
-        }
-
-        $channel['channel_addr'] = self::get_webfinger($channel);
-        $zcard = array('chan' => $channel);
-
-        $r = q(
-            "select height, width, resource_id, imgscale, mimetype from photo where uid = %d and imgscale = %d and photo_usage = %d",
-            intval($channel['channel_id']),
-            intval($cover_size),
-            intval(PHOTO_COVER)
-        );
-
-        if ($r) {
-            $cover = $r[0];
-            $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale'];
-        } else {
-            $default_cover = get_config('system', 'default_cover_photo', 'pexels-94622');
-            $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.jpg' ];
-        }
-
-        $o .= replace_macros(Theme::get_template('zcard_embed.tpl'), array(
-            '$maxwidth' => $maxwidth,
-            '$scale' => $scale,
-            '$translate' => $translate,
-            '$size' => $size,
-            '$cover' => $cover,
-            '$pphoto' => $pphoto,
-            '$zcard' => $zcard
-        ));
-
-        return $o;
-    }
-
-    /**
-     * @brief Get a channel array from a channel nickname.
-     *
-     * @param string $nick - A channel_address nickname
-     * @return array|bool
-     *   - array with channel entry
-     *   - false if no channel with $nick was found
-     */
-
-    public static function from_username($nick, $include_removed = false)
-    {
-
-        $sql_extra = (($include_removed) ? "" : " and channel_removed = 0 ");
-
-        // If we are provided a Unicode nickname convert to IDN
-
-        $nick = punify($nick);
-
-        // return a cached copy if there is a cached copy and it's a match.
-        // Also check that there is an xchan_hash to validate the App::$channel data is complete
-        // and that columns from both joined tables are present
-
-        if (
-            App::$channel && is_array(App::$channel) && array_key_exists('channel_address', App::$channel)
-            && array_key_exists('xchan_hash', App::$channel) && App::$channel['channel_address'] === $nick
-        ) {
-            return App::$channel;
-        }
-
-        $r = q(
-            "SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' $sql_extra LIMIT 1",
-            dbesc($nick)
-        );
-
-        return(($r) ? array_shift($r) : false);
-    }
-
-    /**
-     * @brief Get a channel array by a channel_hash.
-     *
-     * @param string $hash
-     * @return array|bool false if channel ID not found, otherwise the channel array
-     */
-
-    public static function from_hash($hash, $include_removed = false)
-    {
-
-        $sql_extra = (($include_removed) ? "" : " and channel_removed = 0 ");
-
-        if (
-            App::$channel && is_array(App::$channel) && array_key_exists('channel_hash', App::$channel)
-            && array_key_exists('xchan_hash', App::$channel) && App::$channel['channel_hash'] === $hash
-        ) {
-            return App::$channel;
-        }
-
-        $r = q(
-            "SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_hash = '%s' $sql_extra LIMIT 1",
-            dbesc($hash)
-        );
-
-        return(($r) ? array_shift($r) : false);
-    }
-
-
-    /**
-     * @brief Get a channel array by a channel ID.
-     *
-     * @param int $id A channel ID
-     * @return array|bool false if channel ID not found, otherwise the channel array
-     */
-
-    public static function from_id($id, $include_removed = false)
-    {
-
-        $sql_extra = (($include_removed) ? "" : " and channel_removed = 0 ");
-
-        if (
-            App::$channel && is_array(App::$channel) && array_key_exists('channel_id', App::$channel)
-            && array_key_exists('xchan_hash', App::$channel) && intval(App::$channel['channel_id']) === intval($id)
-        ) {
-            return App::$channel;
-        }
-
-        $r = q(
-            "SELECT * FROM channel LEFT JOIN xchan ON channel_hash = xchan_hash WHERE channel_id = %d $sql_extra LIMIT 1",
-            dbesc($id)
-        );
-
-        return(($r) ? array_shift($r) : false);
-    }
-
-    /**
-     * @brief
-     *
-     * @param array $channel
-     * @return string
-     */
-
-    public static function get_webfinger($channel)
-    {
-        if (! ($channel && array_key_exists('channel_address', $channel))) {
-            return '';
-        }
-
-        return strtolower($channel['channel_address'] . '@' . App::get_hostname());
-    }
-
-
-    /**
-     * @brief Get manual channel conversation update config.
-     *
-     * Check the channel config \e manual_conversation_update, if not set fall back
-     * to global system config, defaults to 1 if nothing set.
-     *
-     * @param int $channel_id
-     * @return int
-     */
-
-    public static function manual_conv_update($channel_id)
-    {
-
-        $x = get_pconfig($channel_id, 'system', 'manual_conversation_update', get_config('system', 'manual_conversation_update', 1));
-        return intval($x);
-    }
-
-
-    /**
-     * @brief Return parsed HTML remote_login template.
-     *
-     * @return string with parsed HTML from \e remote_login template
-     */
-    public static function remote_login()
-    {
-        $o = replace_macros(Theme::get_template('remote_login.tpl'), array(
-            '$title' => t('Remote Authentication'),
-            '$desc' => t('Enter your channel address (e.g. channel@example.com)'),
-            '$submit' => t('Authenticate')
-        ));
-
-        return $o;
-    }
-
-    public static function channel_store_lowlevel($arr)
-    {
-        $store = [
-            'channel_account_id'      => ((array_key_exists('channel_account_id', $arr))      ? $arr['channel_account_id']      : '0'),
-            'channel_primary'         => ((array_key_exists('channel_primary', $arr))         ? $arr['channel_primary']         : '0'),
-            'channel_name'            => ((array_key_exists('channel_name', $arr))            ? $arr['channel_name']            : ''),
-            'channel_parent'          => ((array_key_exists('channel_parent', $arr))          ? $arr['channel_parent']          : ''),
-            'channel_address'         => ((array_key_exists('channel_address', $arr))         ? $arr['channel_address']         : ''),
-            'channel_guid'            => ((array_key_exists('channel_guid', $arr))            ? $arr['channel_guid']            : ''),
-            'channel_guid_sig'        => ((array_key_exists('channel_guid_sig', $arr))        ? $arr['channel_guid_sig']        : ''),
-            'channel_hash'            => ((array_key_exists('channel_hash', $arr))            ? $arr['channel_hash']            : ''),
-            'channel_timezone'        => ((array_key_exists('channel_timezone', $arr))        ? $arr['channel_timezone']        : 'UTC'),
-            'channel_location'        => ((array_key_exists('channel_location', $arr))        ? $arr['channel_location']        : ''),
-            'channel_theme'           => ((array_key_exists('channel_theme', $arr))           ? $arr['channel_theme']           : ''),
-            'channel_startpage'       => ((array_key_exists('channel_startpage', $arr))       ? $arr['channel_startpage']       : ''),
-            'channel_pubkey'          => ((array_key_exists('channel_pubkey', $arr))          ? $arr['channel_pubkey']          : ''),
-            'channel_prvkey'          => ((array_key_exists('channel_prvkey', $arr))          ? $arr['channel_prvkey']          : ''),
-            'channel_notifyflags'     => ((array_key_exists('channel_notifyflags', $arr))     ? $arr['channel_notifyflags']     : '65535'),
-            'channel_pageflags'       => ((array_key_exists('channel_pageflags', $arr))       ? $arr['channel_pageflags']       : '0'),
-            'channel_dirdate'         => ((array_key_exists('channel_dirdate', $arr))         ? $arr['channel_dirdate']         : NULL_DATE),
-            'channel_lastpost'        => ((array_key_exists('channel_lastpost', $arr))        ? $arr['channel_lastpost']        : NULL_DATE),
-            'channel_deleted'         => ((array_key_exists('channel_deleted', $arr))         ? $arr['channel_deleted']         : NULL_DATE),
-            'channel_active'          => ((array_key_exists('channel_active', $arr))          ? $arr['channel_active']          : NULL_DATE),
-            'channel_max_anon_mail'   => ((array_key_exists('channel_max_anon_mail', $arr))   ? $arr['channel_max_anon_mail']   : '10'),
-            'channel_max_friend_req'  => ((array_key_exists('channel_max_friend_req', $arr))  ? $arr['channel_max_friend_req']  : '10'),
-            'channel_expire_days'     => ((array_key_exists('channel_expire_days', $arr))     ? $arr['channel_expire_days']     : '0'),
-            'channel_passwd_reset'    => ((array_key_exists('channel_passwd_reset', $arr))    ? $arr['channel_passwd_reset']    : ''),
-            'channel_default_group'   => ((array_key_exists('channel_default_group', $arr))   ? $arr['channel_default_group']   : ''),
-            'channel_allow_cid'       => ((array_key_exists('channel_allow_cid', $arr))       ? $arr['channel_allow_cid']       : ''),
-            'channel_allow_gid'       => ((array_key_exists('channel_allow_gid', $arr))       ? $arr['channel_allow_gid']       : ''),
-            'channel_deny_cid'        => ((array_key_exists('channel_deny_cid', $arr))        ? $arr['channel_deny_cid']        : ''),
-            'channel_deny_gid'        => ((array_key_exists('channel_deny_gid', $arr))        ? $arr['channel_deny_gid']        : ''),
-            'channel_removed'         => ((array_key_exists('channel_removed', $arr))         ? $arr['channel_removed']         : '0'),
-            'channel_system'          => ((array_key_exists('channel_system', $arr))          ? $arr['channel_system']          : '0'),
-            'channel_moved'           => ((array_key_exists('channel_moved', $arr))           ? $arr['channel_moved']           : ''),
-            'channel_password'        => ((array_key_exists('channel_password', $arr))        ? $arr['channel_password']        : ''),
-            'channel_salt'            => ((array_key_exists('channel_salt', $arr))            ? $arr['channel_salt']            : '')
-        ];
-
-        return create_table_from_array('channel', $store);
-    }
-
-    public static function profile_store_lowlevel($arr)
-    {
-
-        $store = [
-            'profile_guid'  => ((array_key_exists('profile_guid', $arr))  ? $arr['profile_guid']  : ''),
-            'aid'           => ((array_key_exists('aid', $arr))           ? $arr['aid']           : 0),
-            'uid'           => ((array_key_exists('uid', $arr))           ? $arr['uid']           : 0),
-            'profile_name'  => ((array_key_exists('profile_name', $arr))  ? $arr['profile_name']  : ''),
-            'is_default'    => ((array_key_exists('is_default', $arr))    ? $arr['is_default']    : 0),
-            'hide_friends'  => ((array_key_exists('hide_friends', $arr))  ? $arr['hide_friends']  : 0),
-            'fullname'      => ((array_key_exists('fullname', $arr))      ? $arr['fullname']      : ''),
-            'pdesc'         => ((array_key_exists('pdesc', $arr))         ? $arr['pdesc']         : ''),
-            'chandesc'      => ((array_key_exists('chandesc', $arr))      ? $arr['chandesc']      : ''),
-            'dob'           => ((array_key_exists('dob', $arr))           ? $arr['dob']           : ''),
-            'dob_tz'        => ((array_key_exists('dob_tz', $arr))        ? $arr['dob_tz']        : ''),
-            'address'       => ((array_key_exists('address', $arr))       ? $arr['address']       : ''),
-            'locality'      => ((array_key_exists('locality', $arr))      ? $arr['locality']      : ''),
-            'region'        => ((array_key_exists('region', $arr))        ? $arr['region']        : ''),
-            'postal_code'   => ((array_key_exists('postal_code', $arr))   ? $arr['postal_code']   : ''),
-            'country_name'  => ((array_key_exists('country_name', $arr))  ? $arr['country_name']  : ''),
-            'hometown'      => ((array_key_exists('hometown', $arr))      ? $arr['hometown']      : ''),
-            'gender'        => ((array_key_exists('gender', $arr))        ? $arr['gender']        : ''),
-            'marital'       => ((array_key_exists('marital', $arr))       ? $arr['marital']       : ''),
-            'partner'       => ((array_key_exists('partner', $arr))       ? $arr['partner']       : ''),
-            'howlong'       => ((array_key_exists('howlong', $arr))       ? $arr['howlong']       : NULL_DATE),
-            'sexual'        => ((array_key_exists('sexual', $arr))        ? $arr['sexual']        : ''),
-            'pronouns'      => ((array_key_exists('pronouns', $arr))      ? $arr['pronouns']      : ''),
-            'politic'       => ((array_key_exists('politic', $arr))       ? $arr['politic']       : ''),
-            'religion'      => ((array_key_exists('religion', $arr))      ? $arr['religion']      : ''),
-            'keywords'      => ((array_key_exists('keywords', $arr))      ? $arr['keywords']      : ''),
-            'likes'         => ((array_key_exists('likes', $arr))         ? $arr['likes']         : ''),
-            'dislikes'      => ((array_key_exists('dislikes', $arr))      ? $arr['dislikes']      : ''),
-            'about'         => ((array_key_exists('about', $arr))         ? $arr['about']         : ''),
-            'summary'       => ((array_key_exists('summary', $arr))       ? $arr['summary']       : ''),
-            'music'         => ((array_key_exists('music', $arr))         ? $arr['music']         : ''),
-            'book'          => ((array_key_exists('book', $arr))          ? $arr['book']          : ''),
-            'tv'            => ((array_key_exists('tv', $arr))            ? $arr['tv']            : ''),
-            'film'          => ((array_key_exists('film', $arr))          ? $arr['film']          : ''),
-            'interest'      => ((array_key_exists('interest', $arr))      ? $arr['interest']      : ''),
-            'romance'       => ((array_key_exists('romance', $arr))       ? $arr['romance']       : ''),
-            'employment'    => ((array_key_exists('employment', $arr))    ? $arr['employment']    : ''),
-            'education'     => ((array_key_exists('education', $arr))     ? $arr['education']     : ''),
-            'contact'       => ((array_key_exists('contact', $arr))       ? $arr['contact']       : ''),
-            'channels'      => ((array_key_exists('channels', $arr))      ? $arr['channels']      : ''),
-            'homepage'      => ((array_key_exists('homepage', $arr))      ? $arr['homepage']      : ''),
-            'photo'         => ((array_key_exists('photo', $arr))         ? $arr['photo']         : ''),
-            'thumb'         => ((array_key_exists('thumb', $arr))         ? $arr['thumb']         : ''),
-            'publish'       => ((array_key_exists('publish', $arr))       ? $arr['publish']       : 0),
-            'profile_vcard' => ((array_key_exists('profile_vcard', $arr)) ? $arr['profile_vcard'] : '')
-        ];
-
-        return create_table_from_array('profile', $store);
-    }
-
-
-
-    /**
-     * @brief Removes a channel.
-     *
-     * @param int $channel_id
-     * @param bool $local default true
-     * @param bool $unset_session default false
-     */
-
-    public static function channel_remove($channel_id, $local = true, $unset_session = false)
-    {
-
-        if (! $channel_id) {
-            return;
-        }
-
-        // global removal (all clones) not currently supported
-        // hence this operation _may_ leave orphan data on remote servers
-
-        $local = true;
-
-        logger('Removing channel: ' . $channel_id);
-        logger('local only: ' . intval($local));
-
-
-        $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id));
-        if (! $r) {
-            logger('channel not found: ' . $channel_id);
-            return;
-        }
-
-        $channel = $r[0];
-
-        /**
-         * @hooks channel_remove
-         *   Called when removing a channel.
-         *   * \e array with entry from channel tabel for $channel_id
-         */
-
-        Hook::call('channel_remove', $channel);
-
-        $r = q(
-            "select iid from iconfig left join item on item.id = iconfig.iid
-    		where item.uid = %d",
-            intval($channel_id)
-        );
-        if ($r) {
-            foreach ($r as $rr) {
-                q(
-                    "delete from iconfig where iid = %d",
-                    intval($rr['iid'])
-                );
-            }
-        }
-
-        q("DELETE FROM app WHERE app_channel = %d", intval($channel_id));
-        q("DELETE FROM atoken WHERE atoken_uid = %d", intval($channel_id));
-        q("DELETE FROM chatroom WHERE cr_uid = %d", intval($channel_id));
-        q("DELETE FROM conv WHERE uid = %d", intval($channel_id));
-
-        q("DELETE FROM pgrp WHERE uid = %d", intval($channel_id));
-        q("DELETE FROM pgrp_member WHERE uid = %d", intval($channel_id));
-        q("DELETE FROM event WHERE uid = %d", intval($channel_id));
-        q("DELETE FROM menu WHERE menu_channel_id = %d", intval($channel_id));
-        q("DELETE FROM menu_item WHERE mitem_channel_id = %d", intval($channel_id));
-
-        q("DELETE FROM notify WHERE uid = %d", intval($channel_id));
-        q("DELETE FROM obj WHERE obj_channel = %d", intval($channel_id));
-
-
-        q("DELETE FROM photo WHERE uid = %d", intval($channel_id));
-        q("DELETE FROM attach WHERE uid = %d", intval($channel_id));
-        q("DELETE FROM profile WHERE uid = %d", intval($channel_id));
-        q("DELETE FROM source WHERE src_channel_id = %d", intval($channel_id));
-
-        $r = q("select hash FROM attach WHERE uid = %d", intval($channel_id));
-        if ($r) {
-            foreach ($r as $rv) {
-                attach_delete($channel_id, $rv['hash']);
-            }
-        }
-
-
-        q(
-            "delete from abook where abook_xchan = '%s' and abook_self = 1 ",
-            dbesc($channel['channel_hash'])
-        );
-
-        $r = q(
-            "update channel set channel_deleted = '%s', channel_removed = 1 where channel_id = %d",
-            dbesc(datetime_convert()),
-            intval($channel_id)
-        );
-
-        // remove items
-
-        Run::Summon([ 'Channel_purge', $channel_id ]);
-
-        // if this was the default channel, set another one as default
-
-        if (App::$account['account_default_channel'] == $channel_id) {
-            $r = q(
-                "select channel_id from channel where channel_account_id = %d and channel_removed = 0 limit 1",
-                intval(App::$account['account_id']),
-                intval(PAGE_REMOVED)
-            );
-            if ($r) {
-                $rr = q(
-                    "update account set account_default_channel = %d where account_id = %d",
-                    intval($r[0]['channel_id']),
-                    intval(App::$account['account_id'])
-                );
-                logger("Default channel deleted, changing default to channel_id " . $r[0]['channel_id']);
-            } else {
-                $rr = q(
-                    "update account set account_default_channel = 0 where account_id = %d",
-                    intval(App::$account['account_id'])
-                );
-            }
-        }
-
-        logger('deleting hublocs', LOGGER_DEBUG);
-
-        $r = q(
-            "update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s' and hubloc_url = '%s' ",
-            dbesc($channel['channel_hash']),
-            dbesc(z_root())
-        );
-
-        // Do we have any valid hublocs remaining?
-
-        $hublocs = 0;
-
-        $r = q(
-            "select hubloc_id from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0",
-            dbesc($channel['channel_hash'])
-        );
-        if ($r) {
-            $hublocs = count($r);
-        }
-
-        if (! $hublocs) {
-            $r = q(
-                "update xchan set xchan_deleted = 1 where xchan_hash = '%s' ",
-                dbesc($channel['channel_hash'])
-            );
-            // send a cleanup message to other servers
-            Run::Summon([ 'Notifier', 'purge_all', $channel_id ]);
-        }
-
-        //remove from file system
-
-        $f = 'store/' . $channel['channel_address'];
-        // This shouldn't happen but make sure the address isn't empty because that could do bad things
-        if (is_dir($f) && $channel['channel_address']) {
-            @rrmdir($f);
-        }
-
-        Run::Summon([ 'Directory', $channel_id ]);
-
-        if ($channel_id == local_channel() && $unset_session) {
-            App::$session->nuke();
-            goaway(z_root());
-        }
-    }
-
-    // execute this at least a week after removing a channel
-
-    public static function channel_remove_final($channel_id)
-    {
-
-        q("delete from abook where abook_channel = %d", intval($channel_id));
-        q("delete from abconfig where chan = %d", intval($channel_id));
-        q("delete from pconfig where uid = %d", intval($channel_id));
-        q("delete from channel where channel_id = %d", intval($channel_id));
-    }
-
-
-    /**
-     * @brief This checks if a channel is allowed to publish executable code.
-     *
-     * It is up to the caller to determine if the observer or local_channel
-     * is in fact the resource owner whose channel_id is being checked.
-     *
-     * @param int $channel_id
-     * @return bool
-     */
-    public static function codeallowed($channel_id)
-    {
-        if (! intval($channel_id)) {
-            return false;
-        }
-
-        $x = self::from_id($channel_id);
-        if (($x) && ($x['channel_pageflags'] & PAGE_ALLOWCODE)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public static function anon_identity_init($reqvars)
-    {
-
-        $x = [
-                'request_vars' => $reqvars,
-                'xchan' => null,
-                'success' => 'unset'
-        ];
-        /**
-         * @hooks anon_identity_init
-         *   * \e array \b request_vars
-         *   * \e string \b xchan - return value
-         *   * \e string|int \b success - Must be a number, so xchan return value gets used
-         */
-        Hook::call('anon_identity_init', $x);
-
-        if ($x['success'] !== 'unset' && intval($x['success']) && $x['xchan']) {
-            return $x['xchan'];
-        }
-
-        // allow a captcha handler to over-ride
-        if ($x['success'] !== 'unset' && (intval($x['success']) === 0)) {
-            return false;
-        }
-
-
-        $anon_name  = strip_tags(trim($reqvars['anonname']));
-        $anon_email = strip_tags(trim($reqvars['anonmail']));
-        $anon_url   = strip_tags(trim($reqvars['anonurl']));
-
-        if (! ($anon_name && $anon_email)) {
-            logger('anonymous commenter did not complete form');
-            return false;
-        }
-
-        if (! validate_email($anon_email)) {
-            logger('enonymous email not valid');
-            return false;
-        }
-
-        if (! $anon_url) {
-            $anon_url = z_root();
-        }
-
-        $hash = hash('md5', $anon_email);
-
-        $x = q(
-            "select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'anon' limit 1",
-            dbesc($anon_email),
-            dbesc($hash)
-        );
-
-        if (! $x) {
-            xchan_store_lowlevel([
-                'xchan_guid'    => $anon_email,
-                'xchan_hash'    => $hash,
-                'xchan_name'    => $anon_name,
-                'xchan_url'     => $anon_url,
-                'xchan_network' => 'anon',
-                'xchan_updated' => datetime_convert(),
-                'xchan_name_date' => datetime_convert()
-            ]);
-
-
-            $x = q(
-                "select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'anon' limit 1",
-                dbesc($anon_email),
-                dbesc($hash)
-            );
-
-            $photo = z_root() . '/' . self::get_default_profile_photo(300);
-            $photos = import_remote_xchan_photo($photo, $hash);
-            if ($photos) {
-                $r = q(
-                    "update xchan set xchan_updated = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'anon' ",
-                    dbesc(datetime_convert()),
-                    dbesc(datetime_convert()),
-                    dbesc($photos[0]),
-                    dbesc($photos[1]),
-                    dbesc($photos[2]),
-                    dbesc($photos[3]),
-                    dbesc($anon_email),
-                    dbesc($hash)
-                );
-            }
-        }
-
-        return $x[0];
-    }
-
-    public static function url($channel)
-    {
-
-        // data validation - if this is wrong, log the call stack so we can find the issue
-
-        if (! is_array($channel)) {
-            btlogger('not a channel array: ' . print_r($channel, true));
-        }
-
-        if ($channel['channel_address'] === App::get_hostname() || intval($channel['channel_system'])) {
-            return z_root();
-        }
-
-        return (($channel) ? z_root() . '/channel/' . $channel['channel_address'] : z_root());
-    }
-
-    public static function is_group($uid)
-    {
-        $role = get_pconfig($uid, 'system', 'permissions_role');
-        $rolesettings = PermissionRoles::role_perms($role);
-        return ((isset($rolesettings['channel_type']) && $rolesettings['channel_type'] === 'group') ? true : false);
-    }
-}
diff --git a/Zotlabs/Lib/Chatroom.php b/Zotlabs/Lib/Chatroom.php
deleted file mode 100644
index a82da7910..000000000
--- a/Zotlabs/Lib/Chatroom.php
+++ /dev/null
@@ -1,315 +0,0 @@
- false);
-
-        $name = trim($arr['name']);
-        if (!$name) {
-            $ret['message'] = t('Missing room name');
-            return $ret;
-        }
-
-        $r = q(
-            "select cr_id from chatroom where cr_uid = %d and cr_name = '%s' limit 1",
-            intval($channel['channel_id']),
-            dbesc($name)
-        );
-        if ($r) {
-            $ret['message'] = t('Duplicate room name');
-            return $ret;
-        }
-
-        $r = q(
-            "select count(cr_id) as total from chatroom where cr_aid = %d",
-            intval($channel['channel_account_id'])
-        );
-        if ($r) {
-            $limit = ServiceClass::fetch($channel['channel_id'], 'chatrooms');
-        }
-
-        if (($r) && ($limit !== false) && ($r[0]['total'] >= $limit)) {
-            $ret['message'] = ServiceClass::upgrade_message();
-            return $ret;
-        }
-
-        if (!array_key_exists('expire', $arr)) {
-            $arr['expire'] = 120;  // minutes, e.g. 2 hours
-        }
-
-        $created = datetime_convert();
-
-        $x = q(
-            "insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, cr_expire, allow_cid, allow_gid, deny_cid, deny_gid )
-			values ( %d, %d , '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s' ) ",
-            intval($channel['channel_account_id']),
-            intval($channel['channel_id']),
-            dbesc($name),
-            dbesc($created),
-            dbesc($created),
-            intval($arr['expire']),
-            dbesc($arr['allow_cid']),
-            dbesc($arr['allow_gid']),
-            dbesc($arr['deny_cid']),
-            dbesc($arr['deny_gid'])
-        );
-
-        if ($x) {
-            $ret['success'] = true;
-        }
-
-        return $ret;
-    }
-
-
-    public static function destroy($channel, $arr)
-    {
-
-        $ret = array('success' => false);
-
-        if (intval($arr['cr_id'])) {
-            $sql_extra = " and cr_id = " . intval($arr['cr_id']) . " ";
-        } elseif (trim($arr['cr_name'])) {
-            $sql_extra = " and cr_name = '" . protect_sprintf(dbesc(trim($arr['cr_name']))) . "' ";
-        } else {
-            $ret['message'] = t('Invalid room specifier.');
-            return $ret;
-        }
-
-        $r = q(
-            "select * from chatroom where cr_uid = %d $sql_extra limit 1",
-            intval($channel['channel_id'])
-        );
-        if (!$r) {
-            $ret['message'] = t('Invalid room specifier.');
-            return $ret;
-        }
-
-        Libsync::build_sync_packet($channel['channel_id'], array('chatroom' => $r));
-
-        q(
-            "delete from chatroom where cr_id = %d",
-            intval($r[0]['cr_id'])
-        );
-        if ($r[0]['cr_id']) {
-            q(
-                "delete from chatpresence where cp_room = %d",
-                intval($r[0]['cr_id'])
-            );
-            q(
-                "delete from chat where chat_room = %d",
-                intval($r[0]['cr_id'])
-            );
-        }
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-
-    public static function enter($observer_xchan, $room_id, $status, $client)
-    {
-
-        if (!$room_id || !$observer_xchan) {
-            return;
-        }
-
-        $r = q(
-            "select * from chatroom where cr_id = %d limit 1",
-            intval($room_id)
-        );
-        if (!$r) {
-            notice(t('Room not found.') . EOL);
-            return false;
-        }
-        require_once('include/security.php');
-        $sql_extra = permissions_sql($r[0]['cr_uid']);
-
-        $x = q(
-            "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
-            intval($room_id),
-            intval($r[0]['cr_uid'])
-        );
-        if (!$x) {
-            notice(t('Permission denied.') . EOL);
-            return false;
-        }
-
-        $limit = ServiceClass::fetch($r[0]['cr_uid'], 'chatters_inroom');
-        if ($limit !== false) {
-            $y = q(
-                "select count(*) as total from chatpresence where cp_room = %d",
-                intval($room_id)
-            );
-            if ($y && $y[0]['total'] > $limit) {
-                notice(t('Room is full') . EOL);
-                return false;
-            }
-        }
-
-        if (intval($x[0]['cr_expire'])) {
-            $r = q(
-                "delete from chat where created < %s - INTERVAL %s and chat_room = %d",
-                db_utcnow(),
-                db_quoteinterval(intval($x[0]['cr_expire']) . ' MINUTE'),
-                intval($x[0]['cr_id'])
-            );
-        }
-
-        $r = q(
-            "select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
-            dbesc($observer_xchan),
-            intval($room_id)
-        );
-        if ($r) {
-            q(
-                "update chatpresence set cp_last = '%s' where cp_id = %d and cp_client = '%s'",
-                dbesc(datetime_convert()),
-                intval($r[0]['cp_id']),
-                dbesc($client)
-            );
-            return true;
-        }
-
-        $r = q(
-            "insert into chatpresence ( cp_room, cp_xchan, cp_last, cp_status, cp_client )
-			values ( %d, '%s', '%s', '%s', '%s' )",
-            intval($room_id),
-            dbesc($observer_xchan),
-            dbesc(datetime_convert()),
-            dbesc($status),
-            dbesc($client)
-        );
-
-        return $r;
-    }
-
-
-    public function leave($observer_xchan, $room_id, $client)
-    {
-        if (!$room_id || !$observer_xchan) {
-            return;
-        }
-
-        $r = q(
-            "select * from chatpresence where cp_xchan = '%s' and cp_room = %d and cp_client = '%s' limit 1",
-            dbesc($observer_xchan),
-            intval($room_id),
-            dbesc($client)
-        );
-        if ($r) {
-            q(
-                "delete from chatpresence where cp_id = %d",
-                intval($r[0]['cp_id'])
-            );
-        }
-
-        return true;
-    }
-
-
-    public static function roomlist($uid)
-    {
-        require_once('include/security.php');
-        $sql_extra = permissions_sql($uid);
-
-        $r = q(
-            "select allow_cid, allow_gid, deny_cid, deny_gid, cr_name, cr_expire, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d $sql_extra group by cr_name, cr_id order by cr_name",
-            intval($uid)
-        );
-
-        return $r;
-    }
-
-    public static function list_count($uid)
-    {
-        require_once('include/security.php');
-        $sql_extra = permissions_sql($uid);
-
-        $r = q(
-            "select count(*) as total from chatroom where cr_uid = %d $sql_extra",
-            intval($uid)
-        );
-
-        return $r[0]['total'];
-    }
-
-    /**
-     * @brief Create a chat message via API.
-     *
-     * It is the caller's responsibility to enter the room.
-     *
-     * @param int $uid
-     * @param int $room_id
-     * @param string $xchan
-     * @param string $text
-     * @return array
-     */
-    public static function message($uid, $room_id, $xchan, $text)
-    {
-
-        $ret = array('success' => false);
-
-        if (!$text) {
-            return;
-        }
-
-        $sql_extra = permissions_sql($uid);
-
-        $r = q(
-            "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
-            intval($uid),
-            intval($room_id)
-        );
-        if (!$r) {
-            return $ret;
-        }
-
-        $arr = [
-            'chat_room' => $room_id,
-            'chat_xchan' => $xchan,
-            'chat_text' => $text
-        ];
-        /**
-         * @hooks chat_message
-         *   Called to create a chat message.
-         *   * \e int \b chat_room
-         *   * \e string \b chat_xchan
-         *   * \e string \b chat_text
-         */
-        Hook::call('chat_message', $arr);
-
-        $x = q(
-            "insert into chat ( chat_room, chat_xchan, created, chat_text )
-			values( %d, '%s', '%s', '%s' )",
-            intval($room_id),
-            dbesc($xchan),
-            dbesc(datetime_convert()),
-            dbesc(str_rot47(base64url_encode($arr['chat_text'])))
-        );
-
-        $ret['success'] = true;
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Lib/Config.php b/Zotlabs/Lib/Config.php
deleted file mode 100644
index 6aba9b319..000000000
--- a/Zotlabs/Lib/Config.php
+++ /dev/null
@@ -1,175 +0,0 @@
- false, 'message' => ''];
-
-        $my_perms = false;
-        $protocol = '';
-
-        $ap_allowed = get_config('system', 'activitypub', ACTIVITYPUB_ENABLED) && get_pconfig($uid, 'system', 'activitypub', ACTIVITYPUB_ENABLED);
-
-        if (substr($url, 0, 1) === '[') {
-            $x = strpos($url, ']');
-            if ($x) {
-                $protocol = substr($url, 1, $x - 1);
-                $url = substr($url, $x + 1);
-            }
-        }
-
-        if (!check_siteallowed($url)) {
-            $result['message'] = t('Channel is blocked on this site.');
-            return $result;
-        }
-
-        if (!$url) {
-            $result['message'] = t('Channel location missing.');
-            return $result;
-        }
-
-        // check service class limits
-
-        $r = q(
-            "select count(*) as total from abook where abook_channel = %d and abook_self = 0 ",
-            intval($uid)
-        );
-        if ($r) {
-            $total_channels = $r[0]['total'];
-        }
-
-        if (!ServiceClass::allows($uid, 'total_channels', $total_channels)) {
-            $result['message'] = ServiceClass::upgrade_message();
-            return $result;
-        }
-
-        $xchan_hash = '';
-        $sql_options = (($protocol) ? " and xchan_network = '" . dbesc($protocol) . "' " : '');
-
-        $r = q(
-            "select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s') $sql_options ",
-            dbesc($url),
-            dbesc($url),
-            dbesc($url)
-        );
-
-        if ($r) {
-            // reset results to the best record or the first if we don't have the best
-            // note: this returns a single record and not an array of records
-
-            $r = Libzot::zot_record_preferred($r, 'xchan_network');
-
-            // ensure there's a valid hubloc for this xchan before proceeding - you cannot connect without it
-
-            if (in_array($r['xchan_network'], ['nomad', 'zot6', 'activitypub'])) {
-                $h = q(
-                    "select * from hubloc where hubloc_hash = '%s'",
-                    dbesc($r['xchan_hash'])
-                );
-                if (!$h) {
-                    $r = null;
-                }
-            }
-
-            // we may have nulled out this record so check again
-
-            if ($r) {
-                // Check the site table to see if we should have a zot6 hubloc,
-                // If so, clear the xchan and start fresh
-
-                if ($r['xchan_network'] === 'activitypub') {
-                    $m = parse_url($r['xchan_hash']);
-                    unset($m['path']);
-                    $h = unparse_url($m);
-                    $s = q(
-                        "select * from site where site_url = '%s'",
-                        dbesc($h)
-                    );
-                    if (intval($s['site_type']) === SITE_TYPE_ZOT) {
-                        logger('got zot - ignore activitypub entry');
-                        $r = null;
-                    }
-                }
-            }
-        }
-
-
-        $singleton = false;
-
-        if (!$r) {
-            // not in cache - try discovery
-
-            $wf = discover_by_webbie($url, $protocol, false);
-
-            if (!$wf) {
-                $result['message'] = t('Remote channel or protocol unavailable.');
-                return $result;
-            }
-        }
-
-        if ($wf) {
-            // something was discovered - find the record which was just created.
-
-            $r = q(
-                "select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s' ) $sql_options",
-                dbesc(($wf) ? $wf : $url),
-                dbesc($url),
-                dbesc($url)
-            );
-
-            // convert to a single record (once again preferring a zot solution in the case of multiples)
-
-            if ($r) {
-                $r = Libzot::zot_record_preferred($r, 'xchan_network');
-            }
-        }
-
-        // if discovery was a success or the channel was already cached we should have an xchan record in $r
-
-        if ($r) {
-            $xchan = $r;
-            $xchan_hash = $r['xchan_hash'];
-            $their_perms = EMPTY_STR;
-        }
-
-        // failure case
-
-        if (!$xchan_hash) {
-            $result['message'] = t('Channel discovery failed.');
-            logger('follow: ' . $result['message']);
-            return $result;
-        }
-
-        if (!check_channelallowed($xchan_hash)) {
-            $result['message'] = t('Channel is blocked on this site.');
-            logger('follow: ' . $result['message']);
-            return $result;
-        }
-
-
-        if ($r['xchan_network'] === 'activitypub') {
-            if (!$ap_allowed) {
-                $result['message'] = t('Protocol not supported');
-                return $result;
-            }
-            $singleton = true;
-        }
-
-        // Now start processing the new connection
-
-        $aid = $channel['channel_account_id'];
-        $hash = $channel['channel_hash'];
-        $default_group = $channel['channel_default_group'];
-
-        if ($hash === $xchan_hash) {
-            $result['message'] = t('Cannot connect to yourself.');
-            return $result;
-        }
-
-        $p = Permissions::connect_perms($uid);
-
-        // parent channels have unencumbered write permission
-
-        if ($sub_channel) {
-            $p['perms']['post_wall'] = 1;
-            $p['perms']['post_comments'] = 1;
-            $p['perms']['write_storage'] = 1;
-            $p['perms']['post_like'] = 1;
-            $p['perms']['delegate'] = 0;
-            $p['perms']['moderated'] = 0;
-        }
-
-        $my_perms = Permissions::serialise($p['perms']);
-
-        $profile_assign = get_pconfig($uid, 'system', 'profile_assign', '');
-
-        // See if we are already connected by virtue of having an abook record
-
-        $r = q(
-            "select abook_id, abook_xchan, abook_pending, abook_instance from abook 
-			where abook_xchan = '%s' and abook_channel = %d limit 1",
-            dbesc($xchan_hash),
-            intval($uid)
-        );
-
-        if ($r) {
-            $abook_instance = $r[0]['abook_instance'];
-
-            // If they are on a non-nomadic network, add them to this location
-
-            if (($singleton) && strpos($abook_instance, z_root()) === false) {
-                if ($abook_instance) {
-                    $abook_instance .= ',';
-                }
-                $abook_instance .= z_root();
-
-                $x = q(
-                    "update abook set abook_instance = '%s', abook_not_here = 0 where abook_id = %d",
-                    dbesc($abook_instance),
-                    intval($r[0]['abook_id'])
-                );
-            }
-
-            // if they have a pending connection, we just followed them so approve the connection request
-
-            if (intval($r[0]['abook_pending'])) {
-                $x = q(
-                    "update abook set abook_pending = 0 where abook_id = %d",
-                    intval($r[0]['abook_id'])
-                );
-            }
-        } else {
-            // create a new abook record
-
-            $closeness = get_pconfig($uid, 'system', 'new_abook_closeness', 80);
-
-            $r = abook_store_lowlevel(
-                [
-                    'abook_account' => intval($aid),
-                    'abook_channel' => intval($uid),
-                    'abook_closeness' => intval($closeness),
-                    'abook_xchan' => $xchan_hash,
-                    'abook_profile' => $profile_assign,
-                    'abook_feed' => intval(($xchan['xchan_network'] === 'rss') ? 1 : 0),
-                    'abook_created' => datetime_convert(),
-                    'abook_updated' => datetime_convert(),
-                    'abook_instance' => (($singleton) ? z_root() : '')
-                ]
-            );
-        }
-
-        if (!$r) {
-            logger('abook creation failed');
-            $result['message'] = t('error saving data');
-            return $result;
-        }
-
-        // Set suitable permissions to the connection
-
-        if ($my_perms) {
-            set_abconfig($uid, $xchan_hash, 'system', 'my_perms', $my_perms);
-        }
-
-        // fetch the entire record
-
-        $r = q(
-            "select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash 
-			where abook_xchan = '%s' and abook_channel = %d limit 1",
-            dbesc($xchan_hash),
-            intval($uid)
-        );
-
-        if ($r) {
-            $result['abook'] = array_shift($r);
-            Run::Summon(['Notifier', 'permissions_create', $result['abook']['abook_id']]);
-        }
-
-        $arr = ['channel_id' => $uid, 'channel' => $channel, 'abook' => $result['abook']];
-
-        Hook::call('follow', $arr);
-
-        /** If there is a default group for this channel, add this connection to it */
-
-        if ($default_group) {
-            $g = AccessList::rec_byhash($uid, $default_group);
-            if ($g) {
-                AccessList::member_add($uid, '', $xchan_hash, $g['id']);
-            }
-        }
-
-        $result['success'] = true;
-        return $result;
-    }
-}
diff --git a/Zotlabs/Lib/Crypto.php b/Zotlabs/Lib/Crypto.php
deleted file mode 100644
index edf69f9f3..000000000
--- a/Zotlabs/Lib/Crypto.php
+++ /dev/null
@@ -1,214 +0,0 @@
- 'sha1',
-            'private_key_bits' => $bits,
-            'encrypt_key'      => false
-        ];
-
-        $conf = get_config('system', 'openssl_conf_file');
-
-        if ($conf) {
-            $openssl_options['config'] = $conf;
-        }
-
-        $result = openssl_pkey_new($openssl_options);
-
-        if (empty($result)) {
-            return false;
-        }
-
-        // Get private key
-
-        $response = [ 'prvkey' => '', 'pubkey' => '' ];
-
-        openssl_pkey_export($result, $response['prvkey']);
-
-        // Get public key
-        $pkey = openssl_pkey_get_details($result);
-        $response['pubkey'] = $pkey["key"];
-
-        return $response;
-    }
-
-
-    public static function sign($data, $key, $alg = 'sha256')
-    {
-
-        if (! $key) {
-            return false;
-        }
-
-        $sig = '';
-        openssl_sign($data, $sig, $key, $alg);
-        return $sig;
-    }
-
-
-    public static function verify($data, $sig, $key, $alg = 'sha256')
-    {
-
-        if (! $key) {
-            return false;
-        }
-
-        try {
-            $verify = openssl_verify($data, $sig, $key, $alg);
-        } catch (Exception $e) {
-            $verify = (-1);
-        }
-
-        if ($verify === (-1)) {
-            while ($msg = openssl_error_string()) {
-                logger('openssl_verify: ' . $msg, LOGGER_NORMAL, LOG_ERR);
-            }
-            btlogger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR);
-        }
-
-        return (($verify > 0) ? true : false);
-    }
-
-    public static function encapsulate($data, $pubkey, $alg)
-    {
-
-        if (! ($alg && $pubkey)) {
-            return $data;
-        }
-
-        $alg_base = $alg;
-        $padding  = OPENSSL_PKCS1_PADDING;
-
-        $exts = explode('.', $alg);
-        if (count($exts) > 1) {
-            switch ($exts[1]) {
-                case 'oaep':
-                    $padding = OPENSSL_PKCS1_OAEP_PADDING;
-                    break;
-                default:
-                    break;
-            }
-            $alg_base = $exts[0];
-        }
-
-        $method = null;
-
-        foreach (self::$openssl_algorithms as $ossl) {
-            if ($ossl[0] === $alg_base) {
-                $method = $ossl;
-                break;
-            }
-        }
-
-        if ($method) {
-                $result = [ 'encrypted' => true ];
-
-                $key = openssl_random_pseudo_bytes(256);
-                $iv  = openssl_random_pseudo_bytes(256);
-
-                $key1 = substr($key, 0, $method[2]);
-                $iv1  = substr($iv, 0, $method[3]);
-
-                $result['data'] = base64url_encode(openssl_encrypt($data, $method[1], $key1, OPENSSL_RAW_DATA, $iv1), true);
-
-                openssl_public_encrypt($key, $k, $pubkey, $padding);
-                openssl_public_encrypt($iv, $i, $pubkey, $padding);
-
-                $result['alg'] = $alg;
-                $result['key'] = base64url_encode($k, true);
-                $result['iv']  = base64url_encode($i, true);
-                return $result;
-        } else {
-            $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data ];
-            Hook::call('crypto_encapsulate', $x);
-            return $x['result'];
-        }
-    }
-
-    public static function unencapsulate($data, $prvkey)
-    {
-
-        if (! (is_array($data) && array_key_exists('encrypted', $data) && array_key_exists('alg', $data) && $data['alg'])) {
-            logger('not encrypted');
-
-            return $data;
-        }
-
-        $alg_base = $data['alg'];
-        $padding  = OPENSSL_PKCS1_PADDING;
-
-        $exts = explode('.', $data['alg']);
-        if (count($exts) > 1) {
-            switch ($exts[1]) {
-                case 'oaep':
-                    $padding = OPENSSL_PKCS1_OAEP_PADDING;
-                    break;
-                default:
-                    break;
-            }
-            $alg_base = $exts[0];
-        }
-
-        $method = null;
-
-        foreach (self::$openssl_algorithms as $ossl) {
-            if ($ossl[0] === $alg_base) {
-                $method = $ossl;
-                break;
-            }
-        }
-
-        if ($method) {
-            openssl_private_decrypt(base64url_decode($data['key']), $k, $prvkey, $padding);
-            openssl_private_decrypt(base64url_decode($data['iv']), $i, $prvkey, $padding);
-            return openssl_decrypt(base64url_decode($data['data']), $method[1], substr($k, 0, $method[2]), OPENSSL_RAW_DATA, substr($i, 0, $method[3]));
-        } else {
-            $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $data['alg'], 'result' => $data ];
-            Hook::call('crypto_unencapsulate', $x);
-            return $x['result'];
-        }
-    }
-}
diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php
deleted file mode 100644
index 66c4dfd31..000000000
--- a/Zotlabs/Lib/DB_Upgrade.php
+++ /dev/null
@@ -1,119 +0,0 @@
-config_name = 'db_version';
-        $this->func_prefix = '_';
-
-        $build = get_config('system', 'db_version', 0);
-        if (!intval($build)) {
-            $build = set_config('system', 'db_version', $db_revision);
-        }
-
-        if ($build == $db_revision) {
-            // Nothing to be done.
-            return;
-        } else {
-            $stored = intval($build);
-            if (!$stored) {
-                logger('Critical: check_config unable to determine database schema version');
-                return;
-            }
-
-            $current = intval($db_revision);
-
-            if ($stored < $current) {
-                // The last update we performed was $stored.
-                // Start at $stored + 1 and continue until we have completed $current
-
-                for ($x = $stored + 1; $x <= $current; $x++) {
-                    $s = '_' . $x;
-                    $cls = '\\Zotlabs\Update\\' . $s;
-                    if (!class_exists($cls)) {
-                        return;
-                    }
-
-                    // There could be a lot of processes running or about to run.
-                    // We want exactly one process to run the update command.
-                    // So store the fact that we're taking responsibility
-                    // after first checking to see if somebody else already has.
-
-                    // If the update fails or times-out completely you may need to
-                    // delete the config entry to try again.
-
-                    Config::Load('database');
-
-                    if (get_config('database', $s)) {
-                        break;
-                    }
-                    set_config('database', $s, '1');
-
-
-                    $c = new $cls();
-
-                    $retval = $c->run();
-
-                    if ($retval != UPDATE_SUCCESS) {
-                        $source = t('Source code of failed update: ') . "\n\n" . @file_get_contents('Zotlabs/Update/' . $s . '.php');
-
-
-                        // Prevent sending hundreds of thousands of emails by creating
-                        // a lockfile.
-
-                        $lockfile = 'cache/mailsent';
-
-                        if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 86400))) {
-                            return;
-                        }
-                        @unlink($lockfile);
-                        //send the administrator an e-mail
-                        file_put_contents($lockfile, $x);
-
-                        $r = q(
-                            "select account_language from account where account_email = '%s' limit 1",
-                            dbesc(App::$config['system']['admin_email'])
-                        );
-                        push_lang(($r) ? $r[0]['account_language'] : 'en');
-                        z_mail(
-                            [
-                                'toEmail' => App::$config['system']['admin_email'],
-                                'messageSubject' => sprintf(t('Update Error at %s'), z_root()),
-                                'textVersion' => replace_macros(
-                                    Theme::get_email_template('update_fail_eml.tpl'),
-                                    [
-                                        '$sitename' => App::$config['system']['sitename'],
-                                        '$siteurl' => z_root(),
-                                        '$update' => $x,
-                                        '$error' => sprintf(t('Update %s failed. See error logs.'), $x),
-                                        '$baseurl' => z_root(),
-                                        '$source' => $source
-                                    ]
-                                )
-                            ]
-                        );
-
-                        //try the logger
-                        logger('CRITICAL: Update Failed: ' . $x);
-                        pop_lang();
-                    } else {
-                        set_config('database', $s, 'success');
-                    }
-                }
-            }
-            set_config('system', 'db_version', $db_revision);
-        }
-    }
-}
diff --git a/Zotlabs/Lib/DReport.php b/Zotlabs/Lib/DReport.php
deleted file mode 100644
index 908dabee7..000000000
--- a/Zotlabs/Lib/DReport.php
+++ /dev/null
@@ -1,156 +0,0 @@
-location = $location;
-        $this->sender = $sender;
-        $this->recipient = $recipient;
-        $this->name = EMPTY_STR;
-        $this->message_id = $message_id;
-        $this->status = $status;
-        $this->date = datetime_convert();
-    }
-
-    public function update($status)
-    {
-        $this->status = $status;
-        $this->date = datetime_convert();
-    }
-
-    public function set_name($name)
-    {
-        $this->name = $name;
-    }
-
-    public function addto_update($status)
-    {
-        $this->status = $this->status . ' ' . $status;
-    }
-
-
-    public function set($arr)
-    {
-        $this->location = $arr['location'];
-        $this->sender = $arr['sender'];
-        $this->recipient = $arr['recipient'];
-        $this->name = $arr['name'];
-        $this->message_id = $arr['message_id'];
-        $this->status = $arr['status'];
-        $this->date = $arr['date'];
-    }
-
-    public function get()
-    {
-        return array(
-            'location' => $this->location,
-            'sender' => $this->sender,
-            'recipient' => $this->recipient,
-            'name' => $this->name,
-            'message_id' => $this->message_id,
-            'status' => $this->status,
-            'date' => $this->date
-        );
-    }
-
-    /**
-     * @brief decide whether to store a returned delivery report
-     *
-     * @param array $dr
-     * @return bool
-     */
-
-    public static function is_storable($dr)
-    {
-
-        if (get_config('system', 'disable_dreport')) {
-            return false;
-        }
-
-        /**
-         * @hooks dreport_is_storable
-         *   Called before storing a dreport record to determine whether to store it.
-         *   * \e array
-         */
-
-        Hook::call('dreport_is_storable', $dr);
-
-        // let plugins accept or reject - if neither, continue on
-        if (array_key_exists('accept', $dr) && intval($dr['accept'])) {
-            return true;
-        }
-        if (array_key_exists('reject', $dr) && intval($dr['reject'])) {
-            return false;
-        }
-
-        if (!($dr['sender'])) {
-            return false;
-        }
-
-        // Is the sender one of our channels?
-
-        $c = q(
-            "select channel_id from channel where channel_hash = '%s' limit 1",
-            dbesc($dr['sender'])
-        );
-        if (!$c) {
-            return false;
-        }
-
-
-        // is the recipient one of our connections, or do we want to store every report?
-
-
-        $rxchan = $dr['recipient'];
-        $pcf = get_pconfig($c[0]['channel_id'], 'system', 'dreport_store_all');
-        if ($pcf) {
-            return true;
-        }
-
-        // We always add ourself as a recipient to private and relayed posts
-        // So if a remote site says they can't find us, that's no big surprise
-        // and just creates a lot of extra report noise
-
-        if (($dr['location'] !== z_root()) && ($dr['sender'] === $rxchan) && ($dr['status'] === 'recipient not found')) {
-            return false;
-        }
-
-        // If you have a private post with a recipient list, every single site is going to report
-        // back a failed delivery for anybody on that list that isn't local to them. We're only
-        // concerned about this if we have a local hubloc record which says we expected them to
-        // have a channel on that site.
-
-        $r = q(
-            "select hubloc_id from hubloc where hubloc_hash = '%s' and hubloc_url = '%s'",
-            dbesc($rxchan),
-            dbesc($dr['location'])
-        );
-        if ((!$r) && ($dr['status'] === 'recipient not found')) {
-            return false;
-        }
-
-        $r = q(
-            "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-            dbesc($rxchan),
-            intval($c[0]['channel_id'])
-        );
-        if ($r) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
deleted file mode 100644
index deec4efb0..000000000
--- a/Zotlabs/Lib/Enotify.php
+++ /dev/null
@@ -1,985 +0,0 @@
-' . t('Notification Settings')  . '');
-        $sender_name = $product;
-        $hostname = App::get_hostname();
-        if (strpos($hostname, ':')) {
-            $hostname = substr($hostname, 0, strpos($hostname, ':'));
-        }
-
-        // Do not translate 'noreply' as it must be a legal 7-bit email address
-
-        $reply_email = get_config('system', 'reply_address');
-        if (! $reply_email) {
-            $reply_email = 'noreply' . '@' . $hostname;
-        }
-
-        $sender_email = get_config('system', 'from_email');
-        if (! $sender_email) {
-            $sender_email = 'Administrator' . '@' . $hostname;
-        }
-
-        $sender_name = get_config('system', 'from_email_name');
-        if (! $sender_name) {
-            $sender_name = System::get_site_name();
-        }
-
-
-        $additional_mail_header = "";
-
-        if (array_key_exists('item', $params)) {
-            require_once('include/conversation.php');
-            // if it's a normal item...
-            if (array_key_exists('verb', $params['item'])) {
-                // localize_item() alters the original item so make a copy first
-                $i = $params['item'];
-                logger('calling localize');
-                localize_item($i);
-                $title = $i['title'];
-                $body = $i['body'];
-                $private = (($i['item_private']) || intval($i['item_obscured']));
-            } else {
-                $title = $params['item']['title'];
-                $body = $params['item']['body'];
-            }
-            if ($params['item']['created'] < datetime_convert('UTC', 'UTC', 'now - 1 month')) {
-                logger('notification invoked for an old item which may have been refetched.', LOGGER_DEBUG, LOG_INFO);
-                return;
-            }
-        } else {
-            $title = $body = '';
-        }
-
-
-        $always_show_in_notices = get_pconfig($recip['channel_id'], 'system', 'always_show_in_notices');
-        $vnotify = get_pconfig($recip['channel_id'], 'system', 'vnotify');
-
-        $salutation = $recip['channel_name'];
-
-    // e.g. "your post", "David's photo", etc.
-        $possess_desc = t('%s ');
-
-        if ($params['type'] == NOTIFY_MAIL) {
-            logger('notification: mail');
-            $subject =  sprintf(t('[$Projectname:Notify] New mail received at %s'), $sitename);
-
-            if ($params['item']['mid'] === $params['item']['parent_mid']) {
-                $preamble = sprintf(t('%1$s sent you a new private message at %2$s.'), $sender['xchan_name'], $sitename);
-                $epreamble = sprintf(t('%1$s sent you %2$s.'), '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]');
-            } else {
-                $preamble = sprintf(t('%1$s replied to a private message at %2$s.'), $sender['xchan_name'], $sitename);
-                $epreamble = sprintf(t('%1$s replied to %2$s.'), '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]');
-            }
-            $sitelink = t('Please visit %s to view and/or reply to your private messages.');
-
-            $tsitelink = sprintf($sitelink, $siteurl . '/display/' . gen_link_id($params['item']['mid']));
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-            $itemlink = z_root() . '/display/' . gen_link_id($params['item']['mid']);
-        }
-
-        if (in_array(intval($params['type']), [ NOTIFY_COMMENT, NOTIFY_RESHARE ])) {
-            // logger("notification: params = " . print_r($params, true), LOGGER_DEBUG);
-
-            $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false);
-
-            $itemlink = $params['link'];
-
-            $action = t('commented on');
-
-            if (array_key_exists('item', $params) && in_array($params['item']['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
-                if (! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE)) {
-                    logger('notification: not a visible activity. Ignoring.');
-                    pop_lang();
-                    return;
-                }
-
-                if (activity_match($params['verb'], ACTIVITY_LIKE)) {
-                    $action = t('liked');
-                }
-
-                if (activity_match($params['verb'], ACTIVITY_DISLIKE)) {
-                    $action = t('disliked');
-                }
-            }
-
-            $parent_mid = $params['parent_mid'];
-
-            // Check to see if there was already a notify for this post.
-            // If so don't create a second notification
-
-            $p = null;
-            $p = q(
-                "select id from notify where link = '%s' and uid = %d limit 1",
-                dbesc($params['link']),
-                intval($recip['channel_id'])
-            );
-            if ($p) {
-                logger('notification: comment already notified');
-                pop_lang();
-                return;
-            }
-
-
-            // if it's a post figure out who's post it is.
-
-            $p = null;
-
-            if ($params['otype'] === 'item' && $parent_mid) {
-                $p = q(
-                    "select * from item where mid = '%s' and uid = %d limit 1",
-                    dbesc($parent_mid),
-                    intval($recip['channel_id'])
-                );
-            }
-
-            xchan_query($p);
-
-            $item_post_type = item_post_type($p[0]);
-    //      $private = $p[0]['item_private'];
-            $parent_id = $p[0]['id'];
-
-            $parent_item = $p[0];
-
-            //$possess_desc = str_replace('',$possess_desc);
-
-            // "a post"
-            $dest_str = sprintf(
-                t('%1$s %2$s [zrl=%3$s]a %4$s[/zrl]'),
-                '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                $action,
-                $itemlink,
-                $item_post_type
-            );
-
-            // "George Bull's post"
-            if ($p) {
-                $dest_str = sprintf(
-                    t('%1$s %2$s [zrl=%3$s]%4$s\'s %5$s[/zrl]'),
-                    '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                    $action,
-                    $itemlink,
-                    $p[0]['author']['xchan_name'],
-                    $item_post_type
-                );
-            }
-
-            // "your post"
-            if ($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall'])) {
-                $dest_str = sprintf(
-                    t('%1$s %2$s [zrl=%3$s]your %4$s[/zrl]'),
-                    '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                    $action,
-                    $itemlink,
-                    $item_post_type
-                );
-            }
-
-            // Some mail softwares relies on subject field for threading.
-            // So, we cannot have different subjects for notifications of the same thread.
-            // Before this we have the name of the replier on the subject rendering
-            // differents subjects for messages on the same thread.
-
-            if ($moderated) {
-                $subject = sprintf(t('[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
-                $itemlink = z_root() . '/moderate/' . gen_link_id($params['item']['mid']);
-            } else {
-                $subject = sprintf(t('[$Projectname:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
-            }
-            $preamble = sprintf(t('%1$s commented on an item/conversation you have been following.'), $sender['xchan_name']);
-            $epreamble = $dest_str;
-
-            if ($moderated) {
-                $epreamble .= ' ' . t('(Moderated)');
-            }
-
-            $sitelink = t('Please visit %s to view and/or reply to the conversation.');
-            $tsitelink = sprintf($sitelink, $siteurl);
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-            if ($moderated) {
-                $tsitelink .= "\n\n" . sprintf(t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate');
-                $hsitelink .= "

          " . sprintf(t('Please visit %s to approve or reject this comment.'), '' . z_root() . '/moderate');
-            }
-        }
-
-        if ($params['type'] == NOTIFY_LIKE) {
-    //      logger("notification: params = " . print_r($params, true), LOGGER_DEBUG);
-
-            $itemlink =  $params['link'];
-
-            if (array_key_exists('item', $params) && (! activity_match($params['item']['verb'], ACTIVITY_LIKE))) {
-                if (! $always_show_in_notices  || !($vnotify & VNOTIFY_LIKE)) {
-                    logger('notification: not a visible activity. Ignoring.');
-                    pop_lang();
-                    return;
-                }
-            }
-
-            $parent_mid = $params['parent_mid'];
-
-            // Check to see if there was already a notify for this post.
-            // If so don't create a second notification
-
-            $p = null;
-            $p = q(
-                "select id from notify where link = '%s' and uid = %d limit 1",
-                dbesc($params['link']),
-                intval($recip['channel_id'])
-            );
-            if ($p) {
-                logger('notification: like already notified');
-                pop_lang();
-                return;
-            }
-
-
-            // if it's a post figure out who's post it is.
-
-            $p = null;
-
-            if ($params['otype'] === 'item' && $parent_mid) {
-                $p = q(
-                    "select * from item where mid = '%s' and uid = %d limit 1",
-                    dbesc($parent_mid),
-                    intval($recip['channel_id'])
-                );
-            }
-
-            xchan_query($p);
-
-
-            $item_post_type = item_post_type($p[0]);
-    //      $private = $p[0]['item_private'];
-            $parent_id = $p[0]['id'];
-
-            $parent_item = $p[0];
-
-
-            // "your post"
-            if ($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall'])) {
-                $dest_str = sprintf(
-                    t('%1$s liked [zrl=%2$s]your %3$s[/zrl]'),
-                    '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                    $itemlink,
-                    $item_post_type
-                );
-            } else {
-                pop_lang();
-                return;
-            }
-
-            // Some mail softwares relies on subject field for threading.
-            // So, we cannot have different subjects for notifications of the same thread.
-            // Before this we have the name of the replier on the subject rendering
-            // differents subjects for messages on the same thread.
-
-            $subject = sprintf(t('[$Projectname:Notify] Like received to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
-            $preamble = sprintf(t('%1$s liked an item/conversation you created.'), $sender['xchan_name']);
-            $epreamble = $dest_str;
-
-            $sitelink = t('Please visit %s to view and/or reply to the conversation.');
-            $tsitelink = sprintf($sitelink, $siteurl);
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-        }
-
-
-
-        if ($params['type'] == NOTIFY_WALL) {
-            $subject = sprintf(t('[$Projectname:Notify] %s posted to your profile wall'), $sender['xchan_name']);
-
-            $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false);
-
-            $itemlink =  (($moderated) ? z_root() . '/moderate/' . gen_link_id($params['item']['mid']) : $params['link']);
-
-            $preamble = sprintf(t('%1$s posted to your profile wall at %2$s'), $sender['xchan_name'], $sitename);
-
-            $epreamble = sprintf(
-                t('%1$s posted to [zrl=%2$s]your wall[/zrl]'),
-                '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                $itemlink
-            );
-
-
-            if ($moderated) {
-                $subject .= t(' - ') . t('Moderated');
-                $epreamble .= t(' - ') . t('Moderated');
-            }
-
-            $sitelink = t('Please visit %s to view and/or reply to the conversation.');
-            $tsitelink = sprintf($sitelink, $siteurl);
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-
-            if ($moderated) {
-                $tsitelink .= "\n\n" . sprintf(t('Please visit %s to approve or reject this post.'), z_root() . '/moderate');
-                $hsitelink .= "

          " . sprintf(t('Please visit %s to approve or reject this post.'), '' . z_root() . '/moderate');
-            }
-        }
-
-        if ($params['type'] == NOTIFY_TAGSELF) {
-            $p = null;
-            $p = q(
-                "select id from notify where link = '%s' and uid = %d limit 1",
-                dbesc($params['link']),
-                intval($recip['channel_id'])
-            );
-            if ($p) {
-                logger('enotify: tag: already notified about this post');
-                pop_lang();
-                return;
-            }
-
-            $subject =  sprintf(t('[$Projectname:Notify] %s tagged you'), $sender['xchan_name']);
-            $preamble = sprintf(t('%1$s tagged you at %2$s'), $sender['xchan_name'], $sitename);
-            $epreamble = sprintf(
-                t('%1$s [zrl=%2$s]tagged you[/zrl].'),
-                '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                $params['link']
-            );
-
-            $sitelink = t('Please visit %s to view and/or reply to the conversation.');
-            $tsitelink = sprintf($sitelink, $siteurl);
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-            $itemlink =  $params['link'];
-        }
-
-        if ($params['type'] == NOTIFY_POKE) {
-            $subject =  sprintf(t('[$Projectname:Notify] %1$s poked you'), $sender['xchan_name']);
-            $preamble = sprintf(t('%1$s poked you at %2$s'), $sender['xchan_name'], $sitename);
-            $epreamble = sprintf(
-                t('%1$s [zrl=%2$s]poked you[/zrl].'),
-                '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                $params['link']
-            );
-
-            $subject = str_replace('poked', t($params['activity']), $subject);
-            $preamble = str_replace('poked', t($params['activity']), $preamble);
-            $epreamble = str_replace('poked', t($params['activity']), $epreamble);
-
-            $sitelink = t('Please visit %s to view and/or reply to the conversation.');
-            $tsitelink = sprintf($sitelink, $siteurl);
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-            $itemlink =  $params['link'];
-        }
-
-        if ($params['type'] == NOTIFY_TAGSHARE) {
-            $subject =  sprintf(t('[$Projectname:Notify] %s tagged your post'), $sender['xchan_name']);
-            $preamble = sprintf(t('%1$s tagged your post at %2$s'), $sender['xchan_name'], $sitename);
-            $epreamble = sprintf(
-                t('%1$s tagged [zrl=%2$s]your post[/zrl]'),
-                '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
-                $itemlink
-            );
-
-            $sitelink = t('Please visit %s to view and/or reply to the conversation.');
-            $tsitelink = sprintf($sitelink, $siteurl);
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-            $itemlink =  $params['link'];
-        }
-
-        if ($params['type'] == NOTIFY_INTRO) {
-            $subject = sprintf(t('[$Projectname:Notify] Introduction received'));
-            $preamble = sprintf(t('You\'ve received an new connection request from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename);
-            $epreamble = sprintf(
-                t('You\'ve received [zrl=%1$s]a new connection request[/zrl] from %2$s.'),
-                $siteurl . '/connections/ifpending',
-                '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]'
-            );
-            $body = sprintf(t('You may visit their profile at %s'), $sender['xchan_url']);
-
-            $sitelink = t('Please visit %s to approve or reject the connection request.');
-            $tsitelink = sprintf($sitelink, $siteurl . '/connections/ifpending');
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-            $itemlink = $params['link'];
-        }
-
-        if ($params['type'] == NOTIFY_SUGGEST) {
-            $subject = sprintf(t('[$Projectname:Notify] Friend suggestion received'));
-            $preamble = sprintf(t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename);
-            $epreamble = sprintf(
-                t('You\'ve received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s.'),
-                $itemlink,
-                '[zrl=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/zrl]',
-                '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]'
-            );
-
-            $body = t('Name:') . ' ' . $params['item']['name'] . "\n";
-            $body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n";
-            $body .= sprintf(t('You may visit their profile at %s'), $params['item']['url']);
-
-            $sitelink = t('Please visit %s to approve or reject the suggestion.');
-            $tsitelink = sprintf($sitelink, $siteurl);
-            $hsitelink = sprintf($sitelink, '' . $sitename . '');
-            $itemlink =  $params['link'];
-        }
-
-        if ($params['type'] == NOTIFY_CONFIRM) {
-            // ?
-        }
-
-        if ($params['type'] == NOTIFY_SYSTEM) {
-            // ?
-        }
-
-        $h = array(
-        'params'    => $params,
-        'subject'   => $subject,
-        'preamble'  => $preamble,
-        'epreamble' => $epreamble,
-        'body'      => $body,
-        'sitelink'  => $sitelink,
-        'sitename'  => $sitename,
-        'tsitelink' => $tsitelink,
-        'hsitelink' => $hsitelink,
-        'itemlink'  => $itemlink,
-        'sender'    => $sender,
-        'recipient' => $recip
-        );
-
-        Hook::call('enotify', $h);
-
-        $subject   = $h['subject'];
-        $preamble  = $h['preamble'];
-        $epreamble = $h['epreamble'];
-        $body      = $h['body'];
-        $sitelink  = $h['sitelink'];
-        $tsitelink = $h['tsitelink'];
-        $hsitelink = $h['hsitelink'];
-        $itemlink  = $h['itemlink'];
-
-
-        require_once('include/html2bbcode.php');
-
-        do {
-            $dups = false;
-            $hash = random_string();
-            $r = q(
-                "SELECT id FROM notify WHERE hash = '%s' LIMIT 1",
-                dbesc($hash)
-            );
-            if ($r) {
-                $dups = true;
-            }
-        } while ($dups === true);
-
-
-        $datarray = [];
-        $datarray['hash']   = $hash;
-        $datarray['sender_hash'] = $sender['xchan_hash'];
-        $datarray['xname']   = $sender['xchan_name'];
-        $datarray['url']    = $sender['xchan_url'];
-        $datarray['photo']  = $sender['xchan_photo_s'];
-        $datarray['created']   = datetime_convert();
-        $datarray['aid']    = $recip['channel_account_id'];
-        $datarray['uid']    = $recip['channel_id'];
-        $datarray['link']   = $itemlink;
-        $datarray['parent'] = $parent_mid;
-        $datarray['parent_item'] = $parent_item;
-        $datarray['ntype']   = $params['type'];
-        $datarray['verb']   = $params['verb'];
-        $datarray['otype']  = $params['otype'];
-        $datarray['abort']  = false;
-
-        $datarray['item'] = $params['item'];
-
-        if (LibBlock::fetch_by_entity($datarray['uid'], $datarray['sender_hash'])) {
-            pop_lang();
-            return;
-        }
-
-        if (is_array($datarray['parent_item'])) {
-            if (LibBlock::fetch_by_entity($datarray['uid'], $datarray['parent_item']['author_xchan']) || LibBlock::fetch_by_entity($datarray['uid'], $datarray['parent_item']['owner_xchan'])) {
-                pop_lang();
-                return;
-            }
-        }
-
-        Hook::call('enotify_store', $datarray);
-
-        if ($datarray['abort']) {
-            pop_lang();
-            return;
-        }
-
-
-    // create notification entry in DB
-        $seen = 0;
-
-    // Mark some notifications as seen right away
-    // Note! The notification have to be created, because they are used to send emails
-    // So easiest solution to hide them from Notices is to mark them as seen right away.
-    // Another option would be to not add them to the DB, and change how emails are handled
-    // (probably would be better that way)
-
-        if (!$always_show_in_notices) {
-            if (($params['type'] == NOTIFY_WALL) || ($params['type'] == NOTIFY_INTRO)) {
-                $seen = 1;
-            }
-            // set back to unseen for moderated wall posts
-            if ($params['type'] == NOTIFY_WALL && $params['item']['item_blocked'] == ITEM_MODERATED) {
-                $seen = 0;
-            }
-        }
-
-        $e = q(
-            "select * from notify where otype = '%s' and xname = '%s' and verb = '%s' and link = '%s' and ntype = %d limit 1",
-            dbesc($datarray['otype']),
-            dbesc($datarray['xname']),
-            dbesc($datarray['verb']),
-            dbesc($datarray['link']),
-            intval($datarray['ntype'])
-        );
-        if ($e) {
-            logger('duplicated notification');
-            pop_lang();
-            return;
-        }
-
-        $r = q(
-            "insert into notify (hash,xname,url,photo,created,msg,aid,uid,link,parent,seen,ntype,verb,otype)
-		values('%s','%s','%s','%s','%s','%s',%d,%d,'%s','%s',%d,%d,'%s','%s')",
-            dbesc($datarray['hash']),
-            dbesc($datarray['xname']),
-            dbesc($datarray['url']),
-            dbesc($datarray['photo']),
-            dbesc($datarray['created']),
-            dbesc(''),      // will fill this in below after the record is created
-            intval($datarray['aid']),
-            intval($datarray['uid']),
-            dbesc($datarray['link']),
-            dbesc($datarray['parent']),
-            intval($seen),
-            intval($datarray['ntype']),
-            dbesc($datarray['verb']),
-            dbesc($datarray['otype'])
-        );
-
-        $r = q(
-            "select id from notify where hash = '%s' and uid = %d limit 1",
-            dbesc($hash),
-            intval($recip['channel_id'])
-        );
-        if ($r) {
-            $notify_id = $r[0]['id'];
-        } else {
-            logger('notification not found.');
-            pop_lang();
-            return;
-        }
-
-        $itemlink = z_root() . '/notify/view/' . $notify_id;
-        $msg = str_replace('$itemlink', $itemlink, $epreamble);
-
-    // wretched hack, but we don't want to duplicate all the preamble variations and we also don't want to screw up a translation
-
-        if ((App::$language === 'en' || (! App::$language)) && strpos($msg, ', ')) {
-            $msg = substr($msg, strpos($msg, ', ') + 1);
-        }
-
-        $r = q(
-            "update notify set msg = '%s' where id = %d and uid = %d",
-            dbesc($msg),
-            intval($notify_id),
-            intval($datarray['uid'])
-        );
-
-    // send email notification if notification preferences permit
-
-        require_once('bbcode.php');
-        if ((intval($recip['channel_notifyflags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
-            logger('notification: sending notification email');
-
-            $hn = get_pconfig($recip['channel_id'], 'system', 'email_notify_host');
-            if ($hn && (! stristr(App::get_hostname(), $hn))) {
-                // this isn't the email notification host
-                pop_lang();
-                return;
-            }
-
-            $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"), array( "", "\n"), $body))), ENT_QUOTES, 'UTF-8'));
-
-            $htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","
          \n"), $body)));
-
-
-            // use $_SESSION['zid_override'] to force zid() to use
-            // the recipient address instead of the current observer
-
-            $_SESSION['zid_override'] = Channel::get_webfinger($recip);
-            $_SESSION['zrl_override'] = z_root() . '/channel/' . $recip['channel_address'];
-
-            $textversion = zidify_links($textversion);
-            $htmlversion = zidify_links($htmlversion);
-
-            // unset when done to revert to normal behaviour
-
-            unset($_SESSION['zid_override']);
-            unset($_SESSION['zrl_override']);
-
-            $datarray = [];
-            $datarray['banner']       = $banner;
-            $datarray['product']      = $product;
-            $datarray['preamble']     = $preamble;
-            $datarray['sitename']     = $sitename;
-            $datarray['siteurl']      = $siteurl;
-            $datarray['type']         = $params['type'];
-            $datarray['parent']       = $params['parent_mid'];
-            $datarray['source_name']  = $sender['xchan_name'];
-            $datarray['source_link']  = $sender['xchan_url'];
-            $datarray['source_photo'] = $sender['xchan_photo_s'];
-            $datarray['uid']          = $recip['channel_id'];
-            $datarray['username']     = $recip['channel_name'];
-            $datarray['hsitelink']    = $hsitelink;
-            $datarray['tsitelink']    = $tsitelink;
-            $datarray['hitemlink']    = '' . $itemlink . '';
-            $datarray['titemlink']    = $itemlink;
-            $datarray['thanks']       = $thanks;
-            $datarray['site_admin']   = $site_admin;
-            $datarray['opt_out1']     = $opt_out1;
-            $datarray['opt_out2']     = $opt_out2;
-            $datarray['hopt_out2']    = $hopt_out2;
-            $datarray['title']        = stripslashes($title);
-            $datarray['htmlversion']  = $htmlversion;
-            $datarray['textversion']  = $textversion;
-            $datarray['subject']      = $subject;
-            $datarray['headers']      = $additional_mail_header;
-            $datarray['email_secure'] = false;
-
-            Hook::call('enotify_mail', $datarray);
-
-            // Default to private - don't disclose message contents over insecure channels (such as email)
-            // Might be interesting to use GPG,PGP,S/MIME encryption instead
-            // but we'll save that for a clever plugin developer to implement
-
-            $private_activity = false;
-
-            if (! $datarray['email_secure']) {
-                switch ($params['type']) {
-                    case NOTIFY_WALL:
-                    case NOTIFY_TAGSELF:
-                    case NOTIFY_POKE:
-                    case NOTIFY_RESHARE:
-                    case NOTIFY_COMMENT:
-                        if (! $private) {
-                            break;
-                        }
-                        $private_activity = true;
-                    case NOTIFY_MAIL:
-                        $datarray['textversion'] = $datarray['htmlversion'] = $datarray['title'] = '';
-                        $datarray['subject'] = preg_replace('/' . preg_quote(t('[$Projectname:Notify]'), '/') . '/', '$0*', $datarray['subject']);
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            if (
-                $private_activity
-                && intval(get_pconfig($datarray['uid'], 'system', 'ignore_private_notifications'))
-            ) {
-                pop_lang();
-                return;
-            }
-
-            // load the template for private message notifications
-            $tpl = Theme::get_template('email_notify_html.tpl');
-            $email_html_body = replace_macros($tpl, array(
-            '$banner'       => $datarray['banner'],
-            '$notify_icon'  => System::get_site_icon(),
-            '$product'      => $datarray['product'],
-            '$preamble'     => $salutation . '

          ' . $datarray['preamble'],
-            '$sitename'     => $datarray['sitename'],
-            '$siteurl'      => $datarray['siteurl'],
-            '$source_name'  => $datarray['source_name'],
-            '$source_link'  => $datarray['source_link'],
-            '$source_photo' => $datarray['source_photo'],
-            '$username'     => $datarray['to_name'],
-            '$hsitelink'    => $datarray['hsitelink'],
-            '$hitemlink'    => $datarray['hitemlink'],
-            '$thanks'       => $datarray['thanks'],
-            '$site_admin'   => $datarray['site_admin'],
-            '$opt_out1'     => $datarray['opt_out1'],
-            '$opt_out2'     => $datarray['hopt_out2'],
-            '$title'        => $datarray['title'],
-            '$htmlversion'  => $datarray['htmlversion'],
-            ));
-
-            // load the template for private message notifications
-            $tpl = Theme::get_template('email_notify_text.tpl');
-            $email_text_body = replace_macros($tpl, array(
-                '$banner'       => $datarray['banner'],
-                '$product'      => $datarray['product'],
-                '$preamble'     => $salutation . "\n\n" . $datarray['preamble'],
-                '$sitename'     => $datarray['sitename'],
-                '$siteurl'      => $datarray['siteurl'],
-                '$source_name'  => $datarray['source_name'],
-                '$source_link'  => $datarray['source_link'],
-                '$source_photo' => $datarray['source_photo'],
-                '$username'     => $datarray['to_name'],
-                '$tsitelink'    => $datarray['tsitelink'],
-                '$titemlink'    => $datarray['titemlink'],
-                '$thanks'       => $datarray['thanks'],
-                '$site_admin'   => $datarray['site_admin'],
-                '$opt_out1'     => $datarray['opt_out1'],
-                '$opt_out2'     => $datarray['opt_out2'],
-                '$title'        => $datarray['title'],
-                '$textversion'  => $datarray['textversion'],
-            ));
-
-    //      logger('text: ' . $email_text_body);
-
-            // use the EmailNotification library to send the message
-
-            $to_email = $recip['account_email'];
-
-            $e = get_pconfig($recip['channel_id'], 'system', 'notification_email', false);
-            if ($e) {
-                $to_email = $e;
-            }
-
-            $addrs = explode(',', $to_email);
-
-            foreach ($addrs as $addr) {
-                self::send(array(
-                'fromName'             => $sender_name,
-                'fromEmail'            => $sender_email,
-                'replyTo'              => $reply_email,
-                'toEmail'              => $addr,
-                'messageSubject'       => $datarray['subject'],
-                'htmlVersion'          => $email_html_body,
-                'textVersion'          => $email_text_body,
-                'additionalMailHeader' => $datarray['headers'],
-                ));
-            }
-        }
-
-        pop_lang();
-    }
-
-
-    /**
-     * @brief Send a multipart/alternative message with Text and HTML versions.
-     *
-     * @param array $params an assoziative array with:
-     *  * \e string \b fromName        name of the sender
-     *  * \e string \b fromEmail       email of the sender
-     *  * \e string \b replyTo         replyTo address to direct responses
-     *  * \e string \b toEmail         destination email address
-     *  * \e string \b messageSubject  subject of the message
-     *  * \e string \b htmlVersion     html version of the message
-     *  * \e string \b textVersion     text only version of the message
-     *  * \e string \b additionalMailHeader  additions to the smtp mail header
-     */
-    public static function send($params)
-    {
-
-        $params['sent']   = false;
-        $params['result'] = false;
-
-        Hook::call('email_send', $params);
-
-        if ($params['sent']) {
-            logger("notification: enotify::send (addon) returns " . (($params['result']) ? 'success' : 'failure'), LOGGER_DEBUG);
-            return $params['result'];
-        }
-
-        $fromName = email_header_encode(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8');
-        $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'], ENT_QUOTES, 'UTF-8'), 'UTF-8');
-
-        // generate a mime boundary
-        $mimeBoundary = rand(0, 9) . "-"
-                . rand(100000000, 999999999) . "-"
-                . rand(100000000, 999999999) . "=:"
-                . rand(10000, 99999);
-
-        // generate a multipart/alternative message header
-        $messageHeader =
-            $params['additionalMailHeader'] .
-            "From: $fromName <{$params['fromEmail']}>" . PHP_EOL .
-            "Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL .
-            "MIME-Version: 1.0" . PHP_EOL .
-            "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
-
-        // assemble the final multipart message body with the text and html types included
-        $textBody = chunk_split(base64_encode($params['textVersion']));
-        $htmlBody = chunk_split(base64_encode($params['htmlVersion']));
-
-        $multipartMessageBody =
-            "--" . $mimeBoundary . PHP_EOL .                    // plain text section
-            "Content-Type: text/plain; charset=UTF-8" . PHP_EOL .
-            "Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL .
-            $textBody . PHP_EOL .
-            "--" . $mimeBoundary . PHP_EOL .                    // text/html section
-            "Content-Type: text/html; charset=UTF-8" . PHP_EOL .
-            "Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL .
-            $htmlBody . PHP_EOL .
-            "--" . $mimeBoundary . "--" . PHP_EOL;                  // message ending
-
-        // send the message
-        $res = mail(
-            $params['toEmail'],                             // send to address
-            $messageSubject,                                // subject
-            $multipartMessageBody,                          // message body
-            $messageHeader                                  // message headers
-        );
-        logger("notification: enotify::send returns " . (($res) ? 'success' : 'failure'), LOGGER_DEBUG);
-        return $res;
-    }
-
-    public static function format($item)
-    {
-
-        $ret = '';
-
-        $expire = intval(get_config('system', 'default_expire_days'));
-        $expire_date = (($expire) ? datetime_convert('UTC', 'UTC', 'now - ' . $expire . ' days') : NULL_DATE);
-
-        require_once('include/conversation.php');
-
-        // Call localize_item to get a one line status for activities.
-        // This should set $item['localize'] to indicate we have a brief summary.
-        // and perhaps $item['shortlocalize'] for an even briefer summary
-
-        localize_item($item);
-
-        if ($item['shortlocalize']) {
-            $itemem_text = $item['shortlocalize'];
-        } elseif ($item['localize']) {
-            $itemem_text = $item['localize'];
-        } else {
-            $itemem_text = (($item['item_thread_top'])
-                ? t('created a new post')
-                : sprintf(t('reacted to %s\'s conversation'), $item['owner']['xchan_name']));
-            if ($item['verb'] === 'Announce') {
-                $itemem_text = sprintf(t('shared %s\'s post'), $item['owner']['xchan_name']);
-            }
-        }
-        if ($item['item_private'] == 2) {
-            $itemem_text = t('sent a direct message');
-        }
-
-        $edit = false;
-
-        if ($item['edited'] > $item['created']) {
-            if ($item['item_thread_top']) {
-                $itemem_text = sprintf(t('edited a post dated %s'), relative_date($item['created']));
-                $edit = true;
-            } else {
-                $itemem_text = sprintf(t('edited a comment dated %s'), relative_date($item['created']));
-                $edit = true;
-            }
-        }
-
-        if (LibBlock::fetch_by_entity(local_channel(), $item['author']['xchan_hash'])) {
-            return [];
-        }
-
-        // convert this logic into a json array just like the system notifications
-
-        $x = array(
-            'notify_link' => $item['llink'],
-            'name' => $item['author']['xchan_name'],
-            'addr' => $item['author']['xchan_addr'],
-            'url' => $item['author']['xchan_url'],
-            'photo' => $item['author']['xchan_photo_s'],
-            'when' => relative_date(($edit) ? $item['edited'] : $item['created']),
-            'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'),
-            'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? gen_link_id($item['thr_parent']) : gen_link_id($item['mid'])),
-            'notify_id' => 'undefined',
-            'thread_top' => (($item['item_thread_top']) ? true : false),
-            'message' => strip_tags(bbcode($itemem_text)),
-            // these are for the superblock addon
-            'hash' => $item['author']['xchan_hash'],
-            'uid' => local_channel(),
-            'display' => true
-        );
-
-        $post_date = (($edit) ? $item['edited'] : $item['created']);
-        if ($post_date && $post_date < $expire_date) {
-            return [];
-        }
-
-        Hook::call('enotify_format', $x);
-        if (! $x['display']) {
-            return [];
-        }
-
-        return $x;
-    }
-}
diff --git a/Zotlabs/Lib/ExtendedZip.php b/Zotlabs/Lib/ExtendedZip.php
deleted file mode 100644
index 3b1bea668..000000000
--- a/Zotlabs/Lib/ExtendedZip.php
+++ /dev/null
@@ -1,63 +0,0 @@
-addEmptyDir($localname);
-        }
-            $this->_addTree($dirname, $localname);
-    }
-
-        // Internal function, to recurse
-    protected function _addTree($dirname, $localname)
-    {
-            $dir = opendir($dirname);
-        while ($filename = readdir($dir)) {
-                // Discard . and ..
-            if ($filename == '.' || $filename == '..') {
-                    continue;
-            }
-
-                // Proceed according to type
-                $path = $dirname . '/' . $filename;
-                $localpath = $localname ? ($localname . '/' . $filename) : $filename;
-            if (is_dir($path)) {
-                // Directory: add & recurse
-                $this->addEmptyDir($localpath);
-                $this->_addTree($path, $localpath);
-            } elseif (is_file($path)) {
-                    // File: just add
-                    $this->addFile($path, $localpath);
-            }
-        }
-            closedir($dir);
-    }
-
-        // Helper function
-    public static function zipTree($dirname, $zipFilename, $flags = 0, $localname = '')
-    {
-            $zip = new self();
-            $zip->open($zipFilename, $flags);
-            $zip->addTree($dirname, $localname);
-            $zip->close();
-    }
-}
diff --git a/Zotlabs/Lib/Features.php b/Zotlabs/Lib/Features.php
deleted file mode 100644
index a21630323..000000000
--- a/Zotlabs/Lib/Features.php
+++ /dev/null
@@ -1,572 +0,0 @@
- $uid, 'feature' => $feature, 'enabled' => $x);
-        Hook::call('feature_enabled', $arr);
-        return($arr['enabled']);
-    }
-
-    public static function get_default($feature)
-    {
-        $f = Features::get(false);
-        foreach ($f as $cat) {
-            foreach ($cat as $feat) {
-                if (is_array($feat) && $feat[0] === $feature) {
-                    return $feat[3];
-                }
-            }
-        }
-        return false;
-    }
-
-
-    public static function level($feature, $def)
-    {
-        $x = get_config('feature_level', $feature);
-        if ($x !== false) {
-            return intval($x);
-        }
-        return $def;
-    }
-
-    public static function get($filtered = true, $level = (-1))
-    {
-
-        $account = App::get_account();
-
-        $arr = [
-
-            // General
-            'general' => [
-
-                t('General Features'),
-
-                [
-                    'start_menu',
-                    t('New Member Links'),
-                    t('Display new member quick links menu'),
-                    (($account && $account['account_created'] > datetime_convert('', '', 'now - 30 days')) ? true : false),
-                    get_config('feature_lock', 'start_menu'),
-                    self::level('start_menu', 1),
-                ],
-
-                [
-                    'advanced_profiles',
-                    t('Advanced Profiles'),
-                    t('Additional profile sections and selections'),
-                    false,
-                    get_config('feature_lock', 'advanced_profiles'),
-                    self::level('advanced_profiles', 1),
-                ],
-
-
-    //          [
-    //              'profile_export',
-    //              t('Profile Import/Export'),
-    //              t('Save and load profile details across sites/channels'),
-    //              false,
-    //              get_config('feature_lock','profile_export'),
-    //              self::level('profile_export',3),
-    //          ],
-
-    //          [
-    //              'webpages',
-    //              t('Web Pages'),
-    //              t('Provide managed web pages on your channel'),
-    //              false,
-    //              get_config('feature_lock','webpages'),
-    //              self::level('webpages',3),
-    //          ],
-
-    //          [
-    //              'wiki',
-    //              t('Wiki'),
-    //              t('Provide a wiki for your channel'),
-    //              false,
-    //              get_config('feature_lock','wiki'),
-    //              self::level('wiki',2),
-    //          ],
-
-    /*
-                [
-                    'hide_rating',
-                    t('Hide Rating'),
-                    t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),
-                    false,
-                    get_config('feature_lock','hide_rating'),
-                    self::level('hide_rating',3),
-                ],
-    */
-                [
-                    'private_notes',
-                    t('Private Notes'),
-                    t('Enables a tool to store notes and reminders (note: not encrypted)'),
-                    false,
-                    get_config('feature_lock', 'private_notes'),
-                    self::level('private_notes', 1),
-                ],
-
-
-    //          [
-    //              'cards',
-    //              t('Cards'),
-    //              t('Create personal planning cards'),
-    //              false,
-    //              get_config('feature_lock','cards'),
-    //              self::level('cards',1),
-    //          ],
-
-
-                [
-                    'articles',
-                    t('Articles'),
-                    t('Create interactive articles'),
-                    false,
-                    get_config('feature_lock', 'articles'),
-                    self::level('articles', 1),
-                ],
-
-    //          [
-    //              'nav_channel_select',
-    //              t('Navigation Channel Select'),
-    //              t('Change channels directly from within the navigation dropdown menu'),
-    //              false,
-    //              get_config('feature_lock','nav_channel_select'),
-    //              self::level('nav_channel_select',3),
-    //          ],
-
-                [
-                    'photo_location',
-                    t('Photo Location'),
-                    t('If location data is available on uploaded photos, link this to a map.'),
-                    false,
-                    get_config('feature_lock', 'photo_location'),
-                    self::level('photo_location', 2),
-                ],
-
-
-    //          [
-    //              'ajaxchat',
-    //              t('Access Controlled Chatrooms'),
-    //              t('Provide chatrooms and chat services with access control.'),
-    //              true,
-    //              get_config('feature_lock','ajaxchat'),
-    //              self::level('ajaxchat',1),
-    //          ],
-
-
-    //          [
-    //              'smart_birthdays',
-    //              t('Smart Birthdays'),
-    //              t('Make birthday events timezone aware in case your friends are scattered across the planet.'),
-    //              true,
-    //              get_config('feature_lock','smart_birthdays'),
-    //              self::level('smart_birthdays',2),
-    //          ],
-
-                [
-                    'event_tz_select',
-                    t('Event Timezone Selection'),
-                    t('Allow event creation in timezones other than your own.'),
-                    false,
-                    get_config('feature_lock', 'event_tz_select'),
-                    self::level('event_tz_select', 2),
-                ],
-
-
-    //          [
-    //              'premium_channel',
-    //              t('Premium Channel'),
-    //              t('Allows you to set restrictions and terms on those that connect with your channel'),
-    //              false,
-    //              get_config('feature_lock','premium_channel'),
-    //              self::level('premium_channel',4),
-    //          ],
-
-                [
-                    'advanced_dirsearch',
-                    t('Advanced Directory Search'),
-                    t('Allows creation of complex directory search queries'),
-                    false,
-                    get_config('feature_lock', 'advanced_dirsearch'),
-                    self::level('advanced_dirsearch', 4),
-                ],
-
-                [
-                    'advanced_theming',
-                    t('Advanced Theme and Layout Settings'),
-                    t('Allows fine tuning of themes and page layouts'),
-                    false,
-                    get_config('feature_lock', 'advanced_theming'),
-                    self::level('advanced_theming', 4),
-                ],
-            ],
-
-
-            'access_control' => [
-                t('Access Control and Permissions'),
-
-                [
-                    'groups',
-                    t('Privacy Groups'),
-                    t('Enable management and selection of privacy groups'),
-                    false,
-                    get_config('feature_lock', 'groups'),
-                    self::level('groups', 0),
-                ],
-
-    //          [
-    //              'multi_profiles',
-    //              t('Multiple Profiles'),
-    //              t('Ability to create multiple profiles'),
-    //              false,
-    //              get_config('feature_lock','multi_profiles'),
-    //              self::level('multi_profiles',3),
-    //          ],
-
-
-              [
-                  'permcats',
-                  t('Permission Categories'),
-                  t('Create custom connection permission limits'),
-                  true,
-                  get_config('feature_lock','permcats'),
-                  self::level('permcats',2),
-              ],
-
-    //          [
-    //              'oauth_clients',
-    //              t('OAuth1 Clients'),
-    //              t('Manage OAuth1 authenticatication tokens for mobile and remote apps.'),
-    //              false,
-    //              get_config('feature_lock','oauth_clients'),
-    //              self::level('oauth_clients',1),
-    //          ],
-
-                [
-                    'oauth2_clients',
-                    t('OAuth2 Clients'),
-                    t('Manage OAuth2 authenticatication tokens for mobile and remote apps.'),
-                    false,
-                    get_config('feature_lock', 'oauth2_clients'),
-                    self::level('oauth2_clients', 1),
-                ],
-
-    //          [
-    //              'access_tokens',
-    //              t('Access Tokens'),
-    //              t('Create access tokens so that non-members can access private content.'),
-    //              false,
-    //              get_config('feature_lock','access_tokens'),
-    //              self::level('access_tokens',2),
-    //          ],
-
-            ],
-
-            // Post composition
-            'composition' => [
-
-                t('Post Composition Features'),
-
-    //          [
-    //              'large_photos',
-    //              t('Large Photos'),
-    //              t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),
-    //              false,
-    //              get_config('feature_lock','large_photos'),
-    //              self::level('large_photos',1),
-    //          ],
-
-    //          [
-    //              'channel_sources',
-    //              t('Channel Sources'),
-    //              t('Automatically import channel content from other channels or feeds'),
-    //              false,
-    //              get_config('feature_lock','channel_sources'),
-    //              self::level('channel_sources',3),
-    //          ],
-
-                [
-                    'content_encrypt',
-                    t('Browser Encryption'),
-                    t('Provide optional browser-to-browser encryption of content with a shared secret key'),
-                    true,
-                    get_config('feature_lock', 'content_encrypt'),
-                    self::level('content_encrypt', 3),
-                ],
-
-    //          [
-    //              'consensus_tools',
-    //              t('Enable Voting Tools'),
-    //              t('Provide a class of post which others can vote on'),
-    //              false,
-    //              get_config('feature_lock','consensus_tools'),
-    //              self::level('consensus_tools',3),
-    //          ],
-
-    //          [
-    //              'disable_comments',
-    //              t('Disable Comments'),
-    //              t('Provide the option to disable comments for a post'),
-    //              false,
-    //              get_config('feature_lock','disable_comments'),
-    //              self::level('disable_comments',2),
-    //          ],
-
-    //          [
-    //              'delayed_posting',
-    //              t('Delayed Posting'),
-    //              t('Allow posts to be published at a later date'),
-    //              false,
-    //              get_config('feature_lock','delayed_posting'),
-    //              self::level('delayed_posting',2),
-    //          ],
-
-    //          [
-    //              'content_expire',
-    //              t('Content Expiration'),
-    //              t('Remove posts/comments and/or private messages at a future time'),
-    //              false,
-    //              get_config('feature_lock','content_expire'),
-    //              self::level('content_expire',1),
-    //          ],
-
-                [
-                    'suppress_duplicates',
-                    t('Suppress Duplicate Posts/Comments'),
-                    t('Prevent posts with identical content to be published with less than two minutes in between submissions.'),
-                    true,
-                    get_config('feature_lock', 'suppress_duplicates'),
-                    self::level('suppress_duplicates', 1),
-                ],
-
-                [
-                    'auto_save_draft',
-                    t('Auto-save drafts of posts and comments'),
-                    t('Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions'),
-                    true,
-                    get_config('feature_lock', 'auto_save_draft'),
-                    self::level('auto_save_draft', 1),
-                ],
-
-            ],
-
-            // Network Tools
-            'net_module' => [
-
-                t('Network and Stream Filtering'),
-
-                [
-                    'archives',
-                    t('Search by Date'),
-                    t('Ability to select posts by date ranges'),
-                    false,
-                    get_config('feature_lock', 'archives'),
-                    self::level('archives', 1),
-                ],
-
-
-                [
-                    'savedsearch',
-                    t('Saved Searches'),
-                    t('Save search terms for re-use'),
-                    false,
-                    get_config('feature_lock', 'savedsearch'),
-                    self::level('savedsearch', 2),
-                ],
-
-                [
-                    'order_tab',
-                    t('Alternate Stream Order'),
-                    t('Ability to order the stream by last post date, last comment date or unthreaded activities'),
-                    false,
-                    get_config('feature_lock', 'order_tab'),
-                    self::level('order_tab', 2),
-                ],
-
-                [
-                    'name_tab',
-                    t('Contact Filter'),
-                    t('Ability to display only posts of a selected contact'),
-                    false,
-                    get_config('feature_lock', 'name_tab'),
-                    self::level('name_tab', 1),
-                ],
-
-                [
-                    'forums_tab',
-                    t('Forum Filter'),
-                    t('Ability to display only posts of a specific forum'),
-                    false,
-                    get_config('feature_lock', 'forums_tab'),
-                    self::level('forums_tab', 1),
-                ],
-
-                [
-                    'personal_tab',
-                    t('Personal Posts Filter'),
-                    t('Ability to display only posts that you\'ve interacted on'),
-                    false,
-                    get_config('feature_lock', 'personal_tab'),
-                    self::level('personal_tab', 1),
-                ],
-
-                [
-                    'affinity',
-                    t('Affinity Tool'),
-                    t('Filter stream activity by depth of relationships'),
-                    false,
-                    get_config('feature_lock', 'affinity'),
-                    self::level('affinity', 1),
-                ],
-
-                [
-                    'suggest',
-                    t('Suggest Channels'),
-                    t('Show friend and connection suggestions'),
-                    false,
-                    get_config('feature_lock', 'suggest'),
-                    self::level('suggest', 1),
-                ],
-
-                [
-                    'connfilter',
-                    t('Connection Filtering'),
-                    t('Filter incoming posts from connections based on keywords/content'),
-                    false,
-                    get_config('feature_lock', 'connfilter'),
-                    self::level('connfilter', 3),
-                ],
-
-
-            ],
-
-            // Item tools
-            'tools' => [
-
-                t('Post/Comment Tools'),
-
-                [
-                    'commtag',
-                    t('Community Tagging'),
-                    t('Ability to tag existing posts'),
-                    false,
-                    get_config('feature_lock', 'commtag'),
-                    self::level('commtag', 1),
-                ],
-
-                [
-                    'categories',
-                    t('Post Categories'),
-                    t('Add categories to your posts'),
-                    false,
-                    get_config('feature_lock', 'categories'),
-                    self::level('categories', 1),
-                ],
-
-                [
-                    'emojis',
-                    t('Emoji Reactions'),
-                    t('Add emoji reaction ability to posts'),
-                    true,
-                    get_config('feature_lock', 'emojis'),
-                    self::level('emojis', 1),
-                ],
-
-                [
-                    'filing',
-                    t('Saved Folders'),
-                    t('Ability to file posts under folders'),
-                    false,
-                    get_config('feature_lock', 'filing'),
-                    self::level('filing', 2),
-                ],
-
-                [
-                    'dislike',
-                    t('Dislike Posts'),
-                    t('Ability to dislike posts/comments'),
-                    false,
-                    get_config('feature_lock', 'dislike'),
-                    self::level('dislike', 1),
-                ],
-
-    //          [
-    //              'star_posts',
-    //              t('Star Posts'),
-    //              t('Ability to mark special posts with a star indicator'),
-    //              false,
-    //              get_config('feature_lock','star_posts'),
-    //              self::level('star_posts',1),
-    //          ],
-    //
-                [
-                    'tagadelic',
-                    t('Tag Cloud'),
-                    t('Provide a personal tag cloud on your channel page'),
-                    false,
-                    get_config('feature_lock', 'tagadelic'),
-                    self::level('tagadelic', 2),
-                ],
-            ],
-        ];
-
-        $x = [ 'features' => $arr, ];
-        Hook::call('get_features', $x);
-
-        $arr = $x['features'];
-
-        // removed any locked features and remove the entire category if this makes it empty
-
-        if ($filtered) {
-            $narr = [];
-            foreach ($arr as $k => $x) {
-                $narr[$k] = [ $arr[$k][0] ];
-                $has_items = false;
-                for ($y = 0; $y < count($arr[$k]); $y++) {
-                    $disabled = false;
-                    if (is_array($arr[$k][$y])) {
-                        if ($arr[$k][$y][4] !== false) {
-                            $disabled = true;
-                        }
-                        if (! $disabled) {
-                            $has_items = true;
-                            $narr[$k][$y] = $arr[$k][$y];
-                        }
-                    }
-                }
-                if (! $has_items) {
-                    unset($narr[$k]);
-                }
-            }
-        } else {
-            $narr = $arr;
-        }
-
-        return $narr;
-    }
-
-
-    
-
-}
diff --git a/Zotlabs/Lib/Hashpath.php b/Zotlabs/Lib/Hashpath.php
deleted file mode 100644
index 1f8745b64..000000000
--- a/Zotlabs/Lib/Hashpath.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
-     *
-     * @param string $src
-     * @param string $media change media attribute (default to 'screen')
-     */
-    public static function add_css($src, $media = 'screen')
-    {
-        App::$css_sources[] = [ $src, $media ];
-    }
-
-    public static function remove_css($src, $media = 'screen')
-    {
-
-        $index = array_search([$src, $media], App::$css_sources);
-        if ($index !== false) {
-            unset(App::$css_sources[$index]);
-        }
-        // re-index the array
-        App::$css_sources = array_values(App::$css_sources);
-    }
-
-    public static function get_css()
-    {
-        $str = EMPTY_STR;
-        $sources = App::$css_sources;
-        if (is_array($sources) && $sources) {
-            foreach ($sources as $source) {
-                $str .= self::format_css_if_exists($source);
-            }
-        }
-
-        return $str;
-    }
-
-    public static function add_link($arr)
-    {
-        if ($arr) {
-            App::$linkrel[] = $arr;
-        }
-    }
-
-    public static function get_links()
-    {
-        $str = '';
-        $sources = App::$linkrel;
-        if (is_array($sources) && $sources) {
-            foreach ($sources as $source) {
-                if (is_array($source) && $source) {
-                    $str .= ' $v) {
-                        $str .= ' ' . $k . '="' . $v . '"';
-                    }
-                    $str .= ' />' . "\r\n";
-                }
-            }
-        }
-
-        return $str;
-    }
-
-    public static function format_css_if_exists($source)
-    {
-
-        // script_path() returns https://yoursite.tld
-
-        $path_prefix = self::script_path();
-
-        $script = $source[0];
-
-        if (strpos($script, '/') !== false) {
-            // The script is a path relative to the server root
-            $path = $script;
-            // If the url starts with // then it's an absolute URL
-            if (substr($script, 0, 2) === '//') {
-                $path_prefix = '';
-            }
-        } else {
-            // It's a file from the theme
-            $path = '/' . Theme::include($script);
-        }
-
-        if ($path) {
-            $qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
-            return '' . "\r\n";
-        }
-    }
-
-    /**
-     * This basically calculates the baseurl. We have other functions to do that, but
-     * there was an issue with script paths and mixed-content whose details are arcane
-     * and perhaps lost in the message archives. The short answer is that we're ignoring
-     * the URL which we are "supposed" to use, and generating script paths relative to
-     * the URL which we are currently using; in order to ensure they are found and aren't
-     * blocked due to mixed content issues.
-     *
-     * @return string
-     */
-    public static function script_path()
-    {
-        if (x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) {
-            $scheme = 'https';
-        } elseif (x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) {
-            $scheme = 'https';
-        } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
-            $scheme = 'https';
-        } else {
-            $scheme = 'http';
-        }
-
-        // Some proxy setups may require using http_host
-
-        if (isset(App::$config['system']['script_path_use_http_host']) && intval(App::$config['system']['script_path_use_http_host'])) {
-            $server_var = 'HTTP_HOST';
-        } else {
-            $server_var = 'SERVER_NAME';
-        }
-
-
-        if (x($_SERVER, $server_var)) {
-            $hostname = $_SERVER[$server_var];
-        } else {
-            return z_root();
-        }
-
-        return $scheme . '://' . $hostname;
-    }
-
-    public static function add_js($src, $priority = 0)
-    {
-        if (! (isset(App::$js_sources[$priority]) && is_array(App::$js_sources[$priority]))) {
-            App::$js_sources[$priority] = [];
-        }
-        App::$js_sources[$priority][] = $src;
-    }
-
-    public static function remove_js($src, $priority = 0)
-    {
-
-        $index = array_search($src, App::$js_sources[$priority]);
-        if ($index !== false) {
-            unset(App::$js_sources[$priority][$index]);
-        }
-    }
-
-    /**
-     * We should probably try to register main.js with a high priority, but currently
-     * we handle it separately and put it at the end of the html head block in case
-     * any other javascript is added outside the head_add_js construct.
-     *
-     * @return string
-     */
-    public static function get_js()
-    {
-
-        $str = '';
-        if (App::$js_sources) {
-            ksort(App::$js_sources, SORT_NUMERIC);
-            foreach (App::$js_sources as $sources) {
-                if (count($sources)) {
-                    foreach ($sources as $source) {
-                        if ($source === 'main.js') {
-                            continue;
-                        }
-                        $str .= self::format_js_if_exists($source);
-                    }
-                }
-            }
-        }
-
-        return $str;
-    }
-
-    public static function get_main_js()
-    {
-        return self::format_js_if_exists('main.js', true);
-    }
-
-    public static function format_js_if_exists($source)
-    {
-        $path_prefix = self::script_path();
-
-        if (strpos($source, '/') !== false) {
-            // The source is a known path on the system
-            $path = $source;
-            // If the url starts with // then it's an absolute URL
-            if (substr($source, 0, 2) === '//') {
-                $path_prefix = '';
-            }
-        } else {
-            // It's a file from the theme
-            $path = '/' . Theme::include($source);
-        }
-        if ($path) {
-            $qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
-            return '' . "\r\n" ;
-        }
-    }    
-
-}
\ No newline at end of file
diff --git a/Zotlabs/Lib/IConfig.php b/Zotlabs/Lib/IConfig.php
deleted file mode 100644
index e0c6567eb..000000000
--- a/Zotlabs/Lib/IConfig.php
+++ /dev/null
@@ -1,182 +0,0 @@
- $family, 'k' => $key, 'v' => $value, 'sharing' => $sharing);
-
-            if (is_null($idx)) {
-                $item['iconfig'][] = $entry;
-            } else {
-                $item['iconfig'][$idx] = $entry;
-            }
-            return $value;
-        }
-
-        if (intval($item)) {
-            $iid = intval($item);
-        }
-
-        if (! $iid) {
-            return false;
-        }
-
-        if (self::Get($item, $family, $key) === false) {
-            $r = q(
-                "insert into iconfig( iid, cat, k, v, sharing ) values ( %d, '%s', '%s', '%s', %d ) ",
-                intval($iid),
-                dbesc($family),
-                dbesc($key),
-                dbesc($dbvalue),
-                intval($sharing)
-            );
-        } else {
-            $r = q(
-                "update iconfig set v = '%s', sharing = %d where iid = %d and cat = '%s' and  k = '%s' ",
-                dbesc($dbvalue),
-                intval($sharing),
-                intval($iid),
-                dbesc($family),
-                dbesc($key)
-            );
-        }
-
-        if (! $r) {
-            return false;
-        }
-
-        return $value;
-    }
-
-
-
-    public static function Delete(&$item, $family, $key)
-    {
-
-
-        $is_item = false;
-        $idx = null;
-
-        if (is_array($item)) {
-            $is_item = true;
-            if (is_array($item['iconfig'])) {
-                for ($x = 0; $x < count($item['iconfig']); $x++) {
-                    if ($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
-                        unset($item['iconfig'][$x]);
-                    }
-                }
-                // re-order the array index
-                $item['iconfig'] = array_values($item['iconfig']);
-            }
-            return true;
-        }
-
-        if (intval($item)) {
-            $iid = intval($item);
-        }
-
-        if (! $iid) {
-            return false;
-        }
-
-        return q(
-            "delete from iconfig where iid = %d and cat = '%s' and  k = '%s' ",
-            intval($iid),
-            dbesc($family),
-            dbesc($key)
-        );
-    }
-}
diff --git a/Zotlabs/Lib/Img_cache.php b/Zotlabs/Lib/Img_cache.php
deleted file mode 100644
index 1682d07b2..000000000
--- a/Zotlabs/Lib/Img_cache.php
+++ /dev/null
@@ -1,83 +0,0 @@
-= self::$cache_life) {
-                Run::Summon(['Cache_image', $url, $path]);
-                return false;
-            } else {
-                return ((filesize($path)) ? true : false);
-            }
-        }
-
-        // Cache_image invokes url_to_cache() as a background task
-
-        Run::Summon(['Cache_image', $url, $path]);
-        return false;
-    }
-
-    public static function url_to_cache($url, $file)
-    {
-
-        $fp = fopen($file, 'wb');
-
-        if (!$fp) {
-            logger('failed to open storage file: ' . $file, LOGGER_NORMAL, LOG_ERR);
-            return false;
-        }
-
-        // don't check certs, and since we're running in the background,
-        // allow a two-minute timeout rather than the default one minute.
-        // This is a compromise. We want to cache all the slow sites we can,
-        // but don't want to rack up too many processes doing so.
-
-        $redirects = 0;
-        $x = z_fetch_url($url, true, $redirects, ['filep' => $fp, 'novalidate' => true, 'timeout' => 120]);
-
-        fclose($fp);
-
-        if ($x['success'] && file_exists($file)) {
-            $i = @getimagesize($file);
-            if ($i && $i[2]) {  // looking for non-zero imagetype
-                Run::Summon(['CacheThumb', basename($file)]);
-                return true;
-            }
-        }
-
-        // We could not cache the image for some reason. Leave an empty file here
-        // to provide a record of the attempt. We'll use this as a flag to avoid
-        // doing it again repeatedly.
-
-        file_put_contents($file, EMPTY_STR);
-        logger('cache failed from  ' . $url);
-        return false;
-    }
-}
diff --git a/Zotlabs/Lib/Img_filesize.php b/Zotlabs/Lib/Img_filesize.php
deleted file mode 100644
index 6ca8a6cd1..000000000
--- a/Zotlabs/Lib/Img_filesize.php
+++ /dev/null
@@ -1,127 +0,0 @@
-url = $url;
-    }
-
-    public function getSize()
-    {
-        $size = null;
-
-        if (stripos($this->url, z_root() . '/photo') !== false) {
-            $size = self::getLocalFileSize($this->url);
-        }
-        if (!$size) {
-            $size = getRemoteFileSize($this->url);
-        }
-
-        return $size;
-    }
-
-
-    public static function getLocalFileSize($url)
-    {
-
-        $fname = basename($url);
-        $resolution = 0;
-
-        if (strpos($fname, '.') !== false) {
-            $fname = substr($fname, 0, strpos($fname, '.'));
-        }
-
-        if (substr($fname, -2, 1) == '-') {
-            $resolution = intval(substr($fname, -1, 1));
-            $fname = substr($fname, 0, -2);
-        }
-
-        $r = q(
-            "SELECT filesize FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
-            dbesc($fname),
-            intval($resolution)
-        );
-        if ($r) {
-            return $r[0]['filesize'];
-        }
-        return null;
-    }
-}
-
-/**
- * Try to determine the size of a remote file by making an HTTP request for
- * a byte range, or look for the content-length header in the response.
- * The function aborts the transfer as soon as the size is found, or if no
- * length headers are returned, it aborts the transfer.
- *
- * @return int|null null if size could not be determined, or length of content
- */
-function getRemoteFileSize($url)
-{
-    $ch = curl_init($url);
-
-    $headers = array(
-        'Range: bytes=0-1',
-        'Connection: close',
-    );
-
-    $in_headers = true;
-    $size       = null;
-
-    curl_setopt($ch, CURLOPT_HEADER, 1);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2450.0 Iron/46.0.2450.0');
-    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-    curl_setopt($ch, CURLOPT_VERBOSE, 0); // set to 1 to debug
-    curl_setopt($ch, CURLOPT_STDERR, fopen('php://output', 'r'));
-
-    curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $line) use (&$in_headers, &$size) {
-        $length = strlen($line);
-
-        if (trim($line) == '') {
-            $in_headers = false;
-        }
-
-        list($header, $content) = explode(':', $line, 2);
-        $header = strtolower(trim($header));
-
-        if ($header == 'content-range') {
-            // found a content-range header
-            list($rng, $s) = explode('/', $content, 2);
-            $size = (int)$s;
-            return 0; // aborts transfer
-        } elseif ($header == 'content-length' && 206 != curl_getinfo($curl, CURLINFO_HTTP_CODE)) {
-            // found content-length header and this is not a 206 Partial Content response (range response)
-            $size = (int)$content;
-            return 0;
-        } else {
-            // continue
-            return $length;
-        }
-    });
-
-    curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($curl, $data) use ($in_headers) {
-        if (!$in_headers) {
-            // shouldn't be here unless we couldn't determine file size
-            // abort transfer
-            return 0;
-        }
-
-        // write function is also called when reading headers
-        return strlen($data);
-    });
-
-    curl_exec($ch);
-    curl_getinfo($ch);
-    curl_close($ch);
-
-    return $size;
-}
diff --git a/Zotlabs/Lib/Infocon.php b/Zotlabs/Lib/Infocon.php
deleted file mode 100644
index 4e33d6bff..000000000
--- a/Zotlabs/Lib/Infocon.php
+++ /dev/null
@@ -1,76 +0,0 @@
- true,
-            'data' => $data,
-            'data_type' => $data_type,
-            'encoding' => $encoding,
-            'alg' => $algorithm,
-            'sigs' => [
-                'value' => $signature,
-                'key_id' => base64url_encode($key_id, true)
-            ]
-        ]);
-    }
-
-    public static function verify($x)
-    {
-
-        logger('verify');
-        $ret = ['results' => []];
-
-        if (!is_array($x)) {
-            return false;
-        }
-        if (!(array_key_exists('signed', $x) && $x['signed'])) {
-            return false;
-        }
-
-        $signed_data = preg_replace('/\s+/', '', $x['data']) . '.'
-            . base64url_encode($x['data_type'], true) . '.'
-            . base64url_encode($x['encoding'], true) . '.'
-            . base64url_encode($x['alg'], true);
-
-        $key = HTTPSig::get_key(EMPTY_STR, 'zot6', base64url_decode($x['sigs']['key_id']));
-        logger('key: ' . print_r($key, true));
-        if ($key['portable_id'] && $key['public_key']) {
-            if (Crypto::verify($signed_data, base64url_decode($x['sigs']['value']), $key['public_key'])) {
-                logger('verified');
-                $ret = ['success' => true, 'signer' => $key['portable_id'], 'hubloc' => $key['hubloc']];
-            }
-        }
-
-        return $ret;
-    }
-
-    public static function unpack($data)
-    {
-        return json_decode(base64url_decode($data), true);
-    }
-}
-
diff --git a/Zotlabs/Lib/Keyutils.php b/Zotlabs/Lib/Keyutils.php
deleted file mode 100644
index 67c6f85fc..000000000
--- a/Zotlabs/Lib/Keyutils.php
+++ /dev/null
@@ -1,102 +0,0 @@
-loadKey([
-            'e' => new BigInteger($e, 256),
-            'n' => new BigInteger($m, 256)
-        ]);
-        return $rsa->getPublicKey();
-    }
-
-    /**
-     * @param string key
-     * @return string
-     */
-    public static function rsaToPem($key)
-    {
-
-        $rsa = new RSA();
-        $rsa->setPublicKey($key);
-
-        return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8);
-    }
-
-    /**
-     * @param string key
-     * @return string
-     */
-    public static function pemToRsa($key)
-    {
-
-        $rsa = new RSA();
-        $rsa->setPublicKey($key);
-
-        return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1);
-    }
-
-    /**
-     * @param string $key key
-     * @param string $m reference modulo
-     * @param string $e reference exponent
-     */
-    public static function pemToMe($key, &$m, &$e)
-    {
-
-        $rsa = new RSA();
-        $rsa->loadKey($key);
-        $rsa->setPublicKey();
-
-        $m = $rsa->modulus->toBytes();
-        $e = $rsa->exponent->toBytes();
-    }
-
-    /**
-     * @param string $pubkey
-     * @return string
-     */
-    public static function salmonKey($pubkey)
-    {
-        self::pemToMe($pubkey, $m, $e);
-        return 'RSA' . '.' . base64url_encode($m, true) . '.' . base64url_encode($e, true);
-    }
-
-    /**
-     * @param string $key
-     * @return string
-     */
-    public static function convertSalmonKey($key)
-    {
-        if (strstr($key, ',')) {
-            $rawkey = substr($key, strpos($key, ',') + 1);
-        } else {
-            $rawkey = substr($key, 5);
-        }
-
-        $key_info = explode('.', $rawkey);
-
-        $m = base64url_decode($key_info[1]);
-        $e = base64url_decode($key_info[2]);
-
-        return self::meToPem($m, $e);
-    }
-}
diff --git a/Zotlabs/Lib/LDSignatures.php b/Zotlabs/Lib/LDSignatures.php
deleted file mode 100644
index ff9729cd6..000000000
--- a/Zotlabs/Lib/LDSignatures.php
+++ /dev/null
@@ -1,139 +0,0 @@
- 'RsaSignature2017',
-            'nonce' => random_string(64),
-            'creator' => Channel::url($channel),
-            'created' => datetime_convert('UTC', 'UTC', 'now', 'Y-m-d\TH:i:s\Z')
-        ];
-
-        $ohash = self::hash(self::signable_options($options));
-        $dhash = self::hash(self::signable_data($data));
-        $options['signatureValue'] = base64_encode(Crypto::sign($ohash . $dhash, $channel['channel_prvkey']));
-
-        return $options;
-    }
-
-
-    public static function signable_data($data)
-    {
-
-        $newdata = [];
-        if ($data) {
-            foreach ($data as $k => $v) {
-                if (!in_array($k, ['signature'])) {
-                    $newdata[$k] = $v;
-                }
-            }
-        }
-        return json_encode($newdata, JSON_UNESCAPED_SLASHES);
-    }
-
-
-    public static function signable_options($options)
-    {
-
-        $newopts = ['@context' => 'https://w3id.org/identity/v1'];
-        if ($options) {
-            foreach ($options as $k => $v) {
-                if (!in_array($k, ['type', 'id', 'signatureValue'])) {
-                    $newopts[$k] = $v;
-                }
-            }
-        }
-        return json_encode($newopts, JSON_UNESCAPED_SLASHES);
-    }
-
-    public static function hash($obj)
-    {
-
-        return hash('sha256', self::normalise($obj));
-    }
-
-    public static function normalise($data)
-    {
-        if (is_string($data)) {
-            $data = json_decode($data);
-        }
-
-        if (!is_object($data)) {
-            return '';
-        }
-
-        jsonld_set_document_loader('jsonld_document_loader');
-
-        try {
-            $d = jsonld_normalize($data, ['algorithm' => 'URDNA2015', 'format' => 'application/nquads']);
-        } catch (Exception $e) {
-            // Don't log the exception - this can exhaust memory
-            // logger('normalise error:' . print_r($e,true));
-            logger('normalise error: ' . print_r($data, true));
-        }
-
-        return $d;
-    }
-
-    public static function salmon_sign($data, $channel)
-    {
-
-        $arr = $data;
-        $data = json_encode($data, JSON_UNESCAPED_SLASHES);
-        $data = base64url_encode($data, false); // do not strip padding
-        $data_type = 'application/activity+json';
-        $encoding = 'base64url';
-        $algorithm = 'RSA-SHA256';
-        $keyhash = base64url_encode(Channel::url($channel));
-
-        $data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $data);
-
-        // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
-
-        $precomputed = '.' . base64url_encode($data_type, false) . '.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
-
-        $signature = base64url_encode(Crypto::sign($data . $precomputed, $channel['channel_prvkey']));
-
-        return ([
-            'id' => $arr['id'],
-            'meData' => $data,
-            'meDataType' => $data_type,
-            'meEncoding' => $encoding,
-            'meAlgorithm' => $algorithm,
-            'meCreator' => Channel::url($channel),
-            'meSignatureValue' => $signature
-        ]);
-    }
-}
diff --git a/Zotlabs/Lib/LibBlock.php b/Zotlabs/Lib/LibBlock.php
deleted file mode 100644
index 0e79ea627..000000000
--- a/Zotlabs/Lib/LibBlock.php
+++ /dev/null
@@ -1,118 +0,0 @@
-' ], [ '', '' ], $item);
-    }
-
-    /**
-    * Builds a modal dialog for editing permissions, using acl_selector.tpl as the template.
-    *
-    * @param array   $defaults Optional access control list for the initial state of the dialog.
-    * @param bool $show_jotnets Whether plugins for federated networks should be included in the permissions dialog
-    * @param PermissionDescription $emptyACL_description - An optional description for the permission implied by selecting an empty ACL. Preferably an instance of PermissionDescription.
-    * @param string  $dialog_description Optional message to include at the top of the dialog. E.g. "Warning: Post permissions cannot be changed once sent".
-    * @param string  $context_help Allows the dialog to present a help icon. E.g. "acl_dialog_post"
-    * @param bool $readonly Not implemented yet. When implemented, the dialog will use acl_readonly.tpl instead, so that permissions may be viewed for posts that can no longer have their permissions changed.
-    *
-    * @return string html modal dialog built from acl_selector.tpl
-    */
-    public static function populate($defaults = null, $show_jotnets = true, $emptyACL_description = '', $dialog_description = '', $context_help = '', $readonly = false)
-    {
-
-        $allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
-        $showall_origin = '';
-        $showall_icon   = 'fa-globe';
-        $role = get_pconfig(local_channel(), 'system', 'permissions_role');
-
-        if (! $emptyACL_description) {
-            $showall_caption = t('Visible to your default audience');
-        } elseif (is_a($emptyACL_description, '\\Zotlabs\\Lib\\PermissionDescription')) {
-            $showall_caption = $emptyACL_description->get_permission_description();
-            $showall_origin  = (($role === 'custom') ? $emptyACL_description->get_permission_origin_description() : '');
-            $showall_icon    = $emptyACL_description->get_permission_icon();
-        } else {
-            // For backwards compatibility we still accept a string... for now!
-            $showall_caption = $emptyACL_description;
-        }
-
-
-        if (is_array($defaults)) {
-            $allow_cid = ((strlen($defaults['allow_cid']))
-                ? explode('><', $defaults['allow_cid']) : [] );
-            $allow_gid = ((strlen($defaults['allow_gid']))
-                ? explode('><', $defaults['allow_gid']) : [] );
-            $deny_cid  = ((strlen($defaults['deny_cid']))
-                ? explode('><', $defaults['deny_cid']) : [] );
-            $deny_gid  = ((strlen($defaults['deny_gid']))
-                ? explode('><', $defaults['deny_gid']) : [] );
-            array_walk($allow_cid, ['\\Zotlabs\\Lib\\Libacl', 'fixacl']);
-            array_walk($allow_gid, ['\\Zotlabs\\Lib\\Libacl', 'fixacl']);
-            array_walk($deny_cid, ['\\Zotlabs\\Lib\\Libacl','fixacl']);
-            array_walk($deny_gid, ['\\Zotlabs\\Lib\\Libacl','fixacl']);
-        }
-
-        $channel = ((local_channel()) ? App::get_channel() : '');
-        $has_acl = false;
-        $single_group = false;
-        $just_me = false;
-        $custom = false;
-
-        if ($allow_cid || $allow_gid || $deny_gid || $deny_cid) {
-            $has_acl = true;
-            $custom = true;
-        }
-
-        if (count($allow_gid) === 1 && (! $allow_cid) && (! $deny_gid) && (! $deny_cid)) {
-            $single_group = true;
-            $custom = false;
-        }
-
-        if (count($allow_cid) === 1 && $channel && $allow_cid[0] === $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) {
-            $just_me = true;
-            $custom = false;
-        }
-
-        $groups = EMPTY_STR;
-
-        $r = q(
-            "SELECT id, hash, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
-            intval(local_channel())
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $selected = (($single_group && $rr['hash'] === $allow_gid[0]) ? ' selected = "selected" ' : '');
-                $groups .= '' . "\r\n";
-            }
-        }
-
-        if ($channel && Apps::system_app_installed($channel['channel_id'], 'Virtual Lists')) {
-            $selected = (($single_group && 'connections:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : '');
-            $groups .= '' . "\r\n";
-            if (get_pconfig($channel['channel_id'], 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
-                $selected = (($single_group && 'activitypub:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : '');
-                $groups .= '' . "\r\n";
-            }
-            $selected = (($single_group && 'zot:' . $channel['channel_hash'] === $allow_gid[0]) ? ' selected = "selected" ' : '');
-            $groups .= '' . "\r\n";
-        }
-
-
-        $forums = get_forum_channels(local_channel(), 1);
-        $selected = false;
-        if ($forums) {
-            foreach ($forums as $f) {
-                $selected = (($single_group && $f['hash'] === $allow_cid[0]) ? ' selected = "selected" ' : '');
-                $groups .= '' . "\r\n";
-            }
-        }
-
-        // preset acl with DM to a single xchan (not a group)
-        if ($selected === false && count($allow_cid) === 1 && $channel && $allow_cid[0] !== $channel['channel_hash'] && (! $allow_gid) && (! $deny_gid) && (! $deny_cid)) {
-            $f = q(
-                "select * from xchan where xchan_hash = '%s'",
-                dbesc($allow_cid[0])
-            );
-            if ($f) {
-                $custom = false;
-                $selected = ' selected="selected" ';
-                $groups .= '' . "\r\n";
-            }
-        }
-
-        $tpl = Theme::get_template("acl_selector.tpl");
-        $o = replace_macros($tpl, array(
-            '$showall'         => $showall_caption,
-            '$onlyme'          => t('Only me'),
-            '$groups'          => $groups,
-            '$public_selected' => (($has_acl) ? false : ' selected="selected" '),
-            '$justme_selected' => (($just_me) ? ' selected="selected" ' : ''),
-            '$custom_selected' => (($custom) ? ' selected="selected" ' : ''),
-            '$showallOrigin'   => $showall_origin,
-            '$showallIcon'     => $showall_icon,
-            '$select_label'    => t('Who can see this?'),
-            '$custom'          => t('Custom selection'),
-            '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'),
-            '$show'            => t('Show'),
-            '$hide'            => t("Don't show"),
-            '$search'          => t('Search'),
-            '$allowcid'        => json_encode($allow_cid),
-            '$allowgid'        => json_encode($allow_gid),
-            '$denycid'         => json_encode($deny_cid),
-            '$denygid'         => json_encode($deny_gid),
-            '$aclModalTitle'   => t('Permissions'),
-            '$aclModalDesc'    => $dialog_description,
-            '$aclModalDismiss' => t('Close'),
-    //      '$helpUrl'         => (($context_help == '') ? '' : (z_root() . '/help/' . $context_help))
-        ));
-
-        return $o;
-    }
-
-    /**
-     * Returns a string that's suitable for passing as the $dialog_description argument to a
-     * populate() call for wall posts or network posts.
-     *
-     * This string is needed in 3 different files, and our .po translation system currently
-     * cannot be used as a string table (because the value is always the key in english) so
-     * I've centralized the value here (making this function name the "key") until we have a
-     * better way.
-     *
-     * @return string Description to present to user in modal permissions dialog
-     */
-    public static function get_post_aclDialogDescription()
-    {
-
-        // I'm trying to make two points in this description text - warn about finality of wall
-        // post permissions, and try to clear up confusion that these permissions set who is
-        // *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking
-        // the "Show"  button on a group does not post it to the feed of people in that group, it
-        // mearly allows those people to view the post if they are viewing/following this channel.
-        $description = t('Post permissions cannot be changed after a post is shared.
          These permissions set who is allowed to view the post.');
-
-        // Lets keep the emphasis styling seperate from the translation. It may change.
-        //$emphasisOpen  = '';
-        //$emphasisClose = '';
-
-        return $description;
-    }
-
-    
-}
diff --git a/Zotlabs/Lib/Libprofile.php b/Zotlabs/Lib/Libprofile.php
deleted file mode 100644
index db39158d8..000000000
--- a/Zotlabs/Lib/Libprofile.php
+++ /dev/null
@@ -1,697 +0,0 @@
- $f) {
-                    if ($k == $qq['k']) {
-                        $p[0][$k] = $qq['v'];
-                        $extra_fields[] = $k;
-                        break;
-                    }
-                }
-            }
-        }
-
-        $p[0]['extra_fields'] = ((isset($extra_fields)) ? $extra_fields : []);
-
-        $z = q(
-            "select xchan_photo_date, xchan_addr from xchan where xchan_hash = '%s' limit 1",
-            dbesc($p[0]['channel_hash'])
-        );
-        if ($z) {
-            $p[0]['picdate'] = $z[0]['xchan_photo_date'];
-            $p[0]['reddress'] = str_replace('@', '@', unpunify($z[0]['xchan_addr']));
-        }
-
-        // fetch user tags if this isn't the default profile
-
-        if (!$p[0]['is_default']) {
-            $x = q(
-                "select keywords from profile where uid = %d and is_default = 1 limit 1",
-                intval($p[0]['profile_uid'])
-            );
-            if ($x && $can_view_profile) {
-                $p[0]['keywords'] = $x[0]['keywords'];
-            }
-        }
-
-        if ($p[0]['keywords']) {
-            $keywords = str_replace(array('#', ',', ' ', ',,'), array('', ' ', ',', ','), $p[0]['keywords']);
-            if (strlen($keywords) && $can_view_profile) {
-                if (!isset(App::$page['htmlhead'])) {
-                    App::$page['htmlhead'] = EMPTY_STR;
-                }
-                App::$page['htmlhead'] .= '' . "\r\n";
-            }
-        }
-
-        App::$profile = $p[0];
-        App::$profile_uid = $p[0]['profile_uid'];
-        App::$page['title'] = App::$profile['channel_name'] . " - " . unpunify(Channel::get_webfinger(App::$profile));
-
-        App::$profile['permission_to_view'] = $can_view_profile;
-
-        if ($can_view_profile) {
-            $online = Channel::get_online_status($nickname);
-            App::$profile['online_status'] = $online['result'];
-        }
-
-        if (local_channel()) {
-            App::$profile['channel_mobile_theme'] = get_pconfig(local_channel(), 'system', 'mobile_theme');
-            $_SESSION['mobile_theme'] = App::$profile['channel_mobile_theme'];
-        }
-
-        /*
-         * load/reload current theme info
-         */
-
-        //  $_SESSION['theme'] = $p[0]['channel_theme'];
-    }
-
-    public static function edit_menu($uid)
-    {
-
-        $ret = [];
-
-        $is_owner = (($uid == local_channel()) ? true : false);
-
-        // show edit profile to profile owner
-        if ($is_owner) {
-            $ret['menu'] = array(
-                'chg_photo' => t('Change profile photo'),
-                'entries' => [],
-            );
-
-            $multi_profiles = Features::enabled(local_channel(), 'multi_profiles');
-            if ($multi_profiles) {
-                $ret['multi'] = 1;
-                $ret['edit'] = [z_root() . '/profiles', t('Edit Profiles'), '', t('Edit')];
-                $ret['menu']['cr_new'] = t('Create New Profile');
-            } else {
-                $ret['edit'] = [z_root() . '/profiles/' . $uid, t('Edit Profile'), '', t('Edit')];
-            }
-
-            $r = q(
-                "SELECT * FROM profile WHERE uid = %d",
-                local_channel()
-            );
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    if (!($multi_profiles || $rr['is_default'])) {
-                        continue;
-                    }
-
-                    $ret['menu']['entries'][] = [
-                        'photo' => $rr['thumb'],
-                        'id' => $rr['id'],
-                        'alt' => t('Profile Image'),
-                        'profile_name' => $rr['profile_name'],
-                        'isdefault' => $rr['is_default'],
-                        'visible_to_everybody' => t('Visible to everybody'),
-                        'edit_visibility' => t('Edit visibility'),
-                    ];
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @brief Formats a profile for display in the sidebar.
-     *
-     * It is very difficult to templatise the HTML completely
-     * because of all the conditional logic.
-     *
-     * @param array $profile
-     * @param int $block
-     * @param bool $show_connect (optional) default true
-     * @param mixed $zcard (optional) default false
-     *
-     * @return HTML string suitable for sidebar inclusion
-     * Exceptions: Returns empty string if passed $profile is wrong type or not populated
-     */
-
-    public static function widget($profile, $block = 0, $show_connect = true, $zcard = false)
-    {
-
-        $observer = App::get_observer();
-
-        $o = '';
-        $location = false;
-        $pdesc = true;
-        $reddress = true;
-
-        if (!perm_is_allowed($profile['uid'], ((is_array($observer)) ? $observer['xchan_hash'] : ''), 'view_profile')) {
-            $block = true;
-        }
-
-        if ((!is_array($profile)) && (!count($profile))) {
-            return $o;
-        }
-
-        head_set_icon($profile['thumb']);
-
-        if (Channel::is_system($profile['uid'])) {
-            $show_connect = false;
-        }
-
-        $profile['picdate'] = urlencode($profile['picdate']);
-
-        /**
-         * @hooks profile_sidebar_enter
-         *   Called before generating the 'channel sidebar' or mini-profile.
-         */
-        Hook::call('profile_sidebar_enter', $profile);
-
-		$profdm = EMPTY_STR;
-		$profdm_url = EMPTY_STR;
-		
-        $can_dm = perm_is_allowed($profile['uid'], (is_array($observer)) ? $observer['xchan_hash'] : EMPTY_STR, 'post_mail') && intval($observer['xchan_type']) !== XCHAN_TYPE_GROUP ;
-
-		if (intval($profile['uid']) === local_channel()) {
-			$can_dm = false;
-		}
-		
-	    if ($can_dm) {			
-			$dm_path = Libzot::get_rpost_path($observer);
-			if ($dm_path) {
-				$profdm = t('Direct Message');
-				$profdm_url = $dm_path
-				. '&to='
-				. urlencode($profile['channel_hash'])
-				. '&body='
-				. urlencode('@!{' . $profile['channel_address'] . '@' . App::get_hostname() . '}');
-			}
-	  	}
-
-        if ($show_connect) {
-            // This will return an empty string if we're already connected.
-
-            $connect_url = rconnect_url($profile['uid'], get_observer_hash());
-            $connect = (($connect_url) ? t('Connect') : '');
-            if ($connect_url) {
-                $connect_url = sprintf($connect_url, urlencode(Channel::get_webfinger($profile)));
-            }
-
-            // premium channel - over-ride
-
-            if ($profile['channel_pageflags'] & PAGE_PREMIUM) {
-                $connect_url = z_root() . '/connect/' . $profile['channel_address'];
-            }
-        }
-
-        if (
-            (x($profile, 'address') == 1)
-            || (x($profile, 'locality') == 1)
-            || (x($profile, 'region') == 1)
-            || (x($profile, 'postal_code') == 1)
-            || (x($profile, 'country_name') == 1)
-        ) {
-            $location = t('Location:');
-        }
-
-        $profile['homepage'] = linkify($profile['homepage'], true);
-
-        $gender = ((x($profile, 'gender') == 1) ? t('Gender:') : false);
-        $marital = ((x($profile, 'marital') == 1) ? t('Status:') : false);
-        $homepage = ((x($profile, 'homepage') == 1) ? t('Homepage:') : false);
-        $pronouns = ((x($profile, 'pronouns') == 1) ? t('Pronouns:') : false);
-
-        // zap/osada do not have a realtime chat system at this time so don't show online state
-        //  $profile['online']   = (($profile['online_status'] === 'online') ? t('Online Now') : False);
-        //  logger('online: ' . $profile['online']);
-
-        $profile['online'] = false;
-
-        if (($profile['hidewall'] && (!local_channel()) && (!remote_channel())) || $block) {
-            $location = $reddress = $pdesc = $gender = $marital = $homepage = false;
-        }
-
-        if ($profile['gender']) {
-            $profile['gender_icon'] = self::gender_icon($profile['gender']);
-        }
-
-        if ($profile['pronouns']) {
-            $profile['pronouns_icon'] = self::pronouns_icon($profile['pronouns']);
-        }
-
-        $firstname = ((strpos($profile['channel_name'], ' '))
-            ? trim(substr($profile['channel_name'], 0, strpos($profile['channel_name'], ' '))) : $profile['channel_name']);
-        $lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'], strlen($firstname))));
-
-
-        $contact_block = contact_block();
-
-        $channel_menu = false;
-        $menu = get_pconfig($profile['uid'], 'system', 'channel_menu');
-        if ($menu && !$block) {
-            $m = Menu::fetch($menu, $profile['uid'], $observer['xchan_hash']);
-            if ($m) {
-                $channel_menu = Menu::render($m);
-            }
-        }
-        $menublock = get_pconfig($profile['uid'], 'system', 'channel_menublock');
-        if ($menublock && (!$block)) {
-            $comanche = new Comanche();
-            $channel_menu .= $comanche->block($menublock);
-        }
-
-        if ($zcard) {
-            $tpl = Theme::get_template('profile_vcard_short.tpl');
-        } else {
-            $tpl = Theme::get_template('profile_vcard.tpl');
-        }
-
-        $o .= replace_macros($tpl, array(
-            '$zcard' => $zcard,
-            '$profile' => $profile,
-            '$connect' => $connect,
-            '$connect_url' => $connect_url,
-			'$profdm' => $profdm,
-			'$profdm_url' => $profdm_url,
-			'$location' => $location,
-            '$gender' => $gender,
-            '$pronouns' => $pronouns,
-            '$pdesc' => $pdesc,
-            '$marital' => $marital,
-            '$homepage' => $homepage,
-            '$chanmenu' => $channel_menu,
-            '$reddress' => $reddress,
-            '$active' => t('Active'),
-            '$activewhen' => relative_date($profile['channel_lastpost']),
-            '$rating' => '',
-            '$contact_block' => $contact_block,
-            '$change_photo' => t('Change your profile photo'),
-            '$copyto' => t('Copy to clipboard'),
-            '$copied' => t('Address copied to clipboard'),
-            '$editmenu' => self::edit_menu($profile['uid'])
-        ));
-
-        $arr = [
-            'profile' => $profile,
-            'entry' => $o
-        ];
-
-        /**
-         * @hooks profile_sidebar
-         *   Called when generating the 'channel sidebar' or mini-profile.
-         *   * \e array \b profile
-         *   * \e string \b entry - The parsed HTML template
-         */
-        Hook::call('profile_sidebar', $arr);
-
-        return $arr['entry'];
-    }
-
-    public static function gender_icon($gender)
-    {
-
-        //  logger('gender: ' . $gender);
-
-        // This can easily get throw off if the observer language is different
-        // than the channel owner language.
-
-        if (strpos(strtolower($gender), strtolower(t('Female'))) !== false) {
-            return 'venus';
-        }
-        if (strpos(strtolower($gender), strtolower(t('Male'))) !== false) {
-            return 'mars';
-        }
-        if (strpos(strtolower($gender), strtolower(t('Trans'))) !== false) {
-            return 'transgender';
-        }
-        if (strpos(strtolower($gender), strtolower(t('Inter'))) !== false) {
-            return 'transgender';
-        }
-        if (strpos(strtolower($gender), strtolower(t('Neuter'))) !== false) {
-            return 'neuter';
-        }
-        if (strpos(strtolower($gender), strtolower(t('Non-specific'))) !== false) {
-            return 'genderless';
-        }
-
-        return '';
-    }
-
-    public static function pronouns_icon($pronouns)
-    {
-
-
-        // This can easily get throw off if the observer language is different
-        // than the channel owner language.
-
-        if (strpos(strtolower($pronouns), strtolower(t('She'))) !== false) {
-            return 'venus';
-        }
-        if (strpos(strtolower($pronouns), strtolower(t('Him'))) !== false) {
-            return 'mars';
-        }
-        if (strpos(strtolower($pronouns), strtolower(t('Them'))) !== false) {
-            return 'users';
-        }
-
-        return '';
-    }
-
-
-    public static function advanced()
-    {
-
-        if (!perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile')) {
-            return '';
-        }
-
-        if (App::$profile['fullname']) {
-            $profile_fields_basic = Channel::get_profile_fields_basic();
-            $profile_fields_advanced = Channel::get_profile_fields_advanced();
-
-            $advanced = ((Features::enabled(App::$profile['profile_uid'], 'advanced_profiles')) ? true : false);
-            if ($advanced) {
-                $fields = $profile_fields_advanced;
-            } else {
-                $fields = $profile_fields_basic;
-            }
-
-            $clean_fields = [];
-            if ($fields) {
-                foreach ($fields as $k => $v) {
-                    $clean_fields[] = trim($k);
-                }
-            }
-
-
-            $tpl = Theme::get_template('profile_advanced.tpl');
-
-            $profile = [];
-
-            $profile['fullname'] = array(t('Full Name:'), App::$profile['fullname']);
-
-            if (App::$profile['gender']) {
-                $profile['gender'] = array(t('Gender:'), App::$profile['gender']);
-            }
-
-
-            $ob_hash = get_observer_hash();
-// this may not work at all any more, but definitely won't work correctly if the liked profile belongs to a group
-// comment out until we are able to look at it much closer
-//          if($ob_hash && perm_is_allowed(App::$profile['profile_uid'],$ob_hash,'post_like')) {
-//              $profile['canlike'] = true;
-//              $profile['likethis'] = t('Like this channel');
-//              $profile['profile_guid'] = App::$profile['profile_guid'];
-//          }
-
-//          $likers = q("select liker, xchan.*  from likes left join xchan on liker = xchan_hash where channel_id = %d and target_type = '%s' and verb = '%s'",
-//              intval(App::$profile['profile_uid']),
-//              dbesc(ACTIVITY_OBJ_PROFILE),
-//              dbesc(ACTIVITY_LIKE)
-//          );
-//          $profile['likers'] = [];
-//          $profile['like_count'] = count($likers);
-//          $profile['like_button_label'] = tt('Like','Likes',$profile['like_count'],'noun');
-
-//          if($likers) {
-//              foreach($likers as $l)
-//                  $profile['likers'][] = array('name' => $l['xchan_name'],'photo' => zid($l['xchan_photo_s']), 'url' => zid($l['xchan_url']));
-//          }
-
-            if ((App::$profile['dob']) && (App::$profile['dob'] != '0000-00-00')) {
-                $val = '';
-
-                if ((substr(App::$profile['dob'], 5, 2) === '00') || (substr(App::$profile['dob'], 8, 2) === '00')) {
-                    $val = substr(App::$profile['dob'], 0, 4);
-                }
-
-                $year_bd_format = t('j F, Y');
-                $short_bd_format = t('j F');
-
-                if (!$val) {
-                    $val = ((intval(App::$profile['dob']))
-                        ? day_translate(datetime_convert('UTC', 'UTC', App::$profile['dob'] . ' 00:00 +00:00', $year_bd_format))
-                        : day_translate(datetime_convert('UTC', 'UTC', '2001-' . substr(App::$profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)));
-                }
-                $profile['birthday'] = array(t('Birthday:'), $val);
-            }
-
-            if ($age = age(App::$profile['dob'], App::$profile['timezone'], '')) {
-                $profile['age'] = array(t('Age:'), $age);
-            }
-
-            if (App::$profile['marital']) {
-                $profile['marital'] = array(t('Status:'), App::$profile['marital']);
-            }
-
-            if (App::$profile['partner']) {
-                $profile['marital']['partner'] = zidify_links(bbcode(App::$profile['partner']));
-            }
-
-            if (strlen(App::$profile['howlong']) && App::$profile['howlong'] > NULL_DATE) {
-                $profile['howlong'] = relative_date(App::$profile['howlong'], t('for %1$d %2$s'));
-            }
-
-            if (App::$profile['keywords']) {
-                $keywords = str_replace(',', ' ', App::$profile['keywords']);
-                $keywords = str_replace('  ', ' ', $keywords);
-                $karr = explode(' ', $keywords);
-                if ($karr) {
-                    for ($cnt = 0; $cnt < count($karr); $cnt++) {
-                        $karr[$cnt] = '' . $karr[$cnt] . '';
-                    }
-                }
-                $profile['keywords'] = array(t('Tags:'), implode(' ', $karr));
-            }
-
-
-            if (App::$profile['sexual']) {
-                $profile['sexual'] = array(t('Sexual Preference:'), App::$profile['sexual']);
-            }
-
-            if (App::$profile['pronouns']) {
-                $profile['pronouns'] = array(t('Pronouns:'), App::$profile['pronouns']);
-            }
-
-            if (App::$profile['homepage']) {
-                $profile['homepage'] = array(t('Homepage:'), linkify(App::$profile['homepage']));
-            }
-
-            if (App::$profile['hometown']) {
-                $profile['hometown'] = array(t('Hometown:'), linkify(App::$profile['hometown']));
-            }
-
-            if (App::$profile['politic']) {
-                $profile['politic'] = array(t('Political Views:'), App::$profile['politic']);
-            }
-
-            if (App::$profile['religion']) {
-                $profile['religion'] = array(t('Religion:'), App::$profile['religion']);
-            }
-
-            if ($txt = prepare_text(App::$profile['about'])) {
-                $profile['about'] = array(t('About:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['interest'])) {
-                $profile['interest'] = array(t('Hobbies/Interests:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['likes'])) {
-                $profile['likes'] = array(t('Likes:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['dislikes'])) {
-                $profile['dislikes'] = array(t('Dislikes:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['contact'])) {
-                $profile['contact'] = array(t('Contact information and Social Networks:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['channels'])) {
-                $profile['channels'] = array(t('My other channels:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['music'])) {
-                $profile['music'] = array(t('Musical interests:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['book'])) {
-                $profile['book'] = array(t('Books, literature:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['tv'])) {
-                $profile['tv'] = array(t('Television:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['film'])) {
-                $profile['film'] = array(t('Film/dance/culture/entertainment:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['romance'])) {
-                $profile['romance'] = array(t('Love/Romance:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['employment'])) {
-                $profile['employment'] = array(t('Work/employment:'), $txt);
-            }
-
-            if ($txt = prepare_text(App::$profile['education'])) {
-                $profile['education'] = array(t('School/education:'), $txt);
-            }
-
-            if (App::$profile['extra_fields']) {
-                foreach (App::$profile['extra_fields'] as $f) {
-                    $x = q(
-                        "select * from profdef where field_name = '%s' limit 1",
-                        dbesc($f)
-                    );
-                    if ($x && $txt = prepare_text(App::$profile[$f])) {
-                        $profile[$f] = array($x[0]['field_desc'] . ':', $txt);
-                    }
-                }
-                $profile['extra_fields'] = App::$profile['extra_fields'];
-            }
-
-            $things = get_things(App::$profile['profile_guid'], App::$profile['profile_uid']);
-
-
-            //      logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA);
-
-            //      $exportlink = ((App::$profile['profile_vcard']) ? zid(z_root() . '/profile/' . App::$profile['channel_address'] . '/vcard') : '');
-
-            return replace_macros($tpl, array(
-                '$title' => t('Profile'),
-                '$canlike' => (($profile['canlike']) ? true : false),
-                '$likethis' => t('Like this thing'),
-                '$export' => t('Export'),
-                '$exportlink' => '', // $exportlink,
-                '$profile' => $profile,
-                '$fields' => $clean_fields,
-                '$editmenu' => self::edit_menu(App::$profile['profile_uid']),
-                '$things' => $things
-            ));
-        }
-
-        return '';
-    }
-}
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
deleted file mode 100644
index f751e4f0c..000000000
--- a/Zotlabs/Lib/Libsync.php
+++ /dev/null
@@ -1,1303 +0,0 @@
- $channel['channel_address'], 'url' => z_root()];
-
-        if (array_key_exists($uid, App::$config) && array_key_exists('transient', App::$config[$uid])) {
-            $settings = App::$config[$uid]['transient'];
-            if ($settings) {
-                $info['config'] = $settings;
-            }
-        }
-
-        if ($channel) {
-            $info['channel'] = [];
-            foreach ($channel as $k => $v) {
-                // filter out any joined tables like xchan
-
-                if (strpos($k, 'channel_') !== 0) {
-                    continue;
-                }
-
-                // don't pass these elements, they should not be synchronised
-
-
-                $disallowed = ['channel_id', 'channel_account_id', 'channel_primary', 'channel_address',
-                    'channel_deleted', 'channel_removed', 'channel_system'];
-
-                if (!$keychange) {
-                    $disallowed[] = 'channel_prvkey';
-                }
-
-                if (in_array($k, $disallowed)) {
-                    continue;
-                }
-
-                $info['channel'][$k] = $v;
-            }
-        }
-
-        if ($groups_changed) {
-            $r = q(
-                "select hash as collection, visible, deleted, rule, gname as name from pgrp where uid = %d ",
-                intval($uid)
-            );
-            if ($r) {
-                $info['collections'] = $r;
-            }
-
-            $r = q(
-                "select pgrp.hash as collection, pgrp_member.xchan as member from pgrp left join pgrp_member on pgrp.id = pgrp_member.gid 
-				where pgrp_member.uid = %d ",
-                intval($uid)
-            );
-            if ($r) {
-                $info['collection_members'] = $r;
-            }
-        }
-
-        $interval = get_config('system', 'delivery_interval', 2);
-
-        logger('Packet: ' . print_r($info, true), LOGGER_DATA, LOG_DEBUG);
-
-        $total = count($synchubs);
-
-        foreach ($synchubs as $hub) {
-            $hash = random_string();
-            $n = Libzot::build_packet($channel, 'sync', $env_recips, json_encode($info), 'red', $hub['hubloc_sitekey'], $hub['site_crypto']);
-            Queue::insert([
-                'hash' => $hash,
-                'account_id' => $channel['channel_account_id'],
-                'channel_id' => $channel['channel_id'],
-                'posturl' => $hub['hubloc_callback'],
-                'notify' => $n,
-                'msg' => EMPTY_STR
-            ]);
-
-
-            $x = q("select count(outq_hash) as total from outq where outq_delivered = 0");
-            if (intval($x[0]['total']) > intval(get_config('system', 'force_queue_threshold', 3000))) {
-                logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO);
-                Queue::update($hash);
-                continue;
-            }
-
-
-            Run::Summon(['Deliver', $hash]);
-            $total = $total - 1;
-
-            if ($interval && $total) {
-                @time_sleep_until(microtime(true) + (float)$interval);
-            }
-        }
-    }
-
-
-    public static function build_link_packet($uid = 0, $packet = null)
-    {
-
-        // logger('build_link_packet');
-
-        if (!$uid) {
-            $uid = local_channel();
-        }
-
-        if (!$uid) {
-            return;
-        }
-
-        $channel = Channel::from_id($uid);
-        if (!$channel) {
-            return;
-        }
-
-        $l = q(
-            "select link from linkid where ident = '%s' and sigtype = 2",
-            dbesc($channel['channel_hash'])
-        );
-
-        if (!$l) {
-            return;
-        }
-
-        $hashes = ids_to_querystr($l, 'link', true);
-
-		$h = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . protect_sprintf($hashes) . ") and hubloc_network in ('nomad','zot6') and hubloc_deleted = 0");
-
-        if (!$h) {
-            return;
-        }
-
-        $interval = get_config('system', 'delivery_interval', 2);
-
-
-        foreach ($h as $x) {
-            if ($x['hubloc_host'] == App::get_hostname()) {
-                continue;
-            }
-
-            $y = q(
-                "select site_dead from site where site_url = '%s' limit 1",
-                dbesc($x['hubloc_url'])
-            );
-
-            if (($y) && (intval($y[0]['site_dead']) == 1)) {
-                $continue;
-            }
-
-            $env_recips = [$x['hubloc_hash']];
-
-            if ($packet) {
-                logger('packet: ' . print_r($packet, true), LOGGER_DATA, LOG_DEBUG);
-            }
-
-            $info = (($packet) ? $packet : []);
-            $info['type'] = 'sync';
-            $info['encoding'] = 'red'; // note: not zot, this packet is very platform specific
-
-            logger('Packet: ' . print_r($info, true), LOGGER_DATA, LOG_DEBUG);
-
-
-            $hash = random_string();
-            $n = Libzot::build_packet($channel, 'sync', $env_recips, json_encode($info), 'red', $x['hubloc_sitekey'], $x['site_crypto']);
-            Queue::insert([
-                'hash' => $hash,
-                'account_id' => $channel['channel_account_id'],
-                'channel_id' => $channel['channel_id'],
-                'posturl' => $x['hubloc_callback'],
-                'notify' => $n,
-                'msg' => EMPTY_STR
-            ]);
-
-            $y = q("select count(outq_hash) as total from outq where outq_delivered = 0");
-            if (intval($y[0]['total']) > intval(get_config('system', 'force_queue_threshold', 3000))) {
-                logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO);
-                Queue::update($hash);
-                continue;
-            }
-
-            Run::Summon(['Deliver', $hash]);
-
-            if ($interval && count($h) > 1) {
-                @time_sleep_until(microtime(true) + (float)$interval);
-            }
-        }
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param array $sender
-     * @param array $arr
-     * @param array $deliveries
-     * @return array
-     */
-
-    public static function process_channel_sync_delivery($sender, $arr, $deliveries)
-    {
-
-        require_once('include/import.php');
-
-        $result = [];
-
-        $keychange = ((array_key_exists('keychange', $arr)) ? true : false);
-
-        foreach ($deliveries as $d) {
-            $linked_channel = false;
-
-            $r = q(
-                "select * from channel where channel_hash = '%s' limit 1",
-                dbesc($sender)
-            );
-
-            $DR = new DReport(z_root(), $sender, $d, 'sync');
-
-            if (!$r) {
-                $l = q(
-                    "select ident from linkid where link = '%s' and sigtype = 2 limit 1",
-                    dbesc($sender)
-                );
-                if ($l) {
-                    $linked_channel = true;
-                    $r = q(
-                        "select * from channel where channel_hash = '%s' limit 1",
-                        dbesc($l[0]['ident'])
-                    );
-                }
-            }
-
-            if (!$r) {
-                $DR->update('recipient not found');
-                $result[] = $DR->get();
-                continue;
-            }
-
-            $channel = $r[0];
-
-            $DR->set_name($channel['channel_name'] . ' <' . Channel::get_webfinger($channel) . '>');
-
-            $max_friends = ServiceClass::fetch($channel['channel_id'], 'total_channels');
-            $max_feeds = ServiceClass::account_fetch($channel['channel_account_id'], 'total_feeds');
-
-            if ($channel['channel_hash'] != $sender && (!$linked_channel)) {
-                logger('Possible forgery. Sender ' . $sender . ' is not ' . $channel['channel_hash']);
-                $DR->update('channel mismatch');
-                $result[] = $DR->get();
-                continue;
-            }
-
-            if ($keychange) {
-                self::keychange($channel, $arr);
-                continue;
-            }
-
-            // if the clone is active, so are we
-
-            if (substr($channel['channel_active'], 0, 10) !== substr(datetime_convert(), 0, 10)) {
-                q(
-                    "UPDATE channel set channel_active = '%s' where channel_id = %d",
-                    dbesc(datetime_convert()),
-                    intval($channel['channel_id'])
-                );
-            }
-
-            if (array_key_exists('config', $arr) && is_array($arr['config']) && count($arr['config'])) {
-                foreach ($arr['config'] as $cat => $k) {
-                    foreach ($arr['config'][$cat] as $k => $v) {
-                        set_pconfig($channel['channel_id'], $cat, $k, $v);
-                    }
-                }
-            }
-
-            if (array_key_exists('atoken', $arr) && $arr['atoken']) {
-                sync_atoken($channel, $arr['atoken']);
-            }
-
-            if (array_key_exists('xign', $arr) && $arr['xign']) {
-                sync_xign($channel, $arr['xign']);
-            }
-
-            if (array_key_exists('block', $arr) && $arr['block']) {
-                sync_block($channel, $arr['block']);
-            }
-
-            if (array_key_exists('obj', $arr) && $arr['obj']) {
-                sync_objs($channel, $arr['obj']);
-            }
-
-            if (array_key_exists('likes', $arr) && $arr['likes']) {
-                import_likes($channel, $arr['likes']);
-            }
-
-            if (array_key_exists('app', $arr) && $arr['app']) {
-                sync_apps($channel, $arr['app']);
-            }
-
-            if (array_key_exists('sysapp', $arr) && $arr['sysapp']) {
-                sync_sysapps($channel, $arr['sysapp']);
-            }
-
-            if (array_key_exists('chatroom', $arr) && $arr['chatroom']) {
-                sync_chatrooms($channel, $arr['chatroom']);
-            }
-
-            if (array_key_exists('conv', $arr) && $arr['conv']) {
-                import_conv($channel, $arr['conv']);
-            }
-
-            if (array_key_exists('mail', $arr) && $arr['mail']) {
-                sync_mail($channel, $arr['mail']);
-            }
-
-            if (array_key_exists('event', $arr) && $arr['event']) {
-                sync_events($channel, $arr['event']);
-            }
-
-            if (array_key_exists('event_item', $arr) && $arr['event_item']) {
-                sync_items($channel, $arr['event_item'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null));
-            }
-
-            if (array_key_exists('item', $arr) && $arr['item']) {
-                sync_items($channel, $arr['item'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null));
-            }
-
-            if (array_key_exists('menu', $arr) && $arr['menu']) {
-                sync_menus($channel, $arr['menu']);
-            }
-
-            if (array_key_exists('file', $arr) && $arr['file']) {
-                sync_files($channel, $arr['file']);
-            }
-
-            if (array_key_exists('wiki', $arr) && $arr['wiki']) {
-                sync_items($channel, $arr['wiki'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null));
-            }
-
-            if (array_key_exists('channel', $arr) && is_array($arr['channel']) && count($arr['channel'])) {
-                $remote_channel = $arr['channel'];
-                $remote_channel['channel_id'] = $channel['channel_id'];
-
-                if (array_key_exists('channel_pageflags', $arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
-                    // Several pageflags are site-specific and cannot be sync'd.
-                    // Only allow those bits which are shareable from the remote and then
-                    // logically OR with the local flags
-
-                    $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] & (PAGE_HIDDEN | PAGE_AUTOCONNECT | PAGE_APPLICATION | PAGE_PREMIUM | PAGE_ADULT);
-                    $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] | $channel['channel_pageflags'];
-                }
-
-                $columns = db_columns('channel');
-
-                $disallowed = [
-                    'channel_id', 'channel_account_id', 'channel_primary', 'channel_prvkey',
-                    'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted',
-                    'channel_system', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook',
-                    'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall',
-                    'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall',
-                    'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish',
-                    'channel_a_delegate', 'channel_moved'
-                ];
-
-                foreach ($arr['channel'] as $k => $v) {
-                    if (in_array($k, $disallowed)) {
-                        continue;
-                    }
-                    if (!in_array($k, $columns)) {
-                        continue;
-                    }
-                    $r = dbq("UPDATE channel set " . dbesc($k) . " = '" . dbesc($v)
-                        . "' where channel_id = " . intval($channel['channel_id']));
-                }
-            }
-
-            if (array_key_exists('abook', $arr) && is_array($arr['abook']) && count($arr['abook'])) {
-                $total_friends = 0;
-                $total_feeds = 0;
-
-                $r = q(
-                    "select abook_id, abook_feed from abook where abook_channel = %d",
-                    intval($channel['channel_id'])
-                );
-                if ($r) {
-                    // don't count yourself
-                    $total_friends = ((count($r) > 0) ? count($r) - 1 : 0);
-                    foreach ($r as $rr) {
-                        if (intval($rr['abook_feed'])) {
-                            $total_feeds++;
-                        }
-                    }
-                }
-
-
-                $disallowed = ['abook_id', 'abook_account', 'abook_channel', 'abook_rating', 'abook_rating_text', 'abook_not_here'];
-
-                $fields = db_columns('abook');
-
-                foreach ($arr['abook'] as $abook) {
-                    // this is here for debugging so we can find the issue source
-
-                    if (!is_array($abook)) {
-                        btlogger('abook is not an array');
-                        continue;
-                    }
-
-                    $abconfig = null;
-
-                    if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) {
-                        $abconfig = $abook['abconfig'];
-                    }
-
-                    $clean = [];
-
-                    if ($abook['abook_xchan'] && $abook['entry_deleted']) {
-                        logger('Removing abook entry for ' . $abook['abook_xchan']);
-
-                        $r = q(
-                            "select abook_id, abook_feed from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
-                            dbesc($abook['abook_xchan']),
-                            intval($channel['channel_id'])
-                        );
-                        if ($r) {
-                            contact_remove($channel['channel_id'], $r[0]['abook_id']);
-                            if ($total_friends) {
-                                $total_friends--;
-                            }
-                            if (intval($r[0]['abook_feed'])) {
-                                $total_feeds--;
-                            }
-                        }
-                        continue;
-                    }
-
-                    // Perform discovery if the referenced xchan hasn't ever been seen on this hub.
-                    // This relies on the undocumented behaviour that red sites send xchan info with the abook
-                    // and import_author_xchan will look them up on all federated networks
-
-                    $found = false;
-                    if ($abook['abook_xchan'] && $abook['xchan_addr'] && (!in_array($abook['xchan_network'], ['token', 'unknown']))) {
-                        $h = Libzot::get_hublocs($abook['abook_xchan']);
-                        if ($h) {
-                            $found = true;
-                        } else {
-                            $xhash = import_author_xchan(encode_item_xchan($abook));
-                            if ($xhash) {
-                                $found = true;
-                            } else {
-                                logger('Import of ' . $abook['xchan_addr'] . ' failed.');
-                            }
-                        }
-                    }
-
-                    if ((!$found) && (!in_array($abook['xchan_network'], ['nomad', 'zot6', 'activitypub']))) {
-                        // just import the record.
-                        $xc = [];
-                        foreach ($abook as $k => $v) {
-                            if (strpos($k, 'xchan_') === 0) {
-                                $xc[$k] = $v;
-                            }
-                        }
-                        $r = q(
-                            "select * from xchan where xchan_hash = '%s'",
-                            dbesc($xc['xchan_hash'])
-                        );
-                        if (!$r) {
-                            xchan_store_lowlevel($xc);
-                        }
-                    }
-
-                    foreach ($abook as $k => $v) {
-                        if (in_array($k, $disallowed) || (strpos($k, 'abook_') !== 0)) {
-                            continue;
-                        }
-                        if (!in_array($k, $fields)) {
-                            continue;
-                        }
-                        $clean[$k] = $v;
-                    }
-
-                    if (!array_key_exists('abook_xchan', $clean)) {
-                        continue;
-                    }
-
-                    $reconnect = false;
-                    if (array_key_exists('abook_instance', $clean) && $clean['abook_instance'] && strpos($clean['abook_instance'], z_root()) === false) {
-                        // guest pass or access token - don't try to probe since it is one-way
-                        // we are relying on the undocumented behaviour that the abook record also contains the xchan
-                        if ($abook['xchan_network'] === 'token') {
-                            $clean['abook_instance'] .= ',';
-                            $clean['abook_instance'] .= z_root();
-                            $clean['abook_not_here'] = 0;
-                        } else {
-                            $clean['abook_not_here'] = 1;
-                            if (!($abook['abook_pending'] || $abook['abook_blocked'])) {
-                                $reconnect = true;
-                            }
-                        }
-                    }
-
-                    $r = q(
-                        "select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-                        dbesc($clean['abook_xchan']),
-                        intval($channel['channel_id'])
-                    );
-
-                    // make sure we have an abook entry for this xchan on this system
-
-                    if (!$r) {
-                        if ($max_friends !== false && $total_friends > $max_friends) {
-                            logger('total_channels service class limit exceeded');
-                            continue;
-                        }
-                        if ($max_feeds !== false && intval($clean['abook_feed']) && $total_feeds > $max_feeds) {
-                            logger('total_feeds service class limit exceeded');
-                            continue;
-                        }
-                        abook_store_lowlevel(
-                            [
-                                'abook_xchan' => $clean['abook_xchan'],
-                                'abook_account' => $channel['channel_account_id'],
-                                'abook_channel' => $channel['channel_id']
-                            ]
-                        );
-                        $total_friends++;
-                        if (intval($clean['abook_feed'])) {
-                            $total_feeds++;
-                        }
-                    }
-
-                    if (count($clean)) {
-                        foreach ($clean as $k => $v) {
-                            if ($k == 'abook_dob') {
-                                $v = dbescdate($v);
-                            }
-
-                            $r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v)
-                                . "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
-                        }
-                    }
-
-                    // This will set abconfig vars if the sender is using old-style fixed permissions
-                    // using the raw abook record as passed to us. New-style permissions will fall through
-                    // and be set using abconfig
-
-                    // translate_abook_perms_inbound($channel,$abook);
-
-                    if ($abconfig) {
-                        /// @fixme does not handle sync of del_abconfig
-                        foreach ($abconfig as $abc) {
-                            set_abconfig($channel['channel_id'], $abc['xchan'], $abc['cat'], $abc['k'], $abc['v']);
-                        }
-                    }
-                    if ($reconnect) {
-                        Connect::connect($channel, $abook['abook_xchan']);
-                    }
-                }
-            }
-
-            // sync collections (privacy groups) oh joy...
-
-            if (array_key_exists('collections', $arr) && is_array($arr['collections']) && count($arr['collections'])) {
-                $x = q(
-                    "select * from pgrp where uid = %d ",
-                    intval($channel['channel_id'])
-                );
-                foreach ($arr['collections'] as $cl) {
-                    $found = false;
-                    if ($x) {
-                        foreach ($x as $y) {
-                            if ($cl['collection'] == $y['hash']) {
-                                $found = true;
-                                break;
-                            }
-                        }
-                        if ($found) {
-                            if (
-                                ($y['gname'] != $cl['name'])
-                                || ($y['visible'] != $cl['visible'])
-                                || ($y['deleted'] != $cl['deleted'])
-                            ) {
-                                q(
-                                    "update pgrp set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d",
-                                    dbesc($cl['name']),
-                                    intval($cl['visible']),
-                                    intval($cl['deleted']),
-                                    dbesc($cl['collection']),
-                                    intval($channel['channel_id'])
-                                );
-                            }
-                            if (intval($cl['deleted']) && (!intval($y['deleted']))) {
-                                q(
-                                    "delete from pgrp_member where gid = %d",
-                                    intval($y['id'])
-                                );
-                            }
-                        }
-                    }
-                    if (!$found) {
-                        $r = q(
-                            "INSERT INTO pgrp ( hash, uid, visible, deleted, gname, rule )
-							VALUES( '%s', %d, %d, %d, '%s', '%s' ) ",
-                            dbesc($cl['collection']),
-                            intval($channel['channel_id']),
-                            intval($cl['visible']),
-                            intval($cl['deleted']),
-                            dbesc($cl['name']),
-                            dbesc($cl['rule'])
-                        );
-                    }
-
-                    // now look for any collections locally which weren't in the list we just received.
-                    // They need to be removed by marking deleted and removing the members.
-                    // This shouldn't happen except for clones created before this function was written.
-
-                    if ($x) {
-                        $found_local = false;
-                        foreach ($x as $y) {
-                            foreach ($arr['collections'] as $cl) {
-                                if ($cl['collection'] == $y['hash']) {
-                                    $found_local = true;
-                                    break;
-                                }
-                            }
-                            if (!$found_local) {
-                                q(
-                                    "delete from pgrp_member where gid = %d",
-                                    intval($y['id'])
-                                );
-                                q(
-                                    "update pgrp set deleted = 1 where id = %d and uid = %d",
-                                    intval($y['id']),
-                                    intval($channel['channel_id'])
-                                );
-                            }
-                        }
-                    }
-                }
-
-                // reload the group list with any updates
-                $x = q(
-                    "select * from pgrp where uid = %d",
-                    intval($channel['channel_id'])
-                );
-
-                // now sync the members
-
-                if (
-                    array_key_exists('collection_members', $arr)
-                    && is_array($arr['collection_members'])
-                    && count($arr['collection_members'])
-                ) {
-                    // first sort into groups keyed by the group hash
-                    $members = [];
-                    foreach ($arr['collection_members'] as $cm) {
-                        if (!array_key_exists($cm['collection'], $members)) {
-                            $members[$cm['collection']] = [];
-                        }
-
-                        $members[$cm['collection']][] = $cm['member'];
-                    }
-
-                    // our group list is already synchronised
-                    if ($x) {
-                        foreach ($x as $y) {
-                            // for each group, loop on members list we just received
-                            if (isset($y['hash']) && isset($members[$y['hash']])) {
-                                foreach ($members[$y['hash']] as $member) {
-                                    $found = false;
-                                    $z = q(
-                                        "select xchan from pgrp_member where gid = %d and uid = %d and xchan = '%s' limit 1",
-                                        intval($y['id']),
-                                        intval($channel['channel_id']),
-                                        dbesc($member)
-                                    );
-                                    if ($z) {
-                                        $found = true;
-                                    }
-
-                                    // if somebody is in the group that wasn't before - add them
-
-                                    if (!$found) {
-                                        q(
-                                            "INSERT INTO pgrp_member (uid, gid, xchan)
-											VALUES( %d, %d, '%s' ) ",
-                                            intval($channel['channel_id']),
-                                            intval($y['id']),
-                                            dbesc($member)
-                                        );
-                                    }
-                                }
-                            }
-
-                            // now retrieve a list of members we have on this site
-                            $m = q(
-                                "select xchan from pgrp_member where gid = %d and uid = %d",
-                                intval($y['id']),
-                                intval($channel['channel_id'])
-                            );
-                            if ($m) {
-                                foreach ($m as $mm) {
-                                    // if the local existing member isn't in the list we just received - remove them
-                                    if (!in_array($mm['xchan'], $members[$y['hash']])) {
-                                        q(
-                                            "delete from pgrp_member where xchan = '%s' and gid = %d and uid = %d",
-                                            dbesc($mm['xchan']),
-                                            intval($y['id']),
-                                            intval($channel['channel_id'])
-                                        );
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (array_key_exists('profile', $arr) && is_array($arr['profile']) && count($arr['profile'])) {
-                $disallowed = array('id', 'aid', 'uid', 'guid');
-
-                foreach ($arr['profile'] as $profile) {
-                    $x = q(
-                        "select * from profile where profile_guid = '%s' and uid = %d limit 1",
-                        dbesc($profile['profile_guid']),
-                        intval($channel['channel_id'])
-                    );
-                    if (!$x) {
-                        Channel::profile_store_lowlevel(
-                            [
-                                'aid' => $channel['channel_account_id'],
-                                'uid' => $channel['channel_id'],
-                                'profile_guid' => $profile['profile_guid'],
-                            ]
-                        );
-
-                        $x = q(
-                            "select * from profile where profile_guid = '%s' and uid = %d limit 1",
-                            dbesc($profile['profile_guid']),
-                            intval($channel['channel_id'])
-                        );
-                        if (!$x) {
-                            continue;
-                        }
-                    }
-                    $clean = [];
-                    foreach ($profile as $k => $v) {
-                        if (in_array($k, $disallowed)) {
-                            continue;
-                        }
-
-                        if ($profile['is_default'] && in_array($k, ['photo', 'thumb'])) {
-                            continue;
-                        }
-
-                        if ($k === 'name') {
-                            $clean['fullname'] = $v;
-                        } elseif ($k === 'with') {
-                            $clean['partner'] = $v;
-                        } elseif ($k === 'work') {
-                            $clean['employment'] = $v;
-                        } elseif (array_key_exists($k, $x[0])) {
-                            $clean[$k] = $v;
-                        }
-
-                        /**
-                         * @TODO
-                         * We also need to import local photos if a custom photo is selected
-                         */
-
-                        if ((strpos($profile['thumb'], '/photo/profile/l/') !== false) || intval($profile['is_default'])) {
-                            $profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id'];
-                            $profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id'];
-                        } else {
-                            $profile['photo'] = z_root() . '/photo/' . basename($profile['photo']);
-                            $profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']);
-                        }
-                    }
-
-                    if (count($clean)) {
-                        foreach ($clean as $k => $v) {
-                            $r = dbq("UPDATE profile set " . TQUOT . dbesc($k) . TQUOT . " = '" . dbesc($v)
-                                . "' where profile_guid = '" . dbesc($profile['profile_guid'])
-                                . "' and uid = " . intval($channel['channel_id']));
-                        }
-                    }
-                }
-            }
-
-            $addon = ['channel' => $channel, 'data' => $arr];
-            /**
-             * @hooks process_channel_sync_delivery
-             *   Called when accepting delivery of a 'sync packet' containing structure and table updates from a channel clone.
-             *   * \e array \b channel
-             *   * \e array \b data
-             */
-            Hook::call('process_channel_sync_delivery', $addon);
-
-            $DR = new DReport(z_root(), $d, $d, 'sync', 'channel sync delivered');
-
-            $DR->set_name($channel['channel_name'] . ' <' . Channel::get_webfinger($channel) . '>');
-
-            $result[] = $DR->get();
-        }
-
-        return $result;
-    }
-
-    /**
-     * @brief Synchronises locations.
-     *
-     * @param array $sender
-     * @param array $arr
-     * @param bool $absolute (optional) default false
-     * @return array
-     */
-
-    public static function sync_locations($sender, $arr, $absolute = false)
-    {
-
-        $ret = [];
-        $what = EMPTY_STR;
-        $changed = false;
-
-        // If a sender reports that the channel has been deleted, delete its hubloc
-
-        if (isset($arr['deleted_locally']) && intval($arr['deleted_locally'])) {
-            q(
-                "UPDATE hubloc SET hubloc_deleted = 1, hubloc_updated = '%s' WHERE hubloc_hash = '%s' AND hubloc_url = '%s'",
-                dbesc(datetime_convert()),
-                dbesc($sender['hash']),
-                dbesc($sender['site']['url'])
-            );
-        }
-
-        if ($arr['locations']) {
-            $x = q(
-                "select * from xchan where xchan_hash = '%s'",
-                dbesc($sender['hash'])
-            );
-            if ($x) {
-                $xchan = array_shift($x);
-            }
-
-            if ($absolute) {
-                Libzot::check_location_move($sender['hash'], $arr['locations']);
-            }
-
-            $xisting = q(
-                "select * from hubloc where hubloc_hash = '%s'",
-                dbesc($sender['hash'])
-            );
-
-            if (!$xisting) {
-                $xisting = [];
-            }
-
-            // See if a primary is specified
-
-            $has_primary = false;
-            foreach ($arr['locations'] as $location) {
-                if ($location['primary']) {
-                    $has_primary = true;
-                    break;
-                }
-            }
-
-            // Ensure that they have one primary hub
-
-            if (!$has_primary) {
-                $arr['locations'][0]['primary'] = true;
-            }
-
-            foreach ($arr['locations'] as $location) {
-
-                $network = isset($location['driver']) ? $location['driver'] : 'zot6';
-                // only set nomad if the location info is coming from the same site as the original zotinfo packet
-                if (isset($sender['site']) && isset($sender['site']['url']) && $sender['site']['url'] === $location['url']) {
-                    if (isset($sender['site']['protocol_version']) && intval($sender['site']['protocol_version']) > 10) {                   
-                        $network = 'nomad';
-                    }
-                }
-  
-                if (!Libzot::verify($location['url'], $location['url_sig'], $sender['public_key'])) {
-                    logger('Unable to verify site signature for ' . $location['url']);
-                    $ret['message'] .= sprintf(t('Unable to verify site signature for %s'), $location['url']) . EOL;
-                    continue;
-                }
-
-                for ($x = 0; $x < count($xisting); $x++) {
-                    if (
-                        ($xisting[$x]['hubloc_url'] === $location['url'])
-                        && ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])
-                    ) {
-                        $xisting[$x]['updated'] = true;
-                    }
-                }
-
-                if (!$location['sitekey']) {
-                    logger('Empty hubloc sitekey. ' . print_r($location, true));
-                    continue;
-                }
-
-                // match as many fields as possible in case anything at all changed.
-
-                $r = q(
-                    "select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_id_url = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ",
-                    dbesc($sender['hash']),
-                    dbesc($sender['id']),
-                    dbesc($sender['id_sig']),
-                    dbesc($location['id_url']),
-                    dbesc($location['url']),
-                    dbesc($location['url_sig']),
-                    dbesc($location['host']),
-                    dbesc($location['address']),
-                    dbesc($location['callback']),
-                    dbesc($location['sitekey'])
-                );
-                if ($r) {
-                    logger('Hub exists: ' . $location['url'], LOGGER_DEBUG);
-
-                    // generate a new hubloc_site_id if it's wrong due to historical bugs 2021-11-30
-
-                    if ($r[0]['hubloc_site_id'] !== $location['site_id']) {
-                        q(
-                            "update hubloc set hubloc_site_id = '%s' where hubloc_id = %d",
-                            dbesc(Libzot::make_xchan_hash($location['url'], $location['sitekey'])),
-                            intval($r[0]['hubloc_id'])
-                        );
-                    }
-
-                    // update connection timestamp if this is the site we're talking to
-                    // This only happens when called from import_xchan
-
-                    $current_site = false;
-
-                    $t = datetime_convert('UTC', 'UTC', 'now - 15 minutes');
-
-                    if (isset($location['driver']) && $location['driver'] === 'nomad' && $location['driver'] !== $r[0]['hubloc_network']) {
-                        q("update hubloc set hubloc_network = '%s' where hubloc_id = %d",
-                            dbesc($location['driver']),
-                            intval($r[0]['hubloc_id'])
-                        );
-                    }                                                                                          
-
-                    if (array_key_exists('site', $arr) && $location['url'] == $arr['site']['url']) {
-                        q(
-                            "update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_updated < '%s'",
-                            dbesc(datetime_convert()),
-                            dbesc(datetime_convert()),
-                            intval($r[0]['hubloc_id']),
-                            dbesc($t)
-                        );
-                        $current_site = true;
-                    }
-
-                    if ($current_site && (intval($r[0]['hubloc_error']) || intval($r[0]['hubloc_deleted']))) {
-                        q(
-                            "update hubloc set hubloc_error = 0, hubloc_deleted = 0 where hubloc_id = %d",
-                            intval($r[0]['hubloc_id'])
-                        );
-                        if (intval($r[0]['hubloc_orphancheck'])) {
-                            q(
-                                "update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d",
-                                intval($r[0]['hubloc_id'])
-                            );
-                        }
-                        q(
-                            "update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
-                            dbesc($sender['hash'])
-                        );
-                    }
-
-                    // Remove pure duplicates
-                    if (count($r) > 1) {
-                        for ($h = 1; $h < count($r); $h++) {
-                            q(
-                                "delete from hubloc where hubloc_id = %d",
-                                intval($r[$h]['hubloc_id'])
-                            );
-                            $what .= 'duplicate_hubloc_removed ';
-                            $changed = true;
-                        }
-                    }
-
-                    if (intval($r[0]['hubloc_primary']) && (!$location['primary'])) {
-                        $m = q(
-                            "update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id = %d",
-                            dbesc(datetime_convert()),
-                            intval($r[0]['hubloc_id'])
-                        );
-                        $r[0]['hubloc_primary'] = intval($location['primary']);
-                        hubloc_change_primary($r[0]);
-                        $what .= 'primary_hub ';
-                        $changed = true;
-                    } elseif ((!intval($r[0]['hubloc_primary'])) && ($location['primary'])) {
-                        $m = q(
-                            "update hubloc set hubloc_primary = 1, hubloc_updated = '%s' where hubloc_id = %d",
-                            dbesc(datetime_convert()),
-                            intval($r[0]['hubloc_id'])
-                        );
-                        // make sure hubloc_change_primary() has current data
-                        $r[0]['hubloc_primary'] = intval($location['primary']);
-                        hubloc_change_primary($r[0]);
-                        $what .= 'primary_hub ';
-                        $changed = true;
-                    } elseif ($absolute) {
-                        // Absolute sync - make sure the current primary is correctly reflected in the xchan
-                        $pr = hubloc_change_primary($r[0]);
-                        if ($pr) {
-                            $what .= 'xchan_primary ';
-                            $changed = true;
-                        }
-                    } elseif (intval($r[0]['hubloc_primary']) && $xchan && $xchan['xchan_url'] !== $r[0]['hubloc_id_url']) {
-                        $pr = hubloc_change_primary($r[0]);
-                        if ($pr) {
-                            $what .= 'xchan_primary ';
-                            $changed = true;
-                        }
-                    }
-
-                    if (intval($r[0]['hubloc_deleted']) && (!intval($location['deleted']))) {
-                        $n = q(
-                            "update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id = %d",
-                            dbesc(datetime_convert()),
-                            intval($r[0]['hubloc_id'])
-                        );
-                        $what .= 'undelete_hub ';
-                        $changed = true;
-                    } elseif ((!intval($r[0]['hubloc_deleted'])) && (intval($location['deleted']))) {
-                        logger('deleting hubloc: ' . $r[0]['hubloc_addr']);
-                        $n = q(
-                            "update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
-                            dbesc(datetime_convert()),
-                            intval($r[0]['hubloc_id'])
-                        );
-                        $what .= 'delete_hub ';
-                        $changed = true;
-                    }
-                    continue;
-                }
-
-                // Existing hubs are dealt with. Now let's process any new ones.
-                // New hub claiming to be primary. Make it so by removing any existing primaries.
-
-                if (intval($location['primary'])) {
-                    $r = q(
-                        "update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_hash = '%s' and hubloc_primary = 1",
-                        dbesc(datetime_convert()),
-                        dbesc($sender['hash'])
-                    );
-                }
-
-                logger('New hub: ' . $location['url']);
-
-                $r = hubloc_store_lowlevel(
-                    [
-                        'hubloc_guid' => $sender['id'],
-                        'hubloc_guid_sig' => $sender['id_sig'],
-                        'hubloc_id_url' => $location['id_url'],
-                        'hubloc_hash' => $sender['hash'],
-                        'hubloc_addr' => $location['address'],
-                        'hubloc_network' => $network,
-                        'hubloc_primary' => intval($location['primary']),
-                        'hubloc_url' => $location['url'],
-                        'hubloc_url_sig' => $location['url_sig'],
-                        'hubloc_site_id' => Libzot::make_xchan_hash($location['url'], $location['sitekey']),
-                        'hubloc_host' => $location['host'],
-                        'hubloc_callback' => $location['callback'],
-                        'hubloc_sitekey' => $location['sitekey'],
-                        'hubloc_updated' => datetime_convert(),
-                        'hubloc_connected' => datetime_convert()
-                    ]
-                );
-
-                $what .= 'newhub ';
-                $changed = true;
-
-                if ($location['primary']) {
-                    $r = q(
-                        "select * from hubloc where hubloc_addr = '%s' and hubloc_sitekey = '%s' limit 1",
-                        dbesc($location['address']),
-                        dbesc($location['sitekey'])
-                    );
-                    if ($r) {
-                        hubloc_change_primary($r[0]);
-                    }
-                }
-            }
-
-            // get rid of any hubs we have for this channel which weren't reported.
-
-            if ($absolute && $xisting) {
-                foreach ($xisting as $x) {
-                    if (!array_key_exists('updated', $x)) {
-                        logger('Deleting unreferenced hub location ' . $x['hubloc_addr']);
-                        $r = q(
-                            "update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
-                            dbesc(datetime_convert()),
-                            intval($x['hubloc_id'])
-                        );
-                        $what .= 'removed_hub ';
-                        $changed = true;
-                    }
-                }
-            }
-        } else {
-            logger('No locations to sync!');
-        }
-
-        $ret['change_message'] = $what;
-        $ret['changed'] = $changed;
-
-        return $ret;
-    }
-
-
-    public static function keychange($channel, $arr)
-    {
-
-        // verify the keychange operation
-        if (!Libzot::verify($arr['channel']['channel_pubkey'], $arr['keychange']['new_sig'], $channel['channel_prvkey'])) {
-            logger('sync keychange: verification failed');
-            return;
-        }
-
-        $sig = Libzot::sign($channel['channel_guid'], $arr['channel']['channel_prvkey']);
-        $hash = Libzot::make_xchan_hash($channel['channel_guid'], $arr['channel']['channel_pubkey']);
-
-
-        $r = q(
-            "update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s',
-			channel_hash = '%s' where channel_id = %d",
-            dbesc($arr['channel']['channel_prvkey']),
-            dbesc($arr['channel']['channel_pubkey']),
-            dbesc($sig),
-            dbesc($hash),
-            intval($channel['channel_id'])
-        );
-        if (!$r) {
-            logger('keychange sync: channel update failed');
-            return;
-        }
-
-        $r = q(
-            "select * from channel where channel_id = %d",
-            intval($channel['channel_id'])
-        );
-
-        if (!$r) {
-            logger('keychange sync: channel retrieve failed');
-            return;
-        }
-
-        $channel = $r[0];
-
-        $h = q(
-            "select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ",
-            dbesc($arr['keychange']['old_hash']),
-            dbesc(z_root())
-        );
-
-        if ($h) {
-            foreach ($h as $hv) {
-                $hv['hubloc_guid_sig'] = $sig;
-                $hv['hubloc_hash'] = $hash;
-                $hv['hubloc_url_sig'] = Libzot::sign(z_root(), $channel['channel_prvkey']);
-                hubloc_store_lowlevel($hv);
-            }
-        }
-
-        $x = q(
-            "select * from xchan where xchan_hash = '%s' ",
-            dbesc($arr['keychange']['old_hash'])
-        );
-
-        $check = q(
-            "select * from xchan where xchan_hash = '%s'",
-            dbesc($hash)
-        );
-
-        if (($x) && (!$check)) {
-            $oldxchan = $x[0];
-            foreach ($x as $xv) {
-                $xv['xchan_guid_sig'] = $sig;
-                $xv['xchan_hash'] = $hash;
-                $xv['xchan_pubkey'] = $channel['channel_pubkey'];
-                $xv['xchan_updated'] = datetime_convert();
-                xchan_store_lowlevel($xv);
-                $newxchan = $xv;
-            }
-        }
-
-        $a = q(
-            "select * from abook where abook_xchan = '%s' and abook_self = 1",
-            dbesc($arr['keychange']['old_hash'])
-        );
-
-        if ($a) {
-            q(
-                "update abook set abook_xchan = '%s' where abook_id = %d",
-                dbesc($hash),
-                intval($a[0]['abook_id'])
-            );
-        }
-
-        xchan_change_key($oldxchan, $newxchan, $arr['keychange']);
-    }
-}
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
deleted file mode 100644
index 6ead2921a..000000000
--- a/Zotlabs/Lib/Libzot.php
+++ /dev/null
@@ -1,3645 +0,0 @@
- $type,
-            'encoding' => $encoding,
-            'sender' => $channel['channel_hash'],
-            'site_id' => self::make_xchan_hash(z_root(), get_config('system', 'pubkey')),
-            'version' => System::get_zot_revision(),
-        ];
-
-        if ($recipients) {
-            $data['recipients'] = $recipients;
-        }
-
-        if ($msg) {
-            $actor = Channel::url($channel);
-            if ($encoding === 'activitystreams' && array_key_exists('actor', $msg) && is_string($msg['actor']) && $actor === $msg['actor']) {
-                $msg = JSalmon::sign($msg, $actor, $channel['channel_prvkey']);
-            }
-            $data['data'] = $msg;
-        } else {
-            unset($data['encoding']);
-        }
-
-        logger('packet: ' . print_r($data, true), LOGGER_DATA, LOG_DEBUG);
-
-        if ($remote_key) {
-            $algorithm = self::best_algorithm($methods);
-            if ($algorithm) {
-                $data = Crypto::encapsulate(json_encode($data), $remote_key, $algorithm);
-            }
-        }
-
-        return json_encode($data);
-    }
-
-
-    /**
-     * @brief Choose best encryption function from those available on both sites.
-     *
-     * @param string $methods
-     *   comma separated list of encryption methods
-     * @return string first match from our site method preferences crypto_methods() array
-     * of a method which is common to both sites; or an empty string if no matches are found.
-     *
-     * Failure to find a common algorithm is not an issue as our communications
-     * take place primarily over https, so this is just redundant encryption in many cases.
-     *
-     * In any case, the receiver is free to reject unencrypted private content if they have
-     * reason to distrust https.
-     *
-     * We are not using array_intersect() here because the specification for that function
-     * does not guarantee the order of results. It probably returns entries in the correct
-     * order for our needs and would simplify this function dramatically, but we cannot be
-     * certain that it will always do so on all operating systems.
-     *
-     */
-
-    public static function best_algorithm($methods)
-    {
-
-        $x = [
-            'methods' => $methods,
-            'result' => ''
-        ];
-
-        /**
-         * @hooks zot_best_algorithm
-         *   Called when negotiating crypto algorithms with remote sites.
-         *   * \e string \b methods - comma separated list of encryption methods
-         *   * \e string \b result - the algorithm to return
-         */
-
-        Hook::call('zot_best_algorithm', $x);
-
-        if ($x['result']) {
-            return $x['result'];
-        }
-
-        if ($methods) {
-            // $x = their methods as an array
-            $x = explode(',', $methods);
-            if ($x) {
-                // $y = our methods as an array
-                $y = Crypto::methods();
-                if ($y) {
-                    foreach ($y as $yv) {
-                        $yv = trim($yv);
-                        if (in_array($yv, $x)) {
-                            return ($yv);
-                        }
-                    }
-                }
-            }
-        }
-
-        return EMPTY_STR;
-    }
-
-
-    /**
-     * @brief send a zot message
-     *
-     * @param string $url
-     * @param array $data
-     * @param array $channel (required if using zot6 delivery)
-     * @param array $crypto (required if encrypted httpsig, requires hubloc_sitekey and site_crypto elements)
-     * @return array see z_post_url() for returned data format
-     * @see z_post_url()
-     *
-     */
-
-    public static function zot($url, $data, $channel = null, $crypto = null)
-    {
-
-        if ($channel) {
-            $headers = [
-                'X-Zot-Token' => random_string(),
-                'Digest' => HTTPSig::generate_digest_header($data),
-                'Content-type' => 'application/x-zot+json',
-                '(request-target)' => 'post ' . get_request_string($url)
-            ];
-
-            $h = HTTPSig::create_sig(
-                $headers,
-                $channel['channel_prvkey'],
-                Channel::url($channel),
-                false,
-                'sha512',
-                (($crypto) ? ['key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto'])] : false)
-            );
-        } else {
-            $h = [];
-        }
-
-        $redirects = 0;
-
-        return z_post_url($url, $data, $redirects, ((empty($h)) ? [] : ['headers' => $h]));
-    }
-
-	public static function nomad($url, $data, $channel = null,$crypto = null) {
-
-		if ($channel) {
-			$headers = [ 
-				'X-Nomad-Token'    => random_string(), 
-				'Digest'           => HTTPSig::generate_digest_header($data), 
-				'Content-type'     => 'application/x-nomad+json',
-				'(request-target)' => 'post ' . get_request_string($url)
-			];
-
-			$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],Channel::url($channel),false,'sha512', 
-				(($crypto) ? [ 'key' => $crypto['hubloc_sitekey'], 'algorithm' => self::best_algorithm($crypto['site_crypto']) ] : false));
-		}
-		else {
-			$h = [];
-		}
-
-		$redirects = 0;
-
-		return z_post_url($url,$data,$redirects,((empty($h)) ? [] : [ 'headers' => $h ]));
-	}
-
-
-
-
-    /**
-     * @brief Refreshes after permission changed or friending, etc.
-     *
-     *
-     * refresh is typically invoked when somebody has changed permissions of a channel and they are notified
-     * to fetch new permissions via a finger/discovery operation. This may result in a new connection
-     * (abook entry) being added to a local channel and it may result in auto-permissions being granted.
-     *
-     * Friending in zot is accomplished by sending a refresh packet to a specific channel which indicates a
-     * permission change has been made by the sender which affects the target channel. The hub controlling
-     * the target channel does targeted discovery (in which a zot discovery request contains permissions for
-     * the sender which were set by the local channel). These are decoded here, and if necessary an abook
-     * structure (addressbook) is created to store the permissions assigned to this channel.
-     *
-     * Initially these abook structures are created with a 'pending' flag, so that no reverse permissions are
-     * implied until this is approved by the owner channel. A channel can also auto-populate permissions in
-     * return and send back a refresh packet of its own. This is used by forum and group communication channels
-     * so that friending and membership in the channel's "club" is automatic.
-     *
-     * If $force is set when calling this function, this operation will be attempted even if our records indicate
-     * the remote site is permanently down.
-     *
-     * @param array $them => xchan structure of sender
-     * @param array $channel => local channel structure of target recipient, required for "friending" operations
-     * @param array $force (optional) default false
-     *
-     * @return boolean
-     *   * \b true if successful
-     *   * otherwise \b false
-     */
-
-    public static function refresh($them, $channel = null, $force = false)
-    {
-
-        $hsig_valid = false;
-
-        logger('them: ' . print_r($them, true), LOGGER_DATA, LOG_DEBUG);
-        if ($channel) {
-            logger('channel: ' . print_r($channel, true), LOGGER_DATA, LOG_DEBUG);
-        }
-
-        $url = null;
-
-        if ($them['hubloc_id_url']) {
-            $url = $them['hubloc_id_url'];
-        } else {
-            $r = null;
-
-            // if they re-installed the server we could end up with the wrong record - pointing to a hash generated by the old install.
-            // We'll order by reverse id to try and pick off the most recently created ones first and hopefully end up with the correct hubloc.
-            // We are looking for the most recently created primary hub, and the most recently created if for some reason we do not have a primary.
-            // hubloc_id_url is set to the channel home, which corresponds to an ActivityStreams actor id.
-
-            $r = q(
-                "select hubloc_id_url, hubloc_primary from hubloc where hubloc_hash = '%s' and hubloc_network in ('zot6','nomad') order by hubloc_id desc",
-                dbesc($them['xchan_hash'])
-            );
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    if (intval($rr['hubloc_primary'])) {
-                        $url = $rr['hubloc_id_url'];
-                        break;
-                    }
-                }
-                if (!$url) {
-                    $url = $r[0]['hubloc_id_url'];
-                }
-            }
-        }
-
-        if (!$url) {
-            logger('zot_refresh: no url');
-            return false;
-        }
-
-        $m = parse_url($url);
-        $site_url = unparse_url(['scheme' => $m['scheme'], 'host' => $m['host']]);
-
-
-        $s = q(
-            "select site_dead from site where site_url = '%s' limit 1",
-            dbesc($site_url)
-        );
-
-        if ($s && intval($s[0]['site_dead']) && (!$force)) {
-            logger('zot_refresh: site ' . $site_url . ' is marked dead and force flag is not set. Cancelling operation.');
-            return false;
-        }
-
-        $record = Zotfinger::exec($url, $channel);
-
-        // Check the HTTP signature
-
-        $hsig = $record['signature'];
-        if ($hsig && $hsig['signer'] === $url && $hsig['header_valid'] === true && $hsig['content_valid'] === true) {
-            $hsig_valid = true;
-        }
-
-        if (!$hsig_valid) {
-            logger('http signature not valid: ' . (($record['data']) ? print_r($hsig, true) : 'fetch failed'));
-            return false;
-        }
-
-        // If we reach this point, the signature is valid and we can trust the channel discovery data, so try and store
-        // the generic information in the returned discovery packet.
-
-        logger('zot-info: ' . print_r($record, true), LOGGER_DATA, LOG_DEBUG);
-
-        $x = self::import_xchan($record['data'], (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED));
-
-        if (!$x['success']) {
-            return false;
-        }
-
-        // Here we handle discovery packets that return targeted permissions and require an abook (either an existing connection
-        // or a new one)
-
-        if ($channel && $record['data']['permissions']) {
-            $old_read_stream_perm = their_perms_contains($channel['channel_id'], $x['hash'], 'view_stream');
-            set_abconfig($channel['channel_id'], $x['hash'], 'system', 'their_perms', $record['data']['permissions']);
-
-            if (array_key_exists('profile', $record['data']) && array_key_exists('next_birthday', $record['data']['profile'])) {
-                $next_birthday = datetime_convert('UTC', 'UTC', $record['data']['profile']['next_birthday']);
-            } else {
-                $next_birthday = NULL_DATE;
-            }
-
-            $profile_assign = get_pconfig($channel['channel_id'], 'system', 'profile_assign', '');
-
-            // Keep original perms to check if we need to notify them
-            $previous_perms = get_all_perms($channel['channel_id'], $x['hash']);
-
-            $r = q(
-                "select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
-                dbesc($x['hash']),
-                intval($channel['channel_id'])
-            );
-
-            if ($r) {
-                // connection exists
-
-                // if the dob is the same as what we have stored (disregarding the year), keep the one
-                // we have as we may have updated the year after sending a notification; and resetting
-                // to the one we just received would cause us to create duplicated events.
-
-                if (substr($r[0]['abook_dob'], 5) == substr($next_birthday, 5)) {
-                    $next_birthday = $r[0]['abook_dob'];
-                }
-
-                $y = q(
-                    "update abook set abook_dob = '%s'
-					where abook_xchan = '%s' and abook_channel = %d
-					and abook_self = 0 ",
-                    dbescdate($next_birthday),
-                    dbesc($x['hash']),
-                    intval($channel['channel_id'])
-                );
-
-                if (!$y) {
-                    logger('abook update failed');
-                } else {
-                    // if we were just granted read stream permission and didn't have it before, try to pull in some posts
-                    if ((!$old_read_stream_perm) && (intval($permissions['view_stream']))) {
-                        Run::Summon(['Onepoll', $r[0]['abook_id']]);
-                    }
-                }
-            } else {
-                // limit the ability to do connection spamming, this limit is per channel
-                $lim = intval(get_config('system', 'max_connections_per_day', 50));
-                if ($lim) {
-                    $n = q(
-                        "select count(abook_id) as total from abook where abook_channel = %d and abook_created > '%s'",
-                        intval($channel['channel_id']),
-                        dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours'))
-                    );
-                    if ($n && intval($n['total']) > $lim) {
-                        logger('channel: ' . $channel['channel_id'] . ' too many new connections per day. This one from ' . $hsig['signer'], LOGGER_NORMAL, LOG_WARNING);
-                        return false;
-                    }
-                }
-
-                // check personal blocklists
-
-                $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER);
-                if ($blocked) {
-                    foreach ($blocked as $b) {
-                        if (strpos($url, $b['block_entity']) !== false) {
-                            logger('siteblock - follower denied');
-                            return;
-                        }
-                    }
-                }
-                if (LibBlock::fetch_by_entity($channel['channel_id'], $x['hash'])) {
-                    logger('actorblock - follower denied');
-                    return;
-                }
-
-                $p = Permissions::connect_perms($channel['channel_id']);
-                $my_perms = Permissions::serialise($p['perms']);
-
-                $automatic = $p['automatic'];
-
-                // new connection
-
-                if ($my_perms) {
-                    set_abconfig($channel['channel_id'], $x['hash'], 'system', 'my_perms', $my_perms);
-                }
-
-                $closeness = get_pconfig($channel['channel_id'], 'system', 'new_abook_closeness', 80);
-
-                // check if it is a sub-channel (collection) and auto-friend if it is
-
-                $is_collection = false;
-
-                $cl = q(
-                    "select channel_id from channel where channel_hash = '%s' and channel_parent = '%s' and channel_account_id = %d limit 1",
-                    dbesc($x['hash']),
-                    dbesc($channel['channel_hash']),
-                    intval($channel['channel_account_id'])
-                );
-                if ($cl) {
-                    $is_collection = true;
-                    $automatic = true;
-                    $closeness = 10;
-                }
-
-                $y = abook_store_lowlevel(
-                    [
-                        'abook_account' => intval($channel['channel_account_id']),
-                        'abook_channel' => intval($channel['channel_id']),
-                        'abook_closeness' => intval($closeness),
-                        'abook_xchan' => $x['hash'],
-                        'abook_profile' => $profile_assign,
-                        'abook_created' => datetime_convert(),
-                        'abook_updated' => datetime_convert(),
-                        'abook_dob' => $next_birthday,
-                        'abook_pending' => intval(($automatic) ? 0 : 1)
-                    ]
-                );
-
-                if ($y) {
-                    logger("New introduction received for {$channel['channel_name']}");
-                    $new_perms = get_all_perms($channel['channel_id'], $x['hash']);
-
-                    // Send a clone sync packet and a permissions update if permissions have changed
-
-                    $new_connection = q(
-                        "select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
-                        dbesc($x['hash']),
-                        intval($channel['channel_id'])
-                    );
-
-                    if ($new_connection) {
-                        if (!Permissions::PermsCompare($new_perms, $previous_perms)) {
-                            Run::Summon(['Notifier', 'permissions_create', $new_connection[0]['abook_id']]);
-                        }
-
-                        if (!$is_collection) {
-                            Enotify::submit(
-                                [
-                                    'type' => NOTIFY_INTRO,
-                                    'from_xchan' => $x['hash'],
-                                    'to_xchan' => $channel['channel_hash'],
-                                    'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id']
-                                ]
-                            );
-                        }
-
-                        if (intval($permissions['view_stream'])) {
-                            if (
-                                intval(get_pconfig($channel['channel_id'], 'perm_limits', 'send_stream') & PERMS_PENDING)
-                                || (!intval($new_connection[0]['abook_pending']))
-                            ) {
-                                Run::Summon(['Onepoll', $new_connection[0]['abook_id']]);
-                            }
-                        }
-
-
-                        // If there is a default group for this channel, add this connection to it
-                        // for pending connections this will happens at acceptance time.
-
-                        if (!intval($new_connection[0]['abook_pending'])) {
-                            $default_group = $channel['channel_default_group'];
-                            if ($default_group) {
-                                $g = AccessList::rec_byhash($channel['channel_id'], $default_group);
-                                if ($g) {
-                                    AccessList::member_add($channel['channel_id'], '', $x['hash'], $g['id']);
-                                }
-                            }
-                        }
-
-                        unset($new_connection[0]['abook_id']);
-                        unset($new_connection[0]['abook_account']);
-                        unset($new_connection[0]['abook_channel']);
-                        $abconfig = load_abconfig($channel['channel_id'], $new_connection[0]['abook_xchan']);
-                        if ($abconfig) {
-                            $new_connection[0]['abconfig'] = $abconfig;
-                        }
-                        Libsync::build_sync_packet($channel['channel_id'], ['abook' => $new_connection]);
-                    }
-                }
-            }
-            return true;
-        } else {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @brief Look up if channel is known and previously verified.
-     *
-     * A guid and a url, both signed by the sender, distinguish a known sender at a
-     * known location.
-     * This function looks these up to see if the channel is known and therefore
-     * previously verified. If not, we will need to verify it.
-     *
-     * @param array $arr an associative array which must contain:
-     *  * \e string \b id => id of conversant
-     *  * \e string \b id_sig => id signed with conversant's private key
-     *  * \e string \b location => URL of the origination hub of this communication
-     *  * \e string \b location_sig => URL signed with conversant's private key
-     * @param bool $multiple (optional) default false
-     *
-     * @return array|null
-     *   * null if site is denied or not found
-     *   * otherwise an array with an hubloc record
-     */
-
-    public static function gethub($arr, $multiple = false)
-    {
-
-        if ($arr['id'] && $arr['id_sig'] && $arr['location'] && $arr['location_sig']) {
-            if (!check_siteallowed($arr['location'])) {
-                logger('denied site: ' . $arr['location']);
-                return null;
-            }
-
-            $limit = (($multiple) ? '' : ' limit 1 ');
-
-            $r = q(
-                "select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url
-					where hubloc_guid = '%s' and hubloc_guid_sig = '%s'
-					and hubloc_url = '%s' and hubloc_url_sig = '%s'
-					and hubloc_site_id = '%s' and hubloc_network in ('nomad','zot6') 
-					$limit",
-                dbesc($arr['id']),
-                dbesc($arr['id_sig']),
-                dbesc($arr['location']),
-                dbesc($arr['location_sig']),
-                dbesc($arr['site_id'])
-            );
-            if ($r) {
-                logger('Found', LOGGER_DEBUG);
-                return (($multiple) ? $r : $r[0]);
-            }
-        }
-        logger('Not found: ' . print_r($arr, true), LOGGER_DEBUG);
-
-        return false;
-    }
-
-
-    public static function valid_hub($sender, $site_id)
-    {
-
-        $r = q(
-            "select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_site_id = '%s' limit 1",
-            dbesc($sender),
-            dbesc($site_id)
-        );
-        if (!$r) {
-            return null;
-        }
-
-        if (!check_siteallowed($r[0]['hubloc_url'])) {
-            logger('denied site: ' . $r[0]['hubloc_url']);
-            return null;
-        }
-
-        if (!check_channelallowed($r[0]['hubloc_hash'])) {
-            logger('denied channel: ' . $r[0]['hubloc_hash']);
-            return null;
-        }
-
-        return $r[0];
-    }
-
-    /**
-     * @brief Registers an unknown hub.
-     *
-     * A communication has been received which has an unknown (to us) sender.
-     * Perform discovery based on our calculated hash of the sender at the
-     * origination address. This will fetch the discovery packet of the sender,
-     * which contains the public key we need to verify our guid and url signatures.
-     *
-     * @param array $arr an associative array which must contain:
-     *  * \e string \b guid => guid of conversant
-     *  * \e string \b guid_sig => guid signed with conversant's private key
-     *  * \e string \b url => URL of the origination hub of this communication
-     *  * \e string \b url_sig => URL signed with conversant's private key
-     *
-     * @return array An associative array with
-     *  * \b success boolean true or false
-     *  * \b message (optional) error string only if success is false
-     */
-
-    public static function register_hub($id)
-    {
-
-        $id_hash = false;
-        $valid = false;
-        $hsig_valid = false;
-
-        $result = ['success' => false];
-
-        if (!$id) {
-            return $result;
-        }
-
-        $record = Zotfinger::exec($id);
-
-        // Check the HTTP signature
-
-        $hsig = $record['signature'];
-        if ($hsig['signer'] === $id && $hsig['header_valid'] === true && $hsig['content_valid'] === true) {
-            $hsig_valid = true;
-        }
-        if (!$hsig_valid) {
-            logger('http signature not valid: ' . print_r($hsig, true));
-            return $result;
-        }
-
-        $c = self::import_xchan($record['data']);
-        if ($c['success']) {
-            $result['success'] = true;
-        } else {
-            logger('Failure to verify zot packet');
-        }
-
-        return $result;
-    }
-
-    /**
-     * @brief Takes an associative array of a fetch discovery packet and updates
-     *   all internal data structures which need to be updated as a result.
-     *
-     * @param array $arr => json_decoded discovery packet
-     * @param int $ud_flags
-     *    Determines whether to create a directory update record if any changes occur, default is UPDATE_FLAGS_UPDATED
-     *    $ud_flags = UPDATE_FLAGS_FORCED indicates a forced refresh where we unconditionally create a directory update record
-     *      this typically occurs once a month for each channel as part of a scheduled ping to notify the directory
-     *      that the channel still exists
-     * @param array $ud_arr
-     *    If set [typically by update_directory_entry()] indicates a specific update table row and more particularly
-     *    contains a particular address (ud_addr) which needs to be updated in that table.
-     *
-     * @return array An associative array with:
-     *   * \e boolean \b success boolean true or false
-     *   * \e string \b message (optional) error string only if success is false
-     */
-
-    public static function import_xchan($arr, $ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null)
-    {
-
-        /**
-         * @hooks import_xchan
-         *   Called when processing the result of zot_finger() to store the result
-         *   * \e array
-         */
-        Hook::call('import_xchan', $arr);
-
-        $ret = array('success' => false);
-        $dirmode = intval(get_config('system', 'directory_mode'));
-
-        $changed = false;
-        $what = '';
-
-        if (!is_array($arr)) {
-            logger('Not an array: ' . print_r($arr, true), LOGGER_DEBUG);
-            return $ret;
-        }
-
-        if (!($arr['id'] && $arr['id_sig'])) {
-            logger('No identity information provided. ' . print_r($arr, true));
-            return $ret;
-        }
-
-        $xchan_hash = self::make_xchan_hash($arr['id'], $arr['public_key']);
-        $arr['hash'] = $xchan_hash;
-
-        $import_photos = false;
-
-        $sig_methods = ((array_key_exists('signing', $arr) && is_array($arr['signing'])) ? $arr['signing'] : ['sha256']);
-        $verified = false;
-
-        if (!self::verify($arr['id'], $arr['id_sig'], $arr['public_key'])) {
-            logger('Unable to verify channel signature for ' . $arr['address']);
-            return $ret;
-        } else {
-            $verified = true;
-        }
-
-        if (!$verified) {
-            $ret['message'] = t('Unable to verify channel signature');
-            return $ret;
-        }
-
-        logger('import_xchan: ' . $xchan_hash, LOGGER_DEBUG);
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($xchan_hash)
-        );
-
-        if (!array_key_exists('connect_url', $arr)) {
-            $arr['connect_url'] = '';
-        }
-
-        if ($r) {
-            if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $arr['photo']['updated'] > $r[0]['xchan_photo_date']) {
-                $import_photos = true;
-            }
-
-            // if we import an entry from a site that's not ours and either or both of us is off the grid - hide the entry.
-            /** @TODO: check if we're the same directory realm, which would mean we are allowed to see it */
-
-            $dirmode = get_config('system', 'directory_mode');
-
-            if ((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root())) {
-                $arr['searchable'] = false;
-            }
-
-            $hidden = (1 - intval($arr['searchable']));
-
-            $hidden_changed = $adult_changed = $deleted_changed = $type_changed = 0;
-
-            if (intval($r[0]['xchan_hidden']) != (1 - intval($arr['searchable']))) {
-                $hidden_changed = 1;
-            }
-            if (intval($r[0]['xchan_selfcensored']) != intval($arr['adult_content'])) {
-                $adult_changed = 1;
-            }
-            if (isset($arr['deleted']) && intval($r[0]['xchan_deleted']) != intval($arr['deleted'])) {
-                $deleted_changed = 1;
-            }
-
-			$px = 0;
-			if (isset($arr['channel_type'])) {
-	            if ($arr['channel_type'] === 'collection') {
-    	            $px = 2;
-        	    } elseif ($arr['channel_type'] === 'group') {
-                	$px = 1;
-				}
-			}
-            if (array_key_exists('public_forum', $arr) && intval($arr['public_forum'])) {
-                $px = 1;
-            }
-
-            if (intval($r[0]['xchan_type']) !== $px) {
-                $type_changed = true;
-            }
-
-            if ($arr['protocols']) {
-                set_xconfig($xchan_hash, 'system', 'protocols', implode(',',$arr['protocols']));
-            }
-            $collections = [];
-            if (isset($arr['primary_location']['following'])) {
-                $collections['following'] = $arr['primary_location']['following'];
-            }
-            if (isset($arr['primary_location']['followers'])) {
-                $collections['followers'] = $arr['primary_location']['followers'];
-            }
-            if (isset($arr['primary_location']['wall'])) {
-                $collections['wall'] = $arr['primary_location']['wall'];
-            }
-            if ($collections) {
-                set_xconfig($xchan_hash, 'activitypub', 'collections', $collections);
-            }
-
-            if (isset($arr['cover_photo']) && isset($arr['cover_photo']['url']) && strlen($arr['cover_photo']['url'])) {
-                set_xconfig($xchan_hash, 'system', 'cover_photo', $arr['cover_photo']['url']);
-            }
-
-            if (isset($arr['signing_algorithm']) && strlen($arr['signing_algorithm'])) {
-                set_xconfig($xchan_hash, 'system', 'signing_algorithm', $arr['signing_algorithm']);
-            }
-
-
-            if (
-                ($r[0]['xchan_name_date'] != $arr['name_updated'])
-                || ($r[0]['xchan_connurl'] != $arr['primary_location']['connections_url'])
-                || ($r[0]['xchan_addr'] != $arr['primary_location']['address'])
-                || ($r[0]['xchan_follow'] != $arr['primary_location']['follow_url'])
-                || ($r[0]['xchan_connpage'] != $arr['connect_url'])
-                || ($r[0]['xchan_url'] != $arr['primary_location']['url'])
-                || ($r[0]['xchan_updated'] < datetime_convert('UTC', 'UTC', 'now - 7 days'))
-                || $hidden_changed || $adult_changed || $deleted_changed || $type_changed
-            ) {
-                $rup = q(
-                    "update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s',
-					xchan_connpage = '%s', xchan_hidden = %d, xchan_selfcensored = %d, xchan_deleted = %d, xchan_type = %d,
-					xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s'",
-                    dbesc(datetime_convert()),
-                    dbesc(($arr['name']) ? escape_tags($arr['name']) : '-'),
-                    dbesc($arr['name_updated']),
-                    dbesc($arr['primary_location']['connections_url']),
-                    dbesc($arr['primary_location']['follow_url']),
-                    dbesc($arr['primary_location']['connect_url']),
-                    intval(1 - intval($arr['searchable'])),
-                    intval($arr['adult_content']),
-                    intval($arr['deleted']),
-                    intval($px),
-                    dbesc(escape_tags($arr['primary_location']['address'])),
-                    dbesc(escape_tags($arr['primary_location']['url'])),
-                    dbesc($xchan_hash)
-                );
-
-                logger('Update: existing: ' . print_r($r[0], true), LOGGER_DATA, LOG_DEBUG);
-                logger('Update: new: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
-                $what .= 'xchan ';
-                $changed = true;
-            }
-        } else {
-            $import_photos = true;
-
-            if (
-                (($arr['site']['directory_mode'] === 'standalone')
-                    || ($dirmode & DIRECTORY_MODE_STANDALONE))
-                && ($arr['site']['url'] != z_root())
-            ) {
-                $arr['searchable'] = false;
-            }
-
-
-            if ($arr['channel_type'] === 'collection') {
-                $px = 2;
-            } elseif ($arr['channel_type'] === 'group') {
-                $px = 1;
-            } else {
-                $px = 0;
-            }
-
-            if (array_key_exists('public_forum', $arr) && intval($arr['public_forum'])) {
-                $px = 1;
-            }
-
-			$network = isset($arr['site']['protocol_version']) && intval($arr['site']['protocol_version']) > 10 ? 'nomad' : 'zot6';
-
-
-            $x = xchan_store_lowlevel(
-                [
-                    'xchan_hash' => $xchan_hash,
-                    'xchan_guid' => $arr['id'],
-                    'xchan_guid_sig' => $arr['id_sig'],
-                    'xchan_pubkey' => $arr['public_key'],
-                    'xchan_photo_mimetype' => $arr['photo']['type'],
-                    'xchan_photo_l' => $arr['photo']['url'],
-                    'xchan_addr' => escape_tags($arr['primary_location']['address']),
-                    'xchan_url' => escape_tags($arr['primary_location']['url']),
-                    'xchan_connurl' => $arr['primary_location']['connections_url'],
-                    'xchan_follow' => $arr['primary_location']['follow_url'],
-                    'xchan_connpage' => $arr['connect_url'],
-                    'xchan_name' => (($arr['name']) ? escape_tags($arr['name']) : '-'),
-                    'xchan_network' => $network,
-                    'xchan_updated' => datetime_convert(),
-                    'xchan_photo_date' => $arr['photo']['updated'],
-                    'xchan_name_date' => $arr['name_updated'],
-                    'xchan_hidden' => intval(1 - intval($arr['searchable'])),
-                    'xchan_selfcensored' => $arr['adult_content'],
-                    'xchan_deleted' => $arr['deleted'],
-                    'xchan_type' => $px
-                ]
-            );
-
-            $what .= 'new_xchan';
-            $changed = true;
-        }
-
-        if (isset($arr['cover_photo']) && isset($arr['cover_photo']['url']) && strlen($arr['cover_photo']['url'])) {
-            set_xconfig($xchan_hash, 'system', 'cover_photo', $arr['cover_photo']['url']);
-        }
-
-        if ($import_photos) {
-            require_once('include/photo_factory.php');
-
-            // see if this is a channel clone that's hosted locally - which we treat different from other xchans/connections
-
-            $local = q(
-                "select channel_account_id, channel_id from channel where channel_hash = '%s' limit 1",
-                dbesc($xchan_hash)
-            );
-            if ($local) {
-                $ph = false;
-                if (strpos($arr['photo']['url'], z_root()) === false) {
-                    $ph = z_fetch_url($arr['photo']['url'], true);
-                }
-                if ($ph && $ph['success']) {
-                    $hash = import_channel_photo($ph['body'], $arr['photo']['type'], $local[0]['channel_account_id'], $local[0]['channel_id']);
-
-                    if ($hash) {
-                        // unless proven otherwise
-                        $is_default_profile = 1;
-
-                        $profile = q(
-                            "select is_default from profile where aid = %d and uid = %d limit 1",
-                            intval($local[0]['channel_account_id']),
-                            intval($local[0]['channel_id'])
-                        );
-                        if ($profile) {
-                            if (!intval($profile[0]['is_default'])) {
-                                $is_default_profile = 0;
-                            }
-                        }
-
-                        // If setting for the default profile, unset the profile photo flag from any other photos I own
-                        if ($is_default_profile) {
-                            q(
-                                "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND aid = %d AND uid = %d",
-                                intval(PHOTO_NORMAL),
-                                intval(PHOTO_PROFILE),
-                                dbesc($hash),
-                                intval($local[0]['channel_account_id']),
-                                intval($local[0]['channel_id'])
-                            );
-                        }
-                    }
-
-                    // reset the names in case they got messed up when we had a bug in this function
-                    $photos = array(
-                        z_root() . '/photo/profile/l/' . $local[0]['channel_id'],
-                        z_root() . '/photo/profile/m/' . $local[0]['channel_id'],
-                        z_root() . '/photo/profile/s/' . $local[0]['channel_id'],
-                        $arr['photo_mimetype'],
-                        false
-                    );
-                }
-            } else {
-                $photos = import_remote_xchan_photo($arr['photo']['url'], $xchan_hash);
-            }
-            if ($photos) {
-                if ($photos[4]) {
-                    // importing the photo failed somehow. Leave the photo_date alone so we can try again at a later date.
-                    // This often happens when somebody joins the matrix with a bad cert.
-                    $r = q(
-                        "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
-						where xchan_hash = '%s'",
-                        dbesc(datetime_convert()),
-                        dbesc($photos[0]),
-                        dbesc($photos[1]),
-                        dbesc($photos[2]),
-                        dbesc($photos[3]),
-                        dbesc($xchan_hash)
-                    );
-                } else {
-                    $r = q(
-                        "update xchan set xchan_updated = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
-						where xchan_hash = '%s'",
-                        dbesc(datetime_convert()),
-                        dbesc(datetime_convert('UTC', 'UTC', ((isset($arr['photo_updated'])) ? $arr['photo_updated'] : 'now'))),
-                        dbesc($photos[0]),
-                        dbesc($photos[1]),
-                        dbesc($photos[2]),
-                        dbesc($photos[3]),
-                        dbesc($xchan_hash)
-                    );
-                }
-                $what .= 'photo ';
-                $changed = true;
-            }
-        }
-
-        // what we are missing for true hub independence is for any changes in the primary hub to
-        // get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan
-
-        $s = Libsync::sync_locations($arr, $arr);
-
-        if ($s) {
-            if (isset($s['change_message']) && $s['change_message']) {
-                $what .= $s['change_message'];
-            }
-            if (isset($s['changed']) && $s['changed']) {
-                $changed = $s['changed'];
-            }
-            if (isset($s['message']) && $s['message']) {
-                $ret['message'] .= $s['message'];
-            }
-        }
-
-        // Which entries in the update table are we interested in updating?
-        $address = ((isset($arr['address']) && $arr['address']) ? $arr['address'] : EMPTY_STR);
-        if (isset($ud_arr) && isset($ud_arr['ud_addr'])) {
-            $address = $ud_arr['ud_addr'];
-        }
-
-        // Are we a directory server of some kind?
-
-        $other_realm = false;
-
-//      $realm = get_directory_realm();
-//      if (array_key_exists('site',$arr)
-//          && array_key_exists('realm',$arr['site'])
-//          && (strpos($arr['site']['realm'],$realm) === false))
-//          $other_realm = true;
-
-
-//      if ($dirmode != DIRECTORY_MODE_NORMAL) {
-
-        // We're some kind of directory server. However we can only add directory information
-        // if the entry is in the same realm (or is a sub-realm). Sub-realms are denoted by
-        // including the parent realm in the name. e.g. 'RED_GLOBAL:foo' would allow an entry to
-        // be in directories for the local realm (foo) and also the RED_GLOBAL realm.
-
-        if (array_key_exists('profile', $arr) && is_array($arr['profile']) && (!$other_realm)) {
-            $profile_changed = Libzotdir::import_directory_profile($xchan_hash, $arr['profile'], $address, $ud_flags, 1);
-            if ($profile_changed) {
-                $what .= 'profile ';
-                $changed = true;
-            }
-        } else {
-            logger('Profile not available - hiding');
-            // they may have made it private
-            $r = q(
-                "delete from xprof where xprof_hash = '%s'",
-                dbesc($xchan_hash)
-            );
-            $r = q(
-                "delete from xtag where xtag_hash = '%s' and xtag_flags = 0",
-                dbesc($xchan_hash)
-            );
-        }
-//      }
-
-        if (array_key_exists('site', $arr) && is_array($arr['site'])) {
-            $profile_changed = self::import_site($arr['site']);
-            if ($profile_changed) {
-                $what .= 'site ';
-                $changed = true;
-            }
-        }
-
-        if (($changed) || ($ud_flags == UPDATE_FLAGS_FORCED)) {
-            $guid = random_string() . '@' . App::get_hostname();
-            Libzotdir::update_modtime($xchan_hash, $guid, $address, $ud_flags);
-            logger('Changed: ' . $what, LOGGER_DEBUG);
-        } elseif (!$ud_flags) {
-            // nothing changed but we still need to update the updates record
-            q(
-                "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) > 0 ",
-                intval(UPDATE_FLAGS_UPDATED),
-                dbesc($address),
-                intval(UPDATE_FLAGS_UPDATED)
-            );
-        }
-
-        if (!x($ret, 'message')) {
-            $ret['success'] = true;
-            $ret['hash'] = $xchan_hash;
-        }
-
-        logger('Result: ' . print_r($ret, true), LOGGER_DATA, LOG_DEBUG);
-        return $ret;
-    }
-
-    /**
-     * @brief Called immediately after sending a zot message which is using queue processing.
-     *
-     * Updates the queue item according to the response result and logs any information
-     * returned to aid communications troubleshooting.
-     *
-     * @param string $hub - url of site we just contacted
-     * @param array $arr - output of z_post_url()
-     * @param array $outq - The queue structure attached to this request
-     */
-
-    public static function process_response($hub, $arr, $outq)
-    {
-
-        logger('remote: ' . print_r($arr, true), LOGGER_DATA);
-
-        if (!$arr['success']) {
-            logger('Failed: ' . $hub);
-            return;
-        }
-
-        $x = json_decode($arr['body'], true);
-
-        if (!$x) {
-            logger('No json from ' . $hub);
-            logger('Headers: ' . print_r($arr['header'], true), LOGGER_DATA, LOG_DEBUG);
-        }
-
-        $x = Crypto::unencapsulate($x, get_config('system', 'prvkey'));
-        if (!is_array($x)) {
-            $x = json_decode($x, true);
-        }
-
-        if (!is_array($x)) {
-            logger('no useful response: ' . $x);
-        }
-
-        if ($x) {
-            if (!$x['success']) {
-                // handle remote validation issues
-
-                $b = q(
-                    "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-                    dbesc(($x['message']) ? $x['message'] : 'unknown delivery error'),
-                    dbesc(datetime_convert()),
-                    dbesc($outq['outq_hash'])
-                );
-            }
-
-            if (is_array($x) && array_key_exists('delivery_report', $x) && is_array($x['delivery_report'])) {
-                foreach ($x['delivery_report'] as $xx) {
-                    Hook::call('dreport_process', $xx);
-                    if (is_array($xx) && array_key_exists('message_id', $xx) && DReport::is_storable($xx)) {
-                        q(
-                            "insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_log ) values ( '%s', '%s', '%s','%s','%s','%s','%s','%s' ) ",
-                            dbesc($xx['message_id']),
-                            dbesc($xx['location']),
-                            dbesc($xx['recipient']),
-                            dbesc($xx['name']),
-                            dbesc($xx['status']),
-                            dbesc(datetime_convert('UTC', 'UTC', $xx['date'])),
-                            dbesc($xx['sender']),
-                            dbesc(EMPTY_STR)
-                        );
-                    }
-                }
-
-                // we have a more descriptive delivery report, so discard the per hub 'queue' report.
-
-                q(
-                    "delete from dreport where dreport_queue = '%s' ",
-                    dbesc($outq['outq_hash'])
-                );
-            }
-        }
-        // update the timestamp for this site
-
-        q(
-            "update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
-            dbesc(datetime_convert()),
-            dbesc(dirname($hub))
-        );
-
-        // synchronous message types are handled immediately
-        // async messages remain in the queue until processed.
-
-        if (intval($outq['outq_async'])) {
-            Queue::remove($outq['outq_hash'], $outq['outq_channel']);
-        }
-
-        logger('zot_process_response: ' . print_r($x, true), LOGGER_DEBUG);
-    }
-
-    /**
-     * @brief
-     *
-     * We received a notification packet (in mod_post) that a message is waiting for us, and we've verified the sender.
-     * Check if the site is using zot6 delivery and includes a verified HTTP Signature, signed content, and a 'msg' field,
-     * and also that the signer and the sender match.
-     * If that happens, we do not need to fetch/pickup the message - we have it already and it is verified.
-     * Translate it into the form we need for zot_import() and import it.
-     *
-     * Otherwise send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site
-     * private key.
-     * The entire pickup message is encrypted with the remote site's public key.
-     * If everything checks out on the remote end, we will receive back a packet containing one or more messages,
-     * which will be processed and delivered before this function ultimately returns.
-     *
-     * @param array $arr
-     *     decrypted and json decoded notify packet from remote site
-     * @return array from zot_import()
-     * @see zot_import()
-     *
-     */
-
-    public static function fetch($arr, $hub = null)
-    {
-
-        logger('zot_fetch: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
-
-        return self::import($arr, $hub);
-    }
-
-    /**
-     * @brief Process incoming messages.
-     *
-     * Process incoming messages and import, update, delete as directed
-     *
-     * The message types handled here are 'activity' (e.g. posts), and 'sync'.
-     *
-     * @param array $arr
-     *  'pickup' structure returned from remote site
-     * @param string $sender_url
-     *  the url specified by the sender in the initial communication.
-     *  We will verify the sender and url in each returned message structure and
-     *  also verify that all the messages returned match the site url that we are
-     *  currently processing.
-     *
-     * @returns array
-     *   Suitable for logging remotely, enumerating the processing results of each message/recipient combination
-     *   * [0] => \e string $channel_hash
-     *   * [1] => \e string $delivery_status
-     *   * [2] => \e string $address
-     */
-
-    public static function import($arr, $hub = null)
-    {
-
-        $env = $arr;
-        $private = false;
-        $return = [];
-
-        $result = null;
-
-        logger('Notify: ' . print_r($env, true), LOGGER_DATA, LOG_DEBUG);
-
-        if (!is_array($env)) {
-            logger('decode error');
-            return;
-        }
-
-        $message_request = false;
-
-        $has_data = array_key_exists('data', $env) && $env['data'];
-        $data = (($has_data) ? $env['data'] : false);
-
-        $AS = null;
-
-        if ($env['encoding'] === 'activitystreams') {
-            $AS = new ActivityStreams($data);
-            if (
-                $AS->is_valid() && $AS->type === 'Announce' && is_array($AS->obj)
-                && array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj)
-            ) {
-                // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
-                // Reparse the encapsulated Activity and use that instead
-                logger('relayed activity', LOGGER_DEBUG);
-                $AS = new ActivityStreams($AS->obj);
-            }
-
-            if (!$AS->is_valid()) {
-                logger('Activity rejected: ' . print_r($data, true));
-                return;
-            }
-
-            // compatibility issue with like of Hubzilla "new friend" activities which is very difficult to fix
-
-            if ($AS->implied_create && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
-                logger('create/person activity rejected. ' . print_r($data, true));
-                return false;
-            }
-
-            if (is_array($AS->obj)) {
-                $arr = Activity::decode_note($AS);
-            } else {
-                $arr = [];
-            }
-
-            logger($AS->debug(), LOGGER_DATA);
-        }
-
-        // There is nothing inherently wrong with getting a message-id which isn't a canonical URI/URL, but
-        // at the present time (2019/02) during the Hubzilla transition to zot6 it is likely to cause lots of duplicates for
-        // messages arriving from different protocols and sources with different message-id semantics. This
-        // restriction can be relaxed once most Hubzilla sites are upgraded to > 4.0.
-        // Don't check sync packets since they have a different encoding
-
-        if ($arr && $env['type'] !== 'sync') {
-            if (strpos($arr['mid'], 'http') === false && strpos($arr['mid'], 'x-zot') === false) {
-                if (strpos($arr['mid'], 'bear:') === false) {
-                    logger('activity rejected: legacy message-id');
-                    return;
-                }
-            }
-
-            if ($arr['verb'] === 'Create' && ActivityStreams::is_an_actor($arr['obj_type'])) {
-                logger('activity rejected: create actor');
-                return;
-            }
-        }
-
-        $deliveries = null;
-
-        if (array_key_exists('recipients', $env) && count($env['recipients'])) {
-            logger('specific recipients');
-            logger('recipients: ' . print_r($env['recipients'], true), LOGGER_DEBUG);
-
-            $recip_arr = [];
-            foreach ($env['recipients'] as $recip) {
-                $recip_arr[] = $recip;
-            }
-
-            $r = false;
-            if ($recip_arr) {
-                stringify_array_elms($recip_arr, true);
-                $recips = implode(',', $recip_arr);
-                $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and channel_removed = 0 ");
-            }
-
-            if (!$r) {
-                logger('recips: no recipients on this site');
-                return;
-            }
-
-            // Response messages will inherit the privacy of the parent
-
-            if ($env['type'] !== 'response') {
-                $private = true;
-            }
-
-            $deliveries = ids_to_array($r, 'hash');
-
-            // We found somebody on this site that's in the recipient list.
-        } else {
-            logger('public post');
-
-
-            // Public post. look for any site members who are or may be accepting posts from this sender
-            // and who are allowed to see them based on the sender's permissions
-            // @fixme;
-
-            $deliveries = self::public_recips($env, $AS);
-        }
-
-        $deliveries = array_unique($deliveries);
-
-        if (!$deliveries) {
-            logger('No deliveries on this site');
-            return;
-        }
-
-        if ($has_data) {
-            if (in_array($env['type'], ['activity', 'response'])) {
-                if (!(is_array($AS->actor) && isset($AS->actor['id']))) {
-                    logger('No author!');
-                    return;
-                }
-
-                $r = q(
-                    "select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_id_url = '%s'",
-                    dbesc($AS->actor['id'])
-                );
-
-                if ($r) {
-                    $r = self::zot_record_preferred($r);
-                    $arr['author_xchan'] = $r['hubloc_hash'];
-                }
-
-                if (!$arr['author_xchan']) {
-                    logger('No author!');
-                    return;
-                }
-
-                $s = q(
-                    "select hubloc_hash, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad') limit 1",
-                    dbesc($env['sender'])
-                );
-
-                // in individual delivery, change owner if needed
-                if ($s) {
-                    $arr['owner_xchan'] = $s[0]['hubloc_hash'];
-                } else {
-                    $arr['owner_xchan'] = $env['sender'];
-                }
-
-                if ($private && (!intval($arr['item_private']))) {
-                    $arr['item_private'] = 1;
-                }
-                if ($arr['mid'] === $arr['parent_mid']) {
-                    if (is_array($AS->obj) && array_key_exists('commentPolicy', $AS->obj)) {
-                        $p = strstr($AS->obj['commentPolicy'], 'until=');
-
-                        // if until= is the same as the creation date, set the item_nocomment flag
-                        // as comments were already closed before the post was even sent.
-
-                        if ($p !== false) {
-                            $comments_closed_at = datetime_convert('UTC', 'UTC', substr($p, 6));
-                            if ($comments_closed_at === $arr['created']) {
-                                $arr['item_nocomment'] = 1;
-                            } else {
-                                $arr['comments_closed'] = $comments_closed_at;
-                                $arr['comment_policy'] = trim(str_replace($p, '', $AS->obj['commentPolicy']));
-                            }
-                        } else {
-                            $arr['comment_policy'] = $AS->obj['commentPolicy'];
-                        }
-                    }
-                }
-                if ($AS->data['hubloc']) {
-                    $arr['item_verified'] = true;
-
-                    if (!array_key_exists('comment_policy', $arr)) {
-                        // set comment policy based on type of site.
-                        $s = q(
-                            "select site_type from site where site_url = '%s' limit 1",
-                            dbesc($r[0]['hubloc_url'])
-                        );
-
-                        if ($s && intval($s[0]['site_type']) === SITE_TYPE_ZOT) {
-                            $arr['comment_policy'] = 'contacts';
-                        } else {
-                            $arr['comment_policy'] = 'authenticated';
-                        }
-                    }
-                }
-                if ($AS->meta['signed_data']) {
-                    IConfig::Set($arr, 'activitypub', 'signed_data', $AS->meta['signed_data'], false);
-                    $j = json_decode($AS->meta['signed_data'], true);
-                    if ($j) {
-                        IConfig::Set($arr, 'activitypub', 'rawmsg', json_encode(JSalmon::unpack($j['data'])), true);
-                    }
-                }
-
-                logger('Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
-                logger('Activity recipients: ' . print_r($deliveries, true), LOGGER_DATA, LOG_DEBUG);
-
-                $relay = (($env['type'] === 'response') ? true : false);
-
-                $result = self::process_delivery($env['sender'], $AS, $arr, $deliveries, $relay, false, $message_request);
-            } elseif ($env['type'] === 'sync') {
-                $arr = json_decode($data, true);
-
-                logger('Channel sync received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
-                logger('Channel sync recipients: ' . print_r($deliveries, true), LOGGER_DATA, LOG_DEBUG);
-
-                if ($env['encoding'] === 'red') {
-                    $result = Libsync::process_channel_sync_delivery($env['sender'], $arr, $deliveries);
-                } else {
-                    logger('unsupported sync packet encoding ignored.');
-                }
-            }
-        }
-        if ($result) {
-            $return = array_merge($return, $result);
-        }
-        return $return;
-    }
-
-
-    public static function is_top_level($env, $act)
-    {
-        if ($env['encoding'] === 'zot' && array_key_exists('flags', $env) && in_array('thread_parent', $env['flags'])) {
-            return true;
-        }
-        if ($act) {
-            if (in_array($act->type, ['Like', 'Dislike'])) {
-                return false;
-            }
-            $x = self::find_parent($env, $act);
-            if ($x === $act->id || (is_array($act->obj) && array_key_exists('id', $act->obj) && $x === $act->obj['id'])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    public static function find_parent($env, $act)
-    {
-        if ($act) {
-            if (in_array($act->type, ['Like', 'Dislike']) && is_array($act->obj)) {
-                return $act->obj['id'];
-            }
-            if ($act->parent_id) {
-                return $act->parent_id;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @brief
-     *
-     * A public message with no listed recipients can be delivered to anybody who
-     * has PERMS_NETWORK for that type of post, PERMS_AUTHED (in-network senders are
-     * by definition authenticated) or PERMS_SITE and is one the same site,
-     * or PERMS_SPECIFIC and the sender is a contact who is granted permissions via
-     * their connection permissions in the address book.
-     * Here we take a given message and construct a list of hashes of everybody
-     * on the site that we should try and deliver to.
-     * Some of these will be rejected, but this gives us a place to start.
-     *
-     * @param array $msg
-     * @return NULL|array
-     */
-
-    public static function public_recips($msg, $act)
-    {
-
-        $check_mentions = false;
-        $include_sys = false;
-
-        if ($msg['type'] === 'activity') {
-            $public_stream_mode = intval(get_config('system', 'public_stream_mode', PUBLIC_STREAM_NONE));
-            if ($public_stream_mode === PUBLIC_STREAM_FULL) {
-                $include_sys = true;
-            }
-
-            $perm = 'send_stream';
-
-            if (self::is_top_level($msg, $act)) {
-                $check_mentions = true;
-            }
-        } elseif ($msg['type'] === 'mail') {
-            $perm = 'post_mail';
-        }
-
-        // channels which we will deliver this post to
-        $r = [];
-
-        $c = q("select channel_id, channel_hash from channel where channel_removed = 0");
-
-        if ($c) {
-            foreach ($c as $cc) {
-                // top level activity sent to ourself: ignore. Clones will get a sync activity
-                // which is a true clone of the original item. Everything else is a duplicate.
-
-                if ($check_mentions && $cc['channel_hash'] === $msg['sender']) {
-                    continue;
-                }
-
-                if (perm_is_allowed($cc['channel_id'], $msg['sender'], $perm)) {
-                    $r[] = $cc['channel_hash'];
-                }
-            }
-        }
-
-        if ($include_sys) {
-            $sys = Channel::get_system();
-            if ($sys) {
-                $r[] = $sys['channel_hash'];
-            }
-        }
-
-        // add channels that are following tags
-        // these will be enumerated and validated in tgroup_check()
-
-        $ft = q(
-            "select channel_hash as hash from channel left join pconfig on pconfig.uid = channel_id where cat = 'system' and k = 'followed_tags' and channel_hash != '%s' and channel_removed = 0",
-            dbesc($msg['sender'])
-        );
-        if ($ft) {
-            foreach ($ft as $t) {
-                $r[] = $t['hash'];
-            }
-        }
-
-        // look for any public mentions on this site
-        // They will get filtered by tgroup_check() so we don't need to check permissions now
-
-        if ($check_mentions) {
-            // It's a top level post. Look at the tags. See if any of them are mentions and are on this hub.
-            if ($act && $act->obj) {
-                if (is_array($act->obj['tag']) && $act->obj['tag']) {
-                    foreach ($act->obj['tag'] as $tag) {
-                        if ($tag['type'] === 'Mention' && (strpos($tag['href'], z_root()) !== false)) {
-                            $address = basename($tag['href']);
-                            if ($address) {
-                                $z = q(
-                                    "select channel_hash as hash from channel where channel_address = '%s'
-									and channel_hash != '%s' and channel_removed = 0 limit 1",
-                                    dbesc($address),
-                                    dbesc($msg['sender'])
-                                );
-                                if ($z) {
-                                    $r[] = $z[0]['hash'];
-                                }
-                            }
-                        }
-                        if ($tag['type'] === 'topicalCollection' && strpos($tag['name'], App::get_hostname())) {
-                            $address = substr($tag['name'], 0, strpos($tag['name'], '@'));
-                            if ($address) {
-                                $z = q(
-                                    "select channel_hash as hash from channel where channel_address = '%s'
-									and channel_hash != '%s' and channel_removed = 0 limit 1",
-                                    dbesc($address),
-                                    dbesc($msg['sender'])
-                                );
-                                if ($z) {
-                                    $r[] = $z[0]['hash'];
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            // This is a comment. We need to find any parent with ITEM_UPLINK set. But in fact, let's just return
-            // everybody that stored a copy of the parent. This way we know we're covered. We'll check the
-            // comment permissions when we deliver them.
-
-            $thread_parent = self::find_parent($msg, $act);
-
-            if ($thread_parent) {
-                $z = q(
-                    "select channel_hash as hash from channel left join item on channel.channel_id = item.uid where ( item.thr_parent = '%s' OR item.parent_mid = '%s' ) ",
-                    dbesc($thread_parent),
-                    dbesc($thread_parent)
-                );
-                if ($z) {
-                    foreach ($z as $zv) {
-                        $r[] = $zv['hash'];
-                    }
-                }
-            }
-        }
-
-        // There are probably a lot of duplicates in $r at this point. We need to filter those out.
-
-        if ($r) {
-            $r = array_values(array_unique($r));
-        }
-
-        logger('public_recips: ' . print_r($r, true), LOGGER_DATA, LOG_DEBUG);
-        return $r;
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param array $sender
-     * @param ActivityStreams object $act
-     * @param array $msg_arr
-     * @param array $deliveries
-     * @param bool $relay
-     * @param bool $public (optional) default false
-     * @param bool $request (optional) default false
-     * @return array
-     */
-
-    public static function process_delivery($sender, $act, $msg_arr, $deliveries, $relay, $public = false, $request = false)
-    {
-
-        $result = [];
-
-        // logger('msg_arr: ' . print_r($msg_arr,true),LOGGER_ALL);
-
-        // If an upstream hop used ActivityPub, set the identities to zot6 nomadic identities where applicable
-        // else things could easily get confused
-
-        $msg_arr['author_xchan'] = Activity::find_best_identity($msg_arr['author_xchan']);
-        $msg_arr['owner_xchan'] = Activity::find_best_identity($msg_arr['owner_xchan']);
-
-        // We've validated the sender. Now make sure that the sender is the owner or author
-
-        if (!$public) {
-            if ($sender != $msg_arr['owner_xchan'] && $sender != $msg_arr['author_xchan']) {
-                logger("Sender $sender is not owner {$msg_arr['owner_xchan']} or author {$msg_arr['author_xchan']} - mid {$msg_arr['mid']}");
-                return;
-            }
-        }
-
-        if ($act->implied_create) {
-            logger('implied create activity. Not delivering/storing.');
-            return;
-        }
-
-        foreach ($deliveries as $d) {
-            $local_public = $public;
-
-            // if any further changes are to be made, change a copy and not the original
-            $arr = $msg_arr;
-
-//          if (! $msg_arr['mid']) {
-//              logger('no mid2: ' . print_r($msg_arr,true));
-//              logger('recip: ' . $d);
-//          }
-
-
-            $DR = new DReport(z_root(), $sender, $d, $arr['mid']);
-
-            $channel = Channel::from_hash($d);
-
-            if (!$channel) {
-                $DR->update('recipient not found');
-                $result[] = $DR->get();
-                continue;
-            }
-
-            $DR->set_name($channel['channel_name'] . ' <' . Channel::get_webfinger($channel) . '>');
-
-//          if ($act->type === 'Tombstone') {
-//              $r = q("select * from item where mid in ( '%s', '%s' ) and uid = %d",
-//                  dbesc($act->id),
-//                  dbesc(str_replace('/activity/','/item/',$act->id))
-//                  intval($channel['channel_id'])
-//              );
-//              if ($r) {
-//                  if (($r[0]['author_xchan'] === $sender) || ($r[0]['owner_xchan'] === $sender)) {
-//                      drop_item($r[0]['id'],false);
-//                  }
-//                  $DR->update('item deleted');
-//                  $result[] = $DR->get();
-//                  continue;
-//              }
-//              $DR->update('deleted item not found');
-//              $result[] = $DR->get();
-//              continue;
-//          }
-
-            if (($act) && ($act->obj) && (!is_array($act->obj))) {
-                // The initial object fetch failed using the sys channel credentials.
-                // Try again using the delivery channel credentials.
-                // We will also need to re-parse the $item array,
-                // but preserve any values that were set during anonymous parsing.
-
-                $o = Activity::fetch($act->obj, $channel);
-                if ($o) {
-                    $act->obj = $o;
-                    $arr = array_merge(Activity::decode_note($act), $arr);
-                } else {
-                    $DR->update('Incomplete or corrupt activity');
-                    $result[] = $DR->get();
-                    continue;
-                }
-            }
-
-            /**
-             * We need to block normal top-level message delivery from our clones, as the delivered
-             * message doesn't have ACL information in it as the cloned copy does. That copy
-             * will normally arrive first via sync delivery, but this isn't guaranteed.
-             * There's a chance the current delivery could take place before the cloned copy arrives
-             * hence the item could have the wrong ACL and *could* be used in subsequent deliveries or
-             * access checks.
-             */
-
-            if ($sender === $channel['channel_hash'] && $arr['author_xchan'] === $channel['channel_hash'] && $arr['mid'] === $arr['parent_mid']) {
-                $DR->update('self delivery ignored');
-                $result[] = $DR->get();
-                continue;
-            }
-
-            // allow public postings to the sys channel regardless of permissions, but not
-            // for comments travelling upstream. Wait and catch them on the way down.
-            // They may have been blocked by the owner.
-
-            if (intval($channel['channel_system']) && (!$arr['item_private']) && (!$relay)) {
-                $local_public = true;
-
-                if (!check_pubstream_channelallowed($sender)) {
-                    $local_public = false;
-                    continue;
-                }
-
-                // don't allow pubstream posts if the sender even has a clone on a pubstream denied site
-
-                $siteallowed = true;
-                $h = q(
-                    "select hubloc_url from hubloc where hubloc_hash = '%s'",
-                    dbesc($sender)
-                );
-                if ($h) {
-                    foreach ($h as $hub) {
-                        if (!check_pubstream_siteallowed($hub['hubloc_url'])) {
-                            $siteallowed = false;
-                            break;
-                        }
-                    }
-                }
-                if (!$siteallowed) {
-                    $local_public = false;
-                    continue;
-                }
-
-                $r = q(
-                    "select xchan_selfcensored from xchan where xchan_hash = '%s' limit 1",
-                    dbesc($sender)
-                );
-                // don't import sys channel posts from selfcensored authors
-                if ($r && (intval($r[0]['xchan_selfcensored']))) {
-                    $local_public = false;
-                    continue;
-                }
-                if (!MessageFilter::evaluate($arr, get_config('system', 'pubstream_incl'), get_config('system', 'pubstream_excl'))) {
-                    $local_public = false;
-                    continue;
-                }
-            }
-
-            // perform pre-storage check to see if it's "likely" that this is a group or collection post
-
-            $tag_delivery = tgroup_check($channel['channel_id'], $arr);
-
-            $perm = 'send_stream';
-            if (($arr['mid'] !== $arr['parent_mid']) && ($relay)) {
-                $perm = 'post_comments';
-            }
-
-            // This is our own post, possibly coming from a channel clone
-
-            if ($arr['owner_xchan'] == $d) {
-                $arr['item_wall'] = 1;
-            } else {
-                $arr['item_wall'] = 0;
-            }
-
-            $friendofriend = false;
-
-            if ((!$tag_delivery) && (!$local_public)) {
-                $allowed = (perm_is_allowed($channel['channel_id'], $sender, $perm));
-
-                $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER);
-                if ($blocked) {
-                    $h = q(
-                        "select hubloc_url from hubloc where hubloc_hash = '%s'",
-                        dbesc($sender)
-                    );
-                    if ($h) {
-                        foreach ($h as $hub) {
-                            foreach ($blocked as $b) {
-                                if (strpos($hub['hubloc_url'], $b['block_entity']) !== false) {
-                                    $allowed = false;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                $permit_mentions = intval(PConfig::Get($channel['channel_id'], 'system', 'permit_all_mentions') && i_am_mentioned($channel, $arr));
-
-                if (!$allowed) {
-                    if ($perm === 'post_comments') {
-                        $parent = q(
-                            "select * from item where mid = '%s' and uid = %d limit 1",
-                            dbesc($arr['parent_mid']),
-                            intval($channel['channel_id'])
-                        );
-                        if ($parent) {
-                            $allowed = can_comment_on_post($sender, $parent[0]);
-                        }
-                        if ((!$allowed) && $permit_mentions) {
-                            if ($parent && $parent[0]['owner_xchan'] === $channel['channel_hash']) {
-                                $allowed = false;
-                            } else {
-                                $allowed = true;
-                            }
-                        }
-                        if ($parent && absolutely_no_comments($parent[0])) {
-                            $allowed = false;
-                        }
-                    } elseif ($permit_mentions) {
-                        $allowed = true;
-                    }
-                }
-                if ($request) {
-                    // Conversation fetches (e.g. $request == true) take place for
-                    //   a) new comments on expired posts
-                    //   b) hyperdrive (friend-of-friend) conversations
-
-
-                    // over-ride normal connection permissions for hyperdrive (friend-of-friend) conversations
-                    // (if hyperdrive is enabled).
-                    // If $allowed is already true, this is probably the conversation of a direct friend or a
-                    // conversation fetch for a new comment on an expired post
-                    // Comments of all these activities are allowed and will only be rejected (later) if the parent
-                    // doesn't exist.
-
-                    if ($perm === 'send_stream') {
-                        if (get_pconfig($channel['channel_id'], 'system', 'hyperdrive', true)) {
-                            $allowed = true;
-                        }
-                    } else {
-                        $allowed = true;
-                    }
-
-                    $friendofriend = true;
-                }
-
-                if (intval($arr['item_private']) === 2) {
-                    if (!perm_is_allowed($channel['channel_id'], $sender, 'post_mail')) {
-                        $allowed = false;
-                    }
-                }
-
-                if (get_abconfig($channel['channel_id'], $sender, 'system', 'block_announce', false)) {
-                    if ($arr['verb'] === 'Announce' || strpos($arr['body'], '[/share]')) {
-                        $allowed = false;
-                    }
-                }
-
-                if (!$allowed) {
-                    logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
-                    $DR->update('permission denied');
-                    $result[] = $DR->get();
-                    continue;
-                }
-            }
-
-            if ($arr['mid'] !== $arr['parent_mid']) {
-                if (perm_is_allowed($channel['channel_id'], $sender, 'moderated') && $relay) {
-                    $arr['item_blocked'] = ITEM_MODERATED;
-                }
-
-                // check source route.
-                // We are only going to accept comments from this sender if the comment has the same route as the top-level-post,
-                // this is so that permissions mismatches between senders apply to the entire conversation
-                // As a side effect we will also do a preliminary check that we have the top-level-post, otherwise
-                // processing it is pointless.
-
-                // The original author won't have a token in their copy of the message
-
-                $prnt = ((strpos($arr['parent_mid'], 'token=') !== false) ? substr($arr['parent_mid'], 0, strpos($arr['parent_mid'], '?')) : '');
-
-                $r = q(
-                    "select route, id, parent_mid, mid, owner_xchan, item_private, obj_type from item where mid = '%s' and uid = %d limit 1",
-                    dbesc($arr['parent_mid']),
-                    intval($channel['channel_id'])
-                );
-                if (!$r) {
-                    $r = q(
-                        "select route, id, parent_mid, mid, owner_xchan, item_private, obj_type from item where mid = '%s' and uid = %d limit 1",
-                        dbesc($prnt),
-                        intval($channel['channel_id'])
-                    );
-                }
-
-                if ($r) {
-                    // if this is a multi-threaded conversation, preserve the threading information
-                    if ($r[0]['parent_mid'] !== $r[0]['mid']) {
-                        $arr['thr_parent'] = $arr['parent_mid'];
-                        $arr['parent_mid'] = $r[0]['parent_mid'];
-                        if ($act->replyto) {
-                            q(
-                                "update item set replyto = '%s' where id = %d",
-                                dbesc($act->replyto),
-                                intval($r[0]['id'])
-                            );
-                        }
-                    }
-
-                    if ($r[0]['obj_type'] === 'Question') {
-                        // route checking doesn't work correctly here because we've changed the privacy
-                        $r[0]['route'] = EMPTY_STR;
-                        // If this is a poll response, convert the obj_type to our (internal-only) "Answer" type
-                        if ($arr['obj_type'] === 'Note' && $arr['title'] && (!$arr['content'])) {
-                            $arr['obj_type'] = 'Answer';
-                        }
-                    }
-                } else {
-                    // We don't seem to have a copy of this conversation or at least the parent
-                    // - so request a copy of the entire conversation to date.
-                    // Don't do this if it's a relay post as we're the ones who are supposed to
-                    // have the copy and we don't want the request to loop.
-                    // Also don't do this if this comment came from a conversation request packet.
-                    // It's possible that comments are allowed but posting isn't and that could
-                    // cause a conversation fetch loop.
-                    // We'll also check the send_stream permission - because if it isn't allowed,
-                    // the top level post is unlikely to be imported and
-                    // this is just an exercise in futility.
-
-                    if (
-                        (!$relay) && (!$request) && (!$local_public)
-                        && perm_is_allowed($channel['channel_id'], $sender, 'send_stream')
-                    ) {
-                        $reports = self::fetch_conversation($channel, $arr['mid']);
-
-                        // extract our delivery report from the fetched conversation
-                        // if we can find it.
-                        logger('fetch_report for ' . $arr['mid'], LOGGER_ALL);
-                        logger('fetch_report: ' . print_r($reports, true), LOGGER_ALL);
-
-                        if ($reports && is_array($reports)) {
-                            $found_report = false;
-                            foreach ($reports as $report) {
-                                if ($report['message_id'] === $arr['mid']) {
-                                    $found_report = true;
-                                    $DR->update($report['status']);
-                                }
-                            }
-                            if (!$found_report) {
-                                $DR->update('conversation fetch failed');
-                            }
-                        } else {
-                            $DR->update('conversation fetch failed');
-                        }
-                    } else {
-                        $DR->update('comment parent not found');
-                    }
-                    $result[] = $DR->get();
-                    continue;
-                }
-
-
-                if ($relay || $friendofriend || (intval($r[0]['item_private']) === 0 && intval($arr['item_private']) === 0)) {
-                    // reset the route in case it travelled a great distance upstream
-                    // use our parent's route so when we go back downstream we'll match
-                    // with whatever route our parent has.
-                    // Also friend-of-friend conversations may have been imported without a route,
-                    // but we are now getting comments via listener delivery
-                    // and if there is no privacy on this or the parent, we don't care about the route,
-                    // so just set the owner and route accordingly.
-                    $arr['route'] = $r[0]['route'];
-                    $arr['owner_xchan'] = $r[0]['owner_xchan'];
-                } else {
-                    // going downstream check that we have the same upstream provider that
-                    // sent it to us originally. Ignore it if it came from another source
-                    // (with potentially different permissions).
-                    // only compare the last hop since it could have arrived at the last location any number of ways.
-                    // Always accept empty routes and firehose items (route contains 'undefined') .
-
-                    $existing_route = explode(',', $r[0]['route']);
-                    $routes = count($existing_route);
-                    if ($routes) {
-                        $last_hop = array_pop($existing_route);
-                        $last_prior_route = implode(',', $existing_route);
-                    } else {
-                        $last_hop = '';
-                        $last_prior_route = '';
-                    }
-
-                    if (in_array('undefined', $existing_route) || $last_hop == 'undefined' || $sender == 'undefined') {
-                        $last_hop = '';
-                    }
-
-                    $current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender;
-
-                    if ($last_hop && $last_hop != $sender) {
-                        logger('comment route mismatch: parent route = ' . $r[0]['route'] . ' expected = ' . $current_route, LOGGER_DEBUG);
-                        logger('comment route mismatch: parent msg = ' . $r[0]['id'], LOGGER_DEBUG);
-                        $DR->update('comment route mismatch');
-                        $result[] = $DR->get();
-                        continue;
-                    }
-
-                    // we'll add sender onto this when we deliver it. $last_prior_route now has the previously stored route
-                    // *except* for the sender which would've been the last hop before it got to us.
-
-                    $arr['route'] = $last_prior_route;
-                }
-            }
-
-            // This is used to fetch allow/deny rules if either the sender
-            // or  owner is  a connection. post_is_importable() evaluates all of them
-            $abook = q(
-                "select * from abook where abook_channel = %d and ( abook_xchan = '%s' OR abook_xchan = '%s' )",
-                intval($channel['channel_id']),
-                dbesc($arr['owner_xchan']),
-                dbesc($arr['author_xchan'])
-            );
-
-            if (isset($arr['item_deleted']) && intval($arr['item_deleted'])) {
-                // set these just in case we need to store a fresh copy of the deleted post.
-                // This could happen if the delete got here before the original post did.
-
-                $arr['aid'] = $channel['channel_account_id'];
-                $arr['uid'] = $channel['channel_id'];
-
-                $item_id = self::delete_imported_item($sender, $act, $arr, $channel['channel_id'], $relay);
-                $DR->update(($item_id) ? 'deleted' : 'delete_failed');
-                $result[] = $DR->get();
-
-                if ($relay && $item_id) {
-                    logger('process_delivery: invoking relay');
-                    Run::Summon(['Notifier', 'relay', intval($item_id)]);
-                    $DR->update('relayed');
-                    $result[] = $DR->get();
-                }
-                continue;
-            }
-
-            // reactions such as like and dislike could have an mid with /activity/ in it.
-            // Check for both forms in order to prevent duplicates.
-
-            $r = q(
-                "select * from item where mid in ('%s','%s') and uid = %d limit 1",
-                dbesc($arr['mid']),
-                dbesc(str_replace(z_root() . '/activity/', z_root() . '/item/', $arr['mid'])),
-                intval($channel['channel_id'])
-            );
-
-            if ($r) {
-                // We already have this post.
-                $item_id = $r[0]['id'];
-
-                if (intval($r[0]['item_deleted'])) {
-                    // It was deleted locally.
-                    $DR->update('update ignored');
-                    $result[] = $DR->get();
-
-                    continue;
-                } // Maybe it has been edited?
-                elseif ($arr['edited'] > $r[0]['edited']) {
-                    $arr['id'] = $r[0]['id'];
-                    $arr['uid'] = $channel['channel_id'];
-                    if (post_is_importable($channel['channel_id'], $arr, $abook)) {
-                        $item_result = self::update_imported_item($sender, $arr, $r[0], $channel['channel_id'], $tag_delivery);
-                        $DR->update('updated');
-                        $result[] = $DR->get();
-                        if (!$relay) {
-                            add_source_route($item_id, $sender);
-                        }
-                    } else {
-                        $DR->update('update ignored');
-                        $result[] = $DR->get();
-                    }
-                } else {
-                    $DR->update('update ignored');
-                    $result[] = $DR->get();
-
-                    // We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit),
-                    // and at the same time not relay any other relayable posts more than once, because to do so is very wasteful.
-                    if (!intval($r[0]['item_origin'])) {
-                        continue;
-                    }
-                }
-            } else {
-                $arr['aid'] = $channel['channel_account_id'];
-                $arr['uid'] = $channel['channel_id'];
-
-                // if it's a sourced post, call the post_local hooks as if it were
-                // posted locally so that crosspost connectors will be triggered.
-
-                if (check_item_source($arr['uid'], $arr)) {
-                    /**
-                     * @hooks post_local
-                     *   Called when an item has been posted on this machine via mod/item.php (also via API).
-                     *   * \e array with an item
-                     */
-                    Hook::call('post_local', $arr);
-                }
-
-                $item_id = 0;
-
-                Activity::rewrite_mentions($arr);
-
-
-                $maxlen = get_max_import_size();
-
-                if ($maxlen && mb_strlen($arr['body']) > $maxlen) {
-                    $arr['body'] = mb_substr($arr['body'], 0, $maxlen, 'UTF-8');
-                    logger('message length exceeds max_import_size: truncated');
-                }
-
-                if ($maxlen && mb_strlen($arr['summary']) > $maxlen) {
-                    $arr['summary'] = mb_substr($arr['summary'], 0, $maxlen, 'UTF-8');
-                    logger('message summary length exceeds max_import_size: truncated');
-                }
-
-                if (post_is_importable($arr['uid'], $arr, $abook)) {
-                    // Strip old-style hubzilla bookmarks
-                    if (strpos($arr['body'], "#^[") !== false) {
-                        $arr['body'] = str_replace("#^[", "[", $arr['body']);
-                    }
-
-                    $item_result = item_store($arr);
-                    if ($item_result['success']) {
-                        $item_id = $item_result['item_id'];
-                        $parr = [
-                            'item_id' => $item_id,
-                            'item' => $arr,
-                            'sender' => $sender,
-                            'channel' => $channel
-                        ];
-                        /**
-                         * @hooks activity_received
-                         *   Called when an activity (post, comment, like, etc.) has been received from a zot source.
-                         *   * \e int \b item_id
-                         *   * \e array \b item
-                         *   * \e array \b sender
-                         *   * \e array \b channel
-                         */
-                        Hook::call('activity_received', $parr);
-                        // don't add a source route if it's a relay or later recipients will get a route mismatch
-                        if (!$relay) {
-                            add_source_route($item_id, $sender);
-                        }
-                    }
-                    $DR->update(($item_id) ? 'posted' : 'storage failed: ' . $item_result['message']);
-                    $result[] = $DR->get();
-                } else {
-                    $DR->update('post ignored');
-                    $result[] = $DR->get();
-                }
-            }
-
-            // preserve conversations with which you are involved from expiration
-
-            $stored = (($item_result && $item_result['item']) ? $item_result['item'] : false);
-            if (
-                (is_array($stored)) && ($stored['id'] != $stored['parent'])
-                && ($stored['author_xchan'] === $channel['channel_hash'])
-            ) {
-                retain_item($stored['item']['parent']);
-            }
-
-            if ($relay && $item_id) {
-                logger('Invoking relay');
-                Run::Summon(['Notifier', 'relay', intval($item_id)]);
-                $DR->addto_update('relayed');
-                $result[] = $DR->get();
-            }
-        }
-
-        if (!$deliveries) {
-            $result[] = array('', 'no recipients', '', $arr['mid']);
-        }
-
-        logger('Local results: ' . print_r($result, true), LOGGER_DEBUG);
-
-        return $result;
-    }
-
-    public static function hyperdrive_enabled($channel, $item)
-    {
-
-        if (get_pconfig($channel['channel_id'], 'system', 'hyperdrive', true)) {
-            return true;
-        }
-        return false;
-    }
-
-    public static function fetch_conversation($channel, $mid)
-    {
-
-        // Use Zotfinger to create a signed request
-
-        logger('fetching conversation: ' . $mid, LOGGER_DEBUG);
-
-        $a = Zotfinger::exec($mid, $channel);
-
-        logger('received conversation: ' . print_r($a, true), LOGGER_DATA);
-
-        if (!$a) {
-            return false;
-        }
-
-        if ($a['data']['type'] !== 'OrderedCollection') {
-            return false;
-        }
-
-        $obj = new ASCollection($a['data'], $channel);
-        $items = $obj->get();
-
-        if (!$items) {
-            return false;
-        }
-
-        $ret = [];
-
-
-        $signer = q(
-            "select hubloc_hash, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad') limit 1",
-            dbesc($a['signature']['signer'])
-        );
-
-
-        foreach ($items as $activity) {
-            $AS = new ActivityStreams($activity);
-            if (
-                $AS->is_valid() && $AS->type === 'Announce' && is_array($AS->obj)
-                && array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj)
-            ) {
-                // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
-                // Reparse the encapsulated Activity and use that instead
-                logger('relayed activity', LOGGER_DEBUG);
-                $AS = new ActivityStreams($AS->obj);
-            }
-
-            if (!$AS->is_valid()) {
-                logger('FOF Activity rejected: ' . print_r($activity, true));
-                continue;
-            }
-            $arr = Activity::decode_note($AS);
-
-            // logger($AS->debug());
-
-            $r = q(
-                "select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1",
-                dbesc($AS->actor['id']),
-                dbesc($AS->actor['id'])
-            );
-
-            if (!$r) {
-                $y = import_author_xchan(['url' => $AS->actor['id']]);
-                if ($y) {
-                    $r = q(
-                        "select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_hash = '%s' limit 1",
-                        dbesc($AS->actor['id']),
-                        dbesc($AS->actor['id'])
-                    );
-                }
-                if (!$r) {
-                    logger('FOF Activity: no actor');
-                    continue;
-                }
-            }
-
-            if ($AS->obj['actor'] && $AS->obj['actor']['id'] && $AS->obj['actor']['id'] !== $AS->actor['id']) {
-                $y = import_author_xchan(['url' => $AS->obj['actor']['id']]);
-                if (!$y) {
-                    logger('FOF Activity: no object actor');
-                    continue;
-                }
-            }
-
-
-            if ($r) {
-                $arr['author_xchan'] = $r[0]['hubloc_hash'];
-            }
-
-            if ($signer) {
-                $arr['owner_xchan'] = $signer[0]['hubloc_hash'];
-            } else {
-                $arr['owner_xchan'] = $a['signature']['signer'];
-            }
-
-            if ($AS->meta['hubloc'] || $arr['author_xchan'] === $arr['owner_xchan']) {
-                $arr['item_verified'] = true;
-            }
-
-            if ($AS->meta['signed_data']) {
-                IConfig::Set($arr, 'activitystreams', 'signed_data', $AS->meta['signed_data'], false);
-            }
-
-            logger('FOF Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
-            logger('FOF Activity recipient: ' . $channel['channel_hash'], LOGGER_DATA, LOG_DEBUG);
-
-            $result = self::process_delivery($arr['owner_xchan'], $AS, $arr, [$channel['channel_hash']], false, false, true);
-            if ($result) {
-                $ret = array_merge($ret, $result);
-            }
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     * @brief Remove community tag.
-     *
-     * @param array $sender an associative array with
-     *   * \e string \b hash a xchan_hash
-     * @param array $arr an associative array
-     *   * \e int \b verb
-     *   * \e int \b obj_type
-     *   * \e int \b mid
-     * @param int $uid
-     */
-
-    public static function remove_community_tag($sender, $arr, $uid)
-    {
-
-        if (!(activity_match($arr['verb'], ACTIVITY_TAG) && ($arr['obj_type'] == ACTIVITY_OBJ_TAGTERM))) {
-            return;
-        }
-
-        logger('remove_community_tag: invoked');
-
-        if (!get_pconfig($uid, 'system', 'blocktags')) {
-            logger('Permission denied.');
-            return;
-        }
-
-        $r = q(
-            "select * from item where mid = '%s' and uid = %d limit 1",
-            dbesc($arr['mid']),
-            intval($uid)
-        );
-        if (!$r) {
-            logger('No item');
-            return;
-        }
-
-        if (($sender != $r[0]['owner_xchan']) && ($sender != $r[0]['author_xchan'])) {
-            logger('Sender not authorised.');
-            return;
-        }
-
-        $i = $r[0];
-
-        if ($i['target']) {
-            $i['target'] = json_decode($i['target'], true);
-        }
-        if ($i['object']) {
-            $i['object'] = json_decode($i['object'], true);
-        }
-        if (!($i['target'] && $i['object'])) {
-            logger('No target/object');
-            return;
-        }
-
-        $message_id = $i['target']['id'];
-
-        $r = q(
-            "select id from item where mid = '%s' and uid = %d limit 1",
-            dbesc($message_id),
-            intval($uid)
-        );
-        if (!$r) {
-            logger('No parent message');
-            return;
-        }
-
-        q(
-            "delete from term where uid = %d and oid = %d and otype = %d and ttype in  ( %d, %d ) and term = '%s' and url = '%s'",
-            intval($uid),
-            intval($r[0]['id']),
-            intval(TERM_OBJ_POST),
-            intval(TERM_HASHTAG),
-            intval(TERM_COMMUNITYTAG),
-            dbesc($i['object']['title']),
-            dbesc(get_rel_link($i['object']['link'], 'alternate'))
-        );
-    }
-
-    /**
-     * @brief Updates an imported item.
-     *
-     * @param array $sender
-     * @param array $item
-     * @param array $orig
-     * @param int $uid
-     * @param bool $tag_delivery
-     * @see item_store_update()
-     *
-     */
-
-    public static function update_imported_item($sender, $item, $orig, $uid, $tag_delivery)
-    {
-
-        // If this is a comment being updated, remove any privacy information
-        // so that item_store_update will set it from the original.
-
-        if ($item['mid'] !== $item['parent_mid']) {
-            unset($item['allow_cid']);
-            unset($item['allow_gid']);
-            unset($item['deny_cid']);
-            unset($item['deny_gid']);
-            unset($item['item_private']);
-        }
-
-        // we need the tag_delivery check for downstream flowing posts as the stored post
-        // may have a different owner than the one being transmitted.
-
-        if (($sender != $orig['owner_xchan'] && $sender != $orig['author_xchan']) && (!$tag_delivery)) {
-            logger('sender is not owner or author');
-            return;
-        }
-
-
-        $x = item_store_update($item);
-
-        // If we're updating an event that we've saved locally, we store the item info first
-        // because event_addtocal will parse the body to get the 'new' event details
-
-        if ($orig['resource_type'] === 'event') {
-            $res = event_addtocal($orig['id'], $uid);
-            if (!$res) {
-                logger('update event: failed');
-            }
-        }
-
-        if (!$x['item_id']) {
-            logger('update_imported_item: failed: ' . $x['message']);
-        } else {
-            logger('update_imported_item');
-        }
-
-        return $x;
-    }
-
-    /**
-     * @brief Deletes an imported item.
-     *
-     * @param array $sender
-     *   * \e string \b hash a xchan_hash
-     * @param array $item
-     * @param int $uid
-     * @param bool $relay
-     * @return bool|int post_id
-     */
-
-    public static function delete_imported_item($sender, $act, $item, $uid, $relay)
-    {
-
-        logger('invoked', LOGGER_DEBUG);
-
-        $ownership_valid = false;
-        $item_found = false;
-        $post_id = 0;
-
-        if ($item['verb'] === 'Tombstone') {
-            // The id of the deleted thing is the item mid (activity id)
-            $mid = $item['mid'];
-        } else {
-            // The id is the object id if the type is Undo or Delete
-            $mid = ((is_array($act->obj)) ? $act->obj['id'] : $act->obj);
-        }
-
-        // we may have stored either the object id or the activity id if it was a response activity (like, dislike, etc.)
-
-        $r = q(
-            "select * from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
-			and mid in ('%s','%s')  and uid = %d limit 1",
-            dbesc($sender),
-            dbesc($sender),
-            dbesc($sender),
-            dbesc($mid),
-            dbesc(str_replace('/activity/', '/item/', $mid)),
-            intval($uid)
-        );
-
-        if ($r) {
-            $stored = $r[0];
-            // we proved ownership in the sql query
-            $ownership_valid = true;
-
-            $post_id = $stored['id'];
-            $item_found = true;
-        } else {
-            // this will fail with an ownership issue, so explain the real reason
-            logger('delete received for non-existent item or not owned by sender - ignoring.');
-        }
-
-        if ($ownership_valid === false) {
-            logger('delete_imported_item: failed: ownership issue');
-            return false;
-        }
-
-        if ($stored['resource_type'] === 'event') {
-            $i = q(
-                "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                dbesc($stored['resource_id']),
-                intval($uid)
-            );
-            if ($i) {
-                if ($i[0]['event_xchan'] === $sender) {
-                    q(
-                        "delete from event where event_hash = '%s' and uid = %d",
-                        dbesc($stored['resource_id']),
-                        intval($uid)
-                    );
-                } else {
-                    logger('delete linked event: not owner');
-                    return;
-                }
-            }
-        }
-        if ($item_found) {
-            if (intval($stored['item_deleted'])) {
-                logger('delete_imported_item: item was already deleted');
-                if (!$relay) {
-                    return false;
-                }
-
-                // This is a bit hackish, but may have to suffice until the notification/delivery loop is optimised
-                // a bit further. We're going to strip the ITEM_ORIGIN on this item if it's a comment, because
-                // it was already deleted, and we're already relaying, and this ensures that no other process or
-                // code path downstream can relay it again (causing a loop). Since it's already gone it's not coming
-                // back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing
-                // this information from the metadata should have no other discernible impact.
-
-                if (($stored['id'] != $stored['parent']) && intval($stored['item_origin'])) {
-                    q(
-                        "update item set item_origin = 0 where id = %d and uid = %d",
-                        intval($stored['id']),
-                        intval($stored['uid'])
-                    );
-                }
-            } else {
-                if ($stored['id'] !== $stored['parent']) {
-                    q(
-                        "update item set commented = '%s', changed = '%s' where id = %d",
-                        dbesc(datetime_convert()),
-                        dbesc(datetime_convert()),
-                        intval($stored['parent'])
-                    );
-                }
-            }
-
-            // Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels
-            // and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2).
-
-            drop_item($post_id, false, DROPITEM_PHASE1);
-            tag_deliver($uid, $post_id);
-        }
-
-        return $post_id;
-    }
-
-
-    /**
-     * @brief Processes delivery of profile.
-     *
-     * @param array $sender an associative array
-     *   * \e string \b hash a xchan_hash
-     * @param array $arr
-     * @param array $deliveries (unused)
-     * @see import_directory_profile()
-     */
-
-    public static function process_profile_delivery($sender, $arr, $deliveries)
-    {
-
-        logger('process_profile_delivery', LOGGER_DEBUG);
-
-        $r = q(
-            "select xchan_addr from xchan where xchan_hash = '%s' limit 1",
-            dbesc($sender['hash'])
-        );
-        if ($r) {
-            Libzotdir::import_directory_profile($sender, $arr, $r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0);
-        }
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param array $sender an associative array
-     *   * \e string \b hash a xchan_hash
-     * @param array $arr
-     * @param array $deliveries (unused) deliveries is irrelevant
-     */
-    public static function process_location_delivery($sender, $arr, $deliveries)
-    {
-
-        // deliveries is irrelevant
-        logger('process_location_delivery', LOGGER_DEBUG);
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($sender)
-        );
-        if ($r) {
-            $xchan = ['id' => $r[0]['xchan_guid'], 'id_sig' => $r[0]['xchan_guid_sig'],
-                'hash' => $r[0]['xchan_hash'], 'public_key' => $r[0]['xchan_pubkey']];
-        }
-        if (array_key_exists('locations', $arr) && $arr['locations']) {
-            $x = Libsync::sync_locations($xchan, $arr, true);
-            logger('results: ' . print_r($x, true), LOGGER_DEBUG);
-            if ($x['changed']) {
-                $guid = random_string() . '@' . App::get_hostname();
-                Libzotdir::update_modtime($sender, $r[0]['xchan_guid'], $arr['locations'][0]['address'], UPDATE_FLAGS_UPDATED);
-            }
-        }
-    }
-
-    /**
-     * @brief Checks for a moved channel and sets the channel_moved flag.
-     *
-     * Currently the effect of this flag is to turn the channel into 'read-only' mode.
-     * New content will not be processed (there was still an issue with blocking the
-     * ability to post comments as of 10-Mar-2016).
-     * We do not physically remove the channel at this time. The hub admin may choose
-     * to do so, but is encouraged to allow a grace period of several days in case there
-     * are any issues migrating content. This packet will generally be received by the
-     * original site when the basic channel import has been processed.
-     *
-     * This will only be executed on the old location
-     * if a new location is reported and there is only one location record.
-     * The rest of the hubloc syncronisation will be handled within
-     * sync_locations
-     *
-     * @param string $sender_hash A channel hash
-     * @param array $locations
-     */
-
-    public static function check_location_move($sender_hash, $locations)
-    {
-
-        if (!$locations) {
-            return;
-        }
-
-        if (count($locations) != 1) {
-            return;
-        }
-
-        $loc = $locations[0];
-
-        $r = q(
-            "select * from channel where channel_hash = '%s' limit 1",
-            dbesc($sender_hash)
-        );
-
-        if (!$r) {
-            return;
-        }
-
-        if ($loc['url'] !== z_root()) {
-            $x = q(
-                "update channel set channel_moved = '%s' where channel_hash = '%s' limit 1",
-                dbesc($loc['url']),
-                dbesc($sender_hash)
-            );
-
-            // federation plugins may wish to notify connections
-            // of the move on singleton networks
-
-            $arr = [
-                'channel' => $r[0],
-                'locations' => $locations
-            ];
-            /**
-             * @hooks location_move
-             *   Called when a new location has been provided to a UNO channel (indicating a move rather than a clone).
-             *   * \e array \b channel
-             *   * \e array \b locations
-             */
-            Hook::call('location_move', $arr);
-        }
-    }
-
-
-    /**
-     * @brief Returns an array with all known distinct hubs for this channel.
-     *
-     * @param array $channel an associative array which must contain
-     *  * \e string \b channel_hash the hash of the channel
-     * @return array an array with associative arrays
-     * @see self::get_hublocs()
-     */
-
-    public static function encode_locations($channel)
-    {
-        $ret = [];
-
-        $x = self::get_hublocs($channel['channel_hash']);
-
-        if ($x && count($x)) {
-            foreach ($x as $hub) {
-                // if this is a local channel that has been deleted, the hubloc is no good
-                // - make sure it is marked deleted so that nobody tries to use it.
-
-                if (intval($channel['channel_removed']) && $hub['hubloc_url'] === z_root()) {
-                    $hub['hubloc_deleted'] = 1;
-                }
-
-                $ret[] = [
-                    'host' => $hub['hubloc_host'],
-                    'address' => $hub['hubloc_addr'],
-                    'id_url' => $hub['hubloc_id_url'],
-                    'primary' => (intval($hub['hubloc_primary']) ? true : false),
-                    'url' => $hub['hubloc_url'],
-                    'url_sig' => $hub['hubloc_url_sig'],
-                    'site_id' => $hub['hubloc_site_id'],
-                    'callback' => $hub['hubloc_callback'],
-                    'sitekey' => $hub['hubloc_sitekey'],
-                    'deleted' => (intval($hub['hubloc_deleted']) ? true : false)
-                ];
-            }
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param array $arr
-     * @param string $pubkey
-     * @return bool true if updated or inserted
-     */
-
-    public static function import_site($arr)
-    {
-
-        if ((!is_array($arr)) || (!$arr['url']) || (!$arr['site_sig'])) {
-            return false;
-        }
-
-        if (!self::verify($arr['url'], $arr['site_sig'], $arr['sitekey'])) {
-            logger('Bad url_sig');
-            return false;
-        }
-
-        $update = false;
-        $exists = false;
-
-        $r = q(
-            "select * from site where site_url = '%s' limit 1",
-            dbesc($arr['url'])
-        );
-        if ($r) {
-            $exists = true;
-            $siterecord = $r[0];
-        }
-
-        $site_directory = 0;
-        if ($arr['directory_mode'] == 'normal') {
-            $site_directory = DIRECTORY_MODE_NORMAL;
-        }
-        if ($arr['directory_mode'] == 'primary') {
-            $site_directory = DIRECTORY_MODE_PRIMARY;
-        }
-        if ($arr['directory_mode'] == 'secondary') {
-            $site_directory = DIRECTORY_MODE_SECONDARY;
-        }
-        if ($arr['directory_mode'] == 'standalone') {
-            $site_directory = DIRECTORY_MODE_STANDALONE;
-        }
-
-        $register_policy = 0;
-        if ($arr['register_policy'] == 'closed') {
-            $register_policy = REGISTER_CLOSED;
-        }
-        if ($arr['register_policy'] == 'open') {
-            $register_policy = REGISTER_OPEN;
-        }
-        if ($arr['register_policy'] == 'approve') {
-            $register_policy = REGISTER_APPROVE;
-        }
-
-        $access_policy = 0;
-        if (array_key_exists('access_policy', $arr)) {
-            if ($arr['access_policy'] === 'private') {
-                $access_policy = ACCESS_PRIVATE;
-            }
-            if ($arr['access_policy'] === 'paid') {
-                $access_policy = ACCESS_PAID;
-            }
-            if ($arr['access_policy'] === 'free') {
-                $access_policy = ACCESS_FREE;
-            }
-            if ($arr['access_policy'] === 'tiered') {
-                $access_policy = ACCESS_TIERED;
-            }
-        }
-
-        // don't let insecure sites register as public hubs
-
-        if (strpos($arr['url'], 'https://') === false) {
-            $access_policy = ACCESS_PRIVATE;
-        }
-
-        if ($access_policy != ACCESS_PRIVATE) {
-            $x = z_fetch_url($arr['url'] . '/siteinfo.json');
-            if (!$x['success']) {
-                $access_policy = ACCESS_PRIVATE;
-            }
-        }
-
-        $site_about = EMPTY_STR;
-        $site_logo = EMPTY_STR;
-        $sitename = EMPTY_STR;
-
-        $directory_url = htmlspecialchars(isset($arr['directory_url']) ? $arr['directory_url'] : EMPTY_STR, ENT_COMPAT, 'UTF-8', false);
-        $url = htmlspecialchars(strtolower($arr['url']), ENT_COMPAT, 'UTF-8', false);
-        $sellpage = htmlspecialchars($arr['sellpage'], ENT_COMPAT, 'UTF-8', false);
-        $site_location = htmlspecialchars($arr['location'], ENT_COMPAT, 'UTF-8', false);
-        $site_realm = htmlspecialchars($arr['realm'], ENT_COMPAT, 'UTF-8', false);
-        $sitename = htmlspecialchars($arr['sitename'], ENT_COMPAT, 'UTF-8', false);
-        $site_project = htmlspecialchars($arr['project'], ENT_COMPAT, 'UTF-8', false);
-        $site_crypto = ((array_key_exists('encryption', $arr) && is_array($arr['encryption'])) ? htmlspecialchars(implode(',', $arr['encryption']), ENT_COMPAT, 'UTF-8', false) : '');
-        $site_version = ((array_key_exists('version', $arr)) ? htmlspecialchars($arr['version'], ENT_COMPAT, 'UTF-8', false) : '');
-        if (array_key_exists('about', $arr) && $arr['about']) {
-            $site_about = html2bbcode(purify_html($arr['about']));
-        }
-        if (array_key_exists('logo', $arr) && $arr['logo']) {
-            $site_logo = $arr['logo'];
-        } elseif (file_exists('images/' . strtolower($site_project) . '.png')) {
-            $site_logo = z_root() . '/images/' . strtolower($site_project) . '.png';
-        } else {
-            $site_logo = z_root() . '/images/default_profile_photos/red_koala_trans/300.png';
-        }
-
-        set_sconfig($url, 'system', 'about', $site_about);
-        set_sconfig($url, 'system', 'logo', $site_logo);
-        set_sconfig($url, 'system', 'sitename', $sitename);
-
-        $site_flags = $site_directory;
-
-        if (array_key_exists('zot', $arr)) {
-            set_sconfig($arr['url'], 'system', 'zot_version', $arr['zot']);
-        }
-
-        if ($exists) {
-            if (
-                ($siterecord['site_flags'] != $site_flags)
-                || ($siterecord['site_access'] != $access_policy)
-                || ($siterecord['site_directory'] != $directory_url)
-                || ($siterecord['site_sellpage'] != $sellpage)
-                || ($siterecord['site_location'] != $site_location)
-                || ($siterecord['site_register'] != $register_policy)
-                || ($siterecord['site_project'] != $site_project)
-                || ($siterecord['site_realm'] != $site_realm)
-                || ($siterecord['site_crypto'] != $site_crypto)
-                || ($siterecord['site_version'] != $site_version)
-            ) {
-                $update = true;
-
-                //          logger('import_site: input: ' . print_r($arr,true));
-                //          logger('import_site: stored: ' . print_r($siterecord,true));
-
-                $r = q(
-                    "update site set site_dead = 0, site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_type = %d, site_project = '%s', site_version = '%s', site_crypto = '%s'
-					where site_url = '%s'",
-                    dbesc($site_location),
-                    intval($site_flags),
-                    intval($access_policy),
-                    dbesc($directory_url),
-                    intval($register_policy),
-                    dbesc(datetime_convert()),
-                    dbesc($sellpage),
-                    dbesc($site_realm),
-                    intval(SITE_TYPE_ZOT),
-                    dbesc($site_project),
-                    dbesc($site_version),
-                    dbesc($site_crypto),
-                    dbesc($url)
-                );
-                if (!$r) {
-                    logger('Update failed. ' . print_r($arr, true));
-                }
-            } else {
-                // update the timestamp to indicate we communicated with this site
-                q(
-                    "update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
-                    dbesc(datetime_convert()),
-                    dbesc($url)
-                );
-            }
-        } else {
-            $update = true;
-
-            $r = site_store_lowlevel(
-                [
-                    'site_location' => $site_location,
-                    'site_url' => $url,
-                    'site_access' => intval($access_policy),
-                    'site_flags' => intval($site_flags),
-                    'site_update' => datetime_convert(),
-                    'site_directory' => $directory_url,
-                    'site_register' => intval($register_policy),
-                    'site_sellpage' => $sellpage,
-                    'site_realm' => $site_realm,
-                    'site_type' => intval(SITE_TYPE_ZOT),
-                    'site_project' => $site_project,
-                    'site_version' => $site_version,
-                    'site_crypto' => $site_crypto
-                ]
-            );
-
-            if (!$r) {
-                logger('Record create failed. ' . print_r($arr, true));
-            }
-        }
-
-        return $update;
-    }
-
-    /**
-     * @brief Returns path to /rpost
-     *
-     * @param array $observer
-     *   * \e string \b xchan_url
-     * @return string
-     * @todo We probably should make rpost discoverable.
-     *
-     */
-    public static function get_rpost_path($observer)
-    {
-        if (!$observer) {
-            return EMPTY_STR;
-        }
-
-		if (in_array($observer['xchan_network'],['zot6','nomad'])) {
-	        $parsed = parse_url($observer['xchan_url']);
-	    	return $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f=';
-		}
-		return EMPTY_STR;
-    }
-
-    /**
-     * @brief
-     *
-     * @param array $x
-     * @return bool|string return false or a hash
-     */
-
-    public static function import_author_zot($x)
-    {
-
-        // Check that we have both a hubloc and xchan record - as occasionally storage calls will fail and
-        // we may only end up with one; which results in posts with no author name or photo and are a bit
-        // of a hassle to repair. If either or both are missing, do a full discovery probe.
-
-        if (!array_key_exists('id', $x)) {
-            return import_author_activitypub($x);
-        }
-
-        $hash = self::make_xchan_hash($x['id'], $x['key']);
-
-        $desturl = $x['url'];
-
-        $found_primary = false;
-
-        $r1 = q(
-            "select hubloc_url, hubloc_updated, site_dead from hubloc left join site on
-			hubloc_url = site_url where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
-            dbesc($x['id']),
-            dbesc($x['id_sig'])
-        );
-        if ($r1) {
-            $found_primary = true;
-        }
-
-        $r2 = q(
-            "select xchan_hash from xchan where xchan_guid = '%s' and xchan_guid_sig = '%s' limit 1",
-            dbesc($x['id']),
-            dbesc($x['id_sig'])
-        );
-
-        $primary_dead = false;
-
-        if ($r1 && intval($r1[0]['site_dead'])) {
-            $primary_dead = true;
-        }
-
-        // We have valid and somewhat fresh information. Always true if it is our own site.
-
-        if ($r1 && $r2 && ($r1[0]['hubloc_updated'] > datetime_convert('UTC', 'UTC', 'now - 1 week') || $r1[0]['hubloc_url'] === z_root())) {
-            logger('in cache', LOGGER_DEBUG);
-            return $hash;
-        }
-
-        logger('not in cache or cache stale - probing: ' . print_r($x, true), LOGGER_DEBUG, LOG_INFO);
-
-        // The primary hub may be dead. Try to find another one associated with this identity that is
-        // still alive. If we find one, use that url for the discovery/refresh probe. Otherwise, the dead site
-        // is all we have and there is no point probing it. Just return the hash indicating we have a
-        // cached entry and the identity is valid. It's just unreachable until they bring back their
-        // server from the grave or create another clone elsewhere.
-
-        if ($primary_dead || !$found_primary) {
-            logger('dead or site - ignoring', LOGGER_DEBUG, LOG_INFO);
-
-            $r = q(
-                "select hubloc_id_url from hubloc left join site on hubloc_url = site_url
-				where hubloc_hash = '%s' and site_dead = 0",
-                dbesc($hash)
-            );
-            if ($r) {
-                logger('found another site that is not dead: ' . $r[0]['hubloc_id_url'], LOGGER_DEBUG, LOG_INFO);
-                $desturl = $r[0]['hubloc_id_url'];
-            } else {
-                return $hash;
-            }
-        }
-
-        $them = ['hubloc_id_url' => $desturl];
-        if (self::refresh($them)) {
-            return $hash;
-        }
-
-        return false;
-    }
-
-    public static function zotinfo($arr)
-    {
-
-        $ret = [];
-
-        $zhash = ((x($arr, 'guid_hash')) ? $arr['guid_hash'] : '');
-        $zguid = ((x($arr, 'guid')) ? $arr['guid'] : '');
-        $zguid_sig = ((x($arr, 'guid_sig')) ? $arr['guid_sig'] : '');
-        $zaddr = ((x($arr, 'address')) ? $arr['address'] : '');
-        $ztarget = ((x($arr, 'target_url')) ? $arr['target_url'] : '');
-        $zsig = ((x($arr, 'target_sig')) ? $arr['target_sig'] : '');
-        $zkey = ((x($arr, 'key')) ? $arr['key'] : '');
-        $mindate = ((x($arr, 'mindate')) ? $arr['mindate'] : '');
-        $token = ((x($arr, 'token')) ? $arr['token'] : '');
-        $feed = ((x($arr, 'feed')) ? intval($arr['feed']) : 0);
-
-        if ($ztarget) {
-            $t = q("select * from hubloc where hubloc_id_url = '%s' and hubloc_network in ('nomad','zot6') limit 1",
-                dbesc($ztarget)
-            );
-            if ($t) {
-                $ztarget_hash = $t[0]['hubloc_hash'];
-            } else {
-                // should probably perform discovery of the requestor (target) but if they actually had
-                // permissions we would know about them and we only want to know who they are to
-                // enumerate their specific permissions
-
-                $ztarget_hash = EMPTY_STR;
-            }
-        }
-
-        $r = null;
-
-        if (strlen($zhash)) {
-            $r = q(
-                "select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
-				where channel_hash = '%s' limit 1",
-                dbesc($zhash)
-            );
-        } elseif (strlen($zguid) && strlen($zguid_sig)) {
-            $r = q(
-                "select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
-				where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
-                dbesc($zguid),
-                dbesc($zguid_sig)
-            );
-        } elseif (strlen($zaddr)) {
-            if (strpos($zaddr, '[system]') === false) {       /* normal address lookup */
-                $r = q(
-                    "select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
-					where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1",
-                    dbesc($zaddr),
-                    dbesc($zaddr)
-                );
-            } else {
-
-                /**
-                 * The special address '[system]' will return a system channel if one has been defined,
-                 * Or the first valid channel we find if there are no system channels.
-                 *
-                 * This is used by magic-auth if we have no prior communications with this site - and
-                 * returns an identity on this site which we can use to create a valid hub record so that
-                 * we can exchange signed messages. The precise identity is irrelevant. It's the hub
-                 * information that we really need at the other end - and this will return it.
-                 *
-                 */
-
-                $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
-					where channel_system = 1 order by channel_id limit 1");
-                if (!$r) {
-                    $r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
-						where channel_removed = 0 order by channel_id limit 1");
-                }
-            }
-        } else {
-            $ret['message'] = 'Invalid request';
-            return ($ret);
-        }
-
-        if (!$r) {
-            $ret['message'] = 'Item not found.';
-            return ($ret);
-        }
-
-        $e = $r[0];
-
-        $id = $e['channel_id'];
-
-        $sys_channel = (intval($e['channel_system']) ? true : false);
-        $special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false);
-        $adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false);
-        $censored = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false);
-        $searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true);
-        $deleted = (intval($e['xchan_deleted']) ? true : false);
-
-        if ($deleted || $censored || $sys_channel) {
-            $searchable = false;
-        }
-
-        // now all forums (public, restricted, and private) set the public_forum flag. So it really means "is a group"
-        // and has nothing to do with accessibility.
-
-        $role = get_pconfig($e['channel_id'], 'system', 'permissions_role');
-        $rolesettings = PermissionRoles::role_perms($role);
-
-        $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal';
-
-        //  This is for birthdays and keywords, but must check access permissions
-        $p = q(
-            "select * from profile where uid = %d and is_default = 1",
-            intval($e['channel_id'])
-        );
-
-        $profile = [];
-
-        if ($p) {
-            if (!intval($p[0]['publish'])) {
-                $searchable = false;
-            }
-
-            $profile['description'] = $p[0]['pdesc'];
-            $profile['birthday'] = $p[0]['dob'];
-            if (($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'], $e['channel_timezone'])) !== '')) {
-                $profile['next_birthday'] = $bd;
-            }
-
-            if ($age = age($p[0]['dob'], $e['channel_timezone'], '')) {
-                $profile['age'] = $age;
-            }
-            $profile['gender'] = $p[0]['gender'];
-            $profile['marital'] = $p[0]['marital'];
-            $profile['sexual'] = $p[0]['sexual'];
-            $profile['locale'] = $p[0]['locality'];
-            $profile['region'] = $p[0]['region'];
-            $profile['postcode'] = $p[0]['postal_code'];
-            $profile['country'] = $p[0]['country_name'];
-            $profile['about'] = ((Channel::is_system($e['channel_id'])) ? get_config('system', 'siteinfo') : $p[0]['about']);
-            $profile['homepage'] = $p[0]['homepage'];
-            $profile['hometown'] = $p[0]['hometown'];
-
-            if ($p[0]['keywords']) {
-                $tags = [];
-                $k = explode(' ', $p[0]['keywords']);
-                if ($k) {
-                    foreach ($k as $kk) {
-                        if (trim($kk, " \t\n\r\0\x0B,")) {
-                            $tags[] = trim($kk, " \t\n\r\0\x0B,");
-                        }
-                    }
-                }
-                if ($tags) {
-                    $profile['keywords'] = $tags;
-                }
-            }
-        }
-
-        $cover_photo = Channel::get_cover_photo($e['channel_id'], 'array');
-
-        // Communication details
-
-        $ret['id'] = $e['xchan_guid'];
-        $ret['id_sig'] = self::sign($e['xchan_guid'], $e['channel_prvkey']);
-
-        $ret['primary_location'] = [
-            'address' => $e['xchan_addr'],
-            'url' => $e['xchan_url'],
-            'connections_url' => $e['xchan_connurl'],
-            'follow_url' => $e['xchan_follow'],
-            'wall' => z_root() . '/outbox/' . $e['channel_address'],
-            'followers' => z_root() . '/followers/' . $e['channel_address'],
-            'following' => z_root() . '/following/' . $e['channel_address']
-        ];
-
-        $ret['public_key'] = $e['xchan_pubkey'];
-        $ret['signing_algorithm'] = 'rsa-sha256';
-        $ret['username'] = $e['channel_address'];
-        $ret['name'] = $e['xchan_name'];
-        $ret['name_updated'] = $e['xchan_name_date'];
-        $ret['photo'] = [
-            'url' => $e['xchan_photo_l'],
-            'type' => $e['xchan_photo_mimetype'],
-            'updated' => $e['xchan_photo_date']
-        ];
-
-        if ($cover_photo) {
-            $ret['cover_photo'] = [
-                'url' => $cover_photo['url'],
-                'type' => $cover_photo['type'],
-                'updated' => $cover_photo['updated']
-            ];
-        }
-
-        $ret['channel_role'] = get_pconfig($e['channel_id'], 'system', 'permissions_role', 'custom');
-        $ret['channel_type'] = $channel_type;
-        $ret['protocols'] = ['nomad','zot6'];
-        if (get_pconfig($e['channel_id'], 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
-            $ret['protocols'][] = 'activitypub';
-        }
-        $ret['searchable'] = $searchable;
-        $ret['adult_content'] = $adult_channel;
-
-        $ret['comments'] = map_scope(PermissionLimits::Get($e['channel_id'], 'post_comments'));
-
-        if ($deleted) {
-            $ret['deleted'] = $deleted;
-        }
-
-        if (intval($e['channel_removed'])) {
-            $ret['deleted_locally'] = true;
-        }
-
-        // premium or other channel desiring some contact with potential followers before connecting.
-        // This is a template - %s will be replaced with the follow_url we discover for the return channel.
-
-        if ($special_channel) {
-            $ret['connect_url'] = (($e['xchan_connpage']) ? $e['xchan_connpage'] : z_root() . '/connect/' . $e['channel_address']);
-        }
-
-        // This is a template for our follow url, %s will be replaced with a webbie
-        if (!isset($ret['follow_url'])) {
-            $ret['follow_url'] = z_root() . '/follow?f=&url=%s';
-        }
-
-        $permissions = get_all_perms($e['channel_id'], $ztarget_hash, false);
-
-        if ($ztarget_hash) {
-            $permissions['connected'] = false;
-            $b = q(
-                "select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-                dbesc($ztarget_hash),
-                intval($e['channel_id'])
-            );
-            if ($b) {
-                $permissions['connected'] = true;
-            }
-        }
-
-        if ($permissions['view_profile']) {
-            $ret['profile'] = $profile;
-        }
-
-
-        $concise_perms = [];
-        if ($permissions) {
-            foreach ($permissions as $k => $v) {
-                if ($v) {
-                    $concise_perms[] = $k;
-                }
-            }
-            $permissions = implode(',', $concise_perms);
-        }
-
-        $ret['permissions'] = $permissions;
-        $ret['permissions_for'] = $ztarget;
-
-
-        // array of (verified) hubs this channel uses
-
-        $x = self::encode_locations($e);
-        if ($x) {
-            $ret['locations'] = $x;
-        }
-        $ret['site'] = self::site_info();
-
-        Hook::call('zotinfo', $ret);
-
-        return ($ret);
-    }
-
-
-    public static function site_info($force = false)
-    {
-
-        $signing_key = get_config('system', 'prvkey');
-        $sig_method = get_config('system', 'signature_algorithm', 'sha256');
-
-        $ret = [];
-        $ret['site'] = [];
-        $ret['site']['url'] = z_root();
-        $ret['site']['site_sig'] = self::sign(z_root(), $signing_key);
-        $ret['site']['post'] = z_root() . '/zot';
-        $ret['site']['openWebAuth'] = z_root() . '/owa';
-        $ret['site']['authRedirect'] = z_root() . '/magic';
-        $ret['site']['sitekey'] = get_config('system', 'pubkey');
-
-        $dirmode = get_config('system', 'directory_mode');
-        if (($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL)) {
-            $ret['site']['directory_mode'] = 'normal';
-        }
-
-        if ($dirmode == DIRECTORY_MODE_PRIMARY) {
-            $ret['site']['directory_mode'] = 'primary';
-        } elseif ($dirmode == DIRECTORY_MODE_SECONDARY) {
-            $ret['site']['directory_mode'] = 'secondary';
-        } elseif ($dirmode == DIRECTORY_MODE_STANDALONE) {
-            $ret['site']['directory_mode'] = 'standalone';
-        }
-        if ($dirmode != DIRECTORY_MODE_NORMAL) {
-            $ret['site']['directory_url'] = z_root() . '/dirsearch';
-        }
-
-
-        $ret['site']['encryption'] = Crypto::methods();
-        $ret['site']['zot'] = System::get_zot_revision();
-
-        // hide detailed site information if you're off the grid
-
-        if ($dirmode != DIRECTORY_MODE_STANDALONE || $force) {
-            $register_policy = intval(get_config('system', 'register_policy'));
-
-            if ($register_policy == REGISTER_CLOSED) {
-                $ret['site']['register_policy'] = 'closed';
-            }
-            if ($register_policy == REGISTER_APPROVE) {
-                $ret['site']['register_policy'] = 'approve';
-            }
-            if ($register_policy == REGISTER_OPEN) {
-                $ret['site']['register_policy'] = 'open';
-            }
-
-            $access_policy = intval(get_config('system', 'access_policy'));
-
-            if ($access_policy == ACCESS_PRIVATE) {
-                $ret['site']['access_policy'] = 'private';
-            }
-            if ($access_policy == ACCESS_PAID) {
-                $ret['site']['access_policy'] = 'paid';
-            }
-            if ($access_policy == ACCESS_FREE) {
-                $ret['site']['access_policy'] = 'free';
-            }
-            if ($access_policy == ACCESS_TIERED) {
-                $ret['site']['access_policy'] = 'tiered';
-            }
-
-            $ret['site']['admin'] = get_config('system', 'admin_email');
-
-            $visible_plugins = [];
-
-            $r = q("select * from addon where hidden = 0");
-            if ($r) {
-                foreach ($r as $rr) {
-                    $visible_plugins[] = $rr['aname'];
-                }
-            }
-
-
-            $ret['site']['about'] = bbcode(get_config('system', 'siteinfo'), ['export' => true]);
-            $ret['site']['plugins'] = $visible_plugins;
-            $ret['site']['sitehash'] = get_config('system', 'location_hash');
-            $ret['site']['sellpage'] = get_config('system', 'sellpage');
-            $ret['site']['location'] = get_config('system', 'site_location');
-            $ret['site']['realm'] = get_directory_realm();
-            $ret['site']['sitename'] = System::get_site_name();
-            $ret['site']['logo'] = System::get_site_icon();
-            $ret['site']['project'] = System::get_project_name();
-            $ret['site']['version'] = System::get_project_version();
-        }
-
-        return $ret['site'];
-    }
-
-    /**
-     * @brief
-     *
-     * @param array $hub
-     * @param string $sitekey (optional, default empty)
-     *
-     * @return string hubloc_url
-     */
-
-    public static function update_hub_connected($hub, $site_id = '')
-    {
-
-        if ($site_id) {
-            /*
-             * This hub has now been proven to be valid.
-             * Any hub with the same URL and a different sitekey cannot be valid.
-             * Get rid of them (mark them deleted). There's a good chance they were re-installs.
-             */
-
-            q(
-                "update hubloc set hubloc_deleted = 1, hubloc_error = 1 where hubloc_hash = '%s' and hubloc_url = '%s' and hubloc_site_id != '%s' ",
-                dbesc($hub['hubloc_hash']),
-                dbesc($hub['hubloc_url']),
-                dbesc($site_id)
-            );
-        } else {
-            $site_id = $hub['hubloc_site_id'];
-        }
-
-        // $sender['sitekey'] is a new addition to the protocol to distinguish
-        // hublocs coming from re-installed sites. Older sites will not provide
-        // this field and we have to still mark them valid, since we can't tell
-        // if this hubloc has the same sitekey as the packet we received.
-        // Update our DB to show when we last communicated successfully with this hub
-        // This will allow us to prune dead hubs from using up resources
-
-        $t = datetime_convert('UTC', 'UTC', 'now - 15 minutes');
-
-        $r = q(
-            "update hubloc set hubloc_connected = '%s' where hubloc_id = %d and hubloc_site_id = '%s' and hubloc_connected < '%s' ",
-            dbesc(datetime_convert()),
-            intval($hub['hubloc_id']),
-            dbesc($site_id),
-            dbesc($t)
-        );
-
-        // a dead hub came back to life - reset any tombstones we might have
-
-        if (intval($hub['hubloc_error']) || intval($hub['hubloc_deleted'])) {
-            q(
-                "update hubloc set hubloc_error = 0, hubloc_deleted = 0 where hubloc_id = %d and hubloc_site_id = '%s' ",
-                intval($hub['hubloc_id']),
-                dbesc($site_id)
-            );
-            if (intval($hub['hubloc_orphancheck'])) {
-                q(
-                    "update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d and hubloc_site_id = '%s' ",
-                    intval($hub['hubloc_id']),
-                    dbesc($site_id)
-                );
-            }
-            q(
-                "update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
-                dbesc($hub['hubloc_hash'])
-            );
-        }
-
-        // this site obviously isn't dead because they are trying to communicate with us.
-        q(
-            "update site set site_dead = 0 where site_dead = 1 and site_url = '%s' ",
-            dbesc($hub['hubloc_url'])
-        );
-
-        return $hub['hubloc_url'];
-    }
-
-
-    public static function sign($data, $key, $alg = 'sha256')
-    {
-        if (!$key) {
-            return 'no key';
-        }
-        $sig = '';
-        openssl_sign($data, $sig, $key, $alg);
-        return $alg . '.' . base64url_encode($sig);
-    }
-
-    public static function verify($data, $sig, $key)
-    {
-
-        $verify = 0;
-
-        $x = explode('.', $sig, 2);
-
-        if ($key && count($x) === 2) {
-            $alg = $x[0];
-            $signature = base64url_decode($x[1]);
-
-            $verify = @openssl_verify($data, $signature, $key, $alg);
-
-            if ($verify === (-1)) {
-                while ($msg = openssl_error_string()) {
-                    logger('openssl_verify: ' . $msg, LOGGER_NORMAL, LOG_ERR);
-                }
-                btlogger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR);
-            }
-        }
-        return (($verify > 0) ? true : false);
-    }
-
-
-    public static function is_zot_request()
-    {
-		$x = getBestSupportedMimeType([ 'application/x-zot+json', 'application/x-nomad+json' ]);
-        return (($x) ? true : false);
-    }
-
-
-    public static function zot_record_preferred($arr, $check = 'hubloc_network')
-    {
-
-        if (!$arr) {
-            return $arr;
-        }
-		foreach ($arr as $v) {
-			if($v[$check] === 'nomad') {
-				return $v;
-			}
-		}
-        foreach ($arr as $v) {
-            if ($v[$check] === 'zot6') {
-                return $v;
-            }
-        }
-        return $arr[0];
-    }
-
-    public static function update_cached_hubloc($hubloc)
-    {
-        if ($hubloc['hubloc_updated'] > datetime_convert('UTC', 'UTC', 'now - 1 week') || $hubloc['hubloc_url'] === z_root()) {
-            return;
-        }
-        self::refresh(['hubloc_id_url' => $hubloc['hubloc_id_url']]);
-    }
-}
diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php
deleted file mode 100644
index 0d79aff59..000000000
--- a/Zotlabs/Lib/Libzotdir.php
+++ /dev/null
@@ -1,543 +0,0 @@
- t('Directory Options'),
-            '$forumsurl' => $forumsurl,
-            '$safemode' => array('safemode', t('Safe Mode'), $safe_mode, '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''),
-            '$pubforums' => array('pubforums', t('Groups Only'), (($pubforums == 1) ? true : false), '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&type="+(this.checked ? 1 : 0)\''),
-//          '$collections' => array('collections', t('Collections Only'),(($pubforums == 2) ? true : false),'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&type="+(this.checked ? 2 : 0)\''),
-            '$hide_local' => $hide_local,
-            '$globaldir' => array('globaldir', t('This Website Only'), 1 - intval($globaldir), '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''),
-            '$activedir' => array('activedir', t('Recently Updated'), intval($activedir), '', array(t('No'), t('Yes')), ' onchange=\'window.location.href="' . $forumsurl . '&active="+(this.checked ? 1 : 0)\''),
-        ]);
-
-        return $o;
-    }
-
-    /**
-     * @brief
-     *
-     * Given an update record, probe the channel, grab a zot-info packet and refresh/sync the data.
-     *
-     * Ignore updating records marked as deleted.
-     *
-     * If successful, sets ud_last in the DB to the current datetime for this
-     * reddress/webbie.
-     *
-     * @param array $ud Entry from update table
-     */
-
-    public static function update_directory_entry($ud)
-    {
-
-        logger('update_directory_entry: ' . print_r($ud, true), LOGGER_DATA);
-
-        if ($ud['ud_addr'] && (!($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) {
-            $success = false;
-
-            $href = Webfinger::zot_url(punify($ud['ud_addr']));
-            if ($href) {
-                $zf = Zotfinger::exec($href);
-            }
-            if (is_array($zf) && array_path_exists('signature/signer', $zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
-                $xc = Libzot::import_xchan($zf['data'], 0, $ud);
-            } else {
-                q(
-                    "update updates set ud_last = '%s' where ud_addr = '%s'",
-                    dbesc(datetime_convert()),
-                    dbesc($ud['ud_addr'])
-                );
-            }
-        }
-    }
-
-
-    /**
-     * @brief Push local channel updates to a local directory server.
-     *
-     * This is called from Zotlabs/Daemon/Directory.php if a profile is to be pushed to the
-     * directory and the local hub in this case is any kind of directory server.
-     *
-     * @param int $uid
-     * @param bool $force
-     */
-
-    public static function local_dir_update($uid, $force)
-    {
-
-
-        logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG);
-
-        $p = q(
-            "select channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
-            intval($uid)
-        );
-
-        $profile = [];
-        $profile['encoding'] = 'zot';
-
-        if ($p) {
-            $hash = $p[0]['channel_hash'];
-
-            $profile['description'] = $p[0]['pdesc'];
-            $profile['birthday'] = $p[0]['dob'];
-            if ($age = age($p[0]['dob'], $p[0]['channel_timezone'], '')) {
-                $profile['age'] = $age;
-            }
-
-            $profile['gender'] = $p[0]['gender'];
-            $profile['marital'] = $p[0]['marital'];
-            $profile['sexual'] = $p[0]['sexual'];
-            $profile['locale'] = $p[0]['locality'];
-            $profile['region'] = $p[0]['region'];
-            $profile['postcode'] = $p[0]['postal_code'];
-            $profile['country'] = $p[0]['country_name'];
-            $profile['about'] = $p[0]['about'];
-            $profile['homepage'] = $p[0]['homepage'];
-            $profile['hometown'] = $p[0]['hometown'];
-
-            if ($p[0]['keywords']) {
-                $tags = [];
-                $k = explode(' ', $p[0]['keywords']);
-                if ($k) {
-                    foreach ($k as $kk) {
-                        if (trim($kk)) {
-                            $tags[] = trim($kk);
-                        }
-                    }
-                }
-
-                if ($tags) {
-                    $profile['keywords'] = $tags;
-                }
-            }
-
-            $hidden = (1 - intval($p[0]['publish']));
-
-            // logger('hidden: ' . $hidden);
-
-            $r = q(
-                "select xchan_hidden from xchan where xchan_hash = '%s' limit 1",
-                dbesc($p[0]['channel_hash'])
-            );
-
-            if (intval($r[0]['xchan_hidden']) != $hidden) {
-                $r = q(
-                    "update xchan set xchan_hidden = %d where xchan_hash = '%s'",
-                    intval($hidden),
-                    dbesc($p[0]['channel_hash'])
-                );
-            }
-
-            $arr = ['channel_id' => $uid, 'hash' => $hash, 'profile' => $profile];
-            Hook::call('local_dir_update', $arr);
-
-            $address = Channel::get_webfinger($p[0]);
-
-            if (perm_is_allowed($uid, '', 'view_profile')) {
-                self::import_directory_profile($hash, $arr['profile'], $address, 0);
-            } else {
-                // they may have made it private
-                $r = q(
-                    "delete from xprof where xprof_hash = '%s'",
-                    dbesc($hash)
-                );
-                $r = q(
-                    "delete from xtag where xtag_hash = '%s'",
-                    dbesc($hash)
-                );
-            }
-        }
-
-        $ud_hash = random_string() . '@' . App::get_hostname();
-        self::update_modtime($hash, $ud_hash, Channel::get_webfinger($p[0]), (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED));
-    }
-
-
-    /**
-     * @brief Imports a directory profile.
-     *
-     * @param string $hash
-     * @param array $profile
-     * @param string $addr
-     * @param number $ud_flags (optional) UPDATE_FLAGS_UPDATED
-     * @param number $suppress_update (optional) default 0
-     * @return bool $updated if something changed
-     */
-
-    public static function import_directory_profile($hash, $profile, $addr, $ud_flags = UPDATE_FLAGS_UPDATED, $suppress_update = 0)
-    {
-
-        logger('import_directory_profile', LOGGER_DEBUG);
-        if (!$hash) {
-            return false;
-        }
-
-
-        $maxlen = get_max_import_size();
-
-        if ($maxlen && mb_strlen($profile['about']) > $maxlen) {
-            $profile['about'] = mb_substr($profile['about'], 0, $maxlen, 'UTF-8');
-        }
-
-        $arr = [];
-
-        $arr['xprof_hash'] = $hash;
-		if (isset($profile['birthday'])) {
-	        $arr['xprof_dob'] = (($profile['birthday'] === '0000-00-00')
-				? $profile['birthday']
-				: datetime_convert('', '', $profile['birthday'], 'Y-m-d')); // !!!! check this for 0000 year
-		}
-        $arr['xprof_age'] = (isset($profile['age']) ? intval($profile['age']) : 0);
-        $arr['xprof_desc'] = ((isset($profile['description']) && $profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_gender'] = ((isset($profile['gender']) && $profile['gender']) ? htmlspecialchars($profile['gender'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_marital'] = ((isset($profile['marital']) && $profile['marital']) ? htmlspecialchars($profile['marital'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_sexual'] = ((isset($profile['sexual']) && $profile['sexual']) ? htmlspecialchars($profile['sexual'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_locale'] = ((isset($profile['locale']) && $profile['locale']) ? htmlspecialchars($profile['locale'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_region'] = ((isset($profile['region']) && $profile['region']) ? htmlspecialchars($profile['region'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_postcode'] = ((isset($profile['postcode']) && $profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_country'] = ((isset($profile['country']) && $profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_about'] = ((isset($profile['about']) && $profile['about']) ? htmlspecialchars($profile['about'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_pronouns'] = ((isset($profile['pronouns']) && $profile['pronouns']) ? htmlspecialchars($profile['pronouns'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_homepage'] = ((isset($profile['homepage']) && $profile['homepage']) ? htmlspecialchars($profile['homepage'], ENT_COMPAT, 'UTF-8', false) : '');
-        $arr['xprof_hometown'] = ((isset($profile['hometown']) && $profile['hometown']) ? htmlspecialchars($profile['hometown'], ENT_COMPAT, 'UTF-8', false) : '');
-
-        $clean = [];
-        if (array_key_exists('keywords', $profile) and is_array($profile['keywords'])) {
-            self::import_directory_keywords($hash, $profile['keywords']);
-            foreach ($profile['keywords'] as $kw) {
-                $kw = trim(htmlspecialchars($kw, ENT_COMPAT, 'UTF-8', false));
-                $kw = trim($kw, ',');
-                $clean[] = $kw;
-            }
-        }
-
-        $arr['xprof_keywords'] = implode(' ', $clean);
-
-        // Self censored, make it so
-        // These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult".
-
-
-        if (in_arrayi('nsfw', $clean) || in_arrayi('adult', $clean)) {
-            q(
-                "update xchan set xchan_selfcensored = 1 where xchan_hash = '%s'",
-                dbesc($hash)
-            );
-        }
-
-        $r = q(
-            "select * from xprof where xprof_hash = '%s' limit 1",
-            dbesc($hash)
-        );
-
-        if ($arr['xprof_age'] > 150) {
-            $arr['xprof_age'] = 150;
-        }
-        if ($arr['xprof_age'] < 0) {
-            $arr['xprof_age'] = 0;
-        }
-
-        if ($r) {
-            $update = false;
-            foreach ($r[0] as $k => $v) {
-                if ((array_key_exists($k, $arr)) && ($arr[$k] != $v)) {
-                    logger('import_directory_profile: update ' . $k . ' => ' . $arr[$k]);
-                    $update = true;
-                    break;
-                }
-            }
-            if ($update) {
-                q(
-                    "update xprof set
-					xprof_desc = '%s',
-					xprof_dob = '%s',
-					xprof_age = %d,
-					xprof_gender = '%s',
-					xprof_marital = '%s',
-					xprof_sexual = '%s',
-					xprof_locale = '%s',
-					xprof_region = '%s',
-					xprof_postcode = '%s',
-					xprof_country = '%s',
-					xprof_about = '%s',
-					xprof_homepage = '%s',
-					xprof_hometown = '%s',
-					xprof_keywords = '%s',
-					xprof_pronouns = '%s'
-					where xprof_hash = '%s'",
-                    dbesc($arr['xprof_desc']),
-                    dbesc($arr['xprof_dob']),
-                    intval($arr['xprof_age']),
-                    dbesc($arr['xprof_gender']),
-                    dbesc($arr['xprof_marital']),
-                    dbesc($arr['xprof_sexual']),
-                    dbesc($arr['xprof_locale']),
-                    dbesc($arr['xprof_region']),
-                    dbesc($arr['xprof_postcode']),
-                    dbesc($arr['xprof_country']),
-                    dbesc($arr['xprof_about']),
-                    dbesc($arr['xprof_homepage']),
-                    dbesc($arr['xprof_hometown']),
-                    dbesc($arr['xprof_keywords']),
-                    dbesc($arr['xprof_pronouns']),
-                    dbesc($arr['xprof_hash'])
-                );
-            }
-        } else {
-            $update = true;
-            logger('New profile');
-            q(
-                "insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_about, xprof_homepage, xprof_hometown, xprof_keywords, xprof_pronouns) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
-                dbesc($arr['xprof_hash']),
-                dbesc($arr['xprof_desc']),
-                dbesc($arr['xprof_dob']),
-                intval($arr['xprof_age']),
-                dbesc($arr['xprof_gender']),
-                dbesc($arr['xprof_marital']),
-                dbesc($arr['xprof_sexual']),
-                dbesc($arr['xprof_locale']),
-                dbesc($arr['xprof_region']),
-                dbesc($arr['xprof_postcode']),
-                dbesc($arr['xprof_country']),
-                dbesc($arr['xprof_about']),
-                dbesc($arr['xprof_homepage']),
-                dbesc($arr['xprof_hometown']),
-                dbesc($arr['xprof_keywords']),
-                dbesc($arr['xprof_pronouns'])
-            );
-        }
-
-        $d = [
-            'xprof' => $arr,
-            'profile' => $profile,
-            'update' => $update
-        ];
-
-        /**
-         * @hooks import_directory_profile
-         *   Called when processing delivery of a profile structure from an external source (usually for directory storage).
-         *   * \e array \b xprof
-         *   * \e array \b profile
-         *   * \e boolean \b update
-         */
-
-        Hook::call('import_directory_profile', $d);
-
-        if (($d['update']) && (!$suppress_update)) {
-            self::update_modtime($arr['xprof_hash'], new_uuid(), $addr, $ud_flags);
-        }
-
-        q(
-            "update xchan set xchan_updated = '%s' where xchan_hash = '%s'",
-            dbesc(datetime_convert()),
-            dbesc($arr['xprof_hash'])
-        );
-
-        return $d['update'];
-    }
-
-    /**
-     * @brief
-     *
-     * @param string $hash An xtag_hash
-     * @param array $keywords
-     */
-
-    public static function import_directory_keywords($hash, $keywords)
-    {
-
-        $existing = [];
-        $r = q(
-            "select * from xtag where xtag_hash = '%s' and xtag_flags = 0",
-            dbesc($hash)
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $existing[] = $rr['xtag_term'];
-            }
-        }
-
-        $clean = [];
-        foreach ($keywords as $kw) {
-            $kw = trim(htmlspecialchars($kw, ENT_COMPAT, 'UTF-8', false));
-            $kw = trim($kw, ',');
-            $clean[] = $kw;
-        }
-
-        foreach ($existing as $x) {
-            if (!in_array($x, $clean)) {
-                $r = q(
-                    "delete from xtag where xtag_hash = '%s' and xtag_term = '%s' and xtag_flags = 0",
-                    dbesc($hash),
-                    dbesc($x)
-                );
-            }
-        }
-        foreach ($clean as $x) {
-            if (!in_array($x, $existing)) {
-                $r = q(
-                    "insert into xtag ( xtag_hash, xtag_term, xtag_flags) values ( '%s' ,'%s', 0 )",
-                    dbesc($hash),
-                    dbesc($x)
-                );
-            }
-        }
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param string $hash
-     * @param string $guid
-     * @param string $addr
-     * @param int $flags (optional) default 0
-     */
-
-    public static function update_modtime($hash, $guid, $addr, $flags = 0)
-    {
-
-        $dirmode = intval(get_config('system', 'directory_mode'));
-
-        if ($dirmode == DIRECTORY_MODE_NORMAL) {
-            return;
-        }
-
-        if ($flags) {
-            q(
-                "insert into updates (ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) values ( '%s', '%s', '%s', %d, '%s' )",
-                dbesc($hash),
-                dbesc($guid),
-                dbesc(datetime_convert()),
-                intval($flags),
-                dbesc($addr)
-            );
-        } else {
-            q(
-                "update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and (ud_flags & %d) = 0 ",
-                intval(UPDATE_FLAGS_UPDATED),
-                dbesc($addr),
-                intval(UPDATE_FLAGS_UPDATED)
-            );
-        }
-    }
-}
diff --git a/Zotlabs/Lib/Markdown.php b/Zotlabs/Lib/Markdown.php
deleted file mode 100644
index c48d8acad..000000000
--- a/Zotlabs/Lib/Markdown.php
+++ /dev/null
@@ -1,414 +0,0 @@
- $s,
-            'zrl' => $use_zrl,
-            'options' => $options
-        ];
-
-        /**
-         * @hooks markdown_to_bb_init
-         *   * \e string \b text - The message as Markdown and what will get returned
-         *   * \e boolean \b zrl
-         *   * \e array \b options
-         */
-        Hook::call('markdown_to_bb_init', $x);
-
-        $s = $x['text'];
-
-        // Escaping the hash tags
-        $s = preg_replace('/\#([^\s\#])/', '#$1', $s);
-
-        $s = MarkdownExtra::defaultTransform($s);
-
-        if ($options && $options['preserve_lf']) {
-            $s = str_replace(["\r", "\n"], ["", '
          '], $s);
-        } else {
-            $s = str_replace("\r", "", $s);
-        }
-
-        $s = str_replace('#', '#', $s);
-
-        $s = html2bbcode($s);
-
-        // Convert everything that looks like a link to a link
-        if ($use_zrl) {
-            if (strpos($s, '[/img]') !== false) {
-                $s = preg_replace_callback("/\[img\](.*?)\[\/img\]/ism", ['\\Zotlabs\\Lib\\Markdown', 'use_zrl_cb_img'], $s);
-                $s = preg_replace_callback("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", ['\\Zotlabs\\Lib\\Markdown', 'use_zrl_cb_img_x'], $s);
-            }
-            $s = preg_replace_callback("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", ['\\Zotlabs\\Lib\\Markdown', 'use_zrl_cb_link'], $s);
-        } else {
-            $s = preg_replace("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]', $s);
-        }
-
-        // remove duplicate adjacent code tags
-        $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism", "[code]$2[/code]", $s);
-
-        /**
-         * @hooks markdown_to_bb
-         *   * \e string - The already converted message as bbcode
-         */
-        Hook::call('markdown_to_bb', $s);
-
-        return $s;
-    }
-
-    public static function use_zrl_cb_link($match)
-    {
-        $res = '';
-        $is_zid = is_matrix_url(trim($match[0]));
-
-        if ($is_zid) {
-            $res = $match[1] . '[zrl=' . $match[2] . $match[3] . ']' . $match[2] . $match[3] . '[/zrl]';
-        } else {
-            $res = $match[1] . '[url=' . $match[2] . $match[3] . ']' . $match[2] . $match[3] . '[/url]';
-        }
-
-        return $res;
-    }
-
-    public static function use_zrl_cb_img($match)
-    {
-        $res = '';
-        $is_zid = is_matrix_url(trim($match[1]));
-
-        if ($is_zid) {
-            $res = '[zmg]' . $match[1] . '[/zmg]';
-        } else {
-            $res = $match[0];
-        }
-
-        return $res;
-    }
-
-    public static function use_zrl_cb_img_x($match)
-    {
-        $res = '';
-        $is_zid = is_matrix_url(trim($match[3]));
-
-        if ($is_zid) {
-            $res = '[zmg=' . $match[1] . 'x' . $match[2] . ']' . $match[3] . '[/zmg]';
-        } else {
-            $res = $match[0];
-        }
-
-        return $res;
-    }
-
-    /**
-     * @brief
-     *
-     * @param array $match
-     * @return string
-     */
-
-    public static function from_bbcode_share($match)
-    {
-
-        $matches = [];
-        $attributes = $match[1];
-
-        $author = "";
-        preg_match("/author='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "") {
-            $author = urldecode($matches[1]);
-        }
-
-        $link = "";
-        preg_match("/link='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "") {
-            $link = $matches[1];
-        }
-
-        $avatar = "";
-        preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "") {
-            $avatar = $matches[1];
-        }
-
-        $profile = "";
-        preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "") {
-            $profile = $matches[1];
-        }
-
-        $posted = "";
-        preg_match("/posted='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "") {
-            $posted = $matches[1];
-        }
-
-        // message_id is never used, do we still need it?
-        $message_id = "";
-        preg_match("/message_id='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "") {
-            $message_id = $matches[1];
-        }
-
-        if (!$message_id) {
-            preg_match("/guid='(.*?)'/ism", $attributes, $matches);
-            if ($matches[1] != "") {
-                $message_id = $matches[1];
-            }
-        }
-
-
-        $reldate = datetime_convert('UTC', date_default_timezone_get(), $posted, 'r');
-
-        $headline = '';
-
-        if ($avatar != "") {
-            $headline .= '[url=' . zid($profile) . '][img]' . $avatar . '[/img][/url]';
-        }
-
-        // Bob Smith wrote the following post 2 hours ago
-
-        $fmt = sprintf(
-            t('%1$s wrote the following %2$s %3$s'),
-            '[url=' . zid($profile) . ']' . $author . '[/url]',
-            '[url=' . zid($link) . ']' . t('post') . '[/url]',
-            $reldate
-        );
-
-        $headline .= $fmt . "\n\n";
-
-        $text = $headline . trim($match[2]);
-
-        return $text;
-    }
-
-
-    /**
-     * @brief Convert bbcode to Markdown.
-     *
-     * @param string $Text The message as bbcode
-     * @param array $options default empty
-     * @return string The message converted to Markdown
-     */
-
-    public static function from_bbcode($Text, $options = [])
-    {
-
-        /*
-         * Transform #tags, strip off the [url] and replace spaces with underscore
-         */
-
-        $Text = preg_replace_callback(
-            '/#\[([zu])rl\=(.*?)\](.*?)\[\/[(zu)]rl\]/i',
-            create_function('$match', 'return \'#\'. str_replace(\' \', \'_\', $match[3]);'),
-            $Text
-        );
-
-        $Text = preg_replace('/#\^\[([zu])rl\=(.*?)\](.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text);
-
-        // Converting images with size parameters to simple images. Markdown doesn't know it.
-        $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
-
-        $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", ['\\Zotlabs\\Lib\\Markdown', 'from_bbcode_share'], $Text);
-
-        $x = ['bbcode' => $Text, 'options' => $options];
-
-        /**
-         * @hooks bb_to_markdown_bb
-         *   * \e string \b bbcode - The message as bbcode and what will get returned
-         *   * \e array \b options
-         */
-        Hook::call('bb_to_markdown_bb', $x);
-
-        $Text = $x['bbcode'];
-
-        // Convert it to HTML - don't try oembed
-        $Text = bbcode($Text, ['tryoembed' => false]);
-
-        // Now convert HTML to Markdown
-
-        $Text = self::from_html($Text);
-
-        //html2markdown adds backslashes infront of hashes after a new line. remove them
-        $Text = str_replace("\n\#", "\n#", $Text);
-
-
-        // If the text going into bbcode() has a plain URL in it, i.e.
-        // with no [url] tags around it, it will come out of parseString()
-        // looking like: , which gets removed by strip_tags().
-        // So take off the angle brackets of any such URL
-        $Text = preg_replace("//is", "http$1", $Text);
-
-        // Remove empty zrl links
-        $Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text);
-
-        $Text = trim($Text);
-
-        /**
-         * @hooks bb_to_markdown
-         *   * \e string - The already converted message as bbcode and what will get returned
-         */
-        Hook::call('bb_to_markdown', $Text);
-
-        return $Text;
-    }
-
-
-    /**
-     * @brief Convert a HTML text into Markdown.
-     *
-     * This function uses the library league/html-to-markdown for this task.
-     *
-     * If the HTML text can not get parsed it will return an empty string.
-     *
-     * @param string $html The HTML code to convert
-     * @return string Markdown representation of the given HTML text, empty on error
-     */
-
-    public static function from_html($html, $options = [])
-    {
-        $markdown = '';
-
-        if (!$options) {
-            $options = [
-                'header_style' => 'setext', // Set to 'atx' to output H1 and H2 headers as # Header1 and ## Header2
-                'suppress_errors' => true,  // Set to false to show warnings when loading malformed HTML
-                'strip_tags' => false,      // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output.
-                'bold_style' => '**',       // DEPRECATED: Set to '__' if you prefer the underlined style
-                'italic_style' => '*',      // DEPRECATED: Set to '_' if you prefer the underlined style
-                'remove_nodes' => '',       // space-separated list of dom nodes that should be removed. example: 'meta style script'
-                'hard_break' => false,      // Set to true to turn 
           into `\n` instead of `  \n`
-                'list_item_style' => '-',   // Set the default character for each 
        •  in a 
            . Can be '-', '*', or '+'
-            ];
-        }
-
-        $environment = Environment::createDefaultEnvironment($options);
-        $environment->addConverter(new TableConverter());
-        $converter = new HtmlConverter($environment);
-
-        try {
-            $markdown = $converter->convert($html);
-        } catch (InvalidArgumentException $e) {
-            logger("Invalid HTML. HTMLToMarkdown library threw an exception.");
-        }
-
-        return $markdown;
-    }
-}
-
-// Tables are not an official part of the markdown specification.
-// This interface was suggested as a workaround.
-// author: Mark Hamstra
-// https://github.com/Mark-H/Docs
-
-
-class TableConverter implements ConverterInterface
-{
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
-    {
-        switch ($element->getTagName()) {
-            case 'tr':
-                $line = [];
-                $i = 1;
-                foreach ($element->getChildren() as $td) {
-                    $i++;
-                    $v = $td->getValue();
-                    $v = trim($v);
-                    if ($i % 2 === 0 || $v !== '') {
-                        $line[] = $v;
-                    }
-                }
-                return '| ' . implode(' | ', $line) . " |\n";
-            case 'td':
-            case 'th':
-                return trim($element->getValue());
-            case 'tbody':
-                return trim($element->getValue());
-            case 'thead':
-                $headerLine = reset($element->getChildren())->getValue();
-                $headers = explode(' | ', trim(trim($headerLine, "\n"), '|'));
-                $hr = [];
-                foreach ($headers as $td) {
-                    $length = strlen(trim($td)) + 2;
-                    $hr[] = str_repeat('-', $length > 3 ? $length : 3);
-                }
-                $hr = '|' . implode('|', $hr) . '|';
-                return $headerLine . $hr . "\n";
-            case 'table':
-                $inner = $element->getValue();
-                if (strpos($inner, '-----') === false) {
-                    $inner = explode("\n", $inner);
-                    $single = explode(' | ', trim($inner[0], '|'));
-                    $hr = [];
-                    foreach ($single as $td) {
-                        $length = strlen(trim($td)) + 2;
-                        $hr[] = str_repeat('-', $length > 3 ? $length : 3);
-                    }
-                    $hr = '|' . implode('|', $hr) . '|';
-                    array_splice($inner, 1, 0, $hr);
-                    $inner = implode("\n", $inner);
-                }
-                return trim($inner) . "\n\n";
-        }
-        return $element->getValue();
-    }
-    /**
-     * @return string[]
-     */
-    public function getSupportedTags()
-    {
-        return array('table', 'tr', 'thead', 'td', 'tbody');
-    }
-}
diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
deleted file mode 100644
index 304f0cd02..000000000
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ /dev/null
@@ -1,147 +0,0 @@
-clean();
- * @endcode
- * What this does:
- * 1. extracts code blocks and privately escapes them from processing
- * 2. Run html purifier on the content
- * 3. put back the code blocks
- * 4. run htmlspecialchars on the entire content for safe storage
- *
- * At render time:
- * @code{.php}
- *    $markdown = \Zotlabs\Lib\MarkdownSoap::unescape($text);
- *    $html = \Michelf\MarkdownExtra::DefaultTransform($markdown);
- * @endcode
- */
-class MarkdownSoap
-{
-
-    /**
-     * @var string
-     */
-    private $str;
-    /**
-     * @var string
-     */
-    private $token;
-
-
-    public function __construct($s)
-    {
-        $this->str = $s;
-        $this->token = random_string(20);
-    }
-
-    public function clean()
-    {
-
-        $x = $this->extract_code($this->str);
-
-        $x = $this->purify($x);
-
-        $x = $this->putback_code($x);
-
-        $x = $this->escape($x);
-
-        return $x;
-    }
-
-    /**
-     * @brief Extracts code blocks and privately escapes them from processing.
-     *
-     * @param string $s
-     * @return string
-     * @see encode_code()
-     * @see putback_code()
-     *
-     */
-    public function extract_code($s)
-    {
-
-        $text = preg_replace_callback(
-            '{
-					(?:\n\n|\A\n?)
-					(	            # $1 = the code block -- one or more lines, starting with a space/tab
-					  (?>
-						[ ]{' . '4' . '}  # Lines must start with a tab or a tab-width of spaces
-						.*\n+
-					  )+
-					)
-					((?=^[ ]{0,' . '4' . '}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
-				}xm',
-            [$this, 'encode_code'],
-            $s
-        );
-
-        return $text;
-    }
-
-    public function encode_code($matches)
-    {
-        return $this->token . ';' . base64_encode($matches[0]) . ';';
-    }
-
-    public function decode_code($matches)
-    {
-        return base64_decode($matches[1]);
-    }
-
-    /**
-     * @brief Put back the code blocks.
-     *
-     * @param string $s
-     * @return string
-     * @see extract_code()
-     * @see decode_code()
-     *
-     */
-    public function putback_code($s)
-    {
-        $text = preg_replace_callback('{' . $this->token . '\;(.*?)\;}xm', [$this, 'decode_code'], $s);
-        return $text;
-    }
-
-    public function purify($s)
-    {
-        $s = $this->protect_autolinks($s);
-        $s = purify_html($s);
-        $s = $this->unprotect_autolinks($s);
-        return $s;
-    }
-
-    public function protect_autolinks($s)
-    {
-        $s = preg_replace('/\<(https?\:\/\/)(.*?)\>/', '[$1$2]($1$2)', $s);
-        return $s;
-    }
-
-    public function unprotect_autolinks($s)
-    {
-        return $s;
-    }
-
-    public function escape($s)
-    {
-        return htmlspecialchars($s, ENT_QUOTES, 'UTF-8', false);
-    }
-
-    /**
-     * @brief Converts special HTML entities back to characters.
-     *
-     * @param string $s
-     * @return string
-     */
-    public static function unescape($s)
-    {
-        return htmlspecialchars_decode($s, ENT_QUOTES);
-    }
-}
diff --git a/Zotlabs/Lib/MastAPI.php b/Zotlabs/Lib/MastAPI.php
deleted file mode 100644
index 3dd2237c4..000000000
--- a/Zotlabs/Lib/MastAPI.php
+++ /dev/null
@@ -1,109 +0,0 @@
- true]);
-        $ret['url'] = Channel::url($channel);
-        $ret['avatar'] = $channel['xchan_photo_l'];
-        $ret['avatar_static'] = $channel['xchan_photo_l'];
-        if ($cover_photo) {
-            $ret['header'] = $cover_photo['url'];
-            $ret['header_static'] = $cover_photo['url'];
-        }
-        $ret['followers_count'] = intval($followers[0]['total']);
-        $ret['following_count'] = intval($following[0]['total']);
-        $ret['statuses_count'] = intval($statuses[0]['total']);
-        $ret['last_status_at'] = datetime_convert('UTC', 'UTC', $channel['lastpost'], ATOM_TIME);
-
-
-        return $ret;
-    }
-
-    public static function format_site()
-    {
-
-        $register = intval(get_config('system', 'register_policy'));
-
-        $u = q("select count(channel_id) as total from channel where channel_removed = 0");
-        $i = q("select count(id) as total from item where item_origin = 1");
-        $s = q("select count(site_url) as total from site");
-
-        $admins = q("select * from channel left join account on account_id = channel_account_id where ( account_roles & 4096 ) > 0 and account_default_channel = channel_id");
-        $adminsx = Channel::from_id($admins[0]['channel_id']);
-
-
-        $ret = [];
-        $ret['uri'] = z_root();
-        $ret['title'] = System::get_site_name();
-        $ret['description'] = bbcode(get_config('system', 'siteinfo', ''), ['export' => true]);
-        $ret['email'] = get_config('system', 'admin_email');
-        $ret['version'] = System::get_project_version();
-        $ret['registrations'] = (($register) ? true : false);
-        $ret['approval_required'] = (($register === REGISTER_APPROVE) ? true : false);
-        $ret['invites_enabled'] = false;
-        $ret['urls'] = [];
-        $ret['stats'] = [
-            'user_count' => intval($u[0]['total']),
-            'status_count' => intval($i[0]['total']),
-            'domain_count' => intval($s[0]['total']),
-        ];
-
-        $ret['contact_account'] = self::format_channel($adminsx);
-
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Lib/Menu.php b/Zotlabs/Lib/Menu.php
deleted file mode 100644
index cb024c84a..000000000
--- a/Zotlabs/Lib/Menu.php
+++ /dev/null
@@ -1,367 +0,0 @@
- $r[0], 'items' => $x );
-        }
-
-        return null;
-    }
-
-    public static function element($channel, $menu)
-    {
-
-        $arr = [];
-        $arr['type'] = 'menu';
-        $arr['pagetitle'] = $menu['menu']['menu_name'];
-        $arr['desc'] = $menu['menu']['menu_desc'];
-        $arr['created'] = $menu['menu']['menu_created'];
-        $arr['edited'] = $menu['menu']['menu_edited'];
-
-        $arr['baseurl'] = z_root();
-        if ($menu['menu']['menu_flags']) {
-            $arr['flags'] = [];
-            if ($menu['menu']['menu_flags'] & MENU_BOOKMARK) {
-                $arr['flags'][] = 'bookmark';
-            }
-            if ($menu['menu']['menu_flags'] & MENU_SYSTEM) {
-                $arr['flags'][] = 'system';
-            }
-        }
-        if ($menu['items']) {
-            $arr['items'] = [];
-            foreach ($menu['items'] as $it) {
-                $entry = [];
-
-                $entry['link'] = str_replace(z_root() . '/channel/' . $channel['channel_address'], '[channelurl]', $it['mitem_link']);
-                $entry['link'] = str_replace(z_root() . '/page/' . $channel['channel_address'], '[pageurl]', $it['mitem_link']);
-                $entry['link'] = str_replace(z_root() . '/cloud/' . $channel['channel_address'], '[cloudurl]', $it['mitem_link']);
-                $entry['link'] = str_replace(z_root(), '[baseurl]', $it['mitem_link']);
-
-                $entry['desc'] = $it['mitem_desc'];
-                $entry['order'] = $it['mitem_order'];
-                if ($it['mitem_flags']) {
-                    $entry['flags'] = [];
-                    if ($it['mitem_flags'] & MENU_ITEM_ZID) {
-                        $entry['flags'][] = 'zid';
-                    }
-                    if ($it['mitem_flags'] & MENU_ITEM_NEWWIN) {
-                        $entry['flags'][] = 'new-window';
-                    }
-                    if ($it['mitem_flags'] & MENU_ITEM_CHATROOM) {
-                        $entry['flags'][] = 'chatroom';
-                    }
-                }
-                $arr['items'][] = $entry;
-            }
-        }
-
-        return $arr;
-    }
-
-
-
-    public static function render($menu, $class = '', $edit = false, $var = [])
-    {
-
-        if (! $menu) {
-            return '';
-        }
-
-        $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0);
-        if ((! $channel_id) && (local_channel())) {
-            $channel_id = local_channel();
-        }
-
-        $chan = Channel::from_id($channel_id);
-        if (! $chan) {
-            return '';
-        }
-
-        $menu_list = self::list($channel_id);
-        $menu_names = [];
-
-        foreach ($menu_list as $menus) {
-            if ($menus['menu_name'] != $menu['menu']['menu_name']) {
-                $menu_names[] = $menus['menu_name'];
-            }
-        }
-
-        for ($x = 0; $x < count($menu['items']); $x++) {
-            if (in_array($menu['items'][$x]['mitem_link'], $menu_names)) {
-                $m = self::fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash());
-                $submenu = self::render($m, 'dropdown-menu', $edit = false, array('wrap' => 'none'));
-                $menu['items'][$x]['submenu'] = $submenu;
-            }
-
-            if ($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID) {
-                $menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']);
-            }
-
-            if ($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN) {
-                $menu['items'][$x]['newwin'] = '1';
-            }
-
-            $menu['items'][$x]['mitem_desc'] = zidify_links(smilies(bbcode($menu['items'][$x]['mitem_desc'])));
-        }
-
-        $wrap = (($var['wrap'] === 'none') ? false : true);
-
-        $ret = replace_macros(Theme::get_template('usermenu.tpl'), array(
-            '$menu' => $menu['menu'],
-            '$class' => $class,
-            '$nick' => $chan['channel_address'],
-            '$edit' => (($edit) ? t("Edit") : ''),
-            '$id' => $menu['menu']['menu_id'],
-            '$items' => $menu['items'],
-            '$wrap' => $wrap
-        ));
-
-        return $ret;
-    }
-
-
-
-    public static function fetch_id($menu_id, $channel_id)
-    {
-
-        $r = q(
-            "select * from menu where menu_id = %d and menu_channel_id = %d limit 1",
-            intval($menu_id),
-            intval($channel_id)
-        );
-
-        return (($r) ? $r[0] : false);
-    }
-
-
-
-    public static function create($arr)
-    {
-        $menu_name = trim(escape_tags($arr['menu_name']));
-        $menu_desc = trim(escape_tags($arr['menu_desc']));
-        $menu_flags = intval($arr['menu_flags']);
-
-        //allow menu_desc (title) to be empty
-        //if(! $menu_desc)
-        //  $menu_desc = $menu_name;
-
-        if (! $menu_name) {
-            return false;
-        }
-
-        if (! $menu_flags) {
-            $menu_flags = 0;
-        }
-
-
-        $menu_channel_id = intval($arr['menu_channel_id']);
-
-        $r = q(
-            "select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
-            dbesc($menu_name),
-            intval($menu_channel_id)
-        );
-
-        if ($r) {
-            return false;
-        }
-
-        $t = datetime_convert();
-
-        $r = q(
-            "insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id, menu_created, menu_edited ) 
-    		values( '%s', '%s', %d, %d, '%s', '%s' )",
-            dbesc($menu_name),
-            dbesc($menu_desc),
-            intval($menu_flags),
-            intval($menu_channel_id),
-            dbesc(datetime_convert('UTC', 'UTC', (($arr['menu_created']) ? $arr['menu_created'] : $t))),
-            dbesc(datetime_convert('UTC', 'UTC', (($arr['menu_edited']) ? $arr['menu_edited'] : $t)))
-        );
-        if (! $r) {
-            return false;
-        }
-
-        $r = q(
-            "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
-            dbesc($menu_name),
-            intval($menu_channel_id)
-        );
-        if ($r) {
-            return $r[0]['menu_id'];
-        }
-        return false;
-    }
-
-    /**
-     * If $flags is present, check that all the bits in $flags are set
-     * so that MENU_SYSTEM|MENU_BOOKMARK will return entries with both
-     * bits set. We will use this to find system generated bookmarks.
-     */
-
-    public static function list($channel_id, $name = '', $flags = 0)
-    {
-
-        $sel_options = '';
-        $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : '');
-        $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : '');
-
-        $r = q(
-            "select * from menu where menu_channel_id = %d $sel_options order by menu_desc",
-            intval($channel_id)
-        );
-        return $r;
-    }
-
-    public static function list_count($channel_id, $name = '', $flags = 0)
-    {
-
-        $sel_options = '';
-        $sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : '');
-        $sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : '');
-
-        $r = q(
-            "select count(*) as total from menu where menu_channel_id = %d $sel_options",
-            intval($channel_id)
-        );
-        return $r[0]['total'];
-    }
-
-    public static function edit($arr)
-    {
-
-        $menu_id   = intval($arr['menu_id']);
-
-        $menu_name = trim(escape_tags($arr['menu_name']));
-        $menu_desc = trim(escape_tags($arr['menu_desc']));
-        $menu_flags = intval($arr['menu_flags']);
-
-        //allow menu_desc (title) to be empty
-        //if(! $menu_desc)
-        //  $menu_desc = $menu_name;
-
-        if (! $menu_name) {
-            return false;
-        }
-
-        if (! $menu_flags) {
-            $menu_flags = 0;
-        }
-
-
-        $menu_channel_id = intval($arr['menu_channel_id']);
-
-        $r = q(
-            "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
-            dbesc($menu_name),
-            intval($menu_channel_id)
-        );
-        if (($r) && ($r[0]['menu_id'] != $menu_id)) {
-            logger('menu_edit: duplicate menu name for channel ' . $menu_channel_id);
-            return false;
-        }
-
-        $r = q(
-            "select * from menu where menu_id = %d and menu_channel_id = %d limit 1",
-            intval($menu_id),
-            intval($menu_channel_id)
-        );
-        if (! $r) {
-            logger('menu_edit: not found: ' . print_r($arr, true));
-            return false;
-        }
-
-        return q(
-            "update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d, menu_edited = '%s'
-    		where menu_id = %d and menu_channel_id = %d",
-            dbesc($menu_name),
-            dbesc($menu_desc),
-            intval($menu_flags),
-            dbesc(datetime_convert()),
-            intval($menu_id),
-            intval($menu_channel_id)
-        );
-    }
-
-    public static function delete($menu_name, $uid)
-    {
-        $r = q(
-            "select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
-            dbesc($menu_name),
-            intval($uid)
-        );
-
-        if ($r) {
-            return self::delete_id($r[0]['menu_id'], $uid);
-        }
-        return false;
-    }
-
-    public static function delete_id($menu_id, $uid)
-    {
-        $r = q(
-            "select menu_id from menu where menu_id = %d and menu_channel_id = %d limit 1",
-            intval($menu_id),
-            intval($uid)
-        );
-        if ($r) {
-            $x = q(
-                "delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d",
-                intval($menu_id),
-                intval($uid)
-            );
-            return q(
-                "delete from menu where menu_id = %d and menu_channel_id = %d",
-                intval($menu_id),
-                intval($uid)
-            );
-        }
-        return false;
-    }
-
-    public static function sync_packet($uid, $observer_hash, $menu_id, $delete = false)
-    {
-        $r = self::fetch_id($menu_id, $uid);
-        $c = Channel::from_id($uid);
-        if ($r) {
-            $m = self::fetch($r['menu_name'], $uid, $observer_hash);
-            if ($m) {
-                if ($delete) {
-                    $m['menu_delete'] = 1;
-                }
-                Libsync::build_sync_packet($uid, array('menu' => array(menu_element($c, $m))));
-            }
-        }
-    }
-
-}
diff --git a/Zotlabs/Lib/MenuItem.php b/Zotlabs/Lib/MenuItem.php
deleted file mode 100644
index fb9f36b8a..000000000
--- a/Zotlabs/Lib/MenuItem.php
+++ /dev/null
@@ -1,122 +0,0 @@
-set_from_array($arr);
-        $p = $acl->get();
-
-        $r = q(
-            "insert into menu_item ( mitem_link, mitem_desc, mitem_flags, allow_cid, allow_gid, deny_cid, deny_gid, mitem_channel_id, mitem_menu_id, mitem_order ) values ( '%s', '%s', %d, '%s', '%s', '%s', '%s', %d, %d, %d ) ",
-            dbesc($mitem_link),
-            dbesc($mitem_desc),
-            intval($mitem_flags),
-            dbesc($p['allow_cid']),
-            dbesc($p['allow_gid']),
-            dbesc($p['deny_cid']),
-            dbesc($p['deny_gid']),
-            intval($uid),
-            intval($menu_id),
-            intval($mitem_order)
-        );
-
-        $x = q(
-            "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
-            dbesc(datetime_convert()),
-            intval($menu_id),
-            intval($uid)
-        );
-
-        return $r;
-    }
-
-    public static function edit($menu_id, $uid, $arr)
-    {
-
-
-        $mitem_id = intval($arr['mitem_id']);
-        $mitem_link = escape_tags($arr['mitem_link']);
-        $mitem_desc = escape_tags($arr['mitem_desc']);
-        $mitem_order = intval($arr['mitem_order']);
-        $mitem_flags = intval($arr['mitem_flags']);
-
-
-        if (local_channel() == $uid) {
-            $channel = App::get_channel();
-        }
-
-        $acl = new AccessControl($channel);
-        $acl->set_from_array($arr);
-        $p = $acl->get();
-
-
-        $r = q(
-            "update menu_item set mitem_link = '%s', mitem_desc = '%s', mitem_flags = %d, allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', mitem_order = %d  where mitem_channel_id = %d and mitem_menu_id = %d and mitem_id = %d",
-            dbesc($mitem_link),
-            dbesc($mitem_desc),
-            intval($mitem_flags),
-            dbesc($p['allow_cid']),
-            dbesc($p['allow_gid']),
-            dbesc($p['deny_cid']),
-            dbesc($p['deny_gid']),
-            intval($mitem_order),
-            intval($uid),
-            intval($menu_id),
-            intval($mitem_id)
-        );
-
-        $x = q(
-            "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
-            dbesc(datetime_convert()),
-            intval($menu_id),
-            intval($uid)
-        );
-
-        return $r;
-    }
-
-
-
-
-    public static function delete($menu_id, $uid, $item_id)
-    {
-        $r = q(
-            "delete from menu_item where mitem_menu_id = %d and mitem_channel_id = %d and mitem_id = %d",
-            intval($menu_id),
-            intval($uid),
-            intval($item_id)
-        );
-
-        $x = q(
-            "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
-            dbesc(datetime_convert()),
-            intval($menu_id),
-            intval($uid)
-        );
-
-        return $r;
-    }
-
-}
diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php
deleted file mode 100644
index f61e240aa..000000000
--- a/Zotlabs/Lib/MessageFilter.php
+++ /dev/null
@@ -1,96 +0,0 @@
-$(document).ready(function() { $("#nav-search-text").search_autocomplete(\'' . z_root() . '/acloader' . '\');});';
-
-        $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false);
-
-        if (local_channel()) {
-            $channel = App::get_channel();
-            $observer = App::get_observer();
-            $prof = q(
-                "select id from profile where uid = %d and is_default = 1",
-                intval($channel['channel_id'])
-            );
-
-            if (! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) {
-                $chans = q(
-                    "select channel_name, channel_id from channel left join pconfig on channel_id = pconfig.uid where channel_account_id = %d and channel_removed = 0 and pconfig.cat = 'system' and pconfig.k = 'include_in_menu' and pconfig.v = '1' order by channel_name ",
-                    intval(get_account_id())
-                );
-                if (is_site_admin() && intval(get_pconfig($site_channel['channel_id'], 'system', 'include_in_menu'))) {
-                    $chans = array_merge([$site_channel], $chans);
-                }
-            }
-
-            $sitelocation = (($is_owner) ? '' : App::$profile['reddress']);
-        } elseif (remote_channel()) {
-            $observer = App::get_observer();
-            $sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname());
-        }
-
-        require_once('include/conversation.php');
-
-
-        $channel_apps[] = ((isset(App::$profile)) ? self::channel_apps($is_owner, App::$profile['channel_address']) : []);
-
-        $site_icon = System::get_site_icon();
-
-        $banner = EMPTY_STR;
-    
-//        $banner = System::get_site_name();
-//        if (! isset(App::$page['header'])) {
-//            App::$page['header'] = EMPTY_STR;
-//        }
-        App::$page['header'] .= replace_macros(Theme::get_template('hdr.tpl'), array(
-            //we could additionally use this to display important system notifications e.g. for updates
-        ));
-
-
-        // nav links: array of array('href', 'text', 'extra css classes', 'title')
-        $nav = [];
-
-        if (can_view_public_stream()) {
-            $nav['pubs'] = true;
-        }
-
-        /**
-         * Display login or logout
-         */
-
-        $nav['usermenu'] = [];
-        $userinfo = null;
-        $nav['loginmenu'] = [];
-
-        if ($observer) {
-            $userinfo = [
-                'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']),
-                'name' => $observer['xchan_addr'],
-            ];
-        } elseif (! $_SESSION['authenticated']) {
-            $nav['remote_login'] = Channel::remote_login();
-            $nav['loginmenu'][] = array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn');
-        }
-
-        if (local_channel()) {
-            if (! (isset($_SESSION['delegate']) && $_SESSION['delegate'])) {
-                $nav['manage'] = array('manage', t('Channels'), "", t('Manage your channels'),'manage_nav_btn');
-            }
-
-            $nav['group'] = array('lists', t('Lists'),"", t('Manage your access lists'),'group_nav_btn');
-
-            $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn');
-
-            $nav['safe'] = array('safe', t('Safe Mode'), ((get_safemode()) ? t('(is on)') : t('(is off)')) , t('Content filtering'),'safe_nav_btn');
-
-
-            if ($chans && count($chans) > 0) {
-                $nav['channels'] = $chans;
-            }
-
-            $nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
-
-            // user menu
-            $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((App::$nav_sel['raw_name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn'];
-
-            if (Features::enabled(local_channel(), 'multi_profiles')) {
-                $nav['usermenu'][]   = ['profiles', t('Edit Profiles'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn'];
-            } else {
-                $nav['usermenu'][]   = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn'];
-            }
-        } else {
-            if (! get_account_id()) {
-                if (App::$module === 'channel') {
-                    $nav['login'] = login(true, 'navbar-login', false, false);
-                    $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),''];
-                } else {
-                    $nav['login'] = login(true, 'navbar-login', false, false);
-                    $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn'];
-                    App::$page['content'] .= replace_macros(
-                        Theme::get_template('nav_login.tpl'),
-                        [
-                            '$nav' => $nav,
-                            'userinfo' => $userinfo
-                        ]
-                    );
-                }
-            } else {
-                $nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
-            }
-        }
-
-        $my_url = Channel::get_my_url();
-        if (! $my_url) {
-            $observer = App::get_observer();
-            $my_url = (($observer) ? $observer['xchan_url'] : '');
-        }
-
-        $homelink_arr = parse_url($my_url);
-        $homelink = $homelink_arr['scheme'] . '://' . $homelink_arr['host'];
-
-        if (! $is_owner) {
-            $nav['rusermenu'] = array(
-                $homelink,
-                t('Take me home'),
-                'logout',
-                ((local_channel()) ? t('Logout') : t('Log me out of this site'))
-            );
-        }
-
-        if (((get_config('system', 'register_policy') == REGISTER_OPEN) || (get_config('system', 'register_policy') == REGISTER_APPROVE)) && (! $_SESSION['authenticated'])) {
-            $nav['register'] = ['register',t('Register'), "", t('Create an account'),'register_nav_btn'];
-        }
-
-        if (! get_config('system', 'hide_help', true)) {
-            $help_url = z_root() . '/help?f=&cmd=' . App::$cmd;
-            $context_help = '';
-            $enable_context_help = ((intval(get_config('system', 'enable_context_help')) === 1 || get_config('system', 'enable_context_help') === false) ? true : false);
-            if ($enable_context_help === true) {
-                require_once('include/help.php');
-                $context_help = load_context_help();
-                //point directly to /help if $context_help is empty - this can be removed once we have context help for all modules
-                $enable_context_help = (($context_help) ? true : false);
-            }
-            $nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help];
-        }
-
-
-        $search_form_action = 'search';
-
-
-        $nav['search'] = ['search', t('Search'), "", t('Search site @name, #tag, ?doc, content'), $search_form_action];
-
-        /**
-         * Admin page
-         */
-        if (is_site_admin()) {
-            $nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'),'admin_nav_btn');
-        }
-
-        $x = array('nav' => $nav, 'usermenu' => $userinfo );
-
-        Hook::call('nav', $x);
-
-        // Not sure the best place to put this on the page. So I'm implementing it but leaving it
-        // turned off until somebody discovers this and figures out a good location for it.
-        $powered_by = '';
-
-        if (App::$profile_uid && App::$nav_sel['raw_name']) {
-            $active_app = q(
-                "SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1",
-                intval(App::$profile_uid),
-                dbesc(App::$nav_sel['raw_name'])
-            );
-
-            if ($active_app) {
-                $url = $active_app[0]['app_url'];
-            }
-        }
-
-        $pinned_list = [];
-        $syslist = [];
-
-        //app bin
-        if ($is_owner) {
-            if (get_pconfig(local_channel(), 'system', 'import_system_apps') !== datetime_convert('UTC', 'UTC', 'now', 'Y-m-d')) {
-                Apps::import_system_apps();
-                set_pconfig(local_channel(), 'system', 'import_system_apps', datetime_convert('UTC', 'UTC', 'now', 'Y-m-d'));
-            }
-
-            $list = Apps::app_list(local_channel(), false, [ 'nav_pinned_app' ]);
-            if ($list) {
-                foreach ($list as $li) {
-                    $pinned_list[] = Apps::app_encode($li);
-                }
-            }
-            Apps::translate_system_apps($pinned_list);
-
-            usort($pinned_list, 'Zotlabs\\Lib\\Apps::app_name_compare');
-
-            $pinned_list = Apps::app_order(local_channel(), $pinned_list, 'nav_pinned_app');
-
-
-            $syslist = [];
-            $list = Apps::app_list(local_channel(), false, [ 'nav_featured_app' ]);
-
-            if ($list) {
-                foreach ($list as $li) {
-                    $syslist[] = Apps::app_encode($li);
-                }
-            }
-            Apps::translate_system_apps($syslist);
-        } else {
-            $syslist = Apps::get_system_apps(true);
-        }
-
-        usort($syslist, 'Zotlabs\\Lib\\Apps::app_name_compare');
-
-        $syslist = Apps::app_order(local_channel(), $syslist, 'nav_featured_app');
-
-
-        if ($pinned_list) {
-            foreach ($pinned_list as $app) {
-                if (App::$nav_sel['name'] == $app['name']) {
-                    $app['active'] = true;
-                }
-
-                if ($is_owner) {
-                    $navbar_apps[] = Apps::app_render($app, 'navbar');
-                } elseif (! $is_owner && strpos($app['requires'], 'local_channel') === false) {
-                    $navbar_apps[] = Apps::app_render($app, 'navbar');
-                }
-            }
-        }
-
-        if ($syslist) {
-            foreach ($syslist as $app) {
-                if (App::$nav_sel['name'] == $app['name']) {
-                    $app['active'] = true;
-                }
-
-                if ($is_owner) {
-                    $nav_apps[] = Apps::app_render($app, 'nav');
-                } elseif (! $is_owner && strpos($app['requires'], 'local_channel') === false) {
-                    $nav_apps[] = Apps::app_render($app, 'nav');
-                }
-            }
-        }
-
-        $c = Theme::include('navbar_' . purify_filename($template) . '.css');
-        $tpl = Theme::get_template('navbar_' . purify_filename($template) . '.tpl');
-
-        if ($c && $tpl) {
-            Head::add_css('navbar_' . $template . '.css');
-        }
-
-        if (! $tpl) {
-            $tpl = Theme::get_template('navbar_default.tpl');
-        }
-
-        App::$page['nav'] .= replace_macros($tpl, array(
-            '$baseurl' => z_root(),
-            '$site_home' => Channel::url($site_channel),
-            '$project_icon' => $site_icon,
-            '$project_title' => t('Powered by $Projectname'),
-            '$fulldocs' => t('Help'),
-            '$sitelocation' => $sitelocation,
-            '$nav' => $x['nav'],
-            '$banner' =>  $banner,
-            '$emptynotifications' => t('Loading'),
-            '$userinfo' => $x['usermenu'],
-            '$localuser' => local_channel(),
-            '$is_owner' => $is_owner,
-            '$sel' => App::$nav_sel,
-            '$powered_by' => $powered_by,
-            '$asidetitle' => t('Side Panel'),
-            '$help' => t('@name, #tag, ?doc, content'),
-            '$pleasewait' => t('Please wait...'),
-            '$nav_apps' => ((isset($nav_apps)) ? $nav_apps : []),
-            '$navbar_apps' => ((isset($navbar_apps)) ? $navbar_apps : []),
-            '$channel_menu' => get_pconfig(App::$profile_uid, 'system', 'channel_menu', get_config('system', 'channel_menu')),
-            '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''),
-            '$channel_apps' => ((isset($channel_apps)) ? $channel_apps : []),
-            '$manageapps' => t('Installed Apps'),
-            '$appstitle' => t('Apps'),
-            '$addapps' => t('Available Apps'),
-            '$orderapps' => t('Arrange Apps'),
-            '$sysapps_toggle' => t('Toggle System Apps'),
-            '$notificationstitle' => t('Notifications'),
-            '$url' => ((isset($url) && $url) ? $url : App::$cmd)
-        ));
-
-        if (x($_SESSION, 'reload_avatar') && $observer) {
-            // The avatar has been changed on the server but the browser doesn't know that,
-            // force the browser to reload the image from the server instead of its cache.
-            $tpl = Theme::get_template('force_image_reload.tpl');
-
-            App::$page['nav'] .= replace_macros($tpl, array(
-                '$imgUrl' => $observer['xchan_photo_m']
-            ));
-            unset($_SESSION['reload_avatar']);
-        }
-
-        Hook::call('page_header', App::$page['nav']);
-    }
-
-    /*
-     * Set a menu item in navbar as selected
-     *
-     */
-    public static function set_selected($item)
-    {
-        App::$nav_sel['raw_name'] = $item;
-        $item = ['name' => $item];
-        Apps::translate_system_apps($item);
-        App::$nav_sel['name'] = $item['name'];
-    }
-
-    public static function channel_apps($is_owner = false, $nickname = null)
-    {
-
-        // Don't provide any channel apps if we're running as the sys channel
-
-        if (App::$is_sys) {
-            return '';
-        }
-
-
-        $channel = App::get_channel();
-
-        if ($channel && is_null($nickname)) {
-            $nickname = $channel['channel_address'];
-        }
-
-        $uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel());
-        $account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']);
-
-        if (! get_pconfig($uid, 'system', 'channelapps', '1')) {
-            return '';
-        }
-
-        if ($uid == local_channel()) {
-            return;
-        } else {
-            $cal_link = '/cal/' . $nickname;
-        }
-
-        $sql_options = item_permissions_sql($uid);
-
-        $r = q(
-            "select item.* from item left join iconfig on item.id = iconfig.iid
-    		where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' 
-    		and item.item_delayed = 0 and item.item_deleted = 0 
-    		and ( iconfig.k = 'WEBPAGE' and item_type = %d ) 
-    		$sql_options limit 1",
-            intval($uid),
-            dbesc('home'),
-            intval(ITEM_TYPE_WEBPAGE)
-        );
-
-        $has_webpages = (($r) ? true : false);
-
-        if (x($_GET, 'tab')) {
-            $tab = notags(trim($_GET['tab']));
-        }
-
-        $url = z_root() . '/channel/' . $nickname;
-        $pr  = z_root() . '/profile/' . $nickname;
-
-        $tabs = [
-            [
-                'label' => t('Channel'),
-                'url'   => $url,
-                'sel'   => ((argv(0) == 'channel') ? 'active' : ''),
-                'title' => t('Status Messages and Posts'),
-                'id'    => 'status-tab',
-                'icon'  => 'home'
-            ],
-        ];
-
-        $p = get_all_perms($uid, get_observer_hash());
-
-        if ($p['view_profile']) {
-            $tabs[] = [
-                'label' => t('About'),
-                'url'   => $pr,
-                'sel'   => ((argv(0) == 'profile') ? 'active' : ''),
-                'title' => t('Profile Details'),
-                'id'    => 'profile-tab',
-                'icon'  => 'user'
-            ];
-        }
-        if ($p['view_storage']) {
-            $tabs[] = [
-                'label' => t('Photos'),
-                'url'   => z_root() . '/photos/' . $nickname,
-                'sel'   => ((argv(0) == 'photos') ? 'active' : ''),
-                'title' => t('Photo Albums'),
-                'id'    => 'photo-tab',
-                'icon'  => 'photo'
-            ];
-            $tabs[] = [
-                'label' => t('Files'),
-                'url'   => z_root() . '/cloud/' . $nickname,
-                'sel'   => ((argv(0) == 'cloud' || argv(0) == 'sharedwithme') ? 'active' : ''),
-                'title' => t('Files and Storage'),
-                'id'    => 'files-tab',
-                'icon'  => 'folder-open'
-            ];
-        }
-
-        if ($p['view_stream'] && $cal_link) {
-            $tabs[] = [
-                'label' => t('Calendar'),
-                'url'   => z_root() . $cal_link,
-                'sel'   => ((argv(0) == 'cal') ? 'active' : ''),
-                'title' => t('Calendar'),
-                'id'    => 'event-tab',
-                'icon'  => 'calendar'
-            ];
-        }
-
-
-        if ($p['chat'] && Apps::system_app_installed($uid, 'Chatrooms')) {
-            $has_chats = Chatroom::list_count($uid);
-            if ($has_chats) {
-                $tabs[] = [
-                    'label' => t('Chatrooms'),
-                    'url'   => z_root() . '/chat/' . $nickname,
-                    'sel'   => ((argv(0) == 'chat') ? 'active' : '' ),
-                    'title' => t('Chatrooms'),
-                    'id'    => 'chat-tab',
-                    'icon'  => 'comments-o'
-                ];
-            }
-        }
-
-        $has_bookmarks = Menu::list_count(local_channel(), '', MENU_BOOKMARK) + Menu::list_count(local_channel(), '', MENU_SYSTEM | MENU_BOOKMARK);
-        if ($is_owner && $has_bookmarks) {
-            $tabs[] = [
-                'label' => t('Bookmarks'),
-                'url'   => z_root() . '/bookmarks',
-                'sel'   => ((argv(0) == 'bookmarks') ? 'active' : ''),
-                'title' => t('Saved Bookmarks'),
-                'id'    => 'bookmarks-tab',
-                'icon'  => 'bookmark'
-            ];
-        }
-
-        if ($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) {
-            $tabs[] = [
-                'label' => t('Cards'),
-                'url'   => z_root() . '/cards/' . $nickname ,
-                'sel'   => ((argv(0) == 'cards') ? 'active' : ''),
-                'title' => t('View Cards'),
-                'id'    => 'cards-tab',
-                'icon'  => 'list'
-            ];
-        }
-
-        if ($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) {
-            $tabs[] = [
-                'label' => t('Articles'),
-                'url'   => z_root() . '/articles/' . $nickname ,
-                'sel'   => ((argv(0) == 'articles') ? 'active' : ''),
-                'title' => t('View Articles'),
-                'id'    => 'articles-tab',
-                'icon'  => 'file-text-o'
-            ];
-        }
-
-
-        if ($has_webpages && Apps::system_app_installed($uid, 'Webpages')) {
-            $tabs[] = [
-                'label' => t('Webpages'),
-                'url'   => z_root() . '/page/' . $nickname . '/home',
-                'sel'   => ((argv(0) == 'webpages') ? 'active' : ''),
-                'title' => t('View Webpages'),
-                'id'    => 'webpages-tab',
-                'icon'  => 'newspaper-o'
-            ];
-        }
-
-
-        if ($p['view_wiki'] && Apps::system_app_installed($uid, 'Wiki')) {
-            $tabs[] = [
-                'label' => t('Wikis'),
-                'url'   => z_root() . '/wiki/' . $nickname,
-                'sel'   => ((argv(0) == 'wiki') ? 'active' : ''),
-                'title' => t('Wiki'),
-                'id'    => 'wiki-tab',
-                'icon'  => 'pencil-square-o'
-            ];
-        }
-
-        $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
-
-        Hook::call('channel_apps', $arr);
-
-        return replace_macros(
-            Theme::get_template('profile_tabs.tpl'),
-            [
-                '$tabs'  => $arr['tabs'],
-                '$name'  => App::$profile['channel_name'],
-                '$thumb' => App::$profile['thumb'],
-            ]
-        );
-    }
-
-
-}
diff --git a/Zotlabs/Lib/Nodeinfo.php b/Zotlabs/Lib/Nodeinfo.php
deleted file mode 100644
index 65d5c78a5..000000000
--- a/Zotlabs/Lib/Nodeinfo.php
+++ /dev/null
@@ -1,41 +0,0 @@
-' . $result['url'] . '';
-        }
-
-        $j = self::fetch_url($result['url']);
-        $s = self::format_object($j);
-        return $s;
-    }
-
-
-    public static function action($embedurl)
-    {
-
-        $host = '';
-        $action = 'filter';
-
-        $embedurl = trim(str_replace('&', '&', $embedurl));
-
-        //logger('oembed_action: ' . $embedurl, LOGGER_DEBUG, LOG_INFO);
-
-        if (strpos($embedurl, 'http://') === 0) {
-            if (intval(get_config('system', 'embed_sslonly'))) {
-                $action = 'block';
-            }
-        }
-
-        if (strpos($embedurl, '.well-known') !== false) {
-            $action = 'block';
-        }
-
-
-        // site allow/deny list
-
-        if (($x = get_config('system', 'embed_deny'))) {
-            if (($x) && (! is_array($x))) {
-                $x = explode("\n", $x);
-            }
-            if ($x) {
-                foreach ($x as $ll) {
-                    $t = trim($ll);
-                    if (($t) && (strpos($embedurl, $t) !== false)) {
-                        $action = 'block';
-                        break;
-                    }
-                }
-            }
-        }
-
-        $found = false;
-
-        if (($x = get_config('system', 'embed_allow'))) {
-            if (($x) && (! is_array($x))) {
-                $x = explode("\n", $x);
-            }
-            if ($x) {
-                foreach ($x as $ll) {
-                    $t = trim($ll);
-                    if (($t) && (strpos($embedurl, $t) !== false) && ($action !== 'block')) {
-                        $found = true;
-                        $action = 'allow';
-                        break;
-                    }
-                }
-            }
-            if ((! $found) && ($action !== 'block')) {
-                $action = 'filter';
-            }
-        }
-
-        // allow individual members to block something that wasn't blocked already.
-        // They cannot over-ride the site to allow or change the filtering on an
-        // embed that is not allowed by the site admin.
-
-        if (local_channel()) {
-            if (($x = get_pconfig(local_channel(), 'system', 'embed_deny'))) {
-                if (($x) && (! is_array($x))) {
-                    $x = explode("\n", $x);
-                }
-                if ($x) {
-                    foreach ($x as $ll) {
-                        $t = trim($ll);
-                        if (($t) && (strpos($embedurl, $t) !== false)) {
-                            $action = 'block';
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        $arr = array('url' => $embedurl, 'action' => $action);
-        Hook::call('oembed_action', $arr);
-
-        //logger('action: ' . $arr['action'] . ' url: ' . $arr['url'], LOGGER_DEBUG,LOG_DEBUG);
-
-        return $arr;
-    }
-
-    // if the url is embeddable with oembed, return the bbcode link.
-
-    public static function process($url)
-    {
-
-        $j = self::fetch_url($url);
-        logger('oembed_process: ' . print_r($j, true), LOGGER_DATA, LOG_DEBUG);
-        if ($j && $j['type'] !== 'error') {
-            return '[embed]' . $url . '[/embed]';
-        }
-        return false;
-    }
-
-
-
-    public static function fetch_url($embedurl)
-    {
-
-        $noexts = [ '.mp3', '.mp4', '.ogg', '.ogv', '.oga', '.ogm', '.webm', '.opus', '.m4a', '.mov' ];
-
-        $result = self::action($embedurl);
-
-        $embedurl = $result['url'];
-        $action = $result['action'];
-
-        foreach ($noexts as $ext) {
-            if (strpos(strtolower($embedurl), $ext) !== false) {
-                $action = 'block';
-            }
-        }
-
-        $txt = null;
-
-        // we should try to cache this and avoid a lookup on each render
-        $is_matrix = is_matrix_url($embedurl);
-
-        $zrl = ((get_config('system', 'oembed_zrl')) ? $is_matrix : false);
-
-        $furl = ((local_channel() && $zrl) ? zid($embedurl) : $embedurl);
-
-        if ($action !== 'block' && (! get_config('system', 'oembed_cache_disable'))) {
-            $txt = Cache::get('[' . App::$videowidth . '] ' . $furl);
-        }
-
-        if (strpos(strtolower($embedurl), '.pdf') !== false && get_config('system', 'inline_pdf')) {
-            $action = 'allow';
-            $j = [
-                'html' => '',
-                'title' => t('View PDF'),
-                'type' => 'pdf'
-            ];
-
-            // set $txt to something so that we don't attempt to fetch what could be a lengthy pdf.
-            $txt = EMPTY_STR;
-        }
-
-        if (is_null($txt)) {
-            $txt = "";
-
-            if ($action !== 'block') {
-                // try oembed autodiscovery
-                $redirects = 0;
-                $result = z_fetch_url(
-                    $furl,
-                    false,
-                    $redirects,
-                    [
-                        'timeout'        => 30,
-                        'accept_content' => "text/*",
-                        'novalidate'     => true,
-                        'session'        => ((local_channel() && $zrl) ? true : false)
-                    ]
-                );
-
-                if ($result['success']) {
-                    $html_text = $result['body'];
-                } else {
-                    logger('fetch failure: ' . $furl);
-                }
-
-                if ($html_text) {
-                    $dom = new DOMDocument();
-                    @$dom->loadHTML($html_text);
-                    if ($dom) {
-                        $xpath = new DOMXPath($dom);
-                        $attr = "oembed";
-                        $xattr = self::build_xpath("class", "oembed");
-
-                        $entries = $xpath->query("//link[@type='application/json+oembed']");
-                        foreach ($entries as $e) {
-                            $href = $e->getAttributeNode("href")->nodeValue;
-
-                            $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth);
-                            if ($x['success']) {
-                                $txt = $x['body'];
-                            } else {
-                                logger('fetch failed: ' . $href);
-                            }
-                            break;
-                        }
-                        // soundcloud is now using text/json+oembed instead of application/json+oembed,
-                        // others may be also
-                        $entries = $xpath->query("//link[@type='text/json+oembed']");
-                        foreach ($entries as $e) {
-                            $href = $e->getAttributeNode("href")->nodeValue;
-                            $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth);
-                            if ($x['success']) {
-                                $txt = $x['body'];
-                            } else {
-                                logger('json fetch failed: ' . $href);
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if ($txt == false || $txt == "") {
-                $x = array('url' => $embedurl,'videowidth' => App::$videowidth);
-                Hook::call('oembed_probe', $x);
-                if (array_key_exists('embed', $x)) {
-                    $txt = $x['embed'];
-                }
-            }
-
-            $txt = trim($txt);
-
-            if ($txt[0] != "{") {
-                $txt = '{"type":"error"}';
-            }
-
-            // save in cache
-
-            if (! get_config('system', 'oembed_cache_disable')) {
-                Cache::set('[' . App::$videowidth . '] ' . $furl, $txt);
-            }
-        }
-
-
-        if (! $j) {
-            $j = json_decode($txt, true);
-        }
-
-        if (! $j) {
-            $j = [];
-        }
-
-        if ($action === 'filter') {
-            if ($j['html']) {
-                $orig = $j['html'];
-                $allow_position = (($is_matrix) ? true : false);
-
-                // some sites (e.g. Mastodon) wrap their entire embed in an iframe
-                // which we will purify away and which we provide anyway.
-                // So if we see this, grab the frame src url and use that
-                // as the embed content - which will still need to be purified.
-
-                if (preg_match('#\";
-        switch ($j['type']) {
-            case "video": {
-                if (isset($j['thumbnail_url'])) {
-                    $tw = (isset($j['thumbnail_width'])) ? $j['thumbnail_width'] : 200;
-                    $th = (isset($j['thumbnail_height'])) ? $j['thumbnail_height'] : 180;
-                    $tr = $tw / $th;
-
-                    $th = 120;
-                    $tw = $th * $tr;
-                    $tpl = Theme::get_template('oembed_video.tpl');
-
-                    $ret .= replace_macros($tpl, array(
-                        '$baseurl' => z_root(),
-                        '$embedurl' => $embedurl,
-                        '$escapedhtml' => base64_encode($jhtml),
-                        '$tw' => $tw,
-                        '$th' => $th,
-                        '$turl' => $j['thumbnail_url'],
-                    ));
-                } else {
-                    $ret = $jhtml;
-                }
-                $ret .= "
            ";
-            }
-                break;
-            case "photo": {
-                $ret .= "";
-                $ret .= "
            ";
-            }
-                break;
-            case "link": {
-                if ($j['thumbnail_url']) {
-                    if (is_matrix_url($embedurl)) {
-                        $embedurl = zid($embedurl);
-                        $j['thumbnail_url'] = zid($j['thumbnail_url']);
-                    }
-                    $ret = 'thumbnail

            ';
-                }
-
-                //$ret = "".$j['title']."";
-            }
-                break;
-            case 'pdf': {
-                $ret = $j['html'];
-                break;
-            }
-
-            case "rich":
-                if ($j['zrl']) {
-                    $ret = ((preg_match('/^]+>(.*?)<\/div>$/is', $j['html'], $o)) ? $o[1] : $j['html']);
-                } else {
-                    $ret .= $jhtml;
-                }
-                break;
-        }
-
-        // add link to source if not present in "rich" type
-        if ($j['type'] != 'rich' || !strpos($j['html'], $embedurl)) {
-            $embedlink = (isset($j['title'])) ? $j['title'] : $embedurl;
-            $ret .= '
            ' . "$embedlink";
-            $ret .= "
            ";
-            if (isset($j['author_name'])) {
-                $ret .= t(' by ') . $j['author_name'];
-            }
-            if (isset($j['provider_name'])) {
-                $ret .= t(' on ') . $j['provider_name'];
-            }
-        } else {
-            // add  for html2bbcode conversion
-            $ret .= "
            $embedurl";
-        }
-        $ret .= "
            ";
-        return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
-    }
-
-    public static function iframe($src, $width, $height)
-    {
-        $scroll = ' scrolling="no" ';
-        if (! $width || strstr($width, '%')) {
-            $width = '640';
-            $scroll = ' scrolling="auto" ';
-        }
-        if (! $height || strstr($height, '%')) {
-            $height = '300';
-            $scroll = ' scrolling="auto" ';
-        }
-
-        // try and leave some room for the description line.
-        $height = intval($height) + 80;
-        $width  = intval($width) + 40;
-
-        $s = z_root() . '/oembed/' . base64url_encode($src);
-
-        // Make sure any children are sandboxed within their own iframe.
-
-        return '';
-    }
-
-
-
-    public static function bbcode2html($text)
-    {
-        $stopoembed = get_config("system", "no_oembed");
-        if ($stopoembed == true) {
-            return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "" . t('Embedding disabled') . " : $1", $text);
-        }
-        return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", ['\\Zotlabs\\Lib\\Oembed','replacecb'], $text);
-    }
-
-
-    public static function build_xpath($attr, $value)
-    {
-        // http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html
-        return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'";
-    }
-
-    public static function get_inner_html($node)
-    {
-        $innerHTML = '';
-        $children = $node->childNodes;
-        foreach ($children as $child) {
-            $innerHTML .= $child->ownerDocument->saveXML($child);
-        }
-        return $innerHTML;
-    }
-
-    /**
-     * Find ....
-     * and replace it with [embed]url[/embed]
-     */
-    public static function html2bbcode($text)
-    {
-        // start parser only if 'oembed' is in text
-        if (strpos($text, "oembed")) {
-            // convert non ascii chars to html entities
-            $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
-
-            // If it doesn't parse at all, just return the text.
-            $dom = new DOMDocument();
-            @$dom->loadHTML($html_text);
-            if ($dom) {
-                $xpath = new DOMXPath($dom);
-                $attr = "oembed";
-
-                $xattr = self::build_xpath("class", "oembed");
-                $entries = $xpath->query("//span[$xattr]");
-
-                $xattr = "@rel='oembed'";//self::build_xpath("rel","oembed");
-                foreach ($entries as $e) {
-                    $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
-                    if (!is_null($href)) {
-                        $e->parentNode->replaceChild(new DOMText("[embed]" . $href . "[/embed]"), $e);
-                    }
-                }
-                return self::get_inner_html($dom->getElementsByTagName("body")->item(0));
-            }
-        }
-        return $text;
-    }
-
-
-    
-}
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
deleted file mode 100644
index b456be5ca..000000000
--- a/Zotlabs/Lib/PConfig.php
+++ /dev/null
@@ -1,229 +0,0 @@
-PConfig is used for channel specific configurations and takes a
- * channel_id as identifier. It stores for example which features are
- * enabled per channel. The storage is of size MEDIUMTEXT.
- *
- * @code{.php}$var = Zotlabs\Lib\PConfig::Get('uid', 'category', 'key');
- * // with default value for non existent key
- * $var = Zotlabs\Lib\PConfig::Get('uid', 'category', 'unsetkey', 'defaultvalue');@endcode
- *
- * The old (deprecated?) way to access a PConfig value is:
- * @code{.php}$var = get_pconfig(local_channel(), 'category', 'key');@endcode
- */
-class PConfig
-{
-
-    /**
-     * @brief Loads all configuration values of a channel into a cached storage.
-     *
-     * All configuration values of the given channel are stored in global cache
-     * which is available under the global variable App::$config[$uid].
-     *
-     * @param string $uid
-     *  The channel_id
-     * @return void|false Nothing or false if $uid is null or false
-     */
-    public static function Load($uid)
-    {
-        if (is_null($uid) || $uid === false) {
-            return false;
-        }
-
-        if (! is_array(App::$config)) {
-            btlogger('App::$config not an array');
-        }
-
-        if (! array_key_exists($uid, App::$config)) {
-            App::$config[$uid] = [];
-        }
-
-        if (! is_array(App::$config[$uid])) {
-            btlogger('App::$config[$uid] not an array: ' . $uid);
-        }
-
-        $r = q(
-            "SELECT * FROM pconfig WHERE uid = %d",
-            intval($uid)
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $k = $rr['k'];
-                $c = $rr['cat'];
-                if (! array_key_exists($c, App::$config[$uid])) {
-                    App::$config[$uid][$c] = [];
-                    App::$config[$uid][$c]['config_loaded'] = true;
-                }
-                App::$config[$uid][$c][$k] = $rr['v'];
-            }
-        }
-    }
-
-    /**
-     * @brief Get a particular channel's config variable given the category name
-     * ($family) and a key.
-     *
-     * Get a particular channel's config value from the given category ($family)
-     * and the $key from a cached storage in App::$config[$uid].
-     *
-     * Returns false if not set.
-     *
-     * @param string $uid
-     *  The channel_id
-     * @param string $family
-     *  The category of the configuration value
-     * @param string $key
-     *  The configuration key to query
-     * @param mixed $default (optional, default false)
-     *  Default value to return if key does not exist
-     * @return mixed Stored value or false if it does not exist
-     */
-    public static function Get($uid, $family, $key, $default = false)
-    {
-
-        if (is_null($uid) || $uid === false) {
-            return $default;
-        }
-
-        if (! array_key_exists($uid, App::$config)) {
-            self::Load($uid);
-        }
-
-        if ((! array_key_exists($family, App::$config[$uid])) || (! array_key_exists($key, App::$config[$uid][$family]))) {
-            return $default;
-        }
-
-        return unserialise(App::$config[$uid][$family][$key]);
-    }
-
-    /**
-     * @brief Sets a configuration value for a channel.
-     *
-     * Stores a config value ($value) in the category ($family) under the key ($key)
-     * for the channel_id $uid.
-     *
-     * @param string $uid
-     *  The channel_id
-     * @param string $family
-     *  The category of the configuration value
-     * @param string $key
-     *  The configuration key to set
-     * @param string $value
-     *  The value to store
-     * @return mixed Stored $value or false
-     */
-    public static function Set($uid, $family, $key, $value)
-    {
-
-        // this catches subtle errors where this function has been called
-        // with local_channel() when not logged in (which returns false)
-        // and throws an error in array_key_exists below.
-        // we provide a function backtrace in the logs so that we can find
-        // and fix the calling function.
-
-        if (is_null($uid) || $uid === false) {
-            btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
-            return;
-        }
-
-        // manage array value
-        $dbvalue = ((is_array($value))  ? serialise($value) : $value);
-        $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-        if (self::Get($uid, $family, $key) === false) {
-            if (! array_key_exists($uid, App::$config)) {
-                App::$config[$uid] = [];
-            }
-            if (! array_key_exists($family, App::$config[$uid])) {
-                App::$config[$uid][$family] = [];
-            }
-
-            $ret = q(
-                "INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
-                intval($uid),
-                dbesc($family),
-                dbesc($key),
-                dbesc($dbvalue)
-            );
-        } else {
-            $ret = q(
-                "UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
-                dbesc($dbvalue),
-                intval($uid),
-                dbesc($family),
-                dbesc($key)
-            );
-        }
-
-        // keep a separate copy for all variables which were
-        // set in the life of this page. We need this to
-        // synchronise channel clones.
-
-        if (! array_key_exists('transient', App::$config[$uid])) {
-            App::$config[$uid]['transient'] = [];
-        }
-        if (! array_key_exists($family, App::$config[$uid]['transient'])) {
-            App::$config[$uid]['transient'][$family] = [];
-        }
-
-        App::$config[$uid][$family][$key] = $value;
-        App::$config[$uid]['transient'][$family][$key] = $value;
-
-        if ($ret) {
-            return $value;
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     * @brief Deletes the given key from the channel's configuration.
-     *
-     * Removes the configured value from the stored cache in App::$config[$uid]
-     * and removes it from the database.
-     *
-     * @param string $uid
-     *  The channel_id
-     * @param string $family
-     *  The category of the configuration value
-     * @param string $key
-     *  The configuration key to delete
-     * @return mixed
-     */
-    public static function Delete($uid, $family, $key)
-    {
-
-        if (is_null($uid) || $uid === false) {
-            return false;
-        }
-
-        $ret = false;
-
-        if (
-            array_key_exists($uid, App::$config)
-            && is_array(App::$config['uid'])
-            && array_key_exists($family, App::$config['uid'])
-            && array_key_exists($key, App::$config[$uid][$family])
-        ) {
-            unset(App::$config[$uid][$family][$key]);
-        }
-
-        $ret = q(
-            "DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
-            intval($uid),
-            dbesc($family),
-            dbesc($key)
-        );
-
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Lib/Permcat.php b/Zotlabs/Lib/Permcat.php
deleted file mode 100644
index c9c0d7cce..000000000
--- a/Zotlabs/Lib/Permcat.php
+++ /dev/null
@@ -1,226 +0,0 @@
-permcats[] = [
-            'name'      => 'default',
-            'localname' => t('default', 'permcat'),
-            'perms'     => Permissions::Operms($perms),
-            'system'    => 1
-        ];
-
-
-        $p = $this->load_permcats($channel_id, $abook_id);
-        if ($p) {
-            for ($x = 0; $x < count($p); $x++) {
-                $this->permcats[] = [
-                    'name'      => $p[$x][0],
-                    'localname' => $p[$x][1],
-                    'perms'     => Permissions::Operms(Permissions::FilledPerms($p[$x][2])),
-                    'system'    => intval($p[$x][3])
-                ];
-            }
-        }
-    }
-
-    public function match($current) {
-        if ($current) {
-            $perms = Permissions::FilledPerms($current);
-            $operms = Permissions::Operms($perms);
-        }
-        
-        if ($this->permcats && $operms) {
-            foreach($this->permcats as $permcat) {
-                $pp = $permcat['perms'];
-                $matching = 0;
-                foreach ($pp as $rp) {
-                    foreach ($operms as $op) {
-                        if ($rp['name'] === $op['name'] && intval($rp['value']) === intval($op['value'])) {
-                            $matching ++;
-                            break;
-                        }
-                    }
-                }
-                if ($matching === count($pp)) {
-                    return $permcat['name'];
-                }
-            }
-        }
-        return 'custom';
-    }
-    
-    /**
-     * @brief Return array with permcats.
-     *
-     * @return array
-     */
-    public function listing()
-    {
-        return $this->permcats;
-    }
-
-    /**
-     * @brief
-     *
-     * @param string $name
-     * @return array
-     *   * \e array with permcats
-     *   * \e bool \b error if $name not found in permcats true
-     */
-    public function fetch($name)
-    {
-        if ($name && $this->permcats) {
-            foreach ($this->permcats as $permcat) {
-                if (strcasecmp($permcat['name'], $name) === 0) {
-                    return $permcat;
-                }
-            }
-        }    
-        return ['error' => true];
-    }
-
-    public function load_permcats($uid, $abook_id = 0)
-    {
-
-        $permcats = [
-            [ 'follower', t('follower', 'permcat'),
-                [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
-                  'post_like' ], 1
-            ],
-            [ 'contributor', t('contributor', 'permcat'),
-                [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki',
-                  'post_wall','post_comments','write_wiki','post_like','tag_deliver','chat' ], 1
-            ],
-            [ 'publisher', t('publisher', 'permcat'),
-                [ 'view_stream','view_profile','view_contacts','view_storage','view_pages',
-                  'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver',
-                  'chat', 'republish' ], 1
-            ]
-        ];
-
-        if ($uid) {
-            $x = q(
-                "select * from pconfig where uid = %d and cat = 'permcat'",
-                intval($uid)
-            );
-            if ($x) {
-                foreach ($x as $xv) {
-                    $value = unserialise($xv['v']);
-                    $permcats[] = [ $xv['k'], $xv['k'], $value, 0 ];
-                }
-            }
-        }
-
-        if ($abook_id) {
-            $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d",
-                intval($abook_id),
-                intval($uid)
-            );
-            if ($r) {
-                $my_perms = explode(',', get_abconfig($uid, $r[0]['xchan_hash'], 'system', 'my_perms', EMPTY_STR));
-                $permcats[] = [ 'custom', t('custom'), $my_perms, 1];
-            }
-            
-        }
-        /**
-         * @hooks permcats
-         *   * \e array
-         */
-        Hook::call('permcats', $permcats);
-
-        return $permcats;
-    }
-
-    public static function find_permcat($arr, $name)
-    {
-        if ((! $arr) || (! $name)) {
-            return false;
-        }
-
-        foreach ($arr as $p) {
-            if ($p['name'] == $name) {
-                return $p['value'];
-            }
-        }
-    }
-
-    public static function update($channel_id, $name, $permarr)
-    {
-        PConfig::Set($channel_id, 'permcat', $name, $permarr);
-    }
-
-    public static function delete($channel_id, $name)
-    {
-        PConfig::Delete($channel_id, 'permcat', $name);
-    }
-}
diff --git a/Zotlabs/Lib/PermissionDescription.php b/Zotlabs/Lib/PermissionDescription.php
deleted file mode 100644
index 58d2ee7f3..000000000
--- a/Zotlabs/Lib/PermissionDescription.php
+++ /dev/null
@@ -1,193 +0,0 @@
-global_perm  = $global_perm;
-        $this->channel_perm = $channel_perm;
-        $this->fallback_description = ($description  == '') ? t('Visible to your default audience') : $description;
-    }
-
-    /**
-     * If the interpretation of an empty ACL can't be summarised with a global default permission
-     * or a specific permission setting then use this method and describe what it means instead.
-     * Remember to localize the description first.
-     *
-     * @param  string $description - the localized caption for the no-ACL option in the ACL dialog.
-     * @return a new instance of PermissionDescription
-     */
-    public static function fromDescription($description)
-    {
-        return new PermissionDescription('', 0x80000, $description);
-    }
-
-    /**
-     * Use this method only if the interpretation of an empty ACL doesn't fall back to a global
-     * default permission. You should pass one of the constants from boot.php - PERMS_PUBLIC,
-     * PERMS_NETWORK etc.
-     *
-     * @param int $perm - a single enumerated constant permission - PERMS_PUBLIC, PERMS_NETWORK etc.
-     * @return a new instance of PermissionDescription
-     */
-    public static function fromStandalonePermission($perm)
-    {
-
-        $result = new PermissionDescription('', $perm);
-
-        $checkPerm = $result->get_permission_description();
-        if ($checkPerm == $result->fallback_description) {
-            $result = null;
-            logger('null PermissionDescription from unknown standalone permission: ' . $perm, LOGGER_DEBUG, LOG_ERR);
-        }
-
-        return $result;
-    }
-
-    /**
-     * This is the preferred way to create a PermissionDescription, as it provides the most details.
-     * Use this method if you know an empty ACL will result in one of the global default permissions
-     * being used, such as channel_r_stream (for which you would pass 'view_stream').
-     *
-     * @param  string $permname - a key for the global perms array from get_perms() in permissions.php,
-     *         e.g. 'view_stream', 'view_profile', etc.
-     * @return a new instance of PermissionDescription
-     */
-    public static function fromGlobalPermission($permname)
-    {
-
-        $result = null;
-
-        $global_perms = Permissions::Perms();
-
-        if (array_key_exists($permname, $global_perms)) {
-            $channelPerm = PermissionLimits::Get(App::$channel['channel_id'], $permname);
-
-            $result = new PermissionDescription('', $channelPerm);
-        } else {
-            // The acl dialog can handle null arguments, but it shouldn't happen
-            logger('null PermissionDescription from unknown global permission: ' . $permname, LOGGER_DEBUG, LOG_ERR);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets a localized description of the permission, or a generic message if the permission
-     * is unknown.
-     *
-     * @return string description
-     */
-    public function get_permission_description()
-    {
-
-        switch ($this->channel_perm) {
-            case 0:
-                return t('Only me');
-            case PERMS_PUBLIC:
-                return t('Public');
-            case PERMS_NETWORK:
-                return t('Anybody in the $Projectname network');
-            case PERMS_SITE:
-                return sprintf(t('Any account on %s'), App::get_hostname());
-            case PERMS_CONTACTS:
-                return t('Any of my connections');
-            case PERMS_SPECIFIC:
-                return t('Only connections I specifically allow');
-            case PERMS_AUTHED:
-                return t('Anybody authenticated (could include visitors from other networks)');
-            case PERMS_PENDING:
-                return t('Any connections including those who haven\'t yet been approved');
-            default:
-                return $this->fallback_description;
-        }
-    }
-
-    /**
-     * Returns an icon css class name if an appropriate one is available, e.g. "fa-globe" for Public,
-     * otherwise returns empty string.
-     *
-     * @return string icon css class name (often FontAwesome)
-     */
-    public function get_permission_icon()
-    {
-
-        switch ($this->channel_perm) {
-            case 0:
-                return 'fa-eye-slash';
-            case PERMS_PUBLIC:
-                return 'fa-globe';
-            case PERMS_NETWORK:
-                return 'fa-share-alt-square'; // fa-share-alt-square is very similiar to the hubzilla logo, but we should create our own logo class to use
-            case PERMS_SITE:
-                return 'fa-sitemap';
-            case PERMS_CONTACTS:
-                return 'fa-group';
-            case PERMS_SPECIFIC:
-                return 'fa-list';
-            case PERMS_AUTHED:
-                return '';
-            case PERMS_PENDING:
-                return '';
-            default:
-                return '';
-        }
-    }
-
-    /**
-     * Returns a localized description of where the permission came from, if this is known.
-     * If it's not know, or if the permission is standalone and didn't come from a default
-     * permission setting, then empty string is returned.
-     *
-     * @return string description or empty string
-    */
-    public function get_permission_origin_description()
-    {
-
-        switch ($this->global_perm) {
-            case PERMS_R_STREAM:
-                return t('This is your default setting for the audience of your normal stream, and posts.');
-            case PERMS_R_PROFILE:
-                return t('This is your default setting for who can view your default channel profile');
-            case PERMS_R_ABOOK:
-                return t('This is your default setting for who can view your connections');
-            case PERMS_R_STORAGE:
-                return t('This is your default setting for who can view your file storage and photos');
-            case PERMS_R_PAGES:
-                return t('This is your default setting for the audience of your webpages');
-            default:
-                return '';
-        }
-    }
-}
diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
deleted file mode 100644
index c25014496..000000000
--- a/Zotlabs/Lib/Queue.php
+++ /dev/null
@@ -1,522 +0,0 @@
- $base,
-                        'site_update' => datetime_convert(),
-                        'site_dead' => 0,
-                        'site_type' => ((in_array($outq['outq_driver'], ['post', 'activitypub'])) ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN),
-                        'site_crypto' => ''
-                    ]
-                );
-            }
-        }
-
-        $arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate);
-        Hook::call('queue_deliver', $arr);
-        if ($arr['handled']) {
-            return;
-        }
-
-        // "post" queue driver - used for diaspora and friendica-over-diaspora communications.
-
-        if ($outq['outq_driver'] === 'post') {
-            $result = z_post_url($outq['outq_posturl'], $outq['outq_msg']);
-            if ($result['success'] && $result['return_code'] < 300) {
-                logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
-                if ($base) {
-                    q(
-                        "update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
-                        dbesc(datetime_convert()),
-                        dbesc($base)
-                    );
-                }
-                q(
-                    "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-                    dbesc('accepted for delivery'),
-                    dbesc(datetime_convert()),
-                    dbesc($outq['outq_hash'])
-                );
-                self::remove($outq['outq_hash']);
-
-                // server is responding - see if anything else is going to this destination and is piled up
-                // and try to send some more. We're relying on the fact that do_delivery() results in an
-                // immediate delivery otherwise we could get into a queue loop.
-
-                if (!$immediate) {
-                    $x = q(
-                        "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
-                        dbesc($outq['outq_posturl'])
-                    );
-
-                    $piled_up = [];
-                    if ($x) {
-                        foreach ($x as $xx) {
-                            $piled_up[] = $xx['outq_hash'];
-                        }
-                    }
-                    if ($piled_up) {
-                        // call do_delivery() with the force flag
-                        do_delivery($piled_up, true);
-                    }
-                }
-            } else {
-                logger('deliver: queue post returned ' . $result['return_code']
-                    . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
-                self::update($outq['outq_hash'], 10);
-            }
-            return;
-        }
-
-        if ($outq['outq_driver'] === 'asfetch') {
-            $channel = Channel::from_id($outq['outq_channel']);
-            if (!$channel) {
-                logger('missing channel: ' . $outq['outq_channel']);
-                return;
-            }
-
-            if (!ActivityStreams::is_url($outq['outq_posturl'])) {
-                logger('fetch item is not url: ' . $outq['outq_posturl']);
-                self::remove($outq['outq_hash']);
-                return;
-            }
-
-            $j = Activity::fetch($outq['outq_posturl'], $channel);
-            if ($j) {
-                $AS = new ActivityStreams($j, null, true);
-                if ($AS->is_valid() && isset($AS->data['type'])) {
-                    if (ActivityStreams::is_an_actor($AS->data['type'])) {
-                        Activity::actor_store($AS->data['id'], $AS->data);
-                    }
-                    if (strpos($AS->data['type'], 'Collection') !== false) {
-                        // we are probably fetching a collection already - and do not support collection recursion at this time
-                        self::remove($outq['outq_hash']);
-                        return;
-                    }
-                    $item = Activity::decode_note($AS, true);
-                    if ($item) {
-                        Activity::store($channel, $channel['channnel_hash'], $AS, $item, true, true);
-                    }
-                }
-                logger('deliver: queue fetch success from ' . $outq['outq_posturl'], LOGGER_DEBUG);
-                self::remove($outq['outq_hash']);
-
-                // server is responding - see if anything else is going to this destination and is piled up
-                // and try to send some more. We're relying on the fact that do_delivery() results in an
-                // immediate delivery otherwise we could get into a queue loop.
-
-                if (!$immediate) {
-                    $x = q(
-                        "select outq_hash from outq where outq_driver = 'asfetch' and outq_channel = %d and outq_delivered = 0",
-                        dbesc($outq['outq_channel'])
-                    );
-
-                    $piled_up = [];
-                    if ($x) {
-                        foreach ($x as $xx) {
-                            $piled_up[] = $xx['outq_hash'];
-                        }
-                    }
-                    if ($piled_up) {
-                        do_delivery($piled_up, true);
-                    }
-                }
-            } else {
-                logger('deliver: queue fetch failed' . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
-                self::update($outq['outq_hash'], 10);
-            }
-            return;
-        }
-
-        if ($outq['outq_driver'] === 'activitypub') {
-            $channel = Channel::from_id($outq['outq_channel']);
-            if (!$channel) {
-                logger('missing channel: ' . $outq['outq_channel']);
-                return;
-            }
-
-
-            $retries = 0;
-            $m = parse_url($outq['outq_posturl']);
-
-            $headers = [];
-            $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
-            $ret = $outq['outq_msg'];
-            logger('ActivityPub send: ' . jindent($ret), LOGGER_DATA);
-            $headers['Date'] = datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T');
-            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
-            $headers['Host'] = $m['host'];
-            $headers['(request-target)'] = 'post ' . get_request_string($outq['outq_posturl']);
-
-            $xhead = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel));
-            if (strpos($outq['outq_posturl'], 'http') !== 0) {
-                logger('bad url: ' . $outq['outq_posturl']);
-                self::remove($outq['outq_hash']);
-            }
-
-            $result = z_post_url($outq['outq_posturl'], $outq['outq_msg'], $retries, ['headers' => $xhead]);
-
-            if ($result['success'] && $result['return_code'] < 300) {
-                logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
-                if ($base) {
-                    q(
-                        "update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
-                        dbesc(datetime_convert()),
-                        dbesc($base)
-                    );
-                }
-                q(
-                    "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-                    dbesc('accepted for delivery'),
-                    dbesc(datetime_convert()),
-                    dbesc($outq['outq_hash'])
-                );
-                self::remove($outq['outq_hash']);
-
-                // server is responding - see if anything else is going to this destination and is piled up
-                // and try to send some more. We're relying on the fact that do_delivery() results in an
-                // immediate delivery otherwise we could get into a queue loop.
-
-                if (!$immediate) {
-                    $x = q(
-                        "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
-                        dbesc($outq['outq_posturl'])
-                    );
-
-                    $piled_up = [];
-                    if ($x) {
-                        foreach ($x as $xx) {
-                            $piled_up[] = $xx['outq_hash'];
-                        }
-                    }
-                    if ($piled_up) {
-                        do_delivery($piled_up, true);
-                    }
-                }
-            }
-            elseif ($result['return_code'] >= 400 && $result['return_code'] < 500) {
-                q(
-                    "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-                    dbesc('delivery rejected' . ' ' . $result['return_code']),
-                    dbesc(datetime_convert()),
-                    dbesc($outq['outq_hash'])
-                );
-                self::remove($outq['outq_hash']);
-
-            }
-            else {
-                $dr = q(
-                    "select * from dreport where dreport_queue = '%s'",
-                    dbesc($outq['outq_hash'])
-                );
-                if ($dr) {
-                    // update every queue entry going to this site with the most recent communication error
-                    q(
-                        "update dreport set dreport_log = '%s' where dreport_site = '%s'",
-                         dbesc(z_curl_error($result)),
-                        dbesc($dr[0]['dreport_site'])
-                    );
-                }
-                self::update($outq['outq_hash'], 10);
-            }
-    
-            logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
-            return;
-        }
-
-        // normal zot delivery
-
-        logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG);
-
-
-        if ($outq['outq_posturl'] === z_root() . '/zot') {
-            // local delivery
-            $zot = new Receiver(new Zot6Handler(), $outq['outq_notify']);
-            $result = $zot->run();
-            logger('returned_json: ' . json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES), LOGGER_DATA);
-            logger('deliver: local zot delivery succeeded to ' . $outq['outq_posturl']);
-            Libzot::process_response($outq['outq_posturl'], ['success' => true, 'body' => json_encode($result)], $outq);
-
-            if (!$immediate) {
-                $x = q(
-                    "select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
-                    dbesc($outq['outq_posturl'])
-                );
-
-                $piled_up = [];
-                if ($x) {
-                    foreach ($x as $xx) {
-                        $piled_up[] = $xx['outq_hash'];
-                    }
-                }
-                if ($piled_up) {
-                    do_delivery($piled_up, true);
-                }
-            }
-        } else {
-            logger('remote');
-            $channel = null;
-
-            if ($outq['outq_channel']) {
-                $channel = Channel::from_id($outq['outq_channel'], true);
-            }
-
-            $host_crypto = null;
-
-            if ($channel && $base) {
-                $h = q(
-                    "select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('zot6','nomad') order by hubloc_id desc limit 1",
-                    dbesc($base)
-                );
-                if ($h) {
-                    $host_crypto = $h[0];
-                }
-            }
-
-            $msg = $outq['outq_notify'];
-
-			if ($outq['outq_driver'] === 'nomad') {
-				$result = Libzot::nomad($outq['outq_posturl'],$msg,$channel,$host_crypto);
-			}
-			else {
-				$result = Libzot::zot($outq['outq_posturl'],$msg,$channel,$host_crypto);
-			}
-
-            if ($result['success']) {
-                logger('deliver: remote nomad/zot delivery succeeded to ' . $outq['outq_posturl']);
-                Libzot::process_response($outq['outq_posturl'], $result, $outq);
-            } else {
-                $dr = q(
-                    "select * from dreport where dreport_queue = '%s'",
-                    dbesc($outq['outq_hash'])
-                );
-
-                // update every queue entry going to this site with the most recent communication error
-                q(
-                    "update dreport set dreport_log = '%s' where dreport_site = '%s'",
-                    dbesc(z_curl_error($result)),
-                    dbesc($dr[0]['dreport_site'])
-                );
-
-                logger('deliver: remote nomad/zot delivery failed to ' . $outq['outq_posturl']);
-                logger('deliver: remote nomad/zot delivery fail data: ' . print_r($result, true), LOGGER_DATA);
-                self::update($outq['outq_hash'], 10);
-            }
-        }
-        return;
-    }
-}
diff --git a/Zotlabs/Lib/SConfig.php b/Zotlabs/Lib/SConfig.php
deleted file mode 100644
index 1d4e93a3f..000000000
--- a/Zotlabs/Lib/SConfig.php
+++ /dev/null
@@ -1,33 +0,0 @@
- false, 'message' => '');
-
-        $r = q(
-            "select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0 ",
-            intval($account_id)
-        );
-        if (! ($r && count($r))) {
-            $ret['total_identities'] = 0;
-            $ret['message'] = t('Unable to obtain identity information from database');
-            return $ret;
-        }
-
-        $ret['total_identities'] = intval($r[0]['total']);
-
-        if (! self::account_allows($account_id, 'total_identities', $r[0]['total'])) {
-            $ret['message'] .= self::upgrade_message();
-            return $ret;
-        }
-
-        $ret['success'] = true;
-
-        return $ret;
-    }
-
-
-
-    /**
-     * @brief Checks for accounts that have past their expiration date.
-     *
-     * If the account has a service class which is not the site default,
-     * the service class is reset to the site default and expiration reset to never.
-     * If the account has no service class it is expired and subsequently disabled.
-     * called from include/poller.php as a scheduled task.
-     *
-     * Reclaiming resources which are no longer within the service class limits is
-     * not the job of this function, but this can be implemented by plugin if desired.
-     * Default behaviour is to stop allowing additional resources to be consumed.
-     */
-    public static function downgrade_accounts()
-    {
-
-        $r = q(
-            "select * from account where not ( account_flags & %d ) > 0 
-    		and account_expires > '%s' 
-    		and account_expires < %s ",
-            intval(ACCOUNT_EXPIRED),
-            dbesc(NULL_DATE),
-            db_getfunc('UTC_TIMESTAMP')
-        );
-
-        if (! $r) {
-            return;
-        }
-
-        $basic = get_config('system', 'default_service_class');
-
-        foreach ($r as $rr) {
-            if (($basic) && ($rr['account_service_class']) && ($rr['account_service_class'] != $basic)) {
-                $x = q(
-                    "UPDATE account set account_service_class = '%s', account_expires = '%s'
-    				where account_id = %d",
-                    dbesc($basic),
-                    dbesc(NULL_DATE),
-                    intval($rr['account_id'])
-                );
-                $ret = [ 'account' => $rr ];
-                Hook::call('account_downgrade', $ret);
-                logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' downgraded.');
-            } else {
-                $x = q(
-                    "UPDATE account SET account_flags = (account_flags | %d) where account_id = %d",
-                    intval(ACCOUNT_EXPIRED),
-                    intval($rr['account_id'])
-                );
-                $ret = [ 'account' => $rr ];
-                Hook::call('account_downgrade', $ret);
-                logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' expired.');
-            }
-        }
-    }
-
-
-    /**
-     * @brief Check service_class restrictions.
-     *
-     * If there are no service_classes defined, everything is allowed.
-     * If $usage is supplied, we check against a maximum count and return true if
-     * the current usage is less than the subscriber plan allows. Otherwise we
-     * return boolean true or false if the property is allowed (or not) in this
-     * subscriber plan. An unset property for this service plan means the property
-     * is allowed, so it is only necessary to provide negative properties for each
-     * plan, or what the subscriber is not allowed to do.
-     *
-     * Like account_service_class_allows() but queries directly by account rather
-     * than channel. Service classes are set for accounts, so we look up the
-     * account for the channel and fetch the service class restrictions of the
-     * account.
-     *
-     * @see account_service_class_allows() if you have a channel_id already
-     * @see service_class_fetch()
-     *
-     * @param int $uid The channel_id to check
-     * @param string $property The service class property to check for
-     * @param string|bool $usage (optional) The value to check against
-     * @return bool
-     */
-    public static function allows($uid, $property, $usage = false)
-    {
-        $limit = self::fetch($uid, $property);
-
-        if ($limit === false) {
-            return true; // No service class set => everything is allowed
-        }
-        
-        $limit = engr_units_to_bytes($limit);
-        if ($usage === false) {
-            // We use negative values for not allowed properties in a subscriber plan
-            return (($limit) ? (bool) $limit : true);
-        } else {
-            return (((intval($usage)) < intval($limit)) ? true : false);
-        }
-    }
-
-    /**
-     * @brief Check service class restrictions by account.
-     *
-     * If there are no service_classes defined, everything is allowed.
-     * If $usage is supplied, we check against a maximum count and return true if
-     * the current usage is less than the subscriber plan allows. Otherwise we
-     * return boolean true or false if the property is allowed (or not) in this
-     * subscriber plan. An unset property for this service plan means the property
-     * is allowed, so it is only necessary to provide negative properties for each
-     * plan, or what the subscriber is not allowed to do.
-     *
-     * Like service_class_allows() but queries directly by account rather than channel.
-     *
-     * @see service_class_allows() if you have a channel_id instead of an account_id
-     * @see account_service_class_fetch()
-     *
-     * @param int $aid The account_id to check
-     * @param string $property The service class property to check for
-     * @param int|bool $usage (optional) The value to check against
-     * @return bool
-     */
-    public static function account_allows($aid, $property, $usage = false)
-    {
-
-        $limit = self::account_fetch($aid, $property);
-
-        if ($limit === false) {
-            return true; // No service class is set => everything is allowed
-        }
-        
-        $limit = engr_units_to_bytes($limit);
-
-        if ($usage === false) {
-            // We use negative values for not allowed properties in a subscriber plan
-            return (($limit) ? (bool) $limit : true);
-        } else {
-            return (((intval($usage)) < intval($limit)) ? true : false);
-        }
-    }
-
-    /**
-     * @brief Queries a service class value for a channel and property.
-     *
-     * Service classes are set for accounts, so look up the account for this channel
-     * and fetch the service classe of the account.
-     *
-     * If no service class is available it returns false and everything should be
-     * allowed.
-     *
-     * @see account_service_class_fetch()
-     *
-     * @param int $uid The channel_id to query
-     * @param string $property The service property name to check for
-     * @return bool|int
-     *
-     * @todo Should we merge this with account_service_class_fetch()?
-     */
-    public static function fetch($uid, $property)
-    {
-
-
-        if ($uid == local_channel()) {
-            $service_class = App::$account['account_service_class'];
-        } else {
-            $r = q(
-                "select account_service_class 
-    			from channel c, account a 
-    			where c.channel_account_id = a.account_id and c.channel_id = %d limit 1",
-                intval($uid)
-            );
-            if ($r) {
-                $service_class = $r[0]['account_service_class'];
-            }
-        }
-        if (! $service_class) {
-            return false; // everything is allowed
-        }
-        $arr = get_config('service_class', $service_class);
-
-        if (! is_array($arr) || (! count($arr))) {
-            return false;
-        }
-
-        return((array_key_exists($property, $arr)) ? $arr[$property] : false);
-    }
-
-    /**
-     * @brief Queries a service class value for an account and property.
-     *
-     * Like service_class_fetch() but queries by account rather than channel.
-     *
-     * @see service_class_fetch() if you have channel_id.
-     * @see account_service_class_allows()
-     *
-     * @param int $aid The account_id to query
-     * @param string $property The service property name to check for
-     * @return bool|int
-     */
-    public static function account_fetch($aid, $property)
-    {
-
-        $r = q(
-            "select account_service_class as service_class from account where account_id = %d limit 1",
-            intval($aid)
-        );
-        if ($r !== false && count($r)) {
-            $service_class = $r[0]['service_class'];
-        }
-
-        if (! x($service_class)) {
-            return false; // everything is allowed
-        }
-
-        $arr = get_config('service_class', $service_class);
-
-        if (! is_array($arr) || (! count($arr))) {
-            return false;
-        }
-
-        return((array_key_exists($property, $arr)) ? $arr[$property] : false);
-    }
-
-
-    public static function upgrade_link($bbcode = false)
-    {
-        $l = get_config('service_class', 'upgrade_link');
-        if (! $l) {
-            return '';
-        }
-        if ($bbcode) {
-            $t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l);
-        } else {
-            $t = sprintf('' . t('Click here to upgrade.') . '
          • ', $l);
-        }
-        return $t;
-    }
-
-    public static function upgrade_message($bbcode = false)
-    {
-        $x = self::upgrade_link($bbcode);
-        return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ;
-    }
-
-    public static function upgrade_bool_message($bbcode = false)
-    {
-        $x = self::upgrade_link($bbcode);
-        return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
-    }
-}
diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php
deleted file mode 100644
index e070f8cd5..000000000
--- a/Zotlabs/Lib/Share.php
+++ /dev/null
@@ -1,249 +0,0 @@
-item = $post_id;
-            return;
-        }
-
-        if (! (local_channel() || remote_channel())) {
-            return;
-        }
-
-        $r = q(
-            "SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d  LIMIT 1",
-            intval($post_id)
-        );
-        if (! $r) {
-            return;
-        }
-
-        if (($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) {
-            return;
-        }
-
-        $sql_extra = item_permissions_sql($r[0]['uid']);
-
-        $r = q(
-            "select * from item where id = %d $sql_extra",
-            intval($post_id)
-        );
-        if (! $r) {
-            return;
-        }
-
-        if (! in_array($r[0]['mimetype'], [ 'text/bbcode', 'text/x-multicode' ])) {
-            return;
-        }
-
-        /** @FIXME eventually we want to post remotely via rpost on your home site */
-        // When that works remove this next bit:
-
-        if (! local_channel()) {
-            return;
-        }
-
-        xchan_query($r);
-
-        $this->item = array_shift($r);
-
-        $arr = [];
-
-        $owner_uid = $this->item['uid'];
-        $owner_aid = $this->item['aid'];
-
-        $channel = Channel::from_id($this->item['uid']);
-        $observer = App::get_observer();
-
-        $can_comment = false;
-        if ((array_key_exists('owner', $this->item)) && intval($this->item['owner']['abook_self'])) {
-            $can_comment = perm_is_allowed($this->item['uid'], $observer['xchan_hash'], 'post_comments');
-        } else {
-            $can_comment = can_comment_on_post($observer['xchan_hash'], $this->item);
-        }
-
-        if (! $can_comment) {
-            return;
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($this->item['owner_xchan'])
-        );
-
-        if ($r) {
-            $thread_owner = array_shift($r);
-        } else {
-            return;
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($this->item['author_xchan'])
-        );
-        if ($r) {
-            $item_author = array_shift($r);
-        } else {
-            return;
-        }
-
-        if (! $this->attach) {
-            $this->attach = [];
-        }
-    
-        $this->attach[] = [
-            'href' => $this->item['mid'],
-            'type' => 'application/activity+json',
-            'title' => $this->item['mid']            
-        ];
-    
-        if ($item_author['network'] === 'activitypub') {
-            // for Mastodon compatibility, send back an ActivityPub Announce activity.
-            // We don't need or want these on our own network as there is no mechanism for providing
-            // a fair-use defense to copyright claims and frivolous lawsuits.
-
-            $arr['aid'] = $owner_aid;
-            $arr['uid'] = $owner_uid;
-
-            $arr['item_origin'] = 1;
-            $arr['item_wall'] = $this->item['item_wall'];
-            $arr['uuid'] = new_uuid();
-            $arr['mid'] = z_root() . '/item/' . $arr['uuid'];
-            $arr['mid'] = str_replace('/item/', '/activity/', $arr['mid']);
-            $arr['parent_mid'] = $this->item['mid'];
-
-            $mention = '@[zrl=' . $this->item['author']['xchan_url'] . ']' . $this->item['author']['xchan_name'] . '[/zrl]';
-            $arr['body'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $this->item['obj_type']);
-
-            $arr['author_xchan'] = $observer['xchan_hash'];
-            $arr['owner_xchan']  = $this->item['author_xchan'];
-            $arr['obj'] = $this->item['obj'];
-            $arr['obj_type'] = $this->item['obj_type'];
-            $arr['verb'] = 'Announce';
-
-            $post = item_store($arr);
-
-            $post_id = $post['item_id'];
-
-            $arr['id'] = $post_id;
-
-            Hook::call('post_local_end', $arr);
-
-            $r = q(
-                "select * from item where id = %d",
-                intval($post_id)
-            );
-            if ($r) {
-                xchan_query($r);
-                $sync_item = fetch_post_tags($r);
-                Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
-            }
-
-            Run::Summon([ 'Notifier','like',$post_id ]);
-        }
-
-        return;
-    }
-
-    public function obj()
-    {
-        $obj = [];
-
-        if (! $this->item) {
-            return $obj;
-        }
-
-        $obj['type']         = $this->item['obj_type'];
-        $obj['id']           = $this->item['mid'];
-        $obj['content']      = bbcode($this->item['body']);
-        $obj['source'] = [
-            'mediaType' => $this->item['mimetype'],
-            'content'   => $this->item['body']
-        ];
-
-        $obj['name']          = $this->item['title'];
-        $obj['published']     = $this->item['created'];
-        $obj['updated']       = $this->item['edited'];
-        $obj['attributedTo']  =  ((strpos($this->item['author']['xchan_hash'], 'http') === 0)
-            ? $this->item['author']['xchan_hash']
-            : $this->item['author']['xchan_url']);
-
-        return $obj;
-    }
-
-    public function get_attach()
-    {
-        return $this->attach;
-    }
-    
-    public function bbcode()
-    {
-        $bb = EMPTY_STR;
-
-        if (! $this->item) {
-            return $bb;
-        }
-
-        if (! $this->item['author']) {
-            $author = q(
-                "select * from xchan where xchan_hash = '%s' limit 1",
-                dbesc($this->item['author_xchan'])
-            );
-            if ($author) {
-                $this->item['author'] = array_shift($author);
-            }
-        }
-
-        $special_object = (in_array($this->item['obj_type'], [ ACTIVITY_OBJ_PHOTO, 'Event', 'Question' ]) ? true : false);
-        if ($special_object) {
-            $object = json_decode($this->item['obj'], true);
-            $special = (($object['source']) ? $object['source']['content'] : $object['body']);
-        }
-
-        if (strpos($this->item['body'], "[/share]") !== false) {
-            $pos = strpos($this->item['body'], "[share");
-            $bb = substr($this->item['body'], $pos);
-        } else {
-            $bb = "[share author='" . urlencode($this->item['author']['xchan_name']) .
-                "' profile='"       . $this->item['author']['xchan_url'] .
-                "' portable_id='"   . $this->item['author']['xchan_hash'] .
-                "' avatar='"        . $this->item['author']['xchan_photo_s'] .
-                "' link='"          . $this->item['plink'] .
-				"' auth='"          . (in_array($this->item['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
-                "' posted='"        . $this->item['created'] .
-                "' message_id='"    . $this->item['mid'] .
-            "']";
-            if ($this->item['title']) {
-                $bb .= '[b]' . $this->item['title'] . '[/b]' . "\r\n";
-            }
-            if ($this->item['summary']) {
-                $bb .= $this->item['summary'] . "\r\n";
-            }
-
-            $bb .= (($special_object) ? $special . "\r\n" . $this->item['body'] : $this->item['body']);
-            $bb .= "[/share]";
-        }
-
-        return $bb;
-    }
-}
diff --git a/Zotlabs/Lib/Socgraph.php b/Zotlabs/Lib/Socgraph.php
deleted file mode 100644
index f416c71de..000000000
--- a/Zotlabs/Lib/Socgraph.php
+++ /dev/null
@@ -1,696 +0,0 @@
- $max) {
-                break;
-            }
-        }
-        logger("poco_load: loaded $total entries", LOGGER_DEBUG);
-
-        q(
-            "delete from xlink where xlink_xchan = '%s' and xlink_updated < %s - INTERVAL %s and xlink_static = 0",
-            dbesc($xchan),
-            db_utcnow(),
-            db_quoteinterval('7 DAY')
-        );
-    }
-
-
-
-
-    public static function ap_poco_load($xchan)
-    {
-
-        $max = intval(get_config('system', 'max_imported_follow', MAX_IMPORTED_FOLLOW));
-        if (! intval($max)) {
-            return;
-        }
-
-
-        if ($xchan) {
-            $cl = get_xconfig($xchan, 'activitypub', 'collections');
-            if (is_array($cl) && $cl) {
-                $url = ((array_key_exists('following', $cl)) ? $cl['following'] : '');
-            } else {
-                return false;
-            }
-        }
-
-        if (! $url) {
-            logger('ap_poco_load: no url');
-            return;
-        }
-
-        $obj = new ASCollection($url, '', 0, $max);
-
-        $friends = $obj->get();
-
-        if (! $friends) {
-            return;
-        }
-
-        foreach ($friends as $entry) {
-            $hash = EMPTY_STR;
-
-            $x = q(
-                "select xchan_hash from xchan where (xchan_hash = '%s' or xchan_url = '%s') order by xchan_network desc limit 1",
-                dbesc($entry),
-                dbesc($entry)
-            );
-
-
-            if ($x) {
-                $hash = $x[0]['xchan_hash'];
-            } else {
-                // We've never seen this person before. Import them.
-
-                $wf = discover_by_webbie($entry);
-                if ($wf) {
-                    $x = q(
-                        "select xchan_hash from xchan where (xchan_hash = '%s' or xchan_url = '%s') order by xchan_network desc limit 1",
-                        dbesc($wf),
-                        dbesc($wf)
-                    );
-                    if ($x) {
-                        $hash = $x[0]['xchan_hash'];
-                    }
-                }
-            }
-
-            if (! $hash) {
-                continue;
-            }
-
-            $total++;
-
-            $r = q(
-                "select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 0 limit 1",
-                dbesc($xchan),
-                dbesc($hash)
-            );
-
-            if (! $r) {
-                q(
-                    "insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 0 ) ",
-                    dbesc($xchan),
-                    dbesc($hash),
-                    intval(0),
-                    dbesc(''),
-                    dbesc(''),
-                    dbesc(datetime_convert())
-                );
-            } else {
-                q(
-                    "update xlink set xlink_updated = '%s' where xlink_id = %d",
-                    dbesc(datetime_convert()),
-                    intval($r[0]['xlink_id'])
-                );
-            }
-        }
-
-        logger("ap_poco_load: loaded $total entries", LOGGER_DEBUG);
-
-        q(
-            "delete from xlink where xlink_xchan = '%s' and xlink_updated < %s - INTERVAL %s and xlink_static = 0",
-            dbesc($xchan),
-            db_utcnow(),
-            db_quoteinterval('7 DAY')
-        );
-
-        return true;
-    }
-
-
-    public static function count_common_friends($uid, $xchan)
-    {
-
-        $r = q(
-            "SELECT count(xlink_id) as total from xlink where xlink_xchan = '%s' and xlink_static = 0 and xlink_link in
-    		(select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_self = 0 )",
-            dbesc($xchan),
-            dbesc($xchan),
-            intval($uid)
-        );
-
-        if ($r) {
-            return $r[0]['total'];
-        }
-        return 0;
-    }
-
-
-    public static function common_friends($uid, $xchan, $start = 0, $limit = 100000000, $shuffle = false)
-    {
-
-        $rand = db_getfunc('rand');
-        if ($shuffle) {
-            $sql_extra = " order by $rand ";
-        } else {
-            $sql_extra = " order by xchan_name asc ";
-        }
-
-        $r = q(
-            "SELECT * from xchan left join xlink on xlink_link = xchan_hash where xlink_xchan = '%s' and xlink_static = 0 and xlink_link in
-    		(select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_self = 0 ) $sql_extra limit %d offset %d",
-            dbesc($xchan),
-            dbesc($xchan),
-            intval($uid),
-            intval($limit),
-            intval($start)
-        );
-
-        return $r;
-    }
-
-
-    public static function suggestion_query($uid, $myxchan, $start = 0, $limit = 120)
-    {
-
-        if ((! $uid) || (! $myxchan)) {
-            return [];
-        }
-
-        $r1 = q(
-            "SELECT count(xlink_xchan) as total, xchan.* from xchan
-    		left join xlink on xlink_link = xchan_hash
-    		where xlink_xchan in ( select abook_xchan from abook where abook_channel = %d )
-    		and not xlink_link in ( select abook_xchan from abook where abook_channel = %d )
-    		and not xlink_link in ( select xchan from xign where uid = %d )
-    		and xlink_xchan != ''
-    		and xchan_hidden = 0
-    		and xchan_deleted = 0
-    		and xlink_static = 0
-    		group by xchan_hash order by total desc limit %d offset %d ",
-            intval($uid),
-            intval($uid),
-            intval($uid),
-            intval($limit),
-            intval($start)
-        );
-
-        if (! $r1) {
-            $r1 = [];
-        }
-
-        $r2 = q(
-            "SELECT count(xtag_hash) as total, xchan.* from xchan
-    		left join xtag on xtag_hash = xchan_hash
-    		where xtag_hash != '%s' 
-    		and not xtag_hash in ( select abook_xchan from abook where abook_channel = %d )
-    		and xtag_term in ( select xtag_term from xtag where xtag_hash = '%s' )
-    		and not xtag_hash in ( select xchan from xign where uid = %d )
-    		and xchan_hidden = 0
-    		and xchan_deleted = 0
-    		group by xchan_hash order by total desc limit %d offset %d ",
-            dbesc($myxchan),
-            intval($uid),
-            dbesc($myxchan),
-            intval($uid),
-            intval($limit),
-            intval($start)
-        );
-
-        if (! $r2) {
-            $r2 = [];
-        }
-
-        foreach ($r2 as $r) {
-            $found = false;
-            for ($x = 0; $x < count($r1); $x++) {
-                if ($r['xchan_hash'] === $r1[$x]['xchan_hash']) {
-                    $r1[$x]['total'] = intval($r1[$x]['total']) + intval($r['total']);
-                    $found = true;
-                    continue;
-                }
-            }
-            if (! $found) {
-                $r1[] = $r;
-            }
-        }
-
-        usort($r1, 'self::socgraph_total_sort');
-        return ($r1);
-    }
-
-    public static function socgraph_total_sort($a, $b)
-    {
-        if ($a['total'] === $b['total']) {
-            return 0;
-        }
-
-        return((intval($a['total']) <  intval($b['total'])) ? 1 : -1 );
-    }
-
-
-    public static function poco()
-    {
-
-        $system_mode = false;
-
-        if (observer_prohibited()) {
-            logger('mod_poco: block_public');
-            http_status_exit(401);
-        }
-
-        $observer = App::get_observer();
-
-        if (argc() > 1) {
-            $user = notags(trim(argv(1)));
-        }
-        if (! (isset($user) && $user)) {
-            $c = q("select * from pconfig where cat = 'system' and k = 'suggestme' and v = '1'");
-            if (! $c) {
-                logger('mod_poco: system mode. No candidates.', LOGGER_DEBUG);
-                http_status_exit(404);
-            }
-            $system_mode = true;
-        }
-
-        $format = ((isset($_REQUEST['format']) && $_REQUEST['format']) ? $_REQUEST['format'] : 'json');
-
-        $justme = false;
-
-        if (argc() > 2 && argv(2) === '@me') {
-            $justme = true;
-        }
-        if (argc() > 3) {
-            if (argv(3) === '@all') {
-                $justme = false;
-            } elseif (argv(3) === '@self') {
-                $justme = true;
-            }
-        }
-        if (argc() > 4 && intval(argv(4)) && $justme == false) {
-            $cid = intval(argv(4));
-        }
-
-        if (! $system_mode) {
-            $r = q(
-                "SELECT channel_id from channel where channel_address = '%s' limit 1",
-                dbesc($user)
-            );
-            if (! $r) {
-                logger('mod_poco: user mode. Account not found. ' . $user);
-                http_status_exit(404);
-            }
-
-            $channel_id = $r[0]['channel_id'];
-            $ohash = (($observer) ? $observer['xchan_hash'] : '');
-
-            if (! perm_is_allowed($channel_id, $ohash, 'view_contacts')) {
-                logger('mod_poco: user mode. Permission denied for ' . $ohash . ' user: ' . $user);
-                http_status_exit(401);
-            }
-        }
-
-        if (isset($justme) && $justme) {
-            $sql_extra = " and abook_self = 1 ";
-        } else {
-            $sql_extra = " and abook_self = 0 ";
-        }
-
-        if (isset($cid) && $cid) {
-            $sql_extra = sprintf(" and abook_id = %d and abook_archived = 0 and abook_hidden = 0 and abook_pending = 0 ", intval($cid));
-        }
-
-        if (isset($system_mode) && $system_mode) {
-            $r = q("SELECT count(*) as total from abook where abook_self = 1 
-    			and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') ");
-        } else {
-            $r = q(
-                "SELECT count(*) as total from abook where abook_channel = %d 
-    			$sql_extra ",
-                intval($channel_id)
-            );
-            $rooms = q(
-                "select * from menu_item where ( mitem_flags & " . intval(MENU_ITEM_CHATROOM) . " ) > 0 and allow_cid = '' and allow_gid = '' and deny_cid = '' and deny_gid = '' and mitem_channel_id = %d",
-                intval($channel_id)
-            );
-        }
-        if ($r) {
-            $totalResults = intval($r[0]['total']);
-        } else {
-            $totalResults = 0;
-        }
-
-        $startIndex = ((isset($_GET['startIndex'])) ? intval($_GET['startIndex']) : 0);
-        if ($startIndex < 0) {
-            $startIndex = 0;
-        }
-
-        $itemsPerPage = ((isset($_GET['count']) && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
-
-        if ($system_mode) {
-            $r = q(
-                "SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_self = 1 
-    			and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') 
-    			limit %d offset %d ",
-                intval($itemsPerPage),
-                intval($startIndex)
-            );
-        } else {
-            $r = q(
-                "SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d 
-    			$sql_extra LIMIT %d OFFSET %d",
-                intval($channel_id),
-                intval($itemsPerPage),
-                intval($startIndex)
-            );
-        }
-
-        $ret = [];
-        if (x($_GET, 'sorted')) {
-            $ret['sorted'] = 'false';
-        }
-        if (x($_GET, 'filtered')) {
-            $ret['filtered'] = 'false';
-        }
-        if (x($_GET, 'updatedSince')) {
-            $ret['updateSince'] = 'false';
-        }
-
-        $ret['startIndex']   = (string) $startIndex;
-        $ret['itemsPerPage'] = (string) $itemsPerPage;
-        $ret['totalResults'] = (string) $totalResults;
-
-        if ($rooms) {
-            $ret['chatrooms'] = [];
-            foreach ($rooms as $room) {
-                $ret['chatrooms'][] = array('url' => $room['mitem_link'], 'desc' => $room['mitem_desc']);
-            }
-        }
-
-        $ret['entry'] = [];
-
-        $fields_ret = array(
-            'id' => false,
-            'guid' => false,
-            'guid_sig' => false,
-            'hash' => false,
-            'displayName' => false,
-            'urls' => false,
-            'preferredUsername' => false,
-            'photos' => false,
-            'rating' => false
-        );
-
-        if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) {
-            foreach ($fields_ret as $k => $v) {
-                $fields_ret[$k] = true;
-            }
-        } else {
-            $fields_req = explode(',', $_GET['fields']);
-            foreach ($fields_req as $f) {
-                $fields_ret[trim($f)] = true;
-            }
-        }
-
-        if (is_array($r)) {
-            if (count($r)) {
-                foreach ($r as $rr) {
-                    $entry = [];
-                    if ($fields_ret['id']) {
-                        $entry['id'] = $rr['abook_id'];
-                    }
-                    if ($fields_ret['guid']) {
-                        $entry['guid'] = $rr['xchan_guid'];
-                    }
-                    if ($fields_ret['guid_sig']) {
-                        $entry['guid_sig'] = $rr['xchan_guid_sig'];
-                    }
-                    if ($fields_ret['hash']) {
-                        $entry['hash'] = $rr['xchan_hash'];
-                    }
-
-                    if ($fields_ret['displayName']) {
-                        $entry['displayName'] = $rr['xchan_name'];
-                    }
-                    if ($fields_ret['urls']) {
-                        $entry['urls'] = array(array('value' => $rr['xchan_url'], 'type' => 'profile'));
-                        $network = $rr['xchan_network'];
-                        if ($rr['xchan_addr']) {
-                            $entry['urls'][] = array('value' => 'acct:' . $rr['xchan_addr'], 'type' => $network);
-                        }
-                    }
-                    if ($fields_ret['preferredUsername']) {
-                        $entry['preferredUsername'] = substr($rr['xchan_addr'], 0, strpos($rr['xchan_addr'], '@'));
-                    }
-                    if ($fields_ret['photos']) {
-                        $entry['photos'] = array(array('value' => $rr['xchan_photo_l'], 'mimetype' => $rr['xchan_photo_mimetype'], 'type' => 'profile'));
-                    }
-                    $ret['entry'][] = $entry;
-                }
-            } else {
-                $ret['entry'][] = [];
-            }
-        } else {
-            http_status_exit(500);
-        }
-
-        if ($format === 'xml') {
-            header('Content-type: text/xml');
-            echo replace_macros(Theme::get_template('poco_xml.tpl'), array_xmlify(array('$response' => $ret)));
-            http_status_exit(500);
-        }
-        if ($format === 'json') {
-            header('Content-type: application/json');
-            echo json_encode($ret);
-            killme();
-        } else {
-            http_status_exit(500);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/Zotlabs/Lib/Statistics.php b/Zotlabs/Lib/Statistics.php
deleted file mode 100644
index 36cd27137..000000000
--- a/Zotlabs/Lib/Statistics.php
+++ /dev/null
@@ -1,62 +0,0 @@
- %s - INTERVAL %s",
-            db_utcnow(),
-            db_quoteinterval('6 MONTH')
-        );
-        $total = ($r) ? count($r) : 0;
-        Config::Set('system', 'channels_active_halfyear_stat', $total);
-        return $total;
-    }
-
-    function get_channels_1mo()
-    {
-        $r = q(
-            "select channel_id from channel left join account on account_id = channel_account_id
-            where account_flags = 0 and channel_active > %s - INTERVAL %s",
-            db_utcnow(),
-            db_quoteinterval('1 MONTH')
-        );
-        $total = ($r) ? count($r) : 0;
-        Config::Set('system', 'channels_active_monthly_stat', $total);
-        return $total;
-    }
-
-    function get_posts()
-    {
-        $posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 and id = parent");
-        $total = ($posts) ? intval($posts[0]['local_posts']) : 0;
-        Config::Set('system', 'local_posts_stat', $total);
-        return $total;
-    }
-
-    function get_comments()
-    {
-        $posts = q("SELECT COUNT(*) AS local_posts FROM item WHERE item_wall = 1 and id != parent");
-        $total = ($posts) ? intval($posts[0]['local_posts']) : 0;
-        Config::Set('system', 'local_comments_stat', $total);
-        return $total;
-    }
-
-}
diff --git a/Zotlabs/Lib/Stringsjs.php b/Zotlabs/Lib/Stringsjs.php
deleted file mode 100644
index 1e90734e0..000000000
--- a/Zotlabs/Lib/Stringsjs.php
+++ /dev/null
@@ -1,129 +0,0 @@
- '/images/' . PLATFORM_NAME . '-64.png',
-            '$delitem'     => t('Delete this item?'),
-            '$comment'     => t('Comment'),
-            '$showmore'    => sprintf(t('%s show all'), ''),
-            '$showfewer'   => sprintf(t('%s show less'), ''),
-            '$divgrowmore' => sprintf(t('%s expand'), ''),
-            '$divgrowless' => sprintf(t('%s collapse'), ''),
-            '$pwshort'     => t("Password too short"),
-            '$pwnomatch'   => t("Passwords do not match"),
-            '$everybody'   => t('everybody'),
-            '$passphrase'  => t('Secret Passphrase'),
-            '$passhint'    => t('Passphrase hint'),
-            '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'),
-            '$closeAll'    => t('close all'),
-            '$nothingnew'  => t('Nothing new here'),
-            '$rating_desc' => t('Rate This Channel (this is public)'),
-            '$rating_val'  => t('Rating'),
-            '$rating_text' => t('Describe (optional)'),
-            '$submit'      => t('Submit'),
-            '$linkurl'     => t('Please enter a link URL'),
-            '$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'),
-            '$location'    => t('Location'),
-            '$lovely'      => t('lovely'),
-            '$wonderful'   => t('wonderful'),
-            '$fantastic'   => t('fantastic'),
-            '$great'       => t('great'),
-            '$nick_invld1' => t('Your chosen nickname was either already taken or not valid. Please use our suggestion ('),
-            '$nick_invld2' => t(') or enter a new one.'),
-            '$nick_valid'  => t('Thank you, this nickname is valid.'),
-            '$name_empty'  => t('A channel name is required.'),
-            '$name_ok1'    => t('This is a '),
-            '$name_ok2'    => t(' channel name'),
-            '$pinned'      => t('Pinned'),
-            '$pin_item'    => t('Pin this post'),
-            '$unpin_item'  => t('Unpin this post'),
-            '$tos'         => t('Please accept terms to continue'),
-
-            // translatable prefix and suffix strings for jquery.timeago -
-            // using the defaults set below if left untranslated, empty strings if
-            // translated to "NONE" and the corresponding language strings
-            // if translated to anything else
-            '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))),
-            '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))),
-            '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))),
-            '$t04' => ((t('timeago.suffixFromNow') == 'timeago.suffixFromNow') ? 'from now' : ((t('timeago.suffixFromNow') == 'NONE') ? '' : t('timeago.suffixFromNow'))),
-
-            // translatable main strings for jquery.timeago
-            '$t05' => t('less than a minute'),
-            '$t06' => t('about a minute'),
-            '$t07' => t('%d minutes'),
-            '$t08' => t('about an hour'),
-            '$t09' => t('about %d hours'),
-            '$t10' => t('a day'),
-            '$t11' => t('%d days'),
-            '$t12' => t('about a month'),
-            '$t13' => t('%d months'),
-            '$t14' => t('about a year'),
-            '$t15' => t('%d years'),
-            '$t16' => t(' '), // wordSeparator
-            '$t17' => ((t('timeago.numbers') != 'timeago.numbers') ? t('timeago.numbers') : '[]'),
-
-            '$January' => t('January'),
-            '$February' => t('February'),
-            '$March' => t('March'),
-            '$April' => t('April'),
-            '$May' => t('May', 'long'),
-            '$June' => t('June'),
-            '$July' => t('July'),
-            '$August' => t('August'),
-            '$September' => t('September'),
-            '$October' => t('October'),
-            '$November' => t('November'),
-            '$December' => t('December'),
-            '$Jan' => t('Jan'),
-            '$Feb' => t('Feb'),
-            '$Mar' => t('Mar'),
-            '$Apr' => t('Apr'),
-            '$MayShort' => t('May', 'short'),
-            '$Jun' => t('Jun'),
-            '$Jul' => t('Jul'),
-            '$Aug' => t('Aug'),
-            '$Sep' => t('Sep'),
-            '$Oct' => t('Oct'),
-            '$Nov' => t('Nov'),
-            '$Dec' => t('Dec'),
-            '$Sunday' => t('Sunday'),
-            '$Monday' => t('Monday'),
-            '$Tuesday' => t('Tuesday'),
-            '$Wednesday' => t('Wednesday'),
-            '$Thursday' => t('Thursday'),
-            '$Friday' => t('Friday'),
-            '$Saturday' => t('Saturday'),
-            '$Sun' => t('Sun'),
-            '$Mon' => t('Mon'),
-            '$Tue' => t('Tue'),
-            '$Wed' => t('Wed'),
-            '$Thu' => t('Thu'),
-            '$Fri' => t('Fri'),
-            '$Sat' => t('Sat'),
-            '$today' => t('today', 'calendar'),
-            '$month' => t('month', 'calendar'),
-            '$week' => t('week', 'calendar'),
-            '$day' => t('day', 'calendar'),
-            '$allday' => t('All day', 'calendar'),
-            '$channel_social' => t('A social networking profile that is public by default and private if desired'),
-            '$channel_social_restricted' => t('A social networking profile where content is private to your [Friends] Access List by default but can be made public if desired'),
-            '$channel_forum' => t('A public group where members are allowed to upload media by default'),
-            '$channel_forum_restricted' => t('A private group with no upload permission'),
-            '$channel_forum_moderated' => t('A public group where posts are moderated by the owner. The [moderated] permission may be removed from any group member once trust is established'),
-            '$channel_collection' => t('A sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'),
-            '$channel_collection_restricted' => t('A private sub-channel of your main channel - often devoted to a specific language or topic. Replies are sent back to your main channel'),
-        ));
-    }
-
-
-    
-}
\ No newline at end of file
diff --git a/Zotlabs/Lib/SvgSanitizer.php b/Zotlabs/Lib/SvgSanitizer.php
deleted file mode 100644
index 5e21c4f12..000000000
--- a/Zotlabs/Lib/SvgSanitizer.php
+++ /dev/null
@@ -1,160 +0,0 @@
- ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'href', 'xlink:href', 'xlink:title'],
-        'circle' => ['class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'r', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
-        'clipPath' => ['class', 'clipPathUnits', 'id'],
-        'defs' => [],
-        'style' => ['type'],
-        'desc' => [],
-        'ellipse' => ['class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
-        'feGaussianBlur' => ['class', 'color-interpolation-filters', 'id', 'requiredFeatures', 'stdDeviation'],
-        'filter' => ['class', 'color-interpolation-filters', 'filterRes', 'filterUnits', 'height', 'id', 'primitiveUnits', 'requiredFeatures', 'width', 'x', 'xlink:href', 'y'],
-        'foreignObject' => ['class', 'font-size', 'height', 'id', 'opacity', 'requiredFeatures', 'style', 'transform', 'width', 'x', 'y'],
-        'g' => ['class', 'clip-path', 'clip-rule', 'id', 'display', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'font-family', 'font-size', 'font-style', 'font-weight', 'text-anchor'],
-        'image' => ['class', 'clip-path', 'clip-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'style', 'systemLanguage', 'transform', 'width', 'x', 'xlink:href', 'xlink:title', 'y'],
-        'line' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'x1', 'x2', 'y1', 'y2'],
-        'linearGradient' => ['class', 'id', 'gradientTransform', 'gradientUnits', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'x1', 'x2', 'xlink:href', 'y1', 'y2'],
-        'marker' => ['id', 'class', 'markerHeight', 'markerUnits', 'markerWidth', 'orient', 'preserveAspectRatio', 'refX', 'refY', 'systemLanguage', 'viewBox'],
-        'mask' => ['class', 'height', 'id', 'maskContentUnits', 'maskUnits', 'width', 'x', 'y'],
-        'metadata' => ['class', 'id'],
-        'path' => ['class', 'clip-path', 'clip-rule', 'd', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
-        'pattern' => ['class', 'height', 'id', 'patternContentUnits', 'patternTransform', 'patternUnits', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xlink:href', 'y'],
-        'polygon' => ['class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
-        'polyline' => ['class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform'],
-        'radialGradient' => ['class', 'cx', 'cy', 'fx', 'fy', 'gradientTransform', 'gradientUnits', 'id', 'r', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'xlink:href'],
-        'rect' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'width', 'x', 'y'],
-        'stop' => ['class', 'id', 'offset', 'requiredFeatures', 'stop-color', 'stop-opacity', 'style', 'systemLanguage'],
-        'svg' => ['class', 'clip-path', 'clip-rule', 'filter', 'id', 'height', 'mask', 'preserveAspectRatio', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xmlns', 'xmlns:se', 'xmlns:xlink', 'y'],
-        'switch' => ['class', 'id', 'requiredFeatures', 'systemLanguage'],
-        'symbol' => ['class', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'opacity', 'preserveAspectRatio', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'viewBox'],
-        'text' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'transform', 'x', 'xml:space', 'y'],
-        'textPath' => ['class', 'id', 'method', 'requiredFeatures', 'spacing', 'startOffset', 'style', 'systemLanguage', 'transform', 'xlink:href'],
-        'title' => [],
-        'tspan' => ['class', 'clip-path', 'clip-rule', 'dx', 'dy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'rotate', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'textLength', 'transform', 'x', 'xml:space', 'y'],
-        'use' => ['class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'transform', 'width', 'x', 'xlink:href', 'y'],
-    ];
-
-    public function __construct()
-    {
-        $this->xmlDoc = new DOMDocument('1.0', 'UTF-8');
-        $this->xmlDoc->preserveWhiteSpace = false;
-        libxml_use_internal_errors(true);
-    }
-
-    // load XML SVG
-    public function load($file)
-    {
-        $this->xmlDoc->load($file);
-    }
-
-    public function loadXML($str)
-    {
-        if (!$str) {
-            logger('loadxml: empty input', LOGGER_DEBUG);
-            return false;
-        }
-        if (!$this->xmlDoc->loadXML($str)) {
-            logger('loadxml: ' . print_r(array_slice(libxml_get_errors(), 0, Config::Get('system', 'svg_backtrace_limit', 3)), true), LOGGER_DEBUG);
-            return false;
-        }
-        return true;
-    }
-
-    public function sanitize()
-    {
-        // all elements in xml doc
-        $allElements = $this->xmlDoc->getElementsByTagName('*');
-
-        // loop through all elements
-        for ($i = 0; $i < $allElements->length; $i++) {
-            $this->removedattrs = [];
-
-            $currentNode = $allElements->item($i);
-
-            // logger('current_node: ' . print_r($currentNode,true));
-
-            // array of allowed attributes in specific element
-            $allowlist_attr_arr = self::$allowlist[$currentNode->tagName];
-
-            // does element exist in allowlist?
-            if (isset($allowlist_attr_arr)) {
-                $total = $currentNode->attributes->length;
-
-                for ($x = 0; $x < $total; $x++) {
-                    // get attributes name
-                    $attrName = $currentNode->attributes->item($x)->nodeName;
-
-                    // logger('checking: ' . print_r($currentNode->attributes->item($x),true));
-                    $matches = false;
-
-                    // check if attribute isn't in allowlist
-                    if (!in_array($attrName, $allowlist_attr_arr)) {
-                        $this->removedattrs[] = $attrName;
-                    } // check for disallowed functions
-                    elseif (
-                        preg_match_all(
-                            '/([a-zA-Z0-9]+)[\s]*\(/',
-                            $currentNode->attributes->item($x)->textContent,
-                            $matches,
-                            PREG_SET_ORDER
-                        )
-                    ) {
-                        if ($attrName === 'text') {
-                            continue;
-                        }
-                        foreach ($matches as $match) {
-                            if (!in_array($match[1], self::$allowed_functions)) {
-                                logger('queue_remove_function: ' . $match[1], LOGGER_DEBUG);
-                                $this->removedattrs[] = $attrName;
-                            }
-                        }
-                    }
-                }
-                if ($this->removedattrs) {
-                    foreach ($this->removedattrs as $attr) {
-                        $currentNode->removeAttribute($attr);
-                        logger('removed: ' . $attr, LOGGER_DEBUG);
-                    }
-                }
-            } // else remove element
-            else {
-                logger('remove_node: ' . print_r($currentNode, true));
-                $currentNode->parentNode->removeChild($currentNode);
-            }
-        }
-        return true;
-    }
-
-    public function saveSVG()
-    {
-        $this->xmlDoc->formatOutput = true;
-        return ($this->xmlDoc->saveXML());
-    }
-}
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php
deleted file mode 100644
index c63a1b959..000000000
--- a/Zotlabs/Lib/System.php
+++ /dev/null
@@ -1,170 +0,0 @@
- ZOT_REVISION ];
-        Hook::call('zot_revision', $x);
-        return $x['revision'];
-    }
-
-    public static function get_std_version()
-    {
-        if (defined('STD_VERSION')) {
-            return STD_VERSION;
-        }
-        return '0.0.0';
-    }
-
-    public static function compatible_project($p)
-    {
-
-        if (in_array(strtolower($p), ['hubzilla', 'zap', 'red', 'misty', 'mistpark', 'redmatrix', 'osada', 'roadhouse','streams'])) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
deleted file mode 100644
index 4aa6e5eb0..000000000
--- a/Zotlabs/Lib/ThreadItem.php
+++ /dev/null
@@ -1,1081 +0,0 @@
-data = $data;
-        $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
-        $this->threaded = get_config('system', 'thread_allow', true);
-
-        $observer = App::get_observer();
-
-        // Prepare the children
-        if ($data['children']) {
-            foreach ($data['children'] as $item) {
-                /*
-                 * Only add those that will be displayed
-                 */
-
-                if (! visible_activity($item)) {
-                    continue;
-                }
-
-                // this is a quick hack to hide ActivityPub DMs that we should not be allowed to see
-                // but may have been forwarded as part of a conversation
-
-                if (intval($item['item_private']) && (intval($item['item_restrict']) & 1 ) && $item['mid'] !== $item['parent_mid']) {
-                    if (! $observer) {
-                        continue;
-                    }
-                }
-
-                $child = new ThreadItem($item);
-                $this->add_child($child);
-            }
-        }
-
-        // allow a site to configure the order and content of the reaction emoji list
-        if ($this->toplevel) {
-            $x = get_config('system', 'reactions');
-            if ($x && is_array($x) && count($x)) {
-                $this->reactions = $x;
-            }
-        }
-    }
-
-    /**
-     * Get data in a form usable by a conversation template
-     *
-     * Returns:
-     *      _ The data requested on success
-     *      _ false on failure
-     */
-
-    public function get_template_data($conv_responses, $thread_level = 1)
-    {
-
-        $result = [];
-
-        $item     = $this->get_data();
-
-        $commentww = '';
-        $sparkle = '';
-        $buttons = '';
-        $dropping = false;
-        $star = false;
-        $isstarred = "unstarred fa-star-o";
-        $is_comment = false;
-        $is_item = false;
-        $osparkle = '';
-        $total_children = $this->count_descendants();
-        $unseen_comments = ((isset($item['real_uid']) && $item['real_uid']) ? 0 : $this->count_unseen_descendants());
-        $privacy_warning = false;
-
-        $conv = $this->get_conversation();
-        $observer = $conv->get_observer();
-
-        $lock = t('Public visibility');
-		if (intval($item['item_private']) === 2) {
-			$lock = t('Direct message (private mail)');
-		}
-		if (intval($item['item_private']) === 1) {
-			$lock = t('Restricted visibility');
-		}
-
-        $locktype = intval($item['item_private']);
-
-        $shareable = ((($conv->get_profile_owner() == local_channel() && local_channel()) && (! intval($item['item_private']))) ? true : false);
-
-        // allow an exemption for sharing stuff from your private feeds
-        if ($item['author']['xchan_network'] === 'rss') {
-            $shareable = true;
-        }
-
-        // @fixme
-        // Have recently added code to properly handle polls in group reshares by redirecting all of the poll responses to the group.
-        // Sharing a poll using a regular embedded share is harder because the poll will need to fork. This is due to comment permissions.
-        // The original poll author may not accept responses from strangers. Forking the poll will receive responses from the sharer's
-        // followers, but there's no elegant way to merge these two sets of results together. For now, we'll disable sharing polls.
-
-        if ($item['obj_type'] === 'Question') {
-            $shareable = false;
-        }
-
-
-        if ($item['item_restrict'] & 2) {
-            $privacy_warning = true;
-            $lock = t('This comment is part of a private conversation, yet was shared with the public. Discretion advised.');
-        }
-
-        $mode = $conv->get_mode();
-
-        $edlink = 'editpost';
-
-        if (local_channel() && $observer['xchan_hash'] === $item['author_xchan']) {
-            $edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit'));
-        } else {
-            $edpost = false;
-        }
-
-        if (local_channel() && $observer['xchan_hash'] === $item['owner_xchan']) {
-            $myconv = true;
-        } else {
-            $myconv = false;
-        }
-
-
-        if ($item['verb'] === 'Announce') {
-            $edpost = false;
-        }
-
-
-        if (
-            $observer && $observer['xchan_hash']
-            && ( $observer['xchan_hash'] == $this->get_data_value('author_xchan')
-            || $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
-            || $observer['xchan_hash'] == $this->get_data_value('source_xchan')
-            || $this->get_data_value('uid') == local_channel())
-        ) {
-            $dropping = true;
-        }
-
-
-        if (array_key_exists('real_uid', $item)) {
-            $edpost = false;
-            $dropping = false;
-        }
-
-
-        if ($dropping) {
-            $drop = array(
-                'dropping' => $dropping,
-                'delete' => t('Delete'),
-            );
-        } elseif (is_site_admin()) {
-            $drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ];
-        }
-
-        if (isset($observer_is_pageowner) && $observer_is_pageowner) {
-            $multidrop = array(
-                'select' => t('Select'),
-            );
-        }
-
-        $filer = ((($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid', $item))) ? t('Save to Folder') : false);
-
-        $profile_avatar = $item['author']['xchan_photo_m'];
-        $profile_link   = chanlink_hash($item['author_xchan']);
-        $profile_name   = $item['author']['xchan_name'];
-
-        $profile_addr = $item['author']['xchan_addr'] ? $item['author']['xchan_addr'] : $item['author']['xchan_url'];
-
-        $location = format_location($item);
-        $isevent = false;
-        $attend = null;
-        $canvote = false;
-
-        // process action responses - e.g. like/dislike/attend/agree/whatever
-        $response_verbs = [ 'like', 'dislike' ];
-
-        if ($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
-            $response_verbs[] = 'attendyes';
-            $response_verbs[] = 'attendno';
-            $response_verbs[] = 'attendmaybe';
-            if ($this->is_commentable() && $observer) {
-                $isevent = true;
-                $attend = array( t('I will attend'), t('I will not attend'), t('I might attend'));
-                $undo_attend = t('Undo attendance');
-            }
-        }
-
-        $responses = get_responses($conv_responses, $response_verbs, $this, $item);
-
-        $my_responses = [];
-        foreach ($response_verbs as $v) {
-            $my_responses[$v] = ((isset($conv_responses[$v][$item['mid'] . '-m']) && $conv_responses[$v][$item['mid'] . '-m']) ? 1 : 0);
-        }
-
-        $like_count = ((x($conv_responses['like'], $item['mid'])) ? $conv_responses['like'][$item['mid']] : '');
-        $like_list = ((x($conv_responses['like'], $item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : '');
-        if (($like_list) && (count($like_list) > MAX_LIKERS)) {
-            $like_list_part = array_slice($like_list, 0, MAX_LIKERS);
-            array_push($like_list_part, '' . t('View all') . '');
-        } else {
-            $like_list_part = '';
-        }
-        if (get_config('system', 'show_like_counts', true)) {
-            $like_button_label = tt('Like', 'Likes', $like_count, 'noun');
-        } else {
-            $like_button_label = t('Likes', 'noun');
-        }
-
-        $dislike_count = ((x($conv_responses['dislike'], $item['mid'])) ? $conv_responses['dislike'][$item['mid']] : '');
-        $dislike_list = ((x($conv_responses['dislike'], $item['mid'])) ? $conv_responses['dislike'][$item['mid'] . '-l'] : '');
-        if (get_config('system', 'show_like_counts', true)) {
-                $dislike_button_label = tt('Dislike', 'Dislikes', $dislike_count, 'noun');
-        } else {
-                $dislike_button_label = t('Dislikes', 'noun');
-        }
-
-        if (($dislike_list) && (count($dislike_list) > MAX_LIKERS)) {
-            $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
-            array_push($dislike_list_part, '' . t('View all') . '');
-        } else {
-            $dislike_list_part = '';
-        }
-
-
-        $showlike    = ((x($conv_responses['like'], $item['mid'])) ? format_like($conv_responses['like'][$item['mid']], $conv_responses['like'][$item['mid'] . '-l'], 'like', $item['mid']) : '');
-        $showdislike = ((x($conv_responses['dislike'], $item['mid']))
-                ? format_like($conv_responses['dislike'][$item['mid']], $conv_responses['dislike'][$item['mid'] . '-l'], 'dislike', $item['mid']) : '');
-
-        /*
-         * We should avoid doing this all the time, but it depends on the conversation mode
-         * And the conv mode may change when we change the conv, or it changes its mode
-         * Maybe we should establish a way to be notified about conversation changes
-         */
-
-        $this->check_wall_to_wall();
-
-        if ($this->is_toplevel()) {
-            if (local_channel() && ($conv->get_profile_owner() == local_channel() || intval($item['item_private']) === 0)) {
-                $star = [
-                    'toggle' => t('Save'),
-                    'isstarred' => ((intval($item['item_starred'])) ? true : false),
-                ];
-            }
-        } else {
-            $is_comment = true;
-        }
-
-
-        $verified = (intval($item['item_verified']) ? t('Message signature validated') : '');
-        $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : '');
-        $unverified = '' ; // (($this->is_wall_to_wall() && (! intval($item['item_verified']))) ? t('Message cannot be verified') : '');
-
-
-        if ($conv->get_profile_owner() == local_channel()) {
-            $tagger = array(
-                'tagit' => t("Add Tag"),
-                'classtagger' => "",
-            );
-        }
-
-        $has_bookmarks = false;
-        if (isset($item['term']) && is_array($item['term'])) {
-            foreach ($item['term'] as $t) {
-                if ($t['ttype'] == TERM_BOOKMARK) {
-                    $has_bookmarks = true;
-                }
-            }
-        }
-
-        $has_event = false;
-        if (($item['obj_type'] === ACTIVITY_OBJ_EVENT) && $conv->get_profile_owner() == local_channel()) {
-            $has_event = true;
-        }
-
-        if ($this->is_commentable() && $observer) {
-            $like = array( t('I like this'), t('Undo like'));
-            $dislike = array( t('I don\'t like this'), t('Undo dislike') );
-        }
-
-        $share = $embed = EMPTY_STR;
-
-        if ($shareable) {
-            $share = t('Repeat This');
-            $embed = t('Share this');
-        }
-
-        $dreport = '';
-
-        $keep_reports = intval(get_config('system', 'expire_delivery_reports'));
-        if ($keep_reports === 0) {
-            $keep_reports = 10;
-        }
-
-        if ((! get_config('system', 'disable_dreport')) && strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', "now - $keep_reports days")) > 0) {
-            $dreport = t('Delivery Report');
-            $dreport_link = gen_link_id($item['mid']);
-        }
-        $is_new = false;
-
-        if (strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', 'now - 12 hours')) > 0) {
-            $is_new = true;
-        }
-
-        localize_item($item);
-
-        $opts = [];
-        if ($this->is_wall_to_wall()) {
-            if ($this->owner_censored) {
-                $opts['censored'] = true;
-            }
-        }
-
-        $body = prepare_body($item, true, $opts);
-
-        // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
-        // since we can't depend on llink or plink pointing to the right local location.
-
-        $owner_address = substr($item['owner']['xchan_addr'], 0, strpos($item['owner']['xchan_addr'], '@'));
-        $viewthread = $item['llink'];
-        if ($conv->get_mode() === 'channel') {
-            $viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid']));
-        }
-
-        $comment_count_txt = sprintf(tt('%d comment', '%d comments', $total_children), $total_children);
-        $list_unseen_txt = (($unseen_comments) ? sprintf(t('%d unseen'), $unseen_comments) : '');
-
-        $children = $this->get_children();
-
-
-        $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
-
-        $dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ];
-        Hook::call('dropdown_extras', $dropdown_extras_arr);
-        $dropdown_extras = $dropdown_extras_arr['dropdown_extras'];
-
-        // Pinned item processing
-        $allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false);
-        $pinned_items = ($allowed_type ? get_pconfig($item['uid'], 'pinned', $item['item_type'], []) : []);
-        $pinned = ((! empty($pinned_items) && in_array($item['mid'], $pinned_items)) ? true : false);
-
-        $tmp_item = array(
-            'template' => $this->get_template(),
-            'mode' => $mode,
-            'item_type' => intval($item['item_type']),
-            'comment_order' => $item['comment_order'],
-            'parent' => $this->get_data_value('parent'),
-            'collapsed' => ((intval($item['comment_order']) > 3) ? true : false),
-            'type' => implode("", array_slice(explode("/", $item['verb']), -1)),
-            'body' => $body['html'],
-            'tags' => $body['tags'],
-            'categories' => $body['categories'],
-            'mentions' => $body['mentions'],
-            'attachments' => $body['attachments'],
-            'folders' => $body['folders'],
-            'text' => strip_tags($body['html']),
-            'id' => $this->get_id(),
-            'mid' => $item['mid'],
-            'isevent' => $isevent,
-            'attend' => $attend,
-            'undo_attend' => $undo_attend,
-            'consensus' => '',
-            'conlabels' => '',
-            'canvote' => $canvote,
-            'linktitle' => sprintf(t('View %s\'s profile - %s'), $profile_name, (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url'])),
-            'olinktitle' => sprintf(t('View %s\'s profile - %s'), $this->get_owner_name(), (($item['owner']['xchan_addr']) ? $item['owner']['xchan_addr'] : $item['owner']['xchan_url'])),
-            'llink' => $item['llink'],
-            'viewthread' => $viewthread,
-            'to' => t('to'),
-            'via' => t('via'),
-            'wall' => t('Wall-to-Wall'),
-            'vwall' => t('via Wall-To-Wall:'),
-            'profile_url' => $profile_link,
-            'thread_action_menu' => thread_action_menu($item, $conv->get_mode()),
-            'thread_author_menu' => thread_author_menu($item, $conv->get_mode()),
-            'dreport' => $dreport,
-            'dreport_link' => ((isset($dreport_link) && $dreport_link) ? $dreport_link : EMPTY_STR),
-            'myconv' => $myconv,
-            'name' => $profile_name,
-            'thumb' => $profile_avatar,
-            'osparkle' => $osparkle,
-            'sparkle' => $sparkle,
-            'title' => $item['title'],
-            'title_tosource' => get_pconfig($conv->get_profile_owner(), 'system', 'title_tosource'),
-            'ago' => relative_date($item['created']),
-            'app' => $item['app'],
-            'str_app' => sprintf(t('from %s'), $item['app']),
-            'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'),
-            'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
-            'editedtime' => (($item['edited'] != $item['created']) ? sprintf(t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''),
-            'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf(t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')) : ''),
-            'lock' => $lock,
-            'locktype' => $locktype,
-            'delayed' => $item['item_delayed'],
-            'privacy_warning' => $privacy_warning,
-            'verified' => $verified,
-            'unverified' => $unverified,
-            'forged' => $forged,
-            'location' => $location,
-            'divider' => get_pconfig($conv->get_profile_owner(), 'system', 'item_divider'),
-            'attend_label' => t('Attend'),
-            'attend_title' => t('Attendance Options'),
-            'vote_label' => t('Vote'),
-            'vote_title' => t('Voting Options'),
-            'comment_lbl' => (($this->is_commentable() && $observer) ? t('Reply') : ''),
-            'is_comment' => $is_comment,
-            'is_new' => $is_new,
-            'mod_display' => ((argv(0) === 'display') ? true : false),   // comments are not collapsed when using mod_display
-            'owner_url' => $this->get_owner_url(),
-            'owner_photo' => $this->get_owner_photo(),
-            'owner_name' => $this->get_owner_name(),
-            'photo' => $body['photo'],
-            'event' => $body['event'],
-            'has_tags' => $has_tags,
-            'reactions' => $this->reactions,
-
-            // Item toolbar buttons
-
-            'emojis'    => '', // deprecated - use your operating system or a browser plugin
-            'like'      => $like,
-            'dislike'   => $dislike,
-            'share'     => $share,
-            'embed'     => $embed,
-            'rawmid'    => $item['mid'],
-            'plink'     => get_plink($item),
-            'edpost'    => $edpost, // ((Features::enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
-            'star'      => $star,
-            'tagger'    => ((Features::enabled($conv->get_profile_owner(), 'commtag')) ? $tagger : ''),
-            'filer'     => ((Features::enabled($conv->get_profile_owner(), 'filing')) ? $filer : ''),
-            'pinned'    => ($pinned ? t('Pinned post') : ''),
-            'pinnable'  => (($this->is_toplevel() && local_channel() && $item['owner_xchan'] == $observer['xchan_hash'] && $allowed_type && $item['item_private'] == 0 && $item['item_delayed'] == 0) ? '1' : ''),
-            'pinme'     => ($pinned ? t('Unpin this post') : t('Pin this post')),
-            'isdraft'   => boolval($item['item_unpublished']),
-            'draft_txt' => t('Saved draft'),
-            'bookmark'  => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''),
-            'addtocal'  => (($has_event && ! $item['resource_id']) ? t('Add to Calendar') : ''),
-            'drop'      => $drop,
-            'multidrop' => ((Features::enabled($conv->get_profile_owner(), 'multi_delete')) ? $multidrop : ''),
-            'dropdown_extras' => $dropdown_extras,
-
-            // end toolbar buttons
-
-            'unseen_comments' => $unseen_comments,
-            'comment_count' => $total_children,
-            'comment_count_txt' => $comment_count_txt,
-            'list_unseen_txt' => $list_unseen_txt,
-            'markseen' => t('Mark all seen'),
-            'responses' => $responses,
-            'my_responses' => $my_responses,
-            'like_count' => $like_count,
-            'like_list' => $like_list,
-            'like_list_part' => $like_list_part,
-            'like_button_label' => $like_button_label,
-            'like_modal_title' => t('Likes', 'noun'),
-            'dislike_modal_title' => t('Dislikes', 'noun'),
-            'dislike_count' => $dislike_count,
-            'dislike_list' => $dislike_list,
-            'dislike_list_part' => $dislike_list_part,
-            'dislike_button_label' => $dislike_button_label,
-            'modal_dismiss' => t('Close'),
-            'showlike' => $showlike,
-            'showdislike' => $showdislike,
-            'comment' => ($item['item_delayed'] ? '' : $this->get_comment_box()),
-            'previewing' => ($conv->is_preview() ? true : false ),
-            'preview_lbl' => t('This is an unsaved preview'),
-            'wait' => t('Please wait'),
-            'submid' => str_replace(['+','='], ['',''], base64_encode($item['mid'])),
-            'thread_level' => $thread_level,
-            'indentpx' => intval(get_pconfig(local_channel(), 'system', 'thread_indent_px', get_config('system', 'thread_indent_px', 0))),
-            'thread_max' => intval(get_config('system', 'thread_maxlevel', 20)) + 1
-        );
-
-        $arr = array('item' => $item, 'output' => $tmp_item);
-        Hook::call('display_item', $arr);
-
-        $result = $arr['output'];
-
-        $result['children'] = [];
-
-        if (local_channel() && get_pconfig(local_channel(), 'system', 'activitypub', get_config('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
-            // place to store all the author addresses (links if not available) in the thread so we can auto-mention them in JS.
-            $result['authors'] = [];
-            // fix to add in sub-replies if replying to a comment on your own post from the top level.
-            if ($observer && ($profile_addr === $observer['xchan_hash'] || $profile_addr === $observer['xchan_addr'])) {
-                // ignore it
-            } else {
-                $result['authors'][] = $profile_addr;
-            }
-
-            // Add any mentions from the immediate parent, unless they are mentions of the current viewer or duplicates
-            if (isset($item['term']) && is_array($item['term'])) {
-                $additional_mentions = [];
-                foreach ($item['term'] as $t) {
-                    if ($t['ttype'] == TERM_MENTION) {
-                        $additional_mentions[] = ((($position = strpos($t['url'], 'url=')) !== false) ? urldecode(substr($t['url'], $position + 4)) : $t['url']);
-                    }
-                }
-                if ($additional_mentions) {
-                    $r = q("select hubloc_addr, hubloc_id_url, hubloc_hash from hubloc where hubloc_id_url in (" . protect_sprintf(stringify_array($additional_mentions, true)) . ") ");
-                    if ($r) {
-                        foreach ($r as $rv) {
-                            $ment = (($r[0]['hubloc_addr']) ? $r[0]['hubloc_addr'] : $r[0]['hubloc_id_url']);
-                            if ($ment) {
-                                if ($observer && $observer['xchan_hash'] !== $rv['hubloc_hash'] && ! in_array($ment, $result['authors'])) {
-                                    $result['authors'][] = $ment;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        $nb_children = count($children);
-
-        $total_children = $this->count_visible_descendants();
-
-        $visible_comments = get_config('system', 'expanded_comments', 3);
-
-        if (($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
-            if ($children) {
-                foreach ($children as $child) {
-                    $xz = $child->get_template_data($conv_responses, $thread_level + 1);
-                    $result['children'][] = $xz;
-                }
-            }
-            // Collapse
-            if ($total_children > $visible_comments && $thread_level == 1) {
-                $result['children'][0]['comment_firstcollapsed'] = true;
-                $result['children'][0]['num_comments'] = $comment_count_txt;
-                $result['children'][0]['hide_text'] = sprintf(t('%s show all'), '');
-            }
-        }
-
-        $result['private'] = $item['item_private'];
-        $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
-
-        if ($this->is_threaded()) {
-            $result['flatten'] = false;
-            $result['threaded'] = true;
-        } else {
-            $result['flatten'] = true;
-            $result['threaded'] = false;
-        }
-
-        return $result;
-    }
-
-    public function get_id()
-    {
-        return $this->get_data_value('id');
-    }
-
-    public function get_display_mode()
-    {
-        return $this->display_mode;
-    }
-
-    public function set_display_mode($mode)
-    {
-        $this->display_mode = $mode;
-    }
-
-    public function is_threaded()
-    {
-        return $this->threaded;
-    }
-
-    public function get_author()
-    {
-        $xchan = $this->get_data_value('author');
-        if ($xchan['xchan_addr']) {
-            return $xchan['xchan_addr'];
-        }
-        return $xchan['xchan_url'];
-    }
-
-    public function set_reload($val)
-    {
-        $this->reload = $val;
-    }
-
-    public function get_reload()
-    {
-        return $this->reload;
-    }
-
-    public function set_commentable($val)
-    {
-        $this->commentable = $val;
-        foreach ($this->get_children() as $child) {
-            $child->set_commentable($val);
-        }
-    }
-
-    public function is_commentable()
-    {
-        return $this->commentable;
-    }
-
-    /**
-     * Add a child item
-     */
-    public function add_child($item)
-    {
-        $item_id = $item->get_id();
-        if (!$item_id) {
-            logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG);
-            return false;
-        }
-        if ($this->get_child($item->get_id())) {
-            logger('[WARN] Item::add_child : Item already exists (' . $item->get_id() . ').', LOGGER_DEBUG);
-            return false;
-        }
-
-        /*
-         * Only add what will be displayed
-         */
-
-        if (activity_match($item->get_data_value('verb'), ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'), ACTIVITY_DISLIKE)) {
-            return false;
-        }
-
-        $item->set_parent($this);
-        $this->children[] = $item;
-        return end($this->children);
-    }
-
-    /**
-     * Get a child by its ID
-     */
-
-    public function get_child($id)
-    {
-        foreach ($this->get_children() as $child) {
-            if ($child->get_id() == $id) {
-                return $child;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get all our children
-     */
-
-    public function get_children()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Set our parent
-     */
-    protected function set_parent($item)
-    {
-        $parent = $this->get_parent();
-        if ($parent) {
-            $parent->remove_child($this);
-        }
-        $this->parent = $item;
-        $this->set_conversation($item->get_conversation());
-    }
-
-    /**
-     * Remove our parent
-     */
-
-    protected function remove_parent()
-    {
-        $this->parent = null;
-        $this->conversation = null;
-    }
-
-    /**
-     * Remove a child
-     */
-
-    public function remove_child($item)
-    {
-        $id = $item->get_id();
-        foreach ($this->get_children() as $key => $child) {
-            if ($child->get_id() == $id) {
-                $child->remove_parent();
-                unset($this->children[$key]);
-                // Reindex the array, in order to make sure there won't be any trouble on loops using count()
-                $this->children = array_values($this->children);
-                return true;
-            }
-        }
-        logger('[WARN] Item::remove_child : Item is not a child (' . $id . ').', LOGGER_DEBUG);
-        return false;
-    }
-
-    /**
-     * Get parent item
-     */
-    protected function get_parent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * set conversation
-     */
-    public function set_conversation($conv)
-    {
-        $previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
-
-        $this->conversation = $conv;
-
-        // Set it on our children too
-        foreach ($this->get_children() as $child) {
-            $child->set_conversation($conv);
-        }
-    }
-
-    /**
-     * get conversation
-     */
-    public function get_conversation()
-    {
-        return $this->conversation;
-    }
-
-    /**
-     * Get raw data
-     *
-     * We shouldn't need this
-     */
-    public function get_data()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Get a data value
-     *
-     * Returns:
-     *      _ value on success
-     *      _ false on failure
-     */
-    public function get_data_value($name)
-    {
-        if (!isset($this->data[$name])) {
-//          logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
-            return false;
-        }
-
-        return $this->data[$name];
-    }
-
-    /**
-     * Get template
-     */
-    public function get_template()
-    {
-        return $this->template;
-    }
-
-
-    public function set_template($t)
-    {
-        $this->template = $t;
-    }
-
-    /**
-     * Check if this is a toplevel post
-     */
-    private function is_toplevel()
-    {
-        return $this->toplevel;
-    }
-
-    /**
-     * Count the total of our descendants
-     */
-    private function count_descendants()
-    {
-        $children = $this->get_children();
-        $total = count($children);
-        if ($total > 0) {
-            foreach ($children as $child) {
-                $total += $child->count_descendants();
-            }
-        }
-        return $total;
-    }
-
-    public function count_visible_descendants()
-    {
-        $total = 0;
-        $children = $this->get_children();
-        if ($children) {
-            foreach ($children as $child) {
-                if (! visible_activity($child->data)) {
-                    continue;
-                }
-                $total++;
-                $total += $child->count_visible_descendants();
-            }
-        }
-        return $total;
-    }
-
-
-    private function label_descendants($count = 0)
-    {
-        if (! array_key_exists('sequence', $this->data)) {
-            if ($count) {
-                $count++;
-            }
-            $this->data['sequence'] = $count;
-        }
-        logger('labelled: ' . print_r($this->data, true), LOGGER_DATA);
-        $children = $this->get_children();
-        $total = count($children);
-        if ($total > 0) {
-            foreach ($children as $child) {
-                if (! visible_activity($child->data)) {
-                    continue;
-                }
-                if (! array_key_exists('sequence', $this->data)) {
-                    $count++;
-                    $child->data['sequence'] = $count;
-                    logger('labelled_child: ' . print_r($child->data, true), LOGGER_DATA);
-                }
-                $child->label_descendants($count);
-            }
-        }
-    }
-
-    private function count_unseen_descendants()
-    {
-        $children = $this->get_children();
-        $total = count($children);
-        if ($total > 0) {
-            $total = 0;
-            foreach ($children as $child) {
-                if (! visible_activity($child->data)) {
-                    continue;
-                }
-                if (intval($child->data['item_unseen'])) {
-                    $total++;
-                }
-            }
-        }
-        return $total;
-    }
-
-
-    /**
-     * Get the template for the comment box
-     */
-    private function get_comment_box_template()
-    {
-        return $this->comment_box_template;
-    }
-
-    /**
-     * Get the comment box
-     *
-     * Returns:
-     *      _ The comment box string (empty if no comment box)
-     *      _ false on failure
-     */
-    private function get_comment_box($indent = 0)
-    {
-
-        if (!$this->is_toplevel() && !get_config('system', 'thread_allow', true)) {
-            return '';
-        }
-
-        $comment_box = '';
-        $conv = $this->get_conversation();
-
-//      logger('Commentable conv: ' . $conv->is_commentable());
-
-        if (! $this->is_commentable()) {
-            return;
-        }
-
-        $template = Theme::get_template($this->get_comment_box_template());
-
-        $observer = $conv->get_observer();
-
-        $arr = array('comment_buttons' => '','id' => $this->get_id());
-        Hook::call('comment_buttons', $arr);
-        $comment_buttons = $arr['comment_buttons'];
-
-        $feature_auto_save_draft = ((Features::enabled($conv->get_profile_owner(), 'auto_save_draft')) ? "true" : "false");
-        $permanent_draft = ((intval($conv->get_profile_owner()) === intval(local_channel()) && Apps::system_app_installed($conv->get_profile_owner(), 'Drafts')) ? ('Save draft') : EMPTY_STR);
-
-
-
-        $comment_box = replace_macros($template, array(
-            '$return_path' => '',
-            '$threaded' => $this->is_threaded(),
-            '$jsreload' => $conv->reload,
-            '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'),
-            '$id' => $this->get_id(),
-            '$parent' => $this->get_id(),
-            '$comment_buttons' => $comment_buttons,
-            '$profile_uid' =>  $conv->get_profile_owner(),
-            '$mylink' => $observer['xchan_url'],
-            '$mytitle' => t('This is you'),
-            '$myphoto' => $observer['xchan_photo_s'],
-            '$comment' => t('Comment'),
-            '$submit' => t('Submit'),
-            '$edat' => EMPTY_STR,
-            '$edbold' => t('Bold'),
-            '$editalic' => t('Italic'),
-            '$eduline' => t('Underline'),
-            '$edquote' => t('Quote'),
-            '$edcode' => t('Code'),
-            '$edimg' => t('Image'),
-            '$edatt' => t('Attach/Upload file'),
-            '$edurl' => t('Insert Link'),
-            '$edvideo' => t('Video'),
-            '$preview' => t('Preview'),
-            '$reset' => t('Reset'),
-            '$indent' => $indent,
-            '$can_upload' => (perm_is_allowed($conv->get_profile_owner(), get_observer_hash(), 'write_storage') && $conv->is_uploadable()),
-            '$feature_encrypt' => ((Apps::system_app_installed($conv->get_profile_owner(), 'Secrets')) ? true : false),
-            '$feature_markup' => ((Apps::system_app_installed($conv->get_profile_owner(), 'Markup')) ? true : false),
-            '$encrypt' => t('Encrypt text'),
-            '$cipher' => $conv->get_cipher(),
-            '$sourceapp' => App::$sourcename,
-            '$observer' => get_observer_hash(),
-            '$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(), '', 'post_comments')) ? true : false),
-            '$anonname' => [ 'anonname', t('Your full name (required)') ],
-            '$anonmail' => [ 'anonmail', t('Your email address (required)') ],
-            '$anonurl'  => [ 'anonurl',  t('Your website URL (optional)') ],
-            '$auto_save_draft' => $feature_auto_save_draft,
-            '$save' => $permanent_draft,
-            '$top' => $this->is_toplevel()
-        ));
-
-        return $comment_box;
-    }
-
-    private function get_redirect_url()
-    {
-        return $this->redirect_url;
-    }
-
-    /**
-     * Check if we are a wall to wall item and set the relevant properties
-     */
-    protected function check_wall_to_wall()
-    {
-        $conv = $this->get_conversation();
-        $this->wall_to_wall = false;
-        $this->owner_url = '';
-        $this->owner_photo = '';
-        $this->owner_name = '';
-        $this->owner_censored = false;
-
-        if ($conv->get_mode() === 'channel') {
-            return;
-        }
-
-        if ($this->is_toplevel() && ($this->get_data_value('author_xchan') != $this->get_data_value('owner_xchan'))) {
-            $this->owner_url = chanlink_hash($this->data['owner']['xchan_hash']);
-            $this->owner_photo = $this->data['owner']['xchan_photo_m'];
-            $this->owner_name = $this->data['owner']['xchan_name'];
-            $this->wall_to_wall = true;
-        }
-
-        // present friend-of-friend conversations from hyperdrive as relayed posts from the first friend
-        // we find among the respondents.
-
-        if ($this->is_toplevel() && (! $this->data['owner']['abook_id'])) {
-            if ($this->data['children']) {
-                $friend = $this->find_a_friend($this->data['children']);
-                if ($friend) {
-                    $this->owner_url = $friend['url'];
-                    $this->owner_photo = $friend['photo'];
-                    $this->owner_name = $friend['name'];
-                    $this->owner_censored = $friend['censored'];
-                    $this->wall_to_wall = true;
-                }
-            }
-        }
-    }
-
-    private function find_a_friend($items)
-    {
-        $ret = null;
-        if ($items) {
-            foreach ($items as $child) {
-                if ($child['author']['abook_id'] && (! intval($child['author']['abook_self']))) {
-                    return [
-                        'url'   => chanlink_hash($child['author']['xchan_hash']),
-                        'photo' => $child['author']['xchan_photo_m'],
-                        'name'  => $child['author']['xchan_name'],
-                        'censored' => (($child['author']['xchan_censored'] || $child['author']['abook_censor']) ? true : false)
-                    ];
-                    if ($child['children']) {
-                        $ret = $this->find_a_friend($child['children']);
-                        if ($ret) {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return $ret;
-    }
-
-
-    private function is_wall_to_wall()
-    {
-        return $this->wall_to_wall;
-    }
-
-    private function get_owner_url()
-    {
-        return $this->owner_url;
-    }
-
-    private function get_owner_photo()
-    {
-        return $this->owner_photo;
-    }
-
-    private function get_owner_name()
-    {
-        return $this->owner_name;
-    }
-
-    private function is_visiting()
-    {
-        return $this->visiting;
-    }
-}
diff --git a/Zotlabs/Lib/ThreadListener.php b/Zotlabs/Lib/ThreadListener.php
deleted file mode 100644
index 1bf4cbe98..000000000
--- a/Zotlabs/Lib/ThreadListener.php
+++ /dev/null
@@ -1,63 +0,0 @@
-set_mode($mode);
-        $this->preview = $preview;
-        $this->uploadable = $uploadable;
-        $this->prepared_item = $prepared_item;
-        $c = ((local_channel()) ? get_pconfig(local_channel(), 'system', 'default_cipher') : '');
-        if ($c) {
-            $this->cipher = $c;
-        }
-    }
-
-    /**
-     * Set the mode we'll be displayed on
-     */
-    private function set_mode($mode)
-    {
-        if ($this->get_mode() == $mode) {
-            return;
-        }
-
-        $this->observer = App::get_observer();
-        $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
-
-        switch ($mode) {
-            case 'stream':
-                $this->profile_owner = local_channel();
-                $this->writable = true;
-                break;
-            case 'pubstream':
-                $this->profile_owner = local_channel();
-                $this->writable = ((local_channel()) ? true : false);
-                break;
-            case 'hq':
-                $this->profile_owner = local_channel();
-                $this->writable = true;
-                break;
-            case 'channel':
-                $this->profile_owner = App::$profile['profile_uid'];
-                $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
-                break;
-            case 'cards':
-                $this->profile_owner = App::$profile['profile_uid'];
-                $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
-                $this->reload = $_SESSION['return_url'];
-                break;
-            case 'articles':
-                $this->profile_owner = App::$profile['profile_uid'];
-                $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
-                $this->reload = $_SESSION['return_url'];
-                break;
-            case 'display':
-                // in this mode we set profile_owner after initialisation (from conversation()) and then
-                // pull some trickery which allows us to re-invoke this function afterward
-                // it's an ugly hack so @FIXME
-                $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
-                $this->uploadable = perm_is_allowed($this->profile_owner, $ob_hash, 'write_storage');
-                break;
-            case 'page':
-                $this->profile_owner = App::$profile['uid'];
-                $this->writable = perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments');
-                break;
-            default:
-                logger('[ERROR] Conversation::set_mode : Unhandled mode (' . $mode . ').', LOGGER_DEBUG);
-                return false;
-                break;
-        }
-        $this->mode = $mode;
-    }
-
-    /**
-     * Get mode
-     */
-    public function get_mode()
-    {
-        return $this->mode;
-    }
-
-    /**
-     * Check if page is writable
-     */
-    public function is_writable()
-    {
-        return $this->writable;
-    }
-
-    public function is_commentable()
-    {
-        return $this->commentable;
-    }
-
-    public function is_uploadable()
-    {
-        return $this->uploadable;
-    }
-
-
-    /**
-     * Check if page is a preview
-     */
-    public function is_preview()
-    {
-        return $this->preview;
-    }
-
-    /**
-     * Get profile owner
-     */
-    public function get_profile_owner()
-    {
-        return $this->profile_owner;
-    }
-
-    public function set_profile_owner($uid)
-    {
-        $this->profile_owner = $uid;
-        $mode = $this->get_mode();
-        $this->mode = null;
-        $this->set_mode($mode);
-    }
-
-    public function get_observer()
-    {
-        return $this->observer;
-    }
-
-    public function get_cipher()
-    {
-        return $this->cipher;
-    }
-
-
-    /**
-     * Add a thread to the conversation
-     *
-     * Returns:
-     *      _ The inserted item on success
-     *      _ false on failure
-     */
-    public function add_thread($item)
-    {
-        $item_id = $item->get_id();
-        if (!$item_id) {
-            logger('Item has no ID!!', LOGGER_DEBUG, LOG_ERR);
-            return false;
-        }
-        if ($this->get_thread($item->get_id())) {
-            logger('Thread already exists (' . $item->get_id() . ').', LOGGER_DEBUG, LOG_WARNING);
-            return false;
-        }
-
-        /*
-         * Only add things that will be displayed
-         */
-
-
-        if (($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'), ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'), ACTIVITY_DISLIKE))) {
-            return false;
-        }
-
-        $item->set_commentable(false);
-        $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
-
-        if (! comments_are_now_closed($item->get_data())) {
-            if (($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash)) {
-                $item->set_commentable(true);
-            }
-
-            if (intval($item->get_data_value('item_nocomment'))) {
-                $item->set_commentable(false);
-            } elseif (! $item->is_commentable()) {
-                if ((array_key_exists('owner', $item->data)) && intval($item->data['owner']['abook_self'])) {
-                    $item->set_commentable(perm_is_allowed($this->profile_owner, $ob_hash, 'post_comments'));
-                } else {
-                    $item->set_commentable(can_comment_on_post($ob_hash, $item->data));
-                }
-            }
-        }
-        if ($this->mode === 'pubstream' && (! local_channel())) {
-            $item->set_commentable(false);
-        }
-
-
-        $item->set_conversation($this);
-        $this->threads[] = $item;
-        return end($this->threads);
-    }
-
-    /**
-     * Get data in a form usable by a conversation template
-     *
-     * We should find a way to avoid using those arguments (at least most of them)
-     *
-     * Returns:
-     *      _ The data requested on success
-     *      _ false on failure
-     */
-    public function get_template_data($conv_responses)
-    {
-        $result = [];
-
-        foreach ($this->threads as $item) {
-            if (($item->get_data_value('id') == $item->get_data_value('parent')) && $this->prepared_item) {
-                $item_data = $this->prepared_item;
-            } else {
-                $item_data = $item->get_template_data($conv_responses);
-            }
-            if (!$item_data) {
-                logger('Failed to get item template data (' . $item->get_id() . ').', LOGGER_DEBUG, LOG_ERR);
-                return false;
-            }
-            $result[] = $item_data;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get a thread based on its item id
-     *
-     * Returns:
-     *      _ The found item on success
-     *      _ false on failure
-     */
-    private function get_thread($id)
-    {
-        foreach ($this->threads as $item) {
-            if ($item->get_id() == $id) {
-                return $item;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/Zotlabs/Lib/Verify.php b/Zotlabs/Lib/Verify.php
deleted file mode 100644
index 04b4114eb..000000000
--- a/Zotlabs/Lib/Verify.php
+++ /dev/null
@@ -1,72 +0,0 @@
- ['Accept: application/jrd+json, */*']]);
-
-        if ($s['success']) {
-            $j = json_decode($s['body'], true);
-            return ($j);
-        }
-
-        return false;
-    }
-
-    public static function parse_resource($resource)
-    {
-
-        self::$resource = urlencode($resource);
-
-        if (strpos($resource, 'http') === 0) {
-            $m = parse_url($resource);
-            if ($m) {
-                if ($m['scheme'] !== 'https') {
-                    return false;
-                }
-                self::$server = $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
-            } else {
-                return false;
-            }
-        } elseif (strpos($resource, 'tag:') === 0) {
-            $arr = explode(':', $resource); // split the tag
-            $h = explode(',', $arr[1]); // split the host,date
-            self::$server = $h[0];
-        } else {
-            $x = explode('@', $resource);
-            if (!strlen($x[0])) {
-                // e.g. @dan@pixelfed.org
-                array_shift($x);
-            }
-            $username = $x[0];
-            if (count($x) > 1) {
-                self::$server = $x[1];
-            } else {
-                return false;
-            }
-            if (strpos($resource, 'acct:') !== 0) {
-                self::$resource = urlencode('acct:' . $resource);
-            }
-        }
-    }
-
-    /**
-     * @brief fetch a webfinger resource and return a zot6 discovery url if present
-     *
-     */
-
-    public static function zot_url($resource)
-    {
-
-        $arr = self::exec($resource);
-
-        if (is_array($arr) && array_key_exists('links', $arr)) {
-            foreach ($arr['links'] as $link) {
-				if (array_key_exists('rel',$link) && in_array($link['rel'], [ PROTOCOL_NOMAD, PROTOCOL_ZOT6 ])) {
-                    if (array_key_exists('href', $link) && $link['href'] !== EMPTY_STR) {
-                        return $link['href'];
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
-
diff --git a/Zotlabs/Lib/XConfig.php b/Zotlabs/Lib/XConfig.php
deleted file mode 100644
index a9d86fc88..000000000
--- a/Zotlabs/Lib/XConfig.php
+++ /dev/null
@@ -1,192 +0,0 @@
-XConfig is comparable to PConfig, except that it uses xchan
- * (an observer hash) as an identifier.
- *
- * XConfig is used for observer specific configurations and takes a
- * xchan as identifier.
- * The storage is of size MEDIUMTEXT.
- *
- * @code{.php}$var = Zotlabs\Lib\XConfig::Get('xchan', 'category', 'key');
- * // with default value for non existent key
- * $var = Zotlabs\Lib\XConfig::Get('xchan', 'category', 'unsetkey', 'defaultvalue');@endcode
- *
- * The old (deprecated?) way to access a XConfig value is:
- * @code{.php}$observer = App::get_observer_hash();
- * if ($observer) {
- *     $var = get_xconfig($observer, 'category', 'key');
- * }@endcode
- */
-class XConfig
-{
-
-    /**
-     * @brief Loads a full xchan's configuration into a cached storage.
-     *
-     * All configuration values of the given observer hash are stored in global
-     * cache which is available under the global variable App::$config[$xchan].
-     *
-     * @param string $xchan
-     *  The observer's hash
-     * @return void|false Returns false if xchan is not set
-     */
-    public static function Load($xchan)
-    {
-
-        if (! $xchan) {
-            return false;
-        }
-
-        if (! array_key_exists($xchan, App::$config)) {
-            App::$config[$xchan] = [];
-        }
-
-        $r = q(
-            "SELECT * FROM xconfig WHERE xchan = '%s'",
-            dbesc($xchan)
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $k = $rr['k'];
-                $c = $rr['cat'];
-                if (! array_key_exists($c, App::$config[$xchan])) {
-                    App::$config[$xchan][$c] = [];
-                    App::$config[$xchan][$c]['config_loaded'] = true;
-                }
-                App::$config[$xchan][$c][$k] = $rr['v'];
-            }
-        }
-    }
-
-    /**
-     * @brief Get a particular observer's config variable given the category
-     * name ($family) and a key.
-     *
-     * Get a particular observer's config value from the given category ($family)
-     * and the $key from a cached storage in App::$config[$xchan].
-     *
-     * Returns false if not set.
-     *
-     * @param string $xchan
-     *  The observer's hash
-     * @param string $family
-     *  The category of the configuration value
-     * @param string $key
-     *  The configuration key to query
-     * @param bool $default (optional) default false
-     * @return mixed Stored $value or false if it does not exist
-     */
-    public static function Get($xchan, $family, $key, $default = false)
-    {
-
-        if (! $xchan) {
-            return $default;
-        }
-
-        if (! array_key_exists($xchan, App::$config)) {
-            load_xconfig($xchan);
-        }
-
-        if ((! array_key_exists($family, App::$config[$xchan])) || (! array_key_exists($key, App::$config[$xchan][$family]))) {
-            return $default;
-        }
-
-        return unserialise(App::$config[$xchan][$family][$key]);
-    }
-
-    /**
-     * @brief Sets a configuration value for an observer.
-     *
-     * Stores a config value ($value) in the category ($family) under the key ($key)
-     * for the observer's $xchan hash.
-     *
-     * @param string $xchan
-     *  The observer's hash
-     * @param string $family
-     *  The category of the configuration value
-     * @param string $key
-     *  The configuration key to set
-     * @param string $value
-     *  The value to store
-     * @return mixed Stored $value or false
-     */
-    public static function Set($xchan, $family, $key, $value)
-    {
-
-        // manage array value
-        $dbvalue = ((is_array($value))  ? serialise($value) : $value);
-        $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-        if (self::Get($xchan, $family, $key) === false) {
-            if (! array_key_exists($xchan, App::$config)) {
-                App::$config[$xchan] = [];
-            }
-            if (! array_key_exists($family, App::$config[$xchan])) {
-                App::$config[$xchan][$family] = [];
-            }
-
-            $ret = q(
-                "INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' )",
-                dbesc($xchan),
-                dbesc($family),
-                dbesc($key),
-                dbesc($dbvalue)
-            );
-        } else {
-            $ret = q(
-                "UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s'",
-                dbesc($dbvalue),
-                dbesc($xchan),
-                dbesc($family),
-                dbesc($key)
-            );
-        }
-
-        App::$config[$xchan][$family][$key] = $value;
-
-        if ($ret) {
-            return $value;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @brief Deletes the given key from the observer's config.
-     *
-     * Removes the configured value from the stored cache in App::$config[$xchan]
-     * and removes it from the database.
-     *
-     * @param string $xchan
-     *  The observer's hash
-     * @param string $family
-     *  The category of the configuration value
-     * @param string $key
-     *  The configuration key to delete
-     * @return mixed
-     */
-    public static function Delete($xchan, $family, $key)
-    {
-
-        if (isset(App::$config[$xchan]) && isset(App::$config[$xchan][$family]) && isset(App::$config[$xchan][$family][$key])) {
-            unset(App::$config[$xchan][$family][$key]);
-        }
-
-        $ret = q(
-            "DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'",
-            dbesc($xchan),
-            dbesc($family),
-            dbesc($key)
-        );
-
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Lib/Xchan.php b/Zotlabs/Lib/Xchan.php
deleted file mode 100644
index c9e4614cd..000000000
--- a/Zotlabs/Lib/Xchan.php
+++ /dev/null
@@ -1,12 +0,0 @@
- $profile['xprof_hash'],
-            $arr['xprof_dob']          => (($profile['birthday'] === '0000-00-00') ? $profile['birthday'] : datetime_convert('', '', $profile['birthday'], 'Y-m-d')),
-            $arr['xprof_age']          => (($profile['age'])         ? intval($profile['age']) : 0),
-            $arr['xprof_desc']         => (($profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_gender']       => (($profile['gender'])      ? htmlspecialchars($profile['gender'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_marital']      => (($profile['marital'])     ? htmlspecialchars($profile['marital'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_sexual']       => (($profile['sexual'])      ? htmlspecialchars($profile['sexual'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_locale']       => (($profile['locale'])      ? htmlspecialchars($profile['locale'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_region']       => (($profile['region'])      ? htmlspecialchars($profile['region'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_postcode']     => (($profile['postcode'])    ? htmlspecialchars($profile['postcode'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_country']      => (($profile['country'])     ? htmlspecialchars($profile['country'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_about']        => (($profile['about'])       ? htmlspecialchars($profile['about'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_homepage']     => (($profile['homepage'])    ? htmlspecialchars($profile['homepage'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_hometown']     => (($profile['hometown'])    ? htmlspecialchars($profile['hometown'], ENT_COMPAT, 'UTF-8', false) : ''),
-            $arr['xprof_keywords']     => (($profile['keywords'])    ? htmlspecialchars($profile['keywords'], ENT_COMPAT, 'UTF-8', false) : ''),
-
-        ];
-
-        return create_table_from_array('xprof', $store);
-    }
-
-
-}
\ No newline at end of file
diff --git a/Zotlabs/Lib/Yaml.php b/Zotlabs/Lib/Yaml.php
deleted file mode 100644
index 1aee3574b..000000000
--- a/Zotlabs/Lib/Yaml.php
+++ /dev/null
@@ -1,33 +0,0 @@
-getMessage());
-		}
-		return $value;
-	}
-
-	public static function encode($data)
-	{
-		return Syaml::dump($data);
-	}
-
-	public static function fromJSON($data)
-	{
-		return Syaml::dump(json_decode($data,true));
-	}
-
-}
diff --git a/Zotlabs/Lib/ZotURL.php b/Zotlabs/Lib/ZotURL.php
deleted file mode 100644
index 6963fe02c..000000000
--- a/Zotlabs/Lib/ZotURL.php
+++ /dev/null
@@ -1,128 +0,0 @@
- false ];
-
-        if (strpos($url, 'x-zot:') !== 0) {
-            return $ret;
-        }
-
-
-        if (! $url) {
-            return $ret;
-        }
-
-        $portable_url = substr($url, 6);
-        $u = explode('/', $portable_url);
-        $portable_id = $u[0];
-
-        $hosts = self::lookup($portable_id, $hub);
-
-        if (! $hosts) {
-            return $ret;
-        }
-
-        foreach ($hosts as $h) {
-            $newurl = $h . '/id/' . $portable_url;
-
-            $m = parse_url($newurl);
-
-            $data = json_encode([ 'zot_token' => random_string() ]);
-
-            if ($channel && $m) {
-                $headers = [
-					'Accept'           => 'application/x-nomad+json, application/x-zot+json', 
-					'Content-Type'     => 'application/x-nomad+json',
-                    'X-Zot-Token'      => random_string(),
-                    'Digest'           => HTTPSig::generate_digest_header($data),
-                    'Host'             => $m['host'],
-                    '(request-target)' => 'post ' . get_request_string($newurl)
-                ];
-                $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false);
-            } else {
-                $h = [ 'Accept: application/x-nomad+json, application/x-zot+json' ];
-            }
-
-            $result = [];
-
-            $redirects = 0;
-            $x = z_post_url($newurl, $data, $redirects, [ 'headers' => $h  ]);
-            if ($x['success']) {
-                return $x;
-            }
-        }
-
-        return $ret;
-    }
-
-    public static function is_zoturl($s)
-    {
-
-        if (strpos($url, 'x-zot:') === 0) {
-            return true;
-        }
-        return false;
-    }
-
-
-    public static function lookup($portable_id, $hub)
-    {
-
-        $r = q(
-            "select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0 order by hubloc_primary desc",
-            dbesc($portable_id)
-        );
-
-        if (! $r) {
-            // extend to network lookup
-
-            $path = '/q/' . $portable_id;
-
-            // first check sending hub since they have recently communicated with this object
-
-            $redirects = 0;
-
-            if ($hub) {
-                $x = z_fetch_url($hub['hubloc_url'] . $path, false, $redirects);
-                $u = self::parse_response($x);
-                if ($u) {
-                    return $u;
-                }
-            }
-
-            // If this fails, fallback on directory servers
-
-            return false;
-        }
-        return ids_to_array($r, 'hubloc_url');
-    }
-
-
-    public static function parse_response($arr)
-    {
-        if (! $arr['success']) {
-            return false;
-        }
-        $a = json_decode($arr['body'], true);
-        if ($a['success'] && array_key_exists('results', $a) && is_array($a['results']) && count($a['results'])) {
-            foreach ($a['results'] as $b) {
-                $m = discover_by_webbie($b);
-                if ($m) {
-                    return([ $b ]);
-                }
-            }
-        }
-        return false;
-    }
-}
-
diff --git a/Zotlabs/Lib/Zotfinger.php b/Zotlabs/Lib/Zotfinger.php
deleted file mode 100644
index 502e47a98..000000000
--- a/Zotlabs/Lib/Zotfinger.php
+++ /dev/null
@@ -1,90 +0,0 @@
- random_string()]);
-
-        if ($channel && $m) {
-            $headers = [
-				'Accept' => 'application/x-nomad+json, application/x-zot+json', 
-				'Content-Type' => 'application/x-nomad+json',
-                'X-Zot-Token' => random_string(),
-                'Digest' => HTTPSig::generate_digest_header($data),
-                'Host' => $m['host'],
-                '(request-target)' => 'post ' . get_request_string($resource)
-            ];
-            $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), false);
-        } else {
-            $h = ['Accept: application/x-nomad+json, application/x-zot+json'];
-        }
-
-        $result = [];
-
-        $redirects = 0;
-        $x = z_post_url($resource, $data, $redirects, ['headers' => $h]);
-
-        if (in_array(intval($x['return_code']), [ 404, 410 ]) && $recurse) {
-
-            // The resource has been deleted or doesn't exist at this location.
-            // Try to find another nomadic resource for this channel and return that.
-
-            // First, see if there's a hubloc for this site. Fetch that record to
-            // obtain the nomadic identity hash. Then use that to find any additional
-            // nomadic locations.
-    
-            $h = Activity::get_actor_hublocs($resource, 'nomad');
-            if ($h) {
-                // mark this location deleted
-                hubloc_delete($h[0]);
-                $hubs = Activity::get_actor_hublocs($h[0]['hubloc_hash']);
-                if ($hubs) {
-                    foreach ($hubs as $hub) {
-                        if ($hub['hubloc_id_url'] !== $resource and !$hub['hubloc_deleted']) {
-                            $rzf = self::exec($hub['hubloc_id_url'],$channel,$verify);
-                            if ($rzf) {
-                                return $rzf;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    
-        if ($x['success']) {
-            if ($verify) {
-                $result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
-            }
-
-            $result['data'] = json_decode($x['body'], true);
-
-            if ($result['data'] && is_array($result['data']) && array_key_exists('encrypted', $result['data']) && $result['data']['encrypted']) {
-                $result['data'] = json_decode(Crypto::unencapsulate($result['data'], get_config('system', 'prvkey')), true);
-            }
-
-            return $result;
-        }
-
-        return false;
-    }
-}
-
diff --git a/Zotlabs/Module/Acloader.php b/Zotlabs/Module/Acloader.php
deleted file mode 100644
index 353971ba4..000000000
--- a/Zotlabs/Module/Acloader.php
+++ /dev/null
@@ -1,346 +0,0 @@
-  standard ACL request
-        //  'g'  =>  Groups only ACL request
-        //  'f'  =>  forums only ACL request
-        //  'c'  =>  Connections only ACL request or editor (textarea) mention request
-        // $_REQUEST['search'] contains ACL search text.
-
-
-        // $type =
-        //  'm'  =>  autocomplete private mail recipient (checks post_mail permission)
-        //  'a'  =>  autocomplete connections (mod_connections, mod_poke, mod_sources, mod_photos)
-        //  'x'  =>  nav search bar autocomplete (match any xchan)
-        //  'z'  =>  autocomplete any xchan, but also include abook_alias, requires non-zero local_channel()
-        //           and also contains xid without urlencode, used specifically by activity_filter widget
-        // $_REQUEST['query'] contains autocomplete search text.
-
-
-        // The different autocomplete libraries use different names for the search text
-        // parameter. Internally we'll use $search to represent the search text no matter
-        // what request variable it was attached to.
-
-        if (array_key_exists('query', $_REQUEST)) {
-            $search = $_REQUEST['query'];
-        }
-
-        if ((!local_channel()) && (!in_array($type, ['x', 'c', 'f']))) {
-            killme();
-        }
-
-        $permitted = [];
-
-        if (in_array($type, ['m', 'a', 'f'])) {
-            // These queries require permission checking. We'll create a simple array of xchan_hash for those with
-            // the requisite permissions which we can check against.
-
-            $x = q(
-                "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s'",
-                intval(local_channel()),
-                dbesc(($type === 'm') ? '%post_mail%' : '%tag_deliver%')
-            );
-
-            $permitted = ids_to_array($x, 'xchan');
-        }
-
-
-        if ($search) {
-            $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " ";
-            // sql_extra2 is typically used when we don't have a local_channel - so we are not search abook_alias
-            $sql_extra2 = " AND ( xchan_name LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR xchan_addr LIKE " . protect_sprintf("'%" . dbesc(punify($search)) . ((strpos($search, '@') === false) ? "%@%'" : "%'")) . ") ";
-
-
-            // This horrible mess is needed because position also returns 0 if nothing is found.
-            // Would be MUCH easier if it instead returned a very large value
-            // Otherwise we could just
-            // order by LEAST(POSITION($search IN xchan_name),POSITION($search IN xchan_addr)).
-
-            $order_extra2 = "CASE WHEN xchan_name LIKE "
-                . protect_sprintf("'%" . dbesc($search) . "%'")
-                . " then POSITION('" . protect_sprintf(dbesc($search))
-                . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, ";
-
-            $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf("'%" . dbesc(punify($search)) . "%'") . " OR xchan_name like " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR abook_alias like " . protect_sprintf("'%" . dbesc($search) . "%'") . " ) ";
-
-            $sql_extra4 = "AND ( xchan_name LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . " OR xchan_addr LIKE " . protect_sprintf("'%" . dbesc(punify($search)) . ((strpos($search, '@') === false) ? "%@%'" : "%'")) . " OR abook_alias LIKE " . protect_sprintf("'%" . dbesc($search) . "%'") . ") ";
-        } else {
-            $sql_extra = $sql_extra2 = $sql_extra3 = $sql_extra4 = "";
-        }
-
-
-        $groups = [];
-        $contacts = [];
-
-        if ($type == '' || $type == 'g') {
-            // Normal privacy groups
-
-            $r = q(
-                "SELECT pgrp.id, pgrp.hash, pgrp.gname
-					FROM pgrp, pgrp_member 
-					WHERE pgrp.deleted = 0 AND pgrp.uid = %d 
-					AND pgrp_member.gid = pgrp.id
-					$sql_extra
-					GROUP BY pgrp.id
-					ORDER BY pgrp.gname 
-					LIMIT %d OFFSET %d",
-                intval(local_channel()),
-                intval($count),
-                intval($start)
-            );
-
-            if ($r) {
-                foreach ($r as $g) {
-                    //      logger('acl: group: ' . $g['gname'] . ' members: ' . AccessList::members_xchan(local_channel(),$g['id']));
-                    $groups[] = [
-                        "type" => "g",
-                        "photo" => "images/twopeople.png",
-                        "name" => $g['gname'],
-                        "id" => $g['id'],
-                        "xid" => $g['hash'],
-                        "uids" => AccessList::members_xchan(local_channel(), $g['id']),
-                        "link" => ''
-                    ];
-                }
-            }
-        }
-
-        if ($type == '' || $type == 'c' || $type === 'f') {
-            // Getting info from the abook is better for local users because it contains info about permissions
-            if (local_channel()) {
-                // add connections
-
-                $r = q(
-                    "SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, xchan_type, abook_flags, abook_self 
-					FROM abook left join xchan on abook_xchan = xchan_hash 
-					WHERE abook_channel = %d AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra4 order by xchan_name asc limit $count",
-                    intval(local_channel())
-                );
-            } else { // Visitors
-                $r = q(
-                    "SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self
-					FROM xchan left join xlink on xlink_link = xchan_hash
-					WHERE xlink_xchan  = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc limit $count",
-                    dbesc(get_observer_hash())
-                );
-            }
-            if ((count($r) < 100) && $type == 'c') {
-                $r2 = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_flags, 0 as abook_self 
-					FROM xchan WHERE xchan_deleted = 0 and xchan_network != 'unknown' $sql_extra2 order by $order_extra2 xchan_name asc limit $count");
-                if ($r2) {
-                    $r = array_merge($r, $r2);
-                    $r = unique_multidim_array($r, 'hash');
-                }
-            }
-        } elseif ($type == 'm') {
-            $r = [];
-            $z = q(
-                "SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url 
-				FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_channel = %d 
-				and xchan_deleted = 0
-				$sql_extra3
-				ORDER BY xchan_name ASC ",
-                intval(local_channel())
-            );
-            if ($z) {
-                foreach ($z as $zz) {
-                    if (in_array($zz['hash'], $permitted)) {
-                        $r[] = $zz;
-                    }
-                }
-            }
-        } elseif ($type == 'a') {
-            $r = q(
-                "SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_channel = %d
-				and xchan_deleted = 0
-				$sql_extra3
-				ORDER BY xchan_name ASC ",
-                intval(local_channel())
-            );
-        } elseif ($type == 'z') {
-            $r = q(
-                "SELECT xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM xchan left join abook on xchan_hash = abook_xchan
-				WHERE ( abook_channel = %d OR abook_channel IS NULL ) 
-				and xchan_deleted = 0
-				$sql_extra3
-				ORDER BY xchan_name ASC ",
-                intval(local_channel())
-            );
-        } elseif ($type == 'x') {
-            $contacts = [];
-            $r = $this->navbar_complete();
-            if ($r) {
-                foreach ($r as $g) {
-                    $contacts[] = [
-                        "photo" => $g['photo'],
-                        "name" => $g['name'],
-                        "nick" => $g['address'],
-                        'link' => (($g['address']) ? $g['address'] : $g['url']),
-                        'xchan' => $g['hash']
-                    ];
-                }
-            }
-
-            $o = [
-                'start' => $start,
-                'count' => $count,
-                'items' => $contacts,
-            ];
-            json_return_and_die($o);
-        } else {
-            $r = [];
-        }
-
-        if ($r) {
-            foreach ($r as $g) {
-                if (isset($g['network']) && in_array($g['network'], ['rss', 'anon', 'unknown']) && ($type != 'a')) {
-                    continue;
-                }
-
-                // 'z' (activity_filter autocomplete) requires an un-encoded hash to prevent double encoding
-
-                if ($type !== 'z') {
-                    $g['hash'] = urlencode($g['hash']);
-                }
-
-                if (!$g['nick']) {
-                    $g['nick'] = $g['url'];
-                }
-
-                if (in_array($g['hash'], $permitted) && $type === 'f' && (!$noforums)) {
-                    $contacts[] = [
-                        "type" => "c",
-                        "photo" => "images/twopeople.png",
-                        "name" => $g['name'],
-                        "id" => urlencode($g['id']),
-                        "xid" => $g['hash'],
-                        "link" => (($g['nick']) ? $g['nick'] : $g['url']),
-                        "nick" => substr($g['nick'], 0, strpos($g['nick'], '@')),
-                        "self" => (intval($g['abook_self']) ? 'abook-self' : ''),
-                        "taggable" => 'taggable',
-                        "label" => t('network')
-                    ];
-                }
-                if ($type !== 'f') {
-                    $contacts[] = [
-                        "type" => "c",
-                        "photo" => $g['micro'],
-                        "name" => $g['name'],
-                        "id" => urlencode($g['id']),
-                        "xid" => $g['hash'],
-                        "link" => (($g['nick']) ? $g['nick'] : $g['url']),
-                        "nick" => ((strpos($g['nick'], '@')) ? substr($g['nick'], 0, strpos($g['nick'], '@')) : $g['nick']),
-                        "self" => (intval($g['abook_self']) ? 'abook-self' : ''),
-                        "taggable" => '',
-                        "label" => '',
-                    ];
-                }
-            }
-        }
-
-        $items = array_merge($groups, $contacts);
-
-        $o = [
-            'start' => $start,
-            'count' => $count,
-            'items' => $items,
-        ];
-
-        json_return_and_die($o);
-    }
-
-
-    public function navbar_complete()
-    {
-
-        //  logger('navbar_complete');
-
-        if (observer_prohibited()) {
-            return;
-        }
-
-        $dirmode = intval(get_config('system', 'directory_mode'));
-        $search = ((x($_REQUEST, 'search')) ? htmlentities($_REQUEST['search'], ENT_COMPAT, 'UTF-8', false) : '');
-        if (!$search || mb_strlen($search) < 2) {
-            return [];
-        }
-
-        $star = false;
-        $address = false;
-
-        if (substr($search, 0, 1) === '@') {
-            $search = substr($search, 1);
-        }
-
-        if (substr($search, 0, 1) === '*') {
-            $star = true;
-            $search = substr($search, 1);
-        }
-
-        if (strpos($search, '@') !== false) {
-            $address = true;
-        }
-
-
-        $url = z_root() . '/dirsearch';
-
-
-        $results = [];
-
-        $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 100);
-
-        if ($url) {
-            $query = $url . '?f=';
-            $query .= '&name=' . urlencode($search) . "&limit=$count" . (($address) ? '&address=' . urlencode(punify($search)) : '');
-
-            $x = z_fetch_url($query);
-            if ($x['success']) {
-                $t = 0;
-                $j = json_decode($x['body'], true);
-                if ($j && $j['results']) {
-                    $results = $j['results'];
-                }
-            }
-        }
-        return $results;
-    }
-}
diff --git a/Zotlabs/Module/Activity.php b/Zotlabs/Module/Activity.php
deleted file mode 100644
index 965d17c25..000000000
--- a/Zotlabs/Module/Activity.php
+++ /dev/null
@@ -1,303 +0,0 @@
- [
-                ACTIVITYSTREAMS_JSONLD_REV,
-                'https://w3id.org/security/v1',
-                ZlibActivity::ap_schema()
-            ]], $i);
-
-            $headers = [];
-            $headers['Content-Type'] = 'application/x-nomad+json';
-            $x['signature'] = LDSignatures::sign($x, $chan);
-            $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
-            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
-            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
-            $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::url($chan));
-            HTTPSig::set_headers($h);
-            echo $ret;
-            killme();
-        }
-
-
-        goaway(z_root() . '/item/' . argv(1));
-    }
-}
-
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
deleted file mode 100644
index d8c83e50a..000000000
--- a/Zotlabs/Module/Admin.php
+++ /dev/null
@@ -1,188 +0,0 @@
-sm = new SubModule();
-    }
-
-    public function init()
-    {
-
-        logger('admin_init', LOGGER_DEBUG);
-
-        if (!is_site_admin()) {
-            logger('admin denied.');
-            return;
-        }
-
-        if (argc() > 1) {
-            $this->sm->call('init');
-        }
-    }
-
-
-    public function post()
-    {
-
-        logger('admin_post', LOGGER_DEBUG);
-
-        if (!is_site_admin()) {
-            logger('admin denied.');
-            return;
-        }
-
-        if (argc() > 1) {
-            $this->sm->call('post');
-        }
-
-        // goaway(z_root() . '/admin' );
-    }
-
-    /**
-     * @return string
-     */
-
-    public function get()
-    {
-
-        logger('admin_content', LOGGER_DEBUG);
-
-        if (!is_site_admin()) {
-            logger('admin denied.');
-            return login(false);
-        }
-
-        /*
-         * Page content
-         */
-
-        Navbar::set_selected('Admin');
-
-        $o = '';
-
-        if (argc() > 1) {
-            $o = $this->sm->call('get');
-            if ($o === false) {
-                notice(t('Item not found.'));
-            }
-        } else {
-            $o = $this->admin_page_summary();
-        }
-
-        if (is_ajax()) {
-            echo $o;
-            killme();
-        } else {
-            return $o;
-        }
-    }
-
-
-    /**
-     * @brief Returns content for Admin Summary Page.
-     *
-     * @return string HTML from parsed admin_summary.tpl
-     */
-
-    public function admin_page_summary()
-    {
-
-        // list total user accounts, expirations etc.
-        $accounts = [];
-        $r = q(
-            "SELECT COUNT(CASE WHEN account_id > 0 THEN 1 ELSE NULL END) AS total, COUNT(CASE WHEN account_expires > %s THEN 1 ELSE NULL END) AS expiring, COUNT(CASE WHEN account_expires < %s AND account_expires > '%s' THEN 1 ELSE NULL END) AS expired, COUNT(CASE WHEN (account_flags & %d)>0 THEN 1 ELSE NULL END) AS blocked FROM account",
-            db_utcnow(),
-            db_utcnow(),
-            dbesc(NULL_DATE),
-            intval(ACCOUNT_BLOCKED)
-        );
-        if ($r) {
-            $accounts['total'] = ['label' => t('Accounts'), 'val' => $r[0]['total']];
-            $accounts['blocked'] = ['label' => t('Blocked accounts'), 'val' => $r[0]['blocked']];
-            $accounts['expired'] = ['label' => t('Expired accounts'), 'val' => $r[0]['expired']];
-            $accounts['expiring'] = ['label' => t('Expiring accounts'), 'val' => $r[0]['expiring']];
-        }
-
-        // pending registrations
-
-        $pdg = q(
-            "SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) > 0 ",
-            intval(ACCOUNT_PENDING)
-        );
-
-        $pending = (($pdg) ? count($pdg) : 0);
-
-        // available channels, primary and clones
-        $channels = [];
-        $r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE channel_removed = 0 and channel_system = 0");
-        if ($r) {
-            $channels['total'] = ['label' => t('Channels'), 'val' => $r[0]['total']];
-            $channels['main'] = ['label' => t('Primary'), 'val' => $r[0]['main']];
-            $channels['clones'] = ['label' => t('Clones'), 'val' => $r[0]['clones']];
-        }
-
-        // We can do better, but this is a quick queue status
-        $r = q("SELECT COUNT(outq_delivered) AS total FROM outq WHERE outq_delivered = 0");
-        $queue = (($r) ? $r[0]['total'] : 0);
-        $queues = ['label' => t('Message queues'), 'queue' => $queue];
-
-        $plugins = Addon::list_installed();
-
-        // Could be extended to provide also other alerts to the admin
-
-        $alertmsg = '';
-
-        $upgrade = EMPTY_STR;
-
-        if ((!defined('PLATFORM_ARCHITECTURE')) || (PLATFORM_ARCHITECTURE === 'zap')) {
-            $vrelease = get_repository_version('release');
-            $vdev = get_repository_version('dev');
-            $upgrade = ((version_compare(STD_VERSION, $vrelease) < 0) ? t('Your software should be updated') : '');
-        }
-
-        $t = Theme::get_template('admin_summary.tpl');
-        return replace_macros($t, [
-            '$title' => t('Administration'),
-            '$page' => t('Summary'),
-            '$adminalertmsg' => $alertmsg,
-            '$queues' => $queues,
-            '$accounts' => [t('Registered accounts'), $accounts],
-            '$pending' => [t('Pending registrations'), $pending],
-            '$channels' => [t('Registered channels'), $channels],
-            '$plugins' => (($plugins) ? [t('Active addons'), $plugins] : EMPTY_STR),
-            '$version' => [t('Version'), STD_VERSION],
-            '$vmaster' => [t('Repository version (release)'), $vrelease],
-            '$vdev' => [t('Repository version (dev)'), $vdev],
-            '$upgrade' => $upgrade,
-            '$build' => Config::Get('system', 'db_version')
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Admin/Account_edit.php b/Zotlabs/Module/Admin/Account_edit.php
deleted file mode 100644
index 852a78b05..000000000
--- a/Zotlabs/Module/Admin/Account_edit.php
+++ /dev/null
@@ -1,86 +0,0 @@
- 2) {
-            $account_id = argv(2);
-        }
-
-        $x = q(
-            "select * from account where account_id = %d limit 1",
-            intval($account_id)
-        );
-
-        if (!$x) {
-            notice(t('Account not found.') . EOL);
-            return '';
-        }
-
-
-        $a = replace_macros(Theme::get_template('admin_account_edit.tpl'), [
-                '$account' => $x[0],
-                '$title' => t('Account Edit'),
-                '$pass1' => ['pass1', t('New Password'), ' ', ''],
-                '$pass2' => ['pass2', t('New Password again'), ' ', ''],
-                '$account_language' => ['account_language', t('Account language (for emails)'), $x[0]['account_language'], '', language_list()],
-                '$service_class' => ['service_class', t('Service class'), $x[0]['account_service_class'], ''],
-                '$submit' => t('Submit'),
-            ]);
-
-        return $a;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php
deleted file mode 100644
index 5cf71cb00..000000000
--- a/Zotlabs/Module/Admin/Accounts.php
+++ /dev/null
@@ -1,215 +0,0 @@
- 2) {
-            $uid = argv(3);
-            $account = q(
-                "SELECT * FROM account WHERE account_id = %d",
-                intval($uid)
-            );
-
-            if (!$account) {
-                notice(t('Account not found') . EOL);
-                goaway(z_root() . '/admin/accounts');
-            }
-
-            check_form_security_token_redirectOnErr('/admin/accounts', 'admin_accounts', 't');
-
-            switch (argv(2)) {
-                case 'delete':
-                    // delete user
-                    Account::remove($uid, true, false);
-
-                    notice(sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL);
-                    break;
-                case 'block':
-                    q(
-                        "UPDATE account SET account_flags = ( account_flags | %d ) WHERE account_id = %d",
-                        intval(ACCOUNT_BLOCKED),
-                        intval($uid)
-                    );
-
-                    notice(sprintf(t("Account '%s' blocked"), $account[0]['account_email']) . EOL);
-                    break;
-                case 'unblock':
-                    q(
-                        "UPDATE account SET account_flags = ( account_flags & ~ %d ) WHERE account_id = %d",
-                        intval(ACCOUNT_BLOCKED),
-                        intval($uid)
-                    );
-
-                    notice(sprintf(t("Account '%s' unblocked"), $account[0]['account_email']) . EOL);
-                    break;
-            }
-
-            goaway(z_root() . '/admin/accounts');
-        }
-
-        /* get pending */
-        $pending = q(
-            "SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) != 0 ",
-            intval(ACCOUNT_PENDING)
-        );
-
-        /* get accounts */
-
-        $total = q("SELECT count(*) as total FROM account");
-        if (count($total)) {
-            App::set_pager_total($total[0]['total']);
-            App::set_pager_itemspage(100);
-        }
-
-        $serviceclass = (($_REQUEST['class']) ? " and account_service_class = '" . dbesc($_REQUEST['class']) . "' " : '');
-
-        $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'account_id');
-        $dir = 'asc';
-        if (array_key_exists('dir', $_REQUEST)) {
-            $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc');
-        }
-
-        $base = z_root() . '/admin/accounts?f=';
-        $odir = (($dir === 'asc') ? '0' : '1');
-
-        $users = q(
-            "SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked, 
-			(SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac 
-			where true $serviceclass and account_flags != %d order by $key $dir limit %d offset %d ",
-            intval(ACCOUNT_BLOCKED),
-            db_concat('ch.channel_address', ' '),
-            intval(ACCOUNT_BLOCKED | ACCOUNT_PENDING),
-            intval(App::$pager['itemspage']),
-            intval(App::$pager['start'])
-        );
-
-        if ($users) {
-            for ($x = 0; $x < count($users); $x++) {
-                $channel_arr = explode(' ', $users[$x]['channels']);
-                if ($channel_arr) {
-                    $linked = [];
-                    foreach ($channel_arr as $c) {
-                        $linked[] = '' . $c . '';
-                    }
-                    $users[$x]['channels'] = implode(' ', $linked);
-                }
-            }
-        }
-
-        $t =
-        $o = replace_macros(Theme::get_template('admin_accounts.tpl'), [
-            '$title' => t('Administration'),
-            '$page' => t('Accounts'),
-            '$submit' => t('Submit'),
-            '$select_all' => t('select all'),
-            '$h_pending' => t('Registrations waiting for confirm'),
-            '$th_pending' => array(t('Request date'), t('Email')),
-            '$no_pending' => t('No registrations.'),
-            '$approve' => t('Approve'),
-            '$deny' => t('Deny'),
-            '$delete' => t('Delete'),
-            '$block' => t('Block'),
-            '$unblock' => t('Unblock'),
-            '$odir' => $odir,
-            '$base' => $base,
-            '$h_users' => t('Accounts'),
-            '$th_users' => [
-                [t('ID'), 'account_id'],
-                [t('Email'), 'account_email'],
-                [t('All Channels'), 'channels'],
-                [t('Register date'), 'account_created'],
-                [t('Last login'), 'account_lastlog'],
-                [t('Expires'), 'account_expires'],
-                [t('Service Class'), 'account_service_class']
-            ],
-            '$confirm_delete_multi' => t('Selected accounts will be deleted!\n\nEverything these accounts had posted on this site will be permanently deleted!\n\nAre you sure?'),
-            '$confirm_delete' => t('The account {0} will be deleted!\n\nEverything this account has posted on this site will be permanently deleted!\n\nAre you sure?'),
-            '$form_security_token' => get_form_security_token("admin_accounts"),
-            '$baseurl' => z_root(),
-            '$pending' => $pending,
-            '$users' => $users,
-        ]);
-
-        $o .= paginate($a);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php
deleted file mode 100644
index b06c64a12..000000000
--- a/Zotlabs/Module/Admin/Addons.php
+++ /dev/null
@@ -1,480 +0,0 @@
- 2 && is_file("addon/" . argv(2) . "/" . argv(2) . ".php")) {
-            @include_once("addon/" . argv(2) . "/" . argv(2) . ".php");
-            if (function_exists(argv(2) . '_plugin_admin_post')) {
-                $func = argv(2) . '_plugin_admin_post';
-                $func($a);
-            }
-
-            goaway(z_root() . '/admin/addons/' . argv(2));
-        } elseif (argc() > 2) {
-            switch (argv(2)) {
-                case 'updaterepo':
-                    if (array_key_exists('repoName', $_REQUEST)) {
-                        $repoName = $_REQUEST['repoName'];
-                    } else {
-                        json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
-                    }
-                    $extendDir = 'cache/git/sys/extend';
-                    $addonDir = $extendDir . '/addon';
-                    if (!file_exists($extendDir)) {
-                        if (!mkdir($extendDir, 0770, true)) {
-                            logger('Error creating extend folder: ' . $extendDir);
-                            json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
-                        } else {
-                            if (!symlink(realpath('extend/addon'), $addonDir)) {
-                                logger('Error creating symlink to addon folder: ' . $addonDir);
-                                json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
-                            }
-                        }
-                    }
-                    $repoDir = 'cache/git/sys/extend/addon/' . $repoName;
-                    if (!is_dir($repoDir)) {
-                        logger('Repo directory does not exist: ' . $repoDir);
-                        json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
-                    }
-                    if (!is_writable($repoDir)) {
-                        logger('Repo directory not writable to web server: ' . $repoDir);
-                        json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
-                    }
-                    $git = new GitRepo('sys', null, false, $repoName, $repoDir);
-                    try {
-                        if ($git->pull()) {
-                            $files = array_diff(scandir($repoDir), array('.', '..'));
-                            foreach ($files as $file) {
-                                if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
-                                    $source = '../extend/addon/' . $repoName . '/' . $file;
-                                    $target = realpath('addon/') . '/' . $file;
-                                    unlink($target);
-                                    if (!symlink($source, $target)) {
-                                        logger('Error linking addons to /addon');
-                                        json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
-                                    }
-                                }
-                            }
-                            json_return_and_die(array('message' => 'Repo updated.', 'success' => true));
-                        } else {
-                            json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
-                        }
-                    } catch (GitException $e) {
-                        json_return_and_die(array('message' => 'Error updating addon repo.', 'success' => false));
-                    }
-                case 'removerepo':
-                    if (array_key_exists('repoName', $_REQUEST)) {
-                        $repoName = $_REQUEST['repoName'];
-                    } else {
-                        json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
-                    }
-                    $extendDir = 'cache/git/sys/extend';
-                    $addonDir = $extendDir . '/addon';
-                    if (!file_exists($extendDir)) {
-                        if (!mkdir($extendDir, 0770, true)) {
-                            logger('Error creating extend folder: ' . $extendDir);
-                            json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
-                        } else {
-                            if (!symlink(realpath('extend/addon'), $addonDir)) {
-                                logger('Error creating symlink to addon folder: ' . $addonDir);
-                                json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
-                            }
-                        }
-                    }
-                    $repoDir = 'cache/git/sys/extend/addon/' . $repoName;
-                    if (!is_dir($repoDir)) {
-                        logger('Repo directory does not exist: ' . $repoDir);
-                        json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
-                    }
-                    if (!is_writable($repoDir)) {
-                        logger('Repo directory not writable to web server: ' . $repoDir);
-                        json_return_and_die(array('message' => 'Repo directory not writable to web server.', 'success' => false));
-                    }
-                    /// @TODO remove directory and unlink /addon/files
-                    if (rrmdir($repoDir)) {
-                        json_return_and_die(array('message' => 'Repo deleted.', 'success' => true));
-                    } else {
-                        json_return_and_die(array('message' => 'Error deleting addon repo.', 'success' => false));
-                    }
-                case 'installrepo':
-                    if (array_key_exists('repoURL', $_REQUEST)) {
-                        $repoURL = $_REQUEST['repoURL'];
-                        $extendDir = 'cache/git/sys/extend';
-                        $addonDir = $extendDir . '/addon';
-                        if (!file_exists($extendDir)) {
-                            if (!mkdir($extendDir, 0770, true)) {
-                                logger('Error creating extend folder: ' . $extendDir);
-                                json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
-                            } else {
-                                if (!symlink(realpath('extend/addon'), $addonDir)) {
-                                    logger('Error creating symlink to addon folder: ' . $addonDir);
-                                    json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
-                                }
-                            }
-                        }
-                        if (!is_writable($extendDir)) {
-                            logger('Directory not writable to web server: ' . $extendDir);
-                            json_return_and_die(array('message' => 'Directory not writable to web server.', 'success' => false));
-                        }
-                        $repoName = null;
-                        if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
-                            $repoName = $_REQUEST['repoName'];
-                        } else {
-                            $repoName = GitRepo::getRepoNameFromURL($repoURL);
-                        }
-                        if (!$repoName) {
-                            logger('Invalid git repo');
-                            json_return_and_die(array('message' => 'Invalid git repo', 'success' => false));
-                        }
-                        $repoDir = $addonDir . '/' . $repoName;
-                        $tempRepoBaseDir = 'cache/git/sys/temp/';
-                        $tempAddonDir = $tempRepoBaseDir . $repoName;
-
-                        if (!is_writable($addonDir) || !is_writable($tempAddonDir)) {
-                            logger('Temp repo directory or /extend/addon not writable to web server: ' . $tempAddonDir);
-                            json_return_and_die(array('message' => 'Temp repo directory not writable to web server.', 'success' => false));
-                        }
-                        rename($tempAddonDir, $repoDir);
-
-                        if (!is_writable(realpath('addon/'))) {
-                            logger('/addon directory not writable to web server: ' . $tempAddonDir);
-                            json_return_and_die(array('message' => '/addon directory not writable to web server.', 'success' => false));
-                        }
-                        $files = array_diff(scandir($repoDir), array('.', '..'));
-                        foreach ($files as $file) {
-                            if (is_dir($repoDir . '/' . $file) && $file !== '.git') {
-                                $source = '../extend/addon/' . $repoName . '/' . $file;
-                                $target = realpath('addon/') . '/' . $file;
-                                unlink($target);
-                                if (!symlink($source, $target)) {
-                                    logger('Error linking addons to /addon');
-                                    json_return_and_die(array('message' => 'Error linking addons to /addon', 'success' => false));
-                                }
-                            }
-                        }
-                        $git = new GitRepo('sys', $repoURL, false, $repoName, $repoDir);
-                        $repo = $git->probeRepo();
-                        json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
-                    }
-                case 'addrepo':
-                    if (array_key_exists('repoURL', $_REQUEST)) {
-                        $repoURL = $_REQUEST['repoURL'];
-                        $extendDir = 'cache/git/sys/extend';
-                        $addonDir = $extendDir . '/addon';
-                        $tempAddonDir = realpath('cache') . '/git/sys/temp';
-                        if (!file_exists($extendDir)) {
-                            if (!mkdir($extendDir, 0770, true)) {
-                                logger('Error creating extend folder: ' . $extendDir);
-                                json_return_and_die(array('message' => 'Error creating extend folder: ' . $extendDir, 'success' => false));
-                            } else {
-                                if (!symlink(realpath('extend/addon'), $addonDir)) {
-                                    logger('Error creating symlink to addon folder: ' . $addonDir);
-                                    json_return_and_die(array('message' => 'Error creating symlink to addon folder: ' . $addonDir, 'success' => false));
-                                }
-                            }
-                        }
-                        if (!is_dir($tempAddonDir)) {
-                            if (!mkdir($tempAddonDir, 0770, true)) {
-                                logger('Error creating temp plugin repo folder: ' . $tempAddonDir);
-                                json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $tempAddonDir, 'success' => false));
-                            }
-                        }
-                        $repoName = null;
-                        if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
-                            $repoName = $_REQUEST['repoName'];
-                        } else {
-                            $repoName = GitRepo::getRepoNameFromURL($repoURL);
-                        }
-                        if (!$repoName) {
-                            logger('Invalid git repo');
-                            json_return_and_die(array('message' => 'Invalid git repo: ' . $repoName, 'success' => false));
-                        }
-                        $repoDir = $tempAddonDir . '/' . $repoName;
-                        if (!is_writable($tempAddonDir)) {
-                            logger('Temporary directory for new addon repo is not writable to web server: ' . $tempAddonDir);
-                            json_return_and_die(array('message' => 'Temporary directory for new addon repo is not writable to web server.', 'success' => false));
-                        }
-                        // clone the repo if new automatically
-                        $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
-
-                        $remotes = $git->git->remote();
-                        $fetchURL = $remotes['origin']['fetch'];
-                        if ($fetchURL !== $git->url) {
-                            if (rrmdir($repoDir)) {
-                                $git = new GitRepo('sys', $repoURL, true, $repoName, $repoDir);
-                            } else {
-                                json_return_and_die(array('message' => 'Error deleting existing addon repo.', 'success' => false));
-                            }
-                        }
-                        $repo = $git->probeRepo();
-                        $repo['readme'] = $repo['manifest'] = null;
-                        foreach ($git->git->tree('master') as $object) {
-                            if ($object['type'] == 'blob' && (strtolower($object['file']) === 'readme.md' || strtolower($object['file']) === 'readme')) {
-                                $repo['readme'] = MarkdownExtra::defaultTransform($git->git->cat->blob($object['hash']));
-                            } elseif ($object['type'] == 'blob' && strtolower($object['file']) === 'manifest.json') {
-                                $repo['manifest'] = $git->git->cat->blob($object['hash']);
-                            }
-                        }
-                        json_return_and_die(array('repo' => $repo, 'message' => '', 'success' => true));
-                    } else {
-                        json_return_and_die(array('message' => 'No repo URL provided', 'success' => false));
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @brief Addons admin page.
-     *
-     * @return string with parsed HTML
-     */
-    public function get()
-    {
-
-        /*
-         * Single plugin
-         */
-
-        if (App::$argc == 3) {
-            $plugin = App::$argv[2];
-            if (!is_file("addon/$plugin/$plugin.php")) {
-                notice(t("Item not found."));
-                return '';
-            }
-
-            $enabled = in_array($plugin, Addon::list_installed());
-            $info = Addon::get_info($plugin);
-            $x = check_plugin_versions($info);
-
-            // disable plugins which are installed but incompatible versions
-
-            if ($enabled && !$x) {
-                $enabled = false;
-                uninstall_plugin($plugin);
-            }
-            $info['disabled'] = 1 - intval($x);
-
-            if (x($_GET, "a") && $_GET['a'] == "t") {
-                check_form_security_token_redirectOnErr('/admin/addons', 'admin_addons', 't');
-                $pinstalled = false;
-                // Toggle plugin status
-                $idx = array_search($plugin, Addon::list_installed());
-                if ($idx !== false) {
-                    Addon::uninstall($plugin);
-                    $pinstalled = false;
-                    info(sprintf(t("Plugin %s disabled."), $plugin));
-                } else {
-                    Addon::install($plugin);
-                    $pinstalled = true;
-                    info(sprintf(t("Plugin %s enabled."), $plugin));
-                }
-
-                if ($pinstalled) {
-                    @require_once("addon/$plugin/$plugin.php");
-                    if (function_exists($plugin . '_plugin_admin')) {
-                        goaway(z_root() . '/admin/addons/' . $plugin);
-                    }
-                }
-                goaway(z_root() . '/admin/addons');
-            }
-
-            // display plugin details
-
-            if (in_array($plugin, Addon::list_installed())) {
-                $status = 'on';
-                $action = t('Disable');
-            } else {
-                $status = 'off';
-                $action = t('Enable');
-            }
-
-            $readme = null;
-            if (is_file("addon/$plugin/README.md")) {
-                $readme = file_get_contents("addon/$plugin/README.md");
-                $readme = MarkdownExtra::defaultTransform($readme);
-            } elseif (is_file("addon/$plugin/README")) {
-                $readme = "
          " . file_get_contents("addon/$plugin/README") . "
          ";
-            }
-
-            $admin_form = '';
-
-            $r = q(
-                "select * from addon where plugin_admin = 1 and aname = '%s' limit 1",
-                dbesc($plugin)
-            );
-
-            if ($r) {
-                @require_once("addon/$plugin/$plugin.php");
-                if (function_exists($plugin . '_plugin_admin')) {
-                    $func = $plugin . '_plugin_admin';
-                    $func($a, $admin_form);
-                }
-            }
-
-
-            $t = Theme::get_template('admin_plugins_details.tpl');
-            return replace_macros($t, array(
-                '$title' => t('Administration'),
-                '$page' => t('Addons'),
-                '$toggle' => t('Toggle'),
-                '$settings' => t('Settings'),
-                '$baseurl' => z_root(),
-
-                '$plugin' => $plugin,
-                '$status' => $status,
-                '$action' => $action,
-                '$info' => $info,
-                '$str_author' => t('Author: '),
-                '$str_maintainer' => t('Maintainer: '),
-                '$str_minversion' => t('Minimum project version: '),
-                '$str_maxversion' => t('Maximum project version: '),
-                '$str_minphpversion' => t('Minimum PHP version: '),
-                '$str_serverroles' => t('Compatible Server Roles: '),
-                '$str_requires' => t('Requires: '),
-                '$disabled' => t('Disabled - version incompatibility'),
-
-                '$admin_form' => $admin_form,
-                '$function' => 'addons',
-                '$screenshot' => '',
-                '$readme' => $readme,
-
-                '$form_security_token' => get_form_security_token('admin_addons'),
-            ));
-        }
-
-
-        /*
-         * List plugins
-         */
-        $plugins = [];
-        $files = glob('addon/*/');
-        if ($files) {
-            foreach ($files as $file) {
-                if ($file === 'addon/vendor/') {
-                    continue;
-                }
-                if (is_dir($file)) {
-                    list($tmp, $id) = array_map('trim', explode('/', $file));
-                    $info = Addon::get_info($id);
-                    $enabled = in_array($id, App::$plugins);
-                    $x = check_plugin_versions($info);
-
-                    // disable plugins which are installed but incompatible versions
-
-                    if ($enabled && !$x) {
-                        $enabled = false;
-                        $idz = array_search($id, Addon::list_installed());
-                        if ($idz !== false) {
-                            uninstall_plugin($id);
-                        }
-                    }
-                    $info['disabled'] = 1 - intval($x);
-
-                    $plugins[] = array($id, (($enabled) ? "on" : "off"), $info);
-                }
-            }
-        }
-
-        usort($plugins, 'self::plugin_sort');
-
-        $allowManageRepos = false;
-        if (is_writable('extend/addon') && is_writable('cache')) {
-            $allowManageRepos = true;
-        }
-
-        $admin_plugins_add_repo_form = replace_macros(
-            Theme::get_template('admin_plugins_addrepo.tpl'),
-            array(
-                '$post' => 'admin/addons/addrepo',
-                '$desc' => t('Enter the public git repository URL of the addon repo.'),
-                '$repoURL' => array('repoURL', t('Addon repo git URL'), '', ''),
-                '$repoName' => array('repoName', t('Custom repo name'), '', '', t('(optional)')),
-                '$submit' => t('Download Addon Repo')
-            )
-        );
-        $newRepoModalID = random_string(3);
-        $newRepoModal = replace_macros(
-            Theme::get_template('generic_modal.tpl'),
-            array(
-                '$id' => $newRepoModalID,
-                '$title' => t('Install new repo'),
-                '$ok' => t('Install'),
-                '$cancel' => t('Cancel')
-            )
-        );
-
-        $reponames = $this->listAddonRepos();
-        $addonrepos = [];
-        foreach ($reponames as $repo) {
-            $addonrepos[] = array('name' => $repo, 'description' => '');
-            /// @TODO Parse repo info to provide more information about repos
-        }
-
-        $t = Theme::get_template('admin_plugins.tpl');
-        return replace_macros($t, array(
-            '$title' => t('Administration'),
-            '$page' => t('Addons'),
-            '$submit' => t('Submit'),
-            '$baseurl' => z_root(),
-            '$function' => 'addons',
-            '$plugins' => $plugins,
-            '$disabled' => t('Disabled - version incompatibility'),
-            '$form_security_token' => get_form_security_token('admin_addons'),
-            '$allowManageRepos' => $allowManageRepos,
-            '$managerepos' => t('Manage Repos'),
-            '$installedtitle' => t('Installed Addon Repositories'),
-            '$addnewrepotitle' => t('Install a New Addon Repository'),
-            '$expandform' => false,
-            '$form' => $admin_plugins_add_repo_form,
-            '$newRepoModal' => $newRepoModal,
-            '$newRepoModalID' => $newRepoModalID,
-            '$addonrepos' => $addonrepos,
-            '$repoUpdateButton' => t('Update'),
-            '$repoBranchButton' => t('Switch branch'),
-            '$repoRemoveButton' => t('Remove')
-        ));
-    }
-
-    public function listAddonRepos()
-    {
-        $addonrepos = [];
-        $addonDir = 'extend/addon/';
-        if (is_dir($addonDir)) {
-            if ($handle = opendir($addonDir)) {
-                while (false !== ($entry = readdir($handle))) {
-                    if ($entry != "." && $entry != "..") {
-                        $addonrepos[] = $entry;
-                    }
-                }
-                closedir($handle);
-            }
-        }
-        return $addonrepos;
-    }
-
-    public static function plugin_sort($a, $b)
-    {
-        return (strcmp(strtolower($a[2]['name']), strtolower($b[2]['name'])));
-    }
-}
diff --git a/Zotlabs/Module/Admin/Channels.php b/Zotlabs/Module/Admin/Channels.php
deleted file mode 100644
index 6505157f9..000000000
--- a/Zotlabs/Module/Admin/Channels.php
+++ /dev/null
@@ -1,203 +0,0 @@
- 2) {
-            $uid = argv(3);
-            $channel = q(
-                "SELECT * FROM channel WHERE channel_id = %d",
-                intval($uid)
-            );
-
-            if (!$channel) {
-                notice(t('Channel not found') . EOL);
-                goaway(z_root() . '/admin/channels');
-            }
-
-            switch (argv(2)) {
-                case "delete":
-                    {
-                        check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't');
-                        // delete channel
-                        Channel::channel_remove($uid, true);
-
-                        notice(sprintf(t("Channel '%s' deleted"), $channel[0]['channel_name']) . EOL);
-                }
-                    break;
-
-                case "block":
-                    {
-                        check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't');
-                        $pflags = $channel[0]['channel_pageflags'] ^ PAGE_CENSORED;
-                        q(
-                            "UPDATE channel SET channel_pageflags = %d where channel_id = %d",
-                            intval($pflags),
-                            intval($uid)
-                        );
-                        Run::Summon(['Directory', $uid, 'nopush']);
-
-                        notice(sprintf((($pflags & PAGE_CENSORED) ? t("Channel '%s' censored") : t("Channel '%s' uncensored")), $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')') . EOL);
-                }
-                    break;
-
-                case "code":
-                    {
-                        check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't');
-                        $pflags = $channel[0]['channel_pageflags'] ^ PAGE_ALLOWCODE;
-                        q(
-                            "UPDATE channel SET channel_pageflags = %d where channel_id = %d",
-                            intval($pflags),
-                            intval($uid)
-                        );
-
-                        notice(sprintf((($pflags & PAGE_ALLOWCODE) ? t("Channel '%s' code allowed") : t("Channel '%s' code disallowed")), $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')') . EOL);
-                }
-                    break;
-
-                default:
-                    break;
-            }
-            goaway(z_root() . '/admin/channels');
-        }
-
-        $key = (($_REQUEST['key']) ? dbesc($_REQUEST['key']) : 'channel_id');
-        $dir = 'asc';
-        if (array_key_exists('dir', $_REQUEST)) {
-            $dir = ((intval($_REQUEST['dir'])) ? 'asc' : 'desc');
-        }
-
-        $base = z_root() . '/admin/channels?f=';
-        $odir = (($dir === 'asc') ? '0' : '1');
-
-        /* get channels */
-
-        $total = q("SELECT count(*) as total FROM channel where channel_removed = 0 and channel_system = 0");
-        if ($total) {
-            App::set_pager_total($total[0]['total']);
-            App::set_pager_itemspage(100);
-        }
-
-        $channels = q(
-            "SELECT * from channel where channel_removed = 0 and channel_system = 0 order by $key $dir limit %d offset %d ",
-            intval(App::$pager['itemspage']),
-            intval(App::$pager['start'])
-        );
-
-        if ($channels) {
-            for ($x = 0; $x < count($channels); $x++) {
-                if ($channels[$x]['channel_pageflags'] & PAGE_CENSORED) {
-                    $channels[$x]['blocked'] = true;
-                } else {
-                    $channels[$x]['blocked'] = false;
-                }
-
-                if ($channels[$x]['channel_pageflags'] & PAGE_ALLOWCODE) {
-                    $channels[$x]['allowcode'] = true;
-                } else {
-                    $channels[$x]['allowcode'] = false;
-                }
-
-                $channels[$x]['channel_link'] = z_root() . '/channel/' . $channels[$x]['channel_address'];
-            }
-        }
-
-        Hook::call('admin_channels', $channels);
-
-        $o = replace_macros(Theme::get_template('admin_channels.tpl'), [
-            // strings //
-            '$title' => t('Administration'),
-            '$page' => t('Channels'),
-            '$submit' => t('Submit'),
-            '$select_all' => t('select all'),
-            '$delete' => t('Delete'),
-            '$block' => t('Censor'),
-            '$unblock' => t('Uncensor'),
-            '$code' => t('Allow Code'),
-            '$uncode' => t('Disallow Code'),
-            '$h_channels' => t('Channel'),
-            '$base' => $base,
-            '$odir' => $odir,
-            '$th_channels' => array(
-                [t('UID'), 'channel_id'],
-                [t('Name'), 'channel_name'],
-                [t('Address'), 'channel_address']),
-
-            '$confirm_delete_multi' => t('Selected channels will be deleted!\n\nEverything that was posted in these channels on this site will be permanently deleted!\n\nAre you sure?'),
-            '$confirm_delete' => t('The channel {0} will be deleted!\n\nEverything that was posted in this channel on this site will be permanently deleted!\n\nAre you sure?'),
-
-            '$form_security_token' => get_form_security_token('admin_channels'),
-
-            // values //
-            '$baseurl' => z_root(),
-            '$channels' => $channels,
-        ]);
-        $o .= paginate($a);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Cover_photo.php b/Zotlabs/Module/Admin/Cover_photo.php
deleted file mode 100644
index 6cd60c6ff..000000000
--- a/Zotlabs/Module/Admin/Cover_photo.php
+++ /dev/null
@@ -1,448 +0,0 @@
- 0 order by imgscale asc LIMIT 1",
-                dbesc($image_id),
-                intval($channel['channel_id'])
-            );
-
-            if ($r) {
-                $max_thumb = intval(get_config('system', 'max_thumbnail', 1600));
-                $iscaled = false;
-                if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) {
-                    $imagick_path = get_config('system', 'imagick_convert_path');
-                    if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) {
-                        $fname = dbunescbin($r[0]['content']);
-                        $tmp_name = $fname . '-001';
-                        $newsize = photo_calculate_scale(array_merge(getimagesize($fname), ['max' => $max_thumb]));
-                        $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
-                        //  logger('imagick thumbnail command: ' . $cmd);
-                        for ($x = 0; $x < 4; $x++) {
-                            exec($cmd);
-                            if (file_exists($tmp_name)) {
-                                break;
-                            }
-                        }
-                        if (file_exists($tmp_name)) {
-                            $base_image = $r[0];
-                            $gis = getimagesize($tmp_name);
-                            logger('gis: ' . print_r($gis, true));
-                            $base_image['width'] = $gis[0];
-                            $base_image['height'] = $gis[1];
-                            $base_image['content'] = @file_get_contents($tmp_name);
-                            $iscaled = true;
-                            @unlink($tmp_name);
-                        }
-                    }
-                }
-                if (!$iscaled) {
-                    $base_image = $r[0];
-                    $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content']));
-                }
-
-                $im = photo_factory($base_image['content'], $base_image['mimetype']);
-                if ($im->is_valid()) {
-                    // We are scaling and cropping the relative pixel locations to the original photo instead of the
-                    // scaled photo we operated on.
-
-                    // First load the scaled photo to check its size. (Should probably pass this in the post form and save
-                    // a query.)
-
-                    $g = q(
-                        "select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3",
-                        dbesc($image_id),
-                        intval($channel['channel_id'])
-                    );
-
-
-                    $scaled_width = $g[0]['width'];
-                    $scaled_height = $g[0]['height'];
-
-                    if ((!$scaled_width) || (!$scaled_height)) {
-                        logger('potential divide by zero scaling cover photo');
-                        return;
-                    }
-
-                    // unset all other cover photos
-
-                    q(
-                        "update photo set photo_usage = %d where photo_usage = %d and uid = %d",
-                        intval(PHOTO_NORMAL),
-                        intval(PHOTO_COVER),
-                        intval($channel['channel_id'])
-                    );
-
-                    $orig_srcx = ($base_image['width'] / $scaled_width) * $srcX;
-                    $orig_srcy = ($base_image['height'] / $scaled_height) * $srcY;
-                    $orig_srcw = ($srcW / $scaled_width) * $base_image['width'];
-                    $orig_srch = ($srcH / $scaled_height) * $base_image['height'];
-
-                    $im->cropImageRect(1200, 435, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch);
-
-                    $aid = get_account_id();
-
-                    $p = [
-                        'aid' => 0,
-                        'uid' => $channel['channel_id'],
-                        'resource_id' => $base_image['resource_id'],
-                        'filename' => $base_image['filename'],
-                        'album' => t('Cover Photos'),
-                        'os_path' => $base_image['os_path'],
-                        'display_path' => $base_image['display_path'],
-                        'created' => $base_image['created'],
-                        'edited' => $base_image['edited']
-                    ];
-
-                    $p['imgscale'] = 7;
-                    $p['photo_usage'] = PHOTO_COVER;
-
-                    $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200);
-
-                    $im->doScaleImage(850, 310);
-                    $p['imgscale'] = 8;
-
-                    $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850);
-
-                    $im->doScaleImage(425, 160);
-                    $p['imgscale'] = 9;
-
-                    $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425);
-
-                    if ($r1 === false || $r2 === false || $r3 === false) {
-                        // if one failed, delete them all so we can start over.
-                        notice(t('Image resize failed.') . EOL);
-                        $x = q(
-                            "delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ",
-                            dbesc($base_image['resource_id']),
-                            intval($channel['channel_id'])
-                        );
-                        return;
-                    }
-                } else {
-                    notice(t('Unable to process image') . EOL);
-                }
-            }
-
-            goaway(z_root() . '/admin');
-        }
-
-
-        $hash = photo_new_resource();
-        $smallest = 0;
-
-        $matches = [];
-        $partial = false;
-
-        if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
-            $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
-            if ($pm) {
-                logger('Content-Range: ' . print_r($matches, true));
-                $partial = true;
-            }
-        }
-
-        if ($partial) {
-            $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
-
-            if ($x['partial']) {
-                header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-                json_return_and_die($x);
-            } else {
-                header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
-
-                $_FILES['userfile'] = [
-                    'name' => $x['name'],
-                    'type' => $x['type'],
-                    'tmp_name' => $x['tmp_name'],
-                    'error' => $x['error'],
-                    'size' => $x['size']
-                ];
-            }
-        } else {
-            if (!array_key_exists('userfile', $_FILES)) {
-                $_FILES['userfile'] = [
-                    'name' => $_FILES['files']['name'],
-                    'type' => $_FILES['files']['type'],
-                    'tmp_name' => $_FILES['files']['tmp_name'],
-                    'error' => $_FILES['files']['error'],
-                    'size' => $_FILES['files']['size']
-                ];
-            }
-        }
-
-        $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Cover Photos'), 'hash' => $hash));
-
-        logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG);
-
-        json_return_and_die(['message' => $hash]);
-    }
-
-
-    /**
-     * @brief Generate content of profile-photo view
-     *
-     * @return string
-     *
-     */
-
-
-    public function get()
-    {
-
-        if (!is_site_admin()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $channel = Channel::get_system();
-
-        $newuser = false;
-
-        if (argc() == 3 && argv(1) === 'new') {
-            $newuser = true;
-        }
-
-
-        if (argv(2) === 'reset') {
-            q(
-                "update photo set photo_usage = %d where photo_usage = %d and uid = %d",
-                intval(PHOTO_NORMAL),
-                intval(PHOTO_COVER),
-                intval($channel['channel_id'])
-            );
-        }
-
-        if (argv(2) === 'use') {
-            if (argc() < 4) {
-                notice(t('Permission denied.') . EOL);
-                return;
-            }
-
-            //      check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo');
-
-            $resource_id = argv(3);
-
-            $r = q(
-                "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC",
-                intval($channel['channel_id']),
-                dbesc($resource_id)
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-            $havescale = false;
-            foreach ($r as $rr) {
-                if ($rr['imgscale'] == 7) {
-                    $havescale = true;
-                }
-            }
-
-            $r = q(
-                "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
-                intval($r[0]['id']),
-                intval($channel['channel_id'])
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-
-            if (intval($r[0]['os_storage'])) {
-                $data = @file_get_contents(dbunescbin($r[0]['content']));
-            } else {
-                $data = dbunescbin($r[0]['content']);
-            }
-
-            $ph = photo_factory($data, $r[0]['mimetype']);
-            $smallest = 0;
-            if ($ph->is_valid()) {
-                // go ahead as if we have just uploaded a new photo to crop
-                $i = q(
-                    "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0",
-                    dbesc($r[0]['resource_id']),
-                    intval($channel['channel_id'])
-                );
-
-                if ($i) {
-                    $hash = $i[0]['resource_id'];
-                    foreach ($i as $ii) {
-                        $smallest = intval($ii['imgscale']);
-                    }
-                }
-            }
-
-            $this->cover_photo_crop_ui_head($ph, $hash, $smallest);
-        }
-
-
-        if (!array_key_exists('imagecrop', App::$data)) {
-            $o .= replace_macros(Theme::get_template('admin_cover_photo.tpl'), [
-                '$user' => $channel['channel_address'],
-                '$channel_id' => $channel['channel_id'],
-                '$info' => t('Your cover photo may be visible to anybody on the internet'),
-                '$existing' => Channel::get_cover_photo($channel['channel_id'], 'array', PHOTO_RES_COVER_850),
-                '$lbl_upfile' => t('Upload File:'),
-                '$lbl_profiles' => t('Select a profile:'),
-                '$title' => t('Change Cover Photo'),
-                '$submit' => t('Upload'),
-                '$profiles' => $profiles,
-                '$embedPhotos' => t('Use a photo from your albums'),
-                '$embedPhotosModalTitle' => t('Use a photo from your albums'),
-                '$embedPhotosModalCancel' => t('Cancel'),
-                '$embedPhotosModalOK' => t('OK'),
-                '$modalchooseimages' => t('Choose images to embed'),
-                '$modalchoosealbum' => t('Choose an album'),
-                '$modaldiffalbum' => t('Choose a different album'),
-                '$modalerrorlist' => t('Error getting album list'),
-                '$modalerrorlink' => t('Error getting photo link'),
-                '$modalerroralbum' => t('Error getting album'),
-                '$form_security_token' => get_form_security_token("cover_photo"),
-                '$select' => t('Select previously uploaded photo'),
-
-            ]);
-
-            Hook::call('cover_photo_content_end', $o);
-
-            return $o;
-        } else {
-            $filename = App::$data['imagecrop'] . '-3';
-            $resolution = 3;
-
-            $o .= replace_macros(Theme::get_template('admin_cropcover.tpl'), [
-                '$filename' => $filename,
-                '$profile' => intval($_REQUEST['profile']),
-                '$resource' => App::$data['imagecrop'] . '-3',
-                '$image_url' => z_root() . '/photo/' . $filename,
-                '$title' => t('Crop Image'),
-                '$desc' => t('Please adjust the image cropping for optimum viewing.'),
-                '$form_security_token' => get_form_security_token("cover_photo"),
-                '$done' => t('Done Editing')
-            ]);
-            return $o;
-        }
-    }
-
-    /* @brief Generate the UI for photo-cropping
-     *
-     * @param $a Current application
-     * @param $ph Photo-Factory
-     * @return void
-     *
-     */
-
-    public function cover_photo_crop_ui_head($ph, $hash, $smallest)
-    {
-
-        $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH);
-
-        if ($max_length > 0) {
-            $ph->scaleImage($max_length);
-        }
-
-        $width = $ph->getWidth();
-        $height = $ph->getHeight();
-
-        if ($width < 300 || $height < 300) {
-            $ph->scaleImageUp(240);
-            $width = $ph->getWidth();
-            $height = $ph->getHeight();
-        }
-
-
-        App::$data['imagecrop'] = $hash;
-        App::$data['imagecrop_resolution'] = $smallest;
-        App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []);
-        return;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Dbsync.php b/Zotlabs/Module/Admin/Dbsync.php
deleted file mode 100644
index f210efd22..000000000
--- a/Zotlabs/Module/Admin/Dbsync.php
+++ /dev/null
@@ -1,111 +0,0 @@
- 3 && intval(argv(3)) && argv(2) === 'mark') {
-            // remove the old style config if it exists
-            del_config('database', 'update_r' . intval(argv(3)));
-            set_config('database', '_' . intval(argv(3)), 'success');
-            if (intval(get_config('system', 'db_version')) < intval(argv(3))) {
-                set_config('system', 'db_version', intval(argv(3)));
-            }
-            info(t('Update has been marked successful') . EOL);
-            goaway(z_root() . '/admin/dbsync');
-        }
-
-        if (argc() > 3 && intval(argv(3)) && argv(2) === 'verify') {
-            $s = '_' . intval(argv(3));
-            $cls = '\\Zotlabs\Update\\' . $s;
-            if (class_exists($cls)) {
-                $c = new $cls();
-                if (method_exists($c, 'verify')) {
-                    $retval = $c->verify();
-                    if ($retval === UPDATE_FAILED) {
-                        $o .= sprintf(t('Verification of update %s failed. Check system logs.'), $s);
-                    } elseif ($retval === UPDATE_SUCCESS) {
-                        $o .= sprintf(t('Update %s was successfully applied.'), $s);
-                        set_config('database', $s, 'success');
-                    } else {
-                        $o .= sprintf(t('Verifying update %s did not return a status. Unknown if it succeeded.'), $s);
-                    }
-                } else {
-                    $o .= sprintf(t('Update %s does not contain a verification function.'), $s);
-                }
-            } else {
-                $o .= sprintf(t('Update function %s could not be found.'), $s);
-            }
-
-            return $o;
-
-
-            // remove the old style config if it exists
-            del_config('database', 'update_r' . intval(argv(3)));
-            set_config('database', '_' . intval(argv(3)), 'success');
-            if (intval(get_config('system', 'db_version')) < intval(argv(3))) {
-                set_config('system', 'db_version', intval(argv(3)));
-            }
-            info(t('Update has been marked successful') . EOL);
-            goaway(z_root() . '/admin/dbsync');
-        }
-
-        if (argc() > 2 && intval(argv(2))) {
-            $x = intval(argv(2));
-            $s = '_' . $x;
-            $cls = '\\Zotlabs\Update\\' . $s;
-            if (class_exists($cls)) {
-                $c = new $cls();
-                $retval = $c->run();
-                if ($retval === UPDATE_FAILED) {
-                    $o .= sprintf(t('Executing update procedure %s failed. Check system logs.'), $s);
-                } elseif ($retval === UPDATE_SUCCESS) {
-                    $o .= sprintf(t('Update %s was successfully applied.'), $s);
-                    set_config('database', $s, 'success');
-                } else {
-                    $o .= sprintf(t('Update %s did not return a status. It cannot be determined if it was successful.'), $s);
-                }
-            } else {
-                $o .= sprintf(t('Update function %s could not be found.'), $s);
-            }
-
-            return $o;
-        }
-
-        $failed = [];
-        $r = q("select * from config where cat = 'database' ");
-        if (count($r)) {
-            foreach ($r as $rr) {
-                $upd = intval(substr($rr['k'], -4));
-                if ($rr['v'] === 'success') {
-                    continue;
-                }
-                $failed[] = $upd;
-            }
-        }
-        if (count($failed)) {
-            $o = replace_macros(Theme::get_template('failed_updates.tpl'), array(
-                '$base' => z_root(),
-                '$banner' => t('Failed Updates'),
-                '$desc' => '',
-                '$mark' => t('Mark success (if update was manually applied)'),
-                '$verify' => t('Attempt to verify this update if a verification procedure exists'),
-                '$apply' => t('Attempt to execute this update step automatically'),
-                '$failed' => $failed
-            ));
-        } else {
-            return '
          ' . t('No failed updates.') . '
          ';
-        }
-        return $o;
-    }
-}
-
diff --git a/Zotlabs/Module/Admin/Logs.php b/Zotlabs/Module/Admin/Logs.php
deleted file mode 100644
index 733a16919..000000000
--- a/Zotlabs/Module/Admin/Logs.php
+++ /dev/null
@@ -1,101 +0,0 @@
- 'Normal',
-            LOGGER_TRACE => 'Trace',
-            LOGGER_DEBUG => 'Debug',
-            LOGGER_DATA => 'Data',
-            LOGGER_ALL => 'All'
-        );
-
-        $t = Theme::get_template('admin_logs.tpl');
-
-        $f = get_config('system', 'logfile');
-
-        $data = '';
-
-        if (!file_exists($f)) {
-            $data = t("Error trying to open $f log file.\r\n
          Check to see if file $f exist and is 
-	readable.");
-        } else {
-            $fp = fopen($f, 'r');
-            if (!$fp) {
-                $data = t("Couldn't open $f log file.\r\n
          Check to see if file $f is readable.");
-            } else {
-                $fstat = fstat($fp);
-                $size = $fstat['size'];
-                if ($size != 0) {
-                    if ($size > 5000000 || $size < 0) {
-                        $size = 5000000;
-                    }
-                    $seek = fseek($fp, 0 - $size, SEEK_END);
-                    if ($seek === 0) {
-                        $data = escape_tags(fread($fp, $size));
-                        while (!feof($fp)) {
-                            $data .= escape_tags(fread($fp, 4096));
-                        }
-                    }
-                }
-                fclose($fp);
-            }
-        }
-
-        return replace_macros($t, array(
-            '$title' => t('Administration'),
-            '$page' => t('Logs'),
-            '$submit' => t('Submit'),
-            '$clear' => t('Clear'),
-            '$data' => $data,
-            '$baseurl' => z_root(),
-            '$logname' => get_config('system', 'logfile'),
-
-            // name, label, value, help string, extra data...
-            '$debugging' => array('debugging', t("Debugging"), get_config('system', 'debugging'), ""),
-            '$logfile' => array('logfile', t("Log file"), get_config('system', 'logfile'), t("Must be writable by web server. Relative to your top-level webserver directory.")),
-            '$loglevel' => array('loglevel', t("Log level"), get_config('system', 'loglevel'), "", $log_choices),
-
-            '$form_security_token' => get_form_security_token('admin_logs'),
-        ));
-    }
-}
diff --git a/Zotlabs/Module/Admin/Profile_photo.php b/Zotlabs/Module/Admin/Profile_photo.php
deleted file mode 100644
index 988554d52..000000000
--- a/Zotlabs/Module/Admin/Profile_photo.php
+++ /dev/null
@@ -1,540 +0,0 @@
-is_valid()) {
-                    $im->cropImage(300, $srcX, $srcY, $srcW, $srcH);
-
-                    $aid = 0;
-
-                    $p = [
-                        'aid' => $aid,
-                        'uid' => $channel['channel_id'],
-                        'resource_id' => $base_image['resource_id'],
-                        'filename' => $base_image['filename'],
-                        'album' => t('Profile Photos'),
-                        'os_path' => $base_image['os_path'],
-                        'display_path' => $base_image['display_path'],
-                        'created' => $base_image['created'],
-                        'edited' => $base_image['edited']
-                    ];
-
-                    $p['imgscale'] = PHOTO_RES_PROFILE_300;
-                    $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
-
-                    $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300);
-
-                    $im->scaleImage(80);
-                    $p['imgscale'] = PHOTO_RES_PROFILE_80;
-
-                    $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80);
-
-                    $im->scaleImage(48);
-                    $p['imgscale'] = PHOTO_RES_PROFILE_48;
-
-                    $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48);
-
-                    if ($r1 === false || $r2 === false || $r3 === false) {
-                        // if one failed, delete them all so we can start over.
-                        notice(t('Image resize failed.') . EOL);
-                        $x = q(
-                            "delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ",
-                            dbesc($base_image['resource_id']),
-                            $channel['channel_id'],
-                            intval(PHOTO_RES_PROFILE_300),
-                            intval(PHOTO_RES_PROFILE_80),
-                            intval(PHOTO_RES_PROFILE_48)
-                        );
-                        return;
-                    }
-
-
-                    $r = q(
-                        "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d
-						AND resource_id != '%s' AND uid = %d",
-                        intval(PHOTO_NORMAL),
-                        intval(PHOTO_PROFILE),
-                        dbesc($base_image['resource_id']),
-                        intval($channel['channel_id'])
-                    );
-
-                    // We'll set the updated profile-photo timestamp even if it isn't the default profile,
-                    // so that browsers will do a cache update unconditionally
-                    // Also set links back to site-specific profile photo url in case it was
-                    // changed to a generic URL by a clone operation. Otherwise the new photo may
-                    // not get pushed to other sites correctly.
-
-                    $r = q(
-                        "UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s'  
-						where xchan_hash = '%s'",
-                        dbesc($im->getType()),
-                        dbesc(datetime_convert()),
-                        dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']),
-                        dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']),
-                        dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']),
-                        dbesc($channel['xchan_hash'])
-                    );
-
-                    // Similarly, tell the nav bar to bypass the cache and update the avatar image.
-                    $_SESSION['reload_avatar'] = true;
-
-                    Config::Set('system', 'site_icon_url', z_root() . '/photo/profile/m/' . $channel['channel_id']);
-
-                    info(t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
-                } else {
-                    notice(t('Unable to process image') . EOL);
-                }
-            }
-
-            goaway(z_root() . '/admin');
-        }
-
-        // A new photo was uploaded. Store it and save some important details
-        // in App::$data for use in the cropping function
-
-
-        $hash = photo_new_resource();
-        $importing = false;
-        $smallest = 0;
-
-
-        if ($_REQUEST['importfile']) {
-            $hash = $_REQUEST['importfile'];
-            $importing = true;
-        } else {
-            $matches = [];
-            $partial = false;
-
-            if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
-                $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
-                if ($pm) {
-                    logger('Content-Range: ' . print_r($matches, true), LOGGER_DEBUG);
-                    $partial = true;
-                }
-            }
-
-            if ($partial) {
-                $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
-
-                if ($x['partial']) {
-                    header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-                    json_return_and_die($x);
-                } else {
-                    header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
-
-                    $_FILES['userfile'] = [
-                        'name' => $x['name'],
-                        'type' => $x['type'],
-                        'tmp_name' => $x['tmp_name'],
-                        'error' => $x['error'],
-                        'size' => $x['size']
-                    ];
-                }
-            } else {
-                if (!array_key_exists('userfile', $_FILES)) {
-                    $_FILES['userfile'] = [
-                        'name' => $_FILES['files']['name'],
-                        'type' => $_FILES['files']['type'],
-                        'tmp_name' => $_FILES['files']['tmp_name'],
-                        'error' => $_FILES['files']['error'],
-                        'size' => $_FILES['files']['size']
-                    ];
-                }
-            }
-
-            $res = attach_store($channel, $channel['channel_hash'], '', array('album' => t('Profile Photos'), 'hash' => $hash));
-
-            logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG);
-
-            json_return_and_die(['message' => $hash]);
-        }
-
-        if (($res && intval($res['data']['is_photo'])) || $importing) {
-            $i = q(
-                "select * from photo where resource_id = '%s' and uid = %d order by imgscale",
-                dbesc($hash),
-                intval($channel['channel_hash'])
-            );
-
-            if (!$i) {
-                notice(t('Image upload failed.') . EOL);
-                return;
-            }
-            $os_storage = false;
-
-            foreach ($i as $ii) {
-                if (intval($ii['imgscale']) < PHOTO_RES_640) {
-                    $smallest = intval($ii['imgscale']);
-                    $os_storage = intval($ii['os_storage']);
-                    $imagedata = $ii['content'];
-                    $filetype = $ii['mimetype'];
-                }
-            }
-        }
-
-        $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata));
-        $ph = photo_factory($imagedata, $filetype);
-
-        if (!$ph->is_valid()) {
-            notice(t('Unable to process image.') . EOL);
-            return;
-        }
-
-        return $this->profile_photo_crop_ui_head($ph, $hash, $smallest);
-
-        // This will "fall through" to the get() method, and since
-        // App::$data['imagecrop'] is set, it will proceed to cropping
-        // rather than present the upload form
-    }
-
-
-    /* @brief Generate content of profile-photo view
-     *
-     * @return void
-     *
-     */
-
-
-    public function get()
-    {
-
-        if (!is_site_admin()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $channel = Channel::get_system();
-        $pf = 0;
-        $newuser = false;
-
-        if (argc() == 3 && argv(2) === 'new') {
-            $newuser = true;
-        }
-
-        if (argv(2) === 'reset') {
-            Config::Delete('system', 'site_icon_url');
-        }
-
-        if (argv(2) === 'use') {
-            if (argc() < 4) {
-                notice(t('Permission denied.') . EOL);
-                return;
-            }
-
-            $resource_id = argv(3);
-
-            $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0);
-
-            $c = q(
-                "select id, is_default from profile where uid = %d",
-                intval($channel['channel_id'])
-            );
-
-            $multi_profiles = true;
-
-            if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) {
-                $_REQUEST['profile'] = $c[0]['id'];
-                $multi_profiles = false;
-            } else {
-                $_REQUEST['profile'] = $pf;
-            }
-
-            $r = q(
-                "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC",
-                intval($channel['channel_id']),
-                dbesc($resource_id)
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-            $havescale = false;
-            foreach ($r as $rr) {
-                if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) {
-                    $havescale = true;
-                }
-            }
-
-            // set an already loaded and cropped photo as profile photo
-
-            if ($havescale) {
-                // unset any existing profile photos
-                $r = q(
-                    "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
-                    intval(PHOTO_NORMAL),
-                    intval(PHOTO_PROFILE),
-                    intval($channel['channel_id'])
-                );
-
-                $r = q(
-                    "UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'",
-                    intval(PHOTO_PROFILE),
-                    intval($channel['channel_id']),
-                    dbesc($resource_id)
-                );
-
-                $r = q(
-                    "UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'",
-                    dbesc(datetime_convert()),
-                    dbesc($channel['xchan_hash'])
-                );
-
-                goaway(z_root() . '/admin');
-            }
-
-            $r = q(
-                "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
-                intval($r[0]['id']),
-                intval($channel['channel_id'])
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-
-            if (intval($r[0]['os_storage'])) {
-                $data = @file_get_contents(dbunescbin($r[0]['content']));
-            } else {
-                $data = dbunescbin($r[0]['content']);
-            }
-
-            $ph = photo_factory($data, $r[0]['mimetype']);
-            $smallest = 0;
-            if ($ph->is_valid()) {
-                // go ahead as if we have just uploaded a new photo to crop
-                $i = q(
-                    "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale",
-                    dbesc($r[0]['resource_id']),
-                    intval($channel['channel_id'])
-                );
-
-                if ($i) {
-                    $hash = $i[0]['resource_id'];
-                    foreach ($i as $ii) {
-                        if (intval($ii['imgscale']) < PHOTO_RES_640) {
-                            $smallest = intval($ii['imgscale']);
-                        }
-                    }
-                }
-            }
-
-            if ($multi_profiles) {
-                App::$data['importfile'] = $resource_id;
-            } else {
-                $this->profile_photo_crop_ui_head($ph, $hash, $smallest);
-            }
-
-            // falls through with App::$data['imagecrop'] set so we go straight to the cropping section
-        }
-
-        // present an upload form
-
-        $profiles = q(
-            "select id, profile_name as name, is_default from profile where uid = %d order by id asc",
-            intval($channel['channel_id'])
-        );
-
-        if ($profiles) {
-            for ($x = 0; $x < count($profiles); $x++) {
-                $profiles[$x]['selected'] = false;
-                if ($pf && $profiles[$x]['id'] == $pf) {
-                    $profiles[$x]['selected'] = true;
-                }
-                if ((!$pf) && $profiles[$x]['is_default']) {
-                    $profiles[$x]['selected'] = true;
-                }
-            }
-        }
-
-        $importing = ((array_key_exists('importfile', App::$data)) ? true : false);
-
-        if (!array_key_exists('imagecrop', App::$data)) {
-            $tpl = Theme::get_template('admin_profile_photo.tpl');
-
-            $o .= replace_macros($tpl, [
-                '$user' => $channel['channel_address'],
-                '$channel_id' => $channel['channel_id'],
-                '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your site photo is visible to anybody on the internet and may be distributed to other websites.')),
-                '$importfile' => (($importing) ? App::$data['importfile'] : ''),
-                '$lbl_upfile' => t('Upload File:'),
-                '$lbl_profiles' => t('Select a profile:'),
-                '$title' => (($importing) ? t('Use Photo for Site Logo') : t('Change Site Logo')),
-                '$submit' => (($importing) ? t('Use') : t('Upload')),
-                '$profiles' => $profiles,
-                '$single' => ((count($profiles) == 1) ? true : false),
-                '$profile0' => $profiles[0],
-                '$embedPhotos' => t('Use a photo from your albums'),
-                '$embedPhotosModalTitle' => t('Use a photo from your albums'),
-                '$embedPhotosModalCancel' => t('Cancel'),
-                '$embedPhotosModalOK' => t('OK'),
-                '$modalchooseimages' => t('Choose images to embed'),
-                '$modalchoosealbum' => t('Choose an album'),
-                '$modaldiffalbum' => t('Choose a different album'),
-                '$modalerrorlist' => t('Error getting album list'),
-                '$modalerrorlink' => t('Error getting photo link'),
-                '$modalerroralbum' => t('Error getting album'),
-                '$form_security_token' => get_form_security_token("profile_photo"),
-                '$select' => t('Select previously uploaded photo'),
-            ]);
-
-            Hook::call('profile_photo_content_end', $o);
-            return $o;
-        } else {
-            // present a cropping form
-
-            $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'];
-            $resolution = App::$data['imagecrop_resolution'];
-            $o .= replace_macros(Theme::get_template('admin_cropbody.tpl'), [
-                '$filename' => $filename,
-                '$profile' => intval($_REQUEST['profile']),
-                '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'],
-                '$image_url' => z_root() . '/photo/' . $filename,
-                '$title' => t('Crop Image'),
-                '$desc' => t('Please adjust the image cropping for optimum viewing.'),
-                '$form_security_token' => get_form_security_token("profile_photo"),
-                '$done' => t('Done Editing')
-            ]);
-            return $o;
-        }
-    }
-
-    /* @brief Generate the UI for photo-cropping
-     *
-     * @param $ph Photo-Factory
-     * @return void
-     *
-     */
-
-    public function profile_photo_crop_ui_head($ph, $hash, $smallest)
-    {
-        $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH);
-
-        if ($max_length > 0) {
-            $ph->scaleImage($max_length);
-        }
-
-        App::$data['width'] = $ph->getWidth();
-        App::$data['height'] = $ph->getHeight();
-
-        if (App::$data['width'] < 500 || App::$data['height'] < 500) {
-            $ph->scaleImageUp(400);
-            App::$data['width'] = $ph->getWidth();
-            App::$data['height'] = $ph->getHeight();
-        }
-
-        App::$data['imagecrop'] = $hash;
-        App::$data['imagecrop_resolution'] = $smallest;
-        App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []);
-        return;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Profs.php b/Zotlabs/Module/Admin/Profs.php
deleted file mode 100644
index 6dbf8a394..000000000
--- a/Zotlabs/Module/Admin/Profs.php
+++ /dev/null
@@ -1,200 +0,0 @@
- 3) && argv(2) == 'drop' && intval(argv(3))) {
-            $r = q(
-                "delete from profdef where id = %d",
-                intval(argv(3))
-            );
-            // remove from allowed fields
-
-            goaway(z_root() . '/admin/profs');
-        }
-
-        if ((argc() > 2) && argv(2) === 'new') {
-            return replace_macros(Theme::get_template('profdef_edit.tpl'), array(
-                '$header' => t('New Profile Field'),
-                '$field_name' => array('field_name', t('Field nickname'), $_REQUEST['field_name'], t('System name of field')),
-                '$field_type' => array('field_type', t('Input type'), (($_REQUEST['field_type']) ? $_REQUEST['field_type'] : 'text'), ''),
-                '$field_desc' => array('field_desc', t('Field Name'), $_REQUEST['field_desc'], t('Label on profile pages')),
-                '$field_help' => array('field_help', t('Help text'), $_REQUEST['field_help'], t('Additional info (optional)')),
-                '$submit' => t('Save')
-            ));
-        }
-
-        if ((argc() > 2) && intval(argv(2))) {
-            $r = q(
-                "select * from profdef where id = %d limit 1",
-                intval(argv(2))
-            );
-            if (!$r) {
-                notice(t('Field definition not found') . EOL);
-                goaway(z_root() . '/admin/profs');
-            }
-
-            return replace_macros(Theme::get_template('profdef_edit.tpl'), array(
-                '$id' => intval($r[0]['id']),
-                '$header' => t('Edit Profile Field'),
-                '$field_name' => array('field_name', t('Field nickname'), $r[0]['field_name'], t('System name of field')),
-                '$field_type' => array('field_type', t('Input type'), $r[0]['field_type'], ''),
-                '$field_desc' => array('field_desc', t('Field Name'), $r[0]['field_desc'], t('Label on profile pages')),
-                '$field_help' => array('field_help', t('Help text'), $r[0]['field_help'], t('Additional info (optional)')),
-                '$submit' => t('Save')
-            ));
-        }
-
-        $basic = '';
-        $barr = [];
-        $fields = Channel::get_profile_fields_basic();
-
-        if (!$fields) {
-            $fields = Channel::get_profile_fields_basic(1);
-        }
-        if ($fields) {
-            foreach ($fields as $k => $v) {
-                if ($basic) {
-                    $basic .= ', ';
-                }
-                $basic .= trim($k);
-                $barr[] = trim($k);
-            }
-        }
-
-        $advanced = '';
-        $fields = Channel::get_profile_fields_advanced();
-        if (!$fields) {
-            $fields = Channel::get_profile_fields_advanced(1);
-        }
-        if ($fields) {
-            foreach ($fields as $k => $v) {
-                if (in_array(trim($k), $barr)) {
-                    continue;
-                }
-                if ($advanced) {
-                    $advanced .= ', ';
-                }
-                $advanced .= trim($k);
-            }
-        }
-
-        $all = '';
-        $fields = Channel::get_profile_fields_advanced(1);
-        if ($fields) {
-            foreach ($fields as $k => $v) {
-                if ($all) {
-                    $all .= ', ';
-                }
-                $all .= trim($k);
-            }
-        }
-
-        $r = q("select * from profdef where true");
-        if ($r) {
-            foreach ($r as $rr) {
-                if ($all) {
-                    $all .= ', ';
-                }
-                $all .= $rr['field_name'];
-            }
-        }
-
-
-        $o = replace_macros(Theme::get_template('admin_profiles.tpl'), array(
-            '$title' => t('Profile Fields'),
-            '$basic' => array('basic', t('Basic Profile Fields'), $basic, ''),
-            '$advanced' => array('advanced', t('Advanced Profile Fields'), $advanced, t('(In addition to basic fields)')),
-            '$all' => $all,
-            '$all_desc' => t('All available fields'),
-            '$cust_field_desc' => t('Custom Fields'),
-            '$cust_fields' => $r,
-            '$edit' => t('Edit'),
-            '$drop' => t('Delete'),
-            '$new' => t('Create Custom Field'),
-            '$submit' => t('Submit')
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Queue.php b/Zotlabs/Module/Admin/Queue.php
deleted file mode 100644
index 35a903390..000000000
--- a/Zotlabs/Module/Admin/Queue.php
+++ /dev/null
@@ -1,52 +0,0 @@
- t('Queue Statistics'),
-            '$numentries' => t('Total Entries'),
-            '$priority' => t('Priority'),
-            '$desturl' => t('Destination URL'),
-            '$nukehub' => t('Mark hub permanently offline'),
-            '$empty' => t('Empty queue for this hub'),
-            '$lastconn' => t('Last known contact'),
-            '$hasentries' => ((count($r)) ? true : false),
-            '$entries' => $r,
-            '$expert' => $expert
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Security.php b/Zotlabs/Module/Admin/Security.php
deleted file mode 100644
index f91d34d7d..000000000
--- a/Zotlabs/Module/Admin/Security.php
+++ /dev/null
@@ -1,191 +0,0 @@
-trim_array_elems(explode("\n", $_POST['allowed_sites']));
-        set_config('system', 'allowed_sites', $ws);
-
-        $bs = $this->trim_array_elems(explode("\n", $_POST['denied_sites']));
-        set_config('system', 'denied_sites', $bs);
-
-        $wc = $this->trim_array_elems(explode("\n", $_POST['allowed_channels']));
-        set_config('system', 'allowed_channels', $wc);
-
-        $bc = $this->trim_array_elems(explode("\n", $_POST['denied_channels']));
-        set_config('system', 'denied_channels', $bc);
-
-        $ws = $this->trim_array_elems(explode("\n", $_POST['pubstream_allowed_sites']));
-        set_config('system', 'pubstream_allowed_sites', $ws);
-
-        $bs = $this->trim_array_elems(explode("\n", $_POST['pubstream_denied_sites']));
-        set_config('system', 'pubstream_denied_sites', $bs);
-
-        $wc = $this->trim_array_elems(explode("\n", $_POST['pubstream_allowed_channels']));
-        set_config('system', 'pubstream_allowed_channels', $wc);
-
-        $bc = $this->trim_array_elems(explode("\n", $_POST['pubstream_denied_channels']));
-        set_config('system', 'pubstream_denied_channels', $bc);
-
-        $embed_sslonly = ((x($_POST, 'embed_sslonly')) ? true : false);
-        set_config('system', 'embed_sslonly', $embed_sslonly);
-
-        $we = $this->trim_array_elems(explode("\n", $_POST['embed_allow']));
-        set_config('system', 'embed_allow', $we);
-
-        $be = $this->trim_array_elems(explode("\n", $_POST['embed_deny']));
-        set_config('system', 'embed_deny', $be);
-
-        $ts = ((x($_POST, 'transport_security')) ? true : false);
-        set_config('system', 'transport_security_header', $ts);
-
-        $cs = ((x($_POST, 'content_security')) ? true : false);
-        set_config('system', 'content_security_policy', $cs);
-
-        goaway(z_root() . '/admin/security');
-    }
-
-
-    public function get()
-    {
-
-        $allowedsites = get_config('system', 'allowed_sites');
-        $allowedsites_str = ((is_array($allowedsites)) ? implode("\n", $allowedsites) : '');
-
-        $deniedsites = get_config('system', 'denied_sites');
-        $deniedsites_str = ((is_array($deniedsites)) ? implode("\n", $deniedsites) : '');
-
-
-        $allowedchannels = get_config('system', 'allowed_channels');
-        $allowedchannels_str = ((is_array($allowedchannels)) ? implode("\n", $allowedchannels) : '');
-
-        $deniedchannels = get_config('system', 'denied_channels');
-        $deniedchannels_str = ((is_array($deniedchannels)) ? implode("\n", $deniedchannels) : '');
-
-        $psallowedsites = get_config('system', 'pubstream_allowed_sites');
-        $psallowedsites_str = ((is_array($psallowedsites)) ? implode("\n", $psallowedsites) : '');
-
-        $psdeniedsites = get_config('system', 'pubstream_denied_sites');
-        $psdeniedsites_str = ((is_array($psdeniedsites)) ? implode("\n", $psdeniedsites) : '');
-
-
-        $psallowedchannels = get_config('system', 'pubstream_allowed_channels');
-        $psallowedchannels_str = ((is_array($psallowedchannels)) ? implode("\n", $psallowedchannels) : '');
-
-        $psdeniedchannels = get_config('system', 'pubstream_denied_channels');
-        $psdeniedchannels_str = ((is_array($psdeniedchannels)) ? implode("\n", $psdeniedchannels) : '');
-
-        $allowedembeds = get_config('system', 'embed_allow');
-        $allowedembeds_str = ((is_array($allowedembeds)) ? implode("\n", $allowedembeds) : '');
-
-        $deniedembeds = get_config('system', 'embed_deny');
-        $deniedembeds_str = ((is_array($deniedembeds)) ? implode("\n", $deniedembeds) : '');
-
-        $embed_coop = intval(get_config('system', 'embed_coop'));
-
-        if ((!$allowedembeds) && (!$deniedembeds)) {
-            $embedhelp1 = t("By default, unfiltered HTML is allowed in embedded media. This is inherently insecure.");
-        }
-
-        $embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:");
-        $embedhelp3 = t("https://youtube.com/
          https://www.youtube.com/
          https://youtu.be/
          https://vimeo.com/
          https://soundcloud.com/
          ");
-        $embedhelp4 = t("All other embedded content will be filtered, unless embedded content from that site is explicitly blocked.");
-
-        $t = Theme::get_template('admin_security.tpl');
-        return replace_macros($t, array(
-            '$title' => t('Administration'),
-            '$page' => t('Security'),
-            '$form_security_token' => get_form_security_token('admin_security'),
-            '$block_public' => array('block_public', t("Block public"), get_config('system', 'block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")),
-            '$block_public_search' => array('block_public_search', t("Block public search"), get_config('system', 'block_public_search', 1), t("Prevent access to search content unless you are currently authenticated.")),
-            '$block_public_dir' => ['block_public_directory', t('Block directory from visitors'), get_config('system', 'block_public_directory', true), t('Only allow authenticated access to directory.')],
-            '$localdir_hide' => ['localdir_hide', t('Hide local directory'), intval(get_config('system', 'localdir_hide')), t('Only use the global directory')],
-            '$cloud_noroot' => ['cloud_noroot', t('Provide a cloud root directory'), 1 - intval(get_config('system', 'cloud_disable_siteroot', true)), t('The cloud root directory lists all channel names which provide public files. Otherwise only the names of connections are shown.')],
-            '$cloud_disksize' => ['cloud_disksize', t('Show total disk space available to cloud uploads'), intval(get_config('system', 'cloud_report_disksize')), ''],
-            '$thumbnail_security' => ['thumbnail_security', t("Allow SVG thumbnails in file browser"), get_config('system', 'thumbnail_security', 0), t("WARNING: SVG images may contain malicious code.")],
-
-            '$inline_pdf' => ['inline_pdf', t("Allow embedded (inline) PDF files"), get_config('system', 'inline_pdf', 0), ''],
-            '$anonymous_comments' => ['anonymous_comments', t('Permit anonymous comments'), intval(get_config('system', 'anonymous_comments')), t('Moderation will be performed by channels that select this comment option.')],
-            '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'), intval(get_config('system', 'transport_security_header')), ''),
-            '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'), intval(get_config('system', 'content_security_policy')), ''),
-            '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system', 'allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
-            '$not_allowed_email' => array('not_allowed_email', t("Not allowed email domains"), get_config('system', 'not_allowed_email'), t("Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.")),
-            '$allowed_sites' => array('allowed_sites', t('Allow communications only from these sites'), $allowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')),
-            '$denied_sites' => array('denied_sites', t('Block communications from these sites'), $deniedsites_str, ''),
-            '$allowed_channels' => array('allowed_channels', t('Allow communications only from these channels'), $allowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')),
-            '$denied_channels' => array('denied_channels', t('Block communications from these channels'), $deniedchannels_str, ''),
-
-            '$psallowed_sites' => array('pubstream_allowed_sites', t('Allow public stream communications only from these sites'), $psallowedsites_str, t('One site per line. Leave empty to allow communication from anywhere by default')),
-            '$psdenied_sites' => array('pubstream_denied_sites', t('Block public stream communications from these sites'), $psdeniedsites_str, ''),
-            '$psallowed_channels' => array('pubstream_allowed_channels', t('Allow public stream communications only from these channels'), $psallowedchannels_str, t('One channel (hash) per line. Leave empty to allow communication from any channel by default')),
-            '$psdenied_channels' => array('pubstream_denied_channels', t('Block public stream communications from these channels'), $psdeniedchannels_str, ''),
-
-
-            '$embed_sslonly' => array('embed_sslonly', t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system', 'embed_sslonly')), ''),
-            '$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $allowedembeds_str, t('One site per line. By default embedded content is filtered.')),
-            '$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $deniedembeds_str, ''),
-
-//          '$embed_coop'     => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')),
-
-            '$submit' => t('Submit')
-        ));
-    }
-
-
-    public function trim_array_elems($arr)
-    {
-        $narr = [];
-
-        if ($arr && is_array($arr)) {
-            for ($x = 0; $x < count($arr); $x++) {
-                $y = trim($arr[$x]);
-                if ($y) {
-                    $narr[] = $y;
-                }
-            }
-        }
-        return $narr;
-    }
-}
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
deleted file mode 100644
index 383afaaa3..000000000
--- a/Zotlabs/Module/Admin/Site.php
+++ /dev/null
@@ -1,384 +0,0 @@
- 0) ? intval(trim($_POST['delivery_batch_count'])) : 3);
-        $poll_interval = ((x($_POST, 'poll_interval')) ? intval(trim($_POST['poll_interval'])) : 0);
-        $maxloadavg = ((x($_POST, 'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50);
-//      $feed_contacts     = ((x($_POST,'feed_contacts'))    ? intval($_POST['feed_contacts'])    : 0);
-        $ap_contacts = ((x($_POST, 'ap_contacts')) ? intval($_POST['ap_contacts']) : 0);
-        $verify_email = ((x($_POST, 'verify_email')) ? 1 : 0);
-        $imagick_path = ((x($_POST, 'imagick_path')) ? trim($_POST['imagick_path']) : '');
-        $force_queue = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue']) : 3000);
-        $pub_incl = escape_tags(trim($_POST['pub_incl']));
-        $pub_excl = escape_tags(trim($_POST['pub_excl']));
-
-        $permissions_role = escape_tags(trim($_POST['permissions_role']));
-
-//      set_config('system', 'feed_contacts', $feed_contacts);
-        set_config('system', 'activitypub', $ap_contacts);
-        set_config('system', 'delivery_interval', $delivery_interval);
-        set_config('system', 'delivery_batch_count', $delivery_batch_count);
-        set_config('system', 'poll_interval', $poll_interval);
-        set_config('system', 'maxloadavg', $maxloadavg);
-        set_config('system', 'frontpage', $frontpage);
-        set_config('system', 'cache_images', $cache_images);
-        set_config('system', 'sellpage', $site_sellpage);
-        set_config('system', 'workflow_channel_next', $first_page);
-        set_config('system', 'site_location', $site_location);
-        set_config('system', 'mirror_frontpage', $mirror_frontpage);
-        set_config('system', 'sitename', $sitename);
-        set_config('system', 'login_on_homepage', $login_on_homepage);
-        set_config('system', 'enable_context_help', $enable_context_help);
-        set_config('system', 'verify_email', $verify_email);
-        set_config('system', 'default_expire_days', $default_expire_days);
-        set_config('system', 'active_expire_days', $active_expire_days);
-        set_config('system', 'reply_address', $reply_address);
-        set_config('system', 'from_email', $from_email);
-        set_config('system', 'from_email_name', $from_email_name);
-        set_config('system', 'imagick_convert_path', $imagick_path);
-        set_config('system', 'default_permissions_role', $permissions_role);
-        set_config('system', 'show_like_counts', $show_like_counts);
-        set_config('system', 'pubstream_incl', $pub_incl);
-        set_config('system', 'pubstream_excl', $pub_excl);
-        set_config('system', 'max_imported_follow', $max_imported_follow);
-        set_config('system', 'animated_avatars', $animations);
-        set_config('system', 'tos_required', $tos_required);
-
-        if ($directory_server) {
-            set_config('system', 'directory_server', $directory_server);
-        }
-
-        if ($admininfo == '') {
-            del_config('system', 'admininfo');
-        } else {
-            require_once('include/text.php');
-            linkify_tags($admininfo, local_channel());
-            set_config('system', 'admininfo', $admininfo);
-        }
-        set_config('system', 'siteinfo', $siteinfo);
-
-        // sync sitename and siteinfo updates to the system channel
-
-        q(
-            "update profile set about = '%s' where uid = %d and is_default = 1",
-            dbesc($siteinfo),
-            intval($sys['channel_id'])
-        );
-        q(
-            "update profile set fullname = '%s' where uid = %d and is_default = 1",
-            dbesc($sitename),
-            intval($sys['channel_id'])
-        );
-        q(
-            "update channel set channel_name = '%s' where channel_id  = %d",
-            dbesc($sitename),
-            intval($sys['channel_id'])
-        );
-        q(
-            "update xchan set xchan_name = '%s' , xchan_name_updated = '%s' where xchan_hash = '%s'",
-            dbesc($sitename),
-            dbesc(datetime_convert()),
-            dbesc($sys['channel_hash'])
-        );
-
-        set_config('system', 'language', $language);
-        set_config('system', 'theme', $theme);
-        //  set_config('system','site_channel', $site_channel);
-        set_config('system', 'maximagesize', $maximagesize);
-
-        set_config('system', 'register_policy', $register_policy);
-        set_config('system', 'minimum_age', $minimum_age);
-        set_config('system', 'invitation_only', $invite_only);
-        set_config('system', 'access_policy', $access_policy);
-        set_config('system', 'account_abandon_days', $abandon_days);
-        set_config('system', 'register_text', $register_text);
-        set_config('system', 'publish_all', $force_publish);
-        set_config('system', 'public_stream_mode', $public_stream_mode);
-        set_config('system', 'open_pubstream', $open_pubstream);
-        set_config('system', 'force_queue_threshold', $force_queue);
-        if ($global_directory == '') {
-            del_config('system', 'directory_submit_url');
-        } else {
-            set_config('system', 'directory_submit_url', $global_directory);
-        }
-
-        set_config('system', 'no_community_page', $no_community_page);
-        set_config('system', 'no_utf', $no_utf);
-        set_config('system', 'verifyssl', $verifyssl);
-        set_config('system', 'proxyuser', $proxyuser);
-        set_config('system', 'proxy', $proxy);
-        set_config('system', 'curl_timeout', $timeout);
-        set_config('system', 'curl_post_timeout', $post_timeout);
-
-        info(t('Site settings updated.') . EOL);
-        goaway(z_root() . '/admin/site');
-    }
-
-    /**
-     * @brief Admin page site.
-     *
-     * @return string with HTML
-     */
-
-    public function get()
-    {
-
-        /* Installed langs */
-        $lang_choices = [];
-        $langs = glob('view/*/strings.php');
-
-        if (is_array($langs) && count($langs)) {
-            if (!in_array('view/en/strings.php', $langs)) {
-                $langs[] = 'view/en/';
-            }
-            asort($langs);
-            foreach ($langs as $l) {
-                $t = explode("/", $l);
-                $lang_choices[$t[1]] = $t[1];
-            }
-        }
-
-        /* Installed themes */
-        $theme_choices_mobile["---"] = t("Default");
-        $theme_choices = [];
-        $files = glob('view/theme/*');
-        if ($files) {
-            foreach ($files as $file) {
-                $vars = '';
-                $f = basename($file);
-
-                $info = Theme::get_info($f);
-                $compatible = Addon::check_versions($info);
-                if (!$compatible) {
-                    $theme_choices[$f] = $theme_choices_mobile[$f] = sprintf(t('%s - (Incompatible)'), $f);
-                    continue;
-                }
-
-                if (file_exists($file . '/library')) {
-                    continue;
-                }
-                if (file_exists($file . '/mobile')) {
-                    $vars = t('mobile');
-                }
-                if (file_exists($file . '/experimental')) {
-                    $vars .= t('experimental');
-                }
-                if (file_exists($file . '/unsupported')) {
-                    $vars .= t('unsupported');
-                }
-                if ($vars) {
-                    $theme_choices[$f] = $f . ' (' . $vars . ')';
-                    $theme_choices_mobile[$f] = $f . ' (' . $vars . ')';
-                } else {
-                    $theme_choices[$f] = $f;
-                    $theme_choices_mobile[$f] = $f;
-                }
-            }
-        }
-
-        $dir_choices = null;
-        $dirmode = get_config('system', 'directory_mode');
-        $realm = get_directory_realm();
-
-        // directory server should not be set or settable unless we are a directory client
-        // avoid older redmatrix servers which don't have modern encryption
-
-        if ($dirmode == DIRECTORY_MODE_NORMAL) {
-            $x = q(
-                "select site_url from site where site_flags in (%d,%d) and site_realm = '%s' and site_dead = 0",
-                intval(DIRECTORY_MODE_SECONDARY),
-                intval(DIRECTORY_MODE_PRIMARY),
-                dbesc($realm)
-            );
-            if ($x) {
-                $dir_choices = [];
-                foreach ($x as $xx) {
-                    $dir_choices[$xx['site_url']] = $xx['site_url'];
-                }
-            }
-        }
-
-
-        /* Admin Info */
-
-        $admininfo = get_config('system', 'admininfo');
-
-        /* Register policy */
-        $register_choices = [
-            REGISTER_CLOSED => t("No"),
-            REGISTER_APPROVE => t("Yes - with approval"),
-            REGISTER_OPEN => t("Yes")
-        ];
-
-        /* Acess policy */
-        $access_choices = [
-            ACCESS_PRIVATE => t("My site is not a public server"),
-            ACCESS_FREE => t("My site provides free public access"),
-            ACCESS_PAID => t("My site provides paid public access"),
-            ACCESS_TIERED => t("My site provides free public access and premium paid plans")
-        ];
-
-        $perm_roles = PermissionRoles::roles();
-        $default_role = get_config('system', 'default_permissions_role', 'social');
-
-        $role = ['permissions_role', t('Default permission role for new accounts'), $default_role, t('This role will be used for the first channel created after registration.'), $perm_roles];
-
-
-        $homelogin = get_config('system', 'login_on_homepage');
-        $enable_context_help = get_config('system', 'enable_context_help');
-
-        return replace_macros(Theme::get_template('admin_site.tpl'), [
-            '$title' => t('Administration'),
-            '$page' => t('Site'),
-            '$submit' => t('Submit'),
-            '$h_basic' => t('Site Configuration'),
-            '$registration' => t('Registration'),
-            '$upload' => t('File upload'),
-            '$corporate' => t('Policies'),
-            '$advanced' => t('Advanced'),
-            '$baseurl' => z_root(),
-            '$sitename' => ['sitename', t("Site name"), htmlspecialchars(get_config('system', 'sitename', App::get_hostname()), ENT_QUOTES, 'UTF-8'), ''],
-            '$admininfo' => ['admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators.  Displayed on siteinfo page.  BBCode may be used here.")],
-            '$siteinfo' => ['siteinfo', t('Site Information'), get_config('system', 'siteinfo'), t("Publicly visible description of this site.  Displayed on siteinfo page.  BBCode may be used here.")],
-            '$language' => ['language', t("System language"), get_config('system', 'language', 'en'), "", $lang_choices],
-            '$theme' => ['theme', t("System theme"), get_config('system', 'theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices],
-//          '$theme_mobile'         => [ 'theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile ],
-//          '$site_channel'         => [ 'site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel") ],
-            '$ap_contacts' => ['ap_contacts', t('ActivityPub protocol'), get_config('system', 'activitypub', ACTIVITYPUB_ENABLED), t('Provides access to software supporting the ActivityPub protocol.')],
-            '$maximagesize' => ['maximagesize', t("Maximum image size"), intval(get_config('system', 'maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")],
-            '$cache_images' => ['cache_images', t('Cache all public images'), intval(get_config('system', 'cache_images', 1)), t('If disabled, proxy non-SSL images, but do not store locally')],
-            '$register_policy' => ['register_policy', t("Does this site allow new member registration?"), get_config('system', 'register_policy'), "", $register_choices],
-            '$invite_only' => ['invite_only', t("Invitation only"), get_config('system', 'invitation_only'), t("Only allow new member registrations with an invitation code. New member registration must be allowed for this to work.")],
-            '$invite_working' => defined('INVITE_WORKING'),
-            '$minimum_age' => ['minimum_age', t("Minimum age"), (x(get_config('system', 'minimum_age')) ? get_config('system', 'minimum_age') : 13), t("Minimum age (in years) for who may register on this site.")],
-            '$access_policy' => ['access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system', 'access_policy'), t("If a public server policy is selected, this information may be displayed on the public server site list."), $access_choices],
-            '$register_text' => ['register_text', t("Register text"), htmlspecialchars(get_config('system', 'register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")],
-            '$tos_required' => [ 'tos_required', t('Require acceptance of Terms of Service'),get_config('system','tos_required'),'', [ t('No'), t('Yes') ] ],
-            '$role' => $role,
-            '$frontpage' => ['frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system', 'frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")],
-            '$mirror_frontpage' => ['mirror_frontpage', t("Preserve site homepage URL"), get_config('system', 'mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')],
-            '$abandon_days' => ['abandon_days', t('Accounts abandoned after x days'), get_config('system', 'account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
-            '$block_public_dir' => ['block_public_directory', t('Block directory from visitors'), get_config('system', 'block_public_directory', true), t('Only allow authenticated access to directory.')],
-            '$verify_email' => ['verify_email', t("Verify Email Addresses"), get_config('system', 'verify_email'), t("Check to verify email addresses used in account registration (recommended).")],
-            '$force_publish' => ['publish_all', t("Force publish in directory"), get_config('system', 'publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")],
-
-            '$public_stream_mode' => ['public_stream_mode', t('Public stream'), intval(get_config('system', 'public_stream_mode', 0)), t('Provide a Public stream on your site. This content is unmoderated.'), [
-                0 => t('the Public stream is disabled'),
-                1 => t('the Public stream contains public conversations from this site only'),
-                2 => t('the Public stream contains public conversations from anywhere on the internet'),
-            ]],
-
-            '$open_pubstream' => ['open_pubstream', t('Allow anybody on the internet to access the Public stream'), get_config('system', 'open_pubstream', 0), t('Default is to only allow viewing by site members. Warning: this content is unmoderated.')],
-            '$show_like_counts' => ['show_like_counts', t('Show numbers of likes and dislikes in conversations'), get_config('system', 'show_like_counts', 1), t('If disabled, the presence of likes and dislikes will be shown, but without totals.')],
-            '$animations' => ['animations', t('Permit animated profile photos'), get_config('system', 'animated_avatars', true), t('Changing this may take several days to work through the system')],
-            '$incl' => ['pub_incl', t('Only import Public stream posts with this text'), get_config('system', 'pubstream_incl'), t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')],
-            '$excl' => ['pub_excl', t('Do not import Public stream posts with this text'), get_config('system', 'pubstream_excl'), t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')],
-            '$max_imported_follow' => ['max_imported_follow', t('Maximum number of imported friends of friends'), get_config('system', 'max_imported_follow', MAX_IMPORTED_FOLLOW), t('Warning: higher numbers will improve the quality of friend suggestions and directory results but can exponentially increase resource usage')],
-            '$login_on_homepage' => ['login_on_homepage', t("Login on Homepage"), ((intval($homelogin) || $homelogin === false) ? 1 : ''), t("Present a login box to visitors on the home page if no other content has been configured.")],
-            '$enable_context_help' => ['enable_context_help', t("Enable context help"), ((intval($enable_context_help) === 1 || $enable_context_help === false) ? 1 : 0), t("Display contextual help for the current page when the help button is pressed.")],
-            '$reply_address' => ['reply_address', t('Reply-to email address for system generated email.'), get_config('system', 'reply_address', 'noreply@' . App::get_hostname()), ''],
-            '$from_email' => ['from_email', t('Sender (From) email address for system generated email.'), get_config('system', 'from_email', 'Administrator@' . App::get_hostname()), ''],
-            '$from_email_name' => ['from_email_name', t('Display name of email sender for system generated email.'), get_config('system', 'from_email_name', System::get_site_name()), ''],
-            '$directory_server' => (($dir_choices) ? ['directory_server', t("Directory Server URL"), get_config('system', 'directory_server'), t("Default directory server"), $dir_choices] : null),
-            '$proxyuser' => ['proxyuser', t("Proxy user"), get_config('system', 'proxyuser'), ""],
-            '$proxy' => ['proxy', t("Proxy URL"), get_config('system', 'proxy'), ""],
-            '$timeout' => ['timeout', t("Network fetch timeout"), (x(get_config('system', 'curl_timeout')) ? get_config('system', 'curl_timeout') : 60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")],
-            '$post_timeout' => ['post_timeout', t("Network post timeout"), (x(get_config('system', 'curl_post_timeout')) ? get_config('system', 'curl_post_timeout') : 90), t("Value is in seconds. Set to 0 for unlimited (not recommended).")],
-            '$delivery_interval' => ['delivery_interval', t("Delivery interval"), (x(get_config('system', 'delivery_interval')) ? get_config('system', 'delivery_interval') : 2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")],
-            '$delivery_batch_count' => ['delivery_batch_count', t('Deliveries per process'), (x(get_config('system', 'delivery_batch_count')) ? get_config('system', 'delivery_batch_count') : 3), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")],
-            '$force_queue' => ['force_queue', t("Queue Threshold"), get_config('system', 'force_queue_threshold', 3000), t("Always defer immediate delivery if queue contains more than this number of entries.")],
-            '$poll_interval' => ['poll_interval', t("Poll interval"), (x(get_config('system', 'poll_interval')) ? get_config('system', 'poll_interval') : 2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")],
-            '$imagick_path' => ['imagick_path', t("Path to ImageMagick convert program"), get_config('system', 'imagick_convert_path'), t("If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert")],
-            '$maxloadavg' => ['maxloadavg', t("Maximum Load Average"), ((intval(get_config('system', 'maxloadavg')) > 0) ? get_config('system', 'maxloadavg') : 50), t("Maximum system load before delivery and poll processes are deferred - default 50.")],
-            '$default_expire_days' => ['default_expire_days', t('Expiration period in days for imported streams and cached images'), intval(get_config('system', 'default_expire_days', 60)), t('0 for no expiration of imported content')],
-            '$active_expire_days' => ['active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system', 'active_expire_days', 7)), ''],
-            '$sellpage' => ['site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system', 'sellpage', ''), sprintf(t('Create this page first. Default is %s/register'), z_root())],
-            '$first_page' => ['first_page', t('Page to display after creating a new channel'), get_config('system', 'workflow_channel_next', 'profiles'), t('Default: profiles')],
-            '$location' => ['site_location', t('Site location'), get_config('system', 'site_location', ''), t('Region or country - shared with other sites')],
-            '$form_security_token' => get_form_security_token("admin_site"),
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Admin/Themes.php b/Zotlabs/Module/Admin/Themes.php
deleted file mode 100644
index 21f1c1356..000000000
--- a/Zotlabs/Module/Admin/Themes.php
+++ /dev/null
@@ -1,243 +0,0 @@
- $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
-            }
-        }
-
-        if (!count($themes)) {
-            notice(t('No themes found.'));
-            return '';
-        }
-
-        /*
-         * Single theme
-         */
-
-        if (App::$argc == 3) {
-            $theme = App::$argv[2];
-            if (!is_dir("view/theme/$theme")) {
-                notice(t("Item not found."));
-                return '';
-            }
-
-            if (x($_GET, "a") && $_GET['a'] == "t") {
-                check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
-
-                // Toggle theme status
-
-                $this->toggle_theme($themes, $theme, $result);
-                $s = $this->rebuild_theme_table($themes);
-                if ($result) {
-                    info(sprintf('Theme %s enabled.', $theme));
-                } else {
-                    info(sprintf('Theme %s disabled.', $theme));
-                }
-
-                set_config('system', 'allowed_themes', $s);
-                goaway(z_root() . '/admin/themes');
-            }
-
-            // display theme details
-
-            if ($this->theme_status($themes, $theme)) {
-                $status = "on";
-                $action = t("Disable");
-            } else {
-                $status = "off";
-                $action = t("Enable");
-            }
-
-            $readme = null;
-            if (is_file("view/theme/$theme/README.md")) {
-                $readme = file_get_contents("view/theme/$theme/README.md");
-                $readme = MarkdownExtra::defaultTransform($readme);
-            } elseif (is_file("view/theme/$theme/README")) {
-                $readme = '
          ' . file_get_contents("view/theme/$theme/README") . '
          ';
-            }
-
-            $admin_form = '';
-            if (is_file("view/theme/$theme/php/config.php")) {
-                require_once("view/theme/$theme/php/config.php");
-                if (function_exists("theme_admin")) {
-                    $admin_form = theme_admin($a);
-                }
-            }
-
-            $screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
-            if (!stristr($screenshot[0], $theme)) {
-                $screenshot = null;
-            }
-
-            $t = Theme::get_template('admin_plugins_details.tpl');
-            return replace_macros($t, array(
-                '$title' => t('Administration'),
-                '$page' => t('Themes'),
-                '$toggle' => t('Toggle'),
-                '$settings' => t('Settings'),
-                '$baseurl' => z_root(),
-
-                '$plugin' => $theme,
-                '$status' => $status,
-                '$action' => $action,
-                '$info' => get_theme_info($theme),
-                '$function' => 'themes',
-                '$admin_form' => $admin_form,
-                '$str_author' => t('Author: '),
-                '$str_maintainer' => t('Maintainer: '),
-                '$screenshot' => $screenshot,
-                '$readme' => $readme,
-
-                '$form_security_token' => get_form_security_token('admin_themes'),
-            ));
-        }
-
-        /*
-         * List themes
-         */
-
-        $xthemes = [];
-        if ($themes) {
-            foreach ($themes as $th) {
-                $xthemes[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
-            }
-        }
-
-        $t = Theme::get_template('admin_plugins.tpl');
-        return replace_macros($t, array(
-            '$title' => t('Administration'),
-            '$page' => t('Themes'),
-            '$submit' => t('Submit'),
-            '$baseurl' => z_root(),
-            '$function' => 'themes',
-            '$plugins' => $xthemes,
-            '$experimental' => t('[Experimental]'),
-            '$unsupported' => t('[Unsupported]'),
-            '$form_security_token' => get_form_security_token('admin_themes'),
-        ));
-    }
-
-
-    /**
-     * @brief Toggle a theme.
-     *
-     * @param array &$themes
-     * @param[in] string $th
-     * @param[out] int &$result
-     */
-    public function toggle_theme(&$themes, $th, &$result)
-    {
-        for ($x = 0; $x < count($themes); $x++) {
-            if ($themes[$x]['name'] === $th) {
-                if ($themes[$x]['allowed']) {
-                    $themes[$x]['allowed'] = 0;
-                    $result = 0;
-                } else {
-                    $themes[$x]['allowed'] = 1;
-                    $result = 1;
-                }
-            }
-        }
-    }
-
-    /**
-     * @param array $themes
-     * @param string $th
-     * @return int
-     */
-    public function theme_status($themes, $th)
-    {
-        for ($x = 0; $x < count($themes); $x++) {
-            if ($themes[$x]['name'] === $th) {
-                if ($themes[$x]['allowed']) {
-                    return 1;
-                } else {
-                    return 0;
-                }
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * @param array $themes
-     * @return string
-     */
-    public function rebuild_theme_table($themes)
-    {
-        $o = '';
-        if (count($themes)) {
-            foreach ($themes as $th) {
-                if ($th['allowed']) {
-                    if (strlen($o)) {
-                        $o .= ',';
-                    }
-                    $o .= $th['name'];
-                }
-            }
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Affinity.php b/Zotlabs/Module/Affinity.php
deleted file mode 100644
index 304406504..000000000
--- a/Zotlabs/Module/Affinity.php
+++ /dev/null
@@ -1,95 +0,0 @@
- 99) {
-                $cmax = 99;
-            }
-            $cmin = intval($_POST['affinity_cmin']);
-            if ($cmin < 0 || $cmin > 99) {
-                $cmin = 0;
-            }
-            set_pconfig(local_channel(), 'affinity', 'cmin', 0);
-            set_pconfig(local_channel(), 'affinity', 'cmax', $cmax);
-
-            info(t('Friend Zoom settings updated.') . EOL);
-        }
-
-        Libsync::build_sync_packet();
-    }
-
-
-    public function get()
-    {
-
-        $desc = t('This app (when installed) presents a slider control in your connection editor and also on your stream page. The slider represents your degree of friendship with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream.');
-
-        $text = '
          ' . $desc . '
          ';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Friend Zoom'))) {
-            return $text;
-        }
-
-        $text .= EOL . t('The number below represents the default maximum slider position for your stream page as a percentage.') . EOL . EOL;
-
-        $setting_fields = $text;
-
-        $cmax = intval(get_pconfig(local_channel(), 'affinity', 'cmax'));
-        $cmax = (($cmax) ? $cmax : 99);
-//      $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), array(
-//          '$field'    => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99'))
-//      ));
-
-        if (Apps::system_app_installed(local_channel(), 'Friend Zoom')) {
-            $labels = array(
-                0 => t('Me'),
-                20 => t('Family'),
-                40 => t('Friends'),
-                60 => t('Peers'),
-                80 => t('Connections'),
-                99 => t('All')
-            );
-            Hook::call('affinity_labels', $labels);
-
-            $tpl = Theme::get_template('affinity.tpl');
-            $x = replace_macros($tpl, [
-                '$cmin' => 0,
-                '$cmax' => $cmax,
-                '$lbl' => t('Default friend zoom in/out'),
-                '$refresh' => t('Refresh'),
-                '$labels' => $labels,
-            ]);
-
-
-            $arr = array('html' => $x);
-            Hook::call('affinity_slider', $arr);
-            $setting_fields .= $arr['html'];
-        }
-
-        $s .= replace_macros(Theme::get_template('generic_app_settings.tpl'), array(
-            '$addon' => array('affinity', '' . t('Friend Zoom Settings'), '', t('Submit')),
-            '$content' => $setting_fields
-        ));
-
-        return $s;
-    }
-}
diff --git a/Zotlabs/Module/Album.php b/Zotlabs/Module/Album.php
deleted file mode 100644
index 1b22ff49c..000000000
--- a/Zotlabs/Module/Album.php
+++ /dev/null
@@ -1,104 +0,0 @@
- 1) {
-                $channel = Channel::from_username(argv(1));
-            }
-            if (!$channel) {
-                http_status_exit(404, 'Not found.');
-            }
-
-            $sql_extra = permissions_sql($channel['channel_id'], $observer_xchan);
-
-            if (argc() > 2) {
-                $folder = argv(2);
-                $r = q(
-                    "select * from attach where is_dir = 1 and hash = '%s' and uid = %d $sql_extra limit 1",
-                    dbesc($folder),
-                    intval($channel['channel_id'])
-                );
-                $allowed = (($r) ? attach_can_view($channel['channel_id'], $observer_xchan, $r[0]['hash'], $bear) : false);
-            } else {
-                $folder = EMPTY_STR;
-                $allowed = perm_is_allowed($channel['channel_id'], $observer_xchan, 'view_storage');
-            }
-
-            if (!$allowed) {
-                http_status_exit(403, 'Permission denied.');
-            }
-
-            $x = q(
-                "select * from attach where folder = '%s' and uid = %d $sql_extra",
-                dbesc($folder),
-                intval($channel['channel_id'])
-            );
-
-            $contents = [];
-
-            if ($x) {
-                foreach ($x as $xv) {
-                    if (intval($xv['is_dir'])) {
-                        continue;
-                    }
-                    if (!attach_can_view($channel['channel_id'], $observer_xchan, $xv['hash'], $bear)) {
-                        continue;
-                    }
-                    if (intval($xv['is_photo'])) {
-                        $contents[] = z_root() . '/photo/' . $xv['hash'];
-                    }
-                }
-            }
-
-            $obj = Activity::encode_simple_collection($contents, App::$query_string, 'OrderedCollection', count($contents));
-            as_return_and_die($obj, $channel);
-        }
-    }
-}
diff --git a/Zotlabs/Module/Ap_probe.php b/Zotlabs/Module/Ap_probe.php
deleted file mode 100644
index 9166fae1c..000000000
--- a/Zotlabs/Module/Ap_probe.php
+++ /dev/null
@@ -1,49 +0,0 @@
- t('ActivityPub Probe Diagnostic'),
-            '$resource' => ['resource', t('Object URL'), $_REQUEST['resource'], EMPTY_STR],
-            '$authf' => ['authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [t('No'), t('Yes')]],
-            '$submit' => t('Submit')
-        ]);
-
-        if (x($_REQUEST, 'resource')) {
-            $resource = $_REQUEST['resource'];
-            if ($_REQUEST['authf']) {
-                $channel = App::get_channel();
-                if (!$channel) {
-                    $channel = Channel::get_system();
-                }
-            }
-
-            $x = Activity::fetch($resource, $channel, null, true);
-
-            if ($x) {
-                $o .= '
          ' . str_replace('\\n', "\n", htmlspecialchars(json_encode($x, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT))) . '
          ';
-                $o .= '
          ' . str_replace('\\n', "\n", htmlspecialchars(Yaml::encode($x))) . '
          ';
-            }
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Api.php b/Zotlabs/Module/Api.php
deleted file mode 100644
index b3a7ef7a4..000000000
--- a/Zotlabs/Module/Api.php
+++ /dev/null
@@ -1,142 +0,0 @@
-"; var_dump($e);
-                killme();
-            }
-
-
-            if (x($_POST, 'oauth_yes')) {
-                $app = $this->oauth_get_client($request);
-                if (is_null($app)) {
-                    return "Invalid request. Unknown token.";
-                }
-
-                $consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']);
-
-                $verifier = md5($app['secret'] . local_channel());
-                set_config('oauth', $verifier, local_channel());
-
-
-                if ($consumer->callback_url != null) {
-                    $params = $request->get_parameters();
-                    $glue = '?';
-                    if (strstr($consumer->callback_url, $glue)) {
-                        $glue = '?';
-                    }
-                    goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier));
-                    killme();
-                }
-
-                $tpl = Theme::get_template("oauth_authorize_done.tpl");
-                $o = replace_macros($tpl, array(
-                    '$title' => t('Authorize application connection'),
-                    '$info' => t('Return to your app and insert this Security Code:'),
-                    '$code' => $verifier,
-                ));
-
-                return $o;
-            }
-
-
-            if (!local_channel()) {
-                // TODO: we need login form to redirect to this page
-                notice(t('Please login to continue.') . EOL);
-                return login(false, 'api-login', $request->get_parameters());
-            }
-
-            $app = $this->oauth_get_client($request);
-            if (is_null($app)) {
-                return "Invalid request. Unknown token.";
-            }
-
-            $tpl = Theme::get_template('oauth_authorize.tpl');
-            $o = replace_macros($tpl, array(
-                '$title' => t('Authorize application connection'),
-                '$app' => $app,
-                '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
-                '$yes' => t('Yes'),
-                '$no' => t('No'),
-            ));
-
-            // echo "
          "; var_dump($app); killme();
-
-            return $o;
-        }
-
-        echo api_call();
-        killme();
-    }
-
-    public function oauth_get_client($request)
-    {
-
-        $params = $request->get_parameters();
-        $token = $params['oauth_token'];
-
-        $r = q(
-            "SELECT clients.* FROM clients, tokens WHERE clients.client_id = tokens.client_id 
-			AND tokens.id = '%s' AND tokens.auth_scope = 'request' ",
-            dbesc($token)
-        );
-        if ($r) {
-            return $r[0];
-        }
-
-        return null;
-    }
-}
diff --git a/Zotlabs/Module/Appman.php b/Zotlabs/Module/Appman.php
deleted file mode 100644
index 5b28763c0..000000000
--- a/Zotlabs/Module/Appman.php
+++ /dev/null
@@ -1,166 +0,0 @@
- intval($_REQUEST['uid']),
-                'url' => escape_tags($_REQUEST['url']),
-                'guid' => escape_tags($_REQUEST['guid']),
-                'author' => escape_tags($_REQUEST['author']),
-                'addr' => escape_tags($_REQUEST['addr']),
-                'name' => escape_tags($_REQUEST['name']),
-                'desc' => escape_tags($_REQUEST['desc']),
-                'photo' => escape_tags($_REQUEST['photo']),
-                'version' => escape_tags($_REQUEST['version']),
-                'price' => escape_tags($_REQUEST['price']),
-                'page' => escape_tags($_REQUEST['sellpage']), // do not use 'page' as a request variable here as it conflicts with pagination
-                'requires' => escape_tags($_REQUEST['requires']),
-                'system' => intval($_REQUEST['system']),
-                'plugin' => escape_tags($_REQUEST['plugin']),
-                'sig' => escape_tags($_REQUEST['sig']),
-                'categories' => escape_tags($_REQUEST['categories'])
-            ];
-
-            $_REQUEST['appid'] = Apps::app_install($channel_id, $arr);
-
-            if (Apps::app_installed($channel_id, $arr)) {
-                info(t('App installed.') . EOL);
-            }
-
-            goaway(z_root() . '/apps');
-        }
-
-
-        $papp = Apps::app_decode($_POST['papp']);
-
-        if (!is_array($papp)) {
-            notice(t('Malformed app.') . EOL);
-            return;
-        }
-
-        if ($_POST['install']) {
-            Apps::app_install($channel_id, $papp);
-            if (Apps::app_installed($channel_id, $papp)) {
-                info(t('App installed.') . EOL);
-            }
-        }
-
-        if ($_POST['delete']) {
-            Apps::app_destroy($channel_id, $papp);
-        }
-
-        if ($_POST['edit']) {
-            return;
-        }
-
-        if ($_POST['feature']) {
-            Apps::app_feature($channel_id, $papp, $_POST['feature']);
-        }
-
-        if ($_POST['pin']) {
-            Apps::app_feature($channel_id, $papp, $_POST['pin']);
-        }
-
-        if ($_SESSION['return_url']) {
-            goaway(z_root() . '/' . $_SESSION['return_url']);
-        }
-
-        goaway(z_root() . '/apps');
-    }
-
-
-    public function get()
-    {
-
-		$channel_id = local_channel();
-		
-        if (!$channel_id) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-		if (Channel::is_system($channel_id)) {
-			$channel_id = 0;
-		}
-		
-        $channel = App::get_channel();
-
-        if (argc() > 3) {
-            if (argv(2) === 'moveup') {
-                Apps::moveup($channel_id, argv(1), argv(3));
-            }
-            if (argv(2) === 'movedown') {
-                Apps::movedown($channel_id, argv(1), argv(3));
-            }
-            goaway(z_root() . '/apporder');
-        }
-
-        $app = null;
-        $embed = null;
-        if ($_REQUEST['appid']) {
-            $r = q(
-                "select * from app where app_id = '%s' and app_channel = %d limit 1",
-                dbesc($_REQUEST['appid']),
-                dbesc($channel_id)
-            );
-            if ($r) {
-                $app = $r[0];
-
-                $term = q(
-                    "select * from term where otype = %d and oid = %d and uid = %d",
-                    intval(TERM_OBJ_APP),
-                    intval($r[0]['id']),
-                    intval($channel_id)
-                );
-                if ($term) {
-                    $app['categories'] = array_elm_to_str($term, 'term');
-                }
-            }
-
-            $embed = ['embed', t('Embed code'), Apps::app_encode($app, true), EMPTY_STR, 'onclick="this.select();"'];
-        }
-
-        return replace_macros(Theme::get_template('app_create.tpl'), [
-            '$banner' => (($app) ? t('Edit App') : t('Create App')),
-            '$app' => $app,
-            '$guid' => (($app) ? $app['app_id'] : EMPTY_STR),
-            '$author' => (($app) ? $app['app_author'] : $channel['channel_hash']),
-            '$addr' => (($app) ? $app['app_addr'] : $channel['xchan_addr']),
-            '$name' => ['name', t('Name of app'), (($app) ? $app['app_name'] : EMPTY_STR), t('Required')],
-            '$url' => ['url', t('Location (URL) of app'), (($app) ? $app['app_url'] : EMPTY_STR), t('Required')],
-            '$desc' => ['desc', t('Description'), (($app) ? $app['app_desc'] : EMPTY_STR), EMPTY_STR],
-            '$photo' => ['photo', t('Photo icon URL'), (($app) ? $app['app_photo'] : EMPTY_STR), t('80 x 80 pixels - optional')],
-            '$categories' => ['categories', t('Categories (optional, comma separated list)'), (($app) ? $app['categories'] : EMPTY_STR), EMPTY_STR],
-            '$version' => ['version', t('Version ID'), (($app) ? $app['app_version'] : EMPTY_STR), EMPTY_STR],
-            '$price' => ['price', t('Price of app'), (($app) ? $app['app_price'] : EMPTY_STR), EMPTY_STR],
-            '$page' => ['sellpage', t('Location (URL) to purchase app'), (($app) ? $app['app_page'] : EMPTY_STR), EMPTY_STR],
-            '$system' => (($app) ? intval($app['app_system']) : 0),
-            '$plugin' => (($app) ? $app['app_plugin'] : EMPTY_STR),
-            '$requires' => (($app) ? $app['app_requires'] : EMPTY_STR),
-            '$embed' => $embed,
-            '$submit' => t('Submit')
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Apporder.php b/Zotlabs/Module/Apporder.php
deleted file mode 100644
index f50594807..000000000
--- a/Zotlabs/Module/Apporder.php
+++ /dev/null
@@ -1,57 +0,0 @@
- t('Arrange Apps'),
-            '$header' => [t('Change order of pinned navbar apps'), t('Change order of app tray apps')],
-            '$desc' => [t('Use arrows to move the corresponding app left (top) or right (bottom) in the navbar'),
-                t('Use arrows to move the corresponding app up or down in the app tray')],
-            '$nav_apps' => $nav_apps,
-            '$navbar_apps' => $navbar_apps
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php
deleted file mode 100644
index 438ea863b..000000000
--- a/Zotlabs/Module/Apps.php
+++ /dev/null
@@ -1,66 +0,0 @@
- get_config('system', 'sitename'),
-            '$cat' => $cat,
-            '$title' => (($available) ? t('Available Apps') : t('Installed Apps')),
-            '$apps' => $apps,
-            '$authed' => ((local_channel()) ? true : false),
-            '$manage' => (($available) ? EMPTY_STR : t('Manage apps')),
-            '$create' => (($mode == 'edit') ? t('Create Custom App') : '')
-        ));
-    }
-}
diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php
deleted file mode 100644
index 9b5c68e0b..000000000
--- a/Zotlabs/Module/Apschema.php
+++ /dev/null
@@ -1,22 +0,0 @@
- array_merge(['as' => 'https://www.w3.org/ns/activitystreams#'], Activity::ap_schema())
-        ];
-
-        header('Content-Type: application/ld+json');
-        echo json_encode($arr, JSON_UNESCAPED_SLASHES);
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Attach.php b/Zotlabs/Module/Attach.php
deleted file mode 100644
index 4c45b2bee..000000000
--- a/Zotlabs/Module/Attach.php
+++ /dev/null
@@ -1,58 +0,0 @@
- 2) ? intval(argv(2)) : 0));
-
-        if (!$r['success']) {
-            notice($r['message'] . EOL);
-            return;
-        }
-
-        $c = q(
-            "select channel_address from channel where channel_id = %d limit 1",
-            intval($r['data']['uid'])
-        );
-
-        if (!$c) {
-            return;
-        }
-
-        header('Content-type: ' . $r['data']['filetype']);
-        header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"');
-        if (intval($r['data']['os_storage'])) {
-            $fname = dbunescbin($r['data']['content']);
-            if (strpos($fname, 'store') !== false) {
-                $istream = fopen($fname, 'rb');
-            } else {
-                $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname, 'rb');
-            }
-            $ostream = fopen('php://output', 'wb');
-            if ($istream && $ostream) {
-                pipe_streams($istream, $ostream);
-                fclose($istream);
-                fclose($ostream);
-            }
-        } else {
-            echo dbunescbin($r['data']['content']);
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Authorize.php b/Zotlabs/Module/Authorize.php
deleted file mode 100644
index 1b8ff2a94..000000000
--- a/Zotlabs/Module/Authorize.php
+++ /dev/null
@@ -1,145 +0,0 @@
- $name,
-                'icon' => (x($_REQUEST, 'logo_uri') ? $_REQUEST['logo_uri'] : z_root() . '/images/icons/plugin.png'),
-                'url' => (x($_REQUEST, 'client_uri') ? $_REQUEST['client_uri'] : ''),
-            ];
-
-            $link = (($app['url']) ? '' . $app['name'] . ' ' : $app['name']);
-
-            $o .= replace_macros(Theme::get_template('oauth_authorize.tpl'), [
-                '$title' => t('Authorize'),
-                '$authorize' => sprintf(t('Do you authorize the app %s to access your channel data?'), $link),
-                '$app' => $app,
-                '$yes' => t('Allow'),
-                '$no' => t('Deny'),
-                '$client_id' => (x($_REQUEST, 'client_id') ? $_REQUEST['client_id'] : ''),
-                '$redirect_uri' => (x($_REQUEST, 'redirect_uri') ? $_REQUEST['redirect_uri'] : ''),
-                '$state' => (x($_REQUEST, 'state') ? $_REQUEST['state'] : ''),
-            ]);
-            return $o;
-        }
-    }
-
-    public function post()
-    {
-        if (!local_channel()) {
-            return;
-        }
-
-        $storage = new OAuth2Storage(DBA::$dba->db);
-        $s = new OAuth2Server($storage);
-
-        // TODO: The automatic client registration protocol below should adhere more
-        // closely to "OAuth 2.0 Dynamic Client Registration Protocol" defined
-        // at https://tools.ietf.org/html/rfc7591
-
-        // If no client_id was provided, generate a new one.
-        if (x($_POST, 'client_name')) {
-            $client_name = $_POST['client_name'];
-        } else {
-            $client_name = $_POST['client_name'] = EMPTY_STR;
-        }
-
-        // If no client_id was provided, generate a new one.
-        if (x($_POST, 'client_id')) {
-            $client_id = $_POST['client_id'];
-        } else {
-            $client_id = $_POST['client_id'] = random_string(16);
-        }
-
-        // If no redirect_uri was provided, generate a fake one.
-        if (x($_POST, 'redirect_uri')) {
-            $redirect_uri = $_POST['redirect_uri'];
-        } else {
-            $redirect_uri = $_POST['redirect_uri'] = 'https://fake.example.com/oauth';
-        }
-
-        $request = Request::createFromGlobals();
-        $response = new Response();
-
-        // Note, "sub" field must match type and content. $user_id is used to populate - make sure it's a string.
-        $channel = Channel::from_id(local_channel());
-        $user_id = $channel['channel_id'];
-
-        $client_found = false;
-        $client = $storage->getClientDetails($client_id);
-
-        logger('client: ' . print_r($client, true), LOGGER_DATA);
-
-        if ($client) {
-            if (intval($client['user_id']) === 0 || intval($client['user_id']) === intval($user_id)) {
-                $client_found = true;
-                $client_name = $client['client_name'];
-                $client_secret = $client['client_secret'];
-                // Until "Dynamic Client Registration" is fully tested - allow new clients to assign their own secret in the REQUEST
-                if (!$client_secret) {
-                    $client_secret = ((isset($_REQUEST['client_secret'])) ? $_REQUEST['client_secret'] : random_string(16));
-                }
-                $grant_types = $client['grant_types'];
-                // Client apps are registered per channel
-
-
-                logger('client_id: ' . $client_id);
-                logger('client_secret: ' . $client_secret);
-                logger('redirect_uri: ' . $redirect_uri);
-                logger('grant_types: ' . $_REQUEST['grant_types']);
-                logger('scope: ' . $_REQUEST['scope']);
-                logger('user_id: ' . $user_id);
-                logger('client_name: ' . $client_name);
-
-                $storage->setClientDetails($client_id, $client_secret, $redirect_uri, $grant_types, $_REQUEST['scope'], $user_id, $client_name);
-            }
-        }
-        if (!$client_found) {
-            $response->send();
-            killme();
-        }
-
-        $response->setParameter('client_secret', $client['client_secret']);
-
-        // validate the authorize request
-        if (!$s->validateAuthorizeRequest($request, $response)) {
-            $response->send();
-            killme();
-        }
-
-        // print the authorization code if the user has authorized your client
-        $is_authorized = ($_POST['authorize'] === 'allow');
-        $s->handleAuthorizeRequest($request, $response, $is_authorized, $user_id);
-        if ($is_authorized) {
-            $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40);
-            logger('Authorization Code: ' . $code);
-        }
-
-        $response->send();
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Block.php b/Zotlabs/Module/Block.php
deleted file mode 100644
index 4b16d03bd..000000000
--- a/Zotlabs/Module/Block.php
+++ /dev/null
@@ -1,97 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-
-    public function get()
-    {
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $which = argv(1);
-
-        $_SESSION['return_url'] = App::$query_string;
-
-        $uid = local_channel();
-        $owner = 0;
-        $channel = null;
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                $uid = $owner = intval($sys['channel_id']);
-                $channel = $sys;
-                $observer = $sys;
-            }
-        }
-
-        if (!$owner) {
-            // Figure out who the page owner is.
-            $r = q(
-                "select channel_id from channel where channel_address = '%s'",
-                dbesc($which)
-            );
-            if ($r) {
-                $owner = intval($r[0]['channel_id']);
-            }
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        // Block design features from visitors
-
-        if ((!$uid) || ($uid != $owner)) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner, 'system', 'page_mimetype'));
-
-        $x = array(
-            'webpage' => ITEM_TYPE_BLOCK,
-            'is_owner' => true,
-            'nickname' => App::$profile['channel_address'],
-            'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-            'bang' => '',
-            'showacl' => false,
-            'visitor' => true,
-            'mimetype' => $mimetype,
-            'mimeselect' => true,
-            'hide_location' => true,
-            'ptlabel' => t('Block Name'),
-            'profile_uid' => intval($owner),
-            'expanded' => true,
-            'novoting' => true,
-            'bbco_autocomplete' => 'bbcode',
-            'bbcode' => true
-        );
-
-        if ($_REQUEST['title']) {
-            $x['title'] = $_REQUEST['title'];
-        }
-        if ($_REQUEST['body']) {
-            $x['body'] = $_REQUEST['body'];
-        }
-        if ($_REQUEST['pagetitle']) {
-            $x['pagetitle'] = $_REQUEST['pagetitle'];
-        }
-
-        $editor = status_editor($x);
-
-
-        $r = q(
-            "select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig 
-			left join item on iconfig.iid = item.id
-			where uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' 
-			and item_type = %d order by item.created desc",
-            intval($owner),
-            intval(ITEM_TYPE_BLOCK)
-        );
-
-        $pages = null;
-
-        if ($r) {
-            $pages = [];
-            foreach ($r as $rr) {
-                $element_arr = array(
-                    'type' => 'block',
-                    'title' => $rr['title'],
-                    'body' => $rr['body'],
-                    'created' => $rr['created'],
-                    'edited' => $rr['edited'],
-                    'mimetype' => $rr['mimetype'],
-                    'pagetitle' => $rr['v'],
-                    'mid' => $rr['mid']
-                );
-                $pages[$rr['iid']][] = array(
-                    'url' => $rr['iid'],
-                    'name' => $rr['v'],
-                    'title' => $rr['title'],
-                    'created' => $rr['created'],
-                    'edited' => $rr['edited'],
-                    'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
-                );
-            }
-        }
-
-        //Build the base URL for edit links
-        $url = z_root() . '/editblock/' . $which;
-
-        $o .= replace_macros(Theme::get_template('blocklist.tpl'), array(
-            '$baseurl' => $url,
-            '$title' => t('Blocks'),
-            '$name' => t('Block Name'),
-            '$blocktitle' => t('Block Title'),
-            '$created' => t('Created'),
-            '$edited' => t('Edited'),
-            '$create' => t('Create'),
-            '$edit' => t('Edit'),
-            '$share' => t('Share'),
-            '$delete' => t('Delete'),
-            '$editor' => $editor,
-            '$pages' => $pages,
-            '$channel' => $which,
-            '$view' => t('View'),
-            '$preview' => '1',
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Ca.php b/Zotlabs/Module/Ca.php
deleted file mode 100644
index 96caace69..000000000
--- a/Zotlabs/Module/Ca.php
+++ /dev/null
@@ -1,66 +0,0 @@
- 1) {
-            $path = 'cache/img/' . substr(argv(1), 0, 2) . '/' . argv(1);
-
-            if (file_exists($path) && filesize($path)) {
-                $x = @getimagesize($path);
-                if ($x) {
-                    header('Content-Type: ' . $x['mime']);
-                }
-
-                $cache = intval(get_config('system', 'photo_cache_time'));
-                if (!$cache) {
-                    $cache = (3600 * 24); // 1 day
-                }
-                header(
-                    'Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache)
-                    . ' GMT'
-                );
-                // Set browser cache age as $cache.  But set timeout of
-                // 'shared caches' much lower in the event that infrastructure
-                // caching is present.
-                $smaxage = intval($cache / 12);
-                header(
-                    'Cache-Control: s-maxage=' . $smaxage
-                    . '; max-age=' . $cache . ';'
-                );
-
-                $infile = fopen($path, 'rb');
-                $outfile = fopen('php://output', 'wb');
-                if ($infile && $outfile) {
-                    pipe_streams($infile, $outfile);
-                }
-                fclose($infile);
-                fclose($outfile);
-                killme();
-            }
-
-            if ($_GET['url']) {
-                goaway($url);
-            }
-        }
-        http_status_exit(404, 'Not found');
-    }
-}
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
deleted file mode 100644
index 903fc5274..000000000
--- a/Zotlabs/Module/Cal.php
+++ /dev/null
@@ -1,379 +0,0 @@
- 1) {
-            $nick = argv(1);
-
-            Libprofile::load($nick);
-
-            $channelx = Channel::from_username($nick);
-
-            if (!$channelx) {
-                return;
-            }
-
-            App::$data['channel'] = $channelx;
-
-            $observer = App::get_observer();
-            App::$data['observer'] = $observer;
-
-            $observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
-
-            head_set_icon(App::$data['channel']['xchan_photo_s']);
-
-            App::$page['htmlhead'] .= "";
-        }
-
-        return;
-    }
-
-
-    public function get()
-    {
-
-        if (observer_prohibited()) {
-            return;
-        }
-
-        $channel = null;
-
-        if (argc() > 1) {
-            $channel = Channel::from_username(argv(1));
-        }
-
-
-        if (!$channel) {
-            notice(t('Channel not found.') . EOL);
-            return;
-        }
-
-        // since we don't currently have an event permission - use the stream permission
-
-        if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_stream')) {
-            notice(t('Permissions denied.') . EOL);
-            return;
-        }
-
-        Navbar::set_selected('Calendar');
-
-        $sql_extra = permissions_sql($channel['channel_id'], get_observer_hash(), 'event');
-
-        $first_day = intval(get_pconfig($channel['channel_id'], 'system', 'cal_first_day', 0));
-
-        $htpl = Theme::get_template('event_head.tpl');
-        App::$page['htmlhead'] .= replace_macros($htpl, array(
-            '$baseurl' => z_root(),
-            '$module_url' => '/cal/' . $channel['channel_address'],
-            '$modparams' => 2,
-            '$lang' => App::$language,
-            '$first_day' => $first_day
-        ));
-
-        $o = '';
-
-        $mode = 'view';
-        $y = 0;
-        $m = 0;
-        $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
-
-        // logger('args: ' . print_r(\App::$argv,true));
-
-        if (argc() > 3 && intval(argv(2)) && intval(argv(3))) {
-            $mode = 'view';
-            $y = intval(argv(2));
-            $m = intval(argv(3));
-        }
-        if (argc() <= 3) {
-            $mode = 'view';
-            $event_id = argv(2);
-        }
-
-        if ($mode == 'view') {
-            /* edit/create form */
-            if ($event_id) {
-                $r = q(
-                    "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                    dbesc($event_id),
-                    intval($channel['channel_id'])
-                );
-                if (count($r)) {
-                    $orig_event = $r[0];
-                }
-            }
-
-
-            // Passed parameters overrides anything found in the DB
-            if (!x($orig_event)) {
-                $orig_event = [];
-            }
-
-
-            $tz = date_default_timezone_get();
-            if (x($orig_event)) {
-                $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
-            }
-
-            $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
-            $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
-            $sday = datetime_convert('UTC', $tz, $sdt, 'd');
-            $shour = datetime_convert('UTC', $tz, $sdt, 'H');
-            $sminute = datetime_convert('UTC', $tz, $sdt, 'i');
-
-            $stext = datetime_convert('UTC', $tz, $sdt);
-            $stext = substr($stext, 0, 14) . "00:00";
-
-            $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
-            $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
-            $fday = datetime_convert('UTC', $tz, $fdt, 'd');
-            $fhour = datetime_convert('UTC', $tz, $fdt, 'H');
-            $fminute = datetime_convert('UTC', $tz, $fdt, 'i');
-
-            $ftext = datetime_convert('UTC', $tz, $fdt);
-            $ftext = substr($ftext, 0, 14) . "00:00";
-
-            $type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
-
-            $f = get_config('system', 'event_input_format');
-            if (!$f) {
-                $f = 'ymd';
-            }
-
-            $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
-
-
-            $show_bd = perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts');
-            if (!$show_bd) {
-                $sql_extra .= " and event.etype != 'birthday' ";
-            }
-
-
-            $category = '';
-
-            $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
-            $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
-            if (!$y) {
-                $y = intval($thisyear);
-            }
-            if (!$m) {
-                $m = intval($thismonth);
-            }
-
-            // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
-            // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
-
-            if ($y < 1901) {
-                $y = 1900;
-            }
-            if ($y > 2099) {
-                $y = 2100;
-            }
-
-            $nextyear = $y;
-            $nextmonth = $m + 1;
-            if ($nextmonth > 12) {
-                $nextmonth = 1;
-                $nextyear++;
-            }
-
-            $prevyear = $y;
-            if ($m > 1) {
-                $prevmonth = $m - 1;
-            } else {
-                $prevmonth = 12;
-                $prevyear--;
-            }
-
-            $dim = get_dim($y, $m);
-            $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
-            $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
-
-
-            if (argv(2) === 'json') {
-                if (x($_GET, 'start')) {
-                    $start = $_GET['start'];
-                }
-                if (x($_GET, 'end')) {
-                    $finish = $_GET['end'];
-                }
-            }
-
-            $start = datetime_convert('UTC', 'UTC', $start);
-            $finish = datetime_convert('UTC', 'UTC', $finish);
-
-            $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-            $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-
-
-            if (!perm_is_allowed(App::$profile['uid'], get_observer_hash(), 'view_contacts')) {
-                $sql_extra .= " and etype != 'birthday' ";
-            }
-
-            if (x($_GET, 'id')) {
-                $r = q(
-                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1",
-                    intval($channel['channel_id']),
-                    intval($_GET['id'])
-                );
-            } else {
-                // fixed an issue with "nofinish" events not showing up in the calendar.
-                // There's still an issue if the finish date crosses the end of month.
-                // Noting this for now - it will need to be fixed here and in Friendica.
-                // Ultimately the finish date shouldn't be involved in the query.
-
-                $r = q(
-                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                              from event left join item on event_hash = resource_id 
-					where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
-					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
-					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) $sql_extra ",
-                    intval($channel['channel_id']),
-                    dbesc($start),
-                    dbesc($finish),
-                    dbesc($adjust_start),
-                    dbesc($adjust_finish)
-                );
-            }
-
-            $links = [];
-
-            if ($r) {
-                xchan_query($r);
-                $r = fetch_post_tags($r, true);
-
-                $r = sort_by_date($r);
-            }
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
-                    if (!x($links, $j)) {
-                        $links[$j] = z_root() . '/' . App::$cmd . '#link-' . $j;
-                    }
-                }
-            }
-
-            $events = [];
-
-            $last_date = '';
-            $fmt = t('l, F j');
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
-                    $d = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], $fmt) : datetime_convert('UTC', 'UTC', $rr['dtstart'], $fmt));
-                    $d = day_translate($d);
-
-                    $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
-                    if ($rr['nofinish']) {
-                        $end = null;
-                    } else {
-                        $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
-                    }
-
-
-                    $is_first = ($d !== $last_date);
-
-                    $last_date = $d;
-
-                    $edit = false;
-
-                    $drop = false;
-
-                    $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
-                    if (!$title) {
-                        list($title, $_trash) = explode(" $rr['id'],
-                        'hash' => $rr['event_hash'],
-                        'start' => $start,
-                        'end' => $end,
-                        'drop' => $drop,
-                        'allDay' => false,
-                        'title' => $title,
-
-                        'j' => $j,
-                        'd' => $d,
-                        'edit' => $edit,
-                        'is_first' => $is_first,
-                        'item' => $rr,
-                        'html' => $html,
-                        'plink' => array($rr['plink'], t('Link to Source'), '', ''),
-                    );
-                }
-            }
-
-            if (argv(2) === 'json') {
-                echo json_encode($events);
-                killme();
-            }
-
-            // links: array('href', 'text', 'extra css classes', 'title')
-            if (x($_GET, 'id')) {
-                $tpl = Theme::get_template("event_cal.tpl");
-            } else {
-                $tpl = Theme::get_template("events_cal-js.tpl");
-            }
-
-            $nick = $channel['channel_address'];
-
-            $o = replace_macros($tpl, array(
-                '$baseurl' => z_root(),
-                '$new_event' => array(z_root() . '/cal', (($event_id) ? t('Edit Event') : t('Create Event')), '', ''),
-                '$previus' => array(z_root() . "/cal/$nick/$prevyear/$prevmonth", t('Previous'), '', ''),
-                '$next' => array(z_root() . "/cal/$nick/$nextyear/$nextmonth", t('Next'), '', ''),
-                '$export' => array(z_root() . "/cal/$nick/$y/$m/export", t('Export'), '', ''),
-                '$calendar' => cal($y, $m, $links, ' eventcal'),
-                '$events' => $events,
-                '$upload' => t('Import'),
-                '$submit' => t('Submit'),
-                '$prev' => t('Previous'),
-                '$next' => t('Next'),
-                '$today' => t('Today'),
-                '$form' => $form,
-                '$expandform' => ((x($_GET, 'expandform')) ? true : false)
-            ));
-
-            if (x($_GET, 'id')) {
-                echo $o;
-                killme();
-            }
-
-            return $o;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Calendar.php b/Zotlabs/Module/Calendar.php
deleted file mode 100644
index 5794d0bbf..000000000
--- a/Zotlabs/Module/Calendar.php
+++ /dev/null
@@ -1,494 +0,0 @@
-set($x[0]);
-
-            $created = $x[0]['created'];
-            $edited = datetime_convert();
-        } else {
-            $created = $edited = datetime_convert();
-            $acl->set_from_array($_POST);
-        }
-
-        $post_tags = [];
-        $ac = $acl->get();
-
-        $str_contact_allow = $ac['allow_cid'];
-        $str_group_allow = $ac['allow_gid'];
-        $str_contact_deny = $ac['deny_cid'];
-        $str_group_deny = $ac['deny_gid'];
-
-        $private = $acl->is_private();
-
-        $results = linkify_tags($desc, local_channel());
-
-        if ($results) {
-            // Set permissions based on tag replacements
-
-            set_linkified_perms($results, $str_contact_allow, $str_group_allow, local_channel(), false, $private);
-
-            foreach ($results as $result) {
-                $success = $result['success'];
-                if ($success['replaced']) {
-                    $post_tags[] = [
-                        'uid' => local_channel(),
-                        'ttype' => $success['termtype'],
-                        'otype' => TERM_OBJ_POST,
-                        'term' => $success['term'],
-                        'url' => $success['url']
-                    ];
-                }
-            }
-        }
-
-
-        if (strlen($categories)) {
-            $cats = explode(',', $categories);
-            foreach ($cats as $cat) {
-                $post_tags[] = array(
-                    'uid' => local_channel(),
-                    'ttype' => TERM_CATEGORY,
-                    'otype' => TERM_OBJ_POST,
-                    'term' => trim($cat),
-                    'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat))
-                );
-            }
-        }
-
-        $datarray = [
-            'dtstart' => $start,
-            'dtend' => $finish,
-            'summary' => $summary,
-            'description' => $desc,
-            'location' => $location,
-            'etype' => $type,
-            'adjust' => $adjust,
-            'nofinish' => $nofinish,
-            'uid' => local_channel(),
-            'account' => get_account_id(),
-            'event_xchan' => $channel['channel_hash'],
-            'allow_cid' => $str_contact_allow,
-            'allow_gid' => $str_group_allow,
-            'deny_cid' => $str_contact_deny,
-            'deny_gid' => $str_group_deny,
-            'private' => intval($private),
-            'id' => $event_id,
-            'created' => $created,
-            'edited' => $edited
-        ];
-
-        if (intval($_REQUEST['preview'])) {
-            $html = format_event_html($datarray);
-            echo $html;
-            killme();
-        }
-
-        $event = event_store_event($datarray);
-
-        if ($post_tags) {
-            $datarray['term'] = $post_tags;
-        }
-
-        $item_id = event_store_item($datarray, $event);
-
-        if ($item_id) {
-            $r = q(
-                "select * from item where id = %d",
-                intval($item_id)
-            );
-            if ($r) {
-                xchan_query($r);
-                $sync_item = fetch_post_tags($r);
-                $z = q(
-                    "select * from event where event_hash = '%s' and uid = %d limit 1",
-                    dbesc($r[0]['resource_id']),
-                    intval($channel['channel_id'])
-                );
-                if ($z) {
-                    Libsync::build_sync_packet($channel['channel_id'], ['event_item' => [encode_item($sync_item[0], true)], 'event' => $z]);
-                }
-            }
-        }
-
-        Run::Summon(['Notifier', 'event', $item_id]);
-        killme();
-    }
-
-
-    public function get()
-    {
-
-        if (argc() > 2 && argv(1) == 'ical') {
-            $event_id = argv(2);
-
-            $sql_extra = permissions_sql(local_channel());
-
-            $r = q(
-                "select * from event where event_hash = '%s' $sql_extra limit 1",
-                dbesc($event_id)
-            );
-            if ($r) {
-                header('Content-type: text/calendar');
-                header('Content-Disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"');
-                echo ical_wrapper($r);
-                killme();
-            } else {
-                notice(t('Event not found.') . EOL);
-                return;
-            }
-        }
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if ((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
-            $r = q(
-                "update event set dismissed = 1 where id = %d and uid = %d",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-        }
-
-        if ((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
-            $r = q(
-                "update event set dismissed = 0 where id = %d and uid = %d",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-        }
-
-        $channel = App::get_channel();
-
-        $mode = 'view';
-        $export = false;
-
-        $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
-
-        if (argc() > 1) {
-            if (argc() > 2 && argv(1) === 'add') {
-                $mode = 'add';
-                $item_id = intval(argv(2));
-            }
-            if (argc() > 2 && argv(1) === 'drop') {
-                $mode = 'drop';
-                $event_id = argv(2);
-            }
-            if (argc() <= 2 && argv(1) === 'export') {
-                $export = true;
-            }
-            if (argc() > 2 && intval(argv(1)) && intval(argv(2))) {
-                $mode = 'view';
-            }
-            if (argc() <= 2) {
-                $mode = 'view';
-                $event_id = argv(1);
-            }
-        }
-
-        if ($mode === 'add') {
-            event_addtocal($item_id, local_channel());
-            killme();
-        }
-
-        if ($mode == 'view') {
-            /* edit/create form */
-            if ($event_id) {
-                $r = q(
-                    "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                    dbesc($event_id),
-                    intval(local_channel())
-                );
-                if ($r) {
-                    $orig_event = $r[0];
-                }
-            }
-
-            $channel = App::get_channel();
-
-            if (argv(1) === 'json') {
-                if (x($_GET, 'start')) {
-                    $start = $_GET['start'];
-                }
-                if (x($_GET, 'end')) {
-                    $finish = $_GET['end'];
-                }
-            }
-
-            $start = datetime_convert('UTC', 'UTC', $start);
-            $finish = datetime_convert('UTC', 'UTC', $finish);
-
-            $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-            $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-
-            if (x($_GET, 'id')) {
-                $r = q(
-                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-	                                from event left join item on item.resource_id = event.event_hash
-					where item.resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
-                    intval(local_channel()),
-                    intval($_GET['id'])
-                );
-            } elseif ($export) {
-                $r = q(
-                    "SELECT * from event where uid = %d",
-                    intval(local_channel())
-                );
-            } else {
-                // fixed an issue with "nofinish" events not showing up in the calendar.
-                // There's still an issue if the finish date crosses the end of month.
-                // Noting this for now - it will need to be fixed here and in Friendica.
-                // Ultimately the finish date shouldn't be involved in the query.
-
-                $r = q(
-                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-					from event left join item on event.event_hash = item.resource_id 
-					where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
-					AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ) 
-					OR  (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) ",
-                    intval(local_channel()),
-                    dbesc($start),
-                    dbesc($finish),
-                    dbesc($adjust_start),
-                    dbesc($adjust_finish)
-                );
-            }
-
-            if ($r && !$export) {
-                xchan_query($r);
-                $r = fetch_post_tags($r, true);
-
-                $r = sort_by_date($r);
-            }
-
-            $events = [];
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
-                    if ($rr['nofinish']) {
-                        $end = null;
-                    } else {
-                        $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
-
-                        // give a fake end to birthdays so they get crammed into a
-                        // single day on the calendar
-
-                        if ($rr['etype'] === 'birthday') {
-                            $end = null;
-                        }
-                    }
-
-                    $catsenabled = Apps::system_app_installed($x['profile_uid'], 'Categories');
-                    $categories = '';
-                    if ($catsenabled) {
-                        if ($rr['term']) {
-                            $categories = array_elm_to_str(get_terms_oftype($rr['term'], TERM_CATEGORY), 'term');
-                        }
-                    }
-
-                    $allDay = false;
-
-                    // allDay event rules
-                    if (!strpos($start, 'T') && !strpos($end, 'T')) {
-                        $allDay = true;
-                    }
-                    if (strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00')) {
-                        $allDay = true;
-                    }
-
-                    $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root() . '/events/' . $rr['event_hash'] . '?expandform=1', t('Edit event'), '', '') : false);
-
-                    $drop = [z_root() . '/events/drop/' . $rr['event_hash'], t('Delete event'), '', ''];
-
-                    $events[] = [
-                        'calendar_id' => 'calendar',
-                        'rw' => true,
-                        'id' => $rr['id'],
-                        'uri' => $rr['event_hash'],
-                        'start' => $start,
-                        'end' => $end,
-                        'drop' => $drop,
-                        'allDay' => $allDay,
-                        'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
-                        'editable' => $edit ? true : false,
-                        'item' => $rr,
-                        'plink' => [$rr['plink'], t('Link to source')],
-                        'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8', false),
-                        'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8', false),
-                        'allow_cid' => expand_acl($rr['allow_cid']),
-                        'allow_gid' => expand_acl($rr['allow_gid']),
-                        'deny_cid' => expand_acl($rr['deny_cid']),
-                        'deny_gid' => expand_acl($rr['deny_gid']),
-                        'categories' => $categories
-                    ];
-                }
-            }
-
-            if ($export) {
-                header('Content-type: text/calendar');
-                header('Content-Disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"');
-                echo ical_wrapper($r);
-                killme();
-            }
-
-            if (App::$argv[1] === 'json') {
-                json_return_and_die($events);
-            }
-        }
-
-
-        if ($mode === 'drop' && $event_id) {
-            $r = q(
-                "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                dbesc($event_id),
-                intval(local_channel())
-            );
-
-            $sync_event = $r[0];
-
-            if ($r) {
-                $r = q(
-                    "delete from event where event_hash = '%s' and uid = %d",
-                    dbesc($event_id),
-                    intval(local_channel())
-                );
-                if ($r) {
-                    $r = q(
-                        "update item set resource_type = '', resource_id = '' where resource_type = 'event' and resource_id = '%s' and uid = %d",
-                        dbesc($event_id),
-                        intval(local_channel())
-                    );
-                    $sync_event['event_deleted'] = 1;
-                    Libsync::build_sync_packet(0, ['event' => [$sync_event]]);
-                    killme();
-                }
-                notice(t('Failed to remove event') . EOL);
-                killme();
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php
deleted file mode 100644
index 7797bf5d4..000000000
--- a/Zotlabs/Module/Card_edit.php
+++ /dev/null
@@ -1,148 +0,0 @@
- 1) ? intval(argv(1)) : 0);
-
-        if (!$post_id) {
-            notice(t('Item not found') . EOL);
-            return;
-        }
-
-        $itm = q(
-            "SELECT * FROM item WHERE id = %d and item_type = %d LIMIT 1",
-            intval($post_id),
-            intval(ITEM_TYPE_CARD)
-        );
-        if ($itm) {
-            $item_id = q(
-                "select * from iconfig where cat = 'system' and k = 'CARD' and iid = %d limit 1",
-                intval($itm[0]['id'])
-            );
-            if ($item_id) {
-                $card_title = $item_id[0]['v'];
-            }
-        } else {
-            notice(t('Item not found') . EOL);
-            return;
-        }
-
-        $owner = $itm[0]['uid'];
-        $uid = local_channel();
-
-        $observer = App::get_observer();
-
-        $channel = Channel::from_id($owner);
-        if (!$channel) {
-            notice(t('Channel not found.') . EOL);
-            return;
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $is_owner = (($uid && $uid == $owner) ? true : false);
-
-        $o = '';
-
-
-        $category = '';
-        $catsenabled = ((Apps::system_app_installed($owner, 'Categories')) ? 'categories' : '');
-
-        if ($catsenabled) {
-            $itm = fetch_post_tags($itm);
-
-            $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-
-            foreach ($cats as $cat) {
-                if (strlen($category)) {
-                    $category .= ', ';
-                }
-                $category .= $cat['term'];
-            }
-        }
-
-        if ($itm[0]['attach']) {
-            $j = json_decode($itm[0]['attach'], true);
-            if ($j) {
-                foreach ($j as $jj) {
-                    $itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
-                }
-            }
-        }
-
-
-        $mimetype = $itm[0]['mimetype'];
-
-        $content = $itm[0]['body'];
-
-
-        $rp = 'cards/' . $channel['channel_address'];
-
-        $x = array(
-            'nickname' => $channel['channel_address'],
-            'bbco_autocomplete' => 'bbcode',
-            'return_path' => $rp,
-            'webpage' => ITEM_TYPE_CARD,
-            'button' => t('Edit'),
-            'writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_pages'),
-            'weblink' => t('Insert web link'),
-            'hide_voting' => false,
-            'hide_future' => false,
-            'hide_location' => false,
-            'hide_expire' => false,
-            'showacl' => true,
-            'acl' => Libacl::populate($itm[0], false, PermissionDescription::fromGlobalPermission('view_pages')),
-            'permissions' => $itm[0],
-            'lockstate' => (($itm[0]['allow_cid'] || $itm[0]['allow_gid'] || $itm[0]['deny_cid'] || $itm[0]['deny_gid']) ? 'lock' : 'unlock'),
-            'ptyp' => $itm[0]['type'],
-            'mimeselect' => false,
-            'mimetype' => $itm[0]['mimetype'],
-            'body' => undo_post_tagging($content),
-            'post_id' => $post_id,
-            'visitor' => true,
-            'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'),
-            'placeholdertitle' => t('Title (optional)'),
-            'pagetitle' => $card_title,
-            'profile_uid' => (intval($channel['channel_id'])),
-            'catsenabled' => $catsenabled,
-            'category' => $category,
-			'bbcode' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? true : false)
-        );
-
-        $editor = status_editor($x);
-
-        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
-            '$title' => t('Edit Card'),
-            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-            '$id' => $itm[0]['id'],
-            '$cancel' => t('Cancel'),
-            '$editor' => $editor
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php
deleted file mode 100644
index 7dc6f15de..000000000
--- a/Zotlabs/Module/Cards.php
+++ /dev/null
@@ -1,223 +0,0 @@
- 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Zotlabs\Web\Controller::get()
-     */
-    public function get()
-    {
-
-        if (observer_prohibited(true)) {
-            return login();
-        }
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        if (!Apps::system_app_installed(App::$profile_uid, 'Cards')) {
-            //Do not display any associated widgets at this point
-            App::$pdl = '';
-
-            $o = 'Cards App (Not Installed):
          ';
-            $o .= t('Create personal planning cards');
-            return $o;
-        }
-
-        Navbar::set_selected('Cards');
-
-        head_add_link([
-            'rel' => 'alternate',
-            'type' => 'application/json+oembed',
-            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-            'title' => 'oembed'
-        ]);
-
-
-        $category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : '');
-
-        if ($category) {
-            $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
-        }
-
-
-        $which = argv(1);
-
-        $selected_card = ((argc() > 2) ? argv(2) : '');
-
-        $_SESSION['return_url'] = App::$query_string;
-
-        $uid = local_channel();
-        $owner = App::$profile_uid;
-        $observer = App::get_observer();
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        if (!perm_is_allowed($owner, $ob_hash, 'view_pages')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $is_owner = ($uid && $uid == $owner);
-
-        $channel = Channel::from_id($owner);
-
-        if ($channel) {
-            $channel_acl = [
-                'allow_cid' => $channel['channel_allow_cid'],
-                'allow_gid' => $channel['channel_allow_gid'],
-                'deny_cid' => $channel['channel_deny_cid'],
-                'deny_gid' => $channel['channel_deny_gid']
-            ];
-        } else {
-            $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
-        }
-
-
-        if (perm_is_allowed($owner, $ob_hash, 'write_pages')) {
-            $x = [
-                'webpage' => ITEM_TYPE_CARD,
-                'is_owner' => true,
-                'content_label' => t('Add Card'),
-                'button' => t('Create'),
-                'nickname' => $channel['channel_address'],
-                'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
-                    || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-                'acl' => (($is_owner) ? Libacl::populate(
-                    $channel_acl,
-                    false,
-                    PermissionDescription::fromGlobalPermission('view_pages')
-                ) : ''),
-                'permissions' => $channel_acl,
-                'showacl' => (($is_owner) ? true : false),
-                'visitor' => true,
-                'hide_location' => false,
-                'hide_voting' => false,
-                'profile_uid' => intval($owner),
-                'mimetype' => 'text/x-multicode',
-                'mimeselect' => false,
-                'layoutselect' => false,
-                'expanded' => false,
-                'novoting' => false,
-                'catsenabled' => Apps::system_app_installed($owner, 'Categories'),
-                'bbco_autocomplete' => 'bbcode',
-                'bbcode' => true
-            ];
-
-            if ($_REQUEST['title']) {
-                $x['title'] = $_REQUEST['title'];
-            }
-            if ($_REQUEST['body']) {
-                $x['body'] = $_REQUEST['body'];
-            }
-
-            $editor = status_editor($x);
-        } else {
-            $editor = '';
-        }
-
-
-        $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
-        App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
-        $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-
-
-        $sql_extra = item_permissions_sql($owner);
-        $sql_item = '';
-
-        if ($selected_card) {
-            $r = q(
-                "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1",
-                dbesc($selected_card)
-            );
-            if ($r) {
-                $sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
-            }
-        }
-
-        $r = q(
-            "select * from item
-			where uid = %d and item_type = %d
-			$sql_extra $sql_item order by item.created desc $pager_sql",
-            intval($owner),
-            intval(ITEM_TYPE_CARD)
-        );
-
-        $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0
-			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-			and item.item_blocked = 0 ";
-
-        $items_result = [];
-        if ($r) {
-            $pager_total = count($r);
-
-            $parents_str = ids_to_querystr($r, 'id');
-
-            $items = q(
-                "SELECT item.*, item.id AS item_id
-				FROM item
-				WHERE item.uid = %d $item_normal
-				AND item.parent IN ( %s )
-				$sql_extra $sql_extra2 ",
-                intval(App::$profile['profile_uid']),
-                dbesc($parents_str)
-            );
-            if ($items) {
-                xchan_query($items);
-                $items = fetch_post_tags($items, true);
-                $items_result = conv_sort($items, 'updated');
-            }
-        }
-
-        $mode = 'cards';
-
-        if (get_pconfig(local_channel(), 'system', 'articles_list_mode') && (!$selected_card)) {
-            $page_mode = 'pager_list';
-        } else {
-            $page_mode = 'traditional';
-        }
-
-        $content = conversation($items_result, $mode, false, $page_mode);
-
-        $o = replace_macros(Theme::get_template('cards.tpl'), [
-            '$title' => t('Cards'),
-            '$editor' => $editor,
-            '$content' => $content,
-            '$pager' => alt_pager($pager_total)
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Categories.php b/Zotlabs/Module/Categories.php
deleted file mode 100644
index e168bc6fe..000000000
--- a/Zotlabs/Module/Categories.php
+++ /dev/null
@@ -1,42 +0,0 @@
-' . $desc . '
          ';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Categories'))) {
-            return $text;
-        }
-
-        $c = new Comanche();
-        return $c->widget('catcloud', EMPTY_STR);
-    }
-}
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
deleted file mode 100644
index a97f096da..000000000
--- a/Zotlabs/Module/Cdav.php
+++ /dev/null
@@ -1,1447 +0,0 @@
- $c, 'account' => $a[0]];
-                                        $channel_login = $c['channel_id'];
-                                    }
-                                }
-                            }
-                            if (!$record) {
-                                continue;
-                            }
-
-                            if ($record) {
-                                $verified = HTTPSig::verify('', $record['channel']['channel_pubkey']);
-                                if (!($verified && $verified['header_signed'] && $verified['header_valid'])) {
-                                    $record = null;
-                                }
-                                if ($record['account']) {
-                                    authenticate_success($record['account']);
-                                    if ($channel_login) {
-                                        change_channel($channel_login);
-                                    }
-                                }
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-
-            /**
-             * This server combines both CardDAV and CalDAV functionality into a single
-             * server. It is assumed that the server runs at the root of a HTTP domain (be
-             * that a domainname-based vhost or a specific TCP port.
-             *
-             * This example also assumes that you're using SQLite and the database has
-             * already been setup (along with the database tables).
-             *
-             * You may choose to use MySQL instead, just change the PDO connection
-             * statement.
-             */
-
-            /**
-             * UTC or GMT is easy to work with, and usually recommended for any
-             * application.
-             */
-            date_default_timezone_set('UTC');
-
-            /**
-             * Make sure this setting is turned on and reflect the root url for your WebDAV
-             * server.
-             *
-             * This can be for example the root / or a complete path to your server script.
-             */
-
-            $baseUri = '/cdav/';
-
-            /**
-             * Database
-             *
-             */
-
-            $pdo = DBA::$dba->db;
-
-            // Autoloader
-            require_once 'vendor/autoload.php';
-
-            /**
-             * The backends. Yes we do really need all of them.
-             *
-             * This allows any developer to subclass just any of them and hook into their
-             * own backend systems.
-             */
-
-            $auth = new BasicAuth();
-            $auth->setRealm(ucfirst(System::get_platform_name()) . ' ' . 'CalDAV/CardDAV');
-
-            if (local_channel()) {
-                logger('loggedin');
-
-                if ((argv(1) == 'addressbooks') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) {
-                    killme();
-                }
-
-                $channel = App::get_channel();
-                $auth->setCurrentUser($channel['channel_address']);
-                $auth->channel_id = $channel['channel_id'];
-                $auth->channel_hash = $channel['channel_hash'];
-                $auth->channel_account_id = $channel['channel_account_id'];
-                if ($channel['channel_timezone']) {
-                    $auth->setTimezone($channel['channel_timezone']);
-                }
-                $auth->observer = $channel['channel_hash'];
-
-                $principalUri = 'principals/' . $channel['channel_address'];
-                if (!cdav_principal($principalUri)) {
-                    $this->activate($pdo, $channel);
-                    if (!cdav_principal($principalUri)) {
-                        return;
-                    }
-                }
-            }
-
-
-            $principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo);
-            $carddavBackend = new PDO($pdo);
-            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
-
-            /**
-             * The directory tree
-             *
-             * Basically this is an array which contains the 'top-level' directories in the
-             * WebDAV server.
-             */
-
-            $nodes = [
-                // /principals
-                new Collection($principalBackend),
-
-                // /calendars
-                new CalendarRoot($principalBackend, $caldavBackend),
-
-                // /addressbook
-                new AddressBookRoot($principalBackend, $carddavBackend)
-            ];
-
-
-            // The object tree needs in turn to be passed to the server class
-
-            $server = new Server($nodes);
-
-            if (isset($baseUri)) {
-                $server->setBaseUri($baseUri);
-            }
-
-            // Plugins
-            $server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth));
-            //$server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-            $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
-            $server->addPlugin(new \Sabre\DAV\Sharing\Plugin());
-            $server->addPlugin(new \Sabre\DAVACL\Plugin());
-
-            // CalDAV plugins
-            $server->addPlugin(new \Sabre\CalDAV\Plugin());
-            $server->addPlugin(new SharingPlugin());
-            //$server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
-            $server->addPlugin(new ICSExportPlugin());
-
-            // CardDAV plugins
-            $server->addPlugin(new Plugin());
-            $server->addPlugin(new VCFExportPlugin());
-
-            // And off we go!
-            $server->exec();
-
-            killme();
-        }
-    }
-
-    public function post()
-    {
-
-        if (!local_channel()) {
-            return;
-        }
-
-        if ((argv(1) === 'addressbook') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) {
-            return;
-        }
-
-        $channel = App::get_channel();
-        $principalUri = 'principals/' . $channel['channel_address'];
-
-        if (!cdav_principal($principalUri)) {
-            return;
-        }
-
-        $pdo = DBA::$dba->db;
-
-        require_once 'vendor/autoload.php';
-
-        if (argc() == 2 && argv(1) === 'calendar') {
-            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
-            $calendars = $caldavBackend->getCalendarsForUser($principalUri);
-
-            // create new calendar
-            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) {
-                do {
-                    $duplicate = false;
-                    $calendarUri = random_string(40);
-
-                    $r = q(
-                        "SELECT uri FROM calendarinstances WHERE principaluri = '%s' AND uri = '%s' LIMIT 1",
-                        dbesc($principalUri),
-                        dbesc($calendarUri)
-                    );
-
-                    if ($r) {
-                        $duplicate = true;
-                    }
-                } while ($duplicate == true);
-
-                $properties = [
-                    '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'],
-                    '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color'],
-                    '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name']
-                ];
-
-                $id = $caldavBackend->createCalendar($principalUri, $calendarUri, $properties);
-
-                // set new calendar to be visible
-                set_pconfig(local_channel(), 'cdav_calendar', $id[0], 1);
-            }
-
-            //create new calendar object via ajax request
-            if ($_REQUEST['submit'] === 'create_event' && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) {
-                $id = explode(':', $_REQUEST['target']);
-
-                if (!cdav_perms($id[0], $calendars, true)) {
-                    return;
-                }
-
-                $title = $_REQUEST['title'];
-                $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
-                $dtstart = new DateTime($start);
-                if ($_REQUEST['dtend']) {
-                    $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
-                    $dtend = new DateTime($end);
-                }
-                $description = $_REQUEST['description'];
-                $location = $_REQUEST['location'];
-
-                do {
-                    $duplicate = false;
-                    $objectUri = random_string(40) . '.ics';
-
-                    $r = q(
-                        "SELECT uri FROM calendarobjects WHERE calendarid = %s AND uri = '%s' LIMIT 1",
-                        intval($id[0]),
-                        dbesc($objectUri)
-                    );
-
-                    if (count($r)) {
-                        $duplicate = true;
-                    }
-                } while ($duplicate == true);
-
-
-                $vcalendar = new VCalendar([
-                    'VEVENT' => [
-                        'SUMMARY' => $title,
-                        'DTSTART' => $dtstart
-                    ]
-                ]);
-                if ($dtend) {
-                    $vcalendar->VEVENT->add('DTEND', $dtend);
-                    $vcalendar->VEVENT->DTEND['TZID'] = App::$timezone;
-                }
-                if ($description) {
-                    $vcalendar->VEVENT->add('DESCRIPTION', $description);
-                }
-                if ($location) {
-                    $vcalendar->VEVENT->add('LOCATION', $location);
-                }
-
-                $vcalendar->VEVENT->DTSTART['TZID'] = App::$timezone;
-
-                $calendarData = $vcalendar->serialize();
-
-                $caldavBackend->createCalendarObject($id, $objectUri, $calendarData);
-
-                killme();
-            }
-
-            // edit calendar name and color
-            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && $_REQUEST['id']) {
-                $id = explode(':', $_REQUEST['id']);
-
-                if (!cdav_perms($id[0], $calendars)) {
-                    return;
-                }
-
-                $mutations = [
-                    '{DAV:}displayname' => $_REQUEST['{DAV:}displayname'],
-                    '{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color']
-                ];
-
-                $patch = new PropPatch($mutations);
-
-                $caldavBackend->updateCalendar($id, $patch);
-
-                $patch->commit();
-            }
-
-            // edit calendar object via ajax request
-            if ($_REQUEST['submit'] === 'update_event' && $_REQUEST['uri'] && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) {
-                $id = explode(':', $_REQUEST['target']);
-
-                if (!cdav_perms($id[0], $calendars, true)) {
-                    return;
-                }
-
-                $uri = $_REQUEST['uri'];
-                $title = $_REQUEST['title'];
-                $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
-                $dtstart = new DateTime($start);
-                if ($_REQUEST['dtend']) {
-                    $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
-                    $dtend = new DateTime($end);
-                }
-                $description = $_REQUEST['description'];
-                $location = $_REQUEST['location'];
-
-                $object = $caldavBackend->getCalendarObject($id, $uri);
-
-                $vcalendar = Reader::read($object['calendardata']);
-
-                if ($title) {
-                    $vcalendar->VEVENT->SUMMARY = $title;
-                }
-                if ($dtstart) {
-                    $vcalendar->VEVENT->DTSTART = $dtstart;
-                }
-                if ($dtend) {
-                    $vcalendar->VEVENT->DTEND = $dtend;
-                } else {
-                    unset($vcalendar->VEVENT->DTEND);
-                }
-                if ($description) {
-                    $vcalendar->VEVENT->DESCRIPTION = $description;
-                }
-                if ($location) {
-                    $vcalendar->VEVENT->LOCATION = $location;
-                }
-
-                $calendarData = $vcalendar->serialize();
-
-                $caldavBackend->updateCalendarObject($id, $uri, $calendarData);
-                killme();
-            }
-
-            // delete calendar object via ajax request
-            if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) {
-                $id = explode(':', $_REQUEST['target']);
-
-                if (!cdav_perms($id[0], $calendars, true)) {
-                    return;
-                }
-
-                $uri = $_REQUEST['uri'];
-
-                $caldavBackend->deleteCalendarObject($id, $uri);
-                killme();
-            }
-
-            // edit calendar object date/timeme via ajax request (drag and drop)
-            if ($_REQUEST['update'] && $_REQUEST['id'] && $_REQUEST['uri']) {
-                $id = [$_REQUEST['id'][0], $_REQUEST['id'][1]];
-
-                if (!cdav_perms($id[0], $calendars, true)) {
-                    return;
-                }
-
-                $uri = $_REQUEST['uri'];
-                $start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
-                $dtstart = new DateTime($start);
-                if ($_REQUEST['dtend']) {
-                    $end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
-                    $dtend = new DateTime($end);
-                }
-
-                $object = $caldavBackend->getCalendarObject($id, $uri);
-
-                $vcalendar = Reader::read($object['calendardata']);
-
-                if ($dtstart) {
-                    $vcalendar->VEVENT->DTSTART = $dtstart;
-                }
-                if ($dtend) {
-                    $vcalendar->VEVENT->DTEND = $dtend;
-                } else {
-                    unset($vcalendar->VEVENT->DTEND);
-                }
-
-                $calendarData = $vcalendar->serialize();
-
-                $caldavBackend->updateCalendarObject($id, $uri, $calendarData);
-
-                killme();
-            }
-
-            // share a calendar - this only works on local system (with channels on the same server)
-            if ($_REQUEST['sharee'] && $_REQUEST['share']) {
-                $id = [intval($_REQUEST['calendarid']), intval($_REQUEST['instanceid'])];
-
-                if (!cdav_perms($id[0], $calendars)) {
-                    return;
-                }
-
-                $hash = $_REQUEST['sharee'];
-
-                $sharee_arr = Channel::from_hash($hash);
-
-                $sharee = new Sharee();
-
-                $sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
-                $sharee->principal = 'principals/' . $sharee_arr['channel_address'];
-                $sharee->access = intval($_REQUEST['access']);
-                $sharee->properties = ['{DAV:}displayname' => $channel['channel_name']];
-
-                $caldavBackend->updateInvites($id, [$sharee]);
-            }
-        }
-
-        if (argc() >= 2 && argv(1) === 'addressbook') {
-            $carddavBackend = new PDO($pdo);
-            $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
-
-            // create new addressbook
-            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) {
-                do {
-                    $duplicate = false;
-                    $addressbookUri = random_string(20);
-
-                    $r = q(
-                        "SELECT uri FROM addressbooks WHERE principaluri = '%s' AND uri = '%s' LIMIT 1",
-                        dbesc($principalUri),
-                        dbesc($addressbookUri)
-                    );
-
-                    if ($r) {
-                        $duplicate = true;
-                    }
-                } while ($duplicate == true);
-
-                $properties = ['{DAV:}displayname' => $_REQUEST['{DAV:}displayname']];
-
-                $carddavBackend->createAddressBook($principalUri, $addressbookUri, $properties);
-            }
-
-            // edit addressbook
-            if ($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && intval($_REQUEST['id'])) {
-                $id = $_REQUEST['id'];
-
-                if (!cdav_perms($id, $addressbooks)) {
-                    return;
-                }
-
-                $mutations = [
-                    '{DAV:}displayname' => $_REQUEST['{DAV:}displayname']
-                ];
-
-                $patch = new PropPatch($mutations);
-
-                $carddavBackend->updateAddressBook($id, $patch);
-
-                $patch->commit();
-            }
-
-            // create addressbook card
-            if ($_REQUEST['create'] && $_REQUEST['target'] && $_REQUEST['fn']) {
-                $id = $_REQUEST['target'];
-
-                do {
-                    $duplicate = false;
-                    $uri = random_string(40) . '.vcf';
-
-                    $r = q(
-                        "SELECT uri FROM cards WHERE addressbookid = %s AND uri = '%s' LIMIT 1",
-                        intval($id),
-                        dbesc($uri)
-                    );
-
-                    if ($r) {
-                        $duplicate = true;
-                    }
-                } while ($duplicate == true);
-
-                // TODO: this mostly duplictes the procedure in update addressbook card.
-                // Should move this part to a function to avoid duplication
-                $fn = $_REQUEST['fn'];
-
-                $vcard = new \Sabre\VObject\Component\VCard([
-                    'FN' => $fn,
-                    'N' => array_reverse(explode(' ', $fn))
-                ]);
-
-                $org = $_REQUEST['org'];
-                if ($org) {
-                    $vcard->ORG = $org;
-                }
-
-                $title = $_REQUEST['title'];
-                if ($title) {
-                    $vcard->TITLE = $title;
-                }
-
-                $tel = $_REQUEST['tel'];
-                $tel_type = $_REQUEST['tel_type'];
-                if ($tel) {
-                    $i = 0;
-                    foreach ($tel as $item) {
-                        if ($item) {
-                            $vcard->add('TEL', $item, ['type' => $tel_type[$i]]);
-                        }
-                        $i++;
-                    }
-                }
-
-                $email = $_REQUEST['email'];
-                $email_type = $_REQUEST['email_type'];
-                if ($email) {
-                    $i = 0;
-                    foreach ($email as $item) {
-                        if ($item) {
-                            $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]);
-                        }
-                        $i++;
-                    }
-                }
-
-                $impp = $_REQUEST['impp'];
-                $impp_type = $_REQUEST['impp_type'];
-                if ($impp) {
-                    $i = 0;
-                    foreach ($impp as $item) {
-                        if ($item) {
-                            $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]);
-                        }
-                        $i++;
-                    }
-                }
-
-                $url = $_REQUEST['url'];
-                $url_type = $_REQUEST['url_type'];
-                if ($url) {
-                    $i = 0;
-                    foreach ($url as $item) {
-                        if ($item) {
-                            $vcard->add('URL', $item, ['type' => $url_type[$i]]);
-                        }
-                        $i++;
-                    }
-                }
-
-                $adr = $_REQUEST['adr'];
-                $adr_type = $_REQUEST['adr_type'];
-
-                if ($adr) {
-                    $i = 0;
-                    foreach ($adr as $item) {
-                        if ($item) {
-                            $vcard->add('ADR', $item, ['type' => $adr_type[$i]]);
-                        }
-                        $i++;
-                    }
-                }
-
-                $note = $_REQUEST['note'];
-                if ($note) {
-                    $vcard->NOTE = $note;
-                }
-
-                $cardData = $vcard->serialize();
-
-                $carddavBackend->createCard($id, $uri, $cardData);
-            }
-
-            // edit addressbook card
-            if ($_REQUEST['update'] && $_REQUEST['uri'] && $_REQUEST['target']) {
-                $id = $_REQUEST['target'];
-
-                if (!cdav_perms($id, $addressbooks)) {
-                    return;
-                }
-
-                $uri = $_REQUEST['uri'];
-
-                $object = $carddavBackend->getCard($id, $uri);
-                $vcard = Reader::read($object['carddata']);
-
-                $fn = $_REQUEST['fn'];
-                if ($fn) {
-                    $vcard->FN = $fn;
-                    $vcard->N = array_reverse(explode(' ', $fn));
-                }
-
-                $org = $_REQUEST['org'];
-                if ($org) {
-                    $vcard->ORG = $org;
-                } else {
-                    unset($vcard->ORG);
-                }
-
-                $title = $_REQUEST['title'];
-                if ($title) {
-                    $vcard->TITLE = $title;
-                } else {
-                    unset($vcard->TITLE);
-                }
-
-                $tel = $_REQUEST['tel'];
-                $tel_type = $_REQUEST['tel_type'];
-                if ($tel) {
-                    $i = 0;
-                    unset($vcard->TEL);
-                    foreach ($tel as $item) {
-                        if ($item) {
-                            $vcard->add('TEL', $item, ['type' => $tel_type[$i]]);
-                        }
-                        $i++;
-                    }
-                } else {
-                    unset($vcard->TEL);
-                }
-
-                $email = $_REQUEST['email'];
-                $email_type = $_REQUEST['email_type'];
-                if ($email) {
-                    $i = 0;
-                    unset($vcard->EMAIL);
-                    foreach ($email as $item) {
-                        if ($item) {
-                            $vcard->add('EMAIL', $item, ['type' => $email_type[$i]]);
-                        }
-                        $i++;
-                    }
-                } else {
-                    unset($vcard->EMAIL);
-                }
-
-                $impp = $_REQUEST['impp'];
-                $impp_type = $_REQUEST['impp_type'];
-                if ($impp) {
-                    $i = 0;
-                    unset($vcard->IMPP);
-                    foreach ($impp as $item) {
-                        if ($item) {
-                            $vcard->add('IMPP', $item, ['type' => $impp_type[$i]]);
-                        }
-                        $i++;
-                    }
-                } else {
-                    unset($vcard->IMPP);
-                }
-
-                $url = $_REQUEST['url'];
-                $url_type = $_REQUEST['url_type'];
-                if ($url) {
-                    $i = 0;
-                    unset($vcard->URL);
-                    foreach ($url as $item) {
-                        if ($item) {
-                            $vcard->add('URL', $item, ['type' => $url_type[$i]]);
-                        }
-                        $i++;
-                    }
-                } else {
-                    unset($vcard->URL);
-                }
-
-                $adr = $_REQUEST['adr'];
-                $adr_type = $_REQUEST['adr_type'];
-                if ($adr) {
-                    $i = 0;
-                    unset($vcard->ADR);
-                    foreach ($adr as $item) {
-                        if ($item) {
-                            $vcard->add('ADR', $item, ['type' => $adr_type[$i]]);
-                        }
-                        $i++;
-                    }
-                } else {
-                    unset($vcard->ADR);
-                }
-
-                $note = $_REQUEST['note'];
-                if ($note) {
-                    $vcard->NOTE = $note;
-                } else {
-                    unset($vcard->NOTE);
-                }
-
-                $cardData = $vcard->serialize();
-
-                $carddavBackend->updateCard($id, $uri, $cardData);
-            }
-
-            // delete addressbook card
-            if ($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) {
-                $id = $_REQUEST['target'];
-
-                if (!cdav_perms($id, $addressbooks)) {
-                    return;
-                }
-
-                $uri = $_REQUEST['uri'];
-
-                $carddavBackend->deleteCard($id, $uri);
-            }
-        }
-
-        // Import calendar or addressbook
-        if (($_FILES) && array_key_exists('userfile', $_FILES) && intval($_FILES['userfile']['size']) && $_REQUEST['target']) {
-            $src = $_FILES['userfile']['tmp_name'];
-
-            if ($src) {
-                if ($_REQUEST['c_upload']) {
-                    if ($_REQUEST['target'] == 'calendar') {
-                        $result = parse_ical_file($src, local_channel());
-                        if ($result) {
-                            info(t('Calendar entries imported.') . EOL);
-                        } else {
-                            notice(t('No calendar entries found.') . EOL);
-                        }
-
-                        @unlink($src);
-                        return;
-                    }
-
-                    $id = explode(':', $_REQUEST['target']);
-                    $ext = 'ics';
-                    $table = 'calendarobjects';
-                    $column = 'calendarid';
-                    $objects = new ICalendar(@file_get_contents($src));
-                    $profile = Node::PROFILE_CALDAV;
-                    $backend = new \Sabre\CalDAV\Backend\PDO($pdo);
-                }
-
-                if ($_REQUEST['a_upload']) {
-                    $id[] = intval($_REQUEST['target']);
-                    $ext = 'vcf';
-                    $table = 'cards';
-                    $column = 'addressbookid';
-                    $objects = new VCard(@file_get_contents($src));
-                    $profile = Node::PROFILE_CARDDAV;
-                    $backend = new PDO($pdo);
-                }
-
-                while ($object = $objects->getNext()) {
-                    if ($_REQUEST['a_upload']) {
-                        $object = $object->convert(Document::VCARD40);
-                    }
-
-                    $ret = $object->validate($profile & Node::REPAIR);
-
-                    // level 3 Means that the document is invalid,
-                    // level 2 means a warning. A warning means it's valid but it could cause interopability issues,
-                    // level 1 means that there was a problem earlier, but the problem was automatically repaired.
-
-                    if ($ret[0]['level'] < 3) {
-                        do {
-                            $duplicate = false;
-                            $objectUri = random_string(40) . '.' . $ext;
-
-                            $r = q(
-                                "SELECT uri FROM $table WHERE $column = %d AND uri = '%s' LIMIT 1",
-                                dbesc($id[0]),
-                                dbesc($objectUri)
-                            );
-
-                            if ($r) {
-                                $duplicate = true;
-                            }
-                        } while ($duplicate == true);
-
-                        if ($_REQUEST['c_upload']) {
-                            $backend->createCalendarObject($id, $objectUri, $object->serialize());
-                        }
-
-                        if ($_REQUEST['a_upload']) {
-                            $backend->createCard($id[0], $objectUri, $object->serialize());
-                        }
-                    } else {
-                        if ($_REQUEST['c_upload']) {
-                            notice('' . t('INVALID EVENT DISMISSED!') . '' . EOL .
-                                '' . t('Summary: ') . '' . (($object->VEVENT->SUMMARY) ? $object->VEVENT->SUMMARY : t('Unknown')) . EOL .
-                                '' . t('Date: ') . '' . (($object->VEVENT->DTSTART) ? $object->VEVENT->DTSTART : t('Unknown')) . EOL .
-                                '' . t('Reason: ') . '' . $ret[0]['message'] . EOL);
-                        }
-
-                        if ($_REQUEST['a_upload']) {
-                            notice('' . t('INVALID CARD DISMISSED!') . '' . EOL .
-                                '' . t('Name: ') . '' . (($object->FN) ? $object->FN : t('Unknown')) . EOL .
-                                '' . t('Reason: ') . '' . $ret[0]['message'] . EOL);
-                        }
-                    }
-                }
-            }
-            @unlink($src);
-        }
-    }
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            return;
-        }
-
-        if ((argv(1) === 'addressbook') && (!Apps::system_app_installed(local_channel(), 'CardDAV'))) {
-            // Do not display any associated widgets at this point
-            App::$pdl = '';
-
-            $o = '' . t('CardDAV App') . ' (' . t('Not Installed') . '):
          ';
-            $o .= t('CalDAV capable addressbook');
-            return $o;
-        }
-
-        App::$profile_uid = local_channel();
-
-        $channel = App::get_channel();
-        $principalUri = 'principals/' . $channel['channel_address'];
-
-        $pdo = DBA::$dba->db;
-
-        require_once 'vendor/autoload.php';
-
-        Head::add_css('cdav.css');
-
-        if (!cdav_principal($principalUri)) {
-            $this->activate($pdo, $channel);
-            if (!cdav_principal($principalUri)) {
-                return;
-            }
-        }
-
-        if (argv(1) === 'calendar') {
-            Navbar::set_selected('Calendar');
-            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
-            $calendars = $caldavBackend->getCalendarsForUser($principalUri);
-        }
-
-        // Display calendar(s) here
-        if (argc() <= 3 && argv(1) === 'calendar') {
-            Head::add_css('/library/fullcalendar/packages/core/main.min.css');
-            Head::add_css('/library/fullcalendar/packages/daygrid/main.min.css');
-            Head::add_css('/library/fullcalendar/packages/timegrid/main.min.css');
-            Head::add_css('/library/fullcalendar/packages/list/main.min.css');
-            Head::add_css('cdav_calendar.css');
-
-            Head::add_js('/library/fullcalendar/packages/core/main.min.js');
-            Head::add_js('/library/fullcalendar/packages/interaction/main.min.js');
-            Head::add_js('/library/fullcalendar/packages/daygrid/main.min.js');
-            Head::add_js('/library/fullcalendar/packages/timegrid/main.min.js');
-            Head::add_js('/library/fullcalendar/packages/list/main.min.js');
-
-            $sources = '';
-            $resource_id = '';
-            $resource = null;
-
-            if (argc() == 3) {
-                $resource_id = argv(2);
-            }
-
-            if ($resource_id) {
-                $r = q(
-                    "SELECT event.*, item.author_xchan, item.owner_xchan, item.plink, item.id as item_id FROM event LEFT JOIN item ON event.event_hash = item.resource_id
-					WHERE event.uid = %d AND event.event_hash = '%s' LIMIT 1",
-                    intval(local_channel()),
-                    dbesc($resource_id)
-                );
-                if ($r) {
-                    xchan_query($r);
-                    $r = fetch_post_tags($r, true);
-
-                    $r[0]['dtstart'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $r[0]['dtstart'], 'c'));
-                    $r[0]['dtend'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtend'], 'c') : datetime_convert('UTC', 'UTC', $r[0]['dtend'], 'c'));
-
-                    $r[0]['plink'] = [$r[0]['plink'], t('Link to source')];
-
-                    $resource = $r[0];
-
-                    $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
-
-                    $categories = '';
-                    if ($catsenabled) {
-                        if ($r[0]['term']) {
-                            $categories = array_elm_to_str(get_terms_oftype($r[0]['term'], TERM_CATEGORY), 'term');
-                        }
-                    }
-
-                    if ($r[0]['dismissed'] == 0) {
-                        q(
-                            "UPDATE event SET dismissed = 1 WHERE event.uid = %d AND event.event_hash = '%s'",
-                            intval(local_channel()),
-                            dbesc($resource_id)
-                        );
-                    }
-                }
-            }
-
-            if (get_pconfig(local_channel(), 'cdav_calendar', 'calendar')) {
-                $sources .= '{
-					id: \'calendar\',
-					url: \'/calendar/json/\',
-					color: \'#3a87ad\'
-				}, ';
-            }
-
-            $calendars[] = [
-                'displayname' => $channel['channel_name'],
-                'id' => 'calendar'
-            ];
-
-            foreach ($calendars as $calendar) {
-                $editable = (($calendar['share-access'] == 2) ? 'false' : 'true');  // false/true must be string since we're passing it to javascript
-                $color = (($calendar['{http://apple.com/ns/ical/}calendar-color']) ? $calendar['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39');
-                $sharer = (($calendar['share-access'] == 3) ? $calendar['{urn:ietf:params:xml:ns:caldav}calendar-description'] : '');
-                $switch = get_pconfig(local_channel(), 'cdav_calendar', $calendar['id'][0]);
-                if ($switch) {
-                    $sources .= '{
-						id: ' . $calendar['id'][0] . ',
-						url: \'/cdav/calendar/json/' . $calendar['id'][0] . '/' . $calendar['id'][1] . '\',
-						color: \'' . $color . '\'
-					 }, ';
-                }
-
-                if ($calendar['share-access'] != 2) {
-                    $writable_calendars[] = [
-                        'displayname' => $calendar['{DAV:}displayname'],
-                        'sharer' => $sharer,
-                        'id' => $calendar['id']
-                    ];
-                }
-            }
-
-            $sources = rtrim($sources, ', ');
-
-            $first_day = Features::enabled(local_channel(), 'cal_first_day');
-            $first_day = (($first_day) ? $first_day : 0);
-
-            $title = ['title', t('Event title')];
-            $dtstart = ['dtstart', t('Start date and time')];
-            $dtend = ['dtend', t('End date and time')];
-            $description = ['description', t('Description')];
-            $location = ['location', t('Location')];
-
-            $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
-
-
-            $accesslist = new AccessControl($channel);
-            $perm_defaults = $accesslist->get();
-
-            $acl = Libacl::populate($perm_defaults, false, PermissionDescription::fromGlobalPermission('view_stream'));
-
-            $permissions = $perm_defaults;
-
-            $o .= replace_macros(Theme::get_template('cdav_calendar.tpl'), [
-                '$sources' => $sources,
-                '$color' => $color,
-                '$lang' => App::$language,
-                '$timezone' => App::$timezone,
-                '$first_day' => $first_day,
-                '$prev' => t('Previous'),
-                '$next' => t('Next'),
-                '$today' => t('Today'),
-                '$month' => t('Month'),
-                '$week' => t('Week'),
-                '$day' => t('Day'),
-                '$list_month' => t('List month'),
-                '$list_week' => t('List week'),
-                '$list_day' => t('List day'),
-                '$title' => $title,
-                '$calendars' => $calendars,
-                '$writable_calendars' => $writable_calendars,
-                '$dtstart' => $dtstart,
-                '$dtend' => $dtend,
-                '$description' => $description,
-                '$location' => $location,
-                '$more' => t('More'),
-                '$less' => t('Less'),
-                '$update' => t('Update'),
-                '$calendar_select_label' => t('Select calendar'),
-                '$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')],
-                '$delete' => t('Delete'),
-                '$delete_all' => t('Delete all'),
-                '$cancel' => t('Cancel'),
-                '$create' => t('Create'),
-                '$recurrence_warning' => t('Sorry! Editing of recurrent events is not yet implemented.'),
-                '$channel_hash' => $channel['channel_hash'],
-                '$acl' => $acl,
-                '$lockstate' => (($accesslist->is_private()) ? 'lock' : 'unlock'),
-                '$allow_cid' => acl2json($permissions['allow_cid']),
-                '$allow_gid' => acl2json($permissions['allow_gid']),
-                '$deny_cid' => acl2json($permissions['deny_cid']),
-                '$deny_gid' => acl2json($permissions['deny_gid']),
-                '$catsenabled' => $catsenabled,
-                '$categories_label' => t('Categories'),
-                '$resource' => json_encode($resource),
-                '$categories' => $categories
-            ]);
-
-            return $o;
-        }
-
-        // Provide json data for calendar
-        if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'json' && intval(argv(3)) && intval(argv(4))) {
-            $events = [];
-
-            $id = [argv(3), argv(4)];
-
-            if (!cdav_perms($id[0], $calendars)) {
-                json_return_and_die($events);
-            }
-
-            if (x($_GET, 'start')) {
-                $start = new DateTime($_GET['start']);
-            }
-            if (x($_GET, 'end')) {
-                $end = new DateTime($_GET['end']);
-            }
-
-            $filters['name'] = 'VCALENDAR';
-            $filters['prop-filters'][0]['name'] = 'VEVENT';
-            $filters['comp-filters'][0]['name'] = 'VEVENT';
-            $filters['comp-filters'][0]['time-range']['start'] = $start;
-            $filters['comp-filters'][0]['time-range']['end'] = $end;
-
-            $uris = $caldavBackend->calendarQuery($id, $filters);
-
-            if ($uris) {
-                $objects = $caldavBackend->getMultipleCalendarObjects($id, $uris);
-                foreach ($objects as $object) {
-                    $vcalendar = Reader::read($object['calendardata']);
-
-                    if (isset($vcalendar->VEVENT->RRULE)) {
-                        // expanding recurrent events seems to loose timezone info
-                        // save it here so we can add it later
-                        $recurrent_timezone = (string)$vcalendar->VEVENT->DTSTART['TZID'];
-                        $vcalendar = $vcalendar->expand($start, $end);
-                    }
-
-                    foreach ($vcalendar->VEVENT as $vevent) {
-                        $title = (string)$vevent->SUMMARY;
-                        $dtstart = (string)$vevent->DTSTART;
-                        $dtend = (string)$vevent->DTEND;
-                        $description = (string)$vevent->DESCRIPTION;
-                        $location = (string)$vevent->LOCATION;
-                        $timezone = (string)$vevent->DTSTART['TZID'];
-                        $rw = ((cdav_perms($id[0], $calendars, true)) ? true : false);
-                        $editable = $rw ? true : false;
-                        $recurrent = ((isset($vevent->{'RECURRENCE-ID'})) ? true : false);
-
-                        if ($recurrent) {
-                            $editable = false;
-                            $timezone = $recurrent_timezone;
-                        }
-
-                        $allDay = false;
-
-                        // allDay event rules
-                        if (!strpos($dtstart, 'T') && !strpos($dtend, 'T')) {
-                            $allDay = true;
-                        }
-                        if (strpos($dtstart, 'T000000') && strpos($dtend, 'T000000')) {
-                            $allDay = true;
-                        }
-
-                        $events[] = [
-                            'calendar_id' => $id,
-                            'uri' => $object['uri'],
-                            'title' => $title,
-                            'start' => datetime_convert($timezone, $timezone, $dtstart, 'c'),
-                            'end' => (($dtend) ? datetime_convert($timezone, $timezone, $dtend, 'c') : ''),
-                            'description' => $description,
-                            'location' => $location,
-                            'allDay' => $allDay,
-                            'editable' => $editable,
-                            'recurrent' => $recurrent,
-                            'rw' => $rw
-                        ];
-                    }
-                }
-            }
-            json_return_and_die($events);
-        }
-
-        // enable/disable calendars
-        if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'switch' && argv(3) && (argv(4) == 1 || argv(4) == 0)) {
-            $id = argv(3);
-
-            if (!cdav_perms($id, $calendars)) {
-                killme();
-            }
-
-            set_pconfig(local_channel(), 'cdav_calendar', argv(3), argv(4));
-            killme();
-        }
-
-        // drop calendar
-        if (argc() == 5 && argv(1) === 'calendar' && argv(2) === 'drop' && intval(argv(3)) && intval(argv(4))) {
-            $id = [argv(3), argv(4)];
-
-            if (!cdav_perms($id[0], $calendars)) {
-                killme();
-            }
-
-            $caldavBackend->deleteCalendar($id);
-            killme();
-        }
-
-        // drop sharee
-        if (argc() == 6 && argv(1) === 'calendar' && argv(2) === 'dropsharee' && intval(argv(3)) && intval(argv(4))) {
-            $id = [argv(3), argv(4)];
-            $hash = argv(5);
-
-            if (!cdav_perms($id[0], $calendars)) {
-                killme();
-            }
-
-            $sharee_arr = Channel::from_hash($hash);
-
-            $sharee = new Sharee();
-
-            $sharee->href = 'mailto:' . $sharee_arr['xchan_addr'];
-            $sharee->principal = 'principals/' . $sharee_arr['channel_address'];
-            $sharee->access = 4;
-            $caldavBackend->updateInvites($id, [$sharee]);
-
-            killme();
-        }
-
-
-        if (argv(1) === 'addressbook') {
-            Navbar::set_selected('CardDAV');
-            $carddavBackend = new PDO($pdo);
-            $addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
-        }
-
-        // Display Adressbook here
-        if (argc() == 3 && argv(1) === 'addressbook' && intval(argv(2))) {
-            $id = argv(2);
-
-            $displayname = cdav_perms($id, $addressbooks);
-
-            if (!$displayname) {
-                return;
-            }
-
-            Head::add_css('cdav_addressbook.css');
-
-            $o = '';
-
-            $sabrecards = $carddavBackend->getCards($id);
-            foreach ($sabrecards as $sabrecard) {
-                $uris[] = $sabrecard['uri'];
-            }
-
-            if ($uris) {
-                $objects = $carddavBackend->getMultipleCards($id, $uris);
-
-                foreach ($objects as $object) {
-                    $vcard = Reader::read($object['carddata']);
-
-                    $photo = '';
-                    if ($vcard->PHOTO) {
-                        $photo_value = strtolower($vcard->PHOTO->getValueType()); // binary or uri
-                        if ($photo_value === 'binary') {
-                            $photo_type = strtolower($vcard->PHOTO['TYPE']); // mime jpeg, png or gif
-                            $photo = 'data:image/' . $photo_type . ';base64,' . base64_encode((string)$vcard->PHOTO);
-                        } else {
-                            $url = parse_url((string)$vcard->PHOTO);
-                            $photo = 'data:' . $url['path'];
-                        }
-                    }
-
-                    $fn = '';
-                    if ($vcard->FN) {
-                        $fn = (string)$vcard->FN;
-                    }
-
-                    $org = '';
-                    if ($vcard->ORG) {
-                        $org = (string)$vcard->ORG;
-                    }
-
-                    $title = '';
-                    if ($vcard->TITLE) {
-                        $title = (string)$vcard->TITLE;
-                    }
-
-                    $tels = [];
-                    if ($vcard->TEL) {
-                        foreach ($vcard->TEL as $tel) {
-                            $type = (($tel['TYPE']) ? translate_type((string)$tel['TYPE']) : '');
-                            $tels[] = [
-                                'type' => $type,
-                                'nr' => (string)$tel
-                            ];
-                        }
-                    }
-
-                    $emails = [];
-                    if ($vcard->EMAIL) {
-                        foreach ($vcard->EMAIL as $email) {
-                            $type = (($email['TYPE']) ? translate_type((string)$email['TYPE']) : '');
-                            $emails[] = [
-                                'type' => $type,
-                                'address' => (string)$email
-                            ];
-                        }
-                    }
-
-                    $impps = [];
-                    if ($vcard->IMPP) {
-                        foreach ($vcard->IMPP as $impp) {
-                            $type = (($impp['TYPE']) ? translate_type((string)$impp['TYPE']) : '');
-                            $impps[] = [
-                                'type' => $type,
-                                'address' => (string)$impp
-                            ];
-                        }
-                    }
-
-                    $urls = [];
-                    if ($vcard->URL) {
-                        foreach ($vcard->URL as $url) {
-                            $type = (($url['TYPE']) ? translate_type((string)$url['TYPE']) : '');
-                            $urls[] = [
-                                'type' => $type,
-                                'address' => (string)$url
-                            ];
-                        }
-                    }
-
-                    $adrs = [];
-                    if ($vcard->ADR) {
-                        foreach ($vcard->ADR as $adr) {
-                            $type = (($adr['TYPE']) ? translate_type((string)$adr['TYPE']) : '');
-                            $adrs[] = [
-                                'type' => $type,
-                                'address' => $adr->getParts()
-                            ];
-                        }
-                    }
-
-                    $note = '';
-                    if ($vcard->NOTE) {
-                        $note = (string)$vcard->NOTE;
-                    }
-
-                    $cards[] = [
-                        'id' => $object['id'],
-                        'uri' => $object['uri'],
-                        'photo' => $photo,
-                        'fn' => $fn,
-                        'org' => $org,
-                        'title' => $title,
-                        'tels' => $tels,
-                        'emails' => $emails,
-                        'impps' => $impps,
-                        'urls' => $urls,
-                        'adrs' => $adrs,
-                        'note' => $note
-                    ];
-                }
-
-                usort($cards, function ($a, $b) {
-                    return strcasecmp($a['fn'], $b['fn']);
-                });
-            }
-
-            $o .= replace_macros(Theme::get_template('cdav_addressbook.tpl'), [
-                '$id' => $id,
-                '$cards' => $cards,
-                '$displayname' => $displayname,
-                '$name_label' => t('Name'),
-                '$org_label' => t('Organisation'),
-                '$title_label' => t('Title'),
-                '$tel_label' => t('Phone'),
-                '$email_label' => t('Email'),
-                '$impp_label' => t('Instant messenger'),
-                '$url_label' => t('Website'),
-                '$adr_label' => t('Address'),
-                '$note_label' => t('Note'),
-                '$mobile' => t('Mobile'),
-                '$home' => t('Home'),
-                '$work' => t('Work'),
-                '$other' => t('Other'),
-                '$add_card' => t('Add Contact'),
-                '$add_field' => t('Add Field'),
-                '$create' => t('Create'),
-                '$update' => t('Update'),
-                '$delete' => t('Delete'),
-                '$cancel' => t('Cancel'),
-                '$po_box' => t('P.O. Box'),
-                '$extra' => t('Additional'),
-                '$street' => t('Street'),
-                '$locality' => t('Locality'),
-                '$region' => t('Region'),
-                '$zip_code' => t('ZIP Code'),
-                '$country' => t('Country')
-            ]);
-
-            return $o;
-        }
-
-        // delete addressbook
-        if (argc() > 3 && argv(1) === 'addressbook' && argv(2) === 'drop' && intval(argv(3))) {
-            $id = argv(3);
-
-            if (!cdav_perms($id, $addressbooks)) {
-                return;
-            }
-
-            $carddavBackend->deleteAddressBook($id);
-            killme();
-        }
-    }
-
-    public function activate($pdo, $channel)
-    {
-
-        if (!$channel) {
-            return;
-        }
-
-        $uri = 'principals/' . $channel['channel_address'];
-
-
-        $r = q(
-            "select * from principals where uri = '%s' limit 1",
-            dbesc($uri)
-        );
-        if ($r) {
-            $r = q(
-                "update principals set email = '%s', displayname = '%s' where uri = '%s' ",
-                dbesc($channel['xchan_addr']),
-                dbesc($channel['channel_name']),
-                dbesc($uri)
-            );
-        } else {
-            $r = q(
-                "insert into principals ( uri, email, displayname ) values('%s','%s','%s') ",
-                dbesc($uri),
-                dbesc($channel['xchan_addr']),
-                dbesc($channel['channel_name'])
-            );
-
-            // create default calendar
-            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
-            $properties = [
-                '{DAV:}displayname' => t('Default Calendar'),
-                '{http://apple.com/ns/ical/}calendar-color' => '#6cad39',
-                '{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name']
-            ];
-
-            $id = $caldavBackend->createCalendar($uri, 'default', $properties);
-            set_pconfig(local_channel(), 'cdav_calendar', $id[0], 1);
-            set_pconfig(local_channel(), 'cdav_calendar', 'calendar', 1);
-
-            // create default addressbook
-            $carddavBackend = new PDO($pdo);
-            $properties = ['{DAV:}displayname' => t('Default Addressbook')];
-            $carddavBackend->createAddressBook($uri, 'default', $properties);
-        }
-    }
-}
diff --git a/Zotlabs/Module/Changeaddr.php b/Zotlabs/Module/Changeaddr.php
deleted file mode 100644
index 2ddadc2d5..000000000
--- a/Zotlabs/Module/Changeaddr.php
+++ /dev/null
@@ -1,119 +0,0 @@
- NULL_DATE) {
-            $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours');
-            if ($account['account_password_changed'] > $d1) {
-                notice(t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL);
-                return;
-            }
-        }
-
-        $new_address = trim($_POST['newname']);
-
-        if ($new_address === $channel['channel_address']) {
-            return;
-        }
-
-        if ($new_address === 'sys') {
-            notice(t('Reserved nickname. Please choose another.') . EOL);
-            return;
-        }
-
-        if (check_webbie(array($new_address)) !== $new_address) {
-            notice(t('Nickname has unsupported characters or is already being used on this site.') . EOL);
-            return $ret;
-        }
-
-        Channel::change_address($channel, $new_address);
-
-        goaway(z_root() . '/changeaddr');
-    }
-
-
-    public function get()
-    {
-
-        if (!get_config('system', 'allow_nick_change')) {
-            notice(t('Feature has been disabled') . EOL);
-            return;
-        }
-
-
-        if (!local_channel()) {
-            goaway(z_root());
-        }
-
-        $channel = App::get_channel();
-
-        $hash = random_string();
-
-        $_SESSION['remove_account_verify'] = $hash;
-
-        $tpl = Theme::get_template('channel_rename.tpl');
-        $o .= replace_macros($tpl, [
-            '$basedir' => z_root(),
-            '$hash' => $hash,
-            '$title' => t('Change channel nickname/address'),
-            '$desc' => array(t('WARNING: '), t('Any/all connections on other networks will be lost!')),
-            '$passwd' => t('Please enter your password for verification:'),
-            '$newname' => ['newname', t('New channel address'), $channel['channel_address'], ''],
-            '$submit' => t('Rename Channel')
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
deleted file mode 100644
index e7beafd8b..000000000
--- a/Zotlabs/Module/Channel.php
+++ /dev/null
@@ -1,619 +0,0 @@
- 1) {
-            $which = argv(1);
-        }
-        if (!$which) {
-            if (local_channel()) {
-                $channel = App::get_channel();
-                if ($channel && $channel['channel_address']) {
-                    $which = $channel['channel_address'];
-                }
-            }
-        }
-        if (!$which) {
-            notice(t('You must be logged in to see this page.') . EOL);
-            return;
-        }
-
-        $profile = 0;
-        $channel = App::get_channel();
-
-        if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-            $which = $channel['channel_address'];
-            $profile = argv(1);
-        }
-
-        $channel = Zlib\Channel::from_username($which, true);
-        if (!$channel) {
-            http_status_exit(404, 'Not found');
-        }
-        if ($channel['channel_removed']) {
-            http_status_exit(410, 'Gone');
-        }
-
-        if (get_pconfig($channel['channel_id'], 'system', 'noindex')) {
-            App::$meta->set('robots', 'noindex, noarchive');
-        }
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/atom+xml',
-            'title' => t('Only posts'),
-            'href' => z_root() . '/feed/' . $which
-        ]);
-
-
-        // An ActivityStreams actor record is more or less required for ActivityStreams compliance
-        // unless the actor object is inlined into every activity/object. This implies that it
-        // is more or less required for the Zot6 protocol, which uses ActivityStreams as a content
-        // serialisation and which doesn't always include the full actor record with every
-        // activity/object.
-
-        // "more or less" means it isn't spelled out in the ActivityStreams spec, but a number of
-        // things will break in subtle ways if it isn't provided.
-
-        // The ActivityPub protocol requires an 'inbox', which will not be present in this record
-        // if/when the ActivityPub protocol is disabled. This will be the case when using the Redmatrix
-        // fork of Zap; which disables ActivityPub connectivity by default.
-
-        if (ActivityStreams::is_as_request()) {
-            // Somebody may attempt an ActivityStreams fetch on one of our message permalinks
-            // Make it do the right thing.
-
-            $mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
-            $mid = unpack_link_id($mid);
-
-            if ($mid) {
-                $obj = null;
-                if (strpos($mid, z_root() . '/item/') === 0) {
-                    App::$argc = 2;
-                    App::$argv = ['item', basename($mid)];
-                    $obj = new Item();
-                }
-                if (strpos($mid, z_root() . '/activity/') === 0) {
-                    App::$argc = 2;
-                    App::$argv = ['activity', basename($mid)];
-                    $obj = new Activity();
-                }
-                if ($obj) {
-                    $obj->init();
-                }
-            }
-            if (intval($channel['channel_system'])) {
-                goaway(z_root());
-            }
-            as_return_and_die(Activity::encode_person($channel, true, true), $channel);
-        }
-
-        // handle zot6 channel discovery
-
-        if (Libzot::is_zot_request()) {
-            $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
-
-            if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
-                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']]));
-                $s = q(
-                    "select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('nomad','zot6') limit 1",
-                    dbesc($sigdata['signer'])
-                );
-
-                if ($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) {
-                    $data = json_encode(Crypto::encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto'])));
-                }
-            } else {
-                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']]));
-            }
-
-            $headers = [
-                'Content-Type' => 'application/x-nomad+json',
-                'Digest' => HTTPSig::generate_digest_header($data),
-                '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
-            ];
-            $h = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Zlib\Channel::url($channel));
-            HTTPSig::set_headers($h);
-            echo $data;
-            killme();
-        }
-
-
-        // Run Libprofile::load() here to make sure the theme is set before
-        // we start loading content
-
-        Libprofile::load($which, $profile);
-
-        if (!$_REQUEST['mid']) {
-            App::$meta->set('og:title', $channel['channel_name']);
-            App::$meta->set('og:image', $channel['xchan_photo_l']);
-            App::$meta->set('og:type', 'webpage');
-            App::$meta->set('og:url:secure_url', Zlib\Channel::url($channel));
-            if (App::$profile['about'] && perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_profile')) {
-                App::$meta->set('og:description', App::$profile['about']);
-            } else {
-                App::$meta->set('og:description', sprintf(t('This is the home page of %s.'), $channel['channel_name']));
-            }
-        }
-    }
-
-    public function get()
-    {
-
-        $noscript_content = get_config('system', 'noscript_content', '1');
-
-        $category = $datequery = $datequery2 = '';
-
-        $mid = ((x($_REQUEST, 'mid')) ? $_REQUEST['mid'] : '');
-        $mid = unpack_link_id($mid);
-
-        $datequery = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
-        $datequery2 = ((x($_GET, 'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
-
-        if (observer_prohibited(true)) {
-            return login();
-        }
-
-        $category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : '');
-        $hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : '');
-        $order = ((x($_GET, 'order')) ? notags($_GET['order']) : 'post');
-        $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
-        $search = ((x($_GET, 'search')) ? $_GET['search'] : EMPTY_STR);
-
-        $groups = [];
-
-        $o = '';
-
-        if ($this->updating) {
-            // Ensure we've got a profile owner if updating.
-            App::$profile['profile_uid'] = App::$profile_uid = $this->profile_uid;
-        }
-
-        $is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false);
-
-        $channel = App::get_channel();
-        $observer = App::get_observer();
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms(App::$profile['profile_uid'], $ob_hash);
-
-
-        if ($this->loading && !$mid) {
-            $_SESSION['loadtime_channel'] = datetime_convert();
-            if ($is_owner) {
-                PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
-            }
-        }
-
-
-        if (!$perms['view_stream']) {
-            // We may want to make the target of this redirect configurable
-            if ($perms['view_profile']) {
-                notice(t('Insufficient permissions.  Request redirected to profile page.') . EOL);
-                goaway(z_root() . "/profile/" . App::$profile['channel_address']);
-            }
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-
-        if (!$this->updating) {
-            Navbar::set_selected('Channel Home');
-
-            $static = Zlib\Channel::manual_conv_update(App::$profile['profile_uid']);
-
-            // search terms header
-            if ($search) {
-                $o .= replace_macros(Theme::get_template("section_title.tpl"), array(
-                    '$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8')
-                ));
-            }
-
-            $role = get_pconfig(App::$profile['profile_uid'], 'system', 'permissions_role');
-            if ($role === 'social_restricted' && (!$ob_hash)) {
-                // provide warning that content is probably hidden ?
-            }
-
-            if ($channel && $is_owner) {
-                $channel_acl = array(
-                    'allow_cid' => $channel['channel_allow_cid'],
-                    'allow_gid' => $channel['channel_allow_gid'],
-                    'deny_cid' => $channel['channel_deny_cid'],
-                    'deny_gid' => $channel['channel_deny_gid']
-                );
-            } else {
-                $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
-            }
-
-
-            if ($perms['post_wall']) {
-                $x = array(
-                    'is_owner' => $is_owner,
-                    'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'], 'system', 'use_browser_location')))) ? true : false),
-                    'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''),
-                    'nickname' => App::$profile['channel_address'],
-                    'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-                    'acl' => (($is_owner) ? Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
-                    'permissions' => $channel_acl,
-                    'showacl' => (($is_owner) ? 'yes' : ''),
-                    'bang' => '',
-                    'visitor' => (($is_owner || $observer) ? true : false),
-                    'profile_uid' => App::$profile['profile_uid'],
-                    'editor_autocomplete' => true,
-                    'bbco_autocomplete' => 'bbcode',
-                    'bbcode' => true,
-                    'jotnets' => true,
-                    'reset' => t('Reset form')
-                );
-
-                $o .= status_editor($x);
-            }
-
-            if (!$mid && !$search) {
-                $obj = new Pinned();
-                $o .= $obj->widget([]);
-            }
-        }
-
-
-        /**
-         * Get permissions SQL
-         */
-
-        $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_deleted = 0
-		    and item.item_unpublished = 0 and item.item_pending_remove = 0
-		    and item.item_blocked = 0 ";
-        if (!$is_owner) {
-            $item_normal .= "and item.item_delayed = 0 ";
-        }
-        $item_normal_update = item_normal_update();
-        $sql_extra = item_permissions_sql(App::$profile['profile_uid']);
-
-        if (get_pconfig(App::$profile['profile_uid'], 'system', 'channel_list_mode') && (!$mid)) {
-            $page_mode = 'list';
-        } else {
-            $page_mode = 'client';
-        }
-
-        $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
-
-        $simple_update = (($this->updating) ? " AND item_unseen = 1 " : '');
-
-        if ($search) {
-            $search = escape_tags($search);
-            if (strpos($search, '#') === 0) {
-                $sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG);
-            } else {
-                $sql_extra .= sprintf(
-                    " AND (item.body like '%s' OR item.title like '%s') ",
-                    dbesc(protect_sprintf('%' . $search . '%')),
-                    dbesc(protect_sprintf('%' . $search . '%'))
-                );
-            }
-        }
-
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/json+oembed',
-            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-            'title' => 'oembed'
-        ]);
-
-        if ($this->updating && isset($_SESSION['loadtime_channel'])) {
-            $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_channel']) . "' ";
-        }
-        if ($this->loading) {
-            $simple_update = '';
-        }
-
-        if ($static && $simple_update) {
-            $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
-        }
-
-        if (($this->updating) && (!$this->loading)) {
-            if ($mid) {
-                $r = q(
-                    "SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal_update
-					AND item_wall = 1 $simple_update $sql_extra limit 1",
-                    dbesc($mid . '%'),
-                    intval(App::$profile['profile_uid'])
-                );
-            } else {
-                $r = q(
-                    "SELECT parent AS item_id from item
-					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-					WHERE uid = %d $item_normal_update
-					AND item_wall = 1 $simple_update
-					AND (abook.abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra
-					ORDER BY created DESC",
-                    intval(App::$profile['profile_uid'])
-                );
-            }
-        } else {
-            if (x($category)) {
-                $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
-            }
-            if (x($hashtags)) {
-                $sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
-            }
-
-            if ($datequery) {
-                $sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
-                $order = 'post';
-            }
-            if ($datequery2) {
-                $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
-            }
-
-            if ($datequery || $datequery2) {
-                $sql_extra2 .= " and item.item_thread_top != 0 ";
-            }
-
-            if ($order === 'post') {
-                $ordering = "created";
-            } else {
-                $ordering = "commented";
-            }
-
-            $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
-            App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
-            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-
-            if ($noscript_content || $this->loading) {
-                if ($mid) {
-                    $r = q(
-                        "SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
-						AND item_wall = 1 $sql_extra limit 1",
-                        dbesc($mid . '%'),
-                        intval(App::$profile['profile_uid'])
-                    );
-                    if (!$r) {
-                        notice(t('Permission denied.') . EOL);
-                    }
-                } else {
-                    $r = q(
-                        "SELECT DISTINCT item.parent AS item_id, $ordering FROM item 
-						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
-						WHERE true and item.uid = %d $item_normal
-						AND (abook.abook_blocked = 0 or abook.abook_flags is null)
-						AND item.item_wall = 1 AND item.item_thread_top = 1
-						$sql_extra $sql_extra2 
-						ORDER BY $ordering DESC $pager_sql ",
-                        intval(App::$profile['profile_uid'])
-                    );
-                }
-            } else {
-                $r = [];
-            }
-        }
-        if ($r) {
-            $parents_str = ids_to_querystr($r, 'item_id');
-
-            $items = q(
-                "SELECT item.*, item.id AS item_id
-				FROM item
-				WHERE item.uid = %d $item_normal
-				AND item.parent IN ( %s )
-				$sql_extra ",
-                intval(App::$profile['profile_uid']),
-                dbesc($parents_str)
-            );
-
-            xchan_query($items);
-            $items = fetch_post_tags($items, true);
-            $items = conv_sort($items, $ordering);
-
-            if ($this->loading && $mid && (!count($items))) {
-                // This will happen if we don't have sufficient permissions
-                // to view the parent item (or the item itself if it is toplevel)
-                notice(t('Permission denied.') . EOL);
-            }
-        } else {
-            $items = [];
-        }
-
-        if ((!$this->updating) && (!$this->loading)) {
-            // This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
-            // because browser prefetching might change it on us. We have to deliver it with the page.
-
-            $maxheight = get_pconfig(App::$profile['profile_uid'], 'system', 'channel_divmore_height');
-            if (!$maxheight) {
-                $maxheight = 400;
-            }
-
-            $o .= '
          ' . "\r\n";
-            $o .= "\r\n";
-
-            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), array(
-                '$baseurl' => z_root(),
-                '$pgtype' => 'channel',
-                '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
-                '$gid' => '0',
-                '$cid' => '0',
-                '$cmin' => '(-1)',
-                '$cmax' => '(-1)',
-                '$star' => '0',
-                '$liked' => '0',
-                '$conv' => '0',
-                '$spam' => '0',
-                '$nouveau' => '0',
-                '$wall' => '1',
-                '$draft' => '0',
-                '$fh' => '0',
-                '$dm' => '0',
-                '$static' => $static,
-                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-                '$search' => $search,
-                '$xchan' => '',
-                '$order' => (($order) ? urlencode($order) : ''),
-                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
-                '$file' => '',
-                '$cats' => (($category) ? urlencode($category) : ''),
-                '$tags' => (($hashtags) ? urlencode($hashtags) : ''),
-                '$mid' => (($mid) ? urlencode($mid) : ''),
-                '$verb' => '',
-                '$net' => '',
-                '$dend' => $datequery,
-                '$dbegin' => $datequery2
-            ));
-        }
-
-        $update_unseen = '';
-
-        if ($page_mode === 'list') {
-
-            /**
-             * in "list mode", only mark the parent item and any like activities as "seen".
-             * We won't distinguish between comment likes and post likes. The important thing
-             * is that the number of unseen comments will be accurate. The SQL to separate the
-             * comment likes could also get somewhat hairy.
-             */
-
-            if (isset($parents_str) && $parents_str) {
-                $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
-                $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
-            }
-        } else {
-            if (isset($parents_str) && $parents_str) {
-                $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
-            }
-        }
-
-        if ($is_owner && $update_unseen && (!$_SESSION['sudo'])) {
-            $x = ['channel_id' => local_channel(), 'update' => 'unset'];
-            Hook::call('update_unseen', $x);
-            if ($x['update'] === 'unset' || intval($x['update'])) {
-                $r = q(
-                    "UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen",
-                    intval(local_channel())
-                );
-            }
-
-            $ids = ids_to_array($items, 'item_id');
-            $seen = PConfig::Get(local_channel(), 'system', 'seen_items');
-            if (!$seen) {
-                $seen = [];
-            }
-            $seen = array_merge($ids, $seen);
-            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
-        }
-
-        $mode = (($search) ? 'search' : 'channel');
-
-        if ($this->updating) {
-            $o .= conversation($items, $mode, $this->updating, $page_mode);
-        } else {
-            $o .= '';
-
-            $o .= conversation($items, $mode, $this->updating, $page_mode);
-
-            if ($mid && $items[0]['title']) {
-                App::$page['title'] = $items[0]['title'] . " - " . App::$page['title'];
-            }
-        }
-
-        // We reset $channel so that info can be obtained for unlogged visitors
-        $channel = Zlib\Channel::from_id(App::$profile['profile_uid']);
-
-        if (isset($_REQUEST['mid']) && $_REQUEST['mid']) {
-            if (preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) {
-                $ogimage = $matches[2];
-                //  Will we use og:image:type someday? We keep this just in case
-                //  $ogimagetype = guess_image_type($ogimage);
-            }
-
-            // some work on post content to generate a description
-            // almost fully based on work done on Hubzilla by Max Kostikov
-            $ogdesc = $items[0]['body'];
-
-            $ogdesc = str_replace("#^[", "[", $ogdesc);
-
-            $ogdesc = bbcode($ogdesc, ['tryoembed' => false]);
-            $ogdesc = trim(html2plain($ogdesc, 0, true));
-            $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8');
-
-            // remove all URLs
-            $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc);
-
-            // shorten description
-            $ogdesc = substr($ogdesc, 0, 300);
-            $ogdesc = str_replace("\n", " ", $ogdesc);
-            while (strpos($ogdesc, "  ") !== false) {
-                $ogdesc = str_replace("  ", " ", $ogdesc);
-            }
-            $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "...");
-
-            // we can now start loading content
-
-            App::$meta->set('og:title', ($items[0]['title'] ? $items[0]['title'] : $channel['channel_name']));
-            App::$meta->set('og:image', ($ogimage ? $ogimage : $channel['xchan_photo_l']));
-            App::$meta->set('og:type', 'article');
-            App::$meta->set('og:url:secure_url', Zlib\Channel::url($channel));
-            App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf(t('This post was published on the home page of %s.'), $channel['channel_name'])));
-        }
-
-        if ($mid) {
-            $o .= '
          ';
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php
deleted file mode 100644
index c5ed66ec5..000000000
--- a/Zotlabs/Module/Chanview.php
+++ /dev/null
@@ -1,184 +0,0 @@
- $url,
-                '$photo' => get_xconfig(App::$poi['xchan_hash'], 'system', 'cover_photo'),
-                '$alt' => t('Cover photo for this channel'),
-                '$about' => $about,
-                '$followers_txt' => t('Followers'),
-                '$following_txt' => t('Following'),
-                '$followers' => $followers,
-                '$following' => $following,
-                '$visit' => t('Visit'),
-                '$full' => t('toggle full screen mode')
-            ]);
-
-            return $o;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php
deleted file mode 100644
index 3a3bf8d1b..000000000
--- a/Zotlabs/Module/Chat.php
+++ /dev/null
@@ -1,273 +0,0 @@
- 1) ? argv(1) : null);
-        if (local_channel() && (!$which)) {
-            $channel = App::get_channel();
-            if ($channel && $channel['channel_address']) {
-                $which = $channel['channel_address'];
-            }
-        }
-
-        if (!$which) {
-            notice(t('You must be logged in to see this page.') . EOL);
-            return;
-        }
-
-        $profile = 0;
-
-        // Run Libprofile::load() here to make sure the theme is set before
-        // we start loading content
-
-        Libprofile::load($which, $profile);
-    }
-
-    public function post()
-    {
-
-        if ($_POST['room_name']) {
-            $room = strip_tags(trim($_POST['room_name']));
-        }
-
-        if ((!$room) || (!local_channel())) {
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        if ($_POST['action'] === 'drop') {
-            logger('delete chatroom');
-            Chatroom::destroy($channel, ['cr_name' => $room]);
-            goaway(z_root() . '/chat/' . $channel['channel_address']);
-        }
-
-        $acl = new AccessControl($channel);
-        $acl->set_from_array($_REQUEST);
-
-        $arr = $acl->get();
-        $arr['name'] = $room;
-        $arr['expire'] = intval($_POST['chat_expire']);
-        if (intval($arr['expire']) < 0) {
-            $arr['expire'] = 0;
-        }
-
-        Chatroom::create($channel, $arr);
-
-        $x = q(
-            "select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1",
-            dbesc($room),
-            intval(local_channel())
-        );
-
-        Libsync::build_sync_packet(0, array('chatroom' => $x));
-
-        if ($x) {
-            goaway(z_root() . '/chat/' . $channel['channel_address'] . '/' . $x[0]['cr_id']);
-        }
-
-        // that failed. Try again perhaps?
-
-        goaway(z_root() . '/chat/' . $channel['channel_address'] . '/new');
-    }
-
-
-    public function get()
-    {
-
-//      if(! Apps::system_app_installed(App::$profile_uid, 'Chatrooms')) {
-//          // Do not display any associated widgets at this point
-//          App::$pdl = '';
-//
-//          $o = 'Chatrooms App (Not Installed):
          ';
-//          $o .= t('Access Controlled Chatrooms');
-//          return $o;
-//      }
-
-        if (local_channel()) {
-            $channel = App::get_channel();
-            Navbar::set_selected('Chatrooms');
-        }
-
-        $ob = App::get_observer();
-        $observer = get_observer_hash();
-        if (!$observer) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if (!perm_is_allowed(App::$profile['profile_uid'], $observer, 'chat')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) {
-            Chatroom::leave($observer, argv(2), $_SERVER['REMOTE_ADDR']);
-            goaway(z_root() . '/channel/' . argv(1));
-        }
-
-
-        if ((argc() > 3) && intval(argv(2)) && (argv(3) === 'status')) {
-            $ret = ['success' => false];
-            $room_id = intval(argv(2));
-            if (!$room_id || !$observer) {
-                return;
-            }
-
-            $r = q(
-                "select * from chatroom where cr_id = %d limit 1",
-                intval($room_id)
-            );
-            if (!$r) {
-                json_return_and_die($ret);
-            }
-            require_once('include/security.php');
-            $sql_extra = permissions_sql($r[0]['cr_uid']);
-
-            $x = q(
-                "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
-                intval($room_id),
-                intval($r[0]['cr_uid'])
-            );
-            if (!$x) {
-                json_return_and_die($ret);
-            }
-            $y = q(
-                "select count(*) as total from chatpresence where cp_room = %d",
-                intval($room_id)
-            );
-            if ($y) {
-                $ret['success'] = true;
-                $ret['chatroom'] = $r[0]['cr_name'];
-                $ret['inroom'] = $y[0]['total'];
-            }
-
-            // figure out how to present a timestamp of the last activity, since we don't know the observer's timezone.
-
-            $z = q(
-                "select created from chat where chat_room = %d order by created desc limit 1",
-                intval($room_id)
-            );
-            if ($z) {
-                $ret['last'] = $z[0]['created'];
-            }
-            json_return_and_die($ret);
-        }
-
-
-        if (argc() > 2 && intval(argv(2))) {
-            $room_id = intval(argv(2));
-
-            $x = Chatroom::enter($observer, $room_id, 'online', $_SERVER['REMOTE_ADDR']);
-            if (!$x) {
-                return;
-            }
-            $x = q(
-                "select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
-                intval($room_id),
-                intval(App::$profile['profile_uid'])
-            );
-
-            if ($x) {
-                $acl = new AccessControl(false);
-                $acl->set($x[0]);
-
-                $private = $acl->is_private();
-                $room_name = $x[0]['cr_name'];
-            } else {
-                notice(t('Room not found') . EOL);
-                return;
-            }
-
-            $cipher = get_pconfig(local_channel(), 'system', 'default_cipher');
-            if (!$cipher) {
-                $cipher = 'AES-128-CCM';
-            }
-
-
-            $o = replace_macros(Theme::get_template('chat.tpl'), [
-                '$is_owner' => ((local_channel() && local_channel() == $x[0]['cr_uid']) ? true : false),
-                '$room_name' => $room_name,
-                '$room_id' => $room_id,
-                '$baseurl' => z_root(),
-                '$nickname' => argv(1),
-                '$submit' => t('Submit'),
-                '$leave' => t('Leave Room'),
-                '$drop' => t('Delete Room'),
-                '$away' => t('I am away right now'),
-                '$online' => t('I am online'),
-                '$feature_encrypt' => ((Apps::system_app_installed(local_channel(), 'Secrets')) ? true : false),
-                '$cipher' => $cipher,
-                '$linkurl' => t('Please enter a link URL:'),
-                '$encrypt' => t('Encrypt text'),
-                '$insert' => t('Insert web link')
-            ]);
-            return $o;
-        }
-
-        require_once('include/conversation.php');
-
-        $o = '';
-
-        $acl = new AccessControl($channel);
-        $channel_acl = $acl->get();
-
-        $lockstate = (($channel_acl['allow_cid'] || $channel_acl['allow_gid'] || $channel_acl['deny_cid'] || $channel_acl['deny_gid']) ? 'lock' : 'unlock');
-
-        $chatroom_new = '';
-        if (local_channel()) {
-            $chatroom_new = replace_macros(Theme::get_template('chatroom_new.tpl'), array(
-                '$header' => t('New Chatroom'),
-                '$name' => array('room_name', t('Chatroom name'), '', ''),
-                '$chat_expire' => array('chat_expire', t('Expiration of chats (minutes)'), 120, ''),
-                '$permissions' => t('Permissions'),
-                '$acl' => Libacl::populate($channel_acl, false),
-                '$allow_cid' => acl2json($channel_acl['allow_cid']),
-                '$allow_gid' => acl2json($channel_acl['allow_gid']),
-                '$deny_cid' => acl2json($channel_acl['deny_cid']),
-                '$deny_gid' => acl2json($channel_acl['deny_gid']),
-                '$lockstate' => $lockstate,
-                '$submit' => t('Submit')
-
-            ));
-        }
-
-        $rooms = Chatroom::roomlist(App::$profile['profile_uid']);
-
-        $o .= replace_macros(Theme::get_template('chatrooms.tpl'), [
-            '$header' => sprintf(t('%1$s\'s Chatrooms'), App::$profile['fullname']),
-            '$name' => t('Name'),
-            '$baseurl' => z_root(),
-            '$nickname' => App::$profile['channel_address'],
-            '$rooms' => $rooms,
-            '$norooms' => t('No chatrooms available'),
-            '$newroom' => t('Create New'),
-            '$is_owner' => ((local_channel() && local_channel() == App::$profile['profile_uid']) ? 1 : 0),
-            '$chatroom_new' => $chatroom_new,
-            '$expire' => t('Expiration'),
-            '$expire_unit' => t('min') //minutes
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php
deleted file mode 100644
index 69dd42911..000000000
--- a/Zotlabs/Module/Chatsvc.php
+++ /dev/null
@@ -1,201 +0,0 @@
- false);
-
-        App::$data['chat']['room_id'] = intval($_REQUEST['room_id']);
-        $x = q(
-            "select cr_uid from chatroom where cr_id = %d and cr_id != 0 limit 1",
-            intval(App::$data['chat']['room_id'])
-        );
-        if (!$x) {
-            json_return_and_die($ret);
-        }
-
-        App::$data['chat']['uid'] = $x[0]['cr_uid'];
-
-        if (!perm_is_allowed(App::$data['chat']['uid'], get_observer_hash(), 'chat')) {
-            json_return_and_die($ret);
-        }
-    }
-
-    public function post()
-    {
-
-        $ret = array('success' => false);
-
-        $room_id = App::$data['chat']['room_id'];
-        $text = escape_tags($_REQUEST['chat_text']);
-        if (!$text) {
-            return;
-        }
-
-        $sql_extra = permissions_sql(App::$data['chat']['uid']);
-
-        $r = q(
-            "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
-            intval(App::$data['chat']['uid']),
-            intval(App::$data['chat']['room_id'])
-        );
-        if (!$r) {
-            json_return_and_die($ret);
-        }
-
-        $arr = array(
-            'chat_room' => App::$data['chat']['room_id'],
-            'chat_xchan' => get_observer_hash(),
-            'chat_text' => $text
-        );
-
-        Hook::call('chat_post', $arr);
-
-        $x = q(
-            "insert into chat ( chat_room, chat_xchan, created, chat_text )
-			values( %d, '%s', '%s', '%s' )",
-            intval(App::$data['chat']['room_id']),
-            dbesc(get_observer_hash()),
-            dbesc(datetime_convert()),
-            dbesc(str_rot47(base64url_encode($arr['chat_text'])))
-        );
-
-        $ret['success'] = true;
-        json_return_and_die($ret);
-    }
-
-    public function get()
-    {
-
-        $status = strip_tags($_REQUEST['status']);
-        $room_id = intval(App::$data['chat']['room_id']);
-        $stopped = ((x($_REQUEST, 'stopped') && intval($_REQUEST['stopped'])) ? true : false);
-
-        if ($status && $room_id) {
-            $x = q(
-                "select channel_address from channel where channel_id = %d limit 1",
-                intval(App::$data['chat']['uid'])
-            );
-
-            $r = q(
-                "update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'",
-                dbesc($status),
-                dbesc(datetime_convert()),
-                intval($room_id),
-                dbesc(get_observer_hash()),
-                dbesc($_SERVER['REMOTE_ADDR'])
-            );
-
-            goaway(z_root() . '/chat/' . $x[0]['channel_address'] . '/' . $room_id);
-        }
-
-        if (!$stopped) {
-            $lastseen = intval($_REQUEST['last']);
-
-            $ret = array('success' => false);
-
-            $sql_extra = permissions_sql(App::$data['chat']['uid']);
-
-            $r = q(
-                "select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
-                intval(App::$data['chat']['uid']),
-                intval(App::$data['chat']['room_id'])
-            );
-            if (!$r) {
-                json_return_and_die($ret);
-            }
-
-            $inroom = [];
-
-            $r = q(
-                "select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name",
-                intval(App::$data['chat']['room_id'])
-            );
-            if ($r) {
-                foreach ($r as $rv) {
-                    if (!$rv['xchan_name']) {
-                        $rv['xchan_hash'] = $rv['cp_xchan'];
-                        $rv['xchan_name'] = substr($rv['cp_xchan'], strrpos($rv['cp_xchan'], '.') + 1);
-                        $rv['xchan_addr'] = '';
-                        $rv['xchan_network'] = 'unknown';
-                        $rv['xchan_url'] = z_root();
-                        $rv['xchan_hidden'] = 1;
-                        $rv['xchan_photo_mimetype'] = 'image/png';
-                        $rv['xchan_photo_l'] = z_root() . '/' . Channel::get_default_profile_photo(300);
-                        $rv['xchan_photo_m'] = z_root() . '/' . Channel::get_default_profile_photo(80);
-                        $rv['xchan_photo_s'] = z_root() . '/' . Channel::get_default_profile_photo(48);
-                    }
-
-                    switch ($rv['cp_status']) {
-                        case 'away':
-                            $status = t('Away');
-                            $status_class = 'away';
-                            break;
-                        case 'online':
-                        default:
-                            $status = t('Online');
-                            $status_class = 'online';
-                            break;
-                    }
-
-                    $inroom[] = array('img' => zid($rv['xchan_photo_m']), 'img_type' => $rv['xchan_photo_mimetype'], 'name' => $rv['xchan_name'], 'status' => $status, 'status_class' => $status_class);
-                }
-            }
-
-            $chats = [];
-
-            $r = q(
-                "select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d order by created",
-                intval(App::$data['chat']['room_id']),
-                intval($lastseen)
-            );
-            if ($r) {
-                foreach ($r as $rr) {
-                    $chats[] = array(
-                        'id' => $rr['chat_id'],
-                        'img' => zid($rr['xchan_photo_m']),
-                        'img_type' => $rr['xchan_photo_mimetype'],
-                        'name' => $rr['xchan_name'],
-                        'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
-                        'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
-                        'text' => zidify_links(smilies(bbcode(base64url_decode(str_rot47($rr['chat_text']))))),
-                        'self' => ((get_observer_hash() == $rr['chat_xchan']) ? 'self' : '')
-                    );
-                }
-            }
-        }
-
-        $r = q(
-            "update chatpresence set cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s'",
-            dbesc(datetime_convert()),
-            intval(App::$data['chat']['room_id']),
-            dbesc(get_observer_hash()),
-            dbesc($_SERVER['REMOTE_ADDR'])
-        );
-
-        $ret['success'] = true;
-        if (!$stopped) {
-            $ret['inroom'] = $inroom;
-            $ret['chats'] = $chats;
-        }
-        json_return_and_die($ret);
-    }
-}
diff --git a/Zotlabs/Module/Clients.php b/Zotlabs/Module/Clients.php
deleted file mode 100644
index 2be5e034e..000000000
--- a/Zotlabs/Module/Clients.php
+++ /dev/null
@@ -1,23 +0,0 @@
-' . $desc . '
          ';
-        }
-        goaway(z_root() . '/settings/oauth2');
-    }
-}
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
deleted file mode 100644
index 5694f43fb..000000000
--- a/Zotlabs/Module/Cloud.php
+++ /dev/null
@@ -1,149 +0,0 @@
- 1) {
-            $which = argv(1);
-        }
-        $profile = 0;
-
-        if ($which) {
-            Libprofile::load($which, $profile);
-        }
-
-
-        $auth = new BasicAuth();
-
-        $ob_hash = get_observer_hash();
-
-        if ($ob_hash) {
-            if (local_channel()) {
-                $channel = App::get_channel();
-                $auth->setCurrentUser($channel['channel_address']);
-                $auth->channel_id = $channel['channel_id'];
-                $auth->channel_hash = $channel['channel_hash'];
-                $auth->channel_account_id = $channel['channel_account_id'];
-                if ($channel['channel_timezone']) {
-                    $auth->setTimezone($channel['channel_timezone']);
-                }
-            }
-            $auth->observer = $ob_hash;
-        }
-
-        // if we arrived at this path with any query parameters in the url, build a clean url without
-        // them and redirect.
-
-        if (!array_key_exists('cloud_sort', $_SESSION)) {
-            $_SESSION['cloud_sort'] = 'name';
-        }
-
-        $_SESSION['cloud_sort'] = (($_REQUEST['sort']) ? trim(notags($_REQUEST['sort'])) : $_SESSION['cloud_sort']);
-
-        $x = clean_query_string();
-        if ($x !== App::$query_string) {
-            goaway(z_root() . '/' . $x);
-        }
-
-        $rootDirectory = new Directory('/', $auth);
-
-        // A SabreDAV server-object
-        $server = new SDAV\Server($rootDirectory);
-        // prevent overwriting changes each other with a lock backend
-        $lockBackend = new SDAV\Locks\Backend\File('cache/locks');
-        $lockPlugin = new SDAV\Locks\Plugin($lockBackend);
-
-        $server->addPlugin($lockPlugin);
-
-        $is_readable = false;
-
-        // provide a directory view for the cloud in Hubzilla
-        $browser = new Browser($auth);
-        $auth->setBrowserPlugin($browser);
-
-        $server->addPlugin($browser);
-
-        // Experimental QuotaPlugin
-        //  require_once('\Zotlabs\Storage/QuotaPlugin.php');
-        //  $server->addPlugin(new \Zotlabs\Storage\\QuotaPlugin($auth));
-
-
-        // over-ride the default XML output on thrown exceptions
-
-        $server->on('exception', [$this, 'DAVException']);
-
-        // All we need to do now, is to fire up the server
-
-        $server->exec();
-
-        if ($browser->build_page) {
-            construct_page();
-        }
-
-        killme();
-    }
-
-
-    public function DAVException($err)
-    {
-
-        if ($err instanceof NotFound) {
-            notice(t('Not found') . EOL);
-        } elseif ($err instanceof Forbidden) {
-            notice(t('Permission denied') . EOL);
-        } elseif ($err instanceof NotImplemented) {
-            notice(t('Please refresh page') . EOL);
-            // It would be nice to do the following on remote authentication
-            // which provides an unexpected page query param, but we do not
-            // because if the exception has a different cause, it will loop.
-            // goaway(z_root() . '/' . App::$query_string);
-        } else {
-            notice(t('Unknown error') . EOL);
-        }
-
-        construct_page();
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Cloud_tiles.php b/Zotlabs/Module/Cloud_tiles.php
deleted file mode 100644
index 488d9b0f5..000000000
--- a/Zotlabs/Module/Cloud_tiles.php
+++ /dev/null
@@ -1,25 +0,0 @@
-' . $desc . '';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Comment Control'))) {
-            return $text;
-        }
-
-        $desc = t('This app is installed. A button to control comments may be found below the post editor.');
-
-        $text = '
          ' . $desc . '
          ';
-
-        return $text;
-    }
-}
diff --git a/Zotlabs/Module/Common.php b/Zotlabs/Module/Common.php
deleted file mode 100644
index 8c8334158..000000000
--- a/Zotlabs/Module/Common.php
+++ /dev/null
@@ -1,81 +0,0 @@
- 1 && intval(argv(1))) {
-            $channel_id = intval(argv(1));
-        } else {
-            notice(t('No channel.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $x = q(
-            "select channel_address from channel where channel_id = %d limit 1",
-            intval($channel_id)
-        );
-
-        if ($x) {
-            Libprofile::load($x[0]['channel_address'], 0);
-        }
-    }
-
-    public function get()
-    {
-
-        $o = '';
-
-        if (!App::$profile['profile_uid']) {
-            return;
-        }
-
-        $observer_hash = get_observer_hash();
-
-        if (!perm_is_allowed(App::$profile['profile_uid'], $observer_hash, 'view_contacts')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $t = Socgraph::count_common_friends(App::$profile['profile_uid'], $observer_hash);
-
-        if (!$t) {
-            notice(t('No connections in common.') . EOL);
-            return;
-        }
-
-        $r = Socgraph::common_friends(App::$profile['profile_uid'], $observer_hash);
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $items[] = [
-                    'url' => $rr['xchan_url'],
-                    'name' => $rr['xchan_name'],
-                    'photo' => $rr['xchan_photo_m'],
-                    'tags' => ''
-                ];
-            }
-        }
-
-        $tpl = Theme::get_template('common_friends.tpl');
-
-        $o = replace_macros($tpl, [
-            '$title' => t('View Common Connections'),
-            '$items' => $items
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Connac.php b/Zotlabs/Module/Connac.php
deleted file mode 100644
index 057084ab3..000000000
--- a/Zotlabs/Module/Connac.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 1) {
-            App::$data['channel'] = Channel::from_username(argv(1));
-            Libprofile::load(argv(1), EMPTY_STR);
-        } else {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-    }
-
-    public function post()
-    {
-
-        if (!array_key_exists('channel', App::$data)) {
-            return;
-        }
-
-        $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false);
-
-        if ($edit) {
-            $has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0);
-            $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0);
-            $text = escape_tags($_POST['text']);
-
-            if ($has_premium != $premium) {
-                $r = q(
-                    "update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d",
-                    db_getfunc('^'),
-                    intval(PAGE_PREMIUM),
-                    intval(local_channel())
-                );
-
-                Run::Summon(['Notifier', 'refresh_all', App::$data['channel']['channel_id']]);
-            }
-            set_pconfig(App::$data['channel']['channel_id'], 'system', 'selltext', $text);
-            // reload the page completely to get fresh data
-            goaway(z_root() . '/' . App::$query_string);
-        }
-
-        $url = EMPTY_STR;
-        $observer = App::get_observer();
-        if (($observer) && ($_POST['submit'] === t('Continue'))) {
-            if ($observer['xchan_follow']) {
-                $url = sprintf($observer['xchan_follow'], urlencode(Channel::get_webfinger(App::$data['channel'])));
-            }
-            if (!$url) {
-                $r = q(
-                    "select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1",
-                    dbesc($observer['xchan_hash'])
-                );
-                if ($r) {
-                    $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(Channel::get_webfinger(App::$data['channel']));
-                }
-            }
-        }
-        if ($url) {
-            goaway($url . '&confirm=1');
-        } else {
-            notice('Unable to connect to your home hub location.');
-        }
-    }
-
-
-    public function get()
-    {
-
-        $edit = ((local_channel() && (local_channel() == App::$data['channel']['channel_id'])) ? true : false);
-
-        $text = get_pconfig(App::$data['channel']['channel_id'], 'system', 'selltext');
-
-        if ($edit) {
-            $o = replace_macros(Theme::get_template('sellpage_edit.tpl'), array(
-                '$header' => t('Premium Channel Setup'),
-                '$address' => App::$data['channel']['channel_address'],
-                '$premium' => array('premium', t('Enable premium channel connection restrictions'), ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''), ''),
-                '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'),
-                '$text' => $text,
-                '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
-                '$lbl2' => t('Potential connections will then see the following text before proceeding:'),
-                '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
-                '$submit' => t('Submit'),
-
-
-            ));
-            return $o;
-        } else {
-            if (!$text) {
-                $text = t('(No specific instructions have been provided by the channel owner.)');
-            }
-
-            $submit = replace_macros(Theme::get_template('sellpage_submit.tpl'), array(
-                '$continue' => t('Continue'),
-                '$address' => App::$data['channel']['channel_address']
-            ));
-
-            $o = replace_macros(Theme::get_template('sellpage_view.tpl'), array(
-                '$header' => t('Restricted or Premium Channel'),
-                '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
-                '$text' => prepare_text($text),
-
-                '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
-                '$submit' => $submit,
-
-            ));
-
-            $arr = array('channel' => App::$data['channel'], 'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit);
-            Hook::call('connect_premium', $arr);
-            $o = $arr['sellpage'];
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
deleted file mode 100644
index 8cdb4f39c..000000000
--- a/Zotlabs/Module/Connections.php
+++ /dev/null
@@ -1,392 +0,0 @@
- array(
-                'label' => t('Active Connections'),
-                'url' => z_root() . '/connections/active',
-                'sel' => ($active) ? 'active' : '',
-                'title' => t('Show active connections'),
-            ),
-
-            'pending' => array(
-                'label' => t('New Connections'),
-                'url' => z_root() . '/connections/pending',
-                'sel' => ($pending) ? 'active' : '',
-                'title' => t('Show pending (new) connections'),
-            ),
-
-            'blocked' => array(
-                'label' => t('Blocked'),
-                'url' => z_root() . '/connections/blocked',
-                'sel' => ($blocked) ? 'active' : '',
-                'title' => t('Only show blocked connections'),
-            ),
-
-            'ignored' => array(
-                'label' => t('Ignored'),
-                'url' => z_root() . '/connections/ignored',
-                'sel' => ($ignored) ? 'active' : '',
-                'title' => t('Only show ignored connections'),
-            ),
-
-            'archived' => array(
-                'label' => t('Archived/Unreachable'),
-                'url' => z_root() . '/connections/archived',
-                'sel' => ($archived) ? 'active' : '',
-                'title' => t('Only show archived/unreachable connections'),
-            ),
-
-            'hidden' => array(
-                'label' => t('Hidden'),
-                'url' => z_root() . '/connections/hidden',
-                'sel' => ($hidden) ? 'active' : '',
-                'title' => t('Only show hidden connections'),
-            ),
-
-            'all' => array(
-                'label' => t('All Connections'),
-                'url' => z_root() . '/connections/all',
-                'sel' => ($all) ? 'active' : '',
-                'title' => t('Show all connections'),
-            ),
-
-        );
-
-        $searching = false;
-        if ($search) {
-            $search_hdr = $search;
-            $search_txt = dbesc(protect_sprintf($search));
-            $searching = true;
-        }
-        $sql_extra .= (($searching) ? " AND ( xchan_name like '%%$search_txt%%' OR abook_alias like '%%$search_txt%%' ) " : "");
-
-        if (isset($_REQUEST['gid']) && intval($_REQUEST['gid'])) {
-            $sql_extra .= " and xchan_hash in ( select xchan from pgrp_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) ";
-        }
-
-        $r = q(
-            "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash 
-			where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ",
-            intval(local_channel())
-        );
-        if ($r) {
-            App::set_pager_total($r[0]['total']);
-            $total = $r[0]['total'];
-        }
-
-        $order_q = 'xchan_name';
-        if (isset($_REQUEST['order'])) {
-            switch ($_REQUEST['order']) {
-                case 'date':
-                    $order_q = 'abook_created desc';
-                    break;
-                case 'created':
-                    $order_q = 'abook_created';
-                    break;
-                case 'cmax':
-                    $order_q = 'abook_closeness';
-                    break;
-                case 'name':
-                default:
-                    $order_q = 'xchan_name';
-                    break;
-            }
-        }
-
-
-        $order = array(
-
-            'name' => array(
-                'label' => t('Name'),
-                'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=name',
-                'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] !== 'name') ? 'active' : ''),
-                'title' => t('Order by name'),
-            ),
-
-            'date' => array(
-                'label' => t('Recent'),
-                'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date',
-                'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'date') ? 'active' : ''),
-                'title' => t('Order by recent'),
-            ),
-
-            'created' => array(
-                'label' => t('Created'),
-                'url' => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=created',
-                'sel' => ((isset($_REQUEST['order']) && $_REQUEST['order'] === 'created') ? 'active' : ''),
-                'title' => t('Order by date'),
-            ),
-// reserved for cmax
-//          'date' => array(
-//              'label' => t(''),
-//              'url'   => z_root() . '/connections' . ((argv(1)) ? '/' . argv(1) : '') . '?order=date',
-//              'sel'   => ($_REQUEST['order'] === 'date') ? 'active' : '',
-//              'title' => t('Order by recent'),
-//          ),
-
-        );
-
-
-        $r = q(
-            "SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
-			WHERE abook_channel = %d and abook_self = 0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra ORDER BY $order_q LIMIT %d OFFSET %d ",
-            intval(local_channel()),
-            intval(App::$pager['itemspage']),
-            intval(App::$pager['start'])
-        );
-
-        $contacts = [];
-
-        if ($r) {
-            vcard_query($r);
-
-
-            foreach ($r as $rr) {
-                if ((!$blocked) && LibBlock::fetch_by_entity(local_channel(), $rr['xchan_hash'])) {
-                    continue;
-                }
-                if ($rr['xchan_url']) {
-                    if ((isset($rr['vcard']) && $rr['vcard']) && is_array($rr['vcard']['tels']) && $rr['vcard']['tels'][0]['nr']) {
-                        $phone = $rr['vcard']['tels'][0]['nr'];
-                    } else {
-                        $phone = '';
-                    }
-
-                    $status_str = '';
-                    $status = array(
-                        ((isset($rr['abook_active']) && intval($rr['abook_active'])) ? t('Active') : ''),
-                        ((intval($rr['abook_pending'])) ? t('Pending approval') : ''),
-                        ((intval($rr['abook_archived'])) ? t('Archived') : ''),
-                        ((intval($rr['abook_hidden'])) ? t('Hidden') : ''),
-                        ((intval($rr['abook_ignored'])) ? t('Ignored') : ''),
-                        ((intval($rr['abook_blocked'])) ? t('Blocked') : ''),
-                        ((intval($rr['abook_not_here'])) ? t('Not connected at this location') : '')
-                    );
-
-                    $oneway = false;
-                    if (!their_perms_contains(local_channel(), $rr['xchan_hash'], 'post_comments')) {
-                        $oneway = true;
-                    }
-
-                    foreach ($status as $str) {
-                        if (!$str) {
-                            continue;
-                        }
-                        $status_str .= $str;
-                        $status_str .= ', ';
-                    }
-                    $status_str = rtrim($status_str, ', ');
-
-                    $contacts[] = array(
-                        'img_hover' => sprintf(t('%1$s [%2$s]'), $rr['xchan_name'], $rr['xchan_url']),
-                        'edit_hover' => t('Edit connection'),
-                        'edit' => t('Edit'),
-                        'delete_hover' => t('Delete connection'),
-                        'id' => $rr['abook_id'],
-                        'thumb' => $rr['xchan_photo_m'],
-                        'name' => $rr['xchan_name'] . (($rr['abook_alias']) ? ' <' . $rr['abook_alias'] . '>' : ''),
-                        'classes' => ((intval($rr['abook_archived']) || intval($rr['abook_not_here'])) ? 'archived' : ''),
-                        'link' => z_root() . '/connedit/' . $rr['abook_id'],
-                        'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop',
-                        'delete' => t('Delete'),
-                        'url' => chanlink_hash($rr['xchan_hash']),
-                        'webbie_label' => t('Channel address'),
-                        'webbie' => $rr['xchan_addr'],
-                        'network_label' => t('Network'),
-                        'network' => network_to_name($rr['xchan_network']),
-                        'channel_type' => intval($rr['xchan_type']),
-                        'call' => t('Call'),
-                        'phone' => $phone,
-                        'status_label' => t('Status'),
-                        'status' => $status_str,
-                        'connected_label' => t('Connected'),
-                        'connected' => datetime_convert('UTC', date_default_timezone_get(), $rr['abook_created'], 'c'),
-                        'approve_hover' => t('Approve connection'),
-                        'approve' => (($rr['abook_pending']) ? t('Approve') : false),
-                        'ignore_hover' => t('Ignore connection'),
-                        'ignore' => ((!$rr['abook_ignored']) ? t('Ignore') : false),
-                        'recent_label' => t('Recent activity'),
-                        'recentlink' => z_root() . '/stream/?f=&cid=' . intval($rr['abook_id']),
-                        'oneway' => $oneway,
-                        'allow_delete' => ($rr['abook_pending'] || get_pconfig(local_channel(), 'system', 'connections_quick_delete')),
-                    );
-                }
-            }
-        }
-
-
-        if ($_REQUEST['aj']) {
-            if ($contacts) {
-                $o = replace_macros(Theme::get_template('contactsajax.tpl'), array(
-                    '$contacts' => $contacts,
-                    '$edit' => t('Edit'),
-                ));
-            } else {
-                $o = '
          ';
-            }
-            echo $o;
-            killme();
-        } else {
-            $o .= "";
-            $o .= replace_macros(Theme::get_template('connections.tpl'), array(
-                '$header' => t('Connections') . (($head) ? ': ' . $head : ''),
-                '$tabs' => $tabs,
-                '$order' => $order,
-                '$sort' => t('Filter by'),
-                '$sortorder' => t('Sort by'),
-                '$total' => $total,
-                '$search' => ((isset($search_hdr)) ? $search_hdr : EMPTY_STR),
-                '$label' => t('Search'),
-                '$desc' => t('Search your connections'),
-                '$finding' => (($searching) ? t('Connections search') . ": '" . $search . "'" : ""),
-                '$submit' => t('Find'),
-                '$edit' => t('Edit'),
-                '$cmd' => App::$cmd,
-                '$contacts' => $contacts,
-                '$paginate' => paginate($a),
-
-            ));
-        }
-
-        if (!$contacts) {
-            $o .= '
          ';
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
deleted file mode 100644
index 97a13771c..000000000
--- a/Zotlabs/Module/Connedit.php
+++ /dev/null
@@ -1,907 +0,0 @@
-= 2) && intval(argv(1))) {
-            $r = q(
-                "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_channel = %d and abook_id = %d LIMIT 1",
-                intval(local_channel()),
-                intval(argv(1))
-            );
-            // Set the person-of-interest for use by widgets that operate on a single pre-defined channel
-            if ($r) {
-                App::$poi = array_shift($r);
-            }
-        }
-
-        $channel = App::get_channel();
-        if ($channel) {
-            head_set_icon($channel['xchan_photo_s']);
-        }
-    }
-
-
-    /**
-     * @brief Evaluate posted values and set changes
-     */
-
-    public function post()
-    {
-
-        if (!local_channel()) {
-            return;
-        }
-
-        $contact_id = intval(argv(1));
-        if (!$contact_id) {
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        $orig_record = q(
-            "SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1",
-            intval($contact_id),
-            intval(local_channel())
-        );
-
-        if (!$orig_record) {
-            notice(t('Could not access contact record.') . EOL);
-            goaway(z_root() . '/connections');
-        }
-
-        $orig_record = array_shift($orig_record);
-
-        Hook::call('contact_edit_post', $_POST);
-
-        $vc = get_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard');
-        $vcard = (($vc) ? Reader::read($vc) : null);
-        $serialised_vcard = update_vcard($_REQUEST, $vcard);
-        if ($serialised_vcard) {
-            set_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard', $serialised_vcard);
-        }
-
-        $autoperms = null;
-        $is_self = false;
-
-        if (intval($orig_record['abook_self'])) {
-            $autoperms = intval($_POST['autoperms']);
-            $is_self = true;
-        }
-
-        $profile_id = ((array_key_exists('profile_assign', $_POST)) ? $_POST['profile_assign'] : $orig_record['abook_profile']);
-
-        if ($profile_id) {
-            $r = q(
-                "SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND uid = %d LIMIT 1",
-                dbesc($profile_id),
-                intval(local_channel())
-            );
-            if (!$r) {
-                notice(t('Could not locate selected profile.') . EOL);
-                return;
-            }
-        }
-
-        $abook_incl = ((array_key_exists('abook_incl', $_POST)) ? escape_tags($_POST['abook_incl']) : $orig_record['abook_incl']);
-        $abook_excl = ((array_key_exists('abook_excl', $_POST)) ? escape_tags($_POST['abook_excl']) : $orig_record['abook_excl']);
-        $abook_alias = ((array_key_exists('abook_alias', $_POST)) ? escape_tags(trim($_POST['abook_alias'])) : $orig_record['abook_alias']);
-
-        $block_announce = ((array_key_exists('block_announce', $_POST)) ? intval($_POST['block_announce']) : 0);
-
-        set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'block_announce', $block_announce);
-
-        $hidden = intval($_POST['hidden']);
-
-        $priority = intval($_POST['poll']);
-        if ($priority > 5 || $priority < 0) {
-            $priority = 0;
-        }
-
-        if (!array_key_exists('closeness', $_POST)) {
-            $_POST['closeness'] = 80;
-        }
-        $closeness = intval($_POST['closeness']);
-        if ($closeness < 0 || $closeness > 99) {
-            $closeness = 80;
-        }
-
-        $all_perms = Permissions::Perms();
-
-        $p = EMPTY_STR;
-
-        if ($all_perms) {
-            foreach ($all_perms as $perm => $desc) {
-                if (array_key_exists('perms_' . $perm, $_POST)) {
-                    if ($p) {
-                        $p .= ',';
-                    }
-                    $p .= $perm;
-                }
-            }
-            set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'my_perms', $p);
-            if ($autoperms) {
-                set_pconfig($channel['channel_id'], 'system', 'autoperms', $p);
-            }
-        }
-
-        $new_friend = false;
-
-        if (($_REQUEST['pending']) && intval($orig_record['abook_pending'])) {
-            $new_friend = true;
-
-            // @fixme it won't be common, but when you accept a new connection request
-            // the permissions will now be that of your permissions role and ignore
-            // any you may have set manually on the form. We'll probably see a bug if somebody
-            // tries to set the permissions *and* approve the connection in the same
-            // request. The workaround is to approve the connection, then go back and
-            // adjust permissions as desired.
-
-            $p = Permissions::connect_perms(local_channel());
-            $my_perms = Permissions::serialise($p['perms']);
-            if ($my_perms) {
-                set_abconfig($channel['channel_id'], $orig_record['abook_xchan'], 'system', 'my_perms', $my_perms);
-            }
-        }
-
-        $abook_pending = (($new_friend) ? 0 : $orig_record['abook_pending']);
-
-        $r = q(
-            "UPDATE abook SET abook_profile = '%s', abook_closeness = %d, abook_pending = %d,
-			abook_incl = '%s', abook_excl = '%s', abook_alias = '%s'
-			where abook_id = %d AND abook_channel = %d",
-            dbesc($profile_id),
-            intval($closeness),
-            intval($abook_pending),
-            dbesc($abook_incl),
-            dbesc($abook_excl),
-            dbesc($abook_alias),
-            intval($contact_id),
-            intval(local_channel())
-        );
-
-        if ($r) {
-            info(t('Connection updated.') . EOL);
-        } else {
-            notice(t('Failed to update connection record.') . EOL);
-        }
-
-        if (!intval(App::$poi['abook_self'])) {
-            if ($new_friend) {
-                Run::Summon(['Notifier', 'permissions_accept', $contact_id]);
-            }
-
-            Run::Summon([
-                'Notifier',
-                (($new_friend) ? 'permissions_create' : 'permissions_update'),
-                $contact_id
-            ]);
-        }
-
-        if ($new_friend) {
-            $default_group = $channel['channel_default_group'];
-            if ($default_group) {
-                $g = AccessList::rec_byhash(local_channel(), $default_group);
-                if ($g) {
-                    AccessList::member_add(local_channel(), '', App::$poi['abook_xchan'], $g['id']);
-                }
-            }
-
-            // Check if settings permit ("post new friend activity" is allowed, and
-            // friends in general or this friend in particular aren't hidden)
-            // and send out a new friend activity
-
-            $pr = q(
-                "select * from profile where uid = %d and is_default = 1 and hide_friends = 0",
-                intval($channel['channel_id'])
-            );
-            if (($pr) && (!intval($orig_record['abook_hidden'])) && (intval(get_pconfig($channel['channel_id'], 'system', 'post_newfriend')))) {
-                $xarr = [];
-
-                $xarr['item_wall'] = 1;
-                $xarr['item_origin'] = 1;
-                $xarr['item_thread_top'] = 1;
-                $xarr['owner_xchan'] = $xarr['author_xchan'] = $channel['channel_hash'];
-                $xarr['allow_cid'] = $channel['channel_allow_cid'];
-                $xarr['allow_gid'] = $channel['channel_allow_gid'];
-                $xarr['deny_cid'] = $channel['channel_deny_cid'];
-                $xarr['deny_gid'] = $channel['channel_deny_gid'];
-                $xarr['item_private'] = (($xarr['allow_cid'] || $xarr['allow_gid'] || $xarr['deny_cid'] || $xarr['deny_gid']) ? 1 : 0);
-
-                $xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . App::$poi['xchan_url'] . ']' . App::$poi['xchan_name'] . '[/zrl]';
-
-                $xarr['body'] .= "\n\n\n" . '[zrl=' . App::$poi['xchan_url'] . '][zmg=80x80]' . App::$poi['xchan_photo_m'] . '[/zmg][/zrl]';
-
-                post_activity_item($xarr);
-            }
-
-            // pull in a bit of content if there is any to pull in
-            Run::Summon(['Onepoll', $contact_id]);
-        }
-
-        // Refresh the structure in memory with the new data
-
-        $r = q(
-            "SELECT abook.*, xchan.*
-			FROM abook left join xchan on abook_xchan = xchan_hash
-			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
-            intval(local_channel()),
-            intval($contact_id)
-        );
-        if ($r) {
-            App::$poi = array_shift($r);
-        }
-
-        if ($new_friend) {
-            $arr = ['channel_id' => local_channel(), 'abook' => App::$poi];
-            Hook::call('accept_follow', $arr);
-        }
-
-        $this->connedit_clone($a);
-
-        if (($_REQUEST['pending']) && (!$_REQUEST['done'])) {
-            goaway(z_root() . '/connections/ifpending');
-        }
-
-        return;
-    }
-
-    /* @brief Clone connection
-     *
-     *
-     */
-
-    public function connedit_clone(&$a)
-    {
-
-        if (!App::$poi) {
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        $r = q(
-            "SELECT abook.*, xchan.*
-			FROM abook left join xchan on abook_xchan = xchan_hash
-			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
-            intval(local_channel()),
-            intval(App::$poi['abook_id'])
-        );
-        if (!$r) {
-            return;
-        }
-
-        App::$poi = array_shift($r);
-        $clone = App::$poi;
-
-        unset($clone['abook_id']);
-        unset($clone['abook_account']);
-        unset($clone['abook_channel']);
-
-        $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
-        if ($abconfig) {
-            $clone['abconfig'] = $abconfig;
-        }
-        Libsync::build_sync_packet($channel['channel_id'], ['abook' => [$clone]]);
-    }
-
-    /**
-     * @brief Generate content of connection edit page
-     */
-
-    public function get()
-    {
-
-        $sort_type = 0;
-        $o = EMPTY_STR;
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return login();
-        }
-
-        $section = ((array_key_exists('section', $_REQUEST)) ? $_REQUEST['section'] : '');
-        $channel = App::get_channel();
-
-        $yes_no = [t('No'), t('Yes')];
-
-        $connect_perms = Permissions::connect_perms(local_channel());
-
-        $o .= "\n";
-
-        if (argc() == 3) {
-            $contact_id = intval(argv(1));
-            if (!$contact_id) {
-                return;
-            }
-
-            $cmd = argv(2);
-
-            $orig_record = q(
-                "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_id = %d AND abook_channel = %d AND abook_self = 0 LIMIT 1",
-                intval($contact_id),
-                intval(local_channel())
-            );
-
-            if (!$orig_record) {
-                notice(t('Could not access address book record.') . EOL);
-                goaway(z_root() . '/connections');
-            }
-
-            $orig_record = array_shift($orig_record);
-
-            if ($cmd === 'update') {
-                // pull feed and consume it, which should subscribe to the hub.
-                Run::Summon(['Poller', $contact_id]);
-                goaway(z_root() . '/connedit/' . $contact_id);
-            }
-
-            if ($cmd === 'fetchvc') {
-                $url = str_replace('/channel/', '/profile/', $orig_record['xchan_url']) . '/vcard';
-                $recurse = 0;
-                $x = z_fetch_url(zid($url), false, $recurse, ['session' => true]);
-                if ($x['success']) {
-                    $h = new HTTPHeaders($x['header']);
-                    $fields = $h->fetcharr();
-                    if ($fields && array_key_exists('content-type', $fields)) {
-                        $type = explode(';', trim($fields['content-type']));
-                        if ($type && $type[0] === 'text/vcard' && $x['body']) {
-                            $vc = Reader::read($x['body']);
-                            $vcard = $vc->serialize();
-                            if ($vcard) {
-                                set_abconfig(local_channel(), $orig_record['abook_xchan'], 'system', 'vcard', $vcard);
-                                $this->connedit_clone($a);
-                            }
-                        }
-                    }
-                }
-                goaway(z_root() . '/connedit/' . $contact_id);
-            }
-
-
-            if ($cmd === 'resetphoto') {
-                q(
-                    "update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s'",
-                    dbesc($orig_record['xchan_hash'])
-                );
-                $cmd = 'refresh';
-            }
-
-            if ($cmd === 'refresh') {
-				if (in_array($orig_record['xchan_network'],['nomad','zot6'])) {
-                    if (!Libzot::refresh($orig_record, App::get_channel())) {
-                        notice(t('Refresh failed - channel is currently unavailable.'));
-                    }
-                } else {
-                    if ($orig_record['xchan_network'] === 'activitypub') {
-                        ActivityPub::discover($orig_record['xchan_hash'], true);
-                    }
-                    // if they are on a different network we'll force a refresh of the connection basic info
-                    Run::Summon(['Notifier', 'permissions_update', $contact_id]);
-                }
-                goaway(z_root() . '/connedit/' . $contact_id);
-            }
-
-            switch ($cmd) {
-                case 'block':
-                    if (intval($orig_record['abook_blocked'])) {
-                        LibBlock::remove(local_channel(), $orig_record['abook_xchan']);
-                        $sync = [
-                            'block_channel_id' => local_channel(),
-                            'block_entity' => $orig_record['abook_xchan'],
-                            'block_type' => BLOCKTYPE_CHANNEL,
-                            'deleted' => true,
-                        ];
-                    } else {
-                        LibBlock::store([
-                            'block_channel_id' => local_channel(),
-                            'block_entity' => $orig_record['abook_xchan'],
-                            'block_type' => BLOCKTYPE_CHANNEL,
-                            'block_comment' => t('Added by Connedit')
-                        ]);
-                        $z = q(
-                            "insert into xign ( uid, xchan ) values ( %d , '%s' ) ",
-                            intval(local_channel()),
-                            dbesc($orig_record['abook_xchan'])
-                        );
-                        $sync = LibBlock::fetch_by_entity(local_channel(), $orig_record['abook_xchan']);
-                    }
-                    $ignored = ['uid' => local_channel(), 'xchan' => $orig_record['abook_xchan']];
-                    Libsync::build_sync_packet(0, ['xign' => [$ignored], 'block' => [$sync]]);
-                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_BLOCKED);
-                    break;
-                case 'ignore':
-                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_IGNORED);
-                    break;
-                case 'censor':
-                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_CENSORED);
-                    break;
-                case 'archive':
-                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_ARCHIVED);
-                    break;
-                case 'hide':
-                    $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_HIDDEN);
-                    break;
-                case 'approve':
-                    if (intval($orig_record['abook_pending'])) {
-                        $flag_result = abook_toggle_flag($orig_record, ABOOK_FLAG_PENDING);
-                    }
-                    break;
-                default:
-                    break;
-            }
-
-            if (isset($flag_result)) {
-                if ($flag_result) {
-                    $this->connedit_clone($a);
-                } else {
-                    notice(t('Unable to set address book parameters.') . EOL);
-                }
-                goaway(z_root() . '/connedit/' . $contact_id);
-            }
-
-            if ($cmd === 'drop') {
-                if ($orig_record['xchan_network'] === 'activitypub') {
-                    ActivityPub::contact_remove(local_channel(), $orig_record);
-                }
-                contact_remove(local_channel(), $orig_record['abook_id'], true);
-
-                // The purge notification is sent to the xchan_hash as the abook record will have just been removed
-
-                Run::Summon(['Notifier', 'purge', $orig_record['xchan_hash']]);
-
-                Libsync::build_sync_packet(0, ['abook' => [['abook_xchan' => $orig_record['abook_xchan'], 'entry_deleted' => true]]]);
-
-                info(t('Connection has been removed.') . EOL);
-                if (isset($_SESSION['return_url']) && $_SESSION['return_url']) {
-                    goaway(z_root() . '/' . $_SESSION['return_url']);
-                }
-                goaway(z_root() . '/contacts');
-            }
-        }
-
-        if (App::$poi) {
-            $abook_prev = 0;
-            $abook_next = 0;
-
-            $contact_id = App::$poi['abook_id'];
-            $contact = App::$poi;
-
-            $cn = q(
-                "SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 order by xchan_name",
-                intval(local_channel())
-            );
-
-            if ($cn) {
-                // store previous/next ids for navigation
-                $pntotal = count($cn);
-
-                for ($x = 0; $x < $pntotal; $x++) {
-                    if ($cn[$x]['abook_id'] == $contact_id) {
-                        if ($x === 0) {
-                            $abook_prev = 0;
-                        } else {
-                            $abook_prev = $cn[$x - 1]['abook_id'];
-                        }
-                        if ($x === $pntotal) {
-                            $abook_next = 0;
-                        } else {
-                            $abook_next = $cn[$x + 1]['abook_id'];
-                        }
-                    }
-                }
-            }
-
-            $tools = array(
-
-                'view' => array(
-                    'label' => t('View Profile'),
-                    'url' => chanlink_cid($contact['abook_id']),
-                    'sel' => '',
-                    'title' => sprintf(t('View %s\'s profile'), $contact['xchan_name']),
-                ),
-
-                'refresh' => array(
-                    'label' => t('Refresh Permissions'),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/refresh',
-                    'sel' => '',
-                    'title' => t('Fetch updated permissions'),
-                ),
-
-                'rephoto' => array(
-                    'label' => t('Refresh Photo'),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/resetphoto',
-                    'sel' => '',
-                    'title' => t('Fetch updated photo'),
-                ),
-
-                'recent' => array(
-                    'label' => t('Recent Activity'),
-                    'url' => z_root() . '/stream/?f=&cid=' . $contact['abook_id'],
-                    'sel' => '',
-                    'title' => t('View recent posts and comments'),
-                ),
-
-                'block' => array(
-                    'label' => (intval($contact['abook_blocked']) ? t('Unblock') : t('Block')),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/block',
-                    'sel' => (intval($contact['abook_blocked']) ? 'active' : ''),
-                    'title' => t('Block (or Unblock) all communications with this connection'),
-                    'info' => (intval($contact['abook_blocked']) ? t('This connection is blocked') : ''),
-                ),
-
-                'ignore' => array(
-                    'label' => (intval($contact['abook_ignored']) ? t('Unignore') : t('Ignore')),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/ignore',
-                    'sel' => (intval($contact['abook_ignored']) ? 'active' : ''),
-                    'title' => t('Ignore (or Unignore) all inbound communications from this connection'),
-                    'info' => (intval($contact['abook_ignored']) ? t('This connection is ignored') : ''),
-                ),
-
-                'censor' => array(
-                    'label' => (intval($contact['abook_censor']) ? t('Uncensor') : t('Censor')),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/censor',
-                    'sel' => (intval($contact['abook_censor']) ? 'active' : ''),
-                    'title' => t('Censor (or Uncensor) images from this connection'),
-                    'info' => (intval($contact['abook_censor']) ? t('This connection is censored') : ''),
-                ),
-
-                'archive' => array(
-                    'label' => (intval($contact['abook_archived']) ? t('Unarchive') : t('Archive')),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/archive',
-                    'sel' => (intval($contact['abook_archived']) ? 'active' : ''),
-                    'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'),
-                    'info' => (intval($contact['abook_archived']) ? t('This connection is archived') : ''),
-                ),
-
-                'hide' => array(
-                    'label' => (intval($contact['abook_hidden']) ? t('Unhide') : t('Hide')),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/hide',
-                    'sel' => (intval($contact['abook_hidden']) ? 'active' : ''),
-                    'title' => t('Hide or Unhide this connection from your other connections'),
-                    'info' => (intval($contact['abook_hidden']) ? t('This connection is hidden') : ''),
-                ),
-
-                'delete' => array(
-                    'label' => t('Delete'),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/drop',
-                    'sel' => '',
-                    'title' => t('Delete this connection'),
-                ),
-
-            );
-
-
-            if (in_array($contact['xchan_network'], [ 'zot6', 'nomad' ])) {
-                $tools['fetchvc'] = [
-                    'label' => t('Fetch Vcard'),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/fetchvc',
-                    'sel' => '',
-                    'title' => t('Fetch electronic calling card for this connection')
-                ];
-            }
-
-            $sections = [];
-
-            $sections['perms'] = [
-                'label' => t('Permissions'),
-                'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=perms',
-                'sel' => '',
-                'title' => t('Open Individual Permissions section by default'),
-            ];
-
-            $self = false;
-
-            if (intval($contact['abook_self'])) {
-                $self = true;
-                $abook_prev = $abook_next = 0;
-            }
-
-            $vc = get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'vcard');
-
-            $vctmp = (($vc) ? Reader::read($vc) : null);
-            $vcard = (($vctmp) ? get_vcard_array($vctmp, $contact['abook_id']) : []);
-            if (!$vcard) {
-                $vcard['fn'] = $contact['xchan_name'];
-            }
-
-
-            $tpl = Theme::get_template("abook_edit.tpl");
-
-            if (Apps::system_app_installed(local_channel(), 'Friend Zoom')) {
-                $sections['affinity'] = [
-                    'label' => t('Friend Zoom'),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=affinity',
-                    'sel' => '',
-                    'title' => t('Open Friend Zoom section by default'),
-                ];
-
-                $labels = [
-                    0 => t('Me'),
-                    20 => t('Family'),
-                    40 => t('Friends'),
-                    60 => t('Peers'),
-                    80 => t('Connections'),
-                    99 => t('All')
-                ];
-                Hook::call('affinity_labels', $labels);
-
-                $slider_tpl = Theme::get_template('contact_slider.tpl');
-
-                $slideval = intval($contact['abook_closeness']);
-
-                $slide = replace_macros($slider_tpl, array(
-                    '$min' => 1,
-                    '$val' => $slideval,
-                    '$labels' => $labels,
-                ));
-            }
-
-            if (Apps::system_app_installed(local_channel(), 'Content Filter')) {
-                $sections['filter'] = [
-                    'label' => t('Filter'),
-                    'url' => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=§ion=filter',
-                    'sel' => '',
-                    'title' => t('Open Custom Filter section by default'),
-                ];
-            }
-
-            $rating_val = 0;
-            $rating_text = '';
-
-            $xl = q(
-                "select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
-                dbesc($channel['channel_hash']),
-                dbesc($contact['xchan_hash'])
-            );
-
-            if ($xl) {
-                $rating_val = intval($xl[0]['xlink_rating']);
-                $rating_text = $xl[0]['xlink_rating_text'];
-            }
-
-            $rating_enabled = get_config('system', 'rating_enabled');
-
-            if ($rating_enabled) {
-                $rating = replace_macros(Theme::get_template('rating_slider.tpl'), array(
-                    '$min' => -10,
-                    '$val' => $rating_val
-                ));
-            } else {
-                $rating = false;
-            }
-
-
-            $perms = [];
-            $channel = App::get_channel();
-
-            $global_perms = Permissions::Perms();
-
-            $existing = get_all_perms(local_channel(), $contact['abook_xchan'], false);
-
-            $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'), t('Yes')));
-
-            $multiprofs = ((Features::enabled(local_channel(), 'multi_profiles')) ? true : false);
-
-            if ($slide && !$multiprofs) {
-                $affinity = t('Set Friend Zoom');
-            }
-
-            if (!$slide && $multiprofs) {
-                $affinity = t('Set Profile');
-            }
-
-            if ($slide && $multiprofs) {
-                $affinity = t('Set Friend Zoom & Profile');
-            }
-
-
-            $theirs = get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'their_perms', EMPTY_STR);
-
-            $their_perms = Permissions::FilledPerms(explode(',', $theirs));
-            foreach ($global_perms as $k => $v) {
-                if (!array_key_exists($k, $their_perms)) {
-                    $their_perms[$k] = 1;
-                }
-            }
-
-            $my_perms = explode(',', get_abconfig(local_channel(), $contact['abook_xchan'], 'system', 'my_perms', EMPTY_STR));
-
-            foreach ($global_perms as $k => $v) {
-                $thisperm = ((in_array($k, $my_perms)) ? 1 : 0);
-
-                $checkinherited = PermissionLimits::Get(local_channel(), $k);
-
-                // For auto permissions (when $self is true) we don't want to look at existing
-                // permissions because they are enabled for the channel owner
-                if ((!$self) && ($existing[$k])) {
-                    $thisperm = "1";
-                }
-
-                $perms[] = array('perms_' . $k, $v, ((array_key_exists($k, $their_perms)) ? intval($their_perms[$k]) : ''), $thisperm, $yes_no, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
-            }
-
-            $current_permcat = EMPTY_STR;
-
-            if (Apps::System_app_installed(local_channel(),'Roles')) {
-                $pcat = new Permcat(local_channel(), $contact['abook_id']);
-                $pcatlist = $pcat->listing();
-                $permcats = [];
-                if ($pcatlist) {
-                    foreach ($pcatlist as $pc) {
-                        $permcats[$pc['name']] = $pc['localname'];
-                    }
-                }
-
-                $current_permcat = $pcat->match($my_perms);
-            }
-
-            $locstr = locations_by_netid($contact['xchan_hash']);
-            if (!$locstr) {
-                $locstr = unpunify($contact['xchan_url']);
-            }
-
-            $clone_warn = '';
-            $clonable = (in_array($contact['xchan_network'], ['nomad', 'zot6', 'zot', 'rss']) ? true : false);
-            if (!$clonable) {
-                $clone_warn = '';
-                $clone_warn .= ((intval($contact['abook_not_here']))
-                    ? t('This connection is unreachable from this location.')
-                    : t('This connection may be unreachable from other channel locations.')
-                );
-                $clone_warn .= '
          ' . t('Location independence is not supported by their network.');
-            }
-
-
-            if (intval($contact['abook_not_here']) && $unclonable) {
-                $not_here = t('This connection is unreachable from this location. Location independence is not supported by their network.');
-            }
-
-            $o .= replace_macros($tpl, [
-                '$header' => (($self) ? t('Connection Default Permissions') : sprintf(t('Connection: %s'), $contact['xchan_name']) . (($contact['abook_alias']) ? ' <' . $contact['abook_alias'] . '>' : '')),
-                '$autoperms' => array('autoperms', t('Apply these permissions automatically'), ((get_pconfig(local_channel(), 'system', 'autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
-                '$permcat' => ['permcat', t('Permission role'), $current_permcat, '', $permcats],
-                '$permcat_new' => t('Add permission role'),
-                '$permcat_enable' => Apps::system_app_installed(local_channel(),'Roles'),
-                '$addr' => unpunify($contact['xchan_addr']),
-                '$primeurl' => unpunify($contact['xchan_url']),
-                '$block_announce' => ['block_announce', t('Ignore shares and repeats this connection posts'), get_abconfig(local_channel(), $contact['xchan_hash'], 'system', 'block_announce', false), t('Note: This is not recommended for Groups.'), [t('No'), t('Yes')]],
-                '$section' => $section,
-                '$sections' => $sections,
-                '$vcard' => $vcard,
-                '$addr_text' => t('This connection\'s primary address is'),
-                '$loc_text' => t('Available locations:'),
-                '$locstr' => $locstr,
-                '$unclonable' => $clone_warn,
-                '$notself' => (($self) ? '' : '1'),
-                '$self' => (($self) ? '1' : ''),
-                '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'),
-                '$tools_label' => t('Connection Tools'),
-                '$tools' => (($self) ? '' : $tools),
-                '$lbl_slider' => t('Slide to adjust your degree of friendship'),
-                '$lbl_rating' => t('Rating'),
-                '$lbl_rating_label' => t('Slide to adjust your rating'),
-                '$lbl_rating_txt' => t('Optionally explain your rating'),
-                '$connfilter' => Apps::system_app_installed(local_channel(), 'Content Filter'),
-                '$connfilter_label' => t('Custom Filter'),
-                '$incl' => array('abook_incl', t('Only import posts with this text'), $contact['abook_incl'], t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')),
-                '$excl' => array('abook_excl', t('Do not import posts with this text'), $contact['abook_excl'], t('words one per line or #tags, $categories, /patterns/, or lang=xx, leave blank to import all posts')),
-                '$alias' => array('abook_alias', t('Nickname'), $contact['abook_alias'], t('optional - allows you to search by a name that you have chosen')),
-                '$rating_text' => array('rating_text', t('Optionally explain your rating'), $rating_text, ''),
-                '$rating_info' => t('This information is public!'),
-                '$rating' => $rating,
-                '$rating_val' => $rating_val,
-                '$slide' => $slide,
-                '$affinity' => $affinity,
-                '$pending_label' => t('Connection Pending Approval'),
-                '$is_pending' => (intval($contact['abook_pending']) ? 1 : ''),
-                '$unapproved' => $unapproved,
-                '$inherited' => '', // t('inherited'),
-                '$submit' => t('Submit'),
-                '$lbl_vis2' => sprintf(t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']),
-                '$close' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 80),
-                '$them' => t('Their Settings'),
-                '$me' => t('My Settings'),
-                '$perms' => $perms,
-                '$permlbl' => t('Individual Permissions'),
-                '$permnote' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
-                '$permnote_self' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
-                '$lastupdtext' => t('Last update:'),
-                '$last_update' => relative_date($contact['abook_connected']),
-                '$profile_select' => contact_profile_assign($contact['abook_profile']),
-                '$multiprofs' => $multiprofs,
-                '$contact_id' => $contact['abook_id'],
-                '$name' => $contact['xchan_name'],
-                '$abook_prev' => $abook_prev,
-                '$abook_next' => $abook_next,
-                '$vcard_label' => t('Details'),
-                '$displayname' => $displayname,
-                '$name_label' => t('Name'),
-                '$org_label' => t('Organisation'),
-                '$title_label' => t('Title'),
-                '$tel_label' => t('Phone'),
-                '$email_label' => t('Email'),
-                '$impp_label' => t('Instant messenger'),
-                '$url_label' => t('Website'),
-                '$adr_label' => t('Address'),
-                '$note_label' => t('Note'),
-                '$mobile' => t('Mobile'),
-                '$home' => t('Home'),
-                '$work' => t('Work'),
-                '$other' => t('Other'),
-                '$add_card' => t('Add Contact'),
-                '$add_field' => t('Add Field'),
-                '$create' => t('Create'),
-                '$update' => t('Update'),
-                '$delete' => t('Delete'),
-                '$cancel' => t('Cancel'),
-                '$po_box' => t('P.O. Box'),
-                '$extra' => t('Additional'),
-                '$street' => t('Street'),
-                '$locality' => t('Locality'),
-                '$region' => t('Region'),
-                '$zip_code' => t('ZIP Code'),
-                '$country' => t('Country')
-            ]);
-
-            $arr = array('contact' => $contact, 'output' => $o);
-
-            Hook::call('contact_edit', $arr);
-
-            return $arr['output'];
-        }
-    }
-}
diff --git a/Zotlabs/Module/Contactgroup.php b/Zotlabs/Module/Contactgroup.php
deleted file mode 100644
index 50100be78..000000000
--- a/Zotlabs/Module/Contactgroup.php
+++ /dev/null
@@ -1,57 +0,0 @@
- AccessList['id']
- * argv[2] => connection portable_id (base64url_encoded for transport)
- *
- */
-
-
-class Contactgroup extends Controller
-{
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            killme();
-        }
-
-        if ((argc() > 2) && (intval(argv(1))) && (argv(2))) {
-            $r = abook_by_hash(local_channel(), base64url_decode(argv(2)));
-            if ($r) {
-                $change = $r['abook_xchan'];
-            }
-        }
-
-        if ((argc() > 1) && (intval(argv(1)))) {
-            $group = AccessList::by_id(local_channel(), argv(1));
-
-            if (!$group) {
-                killme();
-            }
-
-            $members = AccessList::members(local_channel(), $group['id']);
-            $preselected = ids_to_array($members, 'xchan_hash');
-
-            if ($change) {
-                if (in_array($change, $preselected)) {
-                    AccessList::member_remove(local_channel(), $group['gname'], $change);
-                } else {
-                    AccessList::member_add(local_channel(), $group['gname'], $change);
-                }
-            }
-        }
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Content_filter.php b/Zotlabs/Module/Content_filter.php
deleted file mode 100644
index 9fa8d98d1..000000000
--- a/Zotlabs/Module/Content_filter.php
+++ /dev/null
@@ -1,74 +0,0 @@
-' . $desc . '';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Content Filter'))) {
-            return $text;
-        }
-
-        $text .= EOL . t('The settings on this page apply to all incoming content. To edit the settings for individual connetions, see the similar settings on the Connection Edit page for that connection.') . EOL . EOL;
-
-        $setting_fields = $text;
-
-        $setting_fields .= replace_macros(Theme::get_template('field_textarea.tpl'), array(
-            '$field' => [
-                'message_filter_incl',
-                t('Only import posts with this text'),
-                get_pconfig(local_channel(), 'system', 'message_filter_incl', ''),
-                t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts')
-            ]
-        ));
-        $setting_fields .= replace_macros(Theme::get_template('field_textarea.tpl'), array(
-            '$field' => [
-                'message_filter_excl',
-                t('Do not import posts with this text'),
-                get_pconfig(local_channel(), 'system', 'message_filter_excl', ''),
-                t('words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts')
-            ]
-        ));
-
-        $s .= replace_macros(Theme::get_template('generic_app_settings.tpl'), array(
-            '$addon' => array('content_filter', '' . t('Content Filter Settings'), '', t('Submit')),
-            '$content' => $setting_fields
-        ));
-
-        return $s;
-    }
-}
diff --git a/Zotlabs/Module/Conversation.php b/Zotlabs/Module/Conversation.php
deleted file mode 100644
index 783e2e6f1..000000000
--- a/Zotlabs/Module/Conversation.php
+++ /dev/null
@@ -1,174 +0,0 @@
- 0 order by imgscale asc LIMIT 1",
-                dbesc($image_id),
-                intval(local_channel())
-            );
-
-            if ($r) {
-                $max_thumb = intval(get_config('system', 'max_thumbnail', 1600));
-                $iscaled = false;
-                if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) {
-                    $imagick_path = get_config('system', 'imagick_convert_path');
-                    if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) {
-                        $fname = dbunescbin($r[0]['content']);
-                        $tmp_name = $fname . '-001';
-                        $newsize = photo_calculate_scale(array_merge(getimagesize($fname), ['max' => $max_thumb]));
-                        $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
-                        //  logger('imagick thumbnail command: ' . $cmd);
-                        for ($x = 0; $x < 4; $x++) {
-                            exec($cmd);
-                            if (file_exists($tmp_name)) {
-                                break;
-                            }
-                        }
-                        if (file_exists($tmp_name)) {
-                            $base_image = $r[0];
-                            $gis = getimagesize($tmp_name);
-                            logger('gis: ' . print_r($gis, true));
-                            $base_image['width'] = $gis[0];
-                            $base_image['height'] = $gis[1];
-                            $base_image['content'] = @file_get_contents($tmp_name);
-                            $iscaled = true;
-                            @unlink($tmp_name);
-                        }
-                    }
-                }
-                if (!$iscaled) {
-                    $base_image = $r[0];
-                    $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content']));
-                }
-
-                $im = photo_factory($base_image['content'], $base_image['mimetype']);
-                if ($im && $im->is_valid()) {
-                    // We are scaling and cropping the relative pixel locations to the original photo instead of the
-                    // scaled photo we operated on.
-
-                    // First load the scaled photo to check its size. (Should probably pass this in the post form and save
-                    // a query.)
-
-                    $g = q(
-                        "select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3",
-                        dbesc($image_id),
-                        intval(local_channel())
-                    );
-
-
-                    $scaled_width = $g[0]['width'];
-                    $scaled_height = $g[0]['height'];
-
-                    if ((!$scaled_width) || (!$scaled_height)) {
-                        logger('potential divide by zero scaling cover photo');
-                        return;
-                    }
-
-                    // unset all other cover photos
-
-                    q(
-                        "update photo set photo_usage = %d where photo_usage = %d and uid = %d",
-                        intval(PHOTO_NORMAL),
-                        intval(PHOTO_COVER),
-                        intval(local_channel())
-                    );
-
-                    $orig_srcx = ($base_image['width'] / $scaled_width) * $srcX;
-                    $orig_srcy = ($base_image['height'] / $scaled_height) * $srcY;
-                    $orig_srcw = ($srcW / $scaled_width) * $base_image['width'];
-                    $orig_srch = ($srcH / $scaled_height) * $base_image['height'];
-
-                    $im->cropImageRect(1200, 435, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch);
-
-                    $aid = get_account_id();
-
-                    $p = [
-                        'aid' => $aid,
-                        'uid' => local_channel(),
-                        'resource_id' => $base_image['resource_id'],
-                        'filename' => $base_image['filename'],
-                        'album' => t('Cover Photos'),
-                        'os_path' => $base_image['os_path'],
-                        'display_path' => $base_image['display_path'],
-                        'created' => $base_image['created'],
-                        'edited' => $base_image['edited']
-                    ];
-
-                    $p['imgscale'] = 7;
-                    $p['photo_usage'] = PHOTO_COVER;
-
-                    $r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200);
-
-                    $im->doScaleImage(850, 310);
-                    $p['imgscale'] = 8;
-
-                    $r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850);
-
-                    $im->doScaleImage(425, 160);
-                    $p['imgscale'] = 9;
-
-                    $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425);
-
-                    if ($r1 === false || $r2 === false || $r3 === false) {
-                        // if one failed, delete them all so we can start over.
-                        notice(t('Image resize failed.') . EOL);
-                        $x = q(
-                            "delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ",
-                            dbesc($base_image['resource_id']),
-                            local_channel()
-                        );
-                        return;
-                    }
-
-                    $channel = App::get_channel();
-                    $this->send_cover_photo_activity($channel, $base_image, $profile);
-                } else {
-                    notice(t('Unable to process image') . EOL);
-                }
-            }
-
-            goaway(z_root() . '/channel/' . $channel['channel_address']);
-        }
-
-
-        $hash = photo_new_resource();
-        $smallest = 0;
-
-        $matches = [];
-        $partial = false;
-
-        if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
-            $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
-            if ($pm) {
-                logger('Content-Range: ' . print_r($matches, true));
-                $partial = true;
-            }
-        }
-
-        if ($partial) {
-            $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
-
-            if ($x['partial']) {
-                header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-                json_return_and_die($x);
-            } else {
-                header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
-
-                $_FILES['userfile'] = [
-                    'name' => $x['name'],
-                    'type' => $x['type'],
-                    'tmp_name' => $x['tmp_name'],
-                    'error' => $x['error'],
-                    'size' => $x['size']
-                ];
-            }
-        } else {
-            if (!array_key_exists('userfile', $_FILES)) {
-                $_FILES['userfile'] = [
-                    'name' => $_FILES['files']['name'],
-                    'type' => $_FILES['files']['type'],
-                    'tmp_name' => $_FILES['files']['tmp_name'],
-                    'error' => $_FILES['files']['error'],
-                    'size' => $_FILES['files']['size']
-                ];
-            }
-        }
-
-        $res = attach_store(App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash));
-
-        logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG);
-
-        json_return_and_die(['message' => $hash]);
-    }
-
-    public function send_cover_photo_activity($channel, $photo, $profile)
-    {
-
-        $arr = [];
-        $arr['item_thread_top'] = 1;
-        $arr['item_origin'] = 1;
-        $arr['item_wall'] = 1;
-        $arr['uuid'] = new_uuid();
-        $arr['mid'] = z_root() . '/item/' . $arr['uuid'];
-        $arr['obj_type'] = ACTIVITY_OBJ_NOTE;
-        $arr['verb'] = ACTIVITY_CREATE;
-
-        if ($profile && stripos($profile['gender'], t('female')) !== false) {
-            $t = t('%1$s updated her %2$s');
-        } elseif ($profile && stripos($profile['gender'], t('male')) !== false) {
-            $t = t('%1$s updated his %2$s');
-        } else {
-            $t = t('%1$s updated their %2$s');
-        }
-
-        $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]';
-
-        $ltext = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-8[/zmg][/zrl]';
-
-        $arr['body'] = sprintf($t, $channel['channel_name'], $ptext) . "\n\n" . $ltext;
-
-        $arr['obj'] = [
-            'type' => ACTIVITY_OBJ_NOTE,
-            'published' => datetime_convert('UTC', 'UTC', $photo['created'], ATOM_TIME),
-            'updated' => datetime_convert('UTC', 'UTC', $photo['edited'], ATOM_TIME),
-            'id' => $arr['mid'],
-            'url' => ['type' => 'Link', 'mediaType' => $photo['mimetype'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7'],
-            'source' => ['content' => $arr['body'], 'mediaType' => 'text/x-multicode'],
-            'content' => bbcode($arr['body']),
-            'actor' => Activity::encode_person($channel, false),
-        ];
-
-        $acl = new AccessControl($channel);
-        $x = $acl->get();
-        $arr['allow_cid'] = $x['allow_cid'];
-
-        $arr['allow_gid'] = $x['allow_gid'];
-        $arr['deny_cid'] = $x['deny_cid'];
-        $arr['deny_gid'] = $x['deny_gid'];
-
-        $arr['uid'] = $channel['channel_id'];
-        $arr['aid'] = $channel['channel_account_id'];
-
-        $arr['owner_xchan'] = $channel['channel_hash'];
-        $arr['author_xchan'] = $channel['channel_hash'];
-
-        post_activity_item($arr);
-    }
-
-
-    /**
-     * @brief Generate content of profile-photo view
-     *
-     * @return string
-     *
-     */
-
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        $newuser = false;
-
-        if (argc() == 2 && argv(1) === 'new') {
-            $newuser = true;
-        }
-
-        if (argv(1) === 'use') {
-            if (argc() < 3) {
-                notice(t('Permission denied.') . EOL);
-                return;
-            }
-
-            //      check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo');
-
-            $resource_id = argv(2);
-
-            $r = q(
-                "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' and imgscale > 0 ORDER BY imgscale ASC",
-                intval(local_channel()),
-                dbesc($resource_id)
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-            $havescale = false;
-            foreach ($r as $rr) {
-                if ($rr['imgscale'] == 7) {
-                    $havescale = true;
-                }
-            }
-
-            $r = q(
-                "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
-                intval($r[0]['id']),
-                intval(local_channel())
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-
-            if (intval($r[0]['os_storage'])) {
-                $data = @file_get_contents(dbunescbin($r[0]['content']));
-            } else {
-                $data = dbunescbin($r[0]['content']);
-            }
-
-            $ph = photo_factory($data, $r[0]['mimetype']);
-            $smallest = 0;
-            if ($ph && $ph->is_valid()) {
-                // go ahead as if we have just uploaded a new photo to crop
-                $i = q(
-                    "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0",
-                    dbesc($r[0]['resource_id']),
-                    intval(local_channel())
-                );
-
-                if ($i) {
-                    $hash = $i[0]['resource_id'];
-                    foreach ($i as $ii) {
-                        $smallest = intval($ii['imgscale']);
-                    }
-                }
-            }
-
-            $this->cover_photo_crop_ui_head($ph, $hash, $smallest);
-        }
-
-
-        if (!array_key_exists('imagecrop', App::$data)) {
-            $o .= replace_macros(Theme::get_template('cover_photo.tpl'), [
-                '$user' => App::$channel['channel_address'],
-                '$info' => t('Your cover photo may be visible to anybody on the internet'),
-                '$existing' => get_cover_photo(local_channel(), 'array', PHOTO_RES_COVER_850),
-                '$lbl_upfile' => t('Upload File:'),
-                '$lbl_profiles' => t('Select a profile:'),
-                '$title' => t('Change Cover Photo'),
-                '$submit' => t('Upload'),
-                '$profiles' => $profiles,
-                '$embedPhotos' => t('Use a photo from your albums'),
-                '$embedPhotosModalTitle' => t('Use a photo from your albums'),
-                '$embedPhotosModalCancel' => t('Cancel'),
-                '$embedPhotosModalOK' => t('OK'),
-                '$modalchooseimages' => t('Choose images to embed'),
-                '$modalchoosealbum' => t('Choose an album'),
-                '$modaldiffalbum' => t('Choose a different album'),
-                '$modalerrorlist' => t('Error getting album list'),
-                '$modalerrorlink' => t('Error getting photo link'),
-                '$modalerroralbum' => t('Error getting album'),
-                '$form_security_token' => get_form_security_token("cover_photo"),
-                '$select' => t('Select previously uploaded photo'),
-
-            ]);
-
-            Hook::call('cover_photo_content_end', $o);
-
-            return $o;
-        } else {
-            $filename = App::$data['imagecrop'] . '-3';
-            $resolution = 3;
-
-            $o .= replace_macros(Theme::get_template('cropcover.tpl'), [
-                '$filename' => $filename,
-                '$profile' => intval($_REQUEST['profile']),
-                '$resource' => App::$data['imagecrop'] . '-3',
-                '$image_url' => z_root() . '/photo/' . $filename,
-                '$title' => t('Crop Image'),
-                '$desc' => t('Please adjust the image cropping for optimum viewing.'),
-                '$form_security_token' => get_form_security_token("cover_photo"),
-                '$done' => t('Done Editing')
-            ]);
-            return $o;
-        }
-    }
-
-    /* @brief Generate the UI for photo-cropping
-     *
-     * @param $a Current application
-     * @param $ph Photo-Factory
-     * @return void
-     *
-     */
-
-    public function cover_photo_crop_ui_head($ph, $hash, $smallest)
-    {
-
-        $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH);
-        if ($max_length > 0) {
-            $ph->scaleImage($max_length);
-        }
-
-        $width = $ph->getWidth();
-        $height = $ph->getHeight();
-
-        if ($width < 300 || $height < 300) {
-            $ph->scaleImageUp(240);
-            $width = $ph->getWidth();
-            $height = $ph->getHeight();
-        }
-
-
-        App::$data['imagecrop'] = $hash;
-        App::$data['imagecrop_resolution'] = $smallest;
-        App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []);
-        return;
-    }
-}
diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
deleted file mode 100644
index b3a128800..000000000
--- a/Zotlabs/Module/Dav.php
+++ /dev/null
@@ -1,147 +0,0 @@
- $c, 'account' => $a[0]];
-                                    $channel_login = $c['channel_id'];
-                                }
-                            }
-                        }
-                        if (!$record) {
-                            continue;
-                        }
-
-                        if ($record) {
-                            $verified = HTTPSig::verify('', $record['channel']['channel_pubkey']);
-                            if (!($verified && $verified['header_signed'] && $verified['header_valid'])) {
-                                $record = null;
-                            }
-                            if ($record['account']) {
-                                authenticate_success($record['account']);
-                                if ($channel_login) {
-                                    change_channel($channel_login);
-                                }
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!is_dir('store')) {
-            os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false);
-        }
-
-        if (argc() > 1) {
-            Libprofile::load(argv(1), 0);
-        }
-
-
-        $auth = new BasicAuth();
-//      $auth->observer = get_observer_hash();
-
-        $auth->setRealm(ucfirst(System::get_platform_name()) . ' ' . 'WebDAV');
-
-        $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);
-
-        // A SabreDAV server-object
-        $server = new SDAV\Server($rootDirectory);
-
-
-        $authPlugin = new Plugin($auth);
-        $server->addPlugin($authPlugin);
-
-
-        // prevent overwriting changes each other with a lock backend
-        $lockBackend = new SDAV\Locks\Backend\File('cache/locks');
-        $lockPlugin = new SDAV\Locks\Plugin($lockBackend);
-
-        $server->addPlugin($lockPlugin);
-
-        // provide a directory view for the cloud in Hubzilla
-        $browser = new Browser($auth);
-        $auth->setBrowserPlugin($browser);
-
-        // Experimental QuotaPlugin
-        // $server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth));
-
-        // All we need to do now, is to fire up the server
-        $server->exec();
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php
deleted file mode 100644
index 8bd7264ad..000000000
--- a/Zotlabs/Module/Defperms.php
+++ /dev/null
@@ -1,275 +0,0 @@
- $desc) {
-                if (array_key_exists('perms_' . $perm, $_POST)) {
-                    if ($p) {
-                        $p .= ',';
-                    }
-                    $p .= $perm;
-                }
-            }
-            set_abconfig($channel['channel_id'], $orig_record[0]['abook_xchan'], 'system', 'my_perms', $p);
-            if ($autoperms) {
-                set_pconfig($channel['channel_id'], 'system', 'autoperms', $p);
-            }
-        }
-
-        notice(t('Settings updated.') . EOL);
-
-
-        // Refresh the structure in memory with the new data
-
-        $r = q(
-            "SELECT abook.*, xchan.*
-			FROM abook left join xchan on abook_xchan = xchan_hash
-			WHERE abook_channel = %d and abook_id = %d LIMIT 1",
-            intval(local_channel()),
-            intval($contact_id)
-        );
-        if ($r) {
-            App::$poi = $r[0];
-        }
-
-        $this->defperms_clone($a);
-
-        goaway(z_root() . '/defperms');
-
-        return;
-    }
-
-    /* @brief Clone connection
-     *
-     *
-     */
-
-    public function defperms_clone(&$a)
-    {
-
-        if (!App::$poi) {
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        $r = q(
-            "SELECT abook.*, xchan.*
-				FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_channel = %d and abook_id = %d LIMIT 1",
-            intval(local_channel()),
-            intval(App::$poi['abook_id'])
-        );
-        if ($r) {
-            App::$poi = array_shift($r);
-        }
-
-        $clone = App::$poi;
-
-        unset($clone['abook_id']);
-        unset($clone['abook_account']);
-        unset($clone['abook_channel']);
-
-        $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
-        if ($abconfig) {
-            $clone['abconfig'] = $abconfig;
-        }
-        Libsync::build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone)));
-    }
-
-    /* @brief Generate content of connection default permissions page
-     *
-     *
-     */
-
-    public function get()
-    {
-
-        $sort_type = 0;
-        $o = '';
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return login();
-        }
-
-        $role = get_pconfig(local_channel(), 'system', 'permissions_role');
-        if ($role) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $section = ((array_key_exists('section', $_REQUEST)) ? $_REQUEST['section'] : '');
-        $channel = App::get_channel();
-
-        $yes_no = [t('No'), t('Yes')];
-
-        $connect_perms = Permissions::connect_perms(local_channel());
-
-        $o .= "\n";
-
-        if (App::$poi) {
-            $sections = [];
-
-            $self = false;
-
-            $tpl = Theme::get_template('defperms.tpl');
-
-            $perms = [];
-            $channel = App::get_channel();
-
-            $contact = App::$poi;
-
-            $global_perms = Permissions::Perms();
-
-            $hidden_perms = [];
-
-            foreach ($global_perms as $k => $v) {
-                $thisperm = get_abconfig(local_channel(), $contact['abook_xchan'], 'my_perms', $k);
-
-                $checkinherited = PermissionLimits::Get(local_channel(), $k);
-
-                $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true);
-
-                $perms[] = ['perms_' . $k, $v, intval($thisperm), '', $yes_no, (($inherited) ? ' disabled="disabled" ' : '')];
-                if ($inherited) {
-                    $hidden_perms[] = ['perms_' . $k, intval($thisperm)];
-                }
-            }
-
-            $pcat = new Permcat(local_channel());
-            $pcatlist = $pcat->listing();
-            $permcats = [];
-            if ($pcatlist) {
-                foreach ($pcatlist as $pc) {
-                    $permcats[$pc['name']] = $pc['localname'];
-                }
-            }
-
-            $o .= replace_macros($tpl, [
-                '$header' => t('Connection Default Permissions'),
-                '$autoperms' => array('autoperms', t('Apply these permissions automatically'), ((get_pconfig(local_channel(), 'system', 'autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no),
-                '$permcat' => ['permcat', t('Permission role'), '', '', $permcats],
-                '$permcat_new' => t('Add permission role'),
-                '$permcat_enable' => Apps::system_app_installed($channel_id, 'Roles'),
-                '$section' => $section,
-                '$sections' => $sections,
-                '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'),
-                '$autoapprove' => t('Automatic approval settings'),
-                '$unapproved' => $unapproved,
-                '$inherited' => t('inherited'),
-                '$submit' => t('Submit'),
-                '$me' => t('My Settings'),
-                '$perms' => $perms,
-                '$hidden_perms' => $hidden_perms,
-                '$permlbl' => t('Individual Permissions'),
-                '$permnote_self' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
-                '$contact_id' => $contact['abook_id'],
-                '$name' => $contact['xchan_name'],
-            ]);
-
-            $arr = array('contact' => $contact, 'output' => $o);
-
-            Hook::call('contact_edit', $arr);
-
-            return $arr['output'];
-        }
-    }
-}
diff --git a/Zotlabs/Module/Dircensor.php b/Zotlabs/Module/Dircensor.php
deleted file mode 100644
index a4348b862..000000000
--- a/Zotlabs/Module/Dircensor.php
+++ /dev/null
@@ -1,52 +0,0 @@
- [['uid' => local_channel(), 'xchan' => $_GET['ignore']]]]);
-            if ($_REQUEST['return']) {
-                goaway(z_root() . '/' . base64_decode($_REQUEST['return']));
-            }
-            goaway(z_root() . '/directory?f=&suggest=1');
-        }
-
-        $observer = get_observer_hash();
-        $global_changed = false;
-        $safe_changed = false;
-        $type_changed = false;
-        $active_changed = false;
-
-        if (array_key_exists('global', $_REQUEST)) {
-            $globaldir = intval($_REQUEST['global']);
-            if (get_config('system', 'localdir_hide')) {
-                $globaldir = 1;
-            }
-            $global_changed = true;
-        }
-        if ($global_changed) {
-            $_SESSION['globaldir'] = $globaldir;
-            if ($observer) {
-                set_xconfig($observer, 'directory', 'globaldir', $globaldir);
-            }
-        }
-
-        if (array_key_exists('safe', $_REQUEST)) {
-            $safemode = intval($_REQUEST['safe']);
-            $safe_changed = true;
-        }
-        if ($safe_changed) {
-            $_SESSION['safemode'] = $safemode;
-            if ($observer) {
-                set_xconfig($observer, 'directory', 'safemode', $safemode);
-            }
-        }
-
-        if (array_key_exists('type', $_REQUEST)) {
-            $type = intval($_REQUEST['type']);
-            $type_changed = true;
-        }
-        if ($type_changed) {
-            $_SESSION['chantype'] = $type;
-            if ($observer) {
-                set_xconfig($observer, 'directory', 'chantype', $type);
-            }
-        }
-
-        if (array_key_exists('active', $_REQUEST)) {
-            $active = intval($_REQUEST['active']);
-            $active_changed = true;
-        }
-        if ($active_changed) {
-            $_SESSION['activedir'] = $active;
-            if ($observer) {
-                set_xconfig($observer, 'directory', 'activedir', $active);
-            }
-        }
-    }
-
-    public function get()
-    {
-
-        if (observer_prohibited()) {
-            notice(t('Public access denied.') . EOL);
-            return;
-        }
-
-        $observer = get_observer_hash();
-
-        if (get_config('system', 'block_public_directory', true) && (!$observer)) {
-            notice(t('Public access denied.') . EOL);
-            return login(false);
-        }
-
-        $globaldir = Libzotdir::get_directory_setting($observer, 'globaldir');
-
-        // override your personal global search pref if we're doing a navbar search of the directory
-        if (intval($_REQUEST['navsearch'])) {
-            $globaldir = 1;
-        }
-
-        $safe_mode = Libzotdir::get_directory_setting($observer, 'safemode');
-
-        $type = Libzotdir::get_directory_setting($observer, 'chantype');
-
-        $active = Libzotdir::get_directory_setting($observer, 'activedir');
-
-        $o = '';
-        Navbar::set_selected('Directory');
-
-        if (x($_POST, 'search')) {
-            $search = notags(trim($_POST['search']));
-        } else {
-            $search = ((x($_GET, 'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
-        }
-
-        if (strpos($search, '=')) {
-            $advanced = $search;
-        }
-
-        $keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');
-
-        // Suggest channels if no search terms or keywords are given
-        $suggest = (local_channel() && x($_REQUEST, 'suggest')) ? $_REQUEST['suggest'] : '';
-
-        if ($suggest) {
-            // the directory options have no effect in suggestion mode
-
-            $globaldir = 1;
-            $safe_mode = 1;
-            $active = 1;
-            $type = 0;
-
-            // only return DIRECTORY_PAGESIZE suggestions as the suggestion sorting
-            // only works if the suggestion query and the directory query have the
-            // same number of results
-
-            App::set_pager_itemspage(60);
-            $r = Socgraph::suggestion_query(local_channel(), get_observer_hash(), App::$pager['start'], DIRECTORY_PAGESIZE);
-
-            if (!$r) {
-                if ($_REQUEST['aj']) {
-                    echo '
          ';
-                    killme();
-                }
-
-                notice(t('No default suggestions were found.') . EOL);
-                return;
-            }
-
-            // Remember in which order the suggestions were
-            $addresses = [];
-            $common = [];
-            $index = 0;
-            foreach ($r as $rr) {
-                $common[$rr['xchan_hash']] = ((intval($rr['total']) > 0) ? intval($rr['total']) - 1 : 0);
-                $addresses[$rr['xchan_hash']] = $index++;
-            }
-
-            // Build query to get info about suggested people
-            $advanced = '';
-            foreach (array_keys($addresses) as $address) {
-                $advanced .= "xhash=\"$address\" ";
-            }
-            // Remove last space in the advanced query
-            $advanced = rtrim($advanced);
-        }
-
-        $tpl = Theme::get_template('directory_header.tpl');
-
-        $dirmode = intval(get_config('system', 'directory_mode'));
-
-        $directory_admin = false;
-
-        $url = z_root() . '/dirsearch';
-        if (Channel::is_system(local_channel())) {
-            $directory_admin = true;
-        }
-
-        $contacts = [];
-
-        if (local_channel()) {
-            $x = q(
-                "select abook_xchan from abook where abook_channel = %d",
-                intval(local_channel())
-            );
-            if ($x) {
-                foreach ($x as $xx) {
-                    $contacts[] = $xx['abook_xchan'];
-                }
-            }
-        }
-
-        if ($url) {
-            $numtags = get_config('system', 'directorytags');
-
-            $kw = ((intval($numtags) > 0) ? intval($numtags) : 50);
-
-            if (get_config('system', 'disable_directory_keywords')) {
-                $kw = 0;
-            }
-
-            $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : '');
-
-            if ($token) {
-                $query .= '&t=' . $token;
-            }
-
-            if (!$globaldir) {
-                $query .= '&hub=' . App::get_hostname();
-            }
-            if ($search) {
-                $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search);
-            }
-            if (strpos($search, '@')) {
-                $query .= '&address=' . urlencode($search);
-            }
-            if (strpos($search, 'http') === 0) {
-                $query .= '&url=' . urlencode($search);
-            }
-            if ($keywords) {
-                $query .= '&keywords=' . urlencode($keywords);
-            }
-            if ($advanced) {
-                $query .= '&query=' . urlencode($advanced);
-            }
-            if (!is_null($type)) {
-                $query .= '&type=' . intval($type);
-            }
-            $directory_sort_order = get_config('system', 'directory_sort_order');
-            if (!$directory_sort_order) {
-                $directory_sort_order = 'date';
-            }
-
-            $sort_order = ((x($_REQUEST, 'order')) ? $_REQUEST['order'] : $directory_sort_order);
-
-            if ($sort_order) {
-                $query .= '&order=' . urlencode($sort_order);
-            }
-
-            if (App::$pager['page'] != 1) {
-                $query .= '&p=' . App::$pager['page'];
-            }
-
-            if (isset($active)) {
-                $query .= '&active=' . intval($active);
-            }
-
-
-            // logger('mod_directory: query: ' . $query);
-
-            $x = z_fetch_url($query);
-            // logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA);
-
-            if ($x['success']) {
-                $t = 0;
-                $j = json_decode($x['body'], true);
-                if ($j) {
-                    if ($j['results']) {
-                        $results = $j['results'];
-                        if ($suggest) {
-                            // change order to "number of common friends descending"
-                            $results = self::reorder_results($results, $addresses);
-                        }
-
-                        $entries = [];
-
-                        $photo = 'thumb';
-
-                        foreach ($results as $rr) {
-                            $profile_link = chanlink_url($rr['url']);
-
-                            $pdesc = (($rr['description']) ? $rr['description'] . '
          ' : '');
-                            $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');
-
-                            // Checking status is disabled ATM until someone checks the performance impact more carefully
-                            //$online = Channel::remote_online_status($rr['address']);
-                            $online = '';
-
-                            if (in_array($rr['hash'], $contacts)) {
-                                $connect_link = '';
-                            }
-
-                            $location = '';
-                            if (strlen($rr['locale'])) {
-                                $location .= $rr['locale'];
-                            }
-                            if (strlen($rr['region'])) {
-                                if (strlen($rr['locale'])) {
-                                    $location .= ', ';
-                                }
-                                $location .= $rr['region'];
-                            }
-                            if (strlen($rr['country'])) {
-                                if (strlen($location)) {
-                                    $location .= ', ';
-                                }
-                                $location .= $rr['country'];
-                            }
-
-                            $age = '';
-                            if (strlen($rr['birthday'])) {
-                                if (($years = age($rr['birthday'], 'UTC', '')) > 0) {
-                                    $age = $years;
-                                }
-                            }
-
-                            $page_type = '';
-
-                            $total_ratings = '';
-
-                            $profile = $rr;
-
-                            $gender = ((x($profile, 'gender') == 1) ? t('Gender: ') . $profile['gender'] : false);
-                            $marital = ((x($profile, 'marital') == 1) ? t('Status: ') . $profile['marital'] : false);
-                            $homepage = ((x($profile, 'homepage') == 1) ? t('Homepage: ') : false);
-                            $homepageurl = ((x($profile, 'homepage') == 1) ? html2plain($profile['homepage']) : '');
-                            $hometown = ((x($profile, 'hometown') == 1) ? html2plain($profile['hometown']) : false);
-                            $about = ((x($profile, 'about') == 1) ? zidify_links(bbcode($profile['about'])) : false);
-
-                            $keywords = ((x($profile, 'keywords')) ? $profile['keywords'] : '');
-
-                            $out = '';
-
-                            if ($keywords) {
-                                $keywords = str_replace(',', ' ', $keywords);
-                                $keywords = str_replace('  ', ' ', $keywords);
-                                $karr = explode(' ', $keywords);
-
-                                if ($karr) {
-                                    if (local_channel()) {
-                                        $pk = q(
-                                            "select keywords from profile where uid = %d and is_default = 1 limit 1",
-                                            intval(local_channel())
-                                        );
-                                        if ($pk) {
-                                            $keywords = str_replace(',', ' ', $pk[0]['keywords']);
-                                            $keywords = str_replace('  ', ' ', $keywords);
-                                            $marr = explode(' ', $keywords);
-                                        }
-                                    }
-                                    foreach ($karr as $k) {
-                                        if (strlen($out)) {
-                                            $out .= ', ';
-                                        }
-                                        if ($marr && in_arrayi($k, $marr)) {
-                                            $out .= '' . $k . '';
-                                        } else {
-                                            $out .= '' . $k . '';
-                                        }
-                                    }
-                                }
-                            }
-
-                            $entry = [
-                                'id' => ++$t,
-                                'profile_link' => $profile_link,
-                                'type' => $rr['type'],
-                                'photo' => $rr['photo'],
-                                'hash' => $rr['hash'],
-                                'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''),
-                                'name' => $rr['name'],
-                                'age' => $age,
-                                'age_label' => t('Age:'),
-                                'profile' => $profile,
-                                'address' => $rr['address'],
-                                'nickname' => substr($rr['address'], 0, strpos($rr['address'], '@')),
-                                'location' => $location,
-                                'location_label' => t('Location:'),
-                                'gender' => $gender,
-                                'total_ratings' => $total_ratings,
-                                'viewrate' => true,
-                                'canrate' => (($rating_enabled && local_channel()) ? true : false),
-                                // 'network'           => network_to_name($rr['network']),
-                                // 'network_label'     => t('Network:'),
-                                'pdesc' => $pdesc,
-                                'pdesc_label' => t('Description:'),
-                                'censor' => (($directory_admin) ? 'dircensor/' . $rr['hash'] : ''),
-                                'censor_label' => (($rr['censored']) ? t('Uncensor') : t('Censor')),
-                                'marital' => $marital,
-                                'homepage' => $homepage,
-                                'homepageurl' => (($safe_mode) ? $homepageurl : linkify($homepageurl)),
-                                'hometown' => $hometown,
-                                'hometown_label' => t('Hometown:'),
-                                'about' => $about,
-                                'about_label' => t('About:'),
-                                'conn_label' => t('Connect'),
-                                'forum_label' => t('Group'),
-                                'collections_label' => t('Collection'),
-                                'connect' => $connect_link,
-                                'online' => $online,
-                                'kw' => (($out) ? t('Keywords: ') : ''),
-                                'keywords' => $out,
-                                'ignlink' => $suggest ? z_root() . '/directory?ignore=' . $rr['hash'] : '',
-                                'ignore_label' => t('Don\'t suggest'),
-                                'common_friends' => (($common[$rr['hash']]) ? intval($common[$rr['hash']]) : ''),
-                                'common_label' => t('Suggestion ranking:'),
-                                'common_count' => intval($common[$rr['hash']]),
-                                'safe' => $safe_mode
-                            ];
-
-
-                            $blocked = LibBlock::fetch($channel['channel_id'], BLOCKTYPE_SERVER);
-
-                            $found_block = false;
-                            if ($blocked) {
-                                foreach ($blocked as $b) {
-                                    if (strpos($rr['site_url'], $b['block_entity']) !== false) {
-                                        $found_block = true;
-                                        break;
-                                    }
-                                }
-                                if ($found_block) {
-                                    continue;
-                                }
-                            }
-
-                            if (LibBlock::fetch_by_entity(local_channel(), $entry['hash'])) {
-                                continue;
-                            }
-
-                            $arr = array('contact' => $rr, 'entry' => $entry);
-
-                            Hook::call('directory_item', $arr);
-
-                            unset($profile);
-                            unset($location);
-
-                            if (!$arr['entry']) {
-                                continue;
-                            }
-
-                            if ($sort_order == '' && $suggest) {
-                                $entries[$addresses[$rr['address']]] = $arr['entry']; // Use the same indexes as originally to get the best suggestion first
-                            } else {
-                                $entries[] = $arr['entry'];
-                            }
-                        }
-
-                        ksort($entries); // Sort array by key so that foreach-constructs work as expected
-
-                        if ($j['keywords']) {
-                            App::$data['directory_keywords'] = $j['keywords'];
-                        }
-
-                        // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
-
-
-                        if ($_REQUEST['aj']) {
-                            if ($entries) {
-                                $o = replace_macros(Theme::get_template('directajax.tpl'), ['$entries' => $entries]);
-                            } else {
-                                $o = '
          ';
-                            }
-                            echo $o;
-                            killme();
-                        } else {
-                            $maxheight = 94;
-
-                            $dirtitle = (($globaldir) ? t('Directory') : t('Local Directory'));
-
-                            $o .= "";
-                            $o .= replace_macros($tpl, [
-                                '$search' => $search,
-                                '$desc' => t('Find'),
-                                '$finddsc' => t('Finding:'),
-                                '$safetxt' => htmlspecialchars($search, ENT_QUOTES, 'UTF-8'),
-                                '$entries' => $entries,
-                                '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle,
-                                '$submit' => t('Find'),
-                                '$next' => alt_pager($j['records'], t('next page'), t('previous page')),
-                                '$sort' => t('Sort options'),
-                                '$normal' => t('Alphabetic'),
-                                '$reverse' => t('Reverse Alphabetic'),
-                                '$date' => t('Newest to Oldest'),
-                                '$reversedate' => t('Oldest to Newest'),
-                                '$suggest' => $suggest ? '&suggest=1' : ''
-                            ]);
-                        }
-                    } else {
-                        if ($_REQUEST['aj']) {
-                            $o = '
          ';
-                            echo $o;
-                            killme();
-                        }
-                        if ($search && App::$pager['page'] == 1 && $j['records'] == 0) {
-                            if (strpos($search, '@')) {
-                                goaway(z_root() . '/chanview/?f=&address=' . $search);
-                            } elseif (strpos($search, 'http') === 0) {
-                                goaway(z_root() . '/chanview/?f=&url=' . $search);
-                            } else {
-                                $r = q(
-                                    "select xchan_hash from xchan where xchan_name = '%s' limit 1",
-                                    dbesc($search)
-                                );
-                                if ($r) {
-                                    goaway(z_root() . '/chanview/?f=&hash=' . urlencode($r[0]['xchan_hash']));
-                                }
-                            }
-                        }
-                        info(t("No entries (some entries may be hidden).") . EOL);
-                    }
-                }
-            }
-        }
-        return $o;
-    }
-
-
-    public static function reorder_results($results, $suggests)
-    {
-        if (!$suggests) {
-            return $results;
-        }
-
-        $out = [];
-        foreach ($suggests as $k => $v) {
-            foreach ($results as $rv) {
-                if ($k == $rv['hash']) {
-                    $out[intval($v)] = $rv;
-                    break;
-                }
-            }
-        }
-        return $out;
-    }
-}
diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php
deleted file mode 100644
index 754b004ba..000000000
--- a/Zotlabs/Module/Dirsearch.php
+++ /dev/null
@@ -1,466 +0,0 @@
- false];
-
-        // logger('request: ' . print_r($_REQUEST,true));
-
-
-        if (argc() > 1 && argv(1) === 'sites') {
-            $ret = $this->list_public_sites();
-            json_return_and_die($ret);
-        }
-
-        $dirmode = intval(get_config('system', 'directory_mode'));
-
-
-        $network = EMPTY_STR;
-
-        $sql_extra = '';
-
-        $tables = ['name', 'address', 'xhash', 'locale', 'region', 'postcode',
-            'country', 'gender', 'marital', 'sexual', 'keywords'];
-
-        // parse advanced query if present
-
-        if ($_REQUEST['query']) {
-            $advanced = $this->dir_parse_query($_REQUEST['query']);
-            if ($advanced) {
-                foreach ($advanced as $adv) {
-                    if (in_array($adv['field'], $tables)) {
-                        if ($adv['field'] === 'name') {
-                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_name', $adv['value']);
-                        } elseif ($adv['field'] === 'address') {
-                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_addr', $adv['value']);
-                        } elseif ($adv['field'] === 'xhash') {
-                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xchan_hash', $adv['value']);
-                        } else {
-                            $sql_extra .= $this->dir_query_build($adv['logic'], 'xprof_' . $adv['field'], $adv['value']);
-                        }
-                    }
-                }
-            }
-        }
-
-        $hash = ((x($_REQUEST['hash'])) ? $_REQUEST['hash'] : '');
-        $name = ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : '');
-        $url = ((x($_REQUEST, 'url')) ? $_REQUEST['url'] : '');
-        $hub = ((x($_REQUEST, 'hub')) ? $_REQUEST['hub'] : '');
-        $address = ((x($_REQUEST, 'address')) ? $_REQUEST['address'] : '');
-        $locale = ((x($_REQUEST, 'locale')) ? $_REQUEST['locale'] : '');
-        $region = ((x($_REQUEST, 'region')) ? $_REQUEST['region'] : '');
-        $postcode = ((x($_REQUEST, 'postcode')) ? $_REQUEST['postcode'] : '');
-        $country = ((x($_REQUEST, 'country')) ? $_REQUEST['country'] : '');
-        $gender = ((x($_REQUEST, 'gender')) ? $_REQUEST['gender'] : '');
-        $marital = ((x($_REQUEST, 'marital')) ? $_REQUEST['marital'] : '');
-        $sexual = ((x($_REQUEST, 'sexual')) ? $_REQUEST['sexual'] : '');
-        $keywords = ((x($_REQUEST, 'keywords')) ? $_REQUEST['keywords'] : '');
-        $agege = ((x($_REQUEST, 'agege')) ? intval($_REQUEST['agege']) : 0);
-        $agele = ((x($_REQUEST, 'agele')) ? intval($_REQUEST['agele']) : 0);
-        $kw = ((x($_REQUEST, 'kw')) ? intval($_REQUEST['kw']) : 0);
-        $active = ((x($_REQUEST, 'active')) ? intval($_REQUEST['active']) : 0);
-        $type = ((array_key_exists('type', $_REQUEST)) ? intval($_REQUEST['type']) : 0);
-
-        // allow a site to disable the directory's keyword list
-        if (get_config('system', 'disable_directory_keywords')) {
-            $kw = 0;
-        }
-
-        // by default use a safe search
-        $safe = ((x($_REQUEST, 'safe')));
-        if ($safe === false) {
-            $safe = 1;
-        }
-
-        // Directory mirrors will request sync packets, which are lists
-        // of records that have changed since the sync datetime.
-
-        if (array_key_exists('sync', $_REQUEST)) {
-            if ($_REQUEST['sync']) {
-                $sync = datetime_convert('UTC', 'UTC', $_REQUEST['sync']);
-            } else {
-                $sync = datetime_convert('UTC', 'UTC', '2010-01-01 01:01:00');
-            }
-        } else {
-            $sync = false;
-        }
-
-        if (($dirmode == DIRECTORY_MODE_STANDALONE) && (!$hub)) {
-            $hub = App::get_hostname();
-        }
-
-        if ($hub) {
-            $hub_query = " and xchan_hash in (select hubloc_hash from hubloc where hubloc_host =  '" . protect_sprintf(dbesc($hub)) . "') ";
-        } else {
-            $hub_query = '';
-        }
-
-        if ($url) {
-            $r = q(
-                "select xchan_name from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_url = '%s' or hubloc_id_url = '%s'",
-                dbesc($url),
-                dbesc($url)
-            );
-            if ($r && $r[0]['xchan_name']) {
-                $name = $r[0]['xchan_name'];
-            }
-        }
-
-        // The order identifier is validated further below
-
-        $sort_order = ((x($_REQUEST, 'order')) ? $_REQUEST['order'] : '');
-
-
-        // parse and assemble the query for advanced searches
-
-        $joiner = ' OR ';
-
-        if ($_REQUEST['and']) {
-            $joiner = ' AND ';
-        }
-
-        if ($name) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xchan_name', $name);
-        }
-        if ($address) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xchan_addr', $address);
-        }
-        if ($hash) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xchan_hash', $hash);
-        }
-        if ($locale) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_locale', $locale);
-        }
-        if ($region) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_region', $region);
-        }
-        if ($postcode) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_postcode', $postcode);
-        }
-        if ($country) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_country', $country);
-        }
-        if ($gender) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_gender', $gender);
-        }
-        if ($marital) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_marital', $marital);
-        }
-        if ($sexual) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_sexual', $sexual);
-        }
-        if ($keywords) {
-            $sql_extra .= $this->dir_query_build($joiner, 'xprof_keywords', $keywords);
-        }
-
-        // we only support an age range currently. You must set both agege
-        // (greater than or equal) and agele (less than or equal)
-
-        if ($agele && $agege) {
-            $sql_extra .= " $joiner ( xprof_age <= " . intval($agele) . " ";
-            $sql_extra .= " AND  xprof_age >= " . intval($agege) . ") ";
-        }
-
-
-        $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 60);
-        $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0);
-        $startrec = (($page + 1) * $perpage) - $perpage;
-        $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0);
-        $return_total = ((x($_REQUEST, 'return_total')) ? intval($_REQUEST['return_total']) : 0);
-
-        // mtime is not currently working
-
-        $mtime = ((x($_REQUEST, 'mtime')) ? datetime_convert('UTC', 'UTC', $_REQUEST['mtime']) : '');
-
-        // merge them into xprof
-
-        $ret['success'] = true;
-
-        // If &limit=n, return at most n entries
-        // If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination.
-        // By default we return one page (default 60 items maximum) and do not count total entries
-
-        $logic = ((strlen($sql_extra)) ? 'false' : 'true');
-
-        if ($hash) {
-            $logic = 'true';
-        }
-
-        if ($dirmode == DIRECTORY_MODE_STANDALONE) {
-            $sql_extra .= " and xchan_addr like '%%" . App::get_hostname() . "' ";
-        }
-
-        $safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : '');
-        if ($safe < 0) {
-            $safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) ";
-        }
-
-        if ($type) {
-            $safesql .= " and xchan_type = " . intval($type);
-        }
-
-        $activesql = EMPTY_STR;
-
-        if ($active) {
-            $activesql = "and xchan_updated > '" . datetime_convert(date_default_timezone_get(), 'UTC', 'now - 60 days') . "' ";
-        }
-
-        if ($limit) {
-            $qlimit = " LIMIT $limit ";
-        } else {
-            $qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec);
-            if ($return_total) {
-                $r = q("SELECT COUNT(xchan_hash) AS total FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra $network and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $activesql ");
-                if ($r) {
-                    $ret['total_items'] = $r[0]['total'];
-                }
-            }
-        }
-
-        if ($sort_order == 'normal') {
-            $order = " order by xchan_name asc ";
-
-            // Start the alphabetic search at 'A'
-            // This will make a handful of channels whose names begin with
-            // punctuation un-searchable in this mode
-
-            $safesql .= " and ascii(substring(xchan_name FROM 1 FOR 1)) > 64 ";
-        } elseif ($sort_order == 'reverse') {
-            $order = " order by xchan_name desc ";
-        } elseif ($sort_order == 'reversedate') {
-            $order = " order by xchan_name_date asc ";
-        } else {
-            $order = " order by xchan_name_date desc ";
-        }
-
-
-        // normal directory query
-
-        $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash 
-			where ( $logic $sql_extra ) $hub_query $network and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 
-			$safesql $activesql $order $qlimit ");
-
-        $ret['page'] = $page + 1;
-        $ret['records'] = count($r);
-
-        if ($r) {
-            $entries = [];
-            $dups = [];
-            $isdup = EMPTY_STR;
-
-            // Collect activitypub identities and query which also have zot6 identities.
-            // Do this once per page fetch rather than once per entry.
-
-            foreach ($r as $rv) {
-                if ($rv['xchan_network'] === 'activitypub') {
-                    if ($isdup) {
-                        $isdup .= ',';
-                    }
-                    $isdup .= "'" . dbesc($rv['xchan_url']) . "'";
-                }
-                if ($isdup) {
-                    $isdup = protect_sprintf($isdup);
-					$z = q("select xchan_url, xchan_hash from xchan where xchan_url in  ( $isdup ) and xchan_network in ('nomad','zot6')");
-                    if ($z) {
-                        foreach ($z as $zv) {
-                            $dups[$zv['xchan_url']] = $zv['xchan_hash'];
-                        }
-                    }
-                }
-            }
-
-            foreach ($r as $rr) {
-                // If it's an activitypub record and the channel also has a zot6 address, don't return it.
-
-                if (array_key_exists($rr['xchan_url'], $dups)) {
-                    continue;
-                }
-
-                if (!check_siteallowed($rr['xchan_url'])) {
-                    continue;
-                }
-
-                if (!check_channelallowed($rr['xchan_hash'])) {
-                    continue;
-                }
-
-
-                $entry = [];
-
-                $entry['name'] = $rr['xchan_name'];
-                $entry['hash'] = $rr['xchan_hash'];
-                $entry['censored'] = $rr['xchan_censored'];
-                $entry['selfcensored'] = $rr['xchan_selfcensored'];
-                $entry['type'] = $rr['xchan_type'];
-                $entry['url'] = $rr['xchan_url'];
-                $entry['photo_l'] = $rr['xchan_photo_l'];
-                $entry['photo'] = $rr['xchan_photo_m'];
-                $entry['address'] = $rr['xchan_addr'];
-                $entry['network'] = $rr['xchan_network'];
-                $entry['description'] = $rr['xprof_desc'];
-                $entry['locale'] = $rr['xprof_locale'];
-                $entry['region'] = $rr['xprof_region'];
-                $entry['postcode'] = $rr['xprof_postcode'];
-                $entry['country'] = $rr['xprof_country'];
-                $entry['birthday'] = $rr['xprof_dob'];
-                $entry['age'] = $rr['xprof_age'];
-                $entry['gender'] = $rr['xprof_gender'];
-                $entry['marital'] = $rr['xprof_marital'];
-                $entry['sexual'] = $rr['xprof_sexual'];
-                $entry['about'] = $rr['xprof_about'];
-                $entry['homepage'] = $rr['xprof_homepage'];
-                $entry['hometown'] = $rr['xprof_hometown'];
-                $entry['keywords'] = $rr['xprof_keywords'];
-
-                $entries[] = $entry;
-            }
-
-            $ret['results'] = $entries;
-            if ($kw) {
-                $k = dir_tagadelic($kw, $hub, $type, $safesql);
-                if ($k) {
-                    $ret['keywords'] = [];
-                    foreach ($k as $kv) {
-                        $ret['keywords'][] = ['term' => $kv[0], 'weight' => $kv[1], 'normalise' => $kv[2]];
-                    }
-                }
-            }
-        }
-        json_return_and_die($ret);
-    }
-
-    public function dir_query_build($joiner, $field, $s)
-    {
-        $ret = '';
-        if (trim($s)) {
-            $ret .= dbesc($joiner) . " " . dbesc($field) . " like '" . protect_sprintf('%' . dbesc($s) . '%') . "' ";
-        }
-        return $ret;
-    }
-
-    public function dir_flag_build($joiner, $field, $bit, $s)
-    {
-        return dbesc($joiner) . " ( " . dbesc($field) . " & " . intval($bit) . " ) " . ((intval($s)) ? '>' : '=') . " 0 ";
-    }
-
-
-    public function dir_parse_query($s)
-    {
-
-        $ret = [];
-        $curr = [];
-        $all = explode(' ', $s);
-        $quoted_string = false;
-
-        if ($all) {
-            foreach ($all as $q) {
-                if ($quoted_string === false) {
-                    if ($q === 'and') {
-                        $curr['logic'] = 'and';
-                        continue;
-                    }
-                    if ($q === 'or') {
-                        $curr['logic'] = 'or';
-                        continue;
-                    }
-                    if ($q === 'not') {
-                        $curr['logic'] .= ' not';
-                        continue;
-                    }
-                    if (strpos($q, '=')) {
-                        if (!isset($curr['logic'])) {
-                            $curr['logic'] = 'or';
-                        }
-                        $curr['field'] = trim(substr($q, 0, strpos($q, '=')));
-                        $curr['value'] = trim(substr($q, strpos($q, '=') + 1));
-                        if ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value']) - 1] != '"') {
-                            $quoted_string = true;
-                            $curr['value'] = substr($curr['value'], 1);
-                            continue;
-                        } elseif ($curr['value'][0] == '"' && $curr['value'][strlen($curr['value']) - 1] == '"') {
-                            $curr['value'] = substr($curr['value'], 1, strlen($curr['value']) - 2);
-                            $ret[] = $curr;
-                            $curr = [];
-                            continue;
-                        } else {
-                            $ret[] = $curr;
-                            $curr = [];
-                            continue;
-                        }
-                    }
-                } else {
-                    if ($q[strlen($q) - 1] == '"') {
-                        $curr['value'] .= ' ' . str_replace('"', '', trim($q));
-                        $ret[] = $curr;
-                        $curr = [];
-                        $quoted_string = false;
-                    } else {
-                        $curr['value'] .= ' ' . trim($q);
-                    }
-                }
-            }
-        }
-        logger('dir_parse_query:' . print_r($ret, true), LOGGER_DATA);
-        return $ret;
-    }
-
-
-    public function list_public_sites()
-    {
-
-        $rand = db_getfunc('rand');
-        $realm = get_directory_realm();
-
-        $r = q(
-            "select * from site where site_type = %d and site_dead = 0",
-            intval(SITE_TYPE_ZOT)
-        );
-
-        $ret = array('success' => false);
-
-        if ($r) {
-            $ret['success'] = true;
-            $ret['sites'] = [];
-
-            foreach ($r as $rr) {
-                if ($rr['site_access'] == ACCESS_FREE) {
-                    $access = 'free';
-                } elseif ($rr['site_access'] == ACCESS_PAID) {
-                    $access = 'paid';
-                } elseif ($rr['site_access'] == ACCESS_TIERED) {
-                    $access = 'tiered';
-                } else {
-                    $access = 'private';
-                }
-
-                if ($rr['site_register'] == REGISTER_OPEN) {
-                    $register = 'open';
-                } elseif ($rr['site_register'] == REGISTER_APPROVE) {
-                    $register = 'approve';
-                } else {
-                    $register = 'closed';
-                }
-
-                $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project'], 'version' => $rr['site_version']);
-            }
-        }
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
deleted file mode 100644
index fd13779b3..000000000
--- a/Zotlabs/Module/Display.php
+++ /dev/null
@@ -1,523 +0,0 @@
-updating));
-
-        $module_format = 'html';
-
-        if (argc() > 1) {
-            $module_format = substr(argv(1), strrpos(argv(1), '.') + 1);
-            if (!in_array($module_format, ['atom', 'zot', 'json'])) {
-                $module_format = 'html';
-            }
-        }
-
-        if ($this->loading) {
-            $_SESSION['loadtime_display'] = datetime_convert();
-        }
-
-        if (observer_prohibited()) {
-            notice(t('Public access denied.') . EOL);
-            return;
-        }
-
-        if (argc() > 1) {
-            $item_hash = argv(1);
-            if ($module_format !== 'html') {
-                $item_hash = substr($item_hash, 0, strrpos($item_hash, '.'));
-            }
-        }
-
-        if ($_REQUEST['mid']) {
-            $item_hash = $_REQUEST['mid'];
-        }
-
-        if (!$item_hash) {
-            App::$error = 404;
-            notice(t('Item not found.') . EOL);
-            return;
-        }
-
-        $observer_is_owner = false;
-        $updateable = false;
-
-        if (local_channel() && (!$this->updating)) {
-            $channel = App::get_channel();
-
-            $channel_acl = array(
-                'allow_cid' => $channel['channel_allow_cid'],
-                'allow_gid' => $channel['channel_allow_gid'],
-                'deny_cid' => $channel['channel_deny_cid'],
-                'deny_gid' => $channel['channel_deny_gid']
-            );
-
-            $x = array(
-                'is_owner' => true,
-                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
-                'default_location' => $channel['channel_location'],
-                'nickname' => $channel['channel_address'],
-                'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
-                'permissions' => $channel_acl,
-                'bang' => '',
-                'visitor' => true,
-                'profile_uid' => local_channel(),
-                'return_path' => 'channel/' . $channel['channel_address'],
-                'expanded' => true,
-                'editor_autocomplete' => true,
-                'bbco_autocomplete' => 'bbcode',
-                'bbcode' => true,
-                'jotnets' => true,
-                'reset' => t('Reset form')
-            );
-
-            $o = '
          ';
-            $o .= status_editor($x);
-            $o .= '
          ';
-        }
-
-        // This page can be viewed by anybody so the query could be complicated
-        // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally.
-        // If that fails (or we aren't logged in locally),
-        // query an item in which the observer (if logged in remotely) has cid or gid rights
-        // and if that fails, look for a copy of the post that has no privacy restrictions.
-        // If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported.
-
-        // find a copy of the item somewhere
-
-        $target_item = null;
-
-        $item_hash = unpack_link_id($item_hash);
-
-        $r = q(
-            "select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1",
-            dbesc($item_hash . '%')
-        );
-
-        if ($r) {
-            $target_item = $r[0];
-        }
-
-        $x = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($target_item['author_xchan'])
-        );
-        if ($x) {
-// not yet ready for prime time
-//          \App::$poi = $x[0];
-        }
-
-        // if the item is to be moderated redirect to /moderate
-        if ($target_item['item_blocked'] == ITEM_MODERATED) {
-            goaway(z_root() . '/moderate/' . $target_item['id']);
-        }
-
-        $r = null;
-
-        if ($target_item['item_type'] == ITEM_TYPE_WEBPAGE) {
-            $x = q(
-                "select * from channel where channel_id = %d limit 1",
-                intval($target_item['uid'])
-            );
-            $y = q(
-                "select * from iconfig left join item on iconfig.iid = item.id 
-				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
-                intval($target_item['uid']),
-                intval($target_item['parent'])
-            );
-            if ($x && $y) {
-                goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
-            } else {
-                notice(t('Page not found.') . EOL);
-                return '';
-            }
-        }
-        if ($target_item['item_type'] == ITEM_TYPE_ARTICLE) {
-            $x = q(
-                "select * from channel where channel_id = %d limit 1",
-                intval($target_item['uid'])
-            );
-            $y = q(
-                "select * from iconfig left join item on iconfig.iid = item.id 
-				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1",
-                intval($target_item['uid']),
-                intval($target_item['parent'])
-            );
-            if ($x && $y) {
-                goaway(z_root() . '/articles/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
-            } else {
-                notice(t('Page not found.') . EOL);
-                return '';
-            }
-        }
-        if ($target_item['item_type'] == ITEM_TYPE_CARD) {
-            $x = q(
-                "select * from channel where channel_id = %d limit 1",
-                intval($target_item['uid'])
-            );
-            $y = q(
-                "select * from iconfig left join item on iconfig.iid = item.id 
-				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1",
-                intval($target_item['uid']),
-                intval($target_item['parent'])
-            );
-            if ($x && $y) {
-                goaway(z_root() . '/cards/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
-            } else {
-                notice(t('Page not found.') . EOL);
-                return '';
-            }
-        }
-        if ($target_item['item_type'] == ITEM_TYPE_CUSTOM) {
-            Hook::call('item_custom_display', $target_item);
-            notice(t('Page not found.') . EOL);
-            return '';
-        }
-
-
-        $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
-
-
-        $simple_update = (($this->updating) ? " AND item_unseen = 1 " : '');
-
-        if ($this->updating && $_SESSION['loadtime_display']) {
-            $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_display']) . "' ";
-        }
-        if ($this->loading) {
-            $simple_update = '';
-        }
-
-        if ($static && $simple_update) {
-            $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
-        }
-
-        if ((!$this->updating) && (!$this->loading)) {
-            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 1);
-
-            // if the target item is not a post (eg a like) we want to address its thread parent
-
-            $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
-
-            // if we received a decoded hash originally we must encode it again before handing to javascript
-
-            $mid = gen_link_id($mid);
-
-            $o .= '
          ' . "\r\n";
-            $o .= "\r\n";
-
-            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), array(
-                '$baseurl' => z_root(),
-                '$pgtype' => 'display',
-                '$uid' => '0',
-                '$gid' => '0',
-                '$cid' => '0',
-                '$cmin' => '(-1)',
-                '$cmax' => '(-1)',
-                '$star' => '0',
-                '$liked' => '0',
-                '$conv' => '0',
-                '$spam' => '0',
-                '$fh' => '0',
-                '$dm' => '0',
-                '$nouveau' => '0',
-                '$wall' => '0',
-                '$draft' => '0',
-                '$static' => $static,
-                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
-                '$search' => '',
-                '$xchan' => '',
-                '$order' => '',
-                '$file' => '',
-                '$cats' => '',
-                '$tags' => '',
-                '$dend' => '',
-                '$dbegin' => '',
-                '$verb' => '',
-                '$net' => '',
-                '$mid' => (($mid) ? urlencode($mid) : '')
-            ));
-
-            Head::add_link([
-                'rel' => 'alternate',
-                'type' => 'application/json+oembed',
-                'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-                'title' => 'oembed'
-            ]);
-        }
-
-        $observer_hash = get_observer_hash();
-        $item_normal = item_normal();
-        $item_normal_update = item_normal_update();
-
-        $sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash));
-
-        if ($noscript_content || $this->loading) {
-            $r = null;
-
-            require_once('include/channel.php');
-            $sys = Channel::get_system();
-            $sysid = $sys['channel_id'];
-
-            if (local_channel()) {
-                $r = q(
-                    "SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1",
-                    intval(local_channel()),
-                    dbesc($target_item['parent_mid'])
-                );
-                if ($r) {
-                    $updateable = true;
-                }
-            }
-
-            if (!(is_array($r) && count($r))) {
-                $r = q(
-                    "SELECT item.id as item_id from item WHERE mid = '%s' $sql_extra $item_normal limit 1",
-                    dbesc($target_item['parent_mid'])
-                );
-            }
-        } elseif ($this->updating && !$this->loading) {
-            $r = null;
-
-            require_once('include/channel.php');
-            $sys = Channel::get_system();
-            $sysid = $sys['channel_id'];
-
-            if (local_channel()) {
-                $r = q(
-                    "SELECT item.parent AS item_id from item WHERE uid = %d and parent_mid = '%s' $item_normal_update $simple_update limit 1",
-                    intval(local_channel()),
-                    dbesc($target_item['parent_mid'])
-                );
-                if ($r) {
-                    $updateable = true;
-                }
-            }
-
-            if (!$r) {
-                $r = q(
-                    "SELECT item.parent AS item_id from item WHERE parent_mid = '%s' $sql_extra $item_normal_update $simple_update limit 1",
-                    dbesc($target_item['parent_mid'])
-                );
-            }
-        } else {
-            $r = [];
-        }
-
-        if ($r) {
-            $parents_str = ids_to_querystr($r, 'item_id');
-            if ($parents_str) {
-                $items = q(
-                    "SELECT item.*, item.id AS item_id 
-					FROM item
-					WHERE parent in ( %s ) $item_normal $sql_extra ",
-                    dbesc($parents_str)
-                );
-                xchan_query($items);
-                $items = fetch_post_tags($items, true);
-                $items = conv_sort($items, 'created');
-            }
-        } else {
-            $items = [];
-        }
-
-        // see if the top-level post owner chose to block search engines
-
-        if ($items && get_pconfig($items[0]['uid'], 'system', 'noindex')) {
-            App::$meta->set('robots', 'noindex, noarchive');
-        }
-
-        foreach ($items as $item) {
-            if ($item['mid'] === $item_hash) {
-                if (preg_match("/\[[zi]mg(.*?)\]([^\[]+)/is", $items[0]['body'], $matches)) {
-                    $ogimage = $matches[2];
-                    //  Will we use og:image:type someday? We keep this just in case
-                    //  $ogimagetype = guess_image_type($ogimage);
-                }
-
-                // some work on post content to generate a description
-                // almost fully based on work done on Hubzilla by Max Kostikov
-                $ogdesc = $item['body'];
-
-                $ogdesc = bbcode($ogdesc, ['export' => true]);
-                $ogdesc = trim(html2plain($ogdesc, 0, true));
-                $ogdesc = html_entity_decode($ogdesc, ENT_QUOTES, 'UTF-8');
-
-                // remove all URLs
-                $ogdesc = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $ogdesc);
-
-                // shorten description
-                $ogdesc = substr($ogdesc, 0, 300);
-                $ogdesc = str_replace("\n", " ", $ogdesc);
-                while (strpos($ogdesc, "  ") !== false) {
-                    $ogdesc = str_replace("  ", " ", $ogdesc);
-                }
-                $ogdesc = (strlen($ogdesc) < 298 ? $ogdesc : rtrim(substr($ogdesc, 0, strrpos($ogdesc, " ")), "?.,:;!-") . "...");
-
-                $ogsite = (System::get_site_name()) ? escape_tags(System::get_site_name()) : System::get_platform_name();
-
-                // we can now start loading content
-                if ($item['mid'] == $item['parent_mid']) {
-                    App::$meta->set('og:title', ($items[0]['title']
-                        ? sprintf(t('"%1$s", shared by %2$s with %3$s'), $items[0]['title'], $item['author']['xchan_name'], $ogsite)
-                        : sprintf(t('%1$s shared this post with %2$s'), $item['author']['xchan_name'], $ogsite)));
-                    App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon()));
-                    App::$meta->set('og:type', 'article');
-                    App::$meta->set('og:url:secure_url', $item['llink']);
-                    App::$meta->set('og:description', ($ogdesc ? $ogdesc : sprintf(t('Not much to read, click to see the post.'))));
-                } else {
-                    if (($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) {
-                        App::$meta->set('og:title', ($items[0]['title']
-                            ? sprintf(t('%1$s shared a reaction to "%2$s"'), $item['author']['xchan_name'], $items[0]['title'])
-                            : sprintf(t('%s shared a reaction to this post/conversation'), $item['author']['xchan_name'])));
-                        App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon()));
-                        App::$meta->set('og:type', 'article');
-                        App::$meta->set('og:url:secure_url', $item['llink']);
-                        App::$meta->set('og:description', $ogdesc);
-                    } else {
-                        App::$meta->set('og:title', ($items[0]['title']
-                            ? sprintf(t('%1$s commented "%2$s"'), $item['author']['xchan_name'], $items[0]['title'])
-                            : sprintf(t('%s shared a comment of this post/conversation'), $item['author']['xchan_name'])));
-                        App::$meta->set('og:image', (isset($ogimage) ? $ogimage : System::get_site_icon()));
-                        App::$meta->set('og:type', 'article');
-                        App::$meta->set('og:url:secure_url', $item['llink']);
-                        App::$meta->set('og:description', sprintf(t('%1$s wrote this: "%2$s"'), $item['author']['xchan_name'], $ogdesc));
-                    }
-                }
-            }
-        }
-
-        if (local_channel() && $items) {
-            $ids = ids_to_array($items, 'item_id');
-            $seen = PConfig::Get(local_channel(), 'system', 'seen_items');
-            if (!$seen) {
-                $seen = [];
-            }
-            $seen = array_unique(array_merge($ids, $seen));
-            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
-        }
-
-        switch ($module_format) {
-            case 'html':
-                if ($this->updating) {
-                    $o .= conversation($items, 'display', $this->updating, 'client');
-                } else {
-                    $o .= '';
-
-                    App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . App::$page['title'] : App::$page['title']);
-
-                    $o .= conversation($items, 'display', $this->updating, 'client');
-                }
-
-                break;
-
-            case 'atom':
-                $atom = replace_macros(Theme::get_template('atom_feed.tpl'), array(
-                    '$version' => xmlify(System::get_project_version()),
-                    '$generator' => xmlify(System::get_platform_name()),
-                    '$generator_uri' => 'https://hubzilla.org',
-                    '$feed_id' => xmlify(App::$cmd),
-                    '$feed_title' => xmlify(t('Article')),
-                    '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
-                    '$author' => '',
-                    '$owner' => '',
-                    '$profile_page' => xmlify(z_root() . '/display/' . $target_item['mid']),
-                ));
-
-                $x = ['xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params];
-                Hook::call('atom_feed_top', $x);
-
-                $atom = $x['xml'];
-
-                // a much simpler interface
-                Hook::call('atom_feed', $atom);
-
-
-                if ($items) {
-                    $type = 'html';
-                    foreach ($items as $item) {
-                        if ($item['item_private']) {
-                            continue;
-                        }
-                        $atom .= atom_entry($item, $type, null, '', true, '', false);
-                    }
-                }
-
-                Hook::call('atom_feed_end', $atom);
-
-                $atom .= '' . "\r\n";
-
-                header('Content-type: application/atom+xml');
-                echo $atom;
-                killme();
-        }
-
-        if ($updateable) {
-            $x = q(
-                "UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ",
-                intval(local_channel()),
-                intval($r[0]['item_id'])
-            );
-        }
-
-        $o .= '
          ';
-
-        if ((($this->updating && $this->loading) || $noscript_content) && (!$items)) {
-            $r = q(
-                "SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1",
-                dbesc($item_hash)
-            );
-
-            if ($r) {
-                if (intval($r[0]['item_deleted'])) {
-                    notice(t('Item has been removed.') . EOL);
-                } else {
-                    notice(t('Permission denied.') . EOL);
-                }
-            } else {
-                notice(t('Item not found.') . EOL);
-            }
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Drafts.php b/Zotlabs/Module/Drafts.php
deleted file mode 100644
index 722a1139e..000000000
--- a/Zotlabs/Module/Drafts.php
+++ /dev/null
@@ -1,31 +0,0 @@
-' . $desc . '';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Drafts'))) {
-            return $text;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php
deleted file mode 100644
index dccf09e03..000000000
--- a/Zotlabs/Module/Dreport.php
+++ /dev/null
@@ -1,199 +0,0 @@
- 2) {
-            $cmd = argv(1);
-            $mid = argv(2);
-        } elseif (argc() > 1) {
-            $cmd = EMPTY_STR;
-            $mid = argv(1);
-        }
-
-        $message_id = unpack_link_id($mid);
-
-        if (!$message_id) {
-            notice(t('Invalid message') . EOL);
-            return;
-        }
-
-        if ($cmd === 'push') {
-            $i = q(
-                "select id from item where mid = '%s' and uid = %d and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
-                dbesc($message_id),
-                intval($channel['channel_id']),
-                dbesc($channel['channel_hash']),
-                dbesc($channel['channel_hash'])
-            );
-            if ($i) {
-                Run::Summon(['Notifier', 'edit_post', $i[0]['id']]);
-            }
-            sleep(3);
-            goaway(z_root() . '/dreport/' . urlencode($mid));
-        }
-
-        if ($cmd === 'log') {
-            $host = escape_tags($_REQUEST['host']);
-            $r = q(
-                "select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s' and dreport_recip = '%s'",
-                dbesc($channel['channel_hash']),
-                dbesc($message_id),
-                dbesc($host)
-            );
-            if ($r) {
-                $output = '
          ' . t('Delivery Log') . '
          ';
-                $output .= EOL . $r[0]['dreport_log'];
-                return $output;
-            } else {
-                notice(t('Item not found') . EOL);
-                return;
-            }
-        }
-
-        switch ($table) {
-            case 'item':
-                $i = q(
-                    "select id from item where mid = '%s' and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
-                    dbesc($message_id),
-                    dbesc($channel['channel_hash']),
-                    dbesc($channel['channel_hash'])
-                );
-                break;
-            default:
-                break;
-        }
-
-        if (!$i) {
-            notice(t('Permission denied') . EOL);
-            return;
-        }
-
-        $r = q(
-            "select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'",
-            dbesc($channel['channel_hash']),
-            dbesc($message_id)
-        );
-
-        if (!$r) {
-            notice(t('no results') . EOL);
-        }
-
-        for ($x = 0; $x < count($r); $x++) {
-            // This has two purposes: 1. make the delivery report strings translateable, and
-            // 2. assign an ordering to item delivery results so we can group them and provide
-            // a readable report with more interesting events listed toward the top and lesser
-            // interesting items towards the bottom
-
-            switch ($r[$x]['dreport_result']) {
-                case 'channel sync processed':
-                    $r[$x]['gravity'] = 0;
-                    $r[$x]['dreport_result'] = t('channel sync processed');
-                    break;
-                case 'queued':
-                    $r[$x]['gravity'] = 2;
-                    $r[$x]['dreport_result'] = '' . t('queued') . '';
-                    break;
-                case 'site dead':
-                    $r[$x]['gravity'] = 3;
-                    $r[$x]['dreport_result'] = t('site dead');
-                    break;
-                case 'site deferred':
-                    $r[$x]['gravity'] = 4;
-                    $r[$x]['dreport_result'] = t('site might be dead - deferred');
-                    break;
-                case 'posted':
-                    $r[$x]['gravity'] = 5;
-                    $r[$x]['dreport_result'] = t('posted');
-                    break;
-                case 'accepted for delivery':
-                    $r[$x]['gravity'] = 6;
-                    $r[$x]['dreport_result'] = t('accepted for delivery');
-                    break;
-                case 'updated':
-                    $r[$x]['gravity'] = 7;
-                    $r[$x]['dreport_result'] = t('updated');
-                case 'update ignored':
-                    $r[$x]['gravity'] = 8;
-                    $r[$x]['dreport_result'] = t('update ignored');
-                    break;
-                case 'permission denied':
-                    $r[$x]['dreport_result'] = t('permission denied');
-                    $r[$x]['gravity'] = 9;
-                    break;
-                case 'recipient not found':
-                    $r[$x]['dreport_result'] = t('recipient not found');
-                    break;
-                case 'mail recalled':
-                    $r[$x]['dreport_result'] = t('mail recalled');
-                    break;
-                case 'duplicate mail received':
-                    $r[$x]['dreport_result'] = t('duplicate mail received');
-                    break;
-                case 'mail delivered':
-                    $r[$x]['dreport_result'] = t('mail delivered');
-                    break;
-                default:
-                    if (strpos($r[$x]['dreport_result'], 'delivery rejected') === 0) {
-                        $r[$x]['dreport_result'] = t('delivery rejected') . ' ' . substr($r[$x]['dreport_result'], 17);
-                    }
-                    $r[$x]['gravity'] = 1;
-                    break;
-            }
-        }
-
-        usort($r, 'self::dreport_gravity_sort');
-
-        $entries = [];
-        foreach ($r as $rr) {
-            $entries[] = [
-                'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']),
-                'result' => $rr['dreport_result'],
-                'time' => escape_tags(datetime_convert('UTC', date_default_timezone_get(), $rr['dreport_time']))
-            ];
-        }
-
-        $output = replace_macros(Theme::get_template('dreport.tpl'), array(
-            '$title' => sprintf(t('Delivery report for %1$s'), basename($message_id)) . '...',
-            '$table' => $table,
-            '$mid' => urlencode($mid),
-            '$options' => t('Options'),
-            '$push' => t('Redeliver'),
-            '$entries' => $entries
-        ));
-
-
-        return $output;
-    }
-
-    private static function dreport_gravity_sort($a, $b)
-    {
-        if ($a['gravity'] == $b['gravity']) {
-            if ($a['dreport_name'] === $b['dreport_name']) {
-                return strcmp($a['dreport_time'], $b['dreport_time']);
-            }
-            return strcmp($a['dreport_name'], $b['dreport_name']);
-        }
-        return (($a['gravity'] > $b['gravity']) ? 1 : (-1));
-    }
-}
diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php
deleted file mode 100644
index 96ab74f69..000000000
--- a/Zotlabs/Module/Editblock.php
+++ /dev/null
@@ -1,162 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-    public function get()
-    {
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $which = argv(1);
-
-        $uid = local_channel();
-        $owner = 0;
-        $channel = null;
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                $uid = $owner = intval($sys['channel_id']);
-                $channel = $sys;
-                $observer = $sys;
-            }
-        }
-
-        if (!$owner) {
-            // Figure out who the page owner is.
-            $r = q(
-                "select channel_id from channel where channel_address = '%s'",
-                dbesc($which)
-            );
-            if ($r) {
-                $owner = intval($r[0]['channel_id']);
-            }
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $is_owner = (($uid && $uid == $owner) ? true : false);
-
-        $o = '';
-
-        // Figure out which post we're editing
-        $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
-
-        if (!($post_id && $owner)) {
-            notice(t('Item not found') . EOL);
-            return;
-        }
-
-        $itm = q(
-            "SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1",
-            intval($post_id),
-            intval($owner)
-        );
-        if ($itm) {
-            $item_id = q(
-                "select * from iconfig where cat = 'system' and k = 'BUILDBLOCK' and iid = %d limit 1",
-                intval($itm[0]['id'])
-            );
-            if ($item_id) {
-                $block_title = $item_id[0]['v'];
-            }
-        } else {
-            notice(t('Item not found') . EOL);
-            return;
-        }
-
-        $mimetype = $itm[0]['mimetype'];
-
-        $content = $itm[0]['body'];
-        if ($itm[0]['mimetype'] === 'text/markdown') {
-            $content = MarkdownSoap::unescape($itm[0]['body']);
-        }
-
-
-        $rp = 'blocks/' . $channel['channel_address'];
-
-        $x = array(
-			'nickname' => $channel['channel_address'],
-			'bbco_autocomplete'=> ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? 'bbcode' : 'comanche-block'),
-			'return_path' => $rp,
-			'webpage' => ITEM_TYPE_BLOCK,
-			'ptlabel' => t('Block Name'),
-			'button' => t('Edit'),
-			'writefiles' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
-			'weblink' => ((in_array($mimetype, [ 'text/bbcode' , 'text/x-multicode' ])) ? t('Insert web link') : false),
-			'hide_voting' => true,
-			'hide_future' => true,
-			'hide_location' => true,
-			'hide_expire' => true,
-			'showacl' => false,
-			'ptyp' => $itm[0]['type'],
-			'mimeselect' => true,
-			'mimetype' => $itm[0]['mimetype'],
-			'body' => undo_post_tagging($content),
-			'post_id' => $post_id,
-			'visitor' => true,
-			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
-			'placeholdertitle' => t('Title (optional)'),
-			'pagetitle' => $block_title,
-			'profile_uid' => (intval($channel['channel_id'])),
-			'bbcode' => ((in_array($mimetype, [ 'text/bbcode' , 'text/x-multicode' ])) ? true : false)
-        );
-
-        $editor = status_editor($x);
-
-        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
-            '$title' => t('Edit Block'),
-            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-            '$id' => $itm[0]['id'],
-            '$cancel' => t('Cancel'),
-            '$editor' => $editor
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php
deleted file mode 100644
index 113f27cac..000000000
--- a/Zotlabs/Module/Editlayout.php
+++ /dev/null
@@ -1,159 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-    public function get()
-    {
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $which = argv(1);
-
-        $uid = local_channel();
-        $owner = 0;
-        $channel = null;
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                $uid = $owner = intval($sys['channel_id']);
-                $channel = $sys;
-                $observer = $sys;
-            }
-        }
-
-        if (!$owner) {
-            // Figure out who the page owner is.
-            $r = q(
-                "select channel_id from channel where channel_address = '%s'",
-                dbesc($which)
-            );
-            if ($r) {
-                $owner = intval($r[0]['channel_id']);
-            }
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $is_owner = (($uid && $uid == $owner) ? true : false);
-
-        $o = '';
-
-        // Figure out which post we're editing
-        $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
-
-        if (!$post_id) {
-            notice(t('Item not found') . EOL);
-            return;
-        }
-
-        // Now we've got a post and an owner, let's find out if we're allowed to edit it
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $itm = q(
-            "SELECT * FROM item WHERE id = %d and uid = %s LIMIT 1",
-            intval($post_id),
-            intval($owner)
-        );
-
-        $item_id = q(
-            "select * from iconfig where cat = 'system' and k = 'PDL' and iid = %d limit 1",
-            intval($itm[0]['id'])
-        );
-        if ($item_id) {
-            $layout_title = $item_id[0]['v'];
-        }
-
-
-        $rp = 'layouts/' . $which;
-
-        $x = array(
-            'webpage' => ITEM_TYPE_PDL,
-            'nickname' => $channel['channel_address'],
-            'editor_autocomplete' => true,
-            'bbco_autocomplete' => 'comanche',
-            'return_path' => $rp,
-            'button' => t('Edit'),
-            'hide_voting' => true,
-            'hide_future' => true,
-            'hide_expire' => true,
-            'hide_location' => true,
-            'hide_weblink' => true,
-            'hide_attach' => true,
-            'hide_preview' => true,
-            'disable_comments' => true,
-            'ptyp' => $itm[0]['obj_type'],
-            'body' => undo_post_tagging($itm[0]['body']),
-            'post_id' => $post_id,
-            'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'),
-            'pagetitle' => $layout_title,
-            'ptlabel' => t('Layout Name'),
-            'placeholdertitle' => t('Layout Description (Optional)'),
-            'showacl' => false,
-            'profile_uid' => intval($owner),
-        );
-
-        $editor = status_editor($x);
-
-        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
-            '$title' => t('Edit Layout'),
-            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-            '$id' => $itm[0]['id'],
-            '$cancel' => t('Cancel'),
-            '$editor' => $editor
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
deleted file mode 100644
index 2e173a962..000000000
--- a/Zotlabs/Module/Editpost.php
+++ /dev/null
@@ -1,155 +0,0 @@
- 1) ? intval(argv(1)) : 0);
-
-        if (!$post_id) {
-            notice(t('Item not found') . EOL);
-            return;
-        }
-
-        $item = q(
-            "SELECT * FROM item WHERE id = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1",
-            intval($post_id),
-            dbesc(get_observer_hash()),
-            dbesc(get_observer_hash())
-        );
-
-        // don't allow web editing of potentially binary content (item_obscured = 1)
-
-        if ((!$item) || intval($item[0]['item_obscured'])) {
-            notice(t('Item is not editable') . EOL);
-            return;
-        }
-
-        $item = array_shift($item);
-
-        $owner_uid = intval($item['uid']);
-        $owner = Channel::from_id($owner_uid);
-
-        if ($item['resource_type'] === 'photo' && $item['resource_id'] && $owner) {
-            goaway(z_root() . '/photos/' . $owner['channel_address'] . '/image/' . $item['resource_id'] . '?expandform=1');
-        }
-
-        if ($item['resource_type'] === 'event' && $item['resource_id']) {
-            goaway(z_root() . '/events/' . $item['resource_id'] . '?expandform=1');
-        }
-
-
-        $channel = App::get_channel();
-
-        $category = '';
-        $collections = [];
-        $catsenabled = ((Apps::system_app_installed($owner_uid, 'Categories')) ? 'categories' : '');
-
-        // we have a single item, but fetch_post_tags expects an array. Convert it before and after.
-
-        $item = array_shift(fetch_post_tags([$item]));
-
-        if ($catsenabled) {
-            $cats = get_terms_oftype($item['term'], TERM_CATEGORY);
-
-            if ($cats) {
-                foreach ($cats as $cat) {
-                    if (strlen($category)) {
-                        $category .= ', ';
-                    }
-                    $category .= $cat['term'];
-                }
-            }
-        }
-
-        $clcts = get_terms_oftype($item['term'], TERM_PCATEGORY);
-        if ($clcts) {
-            foreach ($clcts as $clct) {
-                $collections[] = $clct['term'];
-            }
-        }
-
-        if ($item['attach']) {
-            $j = json_decode($item['attach'], true);
-            if ($j) {
-                foreach ($j as $jj) {
-                    $item['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
-                }
-            }
-        }
-
-        if (intval($item['item_unpublished'])) {
-            // clear the old creation date if editing a saved draft. These will always show as just created.
-            unset($item['created']);
-        }
-
-        if ($item['summary']) {
-            $item['body'] = '[summary]' . $item['summary'] . '[/summary]' . "\n\n" . $item['body'];
-        }
-
-        $x = [
-            'nickname' => $channel['channel_address'],
-            'item' => $item,
-            'editor_autocomplete' => true,
-            'bbco_autocomplete' => 'bbcode',
-            'return_path' => $_SESSION['return_url'],
-            'button' => t('Submit'),
-            'hide_voting' => true,
-            'hide_future' => true,
-            'hide_location' => true,
-            'is_draft' => ((intval($item['item_unpublished'])) ? true : false),
-            'parent' => (($item['mid'] === $item['parent_mid']) ? 0 : $item['parent']),
-            'mimetype' => $item['mimetype'],
-            'ptyp' => $item['obj_type'],
-            'body' => htmlspecialchars_decode(undo_post_tagging($item['body']), ENT_COMPAT),
-            'post_id' => $post_id,
-            'defloc' => $channel['channel_location'],
-            'visitor' => true,
-            'title' => htmlspecialchars_decode($item['title'], ENT_COMPAT),
-            'category' => $category,
-            'showacl' => ((intval($item['item_unpublished'])) ? true : false),
-            'lockstate' => (($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) ? 'lock' : 'unlock'),
-            'acl' => Libacl::populate($item, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
-            'bang' => EMPTY_STR,
-            'permissions' => $item,
-            'profile_uid' => $owner_uid,
-            'catsenabled' => $catsenabled,
-            'collections' => $collections,
-            'jotnets' => true,
-            'hide_expire' => true,
-            'bbcode' => true
-        ];
-
-        $editor = status_editor($x);
-
-        $output .= replace_macros(
-            Theme::get_template('edpost_head.tpl'),
-            ['$title' => t('Edit post'), '$cancel' => t('Cancel'), '$editor' => $editor]
-        );
-
-        return $output;
-    }
-}
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
deleted file mode 100644
index ca06602bf..000000000
--- a/Zotlabs/Module/Editwebpage.php
+++ /dev/null
@@ -1,193 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-    public function get()
-    {
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $which = argv(1);
-
-        $uid = local_channel();
-        $owner = 0;
-        $channel = null;
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                $uid = $owner = intval($sys['channel_id']);
-                $channel = $sys;
-                $observer = $sys;
-            }
-        }
-
-        if (!$owner) {
-            // Figure out who the page owner is.
-            $r = q(
-                "select channel_id from channel where channel_address = '%s'",
-                dbesc($which)
-            );
-            if ($r) {
-                $owner = intval($r[0]['channel_id']);
-            }
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        if (!perm_is_allowed($owner, $ob_hash, 'write_pages')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $is_owner = (($uid && $uid == $owner) ? true : false);
-
-        $o = '';
-
-        // Figure out which post we're editing
-        $post_id = ((argc() > 2) ? intval(argv(2)) : 0);
-
-        if (!$post_id) {
-            notice(t('Item not found') . EOL);
-            return;
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        // We've already figured out which item we want and whose copy we need,
-        // so we don't need anything fancy here
-
-        $sql_extra = item_permissions_sql($owner);
-
-        $itm = q(
-            "SELECT * FROM item WHERE id = %d and uid = %s $sql_extra LIMIT 1",
-            intval($post_id),
-            intval($owner)
-        );
-
-        // don't allow web editing of potentially binary content (item_obscured = 1)
-        // @FIXME how do we do it instead?
-
-        if ((!$itm) || intval($itm[0]['item_obscured'])) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $item_id = q(
-            "select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1",
-            intval($itm[0]['id'])
-        );
-        if ($item_id) {
-            $page_title = urldecode($item_id[0]['v']);
-        }
-
-        $mimetype = $itm[0]['mimetype'];
-
-        if ($mimetype === 'application/x-php') {
-            if ((!$uid) || ($uid != $itm[0]['uid'])) {
-                notice(t('Permission denied.') . EOL);
-                return;
-            }
-        }
-
-        $layout = $itm[0]['layout_mid'];
-
-        $content = $itm[0]['body'];
-        if ($itm[0]['mimetype'] === 'text/markdown') {
-            $content = MarkdownSoap::unescape($itm[0]['body']);
-        }
-
-        $rp = 'webpages/' . $which;
-
-        $x = array(
-            'nickname' => $channel['channel_address'],
-            'bbco_autocomplete' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? 'bbcode' : ''),
-            'return_path' => $rp,
-            'webpage' => ITEM_TYPE_WEBPAGE,
-            'ptlabel' => t('Page link'),
-            'pagetitle' => $page_title,
-            'writefiles' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? perm_is_allowed($owner, get_observer_hash(), 'write_storage') : false),
-            'button' => t('Edit'),
-            'weblink' => ((in_array($mimetype, [ 'text/bbcode', 'text/x-multicode'])) ? t('Insert web link') : false),
-            'hide_location' => true,
-            'hide_voting' => true,
-            'ptyp' => $itm[0]['type'],
-            'body' => undo_post_tagging($content),
-            'post_id' => $post_id,
-            'visitor' => ($is_owner) ? true : false,
-            'acl' => Libacl::populate($itm[0], false, PermissionDescription::fromGlobalPermission('view_pages')),
-            'permissions' => $itm[0],
-            'showacl' => ($is_owner) ? true : false,
-            'mimetype' => $mimetype,
-            'mimeselect' => true,
-            'layout' => $layout,
-            'layoutselect' => true,
-            'title' => htmlspecialchars($itm[0]['title'], ENT_COMPAT, 'UTF-8'),
-            'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
-            'profile_uid' => (intval($owner)),
-            'bbcode' => ((in_array($mimetype, ['text/bbcode', 'text/x-multicode'])) ? true : false)
-        );
-
-        $editor = status_editor($x);
-
-        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), array(
-            '$title' => t('Edit Webpage'),
-            '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-            '$editor' => $editor,
-            '$cancel' => t('Cancel'),
-            '$id' => $itm[0]['id']
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Email_resend.php b/Zotlabs/Module/Email_resend.php
deleted file mode 100644
index b27156503..000000000
--- a/Zotlabs/Module/Email_resend.php
+++ /dev/null
@@ -1,45 +0,0 @@
- 1) {
-            $result = false;
-            $email = hex2bin(argv(1));
-
-            if ($email) {
-                $result = Account::verify_email_address(['resend' => true, 'email' => $email]);
-            }
-
-            if ($result) {
-                notice(t('Email verification resent'));
-            } else {
-                notice(t('Unable to resend email verification message.'));
-            }
-
-            goaway(z_root() . '/email_validation/' . bin2hex($email));
-        }
-
-        // @todo - one can provide a form here to resend the mail
-        // after directing to here if a succesful login was attempted from an unverified address.
-    }
-}
diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
deleted file mode 100644
index f6cfba321..000000000
--- a/Zotlabs/Module/Email_validation.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 1) {
-            $email = hex2bin(argv(1));
-        }
-
-        $o = replace_macros(Theme::get_template('email_validation.tpl'), [
-            '$title' => t('Email Verification Required'),
-            '$desc' => sprintf(t('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.'), $email),
-            '$resend' => t('Resend Email'),
-            '$email' => bin2hex($email),
-            '$submit' => t('Submit'),
-            '$token' => ['token', t('Validation token'), '', ''],
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Embed.php b/Zotlabs/Module/Embed.php
deleted file mode 100644
index 1cd6e296b..000000000
--- a/Zotlabs/Module/Embed.php
+++ /dev/null
@@ -1,24 +0,0 @@
- 1) ? intval(argv(1)) : 0);
-
-        if ($post_id && local_channel()) {
-            echo '[share=' . $post_id . '][/share]';
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php
deleted file mode 100644
index a0ad208dc..000000000
--- a/Zotlabs/Module/Embedphotos.php
+++ /dev/null
@@ -1,248 +0,0 @@
- 2 && is_site_admin() && intval(argv(2))) {
-            $channel_id = argv(2);
-        } else {
-            $channel_id = local_channel();
-        }
-        if (argc() > 1 && argv(1) === 'album') {
-            // API: /embedphotos/album
-            $name = (x($_POST, 'name') ? $_POST['name'] : null);
-            if (!$name) {
-                json_return_and_die(array('errormsg' => 'Error retrieving album', 'status' => false));
-            }
-            $album = $this->embedphotos_widget_album(array('channel_id' => $channel_id, 'album' => $name));
-            json_return_and_die(array('status' => true, 'content' => $album));
-        }
-        if (argc() > 1 && argv(1) === 'albumlist') {
-            // API: /embedphotos/albumlist
-            $album_list = $this->embedphotos_album_list($channel_id);
-            json_return_and_die(array('status' => true, 'albumlist' => $album_list));
-        }
-        if (argc() > 1 && argv(1) === 'photolink') {
-            // API: /embedphotos/photolink
-            $href = (x($_POST, 'href') ? $_POST['href'] : null);
-            if (!$href) {
-                json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false));
-            }
-            $resource_id = array_pop(explode("/", $href));
-
-            $x = self::photolink($resource_id, $channel_id);
-            if ($x) {
-                json_return_and_die(array('status' => true, 'photolink' => $x, 'resource_id' => $resource_id));
-            }
-            json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
-        }
-    }
-
-
-    protected static function photolink($resource, $channel_id = 0)
-    {
-        if (intval($channel_id)) {
-            $channel = Channel::from_id($channel_id);
-        } else {
-            $channel = App::get_channel();
-        }
-
-        $output = EMPTY_STR;
-        if ($channel) {
-            $resolution = ((Features::enabled($channel['channel_id'], 'large_photos')) ? 1 : 2);
-            $r = q(
-                "select mimetype, height, width, title from photo where resource_id = '%s' and $resolution = %d and uid = %d limit 1",
-                dbesc($resource),
-                intval($resolution),
-                intval($channel['channel_id'])
-            );
-            if (!$r) {
-                return $output;
-            }
-
-            if ($r[0]['mimetype'] === 'image/jpeg') {
-                $ext = '.jpg';
-            } elseif ($r[0]['mimetype'] === 'image/png') {
-                $ext = '.png';
-            } elseif ($r[0]['mimetype'] === 'image/gif') {
-                $ext = '.gif';
-            } else {
-                $ext = EMPTY_STR;
-            }
-
-            $alt = $r[0]['title'];
-            if (!$alt) {
-                $a = q(
-                    "select filename from attach where hash = '%s' and uid = %d limit 1",
-                    dbesc($resource),
-                    intval($channel['channel_id'])
-                );
-                if ($a) {
-                    $alt = $a[0]['filename'];
-                } else {
-                    $alt = t('Image/photo');
-                }
-            }
-            $alt = ' alt="' . $alt . '"';
-
-            $output = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $resource . ']'
-                . '[zmg width="' . $r[0]['width'] . '" height="' . $r[0]['height'] . '"' . $alt . ']'
-                . z_root() . '/photo/' . $resource . '-' . $resolution . $ext . '[/zmg][/zrl]';
-
-            return $output;
-        }
-    }
-
-
-    /**
-     * Copied from include/widgets.php::widget_album() with a modification to get the profile_uid from
-     * the input array as in widget_item()
-     *
-     * @param array $args
-     * @return string with HTML
-     */
-
-    public function embedphotos_widget_album($args)
-    {
-
-        $channel_id = 0;
-        if (array_key_exists('channel_id', $args)) {
-            $channel_id = $args['channel_id'];
-            $channel = Channel::from_id($channel_id);
-        }
-
-        if (!$channel_id) {
-            return '';
-        }
-
-        $owner_uid = $channel_id;
-        require_once('include/security.php');
-        $sql_extra = permissions_sql($channel_id);
-
-        if (!perm_is_allowed($channel_id, get_observer_hash(), 'view_storage')) {
-            return '';
-        }
-
-        if ($args['album']) {
-            $album = (($args['album'] === '/') ? '' : $args['album']);
-        }
-
-        if ($args['title']) {
-            $title = $args['title'];
-        }
-
-        /**
-         * This may return incorrect permissions if you have multiple directories of the same name.
-         * It is a limitation of the photo table using a name for a photo album instead of a folder hash
-         */
-        if ($album) {
-            $x = q(
-                "select hash from attach where filename = '%s' and uid = %d limit 1",
-                dbesc($album),
-                intval($owner_uid)
-            );
-            if ($x) {
-                $y = attach_can_view_folder($owner_uid, get_observer_hash(), $x[0]['hash']);
-                if (!$y) {
-                    return '';
-                }
-            }
-        }
-
-        $order = 'DESC';
-
-        $r = q(
-            "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
-				(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 
-				AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
-				ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
-				ORDER BY created $order",
-            intval($owner_uid),
-            dbesc($album),
-            intval(PHOTO_NORMAL),
-            intval(PHOTO_PROFILE)
-        );
-
-        $photos = [];
-        if ($r) {
-            $twist = 'rotright';
-            foreach ($r as $rr) {
-                if ($twist == 'rotright') {
-                    $twist = 'rotleft';
-                } else {
-                    $twist = 'rotright';
-                }
-
-                $ext = $phototypes[$rr['mimetype']];
-
-                $imgalt_e = $rr['filename'];
-                $desc_e = $rr['description'];
-
-                $imagelink = (z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $rr['resource_id']
-                    . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
-
-                $photos[] = [
-                    'id' => $rr['id'],
-                    'twist' => ' ' . $twist . rand(2, 4),
-                    'link' => $imagelink,
-                    'title' => t('View Photo'),
-                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
-                    'alt' => $imgalt_e,
-                    'desc' => $desc_e,
-                    'ext' => $ext,
-                    'hash' => $rr['resource_id'],
-                    'unknown' => t('Unknown')
-                ];
-            }
-        }
-
-        $o .= replace_macros(Theme::get_template('photo_album.tpl'), [
-            '$photos' => $photos,
-            '$album' => (($title) ? $title : $album),
-            '$album_id' => rand(),
-            '$album_edit' => array(t('Edit Album'), $album_edit),
-            '$can_post' => false,
-            '$upload' => [t('Upload'), z_root() . '/photos/' . $channel['channel_address'] . '/upload/' . bin2hex($album)],
-            '$order' => false,
-            '$upload_form' => $upload_form,
-            '$no_fullscreen_btn' => true
-        ]);
-
-        return $o;
-    }
-
-    public function embedphotos_album_list($channel_id)
-    {
-        $channel = Channel::from_id($channel_id);
-        $p = photos_albums_list($channel, App::get_observer());
-        if ($p['success']) {
-            return $p['albums'];
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Event.php b/Zotlabs/Module/Event.php
deleted file mode 100644
index dcf36ce98..000000000
--- a/Zotlabs/Module/Event.php
+++ /dev/null
@@ -1,61 +0,0 @@
- MAX_EVENT_REPEAT_COUNT) {
-            $count = MAX_EVENT_REPEAT_COUNT;
-        }
-
-        require_once('include/text.php');
-        linkify_tags($desc, local_channel());
-        linkify_tags($location, local_channel());
-
-        //$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
-
-        //@fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location)
-        //$onerror_url = z_root() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type";
-        $onerror_url = z_root() . "/events";
-
-        if (strcmp($finish, $start) < 0 && !$nofinish) {
-            notice(t('Event can not end before it has started.') . EOL);
-            if (intval($_REQUEST['preview'])) {
-                echo(t('Unable to generate preview.'));
-                killme();
-            }
-            goaway($onerror_url);
-        }
-
-        if ((!$summary) || (!$start)) {
-            notice(t('Event title and start time are required.') . EOL);
-            if (intval($_REQUEST['preview'])) {
-                echo(t('Unable to generate preview.'));
-                killme();
-            }
-            goaway($onerror_url);
-        }
-
-        //      $share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0);
-
-        $share = 1;
-
-
-        $acl = new AccessControl(false);
-
-        if ($event_id) {
-            $x = q(
-                "select * from event where id = %d and uid = %d limit 1",
-                intval($event_id),
-                intval(local_channel())
-            );
-            if (!$x) {
-                notice(t('Event not found.') . EOL);
-                if (intval($_REQUEST['preview'])) {
-                    echo(t('Unable to generate preview.'));
-                    killme();
-                }
-                return;
-            }
-
-            $acl->set($x[0]);
-
-            $created = $x[0]['created'];
-            $edited = datetime_convert();
-
-            if (
-                $x[0]['allow_cid'] === '<' . $channel['channel_hash'] . '>'
-                && $x[0]['allow_gid'] === '' && $x[0]['deny_cid'] === '' && $x[0]['deny_gid'] === ''
-            ) {
-                $share = false;
-            } else {
-                $share = true;
-            }
-        } else {
-            $created = $edited = datetime_convert();
-            if ($share) {
-                $acl->set_from_array($_POST);
-            } else {
-                $acl->set(array('allow_cid' => '<' . $channel['channel_hash'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''));
-            }
-        }
-
-        $post_tags = [];
-
-        $ac = $acl->get();
-
-        if (strlen($categories)) {
-            $cats = explode(',', $categories);
-            foreach ($cats as $cat) {
-                $post_tags[] = array(
-                    'uid' => $profile_uid,
-                    'ttype' => TERM_CATEGORY,
-                    'otype' => TERM_OBJ_POST,
-                    'term' => trim($cat),
-                    'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat))
-                );
-            }
-        }
-
-        $datarray = [];
-        $datarray['dtstart'] = $start;
-        $datarray['dtend'] = $finish;
-        $datarray['summary'] = $summary;
-        $datarray['description'] = $desc;
-        $datarray['location'] = $location;
-        $datarray['etype'] = $type;
-        $datarray['adjust'] = $adjust;
-        $datarray['nofinish'] = $nofinish;
-        $datarray['uid'] = local_channel();
-        $datarray['account'] = get_account_id();
-        $datarray['event_xchan'] = $channel['channel_hash'];
-        $datarray['allow_cid'] = $ac['allow_cid'];
-        $datarray['allow_gid'] = $ac['allow_gid'];
-        $datarray['deny_cid'] = $ac['deny_cid'];
-        $datarray['deny_gid'] = $ac['deny_gid'];
-        $datarray['private'] = (($acl->is_private()) ? 1 : 0);
-        $datarray['id'] = $event_id;
-        $datarray['created'] = $created;
-        $datarray['edited'] = $edited;
-
-        if (intval($_REQUEST['preview'])) {
-            $html = format_event_html($datarray);
-            echo $html;
-            killme();
-        }
-
-        $event = event_store_event($datarray);
-
-        if ($post_tags) {
-            $datarray['term'] = $post_tags;
-        }
-
-        $item_id = event_store_item($datarray, $event);
-
-        if ($item_id) {
-            $r = q(
-                "select * from item where id = %d",
-                intval($item_id)
-            );
-            if ($r) {
-                xchan_query($r);
-                $sync_item = fetch_post_tags($r);
-                $z = q(
-                    "select * from event where event_hash = '%s' and uid = %d limit 1",
-                    dbesc($r[0]['resource_id']),
-                    intval($channel['channel_id'])
-                );
-                if ($z) {
-                    Libsync::build_sync_packet($channel['channel_id'], ['event_item' => [encode_item($sync_item[0], true)], 'event' => $z]);
-                }
-            }
-        }
-
-        if ($share) {
-            Run::Summon(['Notifier', 'event', $item_id]);
-        }
-    }
-
-
-    public function get()
-    {
-
-        if (argc() > 2 && argv(1) == 'ical') {
-            $event_id = argv(2);
-
-            require_once('include/security.php');
-            $sql_extra = permissions_sql(local_channel());
-
-            $r = q(
-                "select * from event where event_hash = '%s' $sql_extra limit 1",
-                dbesc($event_id)
-            );
-            if ($r) {
-                header('Content-type: text/calendar');
-                header('Content-Disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"');
-                echo ical_wrapper($r);
-                killme();
-            } else {
-                notice(t('Event not found.') . EOL);
-                return;
-            }
-        }
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        Navbar::set_selected('Events');
-
-        if ((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
-            $r = q(
-                "update event set dismissed = 1 where id = %d and uid = %d",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-        }
-
-        if ((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
-            $r = q(
-                "update event set dismissed = 0 where id = %d and uid = %d",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-        }
-
-        $first_day = intval(get_pconfig(local_channel(), 'system', 'cal_first_day', 0));
-
-        $htpl = Theme::get_template('event_head.tpl');
-        App::$page['htmlhead'] .= replace_macros($htpl, array(
-            '$baseurl' => z_root(),
-            '$module_url' => '/events',
-            '$modparams' => 1,
-            '$lang' => App::$language,
-            '$first_day' => $first_day
-        ));
-
-        $o = '';
-
-        $mode = 'view';
-        $y = 0;
-        $m = 0;
-        $ignored = ((x($_REQUEST, 'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " " : '');
-
-
-        // logger('args: ' . print_r(App::$argv,true));
-
-
-        if (argc() > 1) {
-            if (argc() > 2 && argv(1) === 'add') {
-                $mode = 'add';
-                $item_id = intval(argv(2));
-            }
-            if (argc() > 2 && argv(1) === 'drop') {
-                $mode = 'drop';
-                $event_id = argv(2);
-            }
-            if (argc() > 2 && intval(argv(1)) && intval(argv(2))) {
-                $mode = 'view';
-                $y = intval(argv(1));
-                $m = intval(argv(2));
-            }
-            if (argc() <= 2) {
-                $mode = 'view';
-                $event_id = argv(1);
-            }
-        }
-
-        if ($mode === 'add') {
-            event_addtocal($item_id, local_channel());
-            killme();
-        }
-
-        if ($mode == 'view') {
-            /* edit/create form */
-            if ($event_id) {
-                $r = q(
-                    "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                    dbesc($event_id),
-                    intval(local_channel())
-                );
-                if (count($r)) {
-                    $orig_event = $r[0];
-                }
-            }
-
-            $channel = App::get_channel();
-
-            // Passed parameters overrides anything found in the DB
-            if (!x($orig_event)) {
-                $orig_event = [];
-            }
-
-            // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
-            /*
-            if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
-            if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust'];
-            if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
-            if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
-            if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
-            if(x($_REQUEST,'start')) $orig_event['dtstart'] = $_REQUEST['start'];
-            if(x($_REQUEST,'finish')) $orig_event['dtend'] = $_REQUEST['finish'];
-            if(x($_REQUEST,'type')) $orig_event['etype'] = $_REQUEST['type'];
-            */
-
-            $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
-            $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
-            $t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
-            $d_orig = ((x($orig_event)) ? $orig_event['description'] : '');
-            $l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
-            $eid = ((x($orig_event)) ? $orig_event['id'] : 0);
-            $event_xchan = ((x($orig_event)) ? $orig_event['event_xchan'] : $channel['channel_hash']);
-            $mid = ((x($orig_event)) ? $orig_event['mid'] : '');
-
-            if (!x($orig_event)) {
-                $sh_checked = '';
-                $a_checked = ' checked="checked" ';
-            } else {
-                $sh_checked = ((($orig_event['allow_cid'] === '<' . $channel['channel_hash'] . '>' || (!$orig_event['allow_cid'])) && (!$orig_event['allow_gid']) && (!$orig_event['deny_cid']) && (!$orig_event['deny_gid'])) ? '' : ' checked="checked" ');
-            }
-
-            if ($orig_event['event_xchan']) {
-                $sh_checked .= ' disabled="disabled" ';
-            }
-
-            $sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now');
-
-            $fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour');
-
-            $tz = date_default_timezone_get();
-            if (x($orig_event)) {
-                $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
-            }
-
-            $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
-            $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
-            $sday = datetime_convert('UTC', $tz, $sdt, 'd');
-            $shour = datetime_convert('UTC', $tz, $sdt, 'H');
-            $sminute = datetime_convert('UTC', $tz, $sdt, 'i');
-
-            $stext = datetime_convert('UTC', $tz, $sdt);
-            $stext = substr($stext, 0, 14) . "00:00";
-
-            $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
-            $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
-            $fday = datetime_convert('UTC', $tz, $fdt, 'd');
-            $fhour = datetime_convert('UTC', $tz, $fdt, 'H');
-            $fminute = datetime_convert('UTC', $tz, $fdt, 'i');
-
-            $ftext = datetime_convert('UTC', $tz, $fdt);
-            $ftext = substr($ftext, 0, 14) . "00:00";
-
-            $type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
-
-            $f = get_config('system', 'event_input_format');
-            if (!$f) {
-                $f = 'ymd';
-            }
-
-            $catsenabled = Apps::system_app_installed(local_channel(), 'Categories');
-
-            $category = '';
-
-            if ($catsenabled && x($orig_event)) {
-                $itm = q(
-                    "select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1",
-                    dbesc($orig_event['event_hash']),
-                    intval(local_channel())
-                );
-                $itm = fetch_post_tags($itm);
-                if ($itm) {
-                    $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-                    foreach ($cats as $cat) {
-                        if (strlen($category)) {
-                            $category .= ', ';
-                        }
-                        $category .= $cat['term'];
-                    }
-                }
-            }
-
-            $acl = new AccessControl($channel);
-            $perm_defaults = $acl->get();
-
-            $permissions = ((x($orig_event)) ? $orig_event : $perm_defaults);
-
-            $freq_options = [
-                'DAILY' => t('day(s)'),
-                'WEEKLY' => t('week(s)'),
-                'MONTHLY' => t('month(s)'),
-                'YEARLY' => t('year(s)')
-            ];
-
-
-            $tpl = Theme::get_template('event_form.tpl');
-
-            $form = replace_macros($tpl, array(
-                '$post' => z_root() . '/events',
-                '$eid' => $eid,
-                '$type' => $type,
-                '$xchan' => $event_xchan,
-                '$mid' => $mid,
-                '$event_hash' => $event_id,
-                '$summary' => array('summary', (($event_id) ? t('Edit event title') : t('Event title')), $t_orig, t('Required'), '*'),
-                '$catsenabled' => $catsenabled,
-                '$placeholdercategory' => t('Categories (comma-separated list)'),
-                '$c_text' => (($event_id) ? t('Edit Category') : t('Category')),
-                '$category' => $category,
-                '$required' => '*',
-                '$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear + 5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), (($event_id) ? t('Edit start date and time') : t('Start date and time')), 'start_text', true, true, '', '', true, $first_day),
-                '$n_text' => t('Finish date and time are not known or not relevant'),
-                '$n_checked' => $n_checked,
-                '$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear + 5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), (($event_id) ? t('Edit finish date and time') : t('Finish date and time')), 'finish_text', true, true, 'start_text', '', false, $first_day),
-                '$nofinish' => array('nofinish', t('Finish date and time are not known or not relevant'), $n_checked, '', array(t('No'), t('Yes')), 'onclick="enableDisableFinishDate();"'),
-                '$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'), array(t('No'), t('Yes'))),
-                '$a_text' => t('Adjust for viewer timezone'),
-                '$d_text' => (($event_id) ? t('Edit Description') : t('Description')),
-                '$d_orig' => $d_orig,
-                '$l_text' => (($event_id) ? t('Edit Location') : t('Location')),
-                '$l_orig' => $l_orig,
-                '$t_orig' => $t_orig,
-                '$preview' => t('Preview'),
-                '$perms_label' => t('Permission settings'),
-                // populating the acl dialog was a permission description from view_stream because Cal.php, which
-                // displays events, says "since we don't currently have an event permission - use the stream permission"
-                '$acl' => (($orig_event['event_xchan']) ? '' : Libacl::populate(((x($orig_event)) ? $orig_event : $perm_defaults), false, PermissionDescription::fromGlobalPermission('view_stream'))),
-
-                '$allow_cid' => acl2json($permissions['allow_cid']),
-                '$allow_gid' => acl2json($permissions['allow_gid']),
-                '$deny_cid' => acl2json($permissions['deny_cid']),
-                '$deny_gid' => acl2json($permissions['deny_gid']),
-                '$tz_choose' => Features::enabled(local_channel(), 'event_tz_select'),
-                '$timezone' => array('timezone_select', t('Timezone:'), date_default_timezone_get(), '', get_timezones()),
-
-                '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
-
-                '$submit' => t('Submit'),
-                '$advanced' => t('Advanced Options'),
-
-                '$repeat' => ['repeat', t('Event repeat'), false, '', [t('No'), t('Yes')]],
-                '$freq' => ['freq', t('Repeat frequency'), '', '', $freq_options],
-                '$interval' => ['interval', t('Repeat every'), 1, ''],
-                '$count' => ['count', t('Number of total repeats'), 10, ''],
-                '$until' => '',
-                '$byday' => '',
-
-            ));
-            /* end edit/create form */
-
-            $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
-            $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
-            if (!$y) {
-                $y = intval($thisyear);
-            }
-            if (!$m) {
-                $m = intval($thismonth);
-            }
-
-            $export = false;
-            if (argc() === 4 && argv(3) === 'export') {
-                $export = true;
-            }
-
-            // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
-            // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
-
-            if ($y < 1901) {
-                $y = 1900;
-            }
-            if ($y > 2099) {
-                $y = 2100;
-            }
-
-            $nextyear = $y;
-            $nextmonth = $m + 1;
-            if ($nextmonth > 12) {
-                $nextmonth = 1;
-                $nextyear++;
-            }
-
-            $prevyear = $y;
-            if ($m > 1) {
-                $prevmonth = $m - 1;
-            } else {
-                $prevmonth = 12;
-                $prevyear--;
-            }
-
-            $dim = get_dim($y, $m);
-            $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
-            $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
-
-
-            if (argv(1) === 'json') {
-                if (x($_GET, 'start')) {
-                    $start = $_GET['start'];
-                }
-                if (x($_GET, 'end')) {
-                    $finish = $_GET['end'];
-                }
-            }
-
-            $start = datetime_convert('UTC', 'UTC', $start);
-            $finish = datetime_convert('UTC', 'UTC', $finish);
-
-            $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-            $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-
-            if (x($_GET, 'id')) {
-                $r = q(
-                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
-                    intval(local_channel()),
-                    intval($_GET['id'])
-                );
-            } elseif ($export) {
-                $r = q(
-                    "SELECT * from event where uid = %d
-					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
-					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
-                    intval(local_channel()),
-                    dbesc($start),
-                    dbesc($finish),
-                    dbesc($adjust_start),
-                    dbesc($adjust_finish)
-                );
-            } else {
-                // fixed an issue with "nofinish" events not showing up in the calendar.
-                // There's still an issue if the finish date crosses the end of month.
-                // Noting this for now - it will need to be fixed here and in Friendica.
-                // Ultimately the finish date shouldn't be involved in the query.
-
-                $r = q(
-                    "SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                              from event left join item on event_hash = resource_id 
-					where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
-					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
-					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
-                    intval(local_channel()),
-                    dbesc($start),
-                    dbesc($finish),
-                    dbesc($adjust_start),
-                    dbesc($adjust_finish)
-                );
-            }
-
-            $links = [];
-
-            if ($r && !$export) {
-                xchan_query($r);
-                $r = fetch_post_tags($r, true);
-
-                $r = sort_by_date($r);
-            }
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
-                    if (!x($links, $j)) {
-                        $links[$j] = z_root() . '/' . App::$cmd . '#link-' . $j;
-                    }
-                }
-            }
-
-            $events = [];
-
-            $last_date = '';
-            $fmt = t('l, F j');
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'j') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'j'));
-                    $d = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], $fmt) : datetime_convert('UTC', 'UTC', $rr['dtstart'], $fmt));
-                    $d = day_translate($d);
-
-                    $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
-                    if ($rr['nofinish']) {
-                        $end = null;
-                    } else {
-                        $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
-
-                        // give a fake end to birthdays so they get crammed into a
-                        // single day on the calendar
-
-                        if ($rr['etype'] === 'birthday') {
-                            $end = null;
-                        }
-                    }
-
-
-                    $is_first = ($d !== $last_date);
-
-                    $last_date = $d;
-
-                    $edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root() . '/events/' . $rr['event_hash'] . '?expandform=1', t('Edit event'), '', '') : false);
-
-                    $drop = array(z_root() . '/events/drop/' . $rr['event_hash'], t('Delete event'), '', '');
-
-                    $title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])), ENT_QUOTES, 'UTF-8'));
-                    if (!$title) {
-                        list($title, $_trash) = explode(" $rr['id'],
-                        'hash' => $rr['event_hash'],
-                        'start' => $start,
-                        'end' => $end,
-                        'drop' => $drop,
-                        'allDay' => false,
-                        'title' => $title,
-
-                        'j' => $j,
-                        'd' => $d,
-                        'edit' => $edit,
-                        'is_first' => $is_first,
-                        'item' => $rr,
-                        'html' => $html,
-                        'plink' => array($rr['plink'], t('Link to Source'), '', ''),
-                    );
-                }
-            }
-
-            if ($export) {
-                header('Content-type: text/calendar');
-                header('Content-Disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"');
-                echo ical_wrapper($r);
-                killme();
-            }
-
-            if (App::$argv[1] === 'json') {
-                echo json_encode($events);
-                killme();
-            }
-
-            // links: array('href', 'text', 'extra css classes', 'title')
-            if (x($_GET, 'id')) {
-                $tpl = Theme::get_template("event.tpl");
-            } else {
-                $tpl = Theme::get_template("events-js.tpl");
-            }
-
-            $o = replace_macros($tpl, array(
-                '$baseurl' => z_root(),
-                '$new_event' => array(z_root() . '/events', (($event_id) ? t('Edit Event') : t('Create Event')), '', ''),
-                '$previus' => array(z_root() . "/events/$prevyear/$prevmonth", t('Previous'), '', ''),
-                '$next' => array(z_root() . "/events/$nextyear/$nextmonth", t('Next'), '', ''),
-                '$export' => array(z_root() . "/events/$y/$m/export", t('Export'), '', ''),
-                '$calendar' => cal($y, $m, $links, ' eventcal'),
-                '$events' => $events,
-                '$view_label' => t('View'),
-                '$month' => t('Month'),
-                '$week' => t('Week'),
-                '$day' => t('Day'),
-                '$prev' => t('Previous'),
-                '$next' => t('Next'),
-                '$today' => t('Today'),
-                '$form' => $form,
-                '$expandform' => ((x($_GET, 'expandform')) ? true : false),
-            ));
-
-            if (x($_GET, 'id')) {
-                echo $o;
-                killme();
-            }
-
-            return $o;
-        }
-
-        if ($mode === 'drop' && $event_id) {
-            $r = q(
-                "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                dbesc($event_id),
-                intval(local_channel())
-            );
-
-            $sync_event = $r[0];
-
-            if ($r) {
-                $r = q(
-                    "delete from event where event_hash = '%s' and uid = %d",
-                    dbesc($event_id),
-                    intval(local_channel())
-                );
-                if ($r) {
-                    $i = q(
-                        "select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d",
-                        dbesc($event_id),
-                        intval(local_channel())
-                    );
-
-                    if ($i) {
-                        $can_delete = false;
-                        $local_delete = true;
-
-                        $ob_hash = get_observer_hash();
-                        if ($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) {
-                            $can_delete = true;
-                        }
-
-                        // The site admin can delete any post/item on the site.
-                        // If the item originated on this site+channel the deletion will propagate downstream.
-                        // Otherwise just the local copy is removed.
-
-                        if (is_site_admin()) {
-                            $local_delete = true;
-                            if (intval($i[0]['item_origin'])) {
-                                $can_delete = true;
-                            }
-                        }
-
-                        if ($can_delete || $local_delete) {
-                            // if this is a different page type or it's just a local delete
-                            // but not by the item author or owner, do a simple deletion
-
-                            $complex = false;
-
-                            if (intval($i[0]['item_type']) || ($local_delete && (!$can_delete))) {
-                                drop_item($i[0]['id']);
-                            } else {
-                                // complex deletion that needs to propagate and be performed in phases
-                                drop_item($i[0]['id'], true, DROPITEM_PHASE1);
-                                $complex = true;
-                            }
-
-                            $ii = q(
-                                "select * from item where id = %d",
-                                intval($i[0]['id'])
-                            );
-                            if ($ii) {
-                                xchan_query($ii);
-                                $sync_item = fetch_post_tags($ii);
-                                Libsync::build_sync_packet($i[0]['uid'], array('item' => array(encode_item($sync_item[0], true))));
-                            }
-
-                            if ($complex) {
-                                tag_deliver($i[0]['uid'], $i[0]['id']);
-                            }
-                        }
-                    }
-
-                    $r = q(
-                        "update item set resource_type = '', resource_id = '' where resource_type = 'event' and resource_id = '%s' and uid = %d",
-                        dbesc($event_id),
-                        intval(local_channel())
-                    );
-                    $sync_event['event_deleted'] = 1;
-                    Libsync::build_sync_packet(0, array('event' => array($sync_event)));
-
-                    info(t('Event removed') . EOL);
-                } else {
-                    notice(t('Failed to remove event') . EOL);
-                }
-                goaway(z_root() . '/events');
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Module/Expire.php b/Zotlabs/Module/Expire.php
deleted file mode 100644
index 40dab4e52..000000000
--- a/Zotlabs/Module/Expire.php
+++ /dev/null
@@ -1,54 +0,0 @@
-' . $desc . '';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Expire Posts'))) {
-            return $text;
-        }
-
-        $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), [
-            '$field' => array('selfexpiredays', t('Expire and delete all my posts after this many days'), intval(get_pconfig(local_channel(), 'system', 'selfexpiredays', 0)), t('Leave at 0 if you wish to manually control expiration of specific posts.'))
-        ]);
-
-        return replace_macros(Theme::get_template('generic_app_settings.tpl'), [
-            '$addon' => array('expire', t('Automatic Expiration Settings'), '', t('Submit')),
-            '$content' => $setting_fields
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Fastping.php b/Zotlabs/Module/Fastping.php
deleted file mode 100644
index 63fc2e739..000000000
--- a/Zotlabs/Module/Fastping.php
+++ /dev/null
@@ -1,72 +0,0 @@
- $m);
-            }
-            unset($_SESSION['sysmsg']);
-        }
-        if (x($_SESSION, 'sysmsg_info')) {
-            foreach ($_SESSION['sysmsg_info'] as $m) {
-                $result['info'][] = array('message' => $m);
-            }
-            unset($_SESSION['sysmsg_info']);
-        }
-        if (!($vnotify & VNOTIFY_INFO)) {
-            $result['info'] = [];
-        }
-        if (!($vnotify & VNOTIFY_ALERT)) {
-            $result['notice'] = [];
-        }
-
-        json_return_and_die($result);
-    }
-}
diff --git a/Zotlabs/Module/Fbrowser.php b/Zotlabs/Module/Fbrowser.php
deleted file mode 100644
index 01132bba7..000000000
--- a/Zotlabs/Module/Fbrowser.php
+++ /dev/null
@@ -1,144 +0,0 @@
-
- */
-
-require_once('include/photo_factory.php');
-
-
-class Fbrowser extends Controller
-{
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            killme();
-        }
-
-        if (App::$argc == 1) {
-            killme();
-        }
-
-        //echo "
          "; var_dump(\App::$argv); killme();
-
-        switch (App::$argv[1]) {
-            case "image":
-                $path = array(array(z_root() . "/fbrowser/image/", t("Photos")));
-                $albums = false;
-                $sql_extra = "";
-                $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
-
-                if (App::$argc == 2) {
-                    $albums = q(
-                        "SELECT distinct(album) AS album FROM photo WHERE uid = %d ",
-                        intval(local_channel())
-                    );
-                    // anon functions only from 5.3.0... meglio tardi che mai..
-                    $albums = array_map("self::folder1", $albums);
-                }
-
-                $album = "";
-                if (App::$argc == 3) {
-                    $album = hex2bin(App::$argv[2]);
-                    $sql_extra = sprintf("AND album = '%s' ", dbesc($album));
-                    $sql_extra2 = "";
-                    $path[] = array(z_root() . "/fbrowser/image/" . App::$argv[2] . "/", $album);
-                }
-
-                $r = q(
-                    "SELECT resource_id, id, filename, type, min(imgscale) AS hiq,max(imgscale) AS loq, description  
-						FROM photo WHERE uid = %d $sql_extra
-						GROUP BY resource_id $sql_extra2",
-                    intval(local_channel())
-                );
-
-                $files = array_map("self::files1", $r);
-
-                $tpl = Theme::get_template("filebrowser.tpl");
-                echo replace_macros($tpl, array(
-                    '$type' => 'image',
-                    '$baseurl' => z_root(),
-                    '$path' => $path,
-                    '$folders' => $albums,
-                    '$files' => $files,
-                    '$cancel' => t('Cancel'),
-                ));
-
-
-                break;
-            case "file":
-                if (App::$argc == 2) {
-                    $files = q(
-                        "SELECT id, filename, filetype FROM attach WHERE uid = %d ",
-                        intval(local_channel())
-                    );
-
-                    $files = array_map("self::files2", $files);
-                    //echo "
          "; var_dump($files); killme();
-
-
-                    $tpl = Theme::get_template("filebrowser.tpl");
-                    echo replace_macros($tpl, array(
-                        '$type' => 'file',
-                        '$baseurl' => z_root(),
-                        '$path' => array(array(z_root() . "/fbrowser/image/", t("Files"))),
-                        '$folders' => false,
-                        '$files' => $files,
-                        '$cancel' => t('Cancel'),
-                    ));
-                }
-
-                break;
-        }
-
-
-        killme();
-    }
-
-    private static function folder1($el)
-    {
-        return array(bin2hex($el['album']), $el['album']);
-    }
-
-
-    private static function files1($rr)
-    {
-
-        $ph = photo_factory('');
-        $types = $ph->supportedTypes();
-        $ext = $types[$rr['type']];
-
-        $filename_e = $rr['filename'];
-
-        return array(
-            z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' . $ext,
-            $filename_e,
-            z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['loq'] . '.' . $ext
-        );
-    }
-
-    private static function files2($rr)
-    {
-        list($m1, $m2) = explode("/", $rr['filetype']);
-        $filetype = ((file_exists("images/icons/$m1.png")) ? $m1 : "zip");
-
-        if (App::get_template_engine() === 'internal') {
-            $filename_e = template_escape($rr['filename']);
-        } else {
-            $filename_e = $rr['filename'];
-        }
-
-        return array(z_root() . '/attach/' . $rr['id'], $filename_e, z_root() . '/images/icons/16/' . $filetype . '.png');
-    }
-}
diff --git a/Zotlabs/Module/Fedi_id.php b/Zotlabs/Module/Fedi_id.php
deleted file mode 100644
index 42e7e1307..000000000
--- a/Zotlabs/Module/Fedi_id.php
+++ /dev/null
@@ -1,59 +0,0 @@
- t('Home instance'),
-                '$address' => ['address', t('Enter your channel address or fediverse ID (e.g. channel@example.com)'), '', t('If you do not have a fediverse ID, please use your browser \'back\' button to return to the previous page')],
-                '$action' => 'fedi_id/' . argv(1),
-                '$method' => 'post',
-                '$submit' => t('Connect')
-            ]
-        );
-    }
-}
diff --git a/Zotlabs/Module/Feed.php b/Zotlabs/Module/Feed.php
deleted file mode 100644
index 5a3b86e26..000000000
--- a/Zotlabs/Module/Feed.php
+++ /dev/null
@@ -1,50 +0,0 @@
- 1) {
-            if (observer_prohibited(true)) {
-                killme();
-            }
-
-            $channel = Channel::from_username(argv(1));
-            if (!$channel) {
-                killme();
-            }
-
-            logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
-
-            echo get_public_feed($channel, $params);
-
-            killme();
-        }
-    }
-}
diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
deleted file mode 100644
index 811cee20e..000000000
--- a/Zotlabs/Module/File_upload.php
+++ /dev/null
@@ -1,106 +0,0 @@
- array($sync)));
-                }
-                goaway(z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']);
-            }
-        } else {
-            $matches = [];
-            $partial = false;
-
-
-            if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
-                $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
-                if ($pm) {
-                    logger('Content-Range: ' . print_r($matches, true));
-                    $partial = true;
-                }
-            }
-
-            if ($partial) {
-                $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
-
-                if ($x['partial']) {
-                    header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-                    json_return_and_die($x);
-                } else {
-                    header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
-
-                    $_FILES['userfile'] = [
-                        'name' => $x['name'],
-                        'type' => $x['type'],
-                        'tmp_name' => $x['tmp_name'],
-                        'error' => $x['error'],
-                        'size' => $x['size']
-                    ];
-                }
-            } else {
-                if (!array_key_exists('userfile', $_FILES)) {
-                    $_FILES['userfile'] = [
-                        'name' => $_FILES['files']['name'],
-                        'type' => $_FILES['files']['type'],
-                        'tmp_name' => $_FILES['files']['tmp_name'],
-                        'error' => $_FILES['files']['error'],
-                        'size' => $_FILES['files']['size']
-                    ];
-                }
-            }
-
-            $r = attach_store($channel, get_observer_hash(), '', $_REQUEST);
-            if ($r['success']) {
-                $sync = attach_export_data($channel, $r['data']['hash']);
-                if ($sync) {
-                    Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
-                }
-            }
-        }
-        goaway(z_root() . '/' . $_REQUEST['return_url']);
-    }
-}
diff --git a/Zotlabs/Module/Filer.php b/Zotlabs/Module/Filer.php
deleted file mode 100644
index aa684e1fe..000000000
--- a/Zotlabs/Module/Filer.php
+++ /dev/null
@@ -1,71 +0,0 @@
- 1) ? intval(App::$argv[1]) : 0);
-
-        logger('filer: tag ' . $term . ' item ' . $item_id);
-
-        if ($item_id && strlen($term)) {
-            // file item
-            store_item_tag(local_channel(), $item_id, TERM_OBJ_POST, TERM_FILE, $term, '');
-
-            // protect the entire conversation from periodic expiration
-
-            $r = q(
-                "select parent from item where id = %d and uid = %d limit 1",
-                intval($item_id),
-                intval(local_channel())
-            );
-            if ($r) {
-                $x = q(
-                    "update item set item_retained = 1 where id = %d and uid = %d",
-                    intval($r[0]['parent']),
-                    intval(local_channel())
-                );
-            }
-        } else {
-            $filetags = [];
-            $r = q(
-                "select distinct(term) from term where uid = %d and ttype = %d order by term asc",
-                intval(local_channel()),
-                intval(TERM_FILE)
-            );
-            if (count($r)) {
-                foreach ($r as $rr) {
-                    $filetags[] = $rr['term'];
-                }
-            }
-            $tpl = Theme::get_template("filer_dialog.tpl");
-            $o = replace_macros($tpl, array(
-                '$field' => array('term', t('Enter a folder name'), '', '', $filetags, 'placeholder="' . t('or select an existing folder (doubleclick)') . '"'),
-                '$submit' => t('Save'),
-                '$title' => t('Save to Folder'),
-                '$cancel' => t('Cancel')
-            ));
-
-            echo $o;
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Filerm.php b/Zotlabs/Module/Filerm.php
deleted file mode 100644
index 5d2178cff..000000000
--- a/Zotlabs/Module/Filerm.php
+++ /dev/null
@@ -1,46 +0,0 @@
- 1) ? intval(App::$argv[1]) : 0);
-
-        logger('filerm: tag ' . $term . ' item ' . $item_id);
-
-        if ($item_id && strlen($term)) {
-            $r = q(
-                "delete from term where uid = %d and ttype = %d and oid = %d and term = '%s'",
-                intval(local_channel()),
-                intval(($category) ? TERM_CATEGORY : TERM_FILE),
-                intval($item_id),
-                dbesc($term)
-            );
-        }
-
-        if (x($_SESSION, 'return_url')) {
-            goaway(z_root() . '/' . $_SESSION['return_url']);
-        }
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php
deleted file mode 100644
index 82b0b6c6c..000000000
--- a/Zotlabs/Module/Filestorage.php
+++ /dev/null
@@ -1,259 +0,0 @@
-set_from_array($_POST);
-        $x = $acl->get();
-
-        $url = get_cloud_url($channel_id, $channel['channel_address'], $resource);
-
-        // get the object before permissions change so we can catch eventual former allowed members
-        $object = get_file_activity_object($channel_id, $resource, $url);
-
-        attach_change_permissions($channel_id, $resource, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], $recurse, true);
-
-        $sync = attach_export_data($channel, $resource, false);
-        if ($sync) {
-            Libsync::build_sync_packet($channel_id, array('file' => array($sync)));
-        }
-
-//      file_activity($channel_id, $object, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], 'post', $notify);
-
-        goaway(dirname($url));
-    }
-
-    public function get()
-    {
-
-        if (argc() > 1) {
-            $channel = Channel::from_username(argv(1));
-        }
-        if (!$channel) {
-            notice(t('Channel unavailable.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $owner = intval($channel['channel_id']);
-        $observer = App::get_observer();
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!($perms['view_storage'] || is_site_admin())) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-
-        if (argc() > 3 && argv(3) === 'delete') {
-            if (argc() > 4 && argv(4) === 'json') {
-                $json_return = true;
-            }
-
-            $admin_delete = false;
-
-            if (!$perms['write_storage']) {
-                if (is_site_admin()) {
-                    $admin_delete = true;
-                } else {
-                    notice(t('Permission denied.') . EOL);
-                    if ($json_return) {
-                        json_return_and_die(['success' => false]);
-                    }
-                    return;
-                }
-            }
-
-            $file = intval(argv(2));
-            $r = q(
-                "SELECT hash, creator FROM attach WHERE id = %d AND uid = %d LIMIT 1",
-                dbesc($file),
-                intval($owner)
-            );
-            if (!$r) {
-                notice(t('File not found.') . EOL);
-
-                if ($json_return) {
-                    json_return_and_die(['success' => false]);
-                }
-
-                goaway(z_root() . '/cloud/' . $which);
-            }
-
-            $f = array_shift($r);
-
-            if (intval(local_channel()) !== $owner) {
-                if ($f['creator'] && $f['creator'] !== $ob_hash) {
-                    notice(t('Permission denied.') . EOL);
-
-                    if ($json_return) {
-                        json_return_and_die(['success' => false]);
-                    }
-                    goaway(z_root() . '/cloud/' . $which);
-                }
-            }
-
-            $url = get_cloud_url($channel['channel_id'], $channel['channel_address'], $f['hash']);
-
-            attach_delete($owner, $f['hash']);
-
-            if (!$admin_delete) {
-                $sync = attach_export_data($channel, $f['hash'], true);
-                if ($sync) {
-                    Libsync::build_sync_packet($channel['channel_id'], ['file' => [$sync]]);
-                }
-            }
-
-            if ($json_return) {
-                json_return_and_die(['success' => true]);
-            }
-
-            goaway(dirname($url));
-        }
-
-
-        // Since we have ACL'd files in the wild, but don't have ACL here yet, we
-        // need to return for anyone other than the owner, despite the perms check for now.
-
-        $is_owner = (((local_channel()) && ($owner == local_channel())) ? true : false);
-        if (!($is_owner || is_site_admin())) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-
-        if (argc() > 3 && argv(3) === 'edit') {
-            if (!$perms['write_storage']) {
-                notice(t('Permission denied.') . EOL);
-                return;
-            }
-
-            $file = intval(argv(2));
-
-            $r = q(
-                "select id, uid, folder, filename, revision, flags, is_dir, os_storage, hash, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and uid = %d limit 1",
-                intval($file),
-                intval($owner)
-            );
-
-            $f = array_shift($r);
-
-            $channel = App::get_channel();
-
-            $cloudpath = get_cloudpath($f);
-
-            $aclselect_e = Libacl::populate($f, false, PermissionDescription::fromGlobalPermission('view_storage'));
-            $is_a_dir = (intval($f['is_dir']) ? true : false);
-
-            $lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock');
-
-            // Encode path that is used for link so it's a valid URL
-            // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly
-            $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath));
-            $folder_list = attach_folder_select_list($channel['channel_id']);
-
-            $o = replace_macros(Theme::get_template('attach_edit.tpl'), [
-                '$header' => t('Edit file permissions'),
-                '$file' => $f,
-                '$cloudpath' => z_root() . '/' . $encoded_path,
-                '$uid' => $channel['channel_id'],
-                '$channelnick' => $channel['channel_address'],
-                '$permissions' => t('Permissions'),
-                '$aclselect' => $aclselect_e,
-                '$allow_cid' => acl2json($f['allow_cid']),
-                '$allow_gid' => acl2json($f['allow_gid']),
-                '$deny_cid' => acl2json($f['deny_cid']),
-                '$deny_gid' => acl2json($f['deny_gid']),
-                '$lockstate' => $lockstate,
-                '$newname' => ['newname', t('Change filename to'), '', t('Leave blank to keep the existing filename')],
-                '$newdir' => ['newdir', t('Move to directory'), $f['folder'], '', $folder_list],
-                '$permset' => t('Set/edit permissions'),
-                '$recurse' => ['recurse', t('Include all files and sub folders'), 0, '', [t('No'), t('Yes')]],
-                '$backlink' => t('Return to file list'),
-                '$isadir' => $is_a_dir,
-                '$cpdesc' => t('Copy/paste this code to attach file to a post'),
-                '$cpldesc' => t('Copy/paste this URL to link file from a web page'),
-                '$submit' => t('Submit'),
-                '$attach_btn_title' => t('Share this file'),
-                '$link_btn_title' => t('Show URL to this file'),
-                '$notify' => ['notify_edit', t('Show in your contacts shared folder'), 0, '', [t('No'), t('Yes')]],
-            ]);
-
-            echo $o;
-            killme();
-        }
-        goaway(z_root() . '/cloud/' . $which);
-    }
-}
diff --git a/Zotlabs/Module/Finger.php b/Zotlabs/Module/Finger.php
deleted file mode 100644
index ef9bcae75..000000000
--- a/Zotlabs/Module/Finger.php
+++ /dev/null
@@ -1,38 +0,0 @@
- t('Webfinger Diagnostic'),
-            '$resource' => ['resource', t('Lookup address or URL'), $_GET['resource'], EMPTY_STR],
-            '$submit' => t('Submit')
-        ]);
-
-        if ($_GET['resource']) {
-            $resource = trim(escape_tags($_GET['resource']));
-
-            $result = Webfinger::exec($resource);
-
-            $o .= '
          ' . str_replace("\n", '
          ', print_array($result)) . '
          ';
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
deleted file mode 100644
index 1eee8be52..000000000
--- a/Zotlabs/Module/Follow.php
+++ /dev/null
@@ -1,175 +0,0 @@
-= 2) {
-            $abook_id = intval(argv(1));
-            if (!$abook_id) {
-                return;
-            }
-
-            $r = q(
-                "select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d",
-                intval($abook_id)
-            );
-            if (!$r) {
-                return;
-            }
-
-            $chan = Channel::from_id($r[0]['abook_channel']);
-
-            if (!$chan) {
-                http_status_exit(404, 'Not found');
-            }
-
-            $actor = Activity::encode_person($chan, true, true);
-            if (!$actor) {
-                http_status_exit(404, 'Not found');
-            }
-
-            // Pleroma requires a unique follow id for every follow and follow response
-            // instead of our method of re-using the abook_id. This causes issues if they unfollow
-            // and re-follow so md5 their follow id and slap it on the end so they don't simply discard our
-            // subsequent accept/reject actions.
-
-            $orig_follow = get_abconfig($chan['channel_id'], $r[0]['xchan_hash'], 'activitypub', 'their_follow_id');
-            $orig_follow_type = get_abconfig($chan['channel_id'], $r[0]['xchan_hash'], 'activitypub', 'their_follow_type');
-
-            as_return_and_die([
-                'id' => z_root() . '/follow/' . $r[0]['abook_id'] . (($orig_follow) ? '/' . md5($orig_follow) : EMPTY_STR),
-                'type' => (($orig_follow_type) ? $orig_follow_type : 'Follow'),
-                'actor' => $actor,
-                'object' => $r[0]['xchan_url']
-            ], $chan);
-        }
-
-
-        $uid = local_channel();
-
-        if (!$uid) {
-            return;
-        }
-
-        $url = notags(trim(punify($_REQUEST['url'])));
-        $return_url = $_SESSION['return_url'];
-        $confirm = intval($_REQUEST['confirm']);
-        $interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);
-        $channel = App::get_channel();
-
-        if ((strpos($url, 'http') === 0) || strpos($url, 'bear:') === 0 || strpos($url, 'x-zot:') === 0) {
-            $n = Activity::fetch($url);
-            if ($n && isset($n['type']) && !ActivityStreams::is_an_actor($n['type'])) {
-                // set client flag to convert objects to implied activities
-                $a = new ActivityStreams($n, null, true);
-                if (
-                    $a->type === 'Announce' && is_array($a->obj)
-                    && array_key_exists('object', $a->obj) && array_key_exists('actor', $a->obj)
-                ) {
-                    // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
-                    // Reparse the encapsulated Activity and use that instead
-                    logger('relayed activity', LOGGER_DEBUG);
-                    $a = new ActivityStreams($a->obj, null, true);
-                }
-
-                if ($a->is_valid()) {
-                    if (is_array($a->actor) && array_key_exists('id', $a->actor)) {
-                        Activity::actor_store($a->actor['id'], $a->actor);
-                    }
-
-                    // ActivityPub sourced items are cacheable
-                    $item = Activity::decode_note($a, true);
-
-                    if ($item) {
-                        Activity::store($channel, get_observer_hash(), $a, $item, true);
-
-                        $r = q(
-                            "select * from item where mid = '%s' and uid = %d",
-                            dbesc($item['mid']),
-                            intval($uid)
-                        );
-                        if ($r) {
-                            if ($interactive) {
-                                goaway(z_root() . '/display/' . gen_link_id($item['mid']));
-                            } else {
-                                $result['success'] = true;
-                                json_return_and_die($result);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-
-        $result = Connect::connect($channel, $url);
-
-        if ($result['success'] == false) {
-            if ($result['message']) {
-                notice($result['message']);
-            }
-            if ($interactive) {
-                goaway($return_url);
-            } else {
-                json_return_and_die($result);
-            }
-        }
-
-        info(t('Connection added.') . EOL);
-
-        $clone = [];
-        foreach ($result['abook'] as $k => $v) {
-            if (strpos($k, 'abook_') === 0) {
-                $clone[$k] = $v;
-            }
-        }
-        unset($clone['abook_id']);
-        unset($clone['abook_account']);
-        unset($clone['abook_channel']);
-
-        $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
-        if ($abconfig) {
-            $clone['abconfig'] = $abconfig;
-        }
-        Libsync::build_sync_packet(0, ['abook' => [$clone]], true);
-
-        $can_view_stream = their_perms_contains($channel['channel_id'], $clone['abook_xchan'], 'view_stream');
-
-        // If we can view their stream, pull in some posts
-
-        if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) {
-            Run::Summon(['Onepoll', $result['abook']['abook_id']]);
-        }
-
-        if ($interactive) {
-            goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1');
-        } else {
-            json_return_and_die(['success' => true]);
-        }
-    }
-
-    public function get()
-    {
-        if (!local_channel()) {
-            return login();
-        }
-    }
-}
diff --git a/Zotlabs/Module/Followers.php b/Zotlabs/Module/Followers.php
deleted file mode 100644
index 2857eb205..000000000
--- a/Zotlabs/Module/Followers.php
+++ /dev/null
@@ -1,94 +0,0 @@
- 100) {
-            $ret = Activity::paged_collection_init($t[0]['total'], App::$query_string);
-        } else {
-            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-
-            $r = q(
-                "select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'their_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql",
-                intval($channel['channel_id']),
-                intval($channel['channel_id']),
-                dbesc($channel['channel_hash'])
-            );
-
-            $this->results = $r;
-			$ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']);
-        }
-
-        if (ActivityStreams::is_as_request()) {
-            as_return_and_die($ret, $channel);
-        }
-    }
-
-	function get() {
-
-		if ($this->results) {
-            foreach ($this->results as $member) {
-                $members[] = micropro($member, true, 'mpgroup', 'card');
-            }
-        }
-        $o = replace_macros(Theme::get_template('listmembers.tpl'), [
-            '$title' => t('List members'),
-            '$members' => $members
-        ]);
-        return $o;
-	}
-}
diff --git a/Zotlabs/Module/Following.php b/Zotlabs/Module/Following.php
deleted file mode 100644
index b7e4d126e..000000000
--- a/Zotlabs/Module/Following.php
+++ /dev/null
@@ -1,97 +0,0 @@
- 100) {
-            $ret = Activity::paged_collection_init($t[0]['total'], App::$query_string);
-        } else {
-            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-
-            $r = q(
-                "select * from xchan left join abconfig on abconfig.xchan = xchan_hash left join abook on abook_xchan = xchan_hash where abook_channel = %d and abconfig.chan = %d and abconfig.cat = 'system' and abconfig.k = 'my_perms' and abconfig.v like '%%send_stream%%' and xchan_hash != '%s' and xchan_orphan = 0 and xchan_deleted = 0 and abook_hidden = 0 and abook_pending = 0 and abook_self = 0 $pager_sql",
-                intval($channel['channel_id']),
-                intval($channel['channel_id']),
-                dbesc($channel['channel_hash'])
-            );
-
-			$this->results = $r;
-			
-            $ret = Activity::encode_follow_collection($r, App::$query_string, 'OrderedCollection', $t[0]['total']);
-        }
-
-        if (ActivityStreams::is_as_request()) {
-            as_return_and_die($ret, $channel);
-        }
-    }
-
-	function get() {
-
-		if ($this->results) {
-            foreach ($this->results as $member) {
-                $members[] = micropro($member, true, 'mpgroup', 'card');
-            }
-        }
-        $o = replace_macros(Theme::get_template('listmembers.tpl'), [
-            '$title' => t('List members'),
-            '$members' => $members
-        ]);
-        return $o;
-	}
-
-}
diff --git a/Zotlabs/Module/Future.php b/Zotlabs/Module/Future.php
deleted file mode 100644
index 1cf4b28bf..000000000
--- a/Zotlabs/Module/Future.php
+++ /dev/null
@@ -1,21 +0,0 @@
-' . $desc . '';
-
-        return $text;
-    }
-}
diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php
deleted file mode 100644
index 082550321..000000000
--- a/Zotlabs/Module/Getfile.php
+++ /dev/null
@@ -1,148 +0,0 @@
- 1) {
-            $verify_hash = argv(1);
-            if ($verify_hash !== $resource) {
-                logger('resource mismatch');
-                killme();
-            }
-        }
-
-        if (!$hash) {
-            logger('no sender hash');
-            killme();
-        }
-
-        foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) {
-            if (array_key_exists($head, $_SERVER) && substr(trim($_SERVER[$head]), 0, 9) === 'Signature') {
-                if ($head !== 'HTTP_AUTHORIZATION') {
-                    $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
-                    continue;
-                }
-
-                $verified = HTTPSig::verify('');
-                if ($verified && $verified['header_signed'] && $verified['header_valid']) {
-                    $r = q(
-                        "select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_addr = '%s' limit 1",
-                        dbesc($verified['signer']),
-                        dbesc(str_replace('acct:', '', $verified['signer']))
-                    );
-                    if ($r && $r[0]['hubloc_hash'] === $hash) {
-                        $header_verified = true;
-                    }
-                }
-            }
-        }
-
-        if (!$header_verified) {
-            http_status_exit(403, 'Permission denied');
-        }
-
-        $channel = Channel::from_hash($hash);
-
-        if (!$channel) {
-            logger('error: missing info');
-            killme();
-        }
-
-        if ($resolution > 0) {
-            $r = q(
-                "select * from photo where resource_id = '%s' and uid = %d and imgscale = %d limit 1",
-                dbesc($resource),
-                intval($channel['channel_id']),
-                intval($resolution)
-            );
-            if ($r) {
-                header('Content-type: ' . $r[0]['mimetype']);
-
-                if (intval($r[0]['os_storage'])) {
-                    $fname = dbunescbin($r[0]['content']);
-                    if (strpos($fname, 'store') !== false) {
-                        $istream = fopen($fname, 'rb');
-                    } else {
-                        $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname, 'rb');
-                    }
-                    $ostream = fopen('php://output', 'wb');
-                    if ($istream && $ostream) {
-                        pipe_streams($istream, $ostream);
-                        fclose($istream);
-                        fclose($ostream);
-                    }
-                } else {
-                    echo dbunescbin($r[0]['content']);
-                }
-            }
-            killme();
-        }
-
-        $r = attach_by_hash($resource, $channel['channel_hash'], $revision);
-
-        if (!$r['success']) {
-            logger('attach_by_hash failed: ' . $r['message']);
-            notice($r['message'] . EOL);
-            return;
-        }
-
-        header('Content-type: ' . $r['data']['filetype']);
-        header('Content-Disposition: attachment; filename="' . $r['data']['filename'] . '"');
-        if (intval($r['data']['os_storage'])) {
-            $fname = dbunescbin($r['data']['content']);
-            if (strpos($fname, 'store') !== false) {
-                $istream = fopen($fname, 'rb');
-            } else {
-                $istream = fopen('store/' . $channel['channel_address'] . '/' . $fname, 'rb');
-            }
-            $ostream = fopen('php://output', 'wb');
-            if ($istream && $ostream) {
-                pipe_streams($istream, $ostream);
-                fclose($istream);
-                fclose($ostream);
-            }
-        } else {
-            echo dbunescbin($r['data']['content']);
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Hashtags.php b/Zotlabs/Module/Hashtags.php
deleted file mode 100644
index 9b8ee35f4..000000000
--- a/Zotlabs/Module/Hashtags.php
+++ /dev/null
@@ -1,37 +0,0 @@
- $rv['term']];
-            }
-        }
-
-        json_return_and_die($result);
-    }
-}
diff --git a/Zotlabs/Module/Hcard.php b/Zotlabs/Module/Hcard.php
deleted file mode 100644
index 1b02f2f37..000000000
--- a/Zotlabs/Module/Hcard.php
+++ /dev/null
@@ -1,78 +0,0 @@
- 1) {
-            $which = argv(1);
-        } else {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        logger('hcard_request: ' . $which, LOGGER_DEBUG);
-
-        $profile = '';
-        $channel = App::get_channel();
-
-        if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-            $which = $channel['channel_address'];
-            $profile = argv(1);
-            $r = q(
-                "select profile_guid from profile where id = %d and uid = %d limit 1",
-                intval($profile),
-                intval(local_channel())
-            );
-            if (!$r) {
-                $profile = '';
-            }
-            $profile = $r[0]['profile_guid'];
-        }
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/atom+xml',
-            'title' => t('Posts and comments'),
-            'href' => z_root() . '/feed/' . $which
-        ]);
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/atom+xml',
-            'title' => t('Only posts'),
-            'href' => z_root() . '/feed/' . $which . '?f=&top=1'
-        ]);
-
-
-        if (!$profile) {
-            $x = q(
-                "select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
-                dbesc(argv(1))
-            );
-            if ($x) {
-                App::$profile = $x[0];
-            }
-        }
-
-        Libprofile::load($which, $profile);
-    }
-
-
-    public function get()
-    {
-
-        $x = new \Zotlabs\Widget\Profile();
-        return $x->widget([]);
-    }
-}
diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
deleted file mode 100644
index 7b78f643d..000000000
--- a/Zotlabs/Module/Help.php
+++ /dev/null
@@ -1,145 +0,0 @@
-';
-            $o .= '
          ';
-            $o .= '
          ' . t('Documentation Search') . ' - ' . htmlspecialchars($_REQUEST['search']) . '
          ';
-            $o .= '
          ';
-            $o .= '
          ';
-
-            $r = search_doc_files($_REQUEST['search']);
-            if ($r) {
-                $o .= '
            ';
-                foreach ($r as $rr) {
-                    $dirname = dirname($rr['v']);
-                    $fname = basename($rr['v']);
-                    $fname = substr($fname, 0, strrpos($fname, '.'));
-                    $path = trim(substr($dirname, 4), '/');
-
-                    $o .= '
          • ' . ucwords(str_replace('_', ' ', notags($fname))) . '
            '
-                        . '' . 'help/' . (($path) ? $path . '/' : '') . $fname . '
            '
-                        . '...' . str_replace('$Projectname', System::get_platform_name(), $rr['text']) . '...

            • ';
-                }
-                $o .= '
          ';
-                $o .= '
          ';
-                $o .= '';
-            }
-
-            return $o;
-        }
-
-
-        if (argc() > 2 && argv(argc() - 2) === 'assets') {
-            $path = '';
-            for ($x = 1; $x < argc(); $x++) {
-                if (strlen($path)) {
-                    $path .= '/';
-                }
-                $path .= argv($x);
-            }
-            $realpath = 'doc/' . $path;
-            //Set the content-type header as appropriate
-            $imageInfo = getimagesize($realpath);
-            switch ($imageInfo[2]) {
-                case IMAGETYPE_JPEG:
-                    header("Content-Type: image/jpeg");
-                    break;
-                case IMAGETYPE_GIF:
-                    header("Content-Type: image/gif");
-                    break;
-                case IMAGETYPE_PNG:
-                    header("Content-Type: image/png");
-                    break;
-                default:
-                    break;
-            }
-            header("Content-Length: " . filesize($realpath));
-
-            // dump the picture and stop the script
-            readfile($realpath);
-            killme();
-        }
-
-        if (argc() === 1) {
-            $files = self::listdir('doc');
-
-            if ($files) {
-                foreach ($files as $file) {
-                    if ((!strpos($file, '/site/')) && file_exists(str_replace('doc/', 'doc/site/', $file))) {
-                        continue;
-                    }
-                    if (strpos($file, 'README')) {
-                        continue;
-                    }
-                    if (preg_match('/\/(..|..\-..)\//', $file, $matches)) {
-                        $language = $matches[1];
-                    } else {
-                        $language = t('Unknown language');
-                    }
-                    if ($language === substr(App::$language, 0, 2)) {
-                        $language = '';
-                    }
-
-                    $link = str_replace(['doc/', '.mc'], ['help/', ''], $file);
-                    if (strpos($link, '/global/') !== false || strpos($link, '/media/') !== false) {
-                        continue;
-                    }
-                    $content .= '
          ' . ucfirst(basename($link)) . '
          ' . (($language) ? " [$language]" : '') . EOL;
-                }
-            }
-        } else {
-            $content = get_help_content();
-        }
-
-
-        return replace_macros(Theme::get_template('help.tpl'), array(
-            '$title' => t('$Projectname Documentation'),
-            '$tocHeading' => t('Contents'),
-            '$content' => $content,
-            '$heading' => $heading,
-            '$language' => $language
-        ));
-    }
-
-    public static function listdir($path)
-    {
-        $results = [];
-        $handle = opendir($path);
-        if (!$handle) {
-            return $results;
-        }
-        while (false !== ($file = readdir($handle))) {
-            if ($file === '.' || $file === '..') {
-                continue;
-            }
-            if (is_dir($path . '/' . $file)) {
-                $results = array_merge($results, self::listdir($path . '/' . $file));
-            } else {
-                $results[] = $path . '/' . $file;
-            }
-        }
-        closedir($handle);
-        return $results;
-    }
-}
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php
deleted file mode 100644
index 472d0262b..000000000
--- a/Zotlabs/Module/Home.php
+++ /dev/null
@@ -1,173 +0,0 @@
- [
-                ACTIVITYSTREAMS_JSONLD_REV,
-                'https://w3id.org/security/v1',
-                Activity::ap_schema()
-            ]], Activity::encode_site());
-
-            $headers = [];
-            $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
-            $x['signature'] = LDSignatures::sign($x, ['channel_address' => z_root(), 'channel_prvkey' => get_config('system', 'prvkey')]);
-            $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
-            logger('data: ' . jindent($ret), LOGGER_DATA);
-            $headers['Date'] = datetime_convert('UTC', 'UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T');
-            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
-            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
-
-            $h = HTTPSig::create_sig($headers, get_config('system', 'prvkey'), z_root());
-            HTTPSig::set_headers($h);
-
-            echo $ret;
-            killme();
-        }
-
-        if (Libzot::is_zot_request()) {
-            $channel = Channel::get_system();
-            $sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
-
-            if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
-                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']]));
-                $s = q(
-                    "select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network in ('zot6','nomad') limit 1",
-                    dbesc($sigdata['signer'])
-                );
-
-                if ($s && $s[0]['hubloc_sitekey'] && $s[0]['site_crypto']) {
-                    $data = json_encode(Crypto::encapsulate($data, $s[0]['hubloc_sitekey'], Libzot::best_algorithm($s[0]['site_crypto'])));
-                }
-            } else {
-                $data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash']]));
-            }
-
-            $headers = [
-                'Content-Type' => 'application/x-nomad+json',
-                'Digest' => HTTPSig::generate_digest_header($data),
-                '(request-target)' => strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']
-            ];
-            $h = HTTPSig::create_sig($headers, get_config('system', 'prvkey'), z_root());
-            HTTPSig::set_headers($h);
-            echo $data;
-            killme();
-        }
-
-
-        $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false);
-
-        $channel = App::get_channel();
-        if (local_channel() && $channel && $channel['xchan_url'] && !$splash) {
-            $dest = $channel['channel_startpage'];
-            if (!$dest) {
-                $dest = get_pconfig(local_channel(), 'system', 'startpage');
-            }
-            if (!$dest) {
-                $dest = get_config('system', 'startpage');
-            }
-            if (!$dest) {
-                $dest = z_root() . '/stream';
-            }
-            goaway($dest);
-        }
-
-        if (remote_channel() && (!$splash) && $_SESSION['atoken']) {
-            $r = q(
-                "select * from atoken where atoken_id = %d",
-                intval($_SESSION['atoken'])
-            );
-            if ($r) {
-                $x = Channel::from_id($r[0]['atoken_uid']);
-                if ($x) {
-                    goaway(z_root() . '/channel/' . $x['channel_address']);
-                }
-            }
-        }
-
-
-        if (get_account_id() && !$splash) {
-            goaway(z_root() . '/new_channel');
-        }
-    }
-
-
-    public function get()
-    {
-
-        $o = EMPTY_STR;
-
-        if (x($_SESSION, 'theme')) {
-            unset($_SESSION['theme']);
-        }
-        if (x($_SESSION, 'mobile_theme')) {
-            unset($_SESSION['mobile_theme']);
-        }
-
-        $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false);
-
-        Hook::call('home_content', $o);
-        if ($o) {
-            return $o;
-        }
-
-        $frontpage = get_config('system', 'frontpage');
-        if ($frontpage) {
-            if (strpos($frontpage, 'include:') !== false) {
-                $file = trim(str_replace('include:', '', $frontpage));
-                if (file_exists($file)) {
-                    App::$page['template'] = 'full';
-                    App::$page['title'] = t('$Projectname');
-                    $o .= file_get_contents($file);
-                    return $o;
-                }
-            }
-            if (strpos($frontpage, 'http') !== 0) {
-                $frontpage = z_root() . '/' . $frontpage;
-            }
-            if (intval(get_config('system', 'mirror_frontpage'))) {
-                $o = '' . t('$Projectname') . '';
-                echo $o;
-                killme();
-            }
-            goaway($frontpage);
-        }
-
-
-        $sitename = get_config('system', 'sitename');
-        if ($sitename) {
-            $o .= '
          ' . sprintf(t('Welcome to %s'), $sitename) . '
          ';
-        }
-
-        $loginbox = get_config('system', 'login_on_homepage');
-        if (intval($loginbox) || $loginbox === false) {
-            $o .= login(true);
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Hostxrd.php b/Zotlabs/Module/Hostxrd.php
deleted file mode 100644
index 1c28055b4..000000000
--- a/Zotlabs/Module/Hostxrd.php
+++ /dev/null
@@ -1,32 +0,0 @@
- App::get_hostname(),
-            '$zroot' => z_root()
-        ));
-        $arr = array('xrd' => $x);
-        Hook::call('hostxrd', $arr);
-
-        echo $arr['xrd'];
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
deleted file mode 100644
index 819dcc0b3..000000000
--- a/Zotlabs/Module/Hq.php
+++ /dev/null
@@ -1,321 +0,0 @@
-loading) {
-            $_SESSION['loadtime_hq'] = datetime_convert();
-        }
-
-        if (argc() > 1 && argv(1) !== 'load') {
-            $item_hash = argv(1);
-        }
-
-        if ($_REQUEST['mid']) {
-            $item_hash = $_REQUEST['mid'];
-        }
-
-        $item_normal = item_normal();
-        $item_normal_update = item_normal_update();
-
-        if (!$item_hash) {
-            $r = q(
-                "SELECT mid FROM item 
-				WHERE uid = %d $item_normal
-				AND mid = parent_mid 
-				ORDER BY created DESC LIMIT 1",
-                intval(local_channel())
-            );
-
-            if ($r[0]['mid']) {
-                $item_hash = gen_link_id($r[0]['mid']);
-            }
-        }
-
-        if ($item_hash) {
-            $item_hash = unpack_link_id($item_hash);
-
-            $target_item = null;
-
-            $r = q(
-                "select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1",
-                dbesc($item_hash . '%')
-            );
-
-            if ($r) {
-                $target_item = $r[0];
-            }
-
-            //if the item is to be moderated redirect to /moderate
-            if ($target_item['item_blocked'] == ITEM_MODERATED) {
-                goaway(z_root() . '/moderate/' . $target_item['id']);
-            }
-
-            $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
-
-            $simple_update = (($this->updating) ? " AND item_unseen = 1 " : '');
-
-            if ($this->updating && $_SESSION['loadtime_hq']) {
-                $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_hq']) . "' ";
-            }
-
-            if ($static && $simple_update) {
-                $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
-            }
-
-            $sys = Channel::get_system();
-            $sql_extra = item_permissions_sql($sys['channel_id']);
-
-            $sys_item = false;
-        }
-
-        if (!$this->updating) {
-            $channel = App::get_channel();
-
-            $channel_acl = [
-                'allow_cid' => $channel['channel_allow_cid'],
-                'allow_gid' => $channel['channel_allow_gid'],
-                'deny_cid' => $channel['channel_deny_cid'],
-                'deny_gid' => $channel['channel_deny_gid']
-            ];
-
-            $x = [
-                'is_owner' => true,
-                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
-                'default_location' => $channel['channel_location'],
-                'nickname' => $channel['channel_address'],
-                'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
-                'permissions' => $channel_acl,
-                'bang' => '',
-                'visitor' => true,
-                'profile_uid' => local_channel(),
-                'return_path' => 'hq',
-                'expanded' => true,
-                'editor_autocomplete' => true,
-                'bbco_autocomplete' => 'bbcode',
-                'bbcode' => true,
-                'jotnets' => true,
-                'reset' => t('Reset form')
-            ];
-
-            $o = replace_macros(
-                Theme::get_template("hq.tpl"),
-                [
-                    '$no_messages' => (($target_item) ? false : true),
-                    '$no_messages_label' => [t('Welcome to $Projectname!'), t('You have got no unseen posts...')],
-                    '$editor' => status_editor($x)
-                ]
-            );
-        }
-
-        if (!$this->updating && !$this->loading) {
-            Navbar::set_selected('HQ');
-
-            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 1);
-
-            if ($target_item) {
-                // if the target item is not a post (eg a like) we want to address its thread parent
-                $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
-
-                // if we got a decoded hash we must encode it again before handing to javascript
-                $mid = gen_link_id($mid);
-            } else {
-                $mid = '';
-            }
-
-            $o .= '
          ' . "\r\n";
-            $o .= "\r\n";
-
-            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), [
-                '$baseurl' => z_root(),
-                '$pgtype' => 'hq',
-                '$uid' => local_channel(),
-                '$gid' => '0',
-                '$cid' => '0',
-                '$cmin' => '0',
-                '$cmax' => '99',
-                '$star' => '0',
-                '$liked' => '0',
-                '$conv' => '0',
-                '$spam' => '0',
-                '$fh' => '0',
-                '$dm' => '0',
-                '$nouveau' => '0',
-                '$wall' => '0',
-                '$draft' => '0',
-                '$static' => $static,
-                '$page' => 1,
-                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
-                '$search' => '',
-                '$xchan' => '',
-                '$order' => '',
-                '$file' => '',
-                '$cats' => '',
-                '$tags' => '',
-                '$dend' => '',
-                '$dbegin' => '',
-                '$verb' => '',
-                '$net' => '',
-                '$mid' => (($mid) ? urlencode($mid) : '')
-            ]);
-        }
-
-        $updateable = false;
-
-        if ($this->loading && $target_item) {
-            $r = null;
-
-            $r = q(
-                "SELECT item.id AS item_id FROM item
-				WHERE uid = %d
-				AND mid = '%s'
-				$item_normal
-				LIMIT 1",
-                intval(local_channel()),
-                dbesc($target_item['parent_mid'])
-            );
-
-            if ($r) {
-                $updateable = true;
-            }
-
-            if (!$r) {
-                $sys_item = true;
-
-                $r = q(
-                    "SELECT item.id AS item_id FROM item
-					LEFT JOIN abook ON item.author_xchan = abook.abook_xchan
-					WHERE mid = '%s' AND item.uid = %d $item_normal
-					AND (abook.abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra LIMIT 1",
-                    dbesc($target_item['parent_mid']),
-                    intval($sys['channel_id'])
-                );
-            }
-        } elseif ($this->updating && $target_item) {
-            $r = null;
-
-            $r = q(
-                "SELECT item.parent AS item_id FROM item
-				WHERE uid = %d
-				AND parent_mid = '%s'
-				$item_normal_update
-				$simple_update
-				LIMIT 1",
-                intval(local_channel()),
-                dbesc($target_item['parent_mid'])
-            );
-
-            if ($r) {
-                $updateable = true;
-            }
-
-            if (!$r) {
-                $sys_item = true;
-
-                $r = q(
-                    "SELECT item.parent AS item_id FROM item
-					LEFT JOIN abook ON item.author_xchan = abook.abook_xchan
-					WHERE mid = '%s' AND item.uid = %d $item_normal_update $simple_update
-					AND (abook.abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra LIMIT 1",
-                    dbesc($target_item['parent_mid']),
-                    intval($sys['channel_id'])
-                );
-            }
-
-            $_SESSION['loadtime_hq'] = datetime_convert();
-        } else {
-            $r = [];
-        }
-
-        if ($r) {
-            $items = q(
-                "SELECT item.*, item.id AS item_id 
-				FROM item
-				WHERE parent = '%s' $item_normal ",
-                dbesc($r[0]['item_id'])
-            );
-
-            xchan_query($items, true, (($sys_item) ? local_channel() : 0));
-            $items = fetch_post_tags($items, true);
-            $items = conv_sort($items, 'created');
-        } else {
-            $items = [];
-        }
-
-        $o .= conversation($items, 'hq', $this->updating, 'client');
-
-        if ($updateable) {
-            $x = q(
-                "UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d AND parent = %d ",
-                intval(local_channel()),
-                intval($r[0]['item_id'])
-            );
-        }
-
-        $o .= '
          ';
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Id.php b/Zotlabs/Module/Id.php
deleted file mode 100644
index 3dae28404..000000000
--- a/Zotlabs/Module/Id.php
+++ /dev/null
@@ -1,119 +0,0 @@
- 2) {
-                $item_id = argv(2);
-            }
-
-            $portable_id = EMPTY_STR;
-
-            $sigdata = HTTPSig::verify(EMPTY_STR);
-            if ($sigdata['portable_id'] && $sigdata['header_valid']) {
-                $portable_id = $sigdata['portable_id'];
-            }
-
-            $chan = Channel::from_hash($request_portable_id);
-
-            if ($chan) {
-                $channel_id = $chan['channel_id'];
-                if (!$item_id) {
-                    $handler = new Channel();
-                    App::$argc = 2;
-                    App::$argv[0] = 'channel';
-                    App::$argv[1] = $chan['channel_address'];
-                    $handler->init();
-                }
-            } else {
-                http_status_exit(404, 'Not found');
-            }
-
-
-            $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
-
-            $sql_extra = item_permissions_sql(0);
-
-            $r = q(
-                "select * from item where uuid = '%s' $item_normal $sql_extra and uid = %d limit 1",
-                dbesc($item_id),
-                intval($channel_id)
-            );
-            if (!$r) {
-                $r = q(
-                    "select * from item where uuid = '%s' $item_normal and uid = %d limit 1",
-                    dbesc($item_id),
-                    intval($channel_id)
-                );
-                if ($r) {
-                    http_status_exit(403, 'Forbidden');
-                }
-                http_status_exit(404, 'Not found');
-            }
-
-            if (!perm_is_allowed($chan['channel_id'], get_observer_hash(), 'view_stream')) {
-                http_status_exit(403, 'Forbidden');
-            }
-
-            xchan_query($r, true);
-            $items = fetch_post_tags($r, true);
-
-            $i = Activity::encode_item($items[0], (get_config('system', 'activitypub', ACTIVITYPUB_ENABLED) ? true : false));
-
-            if (!$i) {
-                http_status_exit(404, 'Not found');
-            }
-
-            $x = array_merge(['@context' => [
-                ACTIVITYSTREAMS_JSONLD_REV,
-                'https://w3id.org/security/v1',
-                Activity::ap_schema()
-            ]], $i);
-
-            $headers = [];
-            $headers['Content-Type'] = 'application/x-nomad+json';
-            $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
-            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
-            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
-            $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::url($chan));
-            HTTPSig::set_headers($h);
-            echo $ret;
-            killme();
-        }
-    }
-}
diff --git a/Zotlabs/Module/Impel.php b/Zotlabs/Module/Impel.php
deleted file mode 100644
index ac676d9fd..000000000
--- a/Zotlabs/Module/Impel.php
+++ /dev/null
@@ -1,213 +0,0 @@
- false);
-
-        if (!local_channel()) {
-            json_return_and_die($ret);
-        }
-
-        logger('impel: ' . print_r($_REQUEST, true), LOGGER_DATA);
-
-        $elm = $_REQUEST['element'];
-        $x = base64url_decode($elm);
-        if (!$x) {
-            json_return_and_die($ret);
-        }
-
-        $j = json_decode($x, true);
-        if (!$j) {
-            json_return_and_die($ret);
-        }
-
-        // logger('element: ' . print_r($j,true));
-
-        $channel = App::get_channel();
-
-        $arr = [];
-        $is_menu = false;
-
-        // a portable menu has its links rewritten with the local baseurl
-        $portable_menu = false;
-
-        switch ($j['type']) {
-            case 'webpage':
-                $arr['item_type'] = ITEM_TYPE_WEBPAGE;
-                $namespace = 'WEBPAGE';
-                $installed_type = t('webpage');
-                break;
-            case 'block':
-                $arr['item_type'] = ITEM_TYPE_BLOCK;
-                $namespace = 'BUILDBLOCK';
-                $installed_type = t('block');
-                break;
-            case 'layout':
-                $arr['item_type'] = ITEM_TYPE_PDL;
-                $namespace = 'PDL';
-                $installed_type = t('layout');
-                break;
-            case 'portable-menu':
-                $portable_menu = true;
-            // fall through
-            case 'menu':
-                $is_menu = true;
-                $installed_type = t('menu');
-                break;
-            default:
-                logger('mod_impel: unrecognised element type' . print_r($j, true));
-                break;
-        }
-
-        if ($is_menu) {
-            $m = [];
-            $m['menu_channel_id'] = local_channel();
-            $m['menu_name'] = $j['pagetitle'];
-            $m['menu_desc'] = $j['desc'];
-            if ($j['created']) {
-                $m['menu_created'] = datetime_convert($j['created']);
-            }
-            if ($j['edited']) {
-                $m['menu_edited'] = datetime_convert($j['edited']);
-            }
-
-            $m['menu_flags'] = 0;
-            if ($j['flags']) {
-                if (in_array('bookmark', $j['flags'])) {
-                    $m['menu_flags'] |= MENU_BOOKMARK;
-                }
-                if (in_array('system', $j['flags'])) {
-                    $m['menu_flags'] |= MENU_SYSTEM;
-                }
-            }
-
-            $menu_id = Menu::create($m);
-
-            if ($menu_id) {
-                if (is_array($j['items'])) {
-                    foreach ($j['items'] as $it) {
-                        $mitem = [];
-
-                        $mitem['mitem_link'] = str_replace('[channelurl]', z_root() . '/channel/' . $channel['channel_address'], $it['link']);
-                        $mitem['mitem_link'] = str_replace('[pageurl]', z_root() . '/page/' . $channel['channel_address'], $it['link']);
-                        $mitem['mitem_link'] = str_replace('[cloudurl]', z_root() . '/cloud/' . $channel['channel_address'], $it['link']);
-                        $mitem['mitem_link'] = str_replace('[baseurl]', z_root(), $it['link']);
-
-                        $mitem['mitem_desc'] = escape_tags($it['desc']);
-                        $mitem['mitem_order'] = intval($it['order']);
-                        if (is_array($it['flags'])) {
-                            $mitem['mitem_flags'] = 0;
-                            if (in_array('zid', $it['flags'])) {
-                                $mitem['mitem_flags'] |= MENU_ITEM_ZID;
-                            }
-                            if (in_array('new-window', $it['flags'])) {
-                                $mitem['mitem_flags'] |= MENU_ITEM_NEWWIN;
-                            }
-                            if (in_array('chatroom', $it['flags'])) {
-                                $mitem['mitem_flags'] |= MENU_ITEM_CHATROOM;
-                            }
-                        }
-                        MenuItem::add($menu_id, local_channel(), $mitem);
-                    }
-                    if ($j['edited']) {
-                        $x = q(
-                            "update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
-                            dbesc(datetime_convert('UTC', 'UTC', $j['edited'])),
-                            intval($menu_id),
-                            intval(local_channel())
-                        );
-                    }
-                }
-                $ret['success'] = true;
-            }
-            $x = $ret;
-        } else {
-            $arr['uid'] = local_channel();
-            $arr['aid'] = $channel['channel_account_id'];
-            $arr['title'] = $j['title'];
-            $arr['body'] = $j['body'];
-            $arr['term'] = $j['term'];
-            $arr['layout_mid'] = $j['layout_mid'];
-            $arr['created'] = datetime_convert('UTC', 'UTC', $j['created']);
-            $arr['edited'] = datetime_convert('UTC', 'UTC', $j['edited']);
-            $arr['owner_xchan'] = get_observer_hash();
-            $arr['author_xchan'] = (($j['author_xchan']) ? $j['author_xchan'] : get_observer_hash());
-            $arr['mimetype'] = (($j['mimetype']) ? $j['mimetype'] : 'text/x-multicode');
-
-            if (!$j['mid']) {
-                $j['uuid'] = new_uuid();
-                $j['mid'] = z_root() . '/item/' . $j['uuid'];
-            }
-
-            $arr['uuid'] = $j['uuid'];
-            $arr['mid'] = $arr['parent_mid'] = $j['mid'];
-
-
-            if ($j['pagetitle']) {
-                $pagetitle = strtolower(URLify::transliterate($j['pagetitle']));
-            }
-
-            // Verify ability to use html or php!!!
-
-            $execflag = ((intval($channel['channel_id']) == intval(local_channel()) && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
-
-            $i = q(
-                "select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
-                dbesc($arr['mid']),
-                intval(local_channel())
-            );
-
-            IConfig::Set($arr, 'system', $namespace, (($pagetitle) ? $pagetitle : substr($arr['mid'], 0, 16)), true);
-
-            if ($i) {
-                $arr['id'] = $i[0]['id'];
-                // don't update if it has the same timestamp as the original
-                if ($arr['edited'] > $i[0]['edited']) {
-                    $x = item_store_update($arr, $execflag);
-                }
-            } else {
-                if (($i) && (intval($i[0]['item_deleted']))) {
-                    // was partially deleted already, finish it off
-                    q(
-                        "delete from item where mid = '%s' and uid = %d",
-                        dbesc($arr['mid']),
-                        intval(local_channel())
-                    );
-                } else {
-                    $x = item_store($arr, $execflag);
-                }
-            }
-
-            if ($x && $x['success']) {
-                $item_id = $x['item_id'];
-            }
-        }
-
-        if ($x['success']) {
-            $ret['success'] = true;
-            info(sprintf(t('%s element installed'), $installed_type));
-        } else {
-            notice(sprintf(t('%s element installation failed'), $installed_type));
-        }
-
-        //??? should perhaps return ret?
-
-        json_return_and_die(true);
-    }
-}
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
deleted file mode 100644
index 5bafa14cd..000000000
--- a/Zotlabs/Module/Import.php
+++ /dev/null
@@ -1,711 +0,0 @@
- $email . ':' . $password];
-            $ret = z_fetch_url($api_path, $binary, $redirects, $opts);
-            if ($ret['success']) {
-                $data = $ret['body'];
-            } else {
-                notice(t('Unable to download data from old server') . EOL);
-                return;
-            }
-        }
-
-        if (!$data) {
-            logger('Empty import file.');
-            notice(t('Imported file is empty.') . EOL);
-            return;
-        }
-
-        $data = json_decode($data, true);
-
-        //logger('import: data: ' . print_r($data,true));
-        //print_r($data);
-
-
-        // handle Friendica export
-
-        if (array_path_exists('user/parent-uid', $data)) {
-            $settings = ['account_id' => $account_id, 'sieze' => 1, 'newname' => $newname];
-            $f = new Friendica($data, $settings);
-
-            return;
-        }
-
-        if (!array_key_exists('compatibility', $data)) {
-            Hook::call('import_foreign_channel_data', $data);
-            if ($data['handled']) {
-                return;
-            }
-        }
-
-        $codebase = 'zap';
-
-        if ((!array_path_exists('compatibility/codebase', $data)) || $data['compatibility']['codebase'] !== $codebase) {
-            notice('Data export format is not compatible with this software');
-            return;
-        }
-
-        if ($moving) {
-            $seize = 1;
-        }
-
-        // import channel
-
-        $relocate = ((array_key_exists('relocate', $data)) ? $data['relocate'] : null);
-
-        if (array_key_exists('channel', $data)) {
-            $max_identities = ServiceClass::account_fetch($account_id, 'total_identities');
-
-            if ($max_identities !== false) {
-                $r = q(
-                    "select channel_id from channel where channel_account_id = %d and channel_removed = 0 ",
-                    intval($account_id)
-                );
-                if ($r && count($r) > $max_identities) {
-                    notice(sprintf(t('Your service plan only allows %d channels.'), $max_identities) . EOL);
-                    return;
-                }
-            }
-
-            if ($newname) {
-                $x = false;
-
-                if (get_config('system', 'unicode_usernames')) {
-                    $x = punify(mb_strtolower($newname));
-                }
-
-                if ((!$x) || strlen($x) > 64) {
-                    $x = strtolower(URLify::transliterate($newname));
-                } else {
-                    $x = $newname;
-                }
-                $newname = $x;
-            }
-
-            $channel = import_channel($data['channel'], $account_id, $seize, $newname);
-        } else {
-            $moving = false;
-            $channel = App::get_channel();
-        }
-
-        if (!$channel) {
-            logger('Channel not found. ' . print_r($channel, true));
-            notice(t('No channel. Import failed.') . EOL);
-            return;
-        }
-
-        if (is_array($data['config'])) {
-            import_config($channel, $data['config']);
-        }
-
-        logger('import step 2');
-
-        if (array_key_exists('channel', $data)) {
-            if ($data['photo']) {
-                import_channel_photo(base64url_decode($data['photo']['data']), $data['photo']['type'], $account_id, $channel['channel_id']);
-            }
-
-            if (is_array($data['profile'])) {
-                import_profiles($channel, $data['profile']);
-            }
-        }
-
-        logger('import step 3');
-
-        // import xchans and contact photos
-        // This *must* be done before importing hublocs
-
-        if (array_key_exists('channel', $data) && $seize) {
-            // replace any existing xchan we may have on this site if we're seizing control
-
-            $r = q(
-                "delete from xchan where xchan_hash = '%s'",
-                dbesc($channel['channel_hash'])
-            );
-
-            $r = xchan_store_lowlevel(
-                [
-                    'xchan_hash' => $channel['channel_hash'],
-                    'xchan_guid' => $channel['channel_guid'],
-                    'xchan_guid_sig' => $channel['channel_guid_sig'],
-                    'xchan_pubkey' => $channel['channel_pubkey'],
-                    'xchan_photo_l' => z_root() . "/photo/profile/l/" . $channel['channel_id'],
-                    'xchan_photo_m' => z_root() . "/photo/profile/m/" . $channel['channel_id'],
-                    'xchan_photo_s' => z_root() . "/photo/profile/s/" . $channel['channel_id'],
-                    'xchan_addr' => Channel::get_webfinger($channel),
-                    'xchan_url' => z_root() . '/channel/' . $channel['channel_address'],
-                    'xchan_connurl' => z_root() . '/poco/' . $channel['channel_address'],
-                    'xchan_follow' => z_root() . '/follow?f=&url=%s',
-                    'xchan_name' => $channel['channel_name'],
-                    'xchan_network' => 'nomad',
-                    'xchan_updated' => datetime_convert(),
-                    'xchan_photo_date' => datetime_convert(),
-                    'xchan_name_date' => datetime_convert()
-                ]
-            );
-        }
-
-        logger('import step 4');
-
-        // import xchans
-        $xchans = $data['xchan'];
-        if ($xchans) {
-            foreach ($xchans as $xchan) {
-                // Provide backward compatibility for zot11 based projects
-
-                if ($xchan['xchan_network'] === 'nomad' && version_compare(ZOT_REVISION, '10.0') <= 0) {
-                    $xchan['xchan_network'] = 'zot6';
-                }
-
-                $hash = Libzot::make_xchan_hash($xchan['xchan_guid'], $xchan['xchan_pubkey']);
-
-                if (in_array($xchan['xchan_network'], ['nomad', 'zot6']) && $hash !== $xchan['xchan_hash']) {
-                    logger('forged xchan: ' . print_r($xchan, true));
-                    continue;
-                }
-
-                $r = q(
-                    "select xchan_hash from xchan where xchan_hash = '%s' limit 1",
-                    dbesc($xchan['xchan_hash'])
-                );
-                if ($r) {
-                    continue;
-                }
-                xchan_store_lowlevel($xchan);
-
-
-                if ($xchan['xchan_hash'] === $channel['channel_hash']) {
-                    $r = q(
-                        "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s'",
-                        dbesc(datetime_convert()),
-                        dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']),
-                        dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']),
-                        dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']),
-                        dbesc($xchan['xchan_hash'])
-                    );
-                } else {
-                    $photos = import_remote_xchan_photo($xchan['xchan_photo_l'], $xchan['xchan_hash']);
-                    if ($photos) {
-                        if ($photos[4]) {
-                            $photodate = NULL_DATE;
-                        } else {
-                            $photodate = $xchan['xchan_photo_date'];
-                        }
-
-                        $r = q(
-                            "update xchan set xchan_updated = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' where xchan_hash = '%s'",
-                            dbesc(datetime_convert()),
-                            dbesc($photos[0]),
-                            dbesc($photos[1]),
-                            dbesc($photos[2]),
-                            dbesc($photos[3]),
-                            dbesc($photodate),
-                            dbesc($xchan['xchan_hash'])
-                        );
-                    }
-                }
-            }
-
-            logger('import step 5');
-        }
-
-
-        logger('import step 6');
-
-
-        if (is_array($data['hubloc'])) {
-            import_hublocs($channel, $data['hubloc'], $seize, $moving);
-        }
-
-        logger('import step 7');
-
-        // create new hubloc for the new channel at this site
-
-        if (array_key_exists('channel', $data)) {
-            $r = hubloc_store_lowlevel(
-                [
-                    'hubloc_guid' => $channel['channel_guid'],
-                    'hubloc_guid_sig' => $channel['channel_guid_sig'],
-                    'hubloc_id_url' => Channel::url($channel),
-                    'hubloc_hash' => $channel['channel_hash'],
-                    'hubloc_addr' => Channel::get_webfinger($channel),
-                    'hubloc_network' => 'nomad',
-                    'hubloc_primary' => (($seize) ? 1 : 0),
-                    'hubloc_url' => z_root(),
-                    'hubloc_url_sig' => Libzot::sign(z_root(), $channel['channel_prvkey']),
-                    'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), get_config('system', 'pubkey')),
-                    'hubloc_host' => App::get_hostname(),
-                    'hubloc_callback' => z_root() . '/zot',
-                    'hubloc_sitekey' => get_config('system', 'pubkey'),
-                    'hubloc_updated' => datetime_convert()
-                ]
-            );
-
-            // reset the original primary hubloc if it is being seized
-
-            if ($seize) {
-                $r = q(
-                    "update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ",
-                    dbesc($channel['channel_hash']),
-                    dbesc(z_root())
-                );
-            }
-        }
-
-
-        $friends = 0;
-        $feeds = 0;
-
-        // import contacts
-        $abooks = $data['abook'];
-        if ($abooks) {
-            foreach ($abooks as $abook) {
-                $abook_copy = $abook;
-
-                $abconfig = null;
-                if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) {
-                    $abconfig = $abook['abconfig'];
-                }
-
-                unset($abook['abook_id']);
-                unset($abook['abook_rating']);
-                unset($abook['abook_rating_text']);
-                unset($abook['abconfig']);
-                unset($abook['abook_their_perms']);
-                unset($abook['abook_my_perms']);
-                unset($abook['abook_not_here']);
-
-                $abook['abook_account'] = $account_id;
-                $abook['abook_channel'] = $channel['channel_id'];
-
-                $reconnect = false;
-
-                if (array_key_exists('abook_instance', $abook) && $abook['abook_instance'] && strpos($abook['abook_instance'], z_root()) === false) {
-                    $abook['abook_not_here'] = 1;
-                    if (!($abook['abook_pending'] || $abook['abook_blocked'])) {
-                        $reconnect = true;
-                    }
-                }
-
-                if ($abook['abook_self']) {
-                    $ctype = 0;
-                    $role = get_pconfig($channel['channel_id'], 'system', 'permissions_role');
-                    if (strpos($role, 'collection' !== false)) {
-                        $ctype = 2;
-                    } elseif (strpos($role, 'group') !== false) {
-                        $ctype = 1;
-                    }
-                    if ($ctype) {
-                        q(
-                            "update xchan set xchan_type = %d where xchan_hash = '%s' ",
-                            intval($ctype),
-                            dbesc($abook['abook_xchan'])
-                        );
-                    }
-                } else {
-                    if ($max_friends !== false && $friends > $max_friends) {
-                        continue;
-                    }
-                    if ($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) {
-                        continue;
-                    }
-                }
-
-                $r = q(
-                    "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-                    dbesc($abook['abook_xchan']),
-                    intval($channel['channel_id'])
-                );
-                if ($r) {
-                    $columns = db_columns('abook');
-
-                    foreach ($abook as $k => $v) {
-                        if (!in_array($k, $columns)) {
-                            continue;
-                        }
-                        $r = q(
-                            "UPDATE abook SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE abook_xchan = '%s' AND abook_channel = %d",
-                            dbesc($k),
-                            dbesc($v),
-                            dbesc($abook['abook_xchan']),
-                            intval($channel['channel_id'])
-                        );
-                    }
-                } else {
-                    abook_store_lowlevel($abook);
-
-                    $friends++;
-                    if (intval($abook['abook_feed'])) {
-                        $feeds++;
-                    }
-                }
-
-                if ($abconfig) {
-                    foreach ($abconfig as $abc) {
-                        set_abconfig($channel['channel_id'], $abc['xchan'], $abc['cat'], $abc['k'], $abc['v']);
-                    }
-                }
-                if ($reconnect) {
-                    Connect::connect($channel, $abook['abook_xchan']);
-                }
-            }
-
-            logger('import step 8');
-        }
-
-        // import groups
-        $groups = $data['group'];
-        if ($groups) {
-            $saved = [];
-            foreach ($groups as $group) {
-                $saved[$group['hash']] = ['old' => $group['id']];
-                if (array_key_exists('name', $group)) {
-                    $group['gname'] = $group['name'];
-                    unset($group['name']);
-                }
-                unset($group['id']);
-                $group['uid'] = $channel['channel_id'];
-
-                create_table_from_array('pgrp', $group);
-            }
-            $r = q(
-                "select * from pgrp where uid = %d",
-                intval($channel['channel_id'])
-            );
-            if ($r) {
-                foreach ($r as $rr) {
-                    $saved[$rr['hash']]['new'] = $rr['id'];
-                }
-            }
-        }
-
-        // import group members
-        $group_members = $data['group_member'];
-        if ($group_members) {
-            foreach ($group_members as $group_member) {
-                unset($group_member['id']);
-                $group_member['uid'] = $channel['channel_id'];
-                foreach ($saved as $x) {
-                    if ($x['old'] == $group_member['gid']) {
-                        $group_member['gid'] = $x['new'];
-                    }
-                }
-                create_table_from_array('pgrp_member', $group_member);
-            }
-        }
-
-        logger('import step 9');
-
-
-        if (is_array($data['atoken'])) {
-            import_atoken($channel, $data['atoken']);
-        }
-        if (is_array($data['xign'])) {
-            import_xign($channel, $data['xign']);
-        }
-        if (is_array($data['block'])) {
-            import_block($channel, $data['block']);
-        }
-        if (is_array($data['obj'])) {
-            import_objs($channel, $data['obj']);
-        }
-        if (is_array($data['likes'])) {
-            import_likes($channel, $data['likes']);
-        }
-        if (is_array($data['app'])) {
-            import_apps($channel, $data['app']);
-        }
-        if (is_array($data['sysapp'])) {
-            import_sysapps($channel, $data['sysapp']);
-        }
-        if (is_array($data['chatroom'])) {
-            import_chatrooms($channel, $data['chatroom']);
-        }
-//      if (is_array($data['conv'])) {
-//          import_conv($channel,$data['conv']);
-//      }
-//      if (is_array($data['mail'])) {
-//          import_mail($channel,$data['mail']);
-//      }
-        if (is_array($data['event'])) {
-            import_events($channel, $data['event']);
-        }
-        if (is_array($data['event_item'])) {
-            import_items($channel, $data['event_item'], false, $relocate);
-        }
-//      if (is_array($data['menu'])) {
-//          import_menus($channel,$data['menu']);
-//      }
-//      if (is_array($data['wiki'])) {
-//          import_items($channel,$data['wiki'],false,$relocate);
-//      }
-//      if (is_array($data['webpages'])) {
-//          import_items($channel,$data['webpages'],false,$relocate);
-//      }
-        $addon = array('channel' => $channel, 'data' => $data);
-        Hook::call('import_channel', $addon);
-
-        $saved_notification_flags = Channel::notifications_off($channel['channel_id']);
-        if ($import_posts && array_key_exists('item', $data) && $data['item']) {
-            import_items($channel, $data['item'], false, $relocate);
-        }
-
-        if ($api_path && $import_posts) {  // we are importing from a server and not a file
-            $m = parse_url($api_path);
-
-            $hz_server = $m['scheme'] . '://' . $m['host'];
-
-            $since = datetime_convert(date_default_timezone_get(), date_default_timezone_get(), '0001-01-01 00:00');
-            $until = datetime_convert(date_default_timezone_get(), date_default_timezone_get(), 'now + 1 day');
-
-            $poll_interval = get_config('system', 'poll_interval', 3);
-            $page = 0;
-
-            while (1) {
-                $headers = [
-                    'X-API-Token' => random_string(),
-                    'X-API-Request' => $hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page,
-                    'Host' => $m['host'],
-                    '(request-target)' => 'get /api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page,
-                ];
-
-                $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
-
-                $x = z_fetch_url($hz_server . '/api/z/1.0/item/export_page?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until) . '&page=' . $page, false, $redirects, ['headers' => $headers]);
-
-                // logger('z_fetch: ' . print_r($x,true));
-
-                if (!$x['success']) {
-                    logger('no API response');
-                    break;
-                }
-
-                $j = json_decode($x['body'], true);
-
-                if (!$j) {
-                    break;
-                }
-
-                if (!($j['item'] || count($j['item']))) {
-                    break;
-                }
-
-                Run::Summon(['Content_importer', sprintf('%d', $page), $since, $until, $channel['channel_address'], urlencode($hz_server)]);
-                sleep($poll_interval);
-
-                $page++;
-                continue;
-            }
-
-            $headers = [
-                'X-API-Token' => random_string(),
-                'X-API-Request' => $hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until),
-                'Host' => $m['host'],
-                '(request-target)' => 'get /api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until),
-            ];
-
-            $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
-
-            $x = z_fetch_url($hz_server . '/api/z/1.0/files?f=&zap_compat=1&since=' . urlencode($since) . '&until=' . urlencode($until), false, $redirects, ['headers' => $headers]);
-
-            if (!$x['success']) {
-                logger('no API response');
-                return;
-            }
-
-            $j = json_decode($x['body'], true);
-
-            if (!$j) {
-                return;
-            }
-
-            if (!$j['success']) {
-                return;
-            }
-
-            $poll_interval = get_config('system', 'poll_interval', 3);
-
-            if (count($j['results'])) {
-                $todo = count($j['results']);
-                logger('total to process: ' . $todo, LOGGER_DEBUG);
-
-                foreach ($j['results'] as $jj) {
-                    Run::Summon(['File_importer', $jj['hash'], $channel['channel_address'], urlencode($hz_server)]);
-                    sleep($poll_interval);
-                }
-            }
-
-            notice(t('Files and Posts imported.') . EOL);
-        }
-
-        Channel::notifications_on($channel['channel_id'], $saved_notification_flags);
-
-
-        // send out refresh requests
-        // notify old server that it may no longer be primary.
-
-        Run::Summon(['Notifier', 'refresh_all', $channel['channel_id']]);
-
-        // This will indirectly perform a refresh_all *and* update the directory
-
-        Run::Summon(['Directory', $channel['channel_id']]);
-
-        notice(t('Import completed.') . EOL);
-
-        change_channel($channel['channel_id']);
-
-        goaway(z_root() . '/stream');
-    }
-
-    /**
-     * @brief Handle POST action on channel import page.
-     */
-
-    public function post()
-    {
-        $account_id = get_account_id();
-        if (!$account_id) {
-            return;
-        }
-
-        check_form_security_token_redirectOnErr('/import', 'channel_import');
-        $this->import_account($account_id);
-    }
-
-    /**
-     * @brief Generate channel import page.
-     *
-     * @return string with parsed HTML.
-     */
-
-    public function get()
-    {
-
-        if (!get_account_id()) {
-            notice(t('You must be logged in to use this feature.') . EOL);
-            return EMPTY_STR;
-        }
-
-        return replace_macros(Theme::get_template('channel_import.tpl'), [
-            '$title' => t('Import Channel'),
-            '$desc' => t('Use this form to import an existing channel from a different server. You may retrieve the channel identity from the old server via the network or provide an export file.'),
-            '$label_filename' => t('File to Upload'),
-            '$choice' => t('Or provide the old server details'),
-            '$old_address' => ['old_address', t('Your old identity address (xyz@example.com)'), '', ''],
-            '$email' => ['email', t('Your old login email address'), '', ''],
-            '$password' => ['password', t('Your old login password'), '', ''],
-            '$import_posts' => ['import_posts', t('Import a few months of posts if possible (limited by available memory)'), false, '', [t('No'), t('Yes')]],
-
-            '$common' => t('For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media.'),
-
-            '$make_primary' => ['make_primary', t('Make this hub my primary location'), false, '', [t('No'), t('Yes')]],
-            '$moving' => ['moving', t('Move this channel (disable all previous locations)'), false, '', [t('No'), t('Yes')]],
-            '$newname' => ['newname', t('Use this channel nickname instead of the one provided'), '', t('Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site.')],
-
-            '$pleasewait' => t('This process may take several minutes to complete and considerably longer if importing a large amount of posts and files. Please submit the form only once and leave this page open until finished.'),
-
-            '$form_security_token' => get_form_security_token('channel_import'),
-            '$submit' => t('Submit')
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Import_items.php b/Zotlabs/Module/Import_items.php
deleted file mode 100644
index 5057239a0..000000000
--- a/Zotlabs/Module/Import_items.php
+++ /dev/null
@@ -1,149 +0,0 @@
- $email . ':' . $password);
-            $url = $scheme . $servername . $api_path;
-            $ret = z_fetch_url($url, $binary, $redirects, $opts);
-            if (!$ret['success']) {
-                $ret = z_fetch_url('http://' . $servername . $api_path, $binary, $redirects, $opts);
-            }
-            if ($ret['success']) {
-                $data = $ret['body'];
-            } else {
-                notice(t('Unable to download data from old server') . EOL);
-            }
-        }
-
-        if (!$data) {
-            logger('Empty file.');
-            notice(t('Imported file is empty.') . EOL);
-            return;
-        }
-
-        $data = json_decode($data, true);
-
-        //logger('import: data: ' . print_r($data,true));
-        //print_r($data);
-
-        if (!is_array($data)) {
-            return;
-        }
-
-//      if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
-//          $v1 = substr($data['compatibility']['database'],-4);
-//          $v2 = substr(DB_UPDATE_VERSION,-4);
-//          if($v2 > $v1) {
-//              $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
-//              notice($t . EOL);
-//          }
-//      }
-
-        $codebase = 'zap';
-
-        if ((!array_path_exists('compatibility/codebase', $data)) || $data['compatibility']['codebase'] !== $codebase) {
-            notice(t('Data export format is not compatible with this software'));
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        if (array_key_exists('item', $data) && $data['item']) {
-            import_items($channel, $data['item'], false, ((array_key_exists('relocate', $data)) ? $data['relocate'] : null));
-        }
-
-        info(t('Import completed') . EOL);
-    }
-
-
-    /**
-     * @brief Generate item import page.
-     *
-     * @return string with parsed HTML.
-     */
-    public function get()
-    {
-
-        if (!local_channel()) {
-            notice(t('Permission denied') . EOL);
-            return login();
-        }
-
-        $o = replace_macros(Theme::get_template('item_import.tpl'), array(
-            '$title' => t('Import Items'),
-            '$desc' => t('Use this form to import existing posts and content from an export file.'),
-            '$label_filename' => t('File to Upload'),
-            '$form_security_token' => get_form_security_token('import_items'),
-            '$submit' => t('Submit')
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Inbox.php b/Zotlabs/Module/Inbox.php
deleted file mode 100644
index e47e00970..000000000
--- a/Zotlabs/Module/Inbox.php
+++ /dev/null
@@ -1,431 +0,0 @@
-is_valid() && $AS->type === 'Announce' && is_array($AS->obj)
-            && array_key_exists('object', $AS->obj) && array_key_exists('actor', $AS->obj)
-        ) {
-            // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
-            // Reparse the encapsulated Activity and use that instead
-            logger('relayed activity', LOGGER_DEBUG);
-            $AS = new ActivityStreams($AS->obj);
-        }
-
-        // logger('debug: ' . $AS->debug());
-
-        if (!$AS->is_valid()) {
-            if ($AS->deleted) {
-                // process mastodon user deletion activities, but only if we can validate the signature
-                if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) {
-                    logger('removing deleted actor');
-                    remove_all_xchan_resources($hsig['portable_id']);
-                } else {
-                    logger('ignoring deleted actor', LOGGER_DEBUG, LOG_INFO);
-                }
-            }
-            return;
-        }
-
-
-        if (is_array($AS->actor) && array_key_exists('id', $AS->actor)) {
-            Activity::actor_store($AS->actor['id'], $AS->actor);
-        }
-
-        if (is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
-            Activity::actor_store($AS->obj['id'], $AS->obj);
-        }
-
-        if (is_array($AS->obj) && is_array($AS->obj['actor']) && array_key_exists('id', $AS->obj['actor']) && $AS->obj['actor']['id'] !== $AS->actor['id']) {
-            Activity::actor_store($AS->obj['actor']['id'], $AS->obj['actor']);
-            if (!check_channelallowed($AS->obj['actor']['id'])) {
-                http_status_exit(403, 'Permission denied');
-            }
-        }
-
-        // Validate that the channel that sent us this activity has authority to do so.
-        // Require a valid HTTPSignature with a signed Digest header.
-
-        // Only permit relayed activities if the activity is signed with LDSigs
-        // AND the signature is valid AND the signer is the actor.
-
-        if ($hsig['header_valid'] && $hsig['content_valid'] && $hsig['portable_id']) {
-            // if the sender has the ability to send messages over zot/nomad, ignore messages sent via activitypub
-            // as observer aware features and client side markup will be unavailable
-
-            $test = Activity::get_actor_hublocs($hsig['portable_id'], 'all,not_deleted');
-            if ($test) {
-                foreach ($test as $t) {
-                    if ($t['hubloc_network'] === 'zot6') {
-                        http_status_exit(409, 'Conflict');
-                    }
-                }
-            }
-
-            // fetch the portable_id for the actor, which may or may not be the sender
-
-            $v = Activity::get_actor_hublocs($AS->actor['id'], 'activitypub,not_deleted');
-
-            if ($v && $v[0]['hubloc_hash'] !== $hsig['portable_id']) {
-                // The sender is not actually the activity actor, so verify the LD signature.
-                // litepub activities (with no LD signature) will always have a matching actor and sender
-
-                if ($AS->signer && is_array($AS->signer) && $AS->signer['id'] !== $AS->actor['id']) {
-                    // the activity wasn't signed by the activity actor
-                    return;
-                }
-                if (!$AS->sigok) {
-                    // The activity signature isn't valid.
-                    return;
-                }
-            }
-
-            if ($v) {
-                // The sender has been validated and stored
-                $observer_hash = $hsig['portable_id'];
-            }
-        }
-
-        if (!$observer_hash) {
-            return;
-        }
-
-        // verify that this site has permitted communication with the sender.
-
-        $m = parse_url($observer_hash);
-
-        if ($m && $m['scheme'] && $m['host']) {
-            if (!check_siteallowed($m['scheme'] . '://' . $m['host'])) {
-                http_status_exit(403, 'Permission denied');
-            }
-            // this site obviously isn't dead because they are trying to communicate with us.
-            $test = q(
-                "update site set site_dead = 0 where site_dead = 1 and site_url = '%s' ",
-                dbesc($m['scheme'] . '://' . $m['host'])
-            );
-        }
-        if (!check_channelallowed($observer_hash)) {
-            http_status_exit(403, 'Permission denied');
-        }
-
-        // update the hubloc_connected timestamp, ignore failures
-
-        $test = q(
-            "update hubloc set hubloc_connected = '%s' where hubloc_hash = '%s' and hubloc_network = 'activitypub'",
-            dbesc(datetime_convert()),
-            dbesc($observer_hash)
-        );
-
-
-        // Now figure out who the recipients are
-
-        if ($is_public) {
-            if (in_array($AS->type, ['Follow', 'Join']) && is_array($AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
-                $channels = q(
-                    "SELECT * from channel where channel_address = '%s' and channel_removed = 0 ",
-                    dbesc(basename($AS->obj['id']))
-                );
-            } else {
-                $collections = Activity::get_actor_collections($observer_hash);
-
-                if (in_array($collection['followers'], $AS->recips)
-                    || in_array(ACTIVITY_PUBLIC_INBOX, $AS->recips)
-                    || in_array('Public', $AS->recips)
-                    || in_array('as:Public', $AS->recips)) {
-
-                    // deliver to anybody following $AS->actor
-
-                    $channels = q(
-                        "SELECT * from channel where channel_id in
-                        ( SELECT abook_channel from abook left join xchan on abook_xchan = xchan_hash
-                        WHERE xchan_network = 'activitypub' and xchan_hash = '%s'
-                        ) and channel_removed = 0 ",
-                        dbesc($observer_hash)
-                    );
-                }
-                else {
-                    // deliver to anybody at this site directly addressed
-                    $channel_addr = '';
-                    foreach($AS->recips as $recip) {
-                        if (strpos($recip, z_root()) === 0) {
-                            $channel_addr .= '\'' . dbesc(basename($recip)) . '\',';
-                        }
-                    }
-                    if ($channel_addr) {
-                        $channel_addr = rtrim($channel_addr, ',');
-                        $channels = dbq("SELECT * FROM channel
-                            WHERE channel_address IN ($channel_addr) AND channel_removed = 0");
-                    }
-                }
-
-                if (!$channels) {
-                    $channels = [];
-                }
-
-                $parent = $AS->parent_id;
-                if ($parent) {
-                    // this is a comment - deliver to everybody who owns the parent
-                    $owners = q(
-                        "SELECT * from channel where channel_id in ( SELECT uid from item where mid = '%s' ) ",
-                        dbesc($parent)
-                    );
-                    if ($owners) {
-                        $channels = array_merge($channels, $owners);
-                    }
-                }
-            }
-
-            if ($channels === false) {
-                $channels = [];
-            }
-
-            if (in_array(ACTIVITY_PUBLIC_INBOX, $AS->recips) || in_array('Public', $AS->recips) || in_array('as:Public', $AS->recips)) {
-                // look for channels with send_stream = PERMS_PUBLIC (accept posts from anybody on the internet)
-
-                $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'perm_limits' and k = 'send_stream' and v = '1' ) and channel_removed = 0 ");
-                if ($r) {
-                    $channels = array_merge($channels, $r);
-                }
-
-                // look for channels that are following hashtags. These will be checked in tgroup_check()
-
-                $r = q("select * from channel where channel_id in (select uid from pconfig where cat = 'system' and k = 'followed_tags' and v != '' ) and channel_removed = 0 ");
-                if ($r) {
-                    $channels = array_merge($channels, $r);
-                }
-
-
-                if (!$sys_disabled) {
-                    $channels[] = Channel::get_system();
-                }
-            }
-        }
-
-        // $channels represents all "potential" recipients. If they are not in this array, they will not receive the activity.
-        // If they are in this array, we will decide whether or not to deliver on a case-by-case basis.
-
-        if (!$channels) {
-            logger('no deliveries on this site');
-            return;
-        }
-
-        // Bto and Bcc will only be present in a C2S transaction and should not be stored.
-
-        $saved_recips = [];
-        foreach (['to', 'cc', 'audience'] as $x) {
-            if (array_key_exists($x, $AS->data)) {
-                $saved_recips[$x] = $AS->data[$x];
-            }
-        }
-        $AS->set_recips($saved_recips);
-
-
-        foreach ($channels as $channel) {
-            // Even though activitypub may be enabled for the site, check if the channel has specifically disabled it
-            if (!PConfig::Get($channel['channel_id'], 'system', 'activitypub', Config::Get('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
-                continue;
-            }
-
-            logger('inbox_channel: ' . $channel['channel_address'], LOGGER_DEBUG);
-
-            switch ($AS->type) {
-                case 'Follow':
-                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
-                        // do follow activity
-                        Activity::follow($channel, $AS);
-                    }
-                    break;
-                case 'Invite':
-                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
-                        // do follow activity
-                        Activity::follow($channel, $AS);
-                    }
-                    break;
-                case 'Join':
-                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
-                        // do follow activity
-                        Activity::follow($channel, $AS);
-                    }
-                    break;
-                case 'Accept':
-                    // Activitypub for wordpress sends lowercase 'follow' on accept.
-                    // https://github.com/pfefferle/wordpress-activitypub/issues/97
-                    // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group
-                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow', 'follow', 'Member'])) {
-                        // do follow activity
-                        Activity::follow($channel, $AS);
-                    }
-                    break;
-
-                case 'Reject':
-                default:
-                    break;
-            }
-
-            // These activities require permissions
-
-            $item = null;
-
-            switch ($AS->type) {
-                case 'Update':
-                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
-                        Activity::actor_store($AS->obj['id'], $AS->obj, true /* force cache refresh */);
-                        break;
-                    }
-                case 'Accept':
-                    if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) {
-                        break;
-                    }
-                case 'Create':
-                case 'Like':
-                case 'Dislike':
-                case 'Announce':
-                case 'Reject':
-                case 'TentativeAccept':
-                case 'TentativeReject':
-                case 'Add':
-                case 'Arrive':
-                case 'Block':
-                case 'Flag':
-                case 'Ignore':
-                case 'Invite':
-                case 'Listen':
-                case 'Move':
-                case 'Offer':
-                case 'Question':
-                case 'Read':
-                case 'Travel':
-                case 'View':
-                case 'emojiReaction':
-                case 'EmojiReaction':
-                case 'EmojiReact':
-                    // These require a resolvable object structure
-                    if (is_array($AS->obj)) {
-                        // The boolean flag enables html cache of the item
-                        $item = Activity::decode_note($AS, true);
-                    } else {
-                        logger('unresolved object: ' . print_r($AS->obj, true));
-                    }
-                    break;
-                case 'Undo':
-                    if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') {
-                        // do unfollow activity
-                        Activity::unfollow($channel, $AS);
-                        break;
-                    }
-                case 'Leave':
-                    if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
-                        // do unfollow activity
-                        Activity::unfollow($channel, $AS);
-                        break;
-                    }
-                case 'Tombstone':
-                case 'Delete':
-                    Activity::drop($channel, $observer_hash, $AS);
-                    break;
-
-                case 'Move':
-                    if (
-                        $observer_hash && $observer_hash === $AS->actor
-                        && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type'])
-                        && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type'])
-                    ) {
-                        ActivityPub::move($AS->obj, $AS->tgt);
-                    }
-                    break;
-                case 'Add':
-                case 'Remove':
-                    // for writeable collections as target, it's best to provide an array and include both the type and the id in the target element.
-                    // If it's just a string id, we'll try to fetch the collection when we receive it and that's wasteful since we don't actually need
-                    // the contents.
-                    if (is_array($AS->obj) && isset($AS->tgt)) {
-                        // The boolean flag enables html cache of the item
-                        $item = Activity::decode_note($AS, true);
-                        break;
-                    }
-                default:
-                    break;
-            }
-
-            if ($item) {
-                logger('parsed_item: ' . print_r($item, true), LOGGER_DATA);
-                Activity::store($channel, $observer_hash, $AS, $item);
-            }
-        }
-
-        http_status_exit(200, 'OK');
-    }
-
-    public function get()
-    {
-    }
-}
diff --git a/Zotlabs/Module/Inspect.php b/Zotlabs/Module/Inspect.php
deleted file mode 100644
index 9f1b7a6aa..000000000
--- a/Zotlabs/Module/Inspect.php
+++ /dev/null
@@ -1,92 +0,0 @@
- 2) {
-            $item_type = argv(1);
-            $item_id = argv(2);
-        } elseif (argc() > 1) {
-            $item_type = 'item';
-            $item_id = argv(1);
-        }
-
-        if (!$item_id) {
-            App::$error = 404;
-            notice(t('Item not found.') . EOL);
-        }
-
-        if ($item_type === 'item') {
-            $r = q(
-                "select * from item where uuid = '%s' or id = %d ",
-                dbesc($item_id),
-                intval($item_id)
-            );
-
-            if ($r) {
-                xchan_query($r);
-                $items = fetch_post_tags($r, true);
-            }
-
-            if (!$items) {
-                return $output;
-            }
-
-            foreach ($items as $item) {
-                if ($item['obj']) {
-                    $item['obj'] = json_decode($item['obj'], true);
-                }
-                if ($item['target']) {
-                    $item['target'] = json_decode($item['target'], true);
-                }
-                if ($item['attach']) {
-                    $item['attach'] = json_decode($item['attach'], true);
-                }
-
-                $output .= '
          ' . print_array($item) . '
          ' . EOL . EOL;
-
-                $output .= '
          ' . escape_tags(json_encode(Activity::encode_activity($item, true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
          ' . EOL . EOL;
-
-                $output .= '
          ' . escape_tags(json_encode(json_decode(get_iconfig($item['id'], 'activitypub', 'rawmsg'), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
          ' . EOL . EOL;
-            }
-        }
-
-        if ($item_type === 'xchan') {
-            $items = q(
-                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_hash = '%s' or hubloc_addr = '%s' ",
-                dbesc($item_id),
-                dbesc($item_id)
-            );
-
-            if (!$items) {
-                return $output;
-            }
-
-            foreach ($items as $item) {
-                $output .= '
          ' . print_array($item) . '
          ' . EOL . EOL;
-            }
-        }
-
-
-        return $output;
-    }
-}
diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php
deleted file mode 100644
index 9a97cf918..000000000
--- a/Zotlabs/Module/Invite.php
+++ /dev/null
@@ -1,176 +0,0 @@
- $max_invites) {
-            notice(t('Total invitation limit exceeded.') . EOL);
-            return;
-        }
-
-
-        $recips = ((x($_POST, 'recipients')) ? explode("\n", $_POST['recipients']) : []);
-        $message = ((x($_POST, 'message')) ? notags(trim($_POST['message'])) : '');
-
-        $total = 0;
-
-        if (get_config('system', 'invitation_only')) {
-            $invonly = true;
-            $x = get_pconfig(local_channel(), 'system', 'invites_remaining');
-            if ((!$x) && (!is_site_admin())) {
-                return;
-            }
-        }
-
-        foreach ($recips as $recip) {
-            $recip = trim($recip);
-            if (!$recip) {
-                continue;
-            }
-
-            if (!validate_email($recip)) {
-                notice(sprintf(t('%s : Not a valid email address.'), $recip) . EOL);
-                continue;
-            } else {
-                $nmessage = $message;
-            }
-
-            $account = App::get_account();
-
-            $res = z_mail(
-                [
-                    'toEmail' => $recip,
-                    'fromName' => ' ',
-                    'fromEmail' => $account['account_email'],
-                    'messageSubject' => t('Please join us on $Projectname'),
-                    'textVersion' => $nmessage,
-                ]
-            );
-
-            if ($res) {
-                $total++;
-                $current_invites++;
-                set_pconfig(local_channel(), 'system', 'sent_invites', $current_invites);
-                if ($current_invites > $max_invites) {
-                    notice(t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
-                    return;
-                }
-            } else {
-                notice(sprintf(t('%s : Message delivery failed.'), $recip) . EOL);
-            }
-        }
-        notice(sprintf(tt("%d message sent.", "%d messages sent.", $total), $total) . EOL);
-        return;
-    }
-
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if (!Apps::system_app_installed(local_channel(), 'Invite')) {
-            //Do not display any associated widgets at this point
-            App::$pdl = '';
-
-            $o = 'Invite App (Not Installed):
          ';
-            $o .= t('Send email invitations to join this network');
-            return $o;
-        }
-
-        Navbar::set_selected('Invite');
-
-        $tpl = Theme::get_template('invite.tpl');
-        $invonly = false;
-
-        if (get_config('system', 'invitation_only')) {
-            $invonly = true;
-            $x = get_pconfig(local_channel(), 'system', 'invites_remaining');
-            if ((!$x) && (!is_site_admin())) {
-                notice(t('You have no more invitations available') . EOL);
-                return '';
-            }
-        }
-
-        if ($invonly && ($x || is_site_admin())) {
-            $invite_code = autoname(8) . rand(1000, 9999);
-            $nmessage = str_replace('$invite_code', $invite_code, $message);
-
-            $r = q(
-                "INSERT INTO register (hash,created,uid,password,lang) VALUES ('%s', '%s',0,'','') ",
-                dbesc($invite_code),
-                dbesc(datetime_convert())
-            );
-
-            if (!is_site_admin()) {
-                $x--;
-                if ($x >= 0) {
-                    set_pconfig(local_channel(), 'system', 'invites_remaining', $x);
-                } else {
-                    return;
-                }
-            }
-        }
-
-        $ob = App::get_observer();
-        if (!$ob) {
-            return $o;
-        }
-
-        $channel = App::get_channel();
-
-        $o = replace_macros($tpl, array(
-            '$form_security_token' => get_form_security_token("send_invite"),
-            '$invite' => t('Send invitations'),
-            '$addr_text' => t('Enter email addresses, one per line:'),
-            '$msg_text' => t('Your message:'),
-            '$default_message' => t('Please join my community on $Projectname.') . "\r\n" . "\r\n"
-                . $linktxt
-                . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code:') . " " . $invite_code . "\r\n" . "\r\n" : '')
-                . t('1. Register at any $Projectname location (they are all inter-connected)')
-                . "\r\n" . "\r\n" . z_root() . '/register'
-                . "\r\n" . "\r\n" . t('2. Enter my $Projectname network address into the site searchbar.')
-                . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit') . " " . z_root() . '/channel/' . $channel['channel_address'] . ')'
-                . "\r\n" . "\r\n"
-                . t('3. Click [Connect]')
-                . "\r\n" . "\r\n",
-            '$submit' => t('Submit')
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
deleted file mode 100644
index deec91d47..000000000
--- a/Zotlabs/Module/Item.php
+++ /dev/null
@@ -1,2004 +0,0 @@
- [
-                ACTIVITYSTREAMS_JSONLD_REV,
-                'https://w3id.org/security/v1',
-                Activity::ap_schema()
-            ]], $i);
-
-            $headers = [];
-            $headers['Content-Type'] = 'application/x-nomad+json';
-            $x['signature'] = LDSignatures::sign($x, $chan);
-            $ret = json_encode($x, JSON_UNESCAPED_SLASHES);
-            $headers['Digest'] = HTTPSig::generate_digest_header($ret);
-            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
-            $h = HTTPSig::create_sig($headers, $chan['channel_prvkey'], Channel::url($chan));
-            HTTPSig::set_headers($h);
-            echo $ret;
-            killme();
-        }
-
-        // if it isn't a drop command and isn't a post method and wasn't handled already,
-        // the default action is a browser request for a persistent uri and this should return
-        // the text/html page of the item.
-
-        if (argc() > 1 && argv(1) !== 'drop') {
-            $x = q(
-                "select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' or uuid = '%s'",
-                dbesc(z_root() . '/item/' . argv(1)),
-                dbesc(z_root() . '/activity/' . argv(1)),
-                dbesc(argv(1))
-            );
-            if ($x) {
-                foreach ($x as $xv) {
-                    if (intval($xv['item_wall'])) {
-                        $c = Channel::from_id($xv['uid']);
-                        if ($c) {
-                            goaway($c['xchan_url'] . '?mid=' . gen_link_id($xv['mid']));
-                        }
-                    }
-                }
-                goaway($x[0]['llink']);
-            }
-
-            // save this state and catch it in the get() function
-            $this->return_404 = true;
-        }
-    }
-
-    public function post()
-    {
-
-        if ((!local_channel()) && (!remote_channel()) && (!isset($_REQUEST['anonname']))) {
-            return;
-        }
-
-        // drop an array of items.
-
-        if (isset($_REQUEST['dropitems'])) {
-            $arr_drop = explode(',', $_REQUEST['dropitems']);
-            drop_items($arr_drop);
-            $json = array('success' => 1);
-            echo json_encode($json);
-            killme();
-        }
-
-
-        $uid = local_channel();
-        $channel = null;
-        $observer = null;
-        $token = EMPTY_STR;
-        $datarray = [];
-        $item_starred = false;
-        $item_uplink = false;
-        $item_notshown = false;
-        $item_nsfw = false;
-        $item_relay = false;
-        $item_mentionsme = false;
-        $item_verified = false;
-        $item_retained = false;
-        $item_rss = false;
-        $item_deleted = false;
-        $item_hidden = false;
-        $item_delayed = false;
-        $item_pending_remove = false;
-        $item_blocked = false;
-
-        $post_tags = false;
-        $pub_copy = false;
-
-
-        /**
-         * Is this a reply to something?
-         */
-
-        $parent = ((isset($_REQUEST['parent'])) ? intval($_REQUEST['parent']) : 0);
-        $parent_mid = ((isset($_REQUEST['parent_mid'])) ? trim($_REQUEST['parent_mid']) : '');
-
-        $hidden_mentions = ((isset($_REQUEST['hidden_mentions'])) ? trim($_REQUEST['hidden_mentions']) : '');
-
-
-        /**
-         * Who is viewing this page and posting this thing
-         */
-
-        $remote_xchan = ((isset($_REQUEST['remote_xchan'])) ? trim($_REQUEST['remote_xchan']) : false);
-        $remote_observer = xchan_match(['xchan_hash' => $remote_xchan]);
-
-        if (!$remote_observer) {
-            $remote_xchan = $remote_observer = false;
-        }
-
-        // This is the local channel representing who the posted item will belong to.
-
-        $profile_uid = ((isset($_REQUEST['profile_uid'])) ? intval($_REQUEST['profile_uid']) : 0);
-
-        // *If* you are logged in as the site admin you are allowed to create top-level items for the sys channel.
-        // This would typically be a webpage or webpage element.
-        // Comments and replies are excluded because further below we also check for sys channel ownership and
-        // will make a copy of the parent that you can interact with in your own stream
-
-        $sys = Channel::get_system();
-        if ($sys && $profile_uid && ($sys['channel_id'] == $profile_uid) && is_site_admin() && !$parent) {
-            $uid = intval($sys['channel_id']);
-            $channel = $sys;
-            $observer = $sys;
-        }
-
-        Hook::call('post_local_start', $_REQUEST);
-
-        // logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
-
-        $api_source = ((isset($_REQUEST['api_source']) && $_REQUEST['api_source']) ? true : false);
-
-        $nocomment = 0;
-        if (isset($_REQUEST['comments_enabled'])) {
-            $nocomment = 1 - intval($_REQUEST['comments_enabled']);
-        }
-
-        // this is in days, convert to absolute time
-        $channel_comments_closed = get_pconfig($profile_uid, 'system', 'close_comments');
-        if (intval($channel_comments_closed)) {
-            $channel_comments_closed = datetime_convert(date_Default_timezone_get(), 'UTC', 'now + ' . intval($channel_comments_closed) . ' days');
-        } else {
-            $channel_comments_closed = NULL_DATE;
-        }
-
-        $comments_closed = ((isset($_REQUEST['comments_closed']) && $_REQUEST['comments_closed']) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['comments_closed']) : $channel_comments_closed);
-
-        $is_poll = ((trim($_REQUEST['poll_answers'][0]) != '' && trim($_REQUEST['poll_answers'][1]) != '') ? true : false);
-
-        // 'origin' (if non-zero) indicates that this network is where the message originated,
-        // for the purpose of relaying comments to other conversation members.
-        // If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset.
-        // If the API is used from another network with its own distribution
-        // and deliveries, you may wish to set origin to 0 or false and allow the other
-        // network to relay comments.
-
-        // If you are unsure, it is prudent (and important) to leave it unset.
-
-        $origin = (($api_source && array_key_exists('origin', $_REQUEST)) ? intval($_REQUEST['origin']) : 1);
-
-        // To represent message-ids on other networks - this will create an iconfig record
-
-        $namespace = (($api_source && array_key_exists('namespace', $_REQUEST)) ? strip_tags($_REQUEST['namespace']) : '');
-        $remote_id = (($api_source && array_key_exists('remote_id', $_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : '');
-
-        $owner_hash = null;
-
-        $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
-        $created = ((x($_REQUEST, 'created')) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['created']) : datetime_convert());
-
-        // Because somebody will probably try this and create a mess
-
-        if ($created <= NULL_DATE) {
-            $created = datetime_convert();
-        }
-
-        $post_id = ((x($_REQUEST, 'post_id')) ? intval($_REQUEST['post_id']) : 0);
-
-        $app = ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : '');
-        $return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : '');
-        $preview = ((x($_REQUEST, 'preview')) ? intval($_REQUEST['preview']) : 0);
-        $categories = ((x($_REQUEST, 'category')) ? escape_tags($_REQUEST['category']) : '');
-        $webpage = ((x($_REQUEST, 'webpage')) ? intval($_REQUEST['webpage']) : 0);
-        $item_obscured = ((x($_REQUEST, 'obscured')) ? intval($_REQUEST['obscured']) : 0);
-        $pagetitle = ((x($_REQUEST, 'pagetitle')) ? escape_tags(urlencode($_REQUEST['pagetitle'])) : '');
-        $layout_mid = ((x($_REQUEST, 'layout_mid')) ? escape_tags($_REQUEST['layout_mid']) : '');
-        $plink = ((x($_REQUEST, 'permalink')) ? escape_tags($_REQUEST['permalink']) : '');
-        $obj_type = ((x($_REQUEST, 'obj_type')) ? escape_tags($_REQUEST['obj_type']) : ACTIVITY_OBJ_NOTE);
-
-
-        $item_unpublished = ((isset($_REQUEST['draft'])) ? intval($_REQUEST['draft']) : 0);
-
-        // allow API to bulk load a bunch of imported items without sending out a bunch of posts.
-        $nopush = ((x($_REQUEST, 'nopush')) ? intval($_REQUEST['nopush']) : 0);
-
-        /*
-         * Check service class limits
-         */
-        if ($uid && !(x($_REQUEST, 'parent')) && !(x($_REQUEST, 'post_id'))) {
-            $ret = $this->item_check_service_class($uid, (($_REQUEST['webpage'] == ITEM_TYPE_WEBPAGE) ? true : false));
-            if (!$ret['success']) {
-                notice(t($ret['message']) . EOL);
-                if ($api_source) {
-                    return (['success' => false, 'message' => 'service class exception']);
-                }
-                if (x($_REQUEST, 'return')) {
-                    goaway(z_root() . "/" . $return_path);
-                }
-                killme();
-            }
-        }
-
-        if ($pagetitle) {
-            $pagetitle = strtolower(URLify::transliterate($pagetitle));
-        }
-
-        $item_flags = $item_restrict = 0;
-        $expires = NULL_DATE;
-
-        $route = '';
-        $parent_item = null;
-        $parent_contact = null;
-        $thr_parent = '';
-        $parid = 0;
-        $r = false;
-
-
-        // If this is a comment, find the parent and preset some stuff
-
-        if ($parent || $parent_mid) {
-            if (!x($_REQUEST, 'type')) {
-                $_REQUEST['type'] = 'net-comment';
-            }
-            if ($obj_type == ACTIVITY_OBJ_NOTE) {
-                $obj_type = ACTIVITY_OBJ_COMMENT;
-            }
-
-            // fetch the parent item
-
-            if ($parent) {
-                $r = q(
-                    "SELECT * FROM item WHERE id = %d LIMIT 1",
-                    intval($parent)
-                );
-            } elseif ($parent_mid && $uid) {
-                // This is coming from an API source, and we are logged in
-                $r = q(
-                    "SELECT * FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
-                    dbesc($parent_mid),
-                    intval($uid)
-                );
-            }
-
-            // if this isn't the real parent of the conversation, find it
-            if ($r) {
-                $parid = $r[0]['parent'];
-                $parent_mid = $r[0]['mid'];
-                if ($r[0]['id'] != $r[0]['parent']) {
-                    $r = q(
-                        "SELECT * FROM item WHERE id = parent AND parent = %d LIMIT 1",
-                        intval($parid)
-                    );
-                }
-
-                // if interacting with a pubstream item (owned by the sys channel),
-                // create a copy of the parent in your stream
-
-                // $r may have changed. Check it again before trying to use it.
-
-                if ($r && local_channel() && (!Channel::is_system(local_channel()))) {
-                    $old_id = $r[0]['id'];
-                    $r = [copy_of_pubitem(App::get_channel(), $r[0]['mid'])];
-                    if ($r[0]['id'] !== $old_id) {
-                        // keep track that a copy was made to  display a special status notice that is unique to this condition
-                        $pub_copy = true;
-                    }
-                }
-            }
-
-            if (!$r) {
-                notice(t('Unable to locate original post.') . EOL);
-                if ($api_source) {
-                    return (['success' => false, 'message' => 'invalid post id']);
-                }
-                if (x($_REQUEST, 'return')) {
-                    goaway(z_root() . "/" . $return_path);
-                }
-                killme();
-            }
-
-            xchan_query($r, true);
-
-            $parent_item = $r[0];
-            $parent = $r[0]['id'];
-
-            // multi-level threading - preserve the info but re-parent to our single level threading
-
-            $thr_parent = $parent_mid;
-
-            $route = $parent_item['route'];
-        }
-
-        if ($parent_item && isset($parent_item['replyto']) && $parent_item['replyto']) {
-            $replyto = unserialise($parent_item['replyto']);
-        }
-
-        $moderated = false;
-
-        if (!$observer) {
-            $observer = App::get_observer();
-            if (!$observer) {
-                // perhaps we're allowing moderated comments from anonymous viewers
-                $observer = Channel::anon_identity_init($_REQUEST);
-                if ($observer) {
-                    $moderated = true;
-                    $remote_xchan = $remote_observer = $observer;
-                }
-            }
-        }
-
-        if (!$observer) {
-            notice(t('Permission denied.') . EOL);
-            if ($api_source) {
-                return (['success' => false, 'message' => 'permission denied']);
-            }
-            if (x($_REQUEST, 'return')) {
-                goaway(z_root() . "/" . $return_path);
-            }
-            killme();
-        }
-
-        if ($parent) {
-            logger('mod_item: item_post parent=' . $parent);
-            $can_comment = false;
-
-            $can_comment = can_comment_on_post($observer['xchan_hash'], $parent_item);
-            if (!$can_comment) {
-                if ((array_key_exists('owner', $parent_item)) && intval($parent_item['owner']['abook_self']) == 1) {
-                    $can_comment = perm_is_allowed($profile_uid, $observer['xchan_hash'], 'post_comments');
-                }
-            }
-
-            if (!$can_comment) {
-                notice(t('Permission denied.') . EOL);
-                if ($api_source) {
-                    return (['success' => false, 'message' => 'permission denied']);
-                }
-                if (x($_REQUEST, 'return')) {
-                    goaway(z_root() . "/" . $return_path);
-                }
-                killme();
-            }
-        } else {
-            // fixme - $webpage could also be a wiki page or article and require a different permission to be checked.
-            if (!perm_is_allowed($profile_uid, $observer['xchan_hash'], ($webpage) ? 'write_pages' : 'post_wall')) {
-                notice(t('Permission denied.') . EOL);
-                if ($api_source) {
-                    return (['success' => false, 'message' => 'permission denied']);
-                }
-                if (x($_REQUEST, 'return')) {
-                    goaway(z_root() . "/" . $return_path);
-                }
-                killme();
-            }
-        }
-
-        // check if this author is being moderated through the 'moderated' (negative) permission
-        // when posting wall-to-wall
-        if ($moderated === false && intval($uid) !== intval($profile_uid)) {
-            $moderated = perm_is_allowed($profile_uid, $observer['xchan_hash'], 'moderated');
-        }
-
-        // If this is a comment, check the moderated permission of the parent; who may be on another site
-        $remote_moderated = (($parent) ? their_perms_contains($profile_uid, $parent_item['owner_xchan'], 'moderated') : false);
-        if ($remote_moderated) {
-            notice(t('Comment may be moderated.') . EOL);
-        }
-
-        // is this an edited post?
-
-        $orig_post = null;
-
-        if ($namespace && $remote_id) {
-            // It wasn't an internally generated post - see if we've got an item matching this remote service id
-            $i = q(
-                "select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1",
-                dbesc($namespace),
-                dbesc($remote_id)
-            );
-            if ($i) {
-                $post_id = $i[0]['iid'];
-            }
-        }
-
-        $iconfig = null;
-
-        if ($post_id) {
-            $i = q(
-                "SELECT * FROM item WHERE uid = %d AND id = %d LIMIT 1",
-                intval($profile_uid),
-                intval($post_id)
-            );
-            if (!count($i)) {
-                killme();
-            }
-            $orig_post = $i[0];
-            $iconfig = q(
-                "select * from iconfig where iid = %d",
-                intval($post_id)
-            );
-        }
-
-
-        if (!$channel) {
-            if ($uid && $uid == $profile_uid) {
-                $channel = App::get_channel();
-            } else {
-                // posting as yourself but not necessarily to a channel you control
-                $r = q(
-                    "select * from channel left join account on channel_account_id = account_id where channel_id = %d LIMIT 1",
-                    intval($profile_uid)
-                );
-                if ($r) {
-                    $channel = $r[0];
-                }
-            }
-        }
-
-
-        if (!$channel) {
-            logger("mod_item: no channel.");
-            if ($api_source) {
-                return (['success' => false, 'message' => 'no channel']);
-            }
-            if (x($_REQUEST, 'return')) {
-                goaway(z_root() . "/" . $return_path);
-            }
-            killme();
-        }
-
-        $owner_xchan = null;
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($channel['channel_hash'])
-        );
-        if ($r && count($r)) {
-            $owner_xchan = $r[0];
-        } else {
-            logger("mod_item: no owner.");
-            if ($api_source) {
-                return (['success' => false, 'message' => 'no owner']);
-            }
-            if (x($_REQUEST, 'return')) {
-                goaway(z_root() . "/" . $return_path);
-            }
-            killme();
-        }
-
-        $walltowall = false;
-        $walltowall_comment = false;
-
-        if ($remote_xchan && !$moderated) {
-            $observer = $remote_observer;
-        }
-
-        if ($observer) {
-            logger('mod_item: post accepted from ' . $observer['xchan_name'] . ' for ' . $owner_xchan['xchan_name'], LOGGER_DEBUG);
-
-            // wall-to-wall detection.
-            // For top-level posts, if the author and owner are different it's a wall-to-wall
-            // For comments, We need to additionally look at the parent and see if it's a wall post that originated locally.
-
-            if ($observer['xchan_name'] != $owner_xchan['xchan_name']) {
-                if (($parent_item) && ($parent_item['item_wall'] && $parent_item['item_origin'])) {
-                    $walltowall_comment = true;
-                    $walltowall = true;
-                }
-                if (!$parent) {
-                    $walltowall = true;
-                }
-            }
-        }
-
-        if (!isset($replyto)) {
-            if (strpos($owner_xchan['xchan_hash'], 'http') === 0) {
-                $replyto = $owner_xchan['xchan_hash'];
-            } else {
-                $replyto = $owner_xchan['xchan_url'];
-            }
-        }
-
-
-        $acl = new AccessControl($channel);
-
-        $view_policy = PermissionLimits::Get($channel['channel_id'], 'view_stream');
-        $comment_policy = ((isset($_REQUEST['comments_from']) && intval($_REQUEST['comments_from'])) ? intval($_REQUEST['comments_from']) : PermissionLimits::Get($channel['channel_id'], 'post_comments'));
-
-        $public_policy = ((x($_REQUEST, 'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($view_policy, true));
-        if ($webpage) {
-            $public_policy = '';
-        }
-        if ($public_policy) {
-            $private = 1;
-        }
-
-        if ($orig_post) {
-            $private = 0;
-            // webpages and unpublished drafts are allowed to change ACLs after the fact. Normal conversation items aren't.
-            if ($webpage || intval($orig_post['item_unpublished'])) {
-                $acl->set_from_array($_REQUEST);
-            } else {
-                $acl->set($orig_post);
-                $public_policy = $orig_post['public_policy'];
-                $private = $orig_post['item_private'];
-            }
-
-            if ($public_policy || $acl->is_private()) {
-                $private = (($private) ? $private : 1);
-            }
-
-            $location = $orig_post['location'];
-            $coord = $orig_post['coord'];
-            $verb = $orig_post['verb'];
-            $app = $orig_post['app'];
-            $title = escape_tags(trim($_REQUEST['title']));
-            $summary = trim($_REQUEST['summary']);
-            $body = trim($_REQUEST['body']);
-
-            $item_flags = $orig_post['item_flags'];
-            $item_origin = $orig_post['item_origin'];
-            $item_unseen = $orig_post['item_unseen'];
-            $item_starred = $orig_post['item_starred'];
-            $item_uplink = $orig_post['item_uplink'];
-            $item_wall = $orig_post['item_wall'];
-            $item_thread_top = $orig_post['item_thread_top'];
-            $item_notshown = $orig_post['item_notshown'];
-            $item_nsfw = $orig_post['item_nsfw'];
-            $item_relay = $orig_post['item_relay'];
-            $item_mentionsme = $orig_post['item_mentionsme'];
-            $item_nocomment = $orig_post['item_nocomment'];
-            $item_obscured = $orig_post['item_obscured'];
-            $item_verified = $orig_post['item_verified'];
-            $item_retained = $orig_post['item_retained'];
-            $item_rss = $orig_post['item_rss'];
-            $item_deleted = $orig_post['item_deleted'];
-            $item_type = $orig_post['item_type'];
-            $item_hidden = $orig_post['item_hidden'];
-            $item_delayed = $orig_post['item_delayed'];
-            $item_pending_remove = $orig_post['item_pending_remove'];
-            $item_blocked = $orig_post['item_blocked'];
-
-
-            $postopts = $orig_post['postopts'];
-            $created = ((intval($orig_post['item_unpublished'])) ? $created : $orig_post['created']);
-            $expires = ((intval($orig_post['item_unpublished'])) ? NULL_DATE : $orig_post['expires']);
-            $mid = $orig_post['mid'];
-            $thr_parent = $orig_post['thr_parent'];
-            $parent_mid = $orig_post['parent_mid'];
-            $plink = $orig_post['plink'];
-        } else {
-            if (!$walltowall) {
-                if (
-                    (array_key_exists('contact_allow', $_REQUEST))
-                    || (array_key_exists('group_allow', $_REQUEST))
-                    || (array_key_exists('contact_deny', $_REQUEST))
-                    || (array_key_exists('group_deny', $_REQUEST))
-                ) {
-                    $acl->set_from_array($_REQUEST);
-                } elseif (!$api_source) {
-                    // if no ACL has been defined and we aren't using the API, the form
-                    // didn't send us any parameters. This means there's no ACL or it has
-                    // been reset to the default audience.
-                    // If $api_source is set and there are no ACL parameters, we default
-                    // to the channel permissions which were set in the ACL contructor.
-
-                    $acl->set(array('allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''));
-                }
-            }
-
-
-            $location = ((isset($_REQUEST['location'])) ? notags(trim($_REQUEST['location'])) : EMPTY_STR);
-            $coord = ((isset($_REQUEST['coord'])) ? notags(trim($_REQUEST['coord'])) : EMPTY_STR);
-            $verb = ((isset($_REQUEST['verb'])) ? notags(trim($_REQUEST['verb'])) : EMPTY_STR);
-            $title = ((isset($_REQUEST['title'])) ? escape_tags(trim($_REQUEST['title'])) : EMPTY_STR);
-            $summary = ((isset($_REQUEST['summary'])) ? trim($_REQUEST['summary']) : EMPTY_STR);
-            $body = ((isset($_REQUEST['body'])) ? trim($_REQUEST['body']) : EMPTY_STR);
-            $body .= ((isset($_REQUEST['attachment'])) ? trim($_REQUEST['attachment']) : EMPTY_STR);
-            $postopts = '';
-
-            $allow_empty = ((array_key_exists('allow_empty', $_REQUEST)) ? intval($_REQUEST['allow_empty']) : 0);
-
-            $private = ((isset($private) && $private) ? $private : intval($acl->is_private() || ($public_policy)));
-
-            // If this is a comment, set the permissions from the parent.
-
-            if ($parent_item) {
-                $private = 0;
-                $acl->set($parent_item);
-                $private = ((intval($parent_item['item_private']) ? $parent_item['item_private'] : $acl->is_private()));
-                $public_policy = $parent_item['public_policy'];
-                $owner_hash = $parent_item['owner_xchan'];
-                $webpage = $parent_item['item_type'];
-                $comment_policy = $parent_item['comment_policy'];
-                $item_nocomment = $parent_item['item_nocomment'];
-                $comments_closed = $parent_item['comments_closed'];
-            }
-
-            if ((!$allow_empty) && (!strlen($body))) {
-                if ($preview) {
-                    killme();
-                }
-                info(t('Empty post discarded.') . EOL);
-                if ($api_source) {
-                    return (['success' => false, 'message' => 'no content']);
-                }
-                if (x($_REQUEST, 'return')) {
-                    goaway(z_root() . "/" . $return_path);
-                }
-                killme();
-            }
-        }
-
-
-        if (Apps::system_app_installed($profile_uid, 'Expire Posts')) {
-            if (x($_REQUEST, 'expire')) {
-                $expires = datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['expire']);
-                if ($expires <= datetime_convert()) {
-                    $expires = NULL_DATE;
-                }
-            }
-        }
-
-
-        $mimetype = notags(trim($_REQUEST['mimetype']));
-        if (!$mimetype) {
-            $mimetype = 'text/x-multicode';
-        }
-
-
-        $execflag = ((intval($uid) == intval($profile_uid)
-            && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
-
-        if ($preview) {
-            $summary = z_input_filter($summary, $mimetype, $execflag);
-            $body = z_input_filter($body, $mimetype, $execflag);
-        }
-
-
-        $arr = ['profile_uid' => $profile_uid, 'summary' => $summary, 'content' => $body, 'mimetype' => $mimetype];
-        Hook::call('post_content', $arr);
-        $summary = $arr['summary'];
-        $body = $arr['content'];
-        $mimetype = $arr['mimetype'];
-
-
-        $gacl = $acl->get();
-        $str_contact_allow = $gacl['allow_cid'];
-        $str_group_allow = $gacl['allow_gid'];
-        $str_contact_deny = $gacl['deny_cid'];
-        $str_group_deny = $gacl['deny_gid'];
-
-
-        $groupww = false;
-
-        // if this is a wall-to-wall post to a group, turn it into a direct message
-
-        $role = get_pconfig($profile_uid, 'system', 'permissions_role');
-
-        $rolesettings = PermissionRoles::role_perms($role);
-
-        $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal';
-
-        $is_group = (($channel_type === 'group') ? true : false);
-
-        if (($is_group) && ($walltowall) && (!$walltowall_comment)) {
-            $groupww = true;
-            $str_contact_allow = $owner_xchan['xchan_hash'];
-            $str_group_allow = '';
-        }
-
-
-        if (in_array($mimetype, [ 'text/bbcode', 'text/x-multicode' ])) {
-            // BBCODE alert: the following functions assume bbcode input
-            // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
-            // we may need virtual or template classes to implement the possible alternatives
-
-            if (strpos($body, '[/summary]') !== false) {
-                $match = '';
-                $cnt = preg_match("/\[summary\](.*?)\[\/summary\]/ism", $body, $match);
-                if ($cnt) {
-                    $summary .= $match[1];
-                }
-                $body_content = preg_replace("/^(.*?)\[summary\](.*?)\[\/summary\]/ism", '', $body);
-                $body = trim($body_content);
-            }
-
-            $summary = cleanup_bbcode($summary);
-            $body = cleanup_bbcode($body);
-
-            // Look for tags and linkify them
-            $summary_tags = linkify_tags($summary, ($uid) ? $uid : $profile_uid);
-            $body_tags = linkify_tags($body, ($uid) ? $uid : $profile_uid);
-            $comment_tags = linkify_tags($hidden_mentions, ($uid) ? $uid : $profile_uid);
-
-            foreach ([$summary_tags, $body_tags, $comment_tags] as $results) {
-                if ($results) {
-                    // Set permissions based on tag replacements
-                    set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private);
-
-                    if (!isset($post_tags)) {
-                        $post_tags = [];
-                    }
-                    foreach ($results as $result) {
-                        $success = $result['success'];
-                        if ($success['replaced']) {
-                            // suppress duplicate mentions/tags
-                            $already_tagged = false;
-                            foreach ($post_tags as $pt) {
-                                if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) {
-                                    $already_tagged = true;
-                                    break;
-                                }
-                            }
-                            if ($already_tagged) {
-                                continue;
-                            }
-
-                            $post_tags[] = array(
-                                'uid' => $profile_uid,
-                                'ttype' => $success['termtype'],
-                                'otype' => TERM_OBJ_POST,
-                                'term' => $success['term'],
-                                'url' => $success['url']
-                            );
-
-                            // support #collection syntax to post to a collection
-                            // this is accomplished by adding a pcategory tag for each collection target
-                            // this is checked inside tag_deliver() to create a second delivery chain
-
-                            if ($success['termtype'] === TERM_HASHTAG) {
-                                $r = q(
-                                    "select xchan_url from channel left join xchan on xchan_hash = channel_hash where channel_address = '%s' and channel_parent = '%s' and channel_removed = 0",
-                                    dbesc($success['term']),
-                                    dbesc(get_observer_hash())
-                                );
-                                if ($r) {
-                                    $post_tags[] = [
-                                        'uid' => $profile_uid,
-                                        'ttype' => TERM_PCATEGORY,
-                                        'otype' => TERM_OBJ_POST,
-                                        'term' => $success['term'] . '@' . App::get_hostname(),
-                                        'url' => $r[0]['xchan_url']
-                                    ];
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-
-            /**
-             * process collections selected manually
-             */
-
-            if (array_key_exists('collections', $_REQUEST) && is_array($_REQUEST['collections']) && count($_REQUEST['collections'])) {
-                foreach ($_REQUEST['collections'] as $clct) {
-                    $r = q(
-                        "select xchan_url, xchan_hash from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
-                        dbesc($clct)
-                    );
-                    if ($r) {
-                        if (!isset($post_tags)) {
-                            $post_tags = [];
-                        }
-                        $post_tags[] = [
-                            'uid' => $profile_uid,
-                            'ttype' => TERM_PCATEGORY,
-                            'otype' => TERM_OBJ_POST,
-                            'term' => $clct,
-                            'url' => $r[0]['xchan_url']
-                        ];
-                    }
-                }
-            }
-
-            if (in_array(substr_count($str_contact_allow,'<'), [ 1, 2 ]) && (!$str_group_allow)) {
-                // direct message - private between individual channels but not groups
-                $private = 2;
-            }
-
-            if ($private) {
-                // for edited posts, re-use any existing OCAP token (if found).
-                // Otherwise generate a new one.
-
-                if ($iconfig) {
-                    foreach ($iconfig as $cfg) {
-                        if ($cfg['cat'] === 'ocap' && $cfg['k'] === 'relay') {
-                            $token = $cfg['v'];
-                        }
-                    }
-                }
-                if (!$token) {
-                    $token = new_token();
-                }
-            }
-
-
-            /**
-             *
-             * When a photo was uploaded into the message using the (profile wall) ajax
-             * uploader, The permissions are initially set to disallow anybody but the
-             * owner from seeing it. This is because the permissions may not yet have been
-             * set for the post. If it's private, the photo permissions should be set
-             * appropriately. But we didn't know the final permissions on the post until
-             * now. So now we'll look for links of uploaded photos and attachments that are in the
-             * post and set them to the same permissions as the post itself.
-             *
-             * If the post was end-to-end encrypted we can't find images and attachments in the body,
-             * use our media_str input instead which only contains these elements - but only do this
-             * when encrypted content exists because the photo/attachment may have been removed from
-             * the post and we should keep it private. If it's encrypted we have no way of knowing
-             * so we'll set the permissions regardless and realise that the media may not be
-             * referenced in the post.
-             *
-             */
-
-            if (!$preview) {
-                fix_attached_permissions($profile_uid, ((strpos($body, '[/crypt]')) ? $_POST['media_str'] : $body), $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $token);
-            }
-
-
-            $attachments = '';
-            $match = false;
-
-            if (preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/', $body, $match)) {
-                $attachments = [];
-                $i = 0;
-                foreach ($match[2] as $mtch) {
-                    $attach_link = '';
-                    $hash = substr($mtch, 0, strpos($mtch, ','));
-                    $rev = intval(substr($mtch, strpos($mtch, ',')));
-                    $r = attach_by_hash_nodata($hash, $observer['xchan_hash'], $rev);
-                    if ($r['success']) {
-                        $attachments[] = array(
-                            'href' => z_root() . '/attach/' . $r['data']['hash'],
-                            'length' => $r['data']['filesize'],
-                            'type' => $r['data']['filetype'],
-                            'title' => urlencode($r['data']['filename']),
-                            'revision' => $r['data']['revision']
-                        );
-                    }
-                    $body = str_replace($match[1][$i], $attach_link, $body);
-                    $i++;
-                }
-            }
-
-
-            if (preg_match_all('/(\[share=(.*?)\](.*?)\[\/share\])/', $body, $match)) {
-                // process share by id
-
-                $i = 0;
-                foreach ($match[2] as $mtch) {
-                    $reshare = new Share($mtch);
-                    $body = str_replace($match[1][$i], $reshare->bbcode(), $body);
-                    if (! is_array($attachments)) {
-                        $attachments = [];
-                    }
-                    $attachments = array_merge($attachments,$reshare->get_attach());
-                    $i++;
-                }
-            }
-        }
-
-        // BBCODE end alert
-
-
-        // if the acl contains a single contact and it's a group, add a mention. This is for compatibility
-        // with other groups implementations which require a mention to trigger group delivery.
-
-        if (($str_contact_allow) && (!$str_group_allow) && (!$str_contact_deny) && (!$str_group_deny)) {
-            $cida = expand_acl($str_contact_allow);
-            if (count($cida) === 1) {
-                $netgroups = get_forum_channels($profile_uid, 1);
-                if ($netgroups) {
-                    foreach ($netgroups as $ng) {
-                        if ($ng['xchan_hash'] == $cida[0]) {
-                            if (!is_array($post_tags)) {
-                                $post_tags = [];
-                            }
-                            $post_tags[] = array(
-                                'uid' => $profile_uid,
-                                'ttype' => TERM_MENTION,
-                                'otype' => TERM_OBJ_POST,
-                                'term' => $ng['xchan_name'],
-                                'url' => $ng['xchan_url']
-                            );
-
-                            $colls = get_xconfig($ng['xchan_hash'], 'activitypub', 'collections');
-                            if ($colls && is_array($colls) && isset($colls['wall'])) {
-                                $datarray['target'] = [
-                                    'id' => $colls['wall'],
-                                    'type' => 'Collection',
-                                    'attributedTo' => ((in_array($ng['xchan_network'], ['zot6', 'nomad'])) ? $ng['xchan_url'] : $ng['xchan_hash'])
-                                ];
-                                $datarray['tgt_type'] = 'Collection';
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-    
-        if (strlen($categories)) {
-            if (!isset($post_tags)) {
-                $post_tags = [];
-            }
-
-            $cats = explode(',', $categories);
-            foreach ($cats as $cat) {
-                if ($webpage == ITEM_TYPE_CARD) {
-                    $catlink = z_root() . '/cards/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
-                } elseif ($webpage == ITEM_TYPE_ARTICLE) {
-                    $catlink = z_root() . '/articles/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
-                } else {
-                    $catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat));
-                }
-
-                $post_tags[] = array(
-                    'uid' => $profile_uid,
-                    'ttype' => TERM_CATEGORY,
-                    'otype' => TERM_OBJ_POST,
-                    'term' => trim($cat),
-                    'url' => $catlink
-                );
-            }
-        }
-
-        if ($orig_post) {
-            // preserve original tags
-            $t = q(
-                "select * from term where oid = %d and otype = %d and uid = %d and ttype in ( %d, %d, %d )",
-                intval($orig_post['id']),
-                intval(TERM_OBJ_POST),
-                intval($profile_uid),
-                intval(TERM_UNKNOWN),
-                intval(TERM_FILE),
-                intval(TERM_COMMUNITYTAG)
-            );
-            if ($t) {
-                if (!isset($post_tags)) {
-                    $post_tags = [];
-                }
-
-                foreach ($t as $t1) {
-                    $post_tags[] = array(
-                        'uid' => $profile_uid,
-                        'ttype' => $t1['ttype'],
-                        'otype' => TERM_OBJ_POST,
-                        'term' => $t1['term'],
-                        'url' => $t1['url'],
-                    );
-                }
-            }
-        }
-
-
-        $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0);
-        $item_wall = ((isset($_REQUEST['type']) && ($_REQUEST['type'] === 'wall' || $_REQUEST['type'] === 'wall-comment')) ? 1 : 0);
-        $item_origin = (($origin) ? 1 : 0);
-        $item_nocomment = ((isset($item_nocomment)) ? $item_nocomment : $nocomment);
-
-
-        // determine if this is a wall post
-
-        if ($parent) {
-            $item_wall = $parent_item['item_wall'];
-        } else {
-            if (!$webpage) {
-                $item_wall = 1;
-            }
-        }
-
-
-        if ($moderated) {
-            $item_blocked = ITEM_MODERATED;
-        }
-
-
-        if (!strlen($verb)) {
-            $verb = ACTIVITY_POST;
-        }
-
-        $notify_type = (($parent) ? 'comment-new' : 'wall-new');
-
-        if (!(isset($mid) && $mid)) {
-            if ($message_id) {
-                $mid = $message_id;
-            } else {
-                $uuid = new_uuid();
-                $mid = z_root() . '/item/' . $uuid;
-            }
-        }
-
-
-        if ($is_poll) {
-            $poll = [
-                'question' => $body,
-                'answers' => $_REQUEST['poll_answers'],
-                'multiple_answers' => $_REQUEST['poll_multiple_answers'],
-                'expire_value' => $_REQUEST['poll_expire_value'],
-                'expire_unit' => $_REQUEST['poll_expire_unit']
-            ];
-            $obj = $this->extract_poll_data($poll, ['item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny]);
-        } else {
-            $obj = $this->extract_bb_poll_data($body, ['item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny]);
-        }
-
-
-        if ($obj) {
-            $obj['url'] = $obj['id'] = $mid;
-            $obj['attributedTo'] = Channel::url($channel);
-            $datarray['obj'] = $obj;
-            $obj_type = 'Question';
-            if ($obj['endTime']) {
-                $d = datetime_convert('UTC', 'UTC', $obj['endTime']);
-                if ($d > NULL_DATE) {
-                    $comments_closed = $d;
-                }
-            }
-        }
-
-        if (!$parent_mid) {
-            $parent_mid = $mid;
-        }
-
-        if ($parent_item) {
-            $parent_mid = $parent_item['mid'];
-        }
-
-
-        // Fallback so that we alway have a thr_parent
-
-        if (!$thr_parent) {
-            $thr_parent = $mid;
-        }
-
-
-        $item_thread_top = ((!$parent) ? 1 : 0);
-
-
-        // fix permalinks for cards, etc.
-
-        if ($webpage == ITEM_TYPE_CARD) {
-            $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid);
-        }
-        if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) {
-            $r = q(
-                "select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1",
-                intval($parent_item['id'])
-            );
-            if ($r) {
-                $plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v'];
-            }
-        }
-
-        if ($webpage == ITEM_TYPE_ARTICLE) {
-            $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid);
-        }
-        if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_ARTICLE)) {
-            $r = q(
-                "select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.iid = %d limit 1",
-                intval($parent_item['id'])
-            );
-            if ($r) {
-                $plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . $r[0]['v'];
-            }
-        }
-
-        if ((!(isset($plink) && $plink)) && $item_thread_top) {
-            $plink = z_root() . '/item/' . $uuid;
-        }
-
-        if (array_path_exists('obj/id', $datarray)) {
-            $datarray['obj']['id'] = $mid;
-        }
-
-		if ($private && !$parent) {
-			if ( intval($private) === 1 && (!$str_group_allow) && in_array(substr_count($str_contact_allow,'<'), [ 1, 2 ])) {
-				$private = 2;
-			}
-		}
-
-        $datarray['aid'] = $channel['channel_account_id'];
-        $datarray['uid'] = $profile_uid;
-        $datarray['uuid'] = $uuid;
-        $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']);
-        $datarray['author_xchan'] = $observer['xchan_hash'];
-        $datarray['created'] = $created;
-        $datarray['edited'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
-        $datarray['expires'] = $expires;
-        $datarray['commented'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
-        $datarray['received'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
-        $datarray['changed'] = (($orig_post && (!intval($orig_post['item_unpublished']))) ? datetime_convert() : $created);
-        $datarray['comments_closed'] = $comments_closed;
-        $datarray['mid'] = $mid;
-        $datarray['parent_mid'] = $parent_mid;
-        $datarray['mimetype'] = $mimetype;
-        $datarray['title'] = $title;
-        $datarray['summary'] = $summary;
-        $datarray['body'] = $body;
-        $datarray['app'] = $app;
-        $datarray['location'] = $location;
-        $datarray['coord'] = $coord;
-        $datarray['verb'] = $verb;
-        $datarray['obj_type'] = $obj_type;
-        $datarray['allow_cid'] = $str_contact_allow;
-        $datarray['allow_gid'] = $str_group_allow;
-        $datarray['deny_cid'] = $str_contact_deny;
-        $datarray['deny_gid'] = $str_group_deny;
-        $datarray['attach'] = $attachments;
-        $datarray['thr_parent'] = $thr_parent;
-        $datarray['postopts'] = $postopts;
-        $datarray['item_unseen'] = intval($item_unseen);
-        $datarray['item_wall'] = intval($item_wall);
-        $datarray['item_origin'] = intval($item_origin);
-        $datarray['item_type'] = $webpage;
-        $datarray['item_private'] = intval($private);
-        $datarray['item_thread_top'] = intval($item_thread_top);
-        $datarray['item_unseen'] = intval($item_unseen);
-        $datarray['item_starred'] = intval($item_starred);
-        $datarray['item_uplink'] = intval($item_uplink);
-        $datarray['item_consensus'] = 0;
-        $datarray['item_notshown'] = intval($item_notshown);
-        $datarray['item_nsfw'] = intval($item_nsfw);
-        $datarray['item_relay'] = intval($item_relay);
-        $datarray['item_mentionsme'] = intval($item_mentionsme);
-        $datarray['item_nocomment'] = intval($item_nocomment);
-        $datarray['item_obscured'] = intval($item_obscured);
-        $datarray['item_verified'] = intval($item_verified);
-        $datarray['item_retained'] = intval($item_retained);
-        $datarray['item_rss'] = intval($item_rss);
-        $datarray['item_deleted'] = intval($item_deleted);
-        $datarray['item_hidden'] = intval($item_hidden);
-        $datarray['item_unpublished'] = intval($item_unpublished);
-        $datarray['item_delayed'] = intval($item_delayed);
-        $datarray['item_pending_remove'] = intval($item_pending_remove);
-        $datarray['item_blocked'] = intval($item_blocked);
-        $datarray['layout_mid'] = $layout_mid;
-        $datarray['public_policy'] = $public_policy;
-        $datarray['comment_policy'] = ((is_numeric($comment_policy)) ? map_scope($comment_policy) : $comment_policy); // only map scope if it is numeric, otherwise use what we have
-        $datarray['term'] = $post_tags;
-        $datarray['plink'] = $plink;
-        $datarray['route'] = $route;
-        $datarray['replyto'] = $replyto;
-
-        // A specific ACL over-rides public_policy completely
-
-        if (!empty_acl($datarray)) {
-            $datarray['public_policy'] = '';
-        }
-
-        if ($iconfig) {
-            $datarray['iconfig'] = $iconfig;
-        }
-        if ($private) {
-            IConfig::set($datarray, 'ocap', 'relay', $token);
-        }
-
-        if (!array_key_exists('obj', $datarray)) {
-            $copy = $datarray;
-            $copy['author'] = $observer;
-            $datarray['obj'] = Activity::encode_item($copy, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
-            $recips = [];
-            $i = $datarray['obj'];
-            if ($i['to']) {
-                $recips['to'] = $i['to'];
-            }
-            if ($i['cc']) {
-                $recips['cc'] = $i['cc'];
-            }
-            IConfig::Set($datarray, 'activitypub', 'recips', $recips);
-        }
-
-        Activity::rewrite_mentions($datarray);
-
-        // preview mode - prepare the body for display and send it via json
-
-        if ($preview) {
-            require_once('include/conversation.php');
-
-            $datarray['owner'] = $owner_xchan;
-            $datarray['author'] = $observer;
-            $datarray['attach'] = json_encode($datarray['attach']);
-            $o = conversation(array($datarray), 'search', false, 'preview');
-            //      logger('preview: ' . $o, LOGGER_DEBUG);
-            echo json_encode(array('preview' => $o));
-            killme();
-        }
-
-        // Let 'post_local' event listeners know if this is an edit.
-        // We will unset it immediately afterward.
-
-        if ($orig_post) {
-            $datarray['edit'] = true;
-        }
-
-        // suppress duplicates, *unless* you're editing an existing post. This could get picked up
-        // as a duplicate if you're editing it very soon after posting it initially and you edited
-        // some attribute besides the content, such as title or categories.
-
-        if (PConfig::Get($profile_uid, 'system', 'suppress_duplicates', true) && (!$orig_post)) {
-            $z = q(
-                "select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1",
-                intval($profile_uid),
-                db_utcnow(),
-                db_quoteinterval('2 MINUTE'),
-                dbesc($body)
-            );
-
-            if ($z) {
-                $datarray['cancel'] = 1;
-                notice(t('Duplicate post suppressed.') . EOL);
-                logger('Duplicate post. Cancelled.');
-            }
-        }
-
-        Hook::call('post_local', $datarray);
-
-        // This is no longer needed
-        unset($datarray['edit']);
-
-        if (x($datarray, 'cancel')) {
-            logger('mod_item: post cancelled by plugin or duplicate suppressed.');
-            if ($return_path) {
-                goaway(z_root() . "/" . $return_path);
-            }
-            if ($api_source) {
-                return (['success' => false, 'message' => 'operation cancelled']);
-            }
-            $json = array('cancel' => 1);
-            $json['reload'] = z_root() . '/' . $_REQUEST['jsreload'];
-            json_return_and_die($json);
-        }
-
-
-        if (mb_strlen($datarray['title']) > 191) {
-            $datarray['title'] = mb_substr($datarray['title'], 0, 191);
-        }
-
-        if ($webpage) {
-            IConfig::Set(
-                $datarray,
-                'system',
-                webpage_to_namespace($webpage),
-                (($pagetitle) ? $pagetitle : basename($datarray['mid'])),
-                true
-            );
-        } elseif ($namespace) {
-            IConfig::Set(
-                $datarray,
-                'system',
-                $namespace,
-                (($remote_id) ? $remote_id : basename($datarray['mid'])),
-                true
-            );
-        }
-
-        if (intval($datarray['item_unpublished'])) {
-            $draft_msg = t('Draft saved. Use Drafts app to continue editing.');
-        }
-
-        if ($orig_post) {
-            $datarray['id'] = $post_id;
-
-            $x = item_store_update($datarray, $execflag);
-            if (!$parent) {
-                $r = q(
-                    "select * from item where id = %d",
-                    intval($post_id)
-                );
-                if ($r) {
-                    xchan_query($r);
-                    $sync_item = fetch_post_tags($r);
-                    Libsync::build_sync_packet($profile_uid, array('item' => array(encode_item($sync_item[0], true))));
-                }
-            }
-            if (!$nopush) {
-                Run::Summon(['Notifier', 'edit_post', $post_id]);
-            }
-
-            if ($api_source) {
-                return ($x);
-            }
-
-
-            if (intval($datarray['item_unpublished'])) {
-                info($draft_msg);
-            }
-
-
-            if ((x($_REQUEST, 'return')) && strlen($return_path)) {
-                logger('return: ' . $return_path);
-                goaway(z_root() . "/" . $return_path);
-            }
-            killme();
-        } else {
-            $post_id = 0;
-        }
-
-        $post = item_store($datarray, $execflag);
-
-        if ($pub_copy) {
-            info(t('Your comment has been posted.') . EOL);
-        }
-
-        $post_id = $post['item_id'];
-        $datarray = $post['item'];
-
-
-        if ($post_id) {
-            logger('mod_item: saved item ' . $post_id);
-
-            if ($parent) {
-                // prevent conversations which you are involved from being expired
-
-                if (local_channel()) {
-                    retain_item($parent);
-                }
-
-                // only send comment notification if this is a wall-to-wall comment and not a DM,
-                // otherwise it will happen during delivery
-
-                if (($datarray['owner_xchan'] != $datarray['author_xchan']) && (intval($parent_item['item_wall'])) && intval($datarray['item_private']) != 2) {
-                    Enotify::submit(array(
-                        'type' => NOTIFY_COMMENT,
-                        'from_xchan' => $datarray['author_xchan'],
-                        'to_xchan' => $datarray['owner_xchan'],
-                        'item' => $datarray,
-                        'link' => z_root() . '/display/' . gen_link_id($datarray['mid']),
-                        'verb' => ACTIVITY_POST,
-                        'otype' => 'item',
-                        'parent' => $parent,
-                        'parent_mid' => $parent_item['mid']
-                    ));
-                }
-            } else {
-                $parent = $post_id;
-
-                if (($datarray['owner_xchan'] != $datarray['author_xchan']) && ($datarray['item_type'] == ITEM_TYPE_POST)) {
-                    Enotify::submit(array(
-                        'type' => NOTIFY_WALL,
-                        'from_xchan' => $datarray['author_xchan'],
-                        'to_xchan' => $datarray['owner_xchan'],
-                        'item' => $datarray,
-                        'link' => z_root() . '/display/' . gen_link_id($datarray['mid']),
-                        'verb' => ACTIVITY_POST,
-                        'otype' => 'item'
-                    ));
-                }
-
-                if ($uid && $uid == $profile_uid && (is_item_normal($datarray))) {
-                    q(
-                        "update channel set channel_lastpost = '%s' where channel_id = %d",
-                        dbesc(datetime_convert()),
-                        intval($uid)
-                    );
-                }
-            }
-
-            // photo comments turn the corresponding item visible to the profile wall
-            // This way we don't see every picture in your new photo album posted to your wall at once.
-            // They will show up as people comment on them.
-
-            if (intval($parent_item['item_hidden'])) {
-                $r = q(
-                    "UPDATE item SET item_hidden = 0 WHERE id = %d",
-                    intval($parent_item['id'])
-                );
-            }
-        } else {
-            logger('mod_item: unable to retrieve post that was just stored.');
-            notice(t('System error. Post not saved.') . EOL);
-            if ($return_path) {
-                goaway(z_root() . "/" . $return_path);
-            }
-            if ($api_source) {
-                return (['success' => false, 'message' => 'system error']);
-            }
-            killme();
-        }
-
-        if (($parent) && ($parent != $post_id)) {
-            // Store the comment signature information in case we need to relay to Diaspora
-            //$ditem = $datarray;
-            //$ditem['author'] = $observer;
-            //store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0));
-        } else {
-            $r = q(
-                "select * from item where id = %d",
-                intval($post_id)
-            );
-            if ($r) {
-                xchan_query($r);
-                $sync_item = fetch_post_tags($r);
-                Libsync::build_sync_packet($profile_uid, array('item' => array(encode_item($sync_item[0], true))));
-            }
-        }
-
-        $datarray['id'] = $post_id;
-        $datarray['llink'] = z_root() . '/display/' . gen_link_id($datarray['mid']);
-
-        Hook::call('post_local_end', $datarray);
-
-        if ($groupww) {
-            $nopush = false;
-        }
-
-        if (!$nopush) {
-            Run::Summon(['Notifier', $notify_type, $post_id]);
-        }
-        logger('post_complete');
-
-        if ($moderated) {
-            info(t('Your post/comment is awaiting approval.') . EOL);
-        }
-
-        // figure out how to return, depending on from whence we came
-
-        if ($api_source) {
-            return $post;
-        }
-
-        if (intval($datarray['item_unpublished'])) {
-            info($draft_msg);
-        }
-
-        if ($return_path) {
-            goaway(z_root() . "/" . $return_path);
-        }
-
-        $json = array('success' => 1);
-        if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
-            $json['reload'] = z_root() . '/' . $_REQUEST['jsreload'];
-        }
-
-        logger('post_json: ' . print_r($json, true), LOGGER_DEBUG);
-
-        echo json_encode($json);
-        killme();
-        // NOTREACHED
-    }
-
-
-    public function get()
-    {
-
-
-        if ($this->return_404) {
-            notice(t('Not found'));
-            return;
-        }
-
-        if ((!local_channel()) && (!remote_channel())) {
-            return;
-        }
-
-        // allow pinned items to be dropped. 'pin-' was prepended to the id of these
-        // items so that they would have a unique html id even if the pinned item
-        // was also displayed in a normal conversation on the same web page.
-
-        $drop_id = str_replace('pin-', '', argv(2));
-
-        if ((argc() == 3) && (argv(1) === 'drop') && intval($drop_id)) {
-            $i = q(
-                "select * from item where id = %d limit 1",
-                intval($drop_id)
-            );
-
-            if ($i) {
-                $can_delete = false;
-                $local_delete = false;
-                $regular_delete = false;
-
-                if (local_channel() && local_channel() == $i[0]['uid']) {
-                    $local_delete = true;
-                }
-
-                $ob_hash = get_observer_hash();
-                if ($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) {
-                    $can_delete = true;
-                    $regular_delete = true;
-                }
-
-                // The site admin can delete any post/item on the site.
-                // If the item originated on this site+channel the deletion will propagate downstream.
-                // Otherwise just the local copy is removed.
-
-                if (is_site_admin()) {
-                    $local_delete = true;
-                    if (intval($i[0]['item_origin'])) {
-                        $can_delete = true;
-                    }
-                }
-
-
-                if (!($can_delete || $local_delete)) {
-                    notice(t('Permission denied.') . EOL);
-                    return;
-                }
-
-                if ($i[0]['resource_type'] === 'event') {
-                    // delete and sync the event separately
-                    $r = q(
-                        "SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                        dbesc($i[0]['resource_id']),
-                        intval($i[0]['uid'])
-                    );
-                    if ($r && $regular_delete) {
-                        $sync_event = $r[0];
-                        q(
-                            "delete from event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-                            dbesc($i[0]['resource_id']),
-                            intval($i[0]['uid'])
-                        );
-                        $sync_event['event_deleted'] = 1;
-                        Libsync::build_sync_packet($i[0]['uid'], array('event' => array($sync_event)));
-                    }
-                }
-
-                if ($i[0]['resource_type'] === 'photo') {
-                    attach_delete($i[0]['uid'], $i[0]['resource_id'], true);
-                    $ch = Channel::from_id($i[0]['uid']);
-                    if ($ch && $regular_delete) {
-                        $sync = attach_export_data($ch, $i[0]['resource_id'], true);
-                        if ($sync) {
-                            Libsync::build_sync_packet($i[0]['uid'], array('file' => array($sync)));
-                        }
-                    }
-                }
-
-
-                // if this is a different page type or it's just a local delete
-                // but not by the item author or owner, do a simple deletion
-
-                $complex = false;
-
-                if (intval($i[0]['item_type']) || ($local_delete && (!$can_delete))) {
-                    drop_item($i[0]['id']);
-                } else {
-                    // complex deletion that needs to propagate and be performed in phases
-                    drop_item($i[0]['id'], true, DROPITEM_PHASE1);
-                    $complex = true;
-                }
-
-                $r = q(
-                    "select * from item where id = %d",
-                    intval($i[0]['id'])
-                );
-                if ($r) {
-                    xchan_query($r);
-                    $sync_item = fetch_post_tags($r);
-                    Libsync::build_sync_packet($i[0]['uid'], array('item' => array(encode_item($sync_item[0], true))));
-                }
-
-                if ($complex) {
-                    tag_deliver($i[0]['uid'], $i[0]['id']);
-                }
-            }
-        }
-    }
-
-
-    public function item_check_service_class($channel_id, $iswebpage)
-    {
-        $ret = array('success' => false, 'message' => '');
-
-        if ($iswebpage) {
-            $r = q(
-                "select count(i.id)  as total from item i 
-				right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id )  
-				and i.parent=i.id and i.item_type = %d and i.item_deleted = 0 and i.uid= %d ",
-                intval(ITEM_TYPE_WEBPAGE),
-                intval($channel_id)
-            );
-        } else {
-            $r = q(
-                "select count(id) as total from item where parent = id and item_wall = 1 and uid = %d " . item_normal(),
-                intval($channel_id)
-            );
-        }
-
-        if (!$r) {
-            $ret['message'] = t('Unable to obtain post information from database.');
-            return $ret;
-        }
-
-
-        if (!$iswebpage) {
-            $max = engr_units_to_bytes(ServiceClass::fetch($channel_id, 'total_items'));
-            if (!ServiceClass::allows($channel_id, 'total_items', $r[0]['total'])) {
-                $result['message'] .= ServiceClass::upgrade_message() . sprintf(t('You have reached your limit of %1$.0f top level posts.'), $max);
-                return $result;
-            }
-        } else {
-            $max = engr_units_to_bytes(ServiceClass::fetch($channel_id, 'total_pages'));
-            if (!ServiceClass::allows($channel_id, 'total_pages', $r[0]['total'])) {
-                $result['message'] .= ServiceClass::upgrade_message() . sprintf(t('You have reached your limit of %1$.0f webpages.'), $max);
-                return $result;
-            }
-        }
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-    public function extract_bb_poll_data(&$body, $item)
-    {
-
-        $multiple = false;
-
-        if (strpos($body, '[/question]') === false && strpos($body, '[/answer]') === false) {
-            return false;
-        }
-        if (strpos($body, '[nobb]') !== false) {
-            return false;
-        }
-
-        $obj = [];
-        $ptr = [];
-        $matches = null;
-        $obj['type'] = 'Question';
-
-        if (preg_match_all('/\[answer\](.*?)\[\/answer\]/ism', $body, $matches, PREG_SET_ORDER)) {
-            foreach ($matches as $match) {
-                $ptr[] = ['name' => $match[1], 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]];
-                $body = str_replace('[answer]' . $match[1] . '[/answer]', EMPTY_STR, $body);
-            }
-        }
-
-        $matches = null;
-
-        if (preg_match('/\[question\](.*?)\[\/question\]/ism', $body, $matches)) {
-            $obj['content'] = bbcode($matches[1]);
-            $body = str_replace('[question]' . $matches[1] . '[/question]', $matches[1], $body);
-            $obj['oneOf'] = $ptr;
-        }
-
-        $matches = null;
-
-        if (preg_match('/\[question=multiple\](.*?)\[\/question\]/ism', $body, $matches)) {
-            $obj['content'] = bbcode($matches[1]);
-            $body = str_replace('[question=multiple]' . $matches[1] . '[/question]', $matches[1], $body);
-            $obj['anyOf'] = $ptr;
-        }
-
-        $matches = null;
-
-        if (preg_match('/\[ends\](.*?)\[\/ends\]/ism', $body, $matches)) {
-            $obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', $matches[1], ATOM_TIME);
-            $body = str_replace('[ends]' . $matches[1] . '[/ends]', EMPTY_STR, $body);
-        }
-
-        if ($item['item_private']) {
-            $obj['to'] = Activity::map_acl($item);
-        } else {
-            $obj['to'] = [ACTIVITY_PUBLIC_INBOX];
-        }
-
-        return $obj;
-    }
-
-    public function extract_poll_data($poll, $item)
-    {
-
-        $multiple = intval($poll['multiple_answers']);
-        $expire_value = intval($poll['expire_value']);
-        $expire_unit = $poll['expire_unit'];
-        $question = $poll['question'];
-        $answers = $poll['answers'];
-
-        $obj = [];
-        $ptr = [];
-        $obj['type'] = 'Question';
-        $obj['content'] = bbcode($question);
-
-        foreach ($answers as $answer) {
-            if (trim($answer)) {
-                $ptr[] = ['name' => escape_tags($answer), 'type' => 'Note', 'replies' => ['type' => 'Collection', 'totalItems' => 0]];
-            }
-        }
-
-        if ($multiple) {
-            $obj['anyOf'] = $ptr;
-        } else {
-            $obj['oneOf'] = $ptr;
-        }
-
-        $obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', 'now + ' . $expire_value . ' ' . $expire_unit, ATOM_TIME);
-
-        if ($item['item_private']) {
-            $obj['to'] = Activity::map_acl($item);
-        } else {
-            $obj['to'] = [ACTIVITY_PUBLIC_INBOX];
-        }
-
-        return $obj;
-    }
-}
diff --git a/Zotlabs/Module/Jwks.php b/Zotlabs/Module/Jwks.php
deleted file mode 100644
index 3e0dd544f..000000000
--- a/Zotlabs/Module/Jwks.php
+++ /dev/null
@@ -1,62 +0,0 @@
- base64url_encode($e),
-                'n' => base64url_encode($m),
-                'kty' => 'RSA',
-                'kid' => '0',
-            ]
-        ];
-
-
-        $ret = [
-            'keys' => $keys
-        ];
-
-        if (argc() > 1) {
-            $entry = intval(argv(1));
-            if ($keys[$entry]) {
-                unset($keys[$entry]['kid']);
-                json_return_and_die($keys[$entry], 'application/jwk+json');
-            }
-        }
-
-        json_return_and_die($ret, 'application/jwk-set+json');
-    }
-}
diff --git a/Zotlabs/Module/Lang.php b/Zotlabs/Module/Lang.php
deleted file mode 100644
index ffe493ee0..000000000
--- a/Zotlabs/Module/Lang.php
+++ /dev/null
@@ -1,30 +0,0 @@
-Language App (Not Installed):
          ';
-                $o .= t('Change UI language');
-                return $o;
-            }
-        }
-
-        Navbar::set_selected('Language');
-        return lang_selector();
-    }
-}
diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php
deleted file mode 100644
index 659c91844..000000000
--- a/Zotlabs/Module/Layouts.php
+++ /dev/null
@@ -1,219 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-    public function get()
-    {
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $which = argv(1);
-
-        $_SESSION['return_url'] = App::$query_string;
-
-        $uid = local_channel();
-        $owner = 0;
-        $channel = null;
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                $uid = $owner = intval($sys['channel_id']);
-                $channel = $sys;
-                $observer = $sys;
-            }
-        }
-
-        if (!$owner) {
-            // Figure out who the page owner is.
-            $r = q(
-                "select channel_id from channel where channel_address = '%s'",
-                dbesc($which)
-            );
-            if ($r) {
-                $owner = intval($r[0]['channel_id']);
-            }
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        // Block design features from visitors
-
-        if ((!$uid) || ($uid != $owner)) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        // Get the observer, check their permissions
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        // This feature is not exposed in redbasic ui since it is not clear why one would want to
-        // download a json encoded pdl file - we dont have a possibility to import it.
-        // Use the buildin share/install feature instead.
-
-        if ((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
-            $r = q(
-                "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
-				left join item on item.id = iconfig.iid 
-				where uid = %d and mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc",
-                intval($owner),
-                dbesc(argv(3))
-            );
-            if ($r) {
-                header('Content-type: application/x-hubzilla-layout');
-                header('Content-Disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"');
-                echo json_encode($r);
-                killme();
-            }
-        }
-
-        // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
-        // Nickname is set to the observers xchan, and profile_uid to the owners.
-        // This lets you post pages at other people's channels.
-
-        $x = array(
-            'webpage' => ITEM_TYPE_PDL,
-            'is_owner' => true,
-            'nickname' => App::$profile['channel_address'],
-            'showacl' => false,
-            'hide_voting' => true,
-            'hide_future' => true,
-            'hide_expire' => true,
-            'hide_location' => true,
-            'hide_weblink' => true,
-            'hide_attach' => true,
-            'hide_preview' => true,
-            'disable_comments' => true,
-            'ptlabel' => t('Layout Name'),
-            'profile_uid' => intval($owner),
-            'expanded' => true,
-            'placeholdertitle' => t('Layout Description (Optional)'),
-            'novoting' => true,
-            'bbco_autocomplete' => 'comanche'
-        );
-
-        if ($_REQUEST['title']) {
-            $x['title'] = $_REQUEST['title'];
-        }
-        if ($_REQUEST['body']) {
-            $x['body'] = $_REQUEST['body'];
-        }
-        if ($_REQUEST['pagetitle']) {
-            $x['pagetitle'] = $_REQUEST['pagetitle'];
-        }
-
-        $editor = status_editor($x);
-
-        $r = q(
-            "select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig 
-			left join item on iconfig.iid = item.id
-			where uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' and item_type = %d order by item.created desc",
-            intval($owner),
-            intval(ITEM_TYPE_PDL)
-        );
-
-        $pages = null;
-
-        if ($r) {
-            $pages = [];
-            foreach ($r as $rr) {
-                $element_arr = array(
-                    'type' => 'layout',
-                    'title' => $rr['title'],
-                    'body' => $rr['body'],
-                    'created' => $rr['created'],
-                    'edited' => $rr['edited'],
-                    'mimetype' => $rr['mimetype'],
-                    'pagetitle' => urldecode($rr['v']),
-                    'mid' => $rr['mid']
-                );
-                $pages[$rr['iid']][] = array(
-                    'url' => $rr['iid'],
-                    'title' => urldecode($rr['v']),
-                    'descr' => $rr['title'],
-                    'mid' => $rr['mid'],
-                    'created' => $rr['created'],
-                    'edited' => $rr['edited'],
-                    'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
-                );
-            }
-        }
-
-        //Build the base URL for edit links
-        $url = z_root() . '/editlayout/' . $which;
-
-        $o .= replace_macros(Theme::get_template('layoutlist.tpl'), array(
-            '$title' => t('Layouts'),
-            '$create' => t('Create'),
-            '$help' => '', // array('text' => t('Help'), 'url' => 'help/comanche', 'title' => t('Comanche page description language help')),
-            '$editor' => $editor,
-            '$baseurl' => $url,
-            '$name' => t('Layout Name'),
-            '$descr' => t('Layout Description'),
-            '$created' => t('Created'),
-            '$edited' => t('Edited'),
-            '$edit' => t('Edit'),
-            '$share' => t('Share'),
-            '$download' => t('Download PDL file'),
-            '$pages' => $pages,
-            '$channel' => $which,
-            '$view' => t('View'),
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
deleted file mode 100644
index 84abe972f..000000000
--- a/Zotlabs/Module/Like.php
+++ /dev/null
@@ -1,317 +0,0 @@
- 1 && $test[0] === 'Undo') {
-            $undo = true;
-            $activity = $test[1];
-        }
-
-        if (! in_array($activity, [ 'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept' ])) {
-            killme();
-        }
-
-        $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]);
-
-        // Check for when target is something besides messages, where argv(1) is the type of thing
-        // and  argv(2) is an identifier of things of that type
-        // We currently only recognise 'profile' but other types could be handled
-
-
-        if (! $observer) {
-            killme();
-        }
-
-        // this is used to like an item or comment
-
-        $item_id = ((argc() == 2) ? notags(trim(argv(1))) : 0);
-
-        logger('like: undo: ' . (($undo) ? 'true' : 'false'));
-        logger('like: verb ' . $activity . ' item ' . $item_id, LOGGER_DEBUG);
-
-        // get the item. Allow linked photos (which are normally hidden) to be liked
-
-        $r = q(
-            "SELECT * FROM item WHERE id = %d 
-			and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 
-			and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
-            intval($item_id)
-        );
-
-        // if interacting with a pubstream item,
-        // create a copy of the parent in your stream.
-
-        if ($r) {
-            if (local_channel() && (! Channel::is_system(local_channel()))) {
-                $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ];
-            }
-        }
-
-        if (! $item_id || (! $r)) {
-            logger('like: no item ' . $item_id);
-            killme();
-        }
-
-        xchan_query($r, true);
-
-        $item = array_shift($r);
-
-        $owner_uid = $item['uid'];
-        $owner_aid = $item['aid'];
-
-        $can_comment = false;
-        if ((array_key_exists('owner', $item)) && intval($item['owner']['abook_self'])) {
-            $can_comment = perm_is_allowed($item['uid'], $observer['xchan_hash'], 'post_comments');
-        } else {
-            $can_comment = can_comment_on_post($observer['xchan_hash'], $item);
-        }
-
-        if (! $can_comment) {
-            notice(t('Permission denied') . EOL);
-            killme();
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($item['owner_xchan'])
-        );
-
-        if ($r) {
-            $thread_owner = array_shift($r);
-        } else {
-            killme();
-        }
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($item['author_xchan'])
-        );
-        if ($r) {
-            $item_author = array_shift($r);
-        } else {
-            killme();
-        }
-
-        if ($undo) {
-            $r = q(
-                "select * from item where thr_parent = '%s' and verb = '%s' and author_xchan = '%s' and uid = %d and item_deleted = 0 limit 1",
-                dbesc($item['thr_parent']),
-                dbesc($activity),
-                dbesc($observer['xchan_hash']),
-                intval($owner_uid)
-            );
-
-            xchan_query($r, true);
-            $r = fetch_post_tags($r, true);
-            $r[0]['obj'] = json_decode($r[0]['obj'], true);
-            $object = Activity::encode_activity($r[0], true);
-
-            // do not do either a federated or hard delete on the original reaction
-            // as we are going to send an Undo to perform this task
-            // just set item_deleted to update the local conversation
-
-            $retval = q(
-                "update item set item_deleted = 1 where id = %d",
-                intval($r[0]['id'])
-            );
-        } else {
-            $object = Activity::fetch_item([ 'id' => $item['mid'] ]);
-        }
-
-        if (! $object) {
-            killme();
-        }
-
-        $uuid = new_uuid();
-
-        // we have everything we need - start building our new item
-
-        $arr = [];
-
-        $arr['uuid']  = $uuid;
-        $arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/' ) . $uuid;
-
-        $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
-        if ($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
-            $post_type = t('event');
-        }
-
-        $objtype = $item['obj_type'];
-
-        $body = $item['body'];
-
-
-        if (! intval($item['item_thread_top'])) {
-            $post_type = 'comment';
-        }
-
-        $arr['item_origin'] = 1;
-        $arr['item_notshown'] = 1;
-        $arr['item_type'] = $item['item_type'];
-
-        if (intval($item['item_wall'])) {
-            $arr['item_wall'] = 1;
-        }
-
-        // if this was a linked photo and was hidden, unhide it and distribute it.
-
-        if (intval($item['item_hidden'])) {
-            $r = q(
-                "update item set item_hidden = 0 where id = %d",
-                intval($item['id'])
-            );
-
-            $r = q(
-                "select * from item where id = %d",
-                intval($item['id'])
-            );
-            if ($r) {
-                xchan_query($r);
-                $sync_item = fetch_post_tags($r);
-                Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
-            }
-
-            Run::Summon([ 'Notifier','wall-new',$item['id'] ]);
-        }
-
-
-        if ($undo) {
-            $arr['body'] = t('Undo a previous action');
-            $arr['item_notshown'] = 1;
-        } else {
-            if ($activity === 'Like') {
-                $bodyverb = t('%1$s likes %2$s\'s %3$s');
-            }
-            if ($activity === 'Dislike') {
-                $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-            }
-            if ($activity === 'Accept') {
-                $bodyverb = t('%1$s is attending %2$s\'s %3$s');
-            }
-            if ($activity === 'Reject') {
-                $bodyverb = t('%1$s is not attending %2$s\'s %3$s');
-            }
-            if ($activity === 'TentativeAccept') {
-                $bodyverb = t('%1$s may attend %2$s\'s %3$s');
-            }
-
-            if (! isset($bodyverb)) {
-                killme();
-            }
-
-            $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
-            $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
-            $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
-
-            $arr['body'] = sprintf($bodyverb, $alink, $ulink, $plink);
-        }
-
-
-        if (local_channel() && $activity === 'Accept') {
-            event_addtocal($item['id'], $channel['channel_id']);
-        }
-
-        $arr['parent']       = $item['id'];
-        $arr['thr_parent']   = $item['mid'];
-        $allow_cid       = $item['allow_cid'];
-        $allow_gid       = $item['allow_gid'];
-        $deny_cid        = $item['deny_cid'];
-        $deny_gid        = $item['deny_gid'];
-        $private         = $item['private'];
-
-        $arr['aid']          = $owner_aid;
-        $arr['uid']          = $owner_uid;
-
-        $arr['item_flags']   = $item['item_flags'];
-        $arr['item_wall']    = $item['item_wall'];
-        $arr['parent_mid']   = $item['mid'];
-        $arr['owner_xchan']  = $thread_owner['xchan_hash'];
-        $arr['author_xchan'] = $observer['xchan_hash'];
-
-
-
-        $arr['verb']          = (($undo) ? 'Undo' : $activity);
-        $arr['obj_type']      = (($undo) ? $activity : $objtype);
-        $arr['obj']           = $object;
-
-        if ($target) {
-            $arr['tgt_type']  = $tgttype;
-            $arr['target']    = $target;
-        }
-
-        $arr['allow_cid']     = $allow_cid;
-        $arr['allow_gid']     = $allow_gid;
-        $arr['deny_cid']      = $deny_cid;
-        $arr['deny_gid']      = $deny_gid;
-        $arr['item_private']  = $private;
-
-        Hook::call('post_local', $arr);
-
-        $post = item_store($arr);
-        $post_id = $post['item_id'];
-
-        // save the conversation from expiration
-
-        if (local_channel() && array_key_exists('item', $post) && (intval($post['item']['id']) != intval($post['item']['parent']))) {
-            retain_item($post['item']['parent']);
-        }
-
-        $arr['id'] = $post_id;
-
-        Hook::call('post_local_end', $arr);
-
-        $r = q(
-            "select * from item where id = %d",
-            intval($post_id)
-        );
-        if ($r) {
-            xchan_query($r);
-            $sync_item = fetch_post_tags($r);
-            Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
-        }
-
-        Run::Summon([ 'Notifier', 'like', $post_id ]);
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
deleted file mode 100644
index 9e6a4fbfc..000000000
--- a/Zotlabs/Module/Linkinfo.php
+++ /dev/null
@@ -1,644 +0,0 @@
- true, 'nobody' => true]);
-        if ($result['success']) {
-            $hdrs = [];
-            $h = explode("\n", $result['header']);
-            foreach ($h as $l) {
-                list($k, $v) = array_map("trim", explode(":", trim($l), 2));
-                $hdrs[strtolower($k)] = $v;
-            }
-            if (array_key_exists('content-type', $hdrs)) {
-                $type = $hdrs['content-type'];
-            }
-            if ($type) {
-                if (stripos($type, 'image/') !== false) {
-                    $basename = basename($url);
-
-                    if ($zrl) {
-                        echo $br . '[zmg alt="' . $basename . '"]' . $url . '[/zmg]' . $br;
-                    } else {
-                        echo $br . '[img alt="' . $basename . '"]' . $url . '[/img]' . $br;
-                    }
-                    killme();
-                }
-                if ((stripos($type, 'video/') !== false) || ($type === 'application/ogg')) {
-                    $thumb = self::get_video_poster($url);
-                    if ($thumb) {
-                        if ($zrl) {
-                            echo $br . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . $br;
-                        } else {
-                            echo $br . '[video poster=\'' . $thumb . '\']' . $url . '[/video]' . $br;
-                        }
-                        killme();
-                    }
-                    if ($zrl) {
-                        echo $br . '[zvideo]' . $url . '[/zvideo]' . $br;
-                    } else {
-                        echo $br . '[video]' . $url . '[/video]' . $br;
-                    }
-                    killme();
-                }
-                if (stripos($type, 'audio/') !== false) {
-                    if ($zrl) {
-                        echo $br . '[zaudio]' . $url . '[/zaudio]' . $br;
-                    } else {
-                        echo $br . '[audio]' . $url . '[/audio]' . $br;
-                    }
-                    killme();
-                }
-                if (strtolower($type) === 'text/calendar') {
-                    $content = z_fetch_url($url, false, 0, array('novalidate' => true));
-                    if ($content['success']) {
-                        $ev = ical_to_ev($content['body']);
-                        if ($ev) {
-                            echo $br . format_event_bbcode($ev[0]) . $br;
-                            killme();
-                        }
-                    }
-                }
-                if (strtolower($type) === 'application/pdf' || strtolower($type) === 'application/x-pdf') {
-                    echo $br . '[embed]' . $url . '[/embed]' . $br;
-                    killme();
-                }
-            }
-        }
-
-        $template = $br . '[url=%s]%s[/url]%s' . $br;
-
-        $arr = array('url' => $url, 'text' => '');
-
-        Hook::call('parse_link', $arr);
-
-        if (strlen($arr['text'])) {
-            echo $arr['text'];
-            killme();
-        }
-
-        if ($process_oembed) {
-            $x = Oembed::process($url);
-            if ($x) {
-                echo $x;
-                killme();
-            }
-        }
-
-        if ($process_zotobj) {
-            $x = Activity::fetch($url, App::get_channel());
-            $y = null;
-            if (is_array($x)) {
-                if (ActivityStreams::is_an_actor($x['type']) && $x['id']) {
-                    if (check_siteallowed($x['id']) && check_channelallowed($x['id'])) {
-                        $url = $x['url'];
-                        if (is_array($url)) {
-                            $url = $url[0]['href'];
-                        }
-                        $name = (($x['name']) ? $x['name'] . ' (' . $x['preferredUsername'] . ')' : $x['preferredUsername']);
-
-                        if (array_path_exists('icon/url', $x)) {
-                            $text = $br . $br . '[zrl=' . $url . '][zmg=300x300]' . $x['icon']['url'] . '[/zmg][/zrl]';
-                        }
-                        $text .= $br . $br . '[zrl=' . $url . ']' . $name . '[/zrl]' . $br . $br;
-                        echo $text;
-                        killme();
-                    }
-                } else {
-                    $y = new ActivityStreams($x);
-                    if (
-                        $y->is_valid() && $y->type === 'Announce' && is_array($y->obj)
-                        && array_key_exists('object', $y->obj) && array_key_exists('actor', $y->obj)
-                    ) {
-                        // This is a relayed/forwarded Activity (as opposed to a shared/boosted object)
-                        // Reparse the encapsulated Activity and use that instead
-                        logger('relayed activity', LOGGER_DEBUG);
-                        $y = new ActivityStreams($y->obj);
-                    }
-                }
-
-                if ($y && $y->is_valid()) {
-                    $z = Activity::decode_note($y);
-                    $r = q(
-                        "select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_hash = '%s' OR hubloc_id_url = '%s'",
-                        dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor),
-                        dbesc(is_array($y->actor) ? $y->actor['id'] : $y->actor)
-                    );
-
-                    if ($r) {
-                        $r = Libzot::zot_record_preferred($r);
-                        if ($z) {
-                            $z['author_xchan'] = $r['hubloc_hash'];
-                        }
-                    }
-
-                    if ($z) {
-                        // do not allow somebody to embed a post that was blocked by the site admin
-                        // We *will* let them over-rule any blocks they created themselves
-
-                        if (check_siteallowed($r['hubloc_id_url']) && check_channelallowed($z['author_xchan'])) {
-                            $s = new Zlib\Share($z);
-                            echo $s->bbcode();
-                            killme();
-                        }
-                    }
-                }
-            }
-        }
-
-
-        if ($url && $title && $text) {
-            $text = $br . '[quote]' . trim($text) . '[/quote]' . $br;
-
-            $title = str_replace(array("\r", "\n"), array('', ''), $title);
-
-            $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
-
-            logger('linkinfo (unparsed): returns: ' . $result);
-
-            echo $result;
-            killme();
-        }
-
-        $siteinfo = self::parseurl_getsiteinfo($url);
-
-        // If the site uses this platform, use zrl rather than url so they get zids sent to them by default
-
-        if (is_matrix_url($url)) {
-            $template = str_replace('url', 'zrl', $template);
-        }
-
-        if ($siteinfo["title"] == "") {
-            echo sprintf($template, $url, $url, '') . $str_tags;
-            killme();
-        } else {
-            $text = $siteinfo["text"];
-            $title = $siteinfo["title"];
-        }
-
-        $image = "";
-
-        if (isset($siteinfo['images']) && is_array($siteinfo['images']) && count($siteinfo["images"])) {
-            /* Execute below code only if image is present in siteinfo */
-
-            $total_images = 0;
-            $max_images = get_config('system', 'max_bookmark_images');
-            if ($max_images === false) {
-                $max_images = 2;
-            } else {
-                $max_images = intval($max_images);
-            }
-
-            foreach ($siteinfo["images"] as $imagedata) {
-                if ($url) {
-                    $image .= sprintf('[url=%s]', $url);
-                }
-                $image .= '[img=' . $imagedata["width"] . 'x' . $imagedata["height"] . ']' . $imagedata["src"] . '[/img]';
-                if ($url) {
-                    $image .= '[/url]';
-                }
-                $image .= "\n";
-                $total_images++;
-                if ($max_images && $max_images >= $total_images) {
-                    break;
-                }
-            }
-        }
-
-        if (strlen($text)) {
-            $text = $br . '[quote]' . trim($text) . '[/quote]' . $br;
-        }
-
-        if ($image) {
-            $text = $br . $br . $image . $text;
-        }
-        $title = str_replace(array("\r", "\n"), array('', ''), $title);
-
-        $result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
-
-        logger('linkinfo: returns: ' . $result, LOGGER_DEBUG);
-
-        echo trim($result);
-        killme();
-    }
-
-
-    public static function deletexnode(&$doc, $node)
-    {
-        $xpath = new DomXPath($doc);
-        $list = $xpath->query("//" . $node);
-        foreach ($list as $child) {
-            $child->parentNode->removeChild($child);
-        }
-    }
-
-    public static function completeurl($url, $scheme)
-    {
-        $urlarr = parse_url($url);
-
-        if (isset($urlarr["scheme"])) {
-            return ($url);
-        }
-
-        $schemearr = parse_url($scheme);
-
-        $complete = $schemearr["scheme"] . "://" . $schemearr["host"];
-
-        if ($schemearr["port"] != "") {
-            $complete .= ":" . $schemearr["port"];
-        }
-
-        if (strpos($urlarr['path'], '/') !== 0) {
-            $complete .= '/';
-        }
-
-        $complete .= $urlarr["path"];
-
-        if ($urlarr["query"] != "") {
-            $complete .= "?" . $urlarr["query"];
-        }
-
-        if ($urlarr["fragment"] != "") {
-            $complete .= "#" . $urlarr["fragment"];
-        }
-
-        return ($complete);
-    }
-
-    public static function get_video_poster($url)
-    {
-
-        if (strpos($url, z_root() . '/cloud/') === false) {
-            return EMPTY_STR;
-        }
-        $m = parse_url($url, PHP_URL_PATH);
-        if ($m) {
-            // strip leading '/cloud/'
-            $m = substr($m, 7);
-        }
-        $nick = substr($m, 0, strpos($m, '/'));
-        $p = substr($m, strpos($m, '/') + 1);
-
-        // get the channel to check permissions
-
-        $u = Channel::from_username($nick);
-
-        if ($u && $p) {
-            $sql_extra = permissions_sql(intval($u['channel_id']));
-
-            $r = q(
-                "select hash, content from attach where display_path = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1",
-                dbesc($p),
-                intval($u['channel_id'])
-            );
-            if ($r) {
-                $path = dbunescbin($r[0]['content']);
-                if ($path && @file_exists($path . '.thumb')) {
-                    return z_root() . '/poster/' . $nick . '/' . $r[0]['hash'];
-                }
-            }
-        }
-        return EMPTY_STR;
-    }
-
-
-    public static function parseurl_getsiteinfo($url)
-    {
-        $siteinfo = [];
-
-
-        $result = z_fetch_url($url, false, 0, array('novalidate' => true));
-        if (!$result['success']) {
-            return $siteinfo;
-        }
-
-        $header = $result['header'];
-        $body = $result['body'];
-
-        // Check codepage in HTTP headers or HTML if not exist
-        $cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : '');
-        if (empty($cp)) {
-            $cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO');
-        }
-
-        $body = mb_convert_encoding($body, 'UTF-8', $cp);
-        $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
-
-		if (! $body) {
-			return $siteinfo;
-		}
-
-		try {
-		    $doc = new DOMDocument();
-			$doc->loadHTML($body);
-		} catch (Exception $e) {
-			return $siteinfo;
-		}
-		
-        self::deletexnode($doc, 'style');
-        self::deletexnode($doc, 'script');
-        self::deletexnode($doc, 'option');
-        self::deletexnode($doc, 'h1');
-        self::deletexnode($doc, 'h2');
-        self::deletexnode($doc, 'h3');
-        self::deletexnode($doc, 'h4');
-        self::deletexnode($doc, 'h5');
-        self::deletexnode($doc, 'h6');
-        self::deletexnode($doc, 'ol');
-        self::deletexnode($doc, 'ul');
-
-        $xpath = new DomXPath($doc);
-
-        $list = $xpath->query("//title");
-        foreach ($list as $node) {
-            $siteinfo["title"] = html_entity_decode($node->nodeValue, ENT_QUOTES, "UTF-8");
-        }
-
-        $list = $xpath->query("//meta[@name]");
-        foreach ($list as $node) {
-            $attr = [];
-            if ($node->attributes->length) {
-                foreach ($node->attributes as $attribute) {
-                    $attr[$attribute->name] = $attribute->value;
-                }
-            }
-
-            $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8");
-
-            switch (strtolower($attr["name"])) {
-                case "fulltitle":
-                    $siteinfo["title"] = trim($attr["content"]);
-                    break;
-                case "description":
-                    $siteinfo["text"] = trim($attr["content"]);
-                    break;
-                case "thumbnail":
-                    $siteinfo["image"] = $attr["content"];
-                    break;
-                case "twitter:image":
-                    $siteinfo["image"] = $attr["content"];
-                    break;
-                case "twitter:image:src":
-                    $siteinfo["image"] = $attr["content"];
-                    break;
-                case "twitter:card":
-                    if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) {
-                        $siteinfo["type"] = $attr["content"];
-                    }
-                    break;
-                case "twitter:description":
-                    $siteinfo["text"] = trim($attr["content"]);
-                    break;
-                case "twitter:title":
-                    $siteinfo["title"] = trim($attr["content"]);
-                    break;
-                case "dc.title":
-                    $siteinfo["title"] = trim($attr["content"]);
-                    break;
-                case "dc.description":
-                    $siteinfo["text"] = trim($attr["content"]);
-                    break;
-                case "keywords":
-                    $keywords = explode(",", $attr["content"]);
-                    break;
-                case "news_keywords":
-                    $keywords = explode(",", $attr["content"]);
-                    break;
-            }
-        }
-
-        $list = $xpath->query("//meta[@property]");
-        foreach ($list as $node) {
-            $attr = [];
-            if ($node->attributes->length) {
-                foreach ($node->attributes as $attribute) {
-                    $attr[$attribute->name] = $attribute->value;
-                }
-            }
-
-            $attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8");
-
-            switch (strtolower($attr["property"])) {
-                case "og:image":
-                    $siteinfo["image"] = $attr["content"];
-                    break;
-                case "og:title":
-                    $siteinfo["title"] = $attr["content"];
-                    break;
-                case "og:description":
-                    $siteinfo["text"] = $attr["content"];
-                    break;
-            }
-        }
-
-        if ($siteinfo["image"] == "") {
-            $list = $xpath->query("//img[@src]");
-            foreach ($list as $node) {
-                $attr = [];
-                if ($node->attributes->length) {
-                    foreach ($node->attributes as $attribute) {
-                        $attr[$attribute->name] = $attribute->value;
-                    }
-                }
-
-                $src = self::completeurl($attr["src"], $url);
-                $photodata = @getimagesize($src);
-
-                if (($photodata) && ($photodata[0] > 150) and ($photodata[1] > 150)) {
-                    if ($photodata[0] > 300) {
-                        $photodata[1] = round($photodata[1] * (300 / $photodata[0]));
-                        $photodata[0] = 300;
-                    }
-                    if ($photodata[1] > 300) {
-                        $photodata[0] = round($photodata[0] * (300 / $photodata[1]));
-                        $photodata[1] = 300;
-                    }
-                    $siteinfo["images"][] = array("src" => $src,
-                        "width" => $photodata[0],
-                        "height" => $photodata[1]);
-                }
-            }
-        } else {
-            $src = self::completeurl($siteinfo["image"], $url);
-
-            unset($siteinfo["image"]);
-
-            $photodata = @getimagesize($src);
-
-            if (($photodata) && ($photodata[0] > 10) and ($photodata[1] > 10)) {
-                $siteinfo["images"][] = array("src" => $src,
-                    "width" => $photodata[0],
-                    "height" => $photodata[1]);
-            }
-        }
-
-        if ($siteinfo["text"] == "") {
-            $text = "";
-
-            $list = $xpath->query("//div[@class='article']");
-            foreach ($list as $node) {
-                if (strlen($node->nodeValue) > 40) {
-                    $text .= " " . trim($node->nodeValue);
-                }
-            }
-
-            if ($text == "") {
-                $list = $xpath->query("//div[@class='content']");
-                foreach ($list as $node) {
-                    if (strlen($node->nodeValue) > 40) {
-                        $text .= " " . trim($node->nodeValue);
-                    }
-                }
-            }
-
-            // If none text was found then take the paragraph content
-            if ($text == "") {
-                $list = $xpath->query("//p");
-                foreach ($list as $node) {
-                    if (strlen($node->nodeValue) > 40) {
-                        $text .= " " . trim($node->nodeValue);
-                    }
-                }
-            }
-
-            if ($text != "") {
-                $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text));
-
-                while (strpos($text, "  ")) {
-                    $text = trim(str_replace("  ", " ", $text));
-                }
-
-                $siteinfo["text"] = html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8") . '...';
-            }
-        }
-
-        return ($siteinfo);
-    }
-
-
-    private static function arr_add_hashes(&$item, $k)
-    {
-        if (substr($item, 0, 1) !== '#') {
-            $item = '#' . $item;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Lists.php b/Zotlabs/Module/Lists.php
deleted file mode 100644
index fad3c96ad..000000000
--- a/Zotlabs/Module/Lists.php
+++ /dev/null
@@ -1,399 +0,0 @@
- 100) {
-                $ret = Activity::paged_collection_init($total, App::$query_string);
-            } else {
-                $members = AccessList::members($group['uid'], $group['id'], false, App::$pager['start'], App::$pager['itemspage']);
-                $ret = Activity::encode_follow_collection($members, App::$query_string, 'OrderedCollection', $total);
-            }
-
-            as_return_and_die($ret, $channel);
-        }
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        App::$profile_uid = local_channel();
-        Navbar::set_selected('Access Lists');
-    }
-
-    public function post()
-    {
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if ((argc() == 2) && (argv(1) === 'new')) {
-            check_form_security_token_redirectOnErr('/lists/new', 'group_edit');
-
-            $name = notags(trim($_POST['groupname']));
-            $public = intval($_POST['public']);
-            $r = AccessList::add(local_channel(), $name, $public);
-            if ($r) {
-                info(t('Access list created.') . EOL);
-            } else {
-                notice(t('Could not create access list.') . EOL);
-            }
-            goaway(z_root() . '/lists');
-        }
-        if ((argc() == 2) && (intval(argv(1)))) {
-            check_form_security_token_redirectOnErr('/lists', 'group_edit');
-
-            $r = q(
-                "SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
-                intval(argv(1)),
-                intval(local_channel())
-            );
-            if (!$r) {
-                $r = q(
-                    "select * from pgrp where id = %d limit 1",
-                    intval(argv(1))
-                );
-                if ($r) {
-                    notice(t('Permission denied.') . EOL);
-                } else {
-                    notice(t('Access list not found.') . EOL);
-                }
-                goaway(z_root() . '/connections');
-            }
-            $group = array_shift($r);
-            $groupname = notags(trim($_POST['groupname']));
-            $public = intval($_POST['public']);
-
-            if ((strlen($groupname)) && (($groupname != $group['gname']) || ($public != $group['visible']))) {
-                $r = q(
-                    "UPDATE pgrp SET gname = '%s', visible = %d  WHERE uid = %d AND id = %d",
-                    dbesc($groupname),
-                    intval($public),
-                    intval(local_channel()),
-                    intval($group['id'])
-                );
-                if ($r) {
-                    info(t('Access list updated.') . EOL);
-                }
-                Libsync::build_sync_packet(local_channel(), null, true);
-            }
-
-            goaway(z_root() . '/lists/' . argv(1) . '/' . argv(2));
-        }
-        return;
-    }
-
-    public function get()
-    {
-
-        $change = false;
-
-        // logger('mod_lists: ' . App::$cmd, LOGGER_DEBUG);
-
-        // Switch to text mode interface if we have more than 'n' contacts or group members, else loading avatars will lead to poor interactivity
-
-        $switchtotext = get_pconfig(local_channel(), 'system', 'listedit_image_limit', get_config('system', 'listedit_image_limit', 1000));
-
-        if ((argc() == 1) || ((argc() == 2) && (argv(1) === 'new'))) {
-	        if (!local_channel()) {
-    	        notice(t('Permission denied') . EOL);
-        	    return;
-        	}
-
-            $new = (((argc() == 2) && (argv(1) === 'new')) ? true : false);
-
-            $groups = q(
-                "SELECT id, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
-                intval(local_channel())
-            );
-
-            $i = 0;
-            foreach ($groups as $group) {
-                $entries[$i]['name'] = $group['gname'];
-                $entries[$i]['id'] = $group['id'];
-                $entries[$i]['count'] = count(AccessList::members(local_channel(), $group['id']));
-                $i++;
-            }
-
-            $tpl = Theme::get_template('privacy_groups.tpl');
-            $o = replace_macros($tpl, [
-                '$title' => t('Access Lists'),
-                '$add_new_label' => t('Create access list'),
-                '$new' => $new,
-
-                // new group form
-                '$gname' => array('groupname', t('Access list name')),
-                '$public' => array('public', t('Members are visible to other channels'), false),
-                '$form_security_token' => get_form_security_token("group_edit"),
-                '$submit' => t('Submit'),
-
-                // groups list
-                '$title' => t('Access Lists'),
-                '$name_label' => t('Name'),
-                '$count_label' => t('Members'),
-                '$entries' => $entries
-            ]);
-
-            return $o;
-        }
-
-        $context = array('$submit' => t('Submit'));
-        $tpl = Theme::get_template('group_edit.tpl');
-
-        if ((argc() == 3) && (argv(1) === 'drop')) {
-	        if (!local_channel()) {
-    	        notice(t('Permission denied') . EOL);
-        	    return;
-        	}
-
-
-			check_form_security_token_redirectOnErr('/lists', 'group_drop', 't');
-
-            if (intval(argv(2))) {
-                $r = q(
-                    "SELECT gname FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
-                    intval(argv(2)),
-                    intval(local_channel())
-                );
-                if ($r) {
-                    $result = AccessList::remove(local_channel(), $r[0]['gname']);
-                }
-                if ($result) {
-                    info(t('Access list removed.') . EOL);
-                } else {
-                    notice(t('Unable to remove access list.') . EOL);
-                }
-            }
-            goaway(z_root() . '/lists');
-            // NOTREACHED
-        }
-
-
-        if ((argc() > 2) && intval(argv(1)) && argv(2)) {
-		    if (!local_channel()) {
-            	notice(t('Permission denied') . EOL);
-            	return;
-        	}
-
-            check_form_security_token_ForbiddenOnErr('group_member_change', 't');
-
-            $r = q(
-                "SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
-                dbesc(base64url_decode(argv(2))),
-                intval(local_channel())
-            );
-            if (count($r)) {
-                $change = base64url_decode(argv(2));
-            }
-        }
-
-        if (argc() > 1) {
-
-            if (strlen(argv(1)) <= 11 && intval(argv(1))) {
-                $r = q(
-                    "SELECT * FROM pgrp WHERE id = %d AND deleted = 0 LIMIT 1",
-                    intval(argv(1))
-                );
-            } else {
-                $r = q(
-                    "SELECT * FROM pgrp WHERE hash = '%s' AND deleted = 0 LIMIT 1",
-                    dbesc(argv(1))
-                );
-            }
-
-			if (! $r) {
-                notice(t('Access list not found.') . EOL);
-				return;
-			}
-
-			$group = array_shift($r);
-            $uid = $group['uid'];
-			$owner = (local_channel() && intval(local_channel()) === intval($group['uid']));
-
-			if (!$owner) {
-				// public view of group members if permitted
-				if (!($group['visible'] && perm_is_allowed($uid, get_observer_hash(), 'view_contacts'))) {
-                    notice(t('Permission denied') . EOL);
-                    return;
-                }
-                $members = [];
-                $memberlist = AccessList::members($uid, $group['id']);
-
-                if ($memberlist) {
-                    foreach ($memberlist as $member) {
-                        $members[] = micropro($member, true, 'mpgroup', 'card');
-                    }
-                }
-                $o = replace_macros(Theme::get_template('listmembers.tpl'), [
-                    '$title' => t('List members'),
-                    '$members' => $members
-                ]);
-                return $o;
-			}
-
-            $members = AccessList::members(local_channel(), $group['id']);
-
-            $preselected = [];
-            if (count($members)) {
-                foreach ($members as $member) {
-                    if (!in_array($member['xchan_hash'], $preselected)) {
-                        $preselected[] = $member['xchan_hash'];
-                    }
-                }
-            }
-
-            if ($change) {
-                if (in_array($change, $preselected)) {
-                    AccessList::member_remove(local_channel(), $group['gname'], $change);
-                } else {
-                    AccessList::member_add(local_channel(), $group['gname'], $change);
-                }
-
-                $members = AccessList::members(local_channel(), $group['id']);
-
-                $preselected = [];
-                if (count($members)) {
-                    foreach ($members as $member) {
-                        $preselected[] = $member['xchan_hash'];
-                    }
-                }
-            }
-
-            $context = $context + array(
-                    '$title' => sprintf(t('Access List: %s'), $group['gname']),
-                    '$details_label' => t('Edit'),
-                    '$gname' => array('groupname', t('Access list name: '), $group['gname'], ''),
-                    '$gid' => $group['id'],
-                    '$drop' => $drop_txt,
-                    '$public' => array('public', t('Members are visible to other channels'), $group['visible'], ''),
-                    '$form_security_token_edit' => get_form_security_token('group_edit'),
-                    '$delete' => t('Delete access list'),
-                    '$form_security_token_drop' => get_form_security_token("group_drop"),
-                );
-        }
-
-        if (!isset($group)) {
-            return;
-        }
-
-        $groupeditor = array(
-            'label_members' => t('List members'),
-            'members' => [],
-            'label_contacts' => t('Not in this list'),
-            'contacts' => [],
-        );
-
-        $sec_token = addslashes(get_form_security_token('group_member_change'));
-        $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : 'card');
-        foreach ($members as $member) {
-            if ($member['xchan_url']) {
-                $member['archived'] = (intval($member['abook_archived']) ? true : false);
-                $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;';
-                $groupeditor['members'][] = micropro($member, true, 'mpgroup', $textmode);
-            } else {
-                AccessList::member_remove(local_channel(), $group['gname'], $member['xchan_hash']);
-            }
-        }
-
-        $r = q(
-            "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
-            intval(local_channel())
-        );
-
-        if (count($r)) {
-            $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : 'card');
-            foreach ($r as $member) {
-                if (!in_array($member['xchan_hash'], $preselected)) {
-                    $member['archived'] = (intval($member['abook_archived']) ? true : false);
-                    $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;';
-                    $groupeditor['contacts'][] = micropro($member, true, 'mpall', $textmode);
-                }
-            }
-        }
-
-        $context['$groupeditor'] = $groupeditor;
-        $context['$desc'] = t('Select a channel to toggle membership');
-
-        if ($change) {
-            $tpl = Theme::get_template('groupeditor.tpl');
-            echo replace_macros($tpl, $context);
-            killme();
-        }
-
-        return replace_macros($tpl, $context);
-    }
-}
diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php
deleted file mode 100644
index 6238a0ca3..000000000
--- a/Zotlabs/Module/Lockview.php
+++ /dev/null
@@ -1,189 +0,0 @@
- 1) ? argv(1) : 0);
-        if (is_numeric($type)) {
-            $item_id = intval($type);
-            $type = 'item';
-        } else {
-            $item_id = ((argc() > 2) ? intval(argv(2)) : 0);
-        }
-
-        if (!$item_id) {
-            killme();
-        }
-
-        if (!in_array($type, array('item', 'photo', 'attach', 'event', 'menu_item', 'chatroom'))) {
-            killme();
-        }
-
-        // we have different naming in in menu_item table and chatroom table
-        switch ($type) {
-            case 'menu_item':
-                $id = 'mitem_id';
-                break;
-            case 'chatroom':
-                $id = 'cr_id';
-                break;
-            default:
-                $id = 'id';
-                break;
-        }
-
-        $r = q(
-            "SELECT * FROM %s WHERE $id = %d LIMIT 1",
-            dbesc($type),
-            intval($item_id)
-        );
-
-        if (!$r) {
-            killme();
-        }
-
-        $item = $r[0];
-
-        // we have different naming in in menu_item table and chatroom table
-        switch ($type) {
-            case 'menu_item':
-                $uid = $item['mitem_channel_id'];
-                break;
-            case 'chatroom':
-                $uid = $item['cr_uid'];
-                break;
-            default:
-                $uid = $item['uid'];
-                break;
-        }
-
-        if ($type === 'item') {
-            $recips = get_iconfig($item['id'], 'activitypub', 'recips');
-            if ($recips) {
-                $o = '
          ' . t('Visible to:') . '
          ';
-                $l = [];
-                if (isset($recips['to'])) {
-                    if (!is_array($recips['to'])) {
-                        $recips['to'] = [$recips['to']];
-                    }
-                    $l = array_merge($l, $recips['to']);
-                }
-                if (isset($recips['cc'])) {
-                    if (!is_array($recips['cc'])) {
-                        $recips['cc'] = [$recips['cc']];
-                    }
-                    $l = array_merge($l, $recips['cc']);
-                }
-                for ($x = 0; $x < count($l); $x++) {
-                    if ($l[$x] === ACTIVITY_PUBLIC_INBOX) {
-						$l[$x] = '' . t('Everybody') . '';
-					} else {
-                        $l[$x] = '' . $l[$x] . '';
-                    }
-                }
-                echo $o . implode('
          ', $l);
-                killme();
-            }
-        }
-
-
-        if (
-            intval($item['item_private']) && (!strlen($item['allow_cid'])) && (!strlen($item['allow_gid']))
-            && (!strlen($item['deny_cid'])) && (!strlen($item['deny_gid']))
-        ) {
-            if ($item['mid'] === $item['parent_mid']) {
-                echo '
          ' . translate_scope('specific') . '
          ';
-                killme();
-            }
-        }
-
-        $allowed_users = expand_acl($item['allow_cid']);
-        $allowed_groups = expand_acl($item['allow_gid']);
-        $deny_users = expand_acl($item['deny_cid']);
-        $deny_groups = expand_acl($item['deny_gid']);
-
-        $o = '
          ' . t('Visible to:') . '
          ';
-        $l = [];
-
-        stringify_array_elms($allowed_groups, true);
-        stringify_array_elms($allowed_users, true);
-        stringify_array_elms($deny_groups, true);
-        stringify_array_elms($deny_users, true);
-
-
-        if (count($allowed_groups)) {
-            $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $allowed_groups) . " )");
-            if ($r) {
-                foreach ($r as $rr) {
-                    $l[] = '
          ' . $rr['gname'] . '
          ';
-                }
-            }
-        }
-        if (count($allowed_users)) {
-            $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $allowed_users) . " )");
-            if ($r) {
-                foreach ($r as $rr) {
-                    $l[] = '
          ' . $rr['xchan_name'] . '
          ';
-                }
-            }
-            if ($atokens) {
-                foreach ($atokens as $at) {
-                    if (in_array("'" . $at['xchan_hash'] . "'", $allowed_users)) {
-                        $l[] = '
          ' . $at['xchan_name'] . '
          ';
-                    }
-                }
-            }
-        }
-
-        if (count($deny_groups)) {
-            $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $deny_groups) . " )");
-            if ($r) {
-                foreach ($r as $rr) {
-                    $l[] = '
          ' . $rr['gname'] . '
          ';
-                }
-            }
-        }
-        if (count($deny_users)) {
-            $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $deny_users) . " )");
-            if ($r) {
-                foreach ($r as $rr) {
-                    $l[] = '
          ' . $rr['xchan_name'] . '
          ';
-                }
-            }
-
-            if ($atokens) {
-                foreach ($atokens as $at) {
-                    if (in_array("'" . $at['xchan_hash'] . "'", $deny_users)) {
-                        $l[] = '
          ' . $at['xchan_name'] . '
          ';
-                    }
-                }
-            }
-        }
-
-        echo $o . implode($l);
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php
deleted file mode 100644
index e159a08f1..000000000
--- a/Zotlabs/Module/Locs.php
+++ /dev/null
@@ -1,149 +0,0 @@
- t('Manage Channel Locations'),
-            '$loc' => t('Location'),
-            '$addr' => t('Address'),
-            '$mkprm' => t('Primary'),
-            '$drop' => t('Drop'),
-            '$submit' => t('Submit'),
-            '$sync' => t('Publish these settings'),
-            '$sync_text' => t('Please wait several minutes between consecutive operations.'),
-            '$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'),
-            '$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'),
-            '$hubs' => $r,
-            '$base_url' => z_root()
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php
deleted file mode 100644
index 930cf70f5..000000000
--- a/Zotlabs/Module/Login.php
+++ /dev/null
@@ -1,21 +0,0 @@
-nuke();
-        }
-        goaway(z_root());
-    }
-}
diff --git a/Zotlabs/Module/Lostpass.php b/Zotlabs/Module/Lostpass.php
deleted file mode 100644
index 76d2ab565..000000000
--- a/Zotlabs/Module/Lostpass.php
+++ /dev/null
@@ -1,149 +0,0 @@
- get_config('system', 'sitename'),
-            '$siteurl' => z_root(),
-            '$username' => sprintf(t('Site Member (%s)'), $email),
-            '$email' => $email,
-            '$reset_link' => z_root() . '/lostpass?verify=' . $hash
-        ));
-
-        $subject = email_header_encode(sprintf(t('Password reset requested at %s'), get_config('system', 'sitename')), 'UTF-8');
-
-        $res = z_mail(
-            [
-                'toEmail' => $email,
-                'messageSubject' => sprintf(t('Password reset requested at %s'), get_config('system', 'sitename')),
-                'textVersion' => $message,
-            ]
-        );
-
-        goaway(z_root());
-    }
-
-
-    public function get()
-    {
-
-
-        if (x($_GET, 'verify')) {
-            $verify = $_GET['verify'];
-
-            $r = q(
-                "SELECT * FROM account WHERE account_reset = '%s' LIMIT 1",
-                dbesc($verify)
-            );
-            if (!$r) {
-                notice(t("Request could not be verified. (You may have previously submitted it.) Password reset failed.") . EOL);
-                goaway(z_root());
-                return;
-            }
-
-            $aid = $r[0]['account_id'];
-            $email = $r[0]['account_email'];
-
-            $new_password = autoname(6) . mt_rand(100, 9999);
-
-            $salt = random_string(32);
-            $password_encoded = hash('whirlpool', $salt . $new_password);
-
-            $r = q(
-                "UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '', account_flags = (account_flags & ~%d) where account_id = %d",
-                dbesc($salt),
-                dbesc($password_encoded),
-                intval(ACCOUNT_UNVERIFIED),
-                intval($aid)
-            );
-
-            if ($r) {
-                $tpl = Theme::get_template('pwdreset.tpl');
-                $o .= replace_macros($tpl, array(
-                    '$lbl1' => t('Password Reset'),
-                    '$lbl2' => t('Your password has been reset as requested.'),
-                    '$lbl3' => t('Your new password is'),
-                    '$lbl4' => t('Save or copy your new password - and then'),
-                    '$lbl5' => '' . t('click here to login') . '.',
-                    '$lbl6' => t('Your password may be changed from the Settings page after successful login.'),
-                    '$newpass' => $new_password,
-                    '$baseurl' => z_root()
-
-                ));
-
-                info("Your password has been reset." . EOL);
-
-                $email_tpl = Theme::get_email_template("passchanged_eml.tpl");
-                $message = replace_macros($email_tpl, array(
-                        '$sitename' => App::$config['sitename'],
-                        '$siteurl' => z_root(),
-                        '$username' => sprintf(t('Site Member (%s)'), $email),
-                        '$email' => $email,
-                        '$new_password' => $new_password,
-                        '$uid' => $newuid));
-
-                $res = z_mail(
-                    [
-                        'toEmail' => $email,
-                        'messageSubject' => sprintf(t('Your password has changed at %s'), get_config('system', 'sitename')),
-                        'textVersion' => $message,
-                    ]
-                );
-
-                return $o;
-            }
-        } else {
-            $tpl = Theme::get_template('lostpass.tpl');
-
-            $o .= replace_macros($tpl, array(
-                '$title' => t('Forgot your Password?'),
-                '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
-                '$name' => t('Email Address'),
-                '$submit' => t('Reset')
-            ));
-
-            return $o;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php
deleted file mode 100644
index 007a15823..000000000
--- a/Zotlabs/Module/Magic.php
+++ /dev/null
@@ -1,134 +0,0 @@
- false,
-            'url' => '',
-            'message' => ''
-        ];
-
-        logger('mod_magic: invoked', LOGGER_DEBUG);
-
-        logger('args: ' . print_r($_REQUEST, true), LOGGER_DATA);
-
-        $addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
-        $bdest = ((x($_REQUEST, 'bdest')) ? $_REQUEST['bdest'] : '');
-        $dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
-        $rev = ((x($_REQUEST, 'rev')) ? intval($_REQUEST['rev']) : 0);
-        $owa = ((x($_REQUEST, 'owa')) ? intval($_REQUEST['owa']) : 0);
-        $delegate = ((x($_REQUEST, 'delegate')) ? $_REQUEST['delegate'] : '');
-
-        // bdest is preferred as it is hex-encoded and can survive url rewrite and argument parsing
-
-        if ($bdest) {
-            $dest = hex2bin($bdest);
-        }
-
-        $parsed = parse_url($dest);
-
-        if (!$parsed) {
-            goaway($dest);
-        }
-
-        $basepath = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '');
-        $owapath = SConfig::get($basepath, 'system', 'openwebauth', $basepath . '/owa');
-
-        // This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating.
-        // By default, we'll proceed without asking.
-
-        $arr = [
-            'channel_id' => local_channel(),
-            'destination' => $dest,
-            'proceed' => true
-        ];
-
-        Hook::call('magic_auth', $arr);
-        $dest = $arr['destination'];
-        if (!$arr['proceed']) {
-            goaway($dest);
-        }
-
-        if ((get_observer_hash()) && (stripos($dest, z_root()) === 0)) {
-            // We are already authenticated on this site and a registered observer.
-            // First check if this is a delegate request on the local system and process accordingly.
-            // Otherwise redirect.
-
-            if ($delegate) {
-                $r = q(
-                    "select * from channel left join hubloc on channel_hash = hubloc_hash where hubloc_addr = '%s' limit 1",
-                    dbesc($delegate)
-                );
-
-                if ($r) {
-                    $c = array_shift($r);
-                    if (perm_is_allowed($c['channel_id'], get_observer_hash(), 'delegate')) {
-                        $tmp = $_SESSION;
-                        $_SESSION['delegate_push'] = $tmp;
-                        $_SESSION['delegate_channel'] = $c['channel_id'];
-                        $_SESSION['delegate'] = get_observer_hash();
-                        $_SESSION['account_id'] = intval($c['channel_account_id']);
-
-                        change_channel($c['channel_id']);
-                    }
-                }
-            }
-
-            goaway($dest);
-        }
-
-        if (local_channel()) {
-            $channel = App::get_channel();
-
-            // OpenWebAuth
-
-            if ($owa) {
-                $dest = strip_zids($dest);
-                $dest = strip_query_param($dest, 'f');
-
-                // We now post to the OWA endpoint. This improves security by providing a signed digest
-
-                $data = json_encode(['OpenWebAuth' => random_string()]);
-
-                $headers = [];
-				$headers['Accept'] = 'application/x-nomad+json, application/x-zot+json';
-				$headers['Content-Type'] = 'application/x-nomad+json';
-                $headers['X-Open-Web-Auth'] = random_string();
-                $headers['Digest'] = HTTPSig::generate_digest_header($data);
-                $headers['Host'] = $parsed['host'];
-                $headers['(request-target)'] = 'post ' . '/owa';
-
-                $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], Channel::url($channel), true, 'sha512');
-                $x = z_post_url($owapath, $data, $redirects, ['headers' => $headers]);
-                logger('owa fetch returned: ' . print_r($x, true), LOGGER_DATA);
-                if ($x['success']) {
-                    $j = json_decode($x['body'], true);
-                    if ($j['success'] && $j['encrypted_token']) {
-                        // decrypt the token using our private key
-                        $token = '';
-                        openssl_private_decrypt(base64url_decode($j['encrypted_token']), $token, $channel['channel_prvkey']);
-                        $x = strpbrk($dest, '?&');
-                        // redirect using the encrypted token which will be exchanged for an authenticated session
-                        $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : '');
-                        goaway($dest . $args);
-                    }
-                }
-            }
-        }
-        goaway($dest);
-    }
-}
diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php
deleted file mode 100644
index e82de6e93..000000000
--- a/Zotlabs/Module/Manage.php
+++ /dev/null
@@ -1,204 +0,0 @@
- 1) ? intval(argv(1)) : 0);
-
-        if (argc() > 2) {
-            if (argv(2) === 'default') {
-                $r = q(
-                    "select channel_id from channel where channel_id = %d and channel_account_id = %d limit 1",
-                    intval($change_channel),
-                    intval(get_account_id())
-                );
-                if ($r) {
-                    q(
-                        "update account set account_default_channel = %d where account_id = %d",
-                        intval($change_channel),
-                        intval(get_account_id())
-                    );
-                }
-                goaway(z_root() . '/manage');
-            } elseif (argv(2) === 'menu') {
-                $state = intval(PConfig::get($change_channel, 'system', 'include_in_menu', 0));
-                PConfig::set($change_channel, 'system', 'include_in_menu', 1 - $state);
-                goaway(z_root() . '/manage');
-            }
-        }
-
-
-        if ($change_channel) {
-            $r = change_channel($change_channel);
-
-            if ((argc() > 2) && !(argv(2) === 'default')) {
-                goaway(z_root() . '/' . implode('/', array_slice(App::$argv, 2))); // Go to whatever is after /manage/, but with the new channel
-            } elseif ($r && $r['channel_startpage']) {
-                goaway(z_root() . '/' . $r['channel_startpage']); // If nothing extra is specified, go to the default page
-            }
-            goaway(z_root());
-        }
-
-        $channels = null;
-
-        $r = q(
-            "select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
-            intval(get_account_id())
-        );
-
-        $account = App::get_account();
-
-        if ($r && count($r)) {
-            $channels = ((is_site_admin()) ? array_merge([Channel::get_system()], $r) : $r);
-            for ($x = 0; $x < count($channels); $x++) {
-                $channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
-                $channels[$x]['include_in_menu'] = intval(PConfig::get($channels[$x]['channel_id'], 'system', 'include_in_menu', 0));
-                $channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : '');
-                $channels[$x]['default_links'] = '1';
-                $channels[$x]['collections_label'] = t('Collection');
-                $channels[$x]['forum_label'] = t('Group');
-
-                $c = q(
-                    "SELECT id, item_wall FROM item
-					WHERE item_unseen = 1 and uid = %d " . item_normal(),
-                    intval($channels[$x]['channel_id'])
-                );
-
-                if ($c) {
-                    foreach ($c as $it) {
-                        if (intval($it['item_wall'])) {
-                            $channels[$x]['home']++;
-                        } else {
-                            $channels[$x]['network']++;
-                        }
-                    }
-                }
-
-
-                $intr = q(
-                    "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
-                    intval($channels[$x]['channel_id'])
-                );
-
-                if ($intr) {
-                    $channels[$x]['intros'] = intval($intr[0]['total']);
-                }
-
-                $events = q(
-                    "SELECT etype, dtstart, adjust FROM event
-					WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
-					ORDER BY dtstart ASC ",
-                    intval($channels[$x]['channel_id']),
-                    dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')),
-                    dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-                );
-
-                if ($events) {
-                    $channels[$x]['all_events'] = count($events);
-
-                    if ($channels[$x]['all_events']) {
-                        $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
-                        foreach ($events as $e) {
-                            $bd = false;
-                            if ($e['etype'] === 'birthday') {
-                                $channels[$x]['birthdays']++;
-                                $bd = true;
-                            } else {
-                                $channels[$x]['events']++;
-                            }
-                            if (datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) {
-                                $channels[$x]['all_events_today']++;
-                                if ($bd) {
-                                    $channels[$x]['birthdays_today']++;
-                                } else {
-                                    $channels[$x]['events_today']++;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        $r = q(
-            "select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0",
-            intval(get_account_id())
-        );
-        $limit = ServiceClass::account_fetch(get_account_id(), 'total_identities');
-        if ($limit !== false) {
-            $channel_usage_message = sprintf(t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit);
-        } else {
-            $channel_usage_message = '';
-        }
-
-
-        $create = ['new_channel', t('Create a new channel'), t('Create New')];
-
-        $delegates = null;
-
-        if (local_channel()) {
-            $delegates = q(
-                "select * from abook left join xchan on abook_xchan = xchan_hash where 
-				abook_channel = %d and abook_xchan in ( select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s' )",
-                intval(local_channel()),
-                intval(local_channel()),
-                dbesc('%delegate%')
-            );
-        }
-
-        if ($delegates) {
-            for ($x = 0; $x < count($delegates); $x++) {
-                $delegates[$x]['link'] = 'magic?f=&bdest=' . bin2hex($delegates[$x]['xchan_url'])
-                    . '&delegate=' . urlencode($delegates[$x]['xchan_addr']);
-                $delegates[$x]['channel_name'] = $delegates[$x]['xchan_name'];
-                $delegates[$x]['delegate'] = 1;
-                $delegates[$x]['collections_label'] = t('Collection');
-                $delegates[$x]['forum_label'] = t('Group');
-            }
-        } else {
-            $delegates = null;
-        }
-
-        return replace_macros(Theme::get_template('channels.tpl'), [
-            '$header' => t('Channels'),
-            '$msg_selected' => t('Current Channel'),
-            '$selected' => local_channel(),
-            '$desc' => t('Switch to one of your channels by selecting it.'),
-            '$msg_default' => t('Default Login Channel'),
-            '$msg_make_default' => t('Make Default'),
-            '$msg_include' => t('Add to menu'),
-            '$msg_no_include' => t('Add to menu'),
-            '$create' => $create,
-            '$all_channels' => $channels,
-            '$mail_format' => t('%d new messages'),
-            '$intros_format' => t('%d new introductions'),
-            '$channel_usage_message' => $channel_usage_message,
-            '$delegated_desc' => t('Delegated Channel'),
-            '$delegates' => $delegates
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Manifest.php b/Zotlabs/Module/Manifest.php
deleted file mode 100644
index ab3163196..000000000
--- a/Zotlabs/Module/Manifest.php
+++ /dev/null
@@ -1,50 +0,0 @@
- System::get_platform_name(),
-            'short_name' => System::get_platform_name(),
-            'icons' => [
-                ['src' => '/images/' . System::get_platform_name() . '-64' . '.png', 'sizes' => '64x64'],
-                ['src' => '/images/' . System::get_platform_name() . '-192' . '.png', 'sizes' => '192x192'],
-                ['src' => '/images/' . System::get_platform_name() . '-512' . '.png', 'sizes' => '512x512'],
-                ['src' => '/images/' . System::get_platform_name() . '.svg', 'sizes' => '600x600'],
-            ],
-            'scope' => '/',
-            'start_url' => z_root(),
-            'display' => 'fullscreen',
-            'orientation' => 'any',
-            'theme_color' => 'blue',
-            'background_color' => 'white',
-            'share_target' => [
-                'action' => '/rpost',
-                'method' => 'POST',
-                'enctype' => 'multipart/form-data',
-                'params' => [
-                    'title' => 'title',
-                    'text' => 'body',
-                    'url' => 'url',
-                    'files' => [
-                        ['name' => 'userfile',
-                            'accept' => ['image/*', 'audio/*', 'video/*', 'text/*', 'application/*']
-                        ]
-                    ]
-                ]
-            ]
-
-        ];
-
-
-        json_return_and_die($ret, 'application/manifest+json');
-    }
-}
diff --git a/Zotlabs/Module/Markup.php b/Zotlabs/Module/Markup.php
deleted file mode 100644
index 3641a3ade..000000000
--- a/Zotlabs/Module/Markup.php
+++ /dev/null
@@ -1,22 +0,0 @@
-' . $desc . '';
-
-        return $text;
-    }
-}
diff --git a/Zotlabs/Module/Menu.php b/Zotlabs/Module/Menu.php
deleted file mode 100644
index 51fe0db85..000000000
--- a/Zotlabs/Module/Menu.php
+++ /dev/null
@@ -1,242 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-
-    public function post()
-    {
-
-        if (!App::$profile) {
-            return;
-        }
-
-        $which = argv(1);
-
-
-        $uid = App::$profile['channel_id'];
-
-        if (array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) {
-            $sys = Channel::get_system();
-            $uid = intval($sys['channel_id']);
-            App::$is_sys = true;
-        }
-
-        if (!$uid) {
-            return;
-        }
-
-        $_REQUEST['menu_channel_id'] = $uid;
-
-        if ($_REQUEST['menu_bookmark']) {
-            $_REQUEST['menu_flags'] |= MENU_BOOKMARK;
-        }
-        if ($_REQUEST['menu_system']) {
-            $_REQUEST['menu_flags'] |= MENU_SYSTEM;
-        }
-
-        $menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
-        if ($menu_id) {
-            $_REQUEST['menu_id'] = intval(argv(1));
-            $r = Zlib\Menu::edit($_REQUEST);
-            if ($r) {
-                Zlib\Menu::sync_packet($uid, get_observer_hash(), $menu_id);
-                //info( t('Menu updated.') . EOL);
-                goaway(z_root() . '/mitem/' . $which . '/' . $menu_id . ((App::$is_sys) ? '?f=&sys=1' : ''));
-            } else {
-                notice(t('Unable to update menu.') . EOL);
-            }
-        } else {
-            $r = Zlib\Menu::create($_REQUEST);
-            if ($r) {
-                Zlib\Menu::sync_packet($uid, get_observer_hash(), $r);
-
-                //info( t('Menu created.') . EOL);
-                goaway(z_root() . '/mitem/' . $which . '/' . $r . ((App::$is_sys) ? '?f=&sys=1' : ''));
-            } else {
-                notice(t('Unable to create menu.') . EOL);
-            }
-        }
-    }
-
-
-    public function get()
-    {
-
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        $which = argv(1);
-
-        $_SESSION['return_url'] = App::$query_string;
-
-        $uid = local_channel();
-        $owner = 0;
-        $channel = null;
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                $uid = $owner = intval($sys['channel_id']);
-                $channel = $sys;
-                $observer = $sys;
-            }
-        }
-
-        if (!$owner) {
-            // Figure out who the page owner is.
-            $r = Channel::from_username($which);
-            if ($r) {
-                $owner = intval($r['channel_id']);
-            }
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        // Get the observer, check their permissions
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if (argc() == 2) {
-            $channel = (($sys) ? $sys : Channel::from_id($owner));
-
-            // list menus
-            $x = Zlib\Menu::list($owner);
-            if ($x) {
-                for ($y = 0; $y < count($x); $y++) {
-                    $m = menu_fetch($x[$y]['menu_name'], $owner, get_observer_hash());
-                    if ($m) {
-                        $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($channel, $m))) . '[/element]';
-                    }
-                    $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false);
-                }
-            }
-
-            $create = replace_macros(Theme::get_template('menuedit.tpl'), array(
-                '$menu_name' => array('menu_name', t('Menu Name'), '', t('Unique name (not visible on webpage) - required'), '*'),
-                '$menu_desc' => array('menu_desc', t('Menu Title'), '', t('Visible on webpage - leave empty for no title'), ''),
-                '$menu_bookmark' => array('menu_bookmark', t('Allow Bookmarks'), 0, t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))),
-                '$submit' => t('Submit and proceed'),
-                '$sys' => App::$is_sys,
-                '$nick' => $which,
-                '$display' => 'none'
-            ));
-
-            $o = replace_macros(Theme::get_template('menulist.tpl'), array(
-                '$title' => t('Menus'),
-                '$create' => $create,
-                '$menus' => $x,
-                '$nametitle' => t('Menu Name'),
-                '$desctitle' => t('Menu Title'),
-                '$edit' => t('Edit'),
-                '$drop' => t('Drop'),
-                '$created' => t('Created'),
-                '$edited' => t('Edited'),
-                '$new' => t('New'),
-                '$bmark' => t('Bookmarks allowed'),
-                '$hintnew' => t('Create'),
-                '$hintdrop' => t('Delete this menu'),
-                '$hintcontent' => t('Edit menu contents'),
-                '$hintedit' => t('Edit this menu'),
-                '$nick' => $which,
-                '$sys' => App::$is_sys
-            ));
-
-            return $o;
-        }
-
-        if (argc() > 2) {
-            if (intval(argv(2))) {
-                if (argc() == 4 && argv(3) == 'drop') {
-                    Zlib\Menu::sync_packet($owner, get_observer_hash(), intval(argv(1)), true);
-                    $r = Zlib\Menu::delete_id(intval(argv(2)), $owner);
-                    if (!$r) {
-                        notice(t('Menu could not be deleted.') . EOL);
-                    }
-
-                    goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : ''));
-                }
-
-                $m = Zlib\Menu::fetch_id(intval(argv(2)), $owner);
-
-                if (!$m) {
-                    notice(t('Menu not found.') . EOL);
-                    return '';
-                }
-
-                $o = replace_macros(Theme::get_template('menuedit.tpl'), array(
-                    '$header' => t('Edit Menu'),
-                    '$sys' => App::$is_sys,
-                    '$menu_id' => intval(argv(2)),
-                    '$menu_edit_link' => 'mitem/' . $which . '/' . intval(argv(1)) . ((App::$is_sys) ? '?f=&sys=1' : ''),
-                    '$hintedit' => t('Add or remove entries to this menu'),
-                    '$editcontents' => t('Edit menu contents'),
-                    '$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
-                    '$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
-                    '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), array(t('No'), t('Yes'))),
-                    '$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0),
-                    '$nick' => $which,
-                    '$submit' => t('Submit and proceed')
-                ));
-
-                return $o;
-            } else {
-                notice(t('Not found.') . EOL);
-                return;
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Module/Mitem.php b/Zotlabs/Module/Mitem.php
deleted file mode 100644
index a9b8d0f02..000000000
--- a/Zotlabs/Module/Mitem.php
+++ /dev/null
@@ -1,284 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-
-        if (argc() < 3) {
-            return;
-        }
-
-        $m = Menu::fetch_id(intval(argv(2)), App::$profile['channel_id']);
-        if (!$m) {
-            notice(t('Menu not found.') . EOL);
-            return '';
-        }
-        App::$data['menu'] = $m;
-    }
-
-    public function post()
-    {
-
-        if (!App::$profile) {
-            return;
-        }
-
-        $which = argv(1);
-
-
-        $uid = App::$profile['channel_id'];
-
-        if (array_key_exists('sys', $_REQUEST) && $_REQUEST['sys'] && is_site_admin()) {
-            $sys = Channel::get_system();
-            $uid = intval($sys['channel_id']);
-            App::$is_sys = true;
-        }
-
-        if (!$uid) {
-            return;
-        }
-
-
-        if (!App::$data['menu']) {
-            return;
-        }
-
-        if (!$_REQUEST['mitem_desc'] || !$_REQUEST['mitem_link']) {
-            notice(t('Unable to create element.') . EOL);
-            return;
-        }
-
-        $_REQUEST['mitem_channel_id'] = $uid;
-        $_REQUEST['menu_id'] = App::$data['menu']['menu_id'];
-
-        $_REQUEST['mitem_flags'] = 0;
-        if ($_REQUEST['usezid']) {
-            $_REQUEST['mitem_flags'] |= MENU_ITEM_ZID;
-        }
-        if ($_REQUEST['newwin']) {
-            $_REQUEST['mitem_flags'] |= MENU_ITEM_NEWWIN;
-        }
-
-
-        $mitem_id = ((argc() > 3) ? intval(argv(3)) : 0);
-        if ($mitem_id) {
-            $_REQUEST['mitem_id'] = $mitem_id;
-            $r = MenuItem::edit($_REQUEST['menu_id'], $uid, $_REQUEST);
-            if ($r) {
-                Menu::sync_packet($uid, get_observer_hash(), $_REQUEST['menu_id']);
-                //info( t('Menu element updated.') . EOL);
-                goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . ((App::$is_sys) ? '?f=&sys=1' : ''));
-            } else {
-                notice(t('Unable to update menu element.') . EOL);
-            }
-        } else {
-            $r = MenuItem::add($_REQUEST['menu_id'], $uid, $_REQUEST);
-            if ($r) {
-                Menu::sync_packet($uid, get_observer_hash(), $_REQUEST['menu_id']);
-                //info( t('Menu element added.') . EOL);
-                if ($_REQUEST['submit']) {
-                    goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : ''));
-                }
-                if ($_REQUEST['submit-more']) {
-                    goaway(z_root() . '/mitem/' . $which . '/' . $_REQUEST['menu_id'] . '?f=&display=block' . ((App::$is_sys) ? '&sys=1' : ''));
-                }
-            } else {
-                notice(t('Unable to add menu element.') . EOL);
-            }
-        }
-    }
-
-
-    public function get()
-    {
-
-        $uid = local_channel();
-        $owner = App::$profile['channel_id'];
-        $channel = Channel::from_id($owner);
-        $observer = App::get_observer();
-
-        $which = argv(1);
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            $uid = intval($sys['channel_id']);
-            $channel = $sys;
-            $ob_hash = $sys['xchan_hash'];
-        }
-
-        if (!$uid) {
-            notice(t('Permission denied.') . EOL);
-            return '';
-        }
-
-        if (argc() < 3 || (!App::$data['menu'])) {
-            notice(t('Not found.') . EOL);
-            return '';
-        }
-
-        $m = Menu::fetch(App::$data['menu']['menu_name'], $owner, $ob_hash);
-        App::$data['menu_item'] = $m;
-
-        $menu_list = Menu::list($owner);
-
-        foreach ($menu_list as $menus) {
-            if ($menus['menu_name'] != $m['menu']['menu_name']) {
-                $menu_names[] = $menus['menu_name'];
-            }
-        }
-
-        $acl = new AccessControl($channel);
-
-        $lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
-
-        if (argc() == 3) {
-            $r = q(
-                "select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d order by mitem_order asc, mitem_desc asc",
-                intval(App::$data['menu']['menu_id']),
-                intval($owner)
-            );
-
-            if ($_GET['display']) {
-                $display = $_GET['display'];
-            } else {
-                $display = (($r) ? 'none' : 'block');
-            }
-
-            $create = replace_macros(Theme::get_template('mitemedit.tpl'), array(
-                '$menu_id' => App::$data['menu']['menu_id'],
-                '$permissions' => t('Menu Item Permissions'),
-                '$permdesc' => t("\x28click to open/close\x29"),
-                '$aclselect' => Libacl::populate($acl->get(), false),
-                '$allow_cid' => acl2json($acl->get()['allow_cid']),
-                '$allow_gid' => acl2json($acl->get()['allow_gid']),
-                '$deny_cid' => acl2json($acl->get()['deny_cid']),
-                '$deny_gid' => acl2json($acl->get()['deny_gid']),
-                '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link', '*'),
-                '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'),
-                '$usezid' => array('usezid', t('Use magic-auth if available'), true, '', array(t('No'), t('Yes'))),
-                '$newwin' => array('newwin', t('Open link in new window'), false, '', array(t('No'), t('Yes'))),
-                '$mitem_order' => array('mitem_order', t('Order in list'), '0', t('Higher numbers will sink to bottom of listing')),
-                '$submit' => t('Submit and finish'),
-                '$submit_more' => t('Submit and continue'),
-                '$display' => $display,
-                '$lockstate' => $lockstate,
-                '$menu_names' => $menu_names,
-                '$nick' => $which,
-                '$sys' => App::$is_sys
-            ));
-
-            $o .= replace_macros(Theme::get_template('mitemlist.tpl'), array(
-                '$title' => t('Menu:'),
-                '$create' => $create,
-                '$nametitle' => t('Link Name'),
-                '$targettitle' => t('Link Target'),
-                '$menuname' => App::$data['menu']['menu_name'],
-                '$menudesc' => App::$data['menu']['menu_desc'],
-                '$edmenu' => t('Edit menu'),
-                '$menu_id' => App::$data['menu']['menu_id'],
-                '$mlist' => $r,
-                '$edit' => t('Edit element'),
-                '$drop' => t('Drop element'),
-                '$new' => t('New element'),
-                '$hintmenu' => t('Edit this menu container'),
-                '$hintnew' => t('Add menu element'),
-                '$hintdrop' => t('Delete this menu item'),
-                '$hintedit' => t('Edit this menu item'),
-                '$nick' => $which,
-            ));
-
-            return $o;
-        }
-
-
-        if (argc() > 3) {
-            if (intval(argv(3))) {
-                $m = q(
-                    "select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1",
-                    intval(argv(3)),
-                    intval($owner)
-                );
-
-                if (!$m) {
-                    notice(t('Menu item not found.') . EOL);
-                    goaway(z_root() . '/menu/' . $which . ((App::$is_sys) ? '?f=&sys=1' : ''));
-                }
-
-                $mitem = $m[0];
-
-                $lockstate = (($mitem['allow_cid'] || $mitem['allow_gid'] || $mitem['deny_cid'] || $mitem['deny_gid']) ? 'lock' : 'unlock');
-
-                if (argc() == 5 && argv(4) == 'drop') {
-                    Menu::sync_packet($owner, get_observer_hash(), $mitem['mitem_menu_id']);
-                    $r = MenuItem::delete($mitem['mitem_menu_id'], $owner, intval(argv(3)));
-                    Menu::sync_packet($owner, get_observer_hash(), $mitem['mitem_menu_id']);
-                    if ($r) {
-                        info(t('Menu item deleted.') . EOL);
-                    } else {
-                        notice(t('Menu item could not be deleted.') . EOL);
-                    }
-
-                    goaway(z_root() . '/mitem/' . $which . '/' . $mitem['mitem_menu_id'] . ((App::$is_sys) ? '?f=&sys=1' : ''));
-                }
-
-                // edit menu item
-                $o = replace_macros(Theme::get_template('mitemedit.tpl'), array(
-                    '$header' => t('Edit Menu Element'),
-                    '$menu_id' => App::$data['menu']['menu_id'],
-                    '$permissions' => t('Menu Item Permissions'),
-                    '$permdesc' => t("\x28click to open/close\x29"),
-                    '$aclselect' => Libacl::populate($mitem, false),
-                    '$allow_cid' => acl2json($mitem['allow_cid']),
-                    '$allow_gid' => acl2json($mitem['allow_gid']),
-                    '$deny_cid' => acl2json($mitem['deny_cid']),
-                    '$deny_gid' => acl2json($mitem['deny_gid']),
-                    '$mitem_id' => intval(argv(3)),
-                    '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '', '*'),
-                    '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
-                    '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), '', array(t('No'), t('Yes'))),
-                    '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0), '', array(t('No'), t('Yes'))),
-                    '$mitem_order' => array('mitem_order', t('Order in list'), $mitem['mitem_order'], t('Higher numbers will sink to bottom of listing')),
-                    '$submit' => t('Submit'),
-                    '$lockstate' => $lockstate,
-                    '$menu_names' => $menu_names,
-                    '$nick' => $which
-                ));
-
-                return $o;
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php
deleted file mode 100644
index 23c61bf50..000000000
--- a/Zotlabs/Module/Moderate.php
+++ /dev/null
@@ -1,128 +0,0 @@
- 2) {
-            $post_id = intval(argv(1));
-            if (!$post_id) {
-                goaway(z_root() . '/moderate');
-            }
-
-            $action = argv(2);
-
-            $r = q(
-                "select * from item where uid = %d and id = %d and item_blocked = %d limit 1",
-                intval(local_channel()),
-                intval($post_id),
-                intval(ITEM_MODERATED)
-            );
-
-            if ($r) {
-                $item = $r[0];
-
-                if ($action === 'approve') {
-                    q(
-                        "update item set item_blocked = 0 where uid = %d and id = %d",
-                        intval(local_channel()),
-                        intval($post_id)
-                    );
-
-                    $item['item_blocked'] = 0;
-
-                    item_update_parent_commented($item);
-
-                    notice(t('Comment approved') . EOL);
-                } elseif ($action === 'drop') {
-                    drop_item($post_id, false);
-                    notice(t('Comment deleted') . EOL);
-                }
-
-                // refetch the item after changes have been made
-
-                $r = q(
-                    "select * from item where id = %d",
-                    intval($post_id)
-                );
-                if ($r) {
-                    xchan_query($r);
-                    $sync_item = fetch_post_tags($r);
-                    Libsync::build_sync_packet(local_channel(), array('item' => array(encode_item($sync_item[0], true))));
-                }
-                if ($action === 'approve') {
-                    if ($item['id'] !== $item['parent']) {
-                        // if this is a group comment, call tag_deliver() to generate the associated
-                        // Announce activity so microblog destinations will see it in their home timeline
-                        $role = get_pconfig(local_channel(), 'system', 'permissions_role');
-                        $rolesettings = PermissionRoles::role_perms($role);
-                        $channel_type = isset($rolesettings['channel_type']) ? $rolesettings['channel_type'] : 'normal';
-
-                        $is_group = (($channel_type === 'group') ? true : false);
-                        if ($is_group) {
-                            tag_deliver(local_channel(), $post_id);
-                        }
-                    }
-                    Run::Summon(['Notifier', 'comment-new', $post_id]);
-                }
-                goaway(z_root() . '/moderate');
-            }
-        }
-
-        if ($r) {
-            xchan_query($r);
-            $items = fetch_post_tags($r, true);
-        } else {
-            $items = [];
-        }
-
-        $o = conversation($items, 'moderate', false, 'traditional');
-        $o .= alt_pager(count($items));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php
deleted file mode 100644
index 6a00280c7..000000000
--- a/Zotlabs/Module/Mood.php
+++ /dev/null
@@ -1,175 +0,0 @@
-Mood App (Not Installed):
          ';
-            $o .= t('Set your current mood and tell your friends');
-            return $o;
-        }
-
-        Navbar::set_selected('Mood');
-
-        $parent = ((x($_GET, 'parent')) ? intval($_GET['parent']) : '0');
-
-        $verbs = get_mood_verbs();
-
-        $shortlist = [];
-        foreach ($verbs as $k => $v) {
-            if ($v !== 'NOTRANSLATION') {
-                $shortlist[] = array($k, $v);
-            }
-        }
-
-
-        $tpl = Theme::get_template('mood_content.tpl');
-
-        $o = replace_macros($tpl, array(
-            '$title' => t('Mood'),
-            '$desc' => t('Set your current mood and tell your friends'),
-            '$verbs' => $shortlist,
-            '$parent' => $parent,
-            '$submit' => t('Submit'),
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php
deleted file mode 100644
index ad5f35514..000000000
--- a/Zotlabs/Module/New_channel.php
+++ /dev/null
@@ -1,212 +0,0 @@
- 1) ? argv(1) : '');
-
-        if ($cmd === 'autofill.json') {
-            $result = array('error' => false, 'message' => '');
-            $n = trim($_REQUEST['name']);
-
-            $x = false;
-
-            if (get_config('system', 'unicode_usernames')) {
-                $x = punify(mb_strtolower($n));
-            }
-
-            if ((!$x) || strlen($x) > 64) {
-                $x = strtolower(URLify::transliterate($n));
-            }
-
-            $test = [];
-
-            // first name
-            if (strpos($x, ' ')) {
-                $test[] = legal_webbie(substr($x, 0, strpos($x, ' ')));
-            }
-            if ($test[0]) {
-                // first name plus first initial of last
-                $test[] = ((strpos($x, ' ')) ? $test[0] . legal_webbie(trim(substr($x, strpos($x, ' '), 2))) : '');
-                // first name plus random number
-                $test[] = $test[0] . mt_rand(1000, 9999);
-            }
-            // fullname
-            $test[] = legal_webbie($x);
-            // fullname plus random number
-            $test[] = legal_webbie($x) . mt_rand(1000, 9999);
-
-            json_return_and_die(check_webbie($test));
-        }
-
-        if ($cmd === 'checkaddr.json') {
-            $result = array('error' => false, 'message' => '');
-            $n = trim($_REQUEST['nick']);
-            if (!$n) {
-                $n = trim($_REQUEST['name']);
-            }
-
-            $x = false;
-
-            if (get_config('system', 'unicode_usernames')) {
-                $x = punify(mb_strtolower($n));
-            }
-
-            if ((!$x) || strlen($x) > 64) {
-                $x = strtolower(URLify::transliterate($n));
-            }
-
-
-            $test = [];
-
-            // first name
-            if (strpos($x, ' ')) {
-                $test[] = legal_webbie(substr($x, 0, strpos($x, ' ')));
-            }
-            if ($test[0]) {
-                // first name plus first initial of last
-                $test[] = ((strpos($x, ' ')) ? $test[0] . legal_webbie(trim(substr($x, strpos($x, ' '), 2))) : '');
-                // first name plus random number
-                $test[] = $test[0] . mt_rand(1000, 9999);
-            }
-
-            $n = legal_webbie($x);
-            if (strlen($n)) {
-                $test[] = $n;
-                $test[] = $n . mt_rand(1000, 9999);
-            }
-
-            for ($y = 0; $y < 100; $y++) {
-                $test[] = 'id' . mt_rand(1000, 9999);
-            }
-
-            json_return_and_die(check_webbie($test));
-        }
-    }
-
-    public function post()
-    {
-
-        $arr = $_POST;
-
-        $acc = App::get_account();
-
-        if (local_channel()) {
-            $parent_channel = App::get_channel();
-            if ($parent_channel) {
-                $arr['parent_hash'] = $parent_channel['channel_hash'];
-            }
-        }
-
-        $arr['account_id'] = get_account_id();
-
-        // prevent execution by delegated channels as well as those not logged in.
-        // get_account_id() returns the account_id from the session. But \App::$account
-        // may point to the original authenticated account.
-
-        if ((!$acc) || ($acc['account_id'] != $arr['account_id'])) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $result = Channel::create($arr);
-
-        if (!$result['success']) {
-            notice($result['message']);
-            return;
-        }
-
-        $newuid = $result['channel']['channel_id'];
-
-        change_channel($result['channel']['channel_id']);
-
-        $next_page = get_config('system', 'workflow_channel_next', 'profiles');
-        goaway(z_root() . '/' . $next_page);
-    }
-
-    public function get()
-    {
-
-        $acc = App::get_account();
-
-        if ((!$acc) || $acc['account_id'] != get_account_id()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $default_role = '';
-        $aid = get_account_id();
-        if ($aid) {
-            $r = q(
-                "select count(channel_id) as total from channel where channel_account_id = %d",
-                intval($aid)
-            );
-            if ($r && (!intval($r[0]['total']))) {
-                $default_role = get_config('system', 'default_permissions_role', 'social');
-            }
-
-            $limit = ServiceClass::account_fetch(get_account_id(), 'total_identities');
-
-            if ($r && ($limit !== false)) {
-                $channel_usage_message = sprintf(t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit);
-            } else {
-                $channel_usage_message = '';
-            }
-        }
-
-        $name_help = '';
-        $name_help .= (($default_role)
-            ? t('Your real name is recommended.')
-            : t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"')
-        );
-        $name_help .= '';
-
-        $nick_help = '';
-        $nick_help .= t('This will be used to create a unique network address (like an email address).');
-        if (!get_config('system', 'unicode_usernames')) {
-            $nick_help .= ' ' . t('Allowed characters are a-z 0-9, - and _');
-        }
-        $nick_help .= '';
-
-        $privacy_role = ((x($_REQUEST, 'permissions_role')) ? $_REQUEST['permissions_role'] : "");
-
-        $perm_roles = PermissionRoles::roles();
-
-        $name = array('name', t('Channel name'), ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''), $name_help, "*");
-        $nickhub = '@' . App::get_hostname();
-        $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST, 'nickname')) ? $_REQUEST['nickname'] : ''), $nick_help, "*");
-        $role = array('permissions_role', t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role compatible with your usage needs and privacy requirements.'), $perm_roles);
-
-        $o = replace_macros(Theme::get_template('new_channel.tpl'), array(
-            '$title' => t('Create a Channel'),
-            '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.'),
-            '$label_import' => t('or import an existing channel from another location.'),
-            '$name' => $name,
-            '$role' => $role,
-            '$default_role' => $default_role,
-            '$nickname' => $nickname,
-            '$validate' => t('Validate'),
-            '$submit' => t('Create'),
-            '$channel_usage_message' => $channel_usage_message
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php
deleted file mode 100644
index 5040d4e3b..000000000
--- a/Zotlabs/Module/Notes.php
+++ /dev/null
@@ -1,66 +0,0 @@
- true);
-        if (array_key_exists('note_text', $_REQUEST)) {
-            $body = escape_tags($_REQUEST['note_text']);
-
-            // I've had my notes vanish into thin air twice in four years.
-            // Provide a backup copy if there were contents previously
-            // and there are none being saved now.
-
-            if (!$body) {
-                $old_text = get_pconfig(local_channel(), 'notes', 'text');
-                if ($old_text) {
-                    set_pconfig(local_channel(), 'notes', 'text.bak', $old_text);
-                }
-            }
-            set_pconfig(local_channel(), 'notes', 'text', $body);
-
-
-            // push updates to channel clones
-
-            if ((argc() > 1) && (argv(1) === 'sync')) {
-                Libsync::build_sync_packet();
-            }
-
-            logger('notes saved.', LOGGER_DEBUG);
-            json_return_and_die($ret);
-        }
-    }
-
-    public function get()
-    {
-
-        $desc = t('This app allows you to create private notes for your personal use.');
-
-        $text = '
          ' . $desc . '
          ';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Notes'))) {
-            return $text;
-        }
-
-        $desc = t('This app is installed. The Notes tool can be found on your stream page.');
-
-        $text = '
          ' . $desc . '
          ';
-
-        return $text;
-    }
-}
diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php
deleted file mode 100644
index e6d7d4c5d..000000000
--- a/Zotlabs/Module/Notifications.php
+++ /dev/null
@@ -1,82 +0,0 @@
- 49) {
-            $r = q(
-                "select * from notify where uid = %d
-				and seen = 0 order by created desc limit 50",
-                intval(local_channel())
-            );
-        } else {
-            $r1 = q(
-                "select * from notify where uid = %d
-				and seen = 0 order by created desc limit 50",
-                intval(local_channel())
-            );
-
-            $r2 = q(
-                "select * from notify where uid = %d
-				and seen = 1 order by created desc limit %d",
-                intval(local_channel()),
-                intval(50 - intval($n[0]['total']))
-            );
-            $r = array_merge($r1, $r2);
-        }
-
-        if ($r) {
-            $notifications_available = true;
-            foreach ($r as $rr) {
-                $x = strip_tags(bbcode($rr['msg']));
-                $notif_content .= replace_macros(Theme::get_template('notify.tpl'), array(
-                    '$item_link' => z_root() . '/notify/view/' . $rr['id'],
-                    '$item_image' => $rr['photo'],
-                    '$item_text' => $x,
-                    '$item_when' => relative_date($rr['created']),
-                    '$item_seen' => (($rr['seen']) ? true : false),
-                    '$new' => t('New')
-                ));
-            }
-        } else {
-            $notif_content = t('No more system notifications.');
-        }
-
-        $o .= replace_macros(Theme::get_template('notifications.tpl'), array(
-            '$notif_header' => t('System Notifications'),
-            '$notif_link_mark_seen' => t('Mark all seen'),
-            '$notif_content' => $notif_content,
-            '$notifications_available' => $notifications_available,
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php
deleted file mode 100644
index 4d5ee158f..000000000
--- a/Zotlabs/Module/Notify.php
+++ /dev/null
@@ -1,87 +0,0 @@
- 2 && argv(1) === 'view' && intval(argv(2))) {
-            $r = q(
-                "select * from notify where id = %d and uid = %d limit 1",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-            if ($r) {
-                $x = ['channel_id' => local_channel(), 'update' => 'unset'];
-                Hook::call('update_unseen', $x);
-                if ((!$_SESSION['sudo']) && ($x['update'] === 'unset' || intval($x['update']))) {
-                    q(
-                        "update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d",
-                        dbesc($r[0]['parent']),
-                        dbesc($r[0]['otype']),
-                        dbesc($r[0]['link']),
-                        intval(local_channel())
-                    );
-                }
-                goaway($r[0]['link']);
-            }
-            notice(sprintf(t('A notification with that id was not found for channel \'%s\''), $channel['channel_name']));
-            goaway(z_root());
-        }
-    }
-
-
-    public function get()
-    {
-        if (!local_channel()) {
-            return login();
-        }
-
-        $notif_tpl = Theme::get_template('notifications.tpl');
-
-        $not_tpl = Theme::get_template('notify.tpl');
-
-        $r = q(
-            "SELECT * from notify where uid = %d and seen = 0 order by created desc",
-            intval(local_channel())
-        );
-
-        if ($r) {
-            foreach ($r as $it) {
-                $notif_content .= replace_macros($not_tpl, array(
-                    '$item_link' => z_root() . '/notify/view/' . $it['id'],
-                    '$item_image' => $it['photo'],
-                    '$item_text' => strip_tags(bbcode($it['msg'])),
-                    '$item_when' => relative_date($it['created'])
-                ));
-            }
-        } else {
-            $notif_content .= t('No more system notifications.');
-        }
-
-        $o .= replace_macros($notif_tpl, array(
-            '$notif_header' => t('System Notifications'),
-            '$tabs' => '', // $tabs,
-            '$notif_content' => $notif_content,
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Nullbox.php b/Zotlabs/Module/Nullbox.php
deleted file mode 100644
index 02e90258e..000000000
--- a/Zotlabs/Module/Nullbox.php
+++ /dev/null
@@ -1,14 +0,0 @@
- z_root(),
-            'authorization_endpoint' => z_root() . '/authorize',
-            'jwks_uri' => z_root() . '/jwks',
-            'token_endpoint' => z_root() . '/token',
-            'userinfo_endpoint' => z_root() . '/userinfo',
-            'scopes_supported' => ['openid', 'profile', 'email'],
-            'response_types_supported' => ['code', 'token', 'id_token', 'code id_token', 'token id_token']
-        ];
-
-        json_return_and_die($ret);
-    }
-}
diff --git a/Zotlabs/Module/Oembed.php b/Zotlabs/Module/Oembed.php
deleted file mode 100644
index e292cdf2b..000000000
--- a/Zotlabs/Module/Oembed.php
+++ /dev/null
@@ -1,35 +0,0 @@
- 1) {
-            if (argv(1) == 'b2h') {
-                $url = array("", trim(hex2bin($_REQUEST['url'])));
-                echo Zlib\Oembed::replacecb($url);
-                killme();
-            } elseif (argv(1) == 'h2b') {
-                $text = trim(hex2bin($_REQUEST['text']));
-                echo Zlib\Oembed::html2bbcode($text);
-                killme();
-            } else {
-                echo "";
-                $src = base64url_decode(argv(1));
-                $j = Zlib\Oembed::fetch_url($src);
-                echo $j['html'];
-                echo "";
-            }
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php
deleted file mode 100644
index e032184e3..000000000
--- a/Zotlabs/Module/Oep.php
+++ /dev/null
@@ -1,680 +0,0 @@
- 1 && argv(1) === 'html') ? true : false);
-        if ($_REQUEST['url']) {
-            $_REQUEST['url'] = strip_zids($_REQUEST['url']);
-            $url = $_REQUEST['url'];
-        }
-
-        if (!$url) {
-            http_status_exit(404, 'Not found');
-        }
-
-        $maxwidth = $_REQUEST['maxwidth'];
-        $maxheight = $_REQUEST['maxheight'];
-        $format = $_REQUEST['format'];
-        if ($format && $format !== 'json') {
-            http_status_exit(501, 'Not implemented');
-        }
-
-        if (fnmatch('*/photos/*/album/*', $url)) {
-            $arr = $this->oep_album_reply($_REQUEST);
-        } elseif (fnmatch('*/photos/*/image/*', $url)) {
-            $arr = $this->oep_photo_reply($_REQUEST);
-        } elseif (fnmatch('*/photos*', $url)) {
-            $arr = $this->oep_phototop_reply($_REQUEST);
-        } elseif (fnmatch('*/display/*', $url)) {
-            $arr = $this->oep_display_reply($_REQUEST);
-        } elseif (fnmatch('*/channel/*mid=*', $url)) {
-            $arr = $this->oep_mid_reply($_REQUEST);
-        } elseif (fnmatch('*/channel*', $url)) {
-            $arr = $this->oep_profile_reply($_REQUEST);
-        } elseif (fnmatch('*/profile/*', $url)) {
-            $arr = $this->oep_profile_reply($_REQUEST);
-        } elseif (fnmatch('*/cards/*', $url)) {
-            $arr = $this->oep_cards_reply($_REQUEST);
-        } elseif (fnmatch('*/articles/*', $url)) {
-            $arr = $this->oep_articles_reply($_REQUEST);
-        }
-
-        if ($arr) {
-            if ($html) {
-                if ($arr['type'] === 'rich') {
-                    header('Content-Type: text/html');
-                    echo $arr['html'];
-                }
-            } else {
-                header('Content-Type: application/json+oembed');
-                echo json_encode($arr);
-            }
-            killme();
-        }
-
-        http_status_exit(404, 'Not found');
-    }
-
-    public function oep_display_reply($args)
-    {
-
-        $ret = [];
-        $url = $args['url'];
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        if (preg_match('#//(.*?)/display/(.*?)(&|\?|$)#', $url, $matches)) {
-            $res = $matches[2];
-        }
-
-        $res = unpack_link_id($res);
-
-        $item_normal = item_normal();
-
-        $p = q(
-            "select * from item where mid like '%s' limit 1",
-            dbesc($res . '%')
-        );
-
-        if (!$p) {
-            return;
-        }
-
-        $c = Channel::from_id($p[0]['uid']);
-
-
-        if (!($c && $res)) {
-            return;
-        }
-
-        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_stream')) {
-            return;
-        }
-
-        $sql_extra = item_permissions_sql($c['channel_id']);
-
-        $p = q(
-            "select * from item where mid like '%s' and uid = %d $sql_extra $item_normal limit 1",
-            dbesc($res . '%'),
-            intval($c['channel_id'])
-        );
-
-        if (!$p) {
-            return;
-        }
-
-        xchan_query($p, true);
-        $p = fetch_post_tags($p, true);
-
-        // This function can get tripped up if the item is already a reshare
-        // (the multiple share declarations do not parse cleanly if nested)
-        // So build a template with a known nonsense string as the content, and then
-        // replace that known string with the actual rendered content, sending
-        // each content layer through bbcode() separately.
-
-        $x = '2eGriplW^*Jmf4';
-
-
-        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
-            "' profile='" . $p[0]['author']['xchan_url'] .
-            "' portable_id='" . $p[0]['author']['xchan_hash'] .
-            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
-            "' link='" . $p[0]['plink'] .
-			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
-            "' posted='" . $p[0]['created'] .
-            "' message_id='" . $p[0]['mid'] . "']";
-        if ($p[0]['title']) {
-            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
-        }
-
-        $o .= $x;
-        $o .= "[/share]";
-        $o = bbcode($o);
-
-        $o = str_replace($x, bbcode($p[0]['body']), $o);
-
-        $ret['type'] = 'rich';
-
-        $w = (($maxwidth) ? $maxwidth : 640);
-        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-
-        $ret['html'] = '
          ' . $o . '
          ';
-
-        $ret['width'] = $w;
-        $ret['height'] = $h;
-
-        return $ret;
-    }
-
-
-    public function oep_cards_reply($args)
-    {
-
-        $ret = [];
-        $url = $args['url'];
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        if (preg_match('#//(.*?)/cards/(.*?)/(.*?)(&|\?|$)#', $url, $matches)) {
-            $nick = $matches[2];
-            $res = $matches[3];
-        }
-        if (!($nick && $res)) {
-            return $ret;
-        }
-
-        $channel = Channel::from_username($nick);
-
-        if (!$channel) {
-            return $ret;
-        }
-
-
-        if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_pages')) {
-            return $ret;
-        }
-
-        $sql_extra = item_permissions_sql($channel['channel_id'], get_observer_hash());
-
-        $r = q(
-            "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1",
-            dbesc($res)
-        );
-        if ($r) {
-            $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " ";
-        } else {
-            return $ret;
-        }
-
-        $r = q(
-            "select * from item 
-			where item.uid = %d and item_type = %d 
-			$sql_extra order by item.created desc",
-            intval($channel['channel_id']),
-            intval(ITEM_TYPE_CARD)
-        );
-
-        $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0
-			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-			and item.item_blocked = 0 ";
-
-        if ($r) {
-            xchan_query($r);
-            $p = fetch_post_tags($r, true);
-        }
-
-        $x = '2eGriplW^*Jmf4';
-
-
-        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
-            "' profile='" . $p[0]['author']['xchan_url'] .
-            "' portable_id='" . $p[0]['author']['xchan_hash'] .
-            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
-            "' link='" . $p[0]['plink'] .
-			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
-            "' posted='" . $p[0]['created'] .
-            "' message_id='" . $p[0]['mid'] . "']";
-        if ($p[0]['title']) {
-            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
-        }
-
-        $o .= $x;
-        $o .= "[/share]";
-        $o = bbcode($o);
-
-        $o = str_replace($x, bbcode($p[0]['body']), $o);
-
-        $ret['type'] = 'rich';
-
-        $w = (($maxwidth) ? $maxwidth : 640);
-        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-
-        $ret['html'] = '
          ' . $o . '
          ';
-
-        $ret['width'] = $w;
-        $ret['height'] = $h;
-
-        return $ret;
-    }
-
-    public function oep_articles_reply($args)
-    {
-
-        $ret = [];
-        $url = $args['url'];
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        if (preg_match('#//(.*?)/articles/(.*?)/(.*?)(&|\?|$)#', $url, $matches)) {
-            $nick = $matches[2];
-            $res = $matches[3];
-        }
-        if (!($nick && $res)) {
-            return $ret;
-        }
-
-        $channel = Channel::from_username($nick);
-
-        if (!$channel) {
-            return $ret;
-        }
-
-
-        if (!perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_pages')) {
-            return $ret;
-        }
-
-        $sql_extra = item_permissions_sql($channel['channel_id'], get_observer_hash());
-
-        $r = q(
-            "select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1",
-            dbesc($res)
-        );
-        if ($r) {
-            $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " ";
-        } else {
-            return $ret;
-        }
-
-        $r = q(
-            "select * from item 
-			where item.uid = %d and item_type = %d 
-			$sql_extra order by item.created desc",
-            intval($channel['channel_id']),
-            intval(ITEM_TYPE_ARTICLE)
-        );
-
-        $item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0
-			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-			and item.item_blocked = 0 ";
-
-        if ($r) {
-            xchan_query($r);
-            $p = fetch_post_tags($r, true);
-        }
-
-        $x = '2eGriplW^*Jmf4';
-
-
-        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
-            "' profile='" . $p[0]['author']['xchan_url'] .
-            "' portable_id='" . $p[0]['author']['xchan_hash'] .
-            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
-            "' link='" . $p[0]['plink'] .
-			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
-            "' posted='" . $p[0]['created'] .
-            "' message_id='" . $p[0]['mid'] . "']";
-        if ($p[0]['title']) {
-            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
-        }
-
-        $o .= $x;
-        $o .= "[/share]";
-        $o = bbcode($o);
-
-        $o = str_replace($x, bbcode($p[0]['body']), $o);
-
-        $ret['type'] = 'rich';
-
-        $w = (($maxwidth) ? $maxwidth : 640);
-        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-
-        $ret['html'] = '
          ' . $o . '
          ';
-
-        $ret['width'] = $w;
-        $ret['height'] = $h;
-
-        return $ret;
-    }
-
-
-    public function oep_mid_reply($args)
-    {
-
-        $ret = [];
-        $url = $args['url'];
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        if (preg_match('#//(.*?)/(.*?)/(.*?)/(.*?)mid\=(.*?)(&|$)#', $url, $matches)) {
-            $chn = $matches[3];
-            $res = $matches[5];
-        }
-
-        if (!($chn && $res)) {
-            return;
-        }
-        $c = q(
-            "select * from channel where channel_address = '%s' limit 1",
-            dbesc($chn)
-        );
-
-        if (!$c) {
-            return;
-        }
-
-        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_stream')) {
-            return;
-        }
-
-        $sql_extra = item_permissions_sql($c[0]['channel_id']);
-
-        $p = q(
-            "select * from item where mid = '%s' and uid = %d $sql_extra limit 1",
-            dbesc($res),
-            intval($c[0]['channel_id'])
-        );
-        if (!$p) {
-            return;
-        }
-
-        xchan_query($p, true);
-        $p = fetch_post_tags($p, true);
-
-        // This function can get tripped up if the item is already a reshare
-        // (the multiple share declarations do not parse cleanly if nested)
-        // So build a template with a known nonsense string as the content, and then
-        // replace that known string with the actual rendered content, sending
-        // each content layer through bbcode() separately.
-
-        $x = '2eGriplW^*Jmf4';
-
-        $o = "[share author='" . urlencode($p[0]['author']['xchan_name']) .
-            "' profile='" . $p[0]['author']['xchan_url'] .
-            "' portable_id='" . $p[0]['author']['xchan_hash'] .
-            "' avatar='" . $p[0]['author']['xchan_photo_s'] .
-            "' link='" . $p[0]['plink'] .
-			"' auth='" . (in_array($p[0]['author']['network'],['nomad','zot6']) ? 'true' : 'false') .
-            "' posted='" . $p[0]['created'] .
-            "' message_id='" . $p[0]['mid'] . "']";
-        if ($p[0]['title']) {
-            $o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
-        }
-        $o .= $x;
-        $o .= "[/share]";
-        $o = bbcode($o);
-
-        $o = str_replace($x, bbcode($p[0]['body']), $o);
-
-        $ret['type'] = 'rich';
-
-        $w = (($maxwidth) ? $maxwidth : 640);
-        $h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
-
-        $ret['html'] = '
          ' . $o . '
          ';
-
-        $ret['width'] = $w;
-        $ret['height'] = $h;
-
-        return $ret;
-    }
-
-    public function oep_profile_reply($args)
-    {
-
-
-        require_once('include/channel.php');
-
-        $url = $args['url'];
-
-        if (preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#', $url, $matches)) {
-            $chn = $matches[3];
-        }
-
-        if (!$chn) {
-            return;
-        }
-
-        $c = Channel::from_username($chn);
-
-        if (!$c) {
-            return;
-        }
-
-
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        $width = 800;
-        $height = 375;
-
-        if ($maxwidth) {
-            $width = $maxwidth;
-            $height = (375 / 800) * $width;
-        }
-        if ($maxheight) {
-            if ($maxheight < $height) {
-                $width = (800 / 375) * $maxheight;
-                $height = $maxheight;
-            }
-        }
-        $ret = [];
-
-        $ret['type'] = 'rich';
-        $ret['width'] = intval($width);
-        $ret['height'] = intval($height);
-
-        $ret['html'] = Channel::get_zcard_embed($c, get_observer_hash(), array('width' => $width, 'height' => $height));
-
-        return $ret;
-    }
-
-    public function oep_album_reply($args)
-    {
-
-        $ret = [];
-        $url = $args['url'];
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        if (preg_match('|//(.*?)/(.*?)/(.*?)/album/|', $url, $matches)) {
-            $chn = $matches[3];
-            $res = basename($url);
-        }
-
-        if (!($chn && $res)) {
-            return;
-        }
-        $c = q(
-            "select * from channel where channel_address = '%s' limit 1",
-            dbesc($chn)
-        );
-
-        if (!$c) {
-            return;
-        }
-
-        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) {
-            return;
-        }
-
-        $sql_extra = permissions_sql($c[0]['channel_id']);
-
-        $p = q(
-            "select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
-            dbesc($res),
-            intval($c[0]['channel_id'])
-        );
-        if (!$p) {
-            return;
-        }
-
-        $res = $p[0]['resource_id'];
-
-        $r = q(
-            "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
-            intval($c[0]['channel_id']),
-            dbesc($res)
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $foundres = false;
-                if ($maxheight && $rr['height'] > $maxheight) {
-                    continue;
-                }
-                if ($maxwidth && $rr['width'] > $maxwidth) {
-                    continue;
-                }
-                $foundres = true;
-                break;
-            }
-
-            if ($foundres) {
-                $ret['type'] = 'link';
-                $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
-                $ret['thumbnail_width'] = $rr['width'];
-                $ret['thumbnail_height'] = $rr['height'];
-            }
-        }
-        return $ret;
-    }
-
-
-    public function oep_phototop_reply($args)
-    {
-
-        $ret = [];
-        $url = $args['url'];
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        if (preg_match('|//(.*?)/(.*?)/(.*?)$|', $url, $matches)) {
-            $chn = $matches[3];
-        }
-
-        if (!$chn) {
-            return;
-        }
-        $c = q(
-            "select * from channel where channel_address = '%s' limit 1",
-            dbesc($chn)
-        );
-
-        if (!$c) {
-            return;
-        }
-
-        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) {
-            return;
-        }
-
-        $sql_extra = permissions_sql($c[0]['channel_id']);
-
-        $p = q(
-            "select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
-            intval($c[0]['channel_id'])
-        );
-        if (!$p) {
-            return;
-        }
-
-        $res = $p[0]['resource_id'];
-
-        $r = q(
-            "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
-            intval($c[0]['channel_id']),
-            dbesc($res)
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $foundres = false;
-                if ($maxheight && $rr['height'] > $maxheight) {
-                    continue;
-                }
-                if ($maxwidth && $rr['width'] > $maxwidth) {
-                    continue;
-                }
-                $foundres = true;
-                break;
-            }
-
-            if ($foundres) {
-                $ret['type'] = 'link';
-                $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
-                $ret['thumbnail_width'] = $rr['width'];
-                $ret['thumbnail_height'] = $rr['height'];
-            }
-        }
-        return $ret;
-    }
-
-
-    public function oep_photo_reply($args)
-    {
-
-        $ret = [];
-        $url = $args['url'];
-        $maxwidth = intval($args['maxwidth']);
-        $maxheight = intval($args['maxheight']);
-
-        if (preg_match('|//(.*?)/(.*?)/(.*?)/image/|', $url, $matches)) {
-            $chn = $matches[3];
-            $res = basename($url);
-        }
-
-        if (!($chn && $res)) {
-            return;
-        }
-        $c = q(
-            "select * from channel where channel_address = '%s' limit 1",
-            dbesc($chn)
-        );
-
-        if (!$c) {
-            return;
-        }
-
-        if (!perm_is_allowed($c[0]['channel_id'], get_observer_hash(), 'view_files')) {
-            return;
-        }
-
-        $sql_extra = permissions_sql($c[0]['channel_id']);
-
-
-        $r = q(
-            "select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
-            intval($c[0]['channel_id']),
-            dbesc($res)
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $foundres = false;
-                if ($maxheight && $rr['height'] > $maxheight) {
-                    continue;
-                }
-                if ($maxwidth && $rr['width'] > $maxwidth) {
-                    continue;
-                }
-                $foundres = true;
-                break;
-            }
-
-            if ($foundres) {
-                $ret['type'] = 'link';
-                $ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
-                $ret['thumbnail_width'] = $rr['width'];
-                $ret['thumbnail_height'] = $rr['height'];
-            }
-        }
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Module/Oexchange.php b/Zotlabs/Module/Oexchange.php
deleted file mode 100644
index abd04c216..000000000
--- a/Zotlabs/Module/Oexchange.php
+++ /dev/null
@@ -1,78 +0,0 @@
- 1) && (argv(1) === 'xrd')) {
-            echo replace_macros(Theme::get_template('oexchange_xrd.tpl'), ['$base' => z_root()]);
-            killme();
-        }
-    }
-
-    public function get()
-    {
-        if (!local_channel()) {
-            if (remote_channel()) {
-                $observer = App::get_observer();
-                if ($observer && $observer['xchan_url']) {
-                    $parsed = @parse_url($observer['xchan_url']);
-                    if (!$parsed) {
-                        notice(t('Unable to find your site.') . EOL);
-                        return;
-                    }
-                    $url = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '');
-                    $url .= '/oexchange';
-                    $result = z_post_url($url, $_REQUEST);
-                    json_return_and_die($result);
-                }
-            }
-
-            return login(false);
-        }
-
-        if ((argc() > 1) && argv(1) === 'done') {
-            info(t('Post successful.') . EOL);
-            return;
-        }
-
-        $url = (((x($_REQUEST, 'url')) && strlen($_REQUEST['url']))
-            ? urlencode(notags(trim($_REQUEST['url']))) : '');
-        $title = (((x($_REQUEST, 'title')) && strlen($_REQUEST['title']))
-            ? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
-        $description = (((x($_REQUEST, 'description')) && strlen($_REQUEST['description']))
-            ? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
-        $tags = (((x($_REQUEST, 'tags')) && strlen($_REQUEST['tags']))
-            ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
-
-        $ret = z_fetch_url(z_root() . '/linkinfo?f=&url=' . $url . $title . $description . $tags);
-
-        if ($ret['success']) {
-            $s = $ret['body'];
-        }
-
-        if (!strlen($s)) {
-            return;
-        }
-
-        $post = [];
-
-        $post['profile_uid'] = local_channel();
-        $post['return'] = '/oexchange/done';
-        $post['body'] = $s;
-        $post['type'] = 'wall';
-
-        $_REQUEST = $post;
-        $mod = new Item();
-        $mod->post();
-    }
-}
diff --git a/Zotlabs/Module/Online.php b/Zotlabs/Module/Online.php
deleted file mode 100644
index ac7c340e0..000000000
--- a/Zotlabs/Module/Online.php
+++ /dev/null
@@ -1,18 +0,0 @@
- false];
-        if (argc() != 2) {
-            json_return_and_die($ret);
-        }
-        json_return_and_die(Channel::get_online_status(argv(1)));
-    }
-}
diff --git a/Zotlabs/Module/Outbox.php b/Zotlabs/Module/Outbox.php
deleted file mode 100644
index 040f91ed8..000000000
--- a/Zotlabs/Module/Outbox.php
+++ /dev/null
@@ -1,318 +0,0 @@
-is_valid()) {
-            return;
-        }
-
-        if (!PConfig::Get($channel['channel_id'], 'system', 'activitypub', Config::Get('system', 'activitypub', ACTIVITYPUB_ENABLED))) {
-            return;
-        }
-
-        logger('outbox_channel: ' . $channel['channel_address'], LOGGER_DEBUG);
-
-//      switch ($AS->type) {
-//          case 'Follow':
-//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type']) && isset($AS->obj['id'])) {
-//                  // do follow activity
-//                  Activity::follow($channel,$AS);
-//              }
-//              break;
-//          case 'Invite':
-//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
-//                  // do follow activity
-//                  Activity::follow($channel,$AS);
-//              }
-//              break;
-//          case 'Join':
-//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
-//                  // do follow activity
-//                  Activity::follow($channel,$AS);
-//              }
-//              break;
-//          case 'Accept':
-//              // Activitypub for wordpress sends lowercase 'follow' on accept.
-//              // https://github.com/pfefferle/wordpress-activitypub/issues/97
-//              // Mobilizon sends Accept/"Member" (not in vocabulary) in response to Join/Group
-//              if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && in_array($AS->obj['type'], ['Follow','follow', 'Member'])) {
-//                  // do follow activity
-//                  Activity::follow($channel,$AS);
-//              }
-//              break;
-//          case 'Reject':
-//          default:
-//              break;
-//
-//      }
-
-        // These activities require permissions
-
-        $item = null;
-
-        switch ($AS->type) {
-            case 'Update':
-                if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStreams::is_an_actor($AS->obj['type'])) {
-                    // pretend this is an old cache entry to force an update of all the actor details
-                    $AS->obj['cached'] = true;
-                    $AS->obj['updated'] = datetime_convert('UTC', 'UTC', '1980-01-01', ATOM_TIME);
-                    Activity::actor_store($AS->obj['id'], $AS->obj);
-                    break;
-                }
-            case 'Accept':
-                if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && (ActivityStreams::is_an_actor($AS->obj['type']) || $AS->obj['type'] === 'Member')) {
-                    break;
-                }
-            case 'Create':
-            case 'Like':
-            case 'Dislike':
-            case 'Announce':
-            case 'Reject':
-            case 'TentativeAccept':
-            case 'TentativeReject':
-            case 'Add':
-            case 'Arrive':
-            case 'Block':
-            case 'Flag':
-            case 'Ignore':
-            case 'Invite':
-            case 'Listen':
-            case 'Move':
-            case 'Offer':
-            case 'Question':
-            case 'Read':
-            case 'Travel':
-            case 'View':
-            case 'emojiReaction':
-            case 'EmojiReaction':
-            case 'EmojiReact':
-                // These require a resolvable object structure
-                if (is_array($AS->obj)) {
-                    // The boolean flag enables html cache of the item
-                    $item = Activity::decode_note($AS, true);
-                } else {
-                    logger('unresolved object: ' . print_r($AS->obj, true));
-                }
-                break;
-            case 'Undo':
-                if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Follow') {
-                    // do unfollow activity
-                    Activity::unfollow($channel, $AS);
-                    break;
-                }
-            case 'Leave':
-                if ($AS->obj && is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
-                    // do unfollow activity
-                    Activity::unfollow($channel, $AS);
-                    break;
-                }
-            case 'Tombstone':
-            case 'Delete':
-                Activity::drop($channel, $observer_hash, $AS);
-                break;
-            case 'Move':
-                if (
-                    $observer_hash && $observer_hash === $AS->actor
-                    && is_array($AS->obj) && array_key_exists('type', $AS->obj) && ActivityStream::is_an_actor($AS->obj['type'])
-                    && is_array($AS->tgt) && array_key_exists('type', $AS->tgt) && ActivityStream::is_an_actor($AS->tgt['type'])
-                ) {
-                    ActivityPub::move($AS->obj, $AS->tgt);
-                }
-                break;
-            case 'Add':
-            case 'Remove':
-            default:
-                break;
-        }
-
-        if ($item) {
-            logger('parsed_item: ' . print_r($item, true), LOGGER_DATA);
-            Activity::store($channel, $observer_hash, $AS, $item);
-        }
-
-        http_status_exit(200, 'OK');
-        return;
-    }
-
-
-    public function get()
-    {
-
-        if (observer_prohibited(true)) {
-            killme();
-        }
-
-        if (argc() < 2) {
-            killme();
-        }
-
-        $channel = Channel::from_username(argv(1));
-        if (!$channel) {
-            killme();
-        }
-
-//      if (intval($channel['channel_system'])) {
-//          killme();
-//      }
-
-        if (ActivityStreams::is_as_request()) {
-            $sigdata = HTTPSig::verify(($_SERVER['REQUEST_METHOD'] === 'POST') ? file_get_contents('php://input') : EMPTY_STR);
-            if ($sigdata['portable_id'] && $sigdata['header_valid']) {
-                $portable_id = $sigdata['portable_id'];
-                if (!check_channelallowed($portable_id)) {
-                    http_status_exit(403, 'Permission denied');
-                }
-                if (!check_siteallowed($sigdata['signer'])) {
-                    http_status_exit(403, 'Permission denied');
-                }
-                observer_auth($portable_id);
-            } elseif (Config::get('system', 'require_authenticated_fetch', false)) {
-                http_status_exit(403, 'Permission denied');
-            }
-
-            $observer_hash = get_observer_hash();
-
-            $params = [];
-
-            $params['begin'] = ((x($_REQUEST, 'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE);
-            $params['end'] = ((x($_REQUEST, 'date_end')) ? $_REQUEST['date_end'] : '');
-            $params['type'] = 'json';
-            $params['pages'] = ((x($_REQUEST, 'pages')) ? intval($_REQUEST['pages']) : 0);
-            $params['top'] = ((x($_REQUEST, 'top')) ? intval($_REQUEST['top']) : 0);
-            $params['direction'] = ((x($_REQUEST, 'direction')) ? dbesc($_REQUEST['direction']) : 'desc'); // unimplemented
-            $params['cat'] = ((x($_REQUEST, 'cat')) ? escape_tags($_REQUEST['cat']) : '');
-            $params['compat'] = 1;
-
-
-            $total = items_fetch(
-                [
-                    'total' => true,
-                    'wall' => '1',
-                    'datequery' => $params['end'],
-                    'datequery2' => $params['begin'],
-                    'direction' => dbesc($params['direction']),
-                    'pages' => $params['pages'],
-                    'order' => dbesc('post'),
-                    'top' => $params['top'],
-                    'cat' => $params['cat'],
-                    'compat' => $params['compat']
-                ],
-                $channel,
-                $observer_hash,
-                CLIENT_MODE_NORMAL,
-                App::$module
-            );
-
-            if ($total) {
-                App::set_pager_total($total);
-                App::set_pager_itemspage(100);
-            }
-
-            if (App::$pager['unset'] && $total > 100) {
-                $ret = Activity::paged_collection_init($total, App::$query_string);
-            } else {
-                $items = items_fetch(
-                    [
-                        'wall' => '1',
-                        'datequery' => $params['end'],
-                        'datequery2' => $params['begin'],
-                        'records' => intval(App::$pager['itemspage']),
-                        'start' => intval(App::$pager['start']),
-                        'direction' => dbesc($params['direction']),
-                        'pages' => $params['pages'],
-                        'order' => dbesc('post'),
-                        'top' => $params['top'],
-                        'cat' => $params['cat'],
-                        'compat' => $params['compat']
-                    ],
-                    $channel,
-                    $observer_hash,
-                    CLIENT_MODE_NORMAL,
-                    App::$module
-                );
-
-                if ($items && $observer_hash) {
-                    // check to see if this observer is a connection. If not, register any items
-                    // belonging to this channel for notification of deletion/expiration
-
-                    $x = q(
-                        "select abook_id from abook where abook_channel = %d and abook_xchan = '%s'",
-                        intval($channel['channel_id']),
-                        dbesc($observer_hash)
-                    );
-                    if (!$x) {
-                        foreach ($items as $item) {
-                            if (strpos($item['mid'], z_root()) === 0) {
-                                ThreadListener::store($item['mid'], $observer_hash);
-                            }
-                        }
-                    }
-                }
-
-                $ret = Activity::encode_item_collection($items, App::$query_string, 'OrderedCollection', true, $total);
-            }
-
-            as_return_and_die($ret, $channel);
-        }
-    }
-}
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php
deleted file mode 100644
index a18f2e2b1..000000000
--- a/Zotlabs/Module/Owa.php
+++ /dev/null
@@ -1,76 +0,0 @@
- false];
-
-        if (array_key_exists('REDIRECT_REMOTE_USER', $_SERVER) && (!array_key_exists('HTTP_AUTHORIZATION', $_SERVER))) {
-            $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['REDIRECT_REMOTE_USER'];
-        }
-
-
-        if (array_key_exists('HTTP_AUTHORIZATION', $_SERVER) && substr(trim($_SERVER['HTTP_AUTHORIZATION']), 0, 9) === 'Signature') {
-            $sigblock = HTTPSig::parse_sigheader($_SERVER['HTTP_AUTHORIZATION']);
-            if ($sigblock) {
-                $keyId = $sigblock['keyId'];
-                if ($keyId) {
-                    $r = q(
-                        "select * from hubloc left join xchan on hubloc_hash = xchan_hash 
-						where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and xchan_pubkey != '' ",
-                        dbesc(str_replace('acct:', '', $keyId)),
-                        dbesc($keyId)
-                    );
-                    if (!$r) {
-                        $found = discover_by_webbie(str_replace('acct:', '', $keyId));
-                        if ($found) {
-                            $r = q(
-                                "select * from hubloc left join xchan on hubloc_hash = xchan_hash 
-								where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and xchan_pubkey != '' ",
-                                dbesc(str_replace('acct:', '', $keyId)),
-                                dbesc($keyId)
-                            );
-                        }
-                    }
-                    if ($r) {
-                        foreach ($r as $hubloc) {
-                            $verified = HTTPSig::verify(file_get_contents('php://input'), $hubloc['xchan_pubkey']);
-                            if ($verified && $verified['header_signed'] && $verified['header_valid'] && ($verified['content_valid'] || (!$verified['content_signed']))) {
-                                logger('OWA header: ' . print_r($verified, true), LOGGER_DATA);
-                                logger('OWA success: ' . $hubloc['hubloc_addr'], LOGGER_DATA);
-                                $ret['success'] = true;
-                                $token = random_string(32);
-                                Verify::create('owt', 0, $token, $hubloc['hubloc_addr']);
-                                $result = '';
-                                openssl_public_encrypt($token, $result, $hubloc['xchan_pubkey']);
-                                $ret['encrypted_token'] = base64url_encode($result);
-                                break;
-                            } else {
-                                logger('OWA fail: ' . $hubloc['hubloc_id'] . ' ' . $hubloc['hubloc_addr']);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        json_return_and_die($ret, 'application/x-nomad+json');
-    }
-}
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php
deleted file mode 100644
index 3df726c61..000000000
--- a/Zotlabs/Module/Page.php
+++ /dev/null
@@ -1,203 +0,0 @@
-parse($r[0]['body']);
-            App::$pdl = $r[0]['body'];
-        } elseif ($r[0]['layout_mid']) {
-            $l = q(
-                "select body from item where mid = '%s' and uid = %d limit 1",
-                dbesc($r[0]['layout_mid']),
-                intval($u[0]['channel_id'])
-            );
-
-            if ($l) {
-                App::$comanche = new Comanche();
-                App::$comanche->parse($l[0]['body']);
-                App::$pdl = $l[0]['body'];
-            }
-        }
-
-        App::$data['webpage'] = $r;
-    }
-
-    public function get()
-    {
-
-        $r = App::$data['webpage'];
-        if (!$r) {
-            return;
-        }
-
-        if ($r[0]['item_type'] == ITEM_TYPE_PDL) {
-            $r[0]['body'] = t('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.');
-            $r[0]['mimetype'] = 'text/plain';
-            $r[0]['title'] = '';
-        }
-
-        xchan_query($r);
-        $r = fetch_post_tags($r, true);
-
-        if ($r[0]['mimetype'] === 'application/x-pdl') {
-            App::$page['pdl_content'] = true;
-        }
-
-        $o .= prepare_page($r[0]);
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Pconfig.php b/Zotlabs/Module/Pconfig.php
deleted file mode 100644
index 52da386ef..000000000
--- a/Zotlabs/Module/Pconfig.php
+++ /dev/null
@@ -1,142 +0,0 @@
-disallowed_pconfig())) {
-            notice(t('This setting requires special processing and editing has been blocked.') . EOL);
-            return;
-        }
-
-        if (strpos($k, 'password') !== false) {
-            $v = obscurify($v);
-        }
-
-        set_pconfig(local_channel(), $cat, $k, $v);
-        Libsync::build_sync_packet();
-
-        if ($aj) {
-            killme();
-        }
-
-        goaway(z_root() . '/pconfig/' . $cat . '/' . $k);
-    }
-
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            return login();
-        }
-
-        $content = '
          ' . t('Configuration Editor') . '
          ';
-        $content .= '
          ' . t('Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature.') . '
          ' . EOL . EOL;
-
-
-        if (argc() == 3) {
-            $content .= 'pconfig[' . local_channel() . ']' . EOL;
-            $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . ']' . EOL . EOL;
-            $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . escape_tags(argv(2)) . '] = ' . get_pconfig(local_channel(), escape_tags(argv(1)), escape_tags(argv(2))) . EOL;
-
-            if (in_array(argv(2), $this->disallowed_pconfig())) {
-                notice(t('This setting requires special processing and editing has been blocked.') . EOL);
-                return $content;
-            } else {
-                $content .= $this->pconfig_form(escape_tags(argv(1)), escape_tags(argv(2)));
-            }
-        }
-
-
-        if (argc() == 2) {
-            $content .= 'pconfig[' . local_channel() . ']' . EOL;
-            load_pconfig(local_channel(), escape_tags(argv(1)));
-            if (App::$config[local_channel()][escape_tags(argv(1))]) {
-                foreach (App::$config[local_channel()][escape_tags(argv(1))] as $k => $x) {
-                    $content .= 'pconfig[' . local_channel() . '][' . escape_tags(argv(1)) . '][' . $k . '] = ' . escape_tags($x) . EOL;
-                }
-            }
-        }
-
-        if (argc() == 1) {
-            $r = q("select * from pconfig where uid = " . local_channel());
-            if ($r) {
-                foreach ($r as $rr) {
-                    $content .= 'pconfig[' . local_channel() . '][' . escape_tags($rr['cat']) . '][' . escape_tags($rr['k']) . '] = ' . escape_tags($rr['v']) . EOL;
-                }
-            }
-        }
-        return $content;
-    }
-
-
-    public function pconfig_form($cat, $k)
-    {
-
-        $o = '
          ';
-        $o .= '';
-
-        $v = get_pconfig(local_channel(), $cat, $k);
-        if (strpos($k, 'password') !== false) {
-            $v = unobscurify($v);
-        }
-
-        $o .= '';
-        $o .= '';
-
-
-        if (strpos($v, "\n")) {
-            $o .= '';
-        } else {
-            if (is_array($v)) {
-                $o .= '
          ' . "\n" . print_array($v) . '
          ';
-                $o .= '';
-            } else {
-                $o .= '';
-            }
-        }
-        $o .= EOL . EOL;
-        $o .= '';
-        $o .= '
          ';
-
-        return $o;
-    }
-
-
-    public function disallowed_pconfig()
-    {
-        return array(
-            'permissions_role'
-        );
-    }
-}
diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php
deleted file mode 100644
index 038cc0149..000000000
--- a/Zotlabs/Module/Pdledit.php
+++ /dev/null
@@ -1,120 +0,0 @@
- 2 && argv(2) === 'reset') {
-            del_pconfig(local_channel(), 'system', 'mod_' . argv(1) . '.pdl');
-            goaway(z_root() . '/pdledit');
-        }
-
-        if (argc() > 1) {
-            $module = 'mod_' . argv(1) . '.pdl';
-        } else {
-            $o .= '
          ';
-            $o .= '
          ' . t('Edit System Page Description') . '
          ';
-
-            $edited = [];
-
-            $r = q(
-                "select k from pconfig where uid = %d and cat = 'system' and k like '%s' ",
-                intval(local_channel()),
-                dbesc('mod_%.pdl')
-            );
-
-            if ($r) {
-                foreach ($r as $rv) {
-                    $edited[] = substr(str_replace('.pdl', '', $rv['k']), 4);
-                }
-            }
-
-            $files = glob('Zotlabs/Module/*.php');
-            if ($files) {
-                foreach ($files as $f) {
-                    $name = lcfirst(basename($f, '.php'));
-                    $x = Theme::include('mod_' . $name . '.pdl');
-                    if ($x) {
-                        $o .= '' . $name . '' . ((in_array($name, $edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '' : '') . '
          ';
-                    }
-                }
-            }
-            $addons = glob('addon/*/*.pdl');
-            if ($addons) {
-                foreach ($addons as $a) {
-                    $name = substr(basename($a, '.pdl'), 4);
-                    $o .= '' . $name . '' . ((in_array($name, $edited)) ? ' ' . t('(modified)') . ' ' . t('Reset') . '' : '') . '
          ';
-                }
-            }
-
-            $o .= '
          ';
-
-            // list module pdl files
-            return $o;
-        }
-
-        $t = get_pconfig(local_channel(), 'system', $module);
-        $s = @file_get_contents(Theme::include($module));
-        if (!$s) {
-            $a = glob('addon/*/' . $module);
-            if ($a) {
-                $s = @file_get_contents($a[0]);
-            }
-        }
-        if (!$t) {
-            $t = $s;
-        }
-        if (!$t) {
-            notice(t('Layout not found.') . EOL);
-            return '';
-        }
-
-        $o = replace_macros(Theme::get_template('pdledit.tpl'), array(
-            '$header' => t('Edit System Page Description'),
-            '$mname' => t('Module Name:'),
-            '$help' => t('Layout Help'),
-            '$another' => t('Edit another layout'),
-            '$original' => t('System layout'),
-            '$module' => argv(1),
-            '$src' => $s,
-            '$content' => htmlspecialchars($t, ENT_COMPAT, 'UTF-8'),
-            '$submit' => t('Submit')
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Permcat.php b/Zotlabs/Module/Permcat.php
deleted file mode 100644
index 4d581bec9..000000000
--- a/Zotlabs/Module/Permcat.php
+++ /dev/null
@@ -1,30 +0,0 @@
- false ]);
-        }
-    
-        $abook_id = (argc() > 2) ? argv(2) : EMPTY_STR;
-        $permcat = new Zlib\Permcat(local_channel(), $abook_id);
-
-        if (argc() > 1) {
-            // logger('fetched ' . argv(1) . ':' . print_r($permcat->fetch(argv(1)),true));
-            json_return_and_die($permcat->fetch(argv(1)));
-        }
-
-        json_return_and_die($permcat->listing());
-    }
-}
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
deleted file mode 100644
index 1909d4533..000000000
--- a/Zotlabs/Module/Photo.php
+++ /dev/null
@@ -1,327 +0,0 @@
- $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => ''];
-            Hook::call('get_profile_photo', $d);
-
-            $resolution = $d['imgscale'];
-            $uid = $d['channel_id'];
-            $default = $d['default'];
-            $data = $d['data'];
-            $mimetype = $d['mimetype'];
-
-            if (!$data) {
-                $r = q(
-                    "SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
-                    intval($resolution),
-                    intval($uid),
-                    intval(PHOTO_PROFILE)
-                );
-                if ($r) {
-                    $data = dbunescbin($r[0]['content']);
-                    $mimetype = $r[0]['mimetype'];
-                    if (intval($r[0]['os_storage'])) {
-                        $data = file_get_contents($data);
-                    }
-                }
-            }
-            if (!$data) {
-                $data = fetch_image_from_url($default, $mimetype);
-            }
-            if (!$mimetype) {
-                $mimetype = 'image/png';
-            }
-        } else {
-            $bear = Activity::token_from_request();
-            if ($bear) {
-                logger('bear: ' . $bear, LOGGER_DEBUG);
-            }
-
-
-            /**
-             * Other photos
-             */
-
-            /* Check for a cookie to indicate display pixel density, in order to detect high-resolution
-               displays. This procedure was derived from the "Retina Images" by Jeremey Worboys,
-               used in accordance with the Creative Commons Attribution 3.0 Unported License.
-               Project link: https://github.com/Retina-Images/Retina-Images
-               License link: http://creativecommons.org/licenses/by/3.0/
-            */
-
-            $cookie_value = false;
-            if (isset($_COOKIE['devicePixelRatio'])) {
-                $cookie_value = intval($_COOKIE['devicePixelRatio']);
-            } else {
-                // Force revalidation of cache on next request
-                $cache_directive = 'no-cache';
-                $status = 'no cookie';
-            }
-
-            $resolution = 0;
-
-            if (strpos($photo, '.') !== false) {
-                $photo = substr($photo, 0, strpos($photo, '.'));
-            }
-
-            if (substr($photo, -2, 1) == '-') {
-                $resolution = intval(substr($photo, -1, 1));
-                $photo = substr($photo, 0, -2);
-                // If viewing on a high-res screen, attempt to serve a higher resolution image:
-                if ($resolution == 2 && ($cookie_value > 1)) {
-                    $resolution = 1;
-                }
-            }
-
-            $r = q(
-                "SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
-                dbesc($photo),
-                intval($resolution)
-            );
-            if ($r) {
-                $allowed = (-1);
-
-                if (intval($r[0]['photo_usage'])) {
-                    $allowed = 1;
-                    if (intval($r[0]['photo_usage']) === PHOTO_COVER) {
-                        if ($resolution < PHOTO_RES_COVER_1200) {
-                            $allowed = (-1);
-                        }
-                    }
-                    if (intval($r[0]['photo_usage']) === PHOTO_PROFILE) {
-                        if (!in_array($resolution, [4, 5, 6])) {
-                            $allowed = (-1);
-                        }
-                    }
-                }
-
-                if ($allowed === (-1)) {
-                    $allowed = attach_can_view($r[0]['uid'], $observer_xchan, $photo, $bear);
-                }
-
-                $channel = Channel::from_id($r[0]['uid']);
-
-                // Now we'll see if we can access the photo
-                $e = q(
-                    "SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
-                    dbesc($photo),
-                    intval($resolution)
-                );
-
-                $exists = (($e) ? true : false);
-
-                if ($exists && $allowed) {
-                    $data = dbunescbin($e[0]['content']);
-                    $mimetype = $e[0]['mimetype'];
-                    if (intval($e[0]['os_storage'])) {
-                        $streaming = $data;
-                    }
-
-                    if ($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '') {
-                        $prvcachecontrol = 'no-store, no-cache, must-revalidate';
-                    }
-                } else {
-                    if (!$allowed) {
-                        http_status_exit(403, 'forbidden');
-                    }
-                    if (!$exists) {
-                        http_status_exit(404, 'not found');
-                    }
-                }
-            }
-        }
-
-        if (!isset($data)) {
-            if (isset($resolution)) {
-                switch ($resolution) {
-                    case 4:
-                        $data = fetch_image_from_url(z_root() . '/' . Channel::get_default_profile_photo(), $mimetype);
-                        break;
-                    case 5:
-                        $data = fetch_image_from_url(z_root() . '/' . Channel::get_default_profile_photo(80), $mimetype);
-                        break;
-                    case 6:
-                        $data = fetch_image_from_url(z_root() . '/' . Channel::get_default_profile_photo(48), $mimetype);
-                        break;
-                    default:
-                        killme();
-                }
-            }
-        }
-
-        if (isset($res) && intval($res) && $res < 500) {
-            $ph = photo_factory($data, $mimetype);
-            if ($ph && $ph->is_valid()) {
-                $ph->scaleImageSquare($res);
-                $data = $ph->imageString();
-                $mimetype = $ph->getType();
-            }
-        }
-
-        if (function_exists('header_remove')) {
-            header_remove('Pragma');
-            header_remove('pragma');
-        }
-
-        header("Content-type: " . $mimetype);
-
-        if ($prvcachecontrol) {
-            // it is a private photo that they have permission to view.
-            // tell the browser and infrastructure caches not to cache it,
-            // in case permissions change before the next access.
-
-            header("Cache-Control: no-store, no-cache, must-revalidate");
-        } else {
-            // The cache default for public photos is 1 day to provide a privacy trade-off,
-            // as somebody reducing photo permissions on a photo that is already
-            // "in the wild" won't be able to stop the photo from being viewed
-            // for this amount amount of time once it is cached.
-            // The privacy expectations of your site members and their perception
-            // of privacy where it affects the entire project may be affected.
-            // This has performance considerations but we highly recommend you
-            // leave it alone.
-
-            $cache = get_config('system', 'photo_cache_time');
-            if (!$cache) {
-                $cache = (3600 * 24); // 1 day
-            }
-            header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT");
-            // Set browser cache age as $cache.  But set timeout of 'shared caches'
-            // much lower in the event that infrastructure caching is present.
-            $smaxage = intval($cache / 12);
-            header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';');
-        }
-
-        // If it's a file resource, stream it.
-
-        if ($streaming && $channel) {
-            if (strpos($streaming, 'store') !== false) {
-                $istream = fopen($streaming, 'rb');
-            } else {
-                $istream = fopen('store/' . $channel['channel_address'] . '/' . $streaming, 'rb');
-            }
-            $ostream = fopen('php://output', 'wb');
-            if ($istream && $ostream) {
-                pipe_streams($istream, $ostream);
-                fclose($istream);
-                fclose($ostream);
-            }
-        } else {
-            echo $data;
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Photomap.php b/Zotlabs/Module/Photomap.php
deleted file mode 100644
index 0b2a75224..000000000
--- a/Zotlabs/Module/Photomap.php
+++ /dev/null
@@ -1,25 +0,0 @@
-' . $desc . '';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Photomap'))) {
-            return $text;
-        }
-
-        return $text . '

          ' . t('This app is currently installed.');
-    }
-}
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
deleted file mode 100644
index 726c8b3dc..000000000
--- a/Zotlabs/Module/Photos.php
+++ /dev/null
@@ -1,1450 +0,0 @@
- 1) {
-            $nick = escape_tags(argv(1));
-
-            Libprofile::load($nick);
-
-            $channelx = Channel::from_username($nick);
-
-            $profile_uid = 0;
-
-            if ($channelx) {
-                App::$data['channel'] = $channelx;
-                head_set_icon($channelx['xchan_photo_s']);
-                $profile_uid = $channelx['channel_id'];
-            }
-
-            App::$page['htmlhead'] .= "";
-            App::$data['observer'] = App::get_observer();
-        }
-    }
-
-
-    public function post()
-    {
-
-        logger('mod-photos: photos_post: begin', LOGGER_DEBUG);
-
-        logger('mod_photos: REQUEST ' . print_r($_REQUEST, true), LOGGER_DATA);
-        logger('mod_photos: FILES ' . print_r($_FILES, true), LOGGER_DATA);
-
-        $ph = photo_factory('');
-
-        $phototypes = $ph->supportedTypes();
-
-        $page_owner_uid = App::$data['channel']['channel_id'];
-
-        if (!perm_is_allowed($page_owner_uid, get_observer_hash(), 'write_storage')) {
-            notice(t('Permission denied.') . EOL);
-            killme_if_ajax();
-            return;
-        }
-
-        $acl = new AccessControl(App::$data['channel']);
-
-        if ((argc() > 3) && (argv(2) === 'album')) {
-            $album = argv(3);
-
-            if (!photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
-                notice(t('Album not found.') . EOL);
-                goaway(z_root() . '/' . $_SESSION['photo_return']);
-            }
-
-
-            /*
-             * DELETE photo album and all its photos
-             */
-
-            if ($_REQUEST['dropalbum'] === t('Delete Album')) {
-                $folder_hash = '';
-
-                $r = q(
-                    "select hash from attach where is_dir = 1 and uid = %d and hash = '%s'",
-                    intval($page_owner_uid),
-                    dbesc($album)
-                );
-                if (!$r) {
-                    notice(t('Album not found.') . EOL);
-                    return;
-                }
-                $folder_hash = $r[0]['hash'];
-
-
-                $res = [];
-                $admin_delete = false;
-
-                // get the list of photos we are about to delete
-
-                if (remote_channel() && (!local_channel())) {
-                    $str = photos_album_get_db_idstr($page_owner_uid, $album, remote_channel());
-                } elseif (local_channel()) {
-                    $str = photos_album_get_db_idstr(local_channel(), $album);
-                } elseif (is_site_admin()) {
-                    $str = photos_album_get_db_idstr_admin($page_owner_uid, $album);
-                    $admin_delete = true;
-                } else {
-                    $str = null;
-                }
-
-                if (!$str) {
-                    goaway(z_root() . '/' . $_SESSION['photo_return']);
-                }
-
-                $r = q(
-                    "select id from item where resource_id in ( $str ) and resource_type = 'photo' and uid = %d " . item_normal(),
-                    intval($page_owner_uid)
-                );
-                if ($r) {
-                    foreach ($r as $rv) {
-                        attach_delete($page_owner_uid, $rv['resource_id'], true);
-                    }
-                }
-
-                // remove the associated photos in case they weren't attached to an item (rare)
-
-                q(
-                    "delete from photo where resource_id in ( $str ) and uid = %d",
-                    intval($page_owner_uid)
-                );
-
-                q(
-                    "delete from attach where hash in ( $str ) and uid = %d",
-                    intval($page_owner_uid)
-                );
-
-                if ($folder_hash) {
-                    attach_delete($page_owner_uid, $folder_hash, true);
-
-                    // Sync this action to channel clones, UNLESS it was an admin delete action.
-                    // The admin only has authority to moderate content on their own site.
-
-                    if (!$admin_delete) {
-                        $sync = attach_export_data(App::$data['channel'], $folder_hash, true);
-                        if ($sync) {
-                            Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
-                        }
-                    }
-                }
-            }
-            goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
-        }
-
-        if ((argc() > 2) && (x($_REQUEST, 'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
-            // same as above but remove single photo
-
-            $ob_hash = get_observer_hash();
-
-            if (!$ob_hash) {
-                goaway(z_root() . '/' . $_SESSION['photo_return']);
-            }
-
-            // query to verify ownership of the photo by this viewer
-            // We've already checked observer permissions to perfom this action
-
-            // This implements the policy that remote channels (visitors and guests)
-            // which modify content  can only modify their own content.
-            // The page owner can modify anything within their authority, including
-            // content published by others in their own channel pages.
-            // The site admin can of course modify anything on their own site for
-            // maintenance or legal compliance reasons.
-
-            $r = q(
-                "SELECT id, resource_id FROM photo WHERE ( xchan = '%s' or uid = %d ) AND resource_id = '%s' LIMIT 1",
-                dbesc($ob_hash),
-                intval(local_channel()),
-                dbesc(argv(2))
-            );
-
-            if ($r) {
-                attach_delete($page_owner_uid, $r[0]['resource_id'], true);
-                $sync = attach_export_data(App::$data['channel'], $r[0]['resource_id'], true);
-                if ($sync) {
-                    Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
-                }
-            } elseif (is_site_admin()) {
-                // If the admin deletes a photo, don't check ownership or invoke clone sync
-                attach_delete($page_owner_uid, argv(2), true);
-            }
-
-            goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
-        }
-
-        // perform move_to_album
-
-        if ((argc() > 2) && array_key_exists('move_to_album', $_POST)) {
-            $m = q(
-                "select folder from attach where hash = '%s' and uid = %d limit 1",
-                dbesc(argv(2)),
-                intval($page_owner_uid)
-            );
-
-            // we should sanitize the post variable, but probably pointless because the move
-            // will fail if we can't find the target
-
-            if (($m) && ($m[0]['folder'] != $_POST['move_to_album'])) {
-                attach_move($page_owner_uid, argv(2), $_POST['move_to_album']);
-
-                $sync = attach_export_data(App::$data['channel'], argv(2), false);
-                if ($sync) {
-                    Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
-                }
-
-                // return if this is the only thing being edited
-
-                if (!($_POST['desc'] && $_POST['newtag'])) {
-                    goaway(z_root() . '/' . $_SESSION['photo_return']);
-                }
-            }
-        }
-
-        // this still needs some work
-
-        if (defined('FIXED')) {
-            if ((x($_POST, 'rotate') !== false) && ((intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2))) {
-                logger('rotate');
-
-                $resource_id = argv(2);
-
-                $r = q(
-                    "select * from photo where resource_id = '%s' and uid = %d and imgscale = 0 limit 1",
-                    dbesc($resource_id),
-                    intval($page_owner_uid)
-                );
-                if ($r) {
-                    $ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']);
-                    if ($ph && $ph->is_valid()) {
-                        $rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
-                        $ph->rotate($rotate_deg);
-
-                        $edited = datetime_convert();
-
-                        q(
-                            "update attach set filesize = %d, edited = '%s' where hash = '%s' and uid = %d",
-                            strlen($ph->imageString()),
-                            dbescdate($edited),
-                            dbesc($resource_id),
-                            intval($page_owner_uid)
-                        );
-
-                        $ph->saveImage(dbunescbin($r[0]['content']));
-
-                        $arr = [
-                            'aid' => get_account_id(),
-                            'uid' => intval($page_owner_uid),
-                            'resource_id' => dbesc($resource_id),
-                            'filename' => $r[0]['filename'],
-                            'imgscale' => 0,
-                            'album' => $r[0]['album'],
-                            'os_path' => $r[0]['os_path'],
-                            'os_storage' => 1,
-                            'os_syspath' => dbunescbin($r[0]['content']),
-                            'display_path' => $r[0]['display_path'],
-                            'photo_usage' => PHOTO_NORMAL,
-                            'edited' => dbescdate($edited)
-                        ];
-
-                        $ph->save($arr);
-
-                        unset($arr['os_syspath']);
-
-                        if ($width > 1024 || $height > 1024) {
-                            $ph->scaleImage(1024);
-                        }
-                        $ph->storeThumbnail($arr, PHOTO_RES_1024);
-
-                        if ($width > 640 || $height > 640) {
-                            $ph->scaleImage(640);
-                        }
-                        $ph->storeThumbnail($arr, PHOTO_RES_640);
-
-                        if ($width > 320 || $height > 320) {
-                            $ph->scaleImage(320);
-                        }
-                        $ph->storeThumbnail($arr, PHOTO_RES_320);
-                    }
-                }
-            }
-        } // end FIXED
-
-
-        // edit existing photo properties
-
-        if (x($_POST, 'item_id') !== false && intval($_POST['item_id'])) {
-            $title = ((x($_POST, 'title')) ? escape_tags(trim($_POST['title'])) : EMPTY_STR);
-            $desc = ((x($_POST, 'desc')) ? escape_tags(trim($_POST['desc'])) : EMPTY_STR);
-            $body = ((x($_POST, 'body')) ? trim($_POST['body']) : EMPTY_STR);
-
-            $item_id = ((x($_POST, 'item_id')) ? intval($_POST['item_id']) : 0);
-            $is_nsfw = ((x($_POST, 'adult')) ? intval($_POST['adult']) : 0);
-
-            // convert any supplied posted permissions for storage
-
-            $acl->set_from_array($_POST);
-            $perm = $acl->get();
-
-            $resource_id = argv(2);
-
-            $p = q(
-                "SELECT mimetype, is_nsfw, filename, title, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC",
-                dbesc($resource_id),
-                intval($page_owner_uid)
-            );
-            if ($p) {
-                // update the photo structure with any of the changed elements which are common to all resolutions
-                $r = q(
-                    "UPDATE photo SET title = '%s', description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d",
-                    dbesc($title),
-                    dbesc($desc),
-                    dbesc($perm['allow_cid']),
-                    dbesc($perm['allow_gid']),
-                    dbesc($perm['deny_cid']),
-                    dbesc($perm['deny_gid']),
-                    dbesc($resource_id),
-                    intval($page_owner_uid)
-                );
-            }
-
-            $item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
-
-            $old_is_nsfw = $p[0]['is_nsfw'];
-            if ($old_is_nsfw != $is_nsfw) {
-                $r = q(
-                    "update photo set is_nsfw = %d where resource_id = '%s' and uid = %d",
-                    intval($is_nsfw),
-                    dbesc($resource_id),
-                    intval($page_owner_uid)
-                );
-            }
-
-            /* Don't make the item visible if the only change was the album name */
-
-            $visibility = 0;
-            if ($p[0]['description'] !== $desc || $p[0]['title'] !== $title || $body !== EMPTY_STR) {
-                $visibility = 1;
-            }
-
-            $r = q(
-                "SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
-                intval($item_id),
-                intval($page_owner_uid)
-            );
-            if (!$r) {
-                logger('linked photo item not found.');
-                notice(t('linked item not found.') . EOL);
-                return;
-            }
-
-            $linked_item = array_shift($r);
-
-            // extract the original footer text
-            $footer_text = EMPTY_STR;
-            $orig_text = $linked_item['body'];
-            $matches = [];
-
-            if (preg_match('/\[footer\](.*?)\[\/footer\]/ism', $orig_text, $matches)) {
-                $footer_text = $matches[0];
-            }
-
-            $body = cleanup_bbcode($body);
-            $tags = linkify_tags($body, $page_owner_uid);
-
-            $post_tags = [];
-            if ($tags) {
-                foreach ($tags as $tag) {
-                    $success = $tag['success'];
-                    if ($success['replaced']) {
-                        // suppress duplicate mentions/tags
-                        $already_tagged = false;
-                        foreach ($post_tags as $pt) {
-                            if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) {
-                                $already_tagged = true;
-                                break;
-                            }
-                        }
-                        if ($already_tagged) {
-                            continue;
-                        }
-
-                        $post_tags[] = [
-                            'uid' => $page_owner_uid,
-                            'ttype' => $success['termtype'],
-                            'otype' => TERM_OBJ_POST,
-                            'term' => $success['term'],
-                            'url' => $success['url']
-                        ];
-                    }
-                }
-            }
-            if ($post_tags) {
-                q(
-                    "delete from term where otype = 1 and oid = %d",
-                    intval($linked_item['id'])
-                );
-                foreach ($post_tags as $t) {
-                    q(
-                        "insert into term (uid,oid,otype,ttype,term,url)
-						values(%d,%d,%d,%d,'%s','%s') ",
-                        intval($page_owner_uid),
-                        intval($linked_item['id']),
-                        intval(TERM_OBJ_POST),
-                        intval($t['ttype']),
-                        dbesc($t['term']),
-                        dbesc($t['url'])
-                    );
-                }
-            }
-
-            $body = z_input_filter($body, 'text/x-multicode');
-
-            $obj = EMPTY_STR;
-
-            if (isset($linked_item['obj']) && strlen($linked_item['obj'])) {
-                $obj = json_decode($linked_item['obj'], true);
-
-                $obj['name'] = (($title) ? $title : $p[0]['filename']);
-                $obj['summary'] = (($desc) ? $desc : $p[0]['filename']);
-                $obj['updated'] = datetime_convert('UTC', 'UTC', 'now', ATOM_TIME);
-                $obj['source'] = ['content' => $body, 'mediaType' => 'text/x-multicode'];
-                $obj['content'] = bbcode($body . $footer_text, ['export' => true]);
-                if (isset($obj['url']) && is_array($obj['url'])) {
-                    for ($x = 0; $x < count($obj['url']); $x++) {
-                        $obj['url'][$x]['summary'] = $obj['summary'];
-                    }
-                }
-                $obj = json_encode($obj);
-            }
-
-            // make sure the linked item has the same permissions as the photo regardless of any other changes
-            $x = q(
-                "update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', title = '%s', obj = '%s', body = '%s', edited = '%s', item_private = %d where id = %d",
-                dbesc($perm['allow_cid']),
-                dbesc($perm['allow_gid']),
-                dbesc($perm['deny_cid']),
-                dbesc($perm['deny_gid']),
-                dbesc(($desc) ? $desc : $p[0]['filename']),
-                dbesc($obj),
-                dbesc($body . $footer_text),
-                dbesc(datetime_convert()),
-                intval($acl->is_private()),
-                intval($item_id)
-            );
-
-            // make sure the attach has the same permissions as the photo regardless of any other changes
-            $x = q(
-                "update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1",
-                dbesc($perm['allow_cid']),
-                dbesc($perm['allow_gid']),
-                dbesc($perm['deny_cid']),
-                dbesc($perm['deny_gid']),
-                dbesc($resource_id),
-                intval($page_owner_uid)
-            );
-
-
-            if ($visibility) {
-                Run::Summon(['Notifier', 'edit_post', $item_id]);
-            }
-
-            $sync = attach_export_data(App::$data['channel'], $resource_id);
-
-            if ($sync) {
-                Libsync::build_sync_packet($page_owner_uid, ['file' => [$sync]]);
-            }
-
-            goaway(z_root() . '/' . $_SESSION['photo_return']);
-            return; // NOTREACHED
-        }
-
-
-        /**
-         * default post action - upload a photo
-         */
-
-        $channel = App::$data['channel'];
-        $observer = App::$data['observer'];
-
-        $_REQUEST['source'] = 'photos';
-        require_once('include/attach.php');
-
-        if (!local_channel()) {
-            $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']);
-            $_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']);
-            $_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']);
-            $_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']);
-        }
-
-
-        $matches = [];
-        $partial = false;
-
-        if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
-            $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
-            if ($pm) {
-                logger('Content-Range: ' . print_r($matches, true));
-                $partial = true;
-            }
-        }
-
-        if ($partial) {
-            $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
-
-            if ($x['partial']) {
-                header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-                json_return_and_die($x);
-            } else {
-                header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
-
-                $_FILES['userfile'] = [
-                    'name' => $x['name'],
-                    'type' => $x['type'],
-                    'tmp_name' => $x['tmp_name'],
-                    'error' => $x['error'],
-                    'size' => $x['size']
-                ];
-            }
-        } else {
-            if (!array_key_exists('userfile', $_FILES)) {
-                $_FILES['userfile'] = [
-                    'name' => $_FILES['files']['name'],
-                    'type' => $_FILES['files']['type'],
-                    'tmp_name' => $_FILES['files']['tmp_name'],
-                    'error' => $_FILES['files']['error'],
-                    'size' => $_FILES['files']['size']
-                ];
-            }
-        }
-
-        $r = attach_store($channel, get_observer_hash(), '', $_REQUEST);
-
-        if (!$r['success']) {
-            notice($r['message'] . EOL);
-            if (is_ajax()) {
-                killme();
-            }
-            goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
-        }
-        if ($r['success'] && !intval($r['data']['is_photo'])) {
-            notice(sprintf(t('%s: Unsupported photo type. Saved as file.'), escape_tags($r['data']['filename'])));
-        }
-        if (is_ajax()) {
-            killme();
-        }
-
-        goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']);
-    }
-
-
-    public function get()
-    {
-
-        // URLs:
-        // photos/name
-        // photos/name/album/xxxxx (xxxxx is album name)
-        // photos/name/image/xxxxx
-
-
-        if (observer_prohibited()) {
-            notice(t('Public access denied.') . EOL);
-            return;
-        }
-
-        $unsafe = 1 - get_safemode();
-
-
-        if (!x(App::$data, 'channel')) {
-            notice(t('No photos selected') . EOL);
-            return;
-        }
-
-        $ph = photo_factory('');
-        $phototypes = $ph->supportedTypes();
-
-        $_SESSION['photo_return'] = App::$cmd;
-
-        //
-        // Parse arguments
-        //
-
-        $can_comment = perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'post_comments');
-
-        if (argc() > 3) {
-            $datatype = argv(2);
-            $datum = argv(3);
-        } else {
-            if (argc() > 2) {
-                $datatype = argv(2);
-                $datum = '';
-            } else {
-                $datatype = 'summary';
-            }
-        }
-
-        if (argc() > 4) {
-            $cmd = argv(4);
-        } else {
-            $cmd = 'view';
-        }
-
-        //
-        // Setup permissions structures
-        //
-
-        $can_post = false;
-        $visitor = 0;
-
-
-        $owner_uid = App::$data['channel']['channel_id'];
-        $owner_aid = App::$data['channel']['channel_account_id'];
-
-        $observer = App::get_observer();
-
-        $can_post = perm_is_allowed($owner_uid, $observer['xchan_hash'], 'write_storage');
-        $can_view = perm_is_allowed($owner_uid, $observer['xchan_hash'], 'view_storage');
-
-        if (!$can_view) {
-            notice(t('Access to this item is restricted.') . EOL);
-            return;
-        }
-
-        $sql_item = item_permissions_sql($owner_uid, get_observer_hash());
-        $sql_extra = permissions_sql($owner_uid, get_observer_hash(), 'photo');
-        $sql_attach = permissions_sql($owner_uid, get_observer_hash(), 'attach');
-
-        Navbar::set_selected('Photos');
-
-        $o = '
-			
-			';
-
-
-        $o .= "\r\n";
-
-        $_is_owner = (local_channel() && (local_channel() == $owner_uid));
-
-        /**
-         * Display upload form
-         */
-
-        if ($can_post) {
-            $uploader = '';
-
-            $ret = array('post_url' => z_root() . '/photos/' . App::$data['channel']['channel_address'],
-                'addon_text' => $uploader,
-                'default_upload' => true);
-
-            Hook::call('photo_upload_form', $ret);
-
-            /* Show space usage */
-
-            $r = q(
-                "select sum(filesize) as total from photo where aid = %d and imgscale = 0 ",
-                intval(App::$data['channel']['channel_account_id'])
-            );
-
-
-            $limit = engr_units_to_bytes(ServiceClass::fetch(App::$data['channel']['channel_id'], 'photo_upload_limit'));
-            if ($limit !== false) {
-                $usage_message = sprintf(t("%1$.2f MB of %2$.2f MB photo storage used."), $r[0]['total'] / 1024000, $limit / 1024000);
-            } else {
-                $usage_message = sprintf(t('%1$.2f MB photo storage used.'), $r[0]['total'] / 1024000);
-            }
-
-            if ($_is_owner) {
-                $channel = App::get_channel();
-
-                $acl = new AccessControl($channel);
-                $channel_acl = $acl->get();
-
-                $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
-            }
-
-            $aclselect = (($_is_owner) ? Libacl::populate($channel_acl, false, PermissionDescription::fromGlobalPermission('view_storage')) : '');
-
-            // this is wrong but is to work around an issue with js_upload wherein it chokes if these variables
-            // don't exist. They really should be set to a parseable representation of the channel's default permissions
-            // which can be processed by getSelected()
-
-            if (!$aclselect) {
-                $aclselect = '';
-            }
-
-            $selname = '';
-
-            if ($datum) {
-                $h = attach_by_hash_nodata($datum, get_observer_hash());
-                $selname = $h['data']['display_path'];
-            }
-
-
-            $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer']));
-
-            if (!$selname) {
-                $def_album = get_pconfig(App::$data['channel']['channel_id'], 'system', 'photo_path');
-                if ($def_album) {
-                    $selname = filepath_macro($def_album);
-                    $albums['album'][] = array('text' => $selname);
-                }
-            }
-
-            $tpl = Theme::get_template('photos_upload.tpl');
-            $upload_form = replace_macros($tpl, array(
-                '$pagename' => t('Upload Photos'),
-                '$sessid' => session_id(),
-                '$usage' => $usage_message,
-                '$nickname' => App::$data['channel']['channel_address'],
-                '$newalbum_label' => t('Enter an album name'),
-                '$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
-                '$visible' => array('visible', t('Create a status post for this upload'), 0, t('If multiple files are selected, the message will be repeated for each photo'), array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
-                '$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')),
-                'title' => ['title', t('Title (optional)')],
-                '$body' => array('body', t('Your message (optional)'), '', 'This will only appear in the status post'),
-                '$albums' => $albums['albums'],
-                '$selname' => $selname,
-                '$permissions' => t('Permissions'),
-                '$aclselect' => $aclselect,
-                '$allow_cid' => acl2json($channel_acl['allow_cid']),
-                '$allow_gid' => acl2json($channel_acl['allow_gid']),
-                '$deny_cid' => acl2json($channel_acl['deny_cid']),
-                '$deny_gid' => acl2json($channel_acl['deny_gid']),
-                '$lockstate' => $lockstate,
-                '$uploader' => $ret['addon_text'],
-                '$default' => (($ret['default_upload']) ? true : false),
-                '$uploadurl' => $ret['post_url'],
-                '$submit' => t('Upload')
-
-            ));
-        }
-
-        //
-        // dispatch request
-        //
-
-        /*
-         * Display a single photo album
-         */
-
-        if ($datatype === 'album') {
-            Head::add_link([
-                'rel' => 'alternate',
-                'type' => 'application/json+oembed',
-                'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-                'title' => 'oembed'
-            ]);
-
-            if ($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
-                App::set_pager_itemspage(60);
-                $album = $x['display_path'];
-            } else {
-                goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
-            }
-
-            if ($_GET['order'] === 'posted') {
-                $order = 'created ASC';
-            } elseif ($_GET['order'] === 'name') {
-                $order = 'filename ASC';
-            } else {
-                $order = 'created DESC';
-            }
-
-            $r = q(
-                "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
-					(SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
-					ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
-				ORDER BY $order LIMIT %d OFFSET %d",
-                dbesc($x['hash']),
-                intval($owner_uid),
-                intval(PHOTO_NORMAL),
-                intval(PHOTO_PROFILE),
-                intval(PHOTO_COVER),
-                intval($unsafe),
-                intval(App::$pager['itemspage']),
-                intval(App::$pager['start'])
-            );
-
-            // edit album name
-            $album_edit = null;
-
-            if ($can_post) {
-                $album_e = $album;
-                $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer']));
-
-                // @fixme - syncronise actions with DAV
-
-                //              $edit_tpl = Theme::get_template('album_edit.tpl');
-                //              $album_edit = replace_macros($edit_tpl,array(
-                //                  '$nametext' => t('Enter a new album name'),
-                //                  '$name_placeholder' => t('or select an existing one (doubleclick)'),
-                //                  '$nickname' => App::$data['channel']['channel_address'],
-                //                  '$album' => $album_e,
-                //                  '$albums' => $albums['albums'],
-                //                  '$hexalbum' => bin2hex($album),
-                //                  '$submit' => t('Submit'),
-                //                  '$dropsubmit' => t('Delete Album')
-                //              ));
-            }
-
-            $order = [
-                [t('Date descending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum],
-                [t('Date ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=posted'],
-                [t('Name ascending'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=name']
-            ];
-
-
-            $photos = [];
-            if (count($r)) {
-                $twist = 'rotright';
-                foreach ($r as $rr) {
-                    if ($twist == 'rotright') {
-                        $twist = 'rotleft';
-                    } else {
-                        $twist = 'rotright';
-                    }
-
-                    $ext = $phototypes[$rr['mimetype']];
-
-                    $imgalt_e = $rr['filename'];
-                    $desc_e = $rr['description'];
-
-                    $imagelink = (z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id']
-                        . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
-
-                    $photos[] = array(
-                        'id' => $rr['id'],
-                        'twist' => ' ' . $twist . rand(2, 4),
-                        'link' => $imagelink,
-                        'title' => t('View Photo'),
-                        'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
-                        'alt' => $imgalt_e,
-                        'desc' => $desc_e,
-                        'ext' => $ext,
-                        'hash' => $rr['resource_id'],
-                        'unknown' => t('Unknown')
-                    );
-                }
-            }
-
-            if ($_REQUEST['aj']) {
-                if ($photos) {
-                    $o = replace_macros(Theme::get_template('photosajax.tpl'), array(
-                        '$photos' => $photos,
-                        '$album_id' => $datum
-                    ));
-                } else {
-                    $o = '
          ';
-                }
-                echo $o;
-                killme();
-            } else {
-                $o .= "";
-                $tpl = Theme::get_template('photo_album.tpl');
-                $o .= replace_macros($tpl, array(
-                    '$photos' => $photos,
-                    '$album' => $album,
-                    '$album_id' => $datum,
-                    '$file_view' => t('View files'),
-                    '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'] . '/' . $x['display_path'],
-                    '$album_edit' => array(t('Edit Album'), $album_edit),
-                    '$can_post' => $can_post,
-                    '$upload' => array(t('Add Photos'), z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/upload/' . $datum),
-                    '$order' => $order,
-                    '$sort' => t('Sort'),
-                    '$upload_form' => $upload_form,
-                    '$usage' => $usage_message
-                ));
-
-                return $o;
-            }
-        }
-
-        /**
-         * Display one photo
-         */
-
-        if ($datatype === 'image') {
-            Head::add_link([
-                'rel' => 'alternate',
-                'type' => 'application/json+oembed',
-                'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-                'title' => 'oembed'
-            ]);
-
-            $x = q(
-                "select folder from attach where hash = '%s' and uid = %d $sql_attach limit 1",
-                dbesc($datum),
-                intval($owner_uid)
-            );
-
-            // fetch image, item containing image, then comments
-
-            $ph = q(
-                "SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' 
-				$sql_extra ORDER BY imgscale ASC ",
-                intval($owner_uid),
-                dbesc($datum)
-            );
-
-            if (!($ph && $x)) {
-                /* Check again - this time without specifying permissions */
-
-                $ph = q(
-                    "SELECT id FROM photo WHERE uid = %d AND resource_id = '%s' LIMIT 1",
-                    intval($owner_uid),
-                    dbesc($datum)
-                );
-                if ($ph) {
-                    notice(t('Permission denied. Access to this item may be restricted.') . EOL);
-                } else {
-                    notice(t('Photo not available') . EOL);
-                }
-                return;
-            }
-
-
-            $prevlink = '';
-            $nextlink = '';
-
-            if ($_GET['order'] === 'posted') {
-                $order = 'created ASC';
-            } elseif ($_GET['order'] === 'name') {
-                $order = 'filename ASC';
-            } else {
-                $order = 'created DESC';
-            }
-
-
-            $prvnxt = q(
-                "SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1
-				$sql_attach ORDER BY $order ",
-                dbesc($x[0]['folder']),
-                intval($owner_uid)
-            );
-
-            if (count($prvnxt)) {
-                for ($z = 0; $z < count($prvnxt); $z++) {
-                    if ($prvnxt[$z]['hash'] == $ph[0]['resource_id']) {
-                        $prv = $z - 1;
-                        $nxt = $z + 1;
-                        if ($prv < 0) {
-                            $prv = count($prvnxt) - 1;
-                        }
-                        if ($nxt >= count($prvnxt)) {
-                            $nxt = 0;
-                        }
-                        break;
-                    }
-                }
-
-                $prevlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : '');
-                $nextlink = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order']) ? '?f=&order=' . $_GET['order'] : '');
-            }
-
-
-            if (count($ph) == 1) {
-                $hires = $lores = $ph[0];
-            }
-            if (count($ph) > 1) {
-                if ($ph[1]['imgscale'] == 2) {
-                    // original is 640 or less, we can display it directly
-                    $hires = $lores = $ph[0];
-                } else {
-                    $hires = $ph[0];
-                    $lores = $ph[1];
-                }
-            }
-
-            $album_link = z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $x[0]['folder'];
-            $tools = null;
-            $lock = null;
-
-            if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
-                $tools = array(
-                    'profile' => array(z_root() . '/profile_photo/use/' . $ph[0]['resource_id'], t('Use as profile photo')),
-                    'cover' => array(z_root() . '/cover_photo/use/' . $ph[0]['resource_id'], t('Use as cover photo')),
-                );
-            }
-
-            // lockstate
-            $lockstate = (((strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
-                || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])))
-                ? array('lock', t('Private Photo'))
-                : array('unlock', null));
-
-            App::$page['htmlhead'] .= '';
-
-            if ($prevlink) {
-                $prevlink = array($prevlink, t('Previous'));
-            }
-
-            $photo = array(
-                'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']],
-                'title' => t('View Full Size'),
-                'src' => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] . '?f=&_u=' . datetime_convert('', '', '', 'ymdhis')
-            );
-
-            if ($nextlink) {
-                $nextlink = array($nextlink, t('Next'));
-            }
-
-
-            // Do we have an item for this photo?
-
-            $linked_items = q(
-                "SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' and uid = %d
-				$sql_item LIMIT 1",
-                dbesc($datum),
-                intval($owner_uid)
-            );
-
-            $map = null;
-            $link_item = null;
-
-            if ($linked_items) {
-                xchan_query($linked_items);
-                $linked_items = fetch_post_tags($linked_items, true);
-
-                $link_item = $linked_items[0];
-                $item_normal = item_normal();
-
-                $r = q(
-                    "select * from item where parent_mid = '%s' 
-					$item_normal and uid = %d $sql_item ",
-                    dbesc($link_item['mid']),
-                    intval($link_item['uid'])
-                );
-
-                if ($r) {
-                    xchan_query($r);
-                    $items = fetch_post_tags($r, true);
-                    $sorted_items = conv_sort($items, 'commented');
-                }
-
-                $tags = [];
-                if ($link_item['term']) {
-                    $cnt = 0;
-                    foreach ($link_item['term'] as $t) {
-                        $tags[$cnt] = array(0 => format_term_for_display($t));
-                        if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
-                            $tags[$cnt][1] = 'tagrm/drop/' . $link_item['id'] . '/' . bin2hex($t['term']);   //?f=&item=' . $link_item['id'];
-                            $tags[$cnt][2] = t('Remove');
-                        }
-                        $cnt++;
-                    }
-                }
-
-                if ((local_channel()) && (local_channel() == $link_item['uid'])) {
-                    q(
-                        "UPDATE item SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1",
-                        intval($link_item['parent']),
-                        intval(local_channel())
-                    );
-                }
-
-                if ($link_item['coord'] && Apps::system_app_installed($owner_uid, 'Photomap')) {
-                    $map = generate_map($link_item['coord']);
-                }
-            }
-
-            //      logger('mod_photo: link_item' . print_r($link_item,true));
-
-            // FIXME - remove this when we move to conversation module
-
-            $comment_items = $sorted_items[0]['children'];
-
-            $edit = null;
-            if ($can_post) {
-                $album_e = $ph[0]['album'];
-                $caption_e = $ph[0]['description'];
-                $aclselect_e = (($_is_owner) ? Libacl::populate($ph[0], true, PermissionDescription::fromGlobalPermission('view_storage')) : '');
-                $albums = ((array_key_exists('albums', App::$data)) ? App::$data['albums'] : photos_albums_list(App::$data['channel'], App::$data['observer']));
-
-                $_SESSION['album_return'] = bin2hex($ph[0]['album']);
-
-                $folder_list = attach_folder_select_list($ph[0]['uid']);
-                $edit_body = htmlspecialchars_decode(undo_post_tagging($link_item['body']), ENT_COMPAT);
-                // We will regenerate the body footer
-                $edit_body = preg_replace('/\[footer\](.*?)\[\/footer\]/ism', '', $edit_body);
-
-                $edit = [
-                    'edit' => t('Edit photo'),
-                    'id' => $link_item['id'],
-                    'albums' => $albums['albums'],
-                    'album' => $album_e,
-                    'album_select' => ['move_to_album', t('Move photo to album'), $x[0]['folder'], '', $folder_list],
-                    'newalbum_label' => t('Enter a new album name'),
-                    'newalbum_placeholder' => t('or select an existing one (doubleclick)'),
-                    'nickname' => App::$data['channel']['channel_address'],
-                    'resource_id' => $ph[0]['resource_id'],
-                    'desc' => ['desc', t('Please briefly describe this photo for vision-impaired viewers'), $ph[0]['description']],
-                    'title' => ['title', t('Title (optional)'), $ph[0]['title']],
-                    'body' => ['body', t('Your message (optional)'), $edit_body, t('This will only appear in the optional status post attached to this photo')],
-                    'tag_label' => t('Add a Tag'),
-                    'permissions' => t('Permissions'),
-                    'aclselect' => $aclselect_e,
-                    'allow_cid' => acl2json($ph[0]['allow_cid']),
-                    'allow_gid' => acl2json($ph[0]['allow_gid']),
-                    'deny_cid' => acl2json($ph[0]['deny_cid']),
-                    'deny_gid' => acl2json($ph[0]['deny_gid']),
-                    'lockstate' => $lockstate[0],
-                    'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
-                    'item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
-                    'adult_enabled' => Features::enabled($owner_uid, 'adult_photo_flagging'),
-                    'adult' => array('adult', t('Flag as adult in album view'), intval($ph[0]['is_nsfw']), ''),
-                    'submit' => t('Submit'),
-                    'delete' => t('Delete Photo'),
-                    'expandform' => ((x($_GET, 'expandform')) ? true : false)
-                ];
-            }
-
-            if (count($linked_items)) {
-                $cmnt_tpl = Theme::get_template('comment_item.tpl');
-                $tpl = Theme::get_template('photo_item.tpl');
-                $return_url = App::$cmd;
-
-                $like_tpl = Theme::get_template('like_noshare.tpl');
-
-                $likebuttons = '';
-                $ilike = false;
-                $inolike = false;
-
-
-                if ($items) {
-                    foreach ($items as $i) {
-                        if ($i['verb'] === 'Like' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] = $link_item['mid']) {
-                            $ilike = true;
-                        }
-                        if ($i['verb'] === 'Dislike' && $i['author_xchan'] === get_observer_hash() && $i['thr_parent'] === $link_item['mid']) {
-                            $inolike = true;
-                        }
-                    }
-                }
-
-                if ($observer && ($can_post || $can_comment)) {
-                    $likebuttons = [
-                        'id' => $link_item['id'],
-                        'likethis' => t('I like this'),
-                        'ilike' => $ilike,
-                        'inolike' => $inolike,
-                        'nolike' => t('I don\'t like this'),
-                        'unlikethis' => t('Undo like'),
-                        'unnolike' => t('Undo dislike'),
-                        'share' => t('Share'),
-                        'wait' => t('Please wait')
-                    ];
-                }
-
-                $comments = '';
-                if (!$comment_items) {
-                    if ($observer && ($can_post || $can_comment)) {
-                        $commentbox = replace_macros($cmnt_tpl, array(
-                            '$return_path' => '',
-                            '$mode' => 'photos',
-                            '$jsreload' => $return_url,
-                            '$type' => 'wall-comment',
-                            '$id' => $link_item['id'],
-                            '$parent' => $link_item['id'],
-                            '$profile_uid' => $owner_uid,
-                            '$mylink' => $observer['xchan_url'],
-                            '$mytitle' => t('This is you'),
-                            '$myphoto' => $observer['xchan_photo_s'],
-                            '$comment' => t('Comment'),
-                            '$submit' => t('Submit'),
-                            '$preview' => t('Preview'),
-                            '$auto_save_draft' => 'true',
-                            '$ww' => '',
-                            '$feature_encrypt' => false
-                        ));
-                    }
-                }
-
-                $alike = [];
-                $dlike = [];
-
-                $like = '';
-                $dislike = '';
-
-                $conv_responses = [
-                    'like' => ['title' => t('Likes', 'title')],
-                    'dislike' => ['title' => t('Dislikes', 'title')],
-                    'attendyes' => ['title' => t('Attending', 'title')],
-                    'attendno' => ['title' => t('Not attending', 'title')],
-                    'attendmaybe' => ['title' => t('Might attend', 'title')]
-                ];
-
-                if ($r) {
-                    foreach ($r as $item) {
-                        builtin_activity_puller($item, $conv_responses);
-                    }
-
-                    $like_count = ((x($alike, $link_item['mid'])) ? $alike[$link_item['mid']] : '');
-                    $like_list = ((x($alike, $link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : '');
-
-                    if (is_array($like_list) && (count($like_list) > MAX_LIKERS)) {
-                        $like_list_part = array_slice($like_list, 0, MAX_LIKERS);
-                        array_push($like_list_part, '' . t('View all') . '');
-                    } else {
-                        $like_list_part = '';
-                    }
-                    $like_button_label = tt('Like', 'Likes', $like_count, 'noun');
-
-                    $dislike_count = ((x($dlike, $link_item['mid'])) ? $dlike[$link_item['mid']] : '');
-                    $dislike_list = ((x($dlike, $link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : '');
-                    $dislike_button_label = tt('Dislike', 'Dislikes', $dislike_count, 'noun');
-                    if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) {
-                        $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
-                        array_push($dislike_list_part, '' . t('View all') . '');
-                    } else {
-                        $dislike_list_part = '';
-                    }
-
-
-                    $like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']], $alike[$link_item['mid'] . '-l'], 'like', $link_item['mid']) : '');
-                    $dislike = ((isset($dlike[$link_item['mid']])) ? format_like($dlike[$link_item['mid']], $dlike[$link_item['mid'] . '-l'], 'dislike', $link_item['mid']) : '');
-
-                    // display comments
-
-                    foreach ($comment_items as $item) {
-                        $comment = '';
-                        $template = $tpl;
-                        $sparkle = '';
-
-                        if (!visible_activity($item)) {
-                            continue;
-                        }
-
-                        $profile_url = zid($item['author']['xchan_url']);
-                        $profile_name = $item['author']['xchan_name'];
-                        $profile_avatar = $item['author']['xchan_photo_m'];
-
-                        $profile_link = $profile_url;
-
-                        $drop = '';
-
-                        if ($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan']) {
-                            $drop = replace_macros(Theme::get_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
-                        }
-
-
-                        $name_e = $profile_name;
-                        $title_e = $item['title'];
-                        unobscure($item);
-                        $body_e = prepare_text($item['body'], $item['mimetype']);
-
-                        $comments .= replace_macros($template, array(
-                            '$id' => $item['id'],
-                            '$mode' => 'photos',
-                            '$profile_url' => $profile_link,
-                            '$name' => $name_e,
-                            '$thumb' => $profile_avatar,
-                            '$sparkle' => $sparkle,
-                            '$title' => $title_e,
-                            '$body' => $body_e,
-                            '$ago' => relative_date($item['created']),
-                            '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''),
-                            '$drop' => $drop,
-                            '$comment' => $comment
-                        ));
-                    }
-
-                    if ($observer && ($can_post || $can_comment)) {
-                        $commentbox = replace_macros($cmnt_tpl, array(
-                            '$return_path' => '',
-                            '$jsreload' => $return_url,
-                            '$type' => 'wall-comment',
-                            '$id' => $link_item['id'],
-                            '$parent' => $link_item['id'],
-                            '$profile_uid' => $owner_uid,
-                            '$mylink' => $observer['xchan_url'],
-                            '$mytitle' => t('This is you'),
-                            '$myphoto' => $observer['xchan_photo_s'],
-                            '$comment' => t('Comment'),
-                            '$submit' => t('Submit'),
-                            '$ww' => ''
-                        ));
-                    }
-                }
-                $paginate = paginate($a);
-            }
-
-            $album_e = [$album_link, $ph[0]['album']];
-            $like_e = $like;
-            $dislike_e = $dislike;
-
-
-            $response_verbs = array('like', 'dislike');
-
-            $responses = get_responses($conv_responses, $response_verbs, '', $link_item);
-
-            $o .= replace_macros(Theme::get_template('photo_view.tpl'), [
-                '$id' => $ph[0]['id'],
-                '$album' => $album_e,
-                '$tools_label' => t('Photo Tools'),
-                '$tools' => $tools,
-                '$lock' => $lockstate[1],
-                '$photo' => $photo,
-                '$prevlink' => $prevlink,
-                '$nextlink' => $nextlink,
-                '$title' => $ph[0]['title'],
-                '$desc' => $ph[0]['description'],
-                '$filename' => $ph[0]['filename'],
-                '$unknown' => t('Unknown'),
-                '$tag_hdr' => t('In This Photo:'),
-                '$tags' => $tags,
-                'responses' => $responses,
-                '$edit' => $edit,
-                '$map' => $map,
-                '$map_text' => t('Map'),
-                '$likebuttons' => $likebuttons,
-                '$like' => $like_e,
-                '$dislike' => $dislike_e,
-                '$like_count' => $like_count,
-                '$like_list' => $like_list,
-                '$like_list_part' => $like_list_part,
-                '$like_button_label' => $like_button_label,
-                '$like_modal_title' => t('Likes', 'noun'),
-                '$dislike_modal_title' => t('Dislikes', 'noun'),
-                '$dislike_count' => $dislike_count,
-                '$dislike_list' => $dislike_list,
-                '$dislike_list_part' => $dislike_list_part,
-                '$dislike_button_label' => $dislike_button_label,
-                '$modal_dismiss' => t('Close'),
-                '$comments' => $comments,
-                '$commentbox' => $commentbox,
-                '$paginate' => $paginate,
-            ]);
-
-            App::$data['photo_html'] = $o;
-            return $o;
-        }
-
-        // Default - show recent photos
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/json+oembed',
-            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-            'title' => 'oembed'
-        ]);
-
-        App::set_pager_itemspage(60);
-
-        $r = q(
-            "SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path FROM photo p 
-			INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) 
-			AND is_nsfw = %d $sql_extra group by resource_id ) ph ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) 
-			ORDER by p.created DESC LIMIT %d OFFSET %d",
-            intval(App::$data['channel']['channel_id']),
-            intval(PHOTO_NORMAL),
-            intval(PHOTO_PROFILE),
-            intval($unsafe),
-            intval(App::$pager['itemspage']),
-            intval(App::$pager['start'])
-        );
-
-        $photos = [];
-        if ($r) {
-            $twist = 'rotright';
-            foreach ($r as $rr) {
-                if (!attach_can_view_folder(App::$data['channel']['channel_id'], get_observer_hash(), $rr['resource_id'])) {
-                    continue;
-                }
-
-                if ($twist == 'rotright') {
-                    $twist = 'rotleft';
-                } else {
-                    $twist = 'rotright';
-                }
-                $ext = $phototypes[$rr['mimetype']];
-
-                $alt_e = $rr['filename'];
-                $name_e = dirname($rr['display_path']);
-
-                $photos[] = [
-                    'id' => $rr['id'],
-                    'twist' => ' ' . $twist . rand(2, 4),
-                    'link' => z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'],
-                    'title' => t('View Photo'),
-                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext,
-                    'alt' => $alt_e,
-                    'album' => ['name' => $name_e],
-                ];
-            }
-        }
-
-        if ($_REQUEST['aj']) {
-            if ($photos) {
-                $o = replace_macros(Theme::get_template('photosajax.tpl'), [
-                    '$photos' => $photos,
-                    '$album_id' => bin2hex(t('Recent Photos'))
-                ]);
-            } else {
-                $o = '
          ';
-            }
-            echo $o;
-            killme();
-        } else {
-            $o .= "";
-
-            $o .= replace_macros(Theme::get_template('photos_recent.tpl'), [
-                '$title' => t('Recent Photos'),
-                '$album_id' => bin2hex(t('Recent Photos')),
-                '$file_view' => t('View files'),
-                '$files_path' => z_root() . '/cloud/' . App::$data['channel']['channel_address'],
-                '$can_post' => $can_post,
-                '$upload' => t('Add Photos'),
-                '$photos' => $photos,
-                '$upload_form' => $upload_form,
-                '$usage' => $usage_message
-            ]);
-
-            return $o;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Pin.php b/Zotlabs/Module/Pin.php
deleted file mode 100644
index 547882cf6..000000000
--- a/Zotlabs/Module/Pin.php
+++ /dev/null
@@ -1,68 +0,0 @@
- '%s'
-				$seenstr
-				$item_normal
-				$sql_extra",
-                intval($sys['channel_id']),
-                dbesc($loadtime)
-            );
-
-            if ($pubs) {
-                foreach ($pubs as $p) {
-                    if ($p['author_xchan'] === get_observer_hash()) {
-                        $my_activity++;
-                    } else {
-                        $result['pubs']++;
-                    }
-                }
-            }
-        }
-
-        if ((argc() > 1) && (argv(1) === 'pubs') && ($notify_pubs)) {
-            $local_result = [];
-
-            $r = q(
-                "SELECT * FROM item
-				WHERE uid = %d
-				AND author_xchan != '%s'
-				AND created > '%s'
-				$seenstr
-				$item_normal
-				$sql_extra
-				ORDER BY created DESC
-				LIMIT 300",
-                intval($sys['channel_id']),
-                dbesc(get_observer_hash()),
-                dbesc($loadtime)
-            );
-
-            if ($r) {
-                xchan_query($r);
-                foreach ($r as $rr) {
-                    $rr['llink'] = str_replace('display/', 'pubstream/?f=&mid=', $rr['llink']);
-                    $z = Enotify::format($rr);
-                    if ($z) {
-                        $local_result[] = $z;
-                    }
-                }
-            }
-
-            json_return_and_die(['notify' => $local_result]);
-        }
-
-        if ((!local_channel()) || ($result['invalid'])) {
-            json_return_and_die($result);
-        }
-
-        /**
-         * Everything following is only permitted under the context of a locally authenticated site member.
-         */
-
-        /**
-         * Handle "mark all xyz notifications read" requests.
-         */
-
-        // mark all items read
-        if (x($_REQUEST, 'markRead') && local_channel() && (!$_SESSION['sudo'])) {
-            switch ($_REQUEST['markRead']) {
-                case 'stream':
-                    $r = q(
-                        "UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1",
-                        intval(local_channel())
-                    );
-                    $_SESSION['loadtime_stream'] = datetime_convert();
-                    PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']);
-                    $_SESSION['loadtime_channel'] = datetime_convert();
-                    PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
-                    break;
-                case 'home':
-                    $r = q(
-                        "UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_wall = 1",
-                        intval(local_channel())
-                    );
-                    $_SESSION['loadtime_channel'] = datetime_convert();
-                    PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
-                    break;
-                case 'all_events':
-                    $r = q(
-                        "UPDATE event SET dismissed = 1 WHERE uid = %d AND dismissed = 0 AND dtstart < '%s' AND dtstart > '%s' ",
-                        intval(local_channel()),
-                        dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
-                        dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-                    );
-                    break;
-                case 'notify':
-                    $r = q(
-                        "update notify set seen = 1 where uid = %d",
-                        intval(local_channel())
-                    );
-                    break;
-                case 'pubs':
-                    $_SESSION['loadtime_pubstream'] = datetime_convert();
-                    PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']);
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        if (x($_REQUEST, 'markItemRead') && local_channel() && (!$_SESSION['sudo'])) {
-            $r = q(
-                "UPDATE item SET item_unseen = 0 WHERE  uid = %d AND parent = %d",
-                intval(local_channel()),
-                intval($_REQUEST['markItemRead'])
-            );
-            $id = intval($_REQUEST['markItemRead']);
-            $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []);
-            if (!in_array($id, $seen)) {
-                $seen[] = $id;
-            }
-            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
-        }
-
-        /**
-         * URL ping/something will return detail for "something", e.g. a json list with which to populate a notification
-         * dropdown menu.
-         */
-
-        if (argc() > 1 && argv(1) === 'notify') {
-            $t = q(
-                "SELECT * FROM notify WHERE uid = %d AND seen = 0 ORDER BY CREATED DESC",
-                intval(local_channel())
-            );
-
-            if ($t) {
-                foreach ($t as $tt) {
-                    $message = trim(strip_tags(bbcode($tt['msg'])));
-
-                    if (strpos($message, $tt['xname']) === 0) {
-                        $message = substr($message, strlen($tt['xname']) + 1);
-                    }
-
-
-                    $mid = basename($tt['link']);
-                    $mid = unpack_link_id($mid);
-
-                    if (in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
-                        // we need the thread parent
-                        $r = q(
-                            "select thr_parent from item where mid = '%s' and uid = %d limit 1",
-                            dbesc($mid),
-                            intval(local_channel())
-                        );
-
-                        $b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : gen_link_id($r[0]['thr_parent']));
-                    } else {
-                        $b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : gen_link_id($mid));
-                    }
-
-                    $notifs[] = array(
-                        'notify_link' => z_root() . '/notify/view/' . $tt['id'],
-                        'name' => $tt['xname'],
-                        'url' => $tt['url'],
-                        'photo' => $tt['photo'],
-                        'when' => relative_date($tt['created']),
-                        'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'),
-                        'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'),
-                        'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'),
-                        'message' => $message
-                    );
-                }
-            }
-
-            json_return_and_die(['notify' => $notifs]);
-        }
-
-        if (argc() > 1 && (argv(1) === 'stream')) {
-            $local_result = [];
-
-            $item_normal_moderate = $item_normal;
-            $loadtime = get_loadtime('stream');
-
-            $r = q(
-                "SELECT * FROM item 
-				WHERE uid = %d
-				AND author_xchan != '%s'
-				AND edited > '%s'
-				$seenstr
-				$item_normal_moderate
-				$sql_extra
-				ORDER BY created DESC
-				LIMIT 300",
-                intval(local_channel()),
-                dbesc($ob_hash),
-                dbesc($loadtime)
-            );
-            if ($r) {
-                xchan_query($r);
-                foreach ($r as $item) {
-                    $z = Enotify::format($item);
-
-                    if ($z) {
-                        $local_result[] = $z;
-                    }
-                }
-            }
-
-            json_return_and_die(['notify' => $local_result]);
-        }
-
-        if (argc() > 1 && (argv(1) === 'home')) {
-            $local_result = [];
-            $item_normal_moderate = $item_normal;
-
-            $sql_extra .= " and item_wall = 1 ";
-            $item_normal_moderate = item_normal_moderate();
-
-            $loadtime = get_loadtime('channel');
-
-            $r = q(
-                "SELECT * FROM item 
-				WHERE uid = %d
-				AND author_xchan != '%s'
-				AND edited > '%s'
-				$seenstr
-				$item_normal_moderate
-				$sql_extra
-				ORDER BY created DESC
-				LIMIT 300",
-                intval(local_channel()),
-                dbesc($ob_hash),
-                dbesc($loadtime)
-            );
-            if ($r) {
-                xchan_query($r);
-                foreach ($r as $item) {
-                    $z = Enotify::format($item);
-
-                    if ($z) {
-                        $local_result[] = $z;
-                    }
-                }
-            }
-
-            json_return_and_die(['notify' => $local_result]);
-        }
-
-
-        if (argc() > 1 && (argv(1) === 'intros')) {
-            $local_result = [];
-
-            $r = q(
-                "SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ORDER BY abook_created DESC LIMIT 50",
-                intval(local_channel())
-            );
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $local_result[] = [
-                        'notify_link' => z_root() . '/connections/' . $rr['abook_id'],
-                        'name' => $rr['xchan_name'],
-                        'addr' => $rr['xchan_addr'],
-                        'url' => $rr['xchan_url'],
-                        'photo' => $rr['xchan_photo_s'],
-                        'when' => relative_date($rr['abook_created']),
-                        'hclass' => ('notify-unseen'),
-                        'message' => t('added your channel')
-                    ];
-                }
-            }
-
-            json_return_and_die(['notify' => $local_result]);
-        }
-
-        if ((argc() > 1 && (argv(1) === 'register')) && is_site_admin()) {
-            $result = [];
-
-            $r = q(
-                "SELECT account_email, account_created from account where (account_flags & %d) > 0",
-                intval(ACCOUNT_PENDING)
-            );
-            if ($r) {
-                foreach ($r as $rr) {
-                    $result[] = array(
-                        'notify_link' => z_root() . '/admin/accounts',
-                        'name' => $rr['account_email'],
-                        'addr' => $rr['account_email'],
-                        'url' => '',
-                        'photo' => z_root() . '/' . Channel::get_default_profile_photo(48),
-                        'when' => relative_date($rr['account_created']),
-                        'hclass' => ('notify-unseen'),
-                        'message' => t('requires approval')
-                    );
-                }
-            }
-
-            json_return_and_die(['notify' => $result]);
-        }
-
-        if (argc() > 1 && (argv(1) === 'all_events')) {
-            $bd_format = t('g A l F d'); // 8 AM Friday January 18
-
-            $result = [];
-
-            $r = q(
-                "SELECT * FROM event left join xchan on event_xchan = xchan_hash
-				WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
-				and etype in ( 'event', 'birthday' )
-				ORDER BY dtstart DESC LIMIT 1000",
-                intval(local_channel()),
-                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
-                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-            );
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']);
-                    $today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
-                    $when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ? ' ' . t('[today]') : '');
-
-                    $result[] = array(
-                        'notify_link' => z_root() . '/events', /// @FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event  --> '/events/event/' . $rr['event_hash'],
-                        'name' => $rr['xchan_name'],
-                        'addr' => $rr['xchan_addr'],
-                        'url' => $rr['xchan_url'],
-                        'photo' => $rr['xchan_photo_s'],
-                        'when' => $when,
-                        'hclass' => ('notify-unseen'),
-                        'message' => t('posted an event')
-                    );
-                }
-            }
-
-            json_return_and_die(['notify' => $result]);
-        }
-
-        if (argc() > 1 && (argv(1) === 'files')) {
-            $result = [];
-
-            $r = q(
-                "SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item 
-				LEFT JOIN xchan on author_xchan = xchan_hash
-				WHERE item.verb = '%s'
-				AND item.obj_type = '%s'
-				AND item.uid = %d
-				AND item.owner_xchan != '%s'
-				AND item.item_unseen = 1",
-                dbesc(ACTIVITY_POST),
-                dbesc(ACTIVITY_OBJ_FILE),
-                intval(local_channel()),
-                dbesc($ob_hash)
-            );
-            if ($r) {
-                foreach ($r as $rr) {
-                    $result[] = array(
-                        'notify_link' => z_root() . '/sharedwithme',
-                        'name' => $rr['xchan_name'],
-                        'addr' => $rr['xchan_addr'],
-                        'url' => $rr['xchan_url'],
-                        'photo' => $rr['xchan_photo_s'],
-                        'when' => relative_date($rr['created']),
-                        'hclass' => ('notify-unseen'),
-                        'message' => t('shared a file with you')
-                    );
-                }
-            }
-
-            json_return_and_die(['notify' => $result]);
-        }
-
-        if (argc() > 1 && (argv(1) === 'reports') && is_site_admin()) {
-            $local_result = [];
-
-            $r = q(
-                "SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item 
-				LEFT JOIN xchan on author_xchan = xchan_hash
-				WHERE item.type = '%s' AND item.item_unseen = 1",
-                dbesc(ITEM_TYPE_REPORT)
-            );
-
-            if ($r) {
-                foreach ($r as $rv) {
-                    $result[] = [
-                        'notify_link' => z_root() . '/reports',
-                        'name' => $rv['xchan_name'],
-                        'addr' => $rv['xchan_addr'],
-                        'url' => $rv['xchan_url'],
-                        'photo' => $rv['xchan_photo_s'],
-                        'when' => relative_date($rv['created']),
-                        'hclass' => ('notify-unseen'),
-                        'message' => t('reported content')
-                    ];
-                }
-            }
-
-            json_return_and_die(['notify' => $result]);
-        }
-
-
-        /**
-         * Normal ping - just the counts, no detail
-         */
-
-
-        if ($vnotify & VNOTIFY_SYSTEM) {
-            $t = q(
-                "select count(*) as total from notify where uid = %d and seen = 0",
-                intval(local_channel())
-            );
-            if ($t) {
-                $result['notify'] = intval($t[0]['total']);
-            }
-        }
-
-        if ($vnotify & VNOTIFY_FILES) {
-            $files = q(
-                "SELECT count(id) as total FROM item
-				WHERE verb = '%s'
-				AND obj_type = '%s'
-				AND uid = %d
-				AND owner_xchan != '%s'
-				AND item_unseen = 1",
-                dbesc(ACTIVITY_POST),
-                dbesc(ACTIVITY_OBJ_FILE),
-                intval(local_channel()),
-                dbesc($ob_hash)
-            );
-            if ($files) {
-                $result['files'] = intval($files[0]['total']);
-            }
-        }
-
-
-        if ($vnotify & VNOTIFY_NETWORK) {
-            $loadtime = get_loadtime('stream');
-            $r = q(
-                "SELECT id, author_xchan FROM item 
-				WHERE uid = %d and edited > '%s' 
-				$seenstr
-				$item_normal
-				$sql_extra ",
-                intval(local_channel()),
-                dbesc($loadtime)
-            );
-
-            if ($r) {
-                $arr = array('items' => $r);
-                Hook::call('network_ping', $arr);
-
-                foreach ($r as $it) {
-                    if ($it['author_xchan'] === $ob_hash) {
-                        $my_activity++;
-                    } else {
-                        $result['stream']++;
-                    }
-                }
-            }
-        }
-        if (!($vnotify & VNOTIFY_NETWORK)) {
-            $result['stream'] = 0;
-        }
-
-        if ($vnotify & VNOTIFY_CHANNEL) {
-            $loadtime = get_loadtime('channel');
-            $r = q(
-                "SELECT id, author_xchan FROM item 
-				WHERE item_wall = 1 and uid = %d and edited > '%s'
-				$seenstr 
-				$item_normal
-				$sql_extra ",
-                intval(local_channel()),
-                dbesc($loadtime)
-            );
-
-            if ($r) {
-                foreach ($r as $it) {
-                    if ($it['author_xchan'] === $ob_hash) {
-                        $my_activity++;
-                    } else {
-                        $result['home']++;
-                    }
-                }
-            }
-        }
-        if (!($vnotify & VNOTIFY_CHANNEL)) {
-            $result['home'] = 0;
-        }
-
-
-        if ($vnotify & VNOTIFY_INTRO) {
-            $intr = q(
-                "SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
-                intval(local_channel())
-            );
-
-            if ($intr) {
-                $result['intros'] = intval($intr[0]['total']);
-            }
-        }
-
-
-        $channel = App::get_channel();
-
-        if ($vnotify & VNOTIFY_REGISTER) {
-            if (App::$config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
-                $regs = q(
-                    "SELECT count(account_id) as total from account where (account_flags & %d) > 0",
-                    intval(ACCOUNT_PENDING)
-                );
-                if ($regs) {
-                    $result['register'] = intval($regs[0]['total']);
-                }
-            }
-        }
-
-        if ($vnotify & VNOTIFY_REPORTS) {
-            if (is_site_admin()) {
-                $reps = q(
-                    "SELECT count(id) as total from item where item_type = %d",
-                    intval(ITEM_TYPE_REPORT)
-                );
-                if ($reps) {
-                    $result['reports'] = intval($reps[0]['total']);
-                }
-            }
-        }
-
-        if ($vnotify & (VNOTIFY_EVENT | VNOTIFY_EVENTTODAY | VNOTIFY_BIRTHDAY)) {
-            $events = q(
-                "SELECT etype, dtstart, adjust FROM event
-				WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
-				and etype in ( 'event', 'birthday' )
-				ORDER BY dtstart ASC ",
-                intval(local_channel()),
-                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
-                dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-            );
-
-            if ($events) {
-                $result['all_events'] = count($events);
-
-                if ($result['all_events']) {
-                    $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
-                    foreach ($events as $x) {
-                        $bd = false;
-                        if ($x['etype'] === 'birthday') {
-                            $result['birthdays']++;
-                            $bd = true;
-                        } else {
-                            $result['events']++;
-                        }
-                        if (datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['dtstart'], 'Y-m-d') === $str_now) {
-                            $result['all_events_today']++;
-                            if ($bd) {
-                                $result['birthdays_today']++;
-                            } else {
-                                $result['events_today']++;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!($vnotify & VNOTIFY_EVENT)) {
-            $result['all_events'] = $result['events'] = 0;
-        }
-        if (!($vnotify & VNOTIFY_EVENTTODAY)) {
-            $result['all_events_today'] = $result['events_today'] = 0;
-        }
-        if (!($vnotify & VNOTIFY_BIRTHDAY)) {
-            $result['birthdays'] = 0;
-        }
-
-
-        if ($vnotify & VNOTIFY_FORUMS) {
-            $forums = get_forum_channels(local_channel());
-
-            if ($forums) {
-                $perms_sql = item_permissions_sql(local_channel()) . item_normal();
-                $fcount = count($forums);
-                $forums['total'] = 0;
-
-                for ($x = 0; $x < $fcount; $x++) {
-                    $ttype = TERM_FORUM;
-                    $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . protect_sprintf(dbesc($forums[$x]['xchan_name'])) . "'");
-
-                    $p = ids_to_querystr($p, 'parent');
-                    $pquery = (($p) ? "OR parent IN ( $p )" : '');
-
-                    $r = q(
-                        "select sum(item_unseen) as unseen from item 
-						where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ",
-                        intval(local_channel()),
-                        dbesc($forums[$x]['xchan_hash'])
-                    );
-                    if ($r[0]['unseen']) {
-                        $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/stream/?f=&pf=1&cid=' . $forums[$x]['abook_id']);
-                        $forums[$x]['name'] = $forums[$x]['xchan_name'];
-                        $forums[$x]['addr'] = $forums[$x]['xchan_addr'];
-                        $forums[$x]['url'] = $forums[$x]['xchan_url'];
-                        $forums[$x]['photo'] = $forums[$x]['xchan_photo_s'];
-                        $forums[$x]['unseen'] = $r[0]['unseen'];
-                        $forums[$x]['private_forum'] = (($forums[$x]['private_forum']) ? 'lock' : '');
-                        $forums[$x]['message'] = (($forums[$x]['private_forum']) ? t('Private group') : t('Public group'));
-
-                        $forums['total'] = $forums['total'] + $r[0]['unseen'];
-
-                        unset($forums[$x]['abook_id']);
-                        unset($forums[$x]['xchan_hash']);
-                        unset($forums[$x]['xchan_name']);
-                        unset($forums[$x]['xchan_url']);
-                        unset($forums[$x]['xchan_photo_s']);
-                    } else {
-                        unset($forums[$x]);
-                    }
-                }
-                $result['forums'] = $forums['total'];
-                unset($forums['total']);
-
-                $result['forums_sub'] = $forums;
-            }
-        }
-
-        // Mark all of the stream notifications seen if all three of them are caught up.
-        // This also resets the pconfig storage for items_seen
-
-        if ((!$my_activity) && (!(intval($result['home']) + intval($result['stream']) + intval($result['pubs'])))) {
-            PConfig::Delete(local_channel(), 'system', 'seen_items');
-
-            $_SESSION['loadtime_channel'] = datetime_convert();
-            $_SESSION['loadtime_stream'] = datetime_convert();
-            $_SESSION['loadtime_pubstream'] = datetime_convert();
-
-            PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
-            PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']);
-            PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']);
-        }
-
-        json_return_and_die($result);
-    }
-}
diff --git a/Zotlabs/Module/Plike.php b/Zotlabs/Module/Plike.php
deleted file mode 100644
index 2e2e892fe..000000000
--- a/Zotlabs/Module/Plike.php
+++ /dev/null
@@ -1,312 +0,0 @@
- 'Like',
-            'dislike'     => 'Dislike',
-        ];
-
-        // unlike (etc.) reactions are an undo of positive reactions, rather than a negative action.
-        // The activity is the same in undo actions and will have the same activity mapping
-
-        if (substr($reaction, 0, 2) === 'un') {
-            $undo = true;
-            $reaction = substr($reaction, 2);
-        }
-
-        if (array_key_exists($reaction, $acts)) {
-            return (($undo) ? 'Undo/' : EMPTY_STR) . $acts[$reaction];
-        }
-
-        return EMPTY_STR;
-    }
-
-
-
-    public function get()
-    {
-
-        $undo = false;
-        $object = $target = null;
-        $owner_uid = 0;
-        $post_type = EMPTY_STR;
-        $objtype = EMPTY_STR;
-        $allow_cid = $allow_gid = $deny_cid = $deny_gid = '';
-        $output = EMPTY_STR;
-
-        $sys_channel = Channel::get_system();
-        $sys_channel_id = (($sys_channel) ? $sys_channel['channel_id'] : 0);
-
-        $observer = App::get_observer();
-
-        $verb = ((array_key_exists('verb', $_GET)) ? notags(trim($_GET['verb'])) :  EMPTY_STR);
-
-        // Figure out what action we're performing
-
-        $activity = $this->reaction_to_activity($verb);
-
-        if (! $activity) {
-            return EMPTY_STR;
-        }
-
-        // Check for negative (undo) condition
-        // eg: 'Undo/Like' results in $undo conditional and $activity set to 'Like'
-
-        $test = explode('/', $activity);
-        if (count($test) > 1) {
-            $undo = true;
-            $activity = $test[1];
-        }
-
-        $is_rsvp = in_array($activity, [ 'Accept', 'Reject', 'TentativeAccept' ]);
-
-        // Check for when target is something besides messages, where argv(1) is the type of thing
-        // and  argv(2) is an identifier of things of that type
-        // We currently only recognise 'profile' but other types could be handled
-
-        if (argc() == 3) {
-            if (! $observer) {
-                killme();
-            }
-
-            if ($obj_type == 'profile') {
-                $r = q(
-                    "select * from profile where profile_guid = '%s' limit 1",
-                    dbesc($obj_id)
-                );
-
-                if (! $r) {
-                    killme();
-                }
-
-                $profile = array_shift($r);
-
-                $owner_uid = $profile['uid'];
-
-                $public = ((intval($profile['is_default'])) ? true : false);
-
-                // if this is a private profile, select the destination recipients
-
-                if (! $public) {
-                    $d = q(
-                        "select abook_xchan from abook where abook_profile = '%s' and abook_channel = %d",
-                        dbesc($profile['profile_guid']),
-                        intval($owner_uid)
-                    );
-                    if (! $d) {
-                        // No profile could be found.
-                        killme();
-                    }
-
-                    // $d now contains a list of those who can see this profile.
-                    // Set the access accordingly.
-
-                    foreach ($d as $dd) {
-                        $allow_cid .= '<' . $dd['abook_xchan'] . '>';
-                    }
-                }
-
-                $post_type = t('channel');
-                $objtype = ACTIVITY_OBJ_PROFILE;
-            }
-
-            // We'll need the owner of the thing from up above to figure out what channel is the target
-
-            if (! ($owner_uid)) {
-                killme();
-            }
-
-            // Check permissions of the observer. If this is the owner (mostly this is the case)
-            // this will return true for all permissions.
-
-            $perms = get_all_perms($owner_uid, $observer['xchan_hash']);
-
-            if (! ($perms['post_like'] && $perms['view_profile'])) {
-                killme();
-            }
-
-            $channel = Channel::from_id($owner_uid);
-
-            if (! $channel) {
-                killme();
-            }
-
-            $object = json_encode(Activity::fetch_profile([ 'id' => Channel::url($channel) ]));
-
-            // second like of the same thing is "undo" for the first like
-
-            $z = q(
-                "select * from likes where channel_id = %d and liker = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' limit 1",
-                intval($channel['channel_id']),
-                dbesc($observer['xchan_hash']),
-                dbesc($activity),
-                dbesc(($tgttype) ? $tgttype : $objtype),
-                dbesc($obj_id)
-            );
-
-            if ($z) {
-                $z[0]['deleted'] = 1;
-                Libsync::build_sync_packet($channel['channel_id'], array('likes' => $z));
-
-                q(
-                    "delete from likes where id = %d",
-                    intval($z[0]['id'])
-                );
-                if ($z[0]['i_mid']) {
-                    $r = q(
-                        "select id from item where mid = '%s' and uid = %d limit 1",
-                        dbesc($z[0]['i_mid']),
-                        intval($channel['channel_id'])
-                    );
-                    if ($r) {
-                        drop_item($r[0]['id'], false);
-                    }
-                }
-                killme();
-            }
-        }
-
-        $uuid = new_uuid();
-
-        $arr = [];
-
-        $arr['uuid']  = $uuid;
-        $arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/' ) . $uuid;
-
-
-        $arr['item_thread_top'] = 1;
-        $arr['item_origin'] = 1;
-        $arr['item_wall'] = 1;
-
-
-        if ($verb === 'like') {
-            $bodyverb = t('%1$s likes %2$s\'s %3$s');
-        }
-        if ($verb === 'dislike') {
-            $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-        }
-
-        if (! isset($bodyverb)) {
-            killme();
-        }
-
-
-        $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]';
-        $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
-        $plink = '[zrl=' . z_root() . '/profile/' . $channel['channel_address'] . ']' . $post_type . '[/zrl]';
-        $private = (($public) ? 0 : 1);
-
-
-        $arr['aid']          = $channel['channel_account_id'];
-        $arr['uid']          = $owner_uid;
-
-
-        $arr['item_flags']   = $item['item_flags'];
-        $arr['item_wall']    = $item['item_wall'];
-        $arr['parent_mid']   = $arr['mid'];
-        $arr['owner_xchan']  = $channel['xchan_hash'];
-        $arr['author_xchan'] = $observer['xchan_hash'];
-
-
-        $arr['body']          =  sprintf($bodyverb, $alink, $ulink, $plink);
-
-        if ($obj_type === 'profile') {
-            if ($public) {
-                $arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $channel['channel_address'] . '[/embed]';
-            } else {
-                $arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]';
-            }
-        }
-
-
-        $arr['verb']          = $activity;
-        $arr['obj_type']      = $objtype;
-        $arr['obj']           = $object;
-
-        if ($target) {
-            $arr['tgt_type']  = $tgttype;
-            $arr['target']    = $target;
-        }
-
-        $arr['allow_cid']     = $allow_cid;
-        $arr['allow_gid']     = $allow_gid;
-        $arr['deny_cid']      = $deny_cid;
-        $arr['deny_gid']      = $deny_gid;
-        $arr['item_private']  = $private;
-
-        Hook::call('post_local', $arr);
-
-        $post = item_store($arr);
-        $post_id = $post['item_id'];
-
-        // save the conversation from expiration
-
-        if (local_channel() && array_key_exists('item', $post) && (intval($post['item']['id']) != intval($post['item']['parent']))) {
-            retain_item($post['item']['parent']);
-        }
-
-        $arr['id'] = $post_id;
-
-        Hook::call('post_local_end', $arr);
-
-        $r = q(
-            "select * from item where id = %d",
-            intval($post_id)
-        );
-        if ($r) {
-            xchan_query($r);
-            $sync_item = fetch_post_tags($r);
-            Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0], true) ] ]);
-        }
-
-        $r = q(
-            "insert into likes (channel_id,liker,likee,iid,i_mid,verb,target_type,target_id,target) values (%d,'%s','%s',%d,'%s','%s','%s','%s','%s')",
-            intval($channel['channel_id']),
-            dbesc($observer['xchan_hash']),
-            dbesc($channel['channel_hash']),
-            intval($post_id),
-            dbesc($mid),
-            dbesc($activity),
-            dbesc(($tgttype) ? $tgttype : $objtype),
-            dbesc($obj_id),
-            dbesc(($target) ? $target  : $object)
-        );
-        $r = q(
-            "select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ",
-            dbesc($observer['xchan_hash']),
-            dbesc($channel['channel_hash']),
-            dbesc($mid),
-            dbesc($activity),
-            dbesc(($tgttype) ? $tgttype : $objtype),
-            dbesc($obj_id)
-        );
-        if ($r) {
-            Libsync::build_sync_packet($channel['channel_id'], array('likes' => $r));
-        }
-
-        Run::Summon([ 'Notifier', 'like', $post_id ]);
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Poco.php b/Zotlabs/Module/Poco.php
deleted file mode 100644
index eb126b2b2..000000000
--- a/Zotlabs/Module/Poco.php
+++ /dev/null
@@ -1,19 +0,0 @@
-';
-            $allow_gid = EMPTY_STR;
-            $deny_cid = EMPTY_STR;
-            $deny_gid = EMPTY_STR;
-        }
-
-        $arr = [];
-
-        $arr['item_wall'] = 1;
-        $arr['owner_xchan'] = $channel['channel_hash'];
-        $arr['author_xchan'] = $channel['channel_hash'];
-        $arr['allow_cid'] = $allow_cid;
-        $arr['allow_gid'] = $allow_gid;
-        $arr['deny_cid'] = $deny_cid;
-        $arr['deny_gid'] = $deny_gid;
-        $arr['verb'] = 'Create';
-        $arr['item_private'] = 1;
-        $arr['obj_type'] = 'Note';
-        $arr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . $verbs[$verb][2] . ' ' . '[zrl=' . $target['xchan_url'] . ']' . $target['xchan_name'] . '[/zrl]';
-
-
-        $arr['item_origin'] = 1;
-        $arr['item_wall'] = 1;
-
-        $obj = Activity::encode_item($arr, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
-
-        $i = post_activity_item($arr);
-
-        if ($i['success']) {
-            $item_id = $i['item_id'];
-            $r = q(
-                "select * from item where id = %d",
-                intval($item_id)
-            );
-            if ($r) {
-                xchan_query($r);
-                $sync_item = fetch_post_tags($r);
-                Libsync::build_sync_packet($uid, ['item' => [encode_item($sync_item[0], true)]]);
-            }
-
-            info(sprintf(t('You %1$s %2$s'), $verbs[$verb][2], $target['xchan_name']));
-        }
-
-        json_return_and_die(['success' => true]);
-    }
-
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if (!Apps::system_app_installed(local_channel(), 'Poke')) {
-            $o = '' . t('Poke App (Not Installed)') . '
          ';
-            $o .= t('Poke or do something else to somebody');
-            return $o;
-        }
-
-        Navbar::set_selected('Poke');
-
-        $name = '';
-        $id = '';
-
-        $verbs = get_poke_verbs();
-
-        $shortlist = [];
-        $current = get_pconfig(local_channel(), 'system', 'pokeverb', 'poke');
-        foreach ($verbs as $k => $v) {
-            $shortlist[] = [$k, $v[1], (($k === $current) ? true : false)];
-        }
-
-
-        $title = t('Poke');
-        $desc = t('Poke, prod or do other things to somebody');
-
-        $o = replace_macros(Theme::get_template('poke_content.tpl'), array(
-            '$title' => $title,
-            '$desc' => $desc,
-            '$clabel' => t('Recipient'),
-            '$choice' => t('Choose your default action'),
-            '$verbs' => $shortlist,
-            '$submit' => t('Submit'),
-            '$id' => $id
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Poster.php b/Zotlabs/Module/Poster.php
deleted file mode 100644
index e8cb1096f..000000000
--- a/Zotlabs/Module/Poster.php
+++ /dev/null
@@ -1,46 +0,0 @@
- get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits));
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php
deleted file mode 100644
index 6a276865a..000000000
--- a/Zotlabs/Module/Profile.php
+++ /dev/null
@@ -1,140 +0,0 @@
- 1) {
-            $which = argv(1);
-        } else {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        Navbar::set_selected('Profile');
-
-        $profile = '';
-        $channel = App::get_channel();
-
-        if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-            $which = $channel['channel_address'];
-            $profile = argv(1);
-            $r = q(
-                "select profile_guid from profile where id = %d and uid = %d limit 1",
-                intval($profile),
-                intval(local_channel())
-            );
-            if (!$r) {
-                $profile = '';
-            }
-            $profile = $r[0]['profile_guid'];
-        }
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/atom+xml',
-            'title' => t('Posts and comments'),
-            'href' => z_root() . '/feed/' . $which
-        ]);
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/atom+xml',
-            'title' => t('Only posts'),
-            'href' => z_root() . '/feed/' . $which . '?f=&top=1'
-        ]);
-
-
-        if (!$profile) {
-            $x = q(
-                "select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
-                dbesc(argv(1))
-            );
-            if ($x) {
-                App::$profile = $x[0];
-            }
-        }
-
-
-        if (ActivityStreams::is_as_request()) {
-            $chan = Channel::from_username(argv(1));
-            if (!$chan) {
-                http_status_exit(404, 'Not found');
-            }
-            $p = Activity::encode_person($chan, true, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
-            if (!$p) {
-                http_status_exit(404, 'Not found');
-            }
-
-            as_return_and_die(['type' => 'Profile', 'describes' => $p], $chan);
-        }
-
-        Libprofile::load($which, $profile);
-    }
-
-    public function get()
-    {
-
-        if (observer_prohibited(true)) {
-            return login();
-        }
-
-        $groups = [];
-
-
-        $tab = 'profile';
-        $o = '';
-
-        if (!(perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile'))) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-
-        if (argc() > 2 && argv(2) === 'vcard') {
-            header('Content-type: text/vcard');
-            header('Content-Disposition: attachment; filename="' . t('vcard') . '-' . $profile['channel_address'] . '.vcf"');
-            echo App::$profile['profile_vcard'];
-            killme();
-        }
-
-        $is_owner = ((local_channel()) && (local_channel() == App::$profile['profile_uid']) ? true : false);
-
-        if (App::$profile['hidewall'] && (!$is_owner) && (!remote_channel())) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        Head::add_link([
-            'rel' => 'alternate',
-            'type' => 'application/json+oembed',
-            'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-            'title' => 'oembed'
-        ]);
-
-        $o .= Libprofile::advanced();
-        Hook::call('profile_advanced', $o);
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
deleted file mode 100644
index dba69aa0a..000000000
--- a/Zotlabs/Module/Profile_photo.php
+++ /dev/null
@@ -1,578 +0,0 @@
-is_valid()) {
-                    $im->cropImage(300, $srcX, $srcY, $srcW, $srcH);
-
-                    $aid = get_account_id();
-
-                    $p = [
-                        'aid' => $aid,
-                        'uid' => local_channel(),
-                        'resource_id' => $base_image['resource_id'],
-                        'filename' => $base_image['filename'],
-                        'album' => t('Profile Photos'),
-                        'os_path' => $base_image['os_path'],
-                        'display_path' => $base_image['display_path'],
-                        'created' => $base_image['created'],
-                        'edited' => $base_image['edited']
-                    ];
-
-                    $animated = get_config('system', 'animated_avatars', true);
-
-                    $p['imgscale'] = PHOTO_RES_PROFILE_300;
-                    $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
-
-                    $r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300, $animated);
-
-                    $im->scaleImage(80);
-                    $p['imgscale'] = PHOTO_RES_PROFILE_80;
-
-                    $r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80, $animated);
-
-                    $im->scaleImage(48);
-                    $p['imgscale'] = PHOTO_RES_PROFILE_48;
-
-                    $r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48, $animated);
-
-                    if ($r1 === false || $r2 === false || $r3 === false) {
-                        // if one failed, delete them all so we can start over.
-                        notice(t('Image resize failed.') . EOL);
-                        $x = q(
-                            "delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ",
-                            dbesc($base_image['resource_id']),
-                            local_channel(),
-                            intval(PHOTO_RES_PROFILE_300),
-                            intval(PHOTO_RES_PROFILE_80),
-                            intval(PHOTO_RES_PROFILE_48)
-                        );
-                        return;
-                    }
-
-                    $channel = App::get_channel();
-
-                    // If setting for the default profile, unset the profile photo flag from any other photos I own
-
-                    if ($is_default_profile) {
-                        $r = q(
-                            "update profile set photo = '%s', thumb = '%s' where is_default = 1 and uid = %d",
-                            dbesc(z_root() . '/photo/profile/l/' . local_channel()),
-                            dbesc(z_root() . '/photo/profile/m/' . local_channel()),
-                            intval(local_channel())
-                        );
-
-
-                        $r = q(
-                            "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d
-							AND resource_id != '%s' AND uid = %d",
-                            intval(PHOTO_NORMAL),
-                            intval(PHOTO_PROFILE),
-                            dbesc($base_image['resource_id']),
-                            intval(local_channel())
-                        );
-
-
-                        send_profile_photo_activity($channel, $base_image, $profile);
-                    } else {
-                        $r = q(
-                            "update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
-                            dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-4'),
-                            dbesc(z_root() . '/photo/' . $base_image['resource_id'] . '-5'),
-                            intval($_REQUEST['profile']),
-                            intval(local_channel())
-                        );
-                    }
-
-                    // set $send to false in profiles_build_sync() to return the data
-                    // so that we only send one sync packet.
-
-                    $sync_profiles = Channel::profiles_build_sync(local_channel(), false);
-
-                    // We'll set the updated profile-photo timestamp even if it isn't the default profile,
-                    // so that browsers will do a cache update unconditionally
-                    // Also set links back to site-specific profile photo url in case it was
-                    // changed to a generic URL by a clone operation. Otherwise the new photo may
-                    // not get pushed to other sites correctly.
-
-                    $r = q(
-                        "UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s'  
-						where xchan_hash = '%s'",
-                        dbesc($im->getType()),
-                        dbesc(datetime_convert()),
-                        dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']),
-                        dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']),
-                        dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']),
-                        dbesc($channel['xchan_hash'])
-                    );
-
-                    photo_profile_setperms(local_channel(), $base_image['resource_id'], $_REQUEST['profile']);
-
-                    $sync = attach_export_data($channel, $base_image['resource_id']);
-                    if ($sync) {
-                        Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync), 'profile' => $sync_profiles));
-                    }
-
-                    // Similarly, tell the nav bar to bypass the cache and update the avatar image.
-                    $_SESSION['reload_avatar'] = true;
-
-                    info(t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
-
-                    // Update directory in background
-                    Run::Summon(['Directory', $channel['channel_id']]);
-                } else {
-                    notice(t('Unable to process image') . EOL);
-                }
-            }
-
-            goaway(z_root() . '/profiles');
-        }
-
-        // A new photo was uploaded. Store it and save some important details
-        // in App::$data for use in the cropping function
-
-
-        $hash = photo_new_resource();
-        $importing = false;
-        $smallest = 0;
-
-
-        if ($_REQUEST['importfile']) {
-            $hash = $_REQUEST['importfile'];
-            $importing = true;
-        } else {
-            $matches = [];
-            $partial = false;
-
-            if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
-                $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
-                if ($pm) {
-                    logger('Content-Range: ' . print_r($matches, true), LOGGER_DEBUG);
-                    $partial = true;
-                }
-            }
-
-            if ($partial) {
-                $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
-
-                if ($x['partial']) {
-                    header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-                    json_return_and_die($x);
-                } else {
-                    header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
-
-                    $_FILES['userfile'] = [
-                        'name' => $x['name'],
-                        'type' => $x['type'],
-                        'tmp_name' => $x['tmp_name'],
-                        'error' => $x['error'],
-                        'size' => $x['size']
-                    ];
-                }
-            } else {
-                if (!array_key_exists('userfile', $_FILES)) {
-                    $_FILES['userfile'] = [
-                        'name' => $_FILES['files']['name'],
-                        'type' => $_FILES['files']['type'],
-                        'tmp_name' => $_FILES['files']['tmp_name'],
-                        'error' => $_FILES['files']['error'],
-                        'size' => $_FILES['files']['size']
-                    ];
-                }
-            }
-
-            $res = attach_store(App::get_channel(), get_observer_hash(), '', [ 'album' => t('Profile Photos'), 'hash' => $hash, 'source' => 'photos' ]);
-
-            logger('attach_store: ' . print_r($res, true), LOGGER_DEBUG);
-
-            json_return_and_die(['message' => $hash]);
-        }
-
-        if (($res && intval($res['data']['is_photo'])) || $importing) {
-            $i = q(
-                "select * from photo where resource_id = '%s' and uid = %d order by imgscale",
-                dbesc($hash),
-                intval(local_channel())
-            );
-
-            if (!$i) {
-                notice(t('Image upload failed.') . EOL);
-                return;
-            }
-            $os_storage = false;
-
-            foreach ($i as $ii) {
-                if (intval($ii['imgscale']) < PHOTO_RES_640) {
-                    $smallest = intval($ii['imgscale']);
-                    $os_storage = intval($ii['os_storage']);
-                    $imagedata = $ii['content'];
-                    $filetype = $ii['mimetype'];
-                }
-            }
-        }
-
-        $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata));
-        $ph = photo_factory($imagedata, $filetype);
-
-        if (!$ph->is_valid()) {
-            notice(t('Unable to process image.') . EOL);
-            return;
-        }
-
-        return $this->profile_photo_crop_ui_head($ph, $hash, $smallest);
-
-        // This will "fall through" to the get() method, and since
-        // App::$data['imagecrop'] is set, it will proceed to cropping
-        // rather than present the upload form
-    }
-
-
-    /* @brief Generate content of profile-photo view
-     *
-     * @return void
-     *
-     */
-
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $channel = App::get_channel();
-        $pf = 0;
-        $newuser = false;
-
-        if (argc() == 2 && argv(1) === 'new') {
-            $newuser = true;
-        }
-
-        if (argv(1) === 'use') {
-            if (argc() < 3) {
-                notice(t('Permission denied.') . EOL);
-                return;
-            }
-
-            $resource_id = argv(2);
-
-            $pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0);
-
-            $c = q(
-                "select id, is_default from profile where uid = %d",
-                intval(local_channel())
-            );
-
-            $multi_profiles = true;
-
-            if (($c) && (count($c) === 1) && (intval($c[0]['is_default']))) {
-                $_REQUEST['profile'] = $c[0]['id'];
-                $multi_profiles = false;
-            } else {
-                $_REQUEST['profile'] = $pf;
-            }
-
-            $r = q(
-                "SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC",
-                intval(local_channel()),
-                dbesc($resource_id)
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-            $havescale = false;
-            foreach ($r as $rr) {
-                if ($rr['imgscale'] == PHOTO_RES_PROFILE_80) {
-                    $havescale = true;
-                }
-            }
-
-            // set an already loaded and cropped photo as profile photo
-
-            if ($havescale) {
-                // unset any existing profile photos
-                $r = q(
-                    "UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
-                    intval(PHOTO_NORMAL),
-                    intval(PHOTO_PROFILE),
-                    intval(local_channel())
-                );
-
-                $r = q(
-                    "UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'",
-                    intval(PHOTO_PROFILE),
-                    intval(local_channel()),
-                    dbesc($resource_id)
-                );
-
-                $r = q(
-                    "UPDATE xchan set xchan_photo_date = '%s' where xchan_hash = '%s'",
-                    dbesc(datetime_convert()),
-                    dbesc($channel['xchan_hash'])
-                );
-
-                photo_profile_setperms(local_channel(), $resource_id, $_REQUEST['profile']);
-
-                $sync = attach_export_data($channel, $resource_id);
-                if ($sync) {
-                    Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
-                }
-
-                Run::Summon(['Directory', local_channel()]);
-                goaway(z_root() . '/profiles');
-            }
-
-            $r = q(
-                "SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
-                intval($r[0]['id']),
-                intval(local_channel())
-            );
-            if (!$r) {
-                notice(t('Photo not available.') . EOL);
-                return;
-            }
-
-            if (intval($r[0]['os_storage'])) {
-                $data = @file_get_contents(dbunescbin($r[0]['content']));
-            } else {
-                $data = dbunescbin($r[0]['content']);
-            }
-
-            $ph = photo_factory($data, $r[0]['mimetype']);
-            $smallest = 0;
-            if ($ph->is_valid()) {
-                // go ahead as if we have just uploaded a new photo to crop
-                $i = q(
-                    "select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale",
-                    dbesc($r[0]['resource_id']),
-                    intval(local_channel())
-                );
-
-                if ($i) {
-                    $hash = $i[0]['resource_id'];
-                    foreach ($i as $ii) {
-                        if (intval($ii['imgscale']) < PHOTO_RES_640) {
-                            $smallest = intval($ii['imgscale']);
-                        }
-                    }
-                }
-            }
-
-            if ($multi_profiles) {
-                App::$data['importfile'] = $resource_id;
-            } else {
-                $this->profile_photo_crop_ui_head($ph, $hash, $smallest);
-            }
-
-            // falls through with App::$data['imagecrop'] set so we go straight to the cropping section
-        }
-
-        // present an upload form
-
-        $profiles = q(
-            "select id, profile_name as name, is_default from profile where uid = %d order by id asc",
-            intval(local_channel())
-        );
-
-        if ($profiles) {
-            for ($x = 0; $x < count($profiles); $x++) {
-                $profiles[$x]['selected'] = false;
-                if ($pf && $profiles[$x]['id'] == $pf) {
-                    $profiles[$x]['selected'] = true;
-                }
-                if ((!$pf) && $profiles[$x]['is_default']) {
-                    $profiles[$x]['selected'] = true;
-                }
-            }
-        }
-
-        $importing = ((array_key_exists('importfile', App::$data)) ? true : false);
-
-        if (!array_key_exists('imagecrop', App::$data)) {
-            $tpl = Theme::get_template('profile_photo.tpl');
-
-            $o .= replace_macros($tpl, [
-                '$user' => App::$channel['channel_address'],
-                '$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your profile photo is visible to anybody on the internet and may be distributed to other websites.')),
-                '$importfile' => (($importing) ? App::$data['importfile'] : ''),
-                '$lbl_upfile' => t('Upload File:'),
-                '$lbl_profiles' => t('Select a profile:'),
-                '$title' => (($importing) ? t('Use Photo for Profile') : t('Change Profile Photo')),
-                '$submit' => (($importing) ? t('Use') : t('Upload')),
-                '$profiles' => $profiles,
-                '$single' => ((count($profiles) == 1) ? true : false),
-                '$profile0' => $profiles[0],
-                '$embedPhotos' => t('Use a photo from your albums'),
-                '$embedPhotosModalTitle' => t('Use a photo from your albums'),
-                '$embedPhotosModalCancel' => t('Cancel'),
-                '$embedPhotosModalOK' => t('OK'),
-                '$modalchooseimages' => t('Choose images to embed'),
-                '$modalchoosealbum' => t('Choose an album'),
-                '$modaldiffalbum' => t('Choose a different album'),
-                '$modalerrorlist' => t('Error getting album list'),
-                '$modalerrorlink' => t('Error getting photo link'),
-                '$modalerroralbum' => t('Error getting album'),
-                '$form_security_token' => get_form_security_token("profile_photo"),
-                '$select' => t('Select previously uploaded photo'),
-            ]);
-
-            Hook::call('profile_photo_content_end', $o);
-            return $o;
-        } else {
-            // present a cropping form
-
-            $filename = App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'];
-            $resolution = App::$data['imagecrop_resolution'];
-            $o .= replace_macros(Theme::get_template('cropbody.tpl'), [
-                '$filename' => $filename,
-                '$profile' => intval($_REQUEST['profile']),
-                '$resource' => App::$data['imagecrop'] . '-' . App::$data['imagecrop_resolution'],
-                '$image_url' => z_root() . '/photo/' . $filename,
-                '$title' => t('Crop Image'),
-                '$desc' => t('Please adjust the image cropping for optimum viewing.'),
-                '$form_security_token' => get_form_security_token("profile_photo"),
-                '$done' => t('Done Editing')
-            ]);
-            return $o;
-        }
-    }
-
-    /* @brief Generate the UI for photo-cropping
-     *
-     * @param $ph Photo-Factory
-     * @return void
-     *
-     */
-
-    public function profile_photo_crop_ui_head($ph, $hash, $smallest)
-    {
-        $max_length = get_config('system', 'max_image_length', MAX_IMAGE_LENGTH);
-        if ($max_length > 0) {
-            $ph->scaleImage($max_length);
-        }
-
-        App::$data['width'] = $ph->getWidth();
-        App::$data['height'] = $ph->getHeight();
-
-        if (App::$data['width'] < 500 || App::$data['height'] < 500) {
-            $ph->scaleImageUp(400);
-            App::$data['width'] = $ph->getWidth();
-            App::$data['height'] = $ph->getHeight();
-        }
-
-        App::$data['imagecrop'] = $hash;
-        App::$data['imagecrop_resolution'] = $smallest;
-        App::$page['htmlhead'] .= replace_macros(Theme::get_template('crophead.tpl'), []);
-        return;
-    }
-}
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
deleted file mode 100644
index e91583183..000000000
--- a/Zotlabs/Module/Profiles.php
+++ /dev/null
@@ -1,1128 +0,0 @@
- 2) && (argv(1) === "drop") && intval(argv(2))) {
-            $r = q(
-                "SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-            if (!$r) {
-                notice(t('Profile not found.') . EOL);
-                goaway(z_root() . '/profiles');
-            }
-            $profile_guid = $r[0]['profile_guid'];
-
-            check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
-
-            // move every contact using this profile as their default to the user default
-
-            $r = q(
-                "UPDATE abook SET abook_profile = (SELECT profile_guid FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
-                intval(local_channel()),
-                dbesc($profile_guid),
-                intval(local_channel())
-            );
-            $r = q(
-                "DELETE FROM profile WHERE id = %d AND uid = %d",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-            if ($r) {
-                info(t('Profile deleted.') . EOL);
-            }
-
-            // @fixme this is a much more complicated sync - add any changed abook entries and
-            // also add deleted flag to profile structure
-            // profiles_build_sync is just here as a placeholder - it doesn't work at all here
-
-            // Channel::profiles_build_sync(local_channel());
-
-            goaway(z_root() . '/profiles');
-            return; // NOTREACHED
-        }
-
-
-        if ((argc() > 1) && (argv(1) === 'new')) {
-            //      check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
-
-            $r0 = q(
-                "SELECT id FROM profile WHERE uid = %d",
-                intval(local_channel())
-            );
-            $num_profiles = count($r0);
-
-            $name = t('Profile-') . ($num_profiles + 1);
-
-            $r1 = q(
-                "SELECT fullname, photo, thumb FROM profile WHERE uid = %d AND is_default = 1 LIMIT 1",
-                intval(local_channel())
-            );
-
-            $r2 = Channel::profile_store_lowlevel(
-                [
-                    'aid' => intval(get_account_id()),
-                    'uid' => intval(local_channel()),
-                    'profile_guid' => new_uuid(),
-                    'profile_name' => $name,
-                    'fullname' => $r1[0]['fullname'],
-                    'photo' => $r1[0]['photo'],
-                    'thumb' => $r1[0]['thumb']
-                ]
-            );
-
-            $r3 = q(
-                "SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1",
-                intval(local_channel()),
-                dbesc($name)
-            );
-
-            info(t('New profile created.') . EOL);
-            if (count($r3) == 1) {
-                goaway(z_root() . '/profiles/' . $r3[0]['id']);
-            }
-
-            goaway(z_root() . '/profiles');
-        }
-
-        if ((argc() > 2) && (argv(1) === 'clone')) {
-            check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
-
-            $r0 = q(
-                "SELECT id FROM profile WHERE uid = %d",
-                intval(local_channel())
-            );
-            $num_profiles = count($r0);
-
-            $name = t('Profile-') . ($num_profiles + 1);
-            $r1 = q(
-                "SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1",
-                intval(local_channel()),
-                intval(argv(2))
-            );
-            if (!count($r1)) {
-                notice(t('Profile unavailable to clone.') . EOL);
-                App::$error = 404;
-                return;
-            }
-            unset($r1[0]['id']);
-            $r1[0]['is_default'] = 0;
-            $r1[0]['publish'] = 0;
-            $r1[0]['profile_name'] = $name;
-            $r1[0]['profile_guid'] = new_uuid();
-
-            create_table_from_array('profile', $r1[0]);
-
-            $r3 = q(
-                "SELECT id FROM profile WHERE uid = %d AND profile_name = '%s' LIMIT 1",
-                intval(local_channel()),
-                dbesc($name)
-            );
-            info(t('New profile created.') . EOL);
-
-            Channel::profiles_build_sync(local_channel());
-
-            if (($r3) && (count($r3) == 1)) {
-                goaway(z_root() . '/profiles/' . $r3[0]['id']);
-            }
-
-            goaway(z_root() . '/profiles');
-
-            return; // NOTREACHED
-        }
-
-        if ((argc() > 2) && (argv(1) === 'export')) {
-            $r1 = q(
-                "SELECT * FROM profile WHERE uid = %d AND id = %d LIMIT 1",
-                intval(local_channel()),
-                intval(argv(2))
-            );
-            if (!$r1) {
-                notice(t('Profile unavailable to export.') . EOL);
-                App::$error = 404;
-                return;
-            }
-            header('content-type: application/octet_stream');
-            header('Content-Disposition: attachment; filename="' . $r1[0]['profile_name'] . '.json"');
-
-            unset($r1[0]['id']);
-            unset($r1[0]['aid']);
-            unset($r1[0]['uid']);
-            unset($r1[0]['is_default']);
-            unset($r1[0]['publish']);
-            unset($r1[0]['profile_name']);
-            unset($r1[0]['profile_guid']);
-            echo json_encode($r1[0]);
-            killme();
-        }
-
-        if (((argc() > 1) && (intval(argv(1)))) || !Features::enabled(local_channel(), 'multi_profiles')) {
-            if (Features::enabled(local_channel(), 'multi_profiles')) {
-                $id = argv(1);
-            } else {
-                $x = q(
-                    "select id from profile where uid = %d and is_default = 1",
-                    intval(local_channel())
-                );
-                if ($x) {
-                    $id = $x[0]['id'];
-                }
-            }
-            $r = q(
-                "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1",
-                intval($id),
-                intval(local_channel())
-            );
-            if (!count($r)) {
-                notice(t('Profile not found.') . EOL);
-                App::$error = 404;
-                return;
-            }
-
-            $chan = App::get_channel();
-
-            Libprofile::load($chan['channel_address'], $r[0]['profile_guid']);
-        }
-    }
-
-    public function post()
-    {
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $namechanged = false;
-
-        // import from json export file.
-        // Only import fields that are allowed on this hub
-
-        if (x($_FILES, 'userfile')) {
-            $src = $_FILES['userfile']['tmp_name'];
-            $filesize = intval($_FILES['userfile']['size']);
-            if ($filesize) {
-                $j = @json_decode(@file_get_contents($src), true);
-                @unlink($src);
-                if ($j) {
-                    $fields = Channel::get_profile_fields_advanced();
-                    if ($fields) {
-                        foreach ($j as $jj => $v) {
-                            foreach ($fields as $f => $n) {
-                                if ($jj == $f) {
-                                    $_POST[$f] = $v;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Hook::call('profile_post', $_POST);
-
-
-        if ((argc() > 1) && (argv(1) !== "new") && intval(argv(1))) {
-            $orig = q(
-                "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1",
-                intval(argv(1)),
-                intval(local_channel())
-            );
-            if (!count($orig)) {
-                notice(t('Profile not found.') . EOL);
-                return;
-            }
-
-            check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
-
-
-            $is_default = (($orig[0]['is_default']) ? 1 : 0);
-
-            $profile_name = notags(trim($_POST['profile_name']));
-            if (!strlen($profile_name)) {
-                notice(t('Profile Name is required.') . EOL);
-                return;
-            }
-
-            $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00';
-
-            $y = substr($dob, 0, 4);
-            if ((!ctype_digit($y)) || ($y < 1900)) {
-                $ignore_year = true;
-            } else {
-                $ignore_year = false;
-            }
-
-            if ($dob !== '0000-00-00') {
-                if (strpos($dob, '0000-') === 0) {
-                    $ignore_year = true;
-                    $dob = substr($dob, 5);
-                }
-                $dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d'));
-                if ($ignore_year) {
-                    $dob = '0000-' . $dob;
-                }
-            }
-
-            $name = escape_tags(trim($_POST['name']));
-
-            if ($orig[0]['fullname'] != $name) {
-                $namechanged = true;
-
-                $v = Channel::validate_channelname($name);
-                if ($v) {
-                    notice($v);
-                    $namechanged = false;
-                    $name = $orig[0]['fullname'];
-                }
-            }
-
-            $pdesc = escape_tags(trim($_POST['pdesc']));
-            $gender = escape_tags(trim($_POST['gender']));
-            $address = escape_tags(trim($_POST['address']));
-            $locality = escape_tags(trim($_POST['locality']));
-            $region = escape_tags(trim($_POST['region']));
-            $postal_code = escape_tags(trim($_POST['postal_code']));
-            $country_name = escape_tags(trim($_POST['country_name']));
-            $keywords = escape_tags(trim($_POST['keywords']));
-            $marital = escape_tags(trim($_POST['marital']));
-            $howlong = escape_tags(trim($_POST['howlong']));
-            $sexual = escape_tags(trim($_POST['sexual']));
-            $pronouns = escape_tags(trim($_POST['pronouns']));
-            $homepage = escape_tags(trim($_POST['homepage']));
-            $hometown = escape_tags(trim($_POST['hometown']));
-            $politic = escape_tags(trim($_POST['politic']));
-            $religion = escape_tags(trim($_POST['religion']));
-
-            $likes = escape_tags(trim($_POST['likes']));
-            $dislikes = escape_tags(trim($_POST['dislikes']));
-
-            $about = escape_tags(trim($_POST['about']));
-            $interest = escape_tags(trim($_POST['interest']));
-            $contact = escape_tags(trim($_POST['contact']));
-            $channels = escape_tags(trim($_POST['channels']));
-            $music = escape_tags(trim($_POST['music']));
-            $book = escape_tags(trim($_POST['book']));
-            $tv = escape_tags(trim($_POST['tv']));
-            $film = escape_tags(trim($_POST['film']));
-            $romance = escape_tags(trim($_POST['romance']));
-            $work = escape_tags(trim($_POST['work']));
-            $education = escape_tags(trim($_POST['education']));
-
-            $hide_friends = ((intval($_POST['hide_friends'])) ? 1 : 0);
-
-            // start fresh and create a new vcard.
-            // @TODO: preserve the original guid or whatever else needs saving
-            // $orig_vcard = (($orig[0]['profile_vcard']) ? Reader::read($orig[0]['profile_vcard']) : null);
-
-            $orig_vcard = null;
-
-            $channel = App::get_channel();
-
-            $default_vcard_cat = ((defined('DEFAULT_VCARD_CAT')) ? DEFAULT_VCARD_CAT : 'HOME');
-
-            $defcard = [
-                'fn' => $name,
-                'title' => $pdesc,
-                'photo' => $channel['xchan_photo_l'],
-                'adr' => [],
-                'adr_type' => [$default_vcard_cat],
-                'url' => [$homepage],
-                'url_type' => [$default_vcard_cat]
-            ];
-
-            $defcard['adr'][] = [
-                0 => '',
-                1 => '',
-                2 => $address,
-                3 => $locality,
-                4 => $region,
-                5 => $postal_code,
-                6 => $country_name
-            ];
-
-            $profile_vcard = update_vcard($defcard, $orig_vcard);
-
-            $orig_vcard = Reader::read($profile_vcard);
-
-            $profile_vcard = update_vcard($_REQUEST, $orig_vcard);
-
-
-            require_once('include/text.php');
-            linkify_tags($likes, local_channel());
-            linkify_tags($dislikes, local_channel());
-            linkify_tags($about, local_channel());
-            linkify_tags($interest, local_channel());
-            linkify_tags($interest, local_channel());
-            linkify_tags($contact, local_channel());
-            linkify_tags($channels, local_channel());
-            linkify_tags($music, local_channel());
-            linkify_tags($book, local_channel());
-            linkify_tags($tv, local_channel());
-            linkify_tags($film, local_channel());
-            linkify_tags($romance, local_channel());
-            linkify_tags($work, local_channel());
-            linkify_tags($education, local_channel());
-
-
-            $with = ((x($_POST, 'with')) ? escape_tags(trim($_POST['with'])) : '');
-
-            if (!strlen($howlong)) {
-                $howlong = NULL_DATE;
-            } else {
-                $howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong);
-            }
-
-            // linkify the relationship target if applicable
-
-            $withchanged = false;
-
-            if (strlen($with)) {
-                if ($with != strip_tags($orig[0]['partner'])) {
-                    $withchanged = true;
-                    $prf = '';
-                    $lookup = $with;
-                    if (strpos($lookup, '@') === 0) {
-                        $lookup = substr($lookup, 1);
-                    }
-                    $lookup = str_replace('_', ' ', $lookup);
-                    $newname = $lookup;
-
-                    $r = q(
-                        "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
-                        dbesc($newname),
-                        intval(local_channel())
-                    );
-                    if (!$r) {
-                        $r = q(
-                            "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_addr = '%s' AND abook_channel = %d LIMIT 1",
-                            dbesc($lookup . '@%'),
-                            intval(local_channel())
-                        );
-                    }
-                    if ($r) {
-                        $prf = $r[0]['xchan_url'];
-                        $newname = $r[0]['xchan_name'];
-                    }
-
-
-                    if ($prf) {
-                        $with = str_replace($lookup, '' . $newname . '', $with);
-                        if (strpos($with, '@') === 0) {
-                            $with = substr($with, 1);
-                        }
-                    }
-                } else {
-                    $with = $orig[0]['partner'];
-                }
-            }
-
-            $profile_fields_basic = Channel::get_profile_fields_basic();
-            $profile_fields_advanced = Channel::get_profile_fields_advanced();
-            $advanced = ((Features::enabled(local_channel(), 'advanced_profiles')) ? true : false);
-            if ($advanced) {
-                $fields = $profile_fields_advanced;
-            } else {
-                $fields = $profile_fields_basic;
-            }
-
-            $z = q("select * from profdef where true");
-            if ($z) {
-                foreach ($z as $zz) {
-                    if (array_key_exists($zz['field_name'], $fields)) {
-                        $w = q(
-                            "select * from profext where channel_id = %d and hash = '%s' and k = '%s' limit 1",
-                            intval(local_channel()),
-                            dbesc($orig[0]['profile_guid']),
-                            dbesc($zz['field_name'])
-                        );
-                        if ($w) {
-                            q(
-                                "update profext set v = '%s' where id = %d",
-                                dbesc(escape_tags(trim($_POST[$zz['field_name']]))),
-                                intval($w[0]['id'])
-                            );
-                        } else {
-                            q(
-                                "insert into profext ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ",
-                                intval(local_channel()),
-                                dbesc($orig[0]['profile_guid']),
-                                dbesc($zz['field_name']),
-                                dbesc(escape_tags(trim($_POST[$zz['field_name']])))
-                            );
-                        }
-                    }
-                }
-            }
-
-            $changes = [];
-            $value = '';
-            if ($is_default) {
-                if ($marital != $orig[0]['marital']) {
-                    $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status');
-                    $value = $marital;
-                }
-                if ($withchanged) {
-                    $changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
-                    $value = strip_tags($with);
-                }
-                if ($likes != $orig[0]['likes']) {
-                    $changes[] = t('Likes');
-                    $value = $likes;
-                }
-                if ($dislikes != $orig[0]['dislikes']) {
-                    $changes[] = t('Dislikes');
-                    $value = $dislikes;
-                }
-                if ($work != $orig[0]['employment']) {
-                    $changes[] = t('Work/Employment');
-                }
-                if ($religion != $orig[0]['religion']) {
-                    $changes[] = t('Religion');
-                    $value = $religion;
-                }
-                if ($politic != $orig[0]['politic']) {
-                    $changes[] = t('Political Views');
-                    $value = $politic;
-                }
-                if ($gender != $orig[0]['gender']) {
-                    $changes[] = t('Gender');
-                    $value = $gender;
-                }
-                if ($sexual != $orig[0]['sexual']) {
-                    $changes[] = t('Sexual Preference');
-                    $value = $sexual;
-                }
-                if ($homepage != $orig[0]['homepage']) {
-                    $changes[] = t('Homepage');
-                    $value = $homepage;
-                }
-                if ($interest != $orig[0]['interest']) {
-                    $changes[] = t('Interests');
-                    $value = $interest;
-                }
-                if ($address != $orig[0]['address']) {
-                    $changes[] = t('Address');
-                    // New address not sent in notifications, potential privacy issues
-                    // in case this leaks to unintended recipients. Yes, it's in the public
-                    // profile but that doesn't mean we have to broadcast it to everybody.
-                }
-                if (
-                    $locality != $orig[0]['locality'] || $region != $orig[0]['region']
-                    || $country_name != $orig[0]['country_name']
-                ) {
-                    $changes[] = t('Location');
-                    $comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
-                    $comma2 = (($region && $country_name) ? ', ' : '');
-                    $value = $locality . $comma1 . $region . $comma2 . $country_name;
-                }
-
-                self::profile_activity($changes, $value);
-            }
-
-            $r = q(
-                "UPDATE profile 
-				SET profile_name = '%s',
-				fullname = '%s',
-				pdesc = '%s',
-				gender = '%s',
-				dob = '%s',
-				address = '%s',
-				locality = '%s',
-				region = '%s',
-				postal_code = '%s',
-				country_name = '%s',
-				marital = '%s',
-				partner = '%s',
-				howlong = '%s',
-				sexual = '%s',
-				pronouns = '%s',
-				homepage = '%s',
-				hometown = '%s',
-				politic = '%s',
-				religion = '%s',
-				keywords = '%s',
-				likes = '%s',
-				dislikes = '%s',
-				about = '%s',
-				interest = '%s',
-				contact = '%s',
-				channels = '%s',
-				music = '%s',
-				book = '%s',
-				tv = '%s',
-				film = '%s',
-				romance = '%s',
-				employment = '%s',
-				education = '%s',
-				hide_friends = %d,
-				profile_vcard = '%s'
-				WHERE id = %d AND uid = %d",
-                dbesc($profile_name),
-                dbesc($name),
-                dbesc($pdesc),
-                dbesc($gender),
-                dbesc($dob),
-                dbesc($address),
-                dbesc($locality),
-                dbesc($region),
-                dbesc($postal_code),
-                dbesc($country_name),
-                dbesc($marital),
-                dbesc($with),
-                dbesc($howlong),
-                dbesc($sexual),
-                dbesc($pronouns),
-                dbesc($homepage),
-                dbesc($hometown),
-                dbesc($politic),
-                dbesc($religion),
-                dbesc($keywords),
-                dbesc($likes),
-                dbesc($dislikes),
-                dbesc($about),
-                dbesc($interest),
-                dbesc($contact),
-                dbesc($channels),
-                dbesc($music),
-                dbesc($book),
-                dbesc($tv),
-                dbesc($film),
-                dbesc($romance),
-                dbesc($work),
-                dbesc($education),
-                intval($hide_friends),
-                dbesc($profile_vcard),
-                intval(argv(1)),
-                intval(local_channel())
-            );
-
-            if ($r) {
-                info(t('Profile updated.') . EOL);
-            }
-
-            $sync = q(
-                "select * from profile where id = %d and uid = %d limit 1",
-                intval(argv(1)),
-                intval(local_channel())
-            );
-            if ($sync) {
-                Libsync::build_sync_packet(local_channel(), array('profile' => $sync));
-            }
-
-            if (Channel::is_system(local_channel())) {
-                set_config('system', 'siteinfo', $about);
-            }
-
-            $channel = App::get_channel();
-
-            if ($namechanged && $is_default) {
-                $r = q(
-                    "UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_hash = '%s'",
-                    dbesc($name),
-                    dbesc(datetime_convert()),
-                    dbesc($channel['xchan_hash'])
-                );
-                $r = q(
-                    "UPDATE channel SET channel_name = '%s' WHERE channel_hash = '%s'",
-                    dbesc($name),
-                    dbesc($channel['xchan_hash'])
-                );
-                if (Channel::is_system(local_channel())) {
-                    set_config('system', 'sitename', $name);
-                }
-            }
-
-            if ($is_default) {
-                Run::Summon(['Directory', local_channel()]);
-                goaway(z_root() . '/profiles/' . $sync[0]['id']);
-            }
-        }
-    }
-
-
-    public function get()
-    {
-
-        $o = '';
-
-        $channel = App::get_channel();
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $profile_fields_basic = Channel::get_profile_fields_basic();
-        $profile_fields_advanced = Channel::get_profile_fields_advanced();
-
-        if (((argc() > 1) && (intval(argv(1)))) || !Features::enabled(local_channel(), 'multi_profiles')) {
-            if (Features::enabled(local_channel(), 'multi_profiles')) {
-                $id = argv(1);
-            } else {
-                $x = q(
-                    "select id from profile where uid = %d and is_default = 1",
-                    intval(local_channel())
-                );
-                if ($x) {
-                    $id = $x[0]['id'];
-                }
-            }
-            $r = q(
-                "SELECT * FROM profile WHERE id = %d AND uid = %d LIMIT 1",
-                intval($id),
-                intval(local_channel())
-            );
-            if (!$r) {
-                notice(t('Profile not found.') . EOL);
-                return;
-            }
-
-            $editselect = 'none';
-
-            App::$page['htmlhead'] .= replace_macros(Theme::get_template('profed_head.tpl'), array(
-                '$baseurl' => z_root(),
-                '$editselect' => $editselect,
-            ));
-
-            $advanced = ((Features::enabled(local_channel(), 'advanced_profiles')) ? true : false);
-            if ($advanced) {
-                $fields = $profile_fields_advanced;
-            } else {
-                $fields = $profile_fields_basic;
-            }
-
-            $hide_friends = array(
-                'hide_friends',
-                t('Hide your connections list from viewers of this profile'),
-                $r[0]['hide_friends'],
-                '',
-                array(t('No'), t('Yes'))
-            );
-
-            $q = q("select * from profdef where true");
-            if ($q) {
-                $extra_fields = [];
-
-                foreach ($q as $qq) {
-                    $mine = q(
-                        "select v from profext where k = '%s' and hash = '%s' and channel_id = %d limit 1",
-                        dbesc($qq['field_name']),
-                        dbesc($r[0]['profile_guid']),
-                        intval(local_channel())
-                    );
-
-                    if (array_key_exists($qq['field_name'], $fields)) {
-                        $extra_fields[] = array($qq['field_name'], $qq['field_desc'], (($mine) ? $mine[0]['v'] : ''), $qq['field_help']);
-                    }
-                }
-            }
-
-            //logger('extra_fields: ' . print_r($extra_fields,true));
-
-            $vc = $r[0]['profile_vcard'];
-            $vctmp = (($vc) ? Reader::read($vc) : null);
-            $vcard = (($vctmp) ? get_vcard_array($vctmp, $r[0]['id']) : []);
-
-            $f = get_config('system', 'birthday_input_format');
-            if (!$f) {
-                $f = 'ymd';
-            }
-
-            $is_default = (($r[0]['is_default']) ? 1 : 0);
-
-            $tpl = Theme::get_template("profile_edit.tpl");
-            $o .= replace_macros($tpl, array(
-                '$multi_profiles' => ((Features::enabled(local_channel(), 'multi_profiles')) ? true : false),
-                '$form_security_token' => get_form_security_token("profile_edit"),
-                '$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"),
-                '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
-                '$fields' => $fields,
-                '$vcard' => $vcard,
-                '$guid' => $r[0]['profile_guid'],
-                '$banner' => t('Edit Profile Details'),
-                '$submit' => t('Submit'),
-                '$viewprof' => t('View this profile'),
-                '$editvis' => t('Edit visibility'),
-                '$tools_label' => t('Profile Tools'),
-                '$coverpic' => t('Change cover photo'),
-                '$profpic' => t('Change profile photo'),
-                '$cr_prof' => t('Create a new profile using these settings'),
-                '$cl_prof' => t('Clone this profile'),
-                '$del_prof' => t('Delete this profile'),
-                '$addthing' => t('Add profile things'),
-                '$personal' => t('Personal'),
-                '$location' => t('Location'),
-                '$relation' => t('Relationship'),
-                '$miscellaneous' => t('Miscellaneous'),
-                '$exportable' => Features::enabled(local_channel(), 'profile_export'),
-                '$lbl_import' => t('Import profile from file'),
-                '$lbl_export' => t('Export profile to file'),
-                '$lbl_gender' => t('Your gender'),
-                '$lbl_marital' => t('Marital status'),
-                '$lbl_sexual' => t('Sexual preference'),
-                '$lbl_pronouns' => t('Pronouns'),
-                '$baseurl' => z_root(),
-                '$profile_id' => $r[0]['id'],
-                '$profile_name' => array('profile_name', t('Profile name'), $r[0]['profile_name'], t('Required'), '*'),
-                '$is_default' => $is_default,
-                '$default' => '', // t('This is your default profile.') . EOL . translate_scope(map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_profile'))),
-                '$advanced' => $advanced,
-                '$name' => array('name', t('Your full name'), $r[0]['fullname'], t('Required'), '*'),
-                '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']),
-                '$dob' => dob($r[0]['dob']),
-                '$hide_friends' => $hide_friends,
-                '$address' => array('address', t('Street address'), $r[0]['address']),
-                '$locality' => array('locality', t('Locality/City'), $r[0]['locality']),
-                '$region' => array('region', t('Region/State'), $r[0]['region']),
-                '$postal_code' => array('postal_code', t('Postal/Zip code'), $r[0]['postal_code']),
-                '$country_name' => array('country_name', t('Country'), $r[0]['country_name']),
-                '$gender' => self::gender_selector($r[0]['gender']),
-                '$gender_min' => self::gender_selector_min($r[0]['gender']),
-                '$gender_text' => self::gender_text($r[0]['gender']),
-                '$marital' => self::marital_selector($r[0]['marital']),
-                '$marital_min' => self::marital_selector_min($r[0]['marital']),
-                '$with' => array('with', t("Who (if applicable)"), $r[0]['partner'], t('Examples: cathy123, Cathy Williams, cathy@example.com')),
-                '$howlong' => array('howlong', t('Since (date)'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC', date_default_timezone_get(), $r[0]['howlong']))),
-                '$sexual' => self::sexpref_selector($r[0]['sexual']),
-                '$sexual_min' => self::sexpref_selector_min($r[0]['sexual']),
-                '$pronouns' => self::pronouns_selector($r[0]['pronouns']),
-                '$pronouns_min' => self::pronouns_selector($r[0]['pronouns']),
-                '$about' => array('about', t('Tell us about yourself'), $r[0]['about']),
-                '$homepage' => array('homepage', t('Homepage URL'), $r[0]['homepage']),
-                '$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']),
-                '$politic' => array('politic', t('Political views'), $r[0]['politic']),
-                '$religion' => array('religion', t('Religious views'), $r[0]['religion']),
-                '$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')),
-                '$likes' => array('likes', t('Likes'), $r[0]['likes']),
-                '$dislikes' => array('dislikes', t('Dislikes'), $r[0]['dislikes']),
-                '$music' => array('music', t('Musical interests'), $r[0]['music']),
-                '$book' => array('book', t('Books, literature'), $r[0]['book']),
-                '$tv' => array('tv', t('Television'), $r[0]['tv']),
-                '$film' => array('film', t('Film/Dance/Culture/Entertainment'), $r[0]['film']),
-                '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
-                '$romance' => array('romance', t('Love/Romance'), $r[0]['romance']),
-                '$employ' => array('work', t('Work/Employment'), $r[0]['employment']),
-                '$education' => array('education', t('School/Education'), $r[0]['education']),
-                '$contact' => array('contact', t('Contact information and social networks'), $r[0]['contact']),
-                '$channels' => array('channels', t('My other channels'), $r[0]['channels']),
-                '$extra_fields' => $extra_fields,
-                '$comms' => t('Communications'),
-                '$tel_label' => t('Phone'),
-                '$email_label' => t('Email'),
-                '$impp_label' => t('Instant messenger'),
-                '$url_label' => t('Website'),
-                '$adr_label' => t('Address'),
-                '$note_label' => t('Note'),
-                '$mobile' => t('Mobile'),
-                '$home' => t('Home'),
-                '$work' => t('Work'),
-                '$other' => t('Other'),
-                '$add_card' => t('Add Contact'),
-                '$add_field' => t('Add Field'),
-                '$create' => t('Create'),
-                '$update' => t('Update'),
-                '$delete' => t('Delete'),
-                '$cancel' => t('Cancel'),
-            ));
-
-            $arr = array('profile' => $r[0], 'entry' => $o);
-            Hook::call('profile_edit', $arr);
-
-            return $o;
-        } else {
-            $r = q(
-                "SELECT * FROM profile WHERE uid = %d",
-                local_channel()
-            );
-            if ($r) {
-                $tpl = Theme::get_template('profile_entry.tpl');
-                foreach ($r as $rr) {
-                    $profiles .= replace_macros($tpl, array(
-                        '$photo' => $rr['thumb'],
-                        '$id' => $rr['id'],
-                        '$alt' => t('Profile Image'),
-                        '$profile_name' => $rr['profile_name'],
-                        '$visible' => (($rr['is_default'])
-                            ? '' . translate_scope(map_scope(PermissionLimits::Get($channel['channel_id'], 'view_profile'))) . ''
-                            : '' . t('Edit visibility') . '')
-                    ));
-                }
-
-                $tpl_header = Theme::get_template('profile_listing_header.tpl');
-                $o .= replace_macros($tpl_header, array(
-                    '$header' => t('Edit Profiles'),
-                    '$cr_new' => t('Create New'),
-                    '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
-                    '$profiles' => $profiles
-                ));
-            }
-            return $o;
-        }
-    }
-
-    public static function profile_activity($changed, $value)
-    {
-
-        if (!local_channel() || !is_array($changed) || !count($changed)) {
-            return;
-        }
-
-        if (!get_pconfig(local_channel(), 'system', 'post_profilechange')) {
-            return;
-        }
-
-        $self = App::get_channel();
-
-        if (!$self) {
-            return;
-        }
-
-        $arr = [];
-        $uuid = new_uuid();
-        $mid = z_root() . '/item/' . $uuid;
-
-        $arr['uuid'] = $uuid;
-        $arr['mid'] = $arr['parent_mid'] = $mid;
-        $arr['uid'] = local_channel();
-        $arr['aid'] = $self['channel_account_id'];
-        $arr['owner_xchan'] = $arr['author_xchan'] = $self['xchan_hash'];
-
-        $arr['item_wall'] = 1;
-        $arr['item_origin'] = 1;
-        $arr['item_thread_top'] = 1;
-        $arr['verb'] = ACTIVITY_UPDATE;
-        $arr['obj_type'] = ACTIVITY_OBJ_PROFILE;
-
-        $arr['plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']);
-
-        $A = '[url=' . z_root() . '/channel/' . $self['channel_address'] . ']' . $self['channel_name'] . '[/url]';
-
-
-        $changes = '';
-        $t = count($changed);
-        $z = 0;
-        foreach ($changed as $ch) {
-            if (strlen($changes)) {
-                if ($z == ($t - 1)) {
-                    $changes .= t(' and ');
-                } else {
-                    $changes .= t(', ');
-                }
-            }
-            $z++;
-            $changes .= $ch;
-        }
-
-        $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]';
-
-        if ($t == 1 && strlen($value)) {
-            // if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to.
-            $value = preg_replace_callback("/([^\]\='" . '"' . "]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ismu", 'red_zrl_callback', $value);
-            // take out the bookmark indicator
-            if (substr($value, 0, 2) === '#^') {
-                $value = str_replace('#^', '', $value);
-            }
-
-            $message = sprintf(t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
-            $message .= "\n\n" . sprintf(t('Visit %1$s\'s %2$s'), $A, $prof);
-        } else {
-            $message = sprintf(t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
-        }
-
-        $arr['body'] = $message;
-
-        $arr['obj'] = [
-            'type' => ACTIVITY_OBJ_PROFILE,
-            'summary' => bbcode($message),
-            'source' => ['mediaType' => 'text/x-multicode', 'summary' => $message],
-            'id' => $self['xchan_url'],
-            'url' => z_root() . '/profile/' . $self['channel_address']
-        ];
-
-
-        $arr['allow_cid'] = $self['channel_allow_cid'];
-        $arr['allow_gid'] = $self['channel_allow_gid'];
-        $arr['deny_cid'] = $self['channel_deny_cid'];
-        $arr['deny_gid'] = $self['channel_deny_gid'];
-
-        $res = item_store($arr);
-        $i = $res['item_id'];
-
-        if ($i) {
-            // FIXME - limit delivery in notifier.php to those specificed in the perms argument
-            Run::Summon(['Notifier', 'activity', $i, 'PERMS_R_PROFILE']);
-        }
-    }
-
-    public static function gender_selector($current = "", $suffix = "")
-    {
-        $o = '';
-        $select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided'));
-
-        Hook::call('gender_selector', $select);
-
-        $o .= "';
-        return $o;
-    }
-
-    public static function gender_selector_min($current = "", $suffix = "")
-    {
-        $o = '';
-        $select = array('', t('Male'), t('Female'), t('Other'));
-
-        Hook::call('gender_selector_min', $select);
-
-        $o .= "';
-        return $o;
-    }
-
-    public static function pronouns_selector($current = "", $suffix = "")
-    {
-        $o = '';
-        $select = array('', t('He/Him'), t('She/Her'), t('They/Them'));
-
-        Hook::call('pronouns_selector', $select);
-
-        $o .= "';
-        return $o;
-    }
-
-
-    public static function gender_text($current = "", $suffix = "")
-    {
-        $o = '';
-
-        if (!get_config('system', 'profile_gender_textfield')) {
-            return $o;
-        }
-
-        $o .= "";
-        return $o;
-    }
-
-
-    public static function sexpref_selector($current = "", $suffix = "")
-    {
-        $o = '';
-        $select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
-
-
-        Hook::call('sexpref_selector', $select);
-
-        $o .= "';
-        return $o;
-    }
-
-
-    public static function sexpref_selector_min($current = "", $suffix = "")
-    {
-        $o = '';
-        $select = array('', t('Males'), t('Females'), t('Other'));
-
-        Hook::call('sexpref_selector_min', $select);
-
-        $o .= "';
-        return $o;
-    }
-
-
-    public static function marital_selector($current = "", $suffix = "")
-    {
-        $o = '';
-        $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me'));
-
-        Hook::call('marital_selector', $select);
-
-        $o .= "';
-        return $o;
-    }
-
-    public static function marital_selector_min($current = "", $suffix = "")
-    {
-        $o = '';
-        $select = array('', t('Single'), t('Dating'), t('Cohabiting'), t('Married'), t('Separated'), t('Divorced'), t('Widowed'), t('It\'s complicated'), t('Other'));
-
-        Hook::call('marital_selector_min', $select);
-
-        $o .= "';
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php
deleted file mode 100644
index d4f1dc8d1..000000000
--- a/Zotlabs/Module/Profperm.php
+++ /dev/null
@@ -1,183 +0,0 @@
- 2) && intval(argv(1)) && intval(argv(2))) {
-            $r = q(
-                "SELECT abook_id FROM abook WHERE abook_id = %d and abook_channel = %d limit 1",
-                intval(argv(2)),
-                intval(local_channel())
-            );
-            if ($r) {
-                $change = intval(argv(2));
-            }
-        }
-
-
-        if ((argc() > 1) && (intval(argv(1)))) {
-            $r = q(
-                "SELECT * FROM profile WHERE id = %d AND uid = %d AND is_default = 0 LIMIT 1",
-                intval(argv(1)),
-                intval(local_channel())
-            );
-            if (!$r) {
-                notice(t('Invalid profile identifier.') . EOL);
-                return;
-            }
-
-            $profile = $r[0];
-
-            $r = q(
-                "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'",
-                intval(local_channel()),
-                dbesc($profile['profile_guid'])
-            );
-
-            $ingroup = [];
-            if ($r) {
-                foreach ($r as $member) {
-                    $ingroup[] = $member['abook_id'];
-                }
-            }
-
-            $members = $r;
-
-            if ($change) {
-                if (in_array($change, $ingroup)) {
-                    q(
-                        "UPDATE abook SET abook_profile = '' WHERE abook_id = %d AND abook_channel = %d",
-                        intval($change),
-                        intval(local_channel())
-                    );
-                } else {
-                    q(
-                        "UPDATE abook SET abook_profile = '%s' WHERE abook_id = %d AND abook_channel = %d",
-                        dbesc($profile['profile_guid']),
-                        intval($change),
-                        intval(local_channel())
-                    );
-                }
-
-                $r = q(
-                    "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash 
-					WHERE abook_channel = %d AND abook_profile = '%s'",
-                    intval(local_channel()),
-                    dbesc($profile['profile_guid'])
-                );
-
-                $members = $r;
-
-                $ingroup = [];
-                if (count($r)) {
-                    foreach ($r as $member) {
-                        $ingroup[] = $member['abook_id'];
-                    }
-                }
-            }
-
-            $o .= '
          ' . t('Profile Visibility Editor') . '
          ';
-
-            $o .= '
          ' . t('Profile') . ' \'' . $profile['profile_name'] . '\'
          ';
-
-            $o .= '
          ' . t('Click on a contact to add or remove.') . '
          ';
-        }
-
-        $o .= '
          ';
-        if ($change) {
-            $o = '';
-        }
-
-        $o .= '
          ';
-        $o .= '
          ' . t('Visible To') . '
          ';
-        $o .= '
          ';
-        $o .= '
          ';
-
-        $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
-
-        foreach ($members as $member) {
-            if ($member['xchan_url']) {
-                $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
-                $o .= micropro($member, true, 'mpprof', $textmode);
-            }
-        }
-        $o .= '
          ';
-        $o .= '
          ';
-
-        $o .= '
          ';
-        $o .= '
          ' . t("All Connections") . '
          ';
-        $o .= '
          ';
-        $o .= '
          ';
-
-        $r = abook_connections(local_channel());
-
-        if ($r) {
-            $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
-            foreach ($r as $member) {
-                if (!in_array($member['abook_id'], $ingroup)) {
-                    $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['abook_id'] . '); return false;';
-                    $o .= micropro($member, true, 'mpprof', $textmode);
-                }
-            }
-        }
-
-        $o .= '
          ';
-
-        if ($change) {
-            echo $o;
-            killme();
-        }
-        $o .= '
          ';
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php
deleted file mode 100644
index 72e8c9c6a..000000000
--- a/Zotlabs/Module/Pubstream.php
+++ /dev/null
@@ -1,305 +0,0 @@
-updating)) {
-            $channel = App::get_channel();
-
-            $channel_acl = array(
-                'allow_cid' => $channel['channel_allow_cid'],
-                'allow_gid' => $channel['channel_allow_gid'],
-                'deny_cid' => $channel['channel_deny_cid'],
-                'deny_gid' => $channel['channel_deny_gid']
-            );
-
-            $x = array(
-                'is_owner' => true,
-                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
-                'default_location' => $channel['channel_location'],
-                'nickname' => $channel['channel_address'],
-                'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
-                'permissions' => $channel_acl,
-                'bang' => '',
-                'visitor' => true,
-                'profile_uid' => local_channel(),
-                'return_path' => 'channel/' . $channel['channel_address'],
-                'expanded' => true,
-                'editor_autocomplete' => true,
-                'bbco_autocomplete' => 'bbcode',
-                'bbcode' => true,
-                'jotnets' => true,
-                'reset' => t('Reset form')
-            );
-
-            $o = '
          ';
-            $o .= status_editor($x);
-            $o .= '
          ';
-        }
-
-        if (!$this->updating && !$this->loading) {
-            Navbar::set_selected(t('Public Stream'));
-
-            if (!$mid) {
-                $_SESSION['loadtime_pubstream'] = datetime_convert();
-                if (local_channel()) {
-                    PConfig::Set(local_channel(), 'system', 'loadtime_pubstream', $_SESSION['loadtime_pubstream']);
-                }
-            }
-
-            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 1);
-
-            $maxheight = get_config('system', 'home_divmore_height');
-            if (!$maxheight) {
-                $maxheight = 400;
-            }
-
-            $o .= '
          ' . "\r\n";
-            $o .= "\r\n";
-
-            // if we got a decoded hash we must encode it again before handing to javascript
-            $mid = gen_link_id($mid);
-
-            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), array(
-                '$baseurl' => z_root(),
-                '$pgtype' => 'pubstream',
-                '$uid' => ((local_channel()) ? local_channel() : '0'),
-                '$gid' => '0',
-                '$cid' => '0',
-                '$cmin' => '(-1)',
-                '$cmax' => '(-1)',
-                '$star' => '0',
-                '$liked' => '0',
-                '$conv' => '0',
-                '$spam' => '0',
-                '$fh' => '1',
-                '$dm' => '0',
-                '$nouveau' => '0',
-                '$wall' => '0',
-                '$draft' => '0',
-                '$list' => '0',
-                '$static' => $static,
-                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-                '$search' => '',
-                '$xchan' => '',
-                '$order' => 'comment',
-                '$file' => '',
-                '$cats' => '',
-                '$tags' => (($hashtags) ? urlencode($hashtags) : ''),
-                '$dend' => '',
-                '$mid' => (($mid) ? urlencode($mid) : ''),
-                '$verb' => '',
-                '$net' => (($net) ? urlencode($net) : ''),
-                '$dbegin' => ''
-            ));
-        }
-
-        if ($this->updating && !$this->loading) {
-            // only setup pagination on initial page view
-            $pager_sql = '';
-        } else {
-            $itemspage = ((local_channel()) ? get_pconfig(local_channel(), 'system', 'itemspage', 20) : 20);
-            App::set_pager_itemspage($itemspage);
-            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-        }
-
-        require_once('include/channel.php');
-        require_once('include/security.php');
-
-        if ($public_stream_mode === PUBLIC_STREAM_SITE) {
-            $uids = " and item_private = 0  and item_wall = 1 ";
-        } else {
-            $sys = Channel::get_system();
-            $uids = " and item_private = 0 and item_wall = 0 and item.uid  = " . intval($sys['channel_id']) . " ";
-            $sql_extra = item_permissions_sql($sys['channel_id']);
-            App::$data['firehose'] = intval($sys['channel_id']);
-        }
-
-        if (get_config('system', 'public_list_mode')) {
-            $page_mode = 'list';
-        } else {
-            $page_mode = 'client';
-        }
-
-
-        if (x($hashtags)) {
-            $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
-        }
-
-        $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
-        $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
-
-        if (isset(App::$profile) && isset(App::$profile['profile_uid'])) {
-            $abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
-        }
-
-        $simple_update = ((isset($_SESSION['loadtime_pubstream']) && $_SESSION['loadtime_pubstream']) ? " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_pubstream']) . "' " : '');
-
-        if ($this->loading) {
-            $simple_update = '';
-        }
-
-        if ($static && $simple_update) {
-            $simple_update .= " and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
-        }
-
-        //logger('update: ' . $this->updating . ' load: ' . $this->loading);
-
-        if ($this->updating) {
-            $ordering = "commented";
-
-            if ($this->loading) {
-                if ($mid) {
-                    $r = q(
-                        "SELECT parent AS item_id FROM item
-						left join abook on item.author_xchan = abook.abook_xchan 
-						$net_query
-						WHERE mid like '%s' $uids $item_normal
-						and (abook.abook_blocked = 0 or abook.abook_flags is null)
-						$sql_extra $net_query2 LIMIT 1",
-                        dbesc($mid . '%')
-                    );
-                } else {
-                    // Fetch a page full of parent items for this page
-                    $r = q("SELECT item.id AS item_id FROM item 
-						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
-						$net_query
-						WHERE true $uids and item.item_thread_top = 1 $item_normal
-						and (abook.abook_blocked = 0 or abook.abook_flags is null)
-						$sql_extra $net_query2
-						ORDER BY $ordering DESC $pager_sql ");
-                }
-            } elseif ($this->updating) {
-                if ($mid) {
-                    $r = q(
-                        "SELECT parent AS item_id FROM item
-						left join abook on item.author_xchan = abook.abook_xchan
-						$net_query
-						WHERE mid like '%s' $uids $item_normal_update $simple_update
-						and (abook.abook_blocked = 0 or abook.abook_flags is null)
-						$sql_extra $net_query2 LIMIT 1",
-                        dbesc($mid . '%')
-                    );
-                } else {
-                    $r = q("SELECT parent AS item_id FROM item
-						left join abook on item.author_xchan = abook.abook_xchan
-						$net_query
-						WHERE true $uids $item_normal_update
-						$simple_update
-						and (abook.abook_blocked = 0 or abook.abook_flags is null)
-						$sql_extra $net_query2");
-                }
-            }
-
-            // Then fetch all the children of the parents that are on this page
-            $parents_str = '';
-            $update_unseen = '';
-
-            if ($r) {
-                $parents_str = ids_to_querystr($r, 'item_id');
-
-                $items = q(
-                    "SELECT item.*, item.id AS item_id FROM item
-					WHERE true $uids $item_normal
-					AND item.parent IN ( %s )
-					$sql_extra ",
-                    dbesc($parents_str)
-                );
-
-                // use effective_uid param of xchan_query to help sort out comment permission
-                // for sys_channel owned items.
-
-                xchan_query($items, true, (($sys) ? local_channel() : 0));
-                $items = fetch_post_tags($items, true);
-                $items = conv_sort($items, $ordering);
-            } else {
-                $items = [];
-            }
-        }
-
-        if ($mid && local_channel()) {
-            $ids = ids_to_array($items, 'item_id');
-            $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []);
-            if (!$seen) {
-                $seen = [];
-            }
-            $seen = array_merge($ids, $seen);
-            PConfig::Set(local_channel(), 'system', 'seen_items', $seen);
-        }
-
-        // fake it
-        $mode = ('pubstream');
-
-        $o .= conversation($items, $mode, $this->updating, $page_mode);
-
-        if ($mid) {
-            $o .= '
          ';
-        }
-
-        if (($items) && (!$this->updating)) {
-            $o .= alt_pager(count($items));
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Q.php b/Zotlabs/Module/Q.php
deleted file mode 100644
index 3daedeaf0..000000000
--- a/Zotlabs/Module/Q.php
+++ /dev/null
@@ -1,30 +0,0 @@
- false];
-
-        $h = argv(1);
-        if (!$h) {
-            json_return_and_die($ret);
-        }
-
-        $r = q(
-            "select * from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and site_dead = 0",
-            dbesc($h)
-        );
-        if ($r) {
-            $ret['success'] = true;
-            $ret['results'] = ids_to_array($r, 'hubloc_id_url');
-        }
-        json_return_and_die($ret);
-    }
-}
diff --git a/Zotlabs/Module/README.md b/Zotlabs/Module/README.md
deleted file mode 100644
index 847f53700..000000000
--- a/Zotlabs/Module/README.md
+++ /dev/null
@@ -1,76 +0,0 @@
-Zotlabs/Module
-==============
-
-
-This directory contains controller modules for handling web requests. The
-lowercase class name indicates the head of the URL path which this module
-handles. There are other methods of attaching (routing) URL paths to
-controllers, but this is the primary method used in this project.
-
-Module controllers MUST reside in this directory and namespace to be
-autoloaded (unless other specific routing methods are employed). They
-typically use and extend the class definition in Zotlabs/Web/Controller 
-as a template. 
-
-Template:
-
-	 $item['mid']]);
-            $n['obj_type'] = ((array_path_exists('obj/type', $n)) ? $n['obj']['type'] : EMPTY_STR);
-
-            $n['tgt_type'] = 'Image';
-
-            $n['target'] = [
-                'type' => 'Image',
-                'name' => $emoji,
-                'url' => z_root() . '/images/emoji/' . $emoji . '.png'
-            ];
-
-            $x = item_store($n);
-
-            retain_item($postid);
-
-            if ($x['success']) {
-                $nid = $x['item_id'];
-                Run::Summon(['Notifier', 'like', $nid]);
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
deleted file mode 100644
index dfc4e033f..000000000
--- a/Zotlabs/Module/Register.php
+++ /dev/null
@@ -1,314 +0,0 @@
- 1) ? argv(1) : '');
-
-        // Provide a stored request for somebody desiring a connection
-        // when they first need to register someplace. Once they've
-        // created a channel, we'll try to revive the connection request
-        // and process it.
-
-        if ($_REQUEST['connect']) {
-            $_SESSION['connect'] = $_REQUEST['connect'];
-        }
-
-        switch ($cmd) {
-            case 'invite_check.json':
-                $result = Account::check_invite($_REQUEST['invite_code']);
-                break;
-            case 'email_check.json':
-                $result = Account::check_email($_REQUEST['email']);
-                break;
-            case 'password_check.json':
-                $result = Account::check_password($_REQUEST['password1']);
-                break;
-            default:
-                break;
-        }
-        if ($result) {
-            json_return_and_die($result);
-        }
-    }
-
-
-    public function post()
-    {
-        // security token is session_id() based and we have a transient session, so we can't use it here.
-        //check_form_security_token_redirectOnErr('/register', 'register');
-
-        $max_dailies = intval(get_config('system', 'max_daily_registrations'));
-        if ($max_dailies) {
-            $r = q(
-                "select count(account_id) as total from account where account_created > %s - INTERVAL %s",
-                db_utcnow(),
-                db_quoteinterval('1 day')
-            );
-            if ($r && intval($r[0]['total']) >= $max_dailies) {
-                notice(t('Maximum daily site registrations exceeded. Please try again tomorrow.') . EOL);
-                return;
-            }
-        }
-
-        if (Config::Get('system','tos_required') && !(isset($_POST['tos']) && intval($_POST['tos']))) {
-            notice(t('Please indicate acceptance of the Terms of Service. Registration failed.') . EOL);
-            return;
-        }
-
-        $policy = get_config('system', 'register_policy');
-
-        $email_verify = get_config('system', 'verify_email');
-
-
-        switch ($policy) {
-            case REGISTER_OPEN:
-                $flags = ACCOUNT_OK;
-                break;
-
-            case REGISTER_APPROVE:
-                $flags = ACCOUNT_BLOCKED | ACCOUNT_PENDING;
-                break;
-
-            default:
-            case REGISTER_CLOSED:
-                if (!is_site_admin()) {
-                    notice(t('Permission denied.') . EOL);
-                    return;
-                }
-                $flags = ACCOUNT_BLOCKED;
-                break;
-        }
-
-        if ($email_verify && $policy == REGISTER_OPEN) {
-            $flags = $flags | ACCOUNT_UNVERIFIED;
-        }
-
-
-        if ((!$_POST['password']) || ($_POST['password'] !== $_POST['password2'])) {
-            notice(t('Passwords do not match.') . EOL);
-            return;
-        }
-
-        $arr = $_POST;
-        $arr['account_flags'] = $flags;
-
-        $result = Account::create($arr);
-
-        if (!$result['success']) {
-            notice($result['message']);
-            return;
-        }
-
-        require_once('include/security.php');
-
-
-        if ($_REQUEST['name']) {
-            set_aconfig($result['account']['account_id'], 'register', 'channel_name', $_REQUEST['name']);
-        }
-        if ($_REQUEST['nickname']) {
-            set_aconfig($result['account']['account_id'], 'register', 'channel_address', $_REQUEST['nickname']);
-        }
-        if ($_REQUEST['permissions_role']) {
-            set_aconfig($result['account']['account_id'], 'register', 'permissions_role', $_REQUEST['permissions_role']);
-        }
-
-        // At this point the account has been created without error. Purge any error messages from prior failed registration
-        // attempts which haven't yet been delivered to the browser and start fresh. If you're willing to figure out why they
-        // weren't delivered to the browser please adopt zap issue 34.
-
-        $_SESSION['sysmsg'] = [];
-
-        $using_invites = intval(get_config('system', 'invitation_only'));
-        $num_invites = intval(get_config('system', 'number_invites'));
-        $invite_code = ((x($_POST, 'invite_code')) ? notags(trim($_POST['invite_code'])) : '');
-
-        if ($using_invites && $invite_code && defined('INVITE_WORKING')) {
-            q("delete from register where hash = '%s'", dbesc($invite_code));
-            // @FIXME - this also needs to be considered when using 'invites_remaining' in mod/invite.php
-            set_aconfig($result['account']['account_id'], 'system', 'invites_remaining', $num_invites);
-        }
-
-        if ($policy == REGISTER_OPEN) {
-            if ($email_verify) {
-                $res = Account::verify_email_address($result);
-            } else {
-                $res = Account::send_register_success_email($result['email'], $result['password']);
-            }
-            if ($res) {
-                if ($invite_code) {
-                    info(t('Registration successful. Continue to create your first channel...') . EOL);
-                } else {
-                    info(t('Registration successful. Please check your email for validation instructions.') . EOL);
-                }
-            }
-        } elseif ($policy == REGISTER_APPROVE) {
-            $res = Account::send_reg_approval_email($result);
-            if ($res) {
-                info(t('Your registration is pending approval by the site owner.') . EOL);
-            } else {
-                notice(t('Your registration can not be processed.') . EOL);
-            }
-            goaway(z_root());
-        }
-
-        if ($email_verify) {
-            goaway(z_root() . '/email_validation/' . bin2hex($result['email']));
-        }
-
-        // fall through and authenticate if no approvals or verifications were required.
-
-        authenticate_success($result['account'], null, true, false, true);
-
-        $new_channel = false;
-        $next_page = 'new_channel';
-
-        if (get_config('system', 'auto_channel_create')) {
-            $new_channel = Channel::auto_create($result['account']['account_id']);
-            if ($new_channel['success']) {
-                $channel_id = $new_channel['channel']['channel_id'];
-                change_channel($channel_id);
-                $next_page = '~';
-            } else {
-                $new_channel = false;
-            }
-        }
-
-        $x = get_config('system', 'workflow_register_next');
-        if ($x) {
-            $next_page = $x;
-            $_SESSION['workflow'] = true;
-        }
-
-        unset($_SESSION['login_return_url']);
-        goaway(z_root() . '/' . $next_page);
-    }
-
-
-    public function get()
-    {
-
-        $registration_is = EMPTY_STR;
-        $other_sites = false;
-
-        if (intval(get_config('system', 'register_policy')) === REGISTER_CLOSED) {
-            notice(t('Registration on this website is disabled.') . EOL);
-            if (intval(get_config('system', 'directory_mode')) === DIRECTORY_MODE_STANDALONE) {
-                return EMPTY_STR;
-            } else {
-                $other_sites = true;
-            }
-        }
-
-        if (intval(get_config('system', 'register_policy')) == REGISTER_APPROVE) {
-            $registration_is = t('Registration on this website is by approval only.');
-            $other_sites = true;
-        }
-
-        $invitations = false;
-
-        if (intval(get_config('system', 'invitation_only')) && defined('INVITE_WORKING')) {
-            $invitations = true;
-            $registration_is = t('Registration on this site is by invitation only.');
-            $other_sites = true;
-        }
-
-        $max_dailies = intval(get_config('system', 'max_daily_registrations'));
-        if ($max_dailies) {
-            $r = q(
-                "select count(account_id) as total from account where account_created > %s - INTERVAL %s",
-                db_utcnow(),
-                db_quoteinterval('1 day')
-            );
-            if ($r && $r[0]['total'] >= $max_dailies) {
-                logger('max daily registrations exceeded.');
-                notice(t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
-                return;
-            }
-        }
-
-        $privacy_role = ((x($_REQUEST, 'permissions_role')) ? $_REQUEST['permissions_role'] : "");
-
-        $perm_roles = PermissionRoles::roles();
-
-        // Configurable terms of service link
-
-        $tosurl = get_config('system', 'tos_url');
-        if (!$tosurl) {
-            $tosurl = z_root() . '/help/TermsOfService';
-        }
-
-        $toslink = '' . t('Terms of Service') . '';
-
-        // Configurable whether to restrict age or not - default is based on international legal requirements
-        // This can be relaxed if you are on a restricted server that does not share with public servers
-
-        if (get_config('system', 'no_age_restriction')) {
-            $label_tos = sprintf(t('I accept the %s for this website'), $toslink);
-        } else {
-            $age = get_config('system', 'minimum_age');
-            if (!$age) {
-                $age = 13;
-            }
-            $label_tos = sprintf(t('I am over %s years of age and accept the %s for this website'), $age, $toslink);
-        }
-
-        $enable_tos = Config::Get('system','tos_required');
-
-        $email = ['email', t('Your email address'), ((x($_REQUEST, 'email')) ? strip_tags(trim($_REQUEST['email'])) : ""), '', '', ' required '];
-        $password = ['password', t('Choose a password'), '', '', '', ' required '];
-        $password2 = ['password2', t('Please re-enter your password'), '', '', '', ' required '];
-        $invite_code = ['invite_code', t('Please enter your invitation code'), ((x($_REQUEST, 'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")];
-        $name = ['name', t('Your Name'), ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.')];
-        $nickhub = '@' . str_replace(array('http://', 'https://', '/'), '', get_config('system', 'baseurl'));
-        $nickname = ['nickname', t('Choose a short nickname'), ((x($_REQUEST, 'nickname')) ? $_REQUEST['nickname'] : ''), sprintf(t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub)];
-        $role = ['permissions_role', t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role for your usage needs and privacy requirements.'), $perm_roles];
-        $tos = ['tos', $label_tos, '', '', [t('no'), t('yes')], ' required '];
-
-
-        $auto_create = (get_config('system', 'auto_channel_create') ? true : false);
-        $default_role = get_config('system', 'default_permissions_role');
-        $email_verify = get_config('system', 'verify_email');
-
-
-        $o = replace_macros(Theme::get_template('register.tpl'), [
-            '$form_security_token' => get_form_security_token("register"),
-            '$title' => t('Registration'),
-            '$reg_is' => $registration_is,
-            '$registertext' => bbcode(get_config('system', 'register_text')),
-            '$other_sites' => (($other_sites) ? t('Show affiliated sites - some of which may allow registration.') : EMPTY_STR),
-            '$invitations' => $invitations,
-            '$invite_code' => $invite_code,
-            '$auto_create' => $auto_create,
-            '$name' => $name,
-            '$role' => $role,
-            '$default_role' => $default_role,
-            '$nickname' => $nickname,
-            '$enable_tos' => $enable_tos,
-            '$tos' => $tos,
-            '$email' => $email,
-            '$pass1' => $password,
-            '$pass2' => $password2,
-            '$submit' => t('Register'),
-            '$verify_note' => (($email_verify) ? t('This site requires email verification. After completing this form, please check your email for further instructions.') : ''),
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Regmod.php b/Zotlabs/Module/Regmod.php
deleted file mode 100644
index 5ec0cf467..000000000
--- a/Zotlabs/Module/Regmod.php
+++ /dev/null
@@ -1,50 +0,0 @@
- NULL_DATE) {
-            $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours');
-            if ($account['account_password_changed'] > d1) {
-                notice(t('Account removals are not allowed within 48 hours of changing the account password.') . EOL);
-                return;
-            }
-        }
-
-        Account::remove($account_id);
-    }
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            goaway(z_root());
-        }
-
-        $hash = random_string();
-
-        $_SESSION['remove_account_verify'] = $hash;
-
-        $o .= replace_macros(Theme::get_template('removeaccount.tpl'), [
-            '$basedir' => z_root(),
-            '$hash' => $hash,
-            '$title' => t('Remove This Account'),
-            '$desc' => [t('WARNING: '), t('This account and all its channels will be completely removed from this server. '), t('This action is permanent and can not be undone!')],
-            '$passwd' => t('Please enter your password for verification:'),
-            '$submit' => t('Remove Account')
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php
deleted file mode 100644
index 8ffce47a6..000000000
--- a/Zotlabs/Module/Removeme.php
+++ /dev/null
@@ -1,82 +0,0 @@
- NULL_DATE) {
-            $d1 = datetime_convert('UTC', 'UTC', 'now - 48 hours');
-            if ($account['account_password_changed'] > $d1) {
-                notice(t('Channel removals are not allowed within 48 hours of changing the account password.') . EOL);
-                return;
-            }
-        }
-
-        Channel::channel_remove(local_channel(), true, true);
-    }
-
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            goaway(z_root());
-        }
-
-        $hash = random_string();
-
-        $_SESSION['remove_channel_verify'] = $hash;
-
-        $o .= replace_macros(Theme::get_template('removeme.tpl'), [
-            '$basedir' => z_root(),
-            '$hash' => $hash,
-            '$title' => t('Remove This Channel'),
-            '$desc' => [t('WARNING: '), t('This channel will be completely removed from this server. '), t('This action is permanent and can not be undone!')],
-            '$passwd' => t('Please enter your password for verification:'),
-            '$submit' => t('Remove Channel')
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php
deleted file mode 100644
index 71e4748f7..000000000
--- a/Zotlabs/Module/Rmagic.php
+++ /dev/null
@@ -1,96 +0,0 @@
- $address];
-            Hook::call('reverse_magic_auth', $arr);
-
-            // if they're still here...
-            notice(t('Authentication failed.') . EOL);
-            return;
-        } else {
-            // Presumed Red identity. Perform reverse magic auth
-
-            if (strpos($address, '@') === false) {
-                notice('Invalid address.');
-                return;
-            }
-
-            $r = null;
-            if ($address) {
-                $r = q(
-                    "select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
-                    dbesc($address)
-                );
-            }
-            if ($r) {
-                $url = $r[0]['hubloc_url'];
-            } else {
-                $url = 'https://' . substr($address, strpos($address, '@') + 1);
-            }
-
-            if ($url) {
-                if ($_SESSION['return_url']) {
-                    $dest = bin2hex(z_root() . '/' . str_replace('zid=', 'zid_=', $_SESSION['return_url']));
-                } else {
-                    $dest = bin2hex(z_root() . '/' . str_replace(['rmagic', 'zid='], ['', 'zid_='], App::$query_string));
-                }
-                goaway($url . '/magic' . '?f=&owa=1&bdest=' . $dest);
-            }
-        }
-    }
-
-
-    public function get()
-    {
-        return replace_macros(
-            Theme::get_template('rmagic.tpl'),
-            [
-                '$title' => t('Remote Authentication'),
-                '$address' => ['address', t('Enter your channel address (e.g. channel@example.com)'), '', ''],
-                '$action' => 'rmagic',
-                '$method' => 'post',
-                '$submit' => t('Authenticate')
-            ]
-        );
-    }
-}
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php
deleted file mode 100644
index c203f36ad..000000000
--- a/Zotlabs/Module/Rpost.php
+++ /dev/null
@@ -1,258 +0,0 @@
- $arg) {
-                        if ($key === 'req') {
-                            continue;
-                        }
-                        $url .= '&' . $key . '=' . $arg;
-                    }
-                    goaway($url);
-                }
-            }
-
-            // The login procedure is going to bugger our $_REQUEST variables
-            // so save them in the session.
-
-            if (array_key_exists('body', $_REQUEST)) {
-                $_SESSION['rpost'] = $_REQUEST;
-            }
-            return login();
-        }
-
-        Navbar::set_selected('Post');
-
-        if (local_channel() && array_key_exists('userfile', $_FILES)) {
-            $channel = App::get_channel();
-            $observer = App::get_observer();
-
-            $def_album = get_pconfig($channel['channel_id'], 'system', 'photo_path');
-            $def_attach = get_pconfig($channel['channel_id'], 'system', 'attach_path');
-
-            $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [
-                'source' => 'editor',
-                'visible' => 0,
-                'album' => $def_album,
-                'directory' => $def_attach,
-                'flags' => 1, // indicates temporary permissions are created
-                'allow_cid' => '<' . $channel['channel_hash'] . '>'
-            ]);
-
-            if (!$r['success']) {
-                notice($r['message'] . EOL);
-            }
-
-            $s = EMPTY_STR;
-
-            if (intval($r['data']['is_photo'])) {
-                $s .= "\n\n" . $r['body'] . "\n\n";
-            }
-
-            $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
-
-            if (strpos($r['data']['filetype'], 'video') === 0) {
-                for ($n = 0; $n < 15; $n++) {
-                    $thumb = Linkinfo::get_video_poster($url);
-                    if ($thumb) {
-                        break;
-                    }
-                    sleep(1);
-                    continue;
-                }
-
-                if ($thumb) {
-                    $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n";
-                } else {
-                    $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n";
-                }
-            }
-            if (strpos($r['data']['filetype'], 'audio') === 0) {
-                $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n";
-            }
-            if ($r['data']['filetype'] === 'image/svg+xml') {
-                $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-                if ($x) {
-                    $bb = svg2bb($x);
-                    if ($bb) {
-                        $s .= "\n\n" . $bb;
-                    } else {
-                        logger('empty return from svgbb');
-                    }
-                } else {
-                    logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-                }
-            }
-            if ($r['data']['filetype'] === 'text/vnd.abc' && Addon::is_installed('abc')) {
-                $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-                if ($x) {
-                    $s .= "\n\n" . '[abc]' . $x . '[/abc]';
-                } else {
-                    logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-                }
-            }
-            if ($r['data']['filetype'] === 'text/calendar') {
-                $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-                if ($content) {
-                    $ev = ical_to_ev($content);
-                    if ($ev) {
-                        $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n";
-                    }
-                }
-            }
-
-            $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
-            $_REQUEST['body'] = ((array_key_exists('body', $_REQUEST)) ? $_REQUEST['body'] . $s : $s);
-        }
-
-        // If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables
-
-        if ((!array_key_exists('body', $_REQUEST)) && (array_key_exists('rpost', $_SESSION))) {
-            $_REQUEST = $_SESSION['rpost'];
-            unset($_SESSION['rpost']);
-        }
-
-        if (array_key_exists('channel', $_REQUEST)) {
-            $r = q(
-                "select channel_id from channel where channel_account_id = %d and channel_address = '%s' limit 1",
-                intval(get_account_id()),
-                dbesc($_REQUEST['channel'])
-            );
-            if ($r) {
-                require_once('include/security.php');
-                $change = change_channel($r[0]['channel_id']);
-            }
-        }
-
-        if ($_REQUEST['remote_return']) {
-            $_SESSION['remote_return'] = $_REQUEST['remote_return'];
-        }
-
-        if (argc() > 1 && argv(1) === 'return') {
-            if ($_SESSION['remote_return']) {
-                goaway($_SESSION['remote_return']);
-            }
-            goaway(z_root() . '/stream');
-        }
-
-        $plaintext = true;
-
-        if (array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html' && isset($_REQUEST['body'])) {
-            require_once('include/html2bbcode.php');
-            $_REQUEST['body'] = html2bbcode($_REQUEST['body']);
-        }
-
-        $channel = App::get_channel();
-
-        $acl = new AccessControl($channel);
-
-        if (array_key_exists('to', $_REQUEST) && $_REQUEST['to']) {
-            $acl->set(['allow_cid' => '<' . $_REQUEST['to'] . '>',
-                    'allow_gid' => EMPTY_STR,
-                    'deny_cid' => EMPTY_STR,
-                    'deny_gid' => EMPTY_STR]);
-			if (! (isset($_REQUEST['body']) && $_REQUEST['body'])) {
-				$xchan = q("select * from xchan where xchan_hash = '%s'",
-					dbesc($_REQUEST['to'])
-				);
-			
-				if ($xchan) {
-					$_REQUEST['body'] .= '@!{' . (($xchan[0]['xchan_addr']) ? $xchan[0]['xchan_addr'] : $xchan[0]['xchan_url']) . '} ' ;
-				}
-			}
-        }
-
-        $channel_acl = $acl->get();
-
-        if ($_REQUEST['url']) {
-            $x = z_fetch_url(z_root() . '/linkinfo?f=&url=' . urlencode($_REQUEST['url']) . '&oembed=1&zotobj=1');
-            if ($x['success']) {
-                $_REQUEST['body'] = $_REQUEST['body'] . $x['body'];
-            }
-        }
-
-        if ($_REQUEST['post_id']) {
-            $_REQUEST['body'] .= '[share=' . intval($_REQUEST['post_id']) . '][/share]';
-        }
-
-        $x = [
-            'is_owner' => true,
-            'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
-            'default_location' => $channel['channel_location'],
-            'nickname' => $channel['channel_address'],
-            'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
-            'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
-            'permissions' => $channel_acl,
-            'bang' => '',
-            'visitor' => true,
-            'profile_uid' => local_channel(),
-            'title' => $_REQUEST['title'],
-            'body' => $_REQUEST['body'],
-            'attachment' => $_REQUEST['attachment'],
-            'source' => ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : ''),
-            'return_path' => 'rpost/return',
-            'bbco_autocomplete' => 'bbcode',
-            'editor_autocomplete' => true,
-            'bbcode' => true,
-            'jotnets' => true,
-            'reset' => t('Reset form')
-        ];
-
-        $editor = status_editor($x);
-
-        $o .= replace_macros(Theme::get_template('edpost_head.tpl'), [
-            '$title' => t('Edit post'),
-            '$cancel' => '',
-            '$editor' => $editor
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Safe.php b/Zotlabs/Module/Safe.php
deleted file mode 100644
index d7ecd4b1f..000000000
--- a/Zotlabs/Module/Safe.php
+++ /dev/null
@@ -1,21 +0,0 @@
-loading) {
-            $_SESSION['loadtime'] = datetime_convert();
-        }
-        Navbar::set_selected('Search');
-
-        $format = (($_REQUEST['format']) ? $_REQUEST['format'] : '');
-        if ($format !== '') {
-            $this->updating = $this->loading = 1;
-        }
-
-        $observer = App::get_observer();
-        $observer_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $o = '' . "\r\n";
-        $o .= '
          ' . "\r\n";
-        $o .= '
          ' . t('Search') . '
          ';
-
-        if (x(App::$data, 'search')) {
-            $search = trim(App::$data['search']);
-        } else {
-            $search = ((x($_GET, 'search')) ? trim(escape_tags(rawurldecode($_GET['search']))) : '');
-        }
-        $tag = false;
-        if (x($_GET, 'tag')) {
-            $tag = true;
-            $search = ((x($_GET, 'tag')) ? trim(escape_tags(rawurldecode($_GET['tag']))) : '');
-        }
-
-        $static = ((array_key_exists('static', $_REQUEST)) ? intval($_REQUEST['static']) : 0);
-
-        $o .= search($search, 'search-box', '/search', ((local_channel()) ? true : false));
-
-        // ActivityStreams object fetches from the navbar
-
-        if (local_channel() && strpos($search, 'https://') === 0 && (!$this->updating) && (!$this->loading)) {
-            logger('searching for ActivityPub');
-            if (($pos = strpos($search,'b64.')) !== false) {
-                $search = substr($search,$pos + 4);
-                if (($pos2 = strpos($search,'?')) !== false) {
-                    $search = substr($search,0,$pos2);
-                }
-                $search = base64_decode($search);
-            }
-            logger('Search: ' . $search);
-            $channel = App::get_channel();
-            $hash = EMPTY_STR;
-            $j = Activity::fetch($search, $channel);
-            if ($j) {
-                if (isset($j['type']) && ActivityStreams::is_an_actor($j['type'])) {
-                    Activity::actor_store($j['id'], $j);
-                    goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
-                }
-                $AS = new ActivityStreams($j, null, true);
-                if ($AS->is_valid() && isset($AS->data['type'])) {
-                    if (is_array($AS->obj)) {
-                        // matches Collection and orderedCollection
-                        if (isset($AS->obj['type']) && strpos($AS->obj['type'], 'Collection') !== false) {
-                            // Collections are awkward to process because they can be huge.
-                            // Our strategy is to limit a navbar search to 100 Collection items
-                            // and only fetch the first 10 conversations in the foreground.
-                            // We'll queue the rest, and then send you to a page where
-                            // you can see something we've imported.
-                            // In theory you'll start to see notifications as other conversations
-                            // are fetched in the background while you're looking at the first ones.
-
-                            $max = intval(get_config('system', 'max_imported_search_collection', 100));
-
-                            if (intval($max)) {
-                                $obj = new ASCollection($search, $channel, 0, $max);
-                                $messages = $obj->get();
-                                // logger('received: ' . print_r($messages,true));
-                                $author = null;
-                                if ($messages) {
-                                    logger('received ' . count($messages) . ' items from collection.', LOGGER_DEBUG);
-                                    $processed = 0;
-                                    foreach ($messages as $message) {
-                                        $processed++;
-                                        // only process the first several items in the foreground and
-                                        // queue the remainder.
-                                        if ($processed > 10) {
-                                            $fetch_url = ((is_string($message)) ? $message : EMPTY_STR);
-                                            $fetch_url = ((is_array($message) && array_key_exists('id', $message)) ? $message['id'] : $fetch_url);
-
-                                            if (!$fetch_url) {
-                                                continue;
-                                            }
-
-                                            $hash = new_uuid();
-                                            Queue::insert(
-                                                [
-                                                    'hash' => $hash,
-                                                    'account_id' => $channel['channel_account_id'],
-                                                    'channel_id' => $channel['channel_id'],
-                                                    'posturl' => $fetch_url,
-                                                    'notify' => EMPTY_STR,
-                                                    'msg' => EMPTY_STR,
-                                                    'driver' => 'asfetch'
-                                                ]
-                                            );
-                                            continue;
-                                        }
-
-                                        if (is_string($message)) {
-                                            $message = Activity::fetch($message, App::get_channel());
-                                        }
-                                        $AS = new ActivityStreams($message, null, true);
-                                        if ($AS->is_valid() && is_array($AS->obj)) {
-                                            $item = Activity::decode_note($AS, true);
-                                        }
-                                        if ($item) {
-                                            if (!$author) {
-                                                $author = $item['author_xchan'];
-                                            }
-                                            Activity::store(App::get_channel(), get_observer_hash(), $AS, $item, true, true);
-                                        }
-                                    }
-                                    if ($hash) {
-                                        Run::Summon(['Deliver', $hash]);
-                                    }
-                                }
-
-                                // This will go to the right place most but not all of the time.
-                                // It will go to a relevant place all of the time, so we'll use it.
-
-                                if ($author) {
-                                    goaway(z_root() . '/stream/?xchan=' . urlencode($author));
-                                }
-                                goaway(z_root() . '/stream');
-                            }
-                        } else {
-                            // It wasn't a Collection object and wasn't an Actor object,
-                            // so let's see if it decodes. The boolean flag enables html
-                            // cache of the item
-                            $item = Activity::decode_note($AS, true);
-                            if ($item) {
-                                Activity::store(App::get_channel(), get_observer_hash(), $AS, $item, true, true);
-                                goaway(z_root() . '/display/' . gen_link_id($item['mid']));
-                            }
-                            else {
-                                notice( t('Item not found.') . EOL);
-                                return EMPTY_STR;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (strpos($search, '#') === 0) {
-            $tag = true;
-            $search = substr($search, 1);
-        }
-        if (strpos($search, '@') === 0) {
-            $search = substr($search, 1);
-            goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
-        }
-        if (strpos($search, '!') === 0) {
-            $search = substr($search, 1);
-            goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
-        }
-        if (strpos($search, '?') === 0) {
-            $search = substr($search, 1);
-            goaway(z_root() . '/help' . '?f=1&navsearch=1&search=' . $search);
-        }
-
-        // look for a naked webbie
-        if (strpos($search, '@') !== false && strpos($search, 'http') !== 0) {
-            goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
-        }
-
-        if (!$search) {
-            return $o;
-        }
-
-        if ($tag) {
-            $wildtag = str_replace('*', '%', $search);
-            $sql_extra = sprintf(
-                " AND item.id IN (select oid from term where otype = %d and ttype in ( %d , %d) and term like '%s') ",
-                intval(TERM_OBJ_POST),
-                intval(TERM_HASHTAG),
-                intval(TERM_COMMUNITYTAG),
-                dbesc(protect_sprintf($wildtag))
-            );
-        } else {
-            $regstr = db_getfunc('REGEXP');
-            $sql_extra = sprintf(" AND (item.title $regstr '%s' OR item.body $regstr '%s') ", dbesc(protect_sprintf(preg_quote($search))), dbesc(protect_sprintf(preg_quote($search))));
-        }
-
-        // Here is the way permissions work in the search module...
-        // Only public posts can be shown
-        // OR your own posts if you are a logged in member
-        // No items will be shown if the member has a blocked profile wall.
-
-
-        if ((!$this->updating) && (!$this->loading)) {
-            $static = ((local_channel()) ? Channel::manual_conv_update(local_channel()) : 0);
-
-
-            // This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
-            // because browser prefetching might change it on us. We have to deliver it with the page.
-
-            $o .= '' . "\r\n";
-            $o .= "\r\n";
-
-            App::$page['htmlhead'] .= replace_macros(Theme::get_template("build_query.tpl"), [
-                '$baseurl' => z_root(),
-                '$pgtype' => 'search',
-                '$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
-                '$gid' => '0',
-                '$cid' => '0',
-                '$cmin' => '(-1)',
-                '$cmax' => '(-1)',
-                '$star' => '0',
-                '$liked' => '0',
-                '$conv' => '0',
-                '$spam' => '0',
-                '$fh' => '0',
-                '$dm' => '0',
-                '$nouveau' => '0',
-                '$wall' => '0',
-                '$draft' => '0',
-                '$static' => $static,
-                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
-                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-                '$search' => (($tag) ? urlencode('#') : '') . $search,
-                '$xchan' => '',
-                '$order' => '',
-                '$file' => '',
-                '$cats' => '',
-                '$tags' => '',
-                '$mid' => '',
-                '$verb' => '',
-                '$net' => '',
-                '$dend' => '',
-                '$dbegin' => ''
-            ]);
-        }
-
-        $item_normal = item_normal_search();
-        $pub_sql = item_permissions_sql(0, $observer_hash);
-
-        $sys = Channel::get_system();
-
-        if (($this->updating) && ($this->loading)) {
-            $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
-            App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
-            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-
-            if ($this->loading) {
-                $r = null;
-
-                // if logged in locally, first look in the items you own
-                // and if this returns zero results, resort to searching elsewhere on the site.
-                // Ideally these results would be merged but this can be difficult
-                // and results in lots of duplicated content and/or messed up pagination
-
-                if (local_channel()) {
-                    $r = q(
-                        "SELECT mid, MAX(id) as item_id from item where uid = %d
-                        $item_normal
-                        $sql_extra
-                        group by mid, created order by created desc $pager_sql ",
-                        intval(local_channel())
-                    );
-                }
-                if (!$r) {
-                    $r = q("SELECT mid, MAX(id) as item_id from item WHERE true $pub_sql
-                        $item_normal
-                        $sql_extra
-                        group by mid, created order by created desc $pager_sql");
-                }
-                if ($r) {
-                    $str = ids_to_querystr($r, 'item_id');
-                    $r = q("select *, id as item_id from item where id in ( " . $str . ") order by created desc ");
-                }
-            } else {
-                $r = [];
-            }
-        }
-
-        if ($r) {
-            xchan_query($r);
-            $items = fetch_post_tags($r, true);
-        } else {
-            $items = [];
-        }
-
-        if ($format == 'json') {
-            $result = [];
-            require_once('include/conversation.php');
-            foreach ($items as $item) {
-                $item['html'] = zidify_links(bbcode($item['body']));
-                $x = encode_item($item);
-                $x['html'] = prepare_text($item['body'], $item['mimetype']);
-                $result[] = $x;
-            }
-            json_return_and_die(array('success' => true, 'messages' => $result));
-        }
-
-        if ($tag) {
-            $o .= '
          ' . sprintf(t('Items tagged with: %s'), $search) . '
          ';
-        } else {
-            $o .= '
          ' . sprintf(t('Search results for: %s'), $search) . '
          ';
-        }
-
-        $o .= conversation($items, 'search', $this->updating, 'client');
-
-        $o .= '
          ';
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Search_ac.php b/Zotlabs/Module/Search_ac.php
deleted file mode 100644
index 37c050313..000000000
--- a/Zotlabs/Module/Search_ac.php
+++ /dev/null
@@ -1,101 +0,0 @@
- $g['xchan_photo_s'],
-                        'name' => '@' . $g['xchan_name'],
-                        'id' => $g['abook_id'],
-                        'link' => $g['xchan_url'],
-                        'label' => '',
-                        'nick' => '',
-                    ];
-                }
-            }
-        }
-
-        if ($do_tags) {
-            $r = q(
-                "select distinct term, tid, url from term 
-				where ttype in ( %d, %d ) $tag_sql_extra group by term order by term asc",
-                intval(TERM_HASHTAG),
-                intval(TERM_COMMUNITYTAG)
-            );
-
-            if ($r) {
-                foreach ($r as $g) {
-                    $results[] = [
-                        'photo' => z_root() . '/images/hashtag.png',
-                        'name' => '#' . $g['term'],
-                        'id' => $g['tid'],
-                        'link' => $g['url'],
-                        'label' => '',
-                        'nick' => '',
-                    ];
-                }
-            }
-        }
-
-        json_return_and_die([
-            'start' => $start,
-            'count' => $count,
-            'items' => $results,
-        ]);
-    }
-}
diff --git a/Zotlabs/Module/Secrets.php b/Zotlabs/Module/Secrets.php
deleted file mode 100644
index e720d81fd..000000000
--- a/Zotlabs/Module/Secrets.php
+++ /dev/null
@@ -1,29 +0,0 @@
-' . $desc . '';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Secrets'))) {
-            return $text;
-        }
-
-        $desc = t('This app is installed. A button to encrypt content may be found in the post editor.');
-
-        $text = '
          ' . $desc . '
          ';
-
-        return $text;
-    }
-}
diff --git a/Zotlabs/Module/Service_limits.php b/Zotlabs/Module/Service_limits.php
deleted file mode 100644
index 05ca54322..000000000
--- a/Zotlabs/Module/Service_limits.php
+++ /dev/null
@@ -1,30 +0,0 @@
-sm = new SubModule();
-    }
-
-
-    public function post()
-    {
-
-        if (!local_channel()) {
-            return;
-        }
-
-        if ($_SESSION['delegate']) {
-            return;
-        }
-
-        // logger('mod_settings: ' . print_r($_REQUEST,true));
-
-        if (argc() > 1) {
-            if ($this->sm->call('post') !== false) {
-                return;
-            }
-        }
-
-        goaway(z_root() . '/settings');
-    }
-
-
-    public function get()
-    {
-
-        Navbar::set_selected('Settings');
-
-        if ((!local_channel()) || ($_SESSION['delegate'])) {
-            notice(t('Permission denied.') . EOL);
-            return login();
-        }
-
-
-        $channel = App::get_channel();
-        if ($channel) {
-            head_set_icon($channel['xchan_photo_s']);
-        }
-
-        $o = $this->sm->call('get');
-        if ($o !== false) {
-            return $o;
-        }
-
-        $o = EMPTY_STR;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Account.php b/Zotlabs/Module/Settings/Account.php
deleted file mode 100644
index f3fb590ef..000000000
--- a/Zotlabs/Module/Settings/Account.php
+++ /dev/null
@@ -1,125 +0,0 @@
- get_form_security_token("settings_account"),
-            '$title' => t('Account Settings'),
-            '$origpass' => array('origpass', t('Current Password'), ' ', ''),
-            '$password1' => array('npassword', t('Enter New Password'), '', ''),
-            '$password2' => array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')),
-            '$submit' => t('Submit'),
-            '$email' => array('email', t('Email Address:'), $email, ''),
-            '$removeme' => t('Remove Account'),
-            '$removeaccount' => t('Remove this account including all its channels'),
-            '$account_settings' => $account_settings
-        ));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
deleted file mode 100644
index 9f5525091..000000000
--- a/Zotlabs/Module/Settings/Channel.php
+++ /dev/null
@@ -1,773 +0,0 @@
- $v) {
-                    PermissionLimits::Set(local_channel(), $k, intval($_POST[$k]));
-                }
-                $acl = new AccessControl($channel);
-                $acl->set_from_array($_POST);
-                $x = $acl->get();
-
-                $r = q(
-                    "update channel set channel_allow_cid = '%s', channel_allow_gid = '%s', 
-					channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d",
-                    dbesc($x['allow_cid']),
-                    dbesc($x['allow_gid']),
-                    dbesc($x['deny_cid']),
-                    dbesc($x['deny_gid']),
-                    intval(local_channel())
-                );
-            } else {
-                $role_permissions = PermissionRoles::role_perms($_POST['permissions_role']);
-                if (!$role_permissions) {
-                    notice('Permissions category could not be found.');
-                    return;
-                }
-                $hide_presence = 1 - (intval($role_permissions['online']));
-                if ($role_permissions['default_collection']) {
-                    $r = q(
-                        "select hash from pgrp where uid = %d and gname = '%s' limit 1",
-                        intval(local_channel()),
-                        dbesc(t('Friends'))
-                    );
-                    if (!$r) {
-                        AccessList::add(local_channel(), t('Friends'));
-                        AccessList::member_add(local_channel(), t('Friends'), $channel['channel_hash']);
-                        $r = q(
-                            "select hash from pgrp where uid = %d and gname = '%s' limit 1",
-                            intval(local_channel()),
-                            dbesc(t('Friends'))
-                        );
-                    }
-                    if ($r) {
-                        q(
-                            "update channel set channel_default_group = '%s', channel_allow_gid = '%s', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d",
-                            dbesc($r[0]['hash']),
-                            dbesc('<' . $r[0]['hash'] . '>'),
-                            intval(local_channel())
-                        );
-                    } else {
-                        notice(sprintf('Default access list \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL);
-                        return;
-                    }
-                } // no default permissions
-                else {
-                    q(
-                        "update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '', 
-						channel_deny_cid = '' where channel_id = %d",
-                        intval(local_channel())
-                    );
-                }
-
-                if ($role_permissions['perms_connect']) {
-                    $x = Permissions::FilledPerms($role_permissions['perms_connect']);
-                    $str = Permissions::serialise($x);
-                    set_abconfig(local_channel(), $channel['channel_hash'], 'system', 'my_perms', $str);
-
-                    $autoperms = intval($role_permissions['perms_auto']);
-                }
-
-                if ($role_permissions['limits']) {
-                    foreach ($role_permissions['limits'] as $k => $v) {
-                        PermissionLimits::Set(local_channel(), $k, $v);
-                    }
-                }
-                if (array_key_exists('directory_publish', $role_permissions)) {
-                    $publish = intval($role_permissions['directory_publish']);
-                }
-            }
-
-            set_pconfig(local_channel(), 'system', 'hide_online_status', $hide_presence);
-            set_pconfig(local_channel(), 'system', 'permissions_role', $role);
-        }
-
-        // The post_comments permission is critical to privacy so we always allow you to set it, no matter what
-        // permission role is in place.
-
-        $post_comments = array_key_exists('post_comments', $_POST) ? intval($_POST['post_comments']) : PERMS_SPECIFIC;
-        PermissionLimits::Set(local_channel(), 'post_comments', $post_comments);
-
-        $post_mail = array_key_exists('post_mail', $_POST) ? intval($_POST['post_mail']) : PERMS_SPECIFIC;
-        PermissionLimits::Set(local_channel(), 'post_mail', $post_mail);
-
-
-        $publish = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1 : 0);
-        $username = ((x($_POST, 'username')) ? escape_tags(trim($_POST['username'])) : '');
-        $timezone = ((x($_POST, 'timezone_select')) ? notags(trim($_POST['timezone_select'])) : '');
-        $defloc = ((x($_POST, 'defloc')) ? notags(trim($_POST['defloc'])) : '');
-        $openid = ((x($_POST, 'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
-        $maxreq = ((x($_POST, 'maxreq')) ? intval($_POST['maxreq']) : 0);
-        $expire = ((x($_POST, 'expire')) ? intval($_POST['expire']) : 0);
-        $evdays = ((x($_POST, 'evdays')) ? intval($_POST['evdays']) : 3);
-        $photo_path = ((x($_POST, 'photo_path')) ? escape_tags(trim($_POST['photo_path'])) : '');
-        $attach_path = ((x($_POST, 'attach_path')) ? escape_tags(trim($_POST['attach_path'])) : '');
-        $noindex = ((x($_POST, 'noindex')) ? intval($_POST['noindex']) : 0);
-        $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']), ENT_QUOTES) : '');
-
-        $expire_items = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items']) : 0);
-        $expire_starred = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0);
-        $expire_photos = ((x($_POST, 'expire_photos')) ? intval($_POST['expire_photos']) : 0);
-        $expire_network_only = ((x($_POST, 'expire_network_only')) ? intval($_POST['expire_network_only']) : 0);
-
-        $allow_location = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1 : 0);
-
-        $blocktags = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0 : 1); // this setting is inverted!
-        $unkmail = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1 : 0);
-        $cntunkmail = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
-        $suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0);
-//      $anymention       = ((x($_POST,'anymention')) ? intval($_POST['anymention'])  : 0);
-        $hyperdrive = ((x($_POST, 'hyperdrive')) ? intval($_POST['hyperdrive']) : 0);
-        $activitypub = ((x($_POST, 'activitypub')) ? intval($_POST['activitypub']) : 0);
-        $tag_username = ((x($_POST, 'tag_username')) ? intval($_POST['tag_username']) : 0);
-        $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1 : 0);
-        $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1 : 0);
-        $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1 : 0);
-        $adult = (($_POST['adult'] == 1) ? 1 : 0);
-        $defpermcat = ((x($_POST, 'defpermcat')) ? notags(trim($_POST['defpermcat'])) : 'default');
-
-        $hide_friends = 1 - intval($_POST['hide_friends']);
-
-        $cal_first_day = (((x($_POST, 'first_day')) && intval($_POST['first_day']) >= 0 && intval($_POST['first_day']) < 7) ? intval($_POST['first_day']) : 0);
-        $mailhost = ((array_key_exists('mailhost', $_POST)) ? notags(trim($_POST['mailhost'])) : '');
-        $profile_assign = ((x($_POST, 'profile_assign')) ? notags(trim($_POST['profile_assign'])) : '');
-        $permit_all_mentions = (($_POST['permit_all_mentions'] == 1) ? 1 : 0);
-        $close_comment_days = (($_POST['close_comments']) ? intval($_POST['close_comments']) : 0);
-        if ($close_comment_days) {
-            set_pconfig(local_channel(), 'system', 'close_comments', $close_comment_days . ' days');
-        } else {
-            set_pconfig(local_channel(), 'system', 'close_comments', EMPTY_STR);
-        }
-    
-        // allow a permission change to over-ride the autoperms setting from the form
-        if (!isset($autoperms)) {
-            $autoperms = ((x($_POST, 'autoperms')) ? intval($_POST['autoperms']) : 0);
-        }
-
-
-        $pageflags = $channel['channel_pageflags'];
-        $existing_adult = (($pageflags & PAGE_ADULT) ? 1 : 0);
-        if ($adult != $existing_adult) {
-            $pageflags = ($pageflags ^ PAGE_ADULT);
-        }
-
-
-        $notify = 0;
-
-        if (x($_POST, 'notify1')) {
-            $notify += intval($_POST['notify1']);
-        }
-        if (x($_POST, 'notify2')) {
-            $notify += intval($_POST['notify2']);
-        }
-        if (x($_POST, 'notify3')) {
-            $notify += intval($_POST['notify3']);
-        }
-        if (x($_POST, 'notify4')) {
-            $notify += intval($_POST['notify4']);
-        }
-        if (x($_POST, 'notify5')) {
-            $notify += intval($_POST['notify5']);
-        }
-        if (x($_POST, 'notify6')) {
-            $notify += intval($_POST['notify6']);
-        }
-        if (x($_POST, 'notify7')) {
-            $notify += intval($_POST['notify7']);
-        }
-        if (x($_POST, 'notify8')) {
-            $notify += intval($_POST['notify8']);
-        }
-        if (x($_POST, 'notify10')) {
-            $notify += intval($_POST['notify10']);
-        }
-
-
-        $vnotify = 0;
-
-        if (x($_POST, 'vnotify1')) {
-            $vnotify += intval($_POST['vnotify1']);
-        }
-        if (x($_POST, 'vnotify2')) {
-            $vnotify += intval($_POST['vnotify2']);
-        }
-        if (x($_POST, 'vnotify3')) {
-            $vnotify += intval($_POST['vnotify3']);
-        }
-        if (x($_POST, 'vnotify4')) {
-            $vnotify += intval($_POST['vnotify4']);
-        }
-        if (x($_POST, 'vnotify5')) {
-            $vnotify += intval($_POST['vnotify5']);
-        }
-        if (x($_POST, 'vnotify6')) {
-            $vnotify += intval($_POST['vnotify6']);
-        }
-        if (x($_POST, 'vnotify7')) {
-            $vnotify += intval($_POST['vnotify7']);
-        }
-        if (x($_POST, 'vnotify8')) {
-            $vnotify += intval($_POST['vnotify8']);
-        }
-        if (x($_POST, 'vnotify9')) {
-            $vnotify += intval($_POST['vnotify9']);
-        }
-        if (x($_POST, 'vnotify10')) {
-            $vnotify += intval($_POST['vnotify10']);
-        }
-        if (x($_POST, 'vnotify11') && is_site_admin()) {
-            $vnotify += intval($_POST['vnotify11']);
-        }
-        if (x($_POST, 'vnotify12')) {
-            $vnotify += intval($_POST['vnotify12']);
-        }
-        if (x($_POST, 'vnotify13')) {
-            $vnotify += intval($_POST['vnotify13']);
-        }
-        if (x($_POST, 'vnotify14')) {
-            $vnotify += intval($_POST['vnotify14']);
-        }
-        if (x($_POST, 'vnotify15')) {
-            $vnotify += intval($_POST['vnotify15']);
-        }
-        if (x($_POST, 'vnotify16')) {
-            $vnotify += intval($_POST['vnotify16']);
-        }
-
-        $always_show_in_notices = x($_POST, 'always_show_in_notices') ? 1 : 0;
-
-        $err = '';
-
-        $name_change = false;
-
-        if ($username != $channel['channel_name']) {
-            $name_change = true;
-            require_once('include/channel.php');
-            $err = Zlib\Channel::validate_channelname($username);
-            if ($err) {
-                notice($err);
-                return;
-            }
-        }
-
-        if ($timezone != $channel['channel_timezone']) {
-            if (strlen($timezone)) {
-                date_default_timezone_set($timezone);
-            }
-        }
-
-
-        $followed_tags = $_POST['followed_tags'];
-        $ntags = [];
-        if ($followed_tags) {
-            $tags = explode(',', $followed_tags);
-            foreach ($tags as $t) {
-                $t = trim($t);
-                if ($t) {
-                    $ntags[] = $t;
-                }
-            }
-        }
-
-        set_pconfig(local_channel(), 'system', 'followed_tags', ($ntags) ? $ntags : EMPTY_STR);
-        set_pconfig(local_channel(), 'system', 'use_browser_location', $allow_location);
-        set_pconfig(local_channel(), 'system', 'suggestme', $suggestme);
-        set_pconfig(local_channel(), 'system', 'post_newfriend', $post_newfriend);
-        set_pconfig(local_channel(), 'system', 'post_joingroup', $post_joingroup);
-        set_pconfig(local_channel(), 'system', 'post_profilechange', $post_profilechange);
-        set_pconfig(local_channel(), 'system', 'blocktags', $blocktags);
-        set_pconfig(local_channel(), 'system', 'channel_menu', $channel_menu);
-        set_pconfig(local_channel(), 'system', 'vnotify', $vnotify);
-        set_pconfig(local_channel(), 'system', 'always_show_in_notices', $always_show_in_notices);
-        set_pconfig(local_channel(), 'system', 'evdays', $evdays);
-        set_pconfig(local_channel(), 'system', 'photo_path', $photo_path);
-        set_pconfig(local_channel(), 'system', 'attach_path', $attach_path);
-        set_pconfig(local_channel(), 'system', 'cal_first_day', $cal_first_day);
-        set_pconfig(local_channel(), 'system', 'default_permcat', $defpermcat);
-        set_pconfig(local_channel(), 'system', 'email_notify_host', $mailhost);
-        set_pconfig(local_channel(), 'system', 'profile_assign', $profile_assign);
-//      set_pconfig(local_channel(),'system','anymention',$anymention);
-        set_pconfig(local_channel(), 'system', 'hyperdrive', $hyperdrive);
-        set_pconfig(local_channel(), 'system', 'activitypub', $activitypub);
-        set_pconfig(local_channel(), 'system', 'autoperms', $autoperms);
-        set_pconfig(local_channel(), 'system', 'tag_username', $tag_username);
-        set_pconfig(local_channel(), 'system', 'permit_all_mentions', $permit_all_mentions);
-        set_pconfig(local_channel(), 'system', 'noindex', $noindex);
-
-
-        $r = q(
-            "update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d",
-            dbesc($username),
-            intval($pageflags),
-            dbesc($timezone),
-            dbesc($defloc),
-            intval($notify),
-            intval($unkmail),
-            intval($maxreq),
-            intval($expire),
-            intval(local_channel())
-        );
-        if ($r) {
-            info(t('Settings updated.') . EOL);
-        }
-
-
-        $r = q(
-            "UPDATE profile SET publish = %d, hide_friends = %d WHERE is_default = 1 AND uid = %d",
-            intval($publish),
-            intval($hide_friends),
-            intval(local_channel())
-        );
-        $r = q(
-            "UPDATE xchan SET xchan_hidden = %d WHERE xchan_hash = '%s'",
-            intval(1 - $publish),
-            intval($channel['channel_hash'])
-        );
-
-        if ($name_change) {
-            // catch xchans for all protocols by matching the url
-            $r = q(
-                "update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_url = '%s'",
-                dbesc($username),
-                dbesc(datetime_convert()),
-                dbesc(z_root() . '/channel/' . $channel['channel_address'])
-            );
-            $r = q(
-                "update profile set fullname = '%s' where uid = %d and is_default = 1",
-                dbesc($username),
-                intval($channel['channel_id'])
-            );
-            if (Zlib\Channel::is_system($channel['channel_id'])) {
-                set_config('system', 'sitename', $username);
-            }
-        }
-
-        Run::Summon(['Directory', local_channel()]);
-
-        Libsync::build_sync_packet();
-
-
-        if ($email_changed && App::$config['system']['register_policy'] == REGISTER_VERIFY) {
-            // FIXME - set to un-verified, blocked and redirect to logout
-            // Q: Why? Are we verifying people or email addresses?
-            // A: the policy is to verify email addresses
-        }
-
-        goaway(z_root() . '/settings');
-        return; // NOTREACHED
-    }
-
-    public function get()
-    {
-
-        require_once('include/permissions.php');
-
-
-        $yes_no = [t('No'), t('Yes')];
-
-
-        $p = q(
-            "SELECT * FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1",
-            intval(local_channel())
-        );
-        if (count($p)) {
-            $profile = $p[0];
-        }
-
-        load_pconfig(local_channel(), 'expire');
-
-        $channel = App::get_channel();
-
-        $global_perms = Permissions::Perms();
-
-        $permiss = [];
-
-        $perm_opts = [
-            [t('Restricted - from connections only'), PERMS_SPECIFIC],
-            [t('Semi-public - from anybody that can be identified'), PERMS_AUTHED],
-            [t('Public - from anybody on the internet'), PERMS_PUBLIC]
-        ];
-
-        $limits = PermissionLimits::Get(local_channel());
-        $anon_comments = get_config('system', 'anonymous_comments');
-
-        foreach ($global_perms as $k => $perm) {
-            $options = [];
-            $can_be_public = ((strstr($k, 'view') || ($k === 'post_comments' && $anon_comments)) ? true : false);
-            foreach ($perm_opts as $opt) {
-                if ($opt[1] == PERMS_PUBLIC && (!$can_be_public)) {
-                    continue;
-                }
-                $options[$opt[1]] = $opt[0];
-            }
-            if ($k === 'post_comments') {
-                $comment_perms = [$k, $perm, $limits[$k], '', $options];
-            } elseif ($k === 'post_mail') {
-                $mail_perms = [$k, $perm, $limits[$k], '', $options];
-            } else {
-                $permiss[] = array($k, $perm, $limits[$k], '', $options);
-            }
-        }
-
-        //      logger('permiss: ' . print_r($permiss,true));
-
-        $username = $channel['channel_name'];
-        $nickname = $channel['channel_address'];
-        $timezone = $channel['channel_timezone'];
-        $notify = $channel['channel_notifyflags'];
-        $defloc = $channel['channel_location'];
-
-        $maxreq = $channel['channel_max_friend_req'];
-        $expire = $channel['channel_expire_days'];
-        $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT);
-        $sys_expire = get_config('system', 'default_expire_days');
-
-        $hide_presence = intval(get_pconfig(local_channel(), 'system', 'hide_online_status'));
-
-        $expire_items = get_pconfig(local_channel(), 'expire', 'items');
-        $expire_items = (($expire_items === false) ? '1' : $expire_items); // default if not set: 1
-
-        $expire_notes = get_pconfig(local_channel(), 'expire', 'notes');
-        $expire_notes = (($expire_notes === false) ? '1' : $expire_notes); // default if not set: 1
-
-        $expire_starred = get_pconfig(local_channel(), 'expire', 'starred');
-        $expire_starred = (($expire_starred === false) ? '1' : $expire_starred); // default if not set: 1
-
-
-        $expire_photos = get_pconfig(local_channel(), 'expire', 'photos');
-        $expire_photos = (($expire_photos === false) ? '0' : $expire_photos); // default if not set: 0
-
-        $expire_network_only = get_pconfig(local_channel(), 'expire', 'network_only');
-        $expire_network_only = (($expire_network_only === false) ? '0' : $expire_network_only); // default if not set: 0
-
-
-        $suggestme = get_pconfig(local_channel(), 'system', 'suggestme');
-        $suggestme = (($suggestme === false) ? '0' : $suggestme); // default if not set: 0
-
-        $post_newfriend = get_pconfig(local_channel(), 'system', 'post_newfriend');
-        $post_newfriend = (($post_newfriend === false) ? '0' : $post_newfriend); // default if not set: 0
-
-        $post_joingroup = get_pconfig(local_channel(), 'system', 'post_joingroup');
-        $post_joingroup = (($post_joingroup === false) ? '0' : $post_joingroup); // default if not set: 0
-
-        $post_profilechange = get_pconfig(local_channel(), 'system', 'post_profilechange');
-        $post_profilechange = (($post_profilechange === false) ? '0' : $post_profilechange); // default if not set: 0
-
-        $blocktags = get_pconfig(local_channel(), 'system', 'blocktags');
-        $blocktags = (($blocktags === false) ? '0' : $blocktags);
-
-        $timezone = date_default_timezone_get();
-
-        $opt_tpl = Theme::get_template("field_checkbox.tpl");
-        if (get_config('system', 'publish_all')) {
-            $profile_in_dir = '';
-        } else {
-            $profile_in_dir = replace_macros($opt_tpl, array(
-                '$field' => array('profile_in_directory', t('Publish your profile in the network directory'), $profile['publish'], '', $yes_no),
-            ));
-        }
-
-        $suggestme = replace_macros($opt_tpl, array(
-            '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', $yes_no),
-
-        ));
-
-        $subdir = ((strlen(App::get_path())) ? '
          ' . t('or') . ' ' . z_root() . '/channel/' . $nickname : '');
-
-        $webbie = $nickname . '@' . App::get_hostname();
-        $intl_nickname = unpunify($nickname) . '@' . unpunify(App::get_hostname());
-
-        $prof_addr = replace_macros(Theme::get_template('channel_settings_header.tpl'), array(
-            '$desc' => t('Your channel address is'),
-            '$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . ' (' . $webbie . ')'),
-            '$compat' => t('Friends using compatible applications can use this address to connect with you.'),
-            '$subdir' => $subdir,
-            '$davdesc' => t('Your files/photos are accessible as a network drive at'),
-            '$davpath' => z_root() . '/dav/' . $nickname,
-            '$windows' => t('(Windows)'),
-            '$other' => t('(other platforms)'),
-            '$or' => t('or'),
-            '$davspath' => 'davs://' . App::get_hostname() . '/dav/' . $nickname,
-            '$basepath' => App::get_hostname()
-        ));
-
-
-        $pcat = new Permcat(local_channel());
-        $pcatlist = $pcat->listing();
-        $permcats = [];
-        if ($pcatlist) {
-            foreach ($pcatlist as $pc) {
-                $permcats[$pc['name']] = $pc['localname'];
-            }
-        }
-
-        $default_permcat = get_pconfig(local_channel(), 'system', 'default_permcat', 'default');
-
-
-        $acl = new AccessControl($channel);
-        $perm_defaults = $acl->get();
-
-        $group_select = AccessList::select(local_channel(), $channel['channel_default_group']);
-
-
-        $m1 = Menu::list(local_channel());
-        $menu = false;
-        if ($m1) {
-            $menu = [];
-            $current = get_pconfig(local_channel(), 'system', 'channel_menu');
-            $menu[] = array('name' => '', 'selected' => ((!$current) ? true : false));
-            foreach ($m1 as $m) {
-                $menu[] = array('name' => htmlspecialchars($m['menu_name'], ENT_COMPAT, 'UTF-8'), 'selected' => (($m['menu_name'] === $current) ? ' selected="selected" ' : false));
-            }
-        }
-
-        $evdays = get_pconfig(local_channel(), 'system', 'evdays');
-        if (!$evdays) {
-            $evdays = 3;
-        }
-
-        $permissions_role = get_pconfig(local_channel(), 'system', 'permissions_role');
-        if (!$permissions_role) {
-            $permissions_role = 'custom';
-        }
-
-        $autoperms = replace_macros(Theme::get_template('field_checkbox.tpl'), [
-                '$field' => ['autoperms', t('Automatic connection approval'), ((get_pconfig(local_channel(), 'system', 'autoperms', 0)) ? 1 : 0),
-                t('If enabled, connection requests will be approved without your interaction'), $yes_no]
-        ]);
-
-        $hyperdrive = ['hyperdrive', t('Friend-of-friend conversations'), ((get_pconfig(local_channel(), 'system', 'hyperdrive', true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no];
-
-        if (get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) {
-            $apconfig = true;
-            $activitypub = replace_macros(Theme::get_template('field_checkbox.tpl'), ['$field' => ['activitypub', t('Enable ActivityPub protocol'), ((get_pconfig(local_channel(), 'system', 'activitypub', ACTIVITYPUB_ENABLED)) ? 1 : 0), t('ActivityPub is an emerging internet standard for social communications'), $yes_no]]);
-        } else {
-            $apconfig = false;
-            $activitypub = '' . EOL;
-        }
-
-        $permissions_set = (($permissions_role != 'custom') ? true : false);
-
-        $perm_roles = PermissionRoles::roles();
-        // Don't permit changing to a collection (@TODO unless there is a mechanism to select the channel_parent)
-        unset($perm_roles['Collection']);
-
-
-        $vnotify = get_pconfig(local_channel(), 'system', 'vnotify');
-        $always_show_in_notices = get_pconfig(local_channel(), 'system', 'always_show_in_notices');
-        if ($vnotify === false) {
-            $vnotify = (-1);
-        }
-
-        $plugin = ['basic' => '', 'security' => '', 'notify' => '', 'misc' => ''];
-        Hook::call('channel_settings', $plugin);
-
-        $public_stream_mode = intval(get_config('system', 'public_stream_mode', PUBLIC_STREAM_NONE));
-
-        $ft = get_pconfig(local_channel(), 'system', 'followed_tags', '');
-        if ($ft && is_array($ft)) {
-            $followed = implode(',', $ft);
-        } else {
-            $followed = EMPTY_STR;
-        }
-
-
-        $o .= replace_macros(Theme::get_template('settings.tpl'), [
-            '$ptitle' => t('Channel Settings'),
-            '$submit' => t('Submit'),
-            '$baseurl' => z_root(),
-            '$uid' => local_channel(),
-            '$form_security_token' => get_form_security_token("settings"),
-            '$nickname_block' => $prof_addr,
-            '$h_basic' => t('Basic Settings'),
-            '$username' => array('username', t('Full name'), $username, ''),
-            '$email' => array('email', t('Email Address'), $email, ''),
-            '$timezone' => array('timezone_select', t('Your timezone'), $timezone, t('This is important for showing the correct time on shared events'), get_timezones()),
-            '$defloc' => array('defloc', t('Default post location'), $defloc, t('Optional geographical location to display on your posts')),
-            '$allowloc' => array('allow_location', t('Obtain post location from your web browser or device'), ((get_pconfig(local_channel(), 'system', 'use_browser_location')) ? 1 : ''), '', $yes_no),
-
-            '$adult' => array('adult', t('Adult content'), $adult_flag, t('Enable to indicate if this channel frequently or regularly publishes adult content. (Please also tag any adult material and/or nudity with #NSFW)'), $yes_no),
-
-            '$h_prv' => t('Security and Privacy'),
-            '$permissions_set' => $permissions_set,
-            '$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'),
-
-            '$hide_presence' => array('hide_presence', t('Hide my online presence'), $hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no),
-            '$hidefriends' => array('hide_friends', t('Allow others to view your friends and connections'), 1 - intval($profile['hide_friends']), '', $yes_no),
-            '$permiss_arr' => $permiss,
-            '$comment_perms' => $comment_perms,
-            '$mail_perms' => $mail_perms,
-            '$noindex' => ['noindex', t('Forbid indexing of your channel content by search engines'), get_pconfig($channel['channel_id'], 'system', 'noindex'), '', $yes_no],
-            '$close_comments' => ['close_comments', t('Disable acceptance of comments on my posts after this many days'), ((intval(get_pconfig(local_channel(), 'system', 'close_comments'))) ? intval(get_pconfig(local_channel(), 'system', 'close_comments')) : EMPTY_STR), t('Leave unset or enter 0 to allow comments indefinitely')],
-            '$blocktags' => array('blocktags', t('Allow others to tag your posts'), 1 - $blocktags, t('Often used by the community to retro-actively flag inappropriate content'), $yes_no),
-
-            '$lbl_p2macro' => t('Channel Permission Limits'),
-
-            '$expire' => array('expire', t('Expire conversations you have not participated in after this many days'), $expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf(t('This website expires after %d days.'), intval($sys_expire)) : t('This website does not provide an expiration policy.')) . ' ' . t('The website limit takes precedence if lower than your limit.')),
-            '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']), t('May reduce spam activity')),
-            '$permissions' => t('Default Access List'),
-            '$permdesc' => t("(click to open/close)"),
-            '$aclselect' => Libacl::populate($perm_defaults, false, PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
-            '$profseltxt' => t('Profile to assign new connections'),
-            '$profselect' => ((Features::enabled(local_channel(), 'multi_profiles')) ? contact_profile_assign(get_pconfig(local_channel(), 'system', 'profile_assign', '')) : ''),
-
-            '$allow_cid' => acl2json($perm_defaults['allow_cid']),
-            '$allow_gid' => acl2json($perm_defaults['allow_gid']),
-            '$deny_cid' => acl2json($perm_defaults['deny_cid']),
-            '$deny_gid' => acl2json($perm_defaults['deny_gid']),
-            '$suggestme' => $suggestme,
-            '$group_select' => $group_select,
-            '$can_change_role' => ((in_array($permissions_role, ['collection', 'collection_restricted'])) ? false : true),
-            '$permissions_role' => $permissions_role,
-            '$role' => array('permissions_role', t('Channel type and privacy'), $permissions_role, '', $perm_roles, ' onchange="update_role_text(); return false;"'),
-            '$defpermcat' => ['defpermcat', t('Default Permissions Role'), $default_permcat, '', $permcats],
-            '$permcat_enable' => Apps::system_app_installed(local_channel(), 'Roles'),
-            '$profile_in_dir' => $profile_in_dir,
-            '$hide_friends' => $hide_friends,
-            '$hide_wall' => $hide_wall,
-            '$unkmail' => $unkmail,
-            '$cntunkmail' => array('cntunkmail', t('Maximum direct messages per day from unknown people:'), intval($channel['channel_max_anon_mail']), t("Useful to reduce spamming if you allow direct messages from unknown people")),
-
-            '$autoperms' => $autoperms,
-//          '$anymention' => $anymention,
-            '$hyperdrive' => $hyperdrive,
-            '$activitypub' => $activitypub,
-            '$apconfig' => $apconfig,
-            '$close' => t('Close'),
-            '$h_not' => t('Notifications'),
-            '$activity_options' => t('By default post a status message when:'),
-            '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, '', $yes_no),
-            '$post_joingroup' => array('post_joingroup', t('joining a group/community'), $post_joingroup, '', $yes_no),
-            '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, '', $yes_no),
-            '$lbl_not' => t('Send a notification email when:'),
-            '$notify1' => array('notify1', t('You receive a connection request'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, '', $yes_no),
-//          '$notify2'  => array('notify2', t('Your connections are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, '', $yes_no),
-            '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, '', $yes_no),
-            '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, '', $yes_no),
-            '$notify10' => array('notify10', t('Someone shares a followed conversation'), ($notify & NOTIFY_RESHARE), NOTIFY_RESHARE, '', $yes_no),
-            '$notify5' => array('notify5', t('You receive a direct (private) message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, '', $yes_no),
-//          '$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, '', $yes_no),
-            '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, '', $yes_no),
-//          '$notify8'  => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, '', $yes_no),
-
-            '$notify9' => array('notify9', t('Someone likes your post/comment'), ($notify & NOTIFY_LIKE), NOTIFY_LIKE, '', $yes_no),
-
-
-            '$lbl_vnot' => t('Show visual notifications including:'),
-
-            '$vnotify1' => array('vnotify1', t('Unseen stream activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
-            '$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no),
-            '$vnotify3' => array('vnotify3', t('Unseen direct messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no),
-            '$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no),
-            '$vnotify5' => array('vnotify5', t('Events today'), ($vnotify & VNOTIFY_EVENTTODAY), VNOTIFY_EVENTTODAY, '', $yes_no),
-            '$vnotify6' => array('vnotify6', t('Upcoming birthdays'), ($vnotify & VNOTIFY_BIRTHDAY), VNOTIFY_BIRTHDAY, t('Not available in all themes'), $yes_no),
-            '$vnotify7' => array('vnotify7', t('System (personal) notifications'), ($vnotify & VNOTIFY_SYSTEM), VNOTIFY_SYSTEM, '', $yes_no),
-            '$vnotify8' => array('vnotify8', t('System info messages'), ($vnotify & VNOTIFY_INFO), VNOTIFY_INFO, t('Recommended'), $yes_no),
-            '$vnotify9' => array('vnotify9', t('System critical alerts'), ($vnotify & VNOTIFY_ALERT), VNOTIFY_ALERT, t('Recommended'), $yes_no),
-            '$vnotify10' => array('vnotify10', t('New connections'), ($vnotify & VNOTIFY_INTRO), VNOTIFY_INTRO, t('Recommended'), $yes_no),
-            '$vnotify11' => ((is_site_admin()) ? array('vnotify11', t('System Registrations'), ($vnotify & VNOTIFY_REGISTER), VNOTIFY_REGISTER, '', $yes_no) : []),
-//          '$vnotify12'  => array('vnotify12', t('Unseen shared files'), ($vnotify & VNOTIFY_FILES), VNOTIFY_FILES, '', $yes_no),
-            '$vnotify13' => (($public_stream_mode) ? ['vnotify13', t('Unseen public stream activity'), ($vnotify & VNOTIFY_PUBS), VNOTIFY_PUBS, '', $yes_no] : []),
-            '$vnotify14' => array('vnotify14', t('Unseen likes and dislikes'), ($vnotify & VNOTIFY_LIKE), VNOTIFY_LIKE, '', $yes_no),
-            '$vnotify15' => array('vnotify15', t('Unseen group posts'), ($vnotify & VNOTIFY_FORUMS), VNOTIFY_FORUMS, '', $yes_no),
-            '$vnotify16' => ((is_site_admin()) ? array('vnotify16', t('Reported content'), ($vnotify & VNOTIFY_REPORTS), VNOTIFY_REPORTS, '', $yes_no) : []),
-            '$desktop_notifications_info' => t('Desktop notifications are unavailable because the required browser permission has not been granted'),
-            '$desktop_notifications_request' => t('Grant permission'),
-            '$mailhost' => ['mailhost', t('Email notifications sent from (hostname)'), get_pconfig(local_channel(), 'system', 'email_notify_host', App::get_hostname()), sprintf(t('If your channel is mirrored to multiple locations, set this to your preferred location. This will prevent duplicate email notifications. Example: %s'), App::get_hostname())],
-            '$always_show_in_notices' => array('always_show_in_notices', t('Show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no),
-            '$permit_all_mentions' => ['permit_all_mentions', t('Accept messages from strangers which mention you'), get_pconfig(local_channel(), 'system', 'permit_all_mentions'), t('This setting bypasses normal permissions'), $yes_no],
-            '$followed_tags' => ['followed_tags', t('Accept messages from strangers which include any of the following hashtags'), $followed, t('comma separated, do not include the #')],
-            '$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')),
-            '$basic_addon' => $plugin['basic'],
-            '$sec_addon' => $plugin['security'],
-            '$notify_addon' => $plugin['notify'],
-            '$misc_addon' => $plugin['misc'],
-            '$lbl_time' => t('Date and time'),
-            '$miscdoc' => t('This section is reserved for use by optional addons and apps to provide additional settings.'),
-            '$h_advn' => t('Advanced Account/Page Type Settings'),
-            '$h_descadvn' => t('Change the behaviour of this account for special situations'),
-            '$pagetype' => $pagetype,
-            '$lbl_misc' => t('Miscellaneous'),
-            '$photo_path' => array('photo_path', t('Default photo upload folder name'), get_pconfig(local_channel(), 'system', 'photo_path'), t('%Y - current year, %m -  current month')),
-            '$attach_path' => array('attach_path', t('Default file upload folder name'), get_pconfig(local_channel(), 'system', 'attach_path'), t('%Y - current year, %m -  current month')),
-            '$menus' => $menu,
-            '$menu_desc' => t('Personal menu to display in your channel pages'),
-            '$removeme' => t('Remove Channel'),
-            '$removechannel' => t('Remove this channel.'),
-            '$tag_username' => ['tag_username', t('Mentions should display'), intval(get_pconfig(local_channel(), 'system', 'tag_username', get_config('system', 'tag_username', false))), t('Changes to this setting are applied to new posts/comments only. It is not retroactive.'),
-                [
-                    0 => t('the channel display name [example: @Barbara Jenkins]'),
-                    1 => t('the channel nickname [example: @barbara1976]'),
-                    2 => t('combined [example: @Barbara Jenkins (barbara1976)]'),
-                    127 => t('no preference, use the system default'),
-                ]],
-
-            '$cal_first_day' => array('first_day', t('Calendar week begins on'), intval(get_pconfig(local_channel(), 'system', 'cal_first_day')), t('This varies by country/culture'),
-                [0 => t('Sunday'),
-                    1 => t('Monday'),
-                    2 => t('Tuesday'),
-                    3 => t('Wednesday'),
-                    4 => t('Thursday'),
-                    5 => t('Friday'),
-                    6 => t('Saturday')
-                ]),
-        ]);
-
-        Hook::call('settings_form', $o);
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php
deleted file mode 100644
index bd240565d..000000000
--- a/Zotlabs/Module/Settings/Display.php
+++ /dev/null
@@ -1,248 +0,0 @@
- 100) {
-            $itemspage = 100;
-        }
-
-        if ($indentpx < 0) {
-            $indentpx = 0;
-        }
-        if ($indentpx > 20) {
-            $indentpx = 20;
-        }
-
-        set_pconfig(local_channel(), 'system', 'preload_images', $preload_images);
-        set_pconfig(local_channel(), 'system', 'user_scalable', $user_scalable);
-        set_pconfig(local_channel(), 'system', 'update_interval', $browser_update);
-        set_pconfig(local_channel(), 'system', 'itemspage', $itemspage);
-        set_pconfig(local_channel(), 'system', 'no_smilies', 1 - intval($nosmile));
-        set_pconfig(local_channel(), 'system', 'channel_divmore_height', $channel_divmore_height);
-        set_pconfig(local_channel(), 'system', 'stream_divmore_height', $stream_divmore_height);
-        set_pconfig(local_channel(), 'system', 'channel_menu', $channel_menu);
-        set_pconfig(local_channel(), 'system', 'thread_indent_px', $indentpx);
-
-        $newschema = '';
-        if ($theme) {
-            // call theme_post only if theme has not been changed
-            if (($themeconfigfile = $this->get_theme_config_file($theme)) != null) {
-                require_once($themeconfigfile);
-                if (class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) {
-                    $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config';
-                    $theme_config = new $clsname();
-                    $schemas = $theme_config->get_schemas();
-                    if (array_key_exists($_POST['schema'], $schemas)) {
-                        $newschema = $_POST['schema'];
-                    }
-                    if ($newschema === '---') {
-                        $newschema = '';
-                    }
-                    $theme_config->post();
-                }
-            }
-        }
-
-        logger('theme: ' . $theme . (($newschema) ? ':' . $newschema : ''));
-
-        $_SESSION['theme'] = $theme . (($newschema) ? ':' . $newschema : '');
-
-        $r = q(
-            "UPDATE channel SET channel_theme = '%s' WHERE channel_id = %d",
-            dbesc($theme . (($newschema) ? ':' . $newschema : '')),
-            intval(local_channel())
-        );
-
-        Hook::call('display_settings_post', $_POST);
-        Libsync::build_sync_packet();
-        goaway(z_root() . '/settings/display');
-        return; // NOTREACHED
-    }
-
-
-    public function get()
-    {
-
-        $yes_no = array(t('No'), t('Yes'));
-
-        $default_theme = get_config('system', 'theme');
-        if (!$default_theme) {
-            $default_theme = 'redbasic';
-        }
-
-        $themespec = explode(':', App::$channel['channel_theme']);
-        $existing_theme = $themespec[0];
-        $existing_schema = $themespec[1];
-
-        $theme = (($existing_theme) ? $existing_theme : $default_theme);
-
-        $allowed_themes_str = get_config('system', 'allowed_themes');
-        $allowed_themes_raw = explode(',', $allowed_themes_str);
-        $allowed_themes = [];
-        if (count($allowed_themes_raw)) {
-            foreach ($allowed_themes_raw as $x) {
-                if (strlen(trim($x)) && is_dir("view/theme/$x")) {
-                    $allowed_themes[] = trim($x);
-                }
-            }
-        }
-
-
-        $themes = [];
-        $files = glob('view/theme/*');
-        if ($allowed_themes) {
-            foreach ($allowed_themes as $th) {
-                $f = $th;
-
-                $info = get_theme_info($th);
-                $compatible = check_plugin_versions($info);
-                if (!$compatible) {
-                    $themes[$f] = sprintf(t('%s - (Incompatible)'), $f);
-                    continue;
-                }
-
-                $is_experimental = file_exists('view/theme/' . $th . '/experimental');
-                $unsupported = file_exists('view/theme/' . $th . '/unsupported');
-                $is_library = file_exists('view/theme/' . $th . '/library');
-
-                if (!$is_experimental or ($is_experimental && (get_config('experimentals', 'exp_themes') == 1 or get_config('experimentals', 'exp_themes') === false))) {
-                    $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f);
-                    if (!$is_library) {
-                        $themes[$f] = $theme_name;
-                    }
-                }
-            }
-        }
-
-        $theme_selected = ((array_key_exists('theme', $_SESSION) && $_SESSION['theme']) ? $_SESSION['theme'] : $theme);
-
-        if (strpos($theme_selected, ':')) {
-            $theme_selected = explode(':', $theme_selected)[0];
-        }
-
-
-        $preload_images = get_pconfig(local_channel(), 'system', 'preload_images');
-
-        $user_scalable = get_pconfig(local_channel(), 'system', 'user_scalable', '0');
-
-        $browser_update = intval(get_pconfig(local_channel(), 'system', 'update_interval', 30000)); // default if not set: 30 seconds
-        $browser_update = (($browser_update < 15000) ? 15 : $browser_update / 1000); // minimum 15 seconds
-
-        $itemspage = intval(get_pconfig(local_channel(), 'system', 'itemspage'));
-        $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items
-
-        $nosmile = get_pconfig(local_channel(), 'system', 'no_smilies');
-        $nosmile = (($nosmile === false) ? '0' : $nosmile); // default if not set: 0
-
-        $theme_config = "";
-        if (($themeconfigfile = $this->get_theme_config_file($theme)) != null) {
-            require_once($themeconfigfile);
-            if (class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) {
-                $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config';
-                $thm_config = new $clsname();
-                $schemas = $thm_config->get_schemas();
-                $theme_config = $thm_config->get();
-            }
-        }
-
-        // logger('schemas: ' . print_r($schemas,true));
-
-        $tpl = Theme::get_template("settings_display.tpl");
-        $o = replace_macros($tpl, array(
-            '$ptitle' => t('Display Settings'),
-            '$d_tset' => t('Theme Settings'),
-            '$d_ctset' => t('Custom Theme Settings'),
-            '$d_cset' => t('Content Settings'),
-            '$form_security_token' => get_form_security_token("settings_display"),
-            '$submit' => t('Submit'),
-            '$baseurl' => z_root(),
-            '$uid' => local_channel(),
-
-            '$theme' => (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false),
-            '$schema' => array('schema', t('Select scheme'), $existing_schema, '', $schemas),
-
-            '$preload_images' => array('preload_images', t("Preload images before rendering the page"), $preload_images, t("The subjective page load time will be longer but the page will be ready when displayed"), $yes_no),
-            '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, '', $yes_no),
-            '$ajaxint' => array('browser_update', t("Update notifications every xx seconds"), $browser_update, t('Minimum of 15 seconds, no maximum')),
-            '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
-            '$nosmile' => array('nosmile', t("Show emoticons (smilies) as images"), 1 - intval($nosmile), '', $yes_no),
-            '$channel_menu' => ['channel_menu', t('Provide channel menu in navigation bar'), get_pconfig(local_channel(), 'system', 'channel_menu', get_config('system', 'channel_menu', 0)), t('Default: channel menu located in app menu'), $yes_no],
-            '$layout_editor' => t('System Page Layout Editor - (advanced)'),
-            '$theme_config' => $theme_config,
-            '$expert' => Features::enabled(local_channel(), 'advanced_theming'),
-            '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(), 'system', 'channel_divmore_height')) ? get_pconfig(local_channel(), 'system', 'channel_divmore_height') : 400), t('click to expand content exceeding this height')),
-            '$stream_divmore_height' => array('stream_divmore_height', t('Stream page max height of content (in pixels)'), ((get_pconfig(local_channel(), 'system', 'stream_divmore_height')) ? get_pconfig(local_channel(), 'system', 'stream_divmore_height') : 400), t('click to expand content exceeding this height')),
-            '$indentpx' => ['indentpx', t('Indent threaded comments this many pixels from the parent'), intval(get_pconfig(local_channel(), 'system', 'thread_indent_px', get_config('system', 'thread_indent_px', 0))), t('0-20')],
-
-        ));
-
-        Hook::call('display_settings', $o);
-        return $o;
-    }
-
-
-    public function get_theme_config_file($theme)
-    {
-
-        $base_theme = App::$theme_info['extends'];
-
-        if (file_exists("view/theme/$theme/php/config.php")) {
-            return "view/theme/$theme/php/config.php";
-        }
-        if (file_exists("view/theme/$base_theme/php/config.php")) {
-            return "view/theme/$base_theme/php/config.php";
-        }
-        return null;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php
deleted file mode 100644
index 28fc266ba..000000000
--- a/Zotlabs/Module/Settings/Featured.php
+++ /dev/null
@@ -1,91 +0,0 @@
- 99) {
-                $cmax = 99;
-            }
-            $cmin = intval($_POST['affinity_cmin']);
-            if ($cmin < 0 || $cmin > 99) {
-                $cmin = 0;
-            }
-            set_pconfig(local_channel(), 'affinity', 'cmin', $cmin);
-            set_pconfig(local_channel(), 'affinity', 'cmax', $cmax);
-
-            info(t('Affinity Slider settings updated.') . EOL);
-        }
-
-        Libsync::build_sync_packet();
-        return;
-    }
-
-    public function get()
-    {
-        $settings_addons = "";
-
-        $o = '';
-
-        $r = q("SELECT * FROM hook WHERE hook = 'feature_settings' ");
-        if (!$r) {
-            $settings_addons = t('No feature settings configured');
-        }
-
-        if (Features::enabled(local_channel(), 'affinity')) {
-            $cmax = intval(get_pconfig(local_channel(), 'affinity', 'cmax'));
-            $cmax = (($cmax) ? $cmax : 99);
-            $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), array(
-                '$field' => array('affinity_cmax', t('Default maximum affinity level'), $cmax, t('0-99 default 99'))
-            ));
-            $cmin = intval(get_pconfig(local_channel(), 'affinity', 'cmin'));
-            $cmin = (($cmin) ? $cmin : 0);
-            $setting_fields .= replace_macros(Theme::get_template('field_input.tpl'), array(
-                '$field' => array('affinity_cmin', t('Default minimum affinity level'), $cmin, t('0-99 - default 0'))
-            ));
-
-            $settings_addons .= replace_macros(Theme::get_template('generic_addon_settings.tpl'), array(
-                '$addon' => array('affinity_slider', '' . t('Affinity Slider Settings'), '', t('Submit')),
-                '$content' => $setting_fields
-            ));
-        }
-
-        Hook::call('feature_settings', $settings_addons);
-
-        $this->sortpanels($settings_addons);
-
-
-        $tpl = Theme::get_template("settings_addons.tpl");
-        $o .= replace_macros($tpl, array(
-            '$form_security_token' => get_form_security_token("settings_featured"),
-            '$title' => t('Addon Settings'),
-            '$descrip' => t('Please save/submit changes to any panel before opening another.'),
-            '$settings_addons' => $settings_addons
-        ));
-        return $o;
-    }
-
-    public function sortpanels(&$s)
-    {
-        $a = explode('
          ', $s);
-        if ($a) {
-            usort($a, 'featured_sort');
-            $s = implode('
          ', $a);
-        }
-    }
-}
diff --git a/Zotlabs/Module/Settings/Features.php b/Zotlabs/Module/Settings/Features.php
deleted file mode 100644
index a6b601cef..000000000
--- a/Zotlabs/Module/Settings/Features.php
+++ /dev/null
@@ -1,71 +0,0 @@
- $fdata) {
-            foreach (array_slice($fdata, 1) as $f) {
-                $k = $f[0];
-                if (array_key_exists("feature_$k", $_POST)) {
-                    set_pconfig(local_channel(), 'feature', $k, (string)$_POST["feature_$k"]);
-                } else {
-                    set_pconfig(local_channel(), 'feature', $k, '');
-                }
-            }
-        }
-        Libsync::build_sync_packet();
-        return;
-    }
-
-    public function get()
-    {
-
-        $arr = [];
-        $harr = [];
-
-
-        $all_features_raw = Zlib\Features::get(false);
-
-        foreach ($all_features_raw as $fname => $fdata) {
-            foreach (array_slice($fdata, 1) as $f) {
-                $harr[$f[0]] = ((intval(Zlib\Features::enabled(local_channel(), $f[0]))) ? "1" : '');
-            }
-        }
-
-        $features = Zlib\Features::get(true);
-
-        foreach ($features as $fname => $fdata) {
-            $arr[$fname] = [];
-            $arr[$fname][0] = $fdata[0];
-            foreach (array_slice($fdata, 1) as $f) {
-                $arr[$fname][1][] = array('feature_' . $f[0], $f[1], ((intval(Zlib\Features::enabled(local_channel(), $f[0]))) ? "1" : ''), $f[2], array(t('Off'), t('On')));
-                unset($harr[$f[0]]);
-            }
-        }
-
-        $tpl = Theme::get_template("settings_features.tpl");
-        $o .= replace_macros($tpl, array(
-            '$form_security_token' => get_form_security_token("settings_features"),
-            '$title' => t('Additional Features'),
-            '$features' => $arr,
-            '$hiddens' => $harr,
-            '$baseurl' => z_root(),
-            '$submit' => t('Submit'),
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
deleted file mode 100644
index 4f67192d5..000000000
--- a/Zotlabs/Module/Settings/Network.php
+++ /dev/null
@@ -1,134 +0,0 @@
- 'settings/network',
-            '$form_security_token' => get_form_security_token("settings_network"),
-            '$title' => t('Activity Settings'),
-            '$features' => $arr,
-            '$baseurl' => z_root(),
-            '$submit' => t('Submit'),
-        ));
-
-        return $o;
-    }
-
-    public function get_features()
-    {
-        $arr = [
-
-            [
-                'archives',
-                t('Search by Date'),
-                t('Ability to select posts by date ranges'),
-                false,
-                get_config('feature_lock', 'archives')
-            ],
-
-            [
-                'savedsearch',
-                t('Saved Searches'),
-                t('Save search terms for re-use'),
-                false,
-                get_config('feature_lock', 'savedsearch')
-            ],
-
-            [
-                'order_tab',
-                t('Alternate Stream Order'),
-                t('Ability to order the stream by last post date, last comment date or unthreaded activities'),
-                false,
-                get_config('feature_lock', 'order_tab')
-            ],
-
-            [
-                'name_tab',
-                t('Contact Filter'),
-                t('Ability to display only posts of a selected contact'),
-                false,
-                get_config('feature_lock', 'name_tab')
-            ],
-
-            [
-                'forums_tab',
-                t('Forum Filter'),
-                t('Ability to display only posts of a specific forum'),
-                false,
-                get_config('feature_lock', 'forums_tab')
-            ],
-
-            [
-                'personal_tab',
-                t('Personal Posts Filter'),
-                t('Ability to display only posts that you\'ve interacted on'),
-                false,
-                get_config('feature_lock', 'personal_tab')
-            ],
-
-            [
-                'affinity',
-                t('Affinity Tool'),
-                t('Filter stream activity by depth of relationships'),
-                false,
-                get_config('feature_lock', 'affinity')
-            ],
-
-            [
-                'suggest',
-                t('Suggest Channels'),
-                t('Show friend and connection suggestions'),
-                false,
-                get_config('feature_lock', 'suggest')
-            ],
-
-            [
-                'connfilter',
-                t('Connection Filtering'),
-                t('Filter incoming posts from connections based on keywords/content'),
-                false,
-                get_config('feature_lock', 'connfilter')
-            ]
-
-        ];
-
-        return $arr;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Oauth.php b/Zotlabs/Module/Settings/Oauth.php
deleted file mode 100644
index 32f07b414..000000000
--- a/Zotlabs/Module/Settings/Oauth.php
+++ /dev/null
@@ -1,175 +0,0 @@
- 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST, 'submit')) {
-            check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
-
-            $name = ((x($_POST, 'name')) ? escape_tags($_POST['name']) : '');
-            $key = ((x($_POST, 'key')) ? escape_tags($_POST['key']) : '');
-            $secret = ((x($_POST, 'secret')) ? escape_tags($_POST['secret']) : '');
-            $redirect = ((x($_POST, 'redirect')) ? escape_tags($_POST['redirect']) : '');
-            $icon = ((x($_POST, 'icon')) ? escape_tags($_POST['icon']) : '');
-            $oauth2 = ((x($_POST, 'oauth2')) ? intval($_POST['oauth2']) : 0);
-            $ok = true;
-            if ($name == '') {
-                $ok = false;
-                notice(t('Name is required') . EOL);
-            }
-            if ($key == '' || $secret == '') {
-                $ok = false;
-                notice(t('Key and Secret are required') . EOL);
-            }
-
-            if ($ok) {
-                if ($_POST['submit'] == t("Update")) {
-                    $r = q(
-                        "UPDATE clients SET
-								client_id='%s',
-								pw='%s',
-								clname='%s',
-								redirect_uri='%s',
-								icon='%s',
-								uid=%d
-							WHERE client_id='%s'",
-                        dbesc($key),
-                        dbesc($secret),
-                        dbesc($name),
-                        dbesc($redirect),
-                        dbesc($icon),
-                        intval(local_channel()),
-                        dbesc($key)
-                    );
-                } else {
-                    $r = q(
-                        "INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid)
-						VALUES ('%s','%s','%s','%s','%s',%d)",
-                        dbesc($key),
-                        dbesc($secret),
-                        dbesc($name),
-                        dbesc($redirect),
-                        dbesc($icon),
-                        intval(local_channel())
-                    );
-                    $r = q(
-                        "INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ",
-                        dbesc($key),
-                        intval(local_channel()),
-                        dbesc('all')
-                    );
-                }
-            }
-            goaway(z_root() . "/settings/oauth/");
-            return;
-        }
-    }
-
-    public function get()
-    {
-
-        if ((argc() > 2) && (argv(2) === 'add')) {
-            $tpl = Theme::get_template("settings_oauth_edit.tpl");
-            $o .= replace_macros($tpl, array(
-                '$form_security_token' => get_form_security_token("settings_oauth"),
-                '$title' => t('Add application'),
-                '$submit' => t('Submit'),
-                '$cancel' => t('Cancel'),
-                '$name' => array('name', t('Name'), '', t('Name of application')),
-                '$key' => array('key', t('Consumer Key'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
-                '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
-                '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')),
-                '$icon' => array('icon', t('Icon url'), '', t('Optional')),
-            ));
-            return $o;
-        }
-
-        if ((argc() > 3) && (argv(2) === 'edit')) {
-            $r = q(
-                "SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
-                dbesc(argv(3)),
-                local_channel()
-            );
-
-            if (!count($r)) {
-                notice(t('Application not found.'));
-                return;
-            }
-            $app = $r[0];
-
-            $tpl = Theme::get_template("settings_oauth_edit.tpl");
-            $o .= replace_macros($tpl, array(
-                '$form_security_token' => get_form_security_token("settings_oauth"),
-                '$title' => t('Add application'),
-                '$submit' => t('Update'),
-                '$cancel' => t('Cancel'),
-                '$name' => array('name', t('Name'), $app['clname'], ''),
-                '$key' => array('key', t('Consumer Key'), $app['client_id'], ''),
-                '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''),
-                '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''),
-                '$icon' => array('icon', t('Icon url'), $app['icon'], ''),
-            ));
-            return $o;
-        }
-
-        if ((argc() > 3) && (argv(2) === 'delete')) {
-            check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
-
-            $r = q(
-                "DELETE FROM clients WHERE client_id='%s' AND uid=%d",
-                dbesc(argv(3)),
-                local_channel()
-            );
-            goaway(z_root() . "/settings/oauth/");
-            return;
-        }
-
-
-        $r = q(
-            "SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my 
-				FROM clients
-				LEFT JOIN tokens ON clients.client_id=tokens.client_id
-				WHERE clients.uid IN (%d,0)",
-            local_channel(),
-            local_channel()
-        );
-
-
-        $tpl = Theme::get_template("settings_oauth.tpl");
-        $o .= replace_macros($tpl, array(
-            '$form_security_token' => get_form_security_token("settings_oauth"),
-            '$baseurl' => z_root(),
-            '$title' => t('Connected Apps'),
-            '$add' => t('Add application'),
-            '$edit' => t('Edit'),
-            '$delete' => t('Delete'),
-            '$consumerkey' => t('Client key starts with'),
-            '$noname' => t('No name'),
-            '$remove' => t('Remove authorization'),
-            '$apps' => $r,
-        ));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Oauth2.php b/Zotlabs/Module/Settings/Oauth2.php
deleted file mode 100644
index e12f0c0b8..000000000
--- a/Zotlabs/Module/Settings/Oauth2.php
+++ /dev/null
@@ -1,222 +0,0 @@
- 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST, 'submit')) {
-            check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2');
-
-            $name = ((x($_POST, 'name')) ? escape_tags(trim($_POST['name'])) : '');
-            $clid = ((x($_POST, 'clid')) ? escape_tags(trim($_POST['clid'])) : '');
-            $secret = ((x($_POST, 'secret')) ? escape_tags(trim($_POST['secret'])) : '');
-            $redirect = ((x($_POST, 'redirect')) ? escape_tags(trim($_POST['redirect'])) : '');
-            $grant = ((x($_POST, 'grant')) ? escape_tags(trim($_POST['grant'])) : '');
-            $scope = ((x($_POST, 'scope')) ? escape_tags(trim($_POST['scope'])) : '');
-            logger('redirect: ' . $redirect);
-            $ok = true;
-            if ($clid == '' || $secret == '') {
-                $ok = false;
-                notice(t('ID and Secret are required') . EOL);
-            }
-
-            if ($ok) {
-                if ($_POST['submit'] == t("Update")) {
-                    $r = q(
-                        "UPDATE oauth_clients SET
-								client_name = '%s',
-								client_id = '%s',
-								client_secret = '%s',
-								redirect_uri = '%s',
-								grant_types = '%s',
-								scope = '%s', 
-								user_id = %d
-							WHERE client_id='%s' and user_id = %s",
-                        dbesc($name),
-                        dbesc($clid),
-                        dbesc($secret),
-                        dbesc($redirect),
-                        dbesc($grant),
-                        dbesc($scope),
-                        intval(local_channel()),
-                        dbesc($clid),
-                        intval(local_channel())
-                    );
-                } else {
-                    $r = q(
-                        "INSERT INTO oauth_clients (client_name, client_id, client_secret, redirect_uri, grant_types, scope, user_id)
-						VALUES ('%s','%s','%s','%s','%s','%s',%d)",
-                        dbesc($name),
-                        dbesc($clid),
-                        dbesc($secret),
-                        dbesc($redirect),
-                        dbesc($grant),
-                        dbesc($scope),
-                        intval(local_channel())
-                    );
-                    $r = q(
-                        "INSERT INTO xperm (xp_client, xp_channel, xp_perm) VALUES ('%s', %d, '%s') ",
-                        dbesc($name),
-                        intval(local_channel()),
-                        dbesc('all')
-                    );
-                }
-            }
-            goaway(z_root() . "/settings/oauth2/");
-            return;
-        }
-    }
-
-    public function get()
-    {
-
-        if (!Apps::system_app_installed(local_channel(), 'Clients')) {
-            return;
-        }
-
-        if ((argc() > 2) && (argv(2) === 'add')) {
-            $tpl = Theme::get_template("settings_oauth2_edit.tpl");
-            $o .= replace_macros($tpl, array(
-                '$form_security_token' => get_form_security_token("settings_oauth2"),
-                '$title' => t('Add OAuth2 application'),
-                '$submit' => t('Submit'),
-                '$cancel' => t('Cancel'),
-                '$name' => array('name', t('Name'), '', t('Name of application')),
-                '$clid' => array('clid', t('Consumer ID'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
-                '$secret' => array('secret', t('Consumer Secret'), random_string(16), t('Automatically generated - change if desired. Max length 20')),
-                '$redirect' => array('redirect', t('Redirect'), '', t('Redirect URI - leave blank unless your application specifically requires this')),
-                '$grant' => array('grant', t('Grant Types'), '', t('leave blank unless your application specifically requires this')),
-                '$scope' => array('scope', t('Authorization scope'), '', t('leave blank unless your application specifically requires this')),
-            ));
-            return $o;
-        }
-
-        if ((argc() > 3) && (argv(2) === 'edit')) {
-            $r = q(
-                "SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= %d",
-                dbesc(argv(3)),
-                intval(local_channel())
-            );
-
-            if (!$r) {
-                notice(t('OAuth2 Application not found.'));
-                return;
-            }
-
-            $app = $r[0];
-
-            $tpl = Theme::get_template("settings_oauth2_edit.tpl");
-            $o .= replace_macros($tpl, array(
-                '$form_security_token' => get_form_security_token("settings_oauth2"),
-                '$title' => t('Add application'),
-                '$submit' => t('Update'),
-                '$cancel' => t('Cancel'),
-                '$name' => array('name', t('Name'), $app['client_name'], t('Name of application')),
-                '$clid' => array('clid', t('Consumer ID'), $app['client_id'], t('Automatically generated - change if desired. Max length 20')),
-                '$secret' => array('secret', t('Consumer Secret'), $app['client_secret'], t('Automatically generated - change if desired. Max length 20')),
-                '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], t('Redirect URI - leave blank unless your application specifically requires this')),
-                '$grant' => array('grant', t('Grant Types'), $app['grant_types'], t('leave blank unless your application specifically requires this')),
-                '$scope' => array('scope', t('Authorization scope'), $app['scope'], t('leave blank unless your application specifically requires this')),
-            ));
-            return $o;
-        }
-
-        if ((argc() > 3) && (argv(2) === 'delete')) {
-            check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2', 't');
-
-            $r = q(
-                "DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = %d",
-                dbesc(argv(3)),
-                intval(local_channel())
-            );
-            $r = q(
-                "DELETE FROM oauth_access_tokens WHERE client_id = '%s' AND user_id = %d",
-                dbesc(argv(3)),
-                intval(local_channel())
-            );
-            $r = q(
-                "DELETE FROM oauth_authorization_codes WHERE client_id = '%s' AND user_id = %d",
-                dbesc(argv(3)),
-                intval(local_channel())
-            );
-            $r = q(
-                "DELETE FROM oauth_refresh_tokens WHERE client_id = '%s' AND user_id = %d",
-                dbesc(argv(3)),
-                intval(local_channel())
-            );
-            goaway(z_root() . "/settings/oauth2/");
-            return;
-        }
-
-
-        $r = q(
-            "SELECT * FROM oauth_clients WHERE user_id = %d ",
-            intval(local_channel())
-        );
-
-        $c = q(
-            "select client_id, access_token from oauth_access_tokens where user_id = %d",
-            intval(local_channel())
-        );
-        if ($r && $c) {
-            foreach ($c as $cv) {
-                for ($x = 0; $x < count($r); $x++) {
-                    if ($r[$x]['client_id'] === $cv['client_id']) {
-                        if (!array_key_exists('tokens', $r[$x])) {
-                            $r[$x]['tokens'] = [];
-                        }
-                        $r[$x]['tokens'][] = $cv['access_token'];
-                    }
-                }
-            }
-        }
-
-        $tpl = Theme::get_template("settings_oauth2.tpl");
-        $o .= replace_macros($tpl, array(
-            '$form_security_token' => get_form_security_token("settings_oauth2"),
-            '$baseurl' => z_root(),
-            '$title' => t('Connected OAuth2 Apps'),
-            '$add' => t('Add application'),
-            '$edit' => t('Edit'),
-            '$delete' => t('Delete'),
-            '$consumerkey' => t('Client key starts with'),
-            '$noname' => t('No name'),
-            '$remove' => t('Remove authorization'),
-            '$apps' => $r,
-        ));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php
deleted file mode 100644
index e15ab0cfe..000000000
--- a/Zotlabs/Module/Settings/Permcats.php
+++ /dev/null
@@ -1,150 +0,0 @@
- $desc) {
-                if (array_key_exists('perms_' . $perm, $_POST)) {
-                    $pcarr[] = $perm;
-                }
-            }
-        }
-
-        Permcat::update(local_channel(), $name, $pcarr);
-
-        Libsync::build_sync_packet();
-
-        info(t('Permission role saved.') . EOL);
-
-        return;
-    }
-
-
-    public function get()
-    {
-
-        if (!local_channel()) {
-            return;
-        }
-
-        $channel = App::get_channel();
-
-
-        if (argc() > 2) {
-            $name = hex2bin(argv(2));
-        }
-
-        if (argc() > 3 && argv(3) === 'drop') {
-            Permcat::delete(local_channel(), $name);
-            Libsync::build_sync_packet();
-            json_return_and_die(['success' => true]);
-        }
-
-
-        $desc = t('Use this form to create permission rules for various classes of people or connections.');
-
-        $existing = [];
-
-        $pcat = new Permcat(local_channel());
-        $pcatlist = $pcat->listing();
-        $permcats = [];
-        if ($pcatlist) {
-            foreach ($pcatlist as $pc) {
-                if (($pc['name']) && ($name) && ($pc['name'] == $name)) {
-                    $existing = $pc['perms'];
-                }
-                if (!$pc['system']) {
-                    $permcats[bin2hex($pc['name'])] = $pc['localname'];
-                }
-            }
-        }
-
-        $hidden_perms = [];
-        $global_perms = Permissions::Perms();
-
-        foreach ($global_perms as $k => $v) {
-            $thisperm = Permcat::find_permcat($existing, $k);
-
-            $checkinherited = PermissionLimits::Get(local_channel(), $k);
-
-            $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true);
-
-            $thisperm = 0;
-            if ($existing) {
-                foreach ($existing as $ex) {
-                    if ($ex['name'] === $k) {
-                        $thisperm = $ex['value'];
-                        break;
-                    }
-                }
-            }
-
-            $perms[] = [ 'perms_' . $k, $v, $inherited ? 1 : intval($thisperm), '', [ t('No'), t('Yes') ], (($inherited) ? ' disabled="disabled" ' : '' )];
-
-            if ($inherited) {
-                $hidden_perms[] = ['perms_' . $k, 1 ];
-            }
-
-        }
-
-    
-        $tpl = Theme::get_template("settings_permcats.tpl");
-        $o .= replace_macros($tpl, array(
-            '$form_security_token' => get_form_security_token("settings_permcats"),
-            '$title' => t('Permission Roles'),
-            '$desc' => $desc,
-            '$desc2' => $desc2,
-            '$tokens' => $t,
-            '$permcats' => $permcats,
-            '$atoken' => $atoken,
-            '$url1' => z_root() . '/channel/' . $channel['channel_address'],
-            '$url2' => z_root() . '/photos/' . $channel['channel_address'],
-            '$name' => array('name', t('Role name') . ' *', (($name) ? $name : ''), ''),
-            '$me' => t('My Settings'),
-            '$perms' => $perms,
-            '$hidden_perms' => $hidden_perms,
-            '$inherited' => t('inherited'),
-            '$notself' => 0,
-            '$self' => 1,
-            '$permlbl' => t('Individual Permissions'),
-            '$permnote' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'),
-            '$submit' => t('Submit')
-        ));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Settings/Tokens.php
deleted file mode 100644
index 7696f9268..000000000
--- a/Zotlabs/Module/Settings/Tokens.php
+++ /dev/null
@@ -1,321 +0,0 @@
-= $max_tokens) {
-                    notice(sprintf(t('This channel is limited to %d tokens'), $max_tokens) . EOL);
-                    return;
-                }
-            }
-        }
-        if ($token_errs) {
-            notice(t('Name and Password are required.') . EOL);
-            return;
-        }
-
-        $old_atok = q(
-            "select * from atoken where atoken_uid = %d and atoken_name = '%s'",
-            intval($channel['channel_id']),
-            dbesc($name)
-        );
-        if ($old_atok) {
-            $old_atok = array_shift($old_atok);
-            $old_xchan = atoken_xchan($old_atok);
-        }
-
-        if ($atoken_id) {
-            $r = q(
-                "update atoken set atoken_name = '%s', atoken_token = '%s', atoken_expires = '%s' 
-				where atoken_id = %d and atoken_uid = %d",
-                dbesc($name),
-                dbesc($token),
-                dbesc($expires),
-                intval($atoken_id),
-                intval($channel['channel_id'])
-            );
-        } else {
-            $r = q(
-                "insert into atoken ( atoken_guid, atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expires )
-				values ( '%s', %d, %d, '%s', '%s', '%s' ) ",
-                dbesc($atoken_guid),
-                intval($channel['channel_account_id']),
-                intval($channel['channel_id']),
-                dbesc($name),
-                dbesc($token),
-                dbesc($expires)
-            );
-        }
-        $atok = q(
-            "select * from atoken where atoken_uid = %d and atoken_name = '%s'",
-            intval($channel['channel_id']),
-            dbesc($name)
-        );
-        if ($atok) {
-            $xchan = atoken_xchan($atok[0]);
-            atoken_create_xchan($xchan);
-            $atoken_xchan = $xchan['xchan_hash'];
-            if ($old_atok && $old_xchan) {
-                $r = q(
-                    "update xchan set xchan_name = '%s' where xchan_hash = '%s'",
-                    dbesc($xchan['xchan_name']),
-                    dbesc($old_xchan['xchan_hash'])
-                );
-            }
-        }
-
-        $all_perms = Permissions::Perms();
-
-        $p = EMPTY_STR;
-
-        if ($all_perms) {
-            foreach ($all_perms as $perm => $desc) {
-                if (array_key_exists('perms_' . $perm, $_POST)) {
-                    if ($p) {
-                        $p .= ',';
-                    }
-                    $p .= $perm;
-                }
-            }
-            set_abconfig(local_channel(), $atoken_xchan, 'system', 'my_perms', $p);
-            if ($old_atok) {
-            }
-        }
-
-        if (!$atoken_id) {
-            // If this is a new token, create a new abook record
-
-            $closeness = get_pconfig($uid, 'system', 'new_abook_closeness', 80);
-            $profile_assign = get_pconfig($uid, 'system', 'profile_assign', '');
-
-            $r = abook_store_lowlevel(
-                [
-                    'abook_account' => $channel['channel_account_id'],
-                    'abook_channel' => $channel['channel_id'],
-                    'abook_closeness' => intval($closeness),
-                    'abook_xchan' => $atoken_xchan,
-                    'abook_profile' => $profile_assign,
-                    'abook_feed' => 0,
-                    'abook_created' => datetime_convert(),
-                    'abook_updated' => datetime_convert(),
-                    'abook_instance' => z_root()
-                ]
-            );
-
-            if (!$r) {
-                logger('abook creation failed');
-            }
-
-            /** If there is a default group for this channel, add this connection to it */
-
-            if ($channel['channel_default_group']) {
-                $g = AccessList::rec_byhash($uid, $channel['channel_default_group']);
-                if ($g) {
-                    AccessList::member_add($uid, '', $atoken_xchan, $g['id']);
-                }
-            }
-
-            $r = q(
-                "SELECT abook.*, xchan.*
-				FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
-                intval($channel['channel_id']),
-                dbesc($atoken_xchan)
-            );
-
-            if (!$r) {
-                logger('abook or xchan record not saved correctly');
-                return;
-            }
-
-            $clone = array_shift($r);
-
-            unset($clone['abook_id']);
-            unset($clone['abook_account']);
-            unset($clone['abook_channel']);
-
-            $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
-            if ($abconfig) {
-                $clone['abconfig'] = $abconfig;
-            }
-
-            Libsync::build_sync_packet(
-                $channel['channel_id'],
-                ['abook' => [$clone], 'atoken' => $atok],
-                true
-            );
-        }
-
-        info(t('Token saved.') . EOL);
-        return;
-    }
-
-
-    public function get()
-    {
-
-        $channel = App::get_channel();
-
-        $atoken = null;
-        $atoken_xchan = '';
-
-        if (argc() > 2) {
-            $id = argv(2);
-
-            $atoken = q(
-                "select * from atoken where atoken_id = %d and atoken_uid = %d",
-                intval($id),
-                intval(local_channel())
-            );
-
-            if ($atoken) {
-                $atoken = $atoken[0];
-                $atoken_xchan = substr($channel['channel_hash'], 0, 16) . '.' . $atoken['atoken_guid'];
-            }
-
-            if ($atoken && argc() > 3 && argv(3) === 'drop') {
-                $atoken['deleted'] = true;
-
-                $r = q(
-                    "SELECT abook.*, xchan.*
-					FROM abook left join xchan on abook_xchan = xchan_hash
-					WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
-                    intval($channel['channel_id']),
-                    dbesc($atoken_xchan)
-                );
-                if (!$r) {
-                    return;
-                }
-
-                $clone = array_shift($r);
-
-                unset($clone['abook_id']);
-                unset($clone['abook_account']);
-                unset($clone['abook_channel']);
-
-                $clone['entry_deleted'] = true;
-
-                $abconfig = load_abconfig($channel['channel_id'], $clone['abook_xchan']);
-                if ($abconfig) {
-                    $clone['abconfig'] = $abconfig;
-                }
-
-                atoken_delete($id);
-                Libsync::build_sync_packet(
-                    $channel['channel_id'],
-                    ['abook' => [$clone], 'atoken' => [$atoken]],
-                    true
-                );
-
-                $atoken = null;
-                $atoken_xchan = '';
-            }
-        }
-
-        $t = q(
-            "select * from atoken where atoken_uid = %d",
-            intval(local_channel())
-        );
-
-        $desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access private content.');
-
-        $desc2 = t('You may also provide dropbox style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:');
-
-
-        $global_perms = Permissions::Perms();
-        $existing = get_all_perms(local_channel(), (($atoken_xchan) ? $atoken_xchan : EMPTY_STR));
-
-        $theirs = get_abconfig(local_channel(), $atoken_xchan, 'system', 'their_perms', EMPTY_STR);
-
-        $their_perms = Permissions::FilledPerms(explode(',', $theirs));
-        foreach ($global_perms as $k => $v) {
-            if (!array_key_exists($k, $their_perms)) {
-                $their_perms[$k] = 1;
-            }
-        }
-
-        $my_perms = explode(',', get_abconfig(local_channel(), $atoken_xchan, 'system', 'my_perms', EMPTY_STR));
-
-        foreach ($global_perms as $k => $v) {
-            $thisperm = ((in_array($k, $my_perms)) ? 1 : 0);
-
-            $checkinherited = PermissionLimits::Get(local_channel(), $k);
-
-            // For auto permissions (when $self is true) we don't want to look at existing
-            // permissions because they are enabled for the channel owner
-            if ((!$self) && ($existing[$k])) {
-                $thisperm = "1";
-            }
-
-            $perms[] = array('perms_' . $k, $v, ((array_key_exists($k, $their_perms)) ? intval($their_perms[$k]) : ''), $thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
-        }
-
-
-        $tpl = Theme::get_template("settings_tokens.tpl");
-        $o .= replace_macros($tpl, array(
-            '$form_security_token' => get_form_security_token("settings_tokens"),
-            '$title' => t('Guest Access Tokens'),
-            '$desc' => $desc,
-            '$desc2' => $desc2,
-            '$tokens' => $t,
-            '$atoken' => $atoken,
-            '$atoken_xchan' => $atoken_chan,
-            '$url1' => z_root() . '/channel/' . $channel['channel_address'],
-            '$url2' => z_root() . '/photos/' . $channel['channel_address'],
-            '$name' => array('name', t('Login Name') . ' *', (($atoken) ? $atoken['atoken_name'] : ''), ''),
-            '$token' => array('token', t('Login Password') . ' *', (($atoken) ? $atoken['atoken_token'] : new_token()), ''),
-            '$expires' => array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] > NULL_DATE) ? datetime_convert('UTC', date_default_timezone_get(), $atoken['atoken_expires']) : ''), ''),
-            '$them' => t('Their Settings'),
-            '$me' => t('My Settings'),
-            '$perms' => $perms,
-            '$inherited' => t('inherited'),
-            '$notself' => 1,
-            '$self' => 0,
-            '$permlbl' => t('Individual Permissions'),
-            '$permnote' => t('Some permissions may be inherited from your channel\'s privacy settings, which have higher priority than individual settings. You can not change those settings here.'),
-            '$submit' => t('Submit')
-        ));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
deleted file mode 100644
index 01205455a..000000000
--- a/Zotlabs/Module/Setup.php
+++ /dev/null
@@ -1,902 +0,0 @@
-install_wizard_pass = intval($_POST['pass']);
-        } else {
-            $this->install_wizard_pass = 1;
-        }
-    }
-
-    /**
-     * @brief Handle the actions of the different setup steps.
-     *
-     */
-    public function post()
-    {
-
-        switch ($this->install_wizard_pass) {
-            case 1:
-            case 2:
-                return;
-            // implied break;
-            case 3:
-                $urlpath = App::get_path();
-                $dbhost = trim($_POST['dbhost']);
-                $dbport = intval(trim($_POST['dbport']));
-                $dbuser = trim($_POST['dbuser']);
-                $dbpass = trim($_POST['dbpass']);
-                $dbdata = trim($_POST['dbdata']);
-                $dbtype = intval(trim($_POST['dbtype']));
-                $servertype = intval(trim($_POST['servertype']));
-                $phpath = trim($_POST['phpath']);
-                $adminmail = trim($_POST['adminmail']);
-                $siteurl = trim($_POST['siteurl']);
-
-                // $siteurl should not have a trailing slash
-
-                $siteurl = rtrim($siteurl, '/');
-
-                require_once('include/dba/dba_driver.php');
-
-                $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);
-
-                if (!DBA::$dba->connected) {
-                    echo 'Database Connect failed: ' . DBA::$dba->error;
-                    killme();
-                }
-                return;
-            // implied break;
-            case 4:
-                $urlpath = App::get_path();
-                $dbhost = trim($_POST['dbhost']);
-                $dbport = intval(trim($_POST['dbport']));
-                $dbuser = trim($_POST['dbuser']);
-                $dbpass = trim($_POST['dbpass']);
-                $dbdata = trim($_POST['dbdata']);
-                $dbtype = intval(trim($_POST['dbtype']));
-                $servertype = intval(trim($_POST['servertype']));
-                $phpath = trim($_POST['phpath']);
-                $timezone = trim($_POST['timezone']);
-                $adminmail = trim($_POST['adminmail']);
-                $siteurl = trim($_POST['siteurl']);
-
-                if ($siteurl != z_root()) {
-                    $test = z_fetch_url($siteurl . '/setup/testrewrite');
-                    if ((!$test['success']) || ($test['body'] !== 'ok')) {
-                        App::$data['url_fail'] = true;
-                        App::$data['url_error'] = $test['error'];
-                        return;
-                    }
-                }
-
-                if (!DBA::$dba->connected) {
-                    // connect to db
-                    $db = DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);
-                }
-
-                if (!DBA::$dba->connected) {
-                    echo 'CRITICAL: DB not connected.';
-                    killme();
-                }
-
-                $txt = replace_macros(Theme::get_email_template('htconfig.tpl'), [
-                    '$dbhost' => $dbhost,
-                    '$dbport' => $dbport,
-                    '$dbuser' => $dbuser,
-                    '$dbpass' => $dbpass,
-                    '$dbdata' => $dbdata,
-                    '$dbtype' => $dbtype,
-                    '$servertype' => '',
-                    '$server_role' => 'pro',
-                    '$timezone' => $timezone,
-                    '$platform' => ucfirst(PLATFORM_NAME),
-                    '$siteurl' => $siteurl,
-                    '$site_id' => random_string(),
-                    '$phpath' => $phpath,
-                    '$adminmail' => $adminmail
-                ]);
-
-                $result = file_put_contents('.htconfig.php', $txt);
-                if (!$result) {
-                    App::$data['txt'] = $txt;
-                }
-
-                $errors = $this->load_database($db);
-
-                if ($errors) {
-                    App::$data['db_failed'] = $errors;
-                } else {
-                    App::$data['db_installed'] = true;
-                }
-
-                return;
-            // implied break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * @brief Get output for the setup page.
-     *
-     * Depending on the state we are currently in it returns different content.
-     *
-     * @return string parsed HTML output
-     */
-
-    public function get()
-    {
-
-        $o = EMPTY_STR;
-        $wizard_status = EMPTY_STR;
-        $db_return_text = EMPTY_STR;
-        $install_title = t('$Projectname Server - Setup');
-
-        if (x(App::$data, 'db_conn_failed')) {
-            $this->install_wizard_pass = 2;
-            $wizard_status = t('Could not connect to database.');
-        }
-        if (x(App::$data, 'url_fail')) {
-            $this->install_wizard_pass = 3;
-            $wizard_status = t('Could not connect to specified site URL. Possible SSL certificate or DNS issue.');
-            if (App::$data['url_error']) {
-                $wizard_status .= ' ' . App::$data['url_error'];
-            }
-        }
-
-        if (x(App::$data, 'db_create_failed')) {
-            $this->install_wizard_pass = 2;
-            $wizard_status = t('Could not create table.');
-        }
-        if (x(App::$data, 'db_installed')) {
-            $pass = t('Installation succeeded!');
-            $icon = 'check';
-            $txt = t('Your site database has been installed.') . EOL;
-            $db_return_text .= $txt;
-        }
-        if (x(App::$data, 'db_failed')) {
-            $pass = t('Database install failed!');
-            $icon = 'exclamation-triangle';
-            $txt = t('You may need to import the file "install/schema_xxx.sql" manually using a database client.') . EOL;
-            $txt .= t('Please see the file "install/INSTALL.txt".') . EOL . '
          ';
-            $txt .= '
          ' . App::$data['db_failed'] . '
          ' . EOL;
-            $db_return_text .= $txt;
-        }
-        if (DBA::$dba && DBA::$dba->connected) {
-            $r = q("SELECT COUNT(*) as total FROM account");
-            if ($r && count($r) && $r[0]['total']) {
-                return replace_macros(Theme::get_template('install.tpl'), [
-                    '$title' => $install_title,
-                    '$pass' => '',
-                    '$status' => t('Permission denied.'),
-                    '$text' => '',
-                ]);
-            }
-        }
-
-        if (x(App::$data, 'txt') && strlen(App::$data['txt'])) {
-            $db_return_text .= $this->manual_config($a);
-        }
-
-        if ($db_return_text !== EMPTY_STR) {
-            $tpl = Theme::get_template('install.tpl');
-            return replace_macros(Theme::get_template('install.tpl'), [
-                '$title' => $install_title,
-                '$icon' => $icon,
-                '$pass' => $pass,
-                '$text' => $db_return_text,
-                '$what_next' => $this->what_next()
-            ]);
-        }
-
-        switch ($this->install_wizard_pass) {
-            case 1:
-            {
-                // System check
-
-                $checks = [];
-
-                $this->check_funcs($checks);
-
-                $this->check_htconfig($checks);
-
-                $this->check_store($checks);
-
-                $this->check_smarty3($checks);
-
-                $this->check_keys($checks);
-
-                if (x($_POST, 'phpath')) {
-                    $phpath = notags(trim($_POST['phpath']));
-                }
-
-                $this->check_php($phpath, $checks);
-
-                $this->check_phpconfig($checks);
-
-                $this->check_htaccess($checks);
-
-                $checkspassed = array_reduce($checks, "self::check_passed", true);
-
-                $o .= replace_macros(Theme::get_template('install_checks.tpl'), [
-                    '$title' => $install_title,
-                    '$pass' => t('System check'),
-                    '$checks' => $checks,
-                    '$passed' => $checkspassed,
-                    '$see_install' => t('Please see the file "install/INSTALL.txt".'),
-                    '$next' => t('Next'),
-                    '$reload' => t('Check again'),
-                    '$phpath' => $phpath,
-                    '$baseurl' => z_root(),
-                ]);
-                return $o;
-                break;
-            }
-
-            case 2:
-            {
-                // Database config
-
-                $dbhost = ((x($_POST, 'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
-                $dbuser = ((x($_POST, 'dbuser')) ? trim($_POST['dbuser']) : EMPTY_STR);
-                $dbport = ((x($_POST, 'dbport')) ? intval(trim($_POST['dbport'])) : 0);
-                $dbpass = ((x($_POST, 'dbpass')) ? trim($_POST['dbpass']) : EMPTY_STR);
-                $dbdata = ((x($_POST, 'dbdata')) ? trim($_POST['dbdata']) : EMPTY_STR);
-                $dbtype = ((x($_POST, 'dbtype')) ? intval(trim($_POST['dbtype'])) : 0);
-                $phpath = ((x($_POST, 'phpath')) ? trim($_POST['phpath']) : EMPTY_STR);
-                $adminmail = ((x($_POST, 'adminmail')) ? trim($_POST['adminmail']) : EMPTY_STR);
-                $siteurl = ((x($_POST, 'siteurl')) ? trim($_POST['siteurl']) : EMPTY_STR);
-
-                $servertype = EMPTY_STR;
-
-                $o .= replace_macros(Theme::get_template('install_db.tpl'), [
-                    '$title' => $install_title,
-                    '$pass' => t('Database connection'),
-                    '$info_01' => t('In order to install this software we need to know how to connect to your database.'),
-                    '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
-                    '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'),
-
-                    '$status' => $wizard_status,
-
-                    '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, t('Default is 127.0.0.1')),
-                    '$dbport' => array('dbport', t('Database Port'), $dbport, t('Communication port number - use 0 for default')),
-                    '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''),
-                    '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''),
-                    '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''),
-                    '$dbtype' => array('dbtype', t('Database Type'), $dbtype, '', array(0 => 'MySQL', 1 => 'PostgreSQL')),
-
-                    '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.')),
-                    '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')),
-                    '$lbl_10' => t('Please select a default timezone for your website'),
-                    '$baseurl' => z_root(),
-                    '$phpath' => $phpath,
-                    '$submit' => t('Submit'),
-                ]);
-
-                return $o;
-                break;
-            }
-            case 3:
-            {
-                // Site settings
-                $dbhost = ((x($_POST, 'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
-                $dbuser = ((x($_POST, 'dbuser')) ? trim($_POST['dbuser']) : EMPTY_STR);
-                $dbport = ((x($_POST, 'dbport')) ? intval(trim($_POST['dbport'])) : 0);
-                $dbpass = ((x($_POST, 'dbpass')) ? trim($_POST['dbpass']) : EMPTY_STR);
-                $dbdata = ((x($_POST, 'dbdata')) ? trim($_POST['dbdata']) : EMPTY_STR);
-                $dbtype = ((x($_POST, 'dbtype')) ? intval(trim($_POST['dbtype'])) : 0);
-                $phpath = ((x($_POST, 'phpath')) ? trim($_POST['phpath']) : EMPTY_STR);
-
-                $servertype = EMPTY_STR;
-
-                $adminmail = ((x($_POST, 'adminmail')) ? trim($_POST['adminmail']) : EMPTY_STR);
-                $siteurl = ((x($_POST, 'siteurl')) ? trim($_POST['siteurl']) : EMPTY_STR);
-                $timezone = ((x($_POST, 'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
-
-                $o .= replace_macros(Theme::get_template('install_settings.tpl'), [
-                    '$title' => $install_title,
-                    '$pass' => t('Site settings'),
-                    '$status' => $wizard_status,
-
-                    '$dbhost' => $dbhost,
-                    '$dbport' => $dbport,
-                    '$dbuser' => $dbuser,
-                    '$dbpass' => $dbpass,
-                    '$dbdata' => $dbdata,
-                    '$phpath' => $phpath,
-                    '$dbtype' => $dbtype,
-                    '$servertype' => $servertype,
-
-                    '$adminmail' => ['adminmail', t('Site administrator email address'), $adminmail, t('Required. Your account email address must match this in order to use the web admin panel.')],
-
-                    '$siteurl' => ['siteurl', t('Website URL'), z_root(), t('Required. Please use SSL (https) URL if available.')],
-
-                    '$timezone' => ['timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()],
-
-                    '$baseurl' => z_root(),
-
-                    '$submit' => t('Submit'),
-                ]);
-                return $o;
-                break;
-            }
-        }
-    }
-
-    /**
-     * @brief Add a check result to the array for output.
-     *
-     * @param[in,out] array &$checks array passed to template
-     * @param string $title a title for the check
-     * @param bool $status
-     * @param bool $required
-     * @param string $help optional help string
-     */
-    public function check_add(&$checks, $title, $status, $required, $help = '')
-    {
-        $checks[] = [
-            'title' => $title,
-            'status' => $status,
-            'required' => $required,
-            'help' => $help
-        ];
-    }
-
-    /**
-     * @brief Checks the PHP environment.
-     *
-     * @param[in,out] string &$phpath
-     * @param[out] array &$checks
-     */
-    public function check_php(&$phpath, &$checks)
-    {
-        $help = '';
-
-        if (version_compare(PHP_VERSION, '7.1') < 0) {
-            $help .= t('PHP version 7.1 or greater is required.');
-            $this->check_add($checks, t('PHP version'), false, true, $help);
-        }
-
-        if (strlen($phpath)) {
-            $passed = file_exists($phpath);
-        } elseif (function_exists('shell_exec')) {
-            if (is_windows()) {
-                $phpath = trim(shell_exec('where php'));
-            } else {
-                $phpath = trim(shell_exec('which php'));
-            }
-            $passed = strlen($phpath);
-        }
-
-        if (!$passed) {
-            $help .= t('Could not find a command line version of PHP in the web server PATH.') . EOL;
-            $help .= t('If you do not have a command line version of PHP installed on server, you will not be able to run background tasks - including message delivery.') . EOL;
-            $help .= EOL;
-
-            $help .= replace_macros(Theme::get_template('field_input.tpl'), [
-                '$field' => ['phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')],
-            ]);
-            $phpath = '';
-        }
-
-        $this->check_add($checks, t('Command line PHP') . ($passed ? " ($phpath)" : EMPTY_STR), $passed, false, $help);
-
-        if ($passed) {
-            $str = autoname(8);
-            $cmd = "$phpath install/testargs.php $str";
-            $help = '';
-
-            if (function_exists('shell_exec')) {
-                $result = trim(shell_exec($cmd));
-            } else {
-                $help .= t('Unable to check command line PHP, as shell_exec() is disabled. This is required.') . EOL;
-            }
-            $passed2 = (($result === $str) ? true : false);
-            if (!$passed2) {
-                $help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
-                $help .= t('This is required for message delivery to work.');
-            }
-
-            $this->check_add($checks, t('PHP register_argc_argv'), $passed, true, $help);
-        }
-    }
-
-    /**
-     * @brief Some PHP configuration checks.
-     *
-     * @param[out] array &$checks
-     * @todo Change how we display such informational text. Add more description
-     *       how to change them.
-     *
-     */
-    public function check_phpconfig(&$checks)
-    {
-
-        $help = '';
-        $mem_warning = EMPTY_STR;
-
-        $result = self::getPhpiniUploadLimits();
-        if ($result['post_max_size'] < (2 * 1024 * 1024) || $result['max_upload_filesize'] < (2 * 1024 * 1024)) {
-            $mem_warning = '' . t('This is not sufficient to upload larger images or files. You should be able to upload at least 2MB (2097152 bytes) at once.') . '';
-        }
-
-        $help = sprintf(
-            t('Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.'),
-            userReadableSize($result['post_max_size']),
-            userReadableSize($result['max_upload_filesize']),
-            $result['max_file_uploads']
-        );
-
-        $help .= (($mem_warning) ? $mem_warning : EMPTY_STR);
-        $help .= '

          ' . t('You can adjust these settings in the server php.ini file.');
-
-        $this->check_add($checks, t('PHP upload limits'), true, false, $help);
-    }
-
-    /**
-     * @brief Check if the openssl implementation can generate keys.
-     *
-     * @param[out] array $checks
-     */
-    public function check_keys(&$checks)
-    {
-        $help = '';
-        $res = false;
-
-        if (function_exists('openssl_pkey_new')) {
-            $res = openssl_pkey_new(array(
-                    'digest_alg' => 'sha1',
-                    'private_key_bits' => 4096,
-                    'encrypt_key' => false));
-        }
-
-        // Get private key
-
-        if (!$res) {
-            $help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
-            $help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
-        }
-
-        $this->check_add($checks, t('Generate encryption keys'), $res, true, $help);
-    }
-
-    /**
-     * @brief Check for some PHP functions and modules.
-     *
-     * @param[in,out] array &$checks
-     */
-    public function check_funcs(&$checks)
-    {
-        $ck_funcs = [];
-
-        $disabled = explode(',', ini_get('disable_functions'));
-        if ($disabled) {
-            array_walk($disabled, 'array_trim');
-        }
-
-        // add check metadata, the real check is done bit later and return values set
-
-        $this->check_add($ck_funcs, t('libCurl PHP module'), true, true);
-        $this->check_add($ck_funcs, t('GD graphics PHP module'), true, true);
-        $this->check_add($ck_funcs, t('OpenSSL PHP module'), true, true);
-        $this->check_add($ck_funcs, t('PDO database PHP module'), true, true);
-        $this->check_add($ck_funcs, t('mb_string PHP module'), true, true);
-        $this->check_add($ck_funcs, t('xml PHP module'), true, true);
-        $this->check_add($ck_funcs, t('zip PHP module'), true, true);
-
-        if (function_exists('apache_get_modules')) {
-            if (!in_array('mod_rewrite', apache_get_modules())) {
-                $this->check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
-            } else {
-                $this->check_add($ck_funcs, t('Apache mod_rewrite module'), true, true);
-            }
-        }
-        if ((!function_exists('exec')) || in_array('exec', $disabled)) {
-            $this->check_add($ck_funcs, t('exec'), false, true, t('Error: exec is required but is either not installed or has been disabled in php.ini'));
-        } else {
-            $this->check_add($ck_funcs, t('exec'), true, true);
-        }
-        if ((!function_exists('shell_exec')) || in_array('shell_exec', $disabled)) {
-            $this->check_add($ck_funcs, t('shell_exec'), false, true, t('Error: shell_exec is required but is either not installed or has been disabled in php.ini'));
-        } else {
-            $this->check_add($ck_funcs, t('shell_exec'), true, true);
-        }
-
-        if (!function_exists('curl_init')) {
-            $ck_funcs[0]['status'] = false;
-            $ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.');
-        }
-        if ((!function_exists('imagecreatefromjpeg')) && (!class_exists('\\Imagick'))) {
-            $ck_funcs[1]['status'] = false;
-            $ck_funcs[1]['help'] = t('Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed.');
-        }
-        if (!function_exists('openssl_public_encrypt')) {
-            $ck_funcs[2]['status'] = false;
-            $ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.');
-        }
-        if (class_exists('\\PDO')) {
-            $x = PDO::getAvailableDrivers();
-            if ((!in_array('mysql', $x)) && (!in_array('pgsql', $x))) {
-                $ck_funcs[3]['status'] = false;
-                $ck_funcs[3]['help'] = t('Error: PDO database PHP module missing a driver for either mysql or pgsql.');
-            }
-        }
-        if (!class_exists('\\PDO')) {
-            $ck_funcs[3]['status'] = false;
-            $ck_funcs[3]['help'] = t('Error: PDO database PHP module required but not installed.');
-        }
-        if (!function_exists('mb_strlen')) {
-            $ck_funcs[4]['status'] = false;
-            $ck_funcs[4]['help'] = t('Error: mb_string PHP module required but not installed.');
-        }
-        if (!extension_loaded('xml')) {
-            $ck_funcs[5]['status'] = false;
-            $ck_funcs[5]['help'] = t('Error: xml PHP module required for DAV but not installed.');
-        }
-        if (!extension_loaded('zip')) {
-            $ck_funcs[6]['status'] = false;
-            $ck_funcs[6]['help'] = t('Error: zip PHP module required but not installed.');
-        }
-
-        $checks = array_merge($checks, $ck_funcs);
-    }
-
-    /**
-     * @brief Check for .htconfig requirements.
-     *
-     * @param[out] array &$checks
-     */
-    public function check_htconfig(&$checks)
-    {
-        $status = true;
-        $help = EMPTY_STR;
-
-        $fname = '.htconfig.php';
-
-        if (
-            (file_exists($fname) && is_writable($fname)) ||
-            (!(file_exists($fname) && is_writable('.')))
-        ) {
-            $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
-            return;
-        }
-
-        $status = false;
-        $help .= t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') . EOL;
-        $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL;
-        $help .= t('Please see install/INSTALL.txt for additional information.');
-
-        $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
-    }
-
-    /**
-     * @brief Checks for our templating engine Smarty3 requirements.
-     *
-     * @param[out] array &$checks
-     */
-    public function check_smarty3(&$checks)
-    {
-        $status = true;
-        $help = '';
-
-        @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true);
-
-        if (!is_writable(TEMPLATE_BUILD_PATH)) {
-            $status = false;
-            $help .= t('This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL;
-            $help .= sprintf(t('In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder.'), TEMPLATE_BUILD_PATH) . EOL;
-            $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.') . EOL;
-        }
-
-        $this->check_add($checks, sprintf(t('%s is writable'), TEMPLATE_BUILD_PATH), $status, true, $help);
-    }
-
-    /**
-     * @brief Check for store directory.
-     *
-     * @param[out] array &$checks
-     */
-    public function check_store(&$checks)
-    {
-        $status = true;
-        $help = '';
-
-        @os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, true);
-
-        if (!is_writable('store')) {
-            $status = false;
-            $help = t('This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder') . EOL;
-            $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.') . EOL;
-        }
-
-        $this->check_add($checks, t('store is writable'), $status, true, $help);
-    }
-
-    /**
-     * @brief Check URL rewrite und SSL certificate.
-     *
-     * @param[out] array &$checks
-     */
-    public function check_htaccess(&$checks)
-    {
-        $status = true;
-        $help = '';
-        $ssl_error = false;
-
-        $url = z_root() . '/setup/testrewrite';
-
-        if (function_exists('curl_init')) {
-            $test = z_fetch_url($url);
-            if (!$test['success']) {
-                if (strstr($url, 'https://')) {
-                    $test = z_fetch_url($url, false, 0, ['novalidate' => true]);
-                    if ($test['success']) {
-                        $ssl_error = true;
-                    }
-                } else {
-                    $test = z_fetch_url(str_replace('http://', 'https://', $url), false, 0, ['novalidate' => true]);
-                    if ($test['success']) {
-                        $ssl_error = true;
-                    }
-                }
-
-                if ($ssl_error) {
-                    $help .= t('SSL certificate cannot be validated. Fix certificate or disable https access to this site.') . EOL;
-                    $help .= t('If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!') . EOL;
-                    $help .= t('This restriction is incorporated because public posts from you may for example contain references to images on your own hub.') . EOL;
-                    $help .= t('If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.') . EOL;
-                    $help .= t('This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.') . EOL;
-                    $help .= t('Providers are available that issue free certificates which are browser-valid.') . EOL;
-
-                    $help .= t('If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.') . EOL;
-
-                    $this->check_add($checks, t('SSL certificate validation'), false, true, $help);
-                }
-            }
-
-            if ((!$test['success']) || ($test['body'] !== 'ok')) {
-                $status = false;
-                $help = t('Url rewrite in .htaccess is not working. Check your server configuration.' . 'Test: ' . var_export($test, true));
-            }
-
-            $this->check_add($checks, t('Url rewrite is working'), $status, true, $help);
-        } else {
-            // cannot check modrewrite if libcurl is not installed
-        }
-    }
-
-    /**
-     * @brief
-     *
-     * @param App &$a
-     * @return string with paresed HTML
-     */
-    public function manual_config(&$a)
-    {
-        $data = htmlspecialchars(App::$data['txt'], ENT_COMPAT, 'UTF-8');
-        $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
-        $o .= "";
-
-        return $o;
-    }
-
-    public function load_database_rem($v, $i)
-    {
-        $l = trim($i);
-        if (strlen($l) > 1 && ($l[0] === '-' || ($l[0] === '/' && $l[1] === '*'))) {
-            return $v;
-        } else {
-            return $v . "\n" . $i;
-        }
-    }
-
-
-    public function load_database($db)
-    {
-        $str = file_get_contents(DBA::$dba->get_install_script());
-        $arr = explode(';', $str);
-        $errors = false;
-        foreach ($arr as $a) {
-            if (strlen(trim($a))) {
-                $r = dbq(trim($a));
-                if (!$r) {
-                    $errors .= t('Errors encountered creating database tables.') . $a . EOL;
-                }
-            }
-        }
-
-        return $errors;
-    }
-
-    /**
-     * @brief
-     *
-     * @return string with parsed HTML
-     */
-    public function what_next()
-    {
-        // install the standard theme
-        set_config('system', 'allowed_themes', 'redbasic');
-
-        // if imagick converter is installed, use it
-        if (@is_executable('/usr/bin/convert')) {
-            set_config('system', 'imagick_convert_path', '/usr/bin/convert');
-        }
-
-        // Set a lenient list of ciphers if using openssl. Other ssl engines
-        // (e.g. NSS used in RedHat) require different syntax, so hopefully
-        // the default curl cipher list will work for most sites. If not,
-        // this can set via config. Many distros are now disabling RC4,
-        // but many existing sites still use it and are unable to change it.
-        // We do not use SSL for encryption, only to protect session cookies.
-        // z_fetch_url() is also used to import shared links and other content
-        // so in theory most any cipher could show up and we should do our best
-        // to make the content available rather than tell folks that there's a
-        // weird SSL error which they can't do anything about. This does not affect
-        // the SSL server, but is only a client negotiation to find something workable.
-        // Hence it will not make your system susceptible to POODL or other nasties.
-
-        $x = curl_version();
-        if (stristr($x['ssl_version'], 'openssl')) {
-            set_config('system', 'curl_ssl_ciphers', 'ALL:!eNULL');
-        }
-
-        // Create a system channel
-
-        Channel::create_system();
-
-        $register_link = '' . t('registration page') . '';
-
-        return
-            t('
          What next?
          ')
-            . '
          '
-            . t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
-            . EOL
-            . t('Please see the file "install/INSTALL.txt" for more information and instructions.')
-            . '
          '
-            . sprintf(t('Go to your new hub %s and register as new member. Please use the same email address that you entered for the administrator email as this will allow your new account to enter the site admin panel.'), $register_link)
-            . '
          ';
-    }
-
-    /**
-     * @brief
-     *
-     * @param unknown $v
-     * @param array $c
-     * @return array
-     */
-    private static function check_passed($v, $c)
-    {
-        if ($c['required']) {
-            $v = $v && $c['status'];
-        }
-        return $v;
-    }
-
-    /**
-     * @brief Get some upload related limits from php.ini.
-     *
-     * This function returns values from php.ini like \b post_max_size,
-     * \b max_file_uploads, \b upload_max_filesize.
-     *
-     * @return array associative array
-     *   * \e int \b post_max_size the maximum size of a complete POST in bytes
-     *   * \e int \b upload_max_filesize the maximum size of one file in bytes
-     *   * \e int \b max_file_uploads maximum number of files in one POST
-     *   * \e int \b max_upload_filesize min(post_max_size, upload_max_filesize)
-     */
-
-    private static function getPhpiniUploadLimits()
-    {
-        $ret = [];
-
-        // max size of the complete POST
-        $ret['post_max_size'] = self::phpiniSizeToBytes(ini_get('post_max_size'));
-        // max size of one file
-        $ret['upload_max_filesize'] = self::phpiniSizeToBytes(ini_get('upload_max_filesize'));
-        // catch a configuration error where post_max_size < upload_max_filesize
-        $ret['max_upload_filesize'] = min(
-            $ret['post_max_size'],
-            $ret['upload_max_filesize']
-        );
-        // maximum number of files in one POST
-        $ret['max_file_uploads'] = intval(ini_get('max_file_uploads'));
-
-        return $ret;
-    }
-
-    /**
-     * @brief Parses php_ini size settings to bytes.
-     *
-     * This function parses common size setting from php.ini files to bytes.
-     * e.g. post_max_size = 8M ==> 8388608
-     *
-     * \note This method does not recognise other human readable formats like
-     * 8MB, etc.
-     *
-     * @param string $val value from php.ini e.g. 2M, 8M
-     * @return int size in bytes
-     * @todo Make this function more universal useable. MB, T, etc.
-     *
-     */
-    private static function phpiniSizeToBytes($val)
-    {
-        $val = trim($val);
-        $unit = strtolower($val[strlen($val) - 1]);
-        // strip off any non-numeric portion
-        $val = intval($val);
-        switch ($unit) {
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-            default:
-                break;
-        }
-
-        return (int)$val;
-    }
-}
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
deleted file mode 100644
index 3fff5e86b..000000000
--- a/Zotlabs/Module/Share.php
+++ /dev/null
@@ -1,151 +0,0 @@
- 1) ? intval(argv(1)) : 0);
-
-        if (!$post_id) {
-            killme();
-        }
-
-        if (!local_channel()) {
-            killme();
-        }
-
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-
-        $r = q(
-            "SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d  LIMIT 1",
-            intval($post_id)
-        );
-        if (!$r) {
-            killme();
-        }
-
-        if (($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) {
-            killme();
-        }
-
-        $sql_extra = item_permissions_sql($r[0]['uid']);
-
-        $r = q(
-            "select * from item where id = %d $sql_extra",
-            intval($post_id)
-        );
-        if (!$r) {
-            killme();
-        }
-
-        /** @FIXME we only share bbcode */
-
-        if (!in_array($r[0]['mimetype'], ['text/bbcode', 'text/x-multicode'])) {
-            killme();
-        }
-
-
-        xchan_query($r);
-
-        $arr = [];
-
-        $item = $r[0];
-
-        $owner_uid = $r[0]['uid'];
-        $owner_aid = $r[0]['aid'];
-
-        $can_comment = false;
-        if ((array_key_exists('owner', $item)) && intval($item['owner']['abook_self'])) {
-            $can_comment = perm_is_allowed($item['uid'], $observer['xchan_hash'], 'post_comments');
-        } else {
-            $can_comment = can_comment_on_post($observer['xchan_hash'], $item);
-        }
-
-        if (!$can_comment) {
-            notice(t('Permission denied') . EOL);
-            killme();
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($item['owner_xchan'])
-        );
-
-        if ($r) {
-            $thread_owner = $r[0];
-        } else {
-            killme();
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($item['author_xchan'])
-        );
-        if ($r) {
-            $item_author = $r[0];
-        } else {
-            killme();
-        }
-
-
-        $arr['aid'] = $owner_aid;
-        $arr['uid'] = $owner_uid;
-
-        $arr['item_origin'] = 1;
-        $arr['item_wall'] = $item['item_wall'];
-        $arr['uuid'] = new_uuid();
-        $arr['mid'] = z_root() . '/item/' . $arr['uuid'];
-        $arr['mid'] = str_replace('/item/', '/activity/', $arr['mid']);
-        $arr['parent_mid'] = $item['mid'];
-
-        $mention = '@[zrl=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/zrl]';
-        $arr['body'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $item['obj_type']);
-
-        $arr['author_xchan'] = $channel['channel_hash'];
-        $arr['owner_xchan'] = $item['author_xchan'];
-        $arr['obj'] = $item['obj'];
-        $arr['obj_type'] = $item['obj_type'];
-        $arr['verb'] = 'Announce';
-
-        $post = item_store($arr);
-
-        $post_id = $post['item_id'];
-
-        $arr['id'] = $post_id;
-
-        Hook::call('post_local_end', $arr);
-
-        info(t('Post repeated') . EOL);
-
-        $r = q(
-            "select * from item where id = %d",
-            intval($post_id)
-        );
-        if ($r) {
-            xchan_query($r);
-            $sync_item = fetch_post_tags($r);
-            Libsync::build_sync_packet($channel['channel_id'], ['item' => [encode_item($sync_item[0], true)]]);
-        }
-
-        Run::Summon(['Notifier', 'like', $post_id]);
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php
deleted file mode 100644
index 4a76f2161..000000000
--- a/Zotlabs/Module/Sharedwithme.php
+++ /dev/null
@@ -1,120 +0,0 @@
- 2) && (argv(2) === 'drop')) {
-            $id = intval(argv(1));
-
-            q(
-                "DELETE FROM item WHERE id = %d AND uid = %d",
-                intval($id),
-                intval(local_channel())
-            );
-
-            goaway(z_root() . '/sharedwithme');
-        }
-
-        //drop all files - localuser
-        if ((argc() > 1) && (argv(1) === 'dropall')) {
-            q(
-                "DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
-                dbesc(ACTIVITY_POST),
-                dbesc(ACTIVITY_OBJ_FILE),
-                intval(local_channel())
-            );
-
-            goaway(z_root() . '/sharedwithme');
-        }
-
-        //list files
-        $r = q(
-            "SELECT id, uid, obj, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'",
-            dbesc(ACTIVITY_POST),
-            dbesc(ACTIVITY_OBJ_FILE),
-            intval(local_channel()),
-            dbesc($channel['channel_hash'])
-        );
-
-        $items = [];
-        $ids = '';
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $object = json_decode($rr['obj'], true);
-
-                $item = [];
-                $item['id'] = $rr['id'];
-                $item['objfiletype'] = $object['filetype'];
-                $item['objfiletypeclass'] = getIconFromType($object['filetype']);
-                $item['objurl'] = rawurldecode(get_rel_link($object['link'], 'alternate')) . '?f=&zid=' . $channel['xchan_addr'];
-                $item['objfilename'] = $object['filename'];
-                $item['objfilesize'] = userReadableSize($object['filesize']);
-                $item['objedited'] = $object['edited'];
-                $item['unseen'] = $rr['item_unseen'];
-
-                $items[] = $item;
-
-                if ($item['unseen'] > 0) {
-                    $ids .= " '" . $rr['id'] . "',";
-                }
-            }
-        }
-
-        if ($ids) {
-            //remove trailing ,
-            $ids = rtrim($ids, ",");
-
-            q(
-                "UPDATE item SET item_unseen = 0 WHERE id IN ( $ids ) AND uid = %d",
-                intval(local_channel())
-            );
-        }
-
-        $o = '';
-
-        $o .= replace_macros(Theme::get_template('sharedwithme.tpl'), array(
-            '$header' => t('Files: shared with me'),
-            '$name' => t('Name'),
-            '$label_new' => t('NEW'),
-            '$size' => t('Size'),
-            '$lastmod' => t('Last Modified'),
-            '$dropall' => t('Remove all files'),
-            '$drop' => t('Remove this file'),
-            '$items' => $items
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php
deleted file mode 100644
index e604c04c5..000000000
--- a/Zotlabs/Module/Siteinfo.php
+++ /dev/null
@@ -1,67 +0,0 @@
- t('About this site'),
-                '$url' => z_root(),
-                '$sitenametxt' => t('Site Name'),
-                '$sitename' => System::get_site_name(),
-                '$headline' => t('Site Information'),
-                '$site_about' => bbcode(get_config('system', 'siteinfo')),
-                '$admin_headline' => t('Administrator'),
-                '$admin_about' => bbcode(get_config('system', 'admininfo')),
-                '$terms' => t('Terms of Service'),
-                '$prj_header' => t('Software and Project information'),
-                '$prj_name' => t('This site is powered by $Projectname'),
-                '$prj_transport' => t('Federated and decentralised networking and identity services provided by Nomad'),
-                '$transport_link' => 'https://zotlabs.com',
-
-                '$ebs' => System::ebs(),
-                '$additional_text' => t('Protocols:'),
-                '$additional_fed' => $federated,
-                '$prj_version' => ((get_config('system', 'hidden_version_siteinfo')) ? '' : sprintf(t('Version %s'), System::get_project_version())),
-                '$prj_linktxt' => t('Project homepage'),
-                '$prj_srctxt' => t('Developer homepage'),
-                '$prj_link' => System::get_project_link(),
-                '$prj_src' => System::get_project_srclink(),
-                '$prj_icon' => System::get_site_icon(),
-            ]
-        );
-
-        Hook::call('about_hook', $siteinfo);
-
-        return $siteinfo;
-    }
-}
diff --git a/Zotlabs/Module/Sites.php b/Zotlabs/Module/Sites.php
deleted file mode 100644
index bd127769c..000000000
--- a/Zotlabs/Module/Sites.php
+++ /dev/null
@@ -1,150 +0,0 @@
- $rr['site_url'],
-                    'name' => $sitename,
-                    'access' => $access,
-                    'register' => $register_link,
-                    'sellpage' => $rr['site_sellpage'],
-                    'location_label' => t('Location'),
-                    'location' => $rr['site_location'],
-                    'project' => $rr['site_project'],
-                    'version' => $rr['site_version'],
-                    'photo' => $logo,
-                    'about' => bbcode($about),
-                    'hash' => substr(hash('sha256', $rr['site_url']), 0, 16),
-                    'network_label' => t('Project'),
-                    'network' => $rr['site_project'],
-                    'version_label' => t('Version'),
-                    'version' => $rr['site_version'],
-                    'private' => $disabled,
-                    'connect' => (($disabled) ? '' : $register_link),
-                    'connect_label' => $register,
-                    'access' => (($access === 'private') ? '' : $access),
-                    'access_label' => t('Access type'),
-                ];
-            }
-        }
-
-        $o = replace_macros(Theme::get_template('sitentry_header.tpl'), [
-            '$dirlbl' => t('Affiliated Sites'),
-            '$desc' => $desc,
-            '$entries' => $j,
-        ]);
-
-
-        return $o;
-    }
-
-    public function sort_sites($a)
-    {
-        $ret = [];
-        if ($a) {
-            foreach ($a as $e) {
-                $projectname = explode(' ', $e['project']);
-                $ret[$projectname[0]][] = $e;
-            }
-        }
-        $projects = array_keys($ret);
-        rsort($projects);
-
-        $newret = [];
-        foreach ($projects as $p) {
-            $newret[$p] = $ret[$p];
-        }
-
-        return $newret;
-    }
-
-    public function sort_versions($a, $b)
-    {
-        return version_compare($b['version'], $a['version']);
-    }
-}
diff --git a/Zotlabs/Module/Smilies.php b/Zotlabs/Module/Smilies.php
deleted file mode 100644
index 523efe1f4..000000000
--- a/Zotlabs/Module/Smilies.php
+++ /dev/null
@@ -1,24 +0,0 @@
- $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]);
-            }
-            json_return_and_die($results);
-        } else {
-            return smilies('', true);
-        }
-    }
-}
diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php
deleted file mode 100644
index 041abe3f0..000000000
--- a/Zotlabs/Module/Sources.php
+++ /dev/null
@@ -1,202 +0,0 @@
- t('Channel Sources'),
-                '$desc' => t('Manage remote sources of content for your channel.'),
-                '$new' => t('New Source'),
-                '$sources' => $r
-            ]);
-            return $o;
-        }
-
-        if (argc() == 2 && argv(1) === 'new') {
-            // TODO add the words 'or RSS feed' and corresponding code to manage feeds and frequency
-
-            $o = replace_macros(Theme::get_template('sources_new.tpl'), [
-                '$title' => t('New Source'),
-                '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'),
-                '$words' => ['words', t('Only import content with these words (one per line)'), '', t('Leave blank to import all public content')],
-                '$name' => ['name', t('Channel Name'), '', '', '', 'autocomplete="off"'],
-                '$tags' => ['tags', t('Add the following categories to posts imported from this source (comma separated)'), '', t('Optional')],
-                '$resend' => ['resend', t('Resend posts with this channel as author'), 0, t('Copyrights may apply'), [t('No'), t('Yes')]],
-                '$submit' => t('Submit')
-            ]);
-            return $o;
-        }
-
-        if (argc() == 2 && intval(argv(1))) {
-            // edit source
-            $r = q(
-                "select source.*, xchan.* from source left join xchan on src_xchan = xchan_hash where src_id = %d and src_channel_id = %d limit 1",
-                intval(argv(1)),
-                intval(local_channel())
-            );
-            if ($r) {
-                $x = q(
-                    "select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-                    dbesc($r[0]['src_xchan']),
-                    intval(local_channel())
-                );
-            }
-            if (!$r) {
-                notice(t('Source not found.') . EOL);
-                return '';
-            }
-
-            $r[0]['src_patt'] = htmlspecialchars($r[0]['src_patt'], ENT_QUOTES, 'UTF-8');
-
-            $o = replace_macros(Theme::get_template('sources_edit.tpl'), array(
-                '$title' => t('Edit Source'),
-                '$drop' => t('Delete Source'),
-                '$id' => $r[0]['src_id'],
-                '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'),
-                '$words' => array('words', t('Only import content with these words (one per line)'), $r[0]['src_patt'], t('Leave blank to import all public content')),
-                '$xchan' => $r[0]['src_xchan'],
-                '$abook' => $x[0]['abook_id'],
-                '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'), $r[0]['src_tag'], t('Optional')),
-                '$resend' => ['resend', t('Resend posts with this channel as author'), get_abconfig(local_channel(), $r[0]['xchan_hash'], 'system', 'rself'), t('Copyrights may apply'), [t('No'), t('Yes')]],
-
-                '$name' => array('name', t('Channel Name'), $r[0]['xchan_name'], ''),
-                '$submit' => t('Submit')
-            ));
-            return $o;
-        }
-
-        if (argc() == 3 && intval(argv(1)) && argv(2) === 'drop') {
-            $r = q(
-                "select * from source where src_id = %d and src_channel_id = %d limit 1",
-                intval(argv(1)),
-                intval(local_channel())
-            );
-            if (!$r) {
-                notice(t('Source not found.') . EOL);
-                return '';
-            }
-            $r = q(
-                "delete from source where src_id = %d and src_channel_id = %d",
-                intval(argv(1)),
-                intval(local_channel())
-            );
-            if ($r) {
-                info(t('Source removed') . EOL);
-            } else {
-                notice(t('Unable to remove source.') . EOL);
-            }
-
-            goaway(z_root() . '/sources');
-        }
-
-        // shouldn't get here.
-    }
-}
diff --git a/Zotlabs/Module/Sslify.php b/Zotlabs/Module/Sslify.php
deleted file mode 100644
index c27ec888d..000000000
--- a/Zotlabs/Module/Sslify.php
+++ /dev/null
@@ -1,29 +0,0 @@
- 1) ? intval(argv(1)) : 0);
-        if (!$message_id) {
-            killme();
-        }
-
-        $r = q(
-            "SELECT * FROM item WHERE id = %d 
-			and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0 
-			and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
-            intval($message_id)
-        );
-
-        // if interacting with a pubstream item,
-        // create a copy of the parent in your stream.
-		
-
-        if ($r) {
-            if (! Channel::is_system(local_channel())) {
-                $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ];
-            }
-        }
-
-        if (! $r) {
-            killme();
-        }
-		
-		// reset $message_id to the fetched copy of message if applicable
-		$message_id = $r[0]['id'];
-        $item_starred = (intval($r[0]['item_starred']) ? 0 : 1);
-
-        $r = q(
-            "UPDATE item SET item_starred = %d WHERE uid = %d and id = %d",
-            intval($item_starred),
-            intval(local_channel()),
-            intval($message_id)
-        );
-
-        $r = q(
-            "select * from item where id = %d",
-            intval($message_id)
-        );
-        if ($r) {
-            xchan_query($r);
-            $sync_item = fetch_post_tags($r);
-            Libsync::build_sync_packet(local_channel(), [
-                'item' => [
-                    encode_item($sync_item[0], true)
-                ]
-            ]);
-        }
-
-        header('Content-type: application/json');
-        echo json_encode(array('result' => $item_starred));
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Stream.php b/Zotlabs/Module/Stream.php
deleted file mode 100644
index 1a5f7b159..000000000
--- a/Zotlabs/Module/Stream.php
+++ /dev/null
@@ -1,670 +0,0 @@
-loading) {
-            $_SESSION['loadtime_stream'] = datetime_convert();
-            PConfig::Set(local_channel(), 'system', 'loadtime_stream', $_SESSION['loadtime_stream']);
-            // stream is a superset of channel when it comes to notifications
-            $_SESSION['loadtime_channel'] = datetime_convert();
-            PConfig::Set(local_channel(), 'system', 'loadtime_channel', $_SESSION['loadtime_channel']);
-        }
-
-        $arr = ['query' => App::$query_string];
-        Hook::call('stream_content_init', $arr);
-
-        $channel = ((isset(App::$data['channel'])) ? App::$data['channel'] : null);
-
-        // if called from liveUpdate() we will not have called Stream->init() on this request and $channel will not be set
-
-        if (!$channel) {
-            $channel = App::get_channel();
-        }
-
-
-        $item_normal = item_normal();
-        $item_normal_update = item_normal_update();
-
-        $datequery = $datequery2 = '';
-
-        $group = 0;
-
-        $nouveau = false;
-
-        $datequery = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
-        $datequery2 = ((x($_GET, 'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
-        $static = ((x($_GET, 'static')) ? intval($_GET['static']) : 0);
-        $gid = ((x($_GET, 'gid')) ? $_REQUEST['gid'] : 0);
-        $category = ((x($_REQUEST, 'cat')) ? $_REQUEST['cat'] : '');
-        $hashtags = ((x($_REQUEST, 'tag')) ? $_REQUEST['tag'] : '');
-        $verb = ((x($_REQUEST, 'verb')) ? $_REQUEST['verb'] : '');
-        $dm = ((x($_REQUEST, 'dm')) ? $_REQUEST['dm'] : 0);
-
-        $c_order = get_pconfig(local_channel(), 'mod_stream', 'order', 0);
-        switch ($c_order) {
-            case 0:
-                $order = 'comment';
-                break;
-            case 1:
-                $order = 'post';
-                break;
-            case 2:
-                $nouveau = true;
-                break;
-        }
-
-        $search = (isset($_GET['search']) ? $_GET['search'] : '');
-        if ($search) {
-            $_GET['netsearch'] = escape_tags($search);
-            if (strpos($search, '@') === 0) {
-                $r = q(
-                    "select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1",
-                    dbesc(substr($search, 1)),
-                    intval(local_channel())
-                );
-                if ($r) {
-                    $_GET['cid'] = $r[0]['abook_id'];
-                    $search = $_GET['search'] = '';
-                }
-            } elseif (strpos($search, '#') === 0) {
-                $hashtags = substr($search, 1);
-                $search = $_GET['search'] = '';
-            }
-        }
-
-        if ($datequery) {
-            $order = 'post';
-        }
-
-        // filter by collection (e.g. group)
-
-        $vg = false;
-
-        if ($gid) {
-            if (strpos($gid, ':') === 0) {
-                $g = substr($gid, 1);
-                switch ($g) {
-                    case '1':
-                        $r = [['hash' => 'connections:' . $channel['channel_hash']]];
-                        $vg = t('Connections');
-                        break;
-                    case '2':
-                        $r = [['hash' => 'zot:' . $channel['channel_hash']]];
-                        $vg = t('Nomad');
-                        break;
-                    case '3':
-                        $r = [['hash' => 'activitypub:' . $channel['channel_hash']]];
-                        $vg = t('ActivityPub');
-                        break;
-                    default:
-                        break;
-                }
-            } else {
-                $r = q(
-                    "SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
-                    intval($gid),
-                    intval(local_channel())
-                );
-                if (!$r) {
-                    if ($this->updating) {
-                        killme();
-                    }
-                    notice(t('Access list not found') . EOL);
-                    goaway(z_root() . '/stream');
-                }
-            }
-
-
-            $group = $gid;
-            $group_hash = $r[0]['hash'];
-        }
-
-        $default_cmin = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmin', 0) : (-1));
-        $default_cmax = ((Apps::system_app_installed(local_channel(), 'Friend Zoom')) ? get_pconfig(local_channel(), 'affinity', 'cmax', 99) : (-1));
-
-        $cid = ((x($_GET, 'cid')) ? intval($_GET['cid']) : 0);
-        $draft = ((x($_GET, 'draft')) ? intval($_GET['draft']) : 0);
-        $star = ((x($_GET, 'star')) ? intval($_GET['star']) : 0);
-        $liked = ((x($_GET, 'liked')) ? intval($_GET['liked']) : 0);
-        $conv = ((x($_GET, 'conv')) ? intval($_GET['conv']) : 0);
-        $spam = ((x($_GET, 'spam')) ? intval($_GET['spam']) : 0);
-        $cmin = ((array_key_exists('cmin', $_GET)) ? intval($_GET['cmin']) : $default_cmin);
-        $cmax = ((array_key_exists('cmax', $_GET)) ? intval($_GET['cmax']) : $default_cmax);
-        $file = ((x($_GET, 'file')) ? $_GET['file'] : '');
-        $xchan = ((x($_GET, 'xchan')) ? $_GET['xchan'] : '');
-        $net = ((x($_GET, 'net')) ? $_GET['net'] : '');
-        $pf = ((x($_GET, 'pf')) ? $_GET['pf'] : '');
-
-        $deftag = '';
-
-
-        if (x($_GET, 'search') || $file || (!$pf && $cid)) {
-            $nouveau = true;
-        }
-
-        if ($cid) {
-            $cid_r = q(
-                "SELECT abook.abook_xchan, xchan.xchan_addr, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s, xchan.xchan_type from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and abook_blocked = 0 limit 1",
-                intval($cid),
-                intval(local_channel())
-            );
-
-            if (!$cid_r) {
-                if ($this->updating) {
-                    killme();
-                }
-                notice(t('No such channel') . EOL);
-                goaway(z_root() . '/stream');
-            }
-        }
-
-        if (!$this->updating) {
-            // search terms header
-
-            // hide the terms we use to search for videos from
-            // the activity_filter widget because it doesn't look very good
-            if ($search && $search !== 'video]') {
-                $o .= replace_macros(
-                    Theme::get_template("section_title.tpl"),
-                    ['$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8')]
-                );
-            }
-
-            $body = EMPTY_STR;
-
-            Navbar::set_selected('Stream');
-
-            $channel_acl = [
-                'allow_cid' => $channel['channel_allow_cid'],
-                'allow_gid' => $channel['channel_allow_gid'],
-                'deny_cid' => $channel['channel_deny_cid'],
-                'deny_gid' => $channel['channel_deny_gid']
-            ];
-
-            $x = [
-                'is_owner' => true,
-                'allow_location' => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
-                'default_location' => $channel['channel_location'],
-                'nickname' => $channel['channel_address'],
-                'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-                'acl' => Libacl::populate($channel_acl, true, PermissionDescription::fromGlobalPermission('view_stream'), Libacl::get_post_aclDialogDescription(), 'acl_dialog_post'),
-                'permissions' => $channel_acl,
-                'bang' => EMPTY_STR,
-                'body' => $body,
-                'visitor' => true,
-                'profile_uid' => local_channel(),
-                'editor_autocomplete' => true,
-                'bbco_autocomplete' => 'bbcode',
-                'bbcode' => true,
-                'jotnets' => true,
-                'reset' => t('Reset form')
-            ];
-
-            if ($deftag) {
-                $x['pretext'] = $deftag;
-            }
-
-            $status_editor = status_editor($x);
-            $o .= $status_editor;
-
-            $static = Channel::manual_conv_update(local_channel());
-        }
-
-
-        // We don't have to deal with ACL's on this page. You're looking at everything
-        // that belongs to you, hence you can see all of it. We will filter by group if
-        // desired.
-
-
-        $sql_options = (($star)
-            ? " and item_starred = 1 "
-            : '');
-
-        $sql_nets = '';
-
-        $item_thread_top = ' AND item_thread_top = 1 ';
-
-        $sql_extra = '';
-
-        if ($draft) {
-            $item_normal = item_normal_draft();
-            $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE item_unpublished = 1 and item_deleted = 0 ) ";
-        }
-
-        if ($group) {
-            $contact_str = '';
-            $contacts = AccessList::members(local_channel(), $group);
-            if ($contacts) {
-                $contact_str = ids_to_querystr($contacts, 'xchan', true);
-            } else {
-                $contact_str = " '0' ";
-                if (!$this->updating) {
-                    info(t('Access list is empty'));
-                }
-            }
-            $item_thread_top = '';
-
-            $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
-
-
-            if (!$vg) {
-                $x = AccessList::rec_byhash(local_channel(), $group_hash);
-            }
-
-            if ($x || $vg) {
-                $title = replace_macros(Theme::get_template("section_title.tpl"), array(
-                    '$title' => sprintf(t('Access list: %s'), (($vg) ? $vg : $x['gname']))
-                ));
-            }
-
-            $o = $title . $status_editor;
-        } elseif (isset($cid_r) && $cid_r) {
-            $item_thread_top = EMPTY_STR;
-
-            if ($this->loading || $this->updating) {
-                if (!$pf && $nouveau) {
-                    $sql_extra = " AND author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ";
-                } else {
-                    $ttype = (($pf) ? TERM_FORUM : TERM_MENTION);
-
-                    $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal ");
-                    $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'");
-
-                    $p_str = ids_to_querystr(array_merge($p1, $p2), 'parent');
-                    $sql_extra = " AND item.parent IN ( $p_str ) ";
-                }
-            }
-
-            $title = replace_macros(Theme::get_template('section_title.tpl'), [
-                '$title' => '' . urlencode($cid_r[0]['xchan_name']) . ' ' . $cid_r[0]['xchan_name'] . ''
-            ]);
-
-            $o = $title;
-            $o .= $status_editor;
-        } elseif ($xchan) {
-            $r = q(
-                "select * from xchan where xchan_hash = '%s'",
-                dbesc($xchan)
-            );
-            if ($r) {
-                $item_thread_top = '';
-                $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) ";
-                $title = replace_macros(Theme::get_template('section_title.tpl'), [
-                    '$title' => '' . urlencode($r[0]['xchan_name']) . ' ' . $r[0]['xchan_name'] . ''
-                ]);
-
-                $o = $title;
-                $o .= $status_editor;
-            } else {
-                notice(t('Invalid channel.') . EOL);
-                goaway(z_root() . '/stream');
-            }
-        }
-
-        if (x($category)) {
-            $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
-        }
-        if (x($hashtags)) {
-            $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
-        }
-
-        if (!$this->updating) {
-            // The special div is needed for liveUpdate to kick in for this page.
-            // We only launch liveUpdate if you aren't filtering in some incompatible
-            // way and also you aren't writing a comment (discovered in javascript).
-
-            $maxheight = get_pconfig(local_channel(), 'system', 'stream_divmore_height');
-            if (!$maxheight) {
-                $maxheight = 400;
-            }
-
-
-            $o .= '
          ' . "\r\n";
-            $o .= "\r\n";
-
-            App::$page['htmlhead'] .= replace_macros(Theme::get_template('build_query.tpl'), [
-                '$baseurl' => z_root(),
-                '$pgtype' => 'stream',
-                '$uid' => ((local_channel()) ? local_channel() : '0'),
-                '$gid' => (($gid) ? $gid : '0'),
-                '$cid' => (($cid) ? $cid : '0'),
-                '$cmin' => (($cmin) ? $cmin : '(-1)'),
-                '$cmax' => (($cmax) ? $cmax : '(-1)'),
-                '$star' => (($star) ? $star : '0'),
-                '$liked' => (($liked) ? $liked : '0'),
-                '$conv' => (($conv) ? $conv : '0'),
-                '$spam' => (($spam) ? $spam : '0'),
-                '$fh' => '0',
-                '$dm' => (($dm) ? $dm : '0'),
-                '$nouveau' => (($nouveau) ? $nouveau : '0'),
-                '$wall' => '0',
-                '$draft' => (($draft) ? $draft : '0'),
-                '$static' => $static,
-                '$list' => ((x($_REQUEST, 'list')) ? intval($_REQUEST['list']) : 0),
-                '$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-                '$search' => (($search) ? urlencode($search) : ''),
-                '$xchan' => (($xchan) ? urlencode($xchan) : ''),
-                '$order' => (($order) ? urlencode($order) : ''),
-                '$file' => (($file) ? urlencode($file) : ''),
-                '$cats' => (($category) ? urlencode($category) : ''),
-                '$tags' => (($hashtags) ? urlencode($hashtags) : ''),
-                '$dend' => $datequery,
-                '$mid' => '',
-                '$verb' => (($verb) ? urlencode($verb) : ''),
-                '$net' => (($net) ? urlencode($net) : ''),
-                '$dbegin' => $datequery2,
-                '$pf' => (($pf) ? intval($pf) : '0'),
-            ]);
-        }
-
-        $sql_extra3 = '';
-
-        if ($datequery) {
-            $sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
-        }
-        if ($datequery2) {
-            $sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
-        }
-
-        $sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id ");
-        $sql_extra3 = (($nouveau) ? '' : $sql_extra3);
-
-        if (x($_GET, 'search')) {
-            $search = escape_tags($_GET['search']);
-            if (strpos($search, '#') === 0) {
-                $sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG);
-            } else {
-                $sql_extra .= sprintf(
-                    " AND (item.body like '%s' OR item.title like '%s') ",
-                    dbesc(protect_sprintf('%' . $search . '%')),
-                    dbesc(protect_sprintf('%' . $search . '%'))
-                );
-            }
-        }
-
-        if ($verb) {
-            // the presence of a leading dot in the verb determines
-            // whether to match the type of activity or the child object.
-            // The name 'verb' is a holdover from the earlier XML
-            // ActivityStreams specification.
-
-            if (substr($verb, 0, 1) === '.') {
-                $verb = substr($verb, 1);
-                $sql_extra .= sprintf(
-                    " AND item.obj_type like '%s' ",
-                    dbesc(protect_sprintf('%' . $verb . '%'))
-                );
-            } else {
-                $sql_extra .= sprintf(
-                    " AND item.verb like '%s' ",
-                    dbesc(protect_sprintf('%' . $verb . '%'))
-                );
-            }
-        }
-
-        if (strlen($file)) {
-            $sql_extra .= term_query('item', $file, TERM_FILE);
-        }
-
-        if ($dm) {
-            $sql_extra .= " and item_private = 2 ";
-        }
-
-        if ($conv) {
-            $item_thread_top = '';
-
-            if ($nouveau) {
-                $sql_extra .= " AND author_xchan = '" . dbesc($channel['channel_hash']) . "' ";
-            } else {
-                $sql_extra .= sprintf(
-                    " AND parent IN (SELECT distinct(parent) from item where ( author_xchan = '%s' or item_mentionsme = 1 ) and item_deleted = 0 ) ",
-                    dbesc(protect_sprintf($channel['channel_hash']))
-                );
-            }
-        }
-
-        if ($this->updating && !$this->loading) {
-            // only setup pagination on initial page view
-            $pager_sql = '';
-        } else {
-            $itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
-            App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
-            $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-        }
-
-        // cmin and cmax are both -1 when the affinity tool is disabled
-
-        if (($cmin != (-1)) || ($cmax != (-1))) {
-            // Not everybody who shows up in the network stream will be in your address book.
-            // By default those that aren't are assumed to have closeness = 99; but this isn't
-            // recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
-            // the stream with a NULL address book entry.
-
-            $sql_nets .= " AND ";
-
-            if ($cmax == 99) {
-                $sql_nets .= " ( ";
-            }
-
-            $sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " ";
-            $sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) ";
-
-            if ($cmax == 99) {
-                $sql_nets .= " OR abook.abook_closeness IS NULL ) ";
-            }
-        }
-
-        $net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
-        $net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
-
-        $abook_uids = " and abook.abook_channel = " . local_channel() . " ";
-        $uids = " and item.uid = " . local_channel() . " ";
-
-        if (get_pconfig(local_channel(), 'system', 'stream_list_mode')) {
-            $page_mode = 'list';
-        } else {
-            $page_mode = 'client';
-        }
-
-        $simple_update = (($this->updating) ? " and item_changed >  = '" . $_SESSION['loadtime_stream'] . "' " : '');
-
-        $parents_str = '';
-        $update_unseen = '';
-        $items = [];
-
-        // This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
-        // or three and look at your stream page - after opening up your browser. The first page loads just as it
-        // should. All of a sudden a few seconds later, page 2 will get inserted at the beginning of the page
-        // (before the page 1 content). The update code is actually doing just what it's supposed
-        // to, it's fetching posts that have the ITEM_UNSEEN bit set. But the reason that page 2 content is being
-        // returned in an UPDATE is because you hadn't gotten that far yet - you're still on page 1 and everything
-        // that we loaded for page 1 is now marked as seen. But the stuff on page 2 hasn't been. So... it's being
-        // treated as "new fresh" content because it is unseen. We need to distinguish it somehow from content
-        // which "arrived as you were reading page 1". We're going to do this
-        // by storing in your session the current UTC time whenever you LOAD a network page, and only UPDATE items
-        // which are both ITEM_UNSEEN and have "changed" since that time. Cross fingers...
-
-        if ($this->updating && $_SESSION['loadtime_stream']) {
-            $simple_update = " AND item.changed > '" . datetime_convert('UTC', 'UTC', $_SESSION['loadtime_stream']) . "' ";
-        }
-        if ($this->loading) {
-            $simple_update = '';
-        }
-
-        if ($static && $simple_update) {
-            $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";
-        }
-
-
-        // we are not yet using this in updates because the content may have just been marked seen
-        // and this might prevent us from loading the update. Will need to test further.
-
-        $seenstr = EMPTY_STR;
-        if (local_channel()) {
-            $seen = PConfig::Get(local_channel(), 'system', 'seen_items', []);
-            if ($seen) {
-                $seenstr = " and not item.id in (" . implode(',', $seen) . ") ";
-            }
-        }
-
-        if ($nouveau && $this->loading) {
-            // "New Item View" - show all items unthreaded in reverse created date order
-
-            $items = q("SELECT item.*, item.id AS item_id, created FROM item 
-				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-				$net_query
-				WHERE true $uids $item_normal
-				and (abook.abook_blocked = 0 or abook.abook_flags is null)
-				$simple_update
-				$sql_extra $sql_options $sql_nets
-				$net_query2
-				ORDER BY item.created DESC $pager_sql ");
-
-            xchan_query($items);
-
-            $items = fetch_post_tags($items, true);
-        } elseif ($this->updating) {
-            // Normal conversation view
-
-            if ($order === 'post') {
-                $ordering = "created";
-            } else {
-                $ordering = "commented";
-            }
-
-            if ($this->loading) {
-                // Fetch a page full of parent items for this page
-                $r = q("SELECT item.parent AS item_id FROM item 
-					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-					$net_query
-					WHERE true $uids $item_thread_top $item_normal
-					AND item.mid = item.parent_mid
-					and (abook.abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra3 $sql_extra $sql_options $sql_nets
-					$net_query2
-					ORDER BY $ordering DESC $pager_sql ");
-            } else {
-                // this is an update
-
-                $r = q("SELECT item.parent AS item_id FROM item
-					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-					$net_query
-					WHERE true $uids $item_normal_update $simple_update
-					and (abook.abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra3 $sql_extra $sql_options $sql_nets $net_query2");
-            }
-
-            if ($r) {
-                $parents_str = ids_to_querystr($r, 'item_id');
-
-                $items = q(
-                    "SELECT item.*, item.id AS item_id FROM item
-					WHERE true $uids $item_normal
-					AND item.parent IN ( %s )
-					$sql_extra ",
-                    dbesc($parents_str)
-                );
-
-                xchan_query($items, true);
-                $items = fetch_post_tags($items, true);
-                $items = conv_sort($items, $ordering);
-            }
-
-            if ($page_mode === 'list') {
-
-                /**
-                 * in "list mode", only mark the parent item and any like activities as "seen".
-                 * We won't distinguish between comment likes and post likes. The important thing
-                 * is that the number of unseen comments will be accurate. The SQL to separate the
-                 * comment likes could also get somewhat hairy.
-                 */
-
-                if ($parents_str) {
-                    $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
-                    $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
-                }
-            } else {
-                if ($parents_str) {
-                    $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
-                }
-            }
-        }
-
-        if ($update_unseen && (!(isset($_SESSION['sudo']) && $_SESSION['sudo']))) {
-            $x = ['channel_id' => local_channel(), 'update' => 'unset'];
-            Hook::call('update_unseen', $x);
-            if ($x['update'] === 'unset' || intval($x['update'])) {
-                $r = q(
-                    "UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ",
-                    intval(local_channel())
-                );
-            }
-        }
-
-        $mode = (($nouveau) ? 'stream-new' : 'stream');
-
-        if ($search) {
-            $mode = 'search';
-        }
-
-        $o .= conversation($items, $mode, $this->updating, $page_mode);
-
-        if (($items) && (!$this->updating)) {
-            $o .= alt_pager(count($items));
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php
deleted file mode 100644
index 138377793..000000000
--- a/Zotlabs/Module/Subthread.php
+++ /dev/null
@@ -1,191 +0,0 @@
- 2) ? notags(trim(argv(2))) : 0);
-
-        if (argv(1) === 'sub') {
-            $activity = ACTIVITY_FOLLOW;
-        } elseif (argv(1) === 'unsub') {
-            $activity = ACTIVITY_IGNORE;
-        }
-
-        $i = q(
-            "select * from item where id = %d and uid = %d",
-            intval($item_id),
-            intval(local_channel())
-        );
-
-        if (!$i) {
-            // try the global public stream
-            $i = q(
-                "select * from item where id = %d and uid = %d",
-                intval($postid),
-                intval($sys['channel_id'])
-            );
-            // try the local public stream
-            if (!$i) {
-                $i = q(
-                    "select * from item where id = %d and item_wall = 1 and item_private = 0",
-                    intval($postid)
-                );
-            }
-
-            if ($i && local_channel() && (!Channel::is_system(local_channel()))) {
-                $i = [copy_of_pubitem($channel, $i[0]['mid'])];
-                $item_id = (($i) ? $i[0]['id'] : 0);
-            }
-        }
-
-        if (!$i) {
-            return;
-        }
-
-        $r = q(
-            "select * from item where id = parent and id = %d limit 1",
-            dbesc($i[0]['parent'])
-        );
-
-        if ((!$item_id) || (!$r)) {
-            logger('subthread: no item ' . $item_id);
-            return;
-        }
-
-        $item = $r[0];
-
-        $owner_uid = $item['uid'];
-        $observer = App::get_observer();
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        if (!perm_is_allowed($owner_uid, $ob_hash, 'post_comments')) {
-            return;
-        }
-
-        $sys = Channel::get_system();
-
-        $owner_uid = $item['uid'];
-        $owner_aid = $item['aid'];
-
-        // if this is a "discover" item, (item['uid'] is the sys channel),
-        // fallback to the item comment policy, which should've been
-        // respected when generating the conversation thread.
-        // Even if the activity is rejected by the item owner, it should still get attached
-        // to the local discover conversation on this site.
-
-        if (($owner_uid != $sys['channel_id']) && (!perm_is_allowed($owner_uid, $observer['xchan_hash'], 'post_comments'))) {
-            notice(t('Permission denied') . EOL);
-            killme();
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($item['owner_xchan'])
-        );
-        if ($r) {
-            $thread_owner = $r[0];
-        } else {
-            killme();
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($item['author_xchan'])
-        );
-        if ($r) {
-            $item_author = $r[0];
-        } else {
-            killme();
-        }
-
-        $uuid = new_uuid();
-        $mid = z_root() . '/item/' . $uuid;
-
-        $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
-
-        $links = array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['plink']));
-        $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE);
-
-        $body = $item['body'];
-
-        $obj = Activity::fetch_item(['id' => $item['mid']]);
-        $objtype = $obj['type'];
-
-        if (!intval($item['item_thread_top'])) {
-            $post_type = 'comment';
-        }
-
-        if ($activity === ACTIVITY_FOLLOW) {
-            $bodyverb = t('%1$s is following %2$s\'s %3$s');
-        }
-        if ($activity === ACTIVITY_IGNORE) {
-            $bodyverb = t('%1$s stopped following %2$s\'s %3$s');
-        }
-
-        $arr = [];
-
-        $arr['uuid'] = $uuid;
-        $arr['mid'] = $mid;
-        $arr['aid'] = $owner_aid;
-        $arr['uid'] = $owner_uid;
-        $arr['parent'] = $item['id'];
-        $arr['parent_mid'] = $item['mid'];
-        $arr['thr_parent'] = $item['mid'];
-        $arr['owner_xchan'] = $thread_owner['xchan_hash'];
-        $arr['author_xchan'] = $observer['xchan_hash'];
-        $arr['item_origin'] = 1;
-        $arr['item_notshown'] = 1;
-
-        if (intval($item['item_wall'])) {
-            $arr['item_wall'] = 1;
-        } else {
-            $arr['item_wall'] = 0;
-        }
-
-        $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
-        $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
-        $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
-
-        $arr['body'] = sprintf($bodyverb, $alink, $ulink, $plink);
-
-        $arr['verb'] = $activity;
-        $arr['obj_type'] = $objtype;
-        $arr['obj'] = json_encode($obj);
-
-        $arr['allow_cid'] = $item['allow_cid'];
-        $arr['allow_gid'] = $item['allow_gid'];
-        $arr['deny_cid'] = $item['deny_cid'];
-        $arr['deny_gid'] = $item['deny_gid'];
-
-        $post = item_store($arr);
-        $post_id = $post['item_id'];
-
-        $arr['id'] = $post_id;
-
-        Hook::call('post_local_end', $arr);
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Suggestions.php b/Zotlabs/Module/Suggestions.php
deleted file mode 100644
index f687a7b62..000000000
--- a/Zotlabs/Module/Suggestions.php
+++ /dev/null
@@ -1,47 +0,0 @@
- [['uid' => local_channel(), 'xchan' => $_GET['ignore']]]]);
-        }
-    }
-
-
-    public function get()
-    {
-
-        $o = '';
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if (Apps::system_app_installed(local_channel(), 'Suggest Channels')) {
-            goaway(z_root() . '/directory?f=&suggest=1');
-        }
-
-        $desc = t('This app (when installed) displays a small number of friend suggestions on selected pages or you can run the app to display a full list of channel suggestions.');
-
-        return '
          ' . $desc . '
          ';
-    }
-}
diff --git a/Zotlabs/Module/Superblock.php b/Zotlabs/Module/Superblock.php
deleted file mode 100644
index 28b63d159..000000000
--- a/Zotlabs/Module/Superblock.php
+++ /dev/null
@@ -1,263 +0,0 @@
- local_channel(),
-                'block_entity' => $blocked,
-                'block_type' => $type,
-                'block_comment' => t('Added by Superblock')
-            ];
-
-            LibBlock::store($bl);
-
-            $sync = [];
-
-            $sync['block'] = [LibBlock::fetch_by_entity(local_channel(), $blocked)];
-
-            if ($type === BLOCKTYPE_CHANNEL) {
-                $z = q(
-                    "insert into xign ( uid, xchan ) values ( %d , '%s' ) ",
-                    intval(local_channel()),
-                    dbesc($blocked)
-                );
-                $ab = q(
-                    "select * from abook where abook_channel = %d and abook_xchan = '%s'",
-                    intval(local_channel()),
-                    dbesc($blocked)
-                );
-                if (($ab) && (!intval($ab['abook_blocked']))) {
-                    q(
-                        "update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'",
-                        intval(local_channel()),
-                        dbesc($blocked)
-                    );
-
-                    $r = q(
-                        "SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
-                        intval(local_channel()),
-                        dbesc($blocked)
-                    );
-                    if ($r) {
-                        $r = array_shift($r);
-                        $abconfig = load_abconfig(local_channel(), $blocked);
-                        if ($abconfig) {
-                            $r['abconfig'] = $abconfig;
-                        }
-                        unset($r['abook_id']);
-                        unset($r['abook_account']);
-                        unset($r['abook_channel']);
-                        $sync['abook'] = [$r];
-                    }
-                }
-                $sync['xign'] = [['uid' => local_channel(), 'xchan' => $_GET['block']]];
-            }
-            Libsync::build_sync_packet(0, $sync);
-        }
-
-        $type = BLOCKTYPE_CHANNEL;
-        $unblocked = trim($_REQUEST['unblock']);
-        if (!$unblocked) {
-            $unblocked = trim($_REQUEST['unblocksite']);
-            if ($unblocked) {
-                $type = BLOCKTYPE_SERVER;
-            }
-        }
-        if ($unblocked) {
-            $handled = true;
-            if (check_form_security_token('superblock', 'sectok')) {
-                $r = LibBlock::fetch_by_entity(local_channel(), $unblocked);
-                if ($r) {
-                    LibBlock::remove(local_channel(), $unblocked);
-
-                    $sync = [];
-                    $sync['block'] = [[
-                        'block_channel_id' => local_channel(),
-                        'block_entity' => $unblocked,
-                        'block_type' => $type,
-                        'deleted' => true,
-                    ]];
-                    if ($type === BLOCKTYPE_CHANNEL) {
-                        $ab = q(
-                            "select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s'",
-                            intval(local_channel()),
-                            dbesc($unblocked)
-                        );
-                        if (($ab) && (intval($ab['abook_blocked']))) {
-                            q(
-                                "update abook set abook_blocked = 1 where abook_channel = %d and abook_xchan = '%s'",
-                                intval(local_channel()),
-                                dbesc($unblocked)
-                            );
-                            $ab['abook_blocked'] = 0;
-                            $abconfig = load_abconfig(local_channel(), $unblocked);
-                            if ($abconfig) {
-                                $ab['abconfig'] = $abconfig;
-                            }
-                            unset($ab['abook_id']);
-                            unset($ab['abook_account']);
-                            unset($ab['abook_channel']);
-                            $sync['abook'] = [$ab];
-                        }
-
-                        $z = q(
-                            "delete from xign where uid = %d  and xchan = '%s' ",
-                            intval(local_channel()),
-                            dbesc($unblocked)
-                        );
-                    }
-                    Libsync::build_sync_packet(0, $sync);
-                }
-            }
-        }
-
-        if ($handled) {
-            info(t('superblock settings updated') . EOL);
-
-            if ($unblocked || $inline) {
-                return;
-            }
-
-            killme();
-        }
-    }
-
-    public function get()
-    {
-
-        $l = LibBlock::fetch(local_channel(), BLOCKTYPE_CHANNEL);
-
-        $list = ids_to_array($l, 'block_entity');
-
-        stringify_array_elms($list, true);
-        $query_str = implode(',', $list);
-        if ($query_str) {
-            $r = q("select * from xchan where xchan_hash in ( " . $query_str . " ) ");
-        } else {
-            $r = [];
-        }
-        if ($r) {
-            for ($x = 0; $x < count($r); $x++) {
-                $r[$x]['encoded_hash'] = urlencode($r[$x]['xchan_hash']);
-            }
-        }
-
-        $sc .= replace_macros(Theme::get_template('superblock_list.tpl'), [
-            '$blocked' => t('Blocked channels'),
-            '$entries' => $r,
-            '$nothing' => (($r) ? '' : t('No channels currently blocked')),
-            '$token' => get_form_security_token('superblock'),
-            '$remove' => t('Remove')
-        ]);
-
-
-        $l = LibBlock::fetch(local_channel(), BLOCKTYPE_SERVER);
-        $list = ids_to_array($l, 'block_entity');
-        if ($list) {
-            for ($x = 0; $x < count($list); $x++) {
-                $list[$x] = [$list[$x], urlencode($list[$x])];
-            }
-        }
-
-        $sc .= replace_macros(Theme::get_template('superblock_serverlist.tpl'), [
-            '$blocked' => t('Blocked servers'),
-            '$entries' => $list,
-            '$nothing' => (($list) ? '' : t('No servers currently blocked')),
-            '$token' => get_form_security_token('superblock'),
-            '$remove' => t('Remove')
-        ]);
-
-        $s .= replace_macros(Theme::get_template('generic_app_settings.tpl'), [
-            '$addon' => array('superblock', t('Manage Blocks'), '', t('Submit')),
-            '$content' => $sc
-        ]);
-
-        return $s;
-    }
-}
diff --git a/Zotlabs/Module/Tagadelic.php b/Zotlabs/Module/Tagadelic.php
deleted file mode 100644
index a4d1b8352..000000000
--- a/Zotlabs/Module/Tagadelic.php
+++ /dev/null
@@ -1,47 +0,0 @@
-' . $desc . '
          ';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Tagadelic'))) {
-            return $text;
-        }
-
-        $desc = t('This app is installed. It displays a hashtag cloud on your channel homepage.');
-
-        $text = '
          ' . $desc . '
          ';
-
-
-        $c = new Comanche();
-        return $text . EOL . EOL . $c->widget('tagcloud_wall', EMPTY_STR);
-    }
-}
diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php
deleted file mode 100644
index 44a7f5d2b..000000000
--- a/Zotlabs/Module/Tagger.php
+++ /dev/null
@@ -1,179 +0,0 @@
- 1) ? notags(trim(argv(1))) : 0);
-
-        logger('tagger: tag ' . $term . ' item ' . $item_id);
-
-        $r = q(
-            "select * from item where id = %d and uid = %d limit 1",
-            intval($item_id),
-            intval(local_channel())
-        );
-
-        if (!$r) {
-            $r = q(
-                "select * from item where id = %d and uid = %d limit 1",
-                intval($item_id),
-                intval($sys['channel_id'])
-            );
-            if (!$r) {
-                $r = q(
-                    "select * from item where id = %d and item_private = 0 and item_wall = 1",
-                    intval($item_id)
-                );
-            }
-            if ($r && local_channel() && (!Channel::is_system(local_channel()))) {
-                $r = [copy_of_pubitem($channel, $i[0]['mid'])];
-                $item_id = (($r) ? $r[0]['id'] : 0);
-            }
-        }
-
-        if (!$r) {
-            notice(t('Post not found.') . EOL);
-            return;
-        }
-
-        $r = q(
-            "SELECT * FROM item left join xchan on xchan_hash = author_xchan WHERE id = %d and uid = %d LIMIT 1",
-            intval($item_id),
-            intval(local_channel())
-        );
-
-        if ((!$item_id) || (!$r)) {
-            logger('tagger: no item ' . $item_id);
-            return;
-        }
-
-        $item = $r[0];
-
-        $owner_uid = $item['uid'];
-
-        switch ($item['resource_type']) {
-            case 'photo':
-                $targettype = ACTIVITY_OBJ_PHOTO;
-                $post_type = t('photo');
-                break;
-            case 'event':
-                $targgettype = ACTIVITY_OBJ_EVENT;
-                $post_type = t('event');
-                break;
-            default:
-                $targettype = ACTIVITY_OBJ_NOTE;
-                $post_type = t('post');
-                if ($item['mid'] != $item['parent_mid']) {
-                    $post_type = t('comment');
-                }
-                break;
-        }
-
-
-        $clean_term = trim($term, '"\' ');
-
-        $links = array(array('rel' => 'alternate', 'type' => 'text/html',
-            'href' => z_root() . '/display/' . gen_link_id($item['mid'])));
-
-        $target = json_encode(array(
-            'type' => $targettype,
-            'id' => $item['mid'],
-            'link' => $links,
-            'title' => $item['title'],
-            'content' => $item['body'],
-            'created' => $item['created'],
-            'edited' => $item['edited'],
-            'author' => array(
-                'name' => $item['xchan_name'],
-                'address' => $item['xchan_addr'],
-                'guid' => $item['xchan_guid'],
-                'guid_sig' => $item['xchan_guid_sig'],
-                'link' => array(
-                    array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item['xchan_url']),
-                    array('rel' => 'photo', 'type' => $item['xchan_photo_mimetype'], 'href' => $item['xchan_photo_m'])),
-            ),
-        ));
-
-        $tagid = z_root() . '/search?tag=' . $clean_term;
-        $objtype = ACTIVITY_OBJ_TAGTERM;
-
-        $obj = json_encode(array(
-            'type' => $objtype,
-            'id' => $tagid,
-            'link' => array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $tagid)),
-            'title' => $clean_term,
-            'content' => $clean_term
-        ));
-
-        $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
-
-        // saving here for reference
-        // also check out x22d5 and x2317 and x0d6b and x0db8 and x24d0 and xff20 !!!
-
-        $termlink = html_entity_decode('⋕') . '[zrl=' . z_root() . '/search?tag=' . urlencode($clean_term) . ']' . $clean_term . '[/zrl]';
-
-        $channel = App::get_channel();
-
-        $arr = [];
-
-        $arr['owner_xchan'] = $item['owner_xchan'];
-        $arr['author_xchan'] = $channel['channel_hash'];
-
-        $arr['item_origin'] = 1;
-        $arr['item_wall'] = ((intval($item['item_wall'])) ? 1 : 0);
-
-        $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
-        $alink = '[zrl=' . $item['xchan_url'] . ']' . $item['xchan_name'] . '[/zrl]';
-        $plink = '[zrl=' . $item['plink'] . ']' . $post_type . '[/zrl]';
-
-        $arr['body'] = sprintf($bodyverb, $ulink, $alink, $plink, $termlink);
-
-        $arr['verb'] = ACTIVITY_TAG;
-        $arr['tgt_type'] = $targettype;
-        $arr['target'] = $target;
-        $arr['obj_type'] = $objtype;
-        $arr['obj'] = $obj;
-        $arr['parent_mid'] = $item['mid'];
-        store_item_tag($item['uid'], $item['id'], TERM_OBJ_POST, TERM_COMMUNITYTAG, $clean_term, $tagid);
-        $ret = post_activity_item($arr);
-
-        if ($ret['success']) {
-            Libsync::build_sync_packet(
-                local_channel(),
-                [
-                    'item' => [encode_item($ret['activity'], true)]
-                ]
-            );
-        }
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Tagrm.php b/Zotlabs/Module/Tagrm.php
deleted file mode 100644
index 4879170b6..000000000
--- a/Zotlabs/Module/Tagrm.php
+++ /dev/null
@@ -1,158 +0,0 @@
-' . t('Remove Item Tag') . '';
-
-            $o .= '
          ' . t('Select a tag to remove: ') . '
          ';
-
-            $o .= '
          ';
-            $o .= '';
-            $o .= '
            ';
-
-
-            foreach ($r[0]['term'] as $x) {
-                $o .= '
          • ' . bbcode($x['term']) . '
            • ';
-            }
-
-            $o .= '
          ';
-            $o .= '';
-            $o .= '';
-            $o .= '
          ';
-
-            return $o;
-        }
-    }
-}
diff --git a/Zotlabs/Module/Tasks.php b/Zotlabs/Module/Tasks.php
deleted file mode 100644
index e8c38bda6..000000000
--- a/Zotlabs/Module/Tasks.php
+++ /dev/null
@@ -1,117 +0,0 @@
- 1 && argv(1) === 'fetch') {
-            if (argc() > 2 && argv(2) === 'all') {
-                $arr['all'] = 1;
-            }
-
-            $x = tasks_fetch($arr);
-            $x['html'] = '';
-            if (isset($x['tasks']) && is_array($x['tasks'])) {
-                foreach ($x['tasks'] as $y) {
-                    $x['html'] .= '
           ' . $y['summary'] . '
          ';
-                }
-            }
-            json_return_and_die($x);
-        }
-    }
-
-
-    public function post()
-    {
-        //  logger('post: ' . print_r($_POST,true));
-
-
-        if (!local_channel()) {
-            return;
-        }
-
-        $channel = App::get_channel();
-
-        if ((argc() > 2) && (argv(1) === 'complete') && intval(argv(2))) {
-            $ret = array('success' => false);
-            $r = q(
-                "select * from event where etype = 'task' and uid = %d and id = %d limit 1",
-                intval(local_channel()),
-                intval(argv(2))
-            );
-            if ($r) {
-                $event = $r[0];
-                if ($event['event_status'] === 'COMPLETED') {
-                    $event['event_status'] = 'IN-PROCESS';
-                    $event['event_status_date'] = NULL_DATE;
-                    $event['event_percent'] = 0;
-                    $event['event_sequence'] = $event['event_sequence'] + 1;
-                    $event['edited'] = datetime_convert();
-                } else {
-                    $event['event_status'] = 'COMPLETED';
-                    $event['event_status_date'] = datetime_convert();
-                    $event['event_percent'] = 100;
-                    $event['event_sequence'] = $event['event_sequence'] + 1;
-                    $event['edited'] = datetime_convert();
-                }
-                $x = event_store_event($event);
-                if ($x) {
-                    $ret['success'] = true;
-                }
-            }
-            json_return_and_die($ret);
-        }
-
-        if (argc() == 2 && argv(1) === 'new') {
-            $text = escape_tags(trim($_REQUEST['summary']));
-            if (!$text) {
-                return ['success' => false];
-            }
-            $event = [];
-            $event['account'] = $channel['channel_account_id'];
-            $event['uid'] = $channel['channel_id'];
-            $event['event_xchan'] = $channel['channel_hash'];
-            $event['etype'] = 'task';
-            $event['nofinish'] = true;
-            $event['created'] = $event['edited'] = $event['dtstart'] = datetime_convert();
-            $event['adjust'] = 1;
-            $event['allow_cid'] = '<' . $channel['channel_hash'] . '>';
-            $event['summary'] = escape_tags($_REQUEST['summary']);
-            $x = event_store_event($event);
-            if ($x) {
-                $x['success'] = true;
-            } else {
-                $x = ['success' => false];
-            }
-            json_return_and_die($x);
-        }
-    }
-
-    public function get()
-    {
-        $desc = t('This app provides a simple personal and task list.');
-
-        $text = '
          ' . $desc . '
          ';
-
-        if (!(local_channel() && Apps::system_app_installed(local_channel(), 'Tasks'))) {
-            return $text;
-        }
-
-        $obj = new Tasklist();
-        return $obj->widget([]);
-    }
-}
diff --git a/Zotlabs/Module/Theme_info.php b/Zotlabs/Module/Theme_info.php
deleted file mode 100644
index 8334b8497..000000000
--- a/Zotlabs/Module/Theme_info.php
+++ /dev/null
@@ -1,73 +0,0 @@
-get_theme_config_file($theme)) != null) {
-            require_once($themeconfigfile);
-            if (class_exists('\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config')) {
-                $clsname = '\\Zotlabs\\Theme\\' . ucfirst($theme) . 'Config';
-                $th_config = new $clsname();
-                $schemas = $th_config->get_schemas();
-                if ($schemas) {
-                    foreach ($schemas as $k => $v) {
-                        $schemalist[] = ['key' => $k, 'val' => $v];
-                    }
-                }
-                $theme_config = $th_config->get();
-            }
-        }
-        $info = get_theme_info($theme);
-        if ($info) {
-            // unfortunately there will be no translation for this string
-            $desc = $info['description'];
-            $version = $info['version'];
-            $credits = $info['credits'];
-        } else {
-            $desc = '';
-            $version = '';
-            $credits = '';
-        }
-
-        $ret = [
-            'theme' => $theme,
-            'img' => get_theme_screenshot($theme),
-            'desc' => $desc,
-            'version' => $version,
-            'credits' => $credits,
-            'schemas' => $schemalist,
-            'config' => $theme_config
-        ];
-        json_return_and_die($ret);
-    }
-
-
-    public function get_theme_config_file($theme)
-    {
-
-        $base_theme = App::$theme_info['extends'];
-
-        if (file_exists("view/theme/$theme/php/config.php")) {
-            return "view/theme/$theme/php/config.php";
-        }
-        if (file_exists("view/theme/$base_theme/php/config.php")) {
-            return "view/theme/$base_theme/php/config.php";
-        }
-        return null;
-    }
-}
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
deleted file mode 100644
index b16d95d41..000000000
--- a/Zotlabs/Module/Thing.php
+++ /dev/null
@@ -1,424 +0,0 @@
-set_from_array($_REQUEST);
-        }
-
-        $x = $acl->get();
-
-        if ($term_hash) {
-            $t = q(
-                "select * from obj where obj_obj = '%s' and obj_channel = %d limit 1",
-                dbesc($term_hash),
-                intval(local_channel())
-            );
-            if (!$t) {
-                notice(t('Item not found.') . EOL);
-                return;
-            }
-            $orig_record = $t[0];
-            if ($photo != $orig_record['obj_imgurl']) {
-                delete_thing_photo($orig_record['obj_imgurl'], get_observer_hash());
-                $arr = import_remote_xchan_photo($photo, get_observer_hash(), true);
-                if ($arr) {
-                    $local_photo = $arr[0];
-                    $local_photo_type = $arr[3];
-                } else {
-                    $local_photo = $orig_record['obj_imgurl'];
-                }
-            } else {
-                $local_photo = $orig_record['obj_imgurl'];
-            }
-            if ($local_photo) {
-                $r = q(
-                    "update obj set obj_term = '%s', obj_url = '%s', obj_imgurl = '%s', obj_edited = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where obj_obj = '%s' and obj_channel = %d ",
-                    dbesc($name),
-                    dbesc(($url) ? $url : z_root() . '/thing/' . $term_hash),
-                    dbesc($local_photo),
-                    dbesc(datetime_convert()),
-                    dbesc($x['allow_cid']),
-                    dbesc($x['allow_gid']),
-                    dbesc($x['deny_cid']),
-                    dbesc($x['deny_gid']),
-                    dbesc($term_hash),
-                    intval(local_channel())
-                );
-            }
-            info(t('Thing updated') . EOL);
-
-            $r = q(
-                "select * from obj where obj_channel = %d and obj_obj = '%s' limit 1",
-                intval(local_channel()),
-                dbesc($term_hash)
-            );
-            if ($r) {
-                Libsync::build_sync_packet(0, array('obj' => $r));
-            }
-
-            return;
-        }
-
-        $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 ");
-        $p = q(
-            "select profile_guid, is_default from profile where uid = %d $sql limit 1",
-            intval(local_channel())
-        );
-
-        if ($p) {
-            $profile = $p[0];
-        } else {
-            return;
-        }
-
-        $local_photo = null;
-
-        if ($photo) {
-            $arr = import_remote_xchan_photo($photo, get_observer_hash(), true);
-            if ($arr) {
-                $local_photo = $arr[0];
-                $local_photo_type = $arr[3];
-            } else {
-                $local_photo = $photo;
-            }
-        }
-
-
-        $created = datetime_convert();
-        $url = (($url) ? $url : z_root() . '/thing/' . $hash);
-
-        $r = q(
-            "insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj, obj_term, obj_url, obj_imgurl, obj_created, obj_edited, allow_cid, allow_gid, deny_cid, deny_gid ) values ('%s','%s', %d, %d, '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s') ",
-            dbesc($profile['profile_guid']),
-            dbesc($verb),
-            intval(TERM_OBJ_THING),
-            intval(local_channel()),
-            dbesc($hash),
-            dbesc($name),
-            dbesc($url),
-            dbesc(($photo) ? $local_photo : ''),
-            dbesc($created),
-            dbesc($created),
-            dbesc($x['allow_cid']),
-            dbesc($x['allow_gid']),
-            dbesc($x['deny_cid']),
-            dbesc($x['deny_gid'])
-        );
-
-        if (!$r) {
-            notice(t('Object store: failed'));
-            return;
-        }
-
-        info(t('Thing added'));
-
-        $r = q(
-            "select * from obj where obj_channel = %d and obj_obj = '%s' limit 1",
-            intval(local_channel()),
-            dbesc($hash)
-        );
-        if ($r) {
-            Libsync::build_sync_packet(0, array('obj' => $r));
-        }
-
-        if ($activity) {
-            $arr = [];
-            $links = array(array('rel' => 'alternate', 'type' => 'text/html', 'href' => $url));
-            if ($local_photo) {
-                $links[] = array('rel' => 'photo', 'type' => $local_photo_type, 'href' => $local_photo);
-            }
-
-            $objtype = ACTIVITY_OBJ_THING;
-
-            $obj = json_encode(array(
-                'type' => $objtype,
-                'id' => $url,
-                'link' => $links,
-                'title' => $name,
-                'content' => $name
-            ));
-
-            $bodyverb = str_replace('OBJ: ', '', t('OBJ: %1$s %2$s %3$s'));
-
-            $arr['owner_xchan'] = $channel['channel_hash'];
-            $arr['author_xchan'] = $channel['channel_hash'];
-
-            $arr['item_origin'] = 1;
-            $arr['item_wall'] = 1;
-            $arr['item_thread_top'] = 1;
-
-            $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
-            $plink = '[zrl=' . $url . ']' . $name . '[/zrl]';
-
-            $arr['body'] = sprintf($bodyverb, $ulink, $translated_verb, $plink);
-
-            if ($local_photo) {
-                $arr['body'] .= "\n\n[zmg]" . $local_photo . "[/zmg]";
-            }
-
-            $arr['verb'] = $verb;
-            $arr['obj_type'] = $objtype;
-            $arr['obj'] = $obj;
-
-            if (!$profile['is_default']) {
-                $arr['item_private'] = true;
-                $str = '';
-                $r = q(
-                    "select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'",
-                    intval(local_channel()),
-                    dbesc($profile_guid)
-                );
-                if ($r) {
-                    $arr['allow_cid'] = '';
-                    foreach ($r as $rr) {
-                        $arr['allow_cid'] .= '<' . $rr['abook_xchan'] . '>';
-                    }
-                } else {
-                    $arr['allow_cid'] = '<' . get_observer_hash() . '>';
-                }
-            }
-
-            $ret = post_activity_item($arr);
-        }
-    }
-
-
-    public function get()
-    {
-
-        // @FIXME one problem with things is we can't share them unless we provide the channel in the url
-        // so we can definitively lookup the owner.
-
-        if (argc() == 2) {
-            $r = q(
-                "select obj_channel from obj where obj_type = %d and obj_obj = '%s' limit 1",
-                intval(TERM_OBJ_THING),
-                dbesc(argv(1))
-            );
-            if ($r) {
-                $sql_extra = permissions_sql($r[0]['obj_channel']);
-            }
-
-            $r = q(
-                "select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1",
-                intval(TERM_OBJ_THING),
-                dbesc(argv(1))
-            );
-
-            if ($r) {
-                return replace_macros(Theme::get_template('show_thing.tpl'), array(
-                    '$header' => t('Show Thing'),
-                    '$edit' => t('Edit'),
-                    '$delete' => t('Delete'),
-                    '$canedit' => ((local_channel() && local_channel() == $r[0]['obj_channel']) ? true : false),
-                    '$thing' => $r[0]));
-            } else {
-                notice(t('item not found.') . EOL);
-                return;
-            }
-        }
-
-        $channel = App::get_channel();
-
-        if (!(local_channel() && $channel)) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $acl = new AccessControl($channel);
-        $channel_acl = $acl->get();
-
-        $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
-
-        $thing_hash = '';
-
-        if (argc() == 3 && argv(1) === 'edit') {
-            $thing_hash = argv(2);
-
-            $r = q(
-                "select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
-                intval(TERM_OBJ_THING),
-                dbesc($thing_hash)
-            );
-
-            if ((!$r) || ($r[0]['obj_channel'] != local_channel())) {
-                notice(t('Permission denied.') . EOL);
-                return '';
-            }
-
-            $o .= replace_macros(Theme::get_template('thing_edit.tpl'), array(
-                '$thing_hdr' => t('Edit Thing'),
-                '$multiprof' => Features::enabled(local_channel(), 'multi_profiles'),
-                '$profile_lbl' => t('Select a profile'),
-                '$profile_select' => contact_profile_assign($r[0]['obj_page']),
-                '$verb_lbl' => $channel['channel_name'],
-                '$verb_select' => obj_verb_selector($r[0]['obj_verb']),
-                '$activity' => array('activity', t('Post an activity'), true, t('Only sends to viewers of the applicable profile')),
-                '$thing_hash' => $thing_hash,
-                '$thing_lbl' => t('Name of thing e.g. something'),
-                '$thething' => $r[0]['obj_term'],
-                '$url_lbl' => t('URL of thing (optional)'),
-                '$theurl' => $r[0]['obj_url'],
-                '$img_lbl' => t('URL for photo of thing (optional)'),
-                '$imgurl' => $r[0]['obj_imgurl'],
-                '$permissions' => t('Permissions'),
-                '$aclselect' => Libacl::populate($channel_acl, false),
-                '$allow_cid' => acl2json($channel_acl['allow_cid']),
-                '$allow_gid' => acl2json($channel_acl['allow_gid']),
-                '$deny_cid' => acl2json($channel_acl['deny_cid']),
-                '$deny_gid' => acl2json($channel_acl['deny_gid']),
-                '$lockstate' => $lockstate,
-                '$submit' => t('Submit')
-            ));
-
-            return $o;
-        }
-
-        if (argc() == 3 && argv(1) === 'drop') {
-            $thing_hash = argv(2);
-
-            $r = q(
-                "select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
-                intval(TERM_OBJ_THING),
-                dbesc($thing_hash)
-            );
-
-            if ((!$r) || ($r[0]['obj_channel'] != local_channel())) {
-                notice(t('Permission denied.') . EOL);
-                return '';
-            }
-
-
-            delete_thing_photo($r[0]['obj_imgurl'], get_observer_hash());
-
-            $x = q(
-                "delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d",
-                dbesc($thing_hash),
-                intval(TERM_OBJ_THING),
-                intval(local_channel())
-            );
-
-            $r[0]['obj_deleted'] = 1;
-
-            Libsync::build_sync_packet(0, array('obj' => $r));
-
-            return $o;
-        }
-
-        $o .= replace_macros(Theme::get_template('thing_input.tpl'), array(
-            '$thing_hdr' => t('Add Thing to your Profile'),
-            '$multiprof' => Features::enabled(local_channel(), 'multi_profiles'),
-            '$profile_lbl' => t('Select a profile'),
-            '$profile_select' => contact_profile_assign(''),
-            '$verb_lbl' => $channel['channel_name'],
-            '$activity' => array('activity', t('Post an activity'), ((array_key_exists('activity', $_REQUEST)) ? $_REQUEST['activity'] : true), t('Only sends to viewers of the applicable profile')),
-            '$verb_select' => obj_verb_selector(),
-            '$thing_lbl' => t('Name of thing e.g. something'),
-            '$url_lbl' => t('URL of thing (optional)'),
-            '$img_lbl' => t('URL for photo of thing (optional)'),
-            '$permissions' => t('Permissions'),
-            '$aclselect' => Libacl::populate($channel_acl, false),
-            '$allow_cid' => acl2json($channel_acl['allow_cid']),
-            '$allow_gid' => acl2json($channel_acl['allow_gid']),
-            '$deny_cid' => acl2json($channel_acl['deny_cid']),
-            '$deny_gid' => acl2json($channel_acl['deny_gid']),
-            '$lockstate' => $lockstate,
-            '$submit' => t('Submit')
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Toggle_safesearch.php b/Zotlabs/Module/Toggle_safesearch.php
deleted file mode 100644
index cab77ba50..000000000
--- a/Zotlabs/Module/Toggle_safesearch.php
+++ /dev/null
@@ -1,37 +0,0 @@
-db);
-        $s = new OAuth2Server($storage);
-        $request = Request::createFromGlobals();
-        $response = $s->handleTokenRequest($request);
-        $response->send();
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Uexport.php b/Zotlabs/Module/Uexport.php
deleted file mode 100644
index 710868994..000000000
--- a/Zotlabs/Module/Uexport.php
+++ /dev/null
@@ -1,83 +0,0 @@
- 1) {
-            $channel = App::get_channel();
-
-            if (argc() > 1 && intval(argv(1)) > 1900) {
-                $year = intval(argv(1));
-            }
-
-            if (argc() > 2 && intval(argv(2)) > 0 && intval(argv(2)) <= 12) {
-                $month = intval(argv(2));
-            }
-
-            header('content-type: application/json');
-            header('Content-Disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . (($month) ? '-' . $month : '') . (($_REQUEST['sections']) ? '-' . $_REQUEST['sections'] : '') . '.json"');
-
-            $flags = ((version_compare(PHP_VERSION, '7.2.0') >= 0) ? JSON_INVALID_UTF8_SUBSTITUTE : 0);
-
-            if ($year) {
-                echo json_encode(Channel::export_year(local_channel(), $year, $month), $flags);
-                killme();
-            }
-
-            if (argc() > 1 && argv(1) === 'basic') {
-                echo json_encode(Channel::basic_export(local_channel(), $sections), $flags);
-                killme();
-            }
-
-            // Warning: this option may consume a lot of memory
-
-            if (argc() > 1 && argv(1) === 'complete') {
-                $sections[] = 'items';
-                echo json_encode(Channel::basic_export(local_channel(), $sections));
-                killme();
-            }
-        }
-    }
-
-    public function get()
-    {
-
-        $y = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
-
-        $yearurl = z_root() . '/uexport/' . $y;
-        $janurl = z_root() . '/uexport/' . $y . '/1';
-        $impurl = '/import_items';
-        $o = replace_macros(Theme::get_template('uexport.tpl'), array(
-            '$title' => t('Export Channel'),
-            '$basictitle' => t('Export Channel'),
-            '$basic' => t('Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'),
-            '$fulltitle' => t('Export Content'),
-            '$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin.'),
-
-            '$by_year' => t('Export your posts from a given year.'),
-
-            '$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'),
-            '$extra2' => sprintf(t('To select all posts for a given year, such as this year, visit %2$s'), $yearurl, $yearurl),
-            '$extra3' => sprintf(t('To select all posts for a given month, such as January of this year, visit %2$s'), $janurl, $janurl),
-            '$extra4' => sprintf(t('These content files may be imported or restored by visiting %2$s on any site containing your channel. For best results please import or restore these in date order (oldest first).'), $impurl, $impurl)
-
-        ));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Update.php b/Zotlabs/Module/Update.php
deleted file mode 100644
index b71113504..000000000
--- a/Zotlabs/Module/Update.php
+++ /dev/null
@@ -1,83 +0,0 @@
-get() to indicate that
- * the existing content should either be replaced or appended to.
- * The current modules that support this manner of update are
- *  channel, hq, stream, display, search, and pubstream.
- * The state we are passing is the profile_uid (passed to us as $_GET['p']), and argv(2) === 'load'
- * to indicate that we're replacing original content.
- *
- * module->profile_uid - tell the module who owns this data
- * module->loading - tell the module to replace existing  content
- * module->updating - always true to tell the module that this is a js initiated request
- *
- * Inside main.js we also append all of the relevant content query params which were initially used on that
- * page via buildCmd so those are passed to this instance of update and are therefore available from the module.
- */
-
-use App;
-use Zotlabs\Web\Controller;
-
-class Update extends Controller
-{
-
-    public function get()
-    {
-
-        $profile_uid = intval($_GET['p']);
-
-        // Change a profile_uid of 0 (not logged in) to (-1) for selected controllers
-        // as they only respond to liveUpdate with non-zero values
-
-        if ((!$profile_uid) && in_array(argv(1), ['display', 'search', 'pubstream', 'home'])) {
-            $profile_uid = (-1);
-        }
-
-        if (argc() < 2) {
-            killme();
-        }
-
-        // These modules don't have a completely working liveUpdate implementation currently
-
-        if (in_array(strtolower(argv(1)), ['articles', 'cards'])) {
-            killme();
-        }
-
-        $module = "\\Zotlabs\\Module\\" . ucfirst(argv(1));
-        $load = (((argc() > 2) && (argv(2) == 'load')) ? 1 : 0);
-
-        $mod = new $module();
-
-        // Set the state flags of the relevant module (only conversational
-        // modules support state flags
-
-        if (isset($mod->profile_uid)) {
-            $mod->profile_uid = $profile_uid;
-        }
-        if (isset($mod->updating)) {
-            $mod->updating = 1;
-        }
-        if (isset($mod->loading) && $load) {
-            $mod->loading = 1;
-        }
-
-        header("Content-type: text/html");
-
-        // Modify the argument parameters to match what the new controller
-        // expects. They are currently set to what this controller expects.
-
-        App::$argv = [argv(1)];
-        App::$argc = 1;
-
-        echo "
          \r\n";
-        echo $mod->get();
-        echo "
          \r\n";
-
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Userinfo.php b/Zotlabs/Module/Userinfo.php
deleted file mode 100644
index 798b47926..000000000
--- a/Zotlabs/Module/Userinfo.php
+++ /dev/null
@@ -1,21 +0,0 @@
-db));
-        $request = Request::createFromGlobals();
-        $s->handleUserInfoRequest($request)->send();
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/View.php b/Zotlabs/Module/View.php
deleted file mode 100644
index 0e9bdf234..000000000
--- a/Zotlabs/Module/View.php
+++ /dev/null
@@ -1,24 +0,0 @@
- 1) {
-            Libprofile::load(argv(1));
-        }
-    }
-
-    public function get()
-    {
-
-        // logger('request: ' . print_r($_REQUEST,true));
-
-        if (observer_prohibited()) {
-            notice(t('Public access denied.') . EOL);
-            return;
-        }
-
-        if (((!(is_array(App::$profile) && count(App::$profile))) || (App::$profile['hide_friends']))) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if (!perm_is_allowed(App::$profile['uid'], get_observer_hash(), 'view_contacts')) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        if (!$_REQUEST['aj']) {
-            $_SESSION['return_url'] = App::$query_string;
-        }
-
-        $is_owner = ((local_channel() && local_channel() == App::$profile['uid']) ? true : false);
-
-        $abook_flags = " and abook_pending = 0 and abook_self = 0 ";
-        $sql_extra = '';
-
-        if (!$is_owner) {
-            $abook_flags .= " and abook_hidden = 0 ";
-            $sql_extra = " and xchan_hidden = 0 ";
-        }
-
-        $r = q(
-            "SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ",
-            intval(App::$profile['uid']),
-            intval(App::$pager['itemspage']),
-            intval(App::$pager['start'])
-        );
-
-        if ((!$r) && (!$_REQUEST['aj'])) {
-            info(t('No connections.') . EOL);
-            return $o;
-        }
-
-        $contacts = [];
-
-        foreach ($r as $rr) {
-            $oneway = false;
-            if (!their_perms_contains(App::$profile['uid'], $rr['xchan_hash'], 'post_comments')) {
-                $oneway = true;
-            }
-
-            $url = chanlink_hash($rr['xchan_hash']);
-            if ($url) {
-                $contacts[] = [
-                    'id' => $rr['abook_id'],
-                    'archived' => (intval($rr['abook_archived']) ? true : false),
-                    'img_hover' => sprintf(t('Visit %1$s\'s profile [%2$s]'), $rr['xchan_name'], $rr['xchan_url']),
-                    'thumb' => $rr['xchan_photo_m'],
-                    'name' => substr($rr['xchan_name'], 0, 20),
-                    'username' => $rr['xchan_addr'],
-                    'link' => $url,
-                    'sparkle' => '',
-                    'itemurl' => $rr['url'],
-                    'network' => '',
-                    'oneway' => $oneway
-                ];
-            }
-        }
-
-
-        if ($_REQUEST['aj']) {
-            if ($contacts) {
-                $o = replace_macros(Theme::get_template('viewcontactsajax.tpl'), [
-                    '$contacts' => $contacts
-                ]);
-            } else {
-                $o = '
          ';
-            }
-            echo $o;
-            killme();
-        } else {
-            $o .= "";
-            $o .= replace_macros(Theme::get_template('viewcontact_template.tpl'), [
-                '$title' => t('View Connections'),
-                '$contacts' => $contacts,
-            ]);
-        }
-
-        if (!$contacts) {
-            $o .= '
          ';
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php
deleted file mode 100644
index 8ffc7be69..000000000
--- a/Zotlabs/Module/Viewsrc.php
+++ /dev/null
@@ -1,73 +0,0 @@
- 1) ? intval(argv(1)) : 0);
-        $json = ((argc() > 2 && argv(2) === 'json') ? true : false);
-        $dload = ((argc() > 2 && argv(2) === 'download') ? true : false);
-
-        if (!local_channel()) {
-            notice(t('Permission denied.') . EOL);
-        }
-
-        if (!$item_id) {
-            App::$error = 404;
-            notice(t('Item not found.') . EOL);
-        }
-
-        $item_normal = item_normal_search();
-
-        if (local_channel() && $item_id) {
-            $r = q(
-                "select id, item_flags, mimetype, item_obscured, body, llink, plink from item where uid in (%d , %d) and id = %d $item_normal limit 1",
-                intval(local_channel()),
-                intval($sys['channel_id']),
-                intval($item_id)
-            );
-
-            if ($r) {
-                if (intval($r[0]['item_obscured'])) {
-                    $dload = true;
-                }
-
-                if ($dload) {
-                    header('Content-type: ' . $r[0]['mimetype']);
-                    header('Content-Disposition: attachment; filename="' . t('item') . '-' . $item_id . '"');
-                    echo $r[0]['body'];
-                    killme();
-                }
-
-                $content = escape_tags($r[0]['body']);
-                $o = (($json) ? json_encode($content) : str_replace("\n", '
          ', $content));
-            }
-        }
-
-        $inspect = ((is_site_admin()) ? '| ' . t('Inspect') . '' : EMPTY_STR);
-
-
-        if (is_ajax()) {
-            echo '
          ';
-            echo '
          ' . t('Local id:') . ' ' . $r[0]['id'] . ' | ' . t('Permanent link') . ' | ' . t('Local link') . '' . $inspect . '
          ';
-            echo '
          ';
-            echo '
          ' . $o . '
          ';
-            echo '
          ';
-            killme();
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Vlists.php b/Zotlabs/Module/Vlists.php
deleted file mode 100644
index 4f36d7df7..000000000
--- a/Zotlabs/Module/Vlists.php
+++ /dev/null
@@ -1,31 +0,0 @@
-' . $desc . '
          ';
-
-        $o .= $text;
-
-
-        $text2 = '
          ' . t('This app is installed. ') . '
          ';
-
-        if (local_channel() && Apps::system_app_installed(local_channel(), 'Virtual Lists')) {
-            $o .= $text2;
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Vote.php b/Zotlabs/Module/Vote.php
deleted file mode 100644
index 12e2e9809..000000000
--- a/Zotlabs/Module/Vote.php
+++ /dev/null
@@ -1,135 +0,0 @@
- false, 'message' => EMPTY_STR];
-
-        $channel = App::get_channel();
-
-        if (!$channel) {
-            $ret['message'] = t('Permission denied.');
-            json_return_and_die($ret);
-        }
-
-
-        $fetch = null;
-        $id = argv(1);
-        $response = $_REQUEST['answer'];
-
-        if ($id) {
-            $fetch = q(
-                "select * from item where id = %d limit 1",
-                intval($id)
-            );
-        }
-
-        if ($fetch && $fetch[0]['obj_type'] === 'Question') {
-            $obj = json_decode($fetch[0]['obj'], true);
-        } else {
-            $ret['message'] = t('Poll not found.');
-            json_return_and_die($ret);
-        }
-
-        $valid = false;
-
-        if ($obj['oneOf']) {
-            foreach ($obj['oneOf'] as $selection) {
-                //      logger('selection: ' . $selection);
-                //      logger('response: ' . $response);
-                if ($selection['name'] && $selection['name'] === $response) {
-                    $valid = true;
-                }
-            }
-        }
-
-        $choices = [];
-        if ($obj['anyOf']) {
-            foreach ($obj['anyOf'] as $selection) {
-                $choices[] = $selection['name'];
-            }
-            foreach ($response as $res) {
-                if (!in_array($res, $choices)) {
-                    $valid = false;
-                    break;
-                }
-                $valid = true;
-            }
-        }
-
-        if (!$valid) {
-            $ret['message'] = t('Invalid response.');
-            json_return_and_die($ret);
-        }
-
-        if (!is_array($response)) {
-            $response = [$response];
-        }
-
-        foreach ($response as $res) {
-            $item = [];
-
-            $item['aid'] = $channel['channel_account_id'];
-            $item['uid'] = $channel['channel_id'];
-            $item['item_origin'] = true;
-            $item['parent'] = $fetch[0]['id'];
-            $item['parent_mid'] = $fetch[0]['mid'];
-            $item['thr_parent'] = $fetch[0]['mid'];
-            $item['uuid'] = new_uuid();
-            $item['mid'] = z_root() . '/item/' . $item['uuid'];
-            $item['verb'] = 'Create';
-            $item['title'] = $res;
-            $item['author_xchan'] = $channel['channel_hash'];
-            $item['owner_xchan'] = $fetch[0]['author_xchan'];
-//          $item['allow_cid'] = '<' . $fetch[0]['author_xchan'] . '>';
-//          $item['item_private'] = 1;
-
-            // These two are placeholder values that will be reset after
-            // we encode the item
-
-            $item['obj_type'] = 'Note';
-            $item['author'] = Channel::from_id($channel['channel_id']);
-
-            $item['obj'] = Activity::encode_item($item, ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? true : false));
-
-            // now reset the placeholders
-
-            $item['obj_type'] = 'Answer';
-            unset($item['author']);
-
-            $x = item_store($item);
-
-            retain_item($fetch[0]['id']);
-
-            if ($x['success']) {
-                $itemid = $x['item_id'];
-                Run::Summon(['Notifier', 'like', $itemid]);
-            }
-
-            $r = q(
-                "select * from item where id = %d",
-                intval($itemid)
-            );
-            if ($r) {
-                xchan_query($r);
-                $sync_item = fetch_post_tags($r);
-                Libsync::build_sync_packet($channel['channel_id'], ['item' => [encode_item($sync_item[0], true)]]);
-            }
-        }
-        $ret['success'] = true;
-        $ret['message'] = t('Response submitted. Updates may not appear instantly.');
-        json_return_and_die($ret);
-    }
-}
diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php
deleted file mode 100644
index f2f6534ef..000000000
--- a/Zotlabs/Module/Wall_attach.php
+++ /dev/null
@@ -1,180 +0,0 @@
- 1) {
-                $channel = Channel::from_username(argv(1));
-            }
-        }
-
-        if (!$channel) {
-            killme();
-        }
-
-        $matches = [];
-        $partial = false;
-
-        if (array_key_exists('HTTP_CONTENT_RANGE', $_SERVER)) {
-            $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/', $_SERVER['HTTP_CONTENT_RANGE'], $matches);
-            if ($pm) {
-                // logger('Content-Range: ' . print_r($matches,true));
-                $partial = true;
-            }
-        }
-
-        if ($partial) {
-            $x = save_chunk($channel, $matches[1], $matches[2], $matches[3]);
-            if ($x['partial']) {
-                header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
-                json_return_and_die($x);
-            } else {
-                header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));
-
-                $_FILES['userfile'] = [
-                    'name' => $x['name'],
-                    'type' => $x['type'],
-                    'tmp_name' => $x['tmp_name'],
-                    'error' => $x['error'],
-                    'size' => $x['size']
-                ];
-            }
-        } else {
-            if (!array_key_exists('userfile', $_FILES)) {
-                $_FILES['userfile'] = [
-                    'name' => $_FILES['files']['name'],
-                    'type' => $_FILES['files']['type'],
-                    'tmp_name' => $_FILES['files']['tmp_name'],
-                    'error' => $_FILES['files']['error'],
-                    'size' => $_FILES['files']['size']
-                ];
-            }
-        }
-
-        $observer = App::get_observer();
-
-
-        $def_album = get_pconfig($channel['channel_id'], 'system', 'photo_path');
-        $def_attach = get_pconfig($channel['channel_id'], 'system', 'attach_path');
-
-        $r = attach_store($channel, (($observer) ? $observer['xchan_hash'] : ''), '', [
-            'source' => 'editor',
-            'visible' => 0,
-            'album' => $def_album,
-            'directory' => $def_attach,
-            'flags' => 1, // indicates temporary permissions are created
-            'allow_cid' => '<' . $channel['channel_hash'] . '>'
-        ]);
-
-        if (!$r['success']) {
-            notice($r['message'] . EOL);
-            killme();
-        }
-
-        $s = EMPTY_STR;
-
-        if (intval($r['data']['is_photo'])) {
-            $s .= "\n\n" . $r['body'] . "\n\n";
-        }
-
-        $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
-
-        if (strpos($r['data']['filetype'], 'video') === 0) {
-            for ($n = 0; $n < 15; $n++) {
-                $thumb = Linkinfo::get_video_poster($url);
-                if ($thumb) {
-                    break;
-                }
-                sleep(1);
-                continue;
-            }
-
-            if ($thumb) {
-                $s .= "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n";
-            } else {
-                $s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n";
-            }
-        }
-        if (strpos($r['data']['filetype'], 'audio') === 0) {
-            $s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n";
-        }
-        if ($r['data']['filetype'] === 'image/svg+xml') {
-            $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-            if ($x) {
-                $bb = svg2bb($x);
-                if ($bb) {
-                    $s .= "\n\n" . $bb;
-                } else {
-                    logger('empty return from svgbb');
-                }
-            } else {
-                logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-            }
-        }
-        if ($r['data']['filetype'] === 'text/vnd.abc' && Addon::is_installed('abc')) {
-            $x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-            if ($x) {
-                $s .= "\n\n" . '[abc]' . $x . '[/abc]';
-            } else {
-                logger('unable to read ABC data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-            }
-        }
-        if ($r['data']['filetype'] === 'text/calendar') {
-            $content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-            if ($content) {
-                $ev = ical_to_ev($content);
-                if ($ev) {
-                    $s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n";
-                }
-            }
-        }
-
-        $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
-
-
-        if ($using_api) {
-            return $s;
-        }
-
-        $result['message'] = $s;
-        json_return_and_die($result);
-    }
-}
diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php
deleted file mode 100644
index a14b4625f..000000000
--- a/Zotlabs/Module/Wall_upload.php
+++ /dev/null
@@ -1,62 +0,0 @@
- 1) {
-                $channel = Channel::from_username(argv(1));
-            }
-        }
-
-        if (!$channel) {
-            if ($using_api) {
-                return;
-            }
-            notice(t('Channel not found.') . EOL);
-            killme();
-        }
-
-        $observer = App::get_observer();
-
-        $args = array('source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
-
-        $ret = photo_upload($channel, $observer, $args);
-
-        if (!$ret['success']) {
-            if ($using_api) {
-                return;
-            }
-            notice($ret['message']);
-            killme();
-        }
-
-        if ($using_api) {
-            return ("\n\n" . $ret['body'] . "\n\n");
-        } else {
-            echo "\n\n" . $ret['body'] . "\n\n";
-        }
-        killme();
-    }
-}
diff --git a/Zotlabs/Module/Webfinger.php b/Zotlabs/Module/Webfinger.php
deleted file mode 100644
index 721e18100..000000000
--- a/Zotlabs/Module/Webfinger.php
+++ /dev/null
@@ -1,194 +0,0 @@
- 3 && $arr[2] === 'zotid') {
-                $hash = $arr[3];
-                $channel_target = Channel::from_hash($hash);
-            }
-        }
-
-        if (strpos($resource, 'acct:') === 0) {
-            $channel_nickname = punify(str_replace('acct:', '', $resource));
-            if (strrpos($channel_nickname, '@') !== false) {
-                $host = punify(substr($channel_nickname, strrpos($channel_nickname, '@') + 1));
-
-                // If the webfinger address points off site, redirect to the correct site
-
-                if (strcasecmp($host, App::get_hostname())) {
-                    goaway('https://' . $host . '/.well-known/webfinger?f=&resource=' . $resource);
-                }
-                $channel_nickname = substr($channel_nickname, 0, strrpos($channel_nickname, '@'));
-            }
-        }
-        if (strpos($resource, 'http') === 0) {
-            $channel_nickname = str_replace(['~', '@'], ['', ''], basename($resource));
-        }
-
-        if ($channel_nickname) {
-            $channel_target = Channel::from_username($channel_nickname);
-        }
-
-        if ($channel_target || $site_query) {
-            $h = get_hubloc_addrs_by_hash($channel_target['channel_hash']);
-
-            if (!isset($result['subject'])) {
-                $result['subject'] = $resource;
-            }
-
-            $aliases = [
-                z_root() . '/channel/' . $channel_target['channel_address'],
-                z_root() . '/~' . $channel_target['channel_address'],
-                z_root() . '/@' . $channel_target['channel_address']
-
-            ];
-
-            if ($h) {
-                foreach ($h as $hh) {
-                    $aliases[] = 'acct:' . $hh['hubloc_addr'];
-                }
-            }
-
-            $result['aliases'] = [];
-
-            $result['properties'] = [
-                'http://webfinger.net/ns/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'],
-                'http://xmlns.com/foaf/0.1/name' => $site_query ? System::get_site_name() : $channel_target['channel_name'],
-                'https://w3id.org/security/v1#publicKeyPem' => (($site_query) ? get_config('system', 'pubkey') : $channel_target['xchan_pubkey']),
-                'http://purl.org/zot/federation' => ((get_config('system', 'activitypub', ACTIVITYPUB_ENABLED)) ? 'nomad,zot6,activitypub' : 'nomad,zot6')
-            ];
-
-            if ($site_query) {
-                $aliases[] = z_root();
-                $aliases[] = 'acct:sys@' . App::get_hostname();
-            }
-
-            foreach ($aliases as $alias) {
-                if ($alias !== $result['subject']) {
-                    $result['aliases'][] = $alias;
-                }
-            }
-
-            $result['links'] = [
-
-                [
-                    'rel' => 'http://webfinger.net/rel/avatar',
-                    'type' => $channel_target['xchan_photo_mimetype'],
-                    'href' => $channel_target['xchan_photo_l']
-                ],
-
-                [
-                    'rel' => 'http://webfinger.net/rel/blog',
-                    'href' => z_root() . '/channel/' . $channel_target['channel_address'],
-                ],
-
-                [
-                    'rel' => 'http://openid.net/specs/connect/1.0/issuer',
-                    'href' => z_root()
-                ],
-
-                [
-                    'rel' => 'http://purl.org/zot/protocol/6.0',
-                    'type' => 'application/x-zot+json',
-                    'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']),
-                ],
-
-				[ 
-					'rel'  => 'http://purl.org/nomad', 
-					'type' => 'application/x-nomad+json', 
-					'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address']),
-				],
-
-				[
-					'rel'  => 'http://purl.org/openwebauth/v1',
-					'type' => 'application/x-nomad+json',
-					'href' => z_root() . '/owa'
-				],
-
-                [
-                    'rel' => 'http://purl.org/openwebauth/v1',
-                    'type' => 'application/x-zot+json',
-                    'href' => z_root() . '/owa'
-                ],
-
-                [
-                    'rel' => 'self',
-                    'type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
-                    'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address'])
-                ],
-
-                [
-                    'rel' => 'self',
-                    'type' => 'application/activity+json',
-                    'href' => (($site_query) ? z_root() : z_root() . '/channel/' . $channel_target['channel_address'])
-                ],
-
-                [
-                    'rel' => 'http://ostatus.org/schema/1.0/subscribe',
-                    'template' => z_root() . '/follow?url={uri}'
-                ],
-            ];
-        }
-
-        if (!$result) {
-            header($_SERVER['SERVER_PROTOCOL'] . ' ' . 400 . ' ' . 'Bad Request');
-            killme();
-        }
-
-        $arr = ['channel' => $channel_target, 'request' => $_REQUEST, 'result' => $result];
-        Hook::call('webfinger', $arr);
-
-
-        json_return_and_die($arr['result'], 'application/jrd+json', true);
-    }
-}
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
deleted file mode 100644
index b7d2b0a5b..000000000
--- a/Zotlabs/Module/Webpages.php
+++ /dev/null
@@ -1,731 +0,0 @@
- 1 && argv(1) === 'sys' && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                App::$is_sys = true;
-            }
-        }
-
-        if (argc() > 1) {
-            $which = argv(1);
-        } else {
-            return;
-        }
-
-        Libprofile::load($which);
-    }
-
-
-    public function get()
-    {
-
-        if (!App::$profile) {
-            notice(t('Requested profile is not available.') . EOL);
-            App::$error = 404;
-            return;
-        }
-
-        if (!Apps::system_app_installed(App::$profile_uid, 'Webpages')) {
-            //Do not display any associated widgets at this point
-            App::$pdl = '';
-
-            $o = 'Webpages App (Not Installed):
          ';
-            $o .= t('Provide managed web pages on your channel');
-            return $o;
-        }
-
-        Navbar::set_selected('Webpages');
-
-        $which = argv(1);
-
-        $_SESSION['return_url'] = App::$query_string;
-
-        $uid = local_channel();
-        $owner = 0;
-        $observer = App::get_observer();
-
-        $channel = App::get_channel();
-
-        switch ($_SESSION['action']) {
-            case 'import':
-                $_SESSION['action'] = null;
-                $o .= replace_macros(Theme::get_template('webpage_import.tpl'), array(
-                    '$title' => t('Import Webpage Elements'),
-                    '$importbtn' => t('Import selected'),
-                    '$action' => 'import',
-                    '$pages' => $_SESSION['pages'],
-                    '$layouts' => $_SESSION['layouts'],
-                    '$blocks' => $_SESSION['blocks'],
-                ));
-                return $o;
-
-            case 'importselected':
-                $_SESSION['action'] = null;
-                break;
-            case 'export_select_list':
-                $_SESSION['action'] = null;
-                if (!$uid) {
-                    $_SESSION['export'] = null;
-                    break;
-                }
-                require_once('include/import.php');
-
-                $pages = get_webpage_elements($channel, 'pages');
-                $layouts = get_webpage_elements($channel, 'layouts');
-                $blocks = get_webpage_elements($channel, 'blocks');
-                $o .= replace_macros(Theme::get_template('webpage_export_list.tpl'), array(
-                    '$title' => t('Export Webpage Elements'),
-                    '$exportbtn' => t('Export selected'),
-                    '$action' => $_SESSION['export'],    // value should be 'zipfile' or 'cloud'
-                    '$pages' => $pages['pages'],
-                    '$layouts' => $layouts['layouts'],
-                    '$blocks' => $blocks['blocks'],
-                ));
-                $_SESSION['export'] = null;
-                return $o;
-
-            default:
-                $_SESSION['action'] = null;
-                break;
-        }
-
-
-        if (App::$is_sys && is_site_admin()) {
-            $sys = Channel::get_system();
-            if ($sys && intval($sys['channel_id'])) {
-                $uid = $owner = intval($sys['channel_id']);
-                $channel = $sys;
-                $observer = $sys;
-            }
-        }
-
-        if (!$owner) {
-            // Figure out who the page owner is.
-            $r = q(
-                "select channel_id from channel where channel_address = '%s'",
-                dbesc($which)
-            );
-            if ($r) {
-                $owner = intval($r[0]['channel_id']);
-            }
-        }
-
-        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-        $perms = get_all_perms($owner, $ob_hash);
-
-        if (!$perms['write_pages']) {
-            notice(t('Permission denied.') . EOL);
-            return;
-        }
-
-        $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner, 'system', 'page_mimetype'));
-
-        $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner, 'system', 'page_layout'));
-
-        // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
-        // Nickname is set to the observers xchan, and profile_uid to the owner's.
-        // This lets you post pages at other people's channels.
-
-        if ((!$channel) && ($uid) && ($uid == App::$profile_uid)) {
-            $channel = App::get_channel();
-        }
-        if ($channel) {
-            $channel_acl = array(
-                'allow_cid' => $channel['channel_allow_cid'],
-                'allow_gid' => $channel['channel_allow_gid'],
-                'deny_cid' => $channel['channel_deny_cid'],
-                'deny_gid' => $channel['channel_deny_gid']
-            );
-        } else {
-            $channel_acl = ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
-        }
-
-
-        $is_owner = ($uid && $uid == $owner);
-
-        $o = '';
-
-        $x = array(
-            'webpage' => ITEM_TYPE_WEBPAGE,
-            'is_owner' => true,
-            'nickname' => App::$profile['channel_address'],
-            'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-            'acl' => (($is_owner) ? Libacl::populate($channel_acl, false, PermissionDescription::fromGlobalPermission('view_pages')) : ''),
-            'permissions' => $channel_acl,
-            'showacl' => (($is_owner) ? true : false),
-            'visitor' => true,
-            'hide_location' => true,
-            'hide_voting' => true,
-            'profile_uid' => intval($owner),
-            'mimetype' => $mimetype,
-            'mimeselect' => true,
-            'layout' => $layout,
-            'layoutselect' => true,
-            'expanded' => true,
-            'novoting' => true,
-            'bbco_autocomplete' => 'bbcode',
-            'bbcode' => true
-        );
-
-        if ($_REQUEST['title']) {
-            $x['title'] = $_REQUEST['title'];
-        }
-        if ($_REQUEST['body']) {
-            $x['body'] = $_REQUEST['body'];
-        }
-        if ($_REQUEST['pagetitle']) {
-            $x['pagetitle'] = $_REQUEST['pagetitle'];
-        }
-
-
-        // Get a list of webpages.  We can't display all them because endless scroll makes that unusable,
-        // so just list titles and an edit link.
-
-
-        $sql_extra = item_permissions_sql($owner);
-
-        $r = q(
-            "select * from iconfig left join item on iconfig.iid = item.id 
-			where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d 
-			$sql_extra order by item.created desc",
-            intval($owner),
-            intval(ITEM_TYPE_WEBPAGE)
-        );
-
-        if (!$r) {
-            $x['pagetitle'] = 'home';
-        }
-
-        $editor = status_editor($x);
-
-        $pages = null;
-
-        if ($r) {
-            $pages = [];
-            foreach ($r as $rr) {
-                unobscure($rr);
-
-                $lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock');
-
-                $element_arr = array(
-                    'type' => 'webpage',
-                    'title' => $rr['title'],
-                    'body' => $rr['body'],
-                    'created' => $rr['created'],
-                    'edited' => $rr['edited'],
-                    'mimetype' => $rr['mimetype'],
-                    'pageurl' => str_replace('%2f', '/', $rr['v']),
-                    'pagetitle' => urldecode($rr['v']),
-                    'mid' => $rr['mid'],
-                    'layout_mid' => $rr['layout_mid']
-                );
-                $pages[$rr['iid']][] = array(
-                    'url' => $rr['iid'],
-                    'pageurl' => str_replace('%2f', '/', $rr['v']),
-                    'pagetitle' => urldecode($rr['v']),
-                    'title' => $rr['title'],
-                    'created' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']),
-                    'edited' => datetime_convert('UTC', date_default_timezone_get(), $rr['edited']),
-                    'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]',
-                    'lockstate' => $lockstate
-                );
-            }
-        }
-
-
-        //Build the base URL for edit links
-        $url = z_root() . '/editwebpage/' . $which;
-
-        $o .= replace_macros(Theme::get_template('webpagelist.tpl'), array(
-            '$listtitle' => t('Webpages'),
-            '$baseurl' => $url,
-            '$create' => t('Create'),
-            '$edit' => t('Edit'),
-            '$share' => t('Share'),
-            '$delete' => t('Delete'),
-            '$pages' => $pages,
-            '$channel' => $which,
-            '$editor' => $editor,
-            '$view' => t('View'),
-            '$preview' => t('Preview'),
-            '$actions_txt' => t('Actions'),
-            '$pagelink_txt' => t('Page Link'),
-            '$title_txt' => t('Page Title'),
-            '$created_txt' => t('Created'),
-            '$edited_txt' => t('Edited')
-        ));
-
-        return $o;
-    }
-
-    public function post()
-    {
-        $action = $_REQUEST['action'];
-        if ($action) {
-            switch ($action) {
-                case 'scan':
-                    // the state of this variable tracks whether website files have been scanned (null, true, false)
-                    $cloud = null;
-
-                    // Website files are to be imported from an uploaded zip file
-                    if (($_FILES) && array_key_exists('zip_file', $_FILES) && isset($_POST['w_upload'])) {
-                        $source = $_FILES["zip_file"]["tmp_name"];
-                        $type = $_FILES["zip_file"]["type"];
-                        $okay = false;
-                        $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed');
-                        foreach ($accepted_types as $mime_type) {
-                            if ($mime_type == $type) {
-                                $okay = true;
-                                break;
-                            }
-                        }
-                        if (!$okay) {
-                            notice(t('Invalid file type.') . EOL);
-                            return;
-                        }
-                        $zip = new ZipArchive();
-                        if ($zip->open($source) === true) {
-                            $tmp_folder_name = random_string(5);
-                            $website = dirname($source) . '/' . $tmp_folder_name;
-                            $zip->extractTo($website); // change this to the correct site path
-                            $zip->close();
-                            @unlink($source);    // delete the compressed file now that the content has been extracted
-                            $cloud = false;
-                        } else {
-                            notice(t('Error opening zip file') . EOL);
-                            return null;
-                        }
-                    }
-
-                    // Website files are to be imported from the channel cloud files
-                    if (($_POST) && array_key_exists('path', $_POST) && isset($_POST['cloudsubmit'])) {
-                        $channel = App::get_channel();
-                        $dirpath = get_dirpath_by_cloudpath($channel, $_POST['path']);
-                        if (!$dirpath) {
-                            notice(t('Invalid folder path.') . EOL);
-                            return null;
-                        }
-                        $cloud = true;
-                    }
-
-                    // If the website files were uploaded or specified in the cloud files, then $cloud
-                    // should be either true or false
-                    if ($cloud !== null) {
-                        require_once('include/import.php');
-                        $elements = [];
-                        if ($cloud) {
-                            $path = $_POST['path'];
-                        } else {
-                            $path = $website;
-                        }
-                        $elements['pages'] = scan_webpage_elements($path, 'page', $cloud);
-                        $elements['layouts'] = scan_webpage_elements($path, 'layout', $cloud);
-                        $elements['blocks'] = scan_webpage_elements($path, 'block', $cloud);
-                        $_SESSION['blocks'] = $elements['blocks'];
-                        $_SESSION['layouts'] = $elements['layouts'];
-                        $_SESSION['pages'] = $elements['pages'];
-                        if (!(empty($elements['pages']) && empty($elements['blocks']) && empty($elements['layouts']))) {
-                            //info( t('Webpages elements detected.') . EOL);
-                            $_SESSION['action'] = 'import';
-                        } else {
-                            notice(t('No webpage elements detected.') . EOL);
-                            $_SESSION['action'] = null;
-                        }
-                    }
-
-                    // If the website elements were imported from a zip file, delete the temporary decompressed files
-                    if ($cloud === false && $website && $elements) {
-                        $_SESSION['tempimportpath'] = $website;
-                        //rrmdir($website); // Delete the temporary decompressed files
-                    }
-
-                    break;
-
-                case 'importselected':
-                    require_once('include/import.php');
-                    $channel = App::get_channel();
-
-                    // Import layout first so that pages that reference new layouts will find
-                    // the mid of layout items in the database
-
-                    // Obtain the user-selected layouts to import and import them
-                    $checkedlayouts = $_POST['layout'];
-                    $layouts = [];
-                    if (!empty($checkedlayouts)) {
-                        foreach ($checkedlayouts as $name) {
-                            foreach ($_SESSION['layouts'] as &$layout) {
-                                if ($layout['name'] === $name) {
-                                    $layout['import'] = 1;
-                                    $layoutstoimport[] = $layout;
-                                }
-                            }
-                        }
-                        foreach ($layoutstoimport as $elementtoimport) {
-                            $layouts[] = import_webpage_element($elementtoimport, $channel, 'layout');
-                        }
-                    }
-                    $_SESSION['import_layouts'] = $layouts;
-
-                    // Obtain the user-selected blocks to import and import them
-                    $checkedblocks = $_POST['block'];
-                    $blocks = [];
-                    if (!empty($checkedblocks)) {
-                        foreach ($checkedblocks as $name) {
-                            foreach ($_SESSION['blocks'] as &$block) {
-                                if ($block['name'] === $name) {
-                                    $block['import'] = 1;
-                                    $blockstoimport[] = $block;
-                                }
-                            }
-                        }
-                        foreach ($blockstoimport as $elementtoimport) {
-                            $blocks[] = import_webpage_element($elementtoimport, $channel, 'block');
-                        }
-                    }
-                    $_SESSION['import_blocks'] = $blocks;
-
-                    // Obtain the user-selected pages to import and import them
-                    $checkedpages = $_POST['page'];
-                    $pages = [];
-                    if (!empty($checkedpages)) {
-                        foreach ($checkedpages as $pagelink) {
-                            foreach ($_SESSION['pages'] as &$page) {
-                                if ($page['pagelink'] === $pagelink) {
-                                    $page['import'] = 1;
-                                    $pagestoimport[] = $page;
-                                }
-                            }
-                        }
-                        foreach ($pagestoimport as $elementtoimport) {
-                            $pages[] = import_webpage_element($elementtoimport, $channel, 'page');
-                        }
-                    }
-                    $_SESSION['import_pages'] = $pages;
-                    if (!(empty($_SESSION['import_pages']) && empty($_SESSION['import_blocks']) && empty($_SESSION['import_layouts']))) {
-                        info(t('Import complete.') . EOL);
-                    }
-                    if (isset($_SESSION['tempimportpath'])) {
-                        rrmdir($_SESSION['tempimportpath']);    // Delete the temporary decompressed files
-                        unset($_SESSION['tempimportpath']);
-                    }
-                    break;
-
-                case 'exportzipfile':
-                    if (isset($_POST['w_download'])) {
-                        $_SESSION['action'] = 'export_select_list';
-                        $_SESSION['export'] = 'zipfile';
-                        if (isset($_POST['zipfilename']) && $_POST['zipfilename'] !== '') {
-                            $filename = filter_var($_POST['zipfilename'], FILTER_SANITIZE_ENCODED);
-                        } else {
-                            $filename = 'website.zip';
-                        }
-                        $_SESSION['zipfilename'] = $filename;
-                    }
-
-                    break;
-
-                case 'exportcloud':
-                    if (isset($_POST['exportcloudpath']) && $_POST['exportcloudpath'] !== '') {
-                        $_SESSION['action'] = 'export_select_list';
-                        $_SESSION['export'] = 'cloud';
-                        $_SESSION['exportcloudpath'] = filter_var($_POST['exportcloudpath'], FILTER_SANITIZE_ENCODED);
-                    }
-
-                    break;
-
-                case 'cloud':
-                case 'zipfile':
-                    $channel = App::get_channel();
-
-                    $tmp_folder_name = random_string(10);
-                    $zip_folder_name = random_string(10);
-                    $zip_filename = $_SESSION['zipfilename'];
-                    $tmp_folderpath = '/tmp/' . $tmp_folder_name;
-                    $zip_folderpath = '/tmp/' . $zip_folder_name;
-                    if (!mkdir($zip_folderpath, 0770, false)) {
-                        logger('Error creating zip file export folder: ' . $zip_folderpath, LOGGER_NORMAL);
-                        json_return_and_die(array('message' => 'Error creating zip file export folder'));
-                    }
-                    $zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename;
-
-                    $checkedblocks = $_POST['block'];
-                    $blocks = [];
-                    if (!empty($checkedblocks)) {
-                        foreach ($checkedblocks as $mid) {
-                            $b = q(
-                                "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
-												left join item on item.id = iconfig.iid 
-												where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' order by iconfig.v asc limit 1",
-                                dbesc($mid),
-                                intval($channel['channel_id'])
-                            );
-                            if ($b) {
-                                $b = $b[0];
-                                $blockinfo = array(
-                                    'body' => $b['body'],
-                                    'mimetype' => $b['mimetype'],
-                                    'title' => $b['title'],
-                                    'name' => $b['v'],
-                                    'json' => array(
-                                        'title' => $b['title'],
-                                        'name' => $b['v'],
-                                        'mimetype' => $b['mimetype'],
-                                    )
-                                );
-                                switch ($blockinfo['mimetype']) {
-                                    case 'text/html':
-                                        $block_ext = 'html';
-                                        break;
-                                    case 'text/bbcode':
-									case 'text/x-multicode':
-                                        $block_ext = 'bbcode';
-                                        break;
-                                    case 'text/markdown':
-                                        $block_ext = 'md';
-                                        break;
-                                    case 'application/x-pdl':
-                                        $block_ext = 'pdl';
-                                        break;
-                                    case 'application/x-php':
-                                        $block_ext = 'php';
-                                        break;
-                                    default:
-                                        $block_ext = 'bbcode';
-                                        break;
-                                }
-                                $block_filename = $blockinfo['name'] . '.' . $block_ext;
-                                $tmp_blockfolder = $tmp_folderpath . '/blocks/' . $blockinfo['name'];
-                                $block_filepath = $tmp_blockfolder . '/' . $block_filename;
-                                $blockinfo['json']['contentfile'] = $block_filename;
-                                $block_jsonpath = $tmp_blockfolder . '/block.json';
-                                if (!is_dir($tmp_blockfolder) && !mkdir($tmp_blockfolder, 0770, true)) {
-                                    logger('Error creating temp export folder: ' . $tmp_blockfolder, LOGGER_NORMAL);
-                                    json_return_and_die(array('message' => 'Error creating temp export folder'));
-                                }
-                                file_put_contents($block_filepath, $blockinfo['body']);
-                                file_put_contents($block_jsonpath, json_encode($blockinfo['json'], JSON_UNESCAPED_SLASHES));
-                            }
-                        }
-                    }
-
-                    $checkedlayouts = $_POST['layout'];
-                    $layouts = [];
-                    if (!empty($checkedlayouts)) {
-                        foreach ($checkedlayouts as $mid) {
-                            $l = q(
-                                "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
-												left join item on item.id = iconfig.iid 
-												where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1",
-                                dbesc($mid),
-                                intval($channel['channel_id'])
-                            );
-                            if ($l) {
-                                $l = $l[0];
-                                $layoutinfo = array(
-                                    'body' => $l['body'],
-                                    'mimetype' => $l['mimetype'],
-                                    'description' => $l['title'],
-                                    'name' => $l['v'],
-                                    'json' => array(
-                                        'description' => $l['title'],
-                                        'name' => $l['v'],
-                                        'mimetype' => $l['mimetype'],
-                                    )
-                                );
-                                switch ($layoutinfo['mimetype']) {
-                                    case 'text/bbcode':
-                                    case 'text/x-multicode':
-                                    default:
-                                        $layout_ext = 'bbcode';
-                                        break;
-                                }
-                                $layout_filename = $layoutinfo['name'] . '.' . $layout_ext;
-                                $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name'];
-                                $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename;
-                                $layoutinfo['json']['contentfile'] = $layout_filename;
-                                $layout_jsonpath = $tmp_layoutfolder . '/layout.json';
-                                if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {
-                                    logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL);
-                                    json_return_and_die(array('message' => 'Error creating temp export folder'));
-                                }
-                                file_put_contents($layout_filepath, $layoutinfo['body']);
-                                file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));
-                            }
-                        }
-                    }
-
-                    $checkedpages = $_POST['page'];
-                    $pages = [];
-                    if (!empty($checkedpages)) {
-                        foreach ($checkedpages as $mid) {
-                            $p = q(
-                                "select * from iconfig left join item on iconfig.iid = item.id 
-												where item.uid = %d and item.mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d",
-                                intval($channel['channel_id']),
-                                dbesc($mid),
-                                intval(ITEM_TYPE_WEBPAGE)
-                            );
-
-                            if ($p) {
-                                foreach ($p as $pp) {
-                                    // Get the associated layout
-                                    $layoutinfo = [];
-                                    if ($pp['layout_mid']) {
-                                        $l = q(
-                                            "select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
-																		left join item on item.id = iconfig.iid 
-																		where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1",
-                                            dbesc($pp['layout_mid']),
-                                            intval($channel['channel_id'])
-                                        );
-                                        if ($l) {
-                                            $l = $l[0];
-                                            $layoutinfo = array(
-                                                'body' => $l['body'],
-                                                'mimetype' => $l['mimetype'],
-                                                'description' => $l['title'],
-                                                'name' => $l['v'],
-                                                'json' => array(
-                                                    'description' => $l['title'],
-                                                    'name' => $l['v'],
-                                                )
-                                            );
-                                            switch ($layoutinfo['mimetype']) {
-                                                case 'text/bbcode':
-												case 'text/x-multicode':
-                                                default:
-                                                    $layout_ext = 'bbcode';
-                                                    break;
-                                            }
-                                            $layout_filename = $layoutinfo['name'] . '.' . $layout_ext;
-                                            $tmp_layoutfolder = $tmp_folderpath . '/layouts/' . $layoutinfo['name'];
-                                            $layout_filepath = $tmp_layoutfolder . '/' . $layout_filename;
-                                            $layoutinfo['json']['contentfile'] = $layout_filename;
-                                            $layout_jsonpath = $tmp_layoutfolder . '/layout.json';
-                                            if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {
-                                                logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL);
-                                                json_return_and_die(array('message' => 'Error creating temp export folder'));
-                                            }
-                                            file_put_contents($layout_filepath, $layoutinfo['body']);
-                                            file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));
-                                        }
-                                    }
-                                    switch ($pp['mimetype']) {
-                                        case 'text/html':
-                                            $page_ext = 'html';
-                                            break;
-                                        case 'text/bbcode':
-										case 'text/x-multicode':
-                                            $page_ext = 'bbcode';
-                                            break;
-                                        case 'text/markdown':
-                                            $page_ext = 'md';
-                                            break;
-                                        case 'application/x-pdl':
-                                            $page_ext = 'pdl';
-                                            break;
-                                        case 'application/x-php':
-                                            $page_ext = 'php';
-                                            break;
-                                        default:
-                                            break;
-                                    }
-                                    $pageinfo = array(
-                                        'title' => $pp['title'],
-                                        'body' => $pp['body'],
-                                        'pagelink' => $pp['v'],
-                                        'mimetype' => $pp['mimetype'],
-                                        'contentfile' => $pp['v'] . '.' . $page_ext,
-                                        'layout' => ((x($layoutinfo, 'name')) ? $layoutinfo['name'] : ''),
-                                        'json' => array(
-                                            'title' => $pp['title'],
-                                            'pagelink' => $pp['v'],
-                                            'mimetype' => $pp['mimetype'],
-                                            'layout' => ((x($layoutinfo, 'name')) ? $layoutinfo['name'] : ''),
-                                        )
-                                    );
-                                    $page_filename = $pageinfo['pagelink'] . '.' . $page_ext;
-                                    $tmp_pagefolder = $tmp_folderpath . '/pages/' . $pageinfo['pagelink'];
-                                    $page_filepath = $tmp_pagefolder . '/' . $page_filename;
-                                    $page_jsonpath = $tmp_pagefolder . '/page.json';
-                                    $pageinfo['json']['contentfile'] = $page_filename;
-                                    if (!is_dir($tmp_pagefolder) && !mkdir($tmp_pagefolder, 0770, true)) {
-                                        logger('Error creating temp export folder: ' . $tmp_pagefolder, LOGGER_NORMAL);
-                                        json_return_and_die(array('message' => 'Error creating temp export folder'));
-                                    }
-                                    file_put_contents($page_filepath, $pageinfo['body']);
-                                    file_put_contents($page_jsonpath, json_encode($pageinfo['json'], JSON_UNESCAPED_SLASHES));
-                                }
-                            }
-                        }
-                    }
-                    if ($action === 'zipfile') {
-                        // Generate the zip file
-                        ExtendedZip::zipTree($tmp_folderpath, $zip_filepath, ZipArchive::CREATE);
-                        // Output the file for download
-                        header('Content-Disposition: attachment; filename="' . $zip_filename . '"');
-                        header("Content-Type: application/zip");
-                        $success = readfile($zip_filepath);
-                    } elseif ($action === 'cloud') { // Only zipfile or cloud should be possible values for $action here
-                        if (isset($_SESSION['exportcloudpath'])) {
-                            require_once('include/attach.php');
-                            $cloudpath = urldecode($_SESSION['exportcloudpath']);
-                            $channel = App::get_channel();
-                            $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath);
-                            if (!$dirpath) {
-                                $x = attach_mkdirp($channel, $channel['channel_hash'], array('pathname' => $cloudpath));
-                                $folder_hash = (($x['success']) ? $x['data']['hash'] : '');
-
-                                if (!$x['success']) {
-                                    logger('Failed to create cloud file folder', LOGGER_NORMAL);
-                                }
-                                $dirpath = get_dirpath_by_cloudpath($channel, $cloudpath);
-                                if (!is_dir($dirpath)) {
-                                    logger('Failed to create cloud file folder', LOGGER_NORMAL);
-                                }
-                            }
-
-                            $success = copy_folder_to_cloudfiles($channel, $channel['channel_hash'], $tmp_folderpath, $cloudpath);
-                        }
-                    }
-                    if (!$success) {
-                        logger('Error exporting webpage elements', LOGGER_NORMAL);
-                    }
-
-                    rrmdir($zip_folderpath);
-                    rrmdir($tmp_folderpath);        // delete temporary files
-                    killme();
-
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php
deleted file mode 100644
index b6920e8dd..000000000
--- a/Zotlabs/Module/Well_known.php
+++ /dev/null
@@ -1,71 +0,0 @@
- 1) {
-            $arr = ['server' => $_SERVER, 'request' => $_REQUEST];
-            Hook::call('well_known', $arr);
-
-            if (!check_siteallowed($_SERVER['REMOTE_ADDR'])) {
-                logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']);
-                killme();
-            }
-
-            // from php.net re: REMOTE_HOST:
-            //     Note: Your web server must be configured to create this variable.
-            // For example in Apache you'll need HostnameLookups On inside httpd.conf
-            // for it to exist. See also gethostbyaddr().
-
-            if (get_config('system', 'siteallowed_remote_host') && (!check_siteallowed($_SERVER['REMOTE_HOST']))) {
-                logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']);
-                killme();
-            }
-
-            switch (argv(1)) {
-                case 'webfinger':
-                    App::$argc -= 1;
-                    array_shift(App::$argv);
-                    App::$argv[0] = 'webfinger';
-                    $module = new Webfinger();
-                    $module->init();
-                    break;
-
-                case 'oauth-authorization-server':
-                case 'openid-configuration':
-                    App::$argc -= 1;
-                    array_shift(App::$argv);
-                    App::$argv[0] = 'oauthinfo';
-                    $module = new Oauthinfo();
-                    $module->init();
-                    break;
-
-                case 'dnt-policy.txt':
-                    echo file_get_contents('doc/global/dnt-policy.txt');
-                    killme();
-
-                default:
-                    if (file_exists(App::$cmd)) {
-                        echo file_get_contents(App::$cmd);
-                        killme();
-                    } elseif (file_exists(App::$cmd . '.php')) {
-                        require_once(App::$cmd . '.php');
-                    }
-                    break;
-            }
-        }
-
-        http_status_exit(404);
-    }
-}
diff --git a/Zotlabs/Module/Xchan.php b/Zotlabs/Module/Xchan.php
deleted file mode 100644
index 18290519b..000000000
--- a/Zotlabs/Module/Xchan.php
+++ /dev/null
@@ -1,51 +0,0 @@
-' . t('Xchan Lookup') . '';
-
-        $o .= '
          ';
-        $o .= t('Lookup xchan beginning with (or webbie): ');
-        $o .= '';
-        $o .= '
          ';
-        $o .= '

          ';
-
-        if (x($_GET, 'addr')) {
-            $addr = trim($_GET['addr']);
-
-            $r = q(
-                "select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash",
-                dbesc($addr),
-                dbesc($addr)
-            );
-
-            if ($r) {
-                foreach ($r as $rr) {
-                    $o .= str_replace(array("\n", " "), array("
          ", " "), print_r($rr, true)) . EOL;
-
-                    $s = q(
-                        "select * from hubloc where hubloc_hash like '%s'",
-                        dbesc($r[0]['xchan_hash'])
-                    );
-
-                    if ($s) {
-                        foreach ($s as $rrr) {
-                            $o .= str_replace(array("\n", " "), array("
          ", " "), print_r($rrr, true)) . EOL;
-                        }
-                    }
-                }
-            } else {
-                notice(t('Not found.') . EOL);
-            }
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Xp.php b/Zotlabs/Module/Xp.php
deleted file mode 100644
index a992f6c5b..000000000
--- a/Zotlabs/Module/Xp.php
+++ /dev/null
@@ -1,66 +0,0 @@
- 1) {
-            $path = 'cache/xp/' . substr(argv(1), 0, 2) . '/' . substr(argv(1), 2, 2) . '/' . argv(1);
-
-            if (!file_exists($path)) {
-                // no longer cached for some reason, perhaps expired
-                $resolution = substr(argv(1), (-2), 2);
-                if ($resolution && substr($resolution, 0, 1) === '-') {
-                    switch (substr($resolution, 1, 1)) {
-                        case '4':
-                            $path = Channel::get_default_profile_photo();
-                            break;
-                        case '5':
-                            $path = Channel::get_default_profile_photo(80);
-                            break;
-                        case '6':
-                            $path = Channel::get_default_profile_photo(48);
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }
-
-            if (!file_exists($path)) {
-                http_status_exit(404, 'Not found');
-            }
-
-            $x = @getimagesize($path);
-            if ($x) {
-                header('Content-Type: ' . $x['mime']);
-            }
-
-            $cache = intval(get_config('system', 'photo_cache_time'));
-            if (!$cache) {
-                $cache = (3600 * 24); // 1 day
-            }
-            header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) . ' GMT');
-            // Set browser cache age as $cache.  But set timeout of 'shared caches'
-            // much lower in the event that infrastructure caching is present.
-            $smaxage = intval($cache / 12);
-            header('Cache-Control: s-maxage=' . $smaxage . '; max-age=' . $cache . ';');
-
-            $infile = fopen($path, 'rb');
-            $outfile = fopen('php://output', 'wb');
-            if ($infile && $outfile) {
-                pipe_streams($infile, $outfile);
-            }
-            fclose($infile);
-            fclose($outfile);
-            killme();
-        }
-
-        http_status_exit(404, 'Not found');
-    }
-}
diff --git a/Zotlabs/Module/Xref.php b/Zotlabs/Module/Xref.php
deleted file mode 100644
index 1bd3e2b59..000000000
--- a/Zotlabs/Module/Xref.php
+++ /dev/null
@@ -1,29 +0,0 @@
- 2) {
-            $url = argv(2);
-        }
-
-        goaway(z_root() . '/' . $url);
-    }
-}
diff --git a/Zotlabs/Module/Zot.php b/Zotlabs/Module/Zot.php
deleted file mode 100644
index 830006d87..000000000
--- a/Zotlabs/Module/Zot.php
+++ /dev/null
@@ -1,28 +0,0 @@
-run(),'application/x-nomad+json');
-	}
-
-}
diff --git a/Zotlabs/Module/Zot_probe.php b/Zotlabs/Module/Zot_probe.php
deleted file mode 100644
index 200cc1f40..000000000
--- a/Zotlabs/Module/Zot_probe.php
+++ /dev/null
@@ -1,53 +0,0 @@
- t('Zot6 Probe Diagnostic'),
-            '$resource' => ['resource', t('Object URL'), $_REQUEST['resource'], EMPTY_STR],
-            '$authf' => ['authf', t('Authenticated fetch'), $_REQUEST['authf'], EMPTY_STR, [t('No'), t('Yes')]],
-            '$submit' => t('Submit')
-        ]);
-
-        if (x($_GET, 'resource')) {
-            $resource = $_GET['resource'];
-            $channel = (($_GET['authf']) ? App::get_channel() : null);
-
-            if (strpos($resource, 'x-zot:') === 0) {
-                $x = ZotURL::fetch($resource, $channel);
-            } else {
-                $x = Zotfinger::exec($resource, $channel);
-
-                $o .= '
          ' . htmlspecialchars(print_array($x)) . '
          ';
-
-				$headers = 'Accept: application/x-nomad+json, application/x-zot+json, application/jrd+json, application/json';
-
-                $redirects = 0;
-                $x = z_fetch_url($resource, true, $redirects, ['headers' => [$headers]]);
-            }
-
-            if ($x['success']) {
-                $o .= '
          ' . htmlspecialchars($x['header']) . '
          ' . EOL;
-
-                $o .= 'verify returns: ' . str_replace("\n", EOL, print_r(HTTPSig::verify($x, EMPTY_STR, 'zot6'), true)) . EOL;
-
-                $o .= '
          ' . htmlspecialchars(json_encode(json_decode($x['body']), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) . '
          ' . EOL;
-            }
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Module/Zotfinger.php b/Zotlabs/Module/Zotfinger.php
deleted file mode 100644
index 2d027f97b..000000000
--- a/Zotlabs/Module/Zotfinger.php
+++ /dev/null
@@ -1,47 +0,0 @@
- t('Zotfinger Diagnostic'),
-            '$resource' => ['resource', t('Lookup URL'), $_GET['resource'], EMPTY_STR],
-            '$submit' => t('Submit')
-        ]);
-
-        if ($_GET['resource']) {
-            $channel = App::get_channel();
-            $resource = trim(escape_tags($_GET['resource']));
-            $do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false);
-
-            $j = Zfinger::exec($resource, $channel);
-
-            if ($do_import && $j) {
-                $x = Libzot::import_xchan($j['data']);
-            }
-            $o .= '
          ' . str_replace("\n", '
          ', print_array($j)) . '
          ';
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php
deleted file mode 100644
index 866a02c36..000000000
--- a/Zotlabs/Photo/PhotoDriver.php
+++ /dev/null
@@ -1,581 +0,0 @@
-types = $this->supportedTypes();
-        if (! array_key_exists($type, $this->types)) {
-            $type = 'image/jpeg';
-        }
-        $this->type = $type;
-        $this->valid = false;
-        $this->load($data, $type);
-    }
-
-    public function __destruct()
-    {
-        if ($this->is_valid()) {
-            $this->destroy();
-        }
-    }
-
-    /**
-     * @brief Is it a valid image object.
-     *
-     * @return bool
-     */
-    public function is_valid()
-    {
-        return $this->valid;
-    }
-
-    /**
-     * @brief Get the width of the image.
-     *
-     * @return bool|number Width of image in pixels, or false on failure
-     */
-    public function getWidth()
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-        return $this->width;
-    }
-
-    /**
-     * @brief Get the height of the image.
-     *
-     * @return bool|number Height of image in pixels, or false on failure
-     */
-    public function getHeight()
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-        return $this->height;
-    }
-
-    /**
-     * @brief Saves the image resource to a file in filesystem.
-     *
-     * @param string $path Path and filename where to save the image
-     * @return bool False on failure, otherwise true
-     */
-    public function saveImage($path, $animated = true)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-        return (file_put_contents($path, $this->imageString($animated)) ? true : false);
-    }
-
-    /**
-     * @brief Return mimetype of the image resource.
-     *
-     * @return bool|string False on failure, otherwise mimetype.
-     */
-    public function getType()
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-        return $this->type;
-    }
-
-    /**
-     * @brief Return file extension of the image resource.
-     *
-     * @return bool|string False on failure, otherwise file extension.
-     */
-    public function getExt()
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-        return $this->types[$this->getType()];
-    }
-
-    /**
-     * @brief Scale image to max pixel size in either dimension.
-     *
-     * @param int $max maximum pixel size in either dimension
-     * @param bool $float_height (optional)
-     *   If true allow height to float to any length on tall images, constraining
-     *   only the width
-     * @return bool|void false on failure, otherwise void
-     */
-    public function scaleImage($max, $float_height = true)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $width  = $this->width;
-        $height = $this->height;
-
-        $dest_width = $dest_height = 0;
-
-        if (! ($width && $height)) {
-            return false;
-        }
-
-        if ($width > $max && $height > $max) {
-            // very tall image (greater than 16:9)
-            // constrain the width - let the height float.
-
-            if (((($height * 9) / 16) > $width) && ($float_height)) {
-                $dest_width = $max;
-                $dest_height = intval(($height * $max) / $width);
-            } // else constrain both dimensions
-            elseif ($width > $height) {
-                $dest_width = $max;
-                $dest_height = intval(($height * $max) / $width);
-            } else {
-                $dest_width = intval(($width * $max) / $height);
-                $dest_height = $max;
-            }
-        } else {
-            if ($width > $max) {
-                $dest_width = $max;
-                $dest_height = intval(($height * $max) / $width);
-            } else {
-                if ($height > $max) {
-                    // very tall image (greater than 16:9)
-                    // but width is OK - don't do anything
-
-                    if (((($height * 9) / 16) > $width) && ($float_height)) {
-                        $dest_width = $width;
-                        $dest_height = $height;
-                    } else {
-                        $dest_width = intval(($width * $max) / $height);
-                        $dest_height = $max;
-                    }
-                } else {
-                    $dest_width = $width;
-                    $dest_height = $height;
-                }
-            }
-        }
-        $this->doScaleImage($dest_width, $dest_height);
-    }
-
-    public function scaleImageUp($min)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $width = $this->width;
-        $height = $this->height;
-
-        $dest_width = $dest_height = 0;
-
-        if (! ($width && $height)) {
-            return false;
-        }
-
-        if ($width < $min && $height < $min) {
-            if ($width > $height) {
-                $dest_width = $min;
-                $dest_height = intval(($height * $min) / $width);
-            } else {
-                $dest_width = intval(($width * $min) / $height);
-                $dest_height = $min;
-            }
-        } else {
-            if ($width < $min) {
-                $dest_width = $min;
-                $dest_height = intval(($height * $min) / $width);
-            } else {
-                if ($height < $min) {
-                    $dest_width = intval(($width * $min) / $height);
-                    $dest_height = $min;
-                } else {
-                    $dest_width = $width;
-                    $dest_height = $height;
-                }
-            }
-        }
-        $this->doScaleImage($dest_width, $dest_height);
-    }
-
-    /**
-     * @brief Scales image to a square.
-     *
-     * @param int $dim Pixel of square image
-     * @return bool|void false on failure, otherwise void
-     */
-    public function scaleImageSquare($dim)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-        $this->doScaleImage($dim, $dim);
-    }
-
-    /**
-     * @brief Crops a square image.
-     *
-     * @see cropImageRect()
-     *
-     * @param int $max size of the new image
-     * @param int $x x-offset for region
-     * @param int $y y-offset for region
-     * @param int $w width of region
-     * @param int $h height of region
-     *
-     * @return bool|void false on failure
-     */
-    public function cropImage($max, $x, $y, $w, $h)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-        $this->cropImageRect($max, $max, $x, $y, $w, $h);
-    }
-
-    /**
-     * @brief Reads exif data from a given filename.
-     *
-     * @param string $filename
-     * @return bool|array
-     */
-    public function exif($filename)
-    {
-        if ((! function_exists('exif_read_data')) || (! in_array($this->getType(), ['image/jpeg', 'image/tiff']))) {
-            return false;
-        }
-
-        /*
-         * PHP 7.2 allows you to use a stream resource, which should reduce/avoid
-         * memory exhaustion on large images.
-         */
-
-        if (version_compare(PHP_VERSION, '7.2.0') >= 0) {
-            $f = @fopen($filename, 'rb');
-        } else {
-            $f = $filename;
-        }
-
-        if ($f) {
-            return @exif_read_data($f, null, true);
-        }
-
-        return false;
-    }
-
-    /**
-     * @brief Orients current image based on exif orientation information.
-     *
-     * @param array $exif
-     * @return bool true if oriented, otherwise false
-     */
-    public function orient($exif)
-    {
-        if (! ($this->is_valid() && $exif)) {
-            return false;
-        }
-
-        $ort = ((array_key_exists('IFD0', $exif)) ? $exif['IFD0']['Orientation'] : $exif['Orientation']);
-
-        if (! $ort) {
-            return false;
-        }
-
-        switch ($ort) {
-            case 1: // nothing
-                break;
-            case 2: // horizontal flip
-                $this->flip();
-                break;
-            case 3: // 180 rotate left
-                $this->rotate(180);
-                break;
-            case 4: // vertical flip
-                $this->flip(false, true);
-                break;
-            case 5: // vertical flip + 90 rotate right
-                $this->flip(false, true);
-                $this->rotate(-90);
-                break;
-            case 6: // 90 rotate right
-                $this->rotate(-90);
-                break;
-            case 7: // horizontal flip + 90 rotate right
-                $this->flip();
-                $this->rotate(-90);
-                break;
-            case 8: // 90 rotate left
-                $this->rotate(90);
-                break;
-            default:
-                break;
-        }
-
-        return true;
-    }
-
-    /**
-     * @brief Save photo to database.
-     *
-     * @param array $arr
-     * @param bool $skipcheck (optional) default false
-     * @return bool|array
-     */
-    public function save($arr, $skipcheck = false)
-    {
-        if (! ($skipcheck || $this->is_valid())) {
-            logger('Attempt to store invalid photo.');
-            return false;
-        }
-
-        $p = [];
-
-        $p['aid'] = ((intval($arr['aid'])) ? intval($arr['aid']) : 0);
-        $p['uid'] = ((intval($arr['uid'])) ? intval($arr['uid']) : 0);
-        $p['xchan'] = (($arr['xchan']) ? $arr['xchan'] : '');
-        $p['resource_id'] = (($arr['resource_id']) ? $arr['resource_id'] : '');
-        $p['filename'] = (($arr['filename']) ? $arr['filename'] : '');
-        $p['mimetype'] = (($arr['mimetype']) ? $arr['mimetype'] : $this->getType());
-        $p['album'] = (($arr['album']) ? $arr['album'] : '');
-        $p['imgscale'] = ((intval($arr['imgscale'])) ? intval($arr['imgscale']) : 0);
-        $p['allow_cid'] = (($arr['allow_cid']) ? $arr['allow_cid'] : '');
-        $p['allow_gid'] = (($arr['allow_gid']) ? $arr['allow_gid'] : '');
-        $p['deny_cid'] = (($arr['deny_cid']) ? $arr['deny_cid'] : '');
-        $p['deny_gid'] = (($arr['deny_gid']) ? $arr['deny_gid'] : '');
-        $p['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert());
-        $p['title'] = (($arr['title']) ? $arr['title'] : '');
-        $p['description'] = (($arr['description']) ? $arr['description'] : '');
-        $p['photo_usage'] = intval($arr['photo_usage']);
-        $p['os_storage'] = intval($arr['os_storage']);
-        $p['os_path'] = $arr['os_path'];
-        $p['os_syspath'] = ((array_key_exists('os_syspath', $arr)) ? $arr['os_syspath'] : '');
-        $p['display_path'] = (($arr['display_path']) ? $arr['display_path'] : '');
-        $p['width'] = (($arr['width']) ? $arr['width'] : $this->getWidth());
-        $p['height'] = (($arr['height']) ? $arr['height'] : $this->getHeight());
-        $p['expires'] = (($arr['expires']) ? $arr['expires'] : gmdate('Y-m-d H:i:s', time() + get_config('system', 'photo_cache_time', 86400)));
-        $p['profile'] = ((array_key_exists('profile', $arr)) ? intval($arr['profile']) : 0);
-
-        if (! intval($p['imgscale'])) {
-            logger('save: ' . print_r($arr, true), LOGGER_DATA);
-        }
-        $x = q("select id, created from photo where resource_id = '%s' and uid = %d and xchan = '%s' and imgscale = %d limit 1", dbesc($p['resource_id']), intval($p['uid']), dbesc($p['xchan']), intval($p['imgscale']));
-
-        if ($x) {
-            $p['created'] = (($x['created']) ? $x['created'] : $p['edited']);
-            $r = q(
-                "UPDATE photo set
-				aid = %d,
-				uid = %d,
-				xchan = '%s',
-				resource_id = '%s',
-				created = '%s',
-				edited = '%s',
-				filename = '%s',
-				mimetype = '%s',
-				album = '%s',
-				height = %d,
-				width = %d,
-				content = '%s',
-				os_storage = %d,
-				filesize = %d,
-				imgscale = %d,
-				photo_usage = %d,
-				title = '%s',
-				description = '%s',
-				os_path = '%s',
-				display_path = '%s',
-				allow_cid = '%s',
-				allow_gid = '%s',
-				deny_cid = '%s',
-				deny_gid = '%s',
-				expires = '%s',
-				profile = %d
-				where id = %d",
-                intval($p['aid']),
-                intval($p['uid']),
-                dbesc($p['xchan']),
-                dbesc($p['resource_id']),
-                dbescdate($p['created']),
-                dbescdate($p['edited']),
-                dbesc(basename($p['filename'])),
-                dbesc($p['mimetype']),
-                dbesc($p['album']),
-                intval($p['height']),
-                intval($p['width']),
-                (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())),
-                intval($p['os_storage']),
-                (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())),
-                intval($p['imgscale']),
-                intval($p['photo_usage']),
-                dbesc($p['title']),
-                dbesc($p['description']),
-                dbesc($p['os_path']),
-                dbesc($p['display_path']),
-                dbesc($p['allow_cid']),
-                dbesc($p['allow_gid']),
-                dbesc($p['deny_cid']),
-                dbesc($p['deny_gid']),
-                dbescdate($p['expires']),
-                intval($p['profile']),
-                intval($x[0]['id'])
-            );
-        } else {
-            $p['created'] = (($arr['created']) ? $arr['created'] : $p['edited']);
-            $r = q("INSERT INTO photo
-				( aid, uid, xchan, resource_id, created, edited, filename, mimetype, album, height, width, content, os_storage, filesize, imgscale, photo_usage, title, description, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid, expires, profile )
-				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)", intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']), intval($p['profile']));
-        }
-        logger('Photo save imgscale ' . $p['imgscale'] . ' returned ' . intval($r));
-
-        return $r;
-    }
-
-    /**
-     * @brief Stores thumbnail to database or filesystem.
-     *
-     * @param array $arr
-     * @param scale int
-     * @return bool|array
-     */
-
-    public function storeThumbnail($arr, $scale = 0, $animated = true)
-    {
-
-        $arr['imgscale'] = $scale;
-
-        if (boolval(get_config('system', 'filesystem_storage_thumbnails', 1)) && $scale > 0) {
-            $channel = Channel::from_id($arr['uid']);
-            $arr['os_storage'] = 1;
-            $arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale;
-            if (! $this->saveImage($arr['os_syspath'], $animated)) {
-                return false;
-            }
-        }
-
-        if (! $this->save($arr)) {
-            if (array_key_exists('os_syspath', $arr)) {
-                @unlink($arr['os_syspath']);
-            }
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/Zotlabs/Photo/PhotoGd.php b/Zotlabs/Photo/PhotoGd.php
deleted file mode 100644
index 92c5244d7..000000000
--- a/Zotlabs/Photo/PhotoGd.php
+++ /dev/null
@@ -1,213 +0,0 @@
-valid = false;
-        if (! $data) {
-            return;
-        }
-
-        $this->image = @imagecreatefromstring($data);
-
-        if ($this->image !== false) {
-            $this->valid  = true;
-            $this->setDimensions();
-            imagealphablending($this->image, false);
-            imagesavealpha($this->image, true);
-        } else {
-            logger('image load failed');
-        }
-    }
-
-    protected function setDimensions()
-    {
-        $this->width  = imagesx($this->image);
-        $this->height = imagesy($this->image);
-    }
-
-    /**
-     * @brief GD driver does not preserve EXIF, so not need to clear it.
-     *
-     * @return void
-     */
-    public function clearexif()
-    {
-        return;
-    }
-
-    protected function destroy()
-    {
-        if ($this->is_valid()) {
-            imagedestroy($this->image);
-        }
-    }
-
-    /**
-     * @brief Return a PHP image resource of the current image.
-     *
-     * @see \Zotlabs\Photo\PhotoDriver::getImage()
-     *
-     * @return bool|resource
-     */
-    public function getImage()
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        return $this->image;
-    }
-
-    public function doScaleImage($dest_width, $dest_height)
-    {
-
-        $dest = imagecreatetruecolor($dest_width, $dest_height);
-        $width = imagesx($this->image);
-        $height = imagesy($this->image);
-
-        imagealphablending($dest, false);
-        imagesavealpha($dest, true);
-        if ($this->type == 'image/png') {
-            imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-        }
-        imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
-        if ($this->image) {
-            imagedestroy($this->image);
-        }
-
-        $this->image = $dest;
-        $this->setDimensions();
-    }
-
-    public function rotate($degrees)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $this->image = imagerotate($this->image, $degrees, 0);
-        $this->setDimensions();
-    }
-
-    public function flip($horiz = true, $vert = false)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $w = imagesx($this->image);
-        $h = imagesy($this->image);
-        $flipped = imagecreate($w, $h);
-        if ($horiz) {
-            for ($x = 0; $x < $w; $x++) {
-                imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
-            }
-        }
-        if ($vert) {
-            for ($y = 0; $y < $h; $y++) {
-                imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
-            }
-        }
-        $this->image = $flipped;
-        $this->setDimensions(); // Shouldn't really be necessary
-    }
-
-    public function cropImageRect($maxx, $maxy, $x, $y, $w, $h)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $dest = imagecreatetruecolor($maxx, $maxy);
-        imagealphablending($dest, false);
-        imagesavealpha($dest, true);
-        if ($this->type == 'image/png') {
-            imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
-        }
-        imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $maxx, $maxy, $w, $h);
-        if ($this->image) {
-            imagedestroy($this->image);
-        }
-        $this->image = $dest;
-        $this->setDimensions();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Zotlabs\Photo\PhotoDriver::imageString()
-     */
-    public function imageString($animated = true)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $quality = false;
-
-        ob_start();
-
-        switch ($this->getType()) {
-            case 'image/webp':
-                imagewebp($this->image);
-                break;
-
-            case 'image/png':
-                $quality = get_config('system', 'png_quality');
-                if ((! $quality) || ($quality > 9)) {
-                    $quality = PNG_QUALITY;
-                }
-
-                imagepng($this->image, null, $quality);
-                break;
-            case 'image/jpeg':
-            // gd can lack imagejpeg(), but we verify during installation it is available
-            default:
-                $quality = get_config('system', 'jpeg_quality');
-                if ((! $quality) || ($quality > 100)) {
-                    $quality = JPEG_QUALITY;
-                }
-
-                imagejpeg($this->image, null, $quality);
-                break;
-        }
-        $string = ob_get_contents();
-        ob_end_clean();
-
-        return $string;
-    }
-}
diff --git a/Zotlabs/Photo/PhotoImagick.php b/Zotlabs/Photo/PhotoImagick.php
deleted file mode 100644
index 14e757dbe..000000000
--- a/Zotlabs/Photo/PhotoImagick.php
+++ /dev/null
@@ -1,233 +0,0 @@
- 'jpg',
-            'image/png'  => 'png',
-            'image/gif'  => 'gif',
-            'image/webp' => 'webp',
-        ];
-    }
-
-    private function get_FormatsMap()
-    {
-        return [
-            'image/jpeg' => 'JPG',
-            'image/png'  => 'PNG',
-            'image/gif'  => 'GIF',
-            'image/webp' => 'WEBP'
-        ];
-    }
-
-
-    protected function load($data, $type)
-    {
-        $this->valid = false;
-        $this->image = new Imagick();
-
-        if (! $data) {
-            return;
-        }
-
-        try {
-            $this->image->readImageBlob($data);
-        } catch (Exception $e) {
-            logger('Imagick read failed');
-            // logger('Imagick readImageBlob() exception:' . print_r($e, true));
-            return;
-        }
-
-        /*
-         * Setup the image to the format it will be saved to
-         */
-
-        $map = $this->get_FormatsMap();
-        $format = $map[$type];
-
-        if ($this->image) {
-            $this->image->setFormat($format);
-
-            // Always coalesce, if it is not a multi-frame image it won't hurt anyway
-            $this->image = $this->image->coalesceImages();
-
-            $this->valid = true;
-            $this->setDimensions();
-
-            /*
-             * setup the compression here, so we'll do it only once
-             */
-            switch ($this->getType()) {
-                case 'image/png':
-                    $quality = get_config('system', 'png_quality');
-                    if ((! $quality) || ($quality > 9)) {
-                        $quality = PNG_QUALITY;
-                    }
-                    /*
-                     * From http://www.imagemagick.org/script/command-line-options.php#quality:
-                     *
-                     * 'For the MNG and PNG image formats, the quality value sets
-                     * the zlib compression level (quality / 10) and filter-type (quality % 10).
-                     * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
-                     * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
-                     */
-                    $quality = $quality * 10;
-                    $this->image->setCompressionQuality($quality);
-                    break;
-                case 'image/jpeg':
-                    $quality = get_config('system', 'jpeg_quality');
-                    if ((! $quality) || ($quality > 100)) {
-                        $quality = JPEG_QUALITY;
-                    }
-                    $this->image->setCompressionQuality($quality);
-                default:
-                    break;
-            }
-        }
-    }
-
-    protected function destroy()
-    {
-        if ($this->is_valid()) {
-            $this->image->clear();
-            $this->image->destroy();
-        }
-    }
-
-    protected function setDimensions()
-    {
-        $this->width = $this->image->getImageWidth();
-        $this->height = $this->image->getImageHeight();
-    }
-
-    /**
-     * @brief Strips the image of all profiles and comments.
-     *
-     * Keep ICC profile for better colors.
-     *
-     * @see \Zotlabs\Photo\PhotoDriver::clearexif()
-     */
-    public function clearexif()
-    {
-        $profiles = $this->image->getImageProfiles('icc', true);
-
-        $this->image->stripImage();
-
-        if (! empty($profiles)) {
-            $this->image->profileImage('icc', $profiles['icc']);
-        }
-    }
-
-
-    /**
-     * @brief Return a \Imagick object of the current image.
-     *
-     * @see \Zotlabs\Photo\PhotoDriver::getImage()
-     *
-     * @return bool|Imagick
-     */
-    public function getImage()
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $this->image = $this->image->deconstructImages();
-        return $this->image;
-    }
-
-    public function doScaleImage($dest_width, $dest_height)
-    {
-        /*
-         * If it is not animated, there will be only one iteration here,
-         * so don't bother checking
-         */
-        // Don't forget to go back to the first frame
-        $this->image->setFirstIterator();
-        do {
-            $this->image->scaleImage($dest_width, $dest_height);
-        } while ($this->image->nextImage());
-
-        $this->setDimensions();
-    }
-
-    public function rotate($degrees)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $this->image->setFirstIterator();
-        do {
-            // ImageMagick rotates in the opposite direction of imagerotate()
-            $this->image->rotateImage(new ImagickPixel(), -$degrees);
-        } while ($this->image->nextImage());
-
-        $this->setDimensions();
-    }
-
-    public function flip($horiz = true, $vert = false)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $this->image->setFirstIterator();
-        do {
-            if ($horiz) {
-                $this->image->flipImage();
-            }
-            if ($vert) {
-                $this->image->flopImage();
-            }
-        } while ($this->image->nextImage());
-
-        $this->setDimensions(); // Shouldn't really be necessary
-    }
-
-    public function cropImageRect($maxx, $maxy, $x, $y, $w, $h)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        $this->image->setFirstIterator();
-        do {
-            $this->image->cropImage($w, $h, $x, $y);
-            /*
-             * We need to remove the canvas,
-             * or the image is not resized to the crop:
-             * http://php.net/manual/en/imagick.cropimage.php#97232
-             */
-            $this->image->setImagePage(0, 0, 0, 0);
-        } while ($this->image->nextImage());
-
-        $this->doScaleImage($maxx, $maxy);
-    }
-
-    public function imageString($animated = true)
-    {
-        if (! $this->is_valid()) {
-            return false;
-        }
-
-        /* Clean it */
-        $this->image = $this->image->deconstructImages();
-        if ($animated) {
-            return $this->image->getImagesBlob();
-        }
-        return $this->image->getImageBlob();
-    }
-}
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
deleted file mode 100644
index dd27aa71b..000000000
--- a/Zotlabs/Render/Comanche.php
+++ /dev/null
@@ -1,688 +0,0 @@
-get_condition_var($mtch[1]);
-                $default = $mtch[3];
-                $cases = [];
-                $cntt = preg_match_all("/\[case (.*?)\](.*?)\[\/case\]/ism", $mtch[2], $cases, PREG_SET_ORDER);
-                if ($cntt) {
-                    foreach ($cases as $case) {
-                        if ($case[1] === $switch_var) {
-                            $switch_done = 1;
-                            $s = str_replace($mtch[0], $case[2], $s);
-                            break;
-                        }
-                    }
-                    if ($switch_done === 0) {
-                        $s = str_replace($mtch[0], $default, $s);
-                    }
-                }
-            }
-        }
-
-        $cnt = preg_match_all("/\[if (.*?)\](.*?)\[else\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                if ($this->test_condition($mtch[1])) {
-                    $s = str_replace($mtch[0], $mtch[2], $s);
-                } else {
-                    $s = str_replace($mtch[0], $mtch[3], $s);
-                }
-            }
-        } else {
-            $cnt = preg_match_all("/\[if (.*?)\](.*?)\[\/if\]/ism", $s, $matches, PREG_SET_ORDER);
-            if ($cnt) {
-                foreach ($matches as $mtch) {
-                    if ($this->test_condition($mtch[1])) {
-                        $s = str_replace($mtch[0], $mtch[2], $s);
-                    } else {
-                        $s = str_replace($mtch[0], '', $s);
-                    }
-                }
-            }
-        }
-        if ($pass == 0) {
-            $this->parse_pass0($s);
-        } else {
-            $this->parse_pass1($s);
-        }
-    }
-
-    public function parse_pass0($s)
-    {
-
-        $matches = null;
-
-        $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches);
-        if ($cnt) {
-            App::$page['template'] = trim($matches[1]);
-        }
-
-        $cnt = preg_match("/\[template=(.*?)\](.*?)\[\/template\]/ism", $s, $matches);
-        if ($cnt) {
-            App::$page['template'] = trim($matches[2]);
-            App::$page['template_style'] = trim($matches[2]) . '_' . $matches[1];
-        }
-
-        $cnt = preg_match("/\[template\](.*?)\[\/template\]/ism", $s, $matches);
-        if ($cnt) {
-            App::$page['template'] = trim($matches[1]);
-        }
-
-        $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches);
-        if ($cnt) {
-            App::$layout['schema'] = trim($matches[1]);
-            App::$layout['theme'] = trim($matches[2]);
-        }
-
-        $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches);
-        if ($cnt) {
-            App::$layout['theme'] = trim($matches[1]);
-        }
-
-        $cnt = preg_match("/\[navbar\](.*?)\[\/navbar\]/ism", $s, $matches);
-        if ($cnt) {
-            App::$layout['navbar'] = trim($matches[1]);
-        }
-
-        $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            // only the last webpage definition is used if there is more than one
-            foreach ($matches as $mtch) {
-                App::$layout['webpage'] = $this->webpage($a, $mtch[1]);
-            }
-        }
-    }
-
-    public function parse_pass1($s)
-    {
-        $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                App::$layout['region_' . $mtch[1]] = $this->region($mtch[2], $mtch[1]);
-            }
-        }
-    }
-
-    /**
-     * @brief Replace conditional variables with real values.
-     *
-     * Currently supported condition variables:
-     *   * $config.xxx.yyy - get_config with cat = xxx and k = yyy
-     *   * $request - request uri for this page
-     *   * $observer.language - viewer's preferred language (closest match)
-     *   * $observer.address - xchan_addr or false
-     *   * $observer.name - xchan_name or false
-     *   * $observer - xchan_hash of observer or empty string
-     *   * $local_channel - logged in channel_id or false
-     *
-     * @param string $v The conditional variable name
-     * @return string|bool
-     */
-    public function get_condition_var($v)
-    {
-        if ($v) {
-            $x = explode('.', $v);
-            if ($x[0] == 'config') {
-                return get_config($x[1], $x[2]);
-            } elseif ($x[0] === 'request') {
-                return $_SERVER['REQUEST_URI'];
-            } elseif ($x[0] === 'local_channel') {
-                return local_channel();
-            } elseif ($x[0] === 'observer') {
-                if (count($x) > 1) {
-                    if ($x[1] == 'language') {
-                        return App::$language;
-                    }
-                    $y = App::get_observer();
-                    if (!$y) {
-                        return false;
-                    }
-                    if ($x[1] == 'address') {
-                        return $y['xchan_addr'];
-                    } elseif ($x[1] == 'name') {
-                        return $y['xchan_name'];
-                    } elseif ($x[1] == 'webname') {
-                        return substr($y['xchan_addr'], 0, strpos($y['xchan_addr'], '@'));
-                    }
-                    return false;
-                }
-                return get_observer_hash();
-            } else {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @brief Test for Conditional Execution conditions.
-     *
-     * This is extensible. The first version of variable testing supports tests of the forms:
-     *
-     * - [if $config.system.foo ~= baz] which will check if get_config('system','foo') contains the string 'baz';
-     * - [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz';
-     * - [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz';
-     * - [if $config.system.foo >= 3] which will check if get_config('system','foo') is greater than or equal to 3;
-     * - [if $config.system.foo > 3] which will check if get_config('system','foo') is greater than 3;
-     * - [if $config.system.foo <= 3] which will check if get_config('system','foo') is less than or equal to 3;
-     * - [if $config.system.foo < 3] which will check if get_config('system','foo') is less than 3;
-     *
-     * - [if $config.system.foo {} baz] which will check if 'baz' is an array element in get_config('system','foo')
-     * - [if $config.system.foo {*} baz] which will check if 'baz' is an array key in get_config('system','foo')
-     * - [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo');
-     *
-     * The values 0, '', an empty array, and an unset value will all evaluate to false.
-     *
-     * @param int|string $s
-     * @return bool
-     */
-    public function test_condition($s)
-    {
-
-        if (preg_match('/[\$](.*?)\s\~\=\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if (stripos($x, trim($matches[2])) !== false) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\=\=\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if ($x == trim($matches[2])) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\!\=\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if ($x != trim($matches[2])) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\>\=\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if ($x >= trim($matches[2])) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\<\=\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if ($x <= trim($matches[2])) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\>\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if ($x > trim($matches[2])) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\>\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if ($x < trim($matches[2])) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\{\}\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if (is_array($x) && in_array(trim($matches[2]), $x)) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)\s\{\*\}\s(.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if (is_array($x) && array_key_exists(trim($matches[2]), $x)) {
-                return true;
-            }
-            return false;
-        }
-
-        if (preg_match('/[\$](.*?)$/', $s, $matches)) {
-            $x = $this->get_condition_var($matches[1]);
-            if ($x) {
-                return true;
-            }
-            return false;
-        }
-        return false;
-    }
-
-    /**
-     * @brief Return rendered menu for current channel_id.
-     *
-     * @param string $s
-     * @param string $class (optional) default empty
-     * @return string
-     * @see menu_render()
-     */
-    public function menu($s, $class = '')
-    {
-
-        $channel_id = $this->get_channel_id();
-        $name = $s;
-
-        $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $var[$mtch[1]] = $mtch[2];
-                $name = str_replace($mtch[0], '', $name);
-            }
-        }
-
-        if ($channel_id) {
-            $m = Menu::fetch($name, $channel_id, get_observer_hash());
-            return Menu::render($m, $class, $edit = false, $var);
-        }
-    }
-
-
-    public function replace_region($match)
-    {
-        if (array_key_exists($match[1], App::$page)) {
-            return App::$page[$match[1]];
-        }
-    }
-
-    /**
-     * @brief Returns the channel_id of the profile owner of the page.
-     *
-     * Returns the channel_id of the profile owner of the page, or the local_channel
-     * if there is no profile owner. Otherwise returns 0.
-     *
-     * @return int channel_id
-     */
-    public function get_channel_id()
-    {
-        $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0);
-
-        if ((!$channel_id) && (local_channel())) {
-            $channel_id = local_channel();
-        }
-        return $channel_id;
-    }
-
-    /**
-     * @brief Returns a parsed block.
-     *
-     * @param string $s
-     * @param string $class (optional) default empty
-     * @return string parsed HTML of block
-     */
-    public function block($s, $class = '')
-    {
-        $var = [];
-        $matches = [];
-        $name = $s;
-        $class = (($class) ? $class : 'bblock widget');
-
-        $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $var[$mtch[1]] = $mtch[2];
-                $name = str_replace($mtch[0], '', $name);
-            }
-        }
-
-        $o = '';
-        $channel_id = $this->get_channel_id();
-
-        if ($channel_id) {
-            $r = q(
-                "select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d
-				and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and iconfig.v = '%s' limit 1",
-                intval($channel_id),
-                dbesc($name)
-            );
-
-            if ($r) {
-                //check for eventual menus in the block and parse them
-                $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER);
-                if ($cnt) {
-                    foreach ($matches as $mtch) {
-                        $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[1])), $r[0]['body']);
-                    }
-                }
-                $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $r[0]['body'], $matches, PREG_SET_ORDER);
-                if ($cnt) {
-                    foreach ($matches as $mtch) {
-                        $r[0]['body'] = str_replace($mtch[0], $this->menu(trim($mtch[2]), $mtch[1]), $r[0]['body']);
-                    }
-                }
-
-                // emit the block
-                $o .= (($var['wrap'] == 'none') ? '' : '
          ');
-
-                if ($r[0]['title'] && trim($r[0]['body']) != '$content') {
-                    $o .= '
          ' . $r[0]['title'] . '
          ';
-                }
-
-                if (trim($r[0]['body']) === '$content') {
-                    $o .= App::$page['content'];
-                } else {
-                    $o .= prepare_text($r[0]['body'], $r[0]['mimetype']);
-                }
-
-                $o .= (($var['wrap'] == 'none') ? '' : '
          ');
-            }
-        }
-
-        return $o;
-    }
-
-    /**
-     * @brief Include JS depending on framework.
-     *
-     * @param string $s
-     * @return string
-     */
-    public function js($s)
-    {
-
-        switch ($s) {
-            case 'jquery':
-                $path = 'view/js/jquery.js';
-                break;
-            case 'bootstrap':
-                $path = 'vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js';
-                break;
-            case 'foundation':
-                $path = 'library/foundation/js/foundation.js';
-                $init = "\r\n" . '';
-                break;
-        }
-
-        $ret = '';
-        if ($init) {
-            $ret .= $init;
-        }
-        return $ret;
-    }
-
-    /**
-     * @brief Include CSS depending on framework.
-     *
-     * @param string $s
-     * @return string
-     */
-    public function css($s)
-    {
-
-        switch ($s) {
-            case 'bootstrap':
-                $path = 'vendor/twbs/bootstrap/dist/css/bootstrap.min.css';
-                break;
-            case 'foundation':
-                $path = 'library/foundation/css/foundation.min.css';
-                break;
-        }
-
-        $ret = '';
-
-        return $ret;
-    }
-
-    /**
-     * This doesn't really belong in Comanche, but it could also be argued that it is the perfect place.
-     * We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content.
-     * For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps
-     * 'full' to provide a social network style profile photo.
-     *
-     * But leave it open to have richer templating options and perhaps ultimately discard this one, once we have a better idea
-     * of what template and webpage options we might desire.
-     *
-     * @param[in,out] array $a
-     * @param string $s
-     * @return array
-     */
-    public function webpage(&$a, $s)
-    {
-        $ret = [];
-        $matches = [];
-
-        $cnt = preg_match_all("/\[authored\](.*?)\[\/authored\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $ret['authored'] = $mtch[1];
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @brief Render a widget.
-     *
-     * @param string $name
-     * @param string $text
-     */
-    public function widget($name, $text)
-    {
-        $vars = [];
-        $matches = [];
-
-        $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $text, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $vars[$mtch[1]] = $mtch[2];
-            }
-        }
-
-        if (!purify_filename($name)) {
-            return '';
-        }
-
-        $clsname = ucfirst($name);
-        $nsname = "\\Zotlabs\\Widget\\" . $clsname;
-
-        $found = false;
-        $widgets = Widget::get();
-        if ($widgets) {
-            foreach ($widgets as $widget) {
-                if (is_array($widget) && strtolower($widget[1]) === strtolower($name) && file_exists($widget[0])) {
-                    require_once($widget[0]);
-                    $found = true;
-                }
-            }
-        }
-
-        if (!$found) {
-            if (file_exists('Zotlabs/SiteWidget/' . $clsname . '.php')) {
-                require_once('Zotlabs/SiteWidget/' . $clsname . '.php');
-            } elseif (file_exists('widget/' . $clsname . '/' . $clsname . '.php')) {
-                require_once('widget/' . $clsname . '/' . $clsname . '.php');
-            } elseif (file_exists('Zotlabs/Widget/' . $clsname . '.php')) {
-                require_once('Zotlabs/Widget/' . $clsname . '.php');
-            } else {
-                $pth = Theme::include($clsname . '.php');
-                if ($pth) {
-                    require_once($pth);
-                }
-            }
-        }
-
-        if (class_exists($nsname)) {
-            $x = new $nsname();
-            $f = 'widget';
-            if (method_exists($x, $f)) {
-                return $x->$f($vars);
-            }
-        }
-
-        $func = 'widget_' . trim($name);
-
-        if (!function_exists($func)) {
-            if (file_exists('widget/' . trim($name) . '.php')) {
-                require_once('widget/' . trim($name) . '.php');
-            } elseif (file_exists('widget/' . trim($name) . '/' . trim($name) . '.php')) {
-                require_once('widget/' . trim($name) . '/' . trim($name) . '.php');
-            }
-            if (!function_exists($func)) {
-                $theme_widget = $func . '.php';
-                if (Theme::include($theme_widget)) {
-                    require_once(Theme::include($theme_widget));
-                }
-            }
-        }
-
-        if (function_exists($func)) {
-            return $func($vars);
-        }
-    }
-
-
-    public function region($s, $region_name)
-    {
-
-        $s = str_replace('$region', $region_name, $s);
-
-        $matches = [];
-
-        $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $s = str_replace($mtch[0], $this->menu(trim($mtch[1])), $s);
-            }
-        }
-
-        // menu class e.g. [menu=horizontal]my_menu[/menu] or [menu=tabbed]my_menu[/menu]
-        // allows different menu renderings to be applied
-
-        $cnt = preg_match_all("/\[menu=(.*?)\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $s = str_replace($mtch[0], $this->menu(trim($mtch[2]), $mtch[1]), $s);
-            }
-        }
-        $cnt = preg_match_all("/\[block\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $s = str_replace($mtch[0], $this->block(trim($mtch[1])), $s);
-            }
-        }
-
-        $cnt = preg_match_all("/\[block=(.*?)\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $s = str_replace($mtch[0], $this->block(trim($mtch[2]), trim($mtch[1])), $s);
-            }
-        }
-
-        $cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $s = str_replace($mtch[0], $this->js(trim($mtch[1])), $s);
-            }
-        }
-
-        $cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $s = str_replace($mtch[0], $this->css(trim($mtch[1])), $s);
-            }
-        }
-
-        $cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER);
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                $s = str_replace($mtch[0], $this->widget(trim($mtch[1]), $mtch[2]), $s);
-            }
-        }
-
-        return $s;
-    }
-
-
-    /**
-     * @brief Registers a page template/variant for use by Comanche selectors.
-     *
-     * @param array $arr
-     *    'template' => template name
-     *    'variant' => array(
-     *           'name' => variant name
-     *           'desc' => text description
-     *           'regions' => array(
-     *               'name' => name
-     *               'desc' => text description
-     *           )
-     *    )
-     */
-    public function register_page_template($arr)
-    {
-        App::$page_layouts[$arr['template']] = array($arr['variant']);
-        return;
-    }
-}
diff --git a/Zotlabs/Render/SimpleTemplate.php b/Zotlabs/Render/SimpleTemplate.php
deleted file mode 100644
index 6dd59a18b..000000000
--- a/Zotlabs/Render/SimpleTemplate.php
+++ /dev/null
@@ -1,354 +0,0 @@
- 5.3, not certain how to code around it for unit tests
-//          case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
-            default:
-                // die("Unknown preg error.");
-                return;
-        }
-        echo "
          ";
-        debug_print_backtrace();
-        die();
-    }
-
-    private function _push_stack()
-    {
-        $this->stack[] = [ $this->r, $this->nodes ];
-    }
-
-    private function _pop_stack()
-    {
-        list($this->r, $this->nodes) = array_pop($this->stack);
-    }
-
-    private function _get_var($name, $retNoKey = false)
-    {
-        $keys = array_map('trim', explode('.', $name));
-        if ($retNoKey && ! array_key_exists($keys[0], $this->r)) {
-            return KEY_NOT_EXISTS;
-        }
-
-        $val = $this->r;
-        foreach ($keys as $k) {
-            $val = (isset($val[$k]) ? $val[$k] : null);
-        }
-
-        return template_escape($val);
-    }
-
-    /**
-     * IF node
-     * \code
-     * {{ if <$var> }}...[{{ else }} ...] {{ endif }}
-     * {{ if <$var>== }}...[{{ else }} ...]{{ endif }}
-     * {{ if <$var>!= }}...[{{ else }} ...]{{ endif }}
-     * \endcode
-     */
-    private function _replcb_if($args)
-    {
-        if (strpos($args[2], '==') > 0) {
-            list($a,$b) = array_map('trim', explode('==', $args[2]));
-            $a = $this->_get_var($a);
-            if ($b[0] == '$') {
-                $b =  $this->_get_var($b);
-            }
-            $val = ($a == $b);
-        } elseif (strpos($args[2], '!=') > 0) {
-            list($a,$b) = array_map('trim', explode('!=', $args[2]));
-            $a = $this->_get_var($a);
-            if ($b[0] == '$') {
-                $b =  $this->_get_var($b);
-            }
-            $val = ($a != $b);
-        } else {
-            $val = $this->_get_var($args[2]);
-        }
-        $x = preg_split("|{{ *else *}}|", $args[3]);
-
-        return ( ($val) ? $x[0] : (isset($x[1]) ? $x[1] : EMPTY_STR));
-    }
-
-    /**
-     * FOR node
-     * \code
-     * {{ for <$var> as $name }}...{{ endfor }}
-     * {{ for <$var> as $key=>$name }}...{{ endfor }}
-     * \endcode
-     */
-    private function _replcb_for($args)
-    {
-        $m = array_map('trim', explode(" as ", $args[2]));
-        $x = explode('=>', $m[1]);
-        if (count($x) == 1) {
-            $varname = $x[0];
-            $keyname = EMPTY_STR;
-        } else {
-            list($keyname, $varname) = $x;
-        }
-        if ($m[0] == EMPTY_STR || $varname == EMPTY_STR || is_null($varname)) {
-            die("template error: 'for " . $m[0] . " as " . $varname . "'") ;
-        }
-
-        $vals = $this->_get_var($m[0]);
-        $ret = EMPTY_STR;
-        if (!is_array($vals)) {
-            return $ret;
-        }
-
-        foreach ($vals as $k => $v) {
-            $this->_push_stack();
-            $r = $this->r;
-            $r[$varname] = $v;
-            if ($keyname != EMPTY_STR) {
-                $r[$keyname] = (($k === 0) ? '0' : $k);
-            }
-            $ret .=  $this->replace($args[3], $r);
-            $this->_pop_stack();
-        }
-
-        return $ret;
-    }
-
-    /**
-     * INC node
-     * \code
-     * {{ inc  [with $var1=$var2] }}{{ endinc }}
-     * \endcode
-     */
-    private function _replcb_inc($args)
-    {
-        if (strpos($args[2], 'with')) {
-            list($tplfile, $newctx) = array_map('trim', explode("with", $args[2]));
-        } else {
-            $tplfile = trim($args[2]);
-            $newctx = null;
-        }
-
-        if ($tplfile[0] == '$') {
-            $tplfile = $this->_get_var($tplfile);
-        }
-
-        $this->_push_stack();
-        $r = $this->r;
-        if (! is_null($newctx)) {
-            list($a,$b) = array_map('trim', explode('=', $newctx));
-            $r[$a] = $this->_get_var($b);
-        }
-        $this->nodes = array();
-        $tpl = Theme::get_template($tplfile);
-        $ret = $this->replace($tpl, $r);
-        $this->_pop_stack();
-
-        return $ret;
-    }
-
-    /**
-     * DEBUG node
-     * \code
-     * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
-     * \endcode
-     * replace node with 
          var_dump($var, $var, ...);
          
-     */
-    private function _replcb_debug($args)
-    {
-        $vars = array_map('trim', explode(" ", $args[2]));
-        $vars[] = $args[1];
-
-        $ret = "
          ";
-        foreach ($vars as $var) {
-            $ret .= htmlspecialchars(var_export($this->_get_var($var), true));
-            $ret .= "\n";
-        }
-        $ret .= "
          ";
-
-        return $ret;
-    }
-
-    private function _replcb_node($m)
-    {
-        $node = $this->nodes[$m[1]];
-        if (method_exists($this, "_replcb_" . $node[1])) {
-            $s = call_user_func(array($this, "_replcb_" . $node[1]), $node);
-        } else {
-            $s = "";
-        }
-        $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
-
-        return $s;
-    }
-
-    private function _replcb($m)
-    {
-        //var_dump(array_map('htmlspecialchars', $m));
-        $this->done = false;
-        $this->nodes[] = (array) $m;
-
-        return "||" . (count($this->nodes) - 1) . "||";
-    }
-
-    private function _build_nodes($s)
-    {
-        $this->done = false;
-        while (!$this->done) {
-            $this->done = true;
-            $s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s);
-            if ($s == null) {
-                $this->_preg_error();
-            }
-        }
-        //({{ *else *}}[^{]*)?
-        krsort($this->nodes);
-
-        return $s;
-    }
-
-    private function var_replace($s)
-    {
-        $m = [];
-        /** regexp:
-         * \$                       literal $
-         * (\[)?                    optional open square bracket
-         * ([a-zA-Z0-9-_]+\.?)+     var name, followed by optional
-         *                          dot, repeated at least 1 time
-         * (?(1)\])                 if there was opened square bracket
-         *                          (subgrup 1), match close bracket
-         */
-        if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s, $m)) {
-            foreach ($m[0] as $var) {
-                $exp = str_replace(array("[", "]"), array("", ""), $var);
-                $exptks = explode("|", $exp);
-
-                $varn = $exptks[0];
-                unset($exptks[0]);
-                $val = $this->_get_var($varn, true);
-                if ($val != KEY_NOT_EXISTS) {
-                    /* run filters */
-                    /*
-                     * Filter are in form of:
-                     * filtername:arg:arg:arg
-                     *
-                     * "filtername" is function name
-                     * "arg"s are optional, var value is appended to the end
-                     *          if one "arg"==='x' , is replaced with var value
-                     *
-                     * examples:
-                     * $item.body|htmlspecialchars              // escape html chars
-                     * $item.body|htmlspecialchars|strtoupper   // escape html and uppercase result
-                     * $item.created|date:%Y %M %j              // format date (created is a timestamp)
-                     * $item.body|str_replace:cat:dog           // replace all "cat" with "dog"
-                     * $item.body|str_replace:cat:dog:x:1       // replace one "cat" with "dog"
-                     */
-                    foreach ($exptks as $filterstr) {
-                        $filter = explode(":", $filterstr);
-                        $filtername = $filter[0];
-                        unset($filter[0]);
-                        $valkey = array_search("x", $filter);
-                        if ($valkey === false) {
-                            $filter[] = $val;
-                        } else {
-                            $filter[$valkey] = $val;
-                        }
-                        if (function_exists($filtername)) {
-                            $val = call_user_func_array($filtername, $filter);
-                        }
-                    }
-                    $s = str_replace($var, $val, $s);
-                }
-            }
-        }
-
-        return $s;
-    }
-
-    private function replace($s, $r)
-    {
-        $this->replace_macros($s, $r);
-    }
-
-    // TemplateEngine interface
-
-    public function replace_macros($s, $r)
-    {
-        $this->r = $r;
-
-        $s = $this->_build_nodes($s);
-
-        $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
-        if ($s == null) {
-            $this->_preg_error();
-        }
-
-        // remove comments block
-        $s = preg_replace('/{#[^#]*#}/', "", $s);
-
-        //$t2 = dba_timer();
-
-        // replace strings recursively (limit to 10 loops)
-        $os = "";
-        $count = 0;
-        while (($os !== $s) && $count < 10) {
-            $os = $s;
-            $count++;
-            $s = $this->var_replace($s);
-        }
-
-        return $s;
-    }
-
-    public function get_template($file, $root = '')
-    {
-        $template_file = Theme::include($file, $root);
-        if ($template_file) {
-            $content = file_get_contents($template_file);
-        }
-
-        return $content;
-    }
-}
-
-
-function template_escape($s)
-{
-    return str_replace(array('$','{{'), array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'), $s);
-}
-
-function template_unescape($s)
-{
-    return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'), array('$','{{'), $s);
-}
diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php
deleted file mode 100644
index 58747744e..000000000
--- a/Zotlabs/Render/SmartyInterface.php
+++ /dev/null
@@ -1,72 +0,0 @@
- "view/theme/$thname/tpl/"];
-        if (x(App::$theme_info, "extends")) {
-            $template_dirs = $template_dirs + ['extends' => "view/theme/" . App::$theme_info["extends"] . '/tpl/'];
-        }
-        $template_dirs = $template_dirs + array('base' => 'view/tpl/');
-        $this->setTemplateDir($template_dirs);
-
-        // Cannot use get_config() here because it is called during installation when there is no DB.
-        // FIXME: this may leak private information such as system pathnames.
-
-        $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system']))
-            ? App::$config['system']['smarty3_folder'] : '');
-        if (!$basecompiledir) {
-            $basecompiledir = str_replace('Zotlabs', '', dirname(__DIR__)) . TEMPLATE_BUILD_PATH;
-        }
-        if (!is_dir($basecompiledir)) {
-            @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true);
-        }
-        if (!is_dir($basecompiledir)) {
-            echo "ERROR: folder $basecompiledir does not exist.";
-            killme();
-        }
-
-        if (!is_writable($basecompiledir)) {
-            echo "ERROR: folder $basecompiledir must be writable by webserver.";
-            killme();
-        }
-        App::$config['system']['smarty3_folder'] = $basecompiledir;
-
-        $this->setCompileDir($basecompiledir . '/compiled/');
-        $this->setConfigDir($basecompiledir . '/config/');
-        $this->setCacheDir($basecompiledir . '/cache/');
-
-        $this->left_delimiter = App::get_template_ldelim('smarty3');
-        $this->right_delimiter = App::get_template_rdelim('smarty3');
-
-        // Don't report errors so verbosely
-        $this->error_reporting = (E_ERROR | E_PARSE);
-    }
-
-    public function parsed($template = '')
-    {
-        if ($template) {
-            return $this->fetch('string:' . $template);
-        }
-        return $this->fetch('file:' . $this->filename);
-    }
-}
diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php
deleted file mode 100644
index 2dabbfede..000000000
--- a/Zotlabs/Render/SmartyTemplate.php
+++ /dev/null
@@ -1,98 +0,0 @@
-ERROR: folder $basecompiledir does not exist.";
-                killme();
-            }
-        }
-        if (! is_writable($basecompiledir)) {
-            echo "ERROR: folder $basecompiledir must be writable by webserver.";
-            killme();
-        }
-        App::$config['system']['smarty3_folder'] = $basecompiledir;
-    }
-
-    // TemplateEngine interface
-
-    public function replace_macros($s, $r)
-    {
-        $template = '';
-
-        // macro or macros available for use in all templates
-
-        $r['$z_baseurl']     = z_root();
-
-        if (gettype($s) === 'string') {
-            $template = $s;
-            $s = new SmartyInterface();
-        }
-        foreach ($r as $key => $value) {
-            if ($key[0] === '$') {
-                $key = substr($key, 1);
-            }
-            $s->assign($key, $value);
-        }
-        return $s->parsed($template);
-    }
-
-    public function get_template($file, $root = '')
-    {
-        $template_file = Theme::include($file, $root);
-        if ($template_file) {
-            $template = new SmartyInterface();
-            $template->filename = $template_file;
-
-            return $template;
-        }
-        return EMPTY_STR;
-    }
-
-    public function get_email_template($file, $root = '')
-    {
-
-        $lang = App::$language;
-        if ($root != '' && substr($root, -1) != '/') {
-            $root .= '/';
-        }
-        foreach ([ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) {
-            if (is_file($template_file)) {
-                break;
-            }
-        }
-        if ($template_file == '') {
-            $template_file = Theme::include($file, $root);
-        }
-        if ($template_file) {
-            $template = new SmartyInterface();
-            $template->filename = $template_file;
-            return $template;
-        }
-        return EMPTY_STR;
-    }
-}
diff --git a/Zotlabs/Render/TemplateEngine.php b/Zotlabs/Render/TemplateEngine.php
deleted file mode 100644
index 95e39e3cb..000000000
--- a/Zotlabs/Render/TemplateEngine.php
+++ /dev/null
@@ -1,13 +0,0 @@
- 1) ? $theme[1] : '');
-
-        $opts = '';
-        $opts = ((App::$profile_uid) ? '?f=&puid=' . App::$profile_uid : '');
-
-        $schema_str = ((x(App::$layout, 'schema')) ? '&schema=' . App::$layout['schema'] : '');
-        if (($s) && (!$schema_str)) {
-            $schema_str = '&schema=' . $s;
-        }
-
-        $opts .= $schema_str;
-
-        if (file_exists('view/theme/' . $t . '/php/style.php')) {
-            return ('/view/theme/' . $t . '/php/style.pcss' . $opts);
-        }
-
-        return ('/view/theme/' . $t . '/css/style.css');
-    }
-
-    public static function include($file, $root = '')
-    {
-
-        // Make sure $root ends with a slash / if it's not blank
-        if ($root) {
-            $root = rtrim($root,'/') . '/';
-        }
-    
-        $theme_info = App::$theme_info;
-
-        if (array_key_exists('extends', $theme_info)) {
-            $parent = $theme_info['extends'];
-        } else {
-            $parent = 'NOPATH';
-        }
-
-        $theme = self::current();
-        $thname = $theme[0];
-
-        $ext = substr($file, strrpos($file, '.') + 1);
-
-        $paths = array(
-            "{$root}view/theme/$thname/$ext/$file",
-            "{$root}view/theme/$parent/$ext/$file",
-            "{$root}view/site/$ext/$file",
-            "{$root}view/$ext/$file",
-        );
-
-        foreach ($paths as $p) {
-
-            if (strpos($p, 'NOPATH') !== false) {
-                continue;
-            }
-            if (file_exists($p)) {
-                return $p;
-            }
-        }
-
-        return '';
-    }
-
-    static public function get_info($theme) {
-
-        $info =  null;
-        if (is_file("view/theme/$theme/$theme.yml")) {
-            $info = Infocon::from_file("view/theme/$theme.yml");
-        }
-        elseif (is_file("view/theme/$theme/php/theme.php")) {
-            $info = Infocon::from_c_comment("view/theme/$theme/php/theme.php");
-        }
-        return $info ? $info : [ 'name' => $theme ] ;
-    
-    }
-
-    static public function get_email_template($s, $root = '')
-    {
-            $testroot = ($root=='') ? $testroot = "ROOT" : $root;
-            $t = App::template_engine();
-
-        if (isset(App::$override_intltext_templates[$testroot][$s]["content"])) {
-                return App::$override_intltext_templates[$testroot][$s]["content"];
-        } else {
-            if (isset(App::$override_intltext_templates[$testroot][$s]["root"]) &&
-                   isset(App::$override_intltext_templates[$testroot][$s]["file"])) {
-                    $s = App::$override_intltext_templates[$testroot][$s]["file"];
-                    $root = App::$override_intltext_templates[$testroot][$s]["root"];
-            } elseif (App::$override_templateroot) {
-                $newroot = App::$override_templateroot.$root;
-                if ($newroot != '' && substr($newroot, -1) != '/') {
-                               $newroot .= '/';
-                }
-                    $template = $t->Theme::get_email_template($s, $newroot);
-            }
-                $template = $t->Theme::get_email_template($s, $root);
-                return $template;
-        }
-    }
-
-    static public function get_template($s, $root = '')
-    {
-            $testroot = ($root=='') ? $testroot = "ROOT" : $root;
-
-            $t = App::template_engine();
-
-        if (isset(App::$override_markup_templates[$testroot][$s]["content"])) {
-                return App::$override_markup_templates[$testroot][$s]["content"];
-        } else {
-            if (isset(App::$override_markup_templates[$testroot][$s]["root"]) &&
-                   isset(App::$override_markup_templates[$testroot][$s]["file"])) {
-                    $s = App::$override_markup_templates[$testroot][$s]["file"];
-                    $root = App::$override_markup_templates[$testroot][$s]["root"];
-            } elseif (App::$override_templateroot) {
-                $newroot = App::$override_templateroot.$root;
-                if ($newroot != '' && substr($newroot, -1) != '/') {
-                               $newroot .= '/';
-                }
-                    $template = $t->get_template($s, $newroot);
-            }
-                $template = $t->get_template($s, $root);
-                return $template;
-        }
-    }
-
-
-
-    
-
-    public function debug()
-    {
-        logger('system_theme: ' . self::$system_theme);
-        logger('session_theme: ' . self::$session_theme);
-    }
-}
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
deleted file mode 100644
index cb3375bf5..000000000
--- a/Zotlabs/Storage/BasicAuth.php
+++ /dev/null
@@ -1,291 +0,0 @@
-check_module_access($channel['channel_id'])) {
-            return $this->setAuthenticated($channel);
-        }
-
-        if ($this->module_disabled)
-            $error = 'module not enabled for ' . $username;
-        else
-            $error = 'password failed for ' . $username;
-        logger($error);
-        log_failed_login($error);
-
-        return false;
-    }
-
-    /**
-     * @brief Sets variables and session parameters after successfull authentication.
-     *
-     * @param array $r
-     *  Array with the values for the authenticated channel.
-     * @return bool
-     */
-    protected function setAuthenticated($channel)
-    {
-        $this->channel_name = $channel['channel_address'];
-        $this->channel_id = $channel['channel_id'];
-        $this->channel_hash = $this->observer = $channel['channel_hash'];
-
-        if ($this->observer) {
-            $r = q("select * from xchan where xchan_hash = '%s' limit 1",
-                dbesc($this->observer)
-            );
-            if ($r) {
-                App::set_observer(array_shift($r));
-            }
-        }
-
-        $_SESSION['uid'] = $channel['channel_id'];
-        $_SESSION['account_id'] = $channel['channel_account_id'];
-        $_SESSION['authenticated'] = true;
-        return true;
-    }
-
-    /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * [true, "principals/username"]
-     * [false, "reason for failure"]
-     *
-     * If authentication was successful, it's expected that the authentication
-     * backend returns a so-called principal url.
-     *
-     * Examples of a principal url:
-     *
-     * principals/admin
-     * principals/user1
-     * principals/users/joe
-     * principals/uid/123457
-     *
-     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-     * return a string such as:
-     *
-     * principals/users/[username]
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response)
-    {
-
-        if (local_channel()) {
-            $this->setAuthenticated(App::get_channel());
-            return [true, $this->principalPrefix . $this->channel_name];
-        } elseif (remote_channel()) {
-            return [true, $this->principalPrefix . $this->observer];
-        }
-
-        $auth = new Basic(
-            $this->realm,
-            $request,
-            $response
-        );
-
-        $userpass = $auth->getCredentials();
-        if (!$userpass) {
-            return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
-        }
-        if (!$this->validateUserPass($userpass[0], $userpass[1])) {
-            return [false, "Username or password was incorrect"];
-        }
-        return [true, $this->principalPrefix . $userpass[0]];
-
-    }
-
-    protected function check_module_access($channel_id)
-    {
-        if ($channel_id && in_array(App::$module, ['dav', 'cdav', 'snap'])) {
-            return true;
-        }
-        $this->module_disabled = true;
-        return false;
-    }
-
-    /**
-     * Sets the channel_name from the currently logged-in channel.
-     *
-     * @param string $name
-     *  The channel's name
-     */
-    public function setCurrentUser($name)
-    {
-        $this->channel_name = $name;
-    }
-
-    /**
-     * Returns information about the currently logged-in channel.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     * @see \\Sabre\\DAV\\Auth\\Backend\\AbstractBasic::getCurrentUser
-     */
-    public function getCurrentUser()
-    {
-        return $this->channel_name;
-    }
-
-    /**
-     * @brief Sets the timezone from the channel in BasicAuth.
-     *
-     * Set in mod/cloud.php if the channel has a timezone set.
-     *
-     * @param string $timezone
-     *  The channel's timezone.
-     * @return void
-     */
-    public function setTimezone($timezone)
-    {
-        $this->timezone = $timezone;
-    }
-
-    /**
-     * @brief Returns the timezone.
-     *
-     * @return string
-     *  Return the channel's timezone.
-     */
-    public function getTimezone()
-    {
-        return $this->timezone;
-    }
-
-    /**
-     * @brief Set browser plugin for SabreDAV.
-     *
-     * @param Plugin $browser
-     * @see RedBrowser::set_writeable()
-     */
-    public function setBrowserPlugin($browser)
-    {
-        $this->browser = $browser;
-    }
-
-    /**
-     * @brief Prints out all BasicAuth variables to logger().
-     *
-     * @return void
-     */
-    public function log()
-    {
-//		logger('channel_name ' . $this->channel_name, LOGGER_DATA);
-//		logger('channel_id ' . $this->channel_id, LOGGER_DATA);
-//		logger('channel_hash ' . $this->channel_hash, LOGGER_DATA);
-//		logger('observer ' . $this->observer, LOGGER_DATA);
-//		logger('owner_id ' . $this->owner_id, LOGGER_DATA);
-//		logger('owner_nick ' . $this->owner_nick, LOGGER_DATA);
-    }
-}
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
deleted file mode 100644
index 3b4f3c440..000000000
--- a/Zotlabs/Storage/Browser.php
+++ /dev/null
@@ -1,500 +0,0 @@
-auth = $auth;
-		parent::__construct(true, false);
-	}
-
-	/**
-	 * The DAV browser is instantiated after the auth module and directory classes
-	 * but before we know the current directory and who the owner and observer
-	 * are. So we add a pointer to the browser into the auth module and vice versa.
-	 * Then when we've figured out what directory is actually being accessed, we
-	 * call the following function to decide whether or not to show web elements
-	 * which include writeable objects.
-	 *
-	 * @fixme It only disable/enable the visible parts. Not the POST handler
-	 * which handels the actual requests when uploading files or creating folders.
-	 *
-	 * @todo Maybe this whole way of doing this can be solved with some
-	 * $server->subscribeEvent().
-	 */
-	public function set_writeable() {
-		if (! $this->auth->owner_id) {
-			$this->enablePost = false;
-		}
-
-		if (! perm_is_allowed($this->auth->owner_id, get_observer_hash(), 'write_storage')) {
-			$this->enablePost = false;
-		}
-		else {
-			$this->enablePost = true;
-		}
-	}
-
-	/**
-	 * @brief Creates the directory listing for the given path.
-	 *
-	 * @param string $path which should be displayed
-	 */
-	public function generateDirectoryIndex($path) {
-		// (owner_id = channel_id) is visitor owner of this directory?
-		$is_owner = ((local_channel() && $this->auth->owner_id == local_channel()) ? true : false);
-
-		if ($this->auth->getTimezone()) {
-			date_default_timezone_set($this->auth->getTimezone());
-		}
-
-		if ($this->auth->owner_nick) {
-			$html = '';
-		}
-
-		$files = $this->server->getPropertiesForPath($path, [
-			'{DAV:}displayname',
-			'{DAV:}resourcetype',
-			'{DAV:}getcontenttype',
-			'{DAV:}getcontentlength',
-			'{DAV:}getlastmodified',
-			], 1);
-
-		$parent = $this->server->tree->getNodeForPath($path);
-
-		$parentpath = [];
-		// only show parent if not leaving /cloud/; TODO how to improve this?
-		if ($path && $path != "cloud") {
-			list($parentUri) = \Sabre\Uri\split($path);
-			$fullPath = encodePath($this->server->getBaseUri() . $parentUri);
-
-			$parentpath['icon'] = $this->enableAssets ? '' . t('parent') . '' : '';
-			$parentpath['path'] = $fullPath;
-		}
-
-		$f = [];
-		foreach ($files as $file) {
-			$ft = [];
-			$type = null;
-
-			// This is the current directory, we can skip it
-			if (rtrim($file['href'], '/') == $path) {
-				continue;
-			}
-
-			list(, $name) = \Sabre\Uri\split($file['href']);
-
-			if (isset($file[200]['{DAV:}resourcetype'])) {
-				$type = $file[200]['{DAV:}resourcetype']->getValue();
-
-				// resourcetype can have multiple values
-				if (! is_array($type)) {
-					$type = [ $type ];
-				}
-
-				foreach ($type as $k => $v) {
-					// Some name mapping is preferred
-					switch ($v) {
-						case '{DAV:}collection' :
-							$type[$k] = t('Collection');
-							break;
-						case '{DAV:}principal' :
-							$type[$k] = t('Principal');
-							break;
-						case '{urn:ietf:params:xml:ns:carddav}addressbook' :
-							$type[$k] = t('Addressbook');
-							break;
-						case '{urn:ietf:params:xml:ns:caldav}calendar' :
-							$type[$k] = t('Calendar');
-							break;
-						case '{urn:ietf:params:xml:ns:caldav}schedule-inbox' :
-							$type[$k] = t('Schedule Inbox');
-							break;
-						case '{urn:ietf:params:xml:ns:caldav}schedule-outbox' :
-							$type[$k] = t('Schedule Outbox');
-							break;
-						case '{http://calendarserver.org/ns/}calendar-proxy-read' :
-							$type[$k] = 'Proxy-Read';
-							break;
-						case '{http://calendarserver.org/ns/}calendar-proxy-write' :
-							$type[$k] = 'Proxy-Write';
-							break;
-					}
-				}
-				$type = implode(', ', $type);
-			}
-
-			// If no resourcetype was found, we attempt to use
-			// the contenttype property
-			if (! $type && isset($file[200]['{DAV:}getcontenttype'])) {
-				$type = $file[200]['{DAV:}getcontenttype'];
-			}
-			if (! $type) {
-				$type = t('Unknown');
-			}
-
-			$size = isset($file[200]['{DAV:}getcontentlength']) ? (int)$file[200]['{DAV:}getcontentlength'] : '';
-			$lastmodified = ((isset($file[200]['{DAV:}getlastmodified'])) ? $file[200]['{DAV:}getlastmodified']->getTime()->format('Y-m-d H:i:s') : '');
-
-			$fullPath = encodePath('/' . trim($this->server->getBaseUri() . ($path ? $path . '/' : '') . $name, '/'));
-
-			$displayName = isset($file[200]['{DAV:}displayname']) ? $file[200]['{DAV:}displayname'] : $name;
-
-			$displayName = $this->escapeHTML($displayName);
-			$type = $this->escapeHTML($type);
-
-
-			$icon = '';
-
-			if ($this->enableAssets) {
-				$node = $this->server->tree->getNodeForPath(($path ? $path . '/' : '') . $name);
-				foreach (array_reverse($this->iconMap) as $class=>$iconName) {
-					if ($node instanceof $class) {
-						$icon = '';
-						break;
-					}
-				}
-			}
-
-			$folderHash = '';
-			$parentHash = '';
-			$owner = $this->auth->owner_id;
-			$splitPath = explode('/', $fullPath);
-			if (count($splitPath) > 3) {
-				for ($i = 3; $i < count($splitPath); $i++) {
-					$attachName = urldecode($splitPath[$i]);
-					$folderHash = $parentHash;
-					$attachHash = $this->findAttachHash($owner, $parentHash, $attachName);
-					$parentHash = $attachHash;
-				}
-			}
-
-
-			// generate preview icons for tile view. 
-			// SVG, PDF and office documents have some security concerns and should only be allowed on single-user sites with tightly controlled
-			// upload access. system.thumbnail_security should be set to 1 if you want to include these types 
-
-			$is_creator = false;
-			$photo_icon = '';
-			$preview_style = intval(get_config('system','thumbnail_security',0));
-
-			$r = q("select content, creator from attach where hash = '%s' and uid = %d limit 1",
-				dbesc($attachHash),
-				intval($owner)
-			);
-
-			if ($r) {
-				$is_creator = (($r[0]['creator'] === get_observer_hash()) ? true : false);
-			 	if (file_exists(dbunescbin($r[0]['content']) . '.thumb')) {
-					$photo_icon = 'data:image/jpeg;base64,' . base64_encode(file_get_contents(dbunescbin($r[0]['content']) . '.thumb'));
-				}
-			}
-
-			if (strpos($type,'image/') === 0 && $attachHash) {
-				$r = q("select resource_id, imgscale from photo where resource_id = '%s' and imgscale in ( %d, %d ) order by imgscale asc limit 1",
-					dbesc($attachHash),
-					intval(PHOTO_RES_320),
-					intval(PHOTO_RES_PROFILE_80)
-				);
-				if ($r) {
-					$photo_icon = 'photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale'];				
-				}
-				if ($type === 'image/svg+xml' && $preview_style > 0) {
-					$photo_icon = $fullPath;
-				}
-			}
-
-			$g = [ 'resource_id' => $attachHash, 'thumbnail' => $photo_icon, 'security' => $preview_style ];
-			Hook::call('file_thumbnail', $g);
-			$photo_icon = $g['thumbnail'];
-
-
-			$attachIcon = ""; 
-
-			// put the array for this file together
-			$ft['attachId'] = $this->findAttachIdByHash($attachHash);
-			$ft['fileStorageUrl'] = substr($fullPath, 0, strpos($fullPath, "cloud/")) . "filestorage/" . $this->auth->owner_nick;
-			$ft['icon'] = $icon;
-			$ft['photo_icon'] = $photo_icon;
-			$ft['attachIcon'] = (($size) ? $attachIcon : '');
-			// @todo Should this be an item value, not a global one?
-			$ft['is_owner'] = $is_owner;
-			$ft['is_creator'] = $is_creator;
-			$ft['fullPath'] = $fullPath;
-			$ft['displayName'] = $displayName;
-			$ft['type'] = $type;
-			$ft['size'] = $size;
-			$ft['sizeFormatted'] = userReadableSize($size);
-			$ft['lastmodified'] = (($lastmodified) ? datetime_convert('UTC', date_default_timezone_get(), $lastmodified) : '');
-			$ft['iconFromType'] = getIconFromType($type);
-
-			$f[] = $ft;
-
-		}
-
-
-		$output = '';
-		if ($this->enablePost && $parentpath) {
-			$this->server->emit('onHTMLActionsPanel', array($parent, &$output, $path));
-		}
-
-		// "display as tiles" is the default for visitors, and changes to this setting are stored in the session
-		// so that they apply even to unauthenticated visitors.
-
-		$deftiles = (($is_owner) ? 0 : 1);
-		$tiles = ((array_key_exists('cloud_tiles',$_SESSION)) ? intval($_SESSION['cloud_tiles']) : $deftiles);
-		$_SESSION['cloud_tiles'] = $tiles;
-	
-		$html .= replace_macros(Theme::get_template('cloud.tpl'), [
-				'$header' => t('Files') . ": " . $this->escapeHTML($path) . "/",
-				'$total' => t('Total'),
-				'$actionspanel' => $output,
-				'$shared' => t('Shared'),
-				'$create' => t('Create'),
-				'$upload' => t('Add Files'),
-				'$is_owner' => $is_owner,
-				'$is_admin' => is_site_admin(),
-				'$admin_delete' => t('Admin Delete'),
-				'$parentpath' => $parentpath,
-				'$cpath' => bin2hex(App::$query_string),
-				'$tiles' => intval($_SESSION['cloud_tiles']),
-				'$photo_view' => (($parentpath) ? t('View photos') : EMPTY_STR),
-				'$photos_path' => z_root() . '/photos/' . $this->auth->owner_nick . '/album/' . $folderHash,
-				'$entries' => $f,
-				'$name' => t('Name'),
-				'$type' => t('Type'),
-				'$size' => t('Size'),
-				'$lastmod' => t('Last Modified'),
-				'$parent' => t('parent'),
-				'$edit' => t('Edit'),
-				'$delete' => t('Delete'),
-				'$nick' => $this->auth->getCurrentUser()
-			]
-		);
-
-
-		$a = false;
-
-		Navbar::set_selected('Files');
-
-		App::$page['content'] = $html;
-		load_pdl();
-
-		$current_theme = Theme::current();
-
-		$theme_info_file = 'view/theme/' . $current_theme[0] . '/php/theme.php';
-		if (file_exists($theme_info_file)) {
-			require_once($theme_info_file);
-			if (function_exists(str_replace('-', '_', $current_theme[0]) . '_init')) {
-				$func = str_replace('-', '_', $current_theme[0]) . '_init';
-				$func($a);
-			}
-		}
-		$this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
-		$this->build_page = true;
-	}
-
-	/**
-	 * @brief Creates a form to add new folders and upload files.
-	 *
-	 * @param INode $node
-	 * @param[in,out] string &$output
-	 * @param string $path
-	 */
-	public function htmlActionsPanel(INode $node, &$output, $path) {
-		if (! $node instanceof DAV\ICollection) {
-			return;
-		}
-
-		// We also know fairly certain that if an object is a non-extended
-		// SimpleCollection, we won't need to show the panel either.
-
-		if (get_class($node) === 'Sabre\\DAV\\SimpleCollection') {
-			return;
-		}
-		
-		$aclselect = null;
-		$lockstate = '';
-		$limit = 0;
-
-		if ($this->auth->owner_id) {
-			$channel = Channel::from_id($this->auth->owner_id);
-			if ($channel) {
-				$acl = new AccessControl($channel);
-				$channel_acl = $acl->get();
-				$lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
-
-				$aclselect = ((local_channel() == $this->auth->owner_id) ? Libacl::populate($channel_acl,false,PermissionDescription::fromGlobalPermission('view_storage')) : '');
-			}
-
-			// Storage and quota for the account (all channels of the owner of this directory)!
-			$limit = engr_units_to_bytes(ServiceClass::fetch($this->auth->owner_id, 'attach_upload_limit'));
-		}
-
-		if ((! $limit) && get_config('system','cloud_report_disksize')) {
-			$limit = engr_units_to_bytes(disk_free_space('store'));
-		}
-
-		$r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d",
-			intval($this->auth->channel_account_id)
-		);
-		$used = $r[0]['total'];
-		if ($used) {
-			$quotaDesc = t('You are using %1$s of your available file storage.');
-			$quotaDesc = sprintf($quotaDesc,userReadableSize($used));
-		}
-		if ($limit && $used) {
-			$quotaDesc = t('You are using %1$s of %2$s available file storage. (%3$s%)');
-			$quotaDesc = sprintf($quotaDesc,
-				userReadableSize($used),
-				userReadableSize($limit),
-				round($used / $limit, 1) * 100);
-		}
-		// prepare quota for template
-		$quota = [];
-		$quota['used'] = $used;
-		$quota['limit'] = $limit;
-		$quota['desc'] = $quotaDesc;
-		$quota['warning'] = ((($limit) && ((round($used / $limit, 1) * 100) >= 90)) ? t('WARNING:') : ''); // 10485760 bytes = 100MB
-
-		// strip 'cloud/nickname', but only at the beginning of the path
-
-		$special = 'cloud/' . $this->auth->owner_nick;
-		$count   = strlen($special);
-
-		if (strpos($path,$special) === 0) {
-			$path = trim(substr($path,$count),'/');
-		}
-
-		$output .= replace_macros(Theme::get_template('cloud_actionspanel.tpl'), array(
-				'$folder_header' => t('Create new folder'),
-				'$folder_submit' => t('Create'),
-				'$upload_header' => t('Upload file'),
-				'$upload_submit' => t('Upload'),
-				'$quota' => $quota,
-				'$channick' => $this->auth->owner_nick,
-				'$aclselect' => $aclselect,
-				'$allow_cid' => acl2json($channel_acl['allow_cid']),
-				'$allow_gid' => acl2json($channel_acl['allow_gid']),
-				'$deny_cid' => acl2json($channel_acl['deny_cid']),
-				'$deny_gid' => acl2json($channel_acl['deny_gid']),
-				'$lockstate' => $lockstate,
-				'$return_url' => App::$cmd,
-				'$path' => $path,
-				'$folder' => find_folder_hash_by_path($this->auth->owner_id, $path),
-				'$dragdroptext' => t('Drop files here to immediately upload'),
-				'$notify' => ['notify', t('Show in your contacts shared folder'), 0, '', [t('No'), t('Yes')]]
-			));
-	}
-
-	/**
-	 * This method takes a path/name of an asset and turns it into url
-	 * suiteable for http access.
-	 *
-	 * @param string $assetName
-	 * @return string
-	 */
-	protected function getAssetUrl($assetName) {
-		return z_root() . '/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
-	}
-
-	/**
-	 * @brief Return the hash of an attachment.
-	 *
-	 * Given the owner, the parent folder and and attach name get the attachment
-	 * hash.
-	 *
-	 * @param int $owner
-	 *  The owner_id
-	 * @param string $parentHash
-	 *  The parent's folder hash
-	 * @param string $attachName
-	 *  The name of the attachment
-	 * @return string
-	 */
-	protected function findAttachHash($owner, $parentHash, $attachName) {
-		$r = q("SELECT hash FROM attach WHERE uid = %d AND folder = '%s' AND filename = '%s' ORDER BY edited DESC LIMIT 1",
-			intval($owner),
-			dbesc($parentHash),
-			dbesc($attachName)
-		);
-		$hash = '';
-		if ($r) {
-			foreach ($r as $rr) {
-				$hash = $rr['hash'];
-			}
-		}
-
-		return $hash;
-	}
-
-	/**
-	 * @brief Returns an attachment's id for a given hash.
-	 *
-	 * This id is used to access the attachment in filestorage/
-	 *
-	 * @param string $attachHash
-	 *  The hash of an attachment
-	 * @return string
-	 */
-	 
-	protected function findAttachIdByHash($attachHash) {
-		$r = q("SELECT id FROM attach WHERE hash = '%s' ORDER BY edited DESC LIMIT 1",
-			dbesc($attachHash)
-		);
-		$id = EMPTY_STR;
-		if ($r) {
-			$id = $r[0]['id'];
-		}
-		return $id;
-	}
-}
diff --git a/Zotlabs/Storage/CalDAVClient.php b/Zotlabs/Storage/CalDAVClient.php
deleted file mode 100644
index 8ab34e23f..000000000
--- a/Zotlabs/Storage/CalDAVClient.php
+++ /dev/null
@@ -1,746 +0,0 @@
-username = $user;
-        $this->password = $pass;
-        $this->url = $url;
-    }
-
-    private function set_data($s)
-    {
-        $this->request_data = $s;
-        $this->filepos = 0;
-    }
-
-    public function curl_read($ch, $fh, $size)
-    {
-
-        if ($this->filepos < 0) {
-            unset($fh);
-            return '';
-        }
-
-        $s = substr($this->request_data, $this->filepos, $size);
-
-        if (strlen($s) < $size) {
-            $this->filepos = (-1);
-        } else {
-            $this->filepos = $this->filepos + $size;
-        }
-
-        return $s;
-    }
-
-    public function ctag_fetch()
-    {
-        $headers = ['Depth: 0', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
-
-        // recommended ctag fetch by sabre
-
-        $this->set_data('
-
-  
-     
-     
-	
-  
-');
-
-        // thunderbird uses this - it's a bit more verbose on what capabilities
-        // are provided by the server
-
-        $this->set_data('
-
-
-    
-    
-    
-    
-    
-    
-
-');
-
-
-        $auth = $this->username . ':' . $this->password;
-
-        $recurse = 0;
-
-        $x = z_fetch_url(
-            $this->url,
-            true,
-            $recurse,
-            ['headers' => $headers,
-                'http_auth' => $auth,
-                'custom' => 'PROPFIND',
-                'upload' => true,
-                'infile' => 3,
-                'infilesize' => strlen($this->request_data),
-                'readfunc' => [$this, 'curl_read']
-            ]
-        );
-
-        return $x;
-    }
-
-
-    public function detail_fetch()
-    {
-        $headers = ['Depth: 1', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
-
-        // this query should return all objects in the given calendar, you can filter it appropriately
-        // using filter options
-
-        $this->set_data('
-
-  
-     
-     
-  
-  
-        
-    
-');
-
-        $auth = $this->username . ':' . $this->password;
-
-        $recurse = 0;
-        $x = z_fetch_url(
-            $this->url,
-            true,
-            $recurse,
-            ['headers' => $headers,
-                'http_auth' => $auth,
-                'custom' => 'REPORT',
-                'upload' => true,
-                'infile' => 3,
-                'infilesize' => strlen($this->request_data),
-                'readfunc' => [$this, 'curl_read']
-            ]
-        );
-
-
-        return $x;
-    }
-}
-
-
-
-/*
-
-PROPFIND /calendars/johndoe/home/ HTTP/1.1
-Depth: 0
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-  
-     
-     
-  
-
-
-// Responses: success
-
-HTTP/1.1 207 Multi-status
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        /calendars/johndoe/home/
-        
-            
-                Home calendar
-                3145
-            
-            HTTP/1.1 200 OK
-        
-    
-
-
-// Responses: fail
-
-HTTP/1.1 207 Multi-status
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        /calendars/johndoe/home/
-        
-            
-                
-                
-            
-            HTTP/1.1 403 Forbidden
-        
-    
-
-
-
-// sample request body in DOM
-// prepare request body
-$doc  = new DOMDocument('1.0', 'utf-8');
-$doc->formatOutput = true;
-
-$query = $doc->createElement('c:calendar-query');
-$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:c', 'urn:ietf:params:xml:ns:caldav');
-$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:d', 'DAV:');
-
-$prop = $doc->createElement('d:prop');
-$prop->appendChild($doc->createElement('d:getetag'));
-$prop->appendChild($doc->createElement('c:calendar-data'));
-$query->appendChild($prop);
-$doc->appendChild($query);
-$body = $doc->saveXML();
-
-echo "Body: " . $body . "
          ";
-
-
-Now we download every single object in this calendar. To do this, we use a REPORT method.
-
-REPORT /calendars/johndoe/home/ HTTP/1.1
-Depth: 1
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        
-        
-    
-    
-        
-    
-
-
-This request will give us every object that's a VCALENDAR object, and its etag.
-
-If you're only interested in VTODO (because you're writing a todo app) you can also filter for just those:
-
-REPORT /calendars/johndoe/home/ HTTP/1.1
-Depth: 1
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        
-        
-    
-    
-        
-            
-        
-    
-
-
-Similarly it's also possible to filter to just events, or only get events within a specific time-range.
-
-This report will return a multi-status object again:
-
-HTTP/1.1 207 Multi-status
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        /calendars/johndoe/home/132456762153245.ics
-        
-            
-                "2134-314"
-                BEGIN:VCALENDAR
-                    VERSION:2.0
-                    CALSCALE:GREGORIAN
-                    BEGIN:VTODO
-                    UID:132456762153245
-                    SUMMARY:Do the dishes
-                    DUE:20121028T115600Z
-                    END:VTODO
-                    END:VCALENDAR
-                
-            
-            HTTP/1.1 200 OK
-        
-    
-    
-        /calendars/johndoe/home/132456-34365.ics
-        
-            
-                "5467-323"
-                BEGIN:VCALENDAR
-                    VERSION:2.0
-                    CALSCALE:GREGORIAN
-                    BEGIN:VEVENT
-                    UID:132456-34365
-                    SUMMARY:Weekly meeting
-                    DTSTART:20120101T120000
-                    DURATION:PT1H
-                    RRULE:FREQ=WEEKLY
-                    END:VEVENT
-                    END:VCALENDAR
-                
-            
-            HTTP/1.1 200 OK
-        
-    
-
-
-This calendar only contained 2 objects. A todo and a weekly event.
-
-So after you retrieved and processed these, for each object you must retain:
-
-    The calendar data itself
-    The url
-    The etag
-
-In this case all urls ended with .ics. This is often the case, but you must not rely on this. In this case the UID in the calendar object was also identical to a part of the url. This too is often the case, but again not something you can rely on, so don't make any assumptions.
-
-The url and the UID have no meaningful relationship, so treat both those items as separate unique identifiers.
-Finding out if anything changed
-
-To see if anything in a calendar changed, we simply request the ctag again on the calendar. If the ctag did not change, you still have the latest copy.
-
-If it did change, you must request all the etags in the entire calendar again:
-
-REPORT /calendars/johndoe/home/ HTTP/1.1
-Depth: 1
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        
-    
-    
-        
-            
-        
-    
-
-
-Note that this last request is extremely similar to a previous one, but we are only asking fo the etag, not the calendar-data.
-
-The reason for this, is that calendars can be rather huge. It will save a TON of bandwidth to only check the etag first.
-
-HTTP/1.1 207 Multi-status
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        /calendars/johndoe/home/132456762153245.ics
-        
-            
-                "xxxx-xxx"
-            
-            HTTP/1.1 200 OK
-        
-    
-    
-        /calendars/johndoe/home/fancy-caldav-client-1234253678.ics
-        
-            
-                "5-12"
-            
-            HTTP/1.1 200 OK
-        
-    
-
-
-Judging from this last request, 3 things have changed:
-
-    The etag for the task has changed, so the contents must be different
-    There's a new url, some other client must have added an object
-    One object is missing, something must have deleted it.
-
-So based on those 3 items we know that we need to delete an object from our local list, and fetch the contents for the new item, and the updated one.
-
-To fetch the data for these, you can simply issue GET requests:
-
-GET /calendars/johndoe/home/132456762153245.ics HTTP/1.1
-
-But, because in a worst-case scenario this could result in a LOT of GET requests we can do a 'multiget'.
-
-REPORT /calendars/johndoe/home/ HTTP/1.1
-Depth: 1
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        
-        
-    
-    /calendars/johndoe/home/132456762153245.ics
-    /calendars/johndoe/home/fancy-caldav-client-1234253678.ics
-
-
-This request will simply return a multi-status again with the calendar-data and etag.
-A small note about application design
-
-If you read this far and understood what's been said, you may have realized that it's a bit cumbersome to have a separate step for the initial sync, and subsequent updates.
-
-It would totally be possible to skip the 'initial sync', and just use calendar-query and calendar-multiget REPORTS for the initial sync as well.
-Updating a calendar object
-
-Updating a calendar object is rather simple:
-
-PUT /calendars/johndoe/home/132456762153245.ics HTTP/1.1
-Content-Type: text/calendar; charset=utf-8
-If-Match: "2134-314"
-
-BEGIN:VCALENDAR
-....
-END:VCALENDAR
-
-A response to this will be something like this:
-
-HTTP/1.1 204 No Content
-ETag: "2134-315"
-
-The update gave us back the new ETag. SabreDAV gives this ETag on updates back most of the time, but not always.
-
-There are cases where the caldav server must modify the iCalendar object right after storage. In those cases an ETag will not be returned, and you should issue a GET request immediately to get the correct object.
-
-A few notes:
-
-    You must not change the UID of the original object
-    Every object should hold only 1 event or task.
-    You cannot change an VEVENT into a VTODO.
-
-Creating a calendar object
-
-Creating a calendar object is almost identical, except that you don't have a url yet to a calendar object.
-
-Instead, it is up to you to determine the new url.
-
-PUT /calendars/johndoe/home/somerandomstring.ics HTTP/1.1
-Content-Type: text/calendar; charset=utf-8
-
-BEGIN:VCALENDAR
-....
-END:VCALENDAR
-
-A response to this will be something like this:
-
-HTTP/1.1 201 Created
-ETag: "21345-324"
-
-Similar to updating, an ETag is often returned, but there are cases where this is not true.
-Deleting a calendar object
-
-Deleting is simple enough:
-
-DELETE /calendars/johndoe/home/132456762153245.ics HTTP/1.1
-If-Match: "2134-314"
-
-Speeding up Sync with WebDAV-Sync
-
-WebDAV-Sync is a protocol extension that is defined in rfc6578. Because this extension was defined later, some servers may not support this yet.
-
-SabreDAV supports this since 2.0.
-
-WebDAV-Sync allows a client to ask just for calendars that have changed. The process on a high-level is as follows:
-
-    Client requests sync-token from server.
-    Server reports token 15.
-    Some time passes.
-    Client does a Sync REPORT on an calendar, and supplied token 15.
-    Server returns vcard urls that have changed or have been deleted and returns token 17.
-
-As you can see, after the initial sync, only items that have been created, modified or deleted will ever be sent.
-
-This has a lot of advantages. The transmitted xml bodies can generally be a lot shorter, and is also easier on both client and server in terms of memory and CPU usage, because only a limited set of items will have to be compared.
-
-It's important to note, that a client should only do Sync operations, if the server reports that it has support for it. The quickest way to do so, is to request {DAV}sync-token on the calendar you wish to sync.
-
-Technically, a server may support 'sync' on one calendar, and it may not support it on another, although this is probably rare.
-Getting the first sync-token
-
-Initially, we just request a sync token when asking for calendar information:
-
-PROPFIND /calendars/johndoe/home/ HTTP/1.1
-Depth: 0
-Content-Type: application/xml; charset=utf-8
-
-
-  
-     
-     
-     
-  
-
-
-This would return something as follows:
-
-
-    
-        /calendars/johndoe/home/
-        
-            
-                My calendar
-                3145
-                http://sabredav.org/ns/sync-token/3145
-            
-            HTTP/1.1 200 OK
-        
-    
-
-
-As you can see, the sync-token is a url. It always should be a url. Even though a number appears in the url, you are not allowed to attach any meaning to that url. Some servers may have use an increasing number, another server may use a completely random string.
-Receiving changes
-
-After a sync token has been obtained, and the client already has the initial copy of the calendar, the client is able to request all changes since the token was issued.
-
-This is done with a REPORT request that may look like this:
-
-REPORT /calendars/johndoe/home/ HTTP/1.1
-Host: dav.example.org
-Content-Type: application/xml; charset="utf-8"
-
-
-
-  http://sabredav.org/ns/sync/3145
-  1
-  
-    
-  
-
-
-This requests all the changes since sync-token identified by http://sabredav.org/ns/sync/3145, and for the calendar objects that have been added or modified, we're requesting the etag.
-
-The response to a query like this is another multistatus xml body. Example:
-
-HTTP/1.1 207 Multi-Status
-Content-Type: application/xml; charset="utf-8"
-
-
-
-    
-        /calendars/johndoe/home/newevent.ics
-        
-            
-                "33441-34321"
-            
-            HTTP/1.1 200 OK
-        
-    
-    
-        /calendars/johndoe/home/updatedevent.ics
-        
-            
-                "33541-34696"
-            
-            HTTP/1.1 200 OK
-        
-    
-    
-        /calendars/johndoe/home/deletedevent.ics
-        HTTP/1.1 404 Not Found
-    
-    http://sabredav.org/ns/sync/5001
- 
-
-The last response reported two changes: newevent.ics and updatedevent.ics. There's no way to tell from the response wether those cards got created or updated, you, as a client can only infer this based on the vcards you are already aware of.
-
-The entry with name deletedevent.ics got deleted as indicated by the 404 status. Note that the status element is here a child of d:response when in all previous examples it has been a child of d:propstat.
-
-The other difference with the other multi-status examples, is that this one has a sync-token element with the latest sync-token.
-Caveats
-
-Note that a server is free to 'forget' any sync-tokens that have been previously issued. In this case it may be needed to do a full-sync again.
-
-In case the supplied sync-token is not recognized by the server, a HTTP error is emitted. SabreDAV emits a 403.
-Discovery
-
-Ideally you will want to make sure that all the calendars in an account are automatically discovered. The best user interface would be to just have to ask for three items:
-
-    Username
-    Password
-    Server
-
-And the server should be as short as possible. This is possible with most servers.
-
-If, for example a user specified 'dav.example.org' for the server, the first thing you should do is attempt to send a PROPFIND request to https://dav.example.org/. Note that you SHOULD try the https url before the http url.
-
-This PROPFIND request looks as follows:
-
-PROPFIND / HTTP/1.1
-Depth: 0
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-  
-     
-  
-
-
-This will return a response such as the following:
-
-HTTP/1.1 207 Multi-status
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        /
-        
-            
-                
-                    /principals/users/johndoe/
-                
-            
-            HTTP/1.1 200 OK
-        
-    
-
-
-A 'principal' is a user. The url that's being returned, is a url that refers to the current user. On this url you can request additional information about the user.
-
-What we need from this url, is their 'calendar home'. The calendar home is a collection that contains all of the users' calendars.
-
-To request that, issue the following request:
-
-PROPFIND /principals/users/johndoe/ HTTP/1.1
-Depth: 0
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-  
-     
-  
-
-
-This will return a response such as the following:
-
-HTTP/1.1 207 Multi-status
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        /principals/users/johndoe/
-        
-            
-                
-                    /calendars/johndoe/
-                
-            
-            HTTP/1.1 200 OK
-        
-    
-
-
-Lastly, to list all the calendars for the user, issue a PROPFIND request with Depth: 1.
-
-PROPFIND /calendars/johndoe/ HTTP/1.1
-Depth: 1
-Prefer: return-minimal
-Content-Type: application/xml; charset=utf-8
-
-
-  
-     
-     
-     
-     
-  
-
-
-In that last request, we asked for 4 properties.
-
-The resourcetype tells us what type of object we're getting back. You must read out the resourcetype and ensure that it contains at least a calendar element in the CalDAV namespace. Other items may be returned, including non- calendar, which your application should ignore.
-
-The displayname is a human-readable string for the calendarname, the ctag was already covered in an earlier section.
-
-Lastly, supported-calendar-component-set. This gives us a list of components that the calendar accepts. This could be just VTODO, VEVENT, VJOURNAL or a combination of these three.
-
-If you are just creating a todo-list application, this means you should only list the calendars that support the VTODO component.
-
-HTTP/1.1 207 Multi-status
-Content-Type: application/xml; charset=utf-8
-
-
-    
-        /calendars/johndoe/
-        
-            
-                
-                    
-                
-            
-            HTTP/1.1 200 OK
-        
-    
-    
-        /calendars/johndoe/home/
-        
-            
-                
-                    
-                    
-                
-                Home calendar
-                3145
-                
-                    
-                
-            
-            HTTP/1.1 200 OK
-        
-    
-    
-        /calendars/johndoe/tasks/
-        
-            
-                
-                    
-                    
-                
-                My TODO list
-                3345
-                
-                    
-                
-            
-            HTTP/1.1 200 OK
-        
-    
-
-*/
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
deleted file mode 100644
index b8cb1f601..000000000
--- a/Zotlabs/Storage/Directory.php
+++ /dev/null
@@ -1,952 +0,0 @@
-ext_path = $ext_path;
-        // remove "/cloud" from the beginning of the path
-        $modulename = App::$module;
-        $this->red_path = ((strpos($ext_path, '/' . $modulename) === 0) ? substr($ext_path, strlen($modulename) + 1) : $ext_path);
-        if (!$this->red_path) {
-            $this->red_path = '/';
-        }
-        $this->auth = $auth_plugin;
-        $this->folder_hash = '';
-        $this->getDir();
-
-        if ($this->auth->browser) {
-            $this->auth->browser->set_writeable();
-        }
-    }
-
-    private function log()
-    {
-        logger('ext_path ' . $this->ext_path, LOGGER_DATA);
-        logger('os_path  ' . $this->os_path, LOGGER_DATA);
-        logger('red_path ' . $this->red_path, LOGGER_DATA);
-    }
-
-    /**
-     * @brief Returns an array with all the child nodes.
-     *
-     * @throw "\Sabre\DAV\Exception\Forbidden"
-     * @return array \\Sabre\\DAV\\INode[]
-     */
-    public function getChildren()
-    {
-        logger('children for ' . $this->ext_path, LOGGER_DATA);
-        $this->log();
-
-        if (get_config('system', 'block_public') && (!$this->auth->channel_id) && (!$this->auth->observer)) {
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        if (($this->auth->owner_id) && (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'view_storage'))) {
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        $contents = $this->CollectionData($this->red_path, $this->auth);
-        return $contents;
-    }
-
-    /**
-     * @brief Returns a child by name.
-     *
-     * @throw "\Sabre\DAV\Exception\Forbidden"
-     * @throw "\Sabre\DAV\Exception\NotFound"
-     * @param string $name
-     */
-    public function getChild($name)
-    {
-        logger($name, LOGGER_DATA);
-
-        if (get_config('system', 'block_public') && (!$this->auth->channel_id) && (!$this->auth->observer)) {
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        if (($this->auth->owner_id) && (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'view_storage'))) {
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        $modulename = App::$module;
-        if ($this->red_path === '/' && $name === $modulename) {
-            return new Directory('/' . $modulename, $this->auth);
-        }
-
-        $x = $this->FileData($this->ext_path . '/' . $name, $this->auth);
-        if ($x) {
-            return $x;
-        }
-
-        throw new DAV\Exception\NotFound('The file with name: ' . $name . ' could not be found.');
-    }
-
-    /**
-     * @brief Returns the name of the directory.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return (basename($this->red_path));
-    }
-
-    /**
-     * @brief Renames the directory.
-     *
-     * @param string $name The new name of the directory.
-     * @return void
-     * @todo handle duplicate directory name
-     *
-     * @throw "\Sabre\DAV\Exception\Forbidden"
-     */
-    public function setName($name)
-    {
-        logger('old name ' . basename($this->red_path) . ' -> ' . $name, LOGGER_DATA);
-
-        if ((!$name) || (!$this->auth->owner_id)) {
-            logger('permission denied ' . $name);
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        if (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage')) {
-            logger('permission denied ' . $name);
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        list($parent_path,) = \Sabre\Uri\split($this->red_path);
-        $new_path = $parent_path . '/' . $name;
-
-        $r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND uid = %d",
-            dbesc($name),
-            dbesc($this->folder_hash),
-            intval($this->auth->owner_id)
-        );
-
-        $x = attach_syspaths($this->auth->owner_id, $this->folder_hash);
-
-        $y = q("update attach set display_path = '%s' where hash = '%s' and uid = %d",
-            dbesc($x['path']),
-            dbesc($this->folder_hash),
-            intval($this->auth->owner_id)
-        );
-
-        $ch = Channel::from_id($this->auth->owner_id);
-        if ($ch) {
-            $sync = attach_export_data($ch, $this->folder_hash);
-            if ($sync) {
-                Libsync::build_sync_packet($ch['channel_id'], array('file' => array($sync)));
-            }
-        }
-
-        $this->red_path = $new_path;
-    }
-
-    /**
-     * @brief Creates a new file in the directory.
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After successful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * @throw "\Sabre\DAV\Exception\Forbidden"
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string ETag
-     */
-    public function createFile($name, $data = null)
-    {
-        logger('create file in directory ' . $name, LOGGER_DEBUG);
-
-        if (!$this->auth->owner_id) {
-            logger('permission denied ' . $name);
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        if (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage')) {
-            logger('permission denied ' . $name);
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        $mimetype = z_mime_content_type($name);
-
-        $channel = Channel::from_id($this->auth->owner_id);
-
-        if (!$channel) {
-            logger('no channel');
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        $filesize = 0;
-        $hash = new_uuid();
-
-        $f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $hash;
-
-        $direct = null;
-
-        if ($this->folder_hash) {
-            $r = q("select * from attach where hash = '%s' and is_dir = 1 and uid = %d limit 1",
-                dbesc($this->folder_hash),
-                intval($channel['channel_id'])
-            );
-            if ($r) {
-                $direct = array_shift($r);
-            }
-        }
-
-        if (($direct) && (($direct['allow_cid']) || ($direct['allow_gid']) || ($direct['deny_cid']) || ($direct['deny_gid']))) {
-            $allow_cid = $direct['allow_cid'];
-            $allow_gid = $direct['allow_gid'];
-            $deny_cid = $direct['deny_cid'];
-            $deny_gid = $direct['deny_gid'];
-        } else {
-            $allow_cid = $channel['channel_allow_cid'];
-            $allow_gid = $channel['channel_allow_gid'];
-            $deny_cid = $channel['channel_deny_cid'];
-            $deny_gid = $channel['channel_deny_gid'];
-        }
-
-        $created = $edited = datetime_convert();
-
-        $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
-			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
-            intval($channel['channel_account_id']),
-            intval($channel['channel_id']),
-            dbesc($hash),
-            dbesc($this->auth->observer),
-            dbesc($name),
-            dbesc($this->folder_hash),
-            intval(1),
-            dbesc($mimetype),
-            intval($filesize),
-            intval(0),
-            intval(0),
-            dbesc($f),
-            dbesc($created),
-            dbesc($edited),
-            '',
-            '',
-            dbesc($allow_cid),
-            dbesc($allow_gid),
-            dbesc($deny_cid),
-            dbesc($deny_gid)
-        );
-
-        // fetch the actual storage paths
-
-        $xpath = attach_syspaths($this->auth->owner_id, $hash);
-
-        if (is_resource($data)) {
-            $fp = fopen($f, 'wb');
-            if ($fp) {
-                pipe_streams($data, $fp);
-                fclose($fp);
-            }
-            $size = filesize($f);
-        } else {
-            $size = file_put_contents($f, $data);
-        }
-
-        // delete attach entry if file_put_contents() failed
-        if ($size === false) {
-            logger('file_put_contents() failed to ' . $f);
-            attach_delete($channel['channel_id'], $hash);
-            return;
-        }
-
-        $is_photo = 0;
-        $gis = @getimagesize($f);
-        logger('getimagesize: ' . print_r($gis, true), LOGGER_DATA);
-        if (($gis) && supported_imagetype($gis[2])) {
-            $is_photo = 1;
-        }
-
-        // If we know it's a photo, over-ride the type in case the source system could not determine what it was
-
-        if ($is_photo) {
-            q("update attach set filetype = '%s' where hash = '%s' and uid = %d",
-                dbesc($gis['mime']),
-                dbesc($hash),
-                intval($channel['channel_id'])
-            );
-        }
-
-        // updates entry with path and filesize
-        $d = q("UPDATE attach SET filesize = '%s', os_path = '%s', display_path = '%s', is_photo = %d WHERE hash = '%s' AND uid = %d",
-            dbesc($size),
-            dbesc($xpath['os_path']),
-            dbesc($xpath['path']),
-            intval($is_photo),
-            dbesc($hash),
-            intval($channel['channel_id'])
-        );
-
-        // update the parent folder's lastmodified timestamp
-        $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d",
-            dbesc($edited),
-            dbesc($this->folder_hash),
-            intval($channel['channel_id'])
-        );
-
-        $maxfilesize = get_config('system', 'maxfilesize');
-        if (($maxfilesize) && ($size > $maxfilesize)) {
-            logger('system maxfilesize exceeded. Deleting uploaded file.');
-            attach_delete($channel['channel_id'], $hash);
-            return;
-        }
-
-        // check against service class quota
-        $limit = engr_units_to_bytes(ServiceClass::fetch($channel['channel_id'], 'attach_upload_limit'));
-        if ($limit !== false) {
-            $z = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d ",
-                intval($channel['channel_account_id'])
-            );
-            if (($z) && ($z[0]['total'] + $size > $limit)) {
-                logger('service class limit exceeded for ' . $channel['channel_name'] . ' total usage is ' . $z[0]['total'] . ' limit is ' . userReadableSize($limit));
-                attach_delete($channel['channel_id'], $hash);
-                return;
-            }
-        }
-
-        if ($is_photo) {
-            $album = '';
-            if ($this->folder_hash) {
-                $f1 = q("select filename, display_path from attach WHERE hash = '%s' AND uid = %d",
-                    dbesc($this->folder_hash),
-                    intval($channel['channel_id'])
-                );
-                if ($f1) {
-                    $album = (($f1[0]['display_path']) ? $f1[0]['display_path'] : $f1[0]['filename']);
-                }
-            }
-
-            $args = [
-                'resource_id' => $hash,
-                'album' => $album,
-                'folder' => $this->folder_hash,
-                'os_syspath' => $f,
-                'os_path' => $xpath['os_path'],
-                'display_path' => $xpath['path'],
-                'filename' => $name,
-                'getimagesize' => $gis,
-                'directory' => $direct
-            ];
-            $p = photo_upload($channel, App::get_observer(), $args);
-        }
-
-        Run::Summon(['Thumbnail', $hash]);
-
-        $sync = attach_export_data($channel, $hash);
-
-        if ($sync) {
-            Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
-        }
-    }
-
-    /**
-     * @brief Creates a new subdirectory.
-     *
-     * @param string $name the directory to create
-     * @return void
-     */
-    public function createDirectory($name)
-    {
-        logger('create directory ' . $name, LOGGER_DEBUG);
-
-        if ((!$this->auth->owner_id) || (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        $channel = Channel::from_id($this->auth->owner_id);
-
-        if ($channel) {
-
-            // When initiated from DAV, set the 'force' flag on attach_mkdir(). This will cause the operation to report success even if the
-            // folder already exists.
-
-            require_once('include/attach.php');
-            $result = attach_mkdir($channel, $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash, 'force' => true));
-
-            if ($result['success']) {
-                $sync = attach_export_data($channel, $result['data']['hash']);
-                logger('createDirectory: attach_export_data returns $sync:' . print_r($sync, true), LOGGER_DEBUG);
-
-                if ($sync) {
-                    Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
-                }
-            } else {
-                logger('error ' . print_r($result, true), LOGGER_DEBUG);
-            }
-        }
-    }
-
-    /**
-     * @brief delete directory
-     */
-    public function delete()
-    {
-        logger('delete file ' . basename($this->red_path), LOGGER_DEBUG);
-
-        if ((!$this->auth->owner_id) || (!perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
-            throw new DAV\Exception\Forbidden('Permission denied.');
-        }
-
-        if ($this->auth->owner_id !== $this->auth->channel_id) {
-            if (($this->auth->observer !== $this->data['creator']) || intval($this->data['is_dir'])) {
-                throw new DAV\Exception\Forbidden('Permission denied.');
-            }
-        }
-
-        attach_delete($this->auth->owner_id, $this->folder_hash);
-
-        $channel = Channel::from_id($this->auth->owner_id);
-        if ($channel) {
-            $sync = attach_export_data($channel, $this->folder_hash, true);
-            if ($sync) {
-                Libsync::build_sync_packet($channel['channel_id'], array('file' => array($sync)));
-            }
-        }
-    }
-
-
-    /**
-     * @brief Checks if a child exists.
-     *
-     * @param string $name
-     *  The name to check if it exists.
-     * @return bool
-     */
-    public function childExists($name)
-    {
-        // On /cloud we show a list of available channels.
-        // @todo what happens if no channels are available?
-        $modulename = App::$module;
-        if ($this->red_path === '/' && $name === $modulename) {
-            //logger('We are at ' $modulename . ' show a channel list', LOGGER_DEBUG);
-            return true;
-        }
-
-        $x = $this->FileData($this->ext_path . '/' . $name, $this->auth, true);
-        //logger('FileData returns: ' . print_r($x, true), LOGGER_DATA);
-        if ($x) {
-            return true;
-        }
-        return false;
-    }
-
-
-    public function moveInto($targetName, $sourcePath, DAV\INode $sourceNode)
-    {
-
-        if (!$this->auth->owner_id) {
-            return false;
-        }
-
-        if (!($sourceNode->data && $sourceNode->data['hash'])) {
-            return false;
-        }
-
-        return attach_move($this->auth->owner_id, $sourceNode->data['hash'], $this->folder_hash);
-    }
-
-
-    /**
-     * @return void
-     * @todo add description of what this function does.
-     *
-     * @throw "\Sabre\DAV\Exception\NotFound"
-     */
-    public function getDir()
-    {
-
-        logger('GetDir: ' . $this->ext_path, LOGGER_DEBUG);
-        $this->auth->log();
-        $modulename = App::$module;
-
-        $file = $this->ext_path;
-
-        $x = strpos($file, '/' . $modulename);
-        if ($x === 0) {
-            $file = substr($file, strlen($modulename) + 1);
-        }
-
-        if ((!$file) || ($file === '/')) {
-            return;
-        }
-
-        $file = trim($file, '/');
-        $path_arr = explode('/', $file);
-
-        if (!$path_arr)
-            return;
-
-        logger('paths: ' . print_r($path_arr, true), LOGGER_DATA);
-
-        $channel_name = $path_arr[0];
-
-        $channel = Channel::from_username($channel_name);
-
-        if (!$channel) {
-            throw new DAV\Exception\NotFound('The file with name: ' . $channel_name . ' could not be found.');
-        }
-
-        $channel_id = $channel['channel_id'];
-        $this->auth->owner_id = $channel_id;
-        $this->auth->owner_nick = $channel_name;
-
-        $path = '/' . $channel_name;
-        $folder = '';
-        $os_path = '';
-
-        for ($x = 1; $x < count($path_arr); $x++) {
-            $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0",
-                dbesc($folder),
-                dbesc($path_arr[$x]),
-                intval($channel_id)
-            );
-            if ($r && intval($r[0]['is_dir'])) {
-                $folder = $r[0]['hash'];
-                if (strlen($os_path)) {
-                    $os_path .= '/';
-                }
-                $os_path .= $folder;
-                $path = $path . '/' . $r[0]['filename'];
-            }
-        }
-        $this->folder_hash = $folder;
-        $this->os_path = $os_path;
-    }
-
-    /**
-     * @brief Returns the last modification time for the directory, as a UNIX
-     * timestamp.
-     *
-     * It looks for the last edited file in the folder. If it is an empty folder
-     * it returns the lastmodified time of the folder itself, to prevent zero
-     * timestamps.
-     *
-     * @return int last modification time in UNIX timestamp
-     */
-    public function getLastModified()
-    {
-        $r = q("SELECT edited FROM attach WHERE folder = '%s' AND uid = %d ORDER BY edited DESC LIMIT 1",
-            dbesc($this->folder_hash),
-            intval($this->auth->owner_id)
-        );
-        if (!$r) {
-            $r = q("SELECT edited FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
-                dbesc($this->folder_hash),
-                intval($this->auth->owner_id)
-            );
-            if (!$r)
-                return '';
-        }
-        return datetime_convert('UTC', 'UTC', $r[0]['edited'], 'U');
-    }
-
-
-    /**
-     * @brief Array with all Directory and File DAV\\Node items for the given path.
-     *
-     * @param string $file path to a directory
-     * @param BasicAuth &$auth
-     * @returns null|array \\Sabre\\DAV\\INode[]
-     * @throw "\Sabre\DAV\Exception\Forbidden"
-     * @throw "\Sabre\DAV\Exception\NotFound"
-     */
-    public function CollectionData($file, &$auth)
-    {
-        $ret = [];
-
-        $x = strpos($file, '/cloud');
-        if ($x === 0) {
-            $file = substr($file, 6);
-        }
-
-        // return a list of channel if we are not inside a channel
-        if ((!$file) || ($file === '/')) {
-            return $this->ChannelList($auth);
-        }
-
-        $file = trim($file, '/');
-        $path_arr = explode('/', $file);
-
-        if (!$path_arr) {
-            return null;
-        }
-
-        $channel_name = $path_arr[0];
-
-        $channel = Channel::from_username($channel_name);
-
-        if (!$channel) {
-            return null;
-        }
-
-        $channel_id = $channel['channel_id'];
-        $perms = permissions_sql($channel_id);
-
-        $auth->owner_id = $channel_id;
-
-        $path = '/' . $channel_name;
-
-        $folder = '';
-        $errors = false;
-        $permission_error = false;
-
-        for ($x = 1; $x < count($path_arr); $x++) {
-            $r = q("SELECT id, hash, filename, flags, is_dir FROM attach WHERE folder = '%s' AND filename = '%s' AND uid = %d AND is_dir != 0 $perms LIMIT 1",
-                dbesc($folder),
-                dbesc($path_arr[$x]),
-                intval($channel_id)
-            );
-            if (!$r) {
-                // path wasn't found. Try without permissions to see if it was the result of permissions.
-                $errors = true;
-                $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 limit 1",
-                    dbesc($folder),
-                    basename($path_arr[$x]),
-                    intval($channel_id)
-                );
-                if ($r) {
-                    $permission_error = true;
-                }
-                break;
-            }
-
-            if ($r && intval($r[0]['is_dir'])) {
-                $folder = $r[0]['hash'];
-                $path = $path . '/' . $r[0]['filename'];
-            }
-        }
-
-        if ($errors) {
-            if ($permission_error) {
-                throw new DAV\Exception\Forbidden('Permission denied.');
-            } else {
-                throw new DAV\Exception\NotFound('A component of the requested file path could not be found.');
-            }
-        }
-
-        // This should no longer be needed since we just returned errors for paths not found
-        if ($path !== '/' . $file) {
-            logger("Path mismatch: $path !== /$file");
-            return NULL;
-        }
-
-        $prefix = '';
-
-        if (!array_key_exists('cloud_sort', $_SESSION))
-            $_SESSION['cloud_sort'] = 'name';
-
-        switch ($_SESSION['cloud_sort']) {
-            case 'size':
-                $suffix = ' order by is_dir desc, filesize asc ';
-                break;
-            // The following provides inconsistent results for directories because we re-calculate the date for directories based on the most recent change
-            case 'date':
-                $suffix = ' order by is_dir desc, edited asc ';
-                break;
-            case 'name':
-            default:
-                $suffix = ' order by is_dir desc, filename asc ';
-                break;
-        }
-
-        $r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix",
-            dbesc($folder),
-            intval($channel_id)
-        );
-
-        foreach ($r as $rr) {
-            if (App::$module === 'cloud' && (strpos($rr['filename'], '.') === 0) && (!get_pconfig($channel_id, 'system', 'show_dot_files'))) {
-                continue;
-            }
-
-            // @FIXME I don't think we use revisions currently in attach structures.
-            // In case we see any in the wild provide a unique filename. This
-            // name may or may not be accessible
-
-            if ($rr['revision']) {
-                $rr['filename'] .= '-' . $rr['revision'];
-            }
-
-            // logger('filename: ' . $rr['filename'], LOGGER_DEBUG);
-            if (intval($rr['is_dir'])) {
-                $ret[] = new Directory($path . '/' . $rr['filename'], $auth);
-            } else {
-                $ret[] = new File($path . '/' . $rr['filename'], $rr, $auth);
-            }
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     * @brief Returns an array with viewable channels.
-     *
-     * Get a list of Directory objects with all the channels where the visitor
-     * has view_storage perms.
-     *
-     *
-     * @param BasicAuth &$auth
-     * @return array Directory[]
-     */
-    public function ChannelList(&$auth)
-    {
-        $ret = [];
-
-        $disabled = intval(get_config('system', 'cloud_disable_siteroot', true));
-
-        $r = q("SELECT channel_id, channel_address, profile.publish FROM channel left join profile on profile.uid = channel.channel_id WHERE channel_removed = 0 AND channel_system = 0 AND (channel_pageflags & %d) = 0 and profile.is_default = 1",
-            intval(PAGE_HIDDEN)
-        );
-        if ($r) {
-            foreach ($r as $rr) {
-                if ((perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage') && $rr['publish']) || $rr['channel_id'] == $this->auth->channel_id) {
-                    logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA);
-                    if ($disabled) {
-                        $conn = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' and abook_pending = 0",
-                            intval($rr['channel_id']),
-                            dbesc($auth->observer)
-                        );
-                        if (!$conn) {
-                            continue;
-                        }
-                    }
-
-                    $ret[] = new Directory($rr['channel_address'], $auth);
-                }
-            }
-        }
-        return $ret;
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param string $file
-     *  path to file or directory
-     * @param BasicAuth &$auth
-     * @param bool $test (optional) enable test mode
-     * @return File|Directory|bool|null
-     * @throw "\Sabre\DAV\Exception\Forbidden"
-     */
-    public function FileData($file, &$auth, $test = false)
-    {
-        logger($file . (($test) ? ' (test mode) ' : ''), LOGGER_DATA);
-
-        $x = strpos($file, '/cloud');
-        if ($x === 0) {
-            $file = substr($file, 6);
-        } else {
-            $x = strpos($file, '/dav');
-            if ($x === 0)
-                $file = substr($file, 4);
-        }
-
-        if ((!$file) || ($file === '/')) {
-            return new Directory('/', $auth);
-        }
-
-        $file = trim($file, '/');
-
-        $path_arr = explode('/', $file);
-
-        if (!$path_arr)
-            return null;
-
-        $channel_name = $path_arr[0];
-
-        $r = q("select channel_id from channel where channel_address = '%s' limit 1",
-            dbesc($channel_name)
-        );
-
-        if (!$r)
-            return null;
-
-        $channel_id = $r[0]['channel_id'];
-
-        $path = '/' . $channel_name;
-
-        $auth->owner_id = $channel_id;
-
-        $permission_error = false;
-
-        $folder = '';
-
-        require_once('include/security.php');
-        $perms = permissions_sql($channel_id);
-
-        $errors = false;
-
-        for ($x = 1; $x < count($path_arr); $x++) {
-            $r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 $perms",
-                dbesc($folder),
-                dbesc($path_arr[$x]),
-                intval($channel_id)
-            );
-
-            if ($r && intval($r[0]['is_dir'])) {
-                $folder = $r[0]['hash'];
-                $path = $path . '/' . $r[0]['filename'];
-            }
-            if (!$r) {
-                $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach
-					where folder = '%s' and filename = '%s' and uid = %d $perms order by filename limit 1",
-                    dbesc($folder),
-                    dbesc(basename($file)),
-                    intval($channel_id)
-                );
-            }
-            if (!$r) {
-                $errors = true;
-                $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach
-					where folder = '%s' and filename = '%s' and uid = %d order by filename limit 1",
-                    dbesc($folder),
-                    dbesc(basename($file)),
-                    intval($channel_id)
-                );
-                if ($r)
-                    $permission_error = true;
-            }
-        }
-
-        if ($path === '/' . $file) {
-            if ($test)
-                return true;
-            // final component was a directory.
-            return new Directory($file, $auth);
-        }
-
-        if ($errors) {
-            logger('not found ' . $file);
-            if ($test)
-                return false;
-            if ($permission_error) {
-                logger('permission error ' . $file);
-                throw new DAV\Exception\Forbidden('Permission denied.');
-            }
-            return;
-        }
-
-        if ($r) {
-            if ($test)
-                return true;
-
-            if (intval($r[0]['is_dir'])) {
-                return new Directory($path . '/' . $r[0]['filename'], $auth);
-            } else {
-                return new File($path . '/' . $r[0]['filename'], $r[0], $auth);
-            }
-        }
-        return false;
-    }
-
-    public function getQuotaInfo()
-    {
-
-        /**
-         * Returns the quota information
-         *
-         * This method MUST return an array with 2 values, the first being the total used space,
-         * the second the available space (in bytes)
-         */
-
-        $used = 0;
-        $limit = 0;
-        $free = 0;
-
-        if ($this->auth->owner_id) {
-            $channel = Channel::from_id($this->auth->owner_id);
-            if ($channel) {
-                $r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d",
-                    intval($channel['channel_account_id'])
-                );
-                $used = (($r) ? (float)$r[0]['total'] : 0);
-                $limit = (float)engr_units_to_bytes(ServiceClass::fetch($this->auth->owner_id, 'attach_upload_limit'));
-                if ($limit) {
-                    // Don't let the result go negative
-                    $free = (($limit > $used) ? $limit - $used : 0);
-                }
-            }
-        }
-
-        if (!$limit) {
-            $free = disk_free_space('store');
-            $used = disk_total_space('store') - $free;
-        }
-
-        // prevent integer overflow on 32-bit systems
-
-        if ($used > (float)PHP_INT_MAX)
-            $used = PHP_INT_MAX;
-        if ($free > (float)PHP_INT_MAX)
-            $free = PHP_INT_MAX;
-
-        return [(int)$used, (int)$free];
-
-    }
-
-}
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
deleted file mode 100644
index 4c0c443ae..000000000
--- a/Zotlabs/Storage/File.php
+++ /dev/null
@@ -1,446 +0,0 @@
-name = $name;
-		$this->data = $data;
-		$this->auth = $auth;
-	}
-
-	/**
-	 * @brief Returns the name of the file.
-	 *
-	 * @return string
-	 */
-
-	public function getName() {
-		return basename($this->name);
-	}
-
-	/**
-	 * @brief Renames the file.
-	 *
-	 * @throw "\Sabre\DAV\Exception\Forbidden"
-	 * @param string $newName The new name of the file.
-	 * @return void
-	 */
-
-	public function setName($newName) {
-		logger('old name ' . basename($this->name) . ' -> ' . $newName, LOGGER_DATA);
-
-		if ((! $newName) || (! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
-			logger('permission denied '. $newName);
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		}
-
-		$newName = str_replace('/', '%2F', $newName);
-
-		$r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND id = %d",
-			dbesc($newName),
-			dbesc($this->data['hash']),
-			intval($this->data['id'])
-		);
-
-		$x = attach_syspaths($this->auth->owner_id,$this->data['hash']);
-
-		$y = q("update attach set display_path = '%s where hash = '%s' and uid = %d",
-			dbesc($x['path']),
-			dbesc($this->data['hash']),
-			intval($this->auth->owner_id)
-		);
-
-		if ($this->data->is_photo) {
-			$r = q("update photo set filename = '%s', display_path = '%s' where resource_id = '%s' and uid = %d",
-				dbesc($newName),
-				dbesc($x['path']),
-				dbesc($this->data['hash']),
-				intval($this->auth->owner_id)
-			);
-		}
-
-		$ch = Channel::from_id($this->auth->owner_id);
-		if ($ch) {
-			$sync = attach_export_data($ch,$this->data['hash']);
-			if ($sync) {
-				Libsync::build_sync_packet($ch['channel_id'], [ 'file' => [ $sync ] ]);
-			}
-		}
-	}
-
-	/**
-	 * @brief Updates the data of the file.
-	 *
-	 * @param resource $data
-	 * @return void
-	 */
-
-	public function put($data) {
-		logger('put file: ' . basename($this->name), LOGGER_DEBUG);
-		$size = 0;
-
-
-		if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
-			logger('permission denied for put operation');
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		}
-
-		$channel = Channel::from_id($this->auth->owner_id);
-
-		if (! $channel) {
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		}
-
-		$is_photo = false;
-		$album = '';
-		$os_path = '';
-
-
-		// This hidden config allows you to protect your dav contents from cryptolockers by preventing over-write
-		// and delete from a networked operating system. In this case you are only allowed to over-write the file
-		// if it is empty. Some DAV clients create the file and then store the contents so these would be allowed. 
-
-		if (get_pconfig($this->auth->owner_id,'system','os_delete_prohibit') && App::$module == 'dav') {
-			$r = q("select filesize from attach where hash = '%s' and uid = %d limit 1",
-				dbesc($this->data['hash']),
-				intval($channel['channel_id'])
-			);
-			if ($r && intval($r[0]['filesize'])) { 	
-				throw new DAV\Exception\Forbidden('Permission denied.');
-			}
-		}
-
-		$r = q("SELECT flags, folder, os_storage, os_path, display_path, filename, is_photo FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
-			dbesc($this->data['hash']),
-			intval($channel['channel_id'])
-		);
-		if ($r) {
-
-			$os_path = $r[0]['os_path'];
-			$display_path = $r[0]['display_path'];
-			$filename = $r[0]['filename'];
-			$folder_hash = $r[0]['folder'];
-
-			if (intval($r[0]['os_storage'])) {
-				$d = q("select folder, content from attach where hash = '%s' and uid = %d limit 1",
-					dbesc($this->data['hash']),
-					intval($channel['channel_id'])
-				);
-				if ($d) {
-					if ($d[0]['folder']) {
-						$f1 = q("select * from attach where is_dir = 1 and hash = '%s' and uid = %d limit 1",
-							dbesc($d[0]['folder']),
-							intval($channel['channel_id'])
-						);
-						if ($f1) {
-							$album = $f1[0]['filename'];
-							$direct = $f1[0];
-						}
-					}
-					$fname = dbunescbin($d[0]['content']);
-					if (strpos($fname,'store/') === false) {
-						$f = 'store/' . $this->auth->owner_nick . '/' . $fname ;
-					}
-					else {
-						$f = $fname;
-					}
-					
-					if (is_resource($data)) {
-						$fp = fopen($f,'wb');
-						if ($fp) {
-							pipe_streams($data,$fp);
-							fclose($fp);
-						}
-					}
-					else {
-						file_put_contents($f, $data);
-					}
-
-					$size = @filesize($f);
-
-					logger('filename: ' . $f . ' size: ' . $size, LOGGER_DEBUG);
-				}
-				$gis = @getimagesize($f);
-				logger('getimagesize: ' . print_r($gis,true), LOGGER_DATA);
-				if ($gis && supported_imagetype($gis[2])) {
-					$is_photo = 1;
-				}
-
-				// If we know it's a photo, over-ride the type in case the source system could not determine what it was
-
-				if ($is_photo) {
-					q("update attach set filetype = '%s' where hash = '%s' and uid = %d",
-						dbesc($gis['mime']),
-						dbesc($this->data['hash']),
-						intval($this->data['uid'])
-					);
-				}
-
-			}
-			else {
-				// this shouldn't happen any more
-				$r = q("UPDATE attach SET content = '%s' WHERE hash = '%s' AND uid = %d",
-					dbescbin(stream_get_contents($data)),
-					dbesc($this->data['hash']),
-					intval($this->data['uid'])
-				);
-				$r = q("SELECT length(content) AS fsize FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
-					dbesc($this->data['hash']),
-					intval($this->data['uid'])
-				);
-				if ($r) {
-					$size = $r[0]['fsize'];
-				}
-			}
-		}
-
-		// returns now()
-		$edited = datetime_convert();
-
-		$d = q("UPDATE attach SET filesize = '%s', is_photo = %d, edited = '%s' WHERE hash = '%s' AND uid = %d",
-			dbesc($size),
-			intval($is_photo),
-			dbesc($edited),
-			dbesc($this->data['hash']),
-			intval($channel['channel_id'])
-		);
-
-		if ($is_photo) {
-			$args = [
-				'resource_id'  => $this->data['hash'],
-				'album'        => $album,
-				'folder'       => $folder_hash,
-				'os_syspath'   => $f,
-				'os_path'      => $os_path,
-				'display_path' => $display_path,
-				'filename'     => $filename,
-				'getimagesize' => $gis,
-				'directory'    => $direct
-			];
-			$p = photo_upload($channel, App::get_observer(), $args);
-			logger('photo_upload: ' . print_r($p,true), LOGGER_DATA);
-		}
-
-		// update the folder's lastmodified timestamp
-		$e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d",
-			dbesc($edited),
-			dbesc($r[0]['folder']),
-			intval($channel['channel_id'])
-		);
-
-		// @todo do we really want to remove the whole file if an update fails
-		// because of maxfilesize or quota?
-		// There is an Exception "InsufficientStorage" or "PaymentRequired" for
-		// our service class from SabreDAV we could use.
-
-		$maxfilesize = get_config('system', 'maxfilesize');
-		if (($maxfilesize) && ($size > $maxfilesize)) {
-			attach_delete($channel['channel_id'], $this->data['hash']);
-			return;
-		}
-
-		$limit = engr_units_to_bytes(ServiceClass::fetch($channel['channel_id'], 'attach_upload_limit'));
-		if ($limit !== false) {
-			$x = q("select sum(filesize) as total from attach where aid = %d ",
-				intval($channel['channel_account_id'])
-			);
-			if (($x) && ($x[0]['total'] + $size > $limit)) {
-				logger('service class limit exceeded for ' . $channel['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . userReadableSize($limit));
-				attach_delete($channel['channel_id'], $this->data['hash']);
-				return;
-			}
-		}
-
-		Run::Summon([ 'Thumbnail' , $this->data['hash'] ]);
-
-		$sync = attach_export_data($channel,$this->data['hash']);
-
-		if ($sync) {
-			Libsync::build_sync_packet($channel['channel_id'],array('file' => array($sync)));
-		}
-	}
-
-	/**
-	 * @brief Returns the raw data.
-	 *
-	 * @return string || resource
-	 */
-
-	public function get() {
-		logger('get file ' . basename($this->name), LOGGER_DEBUG);
-		logger('os_path: ' . $this->os_path, LOGGER_DATA);
-
-		$r = q("SELECT content, flags, os_storage, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
-			dbesc($this->data['hash']),
-			intval($this->data['uid'])
-		);
-		if ($r) {
-			// @todo this should be a global definition
-			$unsafe_types = array('text/html', 'text/css', 'application/javascript', 'image/svg+xml');
-
-			if (in_array($r[0]['filetype'], $unsafe_types) && (!Channel::codeallowed($this->data['uid']))) {
-				header('Content-Disposition: attachment; filename="' . $r[0]['filename'] . '"');
-				header('Content-type: ' . $r[0]['filetype']);
-			}
-
-			if (intval($r[0]['os_storage'])) {
-				$x = dbunescbin($r[0]['content']);
-				if (strpos($x,'store') === false) {
-					$f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x;
-				}
-				else {
-					$f = $x;
-				}
-				return @fopen($f, 'rb');
-			}
-			return dbunescbin($r[0]['content']);
-		}
-	}
-
-	/**
-	 * @brief Returns the ETag for a file.
-	 *
-	 * An ETag is a unique identifier representing the current version of the file.
-	 * If the file changes, the ETag MUST change.
-	 * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-	 *
-	 * Return null if the ETag can not effectively be determined.
-	 *
-	 * @return null|string
-	 */
-	public function getETag() {
-		$ret = null;
-		if ($this->data['hash']) {
-			$ret = '"' . $this->data['hash'] . '"';
-		}
-		return $ret;
-	}
-
-	/**
-	 * @brief Returns the mime-type for a file.
-	 *
-	 * If null is returned, we'll assume application/octet-stream
-	 *
-	 * @return mixed
-	 */
-
-	public function getContentType() {
-		return $this->data['filetype'];
-	}
-
-	/**
-	 * @brief Returns the size of the node, in bytes.
-	 *
-	 * @return int
-	 *  filesize in bytes
-	 */
-	public function getSize() {
-		return intval($this->data['filesize']);
-	}
-
-	/**
-	 * @brief Returns the last modification time for the file, as a unix
-	 *        timestamp.
-	 *
-	 * @return int last modification time in UNIX timestamp
-	 */
-
-	public function getLastModified() {
-		return datetime_convert('UTC', 'UTC', $this->data['edited'], 'U');
-	}
-
-	/**
-	 * @brief Delete the file.
-	 *
-	 * This method checks the permissions and then calls attach_delete() function
-	 * to actually remove the file.
-	 *
-	 * @throw "\Sabre\DAV\Exception\Forbidden"
-	 */
-	public function delete() {
-		logger('delete file ' . basename($this->name), LOGGER_DEBUG);
-
-		if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		}
-
-		if ($this->auth->owner_id !== $this->auth->channel_id) {
-			if (($this->auth->observer !== $this->data['creator']) || intval($this->data['is_dir'])) {
-				throw new DAV\Exception\Forbidden('Permission denied.');
-			}
-		}
-
-		// This is a subtle solution to crypto-lockers which can wreak havoc on network resources when
-		// invoked on a dav-mounted filesystem. By setting system.os_delete_prohibit, one can remove files
-		// via the web interface but from their operating system the filesystem is treated as read-only. 
-		
-		if (get_pconfig($this->auth->owner_id,'system','os_delete_prohibit') && App::$module == 'dav') {
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		}
-
-		attach_delete($this->auth->owner_id, $this->data['hash']);
-
-		$channel = Channel::from_id($this->auth->owner_id);
-		if ($channel) {
-			$sync = attach_export_data($channel, $this->data['hash'], true);
-			if ($sync) {
-				Libsync::build_sync_packet($channel['channel_id'], [ 'file' => [ $sync ] ]);
-			}
-		}
-	}
-}
diff --git a/Zotlabs/Storage/GitRepo.php b/Zotlabs/Storage/GitRepo.php
deleted file mode 100644
index 261e11ffe..000000000
--- a/Zotlabs/Storage/GitRepo.php
+++ /dev/null
@@ -1,171 +0,0 @@
-
- */
-class GitRepo
-{
-
-    public $url = null;
-    public $name = null;
-    private $path = null;
-    private $channel = null;
-    public $git = null;
-    private $repoBasePath = null;
-
-    public function __construct($channel = 'sys', $url = null, $clone = false, $name = null, $path = null)
-    {
-
-        if ($channel === 'sys' && !is_site_admin()) {
-            logger('Only admin can use channel sys');
-            return null;
-        }
-
-        $this->repoBasePath = 'store/git';
-        $this->channel = $channel;
-        $this->git = new PHPGit();
-
-        // Allow custom path for repo in the case of , for example
-        if ($path) {
-            $this->path = $path;
-        } else {
-            $this->path = $this->repoBasePath . "/" . $this->channel . "/" . $this->name;
-        }
-
-        if ($this->isValidGitRepoURL($url)) {
-            $this->url = $url;
-        }
-
-        if ($name) {
-            $this->name = $name;
-        } else {
-            $this->name = $this->getRepoNameFromURL($url);
-        }
-        if (!$this->name) {
-            logger('Error creating GitRepo. No repo name found.');
-            return null;
-        }
-
-        if (is_dir($this->path)) {
-            // ignore the $url input if it exists
-            // TODO: Check if the path is either empty or is a valid git repo and error if not
-            $this->git->setRepository($this->path);
-            // TODO: get repo metadata
-            return;
-        }
-
-        if ($this->url) {
-            // create the folder and clone the repo at url to that folder if $clone is true
-            if ($clone) {
-                if (mkdir($this->path, 0770, true)) {
-                    $this->git->setRepository($this->path);
-                    if (!$this->cloneRepo()) {
-                        // TODO: throw error
-                        logger('git clone failed: ' . json_encode($this->git));
-                    }
-                } else {
-                    logger('git repo path could not be created: ' . json_encode($this->git));
-                }
-            }
-        }
-    }
-
-    public function initRepo()
-    {
-        if (!$this->path) {
-            return false;
-        }
-        try {
-            return $this->git->init($this->path);
-        } catch (GitException $ex) {
-            return false;
-        }
-    }
-
-    public function pull()
-    {
-        try {
-            $success = $this->git->pull();
-        } catch (GitException $ex) {
-            return false;
-        }
-        return $success;
-    }
-
-    public function getRepoPath()
-    {
-        return $this->path;
-    }
-
-    public function setRepoPath($directory)
-    {
-        if (is_dir($directory)) {
-            $this->path->$directory;
-            $this->git->setRepository($directory);
-            return true;
-        }
-        return false;
-    }
-
-    public function setIdentity($user_name, $user_email)
-    {
-        // setup user for commit messages
-        $this->git->config->set("user.name", $user_name, ['global' => false, 'system' => false]);
-        $this->git->config->set("user.email", $user_email, ['global' => false, 'system' => false]);
-    }
-
-    public function cloneRepo()
-    {
-        if (validate_url($this->url) && $this->isValidGitRepoURL($this->url) && is_dir($this->path)) {
-            return $this->git->clone($this->url, $this->path);
-        }
-    }
-
-    public function probeRepo()
-    {
-        $git = $this->git;
-        $repo = [];
-        $repo['remote'] = $git->remote();
-        $repo['branches'] = $git->branch(['all' => true]);
-        $repo['logs'] = $git->log(array('limit' => 50));
-        return $repo;
-    }
-
-    // Commit changes to the repo. Default is to stage all changes and commit everything.
-    public function commit($msg, $options = [])
-    {
-        try {
-            return $this->git->commit($msg, $options);
-        } catch (GitException $ex) {
-            return false;
-        }
-    }
-
-    public static function isValidGitRepoURL($url)
-    {
-        if (validate_url($url) && strrpos(parse_url($url, PHP_URL_PATH), '.')) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public static function getRepoNameFromURL($url)
-    {
-        $urlpath = parse_url($url, PHP_URL_PATH);
-        $lastslash = strrpos($urlpath, '/') + 1;
-        $gitext = strrpos($urlpath, '.');
-        if ($gitext) {
-            return substr($urlpath, $lastslash, $gitext - $lastslash);
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/Zotlabs/Storage/ZotOauth2Pdo.php b/Zotlabs/Storage/ZotOauth2Pdo.php
deleted file mode 100644
index 45a7abef0..000000000
--- a/Zotlabs/Storage/ZotOauth2Pdo.php
+++ /dev/null
@@ -1,13 +0,0 @@
-config;
-    }
-}
diff --git a/Zotlabs/Text/Tagadelic.php b/Zotlabs/Text/Tagadelic.php
deleted file mode 100644
index 634e0debb..000000000
--- a/Zotlabs/Text/Tagadelic.php
+++ /dev/null
@@ -1,47 +0,0 @@
-Cover();
-
-        if ($data['found']) {
-            $photo = $data['data'];
-        }
-
-        if ($photo) {
-            $image = imagecreatefromstring($photo);
-            $dest = imagecreatetruecolor($width, $height);
-            $srcwidth = imagesx($image);
-            $srcheight = imagesy($image);
-
-            imagealphablending($dest, false);
-            imagesavealpha($dest, true);
-            imagecopyresampled($dest, $image, 0, 0, 0, 0, $width, $height, $srcwidth, $srcheight);
-            imagedestroy($image);
-            imagejpeg($dest, dbunescbin($attach['content']) . '.thumb');
-        }
-    }
-}
diff --git a/Zotlabs/Thumbs/Mp3audio.php b/Zotlabs/Thumbs/Mp3audio.php
deleted file mode 100644
index bccd20b94..000000000
--- a/Zotlabs/Thumbs/Mp3audio.php
+++ /dev/null
@@ -1,49 +0,0 @@
-readAllTags();
-
-        $image = $id3->getImage();
-        if (is_array($image)) {
-            $photo = $image[1];
-        }
-
-        fclose($fh);
-
-        if ($photo) {
-            $image = imagecreatefromstring($photo);
-            $dest = imagecreatetruecolor($width, $height);
-            $srcwidth = imagesx($image);
-            $srcheight = imagesy($image);
-
-            imagealphablending($dest, false);
-            imagesavealpha($dest, true);
-            imagecopyresampled($dest, $image, 0, 0, 0, 0, $width, $height, $srcwidth, $srcheight);
-            imagedestroy($image);
-            imagejpeg($dest, dbunescbin($attach['content']) . '.thumb');
-        }
-    }
-}
diff --git a/Zotlabs/Thumbs/Pdf.php b/Zotlabs/Thumbs/Pdf.php
deleted file mode 100644
index 899bc0e52..000000000
--- a/Zotlabs/Thumbs/Pdf.php
+++ /dev/null
@@ -1,49 +0,0 @@
- $t) {
-                $l = $l + 1;
-                $x = 3;
-                $y = ($l * $lsize) + 3 - $fsize;
-                imagestring($image, 1, $x, $y, $t, $colour);
-                if (($l * $lsize) >= $height) {
-                    break;
-                }
-            }
-            imagejpeg($image, dbunescbin($attach['content']) . '.thumb');
-        }
-    }
-}
diff --git a/Zotlabs/Thumbs/Video.php b/Zotlabs/Thumbs/Video.php
deleted file mode 100644
index 9ab5a12d1..000000000
--- a/Zotlabs/Thumbs/Video.php
+++ /dev/null
@@ -1,67 +0,0 @@
- 0 ");
-
-        if ($r1 && $r2 && $r3) {
-            return UPDATE_SUCCESS;
-        }
-        return UPDATE_FAILED;
-    }
-}
diff --git a/Zotlabs/Update/_1137.php b/Zotlabs/Update/_1137.php
deleted file mode 100644
index d2ec91c55..000000000
--- a/Zotlabs/Update/_1137.php
+++ /dev/null
@@ -1,16 +0,0 @@
-0");
-
-        // this will fix peertube hubloc_url
-        $r2 = q("UPDATE hubloc SET hubloc_url = LEFT(hubloc_url, POSITION('/account' IN hubloc_url)-1) WHERE POSITION('/account' IN hubloc_url)>0");
-
-        if ($r1 && $r2) {
-            q("COMMIT");
-            return UPDATE_SUCCESS;
-        } else {
-            q("ROLLBACK");
-            return UPDATE_FAILED;
-        }
-    }
-}
diff --git a/Zotlabs/Update/_1216.php b/Zotlabs/Update/_1216.php
deleted file mode 100644
index b42442734..000000000
--- a/Zotlabs/Update/_1216.php
+++ /dev/null
@@ -1,19 +0,0 @@
- intval($rv['channel_id']),
-                                    'block_type' => 0,
-                                    'block_entity' => trim($l),
-                                    'block_comment' => t('Added by superblock')
-                                ]);
-                            }
-                        }
-                    }
-                    del_pconfig($rv['channel_id'], 'system', 'blocked');
-                }
-            }
-        }
-        return UPDATE_SUCCESS;
-    }
-
-
-    public function verify()
-    {
-
-        $r = q("select * from pconfig where cat = 'system' and k = 'blocked'");
-        if ($r) {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/Zotlabs/Update/_1240.php b/Zotlabs/Update/_1240.php
deleted file mode 100644
index b2e4aeafa..000000000
--- a/Zotlabs/Update/_1240.php
+++ /dev/null
@@ -1,43 +0,0 @@
-in_progress['k'])) {
-                        $this->in_progress['v'] .= ' ' . ltrim($line);
-                        continue;
-                    }
-                } else {
-                    if (isset($this->in_progress['k'])) {
-                        $this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
-                        $this->in_progress = [];
-                    }
-                    $key = strtolower(substr($line, 0, strpos($line, ':')));
-                    if ($key) {
-                        $this->in_progress['k'] = $key;
-                        $this->in_progress['v'] = ltrim(substr($line, strpos($line, ':') + 1));
-                    }
-                }
-            }
-            if (isset($this->in_progress['k'])) {
-                $this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
-                $this->in_progress = [];
-            }
-        }
-    }
-
-    public function fetch()
-    {
-        return $this->parsed;
-    }
-
-    public function fetcharr()
-    {
-        $ret = [];
-        if ($this->parsed) {
-            foreach ($this->parsed as $x) {
-                foreach ($x as $y => $z) {
-                    $ret[$y] = $z;
-                }
-            }
-        }
-        return $ret;
-    }
-}
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
deleted file mode 100644
index 61c37368b..000000000
--- a/Zotlabs/Web/HTTPSig.php
+++ /dev/null
@@ -1,699 +0,0 @@
-fetcharr();
-            $body = $data['body'];
-            $headers['(request-target)'] = $data['request_target'];
-        } else {
-            $headers = [];
-            $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
-            $headers['content-type'] = $_SERVER['CONTENT_TYPE'];
-            $headers['content-length'] = $_SERVER['CONTENT_LENGTH'];
-
-            foreach ($_SERVER as $k => $v) {
-                if (strpos($k, 'HTTP_') === 0) {
-                    $field = str_replace('_', '-', strtolower(substr($k, 5)));
-                    $headers[$field] = $v;
-                }
-            }
-        }
-
-        //logger('SERVER: ' . print_r($_SERVER,true), LOGGER_ALL);
-        //logger('headers: ' . print_r($headers,true), LOGGER_ALL);
-
-        return $headers;
-    }
-
-
-    // See draft-cavage-http-signatures-10
-
-    public static function verify($data, $key = '', $keytype = '')
-    {
-
-        $body = $data;
-        $headers = null;
-
-        $result = [
-            'signer' => '',
-            'portable_id' => '',
-            'header_signed' => false,
-            'header_valid' => false,
-            'content_signed' => false,
-            'content_valid' => false
-        ];
-
-
-        $headers = self::find_headers($data, $body);
-
-        if (!$headers) {
-            return $result;
-        }
-
-        if (is_array($body)) {
-            btlogger('body is array!' . print_r($body, true));
-        }
-
-
-        $sig_block = null;
-
-        if (array_key_exists('signature', $headers)) {
-            $sig_block = self::parse_sigheader($headers['signature']);
-        } elseif (array_key_exists('authorization', $headers)) {
-            $sig_block = self::parse_sigheader($headers['authorization']);
-        }
-
-        if (!$sig_block) {
-            logger('no signature provided.', LOGGER_DEBUG);
-            return $result;
-        }
-
-        // Warning: This log statement includes binary data
-        // logger('sig_block: ' . print_r($sig_block,true), LOGGER_DATA);
-
-        $result['header_signed'] = true;
-
-        $signed_headers = $sig_block['headers'];
-        if (!$signed_headers) {
-            $signed_headers = ['date'];
-        }
-        $signed_data = '';
-        foreach ($signed_headers as $h) {
-            if (array_key_exists($h, $headers)) {
-                $signed_data .= $h . ': ' . $headers[$h] . "\n";
-            }
-            if ($h === '(created)') {
-                if ($sig_block['algorithm'] && (strpos($sig_block['algorithm'], 'rsa') !== false || strpos($sig_block['algorithm'], 'hmac') !== false || strpos($sig_block['algorithm'], 'ecdsa') !== false)) {
-                    logger('created not allowed here');
-                    return $result;
-                }
-                if ((!isset($sig_block['(created)'])) || (!intval($sig_block['(created)'])) || intval($sig_block['(created)']) > time()) {
-                    logger('created in future');
-                    return $result;
-                }
-                $signed_data .= '(created): ' . $sig_block['(created)'] . "\n";
-            }
-            if ($h === '(expires)') {
-                if ($sig_block['algorithm'] && (strpos($sig_block['algorithm'], 'rsa') !== false || strpos($sig_block['algorithm'], 'hmac') !== false || strpos($sig_block['algorithm'], 'ecdsa') !== false)) {
-                    logger('expires not allowed here');
-                    return $result;
-                }
-                if ((!isset($sig_block['(expires)'])) || (!intval($sig_block['(expires)'])) || intval($sig_block['(expires)']) < time()) {
-                    logger('signature expired');
-                    return $result;
-                }
-                $signed_data .= '(expires): ' . $sig_block['(expires)'] . "\n";
-            }
-            if ($h === 'date') {
-                $d = new DateTime($headers[$h]);
-                $d->setTimeZone(new DateTimeZone('UTC'));
-                $dplus = datetime_convert('UTC', 'UTC', 'now + 1 day');
-                $dminus = datetime_convert('UTC', 'UTC', 'now - 1 day');
-                $c = $d->format('Y-m-d H:i:s');
-                if ($c > $dplus || $c < $dminus) {
-                    logger('bad time: ' . $c);
-                    return $result;
-                }
-            }
-        }
-        $signed_data = rtrim($signed_data, "\n");
-
-        $algorithm = null;
-
-        if ($sig_block['algorithm'] === 'rsa-sha256') {
-            $algorithm = 'sha256';
-        }
-        if ($sig_block['algorithm'] === 'rsa-sha512') {
-            $algorithm = 'sha512';
-        }
-
-        if (!array_key_exists('keyId', $sig_block)) {
-            return $result;
-        }
-
-        $result['signer'] = $sig_block['keyId'];
-
-        $fkey = self::get_key($key, $keytype, $result['signer']);
-
-        if ($sig_block['algorithm'] === 'hs2019') {
-            if (isset($fkey['algorithm'])) {
-                if (strpos($fkey['algorithm'], 'rsa-sha256') !== false) {
-                    $algorithm = 'sha256';
-                }
-                if (strpos($fkey['algorithm'], 'rsa-sha512') !== false) {
-                    $algorithm = 'sha512';
-                }
-            }
-        }
-
-
-        if (!($fkey && $fkey['public_key'])) {
-            return $result;
-        }
-
-        $x = Crypto::verify($signed_data, $sig_block['signature'], $fkey['public_key'], $algorithm);
-
-        logger('verified: ' . $x, LOGGER_DEBUG);
-
-        if (!$x) {
-            // try again, ignoring the local actor (xchan) cache and refetching the key
-            // from its source
-
-            $fkey = self::get_key($key, $keytype, $result['signer'], true);
-
-            if ($fkey && $fkey['public_key']) {
-                $y = Crypto::verify($signed_data, $sig_block['signature'], $fkey['public_key'], $algorithm);
-                logger('verified: (cache reload) ' . $x, LOGGER_DEBUG);
-            }
-
-            if (!$y) {
-                logger('verify failed for ' . $result['signer'] . ' alg=' . $algorithm . (($fkey['public_key']) ? '' : ' no key'));
-                $sig_block['signature'] = base64_encode($sig_block['signature']);
-                logger('affected sigblock: ' . print_r($sig_block, true));
-                logger('headers: ' . print_r($headers, true));
-                logger('server: ' . print_r($_SERVER, true));
-                return $result;
-            }
-        }
-
-        $result['portable_id'] = $fkey['portable_id'];
-        $result['header_valid'] = true;
-
-        if (in_array('digest', $signed_headers)) {
-            $result['content_signed'] = true;
-            $digest = explode('=', $headers['digest'], 2);
-            if ($digest[0] === 'SHA-256') {
-                $hashalg = 'sha256';
-            }
-            if ($digest[0] === 'SHA-512') {
-                $hashalg = 'sha512';
-            }
-
-            if (base64_encode(hash($hashalg, $body, true)) === $digest[1]) {
-                $result['content_valid'] = true;
-            }
-
-            logger('Content_Valid: ' . (($result['content_valid']) ? 'true' : 'false'));
-            if (!$result['content_valid']) {
-                logger('invalid content signature: data ' . print_r($data, true));
-                logger('invalid content signature: headers ' . print_r($headers, true));
-                logger('invalid content signature: body ' . print_r($body, true));
-            }
-        }
-
-        return $result;
-    }
-
-    public static function get_key($key, $keytype, $id, $force = false)
-    {
-
-        if ($key) {
-            if (function_exists($key)) {
-                return $key($id);
-            }
-            return ['public_key' => $key];
-        }
-
-        if ($keytype === 'zot6') {
-            $key = self::get_zotfinger_key($id, $force);
-            if ($key) {
-                return $key;
-            }
-        }
-
-
-        if (strpos($id, '#') === false) {
-            $key = self::get_webfinger_key($id, $force);
-            if ($key) {
-                return $key;
-            }
-        }
-
-        $key = self::get_activitystreams_key($id, $force);
-        return $key;
-    }
-
-
-    public static function convertKey($key)
-    {
-
-        if (strstr($key, 'RSA ')) {
-            return Keyutils::rsatopem($key);
-        } elseif (substr($key, 0, 5) === 'data:') {
-            return Keyutils::convertSalmonKey($key);
-        } else {
-            return $key;
-        }
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param string $id
-     * @return bool|string
-     *   false if no pub key found, otherwise return the pub key
-     */
-
-    public static function get_activitystreams_key($id, $force = false)
-    {
-
-        // Check the local cache first, but remove any fragments like #main-key since these won't be present in our cached data
-
-        $cache_url = ((strpos($id, '#')) ? substr($id, 0, strpos($id, '#')) : $id);
-
-        // $force is used to ignore the local cache and only use the remote data; for instance the cached key might be stale
-
-        if (!$force) {
-            $x = q(
-                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s') order by hubloc_id desc",
-                dbesc(str_replace('acct:', '', $cache_url)),
-                dbesc($cache_url),
-                dbesc($cache_url)
-            );
-
-            if ($x) {
-                $best = Libzot::zot_record_preferred($x);
-            }
-
-            if ($best && $best['xchan_pubkey']) {
-                return ['portable_id' => $best['xchan_hash'], 'public_key' => $best['xchan_pubkey'], 'algorithm' => get_xconfig($best['xchan_hash'], 'system', 'signing_algorithm'), 'hubloc' => $best];
-            }
-        }
-
-        // The record wasn't in cache. Fetch it now.
-
-        $r = Activity::fetch($id);
-        $signatureAlgorithm = EMPTY_STR;
-
-        if ($r) {
-            if (array_key_exists('publicKey', $r) && array_key_exists('publicKeyPem', $r['publicKey']) && array_key_exists('id', $r['publicKey'])) {
-                if ($r['publicKey']['id'] === $id || $r['id'] === $id) {
-                    $portable_id = ((array_key_exists('owner', $r['publicKey'])) ? $r['publicKey']['owner'] : EMPTY_STR);
-
-                    // the w3c sec context has conflicting names and no defined values for this property except
-                    // "http://www.w3.org/2000/09/xmldsig#rsa-sha1"
-
-                    // Since the names conflict, it could mess up LD-signatures but we will accept both, and at this
-                    // time we will only look for the substrings 'rsa-sha256' and 'rsa-sha512' within those properties.
-                    // We will also accept a toplevel 'sigAlgorithm' regardless of namespace with the same constraints.
-                    // Default to rsa-sha256 if we can't figure out. If they're sending 'hs2019' we have to
-                    // look for something.
-
-                    if (isset($r['publicKey']['signingAlgorithm'])) {
-                        $signatureAlgorithm = $r['publicKey']['signingAlgorithm'];
-                        set_xconfig($portable_id, 'system', 'signing_algorithm', $signatureAlgorithm);
-                    }
-                    if (isset($r['publicKey']['signatureAlgorithm'])) {
-                        $signatureAlgorithm = $r['publicKey']['signatureAlgorithm'];
-                        set_xconfig($portable_id, 'system', 'signing_algorithm', $signatureAlgorithm);
-                    }
-
-                    if (isset($r['sigAlgorithm'])) {
-                        $signatureAlgorithm = $r['sigAlgorithm'];
-                        set_xconfig($portable_id, 'system', 'signing_algorithm', $signatureAlgorithm);
-                    }
-
-                    return ['public_key' => self::convertKey($r['publicKey']['publicKeyPem']), 'portable_id' => $portable_id, 'algorithm' => (($signatureAlgorithm) ? $signatureAlgorithm : 'rsa-sha256'), 'hubloc' => []];
-                }
-            }
-        }
-
-        // No key was found
-
-        return false;
-    }
-
-
-    public static function get_webfinger_key($id, $force = false)
-    {
-
-        if (!$force) {
-            $x = q(
-                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s') order by hubloc_id desc",
-                dbesc(str_replace('acct:', '', $id)),
-                dbesc($id),
-                dbesc($id)
-            );
-
-            if ($x) {
-                $best = Libzot::zot_record_preferred($x);
-            }
-
-            if ($best && $best['xchan_pubkey']) {
-                return ['portable_id' => $best['xchan_hash'], 'public_key' => $best['xchan_pubkey'], 'algorithm' => get_xconfig($best['xchan_hash'], 'system', 'signing_algorithm'), 'hubloc' => $best];
-            }
-        }
-
-        $wf = Webfinger::exec($id);
-        $key = ['portable_id' => '', 'public_key' => '', 'algorithm' => '', 'hubloc' => []];
-
-        if ($wf) {
-            if (array_key_exists('properties', $wf) && array_key_exists('https://w3id.org/security/v1#publicKeyPem', $wf['properties'])) {
-                $key['public_key'] = self::convertKey($wf['properties']['https://w3id.org/security/v1#publicKeyPem']);
-            }
-            if (array_key_exists('links', $wf) && is_array($wf['links'])) {
-                foreach ($wf['links'] as $l) {
-                    if (!(is_array($l) && array_key_exists('rel', $l))) {
-                        continue;
-                    }
-                    if ($l['rel'] === 'magic-public-key' && array_key_exists('href', $l) && $key['public_key'] === EMPTY_STR) {
-                        $key['public_key'] = self::convertKey($l['href']);
-                    }
-                }
-            }
-        }
-
-        return (($key['public_key']) ? $key : false);
-    }
-
-
-    public static function get_zotfinger_key($id, $force = false)
-    {
-
-        if (!$force) {
-            $x = q(
-                "select * from xchan left join hubloc on xchan_hash = hubloc_hash where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and and hubloc_network in ('nomad','zot6') order by hubloc_id desc",
-                dbesc(str_replace('acct:', '', $id)),
-                dbesc($id)
-            );
-
-            if ($x) {
-                $best = Libzot::zot_record_preferred($x);
-            }
-
-            if ($best && $best['xchan_pubkey']) {
-                return ['portable_id' => $best['xchan_hash'], 'public_key' => $best['xchan_pubkey'], 'algorithm' => get_xconfig($best['xchan_hash'], 'system', 'signing_algorithm'), 'hubloc' => $best];
-            }
-        }
-
-        $wf = Webfinger::exec($id);
-        $key = ['portable_id' => '', 'public_key' => '', 'algorithm' => '', 'hubloc' => []];
-
-        if ($wf) {
-            if (array_key_exists('properties', $wf) && array_key_exists('https://w3id.org/security/v1#publicKeyPem', $wf['properties'])) {
-                $key['public_key'] = self::convertKey($wf['properties']['https://w3id.org/security/v1#publicKeyPem']);
-            }
-            if (array_key_exists('links', $wf) && is_array($wf['links'])) {
-                foreach ($wf['links'] as $l) {
-                    if (!(is_array($l) && array_key_exists('rel', $l))) {
-                        continue;
-                    }
-                    if (in_array($l['rel'], ['http://purl.org/nomad', 'http://purl.org/zot/protocol/6.0']) && array_key_exists('href',$l) && $l['href'] !== EMPTY_STR) {
-                        // The third argument to Zotfinger::exec() tells it not to verify signatures
-                        // Since we're inside a function that is fetching keys with which to verify signatures,
-                        // this is necessary to prevent infinite loops.
-
-                        $z = Zotfinger::exec($l['href'], null, false);
-                        if ($z) {
-                            $i = Libzot::import_xchan($z['data']);
-                            if ($i['success']) {
-                                $key['portable_id'] = $i['hash'];
-
-                                $x = q(
-                                    "select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' order by hubloc_id desc limit 1",
-                                    dbesc($l['href'])
-                                );
-                                if ($x) {
-                                    $key['hubloc'] = $x[0];
-                                }
-                                $key['algorithm'] = get_xconfig($i['hash'], 'system', 'signing_algorithm');
-                            }
-                        }
-                    }
-                    if ($l['rel'] === 'magic-public-key' && array_key_exists('href', $l) && $key['public_key'] === EMPTY_STR) {
-                        $key['public_key'] = self::convertKey($l['href']);
-                    }
-                }
-            }
-        }
-
-        return (($key['public_key']) ? $key : false);
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param array $head
-     * @param string $prvkey
-     * @param string $keyid (optional, default '')
-     * @param bool $auth (optional, default false)
-     * @param string $alg (optional, default 'sha256')
-     * @param array $encryption [ 'key', 'algorithm' ] or false
-     * @return array
-     */
-    public static function create_sig($head, $prvkey, $keyid = EMPTY_STR, $auth = false, $alg = 'sha256', $encryption = false)
-    {
-
-        $return_headers = [];
-
-        if ($alg === 'sha256') {
-            $algorithm = 'rsa-sha256';
-        }
-        if ($alg === 'sha512') {
-            $algorithm = 'rsa-sha512';
-        }
-
-        $x = self::sign($head, $prvkey, $alg);
-
-        $headerval = 'keyId="' . $keyid . '",algorithm="' . (($algorithm === 'rsa-sha256') ? 'hs2019' : $algorithm) . '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
-
-        if ($encryption) {
-            $x = Crypto::encapsulate($headerval, $encryption['key'], $encryption['algorithm']);
-            if (is_array($x)) {
-                $headerval = 'iv="' . $x['iv'] . '",key="' . $x['key'] . '",alg="' . $x['alg'] . '",data="' . $x['data'] . '"';
-            }
-        }
-
-        if ($auth) {
-            $sighead = 'Authorization: Signature ' . $headerval;
-        } else {
-            $sighead = 'Signature: ' . $headerval;
-        }
-
-        if ($head) {
-            foreach ($head as $k => $v) {
-                // strip the request-target virtual header from the output headers
-                if ($k === '(request-target)') {
-                    continue;
-                }
-                $return_headers[] = $k . ': ' . $v;
-            }
-        }
-        $return_headers[] = $sighead;
-
-        return $return_headers;
-    }
-
-    /**
-     * @brief set headers
-     *
-     * @param array $headers
-     * @return void
-     */
-
-    public static function set_headers($headers)
-    {
-        if ($headers && is_array($headers)) {
-            foreach ($headers as $h) {
-                header($h);
-            }
-        }
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param array $head
-     * @param string $prvkey
-     * @param string $alg (optional) default 'sha256'
-     * @return array
-     */
-
-    public static function sign($head, $prvkey, $alg = 'sha256')
-    {
-
-        $ret = [];
-
-        $headers = '';
-        $fields = '';
-
-        logger('signing: ' . print_r($head, true), LOGGER_DATA);
-
-        if ($head) {
-            foreach ($head as $k => $v) {
-                $headers .= strtolower($k) . ': ' . trim($v) . "\n";
-                if ($fields) {
-                    $fields .= ' ';
-                }
-                $fields .= strtolower($k);
-            }
-            // strip the trailing linefeed
-            $headers = rtrim($headers, "\n");
-        }
-
-        $sig = base64_encode(Crypto::sign($headers, $prvkey, $alg));
-
-        $ret['headers'] = $fields;
-        $ret['signature'] = $sig;
-
-        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
-     */
-
-    public static function parse_sigheader($header)
-    {
-
-        $ret = [];
-        $matches = [];
-
-        // if the header is encrypted, decrypt with (default) site private key and continue
-
-        if (preg_match('/iv="(.*?)"/ism', $header, $matches)) {
-            $header = self::decrypt_sigheader($header);
-        }
-
-        if (preg_match('/keyId="(.*?)"/ism', $header, $matches)) {
-            $ret['keyId'] = $matches[1];
-        }
-        if (preg_match('/created=([0-9]*)/ism', $header, $matches)) {
-            $ret['(created)'] = $matches[1];
-        }
-        if (preg_match('/expires=([0-9]*)/ism', $header, $matches)) {
-            $ret['(expires)'] = $matches[1];
-        }
-        if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) {
-            $ret['algorithm'] = $matches[1];
-        }
-        if (preg_match('/headers="(.*?)"/ism', $header, $matches)) {
-            $ret['headers'] = explode(' ', $matches[1]);
-        }
-        if (preg_match('/signature="(.*?)"/ism', $header, $matches)) {
-            $ret['signature'] = base64_decode(preg_replace('/\s+/', '', $matches[1]));
-        }
-
-        if (($ret['signature']) && ($ret['algorithm']) && (!$ret['headers'])) {
-            $ret['headers'] = ['date'];
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     * @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
-     */
-
-    public static function decrypt_sigheader($header, $prvkey = null)
-    {
-
-        $iv = $key = $alg = $data = null;
-
-        if (!$prvkey) {
-            $prvkey = get_config('system', 'prvkey');
-        }
-
-        $matches = [];
-
-        if (preg_match('/iv="(.*?)"/ism', $header, $matches)) {
-            $iv = $matches[1];
-        }
-        if (preg_match('/key="(.*?)"/ism', $header, $matches)) {
-            $key = $matches[1];
-        }
-        if (preg_match('/alg="(.*?)"/ism', $header, $matches)) {
-            $alg = $matches[1];
-        }
-        if (preg_match('/data="(.*?)"/ism', $header, $matches)) {
-            $data = $matches[1];
-        }
-
-        if ($iv && $key && $alg && $data) {
-            return Crypto::unencapsulate(['encrypted' => true, 'iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data], $prvkey);
-        }
-
-        return '';
-    }
-}
diff --git a/Zotlabs/Web/HttpMeta.php b/Zotlabs/Web/HttpMeta.php
deleted file mode 100644
index 23e8cc13e..000000000
--- a/Zotlabs/Web/HttpMeta.php
+++ /dev/null
@@ -1,113 +0,0 @@
-vars = [];
-        $this->og = [];
-        $this->ogproperties = [];
-    }
-
-    //Set Meta Value
-    //   Mode:
-    //      0 = Default - set if no value currently exists
-    //  1 = Overwrite - replace existing value(s)
-    //  2 = Multi - append to the array of values
-    public function set($property, $value, $mode = 0)
-    {
-        $ogallowsmulti = ['image', 'audio', 'video'];
-        if (strpos($property, 'og:') === 0) {
-            $count = 0;
-            foreach ($this->og as $ogk => $ogdata) {
-                if (strpos($ogdata['property'], $property) === 0) {
-                    if ($mode == 1) {
-                        unset($this->og[$ogk]);
-                        unset($this->ogproperties[$property]);
-                    } elseif ($mode == 0) {
-                        return;
-                    } elseif ($value == $ogdata['value']) {
-                        return;
-                    } else {
-                        $count++;
-                    }
-                }
-            }
-
-            if ($value !== null) {
-                //mode = 1 with value === null will delete the property entirely.
-                $components = explode(':', $property);
-                $ogp = $components[1];
-
-                if (!$count || in_array($ogp, $ogallowsmulti)) {
-                    $this->og[] = ['property' => $property, 'value' => $value];
-                    $this->ogproperties[$property] = $property;
-                }
-            }
-        } else {
-            $this->vars[$property] = $value;
-        }
-    }
-
-    public function check_required()
-    {
-        if (
-            in_array('og:title', $this->ogproperties)
-            && in_array('og:type', $this->ogproperties)
-            && (in_array('og:image', $this->ogproperties)
-                || in_array('og:image:url', $this->ogproperties))
-            && (array_key_exists('og:url', $this->ogproperties)
-                || array_key_exists('og:url:secure_url', $this->ogproperties))
-            && array_key_exists('og:description', $this->ogproperties)
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    public function get_field($field)
-    {
-        if (strpos($field, 'og:') === 0) {
-            foreach ($this->og as $ogdata) {
-                if (strpos($ogdata['property'], $field) === 0) {
-                    $arr[$field][] = $ogdata['value'];
-                }
-            }
-        } else {
-            $arr = $this->vars;
-        }
-
-        if (isset($arr) && is_array($arr) && array_key_exists($field, $arr) && $arr[$field]) {
-            return $arr[$field];
-        }
-        return false;
-    }
-
-
-    public function get()
-    {
-        // use 'name' for most meta fields, and 'property' for opengraph properties
-        $o = '';
-        if ($this->vars) {
-            foreach ($this->vars as $k => $v) {
-                $o .= '' . "\r\n";
-            }
-        }
-        if ($this->check_required()) {
-            foreach ($this->og as $ogdata) {
-                $o .= '' . "\r\n";
-            }
-        }
-        if ($o) {
-            return "\r\n" . $o;
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php
deleted file mode 100644
index c8e9051e1..000000000
--- a/Zotlabs/Web/Router.php
+++ /dev/null
@@ -1,267 +0,0 @@
-controller = new $modname();
-                            App::$module_loaded = true;
-                        }
-                    }
-                }
-            }
-
-
-            /*
-             * If the site has a custom module to over-ride the standard module, use it.
-             * Otherwise, look for the standard program module
-             */
-
-            if (!(App::$module_loaded)) {
-                try {
-                    $filename = 'Zotlabs/SiteModule/' . ucfirst($module) . '.php';
-                    if (file_exists($filename)) {
-                        // This won't be picked up by the autoloader, so load it explicitly
-                        require_once($filename);
-                        $this->controller = new $modname();
-                        App::$module_loaded = true;
-                    } else {
-                        $filename = 'Zotlabs/Module/' . ucfirst($module) . '.php';
-                        if (file_exists($filename)) {
-                            $this->controller = new $modname();
-                            App::$module_loaded = true;
-                        }
-                    }
-                    if (!App::$module_loaded) {
-                        throw new Exception('Module not found');
-                    }
-                } catch (Exception $e) {
-                }
-            }
-
-            $x = [
-                'module' => $module,
-                'installed' => App::$module_loaded,
-                'controller' => $this->controller
-            ];
-
-            /**
-             * @hooks module_loaded
-             *   Called when a module has been successfully locate to server a URL request.
-             *   This provides a place for plugins to register module handlers which don't otherwise exist
-             *   on the system, or to completely over-ride an existing module.
-             *   If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if
-             *   there is no specific module file or matching plugin name.
-             *   The plugin should catch at least one of the module hooks for this URL.
-             *   * \e string \b module
-             *   * \e boolean \b installed
-             *   * \e mixed \b controller - The initialized module object
-             */
-            Hook::call('module_loaded', $x);
-            if ($x['installed']) {
-                App::$module_loaded = true;
-                $this->controller = $x['controller'];
-            }
-
-            /*
-             * The URL provided does not resolve to a valid module.
-              */
-
-            if (!(App::$module_loaded)) {
-                // undo the setting of a letsencrypt acme-challenge rewrite rule
-                // which blocks access to our .well-known routes.
-                // Also provide a config setting for sites that have a legitimate need
-                // for a custom .htaccess in the .well-known directory; but they should
-                // make the file read-only so letsencrypt doesn't modify it
-
-                if (strpos($_SERVER['REQUEST_URI'], '/.well-known/') === 0) {
-                    if (file_exists('.well-known/.htaccess') && get_config('system', 'fix_apache_acme', true)) {
-                        rename('.well-known/.htaccess', '.well-known/.htaccess.old');
-                    }
-                }
-
-                $x = [
-                    'module' => $module,
-                    'installed' => App::$module_loaded,
-                    'controller' => $this->controller
-                ];
-                Hook::call('page_not_found', $x);
-
-                // Stupid browser tried to pre-fetch our Javascript img template.
-                // Don't log the event or return anything - just quietly exit.
-
-                if ((x($_SERVER, 'QUERY_STRING')) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
-                    killme();
-                }
-
-                if (get_config('system', 'log_404', true)) {
-                    logger("Module {$module} not found.", LOGGER_DEBUG, LOG_WARNING);
-                    logger('index.php: page not found: ' . $_SERVER['REQUEST_URI']
-                        . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: '
-                        . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
-                }
-
-                header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
-                $tpl = Theme::get_template('404.tpl');
-                App::$page['content'] = replace_macros(Theme::get_template('404.tpl'), ['$message' => t('Page not found.')]);
-
-                // pretend this is a module so it will initialise the theme
-                App::$module = '404';
-                App::$module_loaded = true;
-                App::$error = true;
-            }
-        }
-    }
-
-    /**
-     * @brief
-     *
-     */
-    public function Dispatch()
-    {
-
-        /**
-         * Call module functions
-         */
-
-        if (App::$module_loaded) {
-            App::$page['page_title'] = App::$module;
-            $placeholder = '';
-
-            /*
-             * No theme has been specified when calling the module_init functions
-             * For this reason, please restrict the use of templates to those which
-             * do not provide any presentation details - as themes will not be able
-             * to over-ride them.
-             */
-
-            $arr = ['init' => true, 'replace' => false];
-            Hook::call(App::$module . '_mod_init', $arr);
-            if (!$arr['replace']) {
-                if ($this->controller && method_exists($this->controller, 'init')) {
-                    $this->controller->init();
-                }
-            }
-
-            /*
-             * Do all theme initialisation here before calling any additional module functions.
-             * The module_init function may have changed the theme.
-             * Additionally any page with a Comanche template may alter the theme.
-             * So we'll check for those now.
-             */
-
-
-            /*
-             * In case a page has overloaded a module, see if we already have a layout defined
-             * otherwise, if a PDL file exists for this module, use it
-             * The member may have also created a customised PDL that's stored in the config
-             */
-
-            load_pdl();
-
-            /*
-              * load current theme info
-              */
-
-            $current_theme = Theme::current();
-
-            $theme_info_file = 'view/theme/' . $current_theme[0] . '/php/theme.php';
-            if (file_exists($theme_info_file)) {
-                require_once($theme_info_file);
-            }
-
-            if (function_exists(str_replace('-', '_', $current_theme[0]) . '_init')) {
-                $func = str_replace('-', '_', $current_theme[0]) . '_init';
-                $func($a);
-            } elseif (x(App::$theme_info, 'extends') && file_exists('view/theme/' . App::$theme_info['extends'] . '/php/theme.php')) {
-                require_once('view/theme/' . App::$theme_info['extends'] . '/php/theme.php');
-                if (function_exists(str_replace('-', '_', App::$theme_info['extends']) . '_init')) {
-                    $func = str_replace('-', '_', App::$theme_info['extends']) . '_init';
-                    $func($a);
-                }
-            }
-
-            if (($_SERVER['REQUEST_METHOD'] === 'POST') && (!App::$error) && (!x($_POST, 'auth-params'))) {
-                Hook::call(App::$module . '_mod_post', $_POST);
-                if ($this->controller && method_exists($this->controller, 'post')) {
-                    $this->controller->post();
-                }
-            }
-
-            if (!App::$error) {
-                $arr = ['content' => App::$page['content'], 'replace' => false];
-                Hook::call(App::$module . '_mod_content', $arr);
-
-                if (!$arr['replace']) {
-                    if ($this->controller && method_exists($this->controller, 'get')) {
-                        $arr = ['content' => $this->controller->get(), 'replace' => false];
-                    }
-                }
-                Hook::call(App::$module . '_mod_aftercontent', $arr);
-                App::$page['content'] = (($arr['replace']) ? $arr['content'] : App::$page['content'] . $arr['content']);
-            }
-        }
-    }
-}
diff --git a/Zotlabs/Web/Session.php b/Zotlabs/Web/Session.php
deleted file mode 100644
index 869310e3c..000000000
--- a/Zotlabs/Web/Session.php
+++ /dev/null
@@ -1,238 +0,0 @@
-custom_handler = boolval(get_config('system', 'session_custom', false));
-
-        /*
-         * Set our session storage functions.
-         */
-
-        if ($this->custom_handler) {
-           /* Custom handler (files, memached, redis..) */
-
-            $session_save_handler = strval(get_config('system', 'session_save_handler', null));
-            $session_save_path = strval(get_config('system', 'session_save_path', null));
-            if ($session_save_handler && $session_save_path) {
-                ini_set('session.save_handler', $session_save_handler);
-                ini_set('session.save_path', $session_save_path);
-            } else {
-                logger('Session save handler or path not set.', LOGGER_NORMAL, LOG_ERR);
-            }
-        } else {
-            $handler = new SessionHandler();
-
-            $this->handler = $handler;
-
-            $x = session_set_save_handler($handler, false);
-            if (! $x) {
-                logger('Session save handler initialisation failed.', LOGGER_NORMAL, LOG_ERR);
-            }
-        }
-
-        // Force cookies to be secure (https only) if this site is SSL enabled.
-        // Must be done before session_start().
-
-        $arr = session_get_cookie_params();
-
-        // Note when setting cookies: set the domain to false which creates a single domain
-        // cookie. If you use a hostname it will create a .domain.com wildcard which will
-        // have some nasty side effects if you have any other subdomains running the same software.
-
-		session_set_cookie_params([
-			'lifetime' => ((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
-			'path' => ((isset($arr['path'])) ? $arr['path'] : '/'),
-			'domain' => (($arr['domain']) ? $arr['domain'] : false),
-			'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
-			'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
-			'samesite' => 'None'
-		]);
-
-    
-        register_shutdown_function('session_write_close');
-    }
-
-    public function start()
-    {
-        session_start();
-        $this->session_started = true;
-    }
-
-    /**
-     * @brief Resets the current session.
-     *
-     * @return void
-     */
-
-    public function nuke()
-    {
-        $this->new_cookie(0); // 0 means delete on browser exit
-        if ($_SESSION && count($_SESSION)) {
-            foreach ($_SESSION as $k => $v) {
-                unset($_SESSION[$k]);
-            }
-        }
-    }
-
-    public function new_cookie($xtime)
-    {
-
-        $newxtime = (($xtime > 0) ? (time() + $xtime) : 0);
-
-        $old_sid = session_id();
-
-        $arr = session_get_cookie_params();
-
-        if (($this->handler || $this->custom_handler) && $this->session_started) {
-            session_regenerate_id(true);
-
-            // force SessionHandler record creation with the new session_id
-            // which occurs as a side effect of read()
-            if (! $this->custom_handler) {
-                $this->handler->read(session_id());
-            }
-        } else {
-            logger('no session handler');
-        }
-
-        if (x($_COOKIE, 'jsdisabled')) {
-			setcookie(
-				'jsdisabled',
-				$_COOKIE['jsdisabled'],
-				[
-					'expires' => $newxtime,
-					'path' => '/',
-					'domain' => false,
-					'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
-					'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
-					'samesite' => 'None'
-				]
-			);
-		}    
-
-		setcookie(
-			session_name(),
-			session_id(),
-			[
-				'expires' => $newxtime,
-				'path' => '/',
-				'domain' => false,
-				'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
-				'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
-				'samesite' => 'None'
-			]
-		);
-
-        $arr = array('expire' => $xtime);
-        Hook::call('new_cookie', $arr);
-    }
-
-    public function extend_cookie()
-    {
-
-        $arr = session_get_cookie_params();
-
-        // if there's a long-term cookie, extend it
-
-        $xtime = (($_SESSION['remember_me']) ? (60 * 60 * 24 * 365) : 0 );
-
-        if ($xtime) {
-			setcookie(
-				session_name(),
-				session_id(),
-				[
-					'expires' => time() + $xtime,
-					'path' => '/',
-					'domain' => false,
-					'secure' => ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
-					'httponly' => ((isset($arr['httponly'])) ? $arr['httponly'] : true),
-					'samesite' => 'None'
-				]
-			);
-		}
-
-        $arr = array('expire' => $xtime);
-        Hook::call('extend_cookie', $arr);
-    }
-
-
-    public function return_check()
-    {
-
-        // check a returning visitor against IP changes.
-        // If the change results in being blocked from re-entry with the current cookie
-        // nuke the session and logout.
-        // Returning at all indicates the session is still valid.
-
-        // first check if we're enforcing that sessions can't change IP address
-        // @todo what to do with IPv6 addresses
-
-        if ($_SESSION['addr'] && $_SESSION['addr'] != $_SERVER['REMOTE_ADDR']) {
-            logger('SECURITY: Session IP address changed: ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
-
-            $partial1 = substr($_SESSION['addr'], 0, strrpos($_SESSION['addr'], '.'));
-            $partial2 = substr($_SERVER['REMOTE_ADDR'], 0, strrpos($_SERVER['REMOTE_ADDR'], '.'));
-
-            $paranoia = intval(get_pconfig($_SESSION['uid'], 'system', 'paranoia'));
-
-            if (! $paranoia) {
-                $paranoia = intval(get_config('system', 'paranoia'));
-            }
-
-            switch ($paranoia) {
-                case 0:
-                    // no IP checking
-                    break;
-                case 2:
-                    // check 2 octets
-                    $partial1 = substr($partial1, 0, strrpos($partial1, '.'));
-                    $partial2 = substr($partial2, 0, strrpos($partial2, '.'));
-                    if ($partial1 == $partial2) {
-                        break;
-                    }
-                case 1:
-                    // check 3 octets
-                    if ($partial1 == $partial2) {
-                        break;
-                    }
-                case 3:
-                default:
-                    // check any difference at all
-                    logger('Session address changed. Paranoid setting in effect, blocking session. ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
-                    $this->nuke();
-                    goaway(z_root());
-                    break;
-            }
-        }
-        return true;
-    }
-}
diff --git a/Zotlabs/Web/SessionHandler.php b/Zotlabs/Web/SessionHandler.php
deleted file mode 100644
index aa25d713e..000000000
--- a/Zotlabs/Web/SessionHandler.php
+++ /dev/null
@@ -1,101 +0,0 @@
-controller = new $modname();
-        }
-
-        $routes = Route::get();
-
-        if ($routes) {
-            foreach ($routes as $route) {
-                if (is_array($route) && strtolower($route[1]) === strtolower(argv(0)) . '/' . strtolower(argv($whicharg))) {
-                    include_once($route[0]);
-                    if (class_exists($modname)) {
-                        $this->controller = new $modname();
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @brief
-     *
-     * @param string $method
-     * @return bool|mixed
-     */
-    public function call($method)
-    {
-
-        if (!$this->controller) {
-            return false;
-        }
-
-        if (method_exists($this->controller, $method)) {
-            return $this->controller->$method();
-        }
-
-        return false;
-    }
-}
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
deleted file mode 100644
index a2daa0fac..000000000
--- a/Zotlabs/Web/WebServer.php
+++ /dev/null
@@ -1,244 +0,0 @@
-start_session();
-
-        $this->set_language();
-
-        $this->set_identities();
-
-        $this->initialise_notifications();
-
-        if (App::$install) {
-            /*
-             * During installation, only permit the view module and setup module.
-             * The view module is required to expand/replace variables in style.css
-             */
-
-            if (App::$module !== 'view') {
-                App::$module = 'setup';
-            }
-        } else {
-            /*
-             * check_config() is responsible for running update scripts. These automatically
-             * update the DB schema whenever we push a new one out. It also checks to see if
-             * any plugins have been added or removed and reacts accordingly.
-             */
-
-            check_config();
-        }
-
-        $this->create_channel_links();
-
-        $this->initialise_content();
-
-        $Router = new Router();
-        $Router->Dispatch();
-
-        // if the observer is a visitor, add some javascript to the page to let
-        // the application take them home.
-
-        $this->set_homebase();
-
-        // now that we've been through the module content, see if the page reported
-        // a permission problem via session based notifications and if so, a 403
-        // response would seem to be in order.
-
-        if (is_array($_SESSION['sysmsg']) && stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) {
-            header($_SERVER['SERVER_PROTOCOL'] . ' 403 ' . t('Permission denied.'));
-        }
-
-        construct_page();
-
-        killme();
-    }
-
-    private function start_session()
-    {
-
-        if (App::$session) {
-            App::$session->start();
-        } else {
-            session_start();
-            register_shutdown_function('session_write_close');
-        }
-    }
-
-    private function set_language()
-    {
-
-        /*
-         * Determine the language of the interface
-         */
-
-        // First use the browser preference, if available. This will fall back to 'en'
-        // if there is no built-in language support for the preferred languagge
-
-
-        App::$language = get_best_language();
-        load_translation_table(App::$language, App::$install);
-
-        // See if there's a request to over-ride the language
-        // store it in the session.
-
-        if (array_key_exists('system_language', $_REQUEST)) {
-            if (strlen($_REQUEST['system_language'])) {
-                $_SESSION['language'] = $_REQUEST['system_language'];
-            } else {
-                // reset to default if it's an empty string
-                unset($_SESSION['language']);
-            }
-        }
-
-        // If we've over-ridden the language, set it now.
-
-        if ((x($_SESSION, 'language')) && ($_SESSION['language'] !== App::$language)) {
-            App::$language = $_SESSION['language'];
-            load_translation_table(App::$language);
-        }
-    }
-
-    private function set_identities()
-    {
-
-        if ((x($_GET, 'zid')) && (! App::$install)) {
-            App::$query_string = strip_zids(App::$query_string);
-            if (! local_channel()) {
-                if ($_SESSION['my_address'] !== $_GET['zid']) {
-                    $_SESSION['my_address'] = $_GET['zid'];
-                    $_SESSION['authenticated'] = 0;
-                }
-                Channel::zid_init();
-            }
-        }
-
-        if ((x($_GET, 'zat')) && (! App::$install)) {
-            App::$query_string = strip_zats(App::$query_string);
-            if (! local_channel()) {
-                Channel::zat_init();
-            }
-        }
-
-        if ((x($_REQUEST, 'owt')) && (! App::$install)) {
-            $token = $_REQUEST['owt'];
-            App::$query_string = strip_query_param(App::$query_string, 'owt');
-            owt_init($token);
-        }
-
-        if ((x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || (App::$module === 'login')) {
-            require('include/auth.php');
-        }
-    }
-
-    private function initialise_notifications()
-    {
-        if (! x($_SESSION, 'sysmsg')) {
-            $_SESSION['sysmsg'] = [];
-        }
-
-        if (! x($_SESSION, 'sysmsg_info')) {
-            $_SESSION['sysmsg_info'] = [];
-        }
-    }
-
-    private function initialise_content()
-    {
-
-        /* initialise content region */
-
-        if (! x(App::$page, 'content')) {
-            App::$page['content'] = EMPTY_STR;
-        }
-
-        Hook::call('page_content_top', App::$page['content']);
-    }
-
-    private function create_channel_links()
-    {
-
-        /* Initialise the Link: response header if this is a channel page.
-         * This cannot be done inside the channel module because some protocol
-         * addons over-ride the module functions and these links are common
-         * to all protocol drivers; thus doing it here avoids duplication.
-         */
-
-        if (( App::$module === 'channel' ) && argc() > 1) {
-            App::$channel_links = [
-                [
-                    'rel'  => 'jrd',
-                    'type' => 'application/jrd+json',
-                    'href'  => z_root() . '/.well-known/webfinger?f=&resource=acct%3A' . argv(1) . '%40' . App::get_hostname()
-                ],
-
-                [
-                    'rel'  => 'alternate',
-                    'type' => 'application/x-zot+json',
-                    'href'  => z_root() . '/channel/' . argv(1)
-                ],
-
-				[
-					'rel'  => 'alternate',
-					'type' => 'application/x-nomad+json',
-					'href'  => z_root() . '/channel/' . argv(1)
-				],
-
-                [
-                    'rel'  => 'self',
-                    'type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
-                    'href' => z_root() . '/channel/' . argv(1)
-                ],
-
-                [
-                    'rel'  => 'self',
-                    'type' => 'application/activity+json',
-                    'href' => z_root() . '/channel/' . argv(1)
-                ]
-            ];
-
-            $x = [ 'channel_address' => argv(1), 'channel_links' => App::$channel_links ];
-            Hook::call('channel_links', $x);
-            App::$channel_links = $x['channel_links'];
-            header('Link: ' . App::get_channel_links());
-        }
-    }
-
-    private function set_homebase()
-    {
-
-        // If you're just visiting, let javascript take you home
-
-        if (x($_SESSION, 'visitor_home')) {
-            $homebase = $_SESSION['visitor_home'];
-        } elseif (local_channel()) {
-            $homebase = z_root() . '/channel/' . App::$channel['channel_address'];
-        }
-
-        if (isset($homebase)) {
-            App::$page['content'] .= '';
-        }
-    }
-}
diff --git a/Zotlabs/Widget/Activity.php b/Zotlabs/Widget/Activity.php
deleted file mode 100644
index fecb0e7d6..000000000
--- a/Zotlabs/Widget/Activity.php
+++ /dev/null
@@ -1,68 +0,0 @@
- $v) {
-                if (!LibBlock::fetch_by_entity(local_channel(), $k)) {
-                    $arr[] = ['author_xchan' => $k, 'total' => $v];
-                }
-            }
-            usort($arr, 'total_sort');
-            xchan_query($arr);
-        }
-
-        $x = ['entries' => $arr];
-        Hook::call('activity_widget', $x);
-        $arr = $x['entries'];
-
-        if ($arr) {
-            $o .= '
          ';
-            $o .= '
          ' . t('Activity', 'widget') . '
          ';
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php
deleted file mode 100644
index 6935e31e0..000000000
--- a/Zotlabs/Widget/Activity_filter.php
+++ /dev/null
@@ -1,338 +0,0 @@
- t('Direct Messages'),
-            'icon' => 'envelope-o',
-            'url' => z_root() . '/' . $cmd . '/?dm=1',
-            'sel' => $dm_active,
-            'title' => t('Show direct (private) messages')
-        ];
-
-
-        $conv_active = ((isset($_GET['conv']) && intval($_GET['conv'])) ? 'active' : '');
-        if ($conv_active) {
-            $filter_active = 'personal';
-        }
-
-        $tabs[] = [
-            'label' => t('Personal Posts'),
-            'icon' => 'user-circle',
-            'url' => z_root() . '/' . $cmd . '/?conv=1',
-            'sel' => $conv_active,
-            'title' => t('Show posts that mention or involve me')
-        ];
-
-        $starred_active = ((isset($_GET['star']) && intval($_GET['star'])) ? 'active' : '');
-        if ($starred_active) {
-            $filter_active = 'star';
-        }
-
-        $tabs[] = [
-            'label' => t('Saved Posts'),
-            'icon' => 'star',
-            'url' => z_root() . '/' . $cmd . '/?star=1',
-            'sel' => $starred_active,
-            'title' => t('Show posts that I have saved')
-        ];
-
-        if (local_channel() && Apps::system_app_installed(local_channel(), 'Drafts')) {
-            $drafts_active = ((isset($_GET['draft']) && intval($_GET['draft'])) ? 'active' : '');
-            if ($drafts_active) {
-                $filter_active = 'drafts';
-            }
-
-            $tabs[] = [
-                'label' => t('Drafts'),
-                'icon' => 'floppy-o',
-                'url' => z_root() . '/' . $cmd . '/?draft=1',
-                'sel' => $drafts_active,
-                'title' => t('Show drafts that I have saved')
-            ];
-        }
-
-        if (x($_GET, 'search')) {
-            $video_active = (($_GET['search'] == 'video]') ? 'active' : '');
-            $filter_active = (($events_active) ? 'videos' : 'search');
-        }
-
-        $tabs[] = [
-            'label' => t('Videos'),
-            'icon' => 'video',
-            'url' => z_root() . '/' . $cmd . '/?search=video%5D',
-            'sel' => $video_active,
-            'title' => t('Show posts that include videos')
-        ];
-
-        if (x($_GET, 'verb')) {
-            $events_active = (($_GET['verb'] == '.Event') ? 'active' : '');
-            $polls_active = (($_GET['verb'] == '.Question') ? 'active' : '');
-            $filter_active = (($events_active) ? 'events' : 'polls');
-        }
-
-        $tabs[] = [
-            'label' => t('Events'),
-            'icon' => 'calendar',
-            'url' => z_root() . '/' . $cmd . '/?verb=%2EEvent',
-            'sel' => $events_active,
-            'title' => t('Show posts that include events')
-        ];
-
-        $tabs[] = [
-            'label' => t('Polls'),
-            'icon' => 'bar-chart',
-            'url' => z_root() . '/' . $cmd . '/?verb=%2EQuestion',
-            'sel' => $polls_active,
-            'title' => t('Show posts that include polls')
-        ];
-
-
-        $groups = q(
-            "SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
-            intval(local_channel())
-        );
-
-        if ($groups || Apps::system_app_installed(local_channel(), 'Virtual Lists')) {
-            if ($groups) {
-                foreach ($groups as $g) {
-                    if (x($_GET, 'gid')) {
-                        $group_active = (($_GET['gid'] == $g['id']) ? 'active' : '');
-                        $filter_active = 'group';
-                    }
-                    $gsub[] = [
-                        'label' => $g['gname'],
-                        'icon' => '',
-                        'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'],
-                        'sel' => $group_active,
-                        'title' => sprintf(t('Show posts related to the %s access list'), $g['gname'])
-                    ];
-                }
-            }
-            if (Apps::system_app_installed(local_channel(), 'Virtual Lists')) {
-                foreach ([':1', ':2', ':3'] as $l) {
-                    switch ($l) {
-                        case ':1':
-                            $gname = t('Connections');
-                            break;
-                        case ':2':
-                            $gname = t('Nomad');
-                            break;
-                        case ':3':
-                            $gname = t('ActivityPub');
-                            break;
-                        default:
-                            break;
-                    }
-
-                    if (x($_GET, 'gid')) {
-                        $group_active = (($_GET['gid'] == $l) ? 'active' : '');
-                        $filter_active = 'group';
-                    }
-
-                    $gsub[] = [
-                        'label' => $gname,
-                        'icon' => '',
-                        'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $l,
-                        'sel' => $group_active,
-                        'title' => sprintf(t('Show posts related to the %s access list'), $gname)
-                    ];
-                }
-            }
-            $tabs[] = [
-                'id' => 'privacy_groups',
-                'label' => t('Lists'),
-                'icon' => 'users',
-                'url' => '#',
-                'sel' => (($filter_active == 'group') ? true : false),
-                'title' => t('Show my access lists'),
-                'sub' => $gsub
-            ];
-        }
-
-        $forums = get_forum_channels(local_channel(), 1);
-
-        if ($forums) {
-            foreach ($forums as $f) {
-                if (x($_GET, 'pf') && x($_GET, 'cid')) {
-                    $forum_active = ((x($_GET, 'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : '');
-                    $filter_active = 'forums';
-                }
-                $fsub[] = [
-                    'label' => $f['xchan_name'],
-                    'img' => $f['xchan_photo_s'],
-                    'url' => z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id'],
-                    'sel' => $forum_active,
-                    'title' => t('Show posts to this group'),
-                    'lock' => ((isset($f['private_forum']) && $f['private_forum']) ? 'lock' : ''),
-                    'edit' => t('New post'),
-                    'edit_url' => $f['xchan_url']
-                ];
-            }
-
-            $tabs[] = [
-                'id' => 'forums',
-                'label' => t('Groups'),
-                'icon' => 'comments-o',
-                'url' => '#',
-                'sel' => (($filter_active == 'forums') ? true : false),
-                'title' => t('Show groups'),
-                'sub' => $fsub
-            ];
-        }
-
-        if (Features::enabled(local_channel(), 'filing')) {
-            $terms = q(
-                "select distinct term from term where uid = %d and ttype = %d order by term asc",
-                intval(local_channel()),
-                intval(TERM_FILE)
-            );
-
-            if ($terms) {
-                foreach ($terms as $t) {
-                    if (x($_GET, 'file')) {
-                        $file_active = (($_GET['file'] == $t['term']) ? 'active' : '');
-                        $filter_active = 'file';
-                    }
-                    $tsub[] = [
-                        'label' => $t['term'],
-                        'icon' => '',
-                        'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'],
-                        'sel' => $file_active,
-                        'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']),
-                    ];
-                }
-
-                $tabs[] = [
-                    'id' => 'saved_folders',
-                    'label' => t('Saved Folders'),
-                    'icon' => 'folder',
-                    'url' => '#',
-                    'sel' => (($filter_active == 'file') ? true : false),
-                    'title' => t('Show filed post categories'),
-                    'sub' => $tsub
-
-                ];
-            }
-        }
-
-        $ft = get_pconfig(local_channel(), 'system', 'followed_tags', EMPTY_STR);
-        if (is_array($ft) && $ft) {
-            foreach ($ft as $t) {
-                $tag_active = ((isset($_GET['netsearch']) && $_GET['netsearch'] === '#' . $t) ? 'active' : '');
-                if ($tag_active) {
-                    $filter_active = 'tags';
-                }
-
-                $tsub[] = [
-                    'label' => '#' . $t,
-                    'icon' => '',
-                    'url' => z_root() . '/' . $cmd . '/?search=' . '%23' . $t,
-                    'sel' => $tag_active,
-                    'title' => sprintf(t('Show posts with hashtag %s'), '#' . $t),
-                ];
-            }
-
-            $tabs[] = [
-                'id' => 'followed_tags',
-                'label' => t('Followed Hashtags'),
-                'icon' => 'bookmark',
-                'url' => '#',
-                'sel' => (($filter_active == 'tags') ? true : false),
-                'title' => t('Show followed hashtags'),
-                'sub' => $tsub
-            ];
-        }
-
-
-//      if(x($_GET,'search')) {
-//          $filter_active = 'search';
-//          $tabs[] = [
-//              'label' => t('Search'),
-//              'icon' => 'search',
-//              'url' => z_root() . '/' . $cmd . '/?search=' . $_GET['search'],
-//              'sel' => 'active disabled',
-//              'title' => t('Panel search')
-//          ];
-//      }
-
-        $name = [];
-        if (isset($_GET['name']) && $_GET['name']) {
-            $filter_active = 'name';
-        }
-        $name = [
-            'label' => x($_GET, 'name') ? $_GET['name'] : t('Name'),
-            'icon' => 'filter',
-            'url' => z_root() . '/' . $cmd . '/',
-            'sel' => $filter_active == 'name' ? 'is-valid' : '',
-            'title' => ''
-        ];
-
-        $reset = [];
-        if ($filter_active) {
-            $reset = [
-                'label' => '',
-                'icon' => 'remove',
-                'url' => z_root() . '/' . $cmd,
-                'sel' => '',
-                'title' => t('Remove active filter')
-            ];
-        }
-
-        $arr = ['tabs' => $tabs];
-
-        Hook::call('activity_filter', $arr);
-
-        $o = '';
-
-        if ($arr['tabs']) {
-            $content = replace_macros(Theme::get_template('common_pills.tpl'), [
-                '$pills' => $arr['tabs']
-            ]);
-
-            $o .= replace_macros(Theme::get_template('activity_filter_widget.tpl'), [
-                '$title' => t('Stream Filters'),
-    			'$content_id' => 'activity-filter-widget',
-                '$reset' => $reset,
-                '$content' => $content,
-                '$name' => $name
-            ]);
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Admin.php b/Zotlabs/Widget/Admin.php
deleted file mode 100644
index 67f239af1..000000000
--- a/Zotlabs/Widget/Admin.php
+++ /dev/null
@@ -1,75 +0,0 @@
- array(z_root() . '/admin/site/', t('Site'), 'site'),
-//          'profile_photo' => array(z_root() . '/admin/profile_photo', t('Site icon/logo'), 'profile_photo'),
-//          'cover_photo'   => array(z_root() . '/admin/cover_photo', t('Site photo'), 'cover_photo'),
-            'accounts' => array(z_root() . '/admin/accounts/', t('Accounts'), 'accounts', 'pending-update', t('Member registrations waiting for confirmation')),
-            'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'),
-            'security' => array(z_root() . '/admin/security/', t('Security'), 'security'),
-//          'features'      => array(z_root() . '/admin/features/', t('Features'),       'features'),
-            'addons' => array(z_root() . '/admin/addons/', t('Addons'), 'addons'),
-            'themes' => array(z_root() . '/admin/themes/', t('Themes'), 'themes'),
-            'queue' => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'),
-//          'profs'         => array(z_root() . '/admin/profs',     t('Profile Fields'), 'profs'),
-            'dbsync' => array(z_root() . '/admin/dbsync/', t('DB updates'), 'dbsync')
-        ];
-
-        /* get plugins admin page */
-
-        $r = q("SELECT * FROM addon WHERE plugin_admin = 1");
-
-        $plugins = [];
-        if ($r) {
-            foreach ($r as $h) {
-                $plugin = $h['aname'];
-                $plugins[] = array(z_root() . '/admin/addons/' . $plugin, $plugin, 'plugin');
-                // temp plugins with admin
-                App::$addons_admin[] = $plugin;
-            }
-        }
-
-        $logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs');
-
-        $arr = array('links' => $aside, 'plugins' => $plugins, 'logs' => $logs);
-        Hook::call('admin_aside', $arr);
-
-        $o .= replace_macros(Theme::get_template('admin_aside.tpl'), array(
-            '$admin' => $aside,
-            '$admtxt' => t('Admin'),
-            '$plugadmtxt' => t('Addon Features'),
-            '$plugins' => $plugins,
-            '$logtxt' => t('Logs'),
-            '$logs' => $logs,
-            '$h_pending' => t('Member registrations waiting for confirmation'),
-            '$admurl' => z_root() . '/admin/'
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Affinity.php b/Zotlabs/Widget/Affinity.php
deleted file mode 100644
index 62adb788e..000000000
--- a/Zotlabs/Widget/Affinity.php
+++ /dev/null
@@ -1,53 +0,0 @@
- t('Me'),
-                20 => t('Family'),
-                40 => t('Friends'),
-                60 => t('Peers'),
-                80 => t('Connections'),
-                99 => t('All')
-            );
-            Hook::call('affinity_labels', $labels);
-
-            $tpl = Theme::get_template('main_slider.tpl');
-            $x = replace_macros($tpl, [
-                '$cmin' => $cmin,
-                '$cmax' => $cmax,
-                '$lbl' => t('Friend zoom in/out'),
-                '$refresh' => t('Refresh'),
-                '$labels' => $labels,
-            ]);
-
-            $arr = array('html' => $x);
-            Hook::call('main_slider', $arr);
-            return $arr['html'];
-        }
-        return '';
-    }
-}
diff --git a/Zotlabs/Widget/Album.php b/Zotlabs/Widget/Album.php
deleted file mode 100644
index 709d5a43a..000000000
--- a/Zotlabs/Widget/Album.php
+++ /dev/null
@@ -1,117 +0,0 @@
- $rr['id'],
-                    'twist' => ' ' . $twist . rand(2, 4),
-                    'link' => $imagelink,
-                    'title' => t('View Photo'),
-                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
-                    'alt' => $imgalt_e,
-                    'desc' => $desc_e,
-                    'ext' => $ext,
-                    'hash' => $rr['resource_id'],
-                    'unknown' => t('Unknown')
-                );
-            }
-        }
-
-
-        $tpl = Theme::get_template('photo_album.tpl');
-        $o .= replace_macros($tpl, array(
-            '$photos' => $photos,
-            '$album' => (($title) ? $title : $album),
-            '$album_id' => rand(),
-            '$album_edit' => array(t('Edit Album'), $album_edit),
-            '$can_post' => false,
-            '$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
-            '$order' => false,
-            '$upload_form' => $upload_form,
-            '$usage' => $usage_message
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Appcategories.php b/Zotlabs/Widget/Appcategories.php
deleted file mode 100644
index a10ebd7c7..000000000
--- a/Zotlabs/Widget/Appcategories.php
+++ /dev/null
@@ -1,62 +0,0 @@
- 1 && argv(1) === 'available') {
-            $srchurl .= '/available';
-        }
-
-
-        $terms = [];
-
-        $r = q(
-            "select distinct(term.term)
-	        from term join app on term.oid = app.id
-    	    where app_channel = %d
-        	and term.uid = app_channel
-	        and term.otype = %d
-    	    and term.term != 'nav_featured_app'
-    	    and term.term != 'nav_pinned_app'
-        	order by term.term asc",
-            intval(local_channel()),
-            intval(TERM_OBJ_APP)
-        );
-
-        if ($r) {
-            foreach ($r as $rr) {
-                $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-            }
-
-            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
-                '$title' => t('Categories'),
-                '$desc' => '',
-                '$sel_all' => (($selected == '') ? 'selected' : ''),
-                '$all' => t('Everything'),
-                '$terms' => $terms,
-                '$base' => $srchurl,
-
-            ));
-        }
-    }
-}
diff --git a/Zotlabs/Widget/Appcloud.php b/Zotlabs/Widget/Appcloud.php
deleted file mode 100644
index f3cbe74c2..000000000
--- a/Zotlabs/Widget/Appcloud.php
+++ /dev/null
@@ -1,15 +0,0 @@
- 1 && argv(1) === 'available') ? 1 : 0);
-        return replace_macros(Theme::get_template('appstore.tpl'), [
-            '$title' => t('App Collections'),
-            '$options' => [
-                [z_root() . '/apps', t('Installed Apps'), 1 - $store],
-                [z_root() . '/apps/available', t('Available Apps'), $store]
-            ]
-        ]);
-    }
-}
diff --git a/Zotlabs/Widget/Archive.php b/Zotlabs/Widget/Archive.php
deleted file mode 100644
index 24f9eee7a..000000000
--- a/Zotlabs/Widget/Archive.php
+++ /dev/null
@@ -1,63 +0,0 @@
- t('Archives'),
-            '$size' => $visible_years,
-            '$cutoff_year' => $cutoff_year,
-            '$cutoff' => $cutoff,
-            '$url' => $url,
-            '$style' => $style,
-            '$showend' => $showend,
-            '$dates' => $ret
-        ));
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Bookmarkedchats.php b/Zotlabs/Widget/Bookmarkedchats.php
deleted file mode 100644
index 016c5e847..000000000
--- a/Zotlabs/Widget/Bookmarkedchats.php
+++ /dev/null
@@ -1,38 +0,0 @@
- t('Bookmarked Chatrooms'),
-            '$rooms' => $r
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Catcloud.php b/Zotlabs/Widget/Catcloud.php
deleted file mode 100644
index 4cab3218e..000000000
--- a/Zotlabs/Widget/Catcloud.php
+++ /dev/null
@@ -1,48 +0,0 @@
- $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-            }
-
-            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
-                '$title' => t('Categories'),
-                '$desc' => '',
-                '$sel_all' => (($selected == '') ? 'selected' : ''),
-                '$all' => t('Everything'),
-                '$terms' => $terms,
-                '$base' => $baseurl,
-
-            ));
-        }
-        return '';
-    }
-
-    public static function cardcategories_widget($baseurl, $selected = '')
-    {
-
-        if (!Apps::system_app_installed(App::$profile['profile_uid'], 'Categories')) {
-            return '';
-        }
-
-        $sql_extra = item_permissions_sql(App::$profile['profile_uid']);
-
-        $item_normal = "and item.item_hidden = 0 and item.item_type = 6 and item.item_deleted = 0
-			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-			and item.item_blocked = 0 ";
-
-        $terms = [];
-        $r = q(
-            "select distinct(term.term)
-			from term join item on term.oid = item.id
-			where item.uid = %d
-			and term.uid = item.uid
-			and term.ttype = %d
-			and term.otype = %d
-			and item.owner_xchan = '%s'
-			$item_normal
-			$sql_extra
-			order by term.term asc",
-            intval(App::$profile['profile_uid']),
-            intval(TERM_CATEGORY),
-            intval(TERM_OBJ_POST),
-            dbesc(App::$profile['channel_hash'])
-        );
-        if ($r && count($r)) {
-            foreach ($r as $rr) {
-                $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-            }
-
-            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
-                '$title' => t('Categories'),
-                '$desc' => '',
-                '$sel_all' => (($selected == '') ? 'selected' : ''),
-                '$all' => t('Everything'),
-                '$terms' => $terms,
-                '$base' => $baseurl,
-
-            ));
-        }
-        return '';
-    }
-
-
-    public static function categories_widget($baseurl, $selected = '')
-    {
-
-        if (!Apps::system_app_installed(App::$profile['profile_uid'], 'Categories')) {
-            return '';
-        }
-
-        require_once('include/security.php');
-
-        $sql_extra = item_permissions_sql(App::$profile['profile_uid']);
-
-        $item_normal = item_normal();
-
-        $terms = [];
-        $r = q(
-            "select distinct(term.term) from term join item on term.oid = item.id
-			where item.uid = %d
-			and term.uid = item.uid
-			and term.ttype = %d
-			and term.otype = %d
-			and item.owner_xchan = '%s'
-			and item.item_wall = 1
-			and item.verb != '%s'
-			$item_normal
-			$sql_extra
-			order by term.term asc",
-            intval(App::$profile['profile_uid']),
-            intval(TERM_CATEGORY),
-            intval(TERM_OBJ_POST),
-            dbesc(App::$profile['channel_hash']),
-            dbesc(ACTIVITY_UPDATE)
-        );
-        if ($r && count($r)) {
-            foreach ($r as $rr) {
-                $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-            }
-
-            return replace_macros(Theme::get_template('categories_widget.tpl'), array(
-                '$title' => t('Categories'),
-                '$desc' => '',
-                '$sel_all' => (($selected == '') ? 'selected' : ''),
-                '$all' => t('Everything'),
-                '$terms' => $terms,
-                '$base' => $baseurl,
-
-            ));
-        }
-        return '';
-    }
-}
diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php
deleted file mode 100644
index 2f03b9521..000000000
--- a/Zotlabs/Widget/Cdav.php
+++ /dev/null
@@ -1,197 +0,0 @@
-db;
-
-        require_once 'vendor/autoload.php';
-
-        $o = '';
-
-        if (argc() <= 3 && argv(1) === 'calendar') {
-            $caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
-
-            $sabrecals = $caldavBackend->getCalendarsForUser($principalUri);
-
-            //TODO: we should probably also check for permission to send stream here
-            $local_channels = q(
-                "SELECT * FROM channel LEFT JOIN abook ON abook_xchan = channel_hash WHERE channel_system = 0 AND channel_removed = 0 AND channel_hash != '%s' AND abook_channel = %d",
-                dbesc($channel['channel_hash']),
-                intval($channel['channel_id'])
-            );
-
-            $sharee_options .= '' . "\r\n";
-            foreach ($local_channels as $local_channel) {
-                $sharee_options .= '' . "\r\n";
-            }
-
-            $access_options = '' . "\r\n";
-            $access_options .= '' . "\r\n";
-
-            //list calendars
-            foreach ($sabrecals as $sabrecal) {
-                if ($sabrecal['share-access'] == 1) {
-                    $access = '';
-                }
-                if ($sabrecal['share-access'] == 2) {
-                    $access = 'read';
-                }
-                if ($sabrecal['share-access'] == 3) {
-                    $access = 'read-write';
-                }
-
-                $invites = $caldavBackend->getInvites($sabrecal['id']);
-
-                $json_source = '/cdav/calendar/json/' . $sabrecal['id'][0] . '/' . $sabrecal['id'][1];
-
-                $switch = get_pconfig(local_channel(), 'cdav_calendar', $sabrecal['id'][0]);
-
-                $color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#6cad39');
-
-                $editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript
-
-                $sharees = [];
-                $share_displayname = [];
-
-                foreach ($invites as $invite) {
-                    if (strpos($invite->href, 'mailto:') !== false) {
-                        $sharee = Channel::from_username(substr($invite->principal, 11));
-                        $sharees[] = [
-                            'name' => $sharee['channel_name'],
-                            'access' => (($invite->access == 3) ? ' (RW)' : ' (R)'),
-                            'hash' => $sharee['channel_hash']
-                        ];
-                    }
-                }
-
-                if (!$access) {
-                    $my_calendars[] = [
-                        'ownernick' => $channel['channel_address'],
-                        'uri' => $sabrecal['uri'],
-                        'displayname' => $sabrecal['{DAV:}displayname'],
-                        'calendarid' => $sabrecal['id'][0],
-                        'instanceid' => $sabrecal['id'][1],
-                        'json_source' => $json_source,
-                        'color' => $color,
-                        'editable' => $editable,
-                        'switch' => $switch,
-                        'sharees' => $sharees
-                    ];
-                } else {
-                    $shared_calendars[] = [
-                        'ownernick' => $channel['channel_address'],
-                        'uri' => $sabrecal['uri'],
-                        'displayname' => $sabrecal['{DAV:}displayname'],
-                        'calendarid' => $sabrecal['id'][0],
-                        'instanceid' => $sabrecal['id'][1],
-                        'json_source' => $json_source,
-                        'color' => $color,
-                        'editable' => $editable,
-                        'switch' => $switch,
-                        'sharer' => $sabrecal['{urn:ietf:params:xml:ns:caldav}calendar-description'],
-                        'access' => $access
-                    ];
-                }
-
-                if (!$access || $access === 'read-write') {
-                    $writable_calendars[] = [
-                        'displayname' => ((!$access) ? $sabrecal['{DAV:}displayname'] : $share_displayname[0]),
-                        'id' => $sabrecal['id']
-                    ];
-                }
-            }
-
-            $calendars[] = [
-                'ownernick' => $channel['channel_address'],
-                'displayname' => $channel['channel_name'],
-                'calendarid' => 'calendar',
-                'json_source' => '/calendar/json',
-                'color' => '#3a87ad',
-                'editable' => true,
-                'switch' => get_pconfig(local_channel(), 'cdav_calendar', 'calendar')
-            ];
-
-            $o .= replace_macros(Theme::get_template('cdav_widget_calendar.tpl'), [
-                '$calendars_label' => t('Channel Calendar'),
-                '$calendars' => $calendars,
-                '$my_calendars_label' => t('CalDAV Calendars'),
-                '$my_calendars' => $my_calendars,
-                '$shared_calendars_label' => t('Shared CalDAV Calendars'),
-                '$shared_calendars' => $shared_calendars,
-                '$sharee_options' => $sharee_options,
-                '$access_options' => $access_options,
-                '$share_label' => t('Share this calendar'),
-                '$share' => t('Share'),
-                '$edit_label' => t('Calendar name and color'),
-                '$edit' => t('Edit'),
-                '$create_label' => t('Create new CalDAV calendar'),
-                '$create' => t('Create'),
-                '$create_placeholder' => t('Calendar Name'),
-                '$tools_label' => t('Calendar Tools'),
-                '$tools_options_label' => [t('Channel Calendars'), t('CalDAV Calendars')],
-                '$import_label' => t('Import calendar'),
-                '$import_placeholder' => t('Select a calendar to import to'),
-                '$upload' => t('Upload'),
-                '$writable_calendars' => $writable_calendars
-            ]);
-
-            return $o;
-        }
-
-        if (argc() >= 2 && argv(1) === 'addressbook') {
-            $carddavBackend = new PDO($pdo);
-
-            $sabreabooks = $carddavBackend->getAddressBooksForUser($principalUri);
-
-            //list addressbooks
-            foreach ($sabreabooks as $sabreabook) {
-                $addressbooks[] = [
-                    'ownernick' => $channel['channel_address'],
-                    'uri' => $sabreabook['uri'],
-                    'displayname' => $sabreabook['{DAV:}displayname'],
-                    'id' => $sabreabook['id']
-
-                ];
-            }
-
-            $o .= replace_macros(Theme::get_template('cdav_widget_addressbook.tpl'), [
-                '$addressbooks_label' => t('Addressbooks'),
-                '$addressbooks' => $addressbooks,
-                '$edit_label' => t('Addressbook name'),
-                '$edit' => t('Edit'),
-                '$create_label' => t('Create new addressbook'),
-                '$create_placeholder' => t('Addressbook Name'),
-                '$create' => t('Create'),
-                '$tools_label' => t('Addressbook Tools'),
-                '$import_label' => t('Import addressbook'),
-                '$import_placeholder' => t('Select an addressbook to import to'),
-                '$upload' => t('Upload')
-            ]);
-
-            return $o;
-        }
-    }
-}
diff --git a/Zotlabs/Widget/Chatroom_list.php b/Zotlabs/Widget/Chatroom_list.php
deleted file mode 100644
index d523c2706..000000000
--- a/Zotlabs/Widget/Chatroom_list.php
+++ /dev/null
@@ -1,32 +0,0 @@
- t('Chatrooms'),
-                '$baseurl' => z_root(),
-                '$nickname' => App::$profile['channel_address'],
-                '$items' => $r,
-                '$overview' => t('Overview')
-            ));
-        }
-    }
-}
diff --git a/Zotlabs/Widget/Chatroom_members.php b/Zotlabs/Widget/Chatroom_members.php
deleted file mode 100644
index b115c2e68..000000000
--- a/Zotlabs/Widget/Chatroom_members.php
+++ /dev/null
@@ -1,19 +0,0 @@
- t('Chat Members')
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Clock.php b/Zotlabs/Widget/Clock.php
deleted file mode 100644
index fd37c383f..000000000
--- a/Zotlabs/Widget/Clock.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
          
-
-
-EOT;
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Collections.php b/Zotlabs/Widget/Collections.php
deleted file mode 100644
index 3afe16d89..000000000
--- a/Zotlabs/Widget/Collections.php
+++ /dev/null
@@ -1,59 +0,0 @@
- t('Common Connections'),
-            '$base' => z_root(),
-            '$uid' => $profile_uid,
-            '$cid' => $observer,
-            '$linkmore' => (($t > $cnt) ? 'true' : ''),
-            '$more' => sprintf(t('View all %d common connections'), $t),
-            '$items' => $r
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Cover_photo.php b/Zotlabs/Widget/Cover_photo.php
deleted file mode 100644
index 2652af1f8..000000000
--- a/Zotlabs/Widget/Cover_photo.php
+++ /dev/null
@@ -1,102 +0,0 @@
-') !== false) {
-            $style = '';
-        }
-
-        if (array_key_exists('title', $arr) && isset($arr['title'])) {
-            $title = $arr['title'];
-        } else {
-            $title = $channel['channel_name'];
-        }
-
-
-        if (array_key_exists('subtitle', $arr) && isset($arr['subtitle'])) {
-            $subtitle = $arr['subtitle'];
-        } else {
-            $subtitle = str_replace('@', '@', $channel['xchan_addr']);
-        }
-
-
-        if ($site_banner) {
-            $title = $site_banner;
-            $subtitle = '';
-        }
-
-        $c = Channel::get_cover_photo($channel_id, 'html');
-
-        if ($c) {
-            $c = str_replace('src=', 'data-src=', $c);
-            $photo_html = (($style) ? str_replace('alt=', ' style="' . $style . '" alt=', $c) : $c);
-
-            $o = replace_macros(Theme::get_template('cover_photo_widget.tpl'), array(
-                '$photo_html' => $photo_html,
-                '$title' => $title,
-                '$subtitle' => $subtitle,
-                '$hovertitle' => t('Click to show more'),
-                '$hide_cover' => $hide_cover
-            ));
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Design_tools.php b/Zotlabs/Widget/Design_tools.php
deleted file mode 100644
index 399525d05..000000000
--- a/Zotlabs/Widget/Design_tools.php
+++ /dev/null
@@ -1,19 +0,0 @@
- t('Events Tools'),
-            '$export' => t('Export Calendar'),
-            '$import' => t('Import Calendar'),
-            '$submit' => t('Submit')
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Filer.php b/Zotlabs/Widget/Filer.php
deleted file mode 100644
index 760f3e4af..000000000
--- a/Zotlabs/Widget/Filer.php
+++ /dev/null
@@ -1,44 +0,0 @@
- $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-        }
-
-        return replace_macros(Theme::get_template('fileas_widget.tpl'), array(
-            '$title' => t('Saved Folders'),
-            '$desc' => '',
-            '$sel_all' => (($selected == '') ? 'selected' : ''),
-            '$all' => t('Everything'),
-            '$terms' => $terms,
-            '$base' => z_root() . '/' . App::$cmd
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Findpeople.php b/Zotlabs/Widget/Findpeople.php
deleted file mode 100644
index 3b055ac95..000000000
--- a/Zotlabs/Widget/Findpeople.php
+++ /dev/null
@@ -1,47 +0,0 @@
-'
-                    . sprintf(tt('%d invitation available', '%d invitations available', $x), $x)
-                    . '' . $inv;
-            }
-        }
-
-        $advanced_search = ((local_channel() && Features::enabled(local_channel(), 'advanced_dirsearch')) ? t('Advanced') : false);
-
-        return replace_macros(Theme::get_template('peoplefind.tpl'), array(
-            '$findpeople' => t('Find Channels'),
-            '$desc' => t('Enter name or interest'),
-            '$label' => t('Connect/Follow'),
-            '$hint' => t('Examples: Robert Morgenstein, Fishing'),
-            '$findthem' => t('Find'),
-            '$suggest' => t('Channel Suggestions'),
-            '$similar' => '', // FIXME and uncomment when mod/match working // t('Similar Interests'),
-            '$random' => '', // t('Random Profile'),
-            '$sites' => t('Affiliated sites'),
-            '$inv' => '', // t('Invite Friends'),
-            '$advanced_search' => $advanced_search,
-            '$advanced_hint' => "\r\n" . t('Advanced example: name=fred and country=iceland'),
-            '$loggedin' => local_channel()
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Follow.php b/Zotlabs/Widget/Follow.php
deleted file mode 100644
index fec896a81..000000000
--- a/Zotlabs/Widget/Follow.php
+++ /dev/null
@@ -1,45 +0,0 @@
- t('Add New Connection'),
-            '$desc' => t('Enter channel address'),
-            '$hint' => t('Examples: bob@example.com, https://example.com/barbara'),
-            '$follow' => t('Connect'),
-            '$abook_usage_message' => $abook_usage_message
-        ]);
-    }
-}
diff --git a/Zotlabs/Widget/Fullprofile.php b/Zotlabs/Widget/Fullprofile.php
deleted file mode 100644
index c22729743..000000000
--- a/Zotlabs/Widget/Fullprofile.php
+++ /dev/null
@@ -1,20 +0,0 @@
-= 0) {
-            $limit = " limit " . intval($arr['limit']) . " ";
-        } else {
-            $limit = EMPTY_STR;
-        }
-
-        $unseen = 0;
-        if (is_array($arr) && array_key_exists('unseen', $arr) && intval($arr['unseen'])) {
-            $unseen = 1;
-        }
-
-        $perms_sql = item_permissions_sql(local_channel()) . item_normal();
-
-        $xf = false;
-
-        $x1 = q(
-            "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and not v like '%s'",
-            intval(local_channel()),
-            dbesc('%send_stream%')
-        );
-        if ($x1) {
-            $xc = ids_to_querystr($x1, 'xchan', true);
-
-            $x2 = q(
-                "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s' and xchan in (" . $xc . ") ",
-                intval(local_channel()),
-                dbesc('%tag_deliver%')
-            );
-
-            if ($x2) {
-                $xf = ids_to_querystr($x2, 'xchan', true);
-
-                // private forums
-                $x3 = q(
-                    "select xchan from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%s' and xchan in (" . $xc . ") and not xchan in (" . $xf . ") ",
-                    intval(local_channel()),
-                    dbesc('%post_wall%')
-                );
-                if ($x3) {
-                    $xf = ids_to_querystr(array_merge($x2, $x3), 'xchan', true);
-                }
-            }
-        }
-
-        // note: XCHAN_TYPE_GROUP = 1
-        $sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_type = 1 ) " : " and xchan_type = 1 ");
-
-        $r1 = q(
-            "select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name $limit ",
-            intval(local_channel())
-        );
-
-        if (!$r1) {
-            return $output;
-        }
-
-        $str = EMPTY_STR;
-
-        // Trying to cram all this into a single query with joins and the proper group by's is tough.
-        // There also should be a way to update this via ajax.
-
-        for ($x = 0; $x < count($r1); $x++) {
-            $r = q(
-                "select sum(item_unseen) as unseen from item 
-				where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ",
-                intval(local_channel()),
-                dbesc($r1[$x]['xchan_hash'])
-            );
-            if ($r) {
-                $r1[$x]['unseen'] = $r[0]['unseen'];
-            }
-        }
-
-        /**
-         * @FIXME
-         * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
-         * (like personal channels). However the stream query for these posts doesn't yet include this
-         * correction and it makes the SQL for that query pretty hairy so this is left as a future exercise.
-         * It may make more sense in that query to look for the mention in the body rather than another join,
-         * but that makes it very inefficient.
-         *
-         *        $r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
-         *            intval(TERM_OBJ_POST),
-         *            dbesc($r1[$x]['xchan_hash']),
-         *            intval(local_channel()),
-         *            dbesc($r1[$x]['xchan_url']),
-         *            intval(TERM_MENTION)
-         *        );
-         *        if($r)
-         *            $r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
-         *
-         * end @FIXME
-         */
-
-        if ($r1) {
-            $output .= '
          ';
-            $output .= '
          ' . t('Groups') . '
          ';
-        }
-        return $output;
-    }
-}
diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php
deleted file mode 100644
index c3d40b2a3..000000000
--- a/Zotlabs/Widget/Helpindex.php
+++ /dev/null
@@ -1,59 +0,0 @@
-';
-
-        $level_0 = get_help_content('sitetoc');
-        if (!$level_0) {
-            $path = 'toc';
-            $x = determine_help_language();
-            $lang = $x['language'];
-            if ($lang !== 'en') {
-                $path = $lang . '/toc';
-            }
-            $level_0 = get_help_content($path);
-        }
-
-        $level_0 = preg_replace('/\/', '
            ', $level_0);
-
-        $levels = [];
-
-
-        // TODO: Implement support for translations in hierarchical table of content files
-        /*
-        if(argc() > 2) {
-            $path = '';
-            for($x = 1; $x < argc(); $x ++) {
-                $path .= argv($x) . '/';
-                $y = get_help_content($path . 'sitetoc');
-                if(! $y)
-                    $y = get_help_content($path . 'toc');
-                if($y)
-                    $levels[] = preg_replace('/\/','
              ',$y);
-            }
-        }
-        */
-
-        if ($level_0) {
-            $o .= $level_0;
-        }
-        if ($levels) {
-            foreach ($levels as $l) {
-                $o .= '

              ';
-                $o .= $l;
-            }
-        }
-
-        $o .= '';
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Hq_controls.php b/Zotlabs/Widget/Hq_controls.php
deleted file mode 100644
index 55bc89b33..000000000
--- a/Zotlabs/Widget/Hq_controls.php
+++ /dev/null
@@ -1,33 +0,0 @@
- t('HQ Control Panel'),
-                '$menu' => [
-                    'create' => [
-                        'label' => t('Create a new post'),
-                        'id' => 'jot-toggle',
-                        'href' => '#',
-                        'class' => ''
-                    ]
-                ]
-            ]
-        );
-    }
-}
diff --git a/Zotlabs/Widget/Item.php b/Zotlabs/Widget/Item.php
deleted file mode 100644
index 599331e6b..000000000
--- a/Zotlabs/Widget/Item.php
+++ /dev/null
@@ -1,65 +0,0 @@
- t('Private Mail Menu'),
-            '$combined' => array(
-                'label' => t('Combined View'),
-                'url' => z_root() . '/mail/combined',
-                'sel' => (argv(1) == 'combined'),
-            ),
-            '$inbox' => array(
-                'label' => t('Inbox'),
-                'url' => z_root() . '/mail/inbox',
-                'sel' => (argv(1) == 'inbox'),
-            ),
-            '$outbox' => array(
-                'label' => t('Outbox'),
-                'url' => z_root() . '/mail/outbox',
-                'sel' => (argv(1) == 'outbox'),
-            ),
-            '$new' => array(
-                'label' => t('New Message'),
-                'url' => z_root() . '/mail/new',
-                'sel' => (argv(1) == 'new'),
-            )
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Menu_preview.php b/Zotlabs/Widget/Menu_preview.php
deleted file mode 100644
index ef8582e4c..000000000
--- a/Zotlabs/Widget/Menu_preview.php
+++ /dev/null
@@ -1,20 +0,0 @@
- 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/' . $c['channel_address'] => t('View your channel homepage'),
-                'stream' => t('View your stream'),
-            ],
-
-            t('Miscellaneous'),
-            [
-                'settings' => t('Settings'),
-            ]
-        ];
-
-        $public_stream_mode = intval(get_config('system', 'public_stream_mode', PUBLIC_STREAM_NONE));
-        // hack to put this in the correct spot of the array
-
-        if ($public_stream_mode) {
-            $options[5]['pubstream'] = t('View public stream');
-        }
-
-
-        $content = replace_macros(Theme::get_template('new_member.tpl'), [ '$options' => $options ]);
-    
-        $o = replace_macros(Theme::get_template('common_widget.tpl'), [
-            '$title' => t('New Member Links'),
-            '$content_id' => 'widget-new-member',
-            '$content' => $content,
-        ]);
-
- 
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
deleted file mode 100644
index 793bfb9b1..000000000
--- a/Zotlabs/Widget/Notes.php
+++ /dev/null
@@ -1,31 +0,0 @@
- t('Notes'),
-            '$text' => $text,
-            '$save' => t('Save'),
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
deleted file mode 100644
index b2d137569..000000000
--- a/Zotlabs/Widget/Notifications.php
+++ /dev/null
@@ -1,160 +0,0 @@
- 'stream',
-                'icon' => 'th',
-                'severity' => 'secondary',
-                'label' => t('New Stream Activity'),
-                'title' => t('New Stream Activity Notifications'),
-                'viewall' => [
-                    'url' => 'stream',
-                    'label' => t('View your stream activity')
-                ],
-                'markall' => [
-                    'label' => t('Mark all notifications read')
-                ],
-                'filter' => [
-                    'posts_label' => t('Show new posts only'),
-                    'name_label' => t('Filter by name')
-                ]
-            ];
-
-            $notifications[] = [
-                'type' => 'home',
-                'icon' => 'home',
-                'severity' => 'danger',
-                'label' => t('New Home Activity'),
-                'title' => t('New Home Activity Notifications'),
-                'viewall' => [
-                    'url' => 'channel/' . $channel['channel_address'],
-                    'label' => t('View your home activity')
-                ],
-                'markall' => [
-                    'label' => t('Mark all notifications seen')
-                ],
-                'filter' => [
-                    'posts_label' => t('Show new posts only'),
-                    'name_label' => t('Filter by name')
-                ]
-            ];
-
-            $notifications[] = [
-                'type' => 'all_events',
-                'icon' => 'calendar',
-                'severity' => 'secondary',
-                'label' => t('New Events'),
-                'title' => t('New Events Notifications'),
-                'viewall' => [
-                    'url' => 'events',
-                    'label' => t('View events')
-                ],
-                'markall' => [
-                    'label' => t('Mark all events seen')
-                ]
-            ];
-
-            $notifications[] = [
-                'type' => 'intros',
-                'icon' => 'users',
-                'severity' => 'danger',
-                'label' => t('New Connections'),
-                'title' => t('New Connections Notifications'),
-                'viewall' => [
-                    'url' => 'connections',
-                    'label' => t('View all connections')
-                ]
-            ];
-
-            $notifications[] = [
-                'type' => 'files',
-                'icon' => 'folder',
-                'severity' => 'danger',
-                'label' => t('New Files'),
-                'title' => t('New Files Notifications'),
-            ];
-
-            $notifications[] = [
-                'type' => 'notify',
-                'icon' => 'exclamation',
-                'severity' => 'danger',
-                'label' => t('Notices'),
-                'title' => t('Notices'),
-                'viewall' => [
-                    'url' => 'notifications/system',
-                    'label' => t('View all notices')
-                ],
-                'markall' => [
-                    'label' => t('Mark all notices seen')
-                ]
-            ];
-
-            $notifications[] = [
-                'type' => 'forums',
-                'icon' => 'comments-o',
-                'severity' => 'secondary',
-                'label' => t('Groups'),
-                'title' => t('Groups'),
-                'filter' => [
-                    'name_label' => t('Filter by name')
-                ]
-            ];
-        }
-
-        if (local_channel() && is_site_admin()) {
-            $notifications[] = [
-                'type' => 'register',
-                'icon' => 'user-o',
-                'severity' => 'danger',
-                'label' => t('New Registrations'),
-                'title' => t('New Registrations Notifications'),
-            ];
-        }
-
-        if (can_view_public_stream()) {
-            $notifications[] = [
-                'type' => 'pubs',
-                'icon' => 'globe',
-                'severity' => 'secondary',
-                'label' => t('Public Stream'),
-                'title' => t('Public Stream Notifications'),
-                'viewall' => [
-                    'url' => 'pubstream',
-                    'label' => t('View the public stream')
-                ],
-                'markall' => [
-                    'label' => t('Mark all notifications seen')
-                ],
-                'filter' => [
-                    'posts_label' => t('Show new posts only'),
-                    'name_label' => t('Filter by name')
-                ]
-            ];
-        }
-
-        $o = replace_macros(Theme::get_template('notifications_widget.tpl'), array(
-            '$module' => App::$module,
-            '$notifications' => $notifications,
-			'$notifications_label' => t('Notifications'),
-            '$no_notifications' => t('Sorry, you have got no notifications at the moment'),
-            '$loading' => t('Loading'),
-            '$startpage' => get_pconfig(local_channel(), 'system', 'startpage')
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Photo.php b/Zotlabs/Widget/Photo.php
deleted file mode 100644
index 3c6e781f8..000000000
--- a/Zotlabs/Widget/Photo.php
+++ /dev/null
@@ -1,61 +0,0 @@
-') !== false) {
-            $style = '';
-        }
-
-        if (array_key_exists('zrl', $arr) && isset($arr['zrl'])) {
-            $zrl = (($arr['zrl']) ? true : false);
-        }
-
-        if ($zrl) {
-            $url = zid($url);
-        }
-
-        $o = '
              ';
-
-        $o .= '' . t('photo/image') . '';
-
-        $o .= '
              ';
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Photo_albums.php b/Zotlabs/Widget/Photo_albums.php
deleted file mode 100644
index 39805b948..000000000
--- a/Zotlabs/Widget/Photo_albums.php
+++ /dev/null
@@ -1,31 +0,0 @@
- $channel_id), App::get_observer(), $album);
-
-        $filtered = [];
-        if ($ret['success'] && $ret['photos']) {
-            foreach ($ret['photos'] as $p) {
-                if ($p['imgscale'] == $scale) {
-                    $filtered[] = $p['src'];
-                }
-            }
-        }
-
-        if ($filtered) {
-            $e = mt_rand(0, count($filtered) - 1);
-            $url = $filtered[$e];
-        }
-
-        if (strpos($url, 'http') !== 0) {
-            return '';
-        }
-
-        if (array_key_exists('style', $arr) && isset($arr['style'])) {
-            $style = $arr['style'];
-        }
-
-        // ensure they can't sneak in an eval(js) function
-
-        if (strpos($style, '(') !== false) {
-            return '';
-        }
-
-        $url = zid($url);
-
-        $o = '
              ';
-
-        $o .= '' . t('photo/image') . '';
-
-        $o .= '
              ';
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php
deleted file mode 100644
index dfa7bfa19..000000000
--- a/Zotlabs/Widget/Pinned.php
+++ /dev/null
@@ -1,113 +0,0 @@
-allowed_types = get_config('system', 'pin_types', [ITEM_TYPE_POST]);
-
-        $this->uid = App::$profile_uid;
-
-        $types = (($args['types']) ?: [ITEM_TYPE_POST]);
-
-        $id_list = $this->list($types);
-
-        // logger('id_list: ' . print_r($id_list,true));
-
-        if (empty($id_list)) {
-            return $ret;
-        }
-
-        $o = conversation($id_list, 'stream-new', 0, 'traditional');
-
-        // change some id and class names so that auto-update doesn't stumble over them
-
-        $o = str_replace('
              ', '
              ', $o);
-        $o = str_replace('
              ', '
              ', $o);
-        $o = str_replace('
              ', '
              ', $o);
-        $o = str_replace('class="thread-wrapper ', 'class="pin-thread-wrapper ', $o);
-        $o = str_replace('class="wall-item-ago', 'class="wall-item-ago pinned', $o);
-
-        // logger('output: ' . $o);
-        return '
              ' . $o . '
              ';
-    }
-
-
-    /*
-     * @brief List pinned items depend on type
-     *
-     * @param $types
-     * @return array of pinned items
-     *
-     */
-    private function list($types)
-    {
-
-        if (empty($types) || (!is_array($types))) {
-            return [];
-        }
-
-        $item_types = array_intersect($this->allowed_types, $types);
-
-        if (empty($item_types)) {
-            return [];
-        }
-
-        $mids_list = [];
-
-        foreach ($item_types as $type) {
-            $mids = get_pconfig($this->uid, 'pinned', $type, []);
-            if ($mids) {
-                foreach ($mids as $mid) {
-                    if ($mid) {
-                        $mids_list[] = $mid;
-                    }
-                }
-            }
-        }
-        if (empty($mids_list)) {
-            return [];
-        }
-
-        $item_normal = item_normal();
-        $sql_extra = item_permissions_sql($this->uid);
-
-        $r = q(
-            "SELECT *, id as item_id FROM item WHERE parent_mid IN (" . protect_sprintf(stringify_array($mids_list, true)) . ") AND uid = %d AND id = parent $item_normal $sql_extra ORDER BY created DESC",
-            intval($this->uid)
-        );
-        if ($r) {
-            xchan_query($r, true);
-            $items = fetch_post_tags($r, true);
-
-            for ($x = 0; $x < count($items); $x++) {
-                $items[$x]['item_id'] = 'pin-' . $items[$x]['item_id'];
-            }
-
-            return $items;
-        }
-        return [];
-    }
-}
diff --git a/Zotlabs/Widget/Portfolio.php b/Zotlabs/Widget/Portfolio.php
deleted file mode 100644
index 74c4e8d79..000000000
--- a/Zotlabs/Widget/Portfolio.php
+++ /dev/null
@@ -1,132 +0,0 @@
- $rr['id'],
-                    'twist' => ' ' . $twist . rand(2, 4),
-                    'link' => $imagelink,
-                    'title' => t('View Photo'),
-                    'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' . $ext,
-                    'fullsrc' => z_root() . '/photo/' . $rr['resource_id'] . '-' . '1' . '.' . $ext,
-                    'resource_id' => $rr['resource_id'],
-                    'alt' => $imgalt_e,
-                    'desc' => $desc_e,
-                    'ext' => $ext,
-                    'hash' => $rr['resource_id'],
-                    'unknown' => t('Unknown')
-                );
-            }
-        }
-
-
-        $tpl = Theme::get_template('photo_album_portfolio.tpl');
-        $o .= replace_macros($tpl, array(
-            '$photos' => $photos,
-            '$mode' => $mode,
-            '$count' => $count,
-            '$album' => (($title) ? $title : $album),
-            '$album_id' => rand(),
-            '$album_edit' => array(t('Edit Album'), $album_edit),
-            '$can_post' => false,
-            '$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
-            '$order' => false,
-            '$upload_form' => $upload_form,
-            '$usage' => $usage_message
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Profile.php b/Zotlabs/Widget/Profile.php
deleted file mode 100644
index 4a32b33cf..000000000
--- a/Zotlabs/Widget/Profile.php
+++ /dev/null
@@ -1,20 +0,0 @@
-';
-            if ($r[0]['title']) {
-                $o .= '
              ' . $r[0]['title'] . '
              ';
-            }
-
-            $o .= prepare_text($r[0]['body'], $r[0]['mimetype']);
-            $o .= '
              ';
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Rating.php b/Zotlabs/Widget/Rating.php
deleted file mode 100644
index 34528d486..000000000
--- a/Zotlabs/Widget/Rating.php
+++ /dev/null
@@ -1,74 +0,0 @@
-';
-        $o .= '
              ' . t('Rating Tools') . '
              ';
-
-        if ((($remote) || (local_channel())) && (!$self)) {
-            if ($remote) {
-                $o .= ' ' . t('Rate Me') . '';
-            } else {
-                $o .= '
               ' . t('Rate Me') . '
              ';
-            }
-        }
-
-        $o .= ' ' . t('View Ratings') . '';
-        $o .= '
              ';
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Savedsearch.php b/Zotlabs/Widget/Savedsearch.php
deleted file mode 100644
index 9268a43f8..000000000
--- a/Zotlabs/Widget/Savedsearch.php
+++ /dev/null
@@ -1,105 +0,0 @@
- $rr['tid'],
-                    'term' => $rr['term'],
-                    'dellink' => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&searchremove=1&search=' . urlencode($rr['term']),
-                    'srchlink' => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&search=' . urlencode($rr['term']),
-                    'displayterm' => htmlspecialchars($rr['term'], ENT_COMPAT, 'UTF-8'),
-                    'encodedterm' => urlencode($rr['term']),
-                    'delete' => t('Remove term'),
-                    'selected' => ($search == $rr['term']),
-                );
-            }
-        }
-
-        $tpl = Theme::get_template("saved_searches.tpl");
-        $o = replace_macros($tpl, array(
-            '$title' => t('Saved Searches'),
-            '$add' => t('add'),
-            '$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), true),
-            '$saved' => $saved,
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Sblock.php b/Zotlabs/Widget/Sblock.php
deleted file mode 100644
index db28a2563..000000000
--- a/Zotlabs/Widget/Sblock.php
+++ /dev/null
@@ -1,27 +0,0 @@
- t('Block channel or site'),
-            '$desc' => t('Enter channel address or URL'),
-            '$hint' => t('Examples: bob@example.com, https://example.com/barbara'),
-            '$follow' => t('Block'),
-            '$abook_usage_message' => '',
-        ]);
-    }
-}
diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
deleted file mode 100644
index 6e585e2dd..000000000
--- a/Zotlabs/Widget/Settings_menu.php
+++ /dev/null
@@ -1,143 +0,0 @@
- 1) ? true : false);
-
-        $tabs = array(
-            array(
-                'label' => t('Account settings'),
-                'url' => z_root() . '/settings/account',
-                'selected' => ((argv(1) === 'account') ? 'active' : ''),
-            ),
-
-            array(
-                'label' => t('Channel settings'),
-                'url' => z_root() . '/settings/channel',
-                'selected' => ((argv(1) === 'channel') ? 'active' : ''),
-            ),
-
-        );
-
-        $tabs[] = array(
-            'label' => t('Display settings'),
-            'url' => z_root() . '/settings/display',
-            'selected' => ((argv(1) === 'display') ? 'active' : ''),
-        );
-
-        $tabs[] = array(
-            'label' => t('Manage Blocks'),
-            'url' => z_root() . '/superblock',
-            'selected' => ((argv(0) === 'superblock') ? 'active' : ''),
-        );
-
-
-        if ($hublocs) {
-            $tabs[] = array(
-                'label' => t('Manage locations'),
-                'url' => z_root() . '/locs',
-                'selected' => ((argv(1) === 'locs') ? 'active' : ''),
-            );
-        }
-
-        $tabs[] = array(
-            'label' => t('Export channel'),
-            'url' => z_root() . '/uexport',
-            'selected' => ''
-        );
-
-//      if(Features::enabled(local_channel(),'oauth_clients')) {
-//          $tabs[] =   array(
-//              'label' => t('OAuth1 apps'),
-//              'url' => z_root() . '/settings/oauth',
-//              'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
-//          );
-//      }
-
-        if (Apps::system_app_installed(local_channel(), 'Clients')) {
-            $tabs[] = array(
-                'label' => t('Client apps'),
-                'url' => z_root() . '/settings/oauth2',
-                'selected' => ((argv(1) === 'oauth2') ? 'active' : ''),
-            );
-        }
-
-//      if(Features::enabled(local_channel(),'access_tokens')) {
-//          $tabs[] =   array(
-//              'label' => t('Guest Access Tokens'),
-//              'url' => z_root() . '/settings/tokens',
-//              'selected' => ((argv(1) === 'tokens') ? 'active' : ''),
-//          );
-//      }
-
-      if(Apps::system_app_installed(local_channel(),'Roles')) {
-          $tabs[] = array(
-              'label' => t('Permission Roles'),
-              'url' => z_root() . '/settings/permcats',
-              'selected' => ((argv(1) === 'permcats') ? 'active' : ''),
-          );
-      }
-
-
-//      if($role === false || $role === 'custom') {
-//          $tabs[] = array(
-//              'label' => t('Connection Default Permissions'),
-//              'url' => z_root() . '/defperms',
-//              'selected' => ''
-//          );
-//      }
-
-//      if(Features::enabled(local_channel(),'channel_sources')) {
-//          $tabs[] = array(
-//              'label' => t('Channel Sources'),
-//              'url' => z_root() . '/sources',
-//              'selected' => ''
-//          );
-//      }
-
-        $tabtpl = Theme::get_template("generic_links_widget.tpl");
-        return replace_macros($tabtpl, array(
-            '$title' => t('Settings'),
-            '$class' => 'settings-widget',
-            '$items' => $tabs,
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Shortprofile.php b/Zotlabs/Widget/Shortprofile.php
deleted file mode 100644
index cbcfa0b6f..000000000
--- a/Zotlabs/Widget/Shortprofile.php
+++ /dev/null
@@ -1,18 +0,0 @@
- t('Projects'),
-                '$desc' => '',
-                '$all' => t('All projects'),
-                'base' => z_root() . '/sites',
-                '$sel_all' => (($_REQUEST['project']) ? false : true),
-                '$terms' => $results
-            ]);
-
-            return $o;
-        }
-    }
-
-    public static function site_sort($a, $b)
-    {
-        if ($a['site_type'] === $b['site_type']) {
-            return strcasecmp($b['site_project'], $a['site_project']);
-        }
-        return (($a['site_type'] < $b['site_type']) ? -1 : 1);
-    }
-}
diff --git a/Zotlabs/Widget/Sitesearch.php b/Zotlabs/Widget/Sitesearch.php
deleted file mode 100644
index 6edff8f4a..000000000
--- a/Zotlabs/Widget/Sitesearch.php
+++ /dev/null
@@ -1,44 +0,0 @@
- t('Search'),
-            '$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), false),
-            '$saved' => $saved,
-        ));
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Stream_order.php b/Zotlabs/Widget/Stream_order.php
deleted file mode 100644
index d13d88d47..000000000
--- a/Zotlabs/Widget/Stream_order.php
+++ /dev/null
@@ -1,147 +0,0 @@
- t('Commented Date'),
-            'icon' => '',
-            'url' => z_root() . '/' . $cmd . '?f=&order=comment' . $filter,
-            'sel' => $commentord_active,
-            'title' => t('Order by last commented date'),
-        ];
-        $tabs[] = [
-            'label' => t('Posted Date'),
-            'icon' => '',
-            'url' => z_root() . '/' . $cmd . '?f=&order=post' . $filter,
-            'sel' => $postord_active,
-            'title' => t('Order by last posted date'),
-        ];
-        $tabs[] = array(
-            'label' => t('Date Unthreaded'),
-            'icon' => '',
-            'url' => z_root() . '/' . $cmd . '?f=&order=unthreaded' . $filter,
-            'sel' => $unthreaded_active,
-            'title' => t('Order unthreaded by date'),
-        );
-
-        $arr = ['tabs' => $tabs];
-
-        Hook::call('activity_order', $arr);
-
-        $o = '';
-
-        if ($arr['tabs']) {
-            $content = replace_macros(Theme::get_template('common_pills.tpl'), [
-                '$pills' => $arr['tabs'],
-            ]);
-
-            $o = replace_macros(Theme::get_template('common_widget.tpl'), [
-                '$title' => t('Stream Order'),
-    			'$content_id' => 'widget-stream-order',
-                '$content' => $content,
-            ]);
-        }
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Suggestedchats.php b/Zotlabs/Widget/Suggestedchats.php
deleted file mode 100644
index 246a95a01..000000000
--- a/Zotlabs/Widget/Suggestedchats.php
+++ /dev/null
@@ -1,45 +0,0 @@
- t('Suggested Chatrooms'),
-            '$rooms' => $r
-        ));
-    }
-}
diff --git a/Zotlabs/Widget/Suggestions.php b/Zotlabs/Widget/Suggestions.php
deleted file mode 100644
index f60b8484b..000000000
--- a/Zotlabs/Widget/Suggestions.php
+++ /dev/null
@@ -1,63 +0,0 @@
- 2) ? mt_rand(0, count($r) - 2) : 0);
-
-        for ($x = $index; $x <= ($index + 1); $x++) {
-            $rr = $r[$x];
-            if (!$rr['xchan_url']) {
-                break;
-            }
-
-            $connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr'];
-
-            $arr[] = [
-                'url' => chanlink_url($rr['xchan_url']),
-                'profile' => $rr['xchan_url'],
-                'name' => $rr['xchan_name'],
-                'photo' => $rr['xchan_photo_m'],
-                'ignlnk' => z_root() . '/directory?return=' . base64_encode(App::$query_string) . '&ignore=' . $rr['xchan_hash'],
-                'conntxt' => t('Connect'),
-                'connlnk' => $connlnk,
-                'ignore' => t('Ignore/Hide')
-            ];
-        }
-
-        $o = replace_macros(Theme::get_template('suggest_widget.tpl'), [
-            '$title' => t('Suggestions'),
-            '$more' => t('See more...'),
-            '$entries' => $arr
-        ]);
-
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Tagcloud.php b/Zotlabs/Widget/Tagcloud.php
deleted file mode 100644
index 91b75bd59..000000000
--- a/Zotlabs/Widget/Tagcloud.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
              ' . t('Tags') . '
              ';
-            foreach ($r as $rv) {
-                $o .= '' . $rv[0] . '  ' . "\r\n";
-            }
-            $o .= '
              ';
-        }
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Tagcloud_wall.php b/Zotlabs/Widget/Tagcloud_wall.php
deleted file mode 100644
index 4f4705eb4..000000000
--- a/Zotlabs/Widget/Tagcloud_wall.php
+++ /dev/null
@@ -1,28 +0,0 @@
-var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});';
-        $o .= '';
-
-        $o .= '
              ' . '
              ' . t('Tasks') . '
              ';
-        $o .= '
              ';
-        $o .= '
              ';
-        return $o;
-    }
-}
diff --git a/Zotlabs/Widget/Vcard.php b/Zotlabs/Widget/Vcard.php
deleted file mode 100644
index 1b80c8356..000000000
--- a/Zotlabs/Widget/Vcard.php
+++ /dev/null
@@ -1,13 +0,0 @@
- 875));
-    }
-}
diff --git a/Zotlabs/Zot6/IHandler.php b/Zotlabs/Zot6/IHandler.php
deleted file mode 100644
index 6bbeae55b..000000000
--- a/Zotlabs/Zot6/IHandler.php
+++ /dev/null
@@ -1,15 +0,0 @@
-error = false;
-        $this->validated = false;
-        $this->messagetype = '';
-        $this->response = ['success' => false];
-        $this->handler = $handler;
-        $this->data = null;
-        $this->rawdata = null;
-        $this->site_id = null;
-        $this->prvkey = Config::get('system', 'prvkey');
-
-        if ($localdata) {
-            $this->rawdata = $localdata;
-        } else {
-            $this->rawdata = file_get_contents('php://input');
-
-            // All access to the zot endpoint must use http signatures
-
-            if (!$this->Valid_Httpsig()) {
-                logger('signature failed');
-                $this->error = true;
-                $this->response['message'] = 'signature invalid';
-                return;
-            }
-        }
-
-        logger('received raw: ' . print_r($this->rawdata, true), LOGGER_DATA);
-
-
-        if ($this->rawdata) {
-            $this->data = json_decode($this->rawdata, true);
-            if (($this->data) && (!is_array($this->data)) && (substr($this->data, 0, 1) === "{")) {
-                // Multiple json encoding has been seen in the wild and needs to be fixed on the sending side.
-                // Proceed anyway and log the event with a backtrace.
-
-                btlogger('multiple encoding detected');
-                $this->data = json_decode($this->data, true);
-            }
-        } else {
-            $this->error = true;
-            $this->response['message'] = 'no data';
-        }
-
-        logger('received_json: ' . json_encode($this->data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES), LOGGER_DATA);
-
-        logger('received: ' . print_r($this->data, true), LOGGER_DATA);
-
-        if ($this->data && is_array($this->data)) {
-            $this->encrypted = ((array_key_exists('encrypted', $this->data) && intval($this->data['encrypted'])) ? true : false);
-
-            if ($this->encrypted && $this->prvkey) {
-                $uncrypted = Crypto::unencapsulate($this->data, $this->prvkey);
-                if ($uncrypted) {
-                    $this->data = json_decode($uncrypted, true);
-                } else {
-                    $this->error = true;
-                    $this->response['message'] = 'no data';
-                }
-            }
-        }
-    }
-
-
-    public function run()
-    {
-
-        if ($this->error) {
-            // make timing attacks on the decryption engine a bit more difficult
-            usleep(mt_rand(10000, 100000));
-            return ($this->response);
-        }
-
-        if ($this->data) {
-            if (array_key_exists('type', $this->data)) {
-                $this->messagetype = $this->data['type'];
-            }
-
-            if (!$this->messagetype) {
-                $this->error = true;
-                $this->response['message'] = 'no datatype';
-                return $this->response;
-            }
-
-            $this->sender = ((array_key_exists('sender', $this->data)) ? $this->data['sender'] : null);
-            $this->recipients = ((array_key_exists('recipients', $this->data)) ? $this->data['recipients'] : null);
-            $this->site_id = ((array_key_exists('site_id', $this->data)) ? $this->data['site_id'] : null);
-        }
-
-        if ($this->sender) {
-            $result = $this->ValidateSender();
-            if (!$result) {
-                $this->error = true;
-                return $this->response;
-            }
-        }
-
-        return $this->Dispatch();
-    }
-
-    public function ValidateSender()
-    {
-
-        $hub = Libzot::valid_hub($this->sender, $this->site_id);
-
-        if (!$hub) {
-            $x = Libzot::register_hub($this->sigdata['signer']);
-            if ($x['success']) {
-                $hub = Libzot::valid_hub($this->sender, $this->site_id);
-            }
-            if (!$hub) {
-                $this->response['message'] = 'sender unknown';
-                return false;
-            }
-        }
-
-        if (!check_siteallowed($hub['hubloc_url'])) {
-            $this->response['message'] = 'forbidden';
-            return false;
-        }
-
-        if (!check_channelallowed($this->sender)) {
-            $this->response['message'] = 'forbidden';
-            return false;
-        }
-
-        Libzot::update_hub_connected($hub, $this->site_id);
-
-        $this->validated = true;
-        $this->hub = $hub;
-        return true;
-    }
-
-
-    public function Valid_Httpsig()
-    {
-
-        $result = false;
-
-        $this->sigdata = HTTPSig::verify($this->rawdata, EMPTY_STR, 'zot6');
-
-        if ($this->sigdata && $this->sigdata['header_signed'] && $this->sigdata['header_valid']) {
-            $result = true;
-
-            // It is OK to not have signed content - not all messages provide content.
-            // But if it is signed, it has to be valid
-
-            if (($this->sigdata['content_signed']) && (!$this->sigdata['content_valid'])) {
-                $result = false;
-            }
-        }
-        return $result;
-    }
-
-    public function Dispatch()
-    {
-
-        switch ($this->messagetype) {
-            case 'purge':
-                $this->response = $this->handler->Purge($this->sender, $this->recipients, $this->hub);
-                break;
-
-            case 'refresh':
-                $this->response = $this->handler->Refresh($this->sender, $this->recipients, $this->hub, false);
-                break;
-
-            case 'force_refresh':
-                $this->response = $this->handler->Refresh($this->sender, $this->recipients, $this->hub, true);
-                break;
-
-            case 'rekey':
-                $this->response = $this->handler->Rekey($this->sender, $this->data, $this->hub);
-                break;
-
-            case 'activity':
-            case 'response': // upstream message
-            case 'sync':
-            default:
-                // Only accept these message types with a valid sender
-                if ($this->sender) {
-                    $this->response = $this->handler->Notify($this->data, $this->hub);
-                }
-                break;
-        }
-
-        logger('response_to_return: ' . print_r($this->response, true), LOGGER_DATA);
-
-        if ($this->encrypted) {
-            $this->EncryptResponse();
-        }
-
-        return ($this->response);
-    }
-
-    public function EncryptResponse()
-    {
-        $algorithm = Libzot::best_algorithm($this->hub['site_crypto']);
-        if ($algorithm) {
-            $this->response = Crypto::encapsulate(json_encode($this->response), $this->hub['hubloc_sitekey'], $algorithm);
-        }
-    }
-}
diff --git a/Zotlabs/Zot6/Zot6Handler.php b/Zotlabs/Zot6/Zot6Handler.php
deleted file mode 100644
index 98dabcbba..000000000
--- a/Zotlabs/Zot6/Zot6Handler.php
+++ /dev/null
@@ -1,200 +0,0 @@
- false];
-
-        logger('notify received from ' . $hub['hubloc_url']);
-
-        $x = Libzot::fetch($data, $hub);
-        $ret['delivery_report'] = $x;
-
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-
-    /**
-     * @brief Remote channel info (such as permissions or photo or something)
-     * has been updated. Grab a fresh copy and sync it.
-     *
-     * The difference between refresh and force_refresh is that force_refresh
-     * unconditionally creates a directory update record, even if no changes were
-     * detected upon processing.
-     *
-     * @param array $sender
-     * @param array $recipients
-     *
-     * @return json_return_and_die()
-     */
-
-    public static function reply_refresh($sender, $recipients, $hub, $force)
-    {
-        $ret = array('success' => false);
-
-        if ($recipients) {
-            // This would be a permissions update, typically for one connection
-
-            foreach ($recipients as $recip) {
-                $r = q(
-                    "select channel.*,xchan.* from channel
-					left join xchan on channel_hash = xchan_hash
-					where channel_hash ='%s' limit 1",
-                    dbesc($recip)
-                );
-
-                $x = Libzot::refresh(['hubloc_id_url' => $hub['hubloc_id_url']], $r[0], $force);
-            }
-        } else {
-            // system wide refresh
-            $x = Libzot::refresh(['hubloc_id_url' => $hub['hubloc_id_url']], null, $force);
-        }
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-
-    public static function rekey_request($sender, $data, $hub)
-    {
-
-        $ret = array('success' => false);
-
-        //  newsig is newkey signed with oldkey
-
-        // The original xchan will remain. In Zot/Receiver we will have imported the new xchan and hubloc to verify
-        // the packet authenticity. What we will do now is verify that the keychange operation was signed by the
-        // oldkey, and if so change all the abook, abconfig, group, and permission elements which reference the
-        // old xchan_hash.
-
-        if ((!$data['old_key']) && (!$data['new_key']) && (!$data['new_sig'])) {
-            return $ret;
-        }
-
-
-        $old = null;
-
-        if (Libzot::verify($data['old_guid'], $data['old_guid_sig'], $data['old_key'])) {
-            $oldhash = make_xchan_hash($data['old_guid'], $data['old_key']);
-            $old = q(
-                "select * from xchan where xchan_hash = '%s' limit 1",
-                dbesc($oldhash)
-            );
-        } else {
-            return $ret;
-        }
-
-
-        if (!$old) {
-            return $ret;
-        }
-
-        $xchan = $old[0];
-
-        if (!Libzot::verify($data['new_key'], $data['new_sig'], $xchan['xchan_pubkey'])) {
-            return $ret;
-        }
-
-        $r = q(
-            "select * from xchan where xchan_hash = '%s' limit 1",
-            dbesc($sender)
-        );
-
-        $newxchan = $r[0];
-
-        // @todo
-        // if ! $update create a linked identity
-
-
-        xchan_change_key($xchan, $newxchan, $data);
-
-        $ret['success'] = true;
-        return $ret;
-    }
-
-
-    /**
-     * @brief
-     *
-     * @param array $sender
-     * @param array $recipients
-     *
-     * return json_return_and_die()
-     */
-
-    public static function reply_purge($sender, $recipients, $hub)
-    {
-
-        $ret = array('success' => false);
-
-        if (!$sender) {
-            return $ret;
-        }
-
-        if ($recipients) {
-            // basically this means "unfriend"
-            foreach ($recipients as $recip) {
-                $channel = q(
-                    "select channel.*,xchan.* from channel
-					left join xchan on channel_hash = xchan_hash
-					where channel_hash = '%s' limit 1",
-                    dbesc($recip)
-                );
-                if ($channel) {
-                    $abook = q(
-                        "select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
-                        intval($channel[0]['channel_id']),
-                        dbesc($sender)
-                    );
-                    if ($abook) {
-                        contact_remove($channel[0]['channel_id'], $abook[0]['abook_id']);
-                    }
-                }
-            }
-            $ret['success'] = true;
-        } else {
-            // Unfriend everybody - basically this means the channel has committed suicide
-
-            remove_all_xchan_resources($sender);
-
-            $ret['success'] = true;
-        }
-
-        return $ret;
-    }
-}
diff --git a/boot.php b/boot.php
index 921dbadf9..8ffc00758 100755
--- a/boot.php
+++ b/boot.php
@@ -1,21 +1,21 @@
 
 [audio]audio URL[/audio]
              [/nobb][/td]
 [td][/td][/tr]
-[tr][td][nobb][url=https://zotlabs.com]Zotlabs[/url][/nobb][/td]
-[td]Zotlabs[/td]
+[tr][td][nobb][url=https://zotlabs.com]Code[/url][/nobb][/td]
+[td]Code[/td]
 [/tr]
 [tr]
 [td][nobb]An image
diff --git a/doc/pl/admin/install.md b/doc/pl/admin/install.md
index ed8bbd117..3d26155b3 100644
--- a/doc/pl/admin/install.md
+++ b/doc/pl/admin/install.md
@@ -115,13 +115,13 @@ Ze względu na bezpieczeństwo witryny nie ma możliwości zapewnienia dostępu
 
 Skonfiguruj zadanie crona lub zaplanowane zadanie, aby uruchamiać menedżera crona co 10-15 minut do wykonywania w tle zadań przetwarzania i konserwacji. Przykład:
 
-	cd /base/directory; /path/to/php Zotlabs/Daemon/Run.php Cron
+	cd /base/directory; /path/to/php Code/Daemon/Run.php Cron
 
 Zmień "/base/directory" i "/path/to/php" na swoje rzeczywiste ścieżki.
 
 Jeśli używasz serwera Linux, uruchom "crontab -e" i dodaj linię podobną do pokazanej niżej, zastępując ścieżki i ustawienia swoimi danymi:
 
-	*/10 * * * *	cd /home/myname/mywebsite; /usr/bin/php Zotlabs/Daemon/Run.php Cron > /dev/null 2>&1
+	*/10 * * * *	cd /home/myname/mywebsite; /usr/bin/php Code/Daemon/Run.php Cron > /dev/null 2>&1
 
 Na ogół możesz znaleźć lokalizację PHP, wykonując "which php". Jeśli masz problemy z tą sekcją, skontaktuj się z dostawcą usług hostingowych w celu uzyskania pomocy. Oprogramowanie nie będzie działać poprawnie, jeśli nie możesz wykonać tego kroku.
 
diff --git a/include/api.php b/include/api.php
index a951755cc..903ecbb45 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1,7 +1,7 @@
 ' . "\r\n" . '' . Zotlabs\Lib\System::get_project_version() . '' . "\r\n";
+        echo '' . "\r\n" . '' . Code\Lib\System::get_project_version() . '' . "\r\n";
         killme();
     } elseif ($type === 'json') {
         header('Content-type: application/json');
-        echo '"' . Zotlabs\Lib\System::get_project_version() . '"';
+        echo '"' . Code\Lib\System::get_project_version() . '"';
         killme();
     }
 }
@@ -592,14 +592,14 @@ function zot_item_update($type)
     if (x($_FILES, 'media')) {
         $_FILES['userfile'] = $_FILES['media'];
         // upload the image if we have one
-        $mod = new Zotlabs\Module\Wall_attach();
+        $mod = new Code\Module\Wall_attach();
         $media = $mod->post();
         if ($media) {
             $_REQUEST['body'] .= "\n\n" . $media;
         }
     }
 
-    $mod = new Zotlabs\Module\Item();
+    $mod = new Code\Module\Item();
     $x = $mod->post();
     json_return_and_die($x);
 }
diff --git a/include/attach.php b/include/attach.php
index 40e618887..0d4b90a13 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -12,12 +12,12 @@
  * @todo Also an 'append' option to the storage function might be a useful addition.
  */
 
-use Zotlabs\Lib\Libsync;
-use Zotlabs\Lib\AccessList;
-use Zotlabs\Daemon\Run;
-use Zotlabs\Lib\Channel;
-use Zotlabs\Lib\ServiceClass;
-use Zotlabs\Extend\Hook;
+use Code\Lib\Libsync;
+use Code\Lib\AccessList;
+use Code\Daemon\Run;
+use Code\Lib\Channel;
+use Code\Lib\ServiceClass;
+use Code\Extend\Hook;
 require_once('include/permissions.php');
 require_once('include/security.php');
 
diff --git a/include/auth.php b/include/auth.php
index 2d5a2d61e..010c77641 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -10,9 +10,9 @@
  * Also provides a function for OpenID identiy matching.
  */
 
-use Zotlabs\Lib\Libzot;
-use Zotlabs\Lib\Channel;
-use Zotlabs\Extend\Hook;
+use Code\Lib\Libzot;
+use Code\Lib\Channel;
+use Code\Extend\Hook;
 
 require_once('include/api_auth.php');
 require_once('include/security.php');
diff --git a/include/bbcode.php b/include/bbcode.php
index c09cef053..96835e519 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,10 +1,10 @@
  xmlify(Zotlabs\Lib\System::get_project_version()),
-        '$generator'     => xmlify(Zotlabs\Lib\System::get_platform_name()),
+        '$version'       => xmlify(Code\Lib\System::get_project_version()),
+        '$generator'     => xmlify(Code\Lib\System::get_platform_name()),
 		'$generator_uri' => 'https://codeberg.org/' . ((PLATFORM_NAME === 'streams') ? 'streams' : 'zot') . '/' . PLATFORM_NAME,
         '$feed_id'       => xmlify($channel['xchan_url']),
         '$feed_title'    => xmlify($channel['channel_name']),
diff --git a/include/help.php b/include/help.php
index a02d81312..e4236dd7c 100644
--- a/include/help.php
+++ b/include/help.php
@@ -1,8 +1,8 @@
  false ];
 
-    $r = Zotlabs\Lib\Zotfinger::exec($url);
+    $r = Code\Lib\Zotfinger::exec($url);
 
     if (! $r['data']) {
         $ret['message'] = 'no answer from ' . $url;
diff --git a/include/import.php b/include/import.php
index ff57235f8..7c35f6dcd 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1,18 +1,18 @@
 run();
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 6e974cd28..8cbe8dea1 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -198,14 +198,14 @@ using web forms.
 8. Set up a cron job or scheduled task to run the Cron manager once every 10-15
 minutes to perform background processing and maintenance. Example:
 
-    cd /base/directory; /path/to/php Zotlabs/Daemon/Run.php Cron
+    cd /base/directory; /path/to/php Code/Daemon/Run.php Cron
 
 Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 
 If you are using a Linux server, run "crontab -e" and add a line like the
 one shown, substituting for your unique paths and settings:
 
-*/10 * * * *    cd /home/myname/mywebsite; /usr/bin/php Zotlabs/Daemon/Run.php Cron > /dev/null 2>&1
+*/10 * * * *    cd /home/myname/mywebsite; /usr/bin/php Code/Daemon/Run.php Cron > /dev/null 2>&1
 
 You can generally find the location of PHP by executing "which php". If you
 have troubles with this section please contact your hosting provider for
diff --git a/tests/infection.json.dist b/tests/infection.json.dist
index 36b251982..0ad72b300 100644
--- a/tests/infection.json.dist
+++ b/tests/infection.json.dist
@@ -3,7 +3,7 @@
     "source": {
         "directories": [
             "include",
-            "Zotlabs"
+            "Code"
         ]
     },
     "logs": {
diff --git a/tests/phpunit-pgsql.xml b/tests/phpunit-pgsql.xml
index 078056d56..8dca44773 100644
--- a/tests/phpunit-pgsql.xml
+++ b/tests/phpunit-pgsql.xml
@@ -21,7 +21,7 @@
     
     
         
-            ../Zotlabs/
+            ../Code/
             ../include/
         
     
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index 97c84fb81..3ca2b6271 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -24,7 +24,7 @@
     
     
         
-            ../Zotlabs/
+            ../Code/
             ../include/
         
     
diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php
index ea3fc5570..6a61eb2d2 100644
--- a/tests/unit/Access/AccessListTest.php
+++ b/tests/unit/Access/AccessListTest.php
@@ -22,15 +22,15 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit\Access;
+namespace Code\Tests\Unit\Access;
 
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\AccessControl;
+use Code\Tests\Unit\UnitTestCase;
+use Code\Access\AccessControl;
 
 /**
  * @brief Unit Test case for AccessList class.
  *
- * @covers Zotlabs\Access\AccessControl
+ * @covers Code\Access\AccessControl
  */
 class AccessListTest extends UnitTestCase
 {
diff --git a/tests/unit/Access/PermissionLimitsTest.php b/tests/unit/Access/PermissionLimitsTest.php
index 74b724c9a..7266b6c2d 100644
--- a/tests/unit/Access/PermissionLimitsTest.php
+++ b/tests/unit/Access/PermissionLimitsTest.php
@@ -22,17 +22,17 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit\Access;
+namespace Code\Tests\Unit\Access;
 
 use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\PermissionLimits;
-use Zotlabs\Extend\Hook;
+use Code\Tests\Unit\UnitTestCase;
+use Code\Access\PermissionLimits;
+use Code\Extend\Hook;
 
 /**
  * @brief Unit Test case for PermissionLimits class.
  *
- * @covers Zotlabs\Access\PermissionLimits
+ * @covers Code\Access\PermissionLimits
  */
 class PermissionLimitsTest extends UnitTestCase
 {
@@ -43,7 +43,7 @@ class PermissionLimitsTest extends UnitTestCase
      * Std_Limits() we could better unit test this method, now we test the
      * result of Permissions::Perms() mostly.
      *
-     * @uses Zotlabs\Access\Permissions::Perms
+     * @uses Code\Access\Permissions::Perms
      * @uses ::Hook::call
      */
     public function testStd_Limits()
@@ -52,7 +52,7 @@ class PermissionLimitsTest extends UnitTestCase
         $permsCount = 18;
 
         // Create a stub for global function t() with expectation
-        $t = $this->getFunctionMock('Zotlabs\Access', 't');
+        $t = $this->getFunctionMock('Code\Access', 't');
         $t->expects($this->exactly($permsCount));
 
         $stdlimits = PermissionLimits::Std_Limits();
diff --git a/tests/unit/Access/PermissionRolesTest.php b/tests/unit/Access/PermissionRolesTest.php
index 5ff2a5aae..19f8f9da0 100644
--- a/tests/unit/Access/PermissionRolesTest.php
+++ b/tests/unit/Access/PermissionRolesTest.php
@@ -22,19 +22,19 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit\Access;
+namespace Code\Tests\Unit\Access;
 
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\PermissionRoles;
+use Code\Tests\Unit\UnitTestCase;
+use Code\Access\PermissionRoles;
 use phpmock\phpunit\PHPMock;
-use Zotlabs\Extend\Hook;
+use Code\Extend\Hook;
 
 /**
  * @brief Unit Test case for PermissionRoles class.
  *
  * @TODO Work around dependencies to static PermissionLimits methods.
  *
- * @covers Zotlabs\Access\PermissionRoles
+ * @covers Code\Access\PermissionRoles
  */
 class PermissionRolesTest extends UnitTestCase
 {
@@ -54,7 +54,7 @@ class PermissionRolesTest extends UnitTestCase
     public function testRoles()
     {
         // Create a stub for global function t() with expectation
-        $t = $this->getFunctionMock('Zotlabs\Access', 't');
+        $t = $this->getFunctionMock('Code\Access', 't');
         $t->expects($this->atLeastOnce())->willReturnCallback(
             function ($string) {
                 return $string;
@@ -83,14 +83,14 @@ class PermissionRolesTest extends UnitTestCase
 
     /**
      * @uses ::Hook::call
-     * @uses Zotlabs\Access\PermissionLimits::Std_Limits
-     * @uses Zotlabs\Access\Permissions::Perms
+     * @uses Code\Access\PermissionLimits::Std_Limits
+     * @uses Code\Access\Permissions::Perms
      */
     public function testRole_perms()
     {
         // Create a stub for global function t()
-        $t = $this->getFunctionMock('Zotlabs\Access', 't');
-        $t = $this->getFunctionMock('Zotlabs\Access', 'get_config');
+        $t = $this->getFunctionMock('Code\Access', 't');
+        $t = $this->getFunctionMock('Code\Access', 'get_config');
 
         $rp_social = PermissionRoles::role_perms('social');
         $this->assertEquals('social', $rp_social['role']);
diff --git a/tests/unit/Access/PermissionsTest.php b/tests/unit/Access/PermissionsTest.php
index 2d4bb67e9..bb947aa9b 100644
--- a/tests/unit/Access/PermissionsTest.php
+++ b/tests/unit/Access/PermissionsTest.php
@@ -22,18 +22,18 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit\Access;
+namespace Code\Tests\Unit\Access;
 
 use phpmock\phpunit\PHPMock;
-use Zotlabs\Access\PermissionRoles;
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Access\Permissions;
-use Zotlabs\Extend\Hook;
+use Code\Access\PermissionRoles;
+use Code\Tests\Unit\UnitTestCase;
+use Code\Access\Permissions;
+use Code\Extend\Hook;
 
 /**
  * @brief Unit Test case for Permissions class.
  *
- * @covers Zotlabs\Access\Permissions
+ * @covers Code\Access\Permissions
  */
 class PermissionsTest extends UnitTestCase
 {
@@ -70,7 +70,7 @@ class PermissionsTest extends UnitTestCase
         $permsCount = 18;
 
         // Create a stub for global function t() with expectation
-        $t = $this->getFunctionMock('Zotlabs\Access', 't');
+        $t = $this->getFunctionMock('Code\Access', 't');
         $t->expects($this->exactly(2 * $permsCount))->willReturnCallback(
             function ($string) {
                 return $string;
@@ -105,7 +105,7 @@ class PermissionsTest extends UnitTestCase
         $permsCount = 18;
 
         // Create a stub for global function t() with expectation
-        $t = $this->getFunctionMock('Zotlabs\Access', 't');
+        $t = $this->getFunctionMock('Code\Access', 't');
         $t->expects($this->exactly(2 * $permsCount))->willReturnCallback(
             function ($string) {
                 return $string;
@@ -134,7 +134,7 @@ class PermissionsTest extends UnitTestCase
     public function testFilledPerms($permarr, $expected)
     {
         // Create a stub for global function t()
-        $t = $this->getFunctionMock('Zotlabs\Access', 't');
+        $t = $this->getFunctionMock('Code\Access', 't');
 
         $this->assertEquals($expected, Permissions::FilledPerms($permarr));
     }
@@ -223,10 +223,10 @@ class PermissionsTest extends UnitTestCase
     public function testFilledPermsNull()
     {
         // Create a stub for global function t() with expectation
-        $t = $this->getFunctionMock('Zotlabs\Access', 't');
+        $t = $this->getFunctionMock('Code\Access', 't');
         $t->expects($this->atLeastOnce());
         // Create a stub for global function bt() with expectations
-        $bt = $this->getFunctionMock('Zotlabs\Access', 'btlogger');
+        $bt = $this->getFunctionMock('Code\Access', 'btlogger');
         $bt->expects($this->once())->with($this->equalTo('FilledPerms: null'));
 
         $result = [
diff --git a/tests/unit/DatabaseTestCase.php b/tests/unit/DatabaseTestCase.php
index 60f3cd405..84f3ac0e3 100644
--- a/tests/unit/DatabaseTestCase.php
+++ b/tests/unit/DatabaseTestCase.php
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit;
+namespace Code\Tests\Unit;
 
 use PDO;
 use PHPUnit\DbUnit\Database\Connection;
diff --git a/tests/unit/Lib/MarkdownTest.php b/tests/unit/Lib/MarkdownTest.php
index c350397a2..40e3e404e 100644
--- a/tests/unit/Lib/MarkdownTest.php
+++ b/tests/unit/Lib/MarkdownTest.php
@@ -22,11 +22,11 @@
 * SOFTWARE.
 */
 
-namespace Zotlabs\Tests\Unit\includes;
+namespace Code\Tests\Unit\includes;
 
-use Zotlabs\Tests\Unit\UnitTestCase;
+use Code\Tests\Unit\UnitTestCase;
 use phpmock\phpunit\PHPMock;
-use Zotlabs\Lib\Markdown;
+use Code\Lib\Markdown;
 
 /**
  * @brief Unit Test case for markdown functions.
diff --git a/tests/unit/Lib/PermissionDescriptionTest.php b/tests/unit/Lib/PermissionDescriptionTest.php
index ce7853e41..91efc6f30 100644
--- a/tests/unit/Lib/PermissionDescriptionTest.php
+++ b/tests/unit/Lib/PermissionDescriptionTest.php
@@ -22,16 +22,16 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit\Lib;
+namespace Code\Tests\Unit\Lib;
 
 use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
-use Zotlabs\Lib\PermissionDescription;
+use Code\Tests\Unit\UnitTestCase;
+use Code\Lib\PermissionDescription;
 
 /**
  * @brief Unit Test case for PermissionDescription class.
  *
- * @covers Zotlabs\Lib\PermissionDescription
+ * @covers Code\Lib\PermissionDescription
  */
 class PermissionDescriptionTest extends UnitTestCase
 {
@@ -50,14 +50,14 @@ class PermissionDescriptionTest extends UnitTestCase
     public function testFromStandalonePermission()
     {
         // Create a stub for global function t()
-        $t = $this->getFunctionMock('Zotlabs\Lib', 't');
+        $t = $this->getFunctionMock('Code\Lib', 't');
         $t->expects($this->atLeastOnce())->willReturnCallback(
             function ($string) {
                 return $string;
             }
         );
         // Create a mock for global function logger()
-        $this->getFunctionMock('Zotlabs\Lib', 'logger');
+        $this->getFunctionMock('Code\Lib', 'logger');
 
         $permDescUnknown = PermissionDescription::fromStandalonePermission(-1);
         $permDescSelf = PermissionDescription::fromStandalonePermission(0);
@@ -78,14 +78,14 @@ class PermissionDescriptionTest extends UnitTestCase
     public function testGetPermissionDescription()
     {
         // Create a stub for global function t()
-        $t = $this->getFunctionMock('Zotlabs\Lib', 't');
+        $t = $this->getFunctionMock('Code\Lib', 't');
         $t->expects($this->atLeastOnce())->willReturnCallback(
             function ($string) {
                 return $string;
             }
         );
         // Create a mock for global function logger()
-        $this->getFunctionMock('Zotlabs\Lib', 'logger');
+        $this->getFunctionMock('Code\Lib', 'logger');
 
         // Create a stub for the PermissionDescription class
         $stub = $this->createMock(PermissionDescription::class);
diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php
index 16d49c618..95fbd4cec 100644
--- a/tests/unit/UnitTestCase.php
+++ b/tests/unit/UnitTestCase.php
@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit;
+namespace Code\Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php
index 1de250843..5b1e3a99e 100644
--- a/tests/unit/Web/HttpSigTest.php
+++ b/tests/unit/Web/HttpSigTest.php
@@ -21,17 +21,17 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit\Web;
+namespace Code\Tests\Unit\Web;
 
 use phpmock\phpunit\PHPMock;
-use Zotlabs\Tests\Unit\UnitTestCase;
+use Code\Tests\Unit\UnitTestCase;
 
-use Zotlabs\Web\HTTPSig;
+use Code\Web\HTTPSig;
 
 /**
  * @brief Unit Test case for HTTPSig class.
  *
- * @covers Zotlabs\Web\HTTPSig
+ * @covers Code\Web\HTTPSig
  */
 class PermissionDescriptionTest extends UnitTestCase
 {
@@ -113,7 +113,7 @@ class PermissionDescriptionTest extends UnitTestCase
     public function testDecrypt_sigheaderUseSitePrivateKey()
     {
         // Create a stub for global function get_config() with expectation
-        $t = $this->getFunctionMock('Zotlabs\Web', 'get_config');
+        $t = $this->getFunctionMock('Code\Web', 'get_config');
         $t->expects($this->once())->willReturn('system.prvkey');
 
         $header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
diff --git a/tests/unit/includes/LanguageTest.php b/tests/unit/includes/LanguageTest.php
index b713b5d4c..02c33b60b 100644
--- a/tests/unit/includes/LanguageTest.php
+++ b/tests/unit/includes/LanguageTest.php
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-namespace Zotlabs\Tests\Unit\includes;
+namespace Code\Tests\Unit\includes;
 
-use Zotlabs\Tests\Unit\UnitTestCase;
+use Code\Tests\Unit\UnitTestCase;
 use Text_LanguageDetect;
 
 //use phpmock\phpunit\PHPMock;
@@ -52,7 +52,7 @@ class LanguageTest extends UnitTestCase
         // If the calling function is in a namespace it would work.
         //$gc = $this->getFunctionMock(__NAMESPACE__, 'get_config');
         //$gc->expects($this->once())->willReturn(10)
-        //$cg = $this->getFunctionMock('Zotlabs\Lib\Config', 'Get');
+        //$cg = $this->getFunctionMock('Code\Lib\Config', 'Get');
         //$cg->expects($this->once())->willReturn(10);
         //$this->assertEquals($langCode, detect_language($text));
 
diff --git a/tests/unit/includes/TextTest.php b/tests/unit/includes/TextTest.php
index b23624354..aa15b04f3 100644
--- a/tests/unit/includes/TextTest.php
+++ b/tests/unit/includes/TextTest.php
@@ -1,8 +1,8 @@
 ') . PHP_EOL;
diff --git a/util/dcp b/util/dcp
index e7285cfa4..45a2d27d0 100755
--- a/util/dcp
+++ b/util/dcp
@@ -3,8 +3,8 @@
 
 // file import to DAV utility
 
-use Zotlabs\Daemon\Run;
-use Zotlabs\Lib\Channel;
+use Code\Daemon\Run;
+use Code\Lib\Channel;
 
 if(!file_exists('include/cli_startup.php')) {
 	echo 'Run dcp from the top level Hubzilla web directory, as util/dcp ' . PHP_EOL;
diff --git a/util/dmkdir b/util/dmkdir
index 89a5b0289..90f35fea3 100755
--- a/util/dmkdir
+++ b/util/dmkdir
@@ -2,8 +2,8 @@
 may apply to this list and any future members. If this is "
 "not what you intended, please create another list with a different name."
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:347
+#: Code/Lib/AccessList.php:347
 msgid "Add new connections to this access list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:374
+#: Code/Lib/AccessList.php:374
 msgid "edit"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:393 Zotlabs/Lib/Apps.php:377
-#: Zotlabs/Lib/Navbar.php:111 Zotlabs/Widget/Activity_filter.php:178
+#: Code/Lib/AccessList.php:393 Code/Lib/Apps.php:377
+#: Code/Lib/Navbar.php:111 Code/Widget/Activity_filter.php:178
 msgid "Lists"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:394
+#: Code/Lib/AccessList.php:394
 msgid "Edit list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:395
+#: Code/Lib/AccessList.php:395
 msgid "Create new list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:396
+#: Code/Lib/AccessList.php:396
 msgid "Channels not in any access list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:398 Zotlabs/Widget/Savedsearch.php:98
+#: Code/Lib/AccessList.php:398 Code/Widget/Savedsearch.php:98
 msgid "add"
 msgstr ""
 
-#: Zotlabs/Lib/Oembed.php:166
+#: Code/Lib/Oembed.php:166
 msgid "View PDF"
 msgstr ""
 
-#: Zotlabs/Lib/Oembed.php:382
+#: Code/Lib/Oembed.php:382
 msgid " by "
 msgstr ""
 
-#: Zotlabs/Lib/Oembed.php:385
+#: Code/Lib/Oembed.php:385
 msgid " on "
 msgstr ""
 
-#: Zotlabs/Lib/Oembed.php:416
+#: Code/Lib/Oembed.php:416
 msgid "Embedded content"
 msgstr ""
 
-#: Zotlabs/Lib/Oembed.php:425
+#: Code/Lib/Oembed.php:425
 msgid "Embedding disabled"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:62
+#: Code/Lib/Features.php:62
 msgid "General Features"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:66 Zotlabs/Widget/Newmember.php:69
+#: Code/Lib/Features.php:66 Code/Widget/Newmember.php:69
 msgid "New Member Links"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:67
+#: Code/Lib/Features.php:67
 msgid "Display new member quick links menu"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:75
+#: Code/Lib/Features.php:75
 msgid "Advanced Profiles"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:76
+#: Code/Lib/Features.php:76
 msgid "Additional profile sections and selections"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:122
+#: Code/Lib/Features.php:122
 msgid "Private Notes"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:123
+#: Code/Lib/Features.php:123
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:142 Zotlabs/Lib/Apps.php:347
-#: Zotlabs/Lib/Navbar.php:502
+#: Code/Lib/Features.php:142 Code/Lib/Apps.php:347
+#: Code/Lib/Navbar.php:502
 msgid "Articles"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:143
+#: Code/Lib/Features.php:143
 msgid "Create interactive articles"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:160
+#: Code/Lib/Features.php:160
 msgid "Photo Location"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:161
+#: Code/Lib/Features.php:161
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:189
+#: Code/Lib/Features.php:189
 msgid "Event Timezone Selection"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:190
+#: Code/Lib/Features.php:190
 msgid "Allow event creation in timezones other than your own."
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:208
+#: Code/Lib/Features.php:208
 msgid "Advanced Directory Search"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:209
+#: Code/Lib/Features.php:209
 msgid "Allows creation of complex directory search queries"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:217
+#: Code/Lib/Features.php:217
 msgid "Advanced Theme and Layout Settings"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:218
+#: Code/Lib/Features.php:218
 msgid "Allows fine tuning of themes and page layouts"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:227
+#: Code/Lib/Features.php:227
 msgid "Access Control and Permissions"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:231
+#: Code/Lib/Features.php:231
 msgid "Privacy Groups"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:232
+#: Code/Lib/Features.php:232
 msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:250 Zotlabs/Lib/Apps.php:390
+#: Code/Lib/Features.php:250 Code/Lib/Apps.php:390
 msgid "Permission Categories"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:251
+#: Code/Lib/Features.php:251
 msgid "Create custom connection permission limits"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:268
+#: Code/Lib/Features.php:268
 msgid "OAuth2 Clients"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:269
+#: Code/Lib/Features.php:269
 msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps."
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:289
+#: Code/Lib/Features.php:289
 msgid "Post Composition Features"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:311
+#: Code/Lib/Features.php:311
 msgid "Browser Encryption"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:312
+#: Code/Lib/Features.php:312
 msgid ""
 "Provide optional browser-to-browser encryption of content with a shared "
 "secret key"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:356
+#: Code/Lib/Features.php:356
 msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:357
+#: Code/Lib/Features.php:357
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:365
+#: Code/Lib/Features.php:365
 msgid "Auto-save drafts of posts and comments"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:366
+#: Code/Lib/Features.php:366
 msgid ""
 "Automatically saves post and comment drafts in local browser storage to help "
 "prevent accidental loss of compositions"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:377
+#: Code/Lib/Features.php:377
 msgid "Network and Stream Filtering"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:381 Zotlabs/Module/Settings/Network.php:60
+#: Code/Lib/Features.php:381 Code/Module/Settings/Network.php:60
 msgid "Search by Date"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:382 Zotlabs/Module/Settings/Network.php:61
+#: Code/Lib/Features.php:382 Code/Module/Settings/Network.php:61
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:391 Zotlabs/Module/Settings/Network.php:68
-#: Zotlabs/Widget/Savedsearch.php:97
+#: Code/Lib/Features.php:391 Code/Module/Settings/Network.php:68
+#: Code/Widget/Savedsearch.php:97
 msgid "Saved Searches"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:392 Zotlabs/Module/Settings/Network.php:69
+#: Code/Lib/Features.php:392 Code/Module/Settings/Network.php:69
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:400 Zotlabs/Module/Settings/Network.php:76
+#: Code/Lib/Features.php:400 Code/Module/Settings/Network.php:76
 msgid "Alternate Stream Order"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:401 Zotlabs/Module/Settings/Network.php:77
+#: Code/Lib/Features.php:401 Code/Module/Settings/Network.php:77
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:409 Zotlabs/Module/Settings/Network.php:84
+#: Code/Lib/Features.php:409 Code/Module/Settings/Network.php:84
 msgid "Contact Filter"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:410 Zotlabs/Module/Settings/Network.php:85
+#: Code/Lib/Features.php:410 Code/Module/Settings/Network.php:85
 msgid "Ability to display only posts of a selected contact"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:418 Zotlabs/Module/Settings/Network.php:92
+#: Code/Lib/Features.php:418 Code/Module/Settings/Network.php:92
 msgid "Forum Filter"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:419 Zotlabs/Module/Settings/Network.php:93
+#: Code/Lib/Features.php:419 Code/Module/Settings/Network.php:93
 msgid "Ability to display only posts of a specific forum"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:427 Zotlabs/Module/Settings/Network.php:100
+#: Code/Lib/Features.php:427 Code/Module/Settings/Network.php:100
 msgid "Personal Posts Filter"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:428 Zotlabs/Module/Settings/Network.php:101
+#: Code/Lib/Features.php:428 Code/Module/Settings/Network.php:101
 msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:436 Zotlabs/Module/Settings/Network.php:108
+#: Code/Lib/Features.php:436 Code/Module/Settings/Network.php:108
 msgid "Affinity Tool"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:437 Zotlabs/Module/Settings/Network.php:109
+#: Code/Lib/Features.php:437 Code/Module/Settings/Network.php:109
 msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:445 Zotlabs/Lib/Apps.php:412
-#: Zotlabs/Module/Settings/Network.php:116
+#: Code/Lib/Features.php:445 Code/Lib/Apps.php:412
+#: Code/Module/Settings/Network.php:116
 msgid "Suggest Channels"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:446 Zotlabs/Module/Settings/Network.php:117
+#: Code/Lib/Features.php:446 Code/Module/Settings/Network.php:117
 msgid "Show friend and connection suggestions"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:454 Zotlabs/Module/Settings/Network.php:124
+#: Code/Lib/Features.php:454 Code/Module/Settings/Network.php:124
 msgid "Connection Filtering"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:455 Zotlabs/Module/Settings/Network.php:125
+#: Code/Lib/Features.php:455 Code/Module/Settings/Network.php:125
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:467
+#: Code/Lib/Features.php:467
 msgid "Post/Comment Tools"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:471
+#: Code/Lib/Features.php:471
 msgid "Community Tagging"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:472
+#: Code/Lib/Features.php:472
 msgid "Ability to tag existing posts"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:480
+#: Code/Lib/Features.php:480
 msgid "Post Categories"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:481
+#: Code/Lib/Features.php:481
 msgid "Add categories to your posts"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:489
+#: Code/Lib/Features.php:489
 msgid "Emoji Reactions"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:490
+#: Code/Lib/Features.php:490
 msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:498 Zotlabs/Widget/Filer.php:36
-#: Zotlabs/Widget/Activity_filter.php:242
+#: Code/Lib/Features.php:498 Code/Widget/Filer.php:36
+#: Code/Widget/Activity_filter.php:242
 msgid "Saved Folders"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:499
+#: Code/Lib/Features.php:499
 msgid "Ability to file posts under folders"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:507
+#: Code/Lib/Features.php:507
 msgid "Dislike Posts"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:508
+#: Code/Lib/Features.php:508
 msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:525
+#: Code/Lib/Features.php:525
 msgid "Tag Cloud"
 msgstr ""
 
-#: Zotlabs/Lib/Features.php:526
+#: Code/Lib/Features.php:526
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: Zotlabs/Lib/Libzot.php:787
+#: Code/Lib/Libzot.php:787
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:77
+#: Code/Lib/Permcat.php:77
 msgctxt "permcat"
 msgid "default"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:156
+#: Code/Lib/Permcat.php:156
 msgctxt "permcat"
 msgid "follower"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:160
+#: Code/Lib/Permcat.php:160
 msgctxt "permcat"
 msgid "contributor"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:164
+#: Code/Lib/Permcat.php:164
 msgctxt "permcat"
 msgid "publisher"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:191
+#: Code/Lib/Permcat.php:191
 msgid "custom"
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:50 Zotlabs/Lib/Connect.php:172
+#: Code/Lib/Connect.php:50 Code/Lib/Connect.php:172
 msgid "Channel is blocked on this site."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:55
+#: Code/Lib/Connect.php:55
 msgid "Channel location missing."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:133
+#: Code/Lib/Connect.php:133
 msgid "Remote channel or protocol unavailable."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:166
+#: Code/Lib/Connect.php:166
 msgid "Channel discovery failed."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:180
+#: Code/Lib/Connect.php:180
 msgid "Protocol not supported"
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:193
+#: Code/Lib/Connect.php:193
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:271
+#: Code/Lib/Connect.php:271
 msgid "error saving data"
 msgstr ""
 
-#: Zotlabs/Lib/ServiceClass.php:35
+#: Code/Lib/ServiceClass.php:35
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: Zotlabs/Lib/ServiceClass.php:280 Zotlabs/Lib/ServiceClass.php:282
+#: Code/Lib/ServiceClass.php:280 Code/Lib/ServiceClass.php:282
 msgid "Click here to upgrade."
 msgstr ""
 
-#: Zotlabs/Lib/ServiceClass.php:290
+#: Code/Lib/ServiceClass.php:290
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: Zotlabs/Lib/ServiceClass.php:296
+#: Code/Lib/ServiceClass.php:296
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:345
+#: Code/Lib/Apps.php:345
 msgid "Site Admin"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:346 Zotlabs/Lib/Navbar.php:324
+#: Code/Lib/Apps.php:346 Code/Lib/Navbar.php:324
 msgid "Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:348
+#: Code/Lib/Apps.php:348
 msgid "CalDAV"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:349
+#: Code/Lib/Apps.php:349
 msgid "CardDAV"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:350 Zotlabs/Lib/Navbar.php:491
-#: Zotlabs/Module/Cards.php:215 include/conversation.php:2061
+#: Code/Lib/Apps.php:350 Code/Lib/Navbar.php:491
+#: Code/Module/Cards.php:215 include/conversation.php:2061
 msgid "Cards"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:351 Zotlabs/Lib/Navbar.php:453
-#: Zotlabs/Lib/Navbar.php:456 Zotlabs/Storage/Browser.php:157
+#: Code/Lib/Apps.php:351 Code/Lib/Navbar.php:453
+#: Code/Lib/Navbar.php:456 Code/Storage/Browser.php:157
 msgid "Calendar"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:352 Zotlabs/Module/Cdav.php:1076
-#: Zotlabs/Widget/Appcategories.php:52 Zotlabs/Widget/Categories.php:87
-#: Zotlabs/Widget/Categories.php:135 Zotlabs/Widget/Categories.php:186
+#: Code/Lib/Apps.php:352 Code/Module/Cdav.php:1076
+#: Code/Widget/Appcategories.php:52 Code/Widget/Categories.php:87
+#: Code/Widget/Categories.php:135 Code/Widget/Categories.php:186
 #: include/taxonomy.php:467 include/taxonomy.php:561 include/taxonomy.php:583
 #: include/taxonomy.php:606
 msgid "Categories"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:353
+#: Code/Lib/Apps.php:353
 msgid "Channel Home"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:354
+#: Code/Lib/Apps.php:354
 msgid "Channel Manager"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:355 Zotlabs/Module/Sources.php:115
+#: Code/Lib/Apps.php:355 Code/Module/Sources.php:115
 msgid "Channel Sources"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:356
+#: Code/Lib/Apps.php:356
 msgid "Chat"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:357 Zotlabs/Lib/Navbar.php:467
-#: Zotlabs/Lib/Navbar.php:470 Zotlabs/Widget/Chatroom_list.php:24
+#: Code/Lib/Apps.php:357 Code/Lib/Navbar.php:467
+#: Code/Lib/Navbar.php:470 Code/Widget/Chatroom_list.php:24
 #: include/conversation.php:2036 include/conversation.php:2039
 msgid "Chatrooms"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:358
+#: Code/Lib/Apps.php:358
 msgid "Clients"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:359 include/conversation.php:1445
+#: Code/Lib/Apps.php:359 include/conversation.php:1445
 msgid "Comment Control"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:360 Zotlabs/Module/Affinity.php:68
-#: Zotlabs/Module/Connections.php:371 Zotlabs/Module/Connedit.php:678
-#: Zotlabs/Module/Stream.php:139 Zotlabs/Widget/Activity_filter.php:150
-#: Zotlabs/Widget/Affinity.php:33 include/connections.php:968
+#: Code/Lib/Apps.php:360 Code/Module/Affinity.php:68
+#: Code/Module/Connections.php:371 Code/Module/Connedit.php:678
+#: Code/Module/Stream.php:139 Code/Widget/Activity_filter.php:150
+#: Code/Widget/Affinity.php:33 include/connections.php:968
 msgid "Connections"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:361
+#: Code/Lib/Apps.php:361
 msgid "Content Filter"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:362
+#: Code/Lib/Apps.php:362
 #: extend/addon/a/content_import/Mod_content_import.php:136
 msgid "Content Import"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:363 Zotlabs/Module/Directory.php:477
+#: Code/Lib/Apps.php:363 Code/Module/Directory.php:477
 msgid "Directory"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:364 Zotlabs/Widget/Activity_filter.php:81
+#: Code/Lib/Apps.php:364 Code/Widget/Activity_filter.php:81
 msgid "Drafts"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:365 Zotlabs/Widget/Activity_filter.php:109
+#: Code/Lib/Apps.php:365 Code/Widget/Activity_filter.php:109
 #: include/conversation.php:2022 include/conversation.php:2025
 msgid "Events"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:366
+#: Code/Lib/Apps.php:366
 msgid "Expire Posts"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:367
+#: Code/Lib/Apps.php:367
 msgid "Features"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:368 Zotlabs/Lib/Navbar.php:442
-#: Zotlabs/Module/Fbrowser.php:95 Zotlabs/Storage/Browser.php:298
+#: Code/Lib/Apps.php:368 Code/Lib/Navbar.php:442
+#: Code/Module/Fbrowser.php:95 Code/Storage/Browser.php:298
 #: include/conversation.php:2011
 msgid "Files"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:369 extend/addon/a/followlist/Mod_followlist.php:130
+#: Code/Lib/Apps.php:369 extend/addon/a/followlist/Mod_followlist.php:130
 msgid "Followlist"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:370 Zotlabs/Module/Connedit.php:667
+#: Code/Lib/Apps.php:370 Code/Module/Connedit.php:667
 msgid "Friend Zoom"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:371
+#: Code/Lib/Apps.php:371
 msgid "Future Posting"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:372 extend/addon/a/gallery/gallery.php:46
+#: Code/Lib/Apps.php:372 extend/addon/a/gallery/gallery.php:46
 #: extend/addon/a/gallery/Mod_Gallery.php:139
 msgid "Gallery"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:373
+#: Code/Lib/Apps.php:373
 msgid "Guest Pass"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:374 Zotlabs/Lib/Navbar.php:185
-#: Zotlabs/Lib/Navbar.php:305 include/help.php:70
+#: Code/Lib/Apps.php:374 Code/Lib/Navbar.php:185
+#: Code/Lib/Navbar.php:305 include/help.php:70
 msgid "Help"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:375
+#: Code/Lib/Apps.php:375
 msgid "Invite"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:376
+#: Code/Lib/Apps.php:376
 msgid "Language"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:378 Zotlabs/Lib/Navbar.php:136
-#: Zotlabs/Lib/Navbar.php:139 boot.php:1725
+#: Code/Lib/Apps.php:378 Code/Lib/Navbar.php:136
+#: Code/Lib/Navbar.php:139 boot.php:1725
 msgid "Login"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:379
+#: Code/Lib/Apps.php:379
 msgid "Mail"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:380
+#: Code/Lib/Apps.php:380
 msgid "Markup"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:381 Zotlabs/Module/Mood.php:166
+#: Code/Lib/Apps.php:381 Code/Module/Mood.php:166
 msgid "Mood"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:382
+#: Code/Lib/Apps.php:382
 msgid "My Chatrooms"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:383
+#: Code/Lib/Apps.php:383
 msgid "No Comment"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:384 Zotlabs/Widget/Notes.php:24
+#: Code/Lib/Apps.php:384 Code/Widget/Notes.php:24
 msgid "Notes"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:385 Zotlabs/Lib/Navbar.php:328
-#: Zotlabs/Module/Settings/Channel.php:691 Zotlabs/Widget/Notifications.php:152
+#: Code/Lib/Apps.php:385 Code/Lib/Navbar.php:328
+#: Code/Module/Settings/Channel.php:691 Code/Widget/Notifications.php:152
 msgid "Notifications"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:386
+#: Code/Lib/Apps.php:386
 msgid "OAuth Apps Manager"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:387
+#: Code/Lib/Apps.php:387
 msgid "OAuth2 Apps Manager"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:388
+#: Code/Lib/Apps.php:388
 msgid "Order Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:389
+#: Code/Lib/Apps.php:389
 msgid "PDL Editor"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:391 Zotlabs/Lib/Navbar.php:434
-#: Zotlabs/Module/Fbrowser.php:37 include/conversation.php:2003
+#: Code/Lib/Apps.php:391 Code/Lib/Navbar.php:434
+#: Code/Module/Fbrowser.php:37 include/conversation.php:2003
 msgid "Photos"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:392
+#: Code/Lib/Apps.php:392
 msgid "Photomap"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:393 Zotlabs/Module/Poke.php:142
+#: Code/Lib/Apps.php:393 Code/Module/Poke.php:142
 msgid "Poke"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:394
+#: Code/Lib/Apps.php:394
 msgid "Post"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:395
+#: Code/Lib/Apps.php:395
 msgid "Premium Channel"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:396
+#: Code/Lib/Apps.php:396
 msgid "Probe"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:398
+#: Code/Lib/Apps.php:398
 msgid "Profile Photo"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:399
+#: Code/Lib/Apps.php:399
 msgid "Profiles"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:400 Zotlabs/Module/Pubstream.php:99
-#: Zotlabs/Widget/Notifications.php:133
+#: Code/Lib/Apps.php:400 Code/Module/Pubstream.php:99
+#: Code/Widget/Notifications.php:133
 msgid "Public Stream"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:401
+#: Code/Lib/Apps.php:401
 msgid "Random Channel"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:402
+#: Code/Lib/Apps.php:402
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:403
+#: Code/Lib/Apps.php:403
 msgid "Report Bug"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:404
+#: Code/Lib/Apps.php:404
 msgid "Roles"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:405 Zotlabs/Lib/Navbar.php:192
-#: Zotlabs/Lib/Libacl.php:149 Zotlabs/Module/Connections.php:378
-#: Zotlabs/Module/Search.php:65 Zotlabs/Widget/Sitesearch.php:37
+#: Code/Lib/Apps.php:405 Code/Lib/Navbar.php:192
+#: Code/Lib/Libacl.php:149 Code/Module/Connections.php:378
+#: Code/Module/Search.php:65 Code/Widget/Sitesearch.php:37
 #: include/text.php:1052 include/text.php:1065
 msgid "Search"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:406
+#: Code/Lib/Apps.php:406
 msgid "Secrets"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:407 Zotlabs/Lib/Navbar.php:113
-#: Zotlabs/Module/Admin/Addons.php:341 Zotlabs/Module/Admin/Themes.php:139
-#: Zotlabs/Widget/Newmember.php:57 Zotlabs/Widget/Settings_menu.php:138
+#: Code/Lib/Apps.php:407 Code/Lib/Navbar.php:113
+#: Code/Module/Admin/Addons.php:341 Code/Module/Admin/Themes.php:139
+#: Code/Widget/Newmember.php:57 Code/Widget/Settings_menu.php:138
 msgid "Settings"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:408
+#: Code/Lib/Apps.php:408
 msgid "Sites"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:409
+#: Code/Lib/Apps.php:409
 msgid "Stream"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:410 Zotlabs/Widget/Stream_order.php:139
+#: Code/Lib/Apps.php:410 Code/Widget/Stream_order.php:139
 msgid "Stream Order"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:411
+#: Code/Lib/Apps.php:411
 msgid "Suggest"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:413
+#: Code/Lib/Apps.php:413
 msgid "Tagadelic"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:414 Zotlabs/Widget/Tasklist.php:30
+#: Code/Lib/Apps.php:414 Code/Widget/Tasklist.php:30
 msgid "Tasks"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:415
+#: Code/Lib/Apps.php:415
 msgid "View Bookmarks"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:416 Zotlabs/Lib/Navbar.php:125
-#: Zotlabs/Module/Connedit.php:552
+#: Code/Lib/Apps.php:416 Code/Lib/Navbar.php:125
+#: Code/Module/Connedit.php:552
 msgid "View Profile"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:417
+#: Code/Lib/Apps.php:417
 msgid "Virtual Lists"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:418 Zotlabs/Lib/Navbar.php:514
-#: Zotlabs/Module/Webpages.php:266 include/conversation.php:2083
+#: Code/Lib/Apps.php:418 Code/Lib/Navbar.php:514
+#: Code/Module/Webpages.php:266 include/conversation.php:2083
 msgid "Webpages"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:419 Zotlabs/Lib/Navbar.php:529
+#: Code/Lib/Apps.php:419 Code/Lib/Navbar.php:529
 #: include/conversation.php:2099
 msgid "Wiki"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:420 extend/addon/a/zotpost/Mod_zotpost.php:55
+#: Code/Lib/Apps.php:420 extend/addon/a/zotpost/Mod_zotpost.php:55
 msgid "ZotPost"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:597
+#: Code/Lib/Apps.php:597
 msgid "Installed"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:597 Zotlabs/Module/Admin/Addons.php:422
+#: Code/Lib/Apps.php:597 Code/Module/Admin/Addons.php:422
 msgid "Install"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:621
+#: Code/Lib/Apps.php:621
 msgid "Purchase"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:625 Zotlabs/Lib/ThreadItem.php:195
-#: Zotlabs/Module/Admin/Accounts.php:188 Zotlabs/Module/Admin/Channels.php:177
-#: Zotlabs/Module/Admin/Profs.php:193 Zotlabs/Module/Blocks.php:175
-#: Zotlabs/Module/Card_edit.php:140 Zotlabs/Module/Cdav.php:1063
-#: Zotlabs/Module/Cdav.php:1372 Zotlabs/Module/Connections.php:330
-#: Zotlabs/Module/Connedit.php:620 Zotlabs/Module/Connedit.php:890
-#: Zotlabs/Module/Editblock.php:154 Zotlabs/Module/Editlayout.php:151
-#: Zotlabs/Module/Editwebpage.php:185 Zotlabs/Module/Photos.php:1270
-#: Zotlabs/Module/Profiles.php:853 Zotlabs/Module/Settings/Oauth2.php:214
-#: Zotlabs/Module/Settings/Oauth.php:167 Zotlabs/Module/Thing.php:305
-#: Zotlabs/Module/Webpages.php:271 Zotlabs/Storage/Browser.php:319
+#: Code/Lib/Apps.php:625 Code/Lib/ThreadItem.php:195
+#: Code/Module/Admin/Accounts.php:188 Code/Module/Admin/Channels.php:177
+#: Code/Module/Admin/Profs.php:193 Code/Module/Blocks.php:175
+#: Code/Module/Card_edit.php:140 Code/Module/Cdav.php:1063
+#: Code/Module/Cdav.php:1372 Code/Module/Connections.php:330
+#: Code/Module/Connedit.php:620 Code/Module/Connedit.php:890
+#: Code/Module/Editblock.php:154 Code/Module/Editlayout.php:151
+#: Code/Module/Editwebpage.php:185 Code/Module/Photos.php:1270
+#: Code/Module/Profiles.php:853 Code/Module/Settings/Oauth2.php:214
+#: Code/Module/Settings/Oauth.php:167 Code/Module/Thing.php:305
+#: Code/Module/Webpages.php:271 Code/Storage/Browser.php:319
 #: include/conversation.php:606 include/conversation.php:660
 msgid "Delete"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:626
+#: Code/Lib/Apps.php:626
 msgid "Undelete"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:636
+#: Code/Lib/Apps.php:636
 msgid "Add to app-tray"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:637
+#: Code/Lib/Apps.php:637
 msgid "Remove from app-tray"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:638
+#: Code/Lib/Apps.php:638
 msgid "Pin to navbar"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:639
+#: Code/Lib/Apps.php:639
 msgid "Unpin from navbar"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:14 include/conversation.php:1301
+#: Code/Lib/Stringsjs.php:14 include/conversation.php:1301
 msgid "Delete this item?"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:15 Zotlabs/Lib/ThreadItem.php:953
-#: Zotlabs/Module/Photos.php:1196 Zotlabs/Module/Photos.php:1306
+#: Code/Lib/Stringsjs.php:15 Code/Lib/ThreadItem.php:953
+#: Code/Module/Photos.php:1196 Code/Module/Photos.php:1306
 msgid "Comment"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:16 Zotlabs/Lib/ThreadItem.php:576
+#: Code/Lib/Stringsjs.php:16 Code/Lib/ThreadItem.php:576
 #, php-format
 msgid "%s show all"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:17
+#: Code/Lib/Stringsjs.php:17
 #, php-format
 msgid "%s show less"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:18
+#: Code/Lib/Stringsjs.php:18
 #, php-format
 msgid "%s expand"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:19
+#: Code/Lib/Stringsjs.php:19
 #, php-format
 msgid "%s collapse"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:20
+#: Code/Lib/Stringsjs.php:20
 msgid "Password too short"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:21
+#: Code/Lib/Stringsjs.php:21
 msgid "Passwords do not match"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:22
+#: Code/Lib/Stringsjs.php:22
 msgid "everybody"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:23
+#: Code/Lib/Stringsjs.php:23
 msgid "Secret Passphrase"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:24
+#: Code/Lib/Stringsjs.php:24
 msgid "Passphrase hint"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:25
+#: Code/Lib/Stringsjs.php:25
 msgid "Notice: Permissions have changed but have not yet been submitted."
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:26
+#: Code/Lib/Stringsjs.php:26
 msgid "close all"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:27
+#: Code/Lib/Stringsjs.php:27
 msgid "Nothing new here"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:28
+#: Code/Lib/Stringsjs.php:28
 msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:29 Zotlabs/Module/Connedit.php:836
+#: Code/Lib/Stringsjs.php:29 Code/Module/Connedit.php:836
 msgid "Rating"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:30
+#: Code/Lib/Stringsjs.php:30
 msgid "Describe (optional)"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:31 Zotlabs/Lib/ThreadItem.php:954
-#: Zotlabs/Module/Admin/Account_edit.php:81
-#: Zotlabs/Module/Admin/Accounts.php:181 Zotlabs/Module/Admin/Addons.php:438
-#: Zotlabs/Module/Admin/Channels.php:175 Zotlabs/Module/Admin/Logs.php:87
-#: Zotlabs/Module/Admin/Profs.php:195 Zotlabs/Module/Admin/Security.php:172
-#: Zotlabs/Module/Admin/Site.php:315 Zotlabs/Module/Admin/Themes.php:172
-#: Zotlabs/Module/Affinity.php:89 Zotlabs/Module/Ap_probe.php:27
-#: Zotlabs/Module/Appman.php:163 Zotlabs/Module/Cal.php:363
-#: Zotlabs/Module/Chat.php:214 Zotlabs/Module/Chat.php:250
-#: Zotlabs/Module/Connect.php:99 Zotlabs/Module/Connedit.php:854
-#: Zotlabs/Module/Content_filter.php:68 Zotlabs/Module/Defperms.php:262
-#: Zotlabs/Module/Editpost.php:119 Zotlabs/Module/Email_validation.php:48
-#: Zotlabs/Module/Events.php:544 Zotlabs/Module/Expire.php:50
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Module/Finger.php:26
-#: Zotlabs/Module/Import.php:708 Zotlabs/Module/Import_items.php:144
-#: Zotlabs/Module/Invite.php:171 Zotlabs/Module/Lists.php:202
-#: Zotlabs/Module/Lists.php:214 Zotlabs/Module/Locs.php:138
-#: Zotlabs/Module/Mitem.php:274 Zotlabs/Module/Mood.php:170
-#: Zotlabs/Module/Pconfig.php:129 Zotlabs/Module/Pdledit.php:115
-#: Zotlabs/Module/Photos.php:1139 Zotlabs/Module/Photos.php:1197
-#: Zotlabs/Module/Photos.php:1307 Zotlabs/Module/Poke.php:151
-#: Zotlabs/Module/Profiles.php:772 Zotlabs/Module/Settings/Oauth2.php:115
-#: Zotlabs/Module/Settings/Permcats.php:146
-#: Zotlabs/Module/Settings/Tokens.php:317
-#: Zotlabs/Module/Settings/Account.php:117
-#: Zotlabs/Module/Settings/Channel.php:631
-#: Zotlabs/Module/Settings/Display.php:208
-#: Zotlabs/Module/Settings/Featured.php:63
-#: Zotlabs/Module/Settings/Features.php:66
-#: Zotlabs/Module/Settings/Network.php:48 Zotlabs/Module/Settings/Oauth.php:98
-#: Zotlabs/Module/Setup.php:334 Zotlabs/Module/Setup.php:379
-#: Zotlabs/Module/Thing.php:364 Zotlabs/Module/Thing.php:419
-#: Zotlabs/Module/Zot_probe.php:23 Zotlabs/Module/Xchan.php:18
-#: Zotlabs/Module/Sources.php:133 Zotlabs/Module/Sources.php:171
-#: Zotlabs/Module/Superblock.php:257 Zotlabs/Module/Zotfinger.php:30
-#: Zotlabs/Widget/Eventstools.php:22
+#: Code/Lib/Stringsjs.php:31 Code/Lib/ThreadItem.php:954
+#: Code/Module/Admin/Account_edit.php:81
+#: Code/Module/Admin/Accounts.php:181 Code/Module/Admin/Addons.php:438
+#: Code/Module/Admin/Channels.php:175 Code/Module/Admin/Logs.php:87
+#: Code/Module/Admin/Profs.php:195 Code/Module/Admin/Security.php:172
+#: Code/Module/Admin/Site.php:315 Code/Module/Admin/Themes.php:172
+#: Code/Module/Affinity.php:89 Code/Module/Ap_probe.php:27
+#: Code/Module/Appman.php:163 Code/Module/Cal.php:363
+#: Code/Module/Chat.php:214 Code/Module/Chat.php:250
+#: Code/Module/Connect.php:99 Code/Module/Connedit.php:854
+#: Code/Module/Content_filter.php:68 Code/Module/Defperms.php:262
+#: Code/Module/Editpost.php:119 Code/Module/Email_validation.php:48
+#: Code/Module/Events.php:544 Code/Module/Expire.php:50
+#: Code/Module/Filestorage.php:248 Code/Module/Finger.php:26
+#: Code/Module/Import.php:708 Code/Module/Import_items.php:144
+#: Code/Module/Invite.php:171 Code/Module/Lists.php:202
+#: Code/Module/Lists.php:214 Code/Module/Locs.php:138
+#: Code/Module/Mitem.php:274 Code/Module/Mood.php:170
+#: Code/Module/Pconfig.php:129 Code/Module/Pdledit.php:115
+#: Code/Module/Photos.php:1139 Code/Module/Photos.php:1197
+#: Code/Module/Photos.php:1307 Code/Module/Poke.php:151
+#: Code/Module/Profiles.php:772 Code/Module/Settings/Oauth2.php:115
+#: Code/Module/Settings/Permcats.php:146
+#: Code/Module/Settings/Tokens.php:317
+#: Code/Module/Settings/Account.php:117
+#: Code/Module/Settings/Channel.php:631
+#: Code/Module/Settings/Display.php:208
+#: Code/Module/Settings/Featured.php:63
+#: Code/Module/Settings/Features.php:66
+#: Code/Module/Settings/Network.php:48 Code/Module/Settings/Oauth.php:98
+#: Code/Module/Setup.php:334 Code/Module/Setup.php:379
+#: Code/Module/Thing.php:364 Code/Module/Thing.php:419
+#: Code/Module/Zot_probe.php:23 Code/Module/Xchan.php:18
+#: Code/Module/Sources.php:133 Code/Module/Sources.php:171
+#: Code/Module/Superblock.php:257 Code/Module/Zotfinger.php:30
+#: Code/Widget/Eventstools.php:22
 #: extend/addon/a/content_import/Mod_content_import.php:143
 #: extend/addon/a/faces/faces.php:126 extend/addon/a/faces/Mod_Faces.php:180
 #: extend/addon/a/flashcards/Mod_Flashcards.php:264
@@ -1494,1007 +1494,1007 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:32
+#: Code/Lib/Stringsjs.php:32
 msgid "Please enter a link URL"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:33
+#: Code/Lib/Stringsjs.php:33
 msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:34 Zotlabs/Module/Cdav.php:1024
-#: Zotlabs/Module/Events.php:526 Zotlabs/Module/Locs.php:134
-#: Zotlabs/Module/Profiles.php:542 Zotlabs/Module/Profiles.php:783
-#: Zotlabs/Module/Sites.php:96
+#: Code/Lib/Stringsjs.php:34 Code/Module/Cdav.php:1024
+#: Code/Module/Events.php:526 Code/Module/Locs.php:134
+#: Code/Module/Profiles.php:542 Code/Module/Profiles.php:783
+#: Code/Module/Sites.php:96
 msgid "Location"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:35
+#: Code/Lib/Stringsjs.php:35
 msgid "lovely"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:36
+#: Code/Lib/Stringsjs.php:36
 msgid "wonderful"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:37
+#: Code/Lib/Stringsjs.php:37
 msgid "fantastic"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:38
+#: Code/Lib/Stringsjs.php:38
 msgid "great"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:39
+#: Code/Lib/Stringsjs.php:39
 msgid ""
 "Your chosen nickname was either already taken or not valid. Please use our "
 "suggestion ("
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:40
+#: Code/Lib/Stringsjs.php:40
 msgid ") or enter a new one."
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:41
+#: Code/Lib/Stringsjs.php:41
 msgid "Thank you, this nickname is valid."
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:42
+#: Code/Lib/Stringsjs.php:42
 msgid "A channel name is required."
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:43
+#: Code/Lib/Stringsjs.php:43
 msgid "This is a "
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:44
+#: Code/Lib/Stringsjs.php:44
 msgid " channel name"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:45
+#: Code/Lib/Stringsjs.php:45
 msgid "Pinned"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:46 Zotlabs/Lib/ThreadItem.php:477
+#: Code/Lib/Stringsjs.php:46 Code/Lib/ThreadItem.php:477
 #: include/conversation.php:714
 msgid "Pin this post"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:47 Zotlabs/Lib/ThreadItem.php:477
+#: Code/Lib/Stringsjs.php:47 Code/Lib/ThreadItem.php:477
 #: include/conversation.php:714
 msgid "Unpin this post"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:48
+#: Code/Lib/Stringsjs.php:48
 msgid "Please accept terms to continue"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:54
+#: Code/Lib/Stringsjs.php:54
 msgid "timeago.prefixAgo"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:55
+#: Code/Lib/Stringsjs.php:55
 msgid "timeago.prefixFromNow"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:56
+#: Code/Lib/Stringsjs.php:56
 msgid "timeago.suffixAgo"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:57
+#: Code/Lib/Stringsjs.php:57
 msgid "timeago.suffixFromNow"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:60
+#: Code/Lib/Stringsjs.php:60
 msgid "less than a minute"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:61
+#: Code/Lib/Stringsjs.php:61
 msgid "about a minute"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:62
+#: Code/Lib/Stringsjs.php:62
 #, php-format
 msgid "%d minutes"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:63
+#: Code/Lib/Stringsjs.php:63
 msgid "about an hour"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:64
+#: Code/Lib/Stringsjs.php:64
 #, php-format
 msgid "about %d hours"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:65
+#: Code/Lib/Stringsjs.php:65
 msgid "a day"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:66
+#: Code/Lib/Stringsjs.php:66
 #, php-format
 msgid "%d days"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:67
+#: Code/Lib/Stringsjs.php:67
 msgid "about a month"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:68
+#: Code/Lib/Stringsjs.php:68
 #, php-format
 msgid "%d months"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:69
+#: Code/Lib/Stringsjs.php:69
 msgid "about a year"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:70
+#: Code/Lib/Stringsjs.php:70
 #, php-format
 msgid "%d years"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:71
+#: Code/Lib/Stringsjs.php:71
 msgid " "
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:72
+#: Code/Lib/Stringsjs.php:72
 msgid "timeago.numbers"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:74 include/text.php:1443
+#: Code/Lib/Stringsjs.php:74 include/text.php:1443
 msgid "January"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:75 include/text.php:1443
+#: Code/Lib/Stringsjs.php:75 include/text.php:1443
 msgid "February"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:76 include/text.php:1443
+#: Code/Lib/Stringsjs.php:76 include/text.php:1443
 msgid "March"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:77 include/text.php:1443
+#: Code/Lib/Stringsjs.php:77 include/text.php:1443
 msgid "April"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:78
+#: Code/Lib/Stringsjs.php:78
 msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:79 include/text.php:1443
+#: Code/Lib/Stringsjs.php:79 include/text.php:1443
 msgid "June"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:80 include/text.php:1443
+#: Code/Lib/Stringsjs.php:80 include/text.php:1443
 msgid "July"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:81 include/text.php:1443
+#: Code/Lib/Stringsjs.php:81 include/text.php:1443
 msgid "August"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:82 include/text.php:1443
+#: Code/Lib/Stringsjs.php:82 include/text.php:1443
 msgid "September"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:83 include/text.php:1443
+#: Code/Lib/Stringsjs.php:83 include/text.php:1443
 msgid "October"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:84 include/text.php:1443
+#: Code/Lib/Stringsjs.php:84 include/text.php:1443
 msgid "November"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:85 include/text.php:1443
+#: Code/Lib/Stringsjs.php:85 include/text.php:1443
 msgid "December"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:86
+#: Code/Lib/Stringsjs.php:86
 msgid "Jan"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:87
+#: Code/Lib/Stringsjs.php:87
 msgid "Feb"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:88
+#: Code/Lib/Stringsjs.php:88
 msgid "Mar"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:89
+#: Code/Lib/Stringsjs.php:89
 msgid "Apr"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:90
+#: Code/Lib/Stringsjs.php:90
 msgctxt "short"
 msgid "May"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:91
+#: Code/Lib/Stringsjs.php:91
 msgid "Jun"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:92
+#: Code/Lib/Stringsjs.php:92
 msgid "Jul"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:93
+#: Code/Lib/Stringsjs.php:93
 msgid "Aug"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:94
+#: Code/Lib/Stringsjs.php:94
 msgid "Sep"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:95
+#: Code/Lib/Stringsjs.php:95
 msgid "Oct"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:96
+#: Code/Lib/Stringsjs.php:96
 msgid "Nov"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:97
+#: Code/Lib/Stringsjs.php:97
 msgid "Dec"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:98 Zotlabs/Module/Settings/Channel.php:760
+#: Code/Lib/Stringsjs.php:98 Code/Module/Settings/Channel.php:760
 #: include/text.php:1437
 msgid "Sunday"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:99 Zotlabs/Module/Settings/Channel.php:761
+#: Code/Lib/Stringsjs.php:99 Code/Module/Settings/Channel.php:761
 #: include/text.php:1437
 msgid "Monday"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:100 Zotlabs/Module/Settings/Channel.php:762
+#: Code/Lib/Stringsjs.php:100 Code/Module/Settings/Channel.php:762
 #: include/text.php:1437
 msgid "Tuesday"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:101 Zotlabs/Module/Settings/Channel.php:763
+#: Code/Lib/Stringsjs.php:101 Code/Module/Settings/Channel.php:763
 #: include/text.php:1437
 msgid "Wednesday"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:102 Zotlabs/Module/Settings/Channel.php:764
+#: Code/Lib/Stringsjs.php:102 Code/Module/Settings/Channel.php:764
 #: include/text.php:1437
 msgid "Thursday"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:103 Zotlabs/Module/Settings/Channel.php:765
+#: Code/Lib/Stringsjs.php:103 Code/Module/Settings/Channel.php:765
 #: include/text.php:1437
 msgid "Friday"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:104 Zotlabs/Module/Settings/Channel.php:766
+#: Code/Lib/Stringsjs.php:104 Code/Module/Settings/Channel.php:766
 #: include/text.php:1437
 msgid "Saturday"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:105
+#: Code/Lib/Stringsjs.php:105
 msgid "Sun"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:106
+#: Code/Lib/Stringsjs.php:106
 msgid "Mon"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:107
+#: Code/Lib/Stringsjs.php:107
 msgid "Tue"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:108
+#: Code/Lib/Stringsjs.php:108
 msgid "Wed"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:109
+#: Code/Lib/Stringsjs.php:109
 msgid "Thu"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:110
+#: Code/Lib/Stringsjs.php:110
 msgid "Fri"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:111
+#: Code/Lib/Stringsjs.php:111
 msgid "Sat"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:112
+#: Code/Lib/Stringsjs.php:112
 msgctxt "calendar"
 msgid "today"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:113
+#: Code/Lib/Stringsjs.php:113
 msgctxt "calendar"
 msgid "month"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:114
+#: Code/Lib/Stringsjs.php:114
 msgctxt "calendar"
 msgid "week"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:115
+#: Code/Lib/Stringsjs.php:115
 msgctxt "calendar"
 msgid "day"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:116
+#: Code/Lib/Stringsjs.php:116
 msgctxt "calendar"
 msgid "All day"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:117
+#: Code/Lib/Stringsjs.php:117
 msgid ""
 "A social networking profile that is public by default and private if desired"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:118
+#: Code/Lib/Stringsjs.php:118
 msgid ""
 "A social networking profile where content is private to your [Friends] "
 "Access List by default but can be made public if desired"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:119
+#: Code/Lib/Stringsjs.php:119
 msgid "A public group where members are allowed to upload media by default"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:120
+#: Code/Lib/Stringsjs.php:120
 msgid "A private group with no upload permission"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:121
+#: Code/Lib/Stringsjs.php:121
 msgid ""
 "A public group where posts are moderated by the owner. The [moderated] "
 "permission may be removed from any group member once trust is established"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:122
+#: Code/Lib/Stringsjs.php:122
 msgid ""
 "A sub-channel of your main channel - often devoted to a specific language or "
 "topic. Replies are sent back to your main channel"
 msgstr ""
 
-#: Zotlabs/Lib/Stringsjs.php:123
+#: Code/Lib/Stringsjs.php:123
 msgid ""
 "A private sub-channel of your main channel - often devoted to a specific "
 "language or topic. Replies are sent back to your main channel"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:52
+#: Code/Lib/Channel.php:52
 msgid "Empty name"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:56
+#: Code/Lib/Channel.php:56
 msgid "Name too long"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:241
+#: Code/Lib/Channel.php:241
 msgid "No account identifier"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:253
+#: Code/Lib/Channel.php:253
 msgid "Nickname is required."
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:267 Zotlabs/Lib/Channel.php:722
-#: Zotlabs/Module/Changeaddr.php:72
+#: Code/Lib/Channel.php:267 Code/Lib/Channel.php:722
+#: Code/Module/Changeaddr.php:72
 msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:272 Zotlabs/Lib/Channel.php:727
-#: Zotlabs/Module/Changeaddr.php:77
+#: Code/Lib/Channel.php:272 Code/Lib/Channel.php:727
+#: Code/Module/Changeaddr.php:77
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:344
+#: Code/Lib/Channel.php:344
 msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:648 Zotlabs/Lib/Channel.php:746
+#: Code/Lib/Channel.php:648 Code/Lib/Channel.php:746
 msgid "Unable to retrieve modified identity"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:1813 Zotlabs/Module/Cover_photo.php:293
+#: Code/Lib/Channel.php:1813 Code/Module/Cover_photo.php:293
 msgid "cover photo"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:2114 Zotlabs/Module/Rmagic.php:88 boot.php:1726
+#: Code/Lib/Channel.php:2114 Code/Module/Rmagic.php:88 boot.php:1726
 msgid "Remote Authentication"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:2115 Zotlabs/Module/Rmagic.php:89
+#: Code/Lib/Channel.php:2115 Code/Module/Rmagic.php:89
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: Zotlabs/Lib/Channel.php:2116 Zotlabs/Module/Rmagic.php:92
+#: Code/Lib/Channel.php:2116 Code/Module/Rmagic.php:92
 msgid "Authenticate"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:103
+#: Code/Lib/Navbar.php:103
 msgid "Remote authentication"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:103
+#: Code/Lib/Navbar.php:103
 msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:108 Zotlabs/Module/Admin.php:147
-#: Zotlabs/Module/Admin/Channels.php:174 Zotlabs/Module/Manage.php:187
-#: Zotlabs/Widget/Admin.php:33
+#: Code/Lib/Navbar.php:108 Code/Module/Admin.php:147
+#: Code/Module/Admin/Channels.php:174 Code/Module/Manage.php:187
+#: Code/Widget/Admin.php:33
 msgid "Channels"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:108
+#: Code/Lib/Navbar.php:108
 msgid "Manage your channels"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:111
+#: Code/Lib/Navbar.php:111
 msgid "Manage your access lists"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:113
+#: Code/Lib/Navbar.php:113
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:115
+#: Code/Lib/Navbar.php:115
 msgid "(is on)"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:115
+#: Code/Lib/Navbar.php:115
 msgid "(is off)"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:115
+#: Code/Lib/Navbar.php:115
 msgid "Content filtering"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:122 Zotlabs/Lib/Navbar.php:149
-#: Zotlabs/Lib/Navbar.php:167 boot.php:1724
+#: Code/Lib/Navbar.php:122 Code/Lib/Navbar.php:149
+#: Code/Lib/Navbar.php:167 boot.php:1724
 msgid "Logout"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:122 Zotlabs/Lib/Navbar.php:149
+#: Code/Lib/Navbar.php:122 Code/Lib/Navbar.php:149
 msgid "End this session"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:125
+#: Code/Lib/Navbar.php:125
 msgid "Your profile page"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:128
+#: Code/Lib/Navbar.php:128
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:130 Zotlabs/Widget/Newmember.php:39
+#: Code/Lib/Navbar.php:130 Code/Widget/Newmember.php:39
 msgid "Edit your profile"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:136 Zotlabs/Lib/Navbar.php:139
+#: Code/Lib/Navbar.php:136 Code/Lib/Navbar.php:139
 msgid "Sign in"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:165
+#: Code/Lib/Navbar.php:165
 msgid "Take me home"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:167
+#: Code/Lib/Navbar.php:167
 msgid "Log me out of this site"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:172 Zotlabs/Module/Register.php:307
-#: Zotlabs/Module/Sites.php:57 boot.php:1705
+#: Code/Lib/Navbar.php:172 Code/Module/Register.php:307
+#: Code/Module/Sites.php:57 boot.php:1705
 msgid "Register"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:172
+#: Code/Lib/Navbar.php:172
 msgid "Create an account"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:185
+#: Code/Lib/Navbar.php:185
 msgid "Help and documentation"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:192
+#: Code/Lib/Navbar.php:192
 msgid "Search site @name, #tag, ?doc, content"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:198 Zotlabs/Widget/Admin.php:64
+#: Code/Lib/Navbar.php:198 Code/Widget/Admin.php:64
 msgid "Admin"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:198
+#: Code/Lib/Navbar.php:198
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:304
+#: Code/Lib/Navbar.php:304
 msgid "Powered by $Projectname"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:309 Zotlabs/Module/Connedit.php:817
-#: Zotlabs/Module/Defperms.php:253 Zotlabs/Module/New_channel.php:174
-#: Zotlabs/Module/New_channel.php:181 Zotlabs/Widget/Notifications.php:154
+#: Code/Lib/Navbar.php:309 Code/Module/Connedit.php:817
+#: Code/Module/Defperms.php:253 Code/Module/New_channel.php:174
+#: Code/Module/New_channel.php:181 Code/Widget/Notifications.php:154
 msgid "Loading"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:315
+#: Code/Lib/Navbar.php:315
 msgid "Side Panel"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:316
+#: Code/Lib/Navbar.php:316
 msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:317
+#: Code/Lib/Navbar.php:317
 msgid "Please wait..."
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:323 Zotlabs/Module/Apps.php:59
-#: Zotlabs/Widget/Appstore.php:17
+#: Code/Lib/Navbar.php:323 Code/Module/Apps.php:59
+#: Code/Widget/Appstore.php:17
 msgid "Installed Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:325 Zotlabs/Module/Apps.php:59
-#: Zotlabs/Widget/Appstore.php:18
+#: Code/Lib/Navbar.php:325 Code/Module/Apps.php:59
+#: Code/Widget/Appstore.php:18
 msgid "Available Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:326 Zotlabs/Module/Apporder.php:49
+#: Code/Lib/Navbar.php:326 Code/Module/Apporder.php:49
 msgid "Arrange Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:327
+#: Code/Lib/Navbar.php:327
 msgid "Toggle System Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:411 Zotlabs/Module/Admin/Channels.php:182
+#: Code/Lib/Navbar.php:411 Code/Module/Admin/Channels.php:182
 #: include/conversation.php:1980
 msgid "Channel"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:414 include/conversation.php:1983
+#: Code/Lib/Navbar.php:414 include/conversation.php:1983
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:424 include/conversation.php:1993
+#: Code/Lib/Navbar.php:424 include/conversation.php:1993
 msgid "About"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:427 include/conversation.php:1996
+#: Code/Lib/Navbar.php:427 include/conversation.php:1996
 msgid "Profile Details"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:437 include/photos.php:759
+#: Code/Lib/Navbar.php:437 include/photos.php:759
 #: include/conversation.php:2006
 msgid "Photo Albums"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:445 include/conversation.php:2014
+#: Code/Lib/Navbar.php:445 include/conversation.php:2014
 msgid "Files and Storage"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:480 include/conversation.php:2050
+#: Code/Lib/Navbar.php:480 include/conversation.php:2050
 msgid "Bookmarks"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:483 include/conversation.php:2053
+#: Code/Lib/Navbar.php:483 include/conversation.php:2053
 msgid "Saved Bookmarks"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:494 include/conversation.php:2064
+#: Code/Lib/Navbar.php:494 include/conversation.php:2064
 msgid "View Cards"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:505 include/conversation.php:2075
+#: Code/Lib/Navbar.php:505 include/conversation.php:2075
 msgid "View Articles"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:517 include/conversation.php:2086
+#: Code/Lib/Navbar.php:517 include/conversation.php:2086
 msgid "View Webpages"
 msgstr ""
 
-#: Zotlabs/Lib/Navbar.php:526 include/conversation.php:2096
+#: Code/Lib/Navbar.php:526 include/conversation.php:2096
 msgid "Wikis"
 msgstr ""
 
-#: Zotlabs/Lib/Libsync.php:980
+#: Code/Lib/Libsync.php:980
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:74
+#: Code/Lib/Enotify.php:74
 msgid "$Projectname Notification"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:75
+#: Code/Lib/Enotify.php:75
 msgid "$projectname"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:77
+#: Code/Lib/Enotify.php:77
 msgid "Thank You,"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:79
+#: Code/Lib/Enotify.php:79
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:80
+#: Code/Lib/Enotify.php:80
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:80 Zotlabs/Module/Home.php:144
-#: Zotlabs/Module/Home.php:153 extend/addon/a/opensearch/Mod_opensearch.php:28
+#: Code/Lib/Enotify.php:80 Code/Module/Home.php:144
+#: Code/Module/Home.php:153 extend/addon/a/opensearch/Mod_opensearch.php:28
 msgid "$Projectname"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:81
+#: Code/Lib/Enotify.php:81
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
 "at %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:82
+#: Code/Lib/Enotify.php:82
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:82
+#: Code/Lib/Enotify.php:82
 msgid "Notification Settings"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:139
+#: Code/Lib/Enotify.php:139
 #, php-format
 msgid "%s "
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:143
+#: Code/Lib/Enotify.php:143
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:146
+#: Code/Lib/Enotify.php:146
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:147
+#: Code/Lib/Enotify.php:147
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:147 Zotlabs/Lib/Enotify.php:150
+#: Code/Lib/Enotify.php:147 Code/Lib/Enotify.php:150
 msgid "a private message"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:149
+#: Code/Lib/Enotify.php:149
 #, php-format
 msgid "%1$s replied to a private message at %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:150
+#: Code/Lib/Enotify.php:150
 #, php-format
 msgid "%1$s replied to %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:152
+#: Code/Lib/Enotify.php:152
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:166
+#: Code/Lib/Enotify.php:166
 msgid "commented on"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:176
+#: Code/Lib/Enotify.php:176
 msgid "liked"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:180
+#: Code/Lib/Enotify.php:180
 msgid "disliked"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:226
+#: Code/Lib/Enotify.php:226
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:236
+#: Code/Lib/Enotify.php:236
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:248
+#: Code/Lib/Enotify.php:248
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:262
+#: Code/Lib/Enotify.php:262
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:265
+#: Code/Lib/Enotify.php:265
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:267
+#: Code/Lib/Enotify.php:267
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:271
+#: Code/Lib/Enotify.php:271
 msgid "(Moderated)"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:274 Zotlabs/Lib/Enotify.php:358
-#: Zotlabs/Lib/Enotify.php:386 Zotlabs/Lib/Enotify.php:417
-#: Zotlabs/Lib/Enotify.php:436 Zotlabs/Lib/Enotify.php:451
+#: Code/Lib/Enotify.php:274 Code/Lib/Enotify.php:358
+#: Code/Lib/Enotify.php:386 Code/Lib/Enotify.php:417
+#: Code/Lib/Enotify.php:436 Code/Lib/Enotify.php:451
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:278 Zotlabs/Lib/Enotify.php:279
+#: Code/Lib/Enotify.php:278 Code/Lib/Enotify.php:279
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:339
+#: Code/Lib/Enotify.php:339
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:354
+#: Code/Lib/Enotify.php:354
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:355
+#: Code/Lib/Enotify.php:355
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:366
+#: Code/Lib/Enotify.php:366
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:372
+#: Code/Lib/Enotify.php:372
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:375
+#: Code/Lib/Enotify.php:375
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:382 Zotlabs/Lib/Enotify.php:383
+#: Code/Lib/Enotify.php:382 Code/Lib/Enotify.php:383
 msgid " - "
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:382 Zotlabs/Lib/Enotify.php:383
+#: Code/Lib/Enotify.php:382 Code/Lib/Enotify.php:383
 msgid "Moderated"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:391 Zotlabs/Lib/Enotify.php:392
+#: Code/Lib/Enotify.php:391 Code/Lib/Enotify.php:392
 #, php-format
 msgid "Please visit %s to approve or reject this post."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:409
+#: Code/Lib/Enotify.php:409
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:410
+#: Code/Lib/Enotify.php:410
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:412
+#: Code/Lib/Enotify.php:412
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:424
+#: Code/Lib/Enotify.php:424
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:425
+#: Code/Lib/Enotify.php:425
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:427
+#: Code/Lib/Enotify.php:427
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:443
+#: Code/Lib/Enotify.php:443
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:444
+#: Code/Lib/Enotify.php:444
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:446
+#: Code/Lib/Enotify.php:446
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:458
+#: Code/Lib/Enotify.php:458
 msgid "[$Projectname:Notify] Introduction received"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:459
+#: Code/Lib/Enotify.php:459
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:461
+#: Code/Lib/Enotify.php:461
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:465 Zotlabs/Lib/Enotify.php:485
+#: Code/Lib/Enotify.php:465 Code/Lib/Enotify.php:485
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:467
+#: Code/Lib/Enotify.php:467
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:474
+#: Code/Lib/Enotify.php:474
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:475
+#: Code/Lib/Enotify.php:475
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:477
+#: Code/Lib/Enotify.php:477
 #, php-format
 msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:483
+#: Code/Lib/Enotify.php:483
 msgid "Name:"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:484
+#: Code/Lib/Enotify.php:484
 msgid "Photo:"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:487
+#: Code/Lib/Enotify.php:487
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:745
+#: Code/Lib/Enotify.php:745
 msgid "[$Projectname:Notify]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:927
+#: Code/Lib/Enotify.php:927
 msgid "created a new post"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:928
+#: Code/Lib/Enotify.php:928
 #, php-format
 msgid "reacted to %s's conversation"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:930
+#: Code/Lib/Enotify.php:930
 #, php-format
 msgid "shared %s's post"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:934
+#: Code/Lib/Enotify.php:934
 msgid "sent a direct message"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:941
+#: Code/Lib/Enotify.php:941
 #, php-format
 msgid "edited a post dated %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:944
+#: Code/Lib/Enotify.php:944
 #, php-format
 msgid "edited a comment dated %s"
 msgstr ""
 
-#: Zotlabs/Lib/DB_Upgrade.php:70
+#: Code/Lib/DB_Upgrade.php:70
 msgid "Source code of failed update: "
 msgstr ""
 
-#: Zotlabs/Lib/DB_Upgrade.php:93
+#: Code/Lib/DB_Upgrade.php:93
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: Zotlabs/Lib/DB_Upgrade.php:100
+#: Code/Lib/DB_Upgrade.php:100
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:30
+#: Code/Lib/Chatroom.php:30
 msgid "Missing room name"
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:40
+#: Code/Lib/Chatroom.php:40
 msgid "Duplicate room name"
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:96 Zotlabs/Lib/Chatroom.php:105
+#: Code/Lib/Chatroom.php:96 Code/Lib/Chatroom.php:105
 msgid "Invalid room specifier."
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:143
+#: Code/Lib/Chatroom.php:143
 msgid "Room not found."
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:155 Zotlabs/Module/Admin/Cover_photo.php:283
-#: Zotlabs/Module/Admin/Cover_photo.php:307
-#: Zotlabs/Module/Admin/Profile_photo.php:312
-#: Zotlabs/Module/Admin/Profile_photo.php:330 Zotlabs/Module/Api.php:38
-#: Zotlabs/Module/Appman.php:100 Zotlabs/Module/Block.php:31
-#: Zotlabs/Module/Block.php:84 Zotlabs/Module/Blocks.php:82
-#: Zotlabs/Module/Blocks.php:89 Zotlabs/Module/Calendar.php:264
-#: Zotlabs/Module/Card_edit.php:63 Zotlabs/Module/Cards.php:89
-#: Zotlabs/Module/Channel.php:241 Zotlabs/Module/Channel.php:419
-#: Zotlabs/Module/Channel.php:457 Zotlabs/Module/Chat.php:115
-#: Zotlabs/Module/Chat.php:120 Zotlabs/Module/Common.php:50
-#: Zotlabs/Module/Connections.php:39 Zotlabs/Module/Connedit.php:342
-#: Zotlabs/Module/Cover_photo.php:340 Zotlabs/Module/Cover_photo.php:354
-#: Zotlabs/Module/Defperms.php:183 Zotlabs/Module/Defperms.php:189
-#: Zotlabs/Module/Display.php:513 Zotlabs/Module/Editblock.php:79
-#: Zotlabs/Module/Editlayout.php:77 Zotlabs/Module/Editlayout.php:100
-#: Zotlabs/Module/Editpost.php:26 Zotlabs/Module/Editwebpage.php:82
-#: Zotlabs/Module/Editwebpage.php:103 Zotlabs/Module/Editwebpage.php:122
-#: Zotlabs/Module/Editwebpage.php:138 Zotlabs/Module/Events.php:310
-#: Zotlabs/Module/Filestorage.php:29 Zotlabs/Module/Filestorage.php:115
-#: Zotlabs/Module/Filestorage.php:131 Zotlabs/Module/Filestorage.php:159
-#: Zotlabs/Module/Filestorage.php:192 Zotlabs/Module/Filestorage.php:199
-#: Zotlabs/Module/Inspect.php:19 Zotlabs/Module/Invite.php:102
-#: Zotlabs/Module/Item.php:615 Zotlabs/Module/Item.php:637
-#: Zotlabs/Module/Item.php:649 Zotlabs/Module/Item.php:1801
-#: Zotlabs/Module/Layouts.php:82 Zotlabs/Module/Layouts.php:89
-#: Zotlabs/Module/Layouts.php:100 Zotlabs/Module/Lists.php:88
-#: Zotlabs/Module/Lists.php:100 Zotlabs/Module/Lists.php:131
-#: Zotlabs/Module/Locs.php:109 Zotlabs/Module/Manage.php:23
-#: Zotlabs/Module/Menu.php:138 Zotlabs/Module/Menu.php:149
-#: Zotlabs/Module/Mitem.php:143 Zotlabs/Module/Moderate.php:21
-#: Zotlabs/Module/Mood.php:136 Zotlabs/Module/New_channel.php:125
-#: Zotlabs/Module/New_channel.php:150 Zotlabs/Module/Notifications.php:19
-#: Zotlabs/Module/Page.php:42 Zotlabs/Module/Page.php:147
-#: Zotlabs/Module/Pdledit.php:37 Zotlabs/Module/Photos.php:77
-#: Zotlabs/Module/Poke.php:118 Zotlabs/Module/Profile.php:109
-#: Zotlabs/Module/Profile.php:124 Zotlabs/Module/Profile_photo.php:348
-#: Zotlabs/Module/Profile_photo.php:362 Zotlabs/Module/Profiles.php:219
-#: Zotlabs/Module/Profiles.php:680 Zotlabs/Module/Register.php:91
-#: Zotlabs/Module/Regmod.php:25 Zotlabs/Module/Service_limits.php:16
-#: Zotlabs/Module/Settings.php:71 Zotlabs/Module/Setup.php:232
-#: Zotlabs/Module/Sharedwithme.php:24 Zotlabs/Module/Thing.php:317
-#: Zotlabs/Module/Thing.php:338 Zotlabs/Module/Thing.php:380
-#: Zotlabs/Module/Viewconnections.php:37 Zotlabs/Module/Viewconnections.php:42
-#: Zotlabs/Module/Suggestions.php:36 Zotlabs/Module/Viewsrc.php:24
-#: Zotlabs/Module/Vote.php:23 Zotlabs/Module/Sources.php:92
-#: Zotlabs/Module/Webpages.php:143 Zotlabs/Web/WebServer.php:72
+#: Code/Lib/Chatroom.php:155 Code/Module/Admin/Cover_photo.php:283
+#: Code/Module/Admin/Cover_photo.php:307
+#: Code/Module/Admin/Profile_photo.php:312
+#: Code/Module/Admin/Profile_photo.php:330 Code/Module/Api.php:38
+#: Code/Module/Appman.php:100 Code/Module/Block.php:31
+#: Code/Module/Block.php:84 Code/Module/Blocks.php:82
+#: Code/Module/Blocks.php:89 Code/Module/Calendar.php:264
+#: Code/Module/Card_edit.php:63 Code/Module/Cards.php:89
+#: Code/Module/Channel.php:241 Code/Module/Channel.php:419
+#: Code/Module/Channel.php:457 Code/Module/Chat.php:115
+#: Code/Module/Chat.php:120 Code/Module/Common.php:50
+#: Code/Module/Connections.php:39 Code/Module/Connedit.php:342
+#: Code/Module/Cover_photo.php:340 Code/Module/Cover_photo.php:354
+#: Code/Module/Defperms.php:183 Code/Module/Defperms.php:189
+#: Code/Module/Display.php:513 Code/Module/Editblock.php:79
+#: Code/Module/Editlayout.php:77 Code/Module/Editlayout.php:100
+#: Code/Module/Editpost.php:26 Code/Module/Editwebpage.php:82
+#: Code/Module/Editwebpage.php:103 Code/Module/Editwebpage.php:122
+#: Code/Module/Editwebpage.php:138 Code/Module/Events.php:310
+#: Code/Module/Filestorage.php:29 Code/Module/Filestorage.php:115
+#: Code/Module/Filestorage.php:131 Code/Module/Filestorage.php:159
+#: Code/Module/Filestorage.php:192 Code/Module/Filestorage.php:199
+#: Code/Module/Inspect.php:19 Code/Module/Invite.php:102
+#: Code/Module/Item.php:615 Code/Module/Item.php:637
+#: Code/Module/Item.php:649 Code/Module/Item.php:1801
+#: Code/Module/Layouts.php:82 Code/Module/Layouts.php:89
+#: Code/Module/Layouts.php:100 Code/Module/Lists.php:88
+#: Code/Module/Lists.php:100 Code/Module/Lists.php:131
+#: Code/Module/Locs.php:109 Code/Module/Manage.php:23
+#: Code/Module/Menu.php:138 Code/Module/Menu.php:149
+#: Code/Module/Mitem.php:143 Code/Module/Moderate.php:21
+#: Code/Module/Mood.php:136 Code/Module/New_channel.php:125
+#: Code/Module/New_channel.php:150 Code/Module/Notifications.php:19
+#: Code/Module/Page.php:42 Code/Module/Page.php:147
+#: Code/Module/Pdledit.php:37 Code/Module/Photos.php:77
+#: Code/Module/Poke.php:118 Code/Module/Profile.php:109
+#: Code/Module/Profile.php:124 Code/Module/Profile_photo.php:348
+#: Code/Module/Profile_photo.php:362 Code/Module/Profiles.php:219
+#: Code/Module/Profiles.php:680 Code/Module/Register.php:91
+#: Code/Module/Regmod.php:25 Code/Module/Service_limits.php:16
+#: Code/Module/Settings.php:71 Code/Module/Setup.php:232
+#: Code/Module/Sharedwithme.php:24 Code/Module/Thing.php:317
+#: Code/Module/Thing.php:338 Code/Module/Thing.php:380
+#: Code/Module/Viewconnections.php:37 Code/Module/Viewconnections.php:42
+#: Code/Module/Suggestions.php:36 Code/Module/Viewsrc.php:24
+#: Code/Module/Vote.php:23 Code/Module/Sources.php:92
+#: Code/Module/Webpages.php:143 Code/Web/WebServer.php:72
 #: include/items.php:3849 include/attach.php:163 include/attach.php:212
 #: include/attach.php:290 include/attach.php:416 include/attach.php:431
 #: include/attach.php:438 include/attach.php:517 include/attach.php:1134
@@ -2502,144 +2502,144 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:166
+#: Code/Lib/Chatroom.php:166
 msgid "Room is full"
 msgstr ""
 
-#: Zotlabs/Lib/Markdown.php:219 include/bbcode.php:684
+#: Code/Lib/Markdown.php:219 include/bbcode.php:684
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: Zotlabs/Lib/Markdown.php:221 Zotlabs/Module/Tagger.php:93
+#: Code/Lib/Markdown.php:221 Code/Module/Tagger.php:93
 #: include/bbcode.php:678 include/conversation.php:167 include/text.php:2386
 msgid "post"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:96
+#: Code/Lib/Libacl.php:96
 msgid "(List)"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:102
+#: Code/Lib/Libacl.php:102
 msgid "My connections"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:102 Zotlabs/Lib/Libacl.php:105
-#: Zotlabs/Lib/Libacl.php:108
+#: Code/Lib/Libacl.php:102 Code/Lib/Libacl.php:105
+#: Code/Lib/Libacl.php:108
 msgid "(Virtual List)"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:105
+#: Code/Lib/Libacl.php:105
 msgid "My ActivityPub connections"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:108
+#: Code/Lib/Libacl.php:108
 msgid "My Nomad connections"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:117
+#: Code/Lib/Libacl.php:117
 msgid "(Group)"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:130
+#: Code/Lib/Libacl.php:130
 msgid "(DM)"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:144
+#: Code/Lib/Libacl.php:144
 msgid "Who can see this?"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:145
+#: Code/Lib/Libacl.php:145
 msgid "Custom selection"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:146
+#: Code/Lib/Libacl.php:146
 msgid ""
 "Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
 "the scope of \"Show\"."
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:147
+#: Code/Lib/Libacl.php:147
 msgid "Show"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:148
+#: Code/Lib/Libacl.php:148
 msgid "Don't show"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:154 Zotlabs/Module/Chat.php:243
-#: Zotlabs/Module/Connedit.php:641 Zotlabs/Module/Filestorage.php:233
-#: Zotlabs/Module/Photos.php:743 Zotlabs/Module/Photos.php:1128
-#: Zotlabs/Module/Thing.php:357 Zotlabs/Module/Thing.php:412
+#: Code/Lib/Libacl.php:154 Code/Module/Chat.php:243
+#: Code/Module/Connedit.php:641 Code/Module/Filestorage.php:233
+#: Code/Module/Photos.php:743 Code/Module/Photos.php:1128
+#: Code/Module/Thing.php:357 Code/Module/Thing.php:412
 #: extend/addon/a/faces/Mod_Faces.php:172
 #: extend/addon/a/flashcards/Mod_Flashcards.php:256
 msgid "Permissions"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:156 Zotlabs/Lib/ThreadItem.php:505
-#: Zotlabs/Module/Photos.php:1356 Zotlabs/Module/Settings/Channel.php:690
+#: Code/Lib/Libacl.php:156 Code/Lib/ThreadItem.php:505
+#: Code/Module/Photos.php:1356 Code/Module/Settings/Channel.php:690
 #: include/conversation.php:1500
 msgid "Close"
 msgstr ""
 
-#: Zotlabs/Lib/Libacl.php:182
+#: Code/Lib/Libacl.php:182
 msgid ""
 "Post permissions cannot be changed after a post is shared.
              These "
 "permissions set who is allowed to view the post."
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:120 include/conversation.php:614
+#: Code/Lib/ThreadItem.php:120 include/conversation.php:614
 msgid "Public visibility"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:122 include/conversation.php:616
+#: Code/Lib/ThreadItem.php:122 include/conversation.php:616
 msgid "Direct message (private mail)"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:125 include/conversation.php:619
+#: Code/Lib/ThreadItem.php:125 include/conversation.php:619
 msgid "Restricted visibility"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:150
+#: Code/Lib/ThreadItem.php:150
 msgid ""
 "This comment is part of a private conversation, yet was shared with the "
 "public. Discretion advised."
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:198 Zotlabs/Storage/Browser.php:306
+#: Code/Lib/ThreadItem.php:198 Code/Storage/Browser.php:306
 msgid "Admin Delete"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:203 include/conversation.php:605
+#: Code/Lib/ThreadItem.php:203 include/conversation.php:605
 msgid "Select"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:207 Zotlabs/Module/Filer.php:63
+#: Code/Lib/ThreadItem.php:207 Code/Module/Filer.php:63
 msgid "Save to Folder"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:229
+#: Code/Lib/ThreadItem.php:229
 msgid "I will attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:229
+#: Code/Lib/ThreadItem.php:229
 msgid "I will not attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:229
+#: Code/Lib/ThreadItem.php:229
 msgid "I might attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:230
+#: Code/Lib/ThreadItem.php:230
 msgid "Undo attendance"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:245 Zotlabs/Lib/ThreadItem.php:265
-#: Zotlabs/Module/Photos.php:1230 Zotlabs/Module/Photos.php:1241
+#: Code/Lib/ThreadItem.php:245 Code/Lib/ThreadItem.php:265
+#: Code/Module/Photos.php:1230 Code/Module/Photos.php:1241
 msgid "View all"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:250 Zotlabs/Module/Photos.php:1234
+#: Code/Lib/ThreadItem.php:250 Code/Module/Photos.php:1234
 #: include/conversation.php:2153 include/taxonomy.php:743
 msgctxt "noun"
 msgid "Like"
@@ -2647,13 +2647,13 @@ msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Lib/ThreadItem.php:252 Zotlabs/Lib/ThreadItem.php:499
-#: Zotlabs/Module/Photos.php:1350 include/conversation.php:2155
+#: Code/Lib/ThreadItem.php:252 Code/Lib/ThreadItem.php:499
+#: Code/Module/Photos.php:1350 include/conversation.php:2155
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:258 Zotlabs/Module/Photos.php:1238
+#: Code/Lib/ThreadItem.php:258 Code/Module/Photos.php:1238
 #: include/conversation.php:2160
 msgctxt "noun"
 msgid "Dislike"
@@ -2661,1746 +2661,1746 @@ msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Lib/ThreadItem.php:260 Zotlabs/Lib/ThreadItem.php:500
-#: Zotlabs/Module/Photos.php:1351 include/conversation.php:2162
+#: Code/Lib/ThreadItem.php:260 Code/Lib/ThreadItem.php:500
+#: Code/Module/Photos.php:1351 include/conversation.php:2162
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:286 Zotlabs/Module/Admin/Profs.php:103
-#: Zotlabs/Module/Admin/Profs.php:124 Zotlabs/Module/Filer.php:62
-#: Zotlabs/Widget/Notes.php:26
+#: Code/Lib/ThreadItem.php:286 Code/Module/Admin/Profs.php:103
+#: Code/Module/Admin/Profs.php:124 Code/Module/Filer.php:62
+#: Code/Widget/Notes.php:26
 #: extend/addon/a/queueworker/Mod_Queueworker.php:116 include/text.php:1053
 #: include/text.php:1066
 msgid "Save"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:295 include/conversation.php:627
+#: Code/Lib/ThreadItem.php:295 include/conversation.php:627
 msgid "Message signature validated"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:296 include/conversation.php:628
+#: Code/Lib/ThreadItem.php:296 include/conversation.php:628
 msgid "Message signature incorrect"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:302
+#: Code/Lib/ThreadItem.php:302
 msgid "Add Tag"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:322 Zotlabs/Module/Photos.php:1171
+#: Code/Lib/ThreadItem.php:322 Code/Module/Photos.php:1171
 msgid "I like this"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:322 Zotlabs/Module/Photos.php:1175
+#: Code/Lib/ThreadItem.php:322 Code/Module/Photos.php:1175
 msgid "Undo like"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:323 Zotlabs/Module/Photos.php:1174
+#: Code/Lib/ThreadItem.php:323 Code/Module/Photos.php:1174
 msgid "I don't like this"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:323 Zotlabs/Module/Photos.php:1176
+#: Code/Lib/ThreadItem.php:323 Code/Module/Photos.php:1176
 msgid "Undo dislike"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:329
+#: Code/Lib/ThreadItem.php:329
 msgid "Repeat This"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:330
+#: Code/Lib/ThreadItem.php:330
 msgid "Share this"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:341
+#: Code/Lib/ThreadItem.php:341
 msgid "Delivery Report"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:370
+#: Code/Lib/ThreadItem.php:370
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Lib/ThreadItem.php:371
+#: Code/Lib/ThreadItem.php:371
 #, php-format
 msgid "%d unseen"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:410 Zotlabs/Lib/ThreadItem.php:411
+#: Code/Lib/ThreadItem.php:410 Code/Lib/ThreadItem.php:411
 #, php-format
 msgid "View %s's profile - %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:414
+#: Code/Lib/ThreadItem.php:414
 msgid "to"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:415 include/conversation.php:690
+#: Code/Lib/ThreadItem.php:415 include/conversation.php:690
 msgid "via"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:416
+#: Code/Lib/ThreadItem.php:416
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:417
+#: Code/Lib/ThreadItem.php:417
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:432 include/conversation.php:693
+#: Code/Lib/ThreadItem.php:432 include/conversation.php:693
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:435 include/conversation.php:696
+#: Code/Lib/ThreadItem.php:435 include/conversation.php:696
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:436 include/conversation.php:697
+#: Code/Lib/ThreadItem.php:436 include/conversation.php:697
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:446
+#: Code/Lib/ThreadItem.php:446
 msgid "Attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:447
+#: Code/Lib/ThreadItem.php:447
 msgid "Attendance Options"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:448
+#: Code/Lib/ThreadItem.php:448
 msgid "Vote"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:449
+#: Code/Lib/ThreadItem.php:449
 msgid "Voting Options"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:450
+#: Code/Lib/ThreadItem.php:450
 msgid "Reply"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:475 include/conversation.php:712
+#: Code/Lib/ThreadItem.php:475 include/conversation.php:712
 msgid "Pinned post"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:479
+#: Code/Lib/ThreadItem.php:479
 msgid "Saved draft"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:480
+#: Code/Lib/ThreadItem.php:480
 msgid "Save Bookmarks"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:481
+#: Code/Lib/ThreadItem.php:481
 msgid "Add to Calendar"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:492 Zotlabs/Module/Notifications.php:75
+#: Code/Lib/ThreadItem.php:492 Code/Module/Notifications.php:75
 msgid "Mark all seen"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:510 include/conversation.php:418
+#: Code/Lib/ThreadItem.php:510 include/conversation.php:418
 msgid "This is an unsaved preview"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:511 Zotlabs/Module/Photos.php:1178
+#: Code/Lib/ThreadItem.php:511 Code/Module/Photos.php:1178
 #: include/conversation.php:717
 msgid "Please wait"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:951 Zotlabs/Module/Photos.php:1194
-#: Zotlabs/Module/Photos.php:1304
+#: Code/Lib/ThreadItem.php:951 Code/Module/Photos.php:1194
+#: Code/Module/Photos.php:1304
 msgid "This is you"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:956 include/conversation.php:1418
+#: Code/Lib/ThreadItem.php:956 include/conversation.php:1418
 msgid "Bold"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:957 include/conversation.php:1419
+#: Code/Lib/ThreadItem.php:957 include/conversation.php:1419
 msgid "Italic"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:958 include/conversation.php:1420
+#: Code/Lib/ThreadItem.php:958 include/conversation.php:1420
 msgid "Underline"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:959 include/conversation.php:1421
+#: Code/Lib/ThreadItem.php:959 include/conversation.php:1421
 msgid "Quote"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:960 include/conversation.php:1422
+#: Code/Lib/ThreadItem.php:960 include/conversation.php:1422
 msgid "Code"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:961
+#: Code/Lib/ThreadItem.php:961
 msgid "Image"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:962 include/conversation.php:1423
+#: Code/Lib/ThreadItem.php:962 include/conversation.php:1423
 msgid "Attach/Upload file"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:963
+#: Code/Lib/ThreadItem.php:963
 msgid "Insert Link"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:964
+#: Code/Lib/ThreadItem.php:964
 msgid "Video"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:965 Zotlabs/Module/Events.php:529
-#: Zotlabs/Module/Photos.php:1198 Zotlabs/Module/Webpages.php:276
+#: Code/Lib/ThreadItem.php:965 Code/Module/Events.php:529
+#: Code/Module/Photos.php:1198 Code/Module/Webpages.php:276
 #: include/conversation.php:1307
 msgid "Preview"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:966 Zotlabs/Module/Lostpass.php:143
-#: Zotlabs/Module/Pdledit.php:72 Zotlabs/Module/Pdledit.php:80
+#: Code/Lib/ThreadItem.php:966 Code/Module/Lostpass.php:143
+#: Code/Module/Pdledit.php:72 Code/Module/Pdledit.php:80
 msgid "Reset"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:971 Zotlabs/Module/Chat.php:222
+#: Code/Lib/ThreadItem.php:971 Code/Module/Chat.php:222
 #: include/conversation.php:1492
 msgid "Encrypt text"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:976
+#: Code/Lib/ThreadItem.php:976
 msgid "Your full name (required)"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:977
+#: Code/Lib/ThreadItem.php:977
 msgid "Your email address (required)"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:978
+#: Code/Lib/ThreadItem.php:978
 msgid "Your website URL (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Acloader.php:260
+#: Code/Module/Acloader.php:260
 msgid "network"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:94 Zotlabs/Module/Admin/Addons.php:262
-#: Zotlabs/Module/Admin/Themes.php:82 Zotlabs/Module/Display.php:68
-#: Zotlabs/Module/Display.php:516 Zotlabs/Module/Filestorage.php:41
-#: Zotlabs/Module/Inspect.php:35 Zotlabs/Module/Search.php:189
-#: Zotlabs/Module/Thing.php:110 Zotlabs/Module/Viewsrc.php:29
+#: Code/Module/Admin.php:94 Code/Module/Admin/Addons.php:262
+#: Code/Module/Admin/Themes.php:82 Code/Module/Display.php:68
+#: Code/Module/Display.php:516 Code/Module/Filestorage.php:41
+#: Code/Module/Inspect.php:35 Code/Module/Search.php:189
+#: Code/Module/Thing.php:110 Code/Module/Viewsrc.php:29
 #: extend/addon/a/flashcards/Mod_Flashcards.php:286
 #: extend/addon/a/flashcards/Mod_Flashcards.php:287 include/items.php:3747
 msgid "Item not found."
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:128 Zotlabs/Module/Admin/Accounts.php:180
-#: Zotlabs/Module/Admin/Accounts.php:193 Zotlabs/Widget/Admin.php:32
+#: Code/Module/Admin.php:128 Code/Module/Admin/Accounts.php:180
+#: Code/Module/Admin/Accounts.php:193 Code/Widget/Admin.php:32
 msgid "Accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:129
+#: Code/Module/Admin.php:129
 msgid "Blocked accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:130
+#: Code/Module/Admin.php:130
 msgid "Expired accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:131
+#: Code/Module/Admin.php:131
 msgid "Expiring accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:148 Zotlabs/Module/Locs.php:136
+#: Code/Module/Admin.php:148 Code/Module/Locs.php:136
 msgid "Primary"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:149
+#: Code/Module/Admin.php:149
 msgid "Clones"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:155
+#: Code/Module/Admin.php:155
 msgid "Message queues"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:168
+#: Code/Module/Admin.php:168
 msgid "Your software should be updated"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:173 Zotlabs/Module/Admin/Accounts.php:179
-#: Zotlabs/Module/Admin/Addons.php:338 Zotlabs/Module/Admin/Addons.php:436
-#: Zotlabs/Module/Admin/Channels.php:173 Zotlabs/Module/Admin/Logs.php:85
-#: Zotlabs/Module/Admin/Security.php:138 Zotlabs/Module/Admin/Site.php:313
-#: Zotlabs/Module/Admin/Themes.php:136 Zotlabs/Module/Admin/Themes.php:170
+#: Code/Module/Admin.php:173 Code/Module/Admin/Accounts.php:179
+#: Code/Module/Admin/Addons.php:338 Code/Module/Admin/Addons.php:436
+#: Code/Module/Admin/Channels.php:173 Code/Module/Admin/Logs.php:85
+#: Code/Module/Admin/Security.php:138 Code/Module/Admin/Site.php:313
+#: Code/Module/Admin/Themes.php:136 Code/Module/Admin/Themes.php:170
 msgid "Administration"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:174 include/conversation.php:1506
+#: Code/Module/Admin.php:174 include/conversation.php:1506
 msgid "Summary"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:177
+#: Code/Module/Admin.php:177
 msgid "Registered accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:178
+#: Code/Module/Admin.php:178
 msgid "Pending registrations"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:179
+#: Code/Module/Admin.php:179
 msgid "Registered channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:180
+#: Code/Module/Admin.php:180
 msgid "Active addons"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:181 Zotlabs/Module/Sites.php:105
+#: Code/Module/Admin.php:181 Code/Module/Sites.php:105
 msgid "Version"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:182
+#: Code/Module/Admin.php:182
 msgid "Repository version (release)"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:183
+#: Code/Module/Admin.php:183
 msgid "Repository version (dev)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:34
+#: Code/Module/Admin/Account_edit.php:34
 #, php-format
 msgid "Password changed for account %d."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:50
+#: Code/Module/Admin/Account_edit.php:50
 msgid "Account settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:69
+#: Code/Module/Admin/Account_edit.php:69
 msgid "Account not found."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:76
+#: Code/Module/Admin/Account_edit.php:76
 msgid "Account Edit"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:77
+#: Code/Module/Admin/Account_edit.php:77
 msgid "New Password"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:78
+#: Code/Module/Admin/Account_edit.php:78
 msgid "New Password again"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:79
+#: Code/Module/Admin/Account_edit.php:79
 msgid "Account language (for emails)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:80
+#: Code/Module/Admin/Account_edit.php:80
 msgid "Service class"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:44
+#: Code/Module/Admin/Accounts.php:44
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s accounts blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Accounts.php:52
+#: Code/Module/Admin/Accounts.php:52
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Accounts.php:92
+#: Code/Module/Admin/Accounts.php:92
 msgid "Account not found"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:112
+#: Code/Module/Admin/Accounts.php:112
 #, php-format
 msgid "Account '%s' blocked"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:121
+#: Code/Module/Admin/Accounts.php:121
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:182 Zotlabs/Module/Admin/Channels.php:176
+#: Code/Module/Admin/Accounts.php:182 Code/Module/Admin/Channels.php:176
 msgid "select all"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:183
+#: Code/Module/Admin/Accounts.php:183
 msgid "Registrations waiting for confirm"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:184
+#: Code/Module/Admin/Accounts.php:184
 msgid "Request date"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:184 Zotlabs/Module/Admin/Accounts.php:196
-#: Zotlabs/Module/Cdav.php:1359 Zotlabs/Module/Connedit.php:877
-#: Zotlabs/Module/Profiles.php:840 include/network.php:1761
+#: Code/Module/Admin/Accounts.php:184 Code/Module/Admin/Accounts.php:196
+#: Code/Module/Cdav.php:1359 Code/Module/Connedit.php:877
+#: Code/Module/Profiles.php:840 include/network.php:1761
 msgid "Email"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:185
+#: Code/Module/Admin/Accounts.php:185
 msgid "No registrations."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:186 Zotlabs/Module/Connections.php:344
+#: Code/Module/Admin/Accounts.php:186 Code/Module/Connections.php:344
 #: include/conversation.php:659
 msgid "Approve"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:187 Zotlabs/Module/Authorize.php:42
+#: Code/Module/Admin/Accounts.php:187 Code/Module/Authorize.php:42
 msgid "Deny"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:189 Zotlabs/Module/Connedit.php:580
-#: Zotlabs/Widget/Sblock.php:23
+#: Code/Module/Admin/Accounts.php:189 Code/Module/Connedit.php:580
+#: Code/Widget/Sblock.php:23
 msgid "Block"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:190 Zotlabs/Module/Connedit.php:580
+#: Code/Module/Admin/Accounts.php:190 Code/Module/Connedit.php:580
 msgid "Unblock"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:195
+#: Code/Module/Admin/Accounts.php:195
 msgid "ID"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:197
+#: Code/Module/Admin/Accounts.php:197
 msgid "All Channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:198
+#: Code/Module/Admin/Accounts.php:198
 msgid "Register date"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:199
+#: Code/Module/Admin/Accounts.php:199
 msgid "Last login"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:200
+#: Code/Module/Admin/Accounts.php:200
 msgid "Expires"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:201
+#: Code/Module/Admin/Accounts.php:201
 msgid "Service Class"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:203
+#: Code/Module/Admin/Accounts.php:203
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:204
+#: Code/Module/Admin/Accounts.php:204
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:286
+#: Code/Module/Admin/Addons.php:286
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:290
+#: Code/Module/Admin/Addons.php:290
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:306 Zotlabs/Module/Admin/Themes.php:107
+#: Code/Module/Admin/Addons.php:306 Code/Module/Admin/Themes.php:107
 msgid "Disable"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:309 Zotlabs/Module/Admin/Themes.php:110
+#: Code/Module/Admin/Addons.php:309 Code/Module/Admin/Themes.php:110
 msgid "Enable"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:339 Zotlabs/Module/Admin/Addons.php:437
-#: Zotlabs/Widget/Admin.php:36
+#: Code/Module/Admin/Addons.php:339 Code/Module/Admin/Addons.php:437
+#: Code/Widget/Admin.php:36
 msgid "Addons"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:340 Zotlabs/Module/Admin/Themes.php:138
+#: Code/Module/Admin/Addons.php:340 Code/Module/Admin/Themes.php:138
 msgid "Toggle"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:348 Zotlabs/Module/Admin/Themes.php:148
+#: Code/Module/Admin/Addons.php:348 Code/Module/Admin/Themes.php:148
 msgid "Author: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:349 Zotlabs/Module/Admin/Themes.php:149
+#: Code/Module/Admin/Addons.php:349 Code/Module/Admin/Themes.php:149
 msgid "Maintainer: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:350
+#: Code/Module/Admin/Addons.php:350
 msgid "Minimum project version: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:351
+#: Code/Module/Admin/Addons.php:351
 msgid "Maximum project version: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:352
+#: Code/Module/Admin/Addons.php:352
 msgid "Minimum PHP version: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:353
+#: Code/Module/Admin/Addons.php:353
 msgid "Compatible Server Roles: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:354
+#: Code/Module/Admin/Addons.php:354
 msgid "Requires: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:355 Zotlabs/Module/Admin/Addons.php:442
+#: Code/Module/Admin/Addons.php:355 Code/Module/Admin/Addons.php:442
 msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:410
+#: Code/Module/Admin/Addons.php:410
 msgid "Enter the public git repository URL of the addon repo."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:411
+#: Code/Module/Admin/Addons.php:411
 msgid "Addon repo git URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:412
+#: Code/Module/Admin/Addons.php:412
 msgid "Custom repo name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:412
+#: Code/Module/Admin/Addons.php:412
 msgid "(optional)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:413
+#: Code/Module/Admin/Addons.php:413
 msgid "Download Addon Repo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:421
+#: Code/Module/Admin/Addons.php:421
 msgid "Install new repo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:423 Zotlabs/Module/Admin/Cover_photo.php:382
-#: Zotlabs/Module/Admin/Profile_photo.php:478 Zotlabs/Module/Card_edit.php:142
-#: Zotlabs/Module/Cdav.php:1065 Zotlabs/Module/Cdav.php:1373
-#: Zotlabs/Module/Connedit.php:891 Zotlabs/Module/Cover_photo.php:428
-#: Zotlabs/Module/Editblock.php:156 Zotlabs/Module/Editlayout.php:153
-#: Zotlabs/Module/Editpost.php:150 Zotlabs/Module/Editwebpage.php:187
-#: Zotlabs/Module/Fbrowser.php:75 Zotlabs/Module/Fbrowser.php:98
-#: Zotlabs/Module/Filer.php:64 Zotlabs/Module/Profile_photo.php:517
-#: Zotlabs/Module/Profiles.php:854 Zotlabs/Module/Settings/Oauth2.php:116
-#: Zotlabs/Module/Settings/Oauth2.php:146 Zotlabs/Module/Settings/Oauth.php:99
-#: Zotlabs/Module/Settings/Oauth.php:127 Zotlabs/Module/Tagrm.php:21
-#: Zotlabs/Module/Tagrm.php:152 include/conversation.php:1429
+#: Code/Module/Admin/Addons.php:423 Code/Module/Admin/Cover_photo.php:382
+#: Code/Module/Admin/Profile_photo.php:478 Code/Module/Card_edit.php:142
+#: Code/Module/Cdav.php:1065 Code/Module/Cdav.php:1373
+#: Code/Module/Connedit.php:891 Code/Module/Cover_photo.php:428
+#: Code/Module/Editblock.php:156 Code/Module/Editlayout.php:153
+#: Code/Module/Editpost.php:150 Code/Module/Editwebpage.php:187
+#: Code/Module/Fbrowser.php:75 Code/Module/Fbrowser.php:98
+#: Code/Module/Filer.php:64 Code/Module/Profile_photo.php:517
+#: Code/Module/Profiles.php:854 Code/Module/Settings/Oauth2.php:116
+#: Code/Module/Settings/Oauth2.php:146 Code/Module/Settings/Oauth.php:99
+#: Code/Module/Settings/Oauth.php:127 Code/Module/Tagrm.php:21
+#: Code/Module/Tagrm.php:152 include/conversation.php:1429
 #: include/conversation.php:1495 include/conversation.php:1497
 #: include/conversation.php:1499
 msgid "Cancel"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:445
+#: Code/Module/Admin/Addons.php:445
 msgid "Manage Repos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:446
+#: Code/Module/Admin/Addons.php:446
 msgid "Installed Addon Repositories"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:447
+#: Code/Module/Admin/Addons.php:447
 msgid "Install a New Addon Repository"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:453 Zotlabs/Module/Cdav.php:1060
-#: Zotlabs/Module/Cdav.php:1371 Zotlabs/Module/Connedit.php:889
-#: Zotlabs/Module/Profiles.php:852 Zotlabs/Module/Settings/Oauth2.php:57
-#: Zotlabs/Module/Settings/Oauth2.php:145 Zotlabs/Module/Settings/Oauth.php:48
-#: Zotlabs/Module/Settings/Oauth.php:126
+#: Code/Module/Admin/Addons.php:453 Code/Module/Cdav.php:1060
+#: Code/Module/Cdav.php:1371 Code/Module/Connedit.php:889
+#: Code/Module/Profiles.php:852 Code/Module/Settings/Oauth2.php:57
+#: Code/Module/Settings/Oauth2.php:145 Code/Module/Settings/Oauth.php:48
+#: Code/Module/Settings/Oauth.php:126
 msgid "Update"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:454
+#: Code/Module/Admin/Addons.php:454
 msgid "Switch branch"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:455 Zotlabs/Module/Photos.php:1075
-#: Zotlabs/Module/Tagrm.php:151 Zotlabs/Module/Superblock.php:236
-#: Zotlabs/Module/Superblock.php:253
+#: Code/Module/Admin/Addons.php:455 Code/Module/Photos.php:1075
+#: Code/Module/Tagrm.php:151 Code/Module/Superblock.php:236
+#: Code/Module/Superblock.php:253
 msgid "Remove"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:41
+#: Code/Module/Admin/Channels.php:41
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Channels.php:51
+#: Code/Module/Admin/Channels.php:51
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Channels.php:57
+#: Code/Module/Admin/Channels.php:57
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Channels.php:78
+#: Code/Module/Admin/Channels.php:78
 msgid "Channel not found"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:89
+#: Code/Module/Admin/Channels.php:89
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:104
+#: Code/Module/Admin/Channels.php:104
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:104
+#: Code/Module/Admin/Channels.php:104
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:118
+#: Code/Module/Admin/Channels.php:118
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:118
+#: Code/Module/Admin/Channels.php:118
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:178 Zotlabs/Module/Connedit.php:596
-#: Zotlabs/Module/Directory.php:396
+#: Code/Module/Admin/Channels.php:178 Code/Module/Connedit.php:596
+#: Code/Module/Directory.php:396
 msgid "Censor"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:179 Zotlabs/Module/Connedit.php:596
-#: Zotlabs/Module/Directory.php:396
+#: Code/Module/Admin/Channels.php:179 Code/Module/Connedit.php:596
+#: Code/Module/Directory.php:396
 msgid "Uncensor"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:180
+#: Code/Module/Admin/Channels.php:180
 msgid "Allow Code"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:181
+#: Code/Module/Admin/Channels.php:181
 msgid "Disallow Code"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:186
+#: Code/Module/Admin/Channels.php:186
 msgid "UID"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:187 Zotlabs/Module/Cdav.php:1355
-#: Zotlabs/Module/Chat.php:259 Zotlabs/Module/Connections.php:239
-#: Zotlabs/Module/Connedit.php:873 Zotlabs/Module/Lists.php:206
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:147 Zotlabs/Module/Settings/Oauth.php:100
-#: Zotlabs/Module/Settings/Oauth.php:128 Zotlabs/Module/Sharedwithme.php:109
-#: Zotlabs/Storage/Browser.php:313 Zotlabs/Widget/Activity_filter.php:298
+#: Code/Module/Admin/Channels.php:187 Code/Module/Cdav.php:1355
+#: Code/Module/Chat.php:259 Code/Module/Connections.php:239
+#: Code/Module/Connedit.php:873 Code/Module/Lists.php:206
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:147 Code/Module/Settings/Oauth.php:100
+#: Code/Module/Settings/Oauth.php:128 Code/Module/Sharedwithme.php:109
+#: Code/Storage/Browser.php:313 Code/Widget/Activity_filter.php:298
 msgid "Name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:188 Zotlabs/Module/Cdav.php:1362
-#: Zotlabs/Module/Connedit.php:880 Zotlabs/Module/Locs.php:135
-#: Zotlabs/Module/Profiles.php:533 Zotlabs/Module/Profiles.php:843
+#: Code/Module/Admin/Channels.php:188 Code/Module/Cdav.php:1362
+#: Code/Module/Connedit.php:880 Code/Module/Locs.php:135
+#: Code/Module/Profiles.php:533 Code/Module/Profiles.php:843
 msgid "Address"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:190
+#: Code/Module/Admin/Channels.php:190
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:191
+#: Code/Module/Admin/Channels.php:191
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:68
-#: Zotlabs/Module/Admin/Profile_photo.php:71 Zotlabs/Module/Cover_photo.php:68
-#: Zotlabs/Module/Profile_photo.php:68
+#: Code/Module/Admin/Cover_photo.php:68
+#: Code/Module/Admin/Profile_photo.php:71 Code/Module/Cover_photo.php:68
+#: Code/Module/Profile_photo.php:68
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:179
-#: Zotlabs/Module/Admin/Cover_photo.php:263 Zotlabs/Module/Cover_photo.php:179
-#: Zotlabs/Module/Cover_photo.php:266
+#: Code/Module/Admin/Cover_photo.php:179
+#: Code/Module/Admin/Cover_photo.php:263 Code/Module/Cover_photo.php:179
+#: Code/Module/Cover_photo.php:266
 msgid "Cover Photos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:203
-#: Zotlabs/Module/Admin/Profile_photo.php:149
-#: Zotlabs/Module/Cover_photo.php:203 Zotlabs/Module/Profile_photo.php:148
+#: Code/Module/Admin/Cover_photo.php:203
+#: Code/Module/Admin/Profile_photo.php:149
+#: Code/Module/Cover_photo.php:203 Code/Module/Profile_photo.php:148
 msgid "Image resize failed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:212
-#: Zotlabs/Module/Admin/Profile_photo.php:195
-#: Zotlabs/Module/Cover_photo.php:215 Zotlabs/Module/Profile_photo.php:231
+#: Code/Module/Admin/Cover_photo.php:212
+#: Code/Module/Admin/Profile_photo.php:195
+#: Code/Module/Cover_photo.php:215 Code/Module/Profile_photo.php:231
 #: include/photos.php:204
 msgid "Unable to process image"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:321
-#: Zotlabs/Module/Admin/Cover_photo.php:337
-#: Zotlabs/Module/Admin/Profile_photo.php:358
-#: Zotlabs/Module/Admin/Profile_photo.php:401
-#: Zotlabs/Module/Cover_photo.php:368 Zotlabs/Module/Cover_photo.php:384
-#: Zotlabs/Module/Profile_photo.php:390 Zotlabs/Module/Profile_photo.php:441
+#: Code/Module/Admin/Cover_photo.php:321
+#: Code/Module/Admin/Cover_photo.php:337
+#: Code/Module/Admin/Profile_photo.php:358
+#: Code/Module/Admin/Profile_photo.php:401
+#: Code/Module/Cover_photo.php:368 Code/Module/Cover_photo.php:384
+#: Code/Module/Profile_photo.php:390 Code/Module/Profile_photo.php:441
 msgid "Photo not available."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:373 Zotlabs/Module/Cover_photo.php:419
+#: Code/Module/Admin/Cover_photo.php:373 Code/Module/Cover_photo.php:419
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:375
-#: Zotlabs/Module/Admin/Profile_photo.php:469
-#: Zotlabs/Module/Cover_photo.php:421 Zotlabs/Module/Profile_photo.php:508
+#: Code/Module/Admin/Cover_photo.php:375
+#: Code/Module/Admin/Profile_photo.php:469
+#: Code/Module/Cover_photo.php:421 Code/Module/Profile_photo.php:508
 msgid "Upload File:"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:376
-#: Zotlabs/Module/Admin/Profile_photo.php:470
-#: Zotlabs/Module/Cover_photo.php:422 Zotlabs/Module/Profile_photo.php:509
+#: Code/Module/Admin/Cover_photo.php:376
+#: Code/Module/Admin/Profile_photo.php:470
+#: Code/Module/Cover_photo.php:422 Code/Module/Profile_photo.php:509
 msgid "Select a profile:"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:377 Zotlabs/Module/Cover_photo.php:423
+#: Code/Module/Admin/Cover_photo.php:377 Code/Module/Cover_photo.php:423
 msgid "Change Cover Photo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:378
-#: Zotlabs/Module/Admin/Profile_photo.php:472
-#: Zotlabs/Module/Cover_photo.php:424 Zotlabs/Module/Embedphotos.php:229
-#: Zotlabs/Module/Photos.php:753 Zotlabs/Module/Profile_photo.php:511
-#: Zotlabs/Storage/Browser.php:422 Zotlabs/Widget/Cdav.php:157
-#: Zotlabs/Widget/Cdav.php:191 Zotlabs/Widget/Album.php:109
-#: Zotlabs/Widget/Portfolio.php:124
+#: Code/Module/Admin/Cover_photo.php:378
+#: Code/Module/Admin/Profile_photo.php:472
+#: Code/Module/Cover_photo.php:424 Code/Module/Embedphotos.php:229
+#: Code/Module/Photos.php:753 Code/Module/Profile_photo.php:511
+#: Code/Storage/Browser.php:422 Code/Widget/Cdav.php:157
+#: Code/Widget/Cdav.php:191 Code/Widget/Album.php:109
+#: Code/Widget/Portfolio.php:124
 msgid "Upload"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:380
-#: Zotlabs/Module/Admin/Cover_photo.php:381
-#: Zotlabs/Module/Admin/Profile_photo.php:476
-#: Zotlabs/Module/Admin/Profile_photo.php:477
-#: Zotlabs/Module/Cover_photo.php:426 Zotlabs/Module/Cover_photo.php:427
-#: Zotlabs/Module/Profile_photo.php:515 Zotlabs/Module/Profile_photo.php:516
+#: Code/Module/Admin/Cover_photo.php:380
+#: Code/Module/Admin/Cover_photo.php:381
+#: Code/Module/Admin/Profile_photo.php:476
+#: Code/Module/Admin/Profile_photo.php:477
+#: Code/Module/Cover_photo.php:426 Code/Module/Cover_photo.php:427
+#: Code/Module/Profile_photo.php:515 Code/Module/Profile_photo.php:516
 msgid "Use a photo from your albums"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:383
-#: Zotlabs/Module/Admin/Profile_photo.php:479
-#: Zotlabs/Module/Cover_photo.php:429 Zotlabs/Module/Profile_photo.php:518
+#: Code/Module/Admin/Cover_photo.php:383
+#: Code/Module/Admin/Profile_photo.php:479
+#: Code/Module/Cover_photo.php:429 Code/Module/Profile_photo.php:518
 #: include/conversation.php:1430 include/conversation.php:1494
 #: include/conversation.php:1496 include/conversation.php:1498
 msgid "OK"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:384
-#: Zotlabs/Module/Admin/Profile_photo.php:480
-#: Zotlabs/Module/Cover_photo.php:430 Zotlabs/Module/Profile_photo.php:519
+#: Code/Module/Admin/Cover_photo.php:384
+#: Code/Module/Admin/Profile_photo.php:480
+#: Code/Module/Cover_photo.php:430 Code/Module/Profile_photo.php:519
 #: include/conversation.php:1294
 msgid "Choose images to embed"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:385
-#: Zotlabs/Module/Admin/Profile_photo.php:481
-#: Zotlabs/Module/Cover_photo.php:431 Zotlabs/Module/Profile_photo.php:520
+#: Code/Module/Admin/Cover_photo.php:385
+#: Code/Module/Admin/Profile_photo.php:481
+#: Code/Module/Cover_photo.php:431 Code/Module/Profile_photo.php:520
 #: include/conversation.php:1295
 msgid "Choose an album"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:386
-#: Zotlabs/Module/Admin/Profile_photo.php:482
-#: Zotlabs/Module/Cover_photo.php:432 Zotlabs/Module/Profile_photo.php:521
+#: Code/Module/Admin/Cover_photo.php:386
+#: Code/Module/Admin/Profile_photo.php:482
+#: Code/Module/Cover_photo.php:432 Code/Module/Profile_photo.php:521
 msgid "Choose a different album"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:387
-#: Zotlabs/Module/Admin/Profile_photo.php:483
-#: Zotlabs/Module/Cover_photo.php:433 Zotlabs/Module/Profile_photo.php:522
+#: Code/Module/Admin/Cover_photo.php:387
+#: Code/Module/Admin/Profile_photo.php:483
+#: Code/Module/Cover_photo.php:433 Code/Module/Profile_photo.php:522
 #: include/conversation.php:1297
 msgid "Error getting album list"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:388
-#: Zotlabs/Module/Admin/Profile_photo.php:484
-#: Zotlabs/Module/Cover_photo.php:434 Zotlabs/Module/Profile_photo.php:523
+#: Code/Module/Admin/Cover_photo.php:388
+#: Code/Module/Admin/Profile_photo.php:484
+#: Code/Module/Cover_photo.php:434 Code/Module/Profile_photo.php:523
 #: include/conversation.php:1298
 msgid "Error getting photo link"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:389
-#: Zotlabs/Module/Admin/Profile_photo.php:485
-#: Zotlabs/Module/Cover_photo.php:435 Zotlabs/Module/Profile_photo.php:524
+#: Code/Module/Admin/Cover_photo.php:389
+#: Code/Module/Admin/Profile_photo.php:485
+#: Code/Module/Cover_photo.php:435 Code/Module/Profile_photo.php:524
 #: include/conversation.php:1299
 msgid "Error getting album"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:391
-#: Zotlabs/Module/Admin/Profile_photo.php:487
-#: Zotlabs/Module/Cover_photo.php:437 Zotlabs/Module/Profile_photo.php:526
+#: Code/Module/Admin/Cover_photo.php:391
+#: Code/Module/Admin/Profile_photo.php:487
+#: Code/Module/Cover_photo.php:437 Code/Module/Profile_photo.php:526
 msgid "Select previously uploaded photo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:407
-#: Zotlabs/Module/Admin/Profile_photo.php:502
-#: Zotlabs/Module/Cover_photo.php:453 Zotlabs/Module/Profile_photo.php:541
+#: Code/Module/Admin/Cover_photo.php:407
+#: Code/Module/Admin/Profile_photo.php:502
+#: Code/Module/Cover_photo.php:453 Code/Module/Profile_photo.php:541
 msgid "Crop Image"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:408
-#: Zotlabs/Module/Admin/Profile_photo.php:503
-#: Zotlabs/Module/Cover_photo.php:454 Zotlabs/Module/Profile_photo.php:542
+#: Code/Module/Admin/Cover_photo.php:408
+#: Code/Module/Admin/Profile_photo.php:503
+#: Code/Module/Cover_photo.php:454 Code/Module/Profile_photo.php:542
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:410
-#: Zotlabs/Module/Admin/Profile_photo.php:505
-#: Zotlabs/Module/Cover_photo.php:456 Zotlabs/Module/Profile_photo.php:544
+#: Code/Module/Admin/Cover_photo.php:410
+#: Code/Module/Admin/Profile_photo.php:505
+#: Code/Module/Cover_photo.php:456 Code/Module/Profile_photo.php:544
 msgid "Done Editing"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:23 Zotlabs/Module/Admin/Dbsync.php:58
+#: Code/Module/Admin/Dbsync.php:23 Code/Module/Admin/Dbsync.php:58
 msgid "Update has been marked successful"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:35
+#: Code/Module/Admin/Dbsync.php:35
 #, php-format
 msgid "Verification of update %s failed. Check system logs."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:37 Zotlabs/Module/Admin/Dbsync.php:72
+#: Code/Module/Admin/Dbsync.php:37 Code/Module/Admin/Dbsync.php:72
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:40
+#: Code/Module/Admin/Dbsync.php:40
 #, php-format
 msgid "Verifying update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:43
+#: Code/Module/Admin/Dbsync.php:43
 #, php-format
 msgid "Update %s does not contain a verification function."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:46 Zotlabs/Module/Admin/Dbsync.php:78
+#: Code/Module/Admin/Dbsync.php:46 Code/Module/Admin/Dbsync.php:78
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:70
+#: Code/Module/Admin/Dbsync.php:70
 #, php-format
 msgid "Executing update procedure %s failed. Check system logs."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:75
+#: Code/Module/Admin/Dbsync.php:75
 #, php-format
 msgid ""
 "Update %s did not return a status. It cannot be determined if it was "
 "successful."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:98
+#: Code/Module/Admin/Dbsync.php:98
 msgid "Failed Updates"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:100
+#: Code/Module/Admin/Dbsync.php:100
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:101
+#: Code/Module/Admin/Dbsync.php:101
 msgid "Attempt to verify this update if a verification procedure exists"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:102
+#: Code/Module/Admin/Dbsync.php:102
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:106
+#: Code/Module/Admin/Dbsync.php:106
 msgid "No failed updates."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:31
+#: Code/Module/Admin/Logs.php:31
 msgid "Log settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:86 Zotlabs/Widget/Admin.php:57
-#: Zotlabs/Widget/Admin.php:67
+#: Code/Module/Admin/Logs.php:86 Code/Widget/Admin.php:57
+#: Code/Widget/Admin.php:67
 msgid "Logs"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:88
+#: Code/Module/Admin/Logs.php:88
 msgid "Clear"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:94
+#: Code/Module/Admin/Logs.php:94
 msgid "Debugging"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:95
+#: Code/Module/Admin/Logs.php:95
 msgid "Log file"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:95
+#: Code/Module/Admin/Logs.php:95
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:96
+#: Code/Module/Admin/Logs.php:96
 msgid "Log level"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:125
-#: Zotlabs/Module/Admin/Profile_photo.php:255
-#: Zotlabs/Module/Profile_photo.php:122 Zotlabs/Module/Profile_photo.php:291
+#: Code/Module/Admin/Profile_photo.php:125
+#: Code/Module/Admin/Profile_photo.php:255
+#: Code/Module/Profile_photo.php:122 Code/Module/Profile_photo.php:291
 #: include/photo_factory.php:540
 msgid "Profile Photos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:193
-#: Zotlabs/Module/Profile_photo.php:226
+#: Code/Module/Admin/Profile_photo.php:193
+#: Code/Module/Profile_photo.php:226
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:270
-#: Zotlabs/Module/Profile_photo.php:306
+#: Code/Module/Admin/Profile_photo.php:270
+#: Code/Module/Profile_photo.php:306
 msgid "Image upload failed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:289
-#: Zotlabs/Module/Profile_photo.php:325
+#: Code/Module/Admin/Profile_photo.php:289
+#: Code/Module/Profile_photo.php:325
 msgid "Unable to process image."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Admin/Profile_photo.php:467
+#: Code/Module/Profile_photo.php:506
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
+#: Code/Module/Admin/Profile_photo.php:467
 msgid ""
 "Your site photo is visible to anybody on the internet and may be distributed "
 "to other websites."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:471
+#: Code/Module/Admin/Profile_photo.php:471
 msgid "Use Photo for Site Logo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:471
+#: Code/Module/Admin/Profile_photo.php:471
 msgid "Change Site Logo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:472
-#: Zotlabs/Module/Profile_photo.php:511
+#: Code/Module/Admin/Profile_photo.php:472
+#: Code/Module/Profile_photo.php:511
 msgid "Use"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:98
+#: Code/Module/Admin/Profs.php:98
 msgid "New Profile Field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:99 Zotlabs/Module/Admin/Profs.php:120
+#: Code/Module/Admin/Profs.php:99 Code/Module/Admin/Profs.php:120
 msgid "Field nickname"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:99 Zotlabs/Module/Admin/Profs.php:120
+#: Code/Module/Admin/Profs.php:99 Code/Module/Admin/Profs.php:120
 msgid "System name of field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:100 Zotlabs/Module/Admin/Profs.php:121
+#: Code/Module/Admin/Profs.php:100 Code/Module/Admin/Profs.php:121
 msgid "Input type"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:101 Zotlabs/Module/Admin/Profs.php:122
+#: Code/Module/Admin/Profs.php:101 Code/Module/Admin/Profs.php:122
 msgid "Field Name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:101 Zotlabs/Module/Admin/Profs.php:122
+#: Code/Module/Admin/Profs.php:101 Code/Module/Admin/Profs.php:122
 msgid "Label on profile pages"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:102 Zotlabs/Module/Admin/Profs.php:123
+#: Code/Module/Admin/Profs.php:102 Code/Module/Admin/Profs.php:123
 msgid "Help text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:102 Zotlabs/Module/Admin/Profs.php:123
+#: Code/Module/Admin/Profs.php:102 Code/Module/Admin/Profs.php:123
 msgid "Additional info (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:113
+#: Code/Module/Admin/Profs.php:113
 msgid "Field definition not found"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:119
+#: Code/Module/Admin/Profs.php:119
 msgid "Edit Profile Field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:185
+#: Code/Module/Admin/Profs.php:185
 msgid "Profile Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:186
+#: Code/Module/Admin/Profs.php:186
 msgid "Basic Profile Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:187
+#: Code/Module/Admin/Profs.php:187
 msgid "Advanced Profile Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:187
+#: Code/Module/Admin/Profs.php:187
 msgid "(In addition to basic fields)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:189
+#: Code/Module/Admin/Profs.php:189
 msgid "All available fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:190
+#: Code/Module/Admin/Profs.php:190
 msgid "Custom Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:194
+#: Code/Module/Admin/Profs.php:194
 msgid "Create Custom Field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:38
+#: Code/Module/Admin/Queue.php:38
 msgid "Queue Statistics"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:39
+#: Code/Module/Admin/Queue.php:39
 msgid "Total Entries"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:40
+#: Code/Module/Admin/Queue.php:40
 msgid "Priority"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:41
+#: Code/Module/Admin/Queue.php:41
 msgid "Destination URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:42
+#: Code/Module/Admin/Queue.php:42
 msgid "Mark hub permanently offline"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:43
+#: Code/Module/Admin/Queue.php:43
 msgid "Empty queue for this hub"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:44
+#: Code/Module/Admin/Queue.php:44
 msgid "Last known contact"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:129
+#: Code/Module/Admin/Security.php:129
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
 "insecure."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:132
+#: Code/Module/Admin/Security.php:132
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:133
+#: Code/Module/Admin/Security.php:133
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/"
 "
              https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:134
+#: Code/Module/Admin/Security.php:134
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:139 Zotlabs/Widget/Admin.php:34
+#: Code/Module/Admin/Security.php:139 Code/Widget/Admin.php:34
 msgid "Security"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid "Block public"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid "Block public search"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid ""
 "Prevent access to search content unless you are currently authenticated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:143 Zotlabs/Module/Admin/Site.php:342
+#: Code/Module/Admin/Security.php:143 Code/Module/Admin/Site.php:342
 msgid "Block directory from visitors"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:143 Zotlabs/Module/Admin/Site.php:342
+#: Code/Module/Admin/Security.php:143 Code/Module/Admin/Site.php:342
 msgid "Only allow authenticated access to directory."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "Hide local directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "Only use the global directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:145
+#: Code/Module/Admin/Security.php:145
 msgid "Provide a cloud root directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:145
+#: Code/Module/Admin/Security.php:145
 msgid ""
 "The cloud root directory lists all channel names which provide public files. "
 "Otherwise only the names of connections are shown."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:146
+#: Code/Module/Admin/Security.php:146
 msgid "Show total disk space available to cloud uploads"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid "Allow SVG thumbnails in file browser"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid "WARNING: SVG images may contain malicious code."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:149
+#: Code/Module/Admin/Security.php:149
 msgid "Allow embedded (inline) PDF files"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid "Permit anonymous comments"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid ""
 "Moderation will be performed by channels that select this comment option."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:151
+#: Code/Module/Admin/Security.php:151
 msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:152
+#: Code/Module/Admin/Security.php:152
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:153
+#: Code/Module/Admin/Security.php:153
 msgid "Allowed email domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:153
+#: Code/Module/Admin/Security.php:153
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:154
+#: Code/Module/Admin/Security.php:154
 msgid "Not allowed email domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:154
+#: Code/Module/Admin/Security.php:154
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:155
+#: Code/Module/Admin/Security.php:155
 msgid "Allow communications only from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:155 Zotlabs/Module/Admin/Security.php:160
+#: Code/Module/Admin/Security.php:155 Code/Module/Admin/Security.php:160
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:156
+#: Code/Module/Admin/Security.php:156
 msgid "Block communications from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:157
+#: Code/Module/Admin/Security.php:157
 msgid "Allow communications only from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:157 Zotlabs/Module/Admin/Security.php:162
+#: Code/Module/Admin/Security.php:157 Code/Module/Admin/Security.php:162
 msgid ""
 "One channel (hash) per line. Leave empty to allow communication from any "
 "channel by default"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:158
+#: Code/Module/Admin/Security.php:158
 msgid "Block communications from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:160
+#: Code/Module/Admin/Security.php:160
 msgid "Allow public stream communications only from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:161
+#: Code/Module/Admin/Security.php:161
 msgid "Block public stream communications from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:162
+#: Code/Module/Admin/Security.php:162
 msgid "Allow public stream communications only from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:163
+#: Code/Module/Admin/Security.php:163
 msgid "Block public stream communications from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:166
+#: Code/Module/Admin/Security.php:166
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:167
+#: Code/Module/Admin/Security.php:167
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:167
+#: Code/Module/Admin/Security.php:167
 msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:168
+#: Code/Module/Admin/Security.php:168
 msgid "Block embedded HTML from these domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:195
+#: Code/Module/Admin/Site.php:195
 msgid "Site settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:224 include/text.php:3579
+#: Code/Module/Admin/Site.php:224 include/text.php:3579
 #: view/theme/redbasic/php/config.php:19
 msgid "Default"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:235 Zotlabs/Module/Settings/Display.php:151
+#: Code/Module/Admin/Site.php:235 Code/Module/Settings/Display.php:151
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:243
+#: Code/Module/Admin/Site.php:243
 msgid "mobile"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:246
+#: Code/Module/Admin/Site.php:246
 msgid "experimental"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:249
+#: Code/Module/Admin/Site.php:249
 msgid "unsupported"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:291
+#: Code/Module/Admin/Site.php:291
 msgid "Yes - with approval"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:297
+#: Code/Module/Admin/Site.php:297
 msgid "My site is not a public server"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:298
+#: Code/Module/Admin/Site.php:298
 msgid "My site provides free public access"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:299
+#: Code/Module/Admin/Site.php:299
 msgid "My site provides paid public access"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:300
+#: Code/Module/Admin/Site.php:300
 msgid "My site provides free public access and premium paid plans"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:306
+#: Code/Module/Admin/Site.php:306
 msgid "Default permission role for new accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:306
+#: Code/Module/Admin/Site.php:306
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:314 Zotlabs/Widget/Admin.php:29
+#: Code/Module/Admin/Site.php:314 Code/Widget/Admin.php:29
 msgid "Site"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:316
+#: Code/Module/Admin/Site.php:316
 msgid "Site Configuration"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:317 Zotlabs/Module/Register.php:291
+#: Code/Module/Admin/Site.php:317 Code/Module/Register.php:291
 msgid "Registration"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:318
+#: Code/Module/Admin/Site.php:318
 msgid "File upload"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:319
+#: Code/Module/Admin/Site.php:319
 msgid "Policies"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:320 Zotlabs/Widget/Findpeople.php:29
+#: Code/Module/Admin/Site.php:320 Code/Widget/Findpeople.php:29
 msgid "Advanced"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:322
+#: Code/Module/Admin/Site.php:322
 msgid "Site name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid "Administrator Information"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode may be used here."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:324 Zotlabs/Module/Siteinfo.php:41
+#: Code/Module/Admin/Site.php:324 Code/Module/Siteinfo.php:41
 msgid "Site Information"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:324
+#: Code/Module/Admin/Site.php:324
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode may be used here."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:325
+#: Code/Module/Admin/Site.php:325
 msgid "System language"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid "System theme"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:329
+#: Code/Module/Admin/Site.php:329
 msgid "ActivityPub protocol"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:329
+#: Code/Module/Admin/Site.php:329
 msgid "Provides access to software supporting the ActivityPub protocol."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid "Maximum image size"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:331
+#: Code/Module/Admin/Site.php:331
 msgid "Cache all public images"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:331
+#: Code/Module/Admin/Site.php:331
 msgid "If disabled, proxy non-SSL images, but do not store locally"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:332
+#: Code/Module/Admin/Site.php:332
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid "Invitation only"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid ""
 "Only allow new member registrations with an invitation code. New member "
 "registration must be allowed for this to work."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:335
+#: Code/Module/Admin/Site.php:335
 msgid "Minimum age"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:335
+#: Code/Module/Admin/Site.php:335
 msgid "Minimum age (in years) for who may register on this site."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid ""
 "If a public server policy is selected, this information may be displayed on "
 "the public server site list."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid "Register text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Site.php:339
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Site.php:339
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:344
+#: Code/Module/Admin/Site.php:344
 msgid "Force publish in directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:344
+#: Code/Module/Admin/Site.php:344
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:346
+#: Code/Module/Admin/Site.php:346
 msgid "Public stream"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:346
+#: Code/Module/Admin/Site.php:346
 msgid "Provide a Public stream on your site. This content is unmoderated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:347
+#: Code/Module/Admin/Site.php:347
 msgid "the Public stream is disabled"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:348
+#: Code/Module/Admin/Site.php:348
 msgid "the Public stream contains public conversations from this site only"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:349
+#: Code/Module/Admin/Site.php:349
 msgid ""
 "the Public stream contains public conversations from anywhere on the internet"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:352
+#: Code/Module/Admin/Site.php:352
 msgid "Allow anybody on the internet to access the Public stream"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:352
+#: Code/Module/Admin/Site.php:352
 msgid ""
 "Default is to only allow viewing by site members. Warning: this content is "
 "unmoderated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:353
 msgid "Show numbers of likes and dislikes in conversations"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:353
 msgid ""
 "If disabled, the presence of likes and dislikes will be shown, but without "
 "totals."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid "Permit animated profile photos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid "Changing this may take several days to work through the system"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:355
+#: Code/Module/Admin/Site.php:355
 msgid "Only import Public stream posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:355 Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:355 Code/Module/Admin/Site.php:356
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:356
 msgid "Do not import Public stream posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:357
+#: Code/Module/Admin/Site.php:357
 msgid "Maximum number of imported friends of friends"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:357
+#: Code/Module/Admin/Site.php:357
 msgid ""
 "Warning: higher numbers will improve the quality of friend suggestions and "
 "directory results but can exponentially increase resource usage"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:358
+#: Code/Module/Admin/Site.php:358
 msgid "Login on Homepage"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:358
+#: Code/Module/Admin/Site.php:358
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:359
+#: Code/Module/Admin/Site.php:359
 msgid "Enable context help"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:359
+#: Code/Module/Admin/Site.php:359
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:360
+#: Code/Module/Admin/Site.php:360
 msgid "Reply-to email address for system generated email."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:361
+#: Code/Module/Admin/Site.php:361
 msgid "Sender (From) email address for system generated email."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:362
+#: Code/Module/Admin/Site.php:362
 msgid "Display name of email sender for system generated email."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:363
+#: Code/Module/Admin/Site.php:363
 msgid "Directory Server URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:363
+#: Code/Module/Admin/Site.php:363
 msgid "Default directory server"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:364
+#: Code/Module/Admin/Site.php:364
 msgid "Proxy user"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:365
+#: Code/Module/Admin/Site.php:365
 msgid "Proxy URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:366
+#: Code/Module/Admin/Site.php:366
 msgid "Network fetch timeout"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:366 Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:366 Code/Module/Admin/Site.php:367
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:367
 msgid "Network post timeout"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid "Delivery interval"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid "Deliveries per process"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid "Queue Threshold"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid "Poll interval"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:372
+#: Code/Module/Admin/Site.php:372
 msgid "Path to ImageMagick convert program"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:372
+#: Code/Module/Admin/Site.php:372
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 msgid "Maximum Load Average"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "Expiration period in days for imported streams and cached images"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:375
+#: Code/Module/Admin/Site.php:375
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:376
+#: Code/Module/Admin/Site.php:376
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:376
+#: Code/Module/Admin/Site.php:376
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:377
+#: Code/Module/Admin/Site.php:377
 msgid "Page to display after creating a new channel"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:377
+#: Code/Module/Admin/Site.php:377
 msgid "Default: profiles"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:378
+#: Code/Module/Admin/Site.php:378
 msgid "Site location"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:378
+#: Code/Module/Admin/Site.php:378
 msgid "Region or country - shared with other sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:31
+#: Code/Module/Admin/Themes.php:31
 msgid "Theme settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:71
+#: Code/Module/Admin/Themes.php:71
 msgid "No themes found."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:129
+#: Code/Module/Admin/Themes.php:129
 msgid "Screenshot"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:137 Zotlabs/Module/Admin/Themes.php:171
-#: Zotlabs/Widget/Admin.php:37
+#: Code/Module/Admin/Themes.php:137 Code/Module/Admin/Themes.php:171
+#: Code/Widget/Admin.php:37
 msgid "Themes"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:176
+#: Code/Module/Admin/Themes.php:176
 msgid "[Experimental]"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:177
+#: Code/Module/Admin/Themes.php:177
 msgid "[Unsupported]"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:34
+#: Code/Module/Affinity.php:34
 msgid "Friend Zoom settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:44
+#: Code/Module/Affinity.php:44
 msgid ""
 "This app (when installed) presents a slider control in your connection "
 "editor and also on your stream page. The slider represents your degree of "
@@ -4408,1691 +4408,1691 @@ msgid ""
 "conversations from only your closest friends or everybody in your stream."
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:52
+#: Code/Module/Affinity.php:52
 msgid ""
 "The number below represents the default maximum slider position for your "
 "stream page as a percentage."
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:64 Zotlabs/Module/Connedit.php:674
-#: Zotlabs/Widget/Affinity.php:29
+#: Code/Module/Affinity.php:64 Code/Module/Connedit.php:674
+#: Code/Widget/Affinity.php:29
 msgid "Me"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:65 Zotlabs/Module/Connedit.php:675
-#: Zotlabs/Widget/Affinity.php:30
+#: Code/Module/Affinity.php:65 Code/Module/Connedit.php:675
+#: Code/Widget/Affinity.php:30
 msgid "Family"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:67 Zotlabs/Module/Connedit.php:677
-#: Zotlabs/Widget/Affinity.php:32
+#: Code/Module/Affinity.php:67 Code/Module/Connedit.php:677
+#: Code/Widget/Affinity.php:32
 msgid "Peers"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:69 Zotlabs/Module/Connections.php:91
-#: Zotlabs/Module/Connections.php:114 Zotlabs/Module/Connedit.php:679
-#: Zotlabs/Widget/Affinity.php:34
+#: Code/Module/Affinity.php:69 Code/Module/Connections.php:91
+#: Code/Module/Connections.php:114 Code/Module/Connedit.php:679
+#: Code/Widget/Affinity.php:34
 msgid "All"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:77
+#: Code/Module/Affinity.php:77
 msgid "Default friend zoom in/out"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:78 Zotlabs/Widget/Affinity.php:43
+#: Code/Module/Affinity.php:78 Code/Widget/Affinity.php:43
 msgid "Refresh"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:89
+#: Code/Module/Affinity.php:89
 msgid "Friend Zoom Settings"
 msgstr ""
 
-#: Zotlabs/Module/Ap_probe.php:24
+#: Code/Module/Ap_probe.php:24
 msgid "ActivityPub Probe Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Ap_probe.php:25 Zotlabs/Module/Zot_probe.php:21
+#: Code/Module/Ap_probe.php:25 Code/Module/Zot_probe.php:21
 msgid "Object URL"
 msgstr ""
 
-#: Zotlabs/Module/Ap_probe.php:26 Zotlabs/Module/Zot_probe.php:22
+#: Code/Module/Ap_probe.php:26 Code/Module/Zot_probe.php:22
 msgid "Authenticated fetch"
 msgstr ""
 
-#: Zotlabs/Module/Api.php:87 Zotlabs/Module/Api.php:109
+#: Code/Module/Api.php:87 Code/Module/Api.php:109
 msgid "Authorize application connection"
 msgstr ""
 
-#: Zotlabs/Module/Api.php:88
+#: Code/Module/Api.php:88
 msgid "Return to your app and insert this Security Code:"
 msgstr ""
 
-#: Zotlabs/Module/Api.php:98
+#: Code/Module/Api.php:98
 msgid "Please login to continue."
 msgstr ""
 
-#: Zotlabs/Module/Api.php:111
+#: Code/Module/Api.php:111
 msgid ""
 "Do you want to authorize this application to access your posts and contacts, "
 "and/or create new posts for you?"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:49 Zotlabs/Module/Appman.php:66
+#: Code/Module/Appman.php:49 Code/Module/Appman.php:66
 msgid "App installed."
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:59
+#: Code/Module/Appman.php:59
 msgid "Malformed app."
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:142
+#: Code/Module/Appman.php:142
 msgid "Embed code"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:146
+#: Code/Module/Appman.php:146
 msgid "Edit App"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:146
+#: Code/Module/Appman.php:146
 msgid "Create App"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:151
+#: Code/Module/Appman.php:151
 msgid "Name of app"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:151 Zotlabs/Module/Appman.php:152
-#: Zotlabs/Module/Events.php:511 Zotlabs/Module/Events.php:516
-#: Zotlabs/Module/Profiles.php:795 Zotlabs/Module/Profiles.php:799
+#: Code/Module/Appman.php:151 Code/Module/Appman.php:152
+#: Code/Module/Events.php:511 Code/Module/Events.php:516
+#: Code/Module/Profiles.php:795 Code/Module/Profiles.php:799
 #: include/datetime.php:254
 msgid "Required"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:152
+#: Code/Module/Appman.php:152
 msgid "Location (URL) of app"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:153 Zotlabs/Module/Cdav.php:1023
-#: Zotlabs/Module/Events.php:524
+#: Code/Module/Appman.php:153 Code/Module/Cdav.php:1023
+#: Code/Module/Events.php:524
 msgid "Description"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:154
+#: Code/Module/Appman.php:154
 msgid "Photo icon URL"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:154
+#: Code/Module/Appman.php:154
 msgid "80 x 80 pixels - optional"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:155
+#: Code/Module/Appman.php:155
 msgid "Categories (optional, comma separated list)"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:156
+#: Code/Module/Appman.php:156
 msgid "Version ID"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:157
+#: Code/Module/Appman.php:157
 msgid "Price of app"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:158
+#: Code/Module/Appman.php:158
 msgid "Location (URL) to purchase app"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:50
+#: Code/Module/Apporder.php:50
 msgid "Change order of pinned navbar apps"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:50
+#: Code/Module/Apporder.php:50
 msgid "Change order of app tray apps"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:51
+#: Code/Module/Apporder.php:51
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the "
 "navbar"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:52
+#: Code/Module/Apporder.php:52
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
 
-#: Zotlabs/Module/Apps.php:62
+#: Code/Module/Apps.php:62
 msgid "Manage apps"
 msgstr ""
 
-#: Zotlabs/Module/Apps.php:63
+#: Code/Module/Apps.php:63
 msgid "Create Custom App"
 msgstr ""
 
-#: Zotlabs/Module/Attach.php:18
+#: Code/Module/Attach.php:18
 msgid "Item not available."
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:26
+#: Code/Module/Authorize.php:26
 msgid "Unknown App"
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:38
+#: Code/Module/Authorize.php:38
 msgid "Authorize"
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:39
+#: Code/Module/Authorize.php:39
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:41
+#: Code/Module/Authorize.php:41
 msgid "Allow"
 msgstr ""
 
-#: Zotlabs/Module/Block.php:36 Zotlabs/Module/Page.php:47
+#: Code/Module/Block.php:36 Code/Module/Page.php:47
 msgid "Invalid item."
 msgstr ""
 
-#: Zotlabs/Module/Block.php:49 Zotlabs/Module/Cal.php:74
-#: Zotlabs/Module/Card_edit.php:56 Zotlabs/Module/Chanview.php:104
-#: Zotlabs/Module/Page.php:85 Zotlabs/Module/Wall_upload.php:37
-#: Zotlabs/Module/Superblock.php:66 include/items.php:4396
+#: Code/Module/Block.php:49 Code/Module/Cal.php:74
+#: Code/Module/Card_edit.php:56 Code/Module/Chanview.php:104
+#: Code/Module/Page.php:85 Code/Module/Wall_upload.php:37
+#: Code/Module/Superblock.php:66 include/items.php:4396
 msgid "Channel not found."
 msgstr ""
 
-#: Zotlabs/Module/Block.php:86 Zotlabs/Module/Display.php:162
-#: Zotlabs/Module/Display.php:180 Zotlabs/Module/Display.php:198
-#: Zotlabs/Module/Display.php:204 Zotlabs/Module/Page.php:149
-#: Zotlabs/Web/Router.php:168
+#: Code/Module/Block.php:86 Code/Module/Display.php:162
+#: Code/Module/Display.php:180 Code/Module/Display.php:198
+#: Code/Module/Display.php:204 Code/Module/Page.php:149
+#: Code/Web/Router.php:168
 msgid "Page not found."
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:106 Zotlabs/Module/Blocks.php:168
-#: Zotlabs/Module/Editblock.php:128
+#: Code/Module/Blocks.php:106 Code/Module/Blocks.php:168
+#: Code/Module/Editblock.php:128
 msgid "Block Name"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:167 include/text.php:2861
+#: Code/Module/Blocks.php:167 include/text.php:2861
 msgid "Blocks"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:169
+#: Code/Module/Blocks.php:169
 msgid "Block Title"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:170 Zotlabs/Module/Connections.php:253
-#: Zotlabs/Module/Layouts.php:207 Zotlabs/Module/Menu.php:186
-#: Zotlabs/Module/Webpages.php:280
+#: Code/Module/Blocks.php:170 Code/Module/Connections.php:253
+#: Code/Module/Layouts.php:207 Code/Module/Menu.php:186
+#: Code/Module/Webpages.php:280
 msgid "Created"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:171 Zotlabs/Module/Layouts.php:208
-#: Zotlabs/Module/Menu.php:187 Zotlabs/Module/Webpages.php:281
+#: Code/Module/Blocks.php:171 Code/Module/Layouts.php:208
+#: Code/Module/Menu.php:187 Code/Module/Webpages.php:281
 msgid "Edited"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:172 Zotlabs/Module/Cards.php:114
-#: Zotlabs/Module/Cdav.php:1066 Zotlabs/Module/Cdav.php:1370
-#: Zotlabs/Module/Connedit.php:888 Zotlabs/Module/Layouts.php:201
-#: Zotlabs/Module/Menu.php:190 Zotlabs/Module/New_channel.php:206
-#: Zotlabs/Module/Profiles.php:851 Zotlabs/Module/Webpages.php:268
-#: Zotlabs/Storage/Browser.php:302 Zotlabs/Storage/Browser.php:420
-#: Zotlabs/Widget/Cdav.php:151 Zotlabs/Widget/Cdav.php:187
+#: Code/Module/Blocks.php:172 Code/Module/Cards.php:114
+#: Code/Module/Cdav.php:1066 Code/Module/Cdav.php:1370
+#: Code/Module/Connedit.php:888 Code/Module/Layouts.php:201
+#: Code/Module/Menu.php:190 Code/Module/New_channel.php:206
+#: Code/Module/Profiles.php:851 Code/Module/Webpages.php:268
+#: Code/Storage/Browser.php:302 Code/Storage/Browser.php:420
+#: Code/Widget/Cdav.php:151 Code/Widget/Cdav.php:187
 msgid "Create"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:174 Zotlabs/Module/Layouts.php:210
-#: Zotlabs/Module/Photos.php:1177 Zotlabs/Module/Webpages.php:270
-#: Zotlabs/Widget/Cdav.php:147 include/conversation.php:1403
+#: Code/Module/Blocks.php:174 Code/Module/Layouts.php:210
+#: Code/Module/Photos.php:1177 Code/Module/Webpages.php:270
+#: Code/Widget/Cdav.php:147 include/conversation.php:1403
 msgid "Share"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:179 Zotlabs/Module/Events.php:762
-#: Zotlabs/Module/Layouts.php:214 Zotlabs/Module/Webpages.php:275
+#: Code/Module/Blocks.php:179 Code/Module/Events.php:762
+#: Code/Module/Layouts.php:214 Code/Module/Webpages.php:275
 msgid "View"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:81
+#: Code/Module/Cal.php:81
 msgid "Permissions denied."
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:287 Zotlabs/Module/Events.php:675
+#: Code/Module/Cal.php:287 Code/Module/Events.php:675
 msgid "l, F j"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:335 Zotlabs/Module/Events.php:730
+#: Code/Module/Cal.php:335 Code/Module/Events.php:730
 #: include/text.php:2178
 msgid "Link to Source"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:356 Zotlabs/Module/Events.php:756
+#: Code/Module/Cal.php:356 Code/Module/Events.php:756
 msgid "Edit Event"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:356 Zotlabs/Module/Events.php:756
+#: Code/Module/Cal.php:356 Code/Module/Events.php:756
 msgid "Create Event"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:357 Zotlabs/Module/Cal.php:364
-#: Zotlabs/Module/Cdav.php:1042 Zotlabs/Module/Events.php:757
-#: Zotlabs/Module/Events.php:766 Zotlabs/Module/Photos.php:1022
+#: Code/Module/Cal.php:357 Code/Module/Cal.php:364
+#: Code/Module/Cdav.php:1042 Code/Module/Events.php:757
+#: Code/Module/Events.php:766 Code/Module/Photos.php:1022
 msgid "Previous"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:358 Zotlabs/Module/Cal.php:365
-#: Zotlabs/Module/Cdav.php:1043 Zotlabs/Module/Events.php:758
-#: Zotlabs/Module/Events.php:767 Zotlabs/Module/Photos.php:1032
-#: Zotlabs/Module/Setup.php:288
+#: Code/Module/Cal.php:358 Code/Module/Cal.php:365
+#: Code/Module/Cdav.php:1043 Code/Module/Events.php:758
+#: Code/Module/Events.php:767 Code/Module/Photos.php:1032
+#: Code/Module/Setup.php:288
 msgid "Next"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:362 include/text.php:2886
+#: Code/Module/Cal.php:362 include/text.php:2886
 msgid "Import"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:366 Zotlabs/Module/Cdav.php:1044
-#: Zotlabs/Module/Events.php:768
+#: Code/Module/Cal.php:366 Code/Module/Cdav.php:1044
+#: Code/Module/Events.php:768
 msgid "Today"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:93 Zotlabs/Module/Events.php:147
+#: Code/Module/Calendar.php:93 Code/Module/Events.php:147
 msgid "Event can not end before it has started."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:95 Zotlabs/Module/Calendar.php:103
-#: Zotlabs/Module/Calendar.php:120 Zotlabs/Module/Events.php:149
-#: Zotlabs/Module/Events.php:158 Zotlabs/Module/Events.php:180
+#: Code/Module/Calendar.php:95 Code/Module/Calendar.php:103
+#: Code/Module/Calendar.php:120 Code/Module/Events.php:149
+#: Code/Module/Events.php:158 Code/Module/Events.php:180
 msgid "Unable to generate preview."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:101 Zotlabs/Module/Events.php:156
+#: Code/Module/Calendar.php:101 Code/Module/Events.php:156
 msgid "Event title and start time are required."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:118 Zotlabs/Module/Calendar.php:258
-#: Zotlabs/Module/Events.php:178 Zotlabs/Module/Events.php:304
+#: Code/Module/Calendar.php:118 Code/Module/Calendar.php:258
+#: Code/Module/Events.php:178 Code/Module/Events.php:304
 msgid "Event not found."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:254 Zotlabs/Module/Events.php:300
-#: Zotlabs/Module/Like.php:176 Zotlabs/Module/Tagger.php:89
+#: Code/Module/Calendar.php:254 Code/Module/Events.php:300
+#: Code/Module/Like.php:176 Code/Module/Tagger.php:89
 #: include/event.php:1339 include/conversation.php:138 include/text.php:2383
 msgid "event"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:423 Zotlabs/Module/Events.php:702
+#: Code/Module/Calendar.php:423 Code/Module/Events.php:702
 msgid "Edit event"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:425 Zotlabs/Module/Events.php:704
+#: Code/Module/Calendar.php:425 Code/Module/Events.php:704
 msgid "Delete event"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:439 Zotlabs/Module/Cdav.php:957
+#: Code/Module/Calendar.php:439 Code/Module/Cdav.php:957
 msgid "Link to source"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:453 Zotlabs/Module/Events.php:737
+#: Code/Module/Calendar.php:453 Code/Module/Events.php:737
 msgid "calendar"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:489 Zotlabs/Module/Events.php:863
+#: Code/Module/Calendar.php:489 Code/Module/Events.php:863
 msgid "Failed to remove event"
 msgstr ""
 
-#: Zotlabs/Module/Card_edit.php:27 Zotlabs/Module/Card_edit.php:45
-#: Zotlabs/Module/Dreport.php:69 Zotlabs/Module/Editblock.php:91
-#: Zotlabs/Module/Editblock.php:109 Zotlabs/Module/Editlayout.php:89
-#: Zotlabs/Module/Editpost.php:33 Zotlabs/Module/Editwebpage.php:94
+#: Code/Module/Card_edit.php:27 Code/Module/Card_edit.php:45
+#: Code/Module/Dreport.php:69 Code/Module/Editblock.php:91
+#: Code/Module/Editblock.php:109 Code/Module/Editlayout.php:89
+#: Code/Module/Editpost.php:33 Code/Module/Editwebpage.php:94
 msgid "Item not found"
 msgstr ""
 
-#: Zotlabs/Module/Card_edit.php:112 Zotlabs/Module/Chat.php:223
-#: Zotlabs/Module/Editblock.php:131 Zotlabs/Module/Editwebpage.php:161
+#: Code/Module/Card_edit.php:112 Code/Module/Chat.php:223
+#: Code/Module/Editblock.php:131 Code/Module/Editwebpage.php:161
 #: include/conversation.php:1239
 msgid "Insert web link"
 msgstr ""
 
-#: Zotlabs/Module/Card_edit.php:128 Zotlabs/Module/Editblock.php:144
-#: Zotlabs/Module/Photos.php:739 Zotlabs/Module/Photos.php:1125
+#: Code/Module/Card_edit.php:128 Code/Module/Editblock.php:144
+#: Code/Module/Photos.php:739 Code/Module/Photos.php:1125
 #: include/conversation.php:1453
 msgid "Title (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Card_edit.php:139
+#: Code/Module/Card_edit.php:139
 msgid "Edit Card"
 msgstr ""
 
-#: Zotlabs/Module/Cards.php:55
+#: Code/Module/Cards.php:55
 msgid "Create personal planning cards"
 msgstr ""
 
-#: Zotlabs/Module/Cards.php:113
+#: Code/Module/Cards.php:113
 msgid "Add Card"
 msgstr ""
 
-#: Zotlabs/Module/Categories.php:31
+#: Code/Module/Categories.php:31
 msgid "This app allows you to add categories to posts and events."
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:799 Zotlabs/Module/Events.php:44
+#: Code/Module/Cdav.php:799 Code/Module/Events.php:44
 msgid "Calendar entries imported."
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:801 Zotlabs/Module/Events.php:46
+#: Code/Module/Cdav.php:801 Code/Module/Events.php:46
 msgid "No calendar entries found."
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:863
+#: Code/Module/Cdav.php:863
 msgid "INVALID EVENT DISMISSED!"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:864
+#: Code/Module/Cdav.php:864
 msgid "Summary: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:865
+#: Code/Module/Cdav.php:865
 msgid "Date: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:866 Zotlabs/Module/Cdav.php:872
+#: Code/Module/Cdav.php:866 Code/Module/Cdav.php:872
 msgid "Reason: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:870
+#: Code/Module/Cdav.php:870
 msgid "INVALID CARD DISMISSED!"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:871
+#: Code/Module/Cdav.php:871
 msgid "Name: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:892
+#: Code/Module/Cdav.php:892
 msgid "CardDAV App"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:892 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
+#: Code/Module/Cdav.php:892 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
 #: extend/addon/a/gallery/Mod_Gallery.php:61
 msgid "Not Installed"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:893
+#: Code/Module/Cdav.php:893
 msgid "CalDAV capable addressbook"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1020 Zotlabs/Module/Events.php:511
+#: Code/Module/Cdav.php:1020 Code/Module/Events.php:511
 msgid "Event title"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1021 Zotlabs/Module/Events.php:517
+#: Code/Module/Cdav.php:1021 Code/Module/Events.php:517
 msgid "Start date and time"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1022
+#: Code/Module/Cdav.php:1022
 msgid "End date and time"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1045 Zotlabs/Module/Events.php:763
+#: Code/Module/Cdav.php:1045 Code/Module/Events.php:763
 msgid "Month"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1046 Zotlabs/Module/Events.php:764
+#: Code/Module/Cdav.php:1046 Code/Module/Events.php:764
 msgid "Week"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1047 Zotlabs/Module/Events.php:765
+#: Code/Module/Cdav.php:1047 Code/Module/Events.php:765
 msgid "Day"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1048
+#: Code/Module/Cdav.php:1048
 msgid "List month"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1049
+#: Code/Module/Cdav.php:1049
 msgid "List week"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1050
+#: Code/Module/Cdav.php:1050
 msgid "List day"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1058
+#: Code/Module/Cdav.php:1058
 msgid "More"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1059
+#: Code/Module/Cdav.php:1059
 msgid "Less"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1061
+#: Code/Module/Cdav.php:1061
 msgid "Select calendar"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1062 Zotlabs/Widget/Cdav.php:154
+#: Code/Module/Cdav.php:1062 Code/Widget/Cdav.php:154
 msgid "Channel Calendars"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1062 Zotlabs/Widget/Cdav.php:140
-#: Zotlabs/Widget/Cdav.php:154
+#: Code/Module/Cdav.php:1062 Code/Widget/Cdav.php:140
+#: Code/Widget/Cdav.php:154
 msgid "CalDAV Calendars"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1064
+#: Code/Module/Cdav.php:1064
 msgid "Delete all"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1067
+#: Code/Module/Cdav.php:1067
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1356 Zotlabs/Module/Connedit.php:874
+#: Code/Module/Cdav.php:1356 Code/Module/Connedit.php:874
 msgid "Organisation"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1357 Zotlabs/Module/Connedit.php:875
+#: Code/Module/Cdav.php:1357 Code/Module/Connedit.php:875
 msgid "Title"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1358 Zotlabs/Module/Connedit.php:876
-#: Zotlabs/Module/Profiles.php:839
+#: Code/Module/Cdav.php:1358 Code/Module/Connedit.php:876
+#: Code/Module/Profiles.php:839
 msgid "Phone"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1360 Zotlabs/Module/Connedit.php:878
-#: Zotlabs/Module/Profiles.php:841
+#: Code/Module/Cdav.php:1360 Code/Module/Connedit.php:878
+#: Code/Module/Profiles.php:841
 msgid "Instant messenger"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1361 Zotlabs/Module/Connedit.php:879
-#: Zotlabs/Module/Profiles.php:842
+#: Code/Module/Cdav.php:1361 Code/Module/Connedit.php:879
+#: Code/Module/Profiles.php:842
 msgid "Website"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1363 Zotlabs/Module/Connedit.php:881
-#: Zotlabs/Module/Profiles.php:844
+#: Code/Module/Cdav.php:1363 Code/Module/Connedit.php:881
+#: Code/Module/Profiles.php:844
 msgid "Note"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1364 Zotlabs/Module/Connedit.php:882
-#: Zotlabs/Module/Profiles.php:845 include/connections.php:839
+#: Code/Module/Cdav.php:1364 Code/Module/Connedit.php:882
+#: Code/Module/Profiles.php:845 include/connections.php:839
 #: include/event.php:1515
 msgid "Mobile"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1365 Zotlabs/Module/Connedit.php:883
-#: Zotlabs/Module/Profiles.php:846 include/connections.php:840
+#: Code/Module/Cdav.php:1365 Code/Module/Connedit.php:883
+#: Code/Module/Profiles.php:846 include/connections.php:840
 #: include/event.php:1516
 msgid "Home"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1366 Zotlabs/Module/Connedit.php:884
-#: Zotlabs/Module/Profiles.php:847 include/connections.php:843
+#: Code/Module/Cdav.php:1366 Code/Module/Connedit.php:884
+#: Code/Module/Profiles.php:847 include/connections.php:843
 #: include/event.php:1519
 msgid "Work"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1367 Zotlabs/Module/Connedit.php:885
-#: Zotlabs/Module/Profiles.php:848 Zotlabs/Module/Profiles.php:989
-#: Zotlabs/Module/Profiles.php:1007 Zotlabs/Module/Profiles.php:1077
-#: Zotlabs/Module/Profiles.php:1114 include/connections.php:846
+#: Code/Module/Cdav.php:1367 Code/Module/Connedit.php:885
+#: Code/Module/Profiles.php:848 Code/Module/Profiles.php:989
+#: Code/Module/Profiles.php:1007 Code/Module/Profiles.php:1077
+#: Code/Module/Profiles.php:1114 include/connections.php:846
 #: include/connections.php:852 include/event.php:1522 include/event.php:1528
 msgid "Other"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1368 Zotlabs/Module/Connedit.php:886
-#: Zotlabs/Module/Profiles.php:849
+#: Code/Module/Cdav.php:1368 Code/Module/Connedit.php:886
+#: Code/Module/Profiles.php:849
 msgid "Add Contact"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1369 Zotlabs/Module/Connedit.php:887
-#: Zotlabs/Module/Profiles.php:850
+#: Code/Module/Cdav.php:1369 Code/Module/Connedit.php:887
+#: Code/Module/Profiles.php:850
 msgid "Add Field"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1374 Zotlabs/Module/Connedit.php:892
+#: Code/Module/Cdav.php:1374 Code/Module/Connedit.php:892
 msgid "P.O. Box"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1375 Zotlabs/Module/Connedit.php:893
+#: Code/Module/Cdav.php:1375 Code/Module/Connedit.php:893
 msgid "Additional"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1376 Zotlabs/Module/Connedit.php:894
+#: Code/Module/Cdav.php:1376 Code/Module/Connedit.php:894
 msgid "Street"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1377 Zotlabs/Module/Connedit.php:895
+#: Code/Module/Cdav.php:1377 Code/Module/Connedit.php:895
 msgid "Locality"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1378 Zotlabs/Module/Connedit.php:896
+#: Code/Module/Cdav.php:1378 Code/Module/Connedit.php:896
 msgid "Region"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1379 Zotlabs/Module/Connedit.php:897
+#: Code/Module/Cdav.php:1379 Code/Module/Connedit.php:897
 msgid "ZIP Code"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1380 Zotlabs/Module/Connedit.php:898
-#: Zotlabs/Module/Profiles.php:807
+#: Code/Module/Cdav.php:1380 Code/Module/Connedit.php:898
+#: Code/Module/Profiles.php:807
 msgid "Country"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1431
+#: Code/Module/Cdav.php:1431
 msgid "Default Calendar"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1442
+#: Code/Module/Cdav.php:1442
 msgid "Default Addressbook"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:60
+#: Code/Module/Changeaddr.php:60
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:91
+#: Code/Module/Changeaddr.php:91
 msgid "Feature has been disabled"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:110
+#: Code/Module/Changeaddr.php:110
 msgid "Change channel nickname/address"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:111 Zotlabs/Module/Removeaccount.php:75
-#: Zotlabs/Module/Removeme.php:75
+#: Code/Module/Changeaddr.php:111 Code/Module/Removeaccount.php:75
+#: Code/Module/Removeme.php:75
 msgid "WARNING: "
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:111
+#: Code/Module/Changeaddr.php:111
 msgid "Any/all connections on other networks will be lost!"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:112 Zotlabs/Module/Removeaccount.php:76
-#: Zotlabs/Module/Removeme.php:76
+#: Code/Module/Changeaddr.php:112 Code/Module/Removeaccount.php:76
+#: Code/Module/Removeme.php:76
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:113
+#: Code/Module/Changeaddr.php:113
 msgid "New channel address"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:114
+#: Code/Module/Changeaddr.php:114
 msgid "Rename Channel"
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:63 Zotlabs/Module/Chat.php:34
+#: Code/Module/Channel.php:63 Code/Module/Chat.php:34
 msgid "You must be logged in to see this page."
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:90 Zotlabs/Module/Hcard.php:52
-#: Zotlabs/Module/Profile.php:63
+#: Code/Module/Channel.php:90 Code/Module/Hcard.php:52
+#: Code/Module/Profile.php:63
 msgid "Only posts"
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:181
+#: Code/Module/Channel.php:181
 #, php-format
 msgid "This is the home page of %s."
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:238
+#: Code/Module/Channel.php:238
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:254 Zotlabs/Module/Stream.php:219
+#: Code/Module/Channel.php:254 Code/Module/Stream.php:219
 msgid "Search Results For:"
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:292 Zotlabs/Module/Display.php:102
-#: Zotlabs/Module/Hq.php:157 Zotlabs/Module/Pubstream.php:90
-#: Zotlabs/Module/Rpost.php:245 Zotlabs/Module/Stream.php:250
+#: Code/Module/Channel.php:292 Code/Module/Display.php:102
+#: Code/Module/Hq.php:157 Code/Module/Pubstream.php:90
+#: Code/Module/Rpost.php:245 Code/Module/Stream.php:250
 msgid "Reset form"
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:561 Zotlabs/Module/Display.php:441
+#: Code/Module/Channel.php:561 Code/Module/Display.php:441
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:609
+#: Code/Module/Channel.php:609
 #, php-format
 msgid "This post was published on the home page of %s."
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:151 Zotlabs/Module/Chanview.php:152
+#: Code/Module/Chanview.php:151 Code/Module/Chanview.php:152
 msgid "Not available"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:171
+#: Code/Module/Chanview.php:171
 msgid "Cover photo for this channel"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:173
+#: Code/Module/Chanview.php:173
 msgid "Followers"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:174
+#: Code/Module/Chanview.php:174
 msgid "Following"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:177 include/conversation.php:958
+#: Code/Module/Chanview.php:177 include/conversation.php:958
 msgid "Visit"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:178
+#: Code/Module/Chanview.php:178
 msgid "toggle full screen mode"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:198
+#: Code/Module/Chat.php:198
 msgid "Room not found"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:215
+#: Code/Module/Chat.php:215
 msgid "Leave Room"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:216
+#: Code/Module/Chat.php:216
 msgid "Delete Room"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:217
+#: Code/Module/Chat.php:217
 msgid "I am away right now"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:218
+#: Code/Module/Chat.php:218
 msgid "I am online"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:221 include/conversation.php:1289
+#: Code/Module/Chat.php:221 include/conversation.php:1289
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:240
+#: Code/Module/Chat.php:240
 msgid "New Chatroom"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:241
+#: Code/Module/Chat.php:241
 msgid "Chatroom name"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:242
+#: Code/Module/Chat.php:242
 msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:258
+#: Code/Module/Chat.php:258
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:263
+#: Code/Module/Chat.php:263
 msgid "No chatrooms available"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:264 Zotlabs/Module/Manage.php:159
-#: Zotlabs/Module/Profiles.php:883
+#: Code/Module/Chat.php:264 Code/Module/Manage.php:159
+#: Code/Module/Profiles.php:883
 msgid "Create New"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:267
+#: Code/Module/Chat.php:267
 msgid "Expiration"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:268
+#: Code/Module/Chat.php:268
 msgid "min"
 msgstr ""
 
-#: Zotlabs/Module/Chatsvc.php:149
+#: Code/Module/Chatsvc.php:149
 msgid "Away"
 msgstr ""
 
-#: Zotlabs/Module/Chatsvc.php:154
+#: Code/Module/Chatsvc.php:154
 msgid "Online"
 msgstr ""
 
-#: Zotlabs/Module/Clients.php:16
+#: Code/Module/Clients.php:16
 msgid ""
 "This app allows you to authorize mobile apps using OAuth and OpenID to "
 "access your channel."
 msgstr ""
 
-#: Zotlabs/Module/Cloud.php:132 Zotlabs/Module/Item.php:1753
+#: Code/Module/Cloud.php:132 Code/Module/Item.php:1753
 msgid "Not found"
 msgstr ""
 
-#: Zotlabs/Module/Cloud.php:134 Zotlabs/Module/Dreport.php:18
-#: Zotlabs/Module/Dreport.php:88 Zotlabs/Module/Import_items.php:135
-#: Zotlabs/Module/Like.php:111 Zotlabs/Module/Lists.php:173
-#: Zotlabs/Module/Lists.php:219 Zotlabs/Module/Lists.php:248
-#: Zotlabs/Module/Lists.php:290 Zotlabs/Module/Profperm.php:35
-#: Zotlabs/Module/Share.php:82 Zotlabs/Module/Subthread.php:99
-#: Zotlabs/Web/WebServer.php:71 include/items.php:475
+#: Code/Module/Cloud.php:134 Code/Module/Dreport.php:18
+#: Code/Module/Dreport.php:88 Code/Module/Import_items.php:135
+#: Code/Module/Like.php:111 Code/Module/Lists.php:173
+#: Code/Module/Lists.php:219 Code/Module/Lists.php:248
+#: Code/Module/Lists.php:290 Code/Module/Profperm.php:35
+#: Code/Module/Share.php:82 Code/Module/Subthread.php:99
+#: Code/Web/WebServer.php:71 include/items.php:475
 msgid "Permission denied"
 msgstr ""
 
-#: Zotlabs/Module/Cloud.php:136
+#: Code/Module/Cloud.php:136
 msgid "Please refresh page"
 msgstr ""
 
-#: Zotlabs/Module/Cloud.php:142
+#: Code/Module/Cloud.php:142
 msgid "Unknown error"
 msgstr ""
 
-#: Zotlabs/Module/Comment_control.php:15
+#: Code/Module/Comment_control.php:15
 msgid ""
 "This app allows you to select the comment audience and set a length of time "
 "that comments on a particular post will be accepted."
 msgstr ""
 
-#: Zotlabs/Module/Comment_control.php:23
+#: Code/Module/Comment_control.php:23
 msgid ""
 "This app is installed. A button to control comments may be found below the "
 "post editor."
 msgstr ""
 
-#: Zotlabs/Module/Common.php:23
+#: Code/Module/Common.php:23
 msgid "No channel."
 msgstr ""
 
-#: Zotlabs/Module/Common.php:57
+#: Code/Module/Common.php:57
 msgid "No connections in common."
 msgstr ""
 
-#: Zotlabs/Module/Common.php:77
+#: Code/Module/Common.php:77
 msgid "View Common Connections"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:60 Zotlabs/Module/Connect.php:110
+#: Code/Module/Connect.php:60 Code/Module/Connect.php:110
 msgid "Continue"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:91
+#: Code/Module/Connect.php:91
 msgid "Premium Channel Setup"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:93
+#: Code/Module/Connect.php:93
 msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:94
+#: Code/Module/Connect.php:94
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:96 Zotlabs/Module/Connect.php:116
+#: Code/Module/Connect.php:96 Code/Module/Connect.php:116
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:97
+#: Code/Module/Connect.php:97
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:98 Zotlabs/Module/Connect.php:119
+#: Code/Module/Connect.php:98 Code/Module/Connect.php:119
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided "
 "on this page."
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:106
+#: Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:115
+#: Code/Module/Connect.php:115
 msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:71 Zotlabs/Module/Connections.php:158
-#: Zotlabs/Module/Connections.php:301
+#: Code/Module/Connections.php:71 Code/Module/Connections.php:158
+#: Code/Module/Connections.php:301
 msgid "Blocked"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:76 Zotlabs/Module/Connections.php:165
-#: Zotlabs/Module/Connections.php:300
+#: Code/Module/Connections.php:76 Code/Module/Connections.php:165
+#: Code/Module/Connections.php:300
 msgid "Ignored"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:81 Zotlabs/Module/Connections.php:179
-#: Zotlabs/Module/Connections.php:299
+#: Code/Module/Connections.php:81 Code/Module/Connections.php:179
+#: Code/Module/Connections.php:299
 msgid "Hidden"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:86 Zotlabs/Module/Connections.php:172
+#: Code/Module/Connections.php:86 Code/Module/Connections.php:172
 msgid "Archived/Unreachable"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:96 Zotlabs/Module/Connections.php:110
-#: Zotlabs/Module/Menu.php:188 Zotlabs/Module/Notifications.php:66
+#: Code/Module/Connections.php:96 Code/Module/Connections.php:110
+#: Code/Module/Menu.php:188 Code/Module/Notifications.php:66
 msgid "New"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:144
+#: Code/Module/Connections.php:144
 msgid "Active Connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:147
+#: Code/Module/Connections.php:147
 msgid "Show active connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:151 Zotlabs/Widget/Notifications.php:75
+#: Code/Module/Connections.php:151 Code/Widget/Notifications.php:75
 msgid "New Connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:154
+#: Code/Module/Connections.php:154
 msgid "Show pending (new) connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:161
+#: Code/Module/Connections.php:161
 msgid "Only show blocked connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:168
+#: Code/Module/Connections.php:168
 msgid "Only show ignored connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:175
+#: Code/Module/Connections.php:175
 msgid "Only show archived/unreachable connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:182
+#: Code/Module/Connections.php:182
 msgid "Only show hidden connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:186 Zotlabs/Module/Profperm.php:158
+#: Code/Module/Connections.php:186 Code/Module/Profperm.php:158
 msgid "All Connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:189
+#: Code/Module/Connections.php:189
 msgid "Show all connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:242
+#: Code/Module/Connections.php:242
 msgid "Order by name"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:246
+#: Code/Module/Connections.php:246
 msgid "Recent"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:249
+#: Code/Module/Connections.php:249
 msgid "Order by recent"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:256
+#: Code/Module/Connections.php:256
 msgid "Order by date"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:297
+#: Code/Module/Connections.php:297
 msgid "Pending approval"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:298
+#: Code/Module/Connections.php:298
 msgid "Archived"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:302
+#: Code/Module/Connections.php:302
 msgid "Not connected at this location"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:320
+#: Code/Module/Connections.php:320
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:321
+#: Code/Module/Connections.php:321
 msgid "Edit connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:323
+#: Code/Module/Connections.php:323
 msgid "Delete connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:332
+#: Code/Module/Connections.php:332
 msgid "Channel address"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:334
+#: Code/Module/Connections.php:334
 msgid "Network"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:337
+#: Code/Module/Connections.php:337
 msgid "Call"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:339
+#: Code/Module/Connections.php:339
 msgid "Status"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:341
+#: Code/Module/Connections.php:341
 msgid "Connected"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:343
+#: Code/Module/Connections.php:343
 msgid "Approve connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:345
+#: Code/Module/Connections.php:345
 msgid "Ignore connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:346 Zotlabs/Module/Connedit.php:588
+#: Code/Module/Connections.php:346 Code/Module/Connedit.php:588
 msgid "Ignore"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:347
+#: Code/Module/Connections.php:347
 msgid "Recent activity"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:374
+#: Code/Module/Connections.php:374
 msgid "Filter by"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:375
+#: Code/Module/Connections.php:375
 msgid "Sort by"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:379
+#: Code/Module/Connections.php:379
 msgid "Search your connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:380
+#: Code/Module/Connections.php:380
 msgid "Connections search"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:381 Zotlabs/Module/Directory.php:482
-#: Zotlabs/Module/Directory.php:487 Zotlabs/Widget/Findpeople.php:36
+#: Code/Module/Connections.php:381 Code/Module/Directory.php:482
+#: Code/Module/Directory.php:487 Code/Widget/Findpeople.php:36
 msgid "Find"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:92 Zotlabs/Module/Defperms.php:78
+#: Code/Module/Connedit.php:92 Code/Module/Defperms.php:78
 msgid "Could not access contact record."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:124
+#: Code/Module/Connedit.php:124
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:207
+#: Code/Module/Connedit.php:207
 msgid "Connection updated."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:209
+#: Code/Module/Connedit.php:209
 msgid "Failed to update connection record."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:254
+#: Code/Module/Connedit.php:254
 msgid "is now connected to"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:381
+#: Code/Module/Connedit.php:381
 msgid "Could not access address book record."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:427
+#: Code/Module/Connedit.php:427
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:454
+#: Code/Module/Connedit.php:454
 msgid "Added by Connedit"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:492
+#: Code/Module/Connedit.php:492
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:509
+#: Code/Module/Connedit.php:509
 msgid "Connection has been removed."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:555
+#: Code/Module/Connedit.php:555
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:559
+#: Code/Module/Connedit.php:559
 msgid "Refresh Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:562
+#: Code/Module/Connedit.php:562
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:566
+#: Code/Module/Connedit.php:566
 msgid "Refresh Photo"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:569
+#: Code/Module/Connedit.php:569
 msgid "Fetch updated photo"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:573 include/conversation.php:968
+#: Code/Module/Connedit.php:573 include/conversation.php:968
 msgid "Recent Activity"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:576
+#: Code/Module/Connedit.php:576
 msgid "View recent posts and comments"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:583
+#: Code/Module/Connedit.php:583
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:584
+#: Code/Module/Connedit.php:584
 msgid "This connection is blocked"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:588
+#: Code/Module/Connedit.php:588
 msgid "Unignore"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:591
+#: Code/Module/Connedit.php:591
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:592
+#: Code/Module/Connedit.php:592
 msgid "This connection is ignored"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:599
+#: Code/Module/Connedit.php:599
 msgid "Censor (or Uncensor) images from this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:600
+#: Code/Module/Connedit.php:600
 msgid "This connection is censored"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:604
+#: Code/Module/Connedit.php:604
 msgid "Unarchive"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:604
+#: Code/Module/Connedit.php:604
 msgid "Archive"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:607
+#: Code/Module/Connedit.php:607
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:608
+#: Code/Module/Connedit.php:608
 msgid "This connection is archived"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:612
+#: Code/Module/Connedit.php:612
 msgid "Unhide"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:612
+#: Code/Module/Connedit.php:612
 msgid "Hide"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:615
+#: Code/Module/Connedit.php:615
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:616
+#: Code/Module/Connedit.php:616
 msgid "This connection is hidden"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:623
+#: Code/Module/Connedit.php:623
 msgid "Delete this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:631
+#: Code/Module/Connedit.php:631
 msgid "Fetch Vcard"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:634
+#: Code/Module/Connedit.php:634
 msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:644
+#: Code/Module/Connedit.php:644
 msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:670
+#: Code/Module/Connedit.php:670
 msgid "Open Friend Zoom section by default"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:696
+#: Code/Module/Connedit.php:696
 msgid "Filter"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:699
+#: Code/Module/Connedit.php:699
 msgid "Open Custom Filter section by default"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:736
+#: Code/Module/Connedit.php:736
 msgid "Approve this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:736
+#: Code/Module/Connedit.php:736
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:741
+#: Code/Module/Connedit.php:741
 msgid "Set Friend Zoom"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:745
+#: Code/Module/Connedit.php:745
 msgid "Set Profile"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:749
+#: Code/Module/Connedit.php:749
 msgid "Set Friend Zoom & Profile"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:803
+#: Code/Module/Connedit.php:803
 msgid "This connection is unreachable from this location."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:804
+#: Code/Module/Connedit.php:804
 msgid "This connection may be unreachable from other channel locations."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:806
+#: Code/Module/Connedit.php:806
 msgid "Location independence is not supported by their network."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:811
+#: Code/Module/Connedit.php:811
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:815 Zotlabs/Module/Defperms.php:251
+#: Code/Module/Connedit.php:815 Code/Module/Defperms.php:251
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:815 include/items.php:4393
+#: Code/Module/Connedit.php:815 include/items.php:4393
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:816 Zotlabs/Module/Defperms.php:252
+#: Code/Module/Connedit.php:816 Code/Module/Defperms.php:252
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:816
+#: Code/Module/Connedit.php:816
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:817 Zotlabs/Module/Defperms.php:253
+#: Code/Module/Connedit.php:817 Code/Module/Defperms.php:253
 msgid "Permission role"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:818 Zotlabs/Module/Defperms.php:254
+#: Code/Module/Connedit.php:818 Code/Module/Defperms.php:254
 msgid "Add permission role"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:822
+#: Code/Module/Connedit.php:822
 msgid "Ignore shares and repeats this connection posts"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:822
+#: Code/Module/Connedit.php:822
 msgid "Note: This is not recommended for Groups."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:826
+#: Code/Module/Connedit.php:826
 msgid "This connection's primary address is"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:827
+#: Code/Module/Connedit.php:827
 msgid "Available locations:"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:832 Zotlabs/Module/Defperms.php:258
+#: Code/Module/Connedit.php:832 Code/Module/Defperms.php:258
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:833
+#: Code/Module/Connedit.php:833
 msgid "Connection Tools"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:835
+#: Code/Module/Connedit.php:835
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:837
+#: Code/Module/Connedit.php:837
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:838 Zotlabs/Module/Connedit.php:844
+#: Code/Module/Connedit.php:838 Code/Module/Connedit.php:844
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:840
+#: Code/Module/Connedit.php:840
 msgid "Custom Filter"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:841 Zotlabs/Module/Content_filter.php:53
+#: Code/Module/Connedit.php:841 Code/Module/Content_filter.php:53
 msgid "Only import posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:841 Zotlabs/Module/Connedit.php:842
+#: Code/Module/Connedit.php:841 Code/Module/Connedit.php:842
 msgid ""
 "words one per line or #tags, $categories, /patterns/, or lang=xx, leave "
 "blank to import all posts"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:842 Zotlabs/Module/Content_filter.php:61
+#: Code/Module/Connedit.php:842 Code/Module/Content_filter.php:61
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:843 extend/addon/a/zotpost/Mod_zotpost.php:70
+#: Code/Module/Connedit.php:843 extend/addon/a/zotpost/Mod_zotpost.php:70
 msgid "Nickname"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:843
+#: Code/Module/Connedit.php:843
 msgid "optional - allows you to search by a name that you have chosen"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:845
+#: Code/Module/Connedit.php:845
 msgid "This information is public!"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:850
+#: Code/Module/Connedit.php:850
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:855
+#: Code/Module/Connedit.php:855
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:857 Zotlabs/Module/Settings/Tokens.php:309
+#: Code/Module/Connedit.php:857 Code/Module/Settings/Tokens.php:309
 msgid "Their Settings"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:858 Zotlabs/Module/Defperms.php:263
-#: Zotlabs/Module/Settings/Permcats.php:138
-#: Zotlabs/Module/Settings/Tokens.php:310
+#: Code/Module/Connedit.php:858 Code/Module/Defperms.php:263
+#: Code/Module/Settings/Permcats.php:138
+#: Code/Module/Settings/Tokens.php:310
 msgid "My Settings"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:860 Zotlabs/Module/Defperms.php:266
-#: Zotlabs/Module/Settings/Permcats.php:144
-#: Zotlabs/Module/Settings/Tokens.php:315
+#: Code/Module/Connedit.php:860 Code/Module/Defperms.php:266
+#: Code/Module/Settings/Permcats.php:144
+#: Code/Module/Settings/Tokens.php:315
 msgid "Individual Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:861 Zotlabs/Module/Connedit.php:862
-#: Zotlabs/Module/Defperms.php:267 Zotlabs/Module/Settings/Permcats.php:145
+#: Code/Module/Connedit.php:861 Code/Module/Connedit.php:862
+#: Code/Module/Defperms.php:267 Code/Module/Settings/Permcats.php:145
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:863
+#: Code/Module/Connedit.php:863
 msgid "Last update:"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:871
+#: Code/Module/Connedit.php:871
 msgid "Details"
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:28
+#: Code/Module/Content_filter.php:28
 msgid "Content Filter settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:38
+#: Code/Module/Content_filter.php:38
 msgid ""
 "This app (when installed) allows you to filter incoming content from all "
 "sources or from specific connections. The filtering may be based on words, "
 "tags, regular expressions, or language"
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:46
+#: Code/Module/Content_filter.php:46
 msgid ""
 "The settings on this page apply to all incoming content. To edit the "
 "settings for individual connetions, see the similar settings on the "
 "Connection Edit page for that connection."
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:55 Zotlabs/Module/Content_filter.php:63
+#: Code/Module/Content_filter.php:55 Code/Module/Content_filter.php:63
 msgid ""
 "words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - "
 "leave blank to import all posts"
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:68
+#: Code/Module/Content_filter.php:68
 msgid "Content Filter Settings"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:285 include/items.php:4750
+#: Code/Module/Cover_photo.php:285 include/items.php:4750
 msgid "female"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:286 include/items.php:4751
+#: Code/Module/Cover_photo.php:286 include/items.php:4751
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:287 include/items.php:4752
+#: Code/Module/Cover_photo.php:287 include/items.php:4752
 msgid "male"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:288 include/items.php:4753
+#: Code/Module/Cover_photo.php:288 include/items.php:4753
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:290 include/items.php:4755
+#: Code/Module/Cover_photo.php:290 include/items.php:4755
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:110 Zotlabs/Module/Settings/Channel.php:365
+#: Code/Module/Defperms.php:110 Code/Module/Settings/Channel.php:365
 #: extend/addon/a/faces/faces.php:209 extend/addon/a/logrot/logrot.php:55
 #: extend/addon/a/openstreetmap/openstreetmap.php:222
 msgid "Settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:252 Zotlabs/Module/Settings/Channel.php:590
+#: Code/Module/Defperms.php:252 Code/Module/Settings/Channel.php:590
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:259
+#: Code/Module/Defperms.php:259
 msgid "Automatic approval settings"
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:261 Zotlabs/Module/Settings/Permcats.php:141
-#: Zotlabs/Module/Settings/Tokens.php:312
+#: Code/Module/Defperms.php:261 Code/Module/Settings/Permcats.php:141
+#: Code/Module/Settings/Tokens.php:312
 msgid "inherited"
 msgstr ""
 
-#: Zotlabs/Module/Dircensor.php:45
+#: Code/Module/Dircensor.php:45
 msgid "Entry censored"
 msgstr ""
 
-#: Zotlabs/Module/Dircensor.php:47
+#: Code/Module/Dircensor.php:47
 msgid "Entry uncensored"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:101 Zotlabs/Module/Directory.php:108
-#: Zotlabs/Module/Display.php:51 Zotlabs/Module/Photos.php:586
-#: Zotlabs/Module/Search.php:45 Zotlabs/Module/Viewconnections.php:32
+#: Code/Module/Directory.php:101 Code/Module/Directory.php:108
+#: Code/Module/Display.php:51 Code/Module/Photos.php:586
+#: Code/Module/Search.php:45 Code/Module/Viewconnections.php:32
 msgid "Public access denied."
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:164
+#: Code/Module/Directory.php:164
 msgid "No default suggestions were found."
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:331
+#: Code/Module/Directory.php:331
 msgid "Gender: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:332
+#: Code/Module/Directory.php:332
 msgid "Status: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:333
+#: Code/Module/Directory.php:333
 msgid "Homepage: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:394
+#: Code/Module/Directory.php:394
 msgid "Description:"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:405 Zotlabs/Module/Manage.php:83
-#: Zotlabs/Module/Manage.php:180
+#: Code/Module/Directory.php:405 Code/Module/Manage.php:83
+#: Code/Module/Manage.php:180
 msgid "Group"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:406 Zotlabs/Module/Manage.php:82
-#: Zotlabs/Module/Manage.php:179 Zotlabs/Storage/Browser.php:148
+#: Code/Module/Directory.php:406 Code/Module/Manage.php:82
+#: Code/Module/Manage.php:179 Code/Storage/Browser.php:148
 #: include/text.php:3285
 msgid "Collection"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:409
+#: Code/Module/Directory.php:409
 msgid "Keywords: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:412
+#: Code/Module/Directory.php:412
 msgid "Don't suggest"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:414
+#: Code/Module/Directory.php:414
 msgid "Suggestion ranking:"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:477
+#: Code/Module/Directory.php:477
 msgid "Local Directory"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:483
+#: Code/Module/Directory.php:483
 msgid "Finding:"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:486 Zotlabs/Widget/Findpeople.php:37
+#: Code/Module/Directory.php:486 Code/Widget/Findpeople.php:37
 msgid "Channel Suggestions"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:488
+#: Code/Module/Directory.php:488
 msgid "next page"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:488
+#: Code/Module/Directory.php:488
 msgid "previous page"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:489
+#: Code/Module/Directory.php:489
 msgid "Sort options"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:490
+#: Code/Module/Directory.php:490
 msgid "Alphabetic"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:491
+#: Code/Module/Directory.php:491
 msgid "Reverse Alphabetic"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:492
+#: Code/Module/Directory.php:492
 msgid "Newest to Oldest"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:493
+#: Code/Module/Directory.php:493
 msgid "Oldest to Newest"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:518
+#: Code/Module/Directory.php:518
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: Zotlabs/Module/Display.php:394
+#: Code/Module/Display.php:394
 #, php-format
 msgid "\"%1$s\", shared by %2$s with %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:395
+#: Code/Module/Display.php:395
 #, php-format
 msgid "%1$s shared this post with %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:399
+#: Code/Module/Display.php:399
 msgid "Not much to read, click to see the post."
 msgstr ""
 
-#: Zotlabs/Module/Display.php:403
+#: Code/Module/Display.php:403
 #, php-format
 msgid "%1$s shared a reaction to \"%2$s\""
 msgstr ""
 
-#: Zotlabs/Module/Display.php:404
+#: Code/Module/Display.php:404
 #, php-format
 msgid "%s shared a reaction to this post/conversation"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:411
+#: Code/Module/Display.php:411
 #, php-format
 msgid "%1$s commented \"%2$s\""
 msgstr ""
 
-#: Zotlabs/Module/Display.php:412
+#: Code/Module/Display.php:412
 #, php-format
 msgid "%s shared a comment of this post/conversation"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:416
+#: Code/Module/Display.php:416
 #, php-format
 msgid "%1$s wrote this: \"%2$s\""
 msgstr ""
 
-#: Zotlabs/Module/Display.php:458
+#: Code/Module/Display.php:458
 msgid "Article"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:511
+#: Code/Module/Display.php:511
 msgid "Item has been removed."
 msgstr ""
 
-#: Zotlabs/Module/Drafts.php:23
+#: Code/Module/Drafts.php:23
 msgid ""
 "This app allows you to save posts you are writing and finish them later "
 "prior to sharing/publishing."
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:37
+#: Code/Module/Dreport.php:37
 msgid "Invalid message"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:65
+#: Code/Module/Dreport.php:65
 msgid "Delivery Log"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:99
+#: Code/Module/Dreport.php:99
 msgid "no results"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:111
+#: Code/Module/Dreport.php:111
 msgid "channel sync processed"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:115
+#: Code/Module/Dreport.php:115
 msgid "queued"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:119
+#: Code/Module/Dreport.php:119
 msgid "site dead"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:123
+#: Code/Module/Dreport.php:123
 msgid "site might be dead - deferred"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:127
+#: Code/Module/Dreport.php:127
 msgid "posted"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:131
+#: Code/Module/Dreport.php:131
 msgid "accepted for delivery"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:135
+#: Code/Module/Dreport.php:135
 msgid "updated"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:138
+#: Code/Module/Dreport.php:138
 msgid "update ignored"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:141
+#: Code/Module/Dreport.php:141
 msgid "permission denied"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:145
+#: Code/Module/Dreport.php:145
 msgid "recipient not found"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:148
+#: Code/Module/Dreport.php:148
 msgid "mail recalled"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:151
+#: Code/Module/Dreport.php:151
 msgid "duplicate mail received"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:154
+#: Code/Module/Dreport.php:154
 msgid "mail delivered"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:158
+#: Code/Module/Dreport.php:158
 msgid "delivery rejected"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:177
+#: Code/Module/Dreport.php:177
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:180
+#: Code/Module/Dreport.php:180
 msgid "Options"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:181
+#: Code/Module/Dreport.php:181
 msgid "Redeliver"
 msgstr ""
 
-#: Zotlabs/Module/Editblock.php:153
+#: Code/Module/Editblock.php:153
 msgid "Edit Block"
 msgstr ""
 
-#: Zotlabs/Module/Editlayout.php:141 Zotlabs/Module/Layouts.php:141
-#: Zotlabs/Module/Layouts.php:205
+#: Code/Module/Editlayout.php:141 Code/Module/Layouts.php:141
+#: Code/Module/Layouts.php:205
 msgid "Layout Name"
 msgstr ""
 
-#: Zotlabs/Module/Editlayout.php:142 Zotlabs/Module/Layouts.php:144
+#: Code/Module/Editlayout.php:142 Code/Module/Layouts.php:144
 msgid "Layout Description (Optional)"
 msgstr ""
 
-#: Zotlabs/Module/Editlayout.php:150
+#: Code/Module/Editlayout.php:150
 msgid "Edit Layout"
 msgstr ""
 
-#: Zotlabs/Module/Editpost.php:47
+#: Code/Module/Editpost.php:47
 msgid "Item is not editable"
 msgstr ""
 
-#: Zotlabs/Module/Editpost.php:150 Zotlabs/Module/Rpost.php:251
+#: Code/Module/Editpost.php:150 Code/Module/Rpost.php:251
 msgid "Edit post"
 msgstr ""
 
-#: Zotlabs/Module/Editwebpage.php:157
+#: Code/Module/Editwebpage.php:157
 msgid "Page link"
 msgstr ""
 
-#: Zotlabs/Module/Editwebpage.php:184
+#: Code/Module/Editwebpage.php:184
 msgid "Edit Webpage"
 msgstr ""
 
-#: Zotlabs/Module/Email_resend.php:16 Zotlabs/Module/Email_validation.php:31
+#: Code/Module/Email_resend.php:16 Code/Module/Email_validation.php:31
 msgid "Token verification failed."
 msgstr ""
 
-#: Zotlabs/Module/Email_resend.php:34
+#: Code/Module/Email_resend.php:34
 msgid "Email verification resent"
 msgstr ""
 
-#: Zotlabs/Module/Email_resend.php:36
+#: Code/Module/Email_resend.php:36
 msgid "Unable to resend email verification message."
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:44
+#: Code/Module/Email_validation.php:44
 msgid "Email Verification Required"
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:45
+#: Code/Module/Email_validation.php:45
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -6100,134 +6100,134 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:46
+#: Code/Module/Email_validation.php:46
 msgid "Resend Email"
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:49
+#: Code/Module/Email_validation.php:49
 msgid "Validation token"
 msgstr ""
 
-#: Zotlabs/Module/Embedphotos.php:107 include/bbcode.php:259
+#: Code/Module/Embedphotos.php:107 include/bbcode.php:259
 #: include/bbcode.php:1126 include/bbcode.php:2032 include/bbcode.php:2034
 #: include/bbcode.php:2037 include/text.php:1838 include/text.php:1839
 msgid "Image/photo"
 msgstr ""
 
-#: Zotlabs/Module/Embedphotos.php:212 Zotlabs/Module/Photos.php:855
-#: Zotlabs/Module/Photos.php:1412 Zotlabs/Widget/Album.php:90
-#: Zotlabs/Widget/Portfolio.php:101
+#: Code/Module/Embedphotos.php:212 Code/Module/Photos.php:855
+#: Code/Module/Photos.php:1412 Code/Widget/Album.php:90
+#: Code/Widget/Portfolio.php:101
 msgid "View Photo"
 msgstr ""
 
-#: Zotlabs/Module/Embedphotos.php:227 Zotlabs/Module/Photos.php:886
-#: Zotlabs/Widget/Album.php:107 Zotlabs/Widget/Portfolio.php:122
+#: Code/Module/Embedphotos.php:227 Code/Module/Photos.php:886
+#: Code/Widget/Album.php:107 Code/Widget/Portfolio.php:122
 msgid "Edit Album"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:495
+#: Code/Module/Events.php:495
 msgid "day(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:496
+#: Code/Module/Events.php:496
 msgid "week(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:497
+#: Code/Module/Events.php:497
 msgid "month(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:498
+#: Code/Module/Events.php:498
 msgid "year(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:511
+#: Code/Module/Events.php:511
 msgid "Edit event title"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:513
+#: Code/Module/Events.php:513
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:514
+#: Code/Module/Events.php:514
 msgid "Edit Category"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:514
+#: Code/Module/Events.php:514
 msgid "Category"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:517
+#: Code/Module/Events.php:517
 msgid "Edit start date and time"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:518 Zotlabs/Module/Events.php:521
+#: Code/Module/Events.php:518 Code/Module/Events.php:521
 msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:520
+#: Code/Module/Events.php:520
 msgid "Edit finish date and time"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:520
+#: Code/Module/Events.php:520
 msgid "Finish date and time"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:522 Zotlabs/Module/Events.php:523
+#: Code/Module/Events.php:522 Code/Module/Events.php:523
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:522
+#: Code/Module/Events.php:522
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: Zotlabs/Module/Events.php:524
+#: Code/Module/Events.php:524
 msgid "Edit Description"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:526
+#: Code/Module/Events.php:526
 msgid "Edit Location"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:530 include/conversation.php:1457
+#: Code/Module/Events.php:530 include/conversation.php:1457
 msgid "Permission settings"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:540
+#: Code/Module/Events.php:540
 msgid "Timezone:"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:545
+#: Code/Module/Events.php:545
 msgid "Advanced Options"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:547
+#: Code/Module/Events.php:547
 msgid "Event repeat"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:548
+#: Code/Module/Events.php:548
 msgid "Repeat frequency"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:549
+#: Code/Module/Events.php:549
 msgid "Repeat every"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:550
+#: Code/Module/Events.php:550
 msgid "Number of total repeats"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:861
+#: Code/Module/Events.php:861
 msgid "Event removed"
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:27
+#: Code/Module/Expire.php:27
 msgid "Expiration settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:37
+#: Code/Module/Expire.php:37
 msgid ""
 "This app allows you to set an optional expiration date/time for your own "
 "posts, after which they will be deleted. This must be at least fifteen "
@@ -6235,124 +6235,124 @@ msgid ""
 "your posts after a set number of days"
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:46
+#: Code/Module/Expire.php:46
 msgid "Expire and delete all my posts after this many days"
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:46
+#: Code/Module/Expire.php:46
 msgid ""
 "Leave at 0 if you wish to manually control expiration of specific posts."
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:50
+#: Code/Module/Expire.php:50
 msgid "Automatic Expiration Settings"
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:28
+#: Code/Module/Fedi_id.php:28
 msgid "You are already connected with this channel."
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:40
+#: Code/Module/Fedi_id.php:40
 msgid "Unknown or unreachable identifier"
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:51
+#: Code/Module/Fedi_id.php:51
 msgid "Home instance"
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:52
+#: Code/Module/Fedi_id.php:52
 msgid "Enter your channel address or fediverse ID (e.g. channel@example.com)"
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:52
+#: Code/Module/Fedi_id.php:52
 msgid ""
 "If you do not have a fediverse ID, please use your browser 'back' button to "
 "return to the previous page"
 msgstr ""
 
-#: Zotlabs/Module/Filer.php:61
+#: Code/Module/Filer.php:61
 msgid "Enter a folder name"
 msgstr ""
 
-#: Zotlabs/Module/Filer.php:61
+#: Code/Module/Filer.php:61
 msgid "or select an existing folder (doubleclick)"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:102
+#: Code/Module/Filestorage.php:102
 msgid "Channel unavailable."
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:146
+#: Code/Module/Filestorage.php:146
 msgid "File not found."
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:228
+#: Code/Module/Filestorage.php:228
 msgid "Edit file permissions"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:240
 msgid "Change filename to"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:240
 msgid "Leave blank to keep the existing filename"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:241
+#: Code/Module/Filestorage.php:241
 msgid "Move to directory"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:242 extend/addon/a/faces/Mod_Faces.php:179
+#: Code/Module/Filestorage.php:242 extend/addon/a/faces/Mod_Faces.php:179
 #: extend/addon/a/flashcards/Mod_Flashcards.php:263
 msgid "Set/edit permissions"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:243
+#: Code/Module/Filestorage.php:243
 msgid "Include all files and sub folders"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:244
+#: Code/Module/Filestorage.php:244
 msgid "Return to file list"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:246
+#: Code/Module/Filestorage.php:246
 msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:247
+#: Code/Module/Filestorage.php:247
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:249
+#: Code/Module/Filestorage.php:249
 msgid "Share this file"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:250
+#: Code/Module/Filestorage.php:250
 msgid "Show URL to this file"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:251 Zotlabs/Storage/Browser.php:435
+#: Code/Module/Filestorage.php:251 Code/Storage/Browser.php:435
 msgid "Show in your contacts shared folder"
 msgstr ""
 
-#: Zotlabs/Module/Finger.php:24
+#: Code/Module/Finger.php:24
 msgid "Webfinger Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Finger.php:25
+#: Code/Module/Finger.php:25
 msgid "Lookup address or URL"
 msgstr ""
 
-#: Zotlabs/Module/Follow.php:136
+#: Code/Module/Follow.php:136
 msgid "Connection added."
 msgstr ""
 
-#: Zotlabs/Module/Followers.php:89 Zotlabs/Module/Following.php:91
-#: Zotlabs/Module/Lists.php:302 Zotlabs/Module/Lists.php:354
+#: Code/Module/Followers.php:89 Code/Module/Following.php:91
+#: Code/Module/Lists.php:302 Code/Module/Lists.php:354
 msgid "List members"
 msgstr ""
 
-#: Zotlabs/Module/Future.php:15
+#: Code/Module/Future.php:15
 msgid ""
 "This app allows you to set an optional publish date/time for posts, which "
 "may be in the future. This must be at least ten minutes into the future to "
@@ -6361,130 +6361,130 @@ msgid ""
 "editor to set the date/time."
 msgstr ""
 
-#: Zotlabs/Module/Hcard.php:45 Zotlabs/Module/Profile.php:56
+#: Code/Module/Hcard.php:45 Code/Module/Profile.php:56
 msgid "Posts and comments"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:27
+#: Code/Module/Help.php:27
 msgid "Documentation Search"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:98
+#: Code/Module/Help.php:98
 msgid "Unknown language"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:117
+#: Code/Module/Help.php:117
 msgid "$Projectname Documentation"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:118
+#: Code/Module/Help.php:118
 msgid "Contents"
 msgstr ""
 
-#: Zotlabs/Module/Home.php:163
+#: Code/Module/Home.php:163
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: Zotlabs/Module/Hq.php:164
+#: Code/Module/Hq.php:164
 msgid "Welcome to $Projectname!"
 msgstr ""
 
-#: Zotlabs/Module/Hq.php:164
+#: Code/Module/Hq.php:164
 msgid "You have got no unseen posts..."
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:54 include/bbcode.php:417
+#: Code/Module/Impel.php:54 include/bbcode.php:417
 msgid "webpage"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:59 include/bbcode.php:423
+#: Code/Module/Impel.php:59 include/bbcode.php:423
 msgid "block"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:64 include/bbcode.php:420
+#: Code/Module/Impel.php:64 include/bbcode.php:420
 msgid "layout"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:71 include/bbcode.php:426
+#: Code/Module/Impel.php:71 include/bbcode.php:426
 msgid "menu"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:204
+#: Code/Module/Impel.php:204
 #, php-format
 msgid "%s element installed"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:206
+#: Code/Module/Impel.php:206
 #, php-format
 msgid "%s element installation failed"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:78 Zotlabs/Module/Import_items.php:56
+#: Code/Module/Import.php:78 Code/Module/Import_items.php:56
 msgid "Nothing to import."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:93 Zotlabs/Module/Import.php:108
-#: Zotlabs/Module/Import_items.php:81
+#: Code/Module/Import.php:93 Code/Module/Import.php:108
+#: Code/Module/Import_items.php:81
 msgid "Unable to download data from old server"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:115 Zotlabs/Module/Import_items.php:87
+#: Code/Module/Import.php:115 Code/Module/Import_items.php:87
 msgid "Imported file is empty."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:193
+#: Code/Module/Import.php:193
 msgid "No channel. Import failed."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:638
+#: Code/Module/Import.php:638
 msgid "Files and Posts imported."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:653
+#: Code/Module/Import.php:653
 msgid "Import completed."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:685
+#: Code/Module/Import.php:685
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:690
+#: Code/Module/Import.php:690
 msgid "Import Channel"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:691
+#: Code/Module/Import.php:691
 msgid ""
 "Use this form to import an existing channel from a different server. You may "
 "retrieve the channel identity from the old server via the network or provide "
 "an export file."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:692 Zotlabs/Module/Import_items.php:142
+#: Code/Module/Import.php:692 Code/Module/Import_items.php:142
 msgid "File to Upload"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:693
+#: Code/Module/Import.php:693
 msgid "Or provide the old server details"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:694
+#: Code/Module/Import.php:694
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:695
+#: Code/Module/Import.php:695
 msgid "Your old login email address"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:696
+#: Code/Module/Import.php:696
 msgid "Your old login password"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:697
+#: Code/Module/Import.php:697
 msgid "Import a few months of posts if possible (limited by available memory)"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:699
+#: Code/Module/Import.php:699
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be "
@@ -6492,788 +6492,788 @@ msgid ""
 "location for files, photos, and media."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:701
+#: Code/Module/Import.php:701
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:702
+#: Code/Module/Import.php:702
 msgid "Move this channel (disable all previous locations)"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:703
+#: Code/Module/Import.php:703
 msgid "Use this channel nickname instead of the one provided"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:703
+#: Code/Module/Import.php:703
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this site."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:705
+#: Code/Module/Import.php:705
 msgid ""
 "This process may take several minutes to complete and considerably longer if "
 "importing a large amount of posts and files. Please submit the form only "
 "once and leave this page open until finished."
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:112
+#: Code/Module/Import_items.php:112
 msgid "Data export format is not compatible with this software"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:122
+#: Code/Module/Import_items.php:122
 msgid "Import completed"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:140
+#: Code/Module/Import_items.php:140
 msgid "Import Items"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:141
+#: Code/Module/Import_items.php:141
 msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:38
+#: Code/Module/Invite.php:38
 msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:63
+#: Code/Module/Invite.php:63
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:76
+#: Code/Module/Invite.php:76
 msgid "Please join us on $Projectname"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:86
+#: Code/Module/Invite.php:86
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:90
+#: Code/Module/Invite.php:90
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:93
+#: Code/Module/Invite.php:93
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Invite.php:111
+#: Code/Module/Invite.php:111
 msgid "Send email invitations to join this network"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:124
+#: Code/Module/Invite.php:124
 msgid "You have no more invitations available"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:158
+#: Code/Module/Invite.php:158
 msgid "Send invitations"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:159
+#: Code/Module/Invite.php:159
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:160
+#: Code/Module/Invite.php:160
 msgid "Your message:"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:161
+#: Code/Module/Invite.php:161
 msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:163
+#: Code/Module/Invite.php:163
 msgid "You will need to supply this invitation code:"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:164
+#: Code/Module/Invite.php:164
 msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:166
+#: Code/Module/Invite.php:166
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:167
+#: Code/Module/Invite.php:167
 msgid "or visit"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:169
+#: Code/Module/Invite.php:169
 msgid "3. Click [Connect]"
 msgstr ""
 
-#: Zotlabs/Module/Item.php:574 Zotlabs/Module/Pin.php:49
+#: Code/Module/Item.php:574 Code/Module/Pin.php:49
 msgid "Unable to locate original post."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:669
+#: Code/Module/Item.php:669
 msgid "Comment may be moderated."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:906
+#: Code/Module/Item.php:906
 msgid "Empty post discarded."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1516
+#: Code/Module/Item.php:1516
 msgid "Duplicate post suppressed."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1563
+#: Code/Module/Item.php:1563
 msgid ""
 "Draft saved. Use Drafts app to continue "
 "editing."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1607
+#: Code/Module/Item.php:1607
 msgid "Your comment has been posted."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1676
+#: Code/Module/Item.php:1676
 msgid "System error. Post not saved."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1718
+#: Code/Module/Item.php:1718
 msgid "Your post/comment is awaiting approval."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1887
+#: Code/Module/Item.php:1887
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1895
+#: Code/Module/Item.php:1895
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1901
+#: Code/Module/Item.php:1901
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: Zotlabs/Module/Lang.php:22
+#: Code/Module/Lang.php:22
 msgid "Change UI language"
 msgstr ""
 
-#: Zotlabs/Module/Layouts.php:200 include/text.php:2863
+#: Code/Module/Layouts.php:200 include/text.php:2863
 msgid "Layouts"
 msgstr ""
 
-#: Zotlabs/Module/Layouts.php:206
+#: Code/Module/Layouts.php:206
 msgid "Layout Description"
 msgstr ""
 
-#: Zotlabs/Module/Layouts.php:211
+#: Code/Module/Layouts.php:211
 msgid "Download PDL file"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:174 Zotlabs/Module/Subthread.php:126
-#: Zotlabs/Module/Tagger.php:85 include/conversation.php:135
+#: Code/Module/Like.php:174 Code/Module/Subthread.php:126
+#: Code/Module/Tagger.php:85 include/conversation.php:135
 #: include/text.php:2380
 msgid "photo"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:174 Zotlabs/Module/Subthread.php:126
+#: Code/Module/Like.php:174 Code/Module/Subthread.php:126
 msgid "status"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:219
+#: Code/Module/Like.php:219
 msgid "Undo a previous action"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:223 Zotlabs/Module/Plike.php:204
+#: Code/Module/Like.php:223 Code/Module/Plike.php:204
 #: include/conversation.php:184
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:226 Zotlabs/Module/Plike.php:207
+#: Code/Module/Like.php:226 Code/Module/Plike.php:207
 #: include/conversation.php:186
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:229
+#: Code/Module/Like.php:229
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:232
+#: Code/Module/Like.php:232
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:235
+#: Code/Module/Like.php:235
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:111
+#: Code/Module/Lists.php:111
 msgid "Access list created."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:113
+#: Code/Module/Lists.php:113
 msgid "Could not create access list."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:133 Zotlabs/Module/Lists.php:279
+#: Code/Module/Lists.php:133 Code/Module/Lists.php:279
 #: include/items.php:4359
 msgid "Access list not found."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:150
+#: Code/Module/Lists.php:150
 msgid "Access list updated."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:194 Zotlabs/Module/Lists.php:205
+#: Code/Module/Lists.php:194 Code/Module/Lists.php:205
 msgid "Access Lists"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:195
+#: Code/Module/Lists.php:195
 msgid "Create access list"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:199
+#: Code/Module/Lists.php:199
 msgid "Access list name"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:200 Zotlabs/Module/Lists.php:342
+#: Code/Module/Lists.php:200 Code/Module/Lists.php:342
 msgid "Members are visible to other channels"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:207
+#: Code/Module/Lists.php:207
 msgid "Members"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:236
+#: Code/Module/Lists.php:236
 msgid "Access list removed."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:238
+#: Code/Module/Lists.php:238
 msgid "Unable to remove access list."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:337
+#: Code/Module/Lists.php:337
 #, php-format
 msgid "Access List: %s"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:339
+#: Code/Module/Lists.php:339
 msgid "Access list name: "
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:344
+#: Code/Module/Lists.php:344
 msgid "Delete access list"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:356
+#: Code/Module/Lists.php:356
 msgid "Not in this list"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:389
+#: Code/Module/Lists.php:389
 msgid "Select a channel to toggle membership"
 msgstr ""
 
-#: Zotlabs/Module/Lockview.php:86 Zotlabs/Module/Lockview.php:128
+#: Code/Module/Lockview.php:86 Code/Module/Lockview.php:128
 msgid "Visible to:"
 msgstr ""
 
-#: Zotlabs/Module/Lockview.php:102
+#: Code/Module/Lockview.php:102
 msgid "Everybody"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:33 Zotlabs/Module/Locs.php:74
+#: Code/Module/Locs.php:33 Code/Module/Locs.php:74
 msgid "Location not found."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:83
+#: Code/Module/Locs.php:83
 msgid "Location lookup failed."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:87
+#: Code/Module/Locs.php:87
 msgid ""
 "Please select another location to become primary before removing the primary "
 "location."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:117
+#: Code/Module/Locs.php:117
 msgid "Pushing location info"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:128
+#: Code/Module/Locs.php:128
 msgid "No locations found."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:133
+#: Code/Module/Locs.php:133
 msgid "Manage Channel Locations"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:137 Zotlabs/Module/Menu.php:185
+#: Code/Module/Locs.php:137 Code/Module/Menu.php:185
 msgid "Drop"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:139
+#: Code/Module/Locs.php:139
 msgid "Publish these settings"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:140
+#: Code/Module/Locs.php:140
 msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:141
+#: Code/Module/Locs.php:141
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing "
 "your channel."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:142
+#: Code/Module/Locs.php:142
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:27
+#: Code/Module/Lostpass.php:27
 msgid "No valid account found."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:42
+#: Code/Module/Lostpass.php:42
 msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:49 Zotlabs/Module/Lostpass.php:121
+#: Code/Module/Lostpass.php:49 Code/Module/Lostpass.php:121
 #, php-format
 msgid "Site Member (%s)"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:54 Zotlabs/Module/Lostpass.php:59
+#: Code/Module/Lostpass.php:54 Code/Module/Lostpass.php:59
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:80
+#: Code/Module/Lostpass.php:80
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:104 boot.php:1734
+#: Code/Module/Lostpass.php:104 boot.php:1734
 msgid "Password Reset"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:105
+#: Code/Module/Lostpass.php:105
 msgid "Your password has been reset as requested."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:106
+#: Code/Module/Lostpass.php:106
 msgid "Your new password is"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:107
+#: Code/Module/Lostpass.php:107
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:108
+#: Code/Module/Lostpass.php:108
 msgid "click here to login"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:109
+#: Code/Module/Lostpass.php:109
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:129
+#: Code/Module/Lostpass.php:129
 #, php-format
 msgid "Your password has changed at %s"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:140
+#: Code/Module/Lostpass.php:140
 msgid "Forgot your Password?"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:141
+#: Code/Module/Lostpass.php:141
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:142 Zotlabs/Module/Settings/Channel.php:638
+#: Code/Module/Lostpass.php:142 Code/Module/Settings/Channel.php:638
 msgid "Email Address"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:153 Zotlabs/Module/New_channel.php:168
+#: Code/Module/Manage.php:153 Code/Module/New_channel.php:168
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:159
+#: Code/Module/Manage.php:159
 msgid "Create a new channel"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:188
+#: Code/Module/Manage.php:188
 msgid "Current Channel"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:190
+#: Code/Module/Manage.php:190
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:191
+#: Code/Module/Manage.php:191
 msgid "Default Login Channel"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:192
+#: Code/Module/Manage.php:192
 msgid "Make Default"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:193 Zotlabs/Module/Manage.php:194
+#: Code/Module/Manage.php:193 Code/Module/Manage.php:194
 msgid "Add to menu"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:197
+#: Code/Module/Manage.php:197
 #, php-format
 msgid "%d new messages"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:198
+#: Code/Module/Manage.php:198
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:200
+#: Code/Module/Manage.php:200
 msgid "Delegated Channel"
 msgstr ""
 
-#: Zotlabs/Module/Markup.php:16
+#: Code/Module/Markup.php:16
 msgid ""
 "This app adds editor buttons for bold, italic, underline, quote, and "
 "possibly other common richtext constructs."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:79
+#: Code/Module/Menu.php:79
 msgid "Unable to update menu."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:89
+#: Code/Module/Menu.php:89
 msgid "Unable to create menu."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:169 Zotlabs/Module/Menu.php:182
+#: Code/Module/Menu.php:169 Code/Module/Menu.php:182
 msgid "Menu Name"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:169
+#: Code/Module/Menu.php:169
 msgid "Unique name (not visible on webpage) - required"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:170 Zotlabs/Module/Menu.php:183
+#: Code/Module/Menu.php:170 Code/Module/Menu.php:183
 msgid "Menu Title"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:170
+#: Code/Module/Menu.php:170
 msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:171
+#: Code/Module/Menu.php:171
 msgid "Allow Bookmarks"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:171 Zotlabs/Module/Menu.php:229
+#: Code/Module/Menu.php:171 Code/Module/Menu.php:229
 msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:172 Zotlabs/Module/Menu.php:232
+#: Code/Module/Menu.php:172 Code/Module/Menu.php:232
 msgid "Submit and proceed"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:179 include/text.php:2862
+#: Code/Module/Menu.php:179 include/text.php:2862
 msgid "Menus"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:189
+#: Code/Module/Menu.php:189
 msgid "Bookmarks allowed"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:191
+#: Code/Module/Menu.php:191
 msgid "Delete this menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:192 Zotlabs/Module/Menu.php:226
+#: Code/Module/Menu.php:192 Code/Module/Menu.php:226
 msgid "Edit menu contents"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:193
+#: Code/Module/Menu.php:193
 msgid "Edit this menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:207
+#: Code/Module/Menu.php:207
 msgid "Menu could not be deleted."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:216 Zotlabs/Module/Mitem.php:44
+#: Code/Module/Menu.php:216 Code/Module/Mitem.php:44
 msgid "Menu not found."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:221
+#: Code/Module/Menu.php:221
 msgid "Edit Menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:225
+#: Code/Module/Menu.php:225
 msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:227
+#: Code/Module/Menu.php:227
 msgid "Menu name"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:227
+#: Code/Module/Menu.php:227
 msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:228
+#: Code/Module/Menu.php:228
 msgid "Menu title"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:228
+#: Code/Module/Menu.php:228
 msgid "Menu title as seen by others"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:229
+#: Code/Module/Menu.php:229
 msgid "Allow bookmarks"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:237 Zotlabs/Module/Mitem.php:148
-#: Zotlabs/Module/Xchan.php:46
+#: Code/Module/Menu.php:237 Code/Module/Mitem.php:148
+#: Code/Module/Xchan.php:46
 msgid "Not found."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:78
+#: Code/Module/Mitem.php:78
 msgid "Unable to create element."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:103
+#: Code/Module/Mitem.php:103
 msgid "Unable to update menu element."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:117
+#: Code/Module/Mitem.php:117
 msgid "Unable to add menu element."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:182 Zotlabs/Module/Mitem.php:261
+#: Code/Module/Mitem.php:182 Code/Module/Mitem.php:261
 msgid "Menu Item Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:183 Zotlabs/Module/Mitem.php:262
-#: Zotlabs/Module/Settings/Channel.php:663
+#: Code/Module/Mitem.php:183 Code/Module/Mitem.php:262
+#: Code/Module/Settings/Channel.php:663
 msgid "(click to open/close)"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:206
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:206
 msgid "Link Name"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270
+#: Code/Module/Mitem.php:190 Code/Module/Mitem.php:270
 msgid "Link or Submenu Target"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:190
+#: Code/Module/Mitem.php:190
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:191 Zotlabs/Module/Mitem.php:271
+#: Code/Module/Mitem.php:191 Code/Module/Mitem.php:271
 msgid "Use magic-auth if available"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:192 Zotlabs/Module/Mitem.php:272
+#: Code/Module/Mitem.php:192 Code/Module/Mitem.php:272
 msgid "Open link in new window"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:193 Zotlabs/Module/Mitem.php:273
+#: Code/Module/Mitem.php:193 Code/Module/Mitem.php:273
 msgid "Order in list"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:193 Zotlabs/Module/Mitem.php:273
+#: Code/Module/Mitem.php:193 Code/Module/Mitem.php:273
 msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:194
+#: Code/Module/Mitem.php:194
 msgid "Submit and finish"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:195
+#: Code/Module/Mitem.php:195
 msgid "Submit and continue"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:204
+#: Code/Module/Mitem.php:204
 msgid "Menu:"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:207
+#: Code/Module/Mitem.php:207
 msgid "Link Target"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:210
+#: Code/Module/Mitem.php:210
 msgid "Edit menu"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:213
+#: Code/Module/Mitem.php:213
 msgid "Edit element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:214
+#: Code/Module/Mitem.php:214
 msgid "Drop element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:215
+#: Code/Module/Mitem.php:215
 msgid "New element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:216
+#: Code/Module/Mitem.php:216
 msgid "Edit this menu container"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:217
+#: Code/Module/Mitem.php:217
 msgid "Add menu element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:218
+#: Code/Module/Mitem.php:218
 msgid "Delete this menu item"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:219
+#: Code/Module/Mitem.php:219
 msgid "Edit this menu item"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:236
+#: Code/Module/Mitem.php:236
 msgid "Menu item not found."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:249
+#: Code/Module/Mitem.php:249
 msgid "Menu item deleted."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:251
+#: Code/Module/Mitem.php:251
 msgid "Menu item could not be deleted."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:259
+#: Code/Module/Mitem.php:259
 msgid "Edit Menu Element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:269
+#: Code/Module/Mitem.php:269
 msgid "Link text"
 msgstr ""
 
-#: Zotlabs/Module/Moderate.php:36
+#: Code/Module/Moderate.php:36
 msgid "No entries."
 msgstr ""
 
-#: Zotlabs/Module/Moderate.php:81
+#: Code/Module/Moderate.php:81
 msgid "Comment approved"
 msgstr ""
 
-#: Zotlabs/Module/Moderate.php:84
+#: Code/Module/Moderate.php:84
 msgid "Comment deleted"
 msgstr ""
 
-#: Zotlabs/Module/Mood.php:84 include/conversation.php:302
+#: Code/Module/Mood.php:84 include/conversation.php:302
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Mood.php:145 Zotlabs/Module/Mood.php:167
+#: Code/Module/Mood.php:145 Code/Module/Mood.php:167
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:176
+#: Code/Module/New_channel.php:176
 msgid "Your real name is recommended."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:177
+#: Code/Module/New_channel.php:177
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:182
+#: Code/Module/New_channel.php:182
 msgid ""
 "This will be used to create a unique network address (like an email address)."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:184
+#: Code/Module/New_channel.php:184
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:192
+#: Code/Module/New_channel.php:192
 msgid "Channel name"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:194 Zotlabs/Module/Register.php:279
+#: Code/Module/New_channel.php:194 Code/Module/Register.php:279
 msgid "Choose a short nickname"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:195 Zotlabs/Module/Register.php:280
+#: Code/Module/New_channel.php:195 Code/Module/Register.php:280
 msgid "Channel role and privacy"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:195
+#: Code/Module/New_channel.php:195
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:198
+#: Code/Module/New_channel.php:198
 msgid "Create a Channel"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:199
+#: Code/Module/New_channel.php:199
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed, "
 "and many other things."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:200
+#: Code/Module/New_channel.php:200
 msgid ""
 "or import an existing channel from another location."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:205
+#: Code/Module/New_channel.php:205
 msgid "Validate"
 msgstr ""
 
-#: Zotlabs/Module/Notes.php:52
+#: Code/Module/Notes.php:52
 msgid "This app allows you to create private notes for your personal use."
 msgstr ""
 
-#: Zotlabs/Module/Notes.php:60
+#: Code/Module/Notes.php:60
 msgid "This app is installed. The Notes tool can be found on your stream page."
 msgstr ""
 
-#: Zotlabs/Module/Notifications.php:70 Zotlabs/Module/Notify.php:76
+#: Code/Module/Notifications.php:70 Code/Module/Notify.php:76
 msgid "No more system notifications."
 msgstr ""
 
-#: Zotlabs/Module/Notifications.php:74 Zotlabs/Module/Notify.php:80
+#: Code/Module/Notifications.php:74 Code/Module/Notify.php:80
 msgid "System Notifications"
 msgstr ""
 
-#: Zotlabs/Module/Notify.php:45
+#: Code/Module/Notify.php:45
 #, php-format
 msgid "A notification with that id was not found for channel '%s'"
 msgstr ""
 
-#: Zotlabs/Module/Oexchange.php:30
+#: Code/Module/Oexchange.php:30
 msgid "Unable to find your site."
 msgstr ""
 
-#: Zotlabs/Module/Oexchange.php:44
+#: Code/Module/Oexchange.php:44
 msgid "Post successful."
 msgstr ""
 
-#: Zotlabs/Module/Page.php:188
+#: Code/Module/Page.php:188
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
@@ -7283,1625 +7283,1625 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
-#: Zotlabs/Module/Pconfig.php:37 Zotlabs/Module/Pconfig.php:73
+#: Code/Module/Pconfig.php:37 Code/Module/Pconfig.php:73
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: Zotlabs/Module/Pconfig.php:63
+#: Code/Module/Pconfig.php:63
 msgid "Configuration Editor"
 msgstr ""
 
-#: Zotlabs/Module/Pconfig.php:64
+#: Code/Module/Pconfig.php:64
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please "
 "leave this page unless you are comfortable with and knowledgeable about how "
 "to correctly use this feature."
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:28
+#: Code/Module/Pdledit.php:28
 msgid "Layout updated."
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:50 Zotlabs/Module/Pdledit.php:107
+#: Code/Module/Pdledit.php:50 Code/Module/Pdledit.php:107
 msgid "Edit System Page Description"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:72 Zotlabs/Module/Pdledit.php:80
+#: Code/Module/Pdledit.php:72 Code/Module/Pdledit.php:80
 msgid "(modified)"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:102
+#: Code/Module/Pdledit.php:102
 msgid "Layout not found."
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:108
+#: Code/Module/Pdledit.php:108
 msgid "Module Name:"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:109
+#: Code/Module/Pdledit.php:109
 msgid "Layout Help"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:110
+#: Code/Module/Pdledit.php:110
 msgid "Edit another layout"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:111
+#: Code/Module/Pdledit.php:111
 msgid "System layout"
 msgstr ""
 
-#: Zotlabs/Module/Photomap.php:15
+#: Code/Module/Photomap.php:15
 msgid ""
 "This app provides a displayable map when viewing detail of photos that "
 "contain location information."
 msgstr ""
 
-#: Zotlabs/Module/Photomap.php:23
+#: Code/Module/Photomap.php:23
 msgid "This app is currently installed."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:88 Zotlabs/Module/Photos.php:106
+#: Code/Module/Photos.php:88 Code/Module/Photos.php:106
 msgid "Album not found."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:97
+#: Code/Module/Photos.php:97
 msgid "Delete Album"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:171 Zotlabs/Module/Photos.php:1140
+#: Code/Module/Photos.php:171 Code/Module/Photos.php:1140
 msgid "Delete Photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:372
+#: Code/Module/Photos.php:372
 msgid "linked item not found."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:566
+#: Code/Module/Photos.php:566
 #, php-format
 msgid "%s: Unsupported photo type. Saved as file."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:594
+#: Code/Module/Photos.php:594
 msgid "No photos selected"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:644
+#: Code/Module/Photos.php:644
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:687
+#: Code/Module/Photos.php:687
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:689
+#: Code/Module/Photos.php:689
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:731
+#: Code/Module/Photos.php:731
 msgid "Upload Photos"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:735
+#: Code/Module/Photos.php:735
 msgid "Enter an album name"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:736
+#: Code/Module/Photos.php:736
 msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:737
+#: Code/Module/Photos.php:737
 msgid "Create a status post for this upload"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:737
+#: Code/Module/Photos.php:737
 msgid ""
 "If multiple files are selected, the message will be repeated for each photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:738 Zotlabs/Module/Photos.php:1124
+#: Code/Module/Photos.php:738 Code/Module/Photos.php:1124
 msgid "Please briefly describe this photo for vision-impaired viewers"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:740 Zotlabs/Module/Photos.php:1126
+#: Code/Module/Photos.php:740 Code/Module/Photos.php:1126
 msgid "Your message (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:827
+#: Code/Module/Photos.php:827
 msgid "Date descending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:828
+#: Code/Module/Photos.php:828
 msgid "Date ascending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:829
+#: Code/Module/Photos.php:829
 msgid "Name ascending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:884 Zotlabs/Module/Photos.php:1437
+#: Code/Module/Photos.php:884 Code/Module/Photos.php:1437
 msgid "View files"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:888 Zotlabs/Module/Photos.php:1440
+#: Code/Module/Photos.php:888 Code/Module/Photos.php:1440
 msgid "Add Photos"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:890
+#: Code/Module/Photos.php:890
 msgid "Sort"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:935
+#: Code/Module/Photos.php:935
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:937
+#: Code/Module/Photos.php:937
 msgid "Photo not available"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1001
+#: Code/Module/Photos.php:1001
 msgid "Use as profile photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1002
+#: Code/Module/Photos.php:1002
 msgid "Use as cover photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1009
+#: Code/Module/Photos.php:1009
 msgid "Private Photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1027
+#: Code/Module/Photos.php:1027
 msgid "View Full Size"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1115
+#: Code/Module/Photos.php:1115
 msgid "Edit photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1119
+#: Code/Module/Photos.php:1119
 msgid "Move photo to album"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1120
+#: Code/Module/Photos.php:1120
 msgid "Enter a new album name"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1121
+#: Code/Module/Photos.php:1121
 msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1126
+#: Code/Module/Photos.php:1126
 msgid ""
 "This will only appear in the optional status post attached to this photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1127
+#: Code/Module/Photos.php:1127
 msgid "Add a Tag"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1135
+#: Code/Module/Photos.php:1135
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1138
+#: Code/Module/Photos.php:1138
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1213 include/conversation.php:527
+#: Code/Module/Photos.php:1213 include/conversation.php:527
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1214 include/conversation.php:528
+#: Code/Module/Photos.php:1214 include/conversation.php:528
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1215 include/conversation.php:529
+#: Code/Module/Photos.php:1215 include/conversation.php:529
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1216 include/conversation.php:530
+#: Code/Module/Photos.php:1216 include/conversation.php:530
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1217 include/conversation.php:531
+#: Code/Module/Photos.php:1217 include/conversation.php:531
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1327
+#: Code/Module/Photos.php:1327
 msgid "Photo Tools"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1337
+#: Code/Module/Photos.php:1337
 msgid "In This Photo:"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1342
+#: Code/Module/Photos.php:1342
 msgid "Map"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1424 Zotlabs/Module/Photos.php:1435
-#: Zotlabs/Module/Photos.php:1436 include/photos.php:760
+#: Code/Module/Photos.php:1424 Code/Module/Photos.php:1435
+#: Code/Module/Photos.php:1436 include/photos.php:760
 msgid "Recent Photos"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:434
+#: Code/Module/Ping.php:434
 msgid "added your channel"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:459
+#: Code/Module/Ping.php:459
 msgid "requires approval"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:468
+#: Code/Module/Ping.php:468
 msgid "g A l F d"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:486
+#: Code/Module/Ping.php:486
 msgid "[today]"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:496
+#: Code/Module/Ping.php:496
 msgid "posted an event"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:530
+#: Code/Module/Ping.php:530
 msgid "shared a file with you"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:558
+#: Code/Module/Ping.php:558
 msgid "reported content"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:772
+#: Code/Module/Ping.php:772
 msgid "Private group"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:772
+#: Code/Module/Ping.php:772
 msgid "Public group"
 msgstr ""
 
-#: Zotlabs/Module/Plike.php:130 include/conversation.php:141
+#: Code/Module/Plike.php:130 include/conversation.php:141
 msgid "channel"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:107
+#: Code/Module/Poke.php:107
 #, php-format
 msgid "You %1$s %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:123
+#: Code/Module/Poke.php:123
 msgid "Poke App (Not Installed)"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:124
+#: Code/Module/Poke.php:124
 msgid "Poke or do something else to somebody"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:143
+#: Code/Module/Poke.php:143
 msgid "Poke, prod or do other things to somebody"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:148
+#: Code/Module/Poke.php:148
 msgid "Recipient"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:149
+#: Code/Module/Poke.php:149
 msgid "Choose your default action"
 msgstr ""
 
-#: Zotlabs/Module/Profile.php:116
+#: Code/Module/Profile.php:116
 msgid "vcard"
 msgstr ""
 
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Profile_photo.php:506
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
 msgstr ""
 
-#: Zotlabs/Module/Profile_photo.php:510
+#: Code/Module/Profile_photo.php:510
 msgid "Use Photo for Profile"
 msgstr ""
 
-#: Zotlabs/Module/Profile_photo.php:510
+#: Code/Module/Profile_photo.php:510
 msgid "Change Profile Photo"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:38 Zotlabs/Module/Profiles.php:204
-#: Zotlabs/Module/Profiles.php:260 Zotlabs/Module/Profiles.php:705
+#: Code/Module/Profiles.php:38 Code/Module/Profiles.php:204
+#: Code/Module/Profiles.php:260 Code/Module/Profiles.php:705
 msgid "Profile not found."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:59
+#: Code/Module/Profiles.php:59
 msgid "Profile deleted."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:82 Zotlabs/Module/Profiles.php:124
+#: Code/Module/Profiles.php:82 Code/Module/Profiles.php:124
 msgid "Profile-"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:107 Zotlabs/Module/Profiles.php:148
+#: Code/Module/Profiles.php:107 Code/Module/Profiles.php:148
 msgid "New profile created."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:131
+#: Code/Module/Profiles.php:131
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:168
+#: Code/Module/Profiles.php:168
 msgid "Profile unavailable to export."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:271
+#: Code/Module/Profiles.php:271
 msgid "Profile Name is required."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:490
+#: Code/Module/Profiles.php:490
 msgid "Marital Status"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:494
+#: Code/Module/Profiles.php:494
 msgid "Romantic Partner"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:498 Zotlabs/Module/Profiles.php:825
+#: Code/Module/Profiles.php:498 Code/Module/Profiles.php:825
 msgid "Likes"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:502 Zotlabs/Module/Profiles.php:826
+#: Code/Module/Profiles.php:502 Code/Module/Profiles.php:826
 msgid "Dislikes"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:506 Zotlabs/Module/Profiles.php:833
+#: Code/Module/Profiles.php:506 Code/Module/Profiles.php:833
 msgid "Work/Employment"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:509
+#: Code/Module/Profiles.php:509
 msgid "Religion"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:513
+#: Code/Module/Profiles.php:513
 msgid "Political Views"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:517
+#: Code/Module/Profiles.php:517
 msgid "Gender"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:521
+#: Code/Module/Profiles.php:521
 msgid "Sexual Preference"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:525
+#: Code/Module/Profiles.php:525
 msgid "Homepage"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:529
+#: Code/Module/Profiles.php:529
 msgid "Interests"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:629
+#: Code/Module/Profiles.php:629
 msgid "Profile updated."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:725
+#: Code/Module/Profiles.php:725
 msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:771
+#: Code/Module/Profiles.php:771
 msgid "Edit Profile Details"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:773
+#: Code/Module/Profiles.php:773
 msgid "View this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:775
+#: Code/Module/Profiles.php:775
 msgid "Profile Tools"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:776
+#: Code/Module/Profiles.php:776
 msgid "Change cover photo"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:778
+#: Code/Module/Profiles.php:778
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:779
+#: Code/Module/Profiles.php:779
 msgid "Clone this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:780
+#: Code/Module/Profiles.php:780
 msgid "Delete this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:781
+#: Code/Module/Profiles.php:781
 msgid "Add profile things"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:782
+#: Code/Module/Profiles.php:782
 msgid "Personal"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:784
+#: Code/Module/Profiles.php:784
 msgid "Relationship"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:785 Zotlabs/Module/Settings/Channel.php:744
-#: Zotlabs/Widget/Newmember.php:55 include/datetime.php:77
+#: Code/Module/Profiles.php:785 Code/Module/Settings/Channel.php:744
+#: Code/Widget/Newmember.php:55 include/datetime.php:77
 msgid "Miscellaneous"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:787
+#: Code/Module/Profiles.php:787
 msgid "Import profile from file"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:788
+#: Code/Module/Profiles.php:788
 msgid "Export profile to file"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:789
+#: Code/Module/Profiles.php:789
 msgid "Your gender"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:790
+#: Code/Module/Profiles.php:790
 msgid "Marital status"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:791
+#: Code/Module/Profiles.php:791
 msgid "Sexual preference"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:792
+#: Code/Module/Profiles.php:792
 msgid "Pronouns"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:795
+#: Code/Module/Profiles.php:795
 msgid "Profile name"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:799
+#: Code/Module/Profiles.php:799
 msgid "Your full name"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:800
+#: Code/Module/Profiles.php:800
 msgid "Title/Description"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:803
+#: Code/Module/Profiles.php:803
 msgid "Street address"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:804
+#: Code/Module/Profiles.php:804
 msgid "Locality/City"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:805
+#: Code/Module/Profiles.php:805
 msgid "Region/State"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:806
+#: Code/Module/Profiles.php:806
 msgid "Postal/Zip code"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:813
+#: Code/Module/Profiles.php:813
 msgid "Who (if applicable)"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:813
+#: Code/Module/Profiles.php:813
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:814
+#: Code/Module/Profiles.php:814
 msgid "Since (date)"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:819
+#: Code/Module/Profiles.php:819
 msgid "Tell us about yourself"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:820
+#: Code/Module/Profiles.php:820
 msgid "Homepage URL"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:821
+#: Code/Module/Profiles.php:821
 msgid "Hometown"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:822
+#: Code/Module/Profiles.php:822
 msgid "Political views"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:823
+#: Code/Module/Profiles.php:823
 msgid "Religious views"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:824
+#: Code/Module/Profiles.php:824
 msgid "Keywords used in directory listings"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:824
+#: Code/Module/Profiles.php:824
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:827
+#: Code/Module/Profiles.php:827
 msgid "Musical interests"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:828
+#: Code/Module/Profiles.php:828
 msgid "Books, literature"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:829
+#: Code/Module/Profiles.php:829
 msgid "Television"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:830
+#: Code/Module/Profiles.php:830
 msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:831
+#: Code/Module/Profiles.php:831
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:832
+#: Code/Module/Profiles.php:832
 msgid "Love/Romance"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:834
+#: Code/Module/Profiles.php:834
 msgid "School/Education"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:835
+#: Code/Module/Profiles.php:835
 msgid "Contact information and social networks"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:836
+#: Code/Module/Profiles.php:836
 msgid "My other channels"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:838
+#: Code/Module/Profiles.php:838
 msgid "Communications"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:936
+#: Code/Module/Profiles.php:936
 msgid " and "
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:938
+#: Code/Module/Profiles.php:938
 msgid ", "
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:945
+#: Code/Module/Profiles.php:945
 msgid "public profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:955
+#: Code/Module/Profiles.php:955
 #, php-format
 msgid "%1$s changed %2$s to “%3$s”"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:956
+#: Code/Module/Profiles.php:956
 #, php-format
 msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:958
+#: Code/Module/Profiles.php:958
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Currently Male"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Currently Female"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Mostly Male"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Mostly Female"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Transgender"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Intersex"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Transsexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Hermaphrodite"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:989
+#: Code/Module/Profiles.php:989
 msgid "Undecided"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1025
+#: Code/Module/Profiles.php:1025
 msgid "He/Him"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1025
+#: Code/Module/Profiles.php:1025
 msgid "She/Her"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1025
+#: Code/Module/Profiles.php:1025
 msgid "They/Them"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057 Zotlabs/Module/Profiles.php:1077
+#: Code/Module/Profiles.php:1057 Code/Module/Profiles.php:1077
 msgid "Males"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057 Zotlabs/Module/Profiles.php:1077
+#: Code/Module/Profiles.php:1057 Code/Module/Profiles.php:1077
 msgid "Females"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Gay"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Lesbian"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "No Preference"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Bisexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Autosexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Abstinent"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Virgin"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Deviant"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Fetish"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Oodles"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1057
+#: Code/Module/Profiles.php:1057
 msgid "Nonsexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "Single"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Lonely"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Available"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Unavailable"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Has crush"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Infatuated"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "Dating"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Unfaithful"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Sex Addict"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Friends/Benefits"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Casual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Engaged"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "Married"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Imaginarily married"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Partners"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "Cohabiting"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Common law"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Happy"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Not looking"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Swinger"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Betrayed"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "Separated"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Unstable"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "Divorced"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Imaginarily divorced"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "Widowed"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Uncertain"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096 Zotlabs/Module/Profiles.php:1114
+#: Code/Module/Profiles.php:1096 Code/Module/Profiles.php:1114
 msgid "It's complicated"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Don't care"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1096
+#: Code/Module/Profiles.php:1096
 msgid "Ask me"
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:41 Zotlabs/Module/Profperm.php:75
+#: Code/Module/Profperm.php:41 Code/Module/Profperm.php:75
 msgid "Invalid profile identifier."
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:129
+#: Code/Module/Profperm.php:129
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:133
+#: Code/Module/Profperm.php:133
 msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:142
+#: Code/Module/Profperm.php:142
 msgid "Visible To"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:64
+#: Code/Module/Register.php:64
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:70
+#: Code/Module/Register.php:70
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:104
+#: Code/Module/Register.php:104
 msgid "Passwords do not match."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:155
+#: Code/Module/Register.php:155
 msgid "Registration successful. Continue to create your first channel..."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:157
+#: Code/Module/Register.php:157
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:163
+#: Code/Module/Register.php:163
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:165
+#: Code/Module/Register.php:165
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:210
+#: Code/Module/Register.php:210
 msgid "Registration on this website is disabled."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:219
+#: Code/Module/Register.php:219
 msgid "Registration on this website is by approval only."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:227
+#: Code/Module/Register.php:227
 msgid "Registration on this site is by invitation only."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:240
+#: Code/Module/Register.php:240
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:256 Zotlabs/Module/Siteinfo.php:45
+#: Code/Module/Register.php:256 Code/Module/Siteinfo.php:45
 msgid "Terms of Service"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:262
+#: Code/Module/Register.php:262
 #, php-format
 msgid "I accept the %s for this website"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:268
+#: Code/Module/Register.php:268
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:273
+#: Code/Module/Register.php:273
 msgid "Your email address"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:274
+#: Code/Module/Register.php:274
 msgid "Choose a password"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:275
+#: Code/Module/Register.php:275
 msgid "Please re-enter your password"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:276
+#: Code/Module/Register.php:276
 msgid "Please enter your invitation code"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "Your Name"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "Real names are preferred."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:279
+#: Code/Module/Register.php:279
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
 "g. nickname%s"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:280
+#: Code/Module/Register.php:280
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:281
+#: Code/Module/Register.php:281
 msgid "no"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:281
+#: Code/Module/Register.php:281
 msgid "yes"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:294
+#: Code/Module/Register.php:294
 msgid ""
 "Show affiliated sites - some of which may allow "
 "registration."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:308
+#: Code/Module/Register.php:308
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr ""
 
-#: Zotlabs/Module/Regmod.php:20
+#: Code/Module/Regmod.php:20
 msgid "Please login."
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:52
+#: Code/Module/Removeaccount.php:52
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:74
+#: Code/Module/Removeaccount.php:74
 msgid "Remove This Account"
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:75
+#: Code/Module/Removeaccount.php:75
 msgid ""
 "This account and all its channels will be completely removed from this "
 "server. "
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:75 Zotlabs/Module/Removeme.php:75
+#: Code/Module/Removeaccount.php:75 Code/Module/Removeme.php:75
 msgid "This action is permanent and can not be undone!"
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:77 Zotlabs/Module/Settings/Account.php:119
+#: Code/Module/Removeaccount.php:77 Code/Module/Settings/Account.php:119
 msgid "Remove Account"
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:51
+#: Code/Module/Removeme.php:51
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:74
+#: Code/Module/Removeme.php:74
 msgid "Remove This Channel"
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:75
+#: Code/Module/Removeme.php:75
 msgid "This channel will be completely removed from this server. "
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:77 Zotlabs/Module/Settings/Channel.php:749
+#: Code/Module/Removeme.php:77 Code/Module/Settings/Channel.php:749
 msgid "Remove Channel"
 msgstr ""
 
-#: Zotlabs/Module/Rmagic.php:48
+#: Code/Module/Rmagic.php:48
 msgid "Authentication failed."
 msgstr ""
 
-#: Zotlabs/Module/Search.php:351
+#: Code/Module/Search.php:351
 #, php-format
 msgid "Items tagged with: %s"
 msgstr ""
 
-#: Zotlabs/Module/Search.php:353
+#: Code/Module/Search.php:353
 #, php-format
 msgid "Search results for: %s"
 msgstr ""
 
-#: Zotlabs/Module/Secrets.php:15
+#: Code/Module/Secrets.php:15
 msgid ""
 "This app allows you to protect messages with a secret passphrase. This only "
 "works across selected platforms."
 msgstr ""
 
-#: Zotlabs/Module/Secrets.php:23
+#: Code/Module/Secrets.php:23
 msgid ""
 "This app is installed. A button to encrypt content may be found in the post "
 "editor."
 msgstr ""
 
-#: Zotlabs/Module/Service_limits.php:28
+#: Code/Module/Service_limits.php:28
 msgid "No service class restrictions found."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:53
+#: Code/Module/Settings/Oauth2.php:53
 msgid "ID and Secret are required"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:114
+#: Code/Module/Settings/Oauth2.php:114
 msgid "Add OAuth2 application"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:147 Zotlabs/Module/Settings/Oauth.php:100
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:147 Code/Module/Settings/Oauth.php:100
 msgid "Name of application"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:148
 msgid "Consumer ID"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:148
-#: Zotlabs/Module/Settings/Oauth2.php:149 Zotlabs/Module/Settings/Oauth.php:101
-#: Zotlabs/Module/Settings/Oauth.php:102
+#: Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth2.php:149 Code/Module/Settings/Oauth.php:101
+#: Code/Module/Settings/Oauth.php:102
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:149 Zotlabs/Module/Settings/Oauth.php:102
-#: Zotlabs/Module/Settings/Oauth.php:130
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:149 Code/Module/Settings/Oauth.php:102
+#: Code/Module/Settings/Oauth.php:130
 msgid "Consumer Secret"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:150 Zotlabs/Module/Settings/Oauth.php:103
-#: Zotlabs/Module/Settings/Oauth.php:131
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:150 Code/Module/Settings/Oauth.php:103
+#: Code/Module/Settings/Oauth.php:131
 msgid "Redirect"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:150 Zotlabs/Module/Settings/Oauth.php:103
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:150 Code/Module/Settings/Oauth.php:103
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:121
-#: Zotlabs/Module/Settings/Oauth2.php:151
+#: Code/Module/Settings/Oauth2.php:121
+#: Code/Module/Settings/Oauth2.php:151
 msgid "Grant Types"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:121
-#: Zotlabs/Module/Settings/Oauth2.php:122
-#: Zotlabs/Module/Settings/Oauth2.php:151
-#: Zotlabs/Module/Settings/Oauth2.php:152
+#: Code/Module/Settings/Oauth2.php:121
+#: Code/Module/Settings/Oauth2.php:122
+#: Code/Module/Settings/Oauth2.php:151
+#: Code/Module/Settings/Oauth2.php:152
 msgid "leave blank unless your application specifically requires this"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:122
-#: Zotlabs/Module/Settings/Oauth2.php:152
+#: Code/Module/Settings/Oauth2.php:122
+#: Code/Module/Settings/Oauth2.php:152
 msgid "Authorization scope"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:135
+#: Code/Module/Settings/Oauth2.php:135
 msgid "OAuth2 Application not found."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:144
-#: Zotlabs/Module/Settings/Oauth2.php:212 Zotlabs/Module/Settings/Oauth.php:97
-#: Zotlabs/Module/Settings/Oauth.php:125 Zotlabs/Module/Settings/Oauth.php:165
+#: Code/Module/Settings/Oauth2.php:144
+#: Code/Module/Settings/Oauth2.php:212 Code/Module/Settings/Oauth.php:97
+#: Code/Module/Settings/Oauth.php:125 Code/Module/Settings/Oauth.php:165
 msgid "Add application"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:211
+#: Code/Module/Settings/Oauth2.php:211
 msgid "Connected OAuth2 Apps"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:215 Zotlabs/Module/Settings/Oauth.php:168
+#: Code/Module/Settings/Oauth2.php:215 Code/Module/Settings/Oauth.php:168
 msgid "Client key starts with"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:216 Zotlabs/Module/Settings/Oauth.php:169
+#: Code/Module/Settings/Oauth2.php:216 Code/Module/Settings/Oauth.php:169
 msgid "No name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:217 Zotlabs/Module/Settings/Oauth.php:170
+#: Code/Module/Settings/Oauth2.php:217 Code/Module/Settings/Oauth.php:170
 msgid "Remove authorization"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:33
+#: Code/Module/Settings/Permcats.php:33
 msgid "Permission Name is required."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:52
+#: Code/Module/Settings/Permcats.php:52
 msgid "Permission role saved."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:79
+#: Code/Module/Settings/Permcats.php:79
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:129
-#: Zotlabs/Widget/Settings_menu.php:113
+#: Code/Module/Settings/Permcats.php:129
+#: Code/Widget/Settings_menu.php:113
 msgid "Permission Roles"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:137
+#: Code/Module/Settings/Permcats.php:137
 msgid "Role name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:48
+#: Code/Module/Settings/Tokens.php:48
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:54
+#: Code/Module/Settings/Tokens.php:54
 msgid "Name and Password are required."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:190
+#: Code/Module/Settings/Tokens.php:190
 msgid "Token saved."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:261
+#: Code/Module/Settings/Tokens.php:261
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
 "visitors may login using these credentials to access private content."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:263
+#: Code/Module/Settings/Tokens.php:263
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
 "Examples:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:298
+#: Code/Module/Settings/Tokens.php:298
 msgid "Guest Access Tokens"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:306
+#: Code/Module/Settings/Tokens.php:306
 msgid "Login Name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:307
+#: Code/Module/Settings/Tokens.php:307
 msgid "Login Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:308
+#: Code/Module/Settings/Tokens.php:308
 msgid "Expires (yyyy-mm-dd)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:316
+#: Code/Module/Settings/Tokens.php:316
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
 "individual settings. You can not change those settings here."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:26
+#: Code/Module/Settings/Account.php:26
 msgid "Not valid email."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:30
+#: Code/Module/Settings/Account.php:30
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:40
+#: Code/Module/Settings/Account.php:40
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:58
+#: Code/Module/Settings/Account.php:58
 msgid "Password verification failed."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:65
+#: Code/Module/Settings/Account.php:65
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:69
+#: Code/Module/Settings/Account.php:69
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:84
+#: Code/Module/Settings/Account.php:84
 msgid "Password changed."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:86
+#: Code/Module/Settings/Account.php:86
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:113
+#: Code/Module/Settings/Account.php:113
 msgid "Account Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:114
+#: Code/Module/Settings/Account.php:114
 msgid "Current Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:115
+#: Code/Module/Settings/Account.php:115
 msgid "Enter New Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:116
+#: Code/Module/Settings/Account.php:116
 msgid "Confirm New Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:116
+#: Code/Module/Settings/Account.php:116
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:118
+#: Code/Module/Settings/Account.php:118
 msgid "Email Address:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:120
+#: Code/Module/Settings/Account.php:120
 msgid "Remove this account including all its channels"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:440 include/conversation.php:1357
+#: Code/Module/Settings/Channel.php:440 include/conversation.php:1357
 msgid "Restricted - from connections only"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:441 include/conversation.php:1358
+#: Code/Module/Settings/Channel.php:441 include/conversation.php:1358
 msgid "Semi-public - from anybody that can be identified"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:442 include/conversation.php:1359
+#: Code/Module/Settings/Channel.php:442 include/conversation.php:1359
 msgid "Public - from anybody on the internet"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:520
+#: Code/Module/Settings/Channel.php:520
 msgid "Publish your profile in the network directory"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:525
+#: Code/Module/Settings/Channel.php:525
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:529
-#: Zotlabs/Module/Settings/Channel.php:543
+#: Code/Module/Settings/Channel.php:529
+#: Code/Module/Settings/Channel.php:543
 msgid "or"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:535
+#: Code/Module/Settings/Channel.php:535
 msgid "Your channel address is"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:537
+#: Code/Module/Settings/Channel.php:537
 msgid ""
 "Friends using compatible applications can use this address to connect with "
 "you."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:539
+#: Code/Module/Settings/Channel.php:539
 msgid "Your files/photos are accessible as a network drive at"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:541
+#: Code/Module/Settings/Channel.php:541
 msgid "(Windows)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:542
+#: Code/Module/Settings/Channel.php:542
 msgid "(other platforms)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:589
+#: Code/Module/Settings/Channel.php:589
 msgid "Automatic connection approval"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:593
+#: Code/Module/Settings/Channel.php:593
 msgid "Friend-of-friend conversations"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:593
+#: Code/Module/Settings/Channel.php:593
 msgid ""
 "Import public third-party conversations in which your connections "
 "participate."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:597
+#: Code/Module/Settings/Channel.php:597
 msgid "Enable ActivityPub protocol"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:597
+#: Code/Module/Settings/Channel.php:597
 msgid "ActivityPub is an emerging internet standard for social communications"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:630
+#: Code/Module/Settings/Channel.php:630
 msgid "Channel Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:636
+#: Code/Module/Settings/Channel.php:636
 msgid "Basic Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:637
+#: Code/Module/Settings/Channel.php:637
 msgid "Full name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:639
+#: Code/Module/Settings/Channel.php:639
 msgid "Your timezone"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:639
+#: Code/Module/Settings/Channel.php:639
 msgid "This is important for showing the correct time on shared events"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:640
+#: Code/Module/Settings/Channel.php:640
 msgid "Default post location"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:640
+#: Code/Module/Settings/Channel.php:640
 msgid "Optional geographical location to display on your posts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:641
+#: Code/Module/Settings/Channel.php:641
 msgid "Obtain post location from your web browser or device"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:643
+#: Code/Module/Settings/Channel.php:643
 msgid "Adult content"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:643
+#: Code/Module/Settings/Channel.php:643
 msgid ""
 "Enable to indicate if this channel frequently or regularly publishes adult "
 "content. (Please also tag any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:645
+#: Code/Module/Settings/Channel.php:645
 msgid "Security and Privacy"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:647
+#: Code/Module/Settings/Channel.php:647
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:649
+#: Code/Module/Settings/Channel.php:649
 msgid "Hide my online presence"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:649
+#: Code/Module/Settings/Channel.php:649
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:650
+#: Code/Module/Settings/Channel.php:650
 msgid "Allow others to view your friends and connections"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:654
+#: Code/Module/Settings/Channel.php:654
 msgid "Forbid indexing of your channel content by search engines"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "Disable acceptance of comments on my posts after this many days"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "Leave unset or enter 0 to allow comments indefinitely"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:658
+#: Code/Module/Settings/Channel.php:658
 msgid "Channel Permission Limits"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 msgid "Expire conversations you have not participated in after this many days"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 msgid "This website does not provide an expiration policy."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:661
+#: Code/Module/Settings/Channel.php:661
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:661
+#: Code/Module/Settings/Channel.php:661
 msgid "May reduce spam activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:662
+#: Code/Module/Settings/Channel.php:662
 msgid "Default Access List"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:664
+#: Code/Module/Settings/Channel.php:664
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:665
+#: Code/Module/Settings/Channel.php:665
 msgid "Profile to assign new connections"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:676
+#: Code/Module/Settings/Channel.php:676
 msgid "Channel type and privacy"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:677
+#: Code/Module/Settings/Channel.php:677
 msgid "Default Permissions Role"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:683
+#: Code/Module/Settings/Channel.php:683
 msgid "Maximum direct messages per day from unknown people:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:683
+#: Code/Module/Settings/Channel.php:683
 msgid ""
 "Useful to reduce spamming if you allow direct messages from unknown people"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:692
+#: Code/Module/Settings/Channel.php:692
 msgid "By default post a status message when:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:693
+#: Code/Module/Settings/Channel.php:693
 msgid "accepting a friend request"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:694
+#: Code/Module/Settings/Channel.php:694
 msgid "joining a group/community"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:695
+#: Code/Module/Settings/Channel.php:695
 msgid "making an interesting profile change"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:696
+#: Code/Module/Settings/Channel.php:696
 msgid "Send a notification email when:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:697
+#: Code/Module/Settings/Channel.php:697
 msgid "You receive a connection request"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:699
+#: Code/Module/Settings/Channel.php:699
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:700
+#: Code/Module/Settings/Channel.php:700
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:701
+#: Code/Module/Settings/Channel.php:701
 msgid "Someone shares a followed conversation"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:702
+#: Code/Module/Settings/Channel.php:702
 msgid "You receive a direct (private) message"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:704
+#: Code/Module/Settings/Channel.php:704
 msgid "You are tagged in a post"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:707
+#: Code/Module/Settings/Channel.php:707
 msgid "Someone likes your post/comment"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:710
+#: Code/Module/Settings/Channel.php:710
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:712
+#: Code/Module/Settings/Channel.php:712
 msgid "Unseen stream activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:713
+#: Code/Module/Settings/Channel.php:713
 msgid "Unseen channel activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:714
+#: Code/Module/Settings/Channel.php:714
 msgid "Unseen direct messages"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:714
-#: Zotlabs/Module/Settings/Channel.php:719
-#: Zotlabs/Module/Settings/Channel.php:720
-#: Zotlabs/Module/Settings/Channel.php:721
+#: Code/Module/Settings/Channel.php:714
+#: Code/Module/Settings/Channel.php:719
+#: Code/Module/Settings/Channel.php:720
+#: Code/Module/Settings/Channel.php:721
 msgid "Recommended"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:715
+#: Code/Module/Settings/Channel.php:715
 msgid "Upcoming events"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:716
+#: Code/Module/Settings/Channel.php:716
 msgid "Events today"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:717
+#: Code/Module/Settings/Channel.php:717
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:717
+#: Code/Module/Settings/Channel.php:717
 msgid "Not available in all themes"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:718
+#: Code/Module/Settings/Channel.php:718
 msgid "System (personal) notifications"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:719
+#: Code/Module/Settings/Channel.php:719
 msgid "System info messages"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:720
+#: Code/Module/Settings/Channel.php:720
 msgid "System critical alerts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:721
+#: Code/Module/Settings/Channel.php:721
 msgid "New connections"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:722
+#: Code/Module/Settings/Channel.php:722
 msgid "System Registrations"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:724
+#: Code/Module/Settings/Channel.php:724
 msgid "Unseen public stream activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:725
+#: Code/Module/Settings/Channel.php:725
 msgid "Unseen likes and dislikes"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:726
+#: Code/Module/Settings/Channel.php:726
 msgid "Unseen group posts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:727
+#: Code/Module/Settings/Channel.php:727
 msgid "Reported content"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:728
+#: Code/Module/Settings/Channel.php:728
 msgid ""
 "Desktop notifications are unavailable because the required browser "
 "permission has not been granted"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:729
+#: Code/Module/Settings/Channel.php:729
 msgid "Grant permission"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:730
+#: Code/Module/Settings/Channel.php:730
 msgid "Email notifications sent from (hostname)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:730
+#: Code/Module/Settings/Channel.php:730
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple locations, set this to your "
@@ -8909,689 +8909,689 @@ msgid ""
 "Example: %s"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:731
+#: Code/Module/Settings/Channel.php:731
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:732
+#: Code/Module/Settings/Channel.php:732
 msgid "Accept messages from strangers which mention you"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:732
+#: Code/Module/Settings/Channel.php:732
 msgid "This setting bypasses normal permissions"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:733
+#: Code/Module/Settings/Channel.php:733
 msgid ""
 "Accept messages from strangers which include any of the following hashtags"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:733
+#: Code/Module/Settings/Channel.php:733
 msgid "comma separated, do not include the #"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:734
+#: Code/Module/Settings/Channel.php:734
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:734
+#: Code/Module/Settings/Channel.php:734
 msgid "Must be greater than 0"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:739
+#: Code/Module/Settings/Channel.php:739
 msgid "Date and time"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:740
+#: Code/Module/Settings/Channel.php:740
 msgid ""
 "This section is reserved for use by optional addons and apps to provide "
 "additional settings."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:741
+#: Code/Module/Settings/Channel.php:741
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:742
+#: Code/Module/Settings/Channel.php:742
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:745
+#: Code/Module/Settings/Channel.php:745
 msgid "Default photo upload folder name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:745
-#: Zotlabs/Module/Settings/Channel.php:746
+#: Code/Module/Settings/Channel.php:745
+#: Code/Module/Settings/Channel.php:746
 msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:746
+#: Code/Module/Settings/Channel.php:746
 msgid "Default file upload folder name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:748
+#: Code/Module/Settings/Channel.php:748
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:750
+#: Code/Module/Settings/Channel.php:750
 msgid "Remove this channel."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:751
+#: Code/Module/Settings/Channel.php:751
 msgid "Mentions should display"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:751
+#: Code/Module/Settings/Channel.php:751
 msgid ""
 "Changes to this setting are applied to new posts/comments only. It is not "
 "retroactive."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:753
+#: Code/Module/Settings/Channel.php:753
 msgid "the channel display name [example: @Barbara Jenkins]"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:754
+#: Code/Module/Settings/Channel.php:754
 msgid "the channel nickname [example: @barbara1976]"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:755
+#: Code/Module/Settings/Channel.php:755
 msgid "combined [example: @Barbara Jenkins (barbara1976)]"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:756
+#: Code/Module/Settings/Channel.php:756
 msgid "no preference, use the system default"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:759
+#: Code/Module/Settings/Channel.php:759
 msgid "Calendar week begins on"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:759
+#: Code/Module/Settings/Channel.php:759
 msgid "This varies by country/culture"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:160
+#: Code/Module/Settings/Display.php:160
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:203
+#: Code/Module/Settings/Display.php:203
 msgid "Display Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:204
+#: Code/Module/Settings/Display.php:204
 msgid "Theme Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:205
+#: Code/Module/Settings/Display.php:205
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:206
+#: Code/Module/Settings/Display.php:206
 msgid "Content Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:212
+#: Code/Module/Settings/Display.php:212
 msgid "Display Theme:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:213
+#: Code/Module/Settings/Display.php:213
 msgid "Select scheme"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:215
+#: Code/Module/Settings/Display.php:215
 msgid "Preload images before rendering the page"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:215
+#: Code/Module/Settings/Display.php:215
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:216
+#: Code/Module/Settings/Display.php:216
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:217
+#: Code/Module/Settings/Display.php:217
 msgid "Update notifications every xx seconds"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:217
+#: Code/Module/Settings/Display.php:217
 msgid "Minimum of 15 seconds, no maximum"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:218
+#: Code/Module/Settings/Display.php:218
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:218
+#: Code/Module/Settings/Display.php:218
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:219
+#: Code/Module/Settings/Display.php:219
 msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:220
 msgid "Provide channel menu in navigation bar"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:220
 msgid "Default: channel menu located in app menu"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:221
+#: Code/Module/Settings/Display.php:221
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:224
+#: Code/Module/Settings/Display.php:224
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:224
-#: Zotlabs/Module/Settings/Display.php:225
+#: Code/Module/Settings/Display.php:224
+#: Code/Module/Settings/Display.php:225
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:225
+#: Code/Module/Settings/Display.php:225
 msgid "Stream page max height of content (in pixels)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:226
+#: Code/Module/Settings/Display.php:226
 msgid "Indent threaded comments this many pixels from the parent"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:226
+#: Code/Module/Settings/Display.php:226
 msgid "0-20"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:32
+#: Code/Module/Settings/Featured.php:32
 msgid "Affinity Slider settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:47
+#: Code/Module/Settings/Featured.php:47
 msgid "No feature settings configured"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:54
+#: Code/Module/Settings/Featured.php:54
 msgid "Default maximum affinity level"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:54
+#: Code/Module/Settings/Featured.php:54
 msgid "0-99 default 99"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Featured.php:59
 msgid "Default minimum affinity level"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Featured.php:59
 msgid "0-99 - default 0"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:63
+#: Code/Module/Settings/Featured.php:63
 msgid "Affinity Slider Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:76
+#: Code/Module/Settings/Featured.php:76
 msgid "Addon Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:77
+#: Code/Module/Settings/Featured.php:77
 msgid "Please save/submit changes to any panel before opening another."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Features.php:54
-#: Zotlabs/Module/Settings/Network.php:37
+#: Code/Module/Settings/Features.php:54
+#: Code/Module/Settings/Network.php:37
 msgid "Off"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Features.php:54
-#: Zotlabs/Module/Settings/Network.php:37
+#: Code/Module/Settings/Features.php:54
+#: Code/Module/Settings/Network.php:37
 msgid "On"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Features.php:62
+#: Code/Module/Settings/Features.php:62
 msgid "Additional Features"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:45
+#: Code/Module/Settings/Network.php:45
 msgid "Activity Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:40
+#: Code/Module/Settings/Oauth.php:40
 msgid "Name is required"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:44
+#: Code/Module/Settings/Oauth.php:44
 msgid "Key and Secret are required"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Settings/Oauth.php:129
+#: Code/Module/Settings/Oauth.php:101 Code/Module/Settings/Oauth.php:129
 msgid "Consumer Key"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:104 Zotlabs/Module/Settings/Oauth.php:132
+#: Code/Module/Settings/Oauth.php:104 Code/Module/Settings/Oauth.php:132
 msgid "Icon url"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:104 Zotlabs/Module/Sources.php:131
-#: Zotlabs/Module/Sources.php:167
+#: Code/Module/Settings/Oauth.php:104 Code/Module/Sources.php:131
+#: Code/Module/Sources.php:167
 msgid "Optional"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:117
+#: Code/Module/Settings/Oauth.php:117
 msgid "Application not found."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:164
+#: Code/Module/Settings/Oauth.php:164
 msgid "Connected Apps"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:194
+#: Code/Module/Setup.php:194
 msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:198
+#: Code/Module/Setup.php:198
 msgid "Could not connect to database."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:202
+#: Code/Module/Setup.php:202
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:210
+#: Code/Module/Setup.php:210
 msgid "Could not create table."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:213
+#: Code/Module/Setup.php:213
 msgid "Installation succeeded!"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:215
+#: Code/Module/Setup.php:215
 msgid "Your site database has been installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:219
+#: Code/Module/Setup.php:219
 msgid "Database install failed!"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:221
+#: Code/Module/Setup.php:221
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:222 Zotlabs/Module/Setup.php:287
+#: Code/Module/Setup.php:222 Code/Module/Setup.php:287
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:284
+#: Code/Module/Setup.php:284
 msgid "System check"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:289
+#: Code/Module/Setup.php:289
 msgid "Check again"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:315
+#: Code/Module/Setup.php:315
 msgid "Database connection"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:316
+#: Code/Module/Setup.php:316
 msgid ""
 "In order to install this software we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:317
+#: Code/Module/Setup.php:317
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:318
+#: Code/Module/Setup.php:318
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:322
+#: Code/Module/Setup.php:322
 msgid "Database Server Name"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:322
+#: Code/Module/Setup.php:322
 msgid "Default is 127.0.0.1"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:323
+#: Code/Module/Setup.php:323
 msgid "Database Port"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:323
+#: Code/Module/Setup.php:323
 msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:324
+#: Code/Module/Setup.php:324
 msgid "Database Login Name"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:325
+#: Code/Module/Setup.php:325
 msgid "Database Login Password"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:326
+#: Code/Module/Setup.php:326
 msgid "Database Name"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:327
+#: Code/Module/Setup.php:327
 msgid "Database Type"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:329 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:329 Code/Module/Setup.php:371
 msgid "Site administrator email address"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:329 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:329 Code/Module/Setup.php:371
 msgid ""
 "Required. Your account email address must match this in order to use the web "
 "admin panel."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:330 Zotlabs/Module/Setup.php:373
+#: Code/Module/Setup.php:330 Code/Module/Setup.php:373
 msgid "Website URL"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:330 Zotlabs/Module/Setup.php:373
+#: Code/Module/Setup.php:330 Code/Module/Setup.php:373
 msgid "Required. Please use SSL (https) URL if available."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:331 Zotlabs/Module/Setup.php:375
+#: Code/Module/Setup.php:331 Code/Module/Setup.php:375
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:359
+#: Code/Module/Setup.php:359
 msgid "Site settings"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:417
+#: Code/Module/Setup.php:417
 msgid "PHP version 7.1 or greater is required."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:418
+#: Code/Module/Setup.php:418
 msgid "PHP version"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:433
+#: Code/Module/Setup.php:433
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:434
+#: Code/Module/Setup.php:434
 msgid ""
 "If you do not have a command line version of PHP installed on server, you "
 "will not be able to run background tasks - including message delivery."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:438
+#: Code/Module/Setup.php:438
 msgid "PHP executable path"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:438
+#: Code/Module/Setup.php:438
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:443
+#: Code/Module/Setup.php:443
 msgid "Command line PHP"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:453
+#: Code/Module/Setup.php:453
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:457
+#: Code/Module/Setup.php:457
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:458
+#: Code/Module/Setup.php:458
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:461
+#: Code/Module/Setup.php:461
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:481
+#: Code/Module/Setup.php:481
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 2MB (2097152 bytes) at once."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:485
+#: Code/Module/Setup.php:485
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to "
 "upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:492
+#: Code/Module/Setup.php:492
 msgid "You can adjust these settings in the server php.ini file."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:494
+#: Code/Module/Setup.php:494
 msgid "PHP upload limits"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:517
+#: Code/Module/Setup.php:517
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:518
+#: Code/Module/Setup.php:518
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:521
+#: Code/Module/Setup.php:521
 msgid "Generate encryption keys"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:540
+#: Code/Module/Setup.php:540
 msgid "libCurl PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:541
+#: Code/Module/Setup.php:541
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:542
+#: Code/Module/Setup.php:542
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:543
+#: Code/Module/Setup.php:543
 msgid "PDO database PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:544
+#: Code/Module/Setup.php:544
 msgid "mb_string PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:545
+#: Code/Module/Setup.php:545
 msgid "xml PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:546
+#: Code/Module/Setup.php:546
 msgid "zip PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:550 Zotlabs/Module/Setup.php:552
+#: Code/Module/Setup.php:550 Code/Module/Setup.php:552
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:550
+#: Code/Module/Setup.php:550
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:556 Zotlabs/Module/Setup.php:558
+#: Code/Module/Setup.php:556 Code/Module/Setup.php:558
 msgid "exec"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:556
+#: Code/Module/Setup.php:556
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:561 Zotlabs/Module/Setup.php:563
+#: Code/Module/Setup.php:561 Code/Module/Setup.php:563
 msgid "shell_exec"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:561
+#: Code/Module/Setup.php:561
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:568
+#: Code/Module/Setup.php:568
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:572
+#: Code/Module/Setup.php:572
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:576
+#: Code/Module/Setup.php:576
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:582
+#: Code/Module/Setup.php:582
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:587
+#: Code/Module/Setup.php:587
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:591
+#: Code/Module/Setup.php:591
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:595
+#: Code/Module/Setup.php:595
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:599
+#: Code/Module/Setup.php:599
 msgid "Error: zip PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:621 Zotlabs/Module/Setup.php:630
+#: Code/Module/Setup.php:621 Code/Module/Setup.php:630
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:626
+#: Code/Module/Setup.php:626
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:627
+#: Code/Module/Setup.php:627
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:628
+#: Code/Module/Setup.php:628
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:647
+#: Code/Module/Setup.php:647
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:648
+#: Code/Module/Setup.php:648
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:649 Zotlabs/Module/Setup.php:670
+#: Code/Module/Setup.php:649 Code/Module/Setup.php:670
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:652
+#: Code/Module/Setup.php:652
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:669
+#: Code/Module/Setup.php:669
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level "
 "web folder"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:673
+#: Code/Module/Setup.php:673
 msgid "store is writable"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:705
+#: Code/Module/Setup.php:705
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:706
+#: Code/Module/Setup.php:706
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:707
+#: Code/Module/Setup.php:707
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:708
+#: Code/Module/Setup.php:708
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:709
+#: Code/Module/Setup.php:709
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:710
+#: Code/Module/Setup.php:710
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:712
+#: Code/Module/Setup.php:712
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -9599,51 +9599,51 @@ msgid ""
 "server communications."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:714
+#: Code/Module/Setup.php:714
 msgid "SSL certificate validation"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:720
+#: Code/Module/Setup.php:720
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:723
+#: Code/Module/Setup.php:723
 msgid "Url rewrite is working"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:738
+#: Code/Module/Setup.php:738
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:764 extend/addon/a/faces/faces.php:220
+#: Code/Module/Setup.php:764 extend/addon/a/faces/faces.php:220
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:809
+#: Code/Module/Setup.php:809
 msgid "registration page"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:812
+#: Code/Module/Setup.php:812
 msgid "
              What next?
              "
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:814
+#: Code/Module/Setup.php:814
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:816
+#: Code/Module/Setup.php:816
 msgid ""
 "Please see the file \"install/INSTALL.txt\" for more information and "
 "instructions."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:818
+#: Code/Module/Setup.php:818
 #, php-format
 msgid ""
 "Go to your new hub %s and register as new member. Please use the same email "
@@ -9651,118 +9651,118 @@ msgid ""
 "new account to enter the site admin panel."
 msgstr ""
 
-#: Zotlabs/Module/Share.php:135
+#: Code/Module/Share.php:135
 msgid "Post repeated"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:108
+#: Code/Module/Sharedwithme.php:108
 msgid "Files: shared with me"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:110
+#: Code/Module/Sharedwithme.php:110
 msgid "NEW"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:111 Zotlabs/Storage/Browser.php:315
+#: Code/Module/Sharedwithme.php:111 Code/Storage/Browser.php:315
 #: include/text.php:1544
 msgid "Size"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:112 Zotlabs/Storage/Browser.php:316
+#: Code/Module/Sharedwithme.php:112 Code/Storage/Browser.php:316
 msgid "Last Modified"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:113
+#: Code/Module/Sharedwithme.php:113
 msgid "Remove all files"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:114
+#: Code/Module/Sharedwithme.php:114
 msgid "Remove this file"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:37
+#: Code/Module/Siteinfo.php:37
 msgid "About this site"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:39
+#: Code/Module/Siteinfo.php:39
 msgid "Site Name"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:43
+#: Code/Module/Siteinfo.php:43
 msgid "Administrator"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:46
+#: Code/Module/Siteinfo.php:46
 msgid "Software and Project information"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:47
+#: Code/Module/Siteinfo.php:47
 msgid "This site is powered by $Projectname"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:48
+#: Code/Module/Siteinfo.php:48
 msgid ""
 "Federated and decentralised networking and identity services provided by "
 "Nomad"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:52
+#: Code/Module/Siteinfo.php:52
 msgid "Protocols:"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:54
+#: Code/Module/Siteinfo.php:54
 #, php-format
 msgid "Version %s"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:55
+#: Code/Module/Siteinfo.php:55
 msgid "Project homepage"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:56
+#: Code/Module/Siteinfo.php:56
 msgid "Developer homepage"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:19
+#: Code/Module/Sites.php:19
 msgid ""
 "This page provides information about related projects and websites that are "
 "currently known to this system. These are a small fraction of the thousands "
 "of websites and dozens of projects and providers which make up the fediverse."
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:47
+#: Code/Module/Sites.php:47
 msgid "free"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:49
+#: Code/Module/Sites.php:49
 msgid "subscription"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:51
+#: Code/Module/Sites.php:51
 msgid "tiered service plans"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:59
+#: Code/Module/Sites.php:59
 msgid "Register (requires approval)"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:103
+#: Code/Module/Sites.php:103
 msgid "Project"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:111
+#: Code/Module/Sites.php:111
 msgid "Access type"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:117
+#: Code/Module/Sites.php:117
 msgid "Affiliated Sites"
 msgstr ""
 
-#: Zotlabs/Module/Tasks.php:106
+#: Code/Module/Tasks.php:106
 msgid "This app provides a simple personal and task list."
 msgstr ""
 
-#: Zotlabs/Module/Vlists.php:16
+#: Code/Module/Vlists.php:16
 msgid ""
 "This app creates dynamic access lists corresponding to [1] all connections, "
 "[2] all ActivityPub protocol connections, and [3] all Nomad or Zot/6 "
@@ -9770,331 +9770,331 @@ msgid ""
 "Permissions setting tool."
 msgstr ""
 
-#: Zotlabs/Module/Vlists.php:23
+#: Code/Module/Vlists.php:23
 msgid "This app is installed. "
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:143 Zotlabs/Widget/Activity_filter.php:153
+#: Code/Module/Stream.php:143 Code/Widget/Activity_filter.php:153
 #: include/network.php:1764 include/network.php:1765
 msgid "Nomad"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:147 Zotlabs/Widget/Activity_filter.php:156
+#: Code/Module/Stream.php:147 Code/Widget/Activity_filter.php:156
 #: include/network.php:1760
 msgid "ActivityPub"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:162
+#: Code/Module/Stream.php:162
 msgid "Access list not found"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:206
+#: Code/Module/Stream.php:206
 msgid "No such channel"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:292
+#: Code/Module/Stream.php:292
 msgid "Access list is empty"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:306 include/items.php:4383
+#: Code/Module/Stream.php:306 include/items.php:4383
 #, php-format
 msgid "Access list: %s"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:349 extend/addon/a/zotpost/Mod_zotpost.php:30
+#: Code/Module/Stream.php:349 extend/addon/a/zotpost/Mod_zotpost.php:30
 msgid "Invalid channel."
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:141
+#: Code/Module/Thing.php:141
 msgid "Thing updated"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:202
+#: Code/Module/Thing.php:202
 msgid "Object store: failed"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:206
+#: Code/Module/Thing.php:206
 msgid "Thing added"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:234
+#: Code/Module/Thing.php:234
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:303
+#: Code/Module/Thing.php:303
 msgid "Show Thing"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:309
+#: Code/Module/Thing.php:309
 msgid "item not found."
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:343
+#: Code/Module/Thing.php:343
 msgid "Edit Thing"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:345 Zotlabs/Module/Thing.php:404
+#: Code/Module/Thing.php:345 Code/Module/Thing.php:404
 msgid "Select a profile"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:349 Zotlabs/Module/Thing.php:407
+#: Code/Module/Thing.php:349 Code/Module/Thing.php:407
 msgid "Post an activity"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:349 Zotlabs/Module/Thing.php:407
+#: Code/Module/Thing.php:349 Code/Module/Thing.php:407
 msgid "Only sends to viewers of the applicable profile"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:351 Zotlabs/Module/Thing.php:409
+#: Code/Module/Thing.php:351 Code/Module/Thing.php:409
 msgid "Name of thing e.g. something"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:353 Zotlabs/Module/Thing.php:410
+#: Code/Module/Thing.php:353 Code/Module/Thing.php:410
 msgid "URL of thing (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:355 Zotlabs/Module/Thing.php:411
+#: Code/Module/Thing.php:355 Code/Module/Thing.php:411
 msgid "URL for photo of thing (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:402
+#: Code/Module/Thing.php:402
 msgid "Add Thing to your Profile"
 msgstr ""
 
-#: Zotlabs/Module/Viewconnections.php:68
+#: Code/Module/Viewconnections.php:68
 msgid "No connections."
 msgstr ""
 
-#: Zotlabs/Module/Viewconnections.php:85
+#: Code/Module/Viewconnections.php:85
 #, php-format
 msgid "Visit %1$s's profile [%2$s]"
 msgstr ""
 
-#: Zotlabs/Module/Viewconnections.php:112
+#: Code/Module/Viewconnections.php:112
 msgid "View Connections"
 msgstr ""
 
-#: Zotlabs/Module/Zot_probe.php:20
+#: Code/Module/Zot_probe.php:20
 msgid "Zot6 Probe Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Suggestions.php:44
+#: Code/Module/Suggestions.php:44
 msgid ""
 "This app (when installed) displays a small number of friend suggestions on "
 "selected pages or you can run the app to display a full list of channel "
 "suggestions."
 msgstr ""
 
-#: Zotlabs/Module/Tagadelic.php:31
+#: Code/Module/Tagadelic.php:31
 msgid "This app displays a hashtag cloud on your channel homepage."
 msgstr ""
 
-#: Zotlabs/Module/Tagadelic.php:39
+#: Code/Module/Tagadelic.php:39
 msgid ""
 "This app is installed. It displays a hashtag cloud on your channel homepage."
 msgstr ""
 
-#: Zotlabs/Module/Tagrm.php:59 Zotlabs/Module/Tagrm.php:111
+#: Code/Module/Tagrm.php:59 Code/Module/Tagrm.php:111
 msgid "Tag removed"
 msgstr ""
 
-#: Zotlabs/Module/Tagrm.php:137
+#: Code/Module/Tagrm.php:137
 msgid "Remove Item Tag"
 msgstr ""
 
-#: Zotlabs/Module/Tagrm.php:139
+#: Code/Module/Tagrm.php:139
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: Zotlabs/Module/Xchan.php:13
+#: Code/Module/Xchan.php:13
 msgid "Xchan Lookup"
 msgstr ""
 
-#: Zotlabs/Module/Xchan.php:16
+#: Code/Module/Xchan.php:16
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: Zotlabs/Module/Subthread.php:141
+#: Code/Module/Subthread.php:141
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Subthread.php:144
+#: Code/Module/Subthread.php:144
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Tagger.php:63
+#: Code/Module/Tagger.php:63
 msgid "Post not found."
 msgstr ""
 
-#: Zotlabs/Module/Tagger.php:95 include/conversation.php:169
+#: Code/Module/Tagger.php:95 include/conversation.php:169
 #: include/text.php:2388
 msgid "comment"
 msgstr ""
 
-#: Zotlabs/Module/Tagger.php:136
+#: Code/Module/Tagger.php:136
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: Zotlabs/Module/Viewsrc.php:49
+#: Code/Module/Viewsrc.php:49
 msgid "item"
 msgstr ""
 
-#: Zotlabs/Module/Viewsrc.php:59
+#: Code/Module/Viewsrc.php:59
 msgid "Inspect"
 msgstr ""
 
-#: Zotlabs/Module/Viewsrc.php:64
+#: Code/Module/Viewsrc.php:64
 msgid "Local id:"
 msgstr ""
 
-#: Zotlabs/Module/Viewsrc.php:64
+#: Code/Module/Viewsrc.php:64
 msgid "Permanent link"
 msgstr ""
 
-#: Zotlabs/Module/Viewsrc.php:64
+#: Code/Module/Viewsrc.php:64
 msgid "Local link"
 msgstr ""
 
-#: Zotlabs/Module/Vote.php:42
+#: Code/Module/Vote.php:42
 msgid "Poll not found."
 msgstr ""
 
-#: Zotlabs/Module/Vote.php:73
+#: Code/Module/Vote.php:73
 msgid "Invalid response."
 msgstr ""
 
-#: Zotlabs/Module/Vote.php:132
+#: Code/Module/Vote.php:132
 msgid "Response submitted. Updates may not appear instantly."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:52
+#: Code/Module/Sources.php:52
 msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:69
+#: Code/Module/Sources.php:69
 msgid "Source created."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:82
+#: Code/Module/Sources.php:82
 msgid "Source updated."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:109
+#: Code/Module/Sources.php:109
 msgid "*"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:116
+#: Code/Module/Sources.php:116
 msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:117 Zotlabs/Module/Sources.php:127
+#: Code/Module/Sources.php:117 Code/Module/Sources.php:127
 msgid "New Source"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:128 Zotlabs/Module/Sources.php:163
+#: Code/Module/Sources.php:128 Code/Module/Sources.php:163
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:164
+#: Code/Module/Sources.php:129 Code/Module/Sources.php:164
 msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:164
+#: Code/Module/Sources.php:129 Code/Module/Sources.php:164
 msgid "Leave blank to import all public content"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:130 Zotlabs/Module/Sources.php:170
+#: Code/Module/Sources.php:130 Code/Module/Sources.php:170
 msgid "Channel Name"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:131 Zotlabs/Module/Sources.php:167
+#: Code/Module/Sources.php:131 Code/Module/Sources.php:167
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:132 Zotlabs/Module/Sources.php:168
+#: Code/Module/Sources.php:132 Code/Module/Sources.php:168
 msgid "Resend posts with this channel as author"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:132 Zotlabs/Module/Sources.php:168
+#: Code/Module/Sources.php:132 Code/Module/Sources.php:168
 msgid "Copyrights may apply"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:153 Zotlabs/Module/Sources.php:183
+#: Code/Module/Sources.php:153 Code/Module/Sources.php:183
 msgid "Source not found."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:160
+#: Code/Module/Sources.php:160
 msgid "Edit Source"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:161
+#: Code/Module/Sources.php:161
 msgid "Delete Source"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:192
+#: Code/Module/Sources.php:192
 msgid "Source removed"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:194
+#: Code/Module/Sources.php:194
 msgid "Unable to remove source."
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:38
+#: Code/Module/Superblock.php:38
 msgid "Blocking this site is not permitted."
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:95
+#: Code/Module/Superblock.php:95
 msgid "Added by Superblock"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:201
+#: Code/Module/Superblock.php:201
 msgid "superblock settings updated"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:232
+#: Code/Module/Superblock.php:232
 msgid "Blocked channels"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:234
+#: Code/Module/Superblock.php:234
 msgid "No channels currently blocked"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:249
+#: Code/Module/Superblock.php:249
 msgid "Blocked servers"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:251
+#: Code/Module/Superblock.php:251
 msgid "No servers currently blocked"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:257 Zotlabs/Widget/Settings_menu.php:67
+#: Code/Module/Superblock.php:257 Code/Widget/Settings_menu.php:67
 msgid "Manage Blocks"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:67 Zotlabs/Module/Uexport.php:68
+#: Code/Module/Uexport.php:67 Code/Module/Uexport.php:68
 msgid "Export Channel"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:69
+#: Code/Module/Uexport.php:69
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:70
+#: Code/Module/Uexport.php:70
 msgid "Export Content"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:71
+#: Code/Module/Uexport.php:71
 msgid ""
 "Export your channel information and recent content to a JSON backup that can "
 "be restored or imported to another server hub. This backs up all of your "
@@ -10103,11 +10103,11 @@ msgid ""
 "this download to begin."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:73
+#: Code/Module/Uexport.php:73
 msgid "Export your posts from a given year."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:75
+#: Code/Module/Uexport.php:75
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -10115,21 +10115,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:76
+#: Code/Module/Uexport.php:76
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:77
+#: Code/Module/Uexport.php:77
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:78
+#: Code/Module/Uexport.php:78
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting "
@@ -10137,717 +10137,717 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:58
+#: Code/Module/Webpages.php:58
 msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:78
+#: Code/Module/Webpages.php:78
 msgid "Import Webpage Elements"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:79
+#: Code/Module/Webpages.php:79
 msgid "Import selected"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:102
+#: Code/Module/Webpages.php:102
 msgid "Export Webpage Elements"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:103
+#: Code/Module/Webpages.php:103
 msgid "Export selected"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:277
+#: Code/Module/Webpages.php:277
 msgid "Actions"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:278
+#: Code/Module/Webpages.php:278
 msgid "Page Link"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:279
+#: Code/Module/Webpages.php:279
 msgid "Page Title"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:309
+#: Code/Module/Webpages.php:309
 msgid "Invalid file type."
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:321
+#: Code/Module/Webpages.php:321
 msgid "Error opening zip file"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:331
+#: Code/Module/Webpages.php:331
 msgid "Invalid folder path."
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:357
+#: Code/Module/Webpages.php:357
 msgid "No webpage elements detected."
 msgstr ""
 
-#: Zotlabs/Module/Zotfinger.php:28
+#: Code/Module/Zotfinger.php:28
 msgid "Zotfinger Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Zotfinger.php:29
+#: Code/Module/Zotfinger.php:29
 msgid "Lookup URL"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:120 Zotlabs/Storage/Browser.php:317
+#: Code/Storage/Browser.php:120 Code/Storage/Browser.php:317
 msgid "parent"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:151
+#: Code/Storage/Browser.php:151
 msgid "Principal"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:154
+#: Code/Storage/Browser.php:154
 msgid "Addressbook"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:160
+#: Code/Storage/Browser.php:160
 msgid "Schedule Inbox"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:163
+#: Code/Storage/Browser.php:163
 msgid "Schedule Outbox"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:299
+#: Code/Storage/Browser.php:299
 msgid "Total"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:301
+#: Code/Storage/Browser.php:301
 msgid "Shared"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:303
+#: Code/Storage/Browser.php:303
 msgid "Add Files"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:310
+#: Code/Storage/Browser.php:310
 msgid "View photos"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:314
+#: Code/Storage/Browser.php:314
 msgid "Type"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:392
+#: Code/Storage/Browser.php:392
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:396
+#: Code/Storage/Browser.php:396
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:407
+#: Code/Storage/Browser.php:407
 msgid "WARNING:"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:419
+#: Code/Storage/Browser.php:419
 msgid "Create new folder"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:421
+#: Code/Storage/Browser.php:421
 msgid "Upload file"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:434
+#: Code/Storage/Browser.php:434
 msgid "Drop files here to immediately upload"
 msgstr ""
 
-#: Zotlabs/Update/_1239.php:25
+#: Code/Update/_1239.php:25
 msgid "Added by superblock"
 msgstr ""
 
-#: Zotlabs/Widget/Archive.php:52
+#: Code/Widget/Archive.php:52
 msgid "Archives"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:46
+#: Code/Widget/Cdav.php:46
 msgid "Select Channel"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:51
+#: Code/Widget/Cdav.php:51
 msgid "Read-write"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:52
+#: Code/Widget/Cdav.php:52
 msgid "Read-only"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:138
+#: Code/Widget/Cdav.php:138
 msgid "Channel Calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:142
+#: Code/Widget/Cdav.php:142
 msgid "Shared CalDAV Calendars"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:146
+#: Code/Widget/Cdav.php:146
 msgid "Share this calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:148
+#: Code/Widget/Cdav.php:148
 msgid "Calendar name and color"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:150
+#: Code/Widget/Cdav.php:150
 msgid "Create new CalDAV calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:152
+#: Code/Widget/Cdav.php:152
 msgid "Calendar Name"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:153
+#: Code/Widget/Cdav.php:153
 msgid "Calendar Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:155
+#: Code/Widget/Cdav.php:155
 msgid "Import calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:156
+#: Code/Widget/Cdav.php:156
 msgid "Select a calendar to import to"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:181
+#: Code/Widget/Cdav.php:181
 msgid "Addressbooks"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:183
+#: Code/Widget/Cdav.php:183
 msgid "Addressbook name"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:185
+#: Code/Widget/Cdav.php:185
 msgid "Create new addressbook"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:186
+#: Code/Widget/Cdav.php:186
 msgid "Addressbook Name"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:188
+#: Code/Widget/Cdav.php:188
 msgid "Addressbook Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:189
+#: Code/Widget/Cdav.php:189
 msgid "Import addressbook"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:190
+#: Code/Widget/Cdav.php:190
 msgid "Select an addressbook to import to"
 msgstr ""
 
-#: Zotlabs/Widget/Chatroom_list.php:28
+#: Code/Widget/Chatroom_list.php:28
 msgid "Overview"
 msgstr ""
 
-#: Zotlabs/Widget/Filer.php:39 Zotlabs/Widget/Appcategories.php:55
-#: Zotlabs/Widget/Categories.php:90 Zotlabs/Widget/Categories.php:138
-#: Zotlabs/Widget/Categories.php:189
+#: Code/Widget/Filer.php:39 Code/Widget/Appcategories.php:55
+#: Code/Widget/Categories.php:90 Code/Widget/Categories.php:138
+#: Code/Widget/Categories.php:189
 msgid "Everything"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:24
+#: Code/Widget/Findpeople.php:24
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Widget/Findpeople.php:32
+#: Code/Widget/Findpeople.php:32
 msgid "Find Channels"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:33
+#: Code/Widget/Findpeople.php:33
 msgid "Enter name or interest"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:34
+#: Code/Widget/Findpeople.php:34
 msgid "Connect/Follow"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:35
+#: Code/Widget/Findpeople.php:35
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:40
+#: Code/Widget/Findpeople.php:40
 msgid "Affiliated sites"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:43
+#: Code/Widget/Findpeople.php:43
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:22
+#: Code/Widget/Notifications.php:22
 msgid "New Stream Activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:23
+#: Code/Widget/Notifications.php:23
 msgid "New Stream Activity Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:26
+#: Code/Widget/Notifications.php:26
 msgid "View your stream activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:29
+#: Code/Widget/Notifications.php:29
 msgid "Mark all notifications read"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:32 Zotlabs/Widget/Notifications.php:51
-#: Zotlabs/Widget/Notifications.php:143
+#: Code/Widget/Notifications.php:32 Code/Widget/Notifications.php:51
+#: Code/Widget/Notifications.php:143
 msgid "Show new posts only"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:33 Zotlabs/Widget/Notifications.php:52
-#: Zotlabs/Widget/Notifications.php:113 Zotlabs/Widget/Notifications.php:144
+#: Code/Widget/Notifications.php:33 Code/Widget/Notifications.php:52
+#: Code/Widget/Notifications.php:113 Code/Widget/Notifications.php:144
 msgid "Filter by name"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:41
+#: Code/Widget/Notifications.php:41
 msgid "New Home Activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:42
+#: Code/Widget/Notifications.php:42
 msgid "New Home Activity Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:45
+#: Code/Widget/Notifications.php:45
 msgid "View your home activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:48 Zotlabs/Widget/Notifications.php:140
+#: Code/Widget/Notifications.php:48 Code/Widget/Notifications.php:140
 msgid "Mark all notifications seen"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:60
+#: Code/Widget/Notifications.php:60
 msgid "New Events"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:61
+#: Code/Widget/Notifications.php:61
 msgid "New Events Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:64
+#: Code/Widget/Notifications.php:64
 msgid "View events"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:67
+#: Code/Widget/Notifications.php:67
 msgid "Mark all events seen"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:76
+#: Code/Widget/Notifications.php:76
 msgid "New Connections Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:79
+#: Code/Widget/Notifications.php:79
 msgid "View all connections"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:87
+#: Code/Widget/Notifications.php:87
 msgid "New Files"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:88
+#: Code/Widget/Notifications.php:88
 msgid "New Files Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:95 Zotlabs/Widget/Notifications.php:96
+#: Code/Widget/Notifications.php:95 Code/Widget/Notifications.php:96
 msgid "Notices"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:99
+#: Code/Widget/Notifications.php:99
 msgid "View all notices"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:102
+#: Code/Widget/Notifications.php:102
 msgid "Mark all notices seen"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:110 Zotlabs/Widget/Notifications.php:111
-#: Zotlabs/Widget/Groups.php:114 Zotlabs/Widget/Activity_filter.php:209
+#: Code/Widget/Notifications.php:110 Code/Widget/Notifications.php:111
+#: Code/Widget/Groups.php:114 Code/Widget/Activity_filter.php:209
 msgid "Groups"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:123
+#: Code/Widget/Notifications.php:123
 msgid "New Registrations"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:124
+#: Code/Widget/Notifications.php:124
 msgid "New Registrations Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:134
+#: Code/Widget/Notifications.php:134
 msgid "Public Stream Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:137
+#: Code/Widget/Notifications.php:137
 msgid "View the public stream"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:153
+#: Code/Widget/Notifications.php:153
 msgid "Sorry, you have got no notifications at the moment"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:32 Zotlabs/Widget/Admin.php:69
+#: Code/Widget/Admin.php:32 Code/Widget/Admin.php:69
 msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:38
+#: Code/Widget/Admin.php:38
 msgid "Inspect queue"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:40
+#: Code/Widget/Admin.php:40
 msgid "DB updates"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:65
+#: Code/Widget/Admin.php:65
 msgid "Addon Features"
 msgstr ""
 
-#: Zotlabs/Widget/Chatroom_members.php:16
+#: Code/Widget/Chatroom_members.php:16
 msgid "Chat Members"
 msgstr ""
 
-#: Zotlabs/Widget/Hq_controls.php:21
+#: Code/Widget/Hq_controls.php:21
 msgid "HQ Control Panel"
 msgstr ""
 
-#: Zotlabs/Widget/Hq_controls.php:24
+#: Code/Widget/Hq_controls.php:24
 msgid "Create a new post"
 msgstr ""
 
-#: Zotlabs/Widget/Savedsearch.php:89
+#: Code/Widget/Savedsearch.php:89
 msgid "Remove term"
 msgstr ""
 
-#: Zotlabs/Widget/Activity.php:59
+#: Code/Widget/Activity.php:59
 msgctxt "widget"
 msgid "Activity"
 msgstr ""
 
-#: Zotlabs/Widget/Photo.php:55 Zotlabs/Widget/Photo_rand.php:72
+#: Code/Widget/Photo.php:55 Code/Widget/Photo_rand.php:72
 msgid "photo/image"
 msgstr ""
 
-#: Zotlabs/Widget/Rating.php:58
+#: Code/Widget/Rating.php:58
 msgid "Rating Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Rating.php:62 Zotlabs/Widget/Rating.php:64
+#: Code/Widget/Rating.php:62 Code/Widget/Rating.php:64
 msgid "Rate Me"
 msgstr ""
 
-#: Zotlabs/Widget/Rating.php:68
+#: Code/Widget/Rating.php:68
 msgid "View Ratings"
 msgstr ""
 
-#: Zotlabs/Widget/Tagcloud.php:25 include/taxonomy.php:366
+#: Code/Widget/Tagcloud.php:25 include/taxonomy.php:366
 #: include/taxonomy.php:511 include/taxonomy.php:534
 msgid "Tags"
 msgstr ""
 
-#: Zotlabs/Widget/Site_projects.php:35
+#: Code/Widget/Site_projects.php:35
 msgid "Projects"
 msgstr ""
 
-#: Zotlabs/Widget/Site_projects.php:37
+#: Code/Widget/Site_projects.php:37
 msgid "All projects"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:106
+#: Code/Widget/Stream_order.php:106
 msgid "Commented Date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:110
+#: Code/Widget/Stream_order.php:110
 msgid "Order by last commented date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:113
+#: Code/Widget/Stream_order.php:113
 msgid "Posted Date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:117
+#: Code/Widget/Stream_order.php:117
 msgid "Order by last posted date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:120
+#: Code/Widget/Stream_order.php:120
 msgid "Date Unthreaded"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:124
+#: Code/Widget/Stream_order.php:124
 msgid "Order unthreaded by date"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestedchats.php:41
+#: Code/Widget/Suggestedchats.php:41
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestions.php:54
+#: Code/Widget/Suggestions.php:54
 msgid "Ignore/Hide"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestions.php:59
+#: Code/Widget/Suggestions.php:59
 msgid "Suggestions"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestions.php:60
+#: Code/Widget/Suggestions.php:60
 msgid "See more..."
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:40
+#: Code/Widget/Activity_filter.php:40
 msgid "Direct Messages"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:44
+#: Code/Widget/Activity_filter.php:44
 msgid "Show direct (private) messages"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:54
+#: Code/Widget/Activity_filter.php:54
 msgid "Personal Posts"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:58
+#: Code/Widget/Activity_filter.php:58
 msgid "Show posts that mention or involve me"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:67
+#: Code/Widget/Activity_filter.php:67
 msgid "Saved Posts"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:71
+#: Code/Widget/Activity_filter.php:71
 msgid "Show posts that I have saved"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:85
+#: Code/Widget/Activity_filter.php:85
 msgid "Show drafts that I have saved"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:95
+#: Code/Widget/Activity_filter.php:95
 msgid "Videos"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:99
+#: Code/Widget/Activity_filter.php:99
 msgid "Show posts that include videos"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:113
+#: Code/Widget/Activity_filter.php:113
 msgid "Show posts that include events"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:117
+#: Code/Widget/Activity_filter.php:117
 msgid "Polls"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:121
+#: Code/Widget/Activity_filter.php:121
 msgid "Show posts that include polls"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:142
-#: Zotlabs/Widget/Activity_filter.php:172
+#: Code/Widget/Activity_filter.php:142
+#: Code/Widget/Activity_filter.php:172
 #, php-format
 msgid "Show posts related to the %s access list"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:182
+#: Code/Widget/Activity_filter.php:182
 msgid "Show my access lists"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:200
+#: Code/Widget/Activity_filter.php:200
 msgid "Show posts to this group"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:202
+#: Code/Widget/Activity_filter.php:202
 msgid "New post"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:213
+#: Code/Widget/Activity_filter.php:213
 msgid "Show groups"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:236
+#: Code/Widget/Activity_filter.php:236
 #, php-format
 msgid "Show posts that I have filed to %s"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:246
+#: Code/Widget/Activity_filter.php:246
 msgid "Show filed post categories"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:266
+#: Code/Widget/Activity_filter.php:266
 #, php-format
 msgid "Show posts with hashtag %s"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:272
+#: Code/Widget/Activity_filter.php:272
 msgid "Followed Hashtags"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:276
+#: Code/Widget/Activity_filter.php:276
 msgid "Show followed hashtags"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:312
+#: Code/Widget/Activity_filter.php:312
 msgid "Remove active filter"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:328
+#: Code/Widget/Activity_filter.php:328
 msgid "Stream Filters"
 msgstr ""
 
-#: Zotlabs/Widget/Bookmarkedchats.php:34
+#: Code/Widget/Bookmarkedchats.php:34
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: Zotlabs/Widget/Cover_photo.php:96
+#: Code/Widget/Cover_photo.php:96
 msgid "Click to show more"
 msgstr ""
 
-#: Zotlabs/Widget/Eventstools.php:19
+#: Code/Widget/Eventstools.php:19
 msgid "Events Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Eventstools.php:20
+#: Code/Widget/Eventstools.php:20
 msgid "Export Calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Eventstools.php:21
+#: Code/Widget/Eventstools.php:21
 msgid "Import Calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:32
+#: Code/Widget/Follow.php:32
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:38
+#: Code/Widget/Follow.php:38
 msgid "Add New Connection"
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:39
+#: Code/Widget/Follow.php:39
 msgid "Enter channel address"
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:40 Zotlabs/Widget/Sblock.php:22
+#: Code/Widget/Follow.php:40 Code/Widget/Sblock.php:22
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:35
+#: Code/Widget/Newmember.php:35
 msgid "Profile Creation"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:37
+#: Code/Widget/Newmember.php:37
 msgid "Upload profile photo"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:38
+#: Code/Widget/Newmember.php:38
 msgid "Upload cover photo"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:42
+#: Code/Widget/Newmember.php:42
 msgid "Find and Connect with others"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:44
+#: Code/Widget/Newmember.php:44
 msgid "View the directory"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:45
+#: Code/Widget/Newmember.php:45
 msgid "View friend suggestions"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:46
+#: Code/Widget/Newmember.php:46
 msgid "Manage your connections"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:49
+#: Code/Widget/Newmember.php:49
 msgid "Communicate"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:51
+#: Code/Widget/Newmember.php:51
 msgid "View your channel homepage"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:52
+#: Code/Widget/Newmember.php:52
 msgid "View your stream"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:65
+#: Code/Widget/Newmember.php:65
 msgid "View public stream"
 msgstr ""
 
-#: Zotlabs/Widget/Sblock.php:20
+#: Code/Widget/Sblock.php:20
 msgid "Block channel or site"
 msgstr ""
 
-#: Zotlabs/Widget/Sblock.php:21
+#: Code/Widget/Sblock.php:21
 msgid "Enter channel address or URL"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:47
+#: Code/Widget/Settings_menu.php:47
 msgid "Account settings"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:53
+#: Code/Widget/Settings_menu.php:53
 msgid "Channel settings"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:61
+#: Code/Widget/Settings_menu.php:61
 msgid "Display settings"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:75
+#: Code/Widget/Settings_menu.php:75
 msgid "Manage locations"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:82
+#: Code/Widget/Settings_menu.php:82
 msgid "Export channel"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:97
+#: Code/Widget/Settings_menu.php:97
 msgid "Client apps"
 msgstr ""
 
-#: Zotlabs/Widget/Affinity.php:42
+#: Code/Widget/Affinity.php:42
 msgid "Friend zoom in/out"
 msgstr ""
 
-#: Zotlabs/Widget/Appstore.php:15
+#: Code/Widget/Appstore.php:15
 msgid "App Collections"
 msgstr ""
 
-#: Zotlabs/Widget/Common_friends.php:49
+#: Code/Widget/Common_friends.php:49
 msgid "Common Connections"
 msgstr ""
 
-#: Zotlabs/Widget/Common_friends.php:54
+#: Code/Widget/Common_friends.php:54
 #, php-format
 msgid "View all %d common connections"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:19
+#: Code/Widget/Mailmenu.php:19
 msgid "Private Mail Menu"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:21
+#: Code/Widget/Mailmenu.php:21
 msgid "Combined View"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:26
+#: Code/Widget/Mailmenu.php:26
 msgid "Inbox"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:31
+#: Code/Widget/Mailmenu.php:31
 msgid "Outbox"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:36
+#: Code/Widget/Mailmenu.php:36
 msgid "New Message"
 msgstr ""
 
diff --git a/util/pconfig b/util/pconfig
index db8cf061a..69903da32 100755
--- a/util/pconfig
+++ b/util/pconfig
@@ -3,8 +3,8 @@
 
 // personal config utility
 
-use Zotlabs\Lib\Libsync;
-use Zotlabs\Lib\Channel;
+use Code\Lib\Libsync;
+use Code\Lib\Channel;
 
 
 if(!file_exists('include/cli_startup.php')) {
diff --git a/util/typo.php b/util/typo.php
index ccd004dfb..cca09b17c 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -38,8 +38,8 @@ foreach ($files as $file) {
 //  }
 
 
-    echo "Directory: Zotlabs\n";
-    $files = glob('Zotlabs/*/*.php');
+    echo "Directory: Code\n";
+    $files = glob('Code/*/*.php');
 foreach ($files as $file) {
     if ((strpos($file, 'SiteModule') === false) || (strpos($file, 'SiteWidget') === false)) {
         echo exec($cmd . $file) . "\n";
@@ -47,8 +47,8 @@ foreach ($files as $file) {
     }
 }
 
-    echo "Directory: Zotlabs/Module (sub-modules)\n";
-    $files = glob('Zotlabs/Module/*/*.php');
+    echo "Directory: Code/Module (sub-modules)\n";
+    $files = glob('Code/Module/*/*.php');
 foreach ($files as $file) {
     echo exec($cmd . $file) . "\n";
     include_once($file);
diff --git a/view/ca/messages.po b/view/ca/messages.po
index 47a7e4694..6d5895a37 100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@@ -22,143 +22,143 @@ msgstr ""
 "Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Code/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
 msgstr "Pot veure el flux i entrades del meu canal"
 
-#: ../../Zotlabs/Access/Permissions.php:57
+#: ../../Code/Access/Permissions.php:57
 msgid "Can send me their channel stream and posts"
 msgstr "Pot enviar-me el flux i entrades del seu canal"
 
-#: ../../Zotlabs/Access/Permissions.php:58
+#: ../../Code/Access/Permissions.php:58
 msgid "Can view my default channel profile"
 msgstr "Pot veure el perfil del meu canal per defecte"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Code/Access/Permissions.php:59
 msgid "Can view my connections"
 msgstr "Pot veure les meves connexions"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Code/Access/Permissions.php:60
 msgid "Can view my file storage and photos"
 msgstr "Pot veure les meves fotos i arxius"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Code/Access/Permissions.php:61
 msgid "Can upload/modify my file storage and photos"
 msgstr "Pot pujar i modificar els meus fitxers i fotos"
 
-#: ../../Zotlabs/Access/Permissions.php:62
+#: ../../Code/Access/Permissions.php:62
 msgid "Can view my channel webpages"
 msgstr "Pot veure les pàgines web del meu canal"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Code/Access/Permissions.php:63
 msgid "Can view my wiki pages"
 msgstr "Por veure les meves pàgines wiki"
 
-#: ../../Zotlabs/Access/Permissions.php:64
+#: ../../Code/Access/Permissions.php:64
 msgid "Can create/edit my channel webpages"
 msgstr "Pot crear i modificar les pàgines web del meu canal"
 
-#: ../../Zotlabs/Access/Permissions.php:65
+#: ../../Code/Access/Permissions.php:65
 msgid "Can write to my wiki pages"
 msgstr "Pot escriure a les meves pàgines wiki"
 
-#: ../../Zotlabs/Access/Permissions.php:66
+#: ../../Code/Access/Permissions.php:66
 msgid "Can post on my channel (wall) page"
 msgstr "Pot penjar entrades al mur del meu canal"
 
-#: ../../Zotlabs/Access/Permissions.php:67
+#: ../../Code/Access/Permissions.php:67
 msgid "Can comment on or like my posts"
 msgstr "Pot comentar i fer \"m'agrada\" a les meves entrades"
 
-#: ../../Zotlabs/Access/Permissions.php:68
+#: ../../Code/Access/Permissions.php:68
 msgid "Can send me private mail messages"
 msgstr "Pot enviar-me missatges privats"
 
-#: ../../Zotlabs/Access/Permissions.php:69
+#: ../../Code/Access/Permissions.php:69
 msgid "Can like/dislike profiles and profile things"
 msgstr "Pot fer m'agrada i no m'agrada als perfils i coses del perfil"
 
-#: ../../Zotlabs/Access/Permissions.php:70
+#: ../../Code/Access/Permissions.php:70
 msgid "Can forward to all my channel connections via ! mentions in posts"
 msgstr "Pot fer arribar entrades a totes les meves connexions fent servir mencions amb \"!\""
 
-#: ../../Zotlabs/Access/Permissions.php:71
+#: ../../Code/Access/Permissions.php:71
 msgid "Can chat with me"
 msgstr "Pot xatejar amb mi"
 
-#: ../../Zotlabs/Access/Permissions.php:72
+#: ../../Code/Access/Permissions.php:72
 msgid "Can source my public posts in derived channels"
 msgstr "Pot fer servir les meves entrades per publicar automàticament en altres canals"
 
-#: ../../Zotlabs/Access/Permissions.php:73
+#: ../../Code/Access/Permissions.php:73
 msgid "Can administer my channel"
 msgstr "Pot administrar el meu canal"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:283
+#: ../../Code/Access/PermissionRoles.php:283
 msgid "Social Networking"
 msgstr "Xarxes Socials"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:284
+#: ../../Code/Access/PermissionRoles.php:284
 msgid "Social - Federation"
 msgstr "Social - Federació"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:285
+#: ../../Code/Access/PermissionRoles.php:285
 msgid "Social - Mostly Public"
 msgstr "Social -  Principalment públic"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:286
+#: ../../Code/Access/PermissionRoles.php:286
 msgid "Social - Restricted"
 msgstr "Social - Restingit"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
+#: ../../Code/Access/PermissionRoles.php:287
 msgid "Social - Private"
 msgstr "Social - Privat"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
+#: ../../Code/Access/PermissionRoles.php:290
 msgid "Community Forum"
 msgstr "Fòrum comunitari"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
+#: ../../Code/Access/PermissionRoles.php:291
 msgid "Forum - Mostly Public"
 msgstr "Fòrum - Principalment públic"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:292
+#: ../../Code/Access/PermissionRoles.php:292
 msgid "Forum - Restricted"
 msgstr "Fòrum - Restringit"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:293
+#: ../../Code/Access/PermissionRoles.php:293
 msgid "Forum - Private"
 msgstr "Fòrum - Privat"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
+#: ../../Code/Access/PermissionRoles.php:296
 msgid "Feed Republish"
 msgstr "Republicador"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
+#: ../../Code/Access/PermissionRoles.php:297
 msgid "Feed - Mostly Public"
 msgstr "Republicador - Principalment públic"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:298
+#: ../../Code/Access/PermissionRoles.php:298
 msgid "Feed - Restricted"
 msgstr "Republicador - Restringit"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
+#: ../../Code/Access/PermissionRoles.php:301
 msgid "Special Purpose"
 msgstr "Objectiu Especial"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
+#: ../../Code/Access/PermissionRoles.php:302
 msgid "Special - Celebrity/Soapbox"
 msgstr "Especial - Personatge públic / Plataforma"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:303
+#: ../../Code/Access/PermissionRoles.php:303
 msgid "Special - Group Repository"
 msgstr "Especial  - Repositori d'un Grup"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:172
-#: ../../Zotlabs/Module/Settings/Channel.php:496
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Register.php:233 ../../include/selectors.php:49
+#: ../../Code/Access/PermissionRoles.php:306
+#: ../../Code/Module/Cdav.php:1182 ../../Code/Module/New_channel.php:172
+#: ../../Code/Module/Settings/Channel.php:496
+#: ../../Code/Module/Connedit.php:918 ../../Code/Module/Profiles.php:795
+#: ../../Code/Module/Register.php:233 ../../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:703
@@ -166,80 +166,80 @@ msgstr "Especial  - Repositori d'un Grup"
 msgid "Other"
 msgstr "Altres"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
+#: ../../Code/Access/PermissionRoles.php:307
 msgid "Custom/Expert Mode"
 msgstr "Personalitzat, mode expert"
 
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29
-#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Layouts.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:33
-#: ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197
+#: ../../Code/Module/Blocks.php:33 ../../Code/Module/Articles.php:29
+#: ../../Code/Module/Editlayout.php:31 ../../Code/Module/Connect.php:17
+#: ../../Code/Module/Achievements.php:15 ../../Code/Module/Hcard.php:12
+#: ../../Code/Module/Editblock.php:31 ../../Code/Module/Profile.php:20
+#: ../../Code/Module/Menu.php:91 ../../Code/Module/Layouts.php:31
+#: ../../Code/Module/Editwebpage.php:32 ../../Code/Module/Cards.php:33
+#: ../../Code/Module/Webpages.php:33
+#: ../../Code/Module/Filestorage.php:51 ../../include/channel.php:1197
 msgid "Requested profile is not available."
 msgstr "El perfil demanat no està disponible."
 
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115
-#: ../../Zotlabs/Module/Channel.php:281 ../../Zotlabs/Module/Channel.php:320
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20
-#: ../../Zotlabs/Module/Article_edit.php:51
-#: ../../Zotlabs/Module/New_channel.php:105
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
-#: ../../Zotlabs/Module/Moderate.php:13
-#: ../../Zotlabs/Module/Settings/Features.php:38
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280
-#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
-#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
-#: ../../Zotlabs/Module/Profile_photo.php:302
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229
-#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
-#: ../../Zotlabs/Module/Item.php:1108 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40
-#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:12
-#: ../../Zotlabs/Module/Group.php:24 ../../Zotlabs/Module/Profiles.php:198
-#: ../../Zotlabs/Module/Profiles.php:635
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107
-#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118
-#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:77
-#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
-#: ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Cover_photo.php:313
-#: ../../Zotlabs/Module/Cover_photo.php:326
-#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Filestorage.php:15
-#: ../../Zotlabs/Module/Filestorage.php:70
-#: ../../Zotlabs/Module/Filestorage.php:96
-#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Card_edit.php:51
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
+#: ../../Code/Module/Blocks.php:73 ../../Code/Module/Blocks.php:80
+#: ../../Code/Module/Invite.php:17 ../../Code/Module/Invite.php:94
+#: ../../Code/Module/Articles.php:68 ../../Code/Module/Editlayout.php:67
+#: ../../Code/Module/Editlayout.php:90 ../../Code/Module/Channel.php:115
+#: ../../Code/Module/Channel.php:281 ../../Code/Module/Channel.php:320
+#: ../../Code/Module/Settings.php:59 ../../Code/Module/Locs.php:87
+#: ../../Code/Module/Mitem.php:129 ../../Code/Module/Events.php:271
+#: ../../Code/Module/Appman.php:87 ../../Code/Module/Regmod.php:20
+#: ../../Code/Module/Article_edit.php:51
+#: ../../Code/Module/New_channel.php:105
+#: ../../Code/Module/New_channel.php:130
+#: ../../Code/Module/Sharedwithme.php:16 ../../Code/Module/Setup.php:209
+#: ../../Code/Module/Moderate.php:13
+#: ../../Code/Module/Settings/Features.php:38
+#: ../../Code/Module/Achievements.php:34 ../../Code/Module/Thing.php:280
+#: ../../Code/Module/Thing.php:300 ../../Code/Module/Thing.php:341
+#: ../../Code/Module/Api.php:24 ../../Code/Module/Editblock.php:67
+#: ../../Code/Module/Profile.php:85 ../../Code/Module/Profile.php:101
+#: ../../Code/Module/Mood.php:116 ../../Code/Module/Connections.php:29
+#: ../../Code/Module/Viewsrc.php:19 ../../Code/Module/Bookmarks.php:64
+#: ../../Code/Module/Photos.php:69 ../../Code/Module/Wiki.php:50
+#: ../../Code/Module/Wiki.php:273 ../../Code/Module/Wiki.php:404
+#: ../../Code/Module/Pdledit.php:29 ../../Code/Module/Poke.php:149
+#: ../../Code/Module/Profile_photo.php:302
+#: ../../Code/Module/Profile_photo.php:315
+#: ../../Code/Module/Authtest.php:16 ../../Code/Module/Item.php:229
+#: ../../Code/Module/Item.php:246 ../../Code/Module/Item.php:256
+#: ../../Code/Module/Item.php:1108 ../../Code/Module/Page.php:34
+#: ../../Code/Module/Page.php:133 ../../Code/Module/Connedit.php:389
+#: ../../Code/Module/Chat.php:100 ../../Code/Module/Chat.php:105
+#: ../../Code/Module/Menu.php:129 ../../Code/Module/Menu.php:140
+#: ../../Code/Module/Layouts.php:71 ../../Code/Module/Layouts.php:78
+#: ../../Code/Module/Layouts.php:89 ../../Code/Module/Cloud.php:40
+#: ../../Code/Module/Defperms.php:173 ../../Code/Module/Group.php:12
+#: ../../Code/Module/Group.php:24 ../../Code/Module/Profiles.php:198
+#: ../../Code/Module/Profiles.php:635
+#: ../../Code/Module/Editwebpage.php:68
+#: ../../Code/Module/Editwebpage.php:89
+#: ../../Code/Module/Editwebpage.php:107
+#: ../../Code/Module/Editwebpage.php:121 ../../Code/Module/Manage.php:10
+#: ../../Code/Module/Cards.php:72 ../../Code/Module/Webpages.php:118
+#: ../../Code/Module/Block.php:24 ../../Code/Module/Block.php:74
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Sources.php:77
+#: ../../Code/Module/Like.php:185 ../../Code/Module/Suggest.php:28
+#: ../../Code/Module/Message.php:18 ../../Code/Module/Mail.php:146
+#: ../../Code/Module/Register.php:77
+#: ../../Code/Module/Cover_photo.php:313
+#: ../../Code/Module/Cover_photo.php:326
+#: ../../Code/Module/Display.php:449 ../../Code/Module/Network.php:15
+#: ../../Code/Module/Filestorage.php:15
+#: ../../Code/Module/Filestorage.php:70
+#: ../../Code/Module/Filestorage.php:96
+#: ../../Code/Module/Filestorage.php:140 ../../Code/Module/Common.php:38
+#: ../../Code/Module/Viewconnections.php:28
+#: ../../Code/Module/Viewconnections.php:33
+#: ../../Code/Module/Service_limits.php:11
+#: ../../Code/Module/Rate.php:113 ../../Code/Module/Card_edit.php:51
+#: ../../Code/Module/Notifications.php:11
+#: ../../Code/Lib/Chatroom.php:133 ../../Code/Web/WebServer.php:123
 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
 #: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150
 #: ../../include/attach.php:197 ../../include/attach.php:270
@@ -251,206 +251,206 @@ msgstr "El perfil demanat no està disponible."
 msgid "Permission denied."
 msgstr "S'ha denegat el permís."
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
+#: ../../Code/Module/Blocks.php:97 ../../Code/Module/Blocks.php:155
+#: ../../Code/Module/Editblock.php:113
 msgid "Block Name"
 msgstr "Nom del bloc"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2458
+#: ../../Code/Module/Blocks.php:154 ../../include/text.php:2458
 msgid "Blocks"
 msgstr "Blocs"
 
-#: ../../Zotlabs/Module/Blocks.php:156
+#: ../../Code/Module/Blocks.php:156
 msgid "Block Title"
 msgstr "Títol del bloc"
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Code/Module/Blocks.php:157 ../../Code/Module/Menu.php:177
+#: ../../Code/Module/Layouts.php:191 ../../Code/Module/Webpages.php:251
 msgid "Created"
 msgstr "Creat"
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
+#: ../../Code/Module/Blocks.php:158 ../../Code/Module/Menu.php:178
+#: ../../Code/Module/Layouts.php:192 ../../Code/Module/Webpages.php:252
 msgid "Edited"
 msgstr "Editat"
 
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:188
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:181
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239
-#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390
-#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
+#: ../../Code/Module/Blocks.php:159 ../../Code/Module/Articles.php:96
+#: ../../Code/Module/Cdav.php:1185 ../../Code/Module/New_channel.php:188
+#: ../../Code/Module/Connedit.php:921 ../../Code/Module/Menu.php:181
+#: ../../Code/Module/Layouts.php:185 ../../Code/Module/Profiles.php:798
+#: ../../Code/Module/Cards.php:100 ../../Code/Module/Webpages.php:239
+#: ../../Code/Storage/Browser.php:276 ../../Code/Storage/Browser.php:390
+#: ../../Code/Widget/Cdav.php:128 ../../Code/Widget/Cdav.php:165
 msgid "Create"
 msgstr "Crea"
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Admin/Profs.php:175
-#: ../../Zotlabs/Module/Settings/Oauth2.php:150
-#: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:281
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202
-#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:175
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:216
-#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Lib/Apps.php:475 ../../Zotlabs/Lib/ThreadItem.php:128
-#: ../../Zotlabs/Storage/Browser.php:290 ../../Zotlabs/Widget/Cdav.php:126
-#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296
+#: ../../Code/Module/Blocks.php:160 ../../Code/Module/Editlayout.php:114
+#: ../../Code/Module/Article_edit.php:99
+#: ../../Code/Module/Admin/Profs.php:175
+#: ../../Code/Module/Settings/Oauth2.php:150
+#: ../../Code/Module/Settings/Oauth.php:150
+#: ../../Code/Module/Thing.php:266 ../../Code/Module/Editblock.php:114
+#: ../../Code/Module/Connections.php:281
+#: ../../Code/Module/Connections.php:319
+#: ../../Code/Module/Connections.php:339 ../../Code/Module/Wiki.php:202
+#: ../../Code/Module/Wiki.php:362 ../../Code/Module/Menu.php:175
+#: ../../Code/Module/Layouts.php:193 ../../Code/Module/Group.php:216
+#: ../../Code/Module/Editwebpage.php:142
+#: ../../Code/Module/Webpages.php:240 ../../Code/Module/Card_edit.php:99
+#: ../../Code/Lib/Apps.php:475 ../../Code/Lib/ThreadItem.php:128
+#: ../../Code/Storage/Browser.php:290 ../../Code/Widget/Cdav.php:126
+#: ../../Code/Widget/Cdav.php:162 ../../include/channel.php:1296
 #: ../../include/channel.php:1300 ../../include/menu.php:118
 msgid "Edit"
 msgstr "Edita"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1107
-#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124
+#: ../../Code/Module/Blocks.php:161 ../../Code/Module/Photos.php:1107
+#: ../../Code/Module/Wiki.php:287 ../../Code/Module/Layouts.php:194
+#: ../../Code/Module/Webpages.php:241 ../../Code/Widget/Cdav.php:124
 #: ../../include/conversation.php:1374
 msgid "Share"
 msgstr "Comparteix"
 
-#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
-#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Settings/Oauth2.php:151
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:289
-#: ../../Zotlabs/Module/Photos.php:1208 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:800
-#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:242
-#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:476
-#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:291
+#: ../../Code/Module/Blocks.php:162 ../../Code/Module/Editlayout.php:138
+#: ../../Code/Module/Cdav.php:897 ../../Code/Module/Cdav.php:1187
+#: ../../Code/Module/Article_edit.php:129
+#: ../../Code/Module/Admin/Accounts.php:175
+#: ../../Code/Module/Admin/Channels.php:149
+#: ../../Code/Module/Admin/Profs.php:176
+#: ../../Code/Module/Settings/Oauth2.php:151
+#: ../../Code/Module/Settings/Oauth.php:151
+#: ../../Code/Module/Thing.php:267 ../../Code/Module/Editblock.php:139
+#: ../../Code/Module/Connections.php:289
+#: ../../Code/Module/Photos.php:1208 ../../Code/Module/Connedit.php:654
+#: ../../Code/Module/Connedit.php:923 ../../Code/Module/Profiles.php:800
+#: ../../Code/Module/Editwebpage.php:167
+#: ../../Code/Module/Webpages.php:242
+#: ../../Code/Module/Card_edit.php:129 ../../Code/Lib/Apps.php:476
+#: ../../Code/Lib/ThreadItem.php:148 ../../Code/Storage/Browser.php:291
 #: ../../include/conversation.php:691 ../../include/conversation.php:736
 msgid "Delete"
 msgstr "Esborra"
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60
+#: ../../Code/Module/Blocks.php:166 ../../Code/Module/Events.php:694
+#: ../../Code/Module/Wiki.php:204 ../../Code/Module/Layouts.php:198
+#: ../../Code/Module/Webpages.php:246 ../../Code/Module/Pubsites.php:60
 msgid "View"
 msgstr "Mostra"
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Code/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
 msgstr "S'ha superat el límit total d'invitacions."
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Code/Module/Invite.php:53
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "L'adreça de correu %s no és vàlida."
 
-#: ../../Zotlabs/Module/Invite.php:67
+#: ../../Code/Module/Invite.php:67
 msgid "Please join us on $Projectname"
 msgstr "Suma't a $Projectname!"
 
-#: ../../Zotlabs/Module/Invite.php:77
+#: ../../Code/Module/Invite.php:77
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr "S'ha superat el límit d'invitacions. Posa't en contacte amb l'administrador del lloc."
 
-#: ../../Zotlabs/Module/Invite.php:82
+#: ../../Code/Module/Invite.php:82
 #: ../../addon/notifyadmin/notifyadmin.php:40
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "No s'ha pogut lliurar la invitació a %s"
 
-#: ../../Zotlabs/Module/Invite.php:86
+#: ../../Code/Module/Invite.php:86
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "S'ha enviat %d invitació."
 msgstr[1] "S'han enviat %d invitacions."
 
-#: ../../Zotlabs/Module/Invite.php:107
+#: ../../Code/Module/Invite.php:107
 msgid "You have no more invitations available"
 msgstr "No pots enviar més invitacions"
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Code/Module/Invite.php:138
 msgid "Send invitations"
 msgstr "Envia invitacions"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Code/Module/Invite.php:139
 msgid "Enter email addresses, one per line:"
 msgstr "Introdueix les adreces de correu electrònic, una per línia:"
 
-#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
+#: ../../Code/Module/Invite.php:140 ../../Code/Module/Mail.php:285
 msgid "Your message:"
 msgstr "El teu missatge:"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Code/Module/Invite.php:141
 msgid "Please join my community on $Projectname."
 msgstr "Vols sumar-te a la meva comunitat a $Projectname?"
 
-#: ../../Zotlabs/Module/Invite.php:143
+#: ../../Code/Module/Invite.php:143
 msgid "You will need to supply this invitation code:"
 msgstr "Hauràs de facilitar aquest codi d'invitació:"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Code/Module/Invite.php:144
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Pots registrar-te a qualsevol node de $Projectname (estan tots interconnectats)"
 
-#: ../../Zotlabs/Module/Invite.php:146
+#: ../../Code/Module/Invite.php:146
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Escriu a la barra de cerca la meva adreça de la xarxa $Projectname."
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Code/Module/Invite.php:147
 msgid "or visit"
 msgstr "o bé visita"
 
-#: ../../Zotlabs/Module/Invite.php:149
+#: ../../Code/Module/Invite.php:149
 msgid "3. Click [Connect]"
 msgstr "3. Clica [connecta]"
 
-#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:153
-#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
-#: ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:309
-#: ../../Zotlabs/Module/Admin/Addons.php:438
-#: ../../Zotlabs/Module/Admin/Profs.php:178
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Security.php:112
-#: ../../Zotlabs/Module/Settings/Permcats.php:115
-#: ../../Zotlabs/Module/Settings/Channel.php:516
-#: ../../Zotlabs/Module/Settings/Features.php:79
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Oauth2.php:85
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:54
-#: ../../Zotlabs/Module/Settings/Display.php:192
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379
-#: ../../Zotlabs/Module/Import.php:565 ../../Zotlabs/Module/Cal.php:345
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1087
-#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1245
-#: ../../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:40
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
-#: ../../Zotlabs/Module/Group.php:121 ../../Zotlabs/Module/Group.php:137
-#: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85
-#: ../../Zotlabs/Module/Sources.php:117 ../../Zotlabs/Module/Sources.php:154
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
-#: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Lib/ThreadItem.php:757
-#: ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:97
+#: ../../Code/Module/Invite.php:151 ../../Code/Module/Locs.php:121
+#: ../../Code/Module/Mitem.php:259 ../../Code/Module/Events.php:493
+#: ../../Code/Module/Appman.php:153
+#: ../../Code/Module/Import_items.php:129
+#: ../../Code/Module/Setup.php:308 ../../Code/Module/Setup.php:349
+#: ../../Code/Module/Connect.php:98
+#: ../../Code/Module/Admin/Features.php:66
+#: ../../Code/Module/Admin/Accounts.php:168
+#: ../../Code/Module/Admin/Logs.php:84
+#: ../../Code/Module/Admin/Channels.php:147
+#: ../../Code/Module/Admin/Themes.php:158
+#: ../../Code/Module/Admin/Site.php:309
+#: ../../Code/Module/Admin/Addons.php:438
+#: ../../Code/Module/Admin/Profs.php:178
+#: ../../Code/Module/Admin/Account_edit.php:74
+#: ../../Code/Module/Admin/Security.php:112
+#: ../../Code/Module/Settings/Permcats.php:115
+#: ../../Code/Module/Settings/Channel.php:516
+#: ../../Code/Module/Settings/Features.php:79
+#: ../../Code/Module/Settings/Tokens.php:168
+#: ../../Code/Module/Settings/Oauth2.php:85
+#: ../../Code/Module/Settings/Account.php:118
+#: ../../Code/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Display.php:192
+#: ../../Code/Module/Settings/Oauth.php:88
+#: ../../Code/Module/Thing.php:326 ../../Code/Module/Thing.php:379
+#: ../../Code/Module/Import.php:565 ../../Code/Module/Cal.php:345
+#: ../../Code/Module/Mood.php:139 ../../Code/Module/Photos.php:1087
+#: ../../Code/Module/Photos.php:1127 ../../Code/Module/Photos.php:1245
+#: ../../Code/Module/Wiki.php:206 ../../Code/Module/Pdledit.php:98
+#: ../../Code/Module/Poke.php:200 ../../Code/Module/Connedit.php:887
+#: ../../Code/Module/Chat.php:196 ../../Code/Module/Chat.php:242
+#: ../../Code/Module/Email_validation.php:40
+#: ../../Code/Module/Pconfig.php:107 ../../Code/Module/Defperms.php:249
+#: ../../Code/Module/Group.php:121 ../../Code/Module/Group.php:137
+#: ../../Code/Module/Profiles.php:723 ../../Code/Module/Editpost.php:85
+#: ../../Code/Module/Sources.php:117 ../../Code/Module/Sources.php:154
+#: ../../Code/Module/Xchan.php:15 ../../Code/Module/Mail.php:431
+#: ../../Code/Module/Filestorage.php:183 ../../Code/Module/Rate.php:166
+#: ../../Code/Lib/ThreadItem.php:757
+#: ../../Code/Widget/Eventstools.php:16
+#: ../../Code/Widget/Wiki_pages.php:40
+#: ../../Code/Widget/Wiki_pages.php:97
 #: ../../view/theme/redbasic_c/php/config.php:95
 #: ../../view/theme/redbasic/php/config.php:93
 #: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:284
@@ -490,410 +490,410 @@ msgstr "3. Clica [connecta]"
 msgid "Submit"
 msgstr "Envia"
 
-#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191
-#: ../../Zotlabs/Lib/Apps.php:292 ../../include/features.php:133
+#: ../../Code/Module/Articles.php:38 ../../Code/Module/Articles.php:191
+#: ../../Code/Lib/Apps.php:292 ../../include/features.php:133
 #: ../../include/nav.php:461
 msgid "Articles"
 msgstr "Articles"
 
-#: ../../Zotlabs/Module/Articles.php:95
+#: ../../Code/Module/Articles.php:95
 msgid "Add Article"
 msgstr "Afegeix un article"
 
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Article_edit.php:17
-#: ../../Zotlabs/Module/Article_edit.php:33
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Card_edit.php:17
-#: ../../Zotlabs/Module/Card_edit.php:33
+#: ../../Code/Module/Editlayout.php:79
+#: ../../Code/Module/Article_edit.php:17
+#: ../../Code/Module/Article_edit.php:33
+#: ../../Code/Module/Editblock.php:79 ../../Code/Module/Editblock.php:95
+#: ../../Code/Module/Editwebpage.php:80
+#: ../../Code/Module/Editpost.php:24 ../../Code/Module/Card_edit.php:17
+#: ../../Code/Module/Card_edit.php:33
 msgid "Item not found"
 msgstr "No s'ha trobat l'element"
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Code/Module/Editlayout.php:128
+#: ../../Code/Module/Layouts.php:129 ../../Code/Module/Layouts.php:189
 msgid "Layout Name"
 msgstr "Nom del disseny"
 
-#: ../../Zotlabs/Module/Editlayout.php:129
-#: ../../Zotlabs/Module/Layouts.php:132
+#: ../../Code/Module/Editlayout.php:129
+#: ../../Code/Module/Layouts.php:132
 msgid "Layout Description (Optional)"
 msgstr "Descripció del disseny (opcional)"
 
-#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Code/Module/Editlayout.php:137
 msgid "Edit Layout"
 msgstr "Edita el disseny"
 
-#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:899
-#: ../../Zotlabs/Module/Cdav.php:1188
-#: ../../Zotlabs/Module/Article_edit.php:131
-#: ../../Zotlabs/Module/Admin/Addons.php:423
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:347
-#: ../../Zotlabs/Module/Wiki.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:465
-#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55
-#: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131
+#: ../../Code/Module/Editlayout.php:140 ../../Code/Module/Cdav.php:899
+#: ../../Code/Module/Cdav.php:1188
+#: ../../Code/Module/Article_edit.php:131
+#: ../../Code/Module/Admin/Addons.php:423
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:89
+#: ../../Code/Module/Settings/Oauth.php:115
+#: ../../Code/Module/Editblock.php:141 ../../Code/Module/Wiki.php:347
+#: ../../Code/Module/Wiki.php:379
+#: ../../Code/Module/Profile_photo.php:465
+#: ../../Code/Module/Connedit.php:924 ../../Code/Module/Fbrowser.php:66
+#: ../../Code/Module/Fbrowser.php:88 ../../Code/Module/Profiles.php:801
+#: ../../Code/Module/Editwebpage.php:169
+#: ../../Code/Module/Editpost.php:109 ../../Code/Module/Filer.php:55
+#: ../../Code/Module/Cover_photo.php:399 ../../Code/Module/Tagrm.php:15
+#: ../../Code/Module/Tagrm.php:138 ../../Code/Module/Card_edit.php:131
 #: ../../include/conversation.php:1397 ../../include/conversation.php:1446
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Cloud.php:126 ../../Zotlabs/Module/Group.php:83
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122
+#: ../../Code/Module/Profperm.php:28 ../../Code/Module/Subthread.php:86
+#: ../../Code/Module/Import_items.php:120
+#: ../../Code/Module/Cloud.php:126 ../../Code/Module/Group.php:83
+#: ../../Code/Module/Dreport.php:10 ../../Code/Module/Dreport.php:68
+#: ../../Code/Module/Like.php:296 ../../Code/Web/WebServer.php:122
 #: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73
 #: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109
 #: ../../include/items.php:364
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+#: ../../Code/Module/Profperm.php:34 ../../Code/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr "L'identificador de perfil no és vàlid."
 
-#: ../../Zotlabs/Module/Profperm.php:111
+#: ../../Code/Module/Profperm.php:111
 msgid "Profile Visibility Editor"
 msgstr "Editor de la visibilitat del perfil"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644
+#: ../../Code/Module/Profperm.php:113 ../../include/channel.php:1644
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Click on a contact to add or remove."
 msgstr "Clica sobre un contacte per afegir-lo o esborrar-lo."
 
-#: ../../Zotlabs/Module/Profperm.php:124
+#: ../../Code/Module/Profperm.php:124
 msgid "Visible To"
 msgstr "Visible per"
 
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:200
+#: ../../Code/Module/Profperm.php:140
+#: ../../Code/Module/Connections.php:200
 msgid "All Connections"
 msgstr "Totes les connexions"
 
-#: ../../Zotlabs/Module/Cdav.php:785
+#: ../../Code/Module/Cdav.php:785
 msgid "INVALID EVENT DISMISSED!"
 msgstr "S'HA DESCARTAT UN ESDEVENIMENT INVÀLID."
 
-#: ../../Zotlabs/Module/Cdav.php:786
+#: ../../Code/Module/Cdav.php:786
 msgid "Summary: "
 msgstr "Resum:"
 
-#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787
-#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278
-#: ../../Zotlabs/Lib/Apps.php:819 ../../Zotlabs/Lib/Apps.php:898
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:961
+#: ../../Code/Module/Cdav.php:786 ../../Code/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:794 ../../Code/Module/Embedphotos.php:146
+#: ../../Code/Module/Photos.php:822 ../../Code/Module/Photos.php:1278
+#: ../../Code/Lib/Apps.php:819 ../../Code/Lib/Apps.php:898
+#: ../../Code/Storage/Browser.php:164 ../../Code/Widget/Portfolio.php:95
+#: ../../Code/Widget/Album.php:84 ../../addon/pubcrawl/as.php:961
 #: ../../include/conversation.php:1165
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../../Zotlabs/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:787
 msgid "Date: "
 msgstr "Data:"
 
-#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795
+#: ../../Code/Module/Cdav.php:788 ../../Code/Module/Cdav.php:795
 msgid "Reason: "
 msgstr "Motiu:"
 
-#: ../../Zotlabs/Module/Cdav.php:793
+#: ../../Code/Module/Cdav.php:793
 msgid "INVALID CARD DISMISSED!"
 msgstr "S'HA DESCARTAT UNA TARGETA INVÀLIDA."
 
-#: ../../Zotlabs/Module/Cdav.php:794
+#: ../../Code/Module/Cdav.php:794
 msgid "Name: "
 msgstr "Nom:"
 
-#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Cdav.php:868 ../../Code/Module/Events.php:460
 msgid "Event title"
 msgstr "Títol de l'esdeveniment"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Events.php:466
 msgid "Start date and time"
 msgstr "Data i hora d'inici"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Cdav.php:870
 msgid "Example: YYYY-MM-DD HH:mm"
 msgstr "Exemple: AAAA-MM-DD HH:mm"
 
-#: ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:870
 msgid "End date and time"
 msgstr "Data i hora de fi"
 
-#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Code/Module/Cdav.php:871 ../../Code/Module/Events.php:473
+#: ../../Code/Module/Appman.php:143 ../../Code/Module/Rbmark.php:101
 #: ../../addon/rendezvous/rendezvous.php:173
 #: ../../addon/cart/submodules/hzservices.php:659
 msgid "Description"
 msgstr "Descripció"
 
-#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
-#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
+#: ../../Code/Module/Cdav.php:872 ../../Code/Module/Locs.php:117
+#: ../../Code/Module/Events.php:475 ../../Code/Module/Profiles.php:509
+#: ../../Code/Module/Profiles.php:734 ../../Code/Module/Pubsites.php:52
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689
-#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:976
+#: ../../Code/Module/Cdav.php:879 ../../Code/Module/Events.php:689
+#: ../../Code/Module/Events.php:698 ../../Code/Module/Cal.php:339
+#: ../../Code/Module/Cal.php:346 ../../Code/Module/Photos.php:976
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347
-#: ../../Zotlabs/Module/Photos.php:985
+#: ../../Code/Module/Cdav.php:880 ../../Code/Module/Events.php:690
+#: ../../Code/Module/Events.php:699 ../../Code/Module/Setup.php:263
+#: ../../Code/Module/Cal.php:340 ../../Code/Module/Cal.php:347
+#: ../../Code/Module/Photos.php:985
 msgid "Next"
 msgstr "Següent"
 
-#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700
-#: ../../Zotlabs/Module/Cal.php:348
+#: ../../Code/Module/Cdav.php:881 ../../Code/Module/Events.php:700
+#: ../../Code/Module/Cal.php:348
 msgid "Today"
 msgstr "Avui"
 
-#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695
+#: ../../Code/Module/Cdav.php:882 ../../Code/Module/Events.php:695
 msgid "Month"
 msgstr "mes"
 
-#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696
+#: ../../Code/Module/Cdav.php:883 ../../Code/Module/Events.php:696
 msgid "Week"
 msgstr "setmana"
 
-#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697
+#: ../../Code/Module/Cdav.php:884 ../../Code/Module/Events.php:697
 msgid "Day"
 msgstr "dia"
 
-#: ../../Zotlabs/Module/Cdav.php:885
+#: ../../Code/Module/Cdav.php:885
 msgid "List month"
 msgstr "Mes en llista"
 
-#: ../../Zotlabs/Module/Cdav.php:886
+#: ../../Code/Module/Cdav.php:886
 msgid "List week"
 msgstr "Setmana en llista"
 
-#: ../../Zotlabs/Module/Cdav.php:887
+#: ../../Code/Module/Cdav.php:887
 msgid "List day"
 msgstr "Dia en llista"
 
-#: ../../Zotlabs/Module/Cdav.php:894
+#: ../../Code/Module/Cdav.php:894
 msgid "More"
 msgstr "Mostra més"
 
-#: ../../Zotlabs/Module/Cdav.php:895
+#: ../../Code/Module/Cdav.php:895
 msgid "Less"
 msgstr "Mostra menys"
 
-#: ../../Zotlabs/Module/Cdav.php:896
+#: ../../Code/Module/Cdav.php:896
 msgid "Select calendar"
 msgstr "Tria un calendari"
 
-#: ../../Zotlabs/Module/Cdav.php:898
+#: ../../Code/Module/Cdav.php:898
 msgid "Delete all"
 msgstr "Esborra'ls tots"
 
-#: ../../Zotlabs/Module/Cdav.php:900
+#: ../../Code/Module/Cdav.php:900
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "Malauradament encara no es poden editar esdeveniments periòdics."
 
-#: ../../Zotlabs/Module/Cdav.php:1170
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906
-#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Module/Group.php:125
-#: ../../Zotlabs/Lib/NativeWikiPage.php:558
-#: ../../Zotlabs/Storage/Browser.php:285
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../Code/Module/Cdav.php:1170
+#: ../../Code/Module/Sharedwithme.php:105
+#: ../../Code/Module/Admin/Channels.php:159
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth.php:116
+#: ../../Code/Module/Wiki.php:209 ../../Code/Module/Connedit.php:906
+#: ../../Code/Module/Chat.php:251 ../../Code/Module/Group.php:125
+#: ../../Code/Lib/NativeWikiPage.php:558
+#: ../../Code/Storage/Browser.php:285
+#: ../../Code/Widget/Wiki_page_history.php:22
 #: ../../addon/rendezvous/rendezvous.php:172
 msgid "Name"
 msgstr "Nom"
 
-#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907
+#: ../../Code/Module/Cdav.php:1171 ../../Code/Module/Connedit.php:907
 msgid "Organisation"
 msgstr "Organització"
 
-#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Code/Module/Cdav.php:1172 ../../Code/Module/Connedit.php:908
 msgid "Title"
 msgstr "Títol"
 
-#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
-#: ../../Zotlabs/Module/Profiles.php:786
+#: ../../Code/Module/Cdav.php:1173 ../../Code/Module/Connedit.php:909
+#: ../../Code/Module/Profiles.php:786
 msgid "Phone"
 msgstr "Telèfon"
 
-#: ../../Zotlabs/Module/Cdav.php:1174
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Code/Module/Cdav.php:1174
+#: ../../Code/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:183
+#: ../../Code/Module/Connedit.php:910 ../../Code/Module/Profiles.php:787
 #: ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
 #: ../../addon/redred/redred.php:107 ../../include/network.php:1769
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
-#: ../../Zotlabs/Module/Profiles.php:788
+#: ../../Code/Module/Cdav.php:1175 ../../Code/Module/Connedit.php:911
+#: ../../Code/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr "Missatgeria instantània"
 
-#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
-#: ../../Zotlabs/Module/Profiles.php:789
+#: ../../Code/Module/Cdav.php:1176 ../../Code/Module/Connedit.php:912
+#: ../../Code/Module/Profiles.php:789
 msgid "Website"
 msgstr "Lloc web"
 
-#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Code/Module/Cdav.php:1177 ../../Code/Module/Locs.php:118
+#: ../../Code/Module/Admin/Channels.php:160
+#: ../../Code/Module/Connedit.php:913 ../../Code/Module/Profiles.php:502
+#: ../../Code/Module/Profiles.php:790
 msgid "Address"
 msgstr "Adreça"
 
-#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
-#: ../../Zotlabs/Module/Profiles.php:791
+#: ../../Code/Module/Cdav.php:1178 ../../Code/Module/Connedit.php:914
+#: ../../Code/Module/Profiles.php:791
 msgid "Note"
 msgstr "Nota"
 
-#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
-#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308
+#: ../../Code/Module/Cdav.php:1179 ../../Code/Module/Connedit.php:915
+#: ../../Code/Module/Profiles.php:792 ../../include/event.php:1308
 #: ../../include/connections.php:696
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309
+#: ../../Code/Module/Cdav.php:1180 ../../Code/Module/Connedit.php:916
+#: ../../Code/Module/Profiles.php:793 ../../include/event.php:1309
 #: ../../include/connections.php:697
 msgid "Home"
 msgstr "Inici"
 
-#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
-#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312
+#: ../../Code/Module/Cdav.php:1181 ../../Code/Module/Connedit.php:917
+#: ../../Code/Module/Profiles.php:794 ../../include/event.php:1312
 #: ../../include/connections.php:700
 msgid "Work"
 msgstr "Feina"
 
-#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
-#: ../../Zotlabs/Module/Profiles.php:796
+#: ../../Code/Module/Cdav.php:1183 ../../Code/Module/Connedit.php:919
+#: ../../Code/Module/Profiles.php:796
 #: ../../addon/jappixmini/jappixmini.php:368
 msgid "Add Contact"
 msgstr "Afegeix un contacte"
 
-#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Profiles.php:797
+#: ../../Code/Module/Cdav.php:1184 ../../Code/Module/Connedit.php:920
+#: ../../Code/Module/Profiles.php:797
 msgid "Add Field"
 msgstr "Afegeix un camp"
 
-#: ../../Zotlabs/Module/Cdav.php:1186
-#: ../../Zotlabs/Module/Admin/Addons.php:453
-#: ../../Zotlabs/Module/Settings/Oauth2.php:40
-#: ../../Zotlabs/Module/Settings/Oauth2.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:43
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Lib/Apps.php:456
+#: ../../Code/Module/Cdav.php:1186
+#: ../../Code/Module/Admin/Addons.php:453
+#: ../../Code/Module/Settings/Oauth2.php:40
+#: ../../Code/Module/Settings/Oauth2.php:113
+#: ../../Code/Module/Settings/Oauth.php:43
+#: ../../Code/Module/Settings/Oauth.php:114
+#: ../../Code/Module/Connedit.php:922 ../../Code/Module/Profiles.php:799
+#: ../../Code/Lib/Apps.php:456
 msgid "Update"
 msgstr "Actualitza"
 
-#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Code/Module/Cdav.php:1189 ../../Code/Module/Connedit.php:925
 msgid "P.O. Box"
 msgstr "Apartat de correus"
 
-#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Code/Module/Cdav.php:1190 ../../Code/Module/Connedit.php:926
 msgid "Additional"
 msgstr "Addicional"
 
-#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Code/Module/Cdav.php:1191 ../../Code/Module/Connedit.php:927
 msgid "Street"
 msgstr "Carrer"
 
-#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Code/Module/Cdav.php:1192 ../../Code/Module/Connedit.php:928
 msgid "Locality"
 msgstr "Localitat"
 
-#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Code/Module/Cdav.php:1193 ../../Code/Module/Connedit.php:929
 msgid "Region"
 msgstr "Regió"
 
-#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Code/Module/Cdav.php:1194 ../../Code/Module/Connedit.php:930
 msgid "ZIP Code"
 msgstr "Codi postal"
 
-#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Code/Module/Cdav.php:1195 ../../Code/Module/Connedit.php:931
+#: ../../Code/Module/Profiles.php:757
 msgid "Country"
 msgstr "País"
 
-#: ../../Zotlabs/Module/Cdav.php:1242
+#: ../../Code/Module/Cdav.php:1242
 msgid "Default Calendar"
 msgstr "Calendari per defecte"
 
-#: ../../Zotlabs/Module/Cdav.php:1252
+#: ../../Code/Module/Cdav.php:1252
 msgid "Default Addressbook"
 msgstr "Llibreta d'adreces per defecte"
 
-#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
+#: ../../Code/Module/Regdir.php:49 ../../Code/Module/Dirsearch.php:25
 msgid "This site is not a directory server"
 msgstr "Aquest hub no és un servidor de directori"
 
-#: ../../Zotlabs/Module/Channel.php:35 ../../Zotlabs/Module/Ochannel.php:32
-#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508
+#: ../../Code/Module/Channel.php:35 ../../Code/Module/Ochannel.php:32
+#: ../../Code/Module/Chat.php:25 ../../addon/chess/chess.php:508
 msgid "You must be logged in to see this page."
 msgstr "Has de tenir una sessió iniciada per a veure aquesta pàgina."
 
-#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37
-#: ../../Zotlabs/Module/Profile.php:45
+#: ../../Code/Module/Channel.php:50 ../../Code/Module/Hcard.php:37
+#: ../../Code/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr "Entrades i comentaris"
 
-#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44
-#: ../../Zotlabs/Module/Profile.php:52
+#: ../../Code/Module/Channel.php:57 ../../Code/Module/Hcard.php:44
+#: ../../Code/Module/Profile.php:52
 msgid "Only posts"
 msgstr "Només entrades"
 
-#: ../../Zotlabs/Module/Channel.php:112
+#: ../../Code/Module/Channel.php:112
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "S'ha denegat el permís. La petició s'ha redirigit a la pàgina de perfil."
 
-#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174
+#: ../../Code/Module/Channel.php:129 ../../Code/Module/Network.php:174
 msgid "Search Results For:"
 msgstr "Cerca resultats per:"
 
-#: ../../Zotlabs/Module/Channel.php:164 ../../Zotlabs/Module/Hq.php:134
-#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Display.php:81
-#: ../../Zotlabs/Module/Network.php:204
+#: ../../Code/Module/Channel.php:164 ../../Code/Module/Hq.php:134
+#: ../../Code/Module/Pubstream.php:80 ../../Code/Module/Display.php:81
+#: ../../Code/Module/Network.php:204
 msgid "Reset form"
 msgstr "Esborra el formulari"
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+#: ../../Code/Module/Uexport.php:57 ../../Code/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Exporta un canal"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Code/Module/Uexport.php:59
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr "Exporta la informació bàsica del canal a un arxiu. Això serveix com a còpia de seguretat de les teves connexions, permisos, perfil i dades bàsiques, i pots emprar-la per a importar aquestes dades des d'un altre hub. No conté el contingut del canal."
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Code/Module/Uexport.php:60
 msgid "Export Content"
 msgstr "Exporta'n el contingut"
 
-#: ../../Zotlabs/Module/Uexport.php:61
+#: ../../Code/Module/Uexport.php:61
 msgid ""
 "Export your channel information and recent content to a JSON backup that can"
 " be restored or imported to another server hub. This backs up all of your "
@@ -902,11 +902,11 @@ msgid ""
 " this download to begin."
 msgstr "Exporta la informació del canal i tot el contingut recent a una còpia de seguretat en format JSON. Pot ser restaurada o importada des d'un altre hub. Això desa totes les teves connexions, permisos, dades de perfil i diversos mesos de publicacions. L'arxiu pot ser MOLT gran. Si et plau, sigues pacient ja que la preparació de l'arxiu pot trigar una estona, abans que el puguis començar a baixar."
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Code/Module/Uexport.php:63
 msgid "Export your posts from a given year."
 msgstr "Exporta les entrades d'un any determinat."
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Code/Module/Uexport.php:65
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -914,21 +914,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr "Pots també exportar les entrades i converses d'un any o un mes en particular. Ajusta la data a la barra d'adreces del navegador per seleccionar altres dates. Si l'exportació falla (possiblement degut a l'esgotament de la memòria RAM del servidor), prova de nou amb un interval de dates més petit."
 
-#: ../../Zotlabs/Module/Uexport.php:66
+#: ../../Code/Module/Uexport.php:66
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr "Per exemple, per seleccionar totes les entrades d'aquest any, ves a %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:67
+#: ../../Code/Module/Uexport.php:67
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr "Per exemple, per seleccionar totes les entrades del mes de gener d'aquest any, ves a %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:68
+#: ../../Code/Module/Uexport.php:68
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting %2$s. En aquest cas és aquest servidor, però també serviria en un altre hub que allotgés un clon del teu canal. Si vols restaurar més d'un arxiu de contingut, per evitar problemes importa'ls en ordre cronològic."
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "Welcome to Hubzilla!"
 msgstr "Benvingut/da a Hubzilla!"
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "You have got no unseen posts..."
 msgstr "No tens entrades pendents de veure..."
 
-#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:545
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
-#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30
-#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Code/Module/Search.php:17 ../../Code/Module/Photos.php:545
+#: ../../Code/Module/Ratings.php:83 ../../Code/Module/Directory.php:63
+#: ../../Code/Module/Directory.php:68 ../../Code/Module/Display.php:30
+#: ../../Code/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "L'accés públic no està permès."
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335
-#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../Zotlabs/Widget/Activity_filter.php:148 ../../include/text.php:1062
+#: ../../Code/Module/Search.php:44 ../../Code/Module/Connections.php:335
+#: ../../Code/Lib/Apps.php:318 ../../Code/Widget/Sitesearch.php:31
+#: ../../Code/Widget/Activity_filter.php:148 ../../include/text.php:1062
 #: ../../include/text.php:1074 ../../include/acl_selectors.php:118
 #: ../../include/nav.php:185
 msgid "Search"
 msgstr "Cerca"
 
-#: ../../Zotlabs/Module/Search.php:230
+#: ../../Code/Module/Search.php:230
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Elements etiquetats amb: %s"
 
-#: ../../Zotlabs/Module/Search.php:232
+#: ../../Code/Module/Search.php:232
 #, php-format
 msgid "Search results for: %s"
 msgstr "Resultats de cerca per: %s"
 
-#: ../../Zotlabs/Module/Pubstream.php:95
-#: ../../Zotlabs/Widget/Notifications.php:142
+#: ../../Code/Module/Pubstream.php:95
+#: ../../Code/Widget/Notifications.php:142
 msgid "Public Stream"
 msgstr "Flux públic"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+#: ../../Code/Module/Locs.php:25 ../../Code/Module/Locs.php:54
 msgid "Location not found."
 msgstr "No s'ha trobat la ubicació."
 
-#: ../../Zotlabs/Module/Locs.php:62
+#: ../../Code/Module/Locs.php:62
 msgid "Location lookup failed."
 msgstr "Ha fallat la cerca d'ubicació."
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Code/Module/Locs.php:66
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
 msgstr "Abans d'esborrar la ubicació principal actual, fes-ne principal una altra."
 
-#: ../../Zotlabs/Module/Locs.php:95
+#: ../../Code/Module/Locs.php:95
 msgid "Syncing locations"
 msgstr "S'estan sincronitzant les ubicacions"
 
-#: ../../Zotlabs/Module/Locs.php:105
+#: ../../Code/Module/Locs.php:105
 msgid "No locations found."
 msgstr "No s'ha trobat cap ubicació."
 
-#: ../../Zotlabs/Module/Locs.php:116
+#: ../../Code/Module/Locs.php:116
 msgid "Manage Channel Locations"
 msgstr "Gestiona les ubicacions del canal"
 
-#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:115
+#: ../../Code/Module/Locs.php:119 ../../Code/Module/Admin.php:115
 msgid "Primary"
 msgstr "Primària"
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:176
+#: ../../Code/Module/Locs.php:120 ../../Code/Module/Menu.php:176
 msgid "Drop"
 msgstr "Esborra"
 
-#: ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Locs.php:122
 msgid "Sync Now"
 msgstr "Sincronitza ara"
 
-#: ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Espera uns minuts entre operacions consecutives."
 
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Code/Module/Locs.php:124
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
 msgstr "Si pots, és preferible esborrar la ubicació esborrant el canal des del servidor on està copiat."
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Fes servir aquest formulari per a esborrar la ubicació del lloc si el hub ja no està operatiu."
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Canvia l'ordre de les aplicacions fixades a la barra de navegació"
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of App Tray Apps"
 msgstr "Canvia l'ordre de les aplicacions de la safata d'aplicacions"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the"
 " navbar"
 msgstr "Fes servir les fletxes per moure l'aplicació cap a l'esquerra (amunt) o cap a la dreta (avall)"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr "Fes servir les fletxes per moure l'aplicació amunt o avall en la safata"
 
-#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:208
+#: ../../Code/Module/Mitem.php:31 ../../Code/Module/Menu.php:208
 msgid "Menu not found."
 msgstr "No s'ha trobat el menú."
 
-#: ../../Zotlabs/Module/Mitem.php:63
+#: ../../Code/Module/Mitem.php:63
 msgid "Unable to create element."
 msgstr "Incapaç de crear l'element."
 
-#: ../../Zotlabs/Module/Mitem.php:87
+#: ../../Code/Module/Mitem.php:87
 msgid "Unable to update menu element."
 msgstr "Incapaç d'actualitzar un element del menú."
 
-#: ../../Zotlabs/Module/Mitem.php:103
+#: ../../Code/Module/Mitem.php:103
 msgid "Unable to add menu element."
 msgstr "No s'ha pogut afegir l'element de menú."
 
-#: ../../Zotlabs/Module/Mitem.php:134 ../../Zotlabs/Module/Menu.php:231
-#: ../../Zotlabs/Module/Xchan.php:41
+#: ../../Code/Module/Mitem.php:134 ../../Code/Module/Menu.php:231
+#: ../../Code/Module/Xchan.php:41
 msgid "Not found."
 msgstr "No s'ha trobat."
 
-#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
+#: ../../Code/Module/Mitem.php:167 ../../Code/Module/Mitem.php:246
 msgid "Menu Item Permissions"
 msgstr "Permisos dels ítems de menú"
 
-#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Code/Module/Mitem.php:168 ../../Code/Module/Mitem.php:247
+#: ../../Code/Module/Settings/Channel.php:549
 msgid "(click to open/close)"
 msgstr "(clica per obrir/tancar)"
 
-#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
+#: ../../Code/Module/Mitem.php:174 ../../Code/Module/Mitem.php:191
 msgid "Link Name"
 msgstr "Nom de l'enllaç"
 
-#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
+#: ../../Code/Module/Mitem.php:175 ../../Code/Module/Mitem.php:255
 msgid "Link or Submenu Target"
 msgstr "Destí de l'enllaç o del submenú"
 
-#: ../../Zotlabs/Module/Mitem.php:175
+#: ../../Code/Module/Mitem.php:175
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr "Introdueix la URL de l'enllaç o tria un nom de menú per crear un submenú"
 
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
+#: ../../Code/Module/Mitem.php:176 ../../Code/Module/Mitem.php:256
 msgid "Use magic-auth if available"
 msgstr "Empra la magic-auth si està disponible"
 
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
-#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:266
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558
-#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218
-#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396
-#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Menu.php:162
-#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:180
-#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:116
-#: ../../Zotlabs/Module/Sources.php:151
-#: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618
+#: ../../Code/Module/Mitem.php:176 ../../Code/Module/Mitem.php:177
+#: ../../Code/Module/Mitem.php:256 ../../Code/Module/Mitem.php:257
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:266
+#: ../../Code/Module/Settings/Channel.php:315
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Import.php:554 ../../Code/Module/Import.php:558
+#: ../../Code/Module/Import.php:559 ../../Code/Module/Api.php:99
+#: ../../Code/Module/Photos.php:702 ../../Code/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:219 ../../Code/Module/Connedit.php:396
+#: ../../Code/Module/Connedit.php:779 ../../Code/Module/Menu.php:162
+#: ../../Code/Module/Menu.php:221 ../../Code/Module/Defperms.php:180
+#: ../../Code/Module/Profiles.php:681 ../../Code/Module/Sources.php:116
+#: ../../Code/Module/Sources.php:151
+#: ../../Code/Module/Filestorage.php:178
+#: ../../Code/Module/Filestorage.php:186
+#: ../../Code/Storage/Browser.php:405 ../../boot.php:1618
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1151,23 +1151,23 @@ msgstr "Empra la magic-auth si està disponible"
 msgid "No"
 msgstr "No"
 
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
-#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:268
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558
-#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218
-#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396
-#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221
-#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
-#: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618
+#: ../../Code/Module/Mitem.php:176 ../../Code/Module/Mitem.php:177
+#: ../../Code/Module/Mitem.php:256 ../../Code/Module/Mitem.php:257
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:268
+#: ../../Code/Module/Settings/Channel.php:315
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Import.php:554 ../../Code/Module/Import.php:558
+#: ../../Code/Module/Import.php:559 ../../Code/Module/Api.php:98
+#: ../../Code/Module/Photos.php:702 ../../Code/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:219 ../../Code/Module/Connedit.php:396
+#: ../../Code/Module/Menu.php:162 ../../Code/Module/Menu.php:221
+#: ../../Code/Module/Defperms.php:180 ../../Code/Module/Profiles.php:681
+#: ../../Code/Module/Sources.php:116 ../../Code/Module/Sources.php:151
+#: ../../Code/Module/Filestorage.php:178
+#: ../../Code/Module/Filestorage.php:186
+#: ../../Code/Storage/Browser.php:405 ../../boot.php:1618
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1211,921 +1211,921 @@ msgstr "No"
 msgid "Yes"
 msgstr "Sí"
 
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
+#: ../../Code/Module/Mitem.php:177 ../../Code/Module/Mitem.php:257
 msgid "Open link in new window"
 msgstr "Obre l'enllaç en una nova finestra"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+#: ../../Code/Module/Mitem.php:178 ../../Code/Module/Mitem.php:258
 msgid "Order in list"
 msgstr "Ordre de la llista"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+#: ../../Code/Module/Mitem.php:178 ../../Code/Module/Mitem.php:258
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Els números més alts al final de la llista"
 
-#: ../../Zotlabs/Module/Mitem.php:179
+#: ../../Code/Module/Mitem.php:179
 msgid "Submit and finish"
 msgstr "Envia i acaba"
 
-#: ../../Zotlabs/Module/Mitem.php:180
+#: ../../Code/Module/Mitem.php:180
 msgid "Submit and continue"
 msgstr "Envia i continua"
 
-#: ../../Zotlabs/Module/Mitem.php:189
+#: ../../Code/Module/Mitem.php:189
 msgid "Menu:"
 msgstr "Menú:"
 
-#: ../../Zotlabs/Module/Mitem.php:192
+#: ../../Code/Module/Mitem.php:192
 msgid "Link Target"
 msgstr "Destí de l'enllaç"
 
-#: ../../Zotlabs/Module/Mitem.php:195
+#: ../../Code/Module/Mitem.php:195
 msgid "Edit menu"
 msgstr "Edita el menú"
 
-#: ../../Zotlabs/Module/Mitem.php:198
+#: ../../Code/Module/Mitem.php:198
 msgid "Edit element"
 msgstr "Edita l'element"
 
-#: ../../Zotlabs/Module/Mitem.php:199
+#: ../../Code/Module/Mitem.php:199
 msgid "Drop element"
 msgstr "Esborra l'element"
 
-#: ../../Zotlabs/Module/Mitem.php:200
+#: ../../Code/Module/Mitem.php:200
 msgid "New element"
 msgstr "Element nou"
 
-#: ../../Zotlabs/Module/Mitem.php:201
+#: ../../Code/Module/Mitem.php:201
 msgid "Edit this menu container"
 msgstr "Edita el contenidor de menú"
 
-#: ../../Zotlabs/Module/Mitem.php:202
+#: ../../Code/Module/Mitem.php:202
 msgid "Add menu element"
 msgstr "Afegeix un element de menú"
 
-#: ../../Zotlabs/Module/Mitem.php:203
+#: ../../Code/Module/Mitem.php:203
 msgid "Delete this menu item"
 msgstr "Esborra aquest article del menú"
 
-#: ../../Zotlabs/Module/Mitem.php:204
+#: ../../Code/Module/Mitem.php:204
 msgid "Edit this menu item"
 msgstr "Edita aquest article del menú"
 
-#: ../../Zotlabs/Module/Mitem.php:222
+#: ../../Code/Module/Mitem.php:222
 msgid "Menu item not found."
 msgstr "No s'ha trobat l'element de menú."
 
-#: ../../Zotlabs/Module/Mitem.php:235
+#: ../../Code/Module/Mitem.php:235
 msgid "Menu item deleted."
 msgstr "S'ha esborrat l'element de menú."
 
-#: ../../Zotlabs/Module/Mitem.php:237
+#: ../../Code/Module/Mitem.php:237
 msgid "Menu item could not be deleted."
 msgstr "No s'ha pogut esborrar l'element de menú."
 
-#: ../../Zotlabs/Module/Mitem.php:244
+#: ../../Code/Module/Mitem.php:244
 msgid "Edit Menu Element"
 msgstr "Editar elements del menú"
 
-#: ../../Zotlabs/Module/Mitem.php:254
+#: ../../Code/Module/Mitem.php:254
 msgid "Link text"
 msgstr "Text de l'enllaç"
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Code/Module/Events.php:25
 msgid "Calendar entries imported."
 msgstr "S'han importat les entrades de calendari."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Code/Module/Events.php:27
 msgid "No calendar entries found."
 msgstr "No s'ha trobat cap entrada de calendari."
 
-#: ../../Zotlabs/Module/Events.php:110
+#: ../../Code/Module/Events.php:110
 msgid "Event can not end before it has started."
 msgstr "L'esdeveniment no pot acabar abans de començar."
 
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
+#: ../../Code/Module/Events.php:112 ../../Code/Module/Events.php:121
+#: ../../Code/Module/Events.php:143
 msgid "Unable to generate preview."
 msgstr "No s'ha pogut generar la vista prèvia."
 
-#: ../../Zotlabs/Module/Events.php:119
+#: ../../Code/Module/Events.php:119
 msgid "Event title and start time are required."
 msgstr "Cal indicar l'inici i el final de l'esdeveniment."
 
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+#: ../../Code/Module/Events.php:141 ../../Code/Module/Events.php:265
 msgid "Event not found."
 msgstr "No s'ha trobat l'esdeveniment."
 
-#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
-#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119
+#: ../../Code/Module/Events.php:260 ../../Code/Module/Tagger.php:73
+#: ../../Code/Module/Like.php:386 ../../include/conversation.php:119
 #: ../../include/text.php:2025 ../../include/event.php:1153
 msgid "event"
 msgstr "esdeveniment"
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Edita el títol de l'esdeveniment"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142
-#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:465
+#: ../../Code/Module/Appman.php:141 ../../Code/Module/Appman.php:142
+#: ../../Code/Module/Profiles.php:745 ../../Code/Module/Profiles.php:749
 #: ../../include/datetime.php:211
 msgid "Required"
 msgstr "Obligatori"
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Code/Module/Events.php:462
 msgid "Categories (comma-separated list)"
 msgstr "Categories (llista separada per comes)"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Edit Category"
 msgstr "Edita la categoria"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Category"
 msgstr "Categoria"
 
-#: ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Events.php:466
 msgid "Edit start date and time"
 msgstr "Edita la data i hora d'inici"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+#: ../../Code/Module/Events.php:467 ../../Code/Module/Events.php:470
 msgid "Finish date and time are not known or not relevant"
 msgstr "L'hora d'acabar és desconeguda o irrellevant"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Edit finish date and time"
 msgstr "Edita la data i hora de finalització"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Finish date and time"
 msgstr "Data i hora de finalització"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+#: ../../Code/Module/Events.php:471 ../../Code/Module/Events.php:472
 msgid "Adjust for viewer timezone"
 msgstr "Ajusta a la zona horària de l'usuari/a"
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Code/Module/Events.php:471
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "És important per esdeveniments locals, però pels globals no és pràctic."
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../Code/Module/Events.php:473
 msgid "Edit Description"
 msgstr "Edita la descripció"
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Code/Module/Events.php:475
 msgid "Edit Location"
 msgstr "Edita la ubicació"
 
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1128
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:767
+#: ../../Code/Module/Events.php:478 ../../Code/Module/Photos.php:1128
+#: ../../Code/Module/Webpages.php:247 ../../Code/Lib/ThreadItem.php:767
 #: ../../include/conversation.php:1341
 msgid "Preview"
 msgstr "Vista prèvia"
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1413
+#: ../../Code/Module/Events.php:479 ../../include/conversation.php:1413
 msgid "Permission settings"
 msgstr "Configuració de permisos"
 
-#: ../../Zotlabs/Module/Events.php:489
+#: ../../Code/Module/Events.php:489
 msgid "Timezone:"
 msgstr "Zona horària:"
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Code/Module/Events.php:494
 msgid "Advanced Options"
 msgstr "Opcions avançades"
 
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266
+#: ../../Code/Module/Events.php:605 ../../Code/Module/Cal.php:266
 msgid "l, F j"
 msgstr "l, j \\d\\e F"
 
-#: ../../Zotlabs/Module/Events.php:633
+#: ../../Code/Module/Events.php:633
 msgid "Edit event"
 msgstr "Edita l'esdeveniment"
 
-#: ../../Zotlabs/Module/Events.php:635
+#: ../../Code/Module/Events.php:635
 msgid "Delete event"
 msgstr "Esborra l'esdeveniment"
 
-#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315
+#: ../../Code/Module/Events.php:660 ../../Code/Module/Cal.php:315
 #: ../../include/text.php:1844
 msgid "Link to Source"
 msgstr "Enllaç a la font"
 
-#: ../../Zotlabs/Module/Events.php:669
+#: ../../Code/Module/Events.php:669
 msgid "calendar"
 msgstr "calendari"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Edit Event"
 msgstr "Edita l'esdeveniment"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Create Event"
 msgstr "Crear un esdeveniment nou"
 
-#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341
+#: ../../Code/Module/Events.php:691 ../../Code/Module/Cal.php:341
 #: ../../include/channel.php:1647
 msgid "Export"
 msgstr "Exporta"
 
-#: ../../Zotlabs/Module/Events.php:731
+#: ../../Code/Module/Events.php:731
 msgid "Event removed"
 msgstr "S'ha eliminat l'esdeveniment"
 
-#: ../../Zotlabs/Module/Events.php:734
+#: ../../Code/Module/Events.php:734
 msgid "Failed to remove event"
 msgstr "No s'ha pogut esborrar l'esdeveniment"
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+#: ../../Code/Module/Appman.php:39 ../../Code/Module/Appman.php:56
 msgid "App installed."
 msgstr "S'ha instaŀlat l'aplicació."
 
-#: ../../Zotlabs/Module/Appman.php:49
+#: ../../Code/Module/Appman.php:49
 msgid "Malformed app."
 msgstr "L'aplicació conté errors."
 
-#: ../../Zotlabs/Module/Appman.php:130
+#: ../../Code/Module/Appman.php:130
 msgid "Embed code"
 msgstr "Codi embegut"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Edit App"
 msgstr "Edita una aplicació"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Create App"
 msgstr "Crea una aplicació"
 
-#: ../../Zotlabs/Module/Appman.php:141
+#: ../../Code/Module/Appman.php:141
 msgid "Name of app"
 msgstr "Nom de l'aplicació"
 
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Code/Module/Appman.php:142
 msgid "Location (URL) of app"
 msgstr "Adreça URL de l'aplicació"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "Photo icon URL"
 msgstr "Adreça URL de la icona de l'aplicació"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "80 x 80 pixels - optional"
 msgstr "80x80 píxels (opcional)"
 
-#: ../../Zotlabs/Module/Appman.php:145
+#: ../../Code/Module/Appman.php:145
 msgid "Categories (optional, comma separated list)"
 msgstr "Categories (opcional, llista separada per comes)"
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Code/Module/Appman.php:146
 msgid "Version ID"
 msgstr "Identificador o número de versió"
 
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Code/Module/Appman.php:147
 msgid "Price of app"
 msgstr "Preu de l'aplicació"
 
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Code/Module/Appman.php:148
 msgid "Location (URL) to purchase app"
 msgstr "Adreça URL de compra de l'aplicació"
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Inicia sessió."
 
-#: ../../Zotlabs/Module/Magic.php:76
+#: ../../Code/Module/Magic.php:76
 msgid "Hub not found."
 msgstr "No s'ha trobat el hub."
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Tagger.php:69
+#: ../../Code/Module/Like.php:384
 #: ../../addon/redphotos/redphotohelper.php:71
 #: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509
 #: ../../include/conversation.php:116 ../../include/text.php:2022
 msgid "photo"
 msgstr "foto"
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Like.php:384
 #: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509
 #: ../../include/conversation.php:144 ../../include/text.php:2028
 msgid "status"
 msgstr "estat"
 
-#: ../../Zotlabs/Module/Subthread.php:142
+#: ../../Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s segueix %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Subthread.php:144
+#: ../../Code/Module/Subthread.php:144
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s ha deixat de seguir %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75
-#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41
-#: ../../Zotlabs/Module/Card_edit.php:44
+#: ../../Code/Module/Article_edit.php:44 ../../Code/Module/Cal.php:62
+#: ../../Code/Module/Chanview.php:96 ../../Code/Module/Page.php:75
+#: ../../Code/Module/Wall_upload.php:31 ../../Code/Module/Block.php:41
+#: ../../Code/Module/Card_edit.php:44
 msgid "Channel not found."
 msgstr "No s'ha trobat el canal."
 
-#: ../../Zotlabs/Module/Article_edit.php:101
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
-#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Code/Module/Article_edit.php:101
+#: ../../Code/Module/Editblock.php:116 ../../Code/Module/Chat.php:207
+#: ../../Code/Module/Editwebpage.php:143 ../../Code/Module/Mail.php:288
+#: ../../Code/Module/Mail.php:430 ../../Code/Module/Card_edit.php:101
 #: ../../include/conversation.php:1283
 msgid "Insert web link"
 msgstr "Insereix un enllaç web"
 
-#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:703
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117
+#: ../../Code/Module/Article_edit.php:117
+#: ../../Code/Module/Editblock.php:129 ../../Code/Module/Photos.php:703
+#: ../../Code/Module/Photos.php:1073 ../../Code/Module/Card_edit.php:117
 #: ../../include/conversation.php:1409
 msgid "Title (optional)"
 msgstr "Títol (opcional)"
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Code/Module/Article_edit.php:128
 msgid "Edit Article"
 msgstr "Edita l'article"
 
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:66
+#: ../../Code/Module/Import_items.php:48 ../../Code/Module/Import.php:66
 msgid "Nothing to import."
 msgstr "No s'ha trobat res per importar."
 
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:81
-#: ../../Zotlabs/Module/Import.php:97
+#: ../../Code/Module/Import_items.php:72 ../../Code/Module/Import.php:81
+#: ../../Code/Module/Import.php:97
 msgid "Unable to download data from old server"
 msgstr "No s'han pogut descarregar les dades del servidor antic"
 
-#: ../../Zotlabs/Module/Import_items.php:77
-#: ../../Zotlabs/Module/Import.php:104
+#: ../../Code/Module/Import_items.php:77
+#: ../../Code/Module/Import.php:104
 msgid "Imported file is empty."
 msgstr "El fitxer importat està buit."
 
-#: ../../Zotlabs/Module/Import_items.php:93
+#: ../../Code/Module/Import_items.php:93
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Atenció: Les versions de les bases de dades difereixen de %1$d actualitzacions."
 
-#: ../../Zotlabs/Module/Import_items.php:108
+#: ../../Code/Module/Import_items.php:108
 msgid "Import completed"
 msgstr "S'ha completat la importació"
 
-#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Code/Module/Import_items.php:125
 msgid "Import Items"
 msgstr "Importa articles"
 
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Code/Module/Import_items.php:126
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació."
 
-#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:548
+#: ../../Code/Module/Import_items.php:127
+#: ../../Code/Module/Import.php:548
 msgid "File to Upload"
 msgstr "Fitxer per pujar"
 
-#: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Manage.php:138
+#: ../../Code/Module/New_channel.php:147
+#: ../../Code/Module/Manage.php:138
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Has creat %1$.0f canals dels %2$.0f totals permesos."
 
-#: ../../Zotlabs/Module/New_channel.php:154
-#: ../../Zotlabs/Module/New_channel.php:161
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
-#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:276
+#: ../../Code/Module/New_channel.php:154
+#: ../../Code/Module/New_channel.php:161
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
+#: ../../Code/Widget/Notifications.php:162 ../../include/nav.php:276
 msgid "Loading"
 msgstr "S'està carregant"
 
-#: ../../Zotlabs/Module/New_channel.php:156
+#: ../../Code/Module/New_channel.php:156
 msgid "Your real name is recommended."
 msgstr "És recomanable fer servir el nom real."
 
-#: ../../Zotlabs/Module/New_channel.php:157
+#: ../../Code/Module/New_channel.php:157
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
 msgstr "Exemples: \"Paula Gomila\", \"Manel i els seus cavalls\", \"Assemblea de veïnes del barri\", \"Filosofia\""
 
-#: ../../Zotlabs/Module/New_channel.php:162
+#: ../../Code/Module/New_channel.php:162
 msgid ""
 "This will be used to create a unique network address (like an email "
 "address)."
 msgstr "Es farà servir per crear una adreça de xarxa única, com la de email."
 
-#: ../../Zotlabs/Module/New_channel.php:164
+#: ../../Code/Module/New_channel.php:164
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr "Els caràcters permesos són lletres minúscules sense accents, números i guions: a-z, 0-9, -, _"
 
-#: ../../Zotlabs/Module/New_channel.php:174
+#: ../../Code/Module/New_channel.php:174
 msgid "Channel name"
 msgstr "Nom del canal"
 
-#: ../../Zotlabs/Module/New_channel.php:176
-#: ../../Zotlabs/Module/Register.php:265
+#: ../../Code/Module/New_channel.php:176
+#: ../../Code/Module/Register.php:265
 msgid "Choose a short nickname"
 msgstr "Tria un àlies curt"
 
-#: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Settings/Channel.php:560
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Code/Module/New_channel.php:177
+#: ../../Code/Module/Settings/Channel.php:560
+#: ../../Code/Module/Register.php:266
 msgid "Channel role and privacy"
 msgstr "Rol i privacitat del canal"
 
-#: ../../Zotlabs/Module/New_channel.php:177
+#: ../../Code/Module/New_channel.php:177
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
 msgstr "Escull un rol de permisos de canal. Tingues en compte l'ús que en faràs i el nivell de privacitat que desitges."
 
-#: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Code/Module/New_channel.php:177
+#: ../../Code/Module/Register.php:266
 msgid "Read more about channel permission roles"
 msgstr "Llegeix més sobre els rols de permisos en els canals"
 
-#: ../../Zotlabs/Module/New_channel.php:180
+#: ../../Code/Module/New_channel.php:180
 msgid "Create a Channel"
 msgstr "Crea un canal"
 
-#: ../../Zotlabs/Module/New_channel.php:181
+#: ../../Code/Module/New_channel.php:181
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed,"
 " and many other things."
 msgstr "Un canal és una identitat de xarxa única. Tant pot representar una persona (el seu perfil social), com un fòrum (un grup), una associació o la pàgina d'algun personatge públic, un flux de notícies, i moltes més coses."
 
-#: ../../Zotlabs/Module/New_channel.php:182
+#: ../../Code/Module/New_channel.php:182
 msgid ""
 "or import an existing channel from another location."
 msgstr "o bé importa un canal existent des d'una altra ubicació."
 
-#: ../../Zotlabs/Module/New_channel.php:187
+#: ../../Code/Module/New_channel.php:187
 msgid "Validate"
 msgstr "Valida-ho"
 
-#: ../../Zotlabs/Module/Removeme.php:35
+#: ../../Code/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "No es permet esborrar un canal fins a 48 hores més tard d'haver canviant la contrasenya del compte al qual pertany."
 
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Code/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Esborra aquest canal"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
+#: ../../Code/Module/Changeaddr.php:78
 msgid "WARNING: "
 msgstr "ALERTA:"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Aquest canal serà esborrat de la xarxa completament."
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
 msgid "This action is permanent and can not be undone!"
 msgstr "Aquesta acció és irreversible!"
 
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Changeaddr.php:79
+#: ../../Code/Module/Removeme.php:62
+#: ../../Code/Module/Removeaccount.php:59
+#: ../../Code/Module/Changeaddr.php:79
 msgid "Please enter your password for verification:"
 msgstr "Per seguretat, torna a introduir la contrasenya per a confirmar aquesta acció:"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Elimina aquest canal i els seus clons de la xarxa"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Per defecte, només es pot esborrar la instància del canal ubicada en aquest hub."
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:622
+#: ../../Code/Module/Removeme.php:64
+#: ../../Code/Module/Settings/Channel.php:622
 msgid "Remove Channel"
 msgstr "Elimina el canal"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Code/Module/Sharedwithme.php:104
 msgid "Files: shared with me"
 msgstr "Arxius: compartits amb mi"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Code/Module/Sharedwithme.php:106
 msgid "NEW"
 msgstr "NOU"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1451
+#: ../../Code/Module/Sharedwithme.php:107
+#: ../../Code/Storage/Browser.php:287 ../../include/text.php:1451
 msgid "Size"
 msgstr "Mida"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:288
+#: ../../Code/Module/Sharedwithme.php:108
+#: ../../Code/Storage/Browser.php:288
 msgid "Last Modified"
 msgstr "Última modificació"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Code/Module/Sharedwithme.php:109
 msgid "Remove all files"
 msgstr "Esborra tots els arxius"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
+#: ../../Code/Module/Sharedwithme.php:110
 msgid "Remove this file"
 msgstr "Esborra l'arxiu"
 
-#: ../../Zotlabs/Module/Setup.php:170
+#: ../../Code/Module/Setup.php:170
 msgid "$Projectname Server - Setup"
 msgstr "Servidor de $Projectname - Instaŀlació"
 
-#: ../../Zotlabs/Module/Setup.php:174
+#: ../../Code/Module/Setup.php:174
 msgid "Could not connect to database."
 msgstr "No s'ha pogut establir una connexió amb la base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:178
+#: ../../Code/Module/Setup.php:178
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "No s'ha pogut connectar amb la URL del lloc especificat. Comprova si hi ha un problema amb el certificat TLS o amb el registre DNS."
 
-#: ../../Zotlabs/Module/Setup.php:185
+#: ../../Code/Module/Setup.php:185
 msgid "Could not create table."
 msgstr "No s'ha pogut crear la taula."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Code/Module/Setup.php:191
 msgid "Your site database has been installed."
 msgstr "S'ha instaŀlat la base de dades del teu node."
 
-#: ../../Zotlabs/Module/Setup.php:197
+#: ../../Code/Module/Setup.php:197
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Podria ser necessari importar el fitxer \"install / schema_xxx.sql\" manualment utilitzant un client de base de dades."
 
-#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:749
+#: ../../Code/Module/Setup.php:198 ../../Code/Module/Setup.php:262
+#: ../../Code/Module/Setup.php:749
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Consulta el fitxer \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:259
+#: ../../Code/Module/Setup.php:259
 msgid "System check"
 msgstr "Comprovació del sistema"
 
-#: ../../Zotlabs/Module/Setup.php:264
+#: ../../Code/Module/Setup.php:264
 msgid "Check again"
 msgstr "Comprova de nou"
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Code/Module/Setup.php:286
 msgid "Database connection"
 msgstr "Connexió amb la base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Code/Module/Setup.php:287
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Per tal d'instaŀlar $Projectname cal configurar la connexió amb la base de dades."
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Code/Module/Setup.php:288
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Si tens dubtes sobre aquests paràmetres, posa't en contacte amb la proveïdora d'allotjament web o la persona que administradora del lloc."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Code/Module/Setup.php:289
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "La base de dades que especifiquis a continuació ja ha d'existir. Si no és així, crea-la abans de continuar."
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Database Server Name"
 msgstr "Nom del servidor de base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Default is 127.0.0.1"
 msgstr "Per defecte és 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Database Port"
 msgstr "Port per a la base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Communication port number - use 0 for default"
 msgstr "Número del port. Posa 0 per fer servir el valor predeterminat"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Code/Module/Setup.php:295
 msgid "Database Login Name"
 msgstr "Nom d'usuari/a a la base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Code/Module/Setup.php:296
 msgid "Database Login Password"
 msgstr "Contrasenya d'usuari/a a la base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Database Name"
 msgstr "Nom de la base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Database Type"
 msgstr "Tipus de base de dades"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid "Site administrator email address"
 msgstr "Adreça de correu de l'administrador/a del lloc"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "El teu compte de correu ha de coincidir-hi per poder emprar el panell web d'administració."
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Website URL"
 msgstr "Adreça URL del lloc web"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Please use SSL (https) URL if available."
 msgstr "Si us plau, fes servir l'adreça amb TLS (https) si està disponible."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
+#: ../../Code/Module/Setup.php:302 ../../Code/Module/Setup.php:345
 msgid "Please select a default timezone for your website"
 msgstr "Escull la zona horària per defecte del teu lloc web"
 
-#: ../../Zotlabs/Module/Setup.php:330
+#: ../../Code/Module/Setup.php:330
 msgid "Site settings"
 msgstr "Configuració del lloc"
 
-#: ../../Zotlabs/Module/Setup.php:384
+#: ../../Code/Module/Setup.php:384
 msgid "PHP version 5.5 or greater is required."
 msgstr "Es necessita una versió de PHP igual o superior a la 5.5."
 
-#: ../../Zotlabs/Module/Setup.php:385
+#: ../../Code/Module/Setup.php:385
 msgid "PHP version"
 msgstr "Versió del PHP"
 
-#: ../../Zotlabs/Module/Setup.php:401
+#: ../../Code/Module/Setup.php:401
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "No s'ha pogut trobar una versió de consola del PHP en la ruta del servidor web."
 
-#: ../../Zotlabs/Module/Setup.php:402
+#: ../../Code/Module/Setup.php:402
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Si no tens una versió de línia de comandes de PHP instaŀlada al servidor, no es podran fer sondejos periòdics en segon pla, fent servir el cron."
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid "PHP executable path"
 msgstr "Ruta al binari de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Introdueix la ruta al binari de php. Pots deixar-ho en blanc i continuar l'instaŀlació."
 
-#: ../../Zotlabs/Module/Setup.php:411
+#: ../../Code/Module/Setup.php:411
 msgid "Command line PHP"
 msgstr "Línia de comandes de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Code/Module/Setup.php:421
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "No s'ha pogut fer servir PHP per línia de comandes perquè shell_exec() està deshabilitat. Cal habilitar-ho."
 
-#: ../../Zotlabs/Module/Setup.php:424
+#: ../../Code/Module/Setup.php:424
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "La versió de línia de comandes de PHP al teu sistema no té el \"register_argc_argv\" activat."
 
-#: ../../Zotlabs/Module/Setup.php:425
+#: ../../Code/Module/Setup.php:425
 msgid "This is required for message delivery to work."
 msgstr "Això és necessari per poder lliurar missatges."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Code/Module/Setup.php:428
 msgid "PHP register_argc_argv"
 msgstr "register_argc_argv de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Code/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "El límit màxim de pujada està establerta en %s. El límit de pujada per arxiu de pujada és de %s. Es permeten pujar %d arxius alhora."
 
-#: ../../Zotlabs/Module/Setup.php:451
+#: ../../Code/Module/Setup.php:451
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Pots modificar la configuració en l'arxiu de configuració php.ini del servidor."
 
-#: ../../Zotlabs/Module/Setup.php:453
+#: ../../Code/Module/Setup.php:453
 msgid "PHP upload limits"
 msgstr "Límits de pujada de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:476
+#: ../../Code/Module/Setup.php:476
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifratge"
 
-#: ../../Zotlabs/Module/Setup.php:477
+#: ../../Code/Module/Setup.php:477
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Si estàs fent servir un sistema operatiu Windows, consulta \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:480
+#: ../../Code/Module/Setup.php:480
 msgid "Generate encryption keys"
 msgstr "Generar claus de xifratge"
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Code/Module/Setup.php:497
 msgid "libCurl PHP module"
 msgstr "mòdul de PHP \"libCurl\""
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Code/Module/Setup.php:498
 msgid "GD graphics PHP module"
 msgstr "mòdul de PHP \"GD graphics\""
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Code/Module/Setup.php:499
 msgid "OpenSSL PHP module"
 msgstr "mòdul de PHP \"OpenSSL\""
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Code/Module/Setup.php:500
 msgid "PDO database PHP module"
 msgstr "Mòdul PHP per la base de dades PDO"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Code/Module/Setup.php:501
 msgid "mb_string PHP module"
 msgstr "mòdul de PHP \"mb_string\""
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Code/Module/Setup.php:502
 msgid "xml PHP module"
 msgstr "mòdul de PHP \"xml\""
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Code/Module/Setup.php:503
 msgid "zip PHP module"
 msgstr "Mòdul PHP per als comprimits zip"
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+#: ../../Code/Module/Setup.php:507 ../../Code/Module/Setup.php:509
 msgid "Apache mod_rewrite module"
 msgstr "mòdul d'Apache: \"mod_rewrite\""
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Code/Module/Setup.php:507
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: es necessita el mòdul \"mod-rewrite\" del servidor web Apache, però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+#: ../../Code/Module/Setup.php:513 ../../Code/Module/Setup.php:516
 msgid "exec"
 msgstr "exec"
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Code/Module/Setup.php:513
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Error: no s'ha pogut fer servir exec. Cal instaŀlar-lo o bé habilitar-lo al php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+#: ../../Code/Module/Setup.php:519 ../../Code/Module/Setup.php:522
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Code/Module/Setup.php:519
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: no s'ha pogut fer servir shell_exec. Cal instaŀlar-lo o bé habilitar-lo al php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Code/Module/Setup.php:527
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: es necessita el mòdul PHP \"libCURL\", però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Code/Module/Setup.php:531
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Error: es necessita el mòdul PHP \"GD graphics\" amb support JPEG, però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:535
+#: ../../Code/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: es necessita el mòdul PHP \"OpenSSL\", però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Code/Module/Setup.php:539
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Error: no s'ha trobat el mòdul PHP per a la base de dades PDO. Cal instaŀlar-lo."
 
-#: ../../Zotlabs/Module/Setup.php:543
+#: ../../Code/Module/Setup.php:543
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: es necessita el mòdul PHP \"mb_string\", però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:547
+#: ../../Code/Module/Setup.php:547
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: es necessita el mòdul PHP \"xml\" per al DAV, però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Code/Module/Setup.php:551
 msgid "Error: zip PHP module required but not installed."
 msgstr "Error: no s'ha trobat el mòdul PHP per als fitxers zip. Cal instaŀlar-lo."
 
-#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579
+#: ../../Code/Module/Setup.php:570 ../../Code/Module/Setup.php:579
 msgid ".htconfig.php is writable"
 msgstr "L'arxiu «.htconfig.php» es pot modificar"
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Code/Module/Setup.php:575
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "L'instaŀlador ha de poder crear i modificar un fitxer anomenat «.htconfig.php» a la carpeta arrel del servidor, però sembla que no ho pot fer."
 
-#: ../../Zotlabs/Module/Setup.php:576
+#: ../../Code/Module/Setup.php:576
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Això sol ser un problema de permisos. Per molt que el teu usuari pugui modificar-lo, és el del servidor web qui necessita els permisos de modificació."
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Code/Module/Setup.php:577
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Consulta install/INSTALL.txt per a més informació."
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Code/Module/Setup.php:593
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Aquest software fa servir el motor de plantilles Smarty3 per a renderitzar les vistes web. Smarty3 compila plantilles a PHP per a agilitzar-ne el renderitzat."
 
-#: ../../Zotlabs/Module/Setup.php:594
+#: ../../Code/Module/Setup.php:594
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Per tal de guardar aquestes plantilles compilades, el servidor web necessita tenir permís d'escriptura en el directori %s sota la carpeta principal."
 
-#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616
+#: ../../Code/Module/Setup.php:595 ../../Code/Module/Setup.php:616
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Comprova que l'usuari que executa el servidor (www-data en Apache) té permisos d'escriptura en aquesta carpeta."
 
-#: ../../Zotlabs/Module/Setup.php:596
+#: ../../Code/Module/Setup.php:596
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Nota: com a mesura de seguretat, l'usuari del servidor web ha de tenir accés d'escriptura només a %s, i no a les plantilles (.tpl) que conté."
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Code/Module/Setup.php:599
 #, php-format
 msgid "%s is writable"
 msgstr "Es pot escriure a %s"
 
-#: ../../Zotlabs/Module/Setup.php:615
+#: ../../Code/Module/Setup.php:615
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
 " web folder"
 msgstr "Aquest software fa servir la carpeta \"store\" per a desar els arxius pujats. El servidor web necessita permís d'escriptura per a accedir-hi. Es troba a la carpeta arrel del servidor web."
 
-#: ../../Zotlabs/Module/Setup.php:619
+#: ../../Code/Module/Setup.php:619
 msgid "store is writable"
 msgstr "Es pot escriure al magatzem (store)"
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Code/Module/Setup.php:651
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "No s'ha pogut validar el certificat TLS.  Arregla-ho o deshabilita l'accés https a aquest lloc."
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Code/Module/Setup.php:652
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Si tens accés per https al teu lloc web o permets connexions pel port TCP 443 (port https), has d'emprar un certificat VÀLID. NO es poden emprar certificats AUTO-SIGNATS!"
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Code/Module/Setup.php:653
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "El motiu d'aquesta restricció és que les teves entrades públiques poden contenir referències a imatges del teu propi node."
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Code/Module/Setup.php:654
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Si el teu certificat no és vàlid, llavors el membres d'altres hubs, encara que tinguin certificats vàlids, rebran una advertència de seguretat en carregar contingut teu."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Code/Module/Setup.php:655
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Per tant, com que perjudica la usabilitat més enllà del teu lloc, la restricció de tenir un certificat vàlid és molt important."
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Code/Module/Setup.php:656
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Hi ha autoritats de certificació reconegudes que ofereixen certificats gratuïts."
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Code/Module/Setup.php:658
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -2133,1378 +2133,1378 @@ msgid ""
 "server communications."
 msgstr "Si no tens cap dubte que el certificat és vàlid i signat per una autoritat de confiança, comprova si has instaŀlat malament un certificat intermedi. Tot i que els navegadors no en demanen, són necessaris per les connexions entre servidors."
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Code/Module/Setup.php:660
 msgid "SSL certificate validation"
 msgstr "Validació del certificat TLS"
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Code/Module/Setup.php:666
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "No es poden reescriure les URL a «.htaccess». Comprova la configuració del servidor:"
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Code/Module/Setup.php:669
 msgid "Url rewrite is working"
 msgstr "Es poden reescriure les URL a «.htaccess»"
 
-#: ../../Zotlabs/Module/Setup.php:683
+#: ../../Code/Module/Setup.php:683
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "L'arxiu de configuracio de la base de dades «.htconfig.php» no s'ha pogut modificar. L'hauràs de modificar manualment amb el text de la caixa de text, i desar-lo a l'arrel del servidor web."
 
-#: ../../Zotlabs/Module/Setup.php:707
+#: ../../Code/Module/Setup.php:707
 #: ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr "S'han produït errors en crear taules a la base de dades."
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Code/Module/Setup.php:747
 msgid "
              What next?
              "
 msgstr "
              I ara què
              "
 
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Code/Module/Setup.php:748
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "IMPORTANT! Cal que configuris manualment una execució periòdica de l'enquestador (poller en anglès)."
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Code/Module/Connect.php:61 ../../Code/Module/Connect.php:109
 msgid "Continue"
 msgstr "Continua"
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Code/Module/Connect.php:90
 msgid "Premium Channel Setup"
 msgstr "Configuració dels canals prèmium"
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Code/Module/Connect.php:92
 msgid "Enable premium channel connection restrictions"
 msgstr "Activa l'opció de restringir les connexions dels canals prèmium"
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Code/Module/Connect.php:93
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr "Si us plau, introdueix les restriccions o condicions, com ara el rebut de PayPal, les pautes d'ús, etc."
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Code/Module/Connect.php:95 ../../Code/Module/Connect.php:115
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr "Aquest canal pot requerir passos addicionals o reconeixement de les següents condicions abans de connectar:"
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Code/Module/Connect.php:96
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr "Les possibles connexions veuran el següent text abans de continuar:"
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Code/Module/Connect.php:97 ../../Code/Module/Connect.php:118
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided"
 " on this page."
 msgstr "En continuar, certifico que he complert amb totes les instruccions proporcionades en aquesta pàgina."
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr "(No s'han proporcionat instruccions específiques per la persona propietària del canal.)"
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Code/Module/Connect.php:114
 msgid "Restricted or Premium Channel"
 msgstr "Canal restringit o prèmium"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
+#: ../../Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr "Estadístiques de la cua"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
+#: ../../Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr "Total d'entrades"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
+#: ../../Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr "Prioritat"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
+#: ../../Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr "Adreça URL de Destí"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
+#: ../../Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr "Marca el node com a permanentment fora de línia"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
+#: ../../Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr "Buida la cua per aquest node"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
+#: ../../Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr "Últim contacte conegut"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "Off"
 msgstr "No"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "On"
 msgstr "Sí"
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Admin/Features.php:56
 #, php-format
 msgid "Lock feature %s"
 msgstr "Bloqueja l'opció «%s»"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
+#: ../../Code/Module/Admin/Features.php:64
 msgid "Manage Additional Features"
 msgstr "Gestiona les funcionalitats addicionals"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Code/Module/Admin/Dbsync.php:19
 msgid "Update has been marked successful"
 msgstr "S'ha marcat l'actualització com a exitosa"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:31
+#: ../../Code/Module/Admin/Dbsync.php:31
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Ha fallat l'execució de %s. Comprova el registre del sistema."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:34
+#: ../../Code/Module/Admin/Dbsync.php:34
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "S'ha aplicat amb èxit l'actualització %s."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:38
+#: ../../Code/Module/Admin/Dbsync.php:38
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Es desconeix si l'actualització %s s'ha aplicat amb èxit, ja que no ha retornat cap resultat."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:41
+#: ../../Code/Module/Admin/Dbsync.php:41
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "No s'ha pogut trobar la funció d'actualització %s."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Code/Module/Admin/Dbsync.php:59
 msgid "Failed Updates"
 msgstr "Actualitzacions fallides"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+#: ../../Code/Module/Admin/Dbsync.php:61
 msgid "Mark success (if update was manually applied)"
 msgstr "Marca com a exitosa. Fes-ho només si l'actualització s'ha aplicat de forma manual i saps del cert que ha estat així."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+#: ../../Code/Module/Admin/Dbsync.php:62
 msgid "Attempt to execute this update step automatically"
 msgstr "Prova a fer automàticament aquesta actualització"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:67
+#: ../../Code/Module/Admin/Dbsync.php:67
 msgid "No failed updates."
 msgstr "No hi ha actualitzacions fallides."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:37
+#: ../../Code/Module/Admin/Accounts.php:37
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "S'ha [des]bloquejat %s compte"
 msgstr[1] "S'han [des]bloquejat %s comptes"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:44
+#: ../../Code/Module/Admin/Accounts.php:44
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "S'ha esborrat el compte %s"
 msgstr[1] "S'han esborrat %s comptes"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:80
+#: ../../Code/Module/Admin/Accounts.php:80
 msgid "Account not found"
 msgstr "No s'ha trobat el compte"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2490
+#: ../../Code/Module/Admin/Accounts.php:91 ../../include/channel.php:2490
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "S'ha esborrat el compte '%s'"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:99
+#: ../../Code/Module/Admin/Accounts.php:99
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "S'ha bloquejat el compte '%s'"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:107
+#: ../../Code/Module/Admin/Accounts.php:107
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "S'ha desbloquejat el compte '%s'"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:307
-#: ../../Zotlabs/Module/Admin/Addons.php:341
-#: ../../Zotlabs/Module/Admin/Addons.php:436
-#: ../../Zotlabs/Module/Admin/Security.php:92
-#: ../../Zotlabs/Module/Admin.php:140
+#: ../../Code/Module/Admin/Accounts.php:166
+#: ../../Code/Module/Admin/Logs.php:82
+#: ../../Code/Module/Admin/Channels.php:145
+#: ../../Code/Module/Admin/Themes.php:122
+#: ../../Code/Module/Admin/Themes.php:156
+#: ../../Code/Module/Admin/Site.php:307
+#: ../../Code/Module/Admin/Addons.php:341
+#: ../../Code/Module/Admin/Addons.php:436
+#: ../../Code/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin.php:140
 msgid "Administration"
 msgstr "Administració"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
-#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
+#: ../../Code/Module/Admin/Accounts.php:167
+#: ../../Code/Module/Admin/Accounts.php:180
+#: ../../Code/Module/Admin.php:96 ../../Code/Widget/Admin.php:23
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Channels.php:148
+#: ../../Code/Module/Admin/Accounts.php:169
+#: ../../Code/Module/Admin/Channels.php:148
 msgid "select all"
 msgstr "sel·leciona-ho tot"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Code/Module/Admin/Accounts.php:170
 msgid "Registrations waiting for confirm"
 msgstr "Inscripcions esperant confirmació"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:171
 msgid "Request date"
 msgstr "Data de la petició"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Code/Module/Admin/Accounts.php:172
 msgid "No registrations."
 msgstr "Sense inscripcions."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
-#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:735
+#: ../../Code/Module/Admin/Accounts.php:173
+#: ../../Code/Module/Connections.php:303 ../../include/conversation.php:735
 msgid "Approve"
 msgstr "Aprova"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Authorize.php:26
+#: ../../Code/Module/Admin/Accounts.php:174
+#: ../../Code/Module/Authorize.php:26
 msgid "Deny"
 msgstr "Denega"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:176
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:176
+#: ../../Code/Module/Connedit.php:622
 msgid "Block"
 msgstr "Bloqueja"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:177
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:177
+#: ../../Code/Module/Connedit.php:622
 msgid "Unblock"
 msgstr "Desbloqueja"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182
+#: ../../Code/Module/Admin/Accounts.php:182
 msgid "ID"
 msgstr "Identificador"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../Code/Module/Admin/Accounts.php:184
 msgid "All Channels"
 msgstr "Tots els canals"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Code/Module/Admin/Accounts.php:185
 msgid "Register date"
 msgstr "Data d'inscripció"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Code/Module/Admin/Accounts.php:186
 msgid "Last login"
 msgstr "Últim inici de sessió"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:187
+#: ../../Code/Module/Admin/Accounts.php:187
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Code/Module/Admin/Accounts.php:188
 msgid "Service Class"
 msgstr "Classe de servei"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:190
+#: ../../Code/Module/Admin/Accounts.php:190
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "S'esborraran tots els comptes seleccionats!\\n\\nTot el que hagin publicat en aquest lloc també serà esborrat permanentment!\\n\\nN'estàs segur/a de continuar?"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:191
+#: ../../Code/Module/Admin/Accounts.php:191
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "El compte {0} serà eliminat!\\n\\nTot el que hagi publicat en aquest lloc serà esborrat permanentment!\\n\\nN'estàs segur/a?"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
+#: ../../Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "S'ha actualitzat la configuració del registre."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
-#: ../../Zotlabs/Widget/Admin.php:58
+#: ../../Code/Module/Admin/Logs.php:83 ../../Code/Widget/Admin.php:48
+#: ../../Code/Widget/Admin.php:58
 msgid "Logs"
 msgstr "Registre"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
+#: ../../Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Neteja"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
+#: ../../Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Depuració"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "Arxiu de registre"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr "El servidor web l'ha de poder modificar. Escriu la ruta relativa respecte a la carpeta arrel del servidor web."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
+#: ../../Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
+#: ../../Code/Module/Admin/Channels.php:31
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s canal censurat/no censurat"
 msgstr[1] "S'han [des]censurat %s canals"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
+#: ../../Code/Module/Admin/Channels.php:40
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s codi permes/no permes al canal"
 msgstr[1] "S'han [des]activat %s codis de canal"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
+#: ../../Code/Module/Admin/Channels.php:46
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canal esborrat"
 msgstr[1] "S'han esborrat %s canals"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
+#: ../../Code/Module/Admin/Channels.php:65
 msgid "Channel not found"
 msgstr "No s'ha trobat el canal"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
+#: ../../Code/Module/Admin/Channels.php:75
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "S'ha esborrat el canal «%s»"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "S'ha censurat el canal «%s»"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "S'ha descensurat el canal «%s»"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "S'ha activat un codi pel canal «%s»"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "S'ha desactivat un codi pel canal «%s»"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Module/Admin.php:114 ../../Zotlabs/Widget/Admin.php:24
+#: ../../Code/Module/Admin/Channels.php:146
+#: ../../Code/Module/Admin.php:114 ../../Code/Widget/Admin.php:24
 msgid "Channels"
 msgstr "Canals"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Code/Module/Admin/Channels.php:150
 msgid "Censor"
 msgstr "Censura"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Code/Module/Admin/Channels.php:151
 msgid "Uncensor"
 msgstr "Descensura"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
+#: ../../Code/Module/Admin/Channels.php:152
 msgid "Allow Code"
 msgstr "Activa el codi"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
+#: ../../Code/Module/Admin/Channels.php:153
 msgid "Disallow Code"
 msgstr "Desactiva el codi"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../Code/Module/Admin/Channels.php:154
 #: ../../include/conversation.php:1820 ../../include/nav.php:370
 msgid "Channel"
 msgstr "Canal"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
+#: ../../Code/Module/Admin/Channels.php:158
 msgid "UID"
 msgstr "Identificador"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
+#: ../../Code/Module/Admin/Channels.php:162
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Els canals seleccionats estan a punt de ser esborrats\\n\\nTotes les seves publicacions en aquest lloc s'eliminaran de forma permanent!\\n\\nN'estàs segur/a? "
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
+#: ../../Code/Module/Admin/Channels.php:163
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "El canal {0} està a punt de ser esborrat!\\n\\nTotes les seves publicacions d'aquest en aquest lloc s'eliminaran de forma permanent!\\n\\nN'estàs segur/a?"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
+#: ../../Code/Module/Admin/Themes.php:26
 msgid "Theme settings updated."
 msgstr "S'ha actualitzat la configuració de tema."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
+#: ../../Code/Module/Admin/Themes.php:61
 msgid "No themes found."
 msgstr "No s'ha trobat cap tema."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:72
-#: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:453
-#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
+#: ../../Code/Module/Admin/Themes.php:72
+#: ../../Code/Module/Admin/Addons.php:259 ../../Code/Module/Thing.php:94
+#: ../../Code/Module/Viewsrc.php:25 ../../Code/Module/Display.php:46
+#: ../../Code/Module/Display.php:453
+#: ../../Code/Module/Filestorage.php:24 ../../Code/Module/Admin.php:62
 #: ../../include/items.php:3566
 msgid "Item not found."
 msgstr "No s'ha trobat l'element."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-#: ../../Zotlabs/Module/Admin/Addons.php:310
+#: ../../Code/Module/Admin/Themes.php:95
+#: ../../Code/Module/Admin/Addons.php:310
 msgid "Disable"
 msgstr "Desactiva"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-#: ../../Zotlabs/Module/Admin/Addons.php:313
+#: ../../Code/Module/Admin/Themes.php:97
+#: ../../Code/Module/Admin/Addons.php:313
 msgid "Enable"
 msgstr "Activa"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
+#: ../../Code/Module/Admin/Themes.php:116
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+#: ../../Code/Module/Admin/Themes.php:123
+#: ../../Code/Module/Admin/Themes.php:157 ../../Code/Widget/Admin.php:28
 msgid "Themes"
 msgstr "Temes"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-#: ../../Zotlabs/Module/Admin/Addons.php:343
+#: ../../Code/Module/Admin/Themes.php:124
+#: ../../Code/Module/Admin/Addons.php:343
 msgid "Toggle"
 msgstr "Commuta'n l'estat"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:125
-#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:304
-#: ../../Zotlabs/Widget/Newmember.php:46
-#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:99
+#: ../../Code/Module/Admin/Themes.php:125
+#: ../../Code/Module/Admin/Addons.php:344 ../../Code/Lib/Apps.php:304
+#: ../../Code/Widget/Newmember.php:46
+#: ../../Code/Widget/Settings_menu.php:141 ../../include/nav.php:99
 msgid "Settings"
 msgstr "Configuració"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-#: ../../Zotlabs/Module/Admin/Addons.php:351
+#: ../../Code/Module/Admin/Themes.php:134
+#: ../../Code/Module/Admin/Addons.php:351
 msgid "Author: "
 msgstr "Autor/a:"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-#: ../../Zotlabs/Module/Admin/Addons.php:352
+#: ../../Code/Module/Admin/Themes.php:135
+#: ../../Code/Module/Admin/Addons.php:352
 msgid "Maintainer: "
 msgstr "Persona mantenidora:"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
+#: ../../Code/Module/Admin/Themes.php:162
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
+#: ../../Code/Module/Admin/Themes.php:163
 msgid "[Unsupported]"
 msgstr "[Incompatible]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:172
+#: ../../Code/Module/Admin/Site.php:172
 msgid "Site settings updated."
 msgstr "S'ha actualitzat la configuració del lloc"
 
-#: ../../Zotlabs/Module/Admin/Site.php:198
+#: ../../Code/Module/Admin/Site.php:198
 #: ../../view/theme/redbasic_c/php/config.php:15
 #: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../../Zotlabs/Module/Admin/Site.php:209
-#: ../../Zotlabs/Module/Settings/Display.php:130
+#: ../../Code/Module/Admin/Site.php:209
+#: ../../Code/Module/Settings/Display.php:130
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Incompatible)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:216
+#: ../../Code/Module/Admin/Site.php:216
 msgid "mobile"
 msgstr "mòbil"
 
-#: ../../Zotlabs/Module/Admin/Site.php:218
+#: ../../Code/Module/Admin/Site.php:218
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../Zotlabs/Module/Admin/Site.php:220
+#: ../../Code/Module/Admin/Site.php:220
 msgid "unsupported"
 msgstr "incompatible"
 
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Code/Module/Admin/Site.php:267
 msgid "Yes - with approval"
 msgstr "Sí - amb aprovació"
 
-#: ../../Zotlabs/Module/Admin/Site.php:273
+#: ../../Code/Module/Admin/Site.php:273
 msgid "My site is not a public server"
 msgstr "El meu node no es un servidor públic"
 
-#: ../../Zotlabs/Module/Admin/Site.php:274
+#: ../../Code/Module/Admin/Site.php:274
 msgid "My site has paid access only"
 msgstr "El meu node només ofereix accés de pagament"
 
-#: ../../Zotlabs/Module/Admin/Site.php:275
+#: ../../Code/Module/Admin/Site.php:275
 msgid "My site has free access only"
 msgstr "El meu node només ofereix accés gratuït"
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Code/Module/Admin/Site.php:276
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "El meu node ofereix comptes gratuïts i millores de pagament"
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
+#: ../../Code/Module/Admin/Site.php:288
 msgid "Beginner/Basic"
 msgstr "Principiant/bàsica"
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Code/Module/Admin/Site.php:289
 msgid "Novice - not skilled but willing to learn"
 msgstr "Aprenent - amb poca experiència però amb ganes d'aprendre"
 
-#: ../../Zotlabs/Module/Admin/Site.php:290
+#: ../../Code/Module/Admin/Site.php:290
 msgid "Intermediate - somewhat comfortable"
 msgstr "Intermedi - còmode en entorns informàtics"
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Code/Module/Admin/Site.php:291
 msgid "Advanced - very comfortable"
 msgstr "Avançat - molt còmode en entorns informàtics"
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Code/Module/Admin/Site.php:292
 msgid "Expert - I can write computer code"
 msgstr "Expert - Sé programar"
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Code/Module/Admin/Site.php:293
 msgid "Wizard - I probably know more than you do"
 msgstr "Bruixot - Segurament en sé més que tu"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid "Default permission role for new accounts"
 msgstr "Rol de permisos per defecte per als comptes nous."
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr "S'aplicarà aquest rol al primer canal que es creï després del registre d'un compte."
 
-#: ../../Zotlabs/Module/Admin/Site.php:308 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Code/Module/Admin/Site.php:308 ../../Code/Widget/Admin.php:22
 msgid "Site"
 msgstr "Node"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
-#: ../../Zotlabs/Module/Register.php:278
+#: ../../Code/Module/Admin/Site.php:310
+#: ../../Code/Module/Register.php:278
 msgid "Registration"
 msgstr "Inscripcions"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid "File upload"
 msgstr "Pujada d'arxius"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Code/Module/Admin/Site.php:312
 msgid "Policies"
 msgstr "Polítiques"
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Code/Module/Admin/Site.php:313
 #: ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 #: ../../addon/statusnet/statusnet.php:891
 msgid "Site name"
 msgstr "Nom del node"
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Site default technical skill level"
 msgstr "Nivell per defecte del lloc de competències tècniques"
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr "Es fa servir per oferir una experiència ajustada al nivell tècnic de cadascú"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Lock the technical skill level setting"
 msgstr "Bloqueja el paràmetre de nivell tècnic"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Members can set their own technical comfort level by default"
 msgstr "Per defecte, els/les membres poden modificar el paràmetre de nivell tècnic"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Banner/Logo"
 msgstr "Cartell i logotip"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr "Es permet contingut HTML, CSS i JS, sense filtrar"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid "Administrator Information"
 msgstr "Informació de l'administració"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Informació per contactar amb les persones administradores del node. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode."
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
-#: ../../Zotlabs/Module/Siteinfo.php:24
+#: ../../Code/Module/Admin/Site.php:325
+#: ../../Code/Module/Siteinfo.php:24
 msgid "Site Information"
 msgstr "Informació del node"
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Descripció del node visible públicament. Es mostra a la pàgina d'informació del node. S'hi pot emprar BBCode."
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid "System language"
 msgstr "Llengua del sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid "System theme"
 msgstr "Tema del sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Tema del sistema per defecte. Les persones usuàries poden sobreescriure'l a la configuració de perfil: canvia la configuració de tema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "Allow Feeds as Connections"
 msgstr "Permet connectar-se a fluxos RSS"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "(Heavy system resource usage)"
 msgstr "(Demana molts recursos de sistema)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid "Maximum image size"
 msgstr "Mida màxima d'imatge"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Mida màxima total per les imatges pujades, en bytes. Per defecte és 0, que vol dir iŀlimitada."
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid "Does this site allow new member registration?"
 msgstr "Aquest node està obert a la inscripció de nous membres?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid "Invitation only"
 msgstr "Només per invitació"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Només permet nous membres només a través d'invitacions. Perquè tingui efecte, les inscripcions han d'estar obertes a nous membres."
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Minimum age"
 msgstr "Edat mínima"
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Minimum age (in years) for who may register on this site."
 msgstr "Edat mínima en anys per a poder crear un compte en aquest lloc."
 
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Code/Module/Admin/Site.php:335
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Quina descripció s'acosta més al tipus de comptes oferts en aquest node?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Register text"
 msgstr "Text d'inscripció"
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Will be displayed prominently on the registration page."
 msgstr "Es mostrarà en gran a la pàgina d'inscripció"
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Pàgina d'inici a mostrar als visitants (per defecte: la pàgina d'inici de sessió)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "exemple: 'public' per a mostrar el flux públic, 'page/sys/home' per a mostrar una pàgina web de sistema de nom 'home', o 'include:home.html' per a incloure un arxiu."
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Code/Module/Admin/Site.php:339
 msgid "Preserve site homepage URL"
 msgstr "Preserva l'adreça URL de la pàgina d'inici"
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Code/Module/Admin/Site.php:339
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la pàgina d'inici del node en un marc en el lloc original enlloc de redirigir-hi"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Accounts abandoned after x days"
 msgstr "Els comptes es consideren abandonats després de X dies"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Estalviarà recursos del sistema en no sondejar nodes externs per a comptes abandonats. Un 0 vol dir \"mai\"."
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Code/Module/Admin/Site.php:341
 msgid "Allowed friend domains"
 msgstr "Dominis amb permisos de connexió"
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Code/Module/Admin/Site.php:341
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Llista separada per comes de dominis en els quals està permès establir relacions d'amistat amb aquest node. S'accepten comodins (*). Deixa-ho buit per a acceptar qualsevol domini"
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Code/Module/Admin/Site.php:342
 msgid "Verify Email Addresses"
 msgstr "Verifica les adreces de correu electrònic"
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Code/Module/Admin/Site.php:342
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Activa per a comprovar l'adreça de correu emprada durant la inscripció d'un nou compte (recomanat)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Code/Module/Admin/Site.php:343
 msgid "Force publish"
 msgstr "Força la publicació"
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Code/Module/Admin/Site.php:343
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Activa per a forçar que tots el perfils en aquest node siguin llistats en el directori del lloc."
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Import Public Streams"
 msgstr "Importar fluxos públics"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Importa i permet l'accés a contingut públic sondejat d'altres llocs. Avís: aquest contingut no estarà moderat."
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid "Site only Public Streams"
 msgstr "Fluxos públics només locals"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr "Permet accedir a aquell contingut públic que s'hagi originat en aquest lloc, suposant que no s'estan important fluxos públics d'altres nodes."
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr "Permet a qualsevol persona d'internet d'accedir els fluxos públics"
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr "Desabilita-ho per a demanar iniciar sessió per poder-ho veure. Alerta: el contingut no estarà moderat."
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid "Only import Public stream posts with this text"
 msgstr "Importa només entrades del flux públics que continguin aquest text"
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
-#: ../../Zotlabs/Module/Admin/Site.php:348
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:348
+#: ../../Code/Module/Connedit.php:875 ../../Code/Module/Connedit.php:876
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades"
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid "Do not import Public stream posts with this text"
 msgstr "No importes entrades del flux públic que continguin aquest text"
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid "Login on Homepage"
 msgstr "Accés a la Pàgina d'inici"
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presenta una casella d'identificació a la pàgina d'inici als visitants si no s'ha configurat altre contingut."
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "Enable context help"
 msgstr "Activar l'ajuda contextual"
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Mostra l'ajuda contextual per la pàgina actual quan el botó d'ajuda es pressionat."
 
-#: ../../Zotlabs/Module/Admin/Site.php:354
+#: ../../Code/Module/Admin/Site.php:354
 msgid "Reply-to email address for system generated email."
 msgstr "Adreça de correu de resposta per als correus generats."
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 msgid "Sender (From) email address for system generated email."
 msgstr "Adreça de correu de remitent per als correus generats."
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Name of email sender for system generated email."
 msgstr "Nom visible de remitent per als correus generats."
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Directory Server URL"
 msgstr "URL del Servidor de Directoris"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Default directory server"
 msgstr "Servidor de directori per defecte"
 
-#: ../../Zotlabs/Module/Admin/Site.php:360
+#: ../../Code/Module/Admin/Site.php:360
 msgid "Proxy user"
 msgstr "Usuari Proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:361
+#: ../../Code/Module/Admin/Site.php:361
 msgid "Proxy URL"
 msgstr "URL del Proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:362
+#: ../../Code/Module/Admin/Site.php:362
 msgid "Network timeout"
 msgstr "Temps d'espera de la xarxa"
 
-#: ../../Zotlabs/Module/Admin/Site.php:362
+#: ../../Code/Module/Admin/Site.php:362
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valor en segons. Ajusta a 0 per a sense límits (no recomanat)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:363
+#: ../../Code/Module/Admin/Site.php:363
 msgid "Delivery interval"
 msgstr "Interval de lliurament"
 
-#: ../../Zotlabs/Module/Admin/Site.php:363
+#: ../../Code/Module/Admin/Site.php:363
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Retarda en segon plà l'interval de lliurament per aquests segons per reduir la càrrega del sistema. Recomanat:  4-5 per a hostes compartits, 2-3 per a servidors privats virtuals. 0-1 per a servidors dedicats."
 
-#: ../../Zotlabs/Module/Admin/Site.php:364
+#: ../../Code/Module/Admin/Site.php:364
 msgid "Deliveries per process"
 msgstr "Entregues per processar"
 
-#: ../../Zotlabs/Module/Admin/Site.php:364
+#: ../../Code/Module/Admin/Site.php:364
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Nombre de entregues a intentar processar en un únic procèss del sistema operatiu. Ajustar si es necessari per millorar el rendiment. Es recomana: 1-5."
 
-#: ../../Zotlabs/Module/Admin/Site.php:365
+#: ../../Code/Module/Admin/Site.php:365
 msgid "Queue Threshold"
 msgstr "Llindar de la cua"
 
-#: ../../Zotlabs/Module/Admin/Site.php:365
+#: ../../Code/Module/Admin/Site.php:365
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr "Posposa el lliurament immediat si la cua conté més d'aquest nombre d'entrades."
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
+#: ../../Code/Module/Admin/Site.php:366
 msgid "Poll interval"
 msgstr "interval de sondeig"
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
+#: ../../Code/Module/Admin/Site.php:366
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Retarda en segon pla el sondeig en aquesta quantitat de segons per a reduir la càrrega dels sistema. Si es 0 , empra l'interval de lliurament."
 
-#: ../../Zotlabs/Module/Admin/Site.php:367
+#: ../../Code/Module/Admin/Site.php:367
 msgid "Path to ImageMagick convert program"
 msgstr "Ruta al programa de conversió d'imatges ImageMagick"
 
-#: ../../Zotlabs/Module/Admin/Site.php:367
+#: ../../Code/Module/Admin/Site.php:367
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr "Si se n'indica la ruta, es farà servir aquest programa per a generar miniatures per a imatges enormes (més de 4000 píxels d'ample o alt). En cas contrari es pot esgotar la memòria del servidor. Ruta d'exemple: /usr/bin/convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:368
+#: ../../Code/Module/Admin/Site.php:368
 msgid "Allow SVG thumbnails in file browser"
 msgstr "Permet miniatures en SVG a l'explorador de fitxers"
 
-#: ../../Zotlabs/Module/Admin/Site.php:368
+#: ../../Code/Module/Admin/Site.php:368
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "Alerta: Les imatges SVG poden contenir codi maliciós."
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
+#: ../../Code/Module/Admin/Site.php:369
 msgid "Maximum Load Average"
 msgstr "Càrrega Mitja Màxima"
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
+#: ../../Code/Module/Admin/Site.php:369
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Càrrega màxima del sistema, abans que els processos de lliurament i sondeig es difereixin - 50 per defecte."
 
-#: ../../Zotlabs/Module/Admin/Site.php:370
+#: ../../Code/Module/Admin/Site.php:370
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Període d'expiració en dies per contingut importat (malla/xarxa)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:370
+#: ../../Code/Module/Admin/Site.php:370
 msgid "0 for no expiration of imported content"
 msgstr "0 vol dir sense temps d'expiració pel contingut importat"
 
-#: ../../Zotlabs/Module/Admin/Site.php:371
+#: ../../Code/Module/Admin/Site.php:371
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr "No facis caducar les entrades que tinguin comentaris més nous que aquest nombre de dies"
 
-#: ../../Zotlabs/Module/Admin/Site.php:373
+#: ../../Code/Module/Admin/Site.php:373
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr "Servidors públics: Pàgina d'arribada promocional per a nous usuaris o usuàries."
 
-#: ../../Zotlabs/Module/Admin/Site.php:373
+#: ../../Code/Module/Admin/Site.php:373
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Crea primer aquesta pàgina. Per defecte és %s/register"
 
-#: ../../Zotlabs/Module/Admin/Site.php:374
+#: ../../Code/Module/Admin/Site.php:374
 msgid "Page to display after creating a new channel"
 msgstr "Pàgina que es mostrarà després d'haver creat un canal nou"
 
-#: ../../Zotlabs/Module/Admin/Site.php:374
+#: ../../Code/Module/Admin/Site.php:374
 msgid "Default: profiles"
 msgstr "Per defecte: profiles"
 
-#: ../../Zotlabs/Module/Admin/Site.php:376
+#: ../../Code/Module/Admin/Site.php:376
 msgid "Optional: site location"
 msgstr "Opcional: ubicació del node"
 
-#: ../../Zotlabs/Module/Admin/Site.php:376
+#: ../../Code/Module/Admin/Site.php:376
 msgid "Region or country"
 msgstr "Regió o país"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:289
+#: ../../Code/Module/Admin/Addons.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "S'ha desactivat l'extensió %s."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:294
+#: ../../Code/Module/Admin/Addons.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "S'ha activat l'extensió %s."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:342
-#: ../../Zotlabs/Module/Admin/Addons.php:437 ../../Zotlabs/Widget/Admin.php:27
+#: ../../Code/Module/Admin/Addons.php:342
+#: ../../Code/Module/Admin/Addons.php:437 ../../Code/Widget/Admin.php:27
 msgid "Addons"
 msgstr "Extensions"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:353
+#: ../../Code/Module/Admin/Addons.php:353
 msgid "Minimum project version: "
 msgstr "Versió mínima del projecte:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:354
+#: ../../Code/Module/Admin/Addons.php:354
 msgid "Maximum project version: "
 msgstr "Versió màxima del projecte:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:355
+#: ../../Code/Module/Admin/Addons.php:355
 msgid "Minimum PHP version: "
 msgstr "Versió mínima de PHP:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:356
+#: ../../Code/Module/Admin/Addons.php:356
 msgid "Compatible Server Roles: "
 msgstr "Rols de servidor compatibles"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:357
+#: ../../Code/Module/Admin/Addons.php:357
 msgid "Requires: "
 msgstr "Demana:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:358
-#: ../../Zotlabs/Module/Admin/Addons.php:442
+#: ../../Code/Module/Admin/Addons.php:358
+#: ../../Code/Module/Admin/Addons.php:442
 msgid "Disabled - version incompatibility"
 msgstr "Desactivada - versions incompatibles"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:411
+#: ../../Code/Module/Admin/Addons.php:411
 msgid "Enter the public git repository URL of the addon repo."
 msgstr "Introdueix la URL del repositori git d'extensions. Ha de ser un repositori públic."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:412
+#: ../../Code/Module/Admin/Addons.php:412
 msgid "Addon repo git URL"
 msgstr "Adreça URL del repositori d'extensions."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:413
+#: ../../Code/Module/Admin/Addons.php:413
 msgid "Custom repo name"
 msgstr "Nom personalitzat pel repositori"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:413
+#: ../../Code/Module/Admin/Addons.php:413
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:414
+#: ../../Code/Module/Admin/Addons.php:414
 msgid "Download Addon Repo"
 msgstr "Descarrega el repositori"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:421
+#: ../../Code/Module/Admin/Addons.php:421
 msgid "Install new repo"
 msgstr "Instal·la un nou repositori"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:456
+#: ../../Code/Module/Admin/Addons.php:422 ../../Code/Lib/Apps.php:456
 msgid "Install"
 msgstr "Instal·la"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:445
+#: ../../Code/Module/Admin/Addons.php:445
 msgid "Manage Repos"
 msgstr "Gestiona els repositoris"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:446
+#: ../../Code/Module/Admin/Addons.php:446
 msgid "Installed Addon Repositories"
 msgstr "Repositoris instaŀlats"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:447
+#: ../../Code/Module/Admin/Addons.php:447
 msgid "Install a New Addon Repository"
 msgstr "Instal·la un nou repositori"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:454
+#: ../../Code/Module/Admin/Addons.php:454
 msgid "Switch branch"
 msgstr "Canvia de branca"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:455
-#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Code/Module/Admin/Addons.php:455
+#: ../../Code/Module/Photos.php:1025 ../../Code/Module/Tagrm.php:137
 #: ../../addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr "Esborra"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
+#: ../../Code/Module/Admin/Profs.php:89
 msgid "New Profile Field"
 msgstr "Camp de Perfil Nou"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "Field nickname"
 msgstr "Àlies de Camp"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "System name of field"
 msgstr "nOM DEL SISTEMA DEL CAMP"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
+#: ../../Code/Module/Admin/Profs.php:91
+#: ../../Code/Module/Admin/Profs.php:111
 msgid "Input type"
 msgstr "Tipus d'entrada"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Field Name"
 msgstr "Nom de Camp"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Label on profile pages"
 msgstr "Etiqueta a les pàgines de perfil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Help text"
 msgstr "Text d'ajuda"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Additional info (optional)"
 msgstr "Informació adicional (opcional)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1063
+#: ../../Code/Module/Admin/Profs.php:94
+#: ../../Code/Module/Admin/Profs.php:114 ../../Code/Module/Rbmark.php:32
+#: ../../Code/Module/Rbmark.php:104 ../../Code/Module/Filer.php:53
+#: ../../Code/Widget/Notes.php:18 ../../include/text.php:1063
 #: ../../include/text.php:1075
 msgid "Save"
 msgstr "Guardar"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
+#: ../../Code/Module/Admin/Profs.php:103
 msgid "Field definition not found"
 msgstr "No es troba la definició del camp"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
+#: ../../Code/Module/Admin/Profs.php:109
 msgid "Edit Profile Field"
 msgstr "Modifica el camp de perfil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30
+#: ../../Code/Module/Admin/Profs.php:168 ../../Code/Widget/Admin.php:30
 msgid "Profile Fields"
 msgstr "Camps del Perfil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
+#: ../../Code/Module/Admin/Profs.php:169
 msgid "Basic Profile Fields"
 msgstr "Camps Bàsics del Perfil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "Advanced Profile Fields"
 msgstr "Camps Avançats del Perfil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "(In addition to basic fields)"
 msgstr "( addicionalment als camps bàsics)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
+#: ../../Code/Module/Admin/Profs.php:172
 msgid "All available fields"
 msgstr "Tots els camps disponibles"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
+#: ../../Code/Module/Admin/Profs.php:173
 msgid "Custom Fields"
 msgstr "Camps Personalitzats"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
+#: ../../Code/Module/Admin/Profs.php:177
 msgid "Create Custom Field"
 msgstr "Crear un Camp Personalitzat"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#: ../../Code/Module/Admin/Account_edit.php:29
 #, php-format
 msgid "Password changed for account %d."
 msgstr "S'ha modificat la contrasenya pel compte %d."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+#: ../../Code/Module/Admin/Account_edit.php:46
 msgid "Account settings updated."
 msgstr "S'han actualitzat els paràmetres del compte."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+#: ../../Code/Module/Admin/Account_edit.php:61
 msgid "Account not found."
 msgstr "No s'ha trobat el compte."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+#: ../../Code/Module/Admin/Account_edit.php:68
 msgid "Account Edit"
 msgstr "Edita el compte"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+#: ../../Code/Module/Admin/Account_edit.php:69
 msgid "New Password"
 msgstr "Introdueix la nova contrasenya"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+#: ../../Code/Module/Admin/Account_edit.php:70
 msgid "New Password again"
 msgstr "Repeteix la nova contrasenya"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+#: ../../Code/Module/Admin/Account_edit.php:71
 msgid "Technical skill level"
 msgstr "Nivell de competències tècniques"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+#: ../../Code/Module/Admin/Account_edit.php:72
 msgid "Account language (for emails)"
 msgstr "Idioma pel compte (pels correus)"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Code/Module/Admin/Account_edit.php:73
 msgid "Service class"
 msgstr "Classe de servei"
 
-#: ../../Zotlabs/Module/Admin/Security.php:83
+#: ../../Code/Module/Admin/Security.php:83
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
 msgstr "Per defecte, HTML no filtrat està permés als media embeguts. Això es inherentment no segur."
 
-#: ../../Zotlabs/Module/Admin/Security.php:86
+#: ../../Code/Module/Admin/Security.php:86
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr "L'ajust recomanat és només permetre HTML sense filtrar dels següents llocs:"
 
-#: ../../Zotlabs/Module/Admin/Security.php:87
+#: ../../Code/Module/Admin/Security.php:87
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/
              https://vimeo.com/
              https://soundcloud.com/
              "
 
-#: ../../Zotlabs/Module/Admin/Security.php:88
+#: ../../Code/Module/Admin/Security.php:88
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr "Tota la resta de contingut embegut seà filtrat, excepte contingut embegut d'aquest lloc que està blocat explícitament."
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
-#: ../../Zotlabs/Widget/Admin.php:25
+#: ../../Code/Module/Admin/Security.php:93
+#: ../../Code/Widget/Admin.php:25
 msgid "Security"
 msgstr "Seguretat"
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
+#: ../../Code/Module/Admin/Security.php:95
 msgid "Block public"
 msgstr "Bloca que sigui públic"
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
+#: ../../Code/Module/Admin/Security.php:95
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "activa per blocar l'accés a les pàgines personals públiques a tothom excepte aquells/es que s'hagin autenticat en aquest node."
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid "Provide a cloud root directory"
 msgstr "Ofereix un directori arrel de núvols"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid ""
 "The cloud root directory lists all channel names which provide public files"
 msgstr "EL directori arrel de núvols llista tots els canals que ofereixen fitxers públicament"
 
-#: ../../Zotlabs/Module/Admin/Security.php:97
+#: ../../Code/Module/Admin/Security.php:97
 msgid "Show total disk space available to cloud uploads"
 msgstr "Mostra l'espai disc disponible per a pujar arxius als núvols"
 
-#: ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Code/Module/Admin/Security.php:98
 msgid "Set \"Transport Security\" HTTP header"
 msgstr "Set \"Transport Security\" HTTP header"
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr "Set \"Content Security Policy\" HTTP header"
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
+#: ../../Code/Module/Admin/Security.php:100
 msgid "Allowed email domains"
 msgstr "Dominis de correu electonic acceptats"
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
+#: ../../Code/Module/Admin/Security.php:100
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "llista separada per comes de dominis d'adreces de correu electrònic permeses en aquest lloc. S'accepten comodins. Deixar buit per acceptar qualsevol domini"
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
+#: ../../Code/Module/Admin/Security.php:101
 msgid "Not allowed email domains"
 msgstr "Dominis de correu electrònic no acceptats"
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
+#: ../../Code/Module/Admin/Security.php:101
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "llista separada per comes de dominis d'adreces de correu electrònic no permeses en aquest lloc. S'accepten comodins. Deixar buit per no acceptar cap domini, excepte els que s'hagin definits com acceptats."
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
+#: ../../Code/Module/Admin/Security.php:102
 msgid "Allow communications only from these sites"
 msgstr "Permetre comunicacions únicament des de aquests llocs"
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
+#: ../../Code/Module/Admin/Security.php:102
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Un lloc per línia. Deixar en blanc per permetre, per defecte,  la comunicació amb tothom."
 
-#: ../../Zotlabs/Module/Admin/Security.php:103
+#: ../../Code/Module/Admin/Security.php:103
 msgid "Block communications from these sites"
 msgstr "Bloca comunicacions que venen d'aquests llocs"
 
-#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Code/Module/Admin/Security.php:104
 msgid "Allow communications only from these channels"
 msgstr "Permet la comunicació només per aquests canals"
 
-#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Code/Module/Admin/Security.php:104
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "Un canal (hash) per línia. Deixa en blanc per permetre, per defecte,  la comunicació qualsevol canal."
 
-#: ../../Zotlabs/Module/Admin/Security.php:105
+#: ../../Code/Module/Admin/Security.php:105
 msgid "Block communications from these channels"
 msgstr "Bloca les comunicacions que venen d'aquests canals"
 
-#: ../../Zotlabs/Module/Admin/Security.php:106
+#: ../../Code/Module/Admin/Security.php:106
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr "Permetre embeguts només de llocs web i enllaços segurs (SSL)."
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
+#: ../../Code/Module/Admin/Security.php:107
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Permetre HTML embegut sense filtrar només d'aquests dominis."
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
+#: ../../Code/Module/Admin/Security.php:107
 msgid "One site per line. By default embedded content is filtered."
 msgstr "Un lloc per línia. Per defecte el contingut embegut es filtrat."
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
+#: ../../Code/Module/Admin/Security.php:108
 msgid "Block embedded HTML from these domains"
 msgstr "Bloca HTML embegut d'aquests dominis"
 
-#: ../../Zotlabs/Module/Lockview.php:75
+#: ../../Code/Module/Lockview.php:75
 msgid "Remote privacy information not available."
 msgstr "informació privada remota no disponible."
 
-#: ../../Zotlabs/Module/Lockview.php:96
+#: ../../Code/Module/Lockview.php:96
 msgid "Visible to:"
 msgstr "Visible per:"
 
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:120 ../../include/acl_selectors.php:88
+#: ../../Code/Module/Lockview.php:117 ../../Code/Module/Lockview.php:153
+#: ../../Code/Module/Acl.php:120 ../../include/acl_selectors.php:88
 msgctxt "acl"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../Zotlabs/Module/Moderate.php:65
+#: ../../Code/Module/Moderate.php:65
 msgid "Comment approved"
 msgstr "S'ha aprovat el comentari"
 
-#: ../../Zotlabs/Module/Moderate.php:69
+#: ../../Code/Module/Moderate.php:69
 msgid "Comment deleted"
 msgstr "S'ha esborrat el comentari"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:23
+#: ../../Code/Module/Settings/Permcats.php:23
 msgid "Permission Name is required."
 msgstr "Es necessita el nom del perfil."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:42
+#: ../../Code/Module/Settings/Permcats.php:42
 msgid "Permission category saved."
 msgstr "S'ha desat la categoria de permisos."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:66
+#: ../../Code/Module/Settings/Permcats.php:66
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
 msgstr "Pots crear regles de permisos segons classe de persona o de connexió."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:99
-#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240
+#: ../../Code/Module/Settings/Permcats.php:99
+#: ../../Code/Widget/Settings_menu.php:108 ../../include/features.php:240
 msgid "Permission Categories"
 msgstr "Categories de permisos"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
+#: ../../Code/Module/Settings/Permcats.php:107
 msgid "Permission Name"
 msgstr "Nom de permís"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250
+#: ../../Code/Module/Settings/Permcats.php:108
+#: ../../Code/Module/Settings/Tokens.php:161
+#: ../../Code/Module/Connedit.php:891 ../../Code/Module/Defperms.php:250
 msgid "My Settings"
 msgstr "La meva configuració"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248
+#: ../../Code/Module/Settings/Permcats.php:110
+#: ../../Code/Module/Settings/Tokens.php:163
+#: ../../Code/Module/Connedit.php:886 ../../Code/Module/Defperms.php:248
 msgid "inherited"
 msgstr "heretat"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:113
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253
+#: ../../Code/Module/Settings/Permcats.php:113
+#: ../../Code/Module/Settings/Tokens.php:166
+#: ../../Code/Module/Connedit.php:893 ../../Code/Module/Defperms.php:253
 msgid "Individual Permissions"
 msgstr "Permisos Individuals"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:114
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:894
+#: ../../Code/Module/Settings/Permcats.php:114
+#: ../../Code/Module/Settings/Tokens.php:167
+#: ../../Code/Module/Connedit.php:894
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -3512,19 +3512,19 @@ msgid ""
 " settings here."
 msgstr "Alguns permisos pot ser que vinguin heretats de la configuració de privacitat del teu canal. Aquesta té més prioritat que les configuracions individuals. No pots canviar aquests paràmetres aquí."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:68
-#: ../../Zotlabs/Module/Settings/Channel.php:72
-#: ../../Zotlabs/Module/Settings/Channel.php:73
-#: ../../Zotlabs/Module/Settings/Channel.php:76
-#: ../../Zotlabs/Module/Settings/Channel.php:87
-#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24
+#: ../../Code/Module/Settings/Channel.php:68
+#: ../../Code/Module/Settings/Channel.php:72
+#: ../../Code/Module/Settings/Channel.php:73
+#: ../../Code/Module/Settings/Channel.php:76
+#: ../../Code/Module/Settings/Channel.php:87
+#: ../../Code/Module/Connedit.php:711 ../../Code/Widget/Affinity.php:24
 #: ../../include/selectors.php:123 ../../include/channel.php:437
 #: ../../include/channel.php:438 ../../include/channel.php:445
 msgid "Friends"
 msgstr "Amics"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:272
-#: ../../Zotlabs/Module/Defperms.php:103
+#: ../../Code/Module/Settings/Channel.php:272
+#: ../../Code/Module/Defperms.php:103
 #: ../../addon/rendezvous/rendezvous.php:82
 #: ../../addon/openstreetmap/openstreetmap.php:184
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
@@ -3533,976 +3533,976 @@ msgstr "Amics"
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:333
+#: ../../Code/Module/Settings/Channel.php:333
 msgid "Nobody except yourself"
 msgstr "Ningú excepte tú"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:334
+#: ../../Code/Module/Settings/Channel.php:334
 msgid "Only those you specifically allow"
 msgstr "Només allò que específicament permetis"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:335
+#: ../../Code/Module/Settings/Channel.php:335
 msgid "Approved connections"
 msgstr "Connexions aprovades"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:336
+#: ../../Code/Module/Settings/Channel.php:336
 msgid "Any connections"
 msgstr "Qualsevol connexió"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:337
+#: ../../Code/Module/Settings/Channel.php:337
 msgid "Anybody on this website"
 msgstr "Qualsevol en aquest lloc"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:338
+#: ../../Code/Module/Settings/Channel.php:338
 msgid "Anybody in this network"
 msgstr "Qualsevol en aquesta xarxa"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:339
+#: ../../Code/Module/Settings/Channel.php:339
 msgid "Anybody authenticated"
 msgstr "Qualsevol autenticat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:340
+#: ../../Code/Module/Settings/Channel.php:340
 msgid "Anybody on the internet"
 msgstr "Qualsevol a internet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:415
+#: ../../Code/Module/Settings/Channel.php:415
 msgid "Publish your default profile in the network directory"
 msgstr "Publica el teu perfil per defecte al directori de la xarxa"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:420
+#: ../../Code/Module/Settings/Channel.php:420
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Ens permets suggerir-te com a potencial amic als nous membres?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:424
+#: ../../Code/Module/Settings/Channel.php:424
 msgid "or"
 msgstr "o"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:433
+#: ../../Code/Module/Settings/Channel.php:433
 msgid "Your channel address is"
 msgstr "La teva adreça del canal es"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:436
+#: ../../Code/Module/Settings/Channel.php:436
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "Les teves fotos i arxius estan disponibles mitjançant WebDAV a"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Code/Module/Settings/Channel.php:488
 msgid "Automatic membership approval"
 msgstr "Acceptació automàtica de membres"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
-#: ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Settings/Channel.php:488
+#: ../../Code/Module/Defperms.php:239
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr "Si s'habilita, les soŀlicituds de connexió s'aprovaran automàticament sense requerir la teva interacció"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:514
+#: ../../Code/Module/Settings/Channel.php:514
 msgid "Channel Settings"
 msgstr "Configuració de canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid "Basic Settings"
 msgstr "Configuració bàsica"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:522
+#: ../../Code/Module/Settings/Channel.php:522
 #: ../../include/channel.php:1521
 msgid "Full Name:"
 msgstr "Nom Complet:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
-#: ../../Zotlabs/Module/Settings/Account.php:119
+#: ../../Code/Module/Settings/Channel.php:523
+#: ../../Code/Module/Settings/Account.php:119
 msgid "Email Address:"
 msgstr "Adreça de E-Correu:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:524
+#: ../../Code/Module/Settings/Channel.php:524
 msgid "Your Timezone:"
 msgstr "La teva Franja Horària"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "Default Post Location:"
 msgstr "Localització Predeterminada de les Entrades:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "Geographical location to display on your posts"
 msgstr "Posició geogràfica a mostrar a les teves entrades"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "Use Browser Location:"
 msgstr "Empra la Localització del Navegador:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Code/Module/Settings/Channel.php:528
 msgid "Adult Content"
 msgstr "Contingut per a Adults"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Code/Module/Settings/Channel.php:528
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Aquest canal publica freqúentment o amb regularitat contingut per a adults. (Si us plau, etiqueti qualsevol material per a adults amb #NSFW)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Code/Module/Settings/Channel.php:530
 msgid "Security and Privacy Settings"
 msgstr "Configuració de seguretat i privacitat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Code/Module/Settings/Channel.php:532
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Els teus permisos estan configurats. Clic per veure/ajustar"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Code/Module/Settings/Channel.php:534
 msgid "Hide my online presence"
 msgstr "Amaga la meva presencia en línia"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Code/Module/Settings/Channel.php:534
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Evita mostrar en el teu perfil, que estàs en línia"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
+#: ../../Code/Module/Settings/Channel.php:536
 msgid "Simple Privacy Settings:"
 msgstr "Configuració simple de privacitat:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Code/Module/Settings/Channel.php:537
 msgid ""
 "Very Public - extremely permissive (should be used with caution)"
 msgstr "Molt públic - extremadament permissiu (s'ha d'anar en compte)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
+#: ../../Code/Module/Settings/Channel.php:538
 msgid ""
 "Typical - default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)"
 msgstr "Normal - públic per defecte, privat quan es desitgi (similar als permisos de xarxa social, però amb millor privacitat)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Code/Module/Settings/Channel.php:539
 msgid "Private - default private, never open or public"
 msgstr "Privat - privat per defecte, mai públic o obert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Code/Module/Settings/Channel.php:540
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Bloquejat - tothom bloquejat per defecte"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Code/Module/Settings/Channel.php:542
 msgid "Allow others to tag your posts"
 msgstr "Permet a altres etiquetar les teves entrades"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Code/Module/Settings/Channel.php:542
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Sovint emprat per la comunitat per marcar retroactivament contingut inapropiat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
+#: ../../Code/Module/Settings/Channel.php:544
 msgid "Channel Permission Limits"
 msgstr "Límits dels permisos del canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Expire other channel content after this many days"
 msgstr "El contingut d'altes canals caduca després d'aquests dies"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "0 or blank to use the website limit."
 msgstr "0 o en blanc per emprar el limit del lloc web."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Aquest lloc web expira després de %d dies."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "This website does not expire imported content."
 msgstr "A aquest lloc web no expira el contingut importat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "El límit del lloc web pren la preferència si es inferior al teu límit."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Code/Module/Settings/Channel.php:547
 msgid "Maximum Friend Requests/Day:"
 msgstr "Nombre màxim de peticions d'amistat per dia"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Code/Module/Settings/Channel.php:547
 msgid "May reduce spam activity"
 msgstr "Pot reduir l'SPAM"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Code/Module/Settings/Channel.php:548
 msgid "Default Privacy Group"
 msgstr "Grup de privacitat per defecte"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Code/Module/Settings/Channel.php:550
 msgid "Use my default audience setting for the type of object published"
 msgstr "Empra la meva configuració d'audiència que hagi triat per al tipus d'entrada"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Code/Module/Settings/Channel.php:551
 msgid "Profile to assign new connections"
 msgstr "Perfil al qual assignar les connexions noves"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Code/Module/Settings/Channel.php:561
 msgid "Default Permissions Group"
 msgstr "Grup de permisos per defecte"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Code/Module/Settings/Channel.php:567
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Nombre màxim de missatges privats de desconeguts al dia:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Code/Module/Settings/Channel.php:567
 msgid "Useful to reduce spamming"
 msgstr "Útil per a reduir l'spam"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Module/Settings/Channel.php:570
+#: ../../Code/Lib/Enotify.php:68
 msgid "Notification Settings"
 msgstr "Configuració de notificacions"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:571
 msgid "By default post a status message when:"
 msgstr "Per defecte envia un missatge d'estat quan:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Code/Module/Settings/Channel.php:572
 msgid "accepting a friend request"
 msgstr "S'accepta una sol·licitud d'amistat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Code/Module/Settings/Channel.php:573
 msgid "joining a forum/community"
 msgstr "Apuntar-se a un fòrum o comunitat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "making an interesting profile change"
 msgstr "Faci un canvi  interesant al perfil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Code/Module/Settings/Channel.php:575
 msgid "Send a notification email when:"
 msgstr "Notifica per correu quan:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:576
 msgid "You receive a connection request"
 msgstr "Rebi una petició de connexió"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:577
 msgid "Your connections are confirmed"
 msgstr "Es confirma una connexió"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:578
 msgid "Someone writes on your profile wall"
 msgstr "Algú ha escrit al mur del teu perfil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Code/Module/Settings/Channel.php:579
 msgid "Someone writes a followup comment"
 msgstr "Algú ha escrit un comentari de resposta"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Code/Module/Settings/Channel.php:580
 msgid "You receive a private message"
 msgstr "Rebi un missatge privat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Code/Module/Settings/Channel.php:581
 msgid "You receive a friend suggestion"
 msgstr "Rebi una suggerència d'amistat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Code/Module/Settings/Channel.php:582
 msgid "You are tagged in a post"
 msgstr "Estàs etiquetat a l'entrada"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 msgid "You are poked/prodded/etc. in a post"
 msgstr "S'enfoten/te piquen/etc. en una entrada"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Code/Module/Settings/Channel.php:585
 msgid "Someone likes your post/comment"
 msgstr "A algú li ha agradat la teva entrada o comentari"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:588
+#: ../../Code/Module/Settings/Channel.php:588
 msgid "Show visual notifications including:"
 msgstr "Mostra notificacion visuals, com ara:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:590
+#: ../../Code/Module/Settings/Channel.php:590
 msgid "Unseen grid activity"
 msgstr "Activitat de malla no vista"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:591
+#: ../../Code/Module/Settings/Channel.php:591
 msgid "Unseen channel activity"
 msgstr "Activitat no vista del canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:592
 msgid "Unseen private messages"
 msgstr "Missatges privats no llegits"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
-#: ../../Zotlabs/Module/Settings/Channel.php:597
-#: ../../Zotlabs/Module/Settings/Channel.php:598
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Code/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:598
+#: ../../Code/Module/Settings/Channel.php:599
 #: ../../addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr "Recomanat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Code/Module/Settings/Channel.php:593
 msgid "Upcoming events"
 msgstr "Esdeveniments propers"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Code/Module/Settings/Channel.php:594
 msgid "Events today"
 msgstr "Esdeveniments d'avui"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Upcoming birthdays"
 msgstr "Aniversaris propers"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Not available in all themes"
 msgstr "No està disponible en tots els temes"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:596
 msgid "System (personal) notifications"
 msgstr "Notificacions (personals) del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "System info messages"
 msgstr "Missatges d'informació del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:598
+#: ../../Code/Module/Settings/Channel.php:598
 msgid "System critical alerts"
 msgstr "Alertes crítiques del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Code/Module/Settings/Channel.php:599
 msgid "New connections"
 msgstr "Noves connexions"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Code/Module/Settings/Channel.php:600
 msgid "System Registrations"
 msgstr "Inscripcions del Sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Code/Module/Settings/Channel.php:601
 msgid "Unseen shared files"
 msgstr "Fitxers compartits nous"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:602
+#: ../../Code/Module/Settings/Channel.php:602
 msgid "Unseen public activity"
 msgstr "Activitat pública nova"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:603
+#: ../../Code/Module/Settings/Channel.php:603
 msgid "Unseen likes and dislikes"
 msgstr "\"M'agrada\" i \"no m'agrada\" pendents"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:604
+#: ../../Code/Module/Settings/Channel.php:604
 msgid "Unseen forum posts"
 msgstr "Entrades de fòrum no llegides"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:605
+#: ../../Code/Module/Settings/Channel.php:605
 msgid "Email notification hub (hostname)"
 msgstr "Hub per a notificacions per correu (nom de domini)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:605
+#: ../../Code/Module/Settings/Channel.php:605
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple hubs, set this to your preferred "
 "location. This will prevent duplicate email notifications. Example: %s"
 msgstr "En cas que el teu canal estigui repicat en diversos hubs, habilita aquesta opció al teu hub preferit. Això evita notificacions duplicades. Exemple: %s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:606
+#: ../../Code/Module/Settings/Channel.php:606
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr "Mostra totes les novetats d'entrades de mur, missatges privats i connexions a Notícies"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:608
+#: ../../Code/Module/Settings/Channel.php:608
 msgid "Notify me of events this many days in advance"
 msgstr "Notifica'm dels esdeveniments amb aquests dies d'antelació"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:608
+#: ../../Code/Module/Settings/Channel.php:608
 msgid "Must be greater than 0"
 msgstr "Ha de ser més gran que 0"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:614
+#: ../../Code/Module/Settings/Channel.php:614
 msgid "Advanced Account/Page Type Settings"
 msgstr "Configuració avançada de compte i de tipus de pàgina"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:615
+#: ../../Code/Module/Settings/Channel.php:615
 msgid "Change the behaviour of this account for special situations"
 msgstr "Modifica el comportament d'aquest compte en situacions especials"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:617
+#: ../../Code/Module/Settings/Channel.php:617
 msgid "Miscellaneous Settings"
 msgstr "Configuració diversa"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:618
+#: ../../Code/Module/Settings/Channel.php:618
 msgid "Default photo upload folder"
 msgstr "Carpeta per defecte de fotos pujades"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:618
-#: ../../Zotlabs/Module/Settings/Channel.php:619
+#: ../../Code/Module/Settings/Channel.php:618
+#: ../../Code/Module/Settings/Channel.php:619
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - any en curs, %m -  mes corrent"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:619
+#: ../../Code/Module/Settings/Channel.php:619
 msgid "Default file upload folder"
 msgstr "Carpeta per defecte d'arxius pujats"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:621
+#: ../../Code/Module/Settings/Channel.php:621
 msgid "Personal menu to display in your channel pages"
 msgstr "Menú personal per mostrar en les teves pàgines de canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:623
+#: ../../Code/Module/Settings/Channel.php:623
 msgid "Remove this channel."
 msgstr "Elimina aquest canal."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:624
+#: ../../Code/Module/Settings/Channel.php:624
 msgid "Firefox Share $Projectname provider"
 msgstr "Firefox Share $Projectname provider"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:625
+#: ../../Code/Module/Settings/Channel.php:625
 msgid "Start calendar week on Monday"
 msgstr "Comença la setmana en dilluns"
 
-#: ../../Zotlabs/Module/Settings/Features.php:73
+#: ../../Code/Module/Settings/Features.php:73
 msgid "Additional Features"
 msgstr "Característiques Addicionals"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid "Your technical skill level"
 msgstr "El teu nivell tècnic"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid ""
 "Used to provide a member experience and additional features consistent with "
 "your comfort level"
 msgstr "Es fa servir per a oferir-te una experiència i un seguit de funcionalitats addicionals d'acord amb la complexitat que desitgis."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#: ../../Code/Module/Settings/Tokens.php:31
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Aquest canal té un límit de %d tokens"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
+#: ../../Code/Module/Settings/Tokens.php:37
 msgid "Name and Password are required."
 msgstr "El nom i la contrasenya són necessaris."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
+#: ../../Code/Module/Settings/Tokens.php:77
 msgid "Token saved."
 msgstr "S'ha desat el token."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
+#: ../../Code/Module/Settings/Tokens.php:113
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
 "visitors may login using these credentials to access private content."
 msgstr "Fes servir aquest formulari per a crear identificadors d'accés temporal per tal de compartir coses amb persones no membres. Aquestes identitats són reconegudes a \"Control d'accés\" i poden ser usades per iniciar sessió i accedir a contingut privat."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
+#: ../../Code/Module/Settings/Tokens.php:115
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
 "Examples:"
 msgstr "Si vols donar enllaços que no requereixin dos passos, pots afegir la contrasenya d'accés a la URL per compartir. Per exemple:"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:100
+#: ../../Code/Module/Settings/Tokens.php:150
+#: ../../Code/Widget/Settings_menu.php:100
 msgid "Guest Access Tokens"
 msgstr "Tokens d'accés de convidat"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
+#: ../../Code/Module/Settings/Tokens.php:157
 msgid "Login Name"
 msgstr "Nom d'usuari"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
+#: ../../Code/Module/Settings/Tokens.php:158
 msgid "Login Password"
 msgstr "Contrasenya d'usuari"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
+#: ../../Code/Module/Settings/Tokens.php:159
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Data de caducitat (aaaa-mm-dd)"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Code/Module/Settings/Tokens.php:160
+#: ../../Code/Module/Connedit.php:890
 msgid "Their Settings"
 msgstr "La seva configuració"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:36
+#: ../../Code/Module/Settings/Oauth2.php:36
 msgid "Name and Secret are required"
 msgstr "Es necessiten el nom i el secret"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:84
+#: ../../Code/Module/Settings/Oauth2.php:84
 msgid "Add OAuth2 application"
 msgstr "Afegeix una aplicació OAuth2"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:90
 msgid "Name of application"
 msgstr "Nom de l'aplicatiu"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth.php:118
 #: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:92
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generat automàticament- Canvia-ho si ho vols. Max. longitud 20"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth.php:119
 msgid "Redirect"
 msgstr "Redirecciona"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth.php:93
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI redirigida - No canviar excepte perquè el teu aplicatiu ho requereixi."
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "Grant Types"
 msgstr "Tipus de permís"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:91
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
-#: ../../Zotlabs/Module/Settings/Oauth2.php:119
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:91
+#: ../../Code/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:119
 msgid "leave blank unless your application sepcifically requires this"
 msgstr "deixa-ho en blanc si no és que la teva aplicació ho demana explícitament"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:91
-#: ../../Zotlabs/Module/Settings/Oauth2.php:119
+#: ../../Code/Module/Settings/Oauth2.php:91
+#: ../../Code/Module/Settings/Oauth2.php:119
 msgid "Authorization scope"
 msgstr "Àmbit d'autorització"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:103
+#: ../../Code/Module/Settings/Oauth2.php:103
 msgid "OAuth2 Application not found."
 msgstr "No s'ha trobat l'aplicació OAuth2."
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth2.php:149
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
+#: ../../Code/Module/Settings/Oauth2.php:112
+#: ../../Code/Module/Settings/Oauth2.php:149
+#: ../../Code/Module/Settings/Oauth.php:87
+#: ../../Code/Module/Settings/Oauth.php:113
+#: ../../Code/Module/Settings/Oauth.php:149
 msgid "Add application"
 msgstr "Afegir aplicatiu"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:148
+#: ../../Code/Module/Settings/Oauth2.php:148
 msgid "Connected OAuth2 Apps"
 msgstr "Aplicacions OAuth2 connectades"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:152
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
+#: ../../Code/Module/Settings/Oauth2.php:152
+#: ../../Code/Module/Settings/Oauth.php:152
 msgid "Client key starts with"
 msgstr "La clau del client comença amb"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:153
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
+#: ../../Code/Module/Settings/Oauth2.php:153
+#: ../../Code/Module/Settings/Oauth.php:153
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:154
-#: ../../Zotlabs/Module/Settings/Oauth.php:154
+#: ../../Code/Module/Settings/Oauth2.php:154
+#: ../../Code/Module/Settings/Oauth.php:154
 msgid "Remove authorization"
 msgstr "Elimina autorització"
 
-#: ../../Zotlabs/Module/Settings/Account.php:20
+#: ../../Code/Module/Settings/Account.php:20
 msgid "Not valid email."
 msgstr "E-correu no vàlid."
 
-#: ../../Zotlabs/Module/Settings/Account.php:23
+#: ../../Code/Module/Settings/Account.php:23
 msgid "Protected email address. Cannot change to that email."
 msgstr "Adreça d'e-correu protegida. No es pot canviar a aquest e-correu."
 
-#: ../../Zotlabs/Module/Settings/Account.php:32
+#: ../../Code/Module/Settings/Account.php:32
 msgid "System failure storing new email. Please try again."
 msgstr "Fallada del sistema al guardar un nou correu. Si us plau, proba de nou."
 
-#: ../../Zotlabs/Module/Settings/Account.php:40
+#: ../../Code/Module/Settings/Account.php:40
 msgid "Technical skill level updated"
 msgstr "S'ha actualitzat el nivell de competències tècniques"
 
-#: ../../Zotlabs/Module/Settings/Account.php:56
+#: ../../Code/Module/Settings/Account.php:56
 msgid "Password verification failed."
 msgstr "La verificació de la contrasenya ha fallat."
 
-#: ../../Zotlabs/Module/Settings/Account.php:63
+#: ../../Code/Module/Settings/Account.php:63
 msgid "Passwords do not match. Password unchanged."
 msgstr "Les contrasenyes no coincideixen. Contrasenya sense canvis."
 
-#: ../../Zotlabs/Module/Settings/Account.php:67
+#: ../../Code/Module/Settings/Account.php:67
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Les contrasenyes en blanc no estan permesas. Contrasenya sense canvis."
 
-#: ../../Zotlabs/Module/Settings/Account.php:81
+#: ../../Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr "Contrasenya canviada."
 
-#: ../../Zotlabs/Module/Settings/Account.php:83
+#: ../../Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr "L'actualització de la contrasenya va fallar. Si us plau, torneu a intentar-ho."
 
-#: ../../Zotlabs/Module/Settings/Account.php:112
+#: ../../Code/Module/Settings/Account.php:112
 msgid "Account Settings"
 msgstr "Configuració del compte"
 
-#: ../../Zotlabs/Module/Settings/Account.php:113
+#: ../../Code/Module/Settings/Account.php:113
 msgid "Current Password"
 msgstr "Contrasenya Actual"
 
-#: ../../Zotlabs/Module/Settings/Account.php:114
+#: ../../Code/Module/Settings/Account.php:114
 msgid "Enter New Password"
 msgstr "Entra la Nova Contrasenya"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Confirm New Password"
 msgstr "Confirma la Nova Contrasenya"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Leave password fields blank unless changing"
 msgstr "Deixa els camps de contrasenya en blanc llevat que la vulguis canviar"
 
-#: ../../Zotlabs/Module/Settings/Account.php:120
-#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Code/Module/Settings/Account.php:120
+#: ../../Code/Module/Removeaccount.php:61
 msgid "Remove Account"
 msgstr "Esborra el Compte"
 
-#: ../../Zotlabs/Module/Settings/Account.php:121
+#: ../../Code/Module/Settings/Account.php:121
 msgid "Remove this account including all its channels"
 msgstr "Esborra aquest compte inclosos tots els seus canals"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:23
+#: ../../Code/Module/Settings/Featured.php:23
 msgid "Affinity Slider settings updated."
 msgstr "S'ha actualitzat la configuració de la barra d'afinitat"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:38
+#: ../../Code/Module/Settings/Featured.php:38
 msgid "No feature settings configured"
 msgstr "No hi ha opcions de les funcions configurades"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "Default maximum affinity level"
 msgstr "Nivell màxim d'afinitat predeterminat"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "0-99 default 99"
 msgstr "0-99 (per defecte 99)"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "Default minimum affinity level"
 msgstr "Nivell mínim d'afinitat predeterminat"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "0-99 - default 0"
 msgstr "0-99 (per defecte 0)"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Featured.php:54
 msgid "Affinity Slider Settings"
 msgstr "Configuració de la barra d'afinitat"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:67
+#: ../../Code/Module/Settings/Featured.php:67
 msgid "Addon Settings"
 msgstr "Configuració de les extensions"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:68
+#: ../../Code/Module/Settings/Featured.php:68
 msgid "Please save/submit changes to any panel before opening another."
 msgstr "Desa els canvis en un panell abans d'obrir-ne un altre."
 
-#: ../../Zotlabs/Module/Settings/Display.php:139
+#: ../../Code/Module/Settings/Display.php:139
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:187
+#: ../../Code/Module/Settings/Display.php:187
 msgid "Display Settings"
 msgstr "Configuració de pantalla"
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Code/Module/Settings/Display.php:188
 msgid "Theme Settings"
 msgstr "Configuració de tema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Code/Module/Settings/Display.php:189
 msgid "Custom Theme Settings"
 msgstr "Configuració de temes personalitzats"
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Code/Module/Settings/Display.php:190
 msgid "Content Settings"
 msgstr "Configuració dels continguts"
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Code/Module/Settings/Display.php:196
 msgid "Display Theme:"
 msgstr "Tema de pantalla:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Code/Module/Settings/Display.php:197
 msgid "Select scheme"
 msgstr "Tria esquema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid "Preload images before rendering the page"
 msgstr "Precarrega les imatges abans de dibuixar la pàgina"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "El temps subjectiu per carregar la pàgina pot ser llarg però la pàgina estarà preparada quan es mostri"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
+#: ../../Code/Module/Settings/Display.php:200
 msgid "Enable user zoom on mobile devices"
 msgstr "Zoom d'usuari en dispositius mòbils"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Update browser every xx seconds"
 msgstr "Actualitza el navegador cada xx segons"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Mínim de 10 segons, sense màxim"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Nombre màxim de conversacions a càrregar cada vegada"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum of 100 items"
 msgstr "Màxim de 100 elements"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Code/Module/Settings/Display.php:203
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostra emoticons (smilies) com a imatges"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Provide channel menu in navigation bar"
 msgstr "Mostra el menú de canal a la barra de navegació"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Default: channel menu located in app menu"
 msgstr "Per defecte, el menú de canal es troba al menú d'aplicacions"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Manual conversation updates"
 msgstr "Actualitza les converses manualment"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Default is on, turning this off may increase screen jumping"
 msgstr "Per defecte està habilitada perquè evita que la pàgina salti cap avall en actualitzar-se."
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Code/Module/Settings/Display.php:206
 msgid "Link post titles to source"
 msgstr "Enllaça a l'origen els títols de l'entrada"
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
+#: ../../Code/Module/Settings/Display.php:207
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Editor de dissenys de pàgines de sistema (avançat)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:210
 msgid "Use blog/list mode on channel page"
 msgstr "Empra el mode blog/llista a la pàgina del canal"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:211
 msgid "(comments displayed separately)"
 msgstr "(Observacions es mostren per separat)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:211
 msgid "Use blog/list mode on grid page"
 msgstr "Empra el mode de blog/llista a la pàgina de la malla"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:212
 msgid "Channel page max height of content (in pixels)"
 msgstr "Alçada màxima de contingut (en píxels) de la pàgina de Canal"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:213
 msgid "click to expand content exceeding this height"
 msgstr "Clic per expandir el contingut que excedeixi aquesta alçada"
 
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:213
 msgid "Grid page max height of content (in pixels)"
 msgstr "Alçada màxima dels continguts (en píxels) de la Pàgina de Malla "
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:35
+#: ../../Code/Module/Settings/Oauth.php:35
 msgid "Name is required"
 msgstr "Es requereix un Nom"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:39
+#: ../../Code/Module/Settings/Oauth.php:39
 msgid "Key and Secret are required"
 msgstr "Es requereix Clau (Key) i el Secret (Secret)"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:117
 #: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Settings/Oauth.php:120
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Settings/Oauth.php:120
 msgid "Icon url"
 msgstr "Icona de url"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Sources.php:115 ../../Code/Module/Sources.php:150
 msgid "Optional"
 msgstr "Opcional"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:105
+#: ../../Code/Module/Settings/Oauth.php:105
 msgid "Application not found."
 msgstr "Aplicatiu no trobat."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
+#: ../../Code/Module/Settings/Oauth.php:148
 msgid "Connected Apps"
 msgstr "Aplicatius Conectats"
 
-#: ../../Zotlabs/Module/Embedphotos.php:140
-#: ../../Zotlabs/Module/Photos.php:816 ../../Zotlabs/Module/Photos.php:1355
-#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
+#: ../../Code/Module/Embedphotos.php:140
+#: ../../Code/Module/Photos.php:816 ../../Code/Module/Photos.php:1355
+#: ../../Code/Widget/Portfolio.php:87 ../../Code/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Mostra la imatge"
 
-#: ../../Zotlabs/Module/Embedphotos.php:156
-#: ../../Zotlabs/Module/Photos.php:847 ../../Zotlabs/Widget/Portfolio.php:108
-#: ../../Zotlabs/Widget/Album.php:95
+#: ../../Code/Module/Embedphotos.php:156
+#: ../../Code/Module/Photos.php:847 ../../Code/Widget/Portfolio.php:108
+#: ../../Code/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Modifica l'àlbum"
 
-#: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Module/Photos.php:717
-#: ../../Zotlabs/Module/Profile_photo.php:459
-#: ../../Zotlabs/Module/Cover_photo.php:395
-#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133
-#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Widget/Album.php:97
+#: ../../Code/Module/Embedphotos.php:158
+#: ../../Code/Module/Photos.php:717
+#: ../../Code/Module/Profile_photo.php:459
+#: ../../Code/Module/Cover_photo.php:395
+#: ../../Code/Storage/Browser.php:392 ../../Code/Widget/Cdav.php:133
+#: ../../Code/Widget/Cdav.php:169 ../../Code/Widget/Portfolio.php:110
+#: ../../Code/Widget/Album.php:97
 msgid "Upload"
 msgstr "Pujar"
 
-#: ../../Zotlabs/Module/Achievements.php:38
+#: ../../Code/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr "Algunes propostes sobre el que cal fer quan ets nou aquí"
 
-#: ../../Zotlabs/Module/Thing.php:120
+#: ../../Code/Module/Thing.php:120
 msgid "Thing updated"
 msgstr "S'ha actualitzat la cosa"
 
-#: ../../Zotlabs/Module/Thing.php:172
+#: ../../Code/Module/Thing.php:172
 msgid "Object store: failed"
 msgstr "No s'ha pogut emmagatzemar l'objecte"
 
-#: ../../Zotlabs/Module/Thing.php:176
+#: ../../Code/Module/Thing.php:176
 msgid "Thing added"
 msgstr "S'ha afegit la cosa"
 
-#: ../../Zotlabs/Module/Thing.php:202
+#: ../../Code/Module/Thing.php:202
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Thing.php:265
+#: ../../Code/Module/Thing.php:265
 msgid "Show Thing"
 msgstr "Mostra la cosa"
 
-#: ../../Zotlabs/Module/Thing.php:272
+#: ../../Code/Module/Thing.php:272
 msgid "item not found."
 msgstr "no s'ha trobat l'element."
 
-#: ../../Zotlabs/Module/Thing.php:305
+#: ../../Code/Module/Thing.php:305
 msgid "Edit Thing"
 msgstr "Edita la cosa"
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364
+#: ../../Code/Module/Thing.php:307 ../../Code/Module/Thing.php:364
 msgid "Select a profile"
 msgstr "Tria un perfil"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Post an activity"
 msgstr "Publica una activitat"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Only sends to viewers of the applicable profile"
 msgstr "S'envia només a visitants del perfil corresponent"
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+#: ../../Code/Module/Thing.php:313 ../../Code/Module/Thing.php:369
 msgid "Name of thing e.g. something"
 msgstr "Nom de la cosa. Exemple: patata"
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370
+#: ../../Code/Module/Thing.php:315 ../../Code/Module/Thing.php:370
 msgid "URL of thing (optional)"
 msgstr "Adreça URL de la cosa (opcional)"
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371
+#: ../../Code/Module/Thing.php:317 ../../Code/Module/Thing.php:371
 msgid "URL for photo of thing (optional)"
 msgstr "Adreça URL de la foto d'una cosa (opcional)"
 
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
-#: ../../Zotlabs/Module/Photos.php:707 ../../Zotlabs/Module/Photos.php:1076
-#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
-#: ../../Zotlabs/Module/Filestorage.php:170
+#: ../../Code/Module/Thing.php:319 ../../Code/Module/Thing.php:372
+#: ../../Code/Module/Photos.php:707 ../../Code/Module/Photos.php:1076
+#: ../../Code/Module/Connedit.php:676 ../../Code/Module/Chat.php:235
+#: ../../Code/Module/Filestorage.php:170
 #: ../../include/acl_selectors.php:123
 msgid "Permissions"
 msgstr "Permisos "
 
-#: ../../Zotlabs/Module/Thing.php:362
+#: ../../Code/Module/Thing.php:362
 msgid "Add Thing to your Profile"
 msgstr "Afegeix una cosa al teu perfil"
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:55
+#: ../../Code/Module/Notify.php:61
+#: ../../Code/Module/Notifications.php:55
 msgid "No more system notifications."
 msgstr "No hi ha més notificacions del sistema."
 
-#: ../../Zotlabs/Module/Notify.php:65
-#: ../../Zotlabs/Module/Notifications.php:59
+#: ../../Code/Module/Notify.php:65
+#: ../../Code/Module/Notifications.php:59
 msgid "System Notifications"
 msgstr "Notificacions del sistema"
 
-#: ../../Zotlabs/Module/Follow.php:36
+#: ../../Code/Module/Follow.php:36
 msgid "Connection added."
 msgstr "S'ha afegit la connexió."
 
-#: ../../Zotlabs/Module/Import.php:146
+#: ../../Code/Module/Import.php:146
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "El teu paquet de serveis només admet %d canals."
 
-#: ../../Zotlabs/Module/Import.php:173
+#: ../../Code/Module/Import.php:173
 msgid "No channel. Import failed."
 msgstr "Sense canal. No s'ha pogut importar."
 
-#: ../../Zotlabs/Module/Import.php:513
+#: ../../Code/Module/Import.php:513
 #: ../../addon/diaspora/import_diaspora.php:139
 msgid "Import completed."
 msgstr "S'ha completat la importació."
 
-#: ../../Zotlabs/Module/Import.php:541
+#: ../../Code/Module/Import.php:541
 msgid "You must be logged in to use this feature."
 msgstr "Has d'estar registrat per fer servir aquesta funcionalitat."
 
-#: ../../Zotlabs/Module/Import.php:546
+#: ../../Code/Module/Import.php:546
 msgid "Import Channel"
 msgstr "Importa un canal"
 
-#: ../../Zotlabs/Module/Import.php:547
+#: ../../Code/Module/Import.php:547
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal  des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació"
 
-#: ../../Zotlabs/Module/Import.php:549
+#: ../../Code/Module/Import.php:549
 msgid "Or provide the old server/hub details"
 msgstr "O proveeix els detalls de l'antic servidor/node"
 
-#: ../../Zotlabs/Module/Import.php:551
+#: ../../Code/Module/Import.php:551
 msgid "Your old identity address (xyz@example.com)"
 msgstr "La teva adreça de canal antiga. El format és canal@exemple.org"
 
-#: ../../Zotlabs/Module/Import.php:552
+#: ../../Code/Module/Import.php:552
 msgid "Your old login email address"
 msgstr "La teva adreça de correu electrònic antiga"
 
-#: ../../Zotlabs/Module/Import.php:553
+#: ../../Code/Module/Import.php:553
 msgid "Your old login password"
 msgstr "La teva contrasenya antiga"
 
-#: ../../Zotlabs/Module/Import.php:554
+#: ../../Code/Module/Import.php:554
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importa, si es possible, missatges de fa uns quants mesos (limitat per la memòria disponible) "
 
-#: ../../Zotlabs/Module/Import.php:556
+#: ../../Code/Module/Import.php:556
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -4510,511 +4510,511 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària."
 
-#: ../../Zotlabs/Module/Import.php:558
+#: ../../Code/Module/Import.php:558
 msgid "Make this hub my primary location"
 msgstr "Fes d'aquest node la meva ubicació primària"
 
-#: ../../Zotlabs/Module/Import.php:559
+#: ../../Code/Module/Import.php:559
 msgid "Move this channel (disable all previous locations)"
 msgstr "Moure aquest canal (desactiva totes les prèvies localitzacions)"
 
-#: ../../Zotlabs/Module/Import.php:560
+#: ../../Code/Module/Import.php:560
 msgid "Use this channel nickname instead of the one provided"
 msgstr "Fes servir aquest nom de canal en comptes del que has facilitat"
 
-#: ../../Zotlabs/Module/Import.php:560
+#: ../../Code/Module/Import.php:560
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this "
 "site."
 msgstr "Deixa-ho en blanc per a mantenir el teu nom de canal actual. Se t'assignarà un nom aleatori però similar a l'actual en cas que el nom actual ja estigui agafat en aquest node."
 
-#: ../../Zotlabs/Module/Import.php:562
+#: ../../Code/Module/Import.php:562
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
 msgstr "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi."
 
-#: ../../Zotlabs/Module/Rmagic.php:35
+#: ../../Code/Module/Rmagic.php:35
 msgid "Authentication failed."
 msgstr "Ha fallat l'autentificació."
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1614
+#: ../../Code/Module/Rmagic.php:75 ../../boot.php:1614
 #: ../../include/channel.php:2334
 msgid "Remote Authentication"
 msgstr "Autentificació Remota"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2335
+#: ../../Code/Module/Rmagic.php:76 ../../include/channel.php:2335
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Introdueix la teva adreça del canal (eg canal@exemple.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2336
+#: ../../Code/Module/Rmagic.php:77 ../../include/channel.php:2336
 msgid "Authenticate"
 msgstr "Autentica't"
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Code/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Permís denegat."
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2482
+#: ../../Code/Module/Cal.php:344 ../../include/text.php:2482
 msgid "Import"
 msgstr "Importar"
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+#: ../../Code/Module/Api.php:74 ../../Code/Module/Api.php:95
 msgid "Authorize application connection"
 msgstr "Autoritza la connexió de l'aplicació"
 
-#: ../../Zotlabs/Module/Api.php:75
+#: ../../Code/Module/Api.php:75
 msgid "Return to your app and insert this Security Code:"
 msgstr "Torna a la teva aplicació i introdueix aquest codi de seguertat"
 
-#: ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:85
 msgid "Please login to continue."
 msgstr "Si et plau, identifica't per continuar."
 
-#: ../../Zotlabs/Module/Api.php:97
+#: ../../Code/Module/Api.php:97
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Vols autoritzar a aquesta aplicació l'accés a les teves entrades i contactes i/o a crear noves entrades com si fos tu mateix."
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Article no disponible."
 
-#: ../../Zotlabs/Module/Editblock.php:138
+#: ../../Code/Module/Editblock.php:138
 msgid "Edit Block"
 msgstr "Editar Bloc"
 
-#: ../../Zotlabs/Module/Profile.php:93
+#: ../../Code/Module/Profile.php:93
 msgid "vcard"
 msgstr "vcard (targeta estàndard de contacte)"
 
-#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Lib/Apps.php:291
+#: ../../Code/Module/Apps.php:50 ../../Code/Lib/Apps.php:291
 msgid "Apps"
 msgstr "Aplicatius"
 
-#: ../../Zotlabs/Module/Apps.php:53
+#: ../../Code/Module/Apps.php:53
 msgid "Manage apps"
 msgstr "Gestiona apps"
 
-#: ../../Zotlabs/Module/Apps.php:54
+#: ../../Code/Module/Apps.php:54
 msgid "Create new app"
 msgstr "Crear una nova app"
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268
+#: ../../Code/Module/Mood.php:67 ../../include/conversation.php:268
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s es %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:315
+#: ../../Code/Module/Mood.php:135 ../../Code/Lib/Apps.php:315
 msgid "Mood"
 msgstr "Ànim"
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Code/Module/Mood.php:136
 msgid "Set your current mood and tell your friends"
 msgstr "Estableix el teu estat d'ànim actual i digues-li als teus amics"
 
-#: ../../Zotlabs/Module/Connections.php:55
-#: ../../Zotlabs/Module/Connections.php:112
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Code/Module/Connections.php:55
+#: ../../Code/Module/Connections.php:112
+#: ../../Code/Module/Connections.php:256
 msgid "Active"
 msgstr "Actives"
 
-#: ../../Zotlabs/Module/Connections.php:60
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Code/Module/Connections.php:60
+#: ../../Code/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:261
 msgid "Blocked"
 msgstr "Bloquejades"
 
-#: ../../Zotlabs/Module/Connections.php:65
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Code/Module/Connections.php:65
+#: ../../Code/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:260
 msgid "Ignored"
 msgstr "Ignorades"
 
-#: ../../Zotlabs/Module/Connections.php:70
-#: ../../Zotlabs/Module/Connections.php:185
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Code/Module/Connections.php:70
+#: ../../Code/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:259
 msgid "Hidden"
 msgstr "Amagades"
 
-#: ../../Zotlabs/Module/Connections.php:75
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:75
+#: ../../Code/Module/Connections.php:178
 msgid "Archived/Unreachable"
 msgstr "Arxivades o inaccessibles"
 
-#: ../../Zotlabs/Module/Connections.php:80
-#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:179
-#: ../../Zotlabs/Module/Notifications.php:50
+#: ../../Code/Module/Connections.php:80
+#: ../../Code/Module/Connections.php:89 ../../Code/Module/Menu.php:179
+#: ../../Code/Module/Notifications.php:50
 #: ../../include/conversation.php:1726
 msgid "New"
 msgstr "Nou"
 
-#: ../../Zotlabs/Module/Connections.php:94
-#: ../../Zotlabs/Module/Connections.php:108
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
+#: ../../Code/Module/Connections.php:94
+#: ../../Code/Module/Connections.php:108
+#: ../../Code/Module/Connedit.php:713 ../../Code/Widget/Affinity.php:26
 msgid "All"
 msgstr "Tots"
 
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Code/Module/Connections.php:140
 msgid "Active Connections"
 msgstr "Connexions actives"
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Code/Module/Connections.php:143
 msgid "Show active connections"
 msgstr "Mostra les connexions actives"
 
-#: ../../Zotlabs/Module/Connections.php:147
-#: ../../Zotlabs/Widget/Notifications.php:84
+#: ../../Code/Module/Connections.php:147
+#: ../../Code/Widget/Notifications.php:84
 msgid "New Connections"
 msgstr "Noves Connexions"
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Code/Module/Connections.php:150
 msgid "Show pending (new) connections"
 msgstr "Mostra les connexions pendents (noves)"
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Code/Module/Connections.php:167
 msgid "Only show blocked connections"
 msgstr "Mostra només les connexions bloquejades"
 
-#: ../../Zotlabs/Module/Connections.php:174
+#: ../../Code/Module/Connections.php:174
 msgid "Only show ignored connections"
 msgstr "Mostra només les connexions ignorades"
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Code/Module/Connections.php:181
 msgid "Only show archived/unreachable connections"
 msgstr "Mostra només les connexions arxivades o inaccessibles"
 
-#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Code/Module/Connections.php:188
 msgid "Only show hidden connections"
 msgstr "Mostra només les connexions amagades"
 
-#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Code/Module/Connections.php:203
 msgid "Show all connections"
 msgstr "Mostra totes les connexions"
 
-#: ../../Zotlabs/Module/Connections.php:257
+#: ../../Code/Module/Connections.php:257
 msgid "Pending approval"
 msgstr "Pendent d'aprovació"
 
-#: ../../Zotlabs/Module/Connections.php:258
+#: ../../Code/Module/Connections.php:258
 msgid "Archived"
 msgstr "Arxivades"
 
-#: ../../Zotlabs/Module/Connections.php:262
+#: ../../Code/Module/Connections.php:262
 msgid "Not connected at this location"
 msgstr "No està connectada des d'aquest aquest hub"
 
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Code/Module/Connections.php:279
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Code/Module/Connections.php:280
 msgid "Edit connection"
 msgstr "Modifica la connexió"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Code/Module/Connections.php:282
 msgid "Delete connection"
 msgstr "Elimina la connexió"
 
-#: ../../Zotlabs/Module/Connections.php:291
+#: ../../Code/Module/Connections.php:291
 msgid "Channel address"
 msgstr "Adreça del canal"
 
-#: ../../Zotlabs/Module/Connections.php:293
+#: ../../Code/Module/Connections.php:293
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Code/Module/Connections.php:296
 msgid "Call"
 msgstr "Crida"
 
-#: ../../Zotlabs/Module/Connections.php:298
+#: ../../Code/Module/Connections.php:298
 msgid "Status"
 msgstr "Estat"
 
-#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Code/Module/Connections.php:300
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../../Zotlabs/Module/Connections.php:302
+#: ../../Code/Module/Connections.php:302
 msgid "Approve connection"
 msgstr "Aprovar la Connexió "
 
-#: ../../Zotlabs/Module/Connections.php:304
+#: ../../Code/Module/Connections.php:304
 msgid "Ignore connection"
 msgstr "Ignorar connexió"
 
-#: ../../Zotlabs/Module/Connections.php:305
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connections.php:305
+#: ../../Code/Module/Connedit.php:630
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../../Zotlabs/Module/Connections.php:306
+#: ../../Code/Module/Connections.php:306
 msgid "Recent activity"
 msgstr "Activitat recent"
 
-#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:298
+#: ../../Code/Module/Connections.php:331 ../../Code/Lib/Apps.php:298
 #: ../../include/text.php:975
 msgid "Connections"
 msgstr "Connexions"
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Code/Module/Connections.php:336
 msgid "Search your connections"
 msgstr "Cerca entre les teves connexions"
 
-#: ../../Zotlabs/Module/Connections.php:337
+#: ../../Code/Module/Connections.php:337
 msgid "Connections search"
 msgstr "Cerca connexions"
 
-#: ../../Zotlabs/Module/Connections.php:338
-#: ../../Zotlabs/Module/Directory.php:401
-#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23
+#: ../../Code/Module/Connections.php:338
+#: ../../Code/Module/Directory.php:401
+#: ../../Code/Module/Directory.php:406 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Troba"
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
+#: ../../Code/Module/Viewsrc.php:43
 msgid "item"
 msgstr "element"
 
-#: ../../Zotlabs/Module/Bookmarks.php:56
+#: ../../Code/Module/Bookmarks.php:56
 msgid "Bookmark added"
 msgstr "S'ha afegit el marcador"
 
-#: ../../Zotlabs/Module/Bookmarks.php:79
+#: ../../Code/Module/Bookmarks.php:79
 msgid "My Bookmarks"
 msgstr "Els meus marcadors"
 
-#: ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../Code/Module/Bookmarks.php:90
 msgid "My Connections Bookmarks"
 msgstr "Els marcadors de les meves connexions"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../Code/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "L'esborrat de comptes no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Esborra el compte"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Aquest compte i tots els seus canals s'estan apunt d'esborrar totalment de la xarxa."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Esborra de la xarxa aquest compte, tots els seus canals, i tots els seus canals clons."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Per defecte, només les instancies dels canal ubicats en aquest node poden esser esborrades  de la xarxa"
 
-#: ../../Zotlabs/Module/Photos.php:78
+#: ../../Code/Module/Photos.php:78
 msgid "Page owner information could not be retrieved."
 msgstr "La informació del propietari de la pàgina no va poder ser recuperada"
 
-#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113
+#: ../../Code/Module/Photos.php:94 ../../Code/Module/Photos.php:113
 msgid "Album not found."
 msgstr "Àlbum no trobat"
 
-#: ../../Zotlabs/Module/Photos.php:103
+#: ../../Code/Module/Photos.php:103
 msgid "Delete Album"
 msgstr "Esborra Àlbum"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088
+#: ../../Code/Module/Photos.php:174 ../../Code/Module/Photos.php:1088
 msgid "Delete Photo"
 msgstr "Esborra Foto"
 
-#: ../../Zotlabs/Module/Photos.php:556
+#: ../../Code/Module/Photos.php:556
 msgid "No photos selected"
 msgstr "No has seleccionat fotos"
 
-#: ../../Zotlabs/Module/Photos.php:605
+#: ../../Code/Module/Photos.php:605
 msgid "Access to this item is restricted."
 msgstr "L'accés a aquest element esta restringit."
 
-#: ../../Zotlabs/Module/Photos.php:651
+#: ../../Code/Module/Photos.php:651
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "S'estan fent servir %1$.2f MB de %2$.2f MB de l'espai per a imatges."
 
-#: ../../Zotlabs/Module/Photos.php:654
+#: ../../Code/Module/Photos.php:654
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "S'estan fent servir %1$.2f MB de l'espai per a imatges."
 
-#: ../../Zotlabs/Module/Photos.php:696
+#: ../../Code/Module/Photos.php:696
 msgid "Upload Photos"
 msgstr "Puja imatges"
 
-#: ../../Zotlabs/Module/Photos.php:700
+#: ../../Code/Module/Photos.php:700
 msgid "Enter an album name"
 msgstr "Escriu el nom del àlbum"
 
-#: ../../Zotlabs/Module/Photos.php:701
+#: ../../Code/Module/Photos.php:701
 msgid "or select an existing album (doubleclick)"
 msgstr "o bé fes doble clic a un d'existent"
 
-#: ../../Zotlabs/Module/Photos.php:702
+#: ../../Code/Module/Photos.php:702
 msgid "Create a status post for this upload"
 msgstr "Genera una entrada a partir de la pujada"
 
-#: ../../Zotlabs/Module/Photos.php:704
+#: ../../Code/Module/Photos.php:704
 msgid "Description (optional)"
 msgstr "Descripció (opcional)"
 
-#: ../../Zotlabs/Module/Photos.php:790
+#: ../../Code/Module/Photos.php:790
 msgid "Show Newest First"
 msgstr "Ordena de més nou a més antic"
 
-#: ../../Zotlabs/Module/Photos.php:792
+#: ../../Code/Module/Photos.php:792
 msgid "Show Oldest First"
 msgstr "Ordena de més antic a més nou"
 
-#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386
+#: ../../Code/Module/Photos.php:849 ../../Code/Module/Photos.php:1386
 msgid "Add Photos"
 msgstr "Afegeix fotos"
 
-#: ../../Zotlabs/Module/Photos.php:897
+#: ../../Code/Module/Photos.php:897
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "S'ha denegat el permís. Pot ser que l'accés estigui restringit."
 
-#: ../../Zotlabs/Module/Photos.php:899
+#: ../../Code/Module/Photos.php:899
 msgid "Photo not available"
 msgstr "La imatge no està disponible"
 
-#: ../../Zotlabs/Module/Photos.php:957
+#: ../../Code/Module/Photos.php:957
 msgid "Use as profile photo"
 msgstr "Fes-la imatge de perfil"
 
-#: ../../Zotlabs/Module/Photos.php:958
+#: ../../Code/Module/Photos.php:958
 msgid "Use as cover photo"
 msgstr "Emprar com a foto de portada"
 
-#: ../../Zotlabs/Module/Photos.php:965
+#: ../../Code/Module/Photos.php:965
 msgid "Private Photo"
 msgstr "Imatge privada"
 
-#: ../../Zotlabs/Module/Photos.php:980
+#: ../../Code/Module/Photos.php:980
 msgid "View Full Size"
 msgstr "Mostra a mida completa"
 
-#: ../../Zotlabs/Module/Photos.php:1062
+#: ../../Code/Module/Photos.php:1062
 msgid "Edit photo"
 msgstr "Modifica la imatge"
 
-#: ../../Zotlabs/Module/Photos.php:1064
+#: ../../Code/Module/Photos.php:1064
 msgid "Rotate CW (right)"
 msgstr "Tomba cap a la dreta"
 
-#: ../../Zotlabs/Module/Photos.php:1065
+#: ../../Code/Module/Photos.php:1065
 msgid "Rotate CCW (left)"
 msgstr "Tomba cap a l'esquerra"
 
-#: ../../Zotlabs/Module/Photos.php:1068
+#: ../../Code/Module/Photos.php:1068
 msgid "Move photo to album"
 msgstr "Mou la foto a un àlbum"
 
-#: ../../Zotlabs/Module/Photos.php:1069
+#: ../../Code/Module/Photos.php:1069
 msgid "Enter a new album name"
 msgstr "Escriu el nom del nou àlbum"
 
-#: ../../Zotlabs/Module/Photos.php:1070
+#: ../../Code/Module/Photos.php:1070
 msgid "or select an existing one (doubleclick)"
 msgstr "o bé fes doble clic a un d'existent"
 
-#: ../../Zotlabs/Module/Photos.php:1075
+#: ../../Code/Module/Photos.php:1075
 msgid "Add a Tag"
 msgstr "Afegeix una etiqueta"
 
-#: ../../Zotlabs/Module/Photos.php:1083
+#: ../../Code/Module/Photos.php:1083
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Exemple: @joan, @Paula_Peris, @mar@exemple.org"
 
-#: ../../Zotlabs/Module/Photos.php:1086
+#: ../../Code/Module/Photos.php:1086
 msgid "Flag as adult in album view"
 msgstr "Marca com a contingut adult"
 
-#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:285
+#: ../../Code/Module/Photos.php:1105 ../../Code/Lib/ThreadItem.php:285
 msgid "I like this (toggle)"
 msgstr "M'agrada això (canvia)"
 
-#: ../../Zotlabs/Module/Photos.php:1106 ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Code/Module/Photos.php:1106 ../../Code/Lib/ThreadItem.php:286
 msgid "I don't like this (toggle)"
 msgstr "No m'agrada això (canvia)"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../Zotlabs/Lib/ThreadItem.php:432
+#: ../../Code/Module/Photos.php:1108 ../../Code/Lib/ThreadItem.php:432
 #: ../../include/conversation.php:787
 msgid "Please wait"
 msgstr "Si us plau, espera"
 
-#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242
-#: ../../Zotlabs/Lib/ThreadItem.php:754
+#: ../../Code/Module/Photos.php:1124 ../../Code/Module/Photos.php:1242
+#: ../../Code/Lib/ThreadItem.php:754
 msgid "This is you"
 msgstr "Ets tú"
 
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244
-#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/js_strings.php:6
+#: ../../Code/Module/Photos.php:1126 ../../Code/Module/Photos.php:1244
+#: ../../Code/Lib/ThreadItem.php:756 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Comentari"
 
-#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1142 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Likes"
 msgstr "Agrada"
 
-#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1142 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Desagrada"
 
-#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1143 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Agree"
 msgstr "Acord"
 
-#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1143 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Disagree"
 msgstr "Desacord"
 
-#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1143 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstenirse"
 
-#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621
+#: ../../Code/Module/Photos.php:1144 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Attending"
 msgstr "Assistint"
 
-#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621
+#: ../../Code/Module/Photos.php:1144 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Not attending"
 msgstr "Desassistint"
 
-#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621
+#: ../../Code/Module/Photos.php:1144 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Might attend"
 msgstr "Podrien assistir"
 
-#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173
-#: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224
+#: ../../Code/Module/Photos.php:1161 ../../Code/Module/Photos.php:1173
+#: ../../Code/Lib/ThreadItem.php:212 ../../Code/Lib/ThreadItem.php:224
 msgid "View all"
 msgstr "Veure tot"
 
-#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:216
+#: ../../Code/Module/Photos.php:1165 ../../Code/Lib/ThreadItem.php:216
 #: ../../include/conversation.php:1990 ../../include/channel.php:1539
 #: ../../include/taxonomy.php:661
 msgctxt "noun"
@@ -5023,7 +5023,7 @@ msgid_plural "Likes"
 msgstr[0] "Agrada"
 msgstr[1] "Agraden"
 
-#: ../../Zotlabs/Module/Photos.php:1170 ../../Zotlabs/Lib/ThreadItem.php:221
+#: ../../Code/Module/Photos.php:1170 ../../Code/Lib/ThreadItem.php:221
 #: ../../include/conversation.php:1993
 msgctxt "noun"
 msgid "Dislike"
@@ -5031,539 +5031,539 @@ msgid_plural "Dislikes"
 msgstr[0] "Desagrada"
 msgstr[1] "Desagrada"
 
-#: ../../Zotlabs/Module/Photos.php:1270
+#: ../../Code/Module/Photos.php:1270
 msgid "Photo Tools"
 msgstr "Eines per Fotos"
 
-#: ../../Zotlabs/Module/Photos.php:1279
+#: ../../Code/Module/Photos.php:1279
 msgid "In This Photo:"
 msgstr "Hi apareixen:"
 
-#: ../../Zotlabs/Module/Photos.php:1284
+#: ../../Code/Module/Photos.php:1284
 msgid "Map"
 msgstr "Mapa"
 
-#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Lib/ThreadItem.php:420
+#: ../../Code/Module/Photos.php:1292 ../../Code/Lib/ThreadItem.php:420
 msgctxt "noun"
 msgid "Likes"
 msgstr "Agrada"
 
-#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421
+#: ../../Code/Module/Photos.php:1293 ../../Code/Lib/ThreadItem.php:421
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Desagrada"
 
-#: ../../Zotlabs/Module/Photos.php:1298 ../../Zotlabs/Lib/ThreadItem.php:426
+#: ../../Code/Module/Photos.php:1298 ../../Code/Lib/ThreadItem.php:426
 #: ../../include/acl_selectors.php:125
 msgid "Close"
 msgstr "Tanca"
 
-#: ../../Zotlabs/Module/Photos.php:1370 ../../Zotlabs/Module/Photos.php:1383
-#: ../../Zotlabs/Module/Photos.php:1384 ../../include/photos.php:668
+#: ../../Code/Module/Photos.php:1370 ../../Code/Module/Photos.php:1383
+#: ../../Code/Module/Photos.php:1384 ../../include/photos.php:668
 msgid "Recent Photos"
 msgstr "Imatges recents"
 
-#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1293
+#: ../../Code/Module/Wiki.php:30 ../../addon/cart/cart.php:1293
 msgid "Profile Unavailable."
 msgstr "El perfil no està disponible."
 
-#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123
+#: ../../Code/Module/Wiki.php:44 ../../Code/Module/Cloud.php:123
 msgid "Not found"
 msgstr "No s'ha trobat"
 
-#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:51
+#: ../../Code/Module/Wiki.php:68 ../../addon/cart/myshop.php:51
 #: ../../addon/cart/cart.php:1420
 #: ../../addon/cart/submodules/paypalbutton.php:481
 #: ../../addon/cart/manual_payments.php:62
 msgid "Invalid channel"
 msgstr "El canal és invàlid"
 
-#: ../../Zotlabs/Module/Wiki.php:124
+#: ../../Code/Module/Wiki.php:124
 msgid "Error retrieving wiki"
 msgstr "S'ha produït un error en carregar la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:131
+#: ../../Code/Module/Wiki.php:131
 msgid "Error creating zip file export folder"
 msgstr "S'ha produït un error en crear la carpeta per al fitxer comprimit d'exportació"
 
-#: ../../Zotlabs/Module/Wiki.php:182
+#: ../../Code/Module/Wiki.php:182
 msgid "Error downloading wiki: "
 msgstr "S'ha produït un error en descarregar la wiki:"
 
-#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1937
+#: ../../Code/Module/Wiki.php:197 ../../include/conversation.php:1937
 #: ../../include/nav.php:486
 msgid "Wikis"
 msgstr "Wikis"
 
-#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../Code/Module/Wiki.php:203
 msgid "Download"
 msgstr "Descarrega"
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256
-#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Wiki.php:205 ../../Code/Module/Chat.php:256
+#: ../../Code/Module/Profiles.php:831 ../../Code/Module/Manage.php:145
 msgid "Create New"
 msgstr "Crear Nou"
 
-#: ../../Zotlabs/Module/Wiki.php:207
+#: ../../Code/Module/Wiki.php:207
 msgid "Wiki name"
 msgstr "Nom de la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:208
+#: ../../Code/Module/Wiki.php:208
 msgid "Content type"
 msgstr "Llenguatge de formatació"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
 #: ../../include/text.php:1886
 msgid "Markdown"
 msgstr "Markdown"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1884
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1884
 msgid "BBcode"
 msgstr "BBCode"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1887
+#: ../../Code/Module/Wiki.php:208 ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1887
 msgid "Text"
 msgstr "Cap (text pla)"
 
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286
+#: ../../Code/Module/Wiki.php:210 ../../Code/Storage/Browser.php:286
 msgid "Type"
 msgstr "Tipus"
 
-#: ../../Zotlabs/Module/Wiki.php:211
+#: ../../Code/Module/Wiki.php:211
 msgid "Any type"
 msgstr "Qualsevol"
 
-#: ../../Zotlabs/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:218
 msgid "Lock content type"
 msgstr "Bloca el llenguatge de formatació"
 
-#: ../../Zotlabs/Module/Wiki.php:219
+#: ../../Code/Module/Wiki.php:219
 msgid "Create a status post for this wiki"
 msgstr "Crea una entrada d'estat per aquesta wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:220
+#: ../../Code/Module/Wiki.php:220
 msgid "Edit Wiki Name"
 msgstr "Canvia el nom de la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../Code/Module/Wiki.php:262
 msgid "Wiki not found"
 msgstr "No s'ha trobat la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../Code/Module/Wiki.php:286
 msgid "Rename page"
 msgstr "Canvia el nom de la pàgina"
 
-#: ../../Zotlabs/Module/Wiki.php:307
+#: ../../Code/Module/Wiki.php:307
 msgid "Error retrieving page content"
 msgstr "S'ha produït un error en carregar el contingut de la pàgina"
 
-#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317
+#: ../../Code/Module/Wiki.php:315 ../../Code/Module/Wiki.php:317
 msgid "New page"
 msgstr "Crea una pàgina nova"
 
-#: ../../Zotlabs/Module/Wiki.php:345
+#: ../../Code/Module/Wiki.php:345
 msgid "Revision Comparison"
 msgstr "Comparació de revisió"
 
-#: ../../Zotlabs/Module/Wiki.php:346
+#: ../../Code/Module/Wiki.php:346
 msgid "Revert"
 msgstr "Reverteix"
 
-#: ../../Zotlabs/Module/Wiki.php:353
+#: ../../Code/Module/Wiki.php:353
 msgid "Short description of your changes (optional)"
 msgstr "Descripció curta dels canvis (opcional)"
 
-#: ../../Zotlabs/Module/Wiki.php:362
+#: ../../Code/Module/Wiki.php:362
 msgid "Source"
 msgstr "Font"
 
-#: ../../Zotlabs/Module/Wiki.php:372
+#: ../../Code/Module/Wiki.php:372
 msgid "New page name"
 msgstr "Nou nom de pàgina"
 
-#: ../../Zotlabs/Module/Wiki.php:377
+#: ../../Code/Module/Wiki.php:377
 msgid "Embed image from photo albums"
 msgstr "Embeu una imatge dels àlbums de fotos"
 
-#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1396
+#: ../../Code/Module/Wiki.php:378 ../../include/conversation.php:1396
 msgid "Embed an image from your albums"
 msgstr "Embeu una imatge dels teus àlbums"
 
-#: ../../Zotlabs/Module/Wiki.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:466
-#: ../../Zotlabs/Module/Cover_photo.php:400
+#: ../../Code/Module/Wiki.php:380
+#: ../../Code/Module/Profile_photo.php:466
+#: ../../Code/Module/Cover_photo.php:400
 #: ../../include/conversation.php:1398 ../../include/conversation.php:1445
 msgid "OK"
 msgstr "OK"
 
-#: ../../Zotlabs/Module/Wiki.php:381
-#: ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:401
+#: ../../Code/Module/Wiki.php:381
+#: ../../Code/Module/Profile_photo.php:467
+#: ../../Code/Module/Cover_photo.php:401
 #: ../../include/conversation.php:1327
 msgid "Choose images to embed"
 msgstr "Tria una imatge per a embeure-la"
 
-#: ../../Zotlabs/Module/Wiki.php:382
-#: ../../Zotlabs/Module/Profile_photo.php:468
-#: ../../Zotlabs/Module/Cover_photo.php:402
+#: ../../Code/Module/Wiki.php:382
+#: ../../Code/Module/Profile_photo.php:468
+#: ../../Code/Module/Cover_photo.php:402
 #: ../../include/conversation.php:1328
 msgid "Choose an album"
 msgstr "Tria un àlbum"
 
-#: ../../Zotlabs/Module/Wiki.php:383
-#: ../../Zotlabs/Module/Profile_photo.php:469
-#: ../../Zotlabs/Module/Cover_photo.php:403
+#: ../../Code/Module/Wiki.php:383
+#: ../../Code/Module/Profile_photo.php:469
+#: ../../Code/Module/Cover_photo.php:403
 msgid "Choose a different album"
 msgstr "Escull un àlbum diferent"
 
-#: ../../Zotlabs/Module/Wiki.php:384
-#: ../../Zotlabs/Module/Profile_photo.php:470
-#: ../../Zotlabs/Module/Cover_photo.php:404
+#: ../../Code/Module/Wiki.php:384
+#: ../../Code/Module/Profile_photo.php:470
+#: ../../Code/Module/Cover_photo.php:404
 #: ../../include/conversation.php:1330
 msgid "Error getting album list"
 msgstr "Ha ocorregut un error quan treia la llista de àlbums"
 
-#: ../../Zotlabs/Module/Wiki.php:385
-#: ../../Zotlabs/Module/Profile_photo.php:471
-#: ../../Zotlabs/Module/Cover_photo.php:405
+#: ../../Code/Module/Wiki.php:385
+#: ../../Code/Module/Profile_photo.php:471
+#: ../../Code/Module/Cover_photo.php:405
 #: ../../include/conversation.php:1331
 msgid "Error getting photo link"
 msgstr "Ha ocorregut un error quan treia l'enllaç a la foto"
 
-#: ../../Zotlabs/Module/Wiki.php:386
-#: ../../Zotlabs/Module/Profile_photo.php:472
-#: ../../Zotlabs/Module/Cover_photo.php:406
+#: ../../Code/Module/Wiki.php:386
+#: ../../Code/Module/Profile_photo.php:472
+#: ../../Code/Module/Cover_photo.php:406
 #: ../../include/conversation.php:1332
 msgid "Error getting album"
 msgstr "Ha ocorregut un error treient l'àlbum"
 
-#: ../../Zotlabs/Module/Wiki.php:462
+#: ../../Code/Module/Wiki.php:462
 msgid "Error creating wiki. Invalid name."
 msgstr "S'ha produït un error en crear la wiki. El nom no és vàlid."
 
-#: ../../Zotlabs/Module/Wiki.php:469
+#: ../../Code/Module/Wiki.php:469
 msgid "A wiki with this name already exists."
 msgstr "Ja existeix una wiki amb aquest nom."
 
-#: ../../Zotlabs/Module/Wiki.php:482
+#: ../../Code/Module/Wiki.php:482
 msgid "Wiki created, but error creating Home page."
 msgstr "S'ha creat la wiki, però s'ha produït un error en crear-ne la pàgina principal."
 
-#: ../../Zotlabs/Module/Wiki.php:489
+#: ../../Code/Module/Wiki.php:489
 msgid "Error creating wiki"
 msgstr "S'ha produït un error en crear la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:512
+#: ../../Code/Module/Wiki.php:512
 msgid "Error updating wiki. Invalid name."
 msgstr "S'ha produït un error en actualitzar la wiki. El nom no és vàlid."
 
-#: ../../Zotlabs/Module/Wiki.php:532
+#: ../../Code/Module/Wiki.php:532
 msgid "Error updating wiki"
 msgstr "S'ha produït un error en actualitzar la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:547
+#: ../../Code/Module/Wiki.php:547
 msgid "Wiki delete permission denied."
 msgstr "No tens permís per a eliminar la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:557
+#: ../../Code/Module/Wiki.php:557
 msgid "Error deleting wiki"
 msgstr "S'ha produït un error en eliminar la wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:590
+#: ../../Code/Module/Wiki.php:590
 msgid "New page created"
 msgstr "S'ha desat la nova pàgina"
 
-#: ../../Zotlabs/Module/Wiki.php:711
+#: ../../Code/Module/Wiki.php:711
 msgid "Cannot delete Home"
 msgstr "No es pot esborrar la pàgina principal"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Current Revision"
 msgstr "Revisió actual"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Selected Revision"
 msgstr "Revisió seleccionada"
 
-#: ../../Zotlabs/Module/Wiki.php:825
+#: ../../Code/Module/Wiki.php:825
 msgid "You must be authenticated."
 msgstr "Has d'estar autenticat."
 
-#: ../../Zotlabs/Module/Chanview.php:139
+#: ../../Code/Module/Chanview.php:139
 msgid "toggle full screen mode"
 msgstr "commuta el mode de pantalla completa"
 
-#: ../../Zotlabs/Module/Pdledit.php:21
+#: ../../Code/Module/Pdledit.php:21
 msgid "Layout updated."
 msgstr "S'ha actualitzat el disseny."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
+#: ../../Code/Module/Pdledit.php:34 ../../Code/Module/Chat.php:219
 msgid "Feature disabled."
 msgstr "Funcionalitat desactivada."
 
-#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90
+#: ../../Code/Module/Pdledit.php:47 ../../Code/Module/Pdledit.php:90
 msgid "Edit System Page Description"
 msgstr "Editor del Sistema de Descripció de Pàgines"
 
-#: ../../Zotlabs/Module/Pdledit.php:68
+#: ../../Code/Module/Pdledit.php:68
 msgid "(modified)"
 msgstr "(modificat)"
 
-#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133
+#: ../../Code/Module/Pdledit.php:68 ../../Code/Module/Lostpass.php:133
 msgid "Reset"
 msgstr "Reajustar"
 
-#: ../../Zotlabs/Module/Pdledit.php:85
+#: ../../Code/Module/Pdledit.php:85
 msgid "Layout not found."
 msgstr "No s'ha trobat cap disseny de pàgina."
 
-#: ../../Zotlabs/Module/Pdledit.php:91
+#: ../../Code/Module/Pdledit.php:91
 msgid "Module Name:"
 msgstr "Nom del mòdul:"
 
-#: ../../Zotlabs/Module/Pdledit.php:92
+#: ../../Code/Module/Pdledit.php:92
 msgid "Layout Help"
 msgstr "Ajuda per al disseny de pàgina"
 
-#: ../../Zotlabs/Module/Pdledit.php:93
+#: ../../Code/Module/Pdledit.php:93
 msgid "Edit another layout"
 msgstr "Modifica un altre disseny"
 
-#: ../../Zotlabs/Module/Pdledit.php:94
+#: ../../Code/Module/Pdledit.php:94
 msgid "System layout"
 msgstr "Disseny del sistema"
 
-#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:316
+#: ../../Code/Module/Poke.php:182 ../../Code/Lib/Apps.php:316
 #: ../../include/conversation.php:1097
 msgid "Poke"
 msgstr "Esperonar"
 
-#: ../../Zotlabs/Module/Poke.php:183
+#: ../../Code/Module/Poke.php:183
 msgid "Poke somebody"
 msgstr "Emprenyar algú"
 
-#: ../../Zotlabs/Module/Poke.php:186
+#: ../../Code/Module/Poke.php:186
 msgid "Poke/Prod"
 msgstr "Esperonat/Picat"
 
-#: ../../Zotlabs/Module/Poke.php:187
+#: ../../Code/Module/Poke.php:187
 msgid "Poke, prod or do other things to somebody"
 msgstr "emprenyar, picar o fer altres coses a algú"
 
-#: ../../Zotlabs/Module/Poke.php:194
+#: ../../Code/Module/Poke.php:194
 msgid "Recipient"
 msgstr "Destinatari"
 
-#: ../../Zotlabs/Module/Poke.php:195
+#: ../../Code/Module/Poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr "Tria que vols fer amb el destinatari"
 
-#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
+#: ../../Code/Module/Poke.php:198 ../../Code/Module/Poke.php:199
 msgid "Make this post private"
 msgstr "Fer aquesta entrada privada"
 
-#: ../../Zotlabs/Module/Profile_photo.php:66
-#: ../../Zotlabs/Module/Cover_photo.php:57
+#: ../../Code/Module/Profile_photo.php:66
+#: ../../Code/Module/Cover_photo.php:57
 msgid "Image uploaded but image cropping failed."
 msgstr "S'ha pujat la imatge però no s'ha pogut retallar."
 
-#: ../../Zotlabs/Module/Profile_photo.php:120
-#: ../../Zotlabs/Module/Profile_photo.php:248
+#: ../../Code/Module/Profile_photo.php:120
+#: ../../Code/Module/Profile_photo.php:248
 #: ../../include/photo/photo_driver.php:741
 msgid "Profile Photos"
 msgstr "Fotos del Perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:142
-#: ../../Zotlabs/Module/Cover_photo.php:191
+#: ../../Code/Module/Profile_photo.php:142
+#: ../../Code/Module/Cover_photo.php:191
 msgid "Image resize failed."
 msgstr "No s'ha pogut escalar la imatge."
 
-#: ../../Zotlabs/Module/Profile_photo.php:218
+#: ../../Code/Module/Profile_photo.php:218
 #: ../../addon/openclipatar/openclipatar.php:298
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»"
 
-#: ../../Zotlabs/Module/Profile_photo.php:225
-#: ../../Zotlabs/Module/Cover_photo.php:205 ../../include/photos.php:196
+#: ../../Code/Module/Profile_photo.php:225
+#: ../../Code/Module/Cover_photo.php:205 ../../include/photos.php:196
 msgid "Unable to process image"
 msgstr "incapaç de processar la imatge"
 
-#: ../../Zotlabs/Module/Profile_photo.php:260
-#: ../../Zotlabs/Module/Cover_photo.php:229
+#: ../../Code/Module/Profile_photo.php:260
+#: ../../Code/Module/Cover_photo.php:229
 msgid "Image upload failed."
 msgstr "La pujada de la imatge va fracassar."
 
-#: ../../Zotlabs/Module/Profile_photo.php:279
-#: ../../Zotlabs/Module/Cover_photo.php:246
+#: ../../Code/Module/Profile_photo.php:279
+#: ../../Code/Module/Cover_photo.php:246
 msgid "Unable to process image."
 msgstr "Incapaç de processar l'imatge."
 
-#: ../../Zotlabs/Module/Profile_photo.php:343
-#: ../../Zotlabs/Module/Profile_photo.php:390
-#: ../../Zotlabs/Module/Cover_photo.php:339
-#: ../../Zotlabs/Module/Cover_photo.php:354
+#: ../../Code/Module/Profile_photo.php:343
+#: ../../Code/Module/Profile_photo.php:390
+#: ../../Code/Module/Cover_photo.php:339
+#: ../../Code/Module/Cover_photo.php:354
 msgid "Photo not available."
 msgstr "Foto no disponible."
 
-#: ../../Zotlabs/Module/Profile_photo.php:454
+#: ../../Code/Module/Profile_photo.php:454
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
 msgstr "La teva foto de perfil predeterminada és pública i visible per a tothom. Les fotos de perfil dels perfils alternatius hereten els permisos del seu perfil."
 
-#: ../../Zotlabs/Module/Profile_photo.php:454
+#: ../../Code/Module/Profile_photo.php:454
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
 msgstr "La teva foto de perfil és pública i visible a tothom, i és probable que s'escampi per altres webs."
 
-#: ../../Zotlabs/Module/Profile_photo.php:456
-#: ../../Zotlabs/Module/Cover_photo.php:392
+#: ../../Code/Module/Profile_photo.php:456
+#: ../../Code/Module/Cover_photo.php:392
 msgid "Upload File:"
 msgstr "Puja Arxiu:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
-#: ../../Zotlabs/Module/Cover_photo.php:393
+#: ../../Code/Module/Profile_photo.php:457
+#: ../../Code/Module/Cover_photo.php:393
 msgid "Select a profile:"
 msgstr "Tria un perfil:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Code/Module/Profile_photo.php:458
 msgid "Use Photo for Profile"
 msgstr "Fes servir la foto per al perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Code/Module/Profile_photo.php:458
 msgid "Change Profile Photo"
 msgstr "Canvia la imatge de perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:459
+#: ../../Code/Module/Profile_photo.php:459
 msgid "Use"
 msgstr "Aplica"
 
-#: ../../Zotlabs/Module/Profile_photo.php:463
-#: ../../Zotlabs/Module/Profile_photo.php:464
-#: ../../Zotlabs/Module/Cover_photo.php:397
-#: ../../Zotlabs/Module/Cover_photo.php:398
+#: ../../Code/Module/Profile_photo.php:463
+#: ../../Code/Module/Profile_photo.php:464
+#: ../../Code/Module/Cover_photo.php:397
+#: ../../Code/Module/Cover_photo.php:398
 msgid "Use a photo from your albums"
 msgstr "Agafa una foto dels àlbums"
 
-#: ../../Zotlabs/Module/Profile_photo.php:474
-#: ../../Zotlabs/Module/Cover_photo.php:409
+#: ../../Code/Module/Profile_photo.php:474
+#: ../../Code/Module/Cover_photo.php:409
 msgid "Select existing photo"
 msgstr "Tria una foto existent"
 
-#: ../../Zotlabs/Module/Profile_photo.php:493
-#: ../../Zotlabs/Module/Cover_photo.php:426
+#: ../../Code/Module/Profile_photo.php:493
+#: ../../Code/Module/Cover_photo.php:426
 msgid "Crop Image"
 msgstr "Retalla Imatge"
 
-#: ../../Zotlabs/Module/Profile_photo.php:494
-#: ../../Zotlabs/Module/Cover_photo.php:427
+#: ../../Code/Module/Profile_photo.php:494
+#: ../../Code/Module/Cover_photo.php:427
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Si us plau, retalla la imatge per a una optima visualització"
 
-#: ../../Zotlabs/Module/Profile_photo.php:496
-#: ../../Zotlabs/Module/Cover_photo.php:429
+#: ../../Code/Module/Profile_photo.php:496
+#: ../../Code/Module/Cover_photo.php:429
 msgid "Done Editing"
 msgstr "Edició Feta"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
+#: ../../Code/Module/Chatsvc.php:131
 msgid "Away"
 msgstr "Absent"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
+#: ../../Code/Module/Chatsvc.php:136
 msgid "Online"
 msgstr "En connexió"
 
-#: ../../Zotlabs/Module/Item.php:194
+#: ../../Code/Module/Item.php:194
 msgid "Unable to locate original post."
 msgstr "No s'ha pogut trobar l'entrada original."
 
-#: ../../Zotlabs/Module/Item.php:477
+#: ../../Code/Module/Item.php:477
 msgid "Empty post discarded."
 msgstr "S'ha descartat l'entrada perquè no té contingut."
 
-#: ../../Zotlabs/Module/Item.php:864
+#: ../../Code/Module/Item.php:864
 msgid "Duplicate post suppressed."
 msgstr "Publicació duplicada s'ha suprimit."
 
-#: ../../Zotlabs/Module/Item.php:1009
+#: ../../Code/Module/Item.php:1009
 msgid "System error. Post not saved."
 msgstr "Hi ha hagut un error del sistema. L'entrada no s'ha desat."
 
-#: ../../Zotlabs/Module/Item.php:1045
+#: ../../Code/Module/Item.php:1045
 msgid "Your comment is awaiting approval."
 msgstr "El teu comentari encara no ha estat aprovat."
 
-#: ../../Zotlabs/Module/Item.php:1162
+#: ../../Code/Module/Item.php:1162
 msgid "Unable to obtain post information from database."
 msgstr "No s'ha pogut obtenir informació de l'entrada a la base de dades."
 
-#: ../../Zotlabs/Module/Item.php:1191
+#: ../../Code/Module/Item.php:1191
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris)."
 
-#: ../../Zotlabs/Module/Item.php:1198
+#: ../../Code/Module/Item.php:1198
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Has assolit el teu limit de %1$.0f pàgines web."
 
-#: ../../Zotlabs/Module/Ping.php:332
+#: ../../Code/Module/Ping.php:332
 msgid "sent you a private message"
 msgstr "Se t'ha enviat un missatge privat"
 
-#: ../../Zotlabs/Module/Ping.php:385
+#: ../../Code/Module/Ping.php:385
 msgid "added your channel"
 msgstr "el teu canal s'ha afegit"
 
-#: ../../Zotlabs/Module/Ping.php:409
+#: ../../Code/Module/Ping.php:409
 msgid "requires approval"
 msgstr "requereix aprovació"
 
-#: ../../Zotlabs/Module/Ping.php:419
+#: ../../Code/Module/Ping.php:419
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../Zotlabs/Module/Ping.php:437
+#: ../../Code/Module/Ping.php:437
 msgid "[today]"
 msgstr "[avui]"
 
-#: ../../Zotlabs/Module/Ping.php:446
+#: ../../Code/Module/Ping.php:446
 msgid "posted an event"
 msgstr "enviat un esdeveniment"
 
-#: ../../Zotlabs/Module/Ping.php:479
+#: ../../Code/Module/Ping.php:479
 msgid "shared a file with you"
 msgstr "ha compartit un fitxer amb tu"
 
-#: ../../Zotlabs/Module/Ping.php:654
+#: ../../Code/Module/Ping.php:654
 msgid "Private forum"
 msgstr "Fòrum privat"
 
-#: ../../Zotlabs/Module/Ping.php:654
+#: ../../Code/Module/Ping.php:654
 msgid "Public forum"
 msgstr "Fòrum públic"
 
-#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
+#: ../../Code/Module/Page.php:39 ../../Code/Module/Block.php:29
 msgid "Invalid item."
 msgstr "Article invàlid."
 
-#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158
-#: ../../Zotlabs/Module/Display.php:175
-#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167
+#: ../../Code/Module/Page.php:136 ../../Code/Module/Block.php:77
+#: ../../Code/Module/Display.php:141 ../../Code/Module/Display.php:158
+#: ../../Code/Module/Display.php:175
+#: ../../Code/Lib/NativeWikiPage.php:519 ../../Code/Web/Router.php:167
 #: ../../include/help.php:81
 msgid "Page not found."
 msgstr "Pàgina no trobada."
 
-#: ../../Zotlabs/Module/Page.php:173
+#: ../../Code/Module/Page.php:173
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -5573,303 +5573,303 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59
+#: ../../Code/Module/Connedit.php:79 ../../Code/Module/Defperms.php:59
 msgid "Could not access contact record."
 msgstr "No s'ha pogut accedir al llibre de contactes."
 
-#: ../../Zotlabs/Module/Connedit.php:109
+#: ../../Code/Module/Connedit.php:109
 msgid "Could not locate selected profile."
 msgstr "No s'ha trobat el perfil indicat."
 
-#: ../../Zotlabs/Module/Connedit.php:246
+#: ../../Code/Module/Connedit.php:246
 msgid "Connection updated."
 msgstr "S'ha actualitzat la connexió."
 
-#: ../../Zotlabs/Module/Connedit.php:248
+#: ../../Code/Module/Connedit.php:248
 msgid "Failed to update connection record."
 msgstr "No s'ha pogut actualitzar el registre de connexió."
 
-#: ../../Zotlabs/Module/Connedit.php:302
+#: ../../Code/Module/Connedit.php:302
 msgid "is now connected to"
 msgstr "Ara està conectat amb"
 
-#: ../../Zotlabs/Module/Connedit.php:427
+#: ../../Code/Module/Connedit.php:427
 msgid "Could not access address book record."
 msgstr "No puc accedir al registre del contacte"
 
-#: ../../Zotlabs/Module/Connedit.php:475
+#: ../../Code/Module/Connedit.php:475
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Ha fallat la recàrrega - el canal es actualment inaccesible."
 
-#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499
-#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Code/Module/Connedit.php:490 ../../Code/Module/Connedit.php:499
+#: ../../Code/Module/Connedit.php:508 ../../Code/Module/Connedit.php:517
+#: ../../Code/Module/Connedit.php:530
 msgid "Unable to set address book parameters."
 msgstr "No es poden ajustar els paràmetres dels contactes."
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Code/Module/Connedit.php:554
 msgid "Connection has been removed."
 msgstr "S'han eliminat les conexions."
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:309
+#: ../../Code/Module/Connedit.php:594 ../../Code/Lib/Apps.php:309
 #: ../../addon/openclipatar/openclipatar.php:57
 #: ../../include/conversation.php:1037 ../../include/nav.php:108
 msgid "View Profile"
 msgstr "Mostra el meu perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:597
+#: ../../Code/Module/Connedit.php:597
 #, php-format
 msgid "View %s's profile"
 msgstr "Mostra el perfil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:601
+#: ../../Code/Module/Connedit.php:601
 msgid "Refresh Permissions"
 msgstr "Recarrega els Permissos"
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Code/Module/Connedit.php:604
 msgid "Fetch updated permissions"
 msgstr "Obté els permisos actualitzats"
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Code/Module/Connedit.php:608
 msgid "Refresh Photo"
 msgstr "Recarrega la foto"
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Code/Module/Connedit.php:611
 msgid "Fetch updated photo"
 msgstr "Demana la nova foto al servidor"
 
-#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1047
+#: ../../Code/Module/Connedit.php:615 ../../include/conversation.php:1047
 msgid "Recent Activity"
 msgstr "Activitat Recent"
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Code/Module/Connedit.php:618
 msgid "View recent posts and comments"
 msgstr "Mostra les entrades i comentaris recents"
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Code/Module/Connedit.php:625
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Boqueja (o Desbloqueja) les comunicacions amb aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Code/Module/Connedit.php:626
 msgid "This connection is blocked!"
 msgstr "Aquesta connexió està bloquejada!"
 
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connedit.php:630
 msgid "Unignore"
 msgstr "Inhabilita"
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Code/Module/Connedit.php:633
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignora (o Considera) les communicacions entrants d'aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Code/Module/Connedit.php:634
 msgid "This connection is ignored!"
 msgstr "Aquesta connexió es ignorada!"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Unarchive"
 msgstr "Desarxiva"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Archive"
 msgstr "Arxiva"
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Code/Module/Connedit.php:641
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Arxiva (o Desarxiva) aquesta connexió - Marca el canal com a mort pero manté el contingut "
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Code/Module/Connedit.php:642
 msgid "This connection is archived!"
 msgstr "Aquesta connexió està arxivada!"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Unhide"
 msgstr "Mostra"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Hide"
 msgstr "Amaga"
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Code/Module/Connedit.php:649
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Amaga (o Mostra) aquesta connexió de les altres connexions teves"
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Code/Module/Connedit.php:650
 msgid "This connection is hidden!"
 msgstr "Aquesta connexió està amagada!"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Code/Module/Connedit.php:657
 msgid "Delete this connection"
 msgstr "Elimina aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Code/Module/Connedit.php:665
 msgid "Fetch Vcard"
 msgstr "Obté la targeta de contacte Vcard"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Code/Module/Connedit.php:668
 msgid "Fetch electronic calling card for this connection"
 msgstr "Obté la targeta de trucada electrònica d'aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:679
+#: ../../Code/Module/Connedit.php:679
 msgid "Open Individual Permissions section by default"
 msgstr "Obrir, per defecte,  la secció de Permisos Individuals"
 
-#: ../../Zotlabs/Module/Connedit.php:702
+#: ../../Code/Module/Connedit.php:702
 msgid "Affinity"
 msgstr "Afinitat"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Code/Module/Connedit.php:705
 msgid "Open Set Affinity section by default"
 msgstr "Obre per defecte la barra d'afinitat"
 
-#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22
+#: ../../Code/Module/Connedit.php:709 ../../Code/Widget/Affinity.php:22
 msgid "Me"
 msgstr "Jo"
 
-#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23
+#: ../../Code/Module/Connedit.php:710 ../../Code/Widget/Affinity.php:23
 msgid "Family"
 msgstr "Família"
 
-#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25
+#: ../../Code/Module/Connedit.php:712 ../../Code/Widget/Affinity.php:25
 msgid "Acquaintances"
 msgstr "Coneguts"
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Code/Module/Connedit.php:739
 msgid "Filter"
 msgstr "Filtre"
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Code/Module/Connedit.php:742
 msgid "Open Custom Filter section by default"
 msgstr "Obrir, per defecte, la secció de Filtres a Mida"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Approve this connection"
 msgstr "Apccepta aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Accept connection to allow communication"
 msgstr "Accepta la connexió per permetre la comunicació"
 
-#: ../../Zotlabs/Module/Connedit.php:784
+#: ../../Code/Module/Connedit.php:784
 msgid "Set Affinity"
 msgstr "Ajusta l'Afinitat"
 
-#: ../../Zotlabs/Module/Connedit.php:787
+#: ../../Code/Module/Connedit.php:787
 msgid "Set Profile"
 msgstr "Ajusta el Perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:790
+#: ../../Code/Module/Connedit.php:790
 msgid "Set Affinity & Profile"
 msgstr "Ajusta Afinitat i Perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:838
+#: ../../Code/Module/Connedit.php:838
 msgid "This connection is unreachable from this location."
 msgstr "Aquesta connexió no és accessible des d'aquest hub."
 
-#: ../../Zotlabs/Module/Connedit.php:839
+#: ../../Code/Module/Connedit.php:839
 msgid "This connection may be unreachable from other channel locations."
 msgstr "Aquesta connexió no és accessibles des d'altres hubs del canal."
 
-#: ../../Zotlabs/Module/Connedit.php:841
+#: ../../Code/Module/Connedit.php:841
 msgid "Location independence is not supported by their network."
 msgstr "La xarxa d'aquesta connexió no és compatible amb la independència de hub."
 
-#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Code/Module/Connedit.php:847
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr "Aquesta connexió no és accessible des d'aquest hub. La seva xarxa no és compatible amb la independència de hub."
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
-#: ../../Zotlabs/Widget/Settings_menu.php:117
+#: ../../Code/Module/Connedit.php:850 ../../Code/Module/Defperms.php:238
+#: ../../Code/Widget/Settings_menu.php:117
 msgid "Connection Default Permissions"
 msgstr "Permisos per Defecte de la Connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4158
+#: ../../Code/Module/Connedit.php:850 ../../include/items.php:4158
 #, php-format
 msgid "Connection: %s"
 msgstr "Connexió: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Connedit.php:851 ../../Code/Module/Defperms.php:239
 msgid "Apply these permissions automatically"
 msgstr "Aplica aquests permissos automaticament"
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Code/Module/Connedit.php:851
 msgid "Connection requests will be approved without your interaction"
 msgstr "Les peticions de connexió seran aprovades sense la teva interacció"
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
 msgid "Permission role"
 msgstr "Permisos de rol"
 
-#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241
+#: ../../Code/Module/Connedit.php:853 ../../Code/Module/Defperms.php:241
 msgid "Add permission role"
 msgstr "Afegir permisos de rol"
 
-#: ../../Zotlabs/Module/Connedit.php:860
+#: ../../Code/Module/Connedit.php:860
 msgid "This connection's primary address is"
 msgstr "La primera adreça d'aqueste connexió es"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Code/Module/Connedit.php:861
 msgid "Available locations:"
 msgstr "Localització disponible:"
 
-#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
+#: ../../Code/Module/Connedit.php:866 ../../Code/Module/Defperms.php:245
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Els permisos indicats en aquesta pàgina seran aplicats a totes les noves connexions."
 
-#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Code/Module/Connedit.php:867
 msgid "Connection Tools"
 msgstr "Eines de Connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Code/Module/Connedit.php:869
 msgid "Slide to adjust your degree of friendship"
 msgstr "Llisca per ajustar el nivell d'amistat"
 
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155
+#: ../../Code/Module/Connedit.php:870 ../../Code/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valora"
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Code/Module/Connedit.php:871
 msgid "Slide to adjust your rating"
 msgstr "Llisca per ajustar la valoració"
 
-#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877
+#: ../../Code/Module/Connedit.php:872 ../../Code/Module/Connedit.php:877
 msgid "Optionally explain your rating"
 msgstr "Opcionalment pots explicar la teva valoració"
 
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Code/Module/Connedit.php:874
 msgid "Custom Filter"
 msgstr "Filtre a mida"
 
-#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../Code/Module/Connedit.php:875
 msgid "Only import posts with this text"
 msgstr "Importa exclusivament entrades amb aquest text"
 
-#: ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:876
 msgid "Do not import posts with this text"
 msgstr "No importar entrades amb aquest text"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Code/Module/Connedit.php:878
 msgid "This information is public!"
 msgstr "Aquesta informació es pública!"
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Code/Module/Connedit.php:883
 msgid "Connection Pending Approval"
 msgstr "Connexió Pendent d'Aprovació"
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Code/Module/Connedit.php:888
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Tria el perfil que vols mostrar a %s quan es vegi el perfil segur."
 
-#: ../../Zotlabs/Module/Connedit.php:895
+#: ../../Code/Module/Connedit.php:895
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -5877,217 +5877,217 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Alguns permisos pot ser que vinguin heretats de la configuració de privacitat. del teu canal. Aquesta té més prioritat que les configuracions individuals. Pots canviar aquí aquests permisos però no tindran cap impacte mentre no canviï la configuració del teu canal."
 
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Code/Module/Connedit.php:896
 msgid "Last update:"
 msgstr "Darrera actualització:"
 
-#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../Code/Module/Connedit.php:904
 msgid "Details"
 msgstr "Detalls"
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Code/Module/Chat.php:181
 msgid "Room not found"
 msgstr "No s'ha trobat la sala"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Code/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Abandona la sala"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Code/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Esborra Sala"
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Code/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Absent"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Code/Module/Chat.php:200
 msgid "I am online"
 msgstr "Estic connectat/da"
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Code/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Desa aquesta sala"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1322
+#: ../../Code/Module/Chat.php:205 ../../Code/Module/Mail.php:241
+#: ../../Code/Module/Mail.php:362 ../../include/conversation.php:1322
 msgid "Please enter a link URL:"
 msgstr "Si us plau entra l'enllaç URL:"
 
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:771
+#: ../../Code/Module/Chat.php:206 ../../Code/Module/Mail.php:294
+#: ../../Code/Module/Mail.php:436 ../../Code/Lib/ThreadItem.php:771
 #: ../../include/conversation.php:1443
 msgid "Encrypt text"
 msgstr "Text encriptat"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Nova sala per a Xerrar"
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Code/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Nom de la sala de xat"
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Code/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Expiració dels chats (minuts)"
 
-#: ../../Zotlabs/Module/Chat.php:250
+#: ../../Code/Module/Chat.php:250
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "%1$s de Xats"
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Code/Module/Chat.php:255
 msgid "No chatrooms available"
 msgstr "No hi ha sales de xat disponibles"
 
-#: ../../Zotlabs/Module/Chat.php:259
+#: ../../Code/Module/Chat.php:259
 msgid "Expiration"
 msgstr "Expiració"
 
-#: ../../Zotlabs/Module/Chat.php:260
+#: ../../Code/Module/Chat.php:260
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:310
+#: ../../Code/Module/Fbrowser.php:29 ../../Code/Lib/Apps.php:310
 #: ../../include/conversation.php:1843 ../../include/nav.php:393
 msgid "Photos"
 msgstr "Fotos"
 
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:305
-#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1851
+#: ../../Code/Module/Fbrowser.php:85 ../../Code/Lib/Apps.php:305
+#: ../../Code/Storage/Browser.php:272 ../../include/conversation.php:1851
 #: ../../include/nav.php:401
 msgid "Files"
 msgstr "Arxius"
 
-#: ../../Zotlabs/Module/Menu.php:67
+#: ../../Code/Module/Menu.php:67
 msgid "Unable to update menu."
 msgstr "No s'ha pogut actualitzar el menú."
 
-#: ../../Zotlabs/Module/Menu.php:78
+#: ../../Code/Module/Menu.php:78
 msgid "Unable to create menu."
 msgstr "No s'ha pogut crear el menú."
 
-#: ../../Zotlabs/Module/Menu.php:160 ../../Zotlabs/Module/Menu.php:173
+#: ../../Code/Module/Menu.php:160 ../../Code/Module/Menu.php:173
 msgid "Menu Name"
 msgstr "Nom del menú"
 
-#: ../../Zotlabs/Module/Menu.php:160
+#: ../../Code/Module/Menu.php:160
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Nom únic (no visible a la pàgina web) - requerit"
 
-#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
+#: ../../Code/Module/Menu.php:161 ../../Code/Module/Menu.php:174
 msgid "Menu Title"
 msgstr "Títol del menú"
 
-#: ../../Zotlabs/Module/Menu.php:161
+#: ../../Code/Module/Menu.php:161
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Visible a la pàgina web - deixar buit per a no posar títol"
 
-#: ../../Zotlabs/Module/Menu.php:162
+#: ../../Code/Module/Menu.php:162
 msgid "Allow Bookmarks"
 msgstr "Activa els marcadors"
 
-#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221
+#: ../../Code/Module/Menu.php:162 ../../Code/Module/Menu.php:221
 msgid "Menu may be used to store saved bookmarks"
 msgstr "El menú es pot emprar per a desar marcadors"
 
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:224
+#: ../../Code/Module/Menu.php:163 ../../Code/Module/Menu.php:224
 msgid "Submit and proceed"
 msgstr "Envia i procedeix"
 
-#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2459
+#: ../../Code/Module/Menu.php:170 ../../include/text.php:2459
 msgid "Menus"
 msgstr "Menús"
 
-#: ../../Zotlabs/Module/Menu.php:180
+#: ../../Code/Module/Menu.php:180
 msgid "Bookmarks allowed"
 msgstr "Marcadors permesos"
 
-#: ../../Zotlabs/Module/Menu.php:182
+#: ../../Code/Module/Menu.php:182
 msgid "Delete this menu"
 msgstr "Esborra el menú"
 
-#: ../../Zotlabs/Module/Menu.php:183 ../../Zotlabs/Module/Menu.php:218
+#: ../../Code/Module/Menu.php:183 ../../Code/Module/Menu.php:218
 msgid "Edit menu contents"
 msgstr "Edita el contingut del menú"
 
-#: ../../Zotlabs/Module/Menu.php:184
+#: ../../Code/Module/Menu.php:184
 msgid "Edit this menu"
 msgstr "Edita el menú"
 
-#: ../../Zotlabs/Module/Menu.php:200
+#: ../../Code/Module/Menu.php:200
 msgid "Menu could not be deleted."
 msgstr "El menu no es pot esborrar."
 
-#: ../../Zotlabs/Module/Menu.php:213
+#: ../../Code/Module/Menu.php:213
 msgid "Edit Menu"
 msgstr "Edita Menú"
 
-#: ../../Zotlabs/Module/Menu.php:217
+#: ../../Code/Module/Menu.php:217
 msgid "Add or remove entries to this menu"
 msgstr "Afegeix o esborra entrades a aquest menú"
 
-#: ../../Zotlabs/Module/Menu.php:219
+#: ../../Code/Module/Menu.php:219
 msgid "Menu name"
 msgstr "Nom del Menú"
 
-#: ../../Zotlabs/Module/Menu.php:219
+#: ../../Code/Module/Menu.php:219
 msgid "Must be unique, only seen by you"
 msgstr "Ha de ser únic, nomes vist per tú"
 
-#: ../../Zotlabs/Module/Menu.php:220
+#: ../../Code/Module/Menu.php:220
 msgid "Menu title"
 msgstr "Títol del menú"
 
-#: ../../Zotlabs/Module/Menu.php:220
+#: ../../Code/Module/Menu.php:220
 msgid "Menu title as seen by others"
 msgstr "Títol del menú vist pels altres"
 
-#: ../../Zotlabs/Module/Menu.php:221
+#: ../../Code/Module/Menu.php:221
 msgid "Allow bookmarks"
 msgstr "Activa els marcadors"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2460
+#: ../../Code/Module/Layouts.php:184 ../../include/text.php:2460
 msgid "Layouts"
 msgstr "Dissenys"
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:313
+#: ../../Code/Module/Layouts.php:186 ../../Code/Lib/Apps.php:313
 #: ../../include/nav.php:170 ../../include/nav.php:272
 #: ../../include/help.php:68 ../../include/help.php:74
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../../Zotlabs/Module/Layouts.php:186
+#: ../../Code/Module/Layouts.php:186
 msgid "Comanche page description language help"
 msgstr "Pgina d'ajuda del llenguatge Comanche"
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Code/Module/Layouts.php:190
 msgid "Layout Description"
 msgstr "Descripció del disseny pàgina"
 
-#: ../../Zotlabs/Module/Layouts.php:195
+#: ../../Code/Module/Layouts.php:195
 msgid "Download PDL file"
 msgstr "Descarrega l'arxiu PDL"
 
-#: ../../Zotlabs/Module/Cloud.php:129
+#: ../../Code/Module/Cloud.php:129
 msgid "Please refresh page"
 msgstr "Recarrega la pàgina"
 
-#: ../../Zotlabs/Module/Cloud.php:132
+#: ../../Code/Module/Cloud.php:132
 msgid "Unknown error"
 msgstr "S'ha produït un error desconegut"
 
-#: ../../Zotlabs/Module/Email_validation.php:24
-#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Code/Module/Email_validation.php:24
+#: ../../Code/Module/Email_resend.php:12
 msgid "Token verification failed."
 msgstr "Ha fallat la verificació del token."
 
-#: ../../Zotlabs/Module/Email_validation.php:36
+#: ../../Code/Module/Email_validation.php:36
 msgid "Email Verification Required"
 msgstr "Cal verificar el correu"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../Code/Module/Email_validation.php:37
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -6095,1189 +6095,1189 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr "S'ha enviat al teu correu (%s) un token de verificació. Introdueix-lo aquí per a completar la verificació del compte. Tingues en compte que el correu pot trigar uns minuts en arribar, i que hi ha proveïdors de correu que el classificaran com a correu brossa."
 
-#: ../../Zotlabs/Module/Email_validation.php:38
+#: ../../Code/Module/Email_validation.php:38
 msgid "Resend Email"
 msgstr "Torna a enviar el correu"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
+#: ../../Code/Module/Email_validation.php:41
 msgid "Validation token"
 msgstr "Token de validació"
 
-#: ../../Zotlabs/Module/Tagger.php:48
+#: ../../Code/Module/Tagger.php:48
 msgid "Post not found."
 msgstr "No s'ha trobat l'entrada"
 
-#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160
+#: ../../Code/Module/Tagger.php:77 ../../include/markdown.php:160
 #: ../../include/bbcode.php:354
 msgid "post"
 msgstr "entrada"
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
+#: ../../Code/Module/Tagger.php:79 ../../include/conversation.php:146
 #: ../../include/text.php:2030
 msgid "comment"
 msgstr "comentari"
 
-#: ../../Zotlabs/Module/Tagger.php:119
+#: ../../Code/Module/Tagger.php:119
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s ha etiquetat %3$s de %2$s amb %4$s"
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:26 ../../Code/Module/Pconfig.php:59
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Aquest ajust requereix un procés espedial i l'edició esta bloquejada."
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Code/Module/Pconfig.php:48
 msgid "Configuration Editor"
 msgstr "Editor de Configuració"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Code/Module/Pconfig.php:49
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please"
 " leave this page unless you are comfortable with and knowledgeable about how"
 " to correctly use this feature."
 msgstr "Alerta: segons quines combinacions podrien deixar el teu canal inusable. No és recomanable canviar aquesta configuració si no ets sents còmode/ i segur/a de com fer servir aquesta funcionalitat."
 
-#: ../../Zotlabs/Module/Defperms.php:246
+#: ../../Code/Module/Defperms.php:246
 msgid "Automatic approval settings"
 msgstr "Aprovació automàtica de soŀlicituds de connexió"
 
-#: ../../Zotlabs/Module/Defperms.php:254
+#: ../../Code/Module/Defperms.php:254
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
 msgstr "El valor per defecte dels permisos individuals poden tenir valors per defecte segons el tipus de canal i les opcions de privacitat. Pot ser que no estiguis autoritzat/da a modificar-los."
 
-#: ../../Zotlabs/Module/Authorize.php:17
+#: ../../Code/Module/Authorize.php:17
 msgid "Unknown App"
 msgstr "No es coneix l'aplicació"
 
-#: ../../Zotlabs/Module/Authorize.php:22
+#: ../../Code/Module/Authorize.php:22
 msgid "Authorize"
 msgstr "Autoritza"
 
-#: ../../Zotlabs/Module/Authorize.php:23
+#: ../../Code/Module/Authorize.php:23
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr "Vols autoritzar l'aplicació %s a accedir a les dades del teu canal?"
 
-#: ../../Zotlabs/Module/Authorize.php:25
+#: ../../Code/Module/Authorize.php:25
 msgid "Allow"
 msgstr "Permet-ho"
 
-#: ../../Zotlabs/Module/Group.php:35
+#: ../../Code/Module/Group.php:35
 msgid "Privacy group created."
 msgstr "S'ha creat el grup de privacitat."
 
-#: ../../Zotlabs/Module/Group.php:38
+#: ../../Code/Module/Group.php:38
 msgid "Could not create privacy group."
 msgstr "No s'ha pogut crear el grup de privacitat."
 
-#: ../../Zotlabs/Module/Group.php:51 ../../Zotlabs/Module/Group.php:181
+#: ../../Code/Module/Group.php:51 ../../Code/Module/Group.php:181
 #: ../../include/items.php:4125
 msgid "Privacy group not found."
 msgstr "No s'ha trobat el grup de privacitat."
 
-#: ../../Zotlabs/Module/Group.php:67
+#: ../../Code/Module/Group.php:67
 msgid "Privacy group updated."
 msgstr "S'ha actualitzat el grup de privacitat."
 
-#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124
-#: ../../Zotlabs/Widget/Activity_filter.php:68 ../../include/features.php:221
+#: ../../Code/Module/Group.php:113 ../../Code/Module/Group.php:124
+#: ../../Code/Widget/Activity_filter.php:68 ../../include/features.php:221
 #: ../../include/nav.php:97 ../../include/group.php:320
 msgid "Privacy Groups"
 msgstr "Grup de privacitat"
 
-#: ../../Zotlabs/Module/Group.php:114
+#: ../../Code/Module/Group.php:114
 msgid "Add Group"
 msgstr "Afegeix un grup"
 
-#: ../../Zotlabs/Module/Group.php:118
+#: ../../Code/Module/Group.php:118
 msgid "Privacy group name"
 msgstr "Nom del grup de privacitat"
 
-#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220
+#: ../../Code/Module/Group.php:119 ../../Code/Module/Group.php:220
 msgid "Members are visible to other channels"
 msgstr "Els membres son visibles en altres canals"
 
-#: ../../Zotlabs/Module/Group.php:126 ../../Zotlabs/Module/Help.php:81
+#: ../../Code/Module/Group.php:126 ../../Code/Module/Help.php:81
 msgid "Members"
 msgstr "Membres"
 
-#: ../../Zotlabs/Module/Group.php:151
+#: ../../Code/Module/Group.php:151
 msgid "Privacy group removed."
 msgstr "S'ha esborrat el grup de privacitat."
 
-#: ../../Zotlabs/Module/Group.php:153
+#: ../../Code/Module/Group.php:153
 msgid "Unable to remove privacy group."
 msgstr "No s'ha pogut esborrar el grup de privacitat."
 
-#: ../../Zotlabs/Module/Group.php:215
+#: ../../Code/Module/Group.php:215
 #, php-format
 msgid "Privacy Group: %s"
 msgstr "Grup de privacitat: %s"
 
-#: ../../Zotlabs/Module/Group.php:217
+#: ../../Code/Module/Group.php:217
 msgid "Privacy group name: "
 msgstr "Nom del grup de privacitat:"
 
-#: ../../Zotlabs/Module/Group.php:222
+#: ../../Code/Module/Group.php:222
 msgid "Delete Group"
 msgstr "Esborra el grup"
 
-#: ../../Zotlabs/Module/Group.php:232
+#: ../../Code/Module/Group.php:232
 msgid "Group members"
 msgstr "Membres del grup"
 
-#: ../../Zotlabs/Module/Group.php:234
+#: ../../Code/Module/Group.php:234
 msgid "Not in this group"
 msgstr "No hi són al grup"
 
-#: ../../Zotlabs/Module/Group.php:266
+#: ../../Code/Module/Group.php:266
 msgid "Click a channel to toggle membership"
 msgstr "Fes clic a un canal per a ficar-lo o treure'l del grup"
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+#: ../../Code/Module/Profiles.php:24 ../../Code/Module/Profiles.php:184
+#: ../../Code/Module/Profiles.php:241 ../../Code/Module/Profiles.php:659
 msgid "Profile not found."
 msgstr "Perfil no trobat."
 
-#: ../../Zotlabs/Module/Profiles.php:44
+#: ../../Code/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Perfil eliminat."
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+#: ../../Code/Module/Profiles.php:68 ../../Code/Module/Profiles.php:105
 msgid "Profile-"
 msgstr "Perfil-"
 
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+#: ../../Code/Module/Profiles.php:90 ../../Code/Module/Profiles.php:127
 msgid "New profile created."
 msgstr "Nou perfil creat."
 
-#: ../../Zotlabs/Module/Profiles.php:111
+#: ../../Code/Module/Profiles.php:111
 msgid "Profile unavailable to clone."
 msgstr "Perfil que no es pot clonar."
 
-#: ../../Zotlabs/Module/Profiles.php:146
+#: ../../Code/Module/Profiles.php:146
 msgid "Profile unavailable to export."
 msgstr "Perfil que no es pot exportar."
 
-#: ../../Zotlabs/Module/Profiles.php:252
+#: ../../Code/Module/Profiles.php:252
 msgid "Profile Name is required."
 msgstr "Es requereix el Nom del Perfil."
 
-#: ../../Zotlabs/Module/Profiles.php:459
+#: ../../Code/Module/Profiles.php:459
 msgid "Marital Status"
 msgstr "Estat Marital"
 
-#: ../../Zotlabs/Module/Profiles.php:463
+#: ../../Code/Module/Profiles.php:463
 msgid "Romantic Partner"
 msgstr "Company/a Romàntic"
 
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772
+#: ../../Code/Module/Profiles.php:467 ../../Code/Module/Profiles.php:772
 msgid "Likes"
 msgstr "Agrada"
 
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773
+#: ../../Code/Module/Profiles.php:471 ../../Code/Module/Profiles.php:773
 msgid "Dislikes"
 msgstr "Desagrada"
 
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780
+#: ../../Code/Module/Profiles.php:475 ../../Code/Module/Profiles.php:780
 msgid "Work/Employment"
 msgstr "Treball/Feina"
 
-#: ../../Zotlabs/Module/Profiles.php:478
+#: ../../Code/Module/Profiles.php:478
 msgid "Religion"
 msgstr "Religió"
 
-#: ../../Zotlabs/Module/Profiles.php:482
+#: ../../Code/Module/Profiles.php:482
 msgid "Political Views"
 msgstr "Idees Polítiques"
 
-#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../Code/Module/Profiles.php:486
 #: ../../addon/openid/MysqlProvider.php:74
 msgid "Gender"
 msgstr "Gènere"
 
-#: ../../Zotlabs/Module/Profiles.php:490
+#: ../../Code/Module/Profiles.php:490
 msgid "Sexual Preference"
 msgstr "Preferència Sexual"
 
-#: ../../Zotlabs/Module/Profiles.php:494
+#: ../../Code/Module/Profiles.php:494
 msgid "Homepage"
 msgstr "Pàgina Personal"
 
-#: ../../Zotlabs/Module/Profiles.php:498
+#: ../../Code/Module/Profiles.php:498
 msgid "Interests"
 msgstr "Interessos"
 
-#: ../../Zotlabs/Module/Profiles.php:594
+#: ../../Code/Module/Profiles.php:594
 msgid "Profile updated."
 msgstr "Perfil actualitzat."
 
-#: ../../Zotlabs/Module/Profiles.php:678
+#: ../../Code/Module/Profiles.php:678
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Amaga dels curiosos la teva llista de connexions d'aquest perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Code/Module/Profiles.php:722
 msgid "Edit Profile Details"
 msgstr "Modifica els detalls de perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Code/Module/Profiles.php:724
 msgid "View this profile"
 msgstr "Mostra aquest perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824
+#: ../../Code/Module/Profiles.php:725 ../../Code/Module/Profiles.php:824
 #: ../../include/channel.php:1319
 msgid "Edit visibility"
 msgstr "Editar visibilitat"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Profile Tools"
 msgstr "Eines per Perfils"
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Change cover photo"
 msgstr "Canviar la foto de portada"
 
-#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289
+#: ../../Code/Module/Profiles.php:728 ../../include/channel.php:1289
 msgid "Change profile photo"
 msgstr "Canviar la foto del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Code/Module/Profiles.php:729
 msgid "Create a new profile using these settings"
 msgstr "Crea un perfil nou amb aquesta configuració"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Clone this profile"
 msgstr "Clonar aquest perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Profiles.php:731
 msgid "Delete this profile"
 msgstr "Elimina aquest perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Profiles.php:732
 msgid "Add profile things"
 msgstr "Afegeix coses al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1717
+#: ../../Code/Module/Profiles.php:733 ../../include/conversation.php:1717
 msgid "Personal"
 msgstr "Personal"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Relationship"
 msgstr "Relació"
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44
+#: ../../Code/Module/Profiles.php:736 ../../Code/Widget/Newmember.php:44
 #: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr "Miscelania"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Import profile from file"
 msgstr "Importa perfil des d'un arxiu"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Export profile to file"
 msgstr "Exporta perfil a un arxiu"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Your gender"
 msgstr "El teu gènere"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Marital status"
 msgstr "Estat marital"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Code/Module/Profiles.php:742
 msgid "Sexual preference"
 msgstr "Preferència sexual"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:745
 msgid "Profile name"
 msgstr "Nom del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Code/Module/Profiles.php:747
 msgid "This is your default profile."
 msgstr "Aquest es el teu perfil per defecte"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Profiles.php:749
 msgid "Your full name"
 msgstr "El teu nom complet"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Code/Module/Profiles.php:750
 msgid "Title/Description"
 msgstr "Títol/Descripció"
 
-#: ../../Zotlabs/Module/Profiles.php:753
+#: ../../Code/Module/Profiles.php:753
 msgid "Street address"
 msgstr "Carrer"
 
-#: ../../Zotlabs/Module/Profiles.php:754
+#: ../../Code/Module/Profiles.php:754
 msgid "Locality/City"
 msgstr "Població/Ciutat"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Code/Module/Profiles.php:755
 msgid "Region/State"
 msgstr "Regió/Estat"
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Code/Module/Profiles.php:756
 msgid "Postal/Zip code"
 msgstr "Codi Postal"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Who (if applicable)"
 msgstr "Qui (si es aplicable)"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Examples: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../Zotlabs/Module/Profiles.php:763
+#: ../../Code/Module/Profiles.php:763
 msgid "Since (date)"
 msgstr "Des de (data)"
 
-#: ../../Zotlabs/Module/Profiles.php:766
+#: ../../Code/Module/Profiles.php:766
 msgid "Tell us about yourself"
 msgstr "Quelcom sobre tu"
 
-#: ../../Zotlabs/Module/Profiles.php:767
+#: ../../Code/Module/Profiles.php:767
 #: ../../addon/openid/MysqlProvider.php:68
 msgid "Homepage URL"
 msgstr "URL de la pàgina d'inici"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Code/Module/Profiles.php:768
 msgid "Hometown"
 msgstr "Ciutat Natal"
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Code/Module/Profiles.php:769
 msgid "Political views"
 msgstr "Idees polítiques"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Code/Module/Profiles.php:770
 msgid "Religious views"
 msgstr "Creences religioses"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Keywords used in directory listings"
 msgstr "Paraules clau emprades en els llistats de directoris"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Example: fishing photography software"
 msgstr "Exemple: software de fotografia submarina"
 
-#: ../../Zotlabs/Module/Profiles.php:774
+#: ../../Code/Module/Profiles.php:774
 msgid "Musical interests"
 msgstr "Interessos Musicals"
 
-#: ../../Zotlabs/Module/Profiles.php:775
+#: ../../Code/Module/Profiles.php:775
 msgid "Books, literature"
 msgstr "Llibres, literatura"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Code/Module/Profiles.php:776
 msgid "Television"
 msgstr "Televisió"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Code/Module/Profiles.php:777
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Pel·lícules/Dansa/Cultura/Entreteniment"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Profiles.php:778
 msgid "Hobbies/Interests"
 msgstr "Aficions/Interessos"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Code/Module/Profiles.php:779
 msgid "Love/Romance"
 msgstr "Amor/Romace"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Code/Module/Profiles.php:781
 msgid "School/Education"
 msgstr "Escola/Educació"
 
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Code/Module/Profiles.php:782
 msgid "Contact information and social networks"
 msgstr "Informació de contacte i xarxes socials"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Code/Module/Profiles.php:783
 msgid "My other channels"
 msgstr "Els meus altres canals"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Code/Module/Profiles.php:785
 msgid "Communications"
 msgstr "Comunicacions"
 
-#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315
+#: ../../Code/Module/Profiles.php:820 ../../include/channel.php:1315
 msgid "Profile Image"
 msgstr "Imatge del Perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296
+#: ../../Code/Module/Profiles.php:830 ../../include/channel.php:1296
 #: ../../include/nav.php:111
 msgid "Edit Profiles"
 msgstr "Modifica els perfils"
 
-#: ../../Zotlabs/Module/Go.php:21
+#: ../../Code/Module/Go.php:21
 msgid "This page is available only to site members"
 msgstr "Aquesta pàgina només és accessible per als membres del node."
 
-#: ../../Zotlabs/Module/Go.php:27
+#: ../../Code/Module/Go.php:27
 msgid "Welcome"
 msgstr "Benvingut/da"
 
-#: ../../Zotlabs/Module/Go.php:29
+#: ../../Code/Module/Go.php:29
 msgid "What would you like to do?"
 msgstr "Què t'agradaria fer?"
 
-#: ../../Zotlabs/Module/Go.php:31
+#: ../../Code/Module/Go.php:31
 msgid ""
 "Please bookmark this page if you would like to return to it in the future"
 msgstr "Marca aquesta pàgina si vols tornar-hi en un futur"
 
-#: ../../Zotlabs/Module/Go.php:35
+#: ../../Code/Module/Go.php:35
 msgid "Upload a profile photo"
 msgstr "Puja una imatge de perfil"
 
-#: ../../Zotlabs/Module/Go.php:36
+#: ../../Code/Module/Go.php:36
 msgid "Upload a cover photo"
 msgstr "Puja una imatge de portada"
 
-#: ../../Zotlabs/Module/Go.php:37
+#: ../../Code/Module/Go.php:37
 msgid "Edit your default profile"
 msgstr "Modifica el teu perfil per defecte"
 
-#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34
+#: ../../Code/Module/Go.php:38 ../../Code/Widget/Newmember.php:34
 msgid "View friend suggestions"
 msgstr "Mostra suggerències de connexions"
 
-#: ../../Zotlabs/Module/Go.php:39
+#: ../../Code/Module/Go.php:39
 msgid "View the channel directory"
 msgstr "Mostra el directori del canal"
 
-#: ../../Zotlabs/Module/Go.php:40
+#: ../../Code/Module/Go.php:40
 msgid "View/edit your channel settings"
 msgstr "Mostra o modifica la configuració del teu canal"
 
-#: ../../Zotlabs/Module/Go.php:41
+#: ../../Code/Module/Go.php:41
 msgid "View the site or project documentation"
 msgstr "Mostra la documentació del projecte"
 
-#: ../../Zotlabs/Module/Go.php:42
+#: ../../Code/Module/Go.php:42
 msgid "Visit your channel homepage"
 msgstr "Ves a la pàgina del teu canal"
 
-#: ../../Zotlabs/Module/Go.php:43
+#: ../../Code/Module/Go.php:43
 msgid ""
 "View your connections and/or add somebody whose address you already know"
 msgstr "Mostra les teves connexions o afegeix-ne una de nova introduint la seva adreça a mà."
 
-#: ../../Zotlabs/Module/Go.php:44
+#: ../../Code/Module/Go.php:44
 msgid ""
 "View your personal stream (this may be empty until you add some connections)"
 msgstr "Mostra el teu flux personal. Estarà buit mentre no et connectis amb ningú."
 
-#: ../../Zotlabs/Module/Go.php:52
+#: ../../Code/Module/Go.php:52
 msgid "View the public stream. Warning: this content is not moderated"
 msgstr "Mostra el flux públic. Avís: aquest contingut no està moderat"
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
+#: ../../Code/Module/Editwebpage.php:139
 msgid "Page link"
 msgstr "Enllaç de la pàgina"
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
+#: ../../Code/Module/Editwebpage.php:166
 msgid "Edit Webpage"
 msgstr "Edita la Pàgina Web"
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Manage.php:145
 msgid "Create a new channel"
 msgstr "Crear un nou canal"
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:302
+#: ../../Code/Module/Manage.php:170 ../../Code/Lib/Apps.php:302
 #: ../../include/nav.php:94
 msgid "Channel Manager"
 msgstr "Gestor de canals"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Code/Module/Manage.php:171
 msgid "Current Channel"
 msgstr "Canal Actual"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Code/Module/Manage.php:173
 msgid "Switch to one of your channels by selecting it."
 msgstr "Canviar a un altre dels teus canals seleccionant-ho."
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Code/Module/Manage.php:174
 msgid "Default Channel"
 msgstr "Canal per Defecte"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Code/Module/Manage.php:175
 msgid "Make Default"
 msgstr "Estableix com a Predeterminat"
 
-#: ../../Zotlabs/Module/Manage.php:178
+#: ../../Code/Module/Manage.php:178
 #, php-format
 msgid "%d new messages"
 msgstr "%d missatges nous"
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Code/Module/Manage.php:179
 #, php-format
 msgid "%d new introductions"
 msgstr "%d noves presentacions"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Code/Module/Manage.php:181
 msgid "Delegated Channel"
 msgstr "Canal Delegat"
 
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194
-#: ../../Zotlabs/Lib/Apps.php:293 ../../include/conversation.php:1902
+#: ../../Code/Module/Cards.php:42 ../../Code/Module/Cards.php:194
+#: ../../Code/Lib/Apps.php:293 ../../include/conversation.php:1902
 #: ../../include/features.php:123 ../../include/nav.php:450
 msgid "Cards"
 msgstr "Targetes"
 
-#: ../../Zotlabs/Module/Cards.php:99
+#: ../../Code/Module/Cards.php:99
 msgid "Add Card"
 msgstr "Afegeix una carta"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
+#: ../../Code/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "Aquest servidor de directori requereix un token de accès"
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Code/Module/Siteinfo.php:21
 msgid "About this site"
 msgstr "Sobre aquest lloc web"
 
-#: ../../Zotlabs/Module/Siteinfo.php:22
+#: ../../Code/Module/Siteinfo.php:22
 msgid "Site Name"
 msgstr "Nom del lloc web"
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
+#: ../../Code/Module/Siteinfo.php:26
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241
+#: ../../Code/Module/Siteinfo.php:28 ../../Code/Module/Register.php:241
 msgid "Terms of Service"
 msgstr "Condicions del Servei"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
+#: ../../Code/Module/Siteinfo.php:29
 msgid "Software and Project information"
 msgstr "Informació del programari i del projecte"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Code/Module/Siteinfo.php:30
 msgid "This site is powered by $Projectname"
 msgstr "Aquest lloc web funciona amb $Projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../Code/Module/Siteinfo.php:31
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr "Els serveis d'identitat i la federació i descentralització de la xarxa funcionen amb Zot"
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
+#: ../../Code/Module/Siteinfo.php:34
 msgid "Additional federated transport protocols:"
 msgstr "Altres protocols de transport federats:"
 
-#: ../../Zotlabs/Module/Siteinfo.php:36
+#: ../../Code/Module/Siteinfo.php:36
 #, php-format
 msgid "Version %s"
 msgstr "Versió %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:37
+#: ../../Code/Module/Siteinfo.php:37
 msgid "Project homepage"
 msgstr "Pàgina principal del projecte"
 
-#: ../../Zotlabs/Module/Siteinfo.php:38
+#: ../../Code/Module/Siteinfo.php:38
 msgid "Developer homepage"
 msgstr "Pàgina principal de desenvolupament"
 
-#: ../../Zotlabs/Module/Ratings.php:70
+#: ../../Code/Module/Ratings.php:70
 msgid "No ratings"
 msgstr "No valorat"
 
-#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
+#: ../../Code/Module/Ratings.php:97 ../../Code/Module/Pubsites.php:35
 #: ../../include/conversation.php:1087
 msgid "Ratings"
 msgstr "Valoracions"
 
-#: ../../Zotlabs/Module/Ratings.php:98
+#: ../../Code/Module/Ratings.php:98
 msgid "Rating: "
 msgstr "Valoració:"
 
-#: ../../Zotlabs/Module/Ratings.php:99
+#: ../../Code/Module/Ratings.php:99
 msgid "Website: "
 msgstr "Lloc web:"
 
-#: ../../Zotlabs/Module/Ratings.php:101
+#: ../../Code/Module/Ratings.php:101
 msgid "Description: "
 msgstr "Descripció:"
 
-#: ../../Zotlabs/Module/Webpages.php:54
+#: ../../Code/Module/Webpages.php:54
 msgid "Import Webpage Elements"
 msgstr "Importa elements de pàgina web"
 
-#: ../../Zotlabs/Module/Webpages.php:55
+#: ../../Code/Module/Webpages.php:55
 msgid "Import selected"
 msgstr "Importa la selecció"
 
-#: ../../Zotlabs/Module/Webpages.php:78
+#: ../../Code/Module/Webpages.php:78
 msgid "Export Webpage Elements"
 msgstr "Exporta elements de pàgina web"
 
-#: ../../Zotlabs/Module/Webpages.php:79
+#: ../../Code/Module/Webpages.php:79
 msgid "Export selected"
 msgstr "Exporta la selecció"
 
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:306
+#: ../../Code/Module/Webpages.php:237 ../../Code/Lib/Apps.php:306
 #: ../../include/conversation.php:1924 ../../include/nav.php:473
 msgid "Webpages"
 msgstr "Pàgines web"
 
-#: ../../Zotlabs/Module/Webpages.php:248
+#: ../../Code/Module/Webpages.php:248
 msgid "Actions"
 msgstr "Accions"
 
-#: ../../Zotlabs/Module/Webpages.php:249
+#: ../../Code/Module/Webpages.php:249
 msgid "Page Link"
 msgstr "Enllaç a Pàgina"
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Code/Module/Webpages.php:250
 msgid "Page Title"
 msgstr "Títol de la pàgina"
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Code/Module/Webpages.php:280
 msgid "Invalid file type."
 msgstr "El tipus de fitxer és invàlid."
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Code/Module/Webpages.php:292
 msgid "Error opening zip file"
 msgstr "Hi ha hagut un error descomprimint"
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Code/Module/Webpages.php:303
 msgid "Invalid folder path."
 msgstr "El camí de carpeta és invàlid."
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Code/Module/Webpages.php:330
 msgid "No webpage elements detected."
 msgstr "No s'ha detectat cap element de pàgina web."
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Code/Module/Webpages.php:405
 msgid "Import complete."
 msgstr "S'ha completat la importació."
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
+#: ../../Code/Module/Changeaddr.php:35
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account"
 " password."
 msgstr "No es permet canviar el nom d'un canal fins a 48 hores més tard d'haver canviant la contrasenya del compte al que pertany."
 
-#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214
+#: ../../Code/Module/Changeaddr.php:46 ../../include/channel.php:214
 #: ../../include/channel.php:599
 msgid "Reserved nickname. Please choose another."
 msgstr "Àlies reservat. Tria un altre."
 
-#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219
+#: ../../Code/Module/Changeaddr.php:51 ../../include/channel.php:219
 #: ../../include/channel.php:604
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "L'álies te caracters no soportats o ja esta en ús en aquest lloc"
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
+#: ../../Code/Module/Changeaddr.php:77
 msgid "Change channel nickname/address"
 msgstr "Canvia el nom o adreça del canal"
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Changeaddr.php:78
 msgid "Any/all connections on other networks will be lost!"
 msgstr "Es perdran totes les connexions amb xarxes externes!"
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
+#: ../../Code/Module/Changeaddr.php:80
 msgid "New channel address"
 msgstr "Adreça de canal nova"
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
+#: ../../Code/Module/Changeaddr.php:81
 msgid "Rename Channel"
 msgstr "Canvia el nom del canal"
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+#: ../../Code/Module/Editpost.php:38 ../../Code/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "Article no editable"
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144
+#: ../../Code/Module/Editpost.php:108 ../../Code/Module/Rpost.php:144
 msgid "Edit post"
 msgstr "Modifica l'entrada"
 
-#: ../../Zotlabs/Module/Dreport.php:45
+#: ../../Code/Module/Dreport.php:45
 msgid "Invalid message"
 msgstr "Missatge invàlid."
 
-#: ../../Zotlabs/Module/Dreport.php:78
+#: ../../Code/Module/Dreport.php:78
 msgid "no results"
 msgstr "sense resultats"
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Code/Module/Dreport.php:93
 msgid "channel sync processed"
 msgstr "sincronització del canal processada"
 
-#: ../../Zotlabs/Module/Dreport.php:97
+#: ../../Code/Module/Dreport.php:97
 msgid "queued"
 msgstr "Posat en cua"
 
-#: ../../Zotlabs/Module/Dreport.php:101
+#: ../../Code/Module/Dreport.php:101
 msgid "posted"
 msgstr "enviat"
 
-#: ../../Zotlabs/Module/Dreport.php:105
+#: ../../Code/Module/Dreport.php:105
 msgid "accepted for delivery"
 msgstr "acceptat per entregar"
 
-#: ../../Zotlabs/Module/Dreport.php:109
+#: ../../Code/Module/Dreport.php:109
 msgid "updated"
 msgstr "actualitzat"
 
-#: ../../Zotlabs/Module/Dreport.php:112
+#: ../../Code/Module/Dreport.php:112
 msgid "update ignored"
 msgstr "actualització ignorada"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Code/Module/Dreport.php:115
 msgid "permission denied"
 msgstr "permís denegat"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Code/Module/Dreport.php:119
 msgid "recipient not found"
 msgstr "Contenidor no trobat"
 
-#: ../../Zotlabs/Module/Dreport.php:122
+#: ../../Code/Module/Dreport.php:122
 msgid "mail recalled"
 msgstr "Recupera el correu"
 
-#: ../../Zotlabs/Module/Dreport.php:125
+#: ../../Code/Module/Dreport.php:125
 msgid "duplicate mail received"
 msgstr "rebut correu duplicat"
 
-#: ../../Zotlabs/Module/Dreport.php:128
+#: ../../Code/Module/Dreport.php:128
 msgid "mail delivered"
 msgstr "correu entregat"
 
-#: ../../Zotlabs/Module/Dreport.php:148
+#: ../../Code/Module/Dreport.php:148
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Informe de lliurament per %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Code/Module/Dreport.php:151 ../../Code/Widget/Wiki_pages.php:39
+#: ../../Code/Widget/Wiki_pages.php:96
 msgid "Options"
 msgstr "Opcions"
 
-#: ../../Zotlabs/Module/Dreport.php:152
+#: ../../Code/Module/Dreport.php:152
 msgid "Redeliver"
 msgstr "Tornar a lliurar"
 
-#: ../../Zotlabs/Module/Sources.php:38
+#: ../../Code/Module/Sources.php:38
 msgid "Failed to create source. No channel selected."
 msgstr "Error en crear l'origen. Cap canal seleccionat."
 
-#: ../../Zotlabs/Module/Sources.php:54
+#: ../../Code/Module/Sources.php:54
 msgid "Source created."
 msgstr "Origen creat."
 
-#: ../../Zotlabs/Module/Sources.php:67
+#: ../../Code/Module/Sources.php:67
 msgid "Source updated."
 msgstr "Origen actualitzat."
 
-#: ../../Zotlabs/Module/Sources.php:93
+#: ../../Code/Module/Sources.php:93
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:99
-#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292
+#: ../../Code/Module/Sources.php:99
+#: ../../Code/Widget/Settings_menu.php:133 ../../include/features.php:292
 msgid "Channel Sources"
 msgstr "Canal Origen"
 
-#: ../../Zotlabs/Module/Sources.php:100
+#: ../../Code/Module/Sources.php:100
 msgid "Manage remote sources of content for your channel."
 msgstr "Gestiona contingut per al teu canal d'origens remots"
 
-#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111
+#: ../../Code/Module/Sources.php:101 ../../Code/Module/Sources.php:111
 msgid "New Source"
 msgstr "Nou Origen"
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:146
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importa-ho tot o només allò seleccionat del següent canals, cap a aquest canal, i distribueix-lo d'acord a la configuració del teu canal."
 
-#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:113 ../../Code/Module/Sources.php:147
 msgid "Only import content with these words (one per line)"
 msgstr "Només importa contingut amb aquestes paraules (una per línia)"
 
-#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:113 ../../Code/Module/Sources.php:147
 msgid "Leave blank to import all public content"
 msgstr "Deixar en blanc per importar tot el contingut públic"
 
-#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153
+#: ../../Code/Module/Sources.php:114 ../../Code/Module/Sources.php:153
 msgid "Channel Name"
 msgstr "Nom del canal"
 
-#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150
+#: ../../Code/Module/Sources.php:115 ../../Code/Module/Sources.php:150
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr "Afegeix les següents categories d'entrades importades des d'aquest origen (separat per comes)"
 
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
+#: ../../Code/Module/Sources.php:116 ../../Code/Module/Sources.php:151
 msgid "Resend posts with this channel as author"
 msgstr "Reenvia les entrades que tinguin aquest canal com a autor/a"
 
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
+#: ../../Code/Module/Sources.php:116 ../../Code/Module/Sources.php:151
 msgid "Copyrights may apply"
 msgstr "Poden aplicar drets d'autor"
 
-#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166
+#: ../../Code/Module/Sources.php:136 ../../Code/Module/Sources.php:166
 msgid "Source not found."
 msgstr "No s'ha trobat la font."
 
-#: ../../Zotlabs/Module/Sources.php:143
+#: ../../Code/Module/Sources.php:143
 msgid "Edit Source"
 msgstr "Edita la font"
 
-#: ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:144
 msgid "Delete Source"
 msgstr "Esborra la font"
 
-#: ../../Zotlabs/Module/Sources.php:174
+#: ../../Code/Module/Sources.php:174
 msgid "Source removed"
 msgstr "S'ha esborrat la font"
 
-#: ../../Zotlabs/Module/Sources.php:176
+#: ../../Code/Module/Sources.php:176
 msgid "Unable to remove source."
 msgstr "No s'ha pogut esborrar la font."
 
-#: ../../Zotlabs/Module/Like.php:54
+#: ../../Code/Module/Like.php:54
 msgid "Like/Dislike"
 msgstr "M'agrada / No m'agrada"
 
-#: ../../Zotlabs/Module/Like.php:59
+#: ../../Code/Module/Like.php:59
 msgid "This action is restricted to members."
 msgstr "Aquesta acció està restringida als membres."
 
-#: ../../Zotlabs/Module/Like.php:60
+#: ../../Code/Module/Like.php:60
 msgid ""
 "Please login with your $Projectname ID or register as a new $Projectname member to continue."
 msgstr "Entra amb la teva identitat $Projectname o registra't a $Projectname per continuar."
 
-#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135
-#: ../../Zotlabs/Module/Like.php:173
+#: ../../Code/Module/Like.php:109 ../../Code/Module/Like.php:135
+#: ../../Code/Module/Like.php:173
 msgid "Invalid request."
 msgstr "Sol·licitud invàlida."
 
-#: ../../Zotlabs/Module/Like.php:121 ../../include/conversation.php:122
+#: ../../Code/Module/Like.php:121 ../../include/conversation.php:122
 msgid "channel"
 msgstr "canal"
 
-#: ../../Zotlabs/Module/Like.php:150
+#: ../../Code/Module/Like.php:150
 msgid "thing"
 msgstr "cosa"
 
-#: ../../Zotlabs/Module/Like.php:196
+#: ../../Code/Module/Like.php:196
 msgid "Channel unavailable."
 msgstr "El canal està inactiu."
 
-#: ../../Zotlabs/Module/Like.php:244
+#: ../../Code/Module/Like.php:244
 msgid "Previous action reversed."
 msgstr "S'ha desfet l'acció anterior."
 
-#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1559
+#: ../../Code/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1559
 #: ../../addon/pubcrawl/as.php:1544 ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s agrada %2$s de %3$s"
 
-#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1546
+#: ../../Code/Module/Like.php:440 ../../addon/pubcrawl/as.php:1546
 #: ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s no agrada %2$s de %3$s"
 
-#: ../../Zotlabs/Module/Like.php:442
+#: ../../Code/Module/Like.php:442
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s està d'acord amb %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:444
+#: ../../Code/Module/Like.php:444
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s no està d'acord amb %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:446
+#: ../../Code/Module/Like.php:446
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s s'abstén en %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2102
+#: ../../Code/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2102
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s assistirà a %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2104
+#: ../../Code/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2104
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s no assistirà a %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2106
+#: ../../Code/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2106
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s potser assistirà a %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:564
+#: ../../Code/Module/Like.php:564
 msgid "Action completed."
 msgstr "S'ha completat l'acció."
 
-#: ../../Zotlabs/Module/Like.php:565
+#: ../../Code/Module/Like.php:565
 msgid "Thank you."
 msgstr "Gràcies."
 
-#: ../../Zotlabs/Module/Directory.php:106
+#: ../../Code/Module/Directory.php:106
 msgid "No default suggestions were found."
 msgstr "No s'han trobat suggerències predefinides."
 
-#: ../../Zotlabs/Module/Directory.php:255
+#: ../../Code/Module/Directory.php:255
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d valoració"
 msgstr[1] "%d valoracions"
 
-#: ../../Zotlabs/Module/Directory.php:266
+#: ../../Code/Module/Directory.php:266
 msgid "Gender: "
 msgstr "Gènere:"
 
-#: ../../Zotlabs/Module/Directory.php:268
+#: ../../Code/Module/Directory.php:268
 msgid "Status: "
 msgstr "Estatus:"
 
-#: ../../Zotlabs/Module/Directory.php:270
+#: ../../Code/Module/Directory.php:270
 msgid "Homepage: "
 msgstr "Pàgina Personal:"
 
-#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564
+#: ../../Code/Module/Directory.php:319 ../../include/channel.php:1564
 msgid "Age:"
 msgstr "Edat:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391
+#: ../../Code/Module/Directory.php:324 ../../include/channel.php:1391
 #: ../../include/event.php:54 ../../include/event.php:86
 msgid "Location:"
 msgstr "Localització:"
 
-#: ../../Zotlabs/Module/Directory.php:330
+#: ../../Code/Module/Directory.php:330
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593
+#: ../../Code/Module/Directory.php:335 ../../include/channel.php:1593
 msgid "Hometown:"
 msgstr "Ciutat Natal:"
 
-#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599
+#: ../../Code/Module/Directory.php:337 ../../include/channel.php:1599
 msgid "About:"
 msgstr "Sobre:"
 
-#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../Code/Module/Directory.php:338 ../../Code/Module/Suggest.php:56
+#: ../../Code/Widget/Follow.php:32 ../../Code/Widget/Suggestions.php:44
 #: ../../include/conversation.php:1057 ../../include/channel.php:1376
 #: ../../include/connections.php:110
 msgid "Connect"
 msgstr "Connecta "
 
-#: ../../Zotlabs/Module/Directory.php:339
+#: ../../Code/Module/Directory.php:339
 msgid "Public Forum:"
 msgstr "Forum Públic:"
 
-#: ../../Zotlabs/Module/Directory.php:342
+#: ../../Code/Module/Directory.php:342
 msgid "Keywords: "
 msgstr "Paraules Clau:"
 
-#: ../../Zotlabs/Module/Directory.php:345
+#: ../../Code/Module/Directory.php:345
 msgid "Don't suggest"
 msgstr "No suggerir"
 
-#: ../../Zotlabs/Module/Directory.php:347
+#: ../../Code/Module/Directory.php:347
 msgid "Common connections (estimated):"
 msgstr "Connexions en comú (aproximades):"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Global Directory"
 msgstr "Directori Global"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Local Directory"
 msgstr "Directori Local"
 
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Code/Module/Directory.php:402
 msgid "Finding:"
 msgstr "Cercant:"
 
-#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Code/Module/Directory.php:405 ../../Code/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Canals Suggerits"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "next page"
 msgstr "pàgina següent"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "previous page"
 msgstr "pàgina anterior"
 
-#: ../../Zotlabs/Module/Directory.php:408
+#: ../../Code/Module/Directory.php:408
 msgid "Sort options"
 msgstr "Opcions per ordenar"
 
-#: ../../Zotlabs/Module/Directory.php:409
+#: ../../Code/Module/Directory.php:409
 msgid "Alphabetic"
 msgstr "Alfabètic"
 
-#: ../../Zotlabs/Module/Directory.php:410
+#: ../../Code/Module/Directory.php:410
 msgid "Reverse Alphabetic"
 msgstr "Alfabètic Invers"
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Code/Module/Directory.php:411
 msgid "Newest to Oldest"
 msgstr "De més Nou a més Vell"
 
-#: ../../Zotlabs/Module/Directory.php:412
+#: ../../Code/Module/Directory.php:412
 msgid "Oldest to Newest"
 msgstr "De més Antic a més Nou"
 
-#: ../../Zotlabs/Module/Directory.php:429
+#: ../../Code/Module/Directory.php:429
 msgid "No entries (some entries may be hidden)."
 msgstr "Sense entrades (algunes podrien estar amagades)."
 
-#: ../../Zotlabs/Module/Xchan.php:10
+#: ../../Code/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr "Cerca a xchan"
 
-#: ../../Zotlabs/Module/Xchan.php:13
+#: ../../Code/Module/Xchan.php:13
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Cerca a xchan començant per (o webbie)"
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Code/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "No hi ha suggerencies. Si es un lloc nou, espera 24 hores i proba de nou."
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Code/Module/Suggest.php:58 ../../Code/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr "Ignora/Amaga"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "No es possible trobar el node"
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "Entrada realitzada amb èxit. "
 
-#: ../../Zotlabs/Module/Mail.php:73
+#: ../../Code/Module/Mail.php:73
 msgid "Unable to lookup recipient."
 msgstr "Incapaç de trobar el destinatari."
 
-#: ../../Zotlabs/Module/Mail.php:80
+#: ../../Code/Module/Mail.php:80
 msgid "Unable to communicate with requested channel."
 msgstr "Incapaç de comunicar amb el canal demanat."
 
-#: ../../Zotlabs/Module/Mail.php:87
+#: ../../Code/Module/Mail.php:87
 msgid "Cannot verify requested channel."
 msgstr "No puc verificar el canal demanat."
 
-#: ../../Zotlabs/Module/Mail.php:105
+#: ../../Code/Module/Mail.php:105
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "El canal seleccionat te restriccions sobre els missatges privats. L'enviament ha fallat."
 
-#: ../../Zotlabs/Module/Mail.php:160
+#: ../../Code/Module/Mail.php:160
 msgid "Messages"
 msgstr "Missatges"
 
-#: ../../Zotlabs/Module/Mail.php:173
+#: ../../Code/Module/Mail.php:173
 msgid "message"
 msgstr "missatge"
 
-#: ../../Zotlabs/Module/Mail.php:214
+#: ../../Code/Module/Mail.php:214
 msgid "Message recalled."
 msgstr "Recupera el missatge."
 
-#: ../../Zotlabs/Module/Mail.php:227
+#: ../../Code/Module/Mail.php:227
 msgid "Conversation removed."
 msgstr "Conversació eliminada."
 
-#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
+#: ../../Code/Module/Mail.php:242 ../../Code/Module/Mail.php:363
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Expira YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:270
+#: ../../Code/Module/Mail.php:270
 msgid "Requested channel is not in this network"
 msgstr "El canal demanat no hi es en questa xarxa"
 
-#: ../../Zotlabs/Module/Mail.php:278
+#: ../../Code/Module/Mail.php:278
 msgid "Send Private Message"
 msgstr "Envia Missatge Privat"
 
-#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
+#: ../../Code/Module/Mail.php:279 ../../Code/Module/Mail.php:421
 msgid "To:"
 msgstr "Per:"
 
-#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
+#: ../../Code/Module/Mail.php:282 ../../Code/Module/Mail.php:423
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../Code/Module/Mail.php:287 ../../Code/Module/Mail.php:429
 msgid "Attach file"
 msgstr "Adjunta arxiu"
 
-#: ../../Zotlabs/Module/Mail.php:289
+#: ../../Code/Module/Mail.php:289
 msgid "Send"
 msgstr "Envia"
 
-#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../Code/Module/Mail.php:292 ../../Code/Module/Mail.php:434
 #: ../../include/conversation.php:1438
 msgid "Set expiration date"
 msgstr "Ajusta la data d'expiració"
 
-#: ../../Zotlabs/Module/Mail.php:393
+#: ../../Code/Module/Mail.php:393
 msgid "Delete message"
 msgstr "Elimina el missatge"
 
-#: ../../Zotlabs/Module/Mail.php:394
+#: ../../Code/Module/Mail.php:394
 msgid "Delivery report"
 msgstr "Informe d'entrega"
 
-#: ../../Zotlabs/Module/Mail.php:395
+#: ../../Code/Module/Mail.php:395
 msgid "Recall message"
 msgstr "Recupera el missatge"
 
-#: ../../Zotlabs/Module/Mail.php:397
+#: ../../Code/Module/Mail.php:397
 msgid "Message has been recalled."
 msgstr "El missatge s'ha recuperat."
 
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Code/Module/Mail.php:414
 msgid "Delete Conversation"
 msgstr "Conversació esborrada"
 
-#: ../../Zotlabs/Module/Mail.php:416
+#: ../../Code/Module/Mail.php:416
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "Comunicació segura no disponible. Pots respondre des de la pàgina de perfil del remitent."
 
-#: ../../Zotlabs/Module/Mail.php:420
+#: ../../Code/Module/Mail.php:420
 msgid "Send Reply"
 msgstr "Envia Resposta"
 
-#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Code/Module/Mail.php:425
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "El teu missatge per %s (%s):"
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+#: ../../Code/Module/Pubsites.php:24 ../../Code/Widget/Pubsites.php:12
 msgid "Public Hubs"
 msgstr "Nodes Públics"
 
-#: ../../Zotlabs/Module/Pubsites.php:27
+#: ../../Code/Module/Pubsites.php:27
 msgid ""
 "The listed hubs allow public registration for the $Projectname network. All "
 "hubs in the network are interlinked so membership on any of them conveys "
@@ -7286,1522 +7286,1522 @@ msgid ""
 "additional details."
 msgstr "Els nodes llistats permeten registrar usuaris de la xarxa $Projectname. Com que tots els nodes estan enllaçats entre ells, la identitat és vàlida a tota la xarxa. Alguns nodes poden demanar subscripció o oferir serveis addicional de pagament. Per a més detalls, proveu de seguir els enllaços dels proveïdors."
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr "URL del Node"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr "Tipus d'accés"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr "Condicions d'inscripció"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Stats"
 msgstr "Estadístiques"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Software"
 msgstr "Programari"
 
-#: ../../Zotlabs/Module/Pubsites.php:49
+#: ../../Code/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Puntua"
 
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:269
+#: ../../Code/Module/Impel.php:43 ../../include/bbcode.php:269
 msgid "webpage"
 msgstr "pàgina web"
 
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:275
+#: ../../Code/Module/Impel.php:48 ../../include/bbcode.php:275
 msgid "block"
 msgstr "bloc"
 
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:272
+#: ../../Code/Module/Impel.php:53 ../../include/bbcode.php:272
 msgid "layout"
 msgstr "disposició"
 
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:278
+#: ../../Code/Module/Impel.php:60 ../../include/bbcode.php:278
 msgid "menu"
 msgstr "menú"
 
-#: ../../Zotlabs/Module/Impel.php:183
+#: ../../Code/Module/Impel.php:183
 #, php-format
 msgid "%s element installed"
 msgstr "%s element instal·lat"
 
-#: ../../Zotlabs/Module/Impel.php:186
+#: ../../Code/Module/Impel.php:186
 #, php-format
 msgid "%s element installation failed"
 msgstr "%s instal·lació d'element va fallar"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Code/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr "Tria una carpeta d'interès"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Code/Module/Rbmark.php:99
 msgid "Save Bookmark"
 msgstr "Desa el marcadors"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Code/Module/Rbmark.php:100
 msgid "URL of bookmark"
 msgstr "URL del marcador"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Code/Module/Rbmark.php:105
 msgid "Or enter new bookmark folder name"
 msgstr "O introdueix el nom d'una carpeta de marcadors nova"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "Enter a folder name"
 msgstr "Escriu el nom de la carpeta"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "or select an existing folder (doubleclick)"
 msgstr "o escull-ne una d'existent amb doble clic"
 
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:162
+#: ../../Code/Module/Filer.php:54 ../../Code/Lib/ThreadItem.php:162
 msgid "Save to Folder"
 msgstr "Guardar en la Carpeta"
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Code/Module/Probe.php:30 ../../Code/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "URL sol·licitada retorna error: %1$s"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Code/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Nombre màxim d'inscripcions diaris excedit. Si us plau, provau demà."
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Code/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "L'inscripció ha fallat. Si et plau, indica que acceptes les Condicions del Servei."
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Code/Module/Register.php:89
 msgid "Passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: ../../Zotlabs/Module/Register.php:132
+#: ../../Code/Module/Register.php:132
 msgid "Registration successful. Continue to create your first channel..."
 msgstr "S'ha registrat el compte amb èxit. Ara pots crear el teu primer canal..."
 
-#: ../../Zotlabs/Module/Register.php:135
+#: ../../Code/Module/Register.php:135
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registrat amb èxit. Si et plau revisa el teu correu electrònic per a les instruccions de validació."
 
-#: ../../Zotlabs/Module/Register.php:142
+#: ../../Code/Module/Register.php:142
 msgid "Your registration is pending approval by the site owner."
 msgstr "La teva inscripció esta pendent de validació pel propietari del lloc."
 
-#: ../../Zotlabs/Module/Register.php:145
+#: ../../Code/Module/Register.php:145
 msgid "Your registration can not be processed."
 msgstr "La teva inscripció no ha pogut ser processat. "
 
-#: ../../Zotlabs/Module/Register.php:192
+#: ../../Code/Module/Register.php:192
 msgid "Registration on this hub is disabled."
 msgstr "L'inscripció en aquest node està deshabilitat."
 
-#: ../../Zotlabs/Module/Register.php:201
+#: ../../Code/Module/Register.php:201
 msgid "Registration on this hub is by approval only."
 msgstr "L'inscripció en aquest node es únicament per validació."
 
-#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211
+#: ../../Code/Module/Register.php:202 ../../Code/Module/Register.php:211
 msgid "Register at another affiliated hub."
 msgstr "Inscripció en altre node afiliat"
 
-#: ../../Zotlabs/Module/Register.php:210
+#: ../../Code/Module/Register.php:210
 msgid "Registration on this hub is by invitation only."
 msgstr "El registre en aquest node funciona per invitació."
 
-#: ../../Zotlabs/Module/Register.php:221
+#: ../../Code/Module/Register.php:221
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "El lloc ha excedit el límit màxim diari de nous comptes/inscripció. Provau demà."
 
-#: ../../Zotlabs/Module/Register.php:247
+#: ../../Code/Module/Register.php:247
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Accepto el %s per a aquest lloc web"
 
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/Register.php:254
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Tinc més de %s anys i accepto les %s"
 
-#: ../../Zotlabs/Module/Register.php:259
+#: ../../Code/Module/Register.php:259
 msgid "Your email address"
 msgstr "La teva adreça de correu electrónic"
 
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Code/Module/Register.php:260
 msgid "Choose a password"
 msgstr "Tria una contrasenya"
 
-#: ../../Zotlabs/Module/Register.php:261
+#: ../../Code/Module/Register.php:261
 msgid "Please re-enter your password"
 msgstr "Si et plau, re-entra la contrasenya"
 
-#: ../../Zotlabs/Module/Register.php:262
+#: ../../Code/Module/Register.php:262
 msgid "Please enter your invitation code"
 msgstr "Si et plau, introdueix el teu codi d'invitació"
 
-#: ../../Zotlabs/Module/Register.php:263
+#: ../../Code/Module/Register.php:263
 msgid "Your Name"
 msgstr "El teu nom"
 
-#: ../../Zotlabs/Module/Register.php:263
+#: ../../Code/Module/Register.php:263
 msgid "Real names are preferred."
 msgstr "Considera de fer servir el teu nom real."
 
-#: ../../Zotlabs/Module/Register.php:265
+#: ../../Code/Module/Register.php:265
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
 "e.g. nickname%s"
 msgstr "El teu àlies servirà per crear un nom fàcil per recordar l'adreça del canal. Per exemple, àlies%s"
 
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Code/Module/Register.php:266
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
 msgstr "Escull un rol de permisos de canal. Tingues en compte l'ús que en faràs i el nivell de privacitat que desitges."
 
-#: ../../Zotlabs/Module/Register.php:267
+#: ../../Code/Module/Register.php:267
 msgid "no"
 msgstr "no"
 
-#: ../../Zotlabs/Module/Register.php:267
+#: ../../Code/Module/Register.php:267
 msgid "yes"
 msgstr "sí"
 
-#: ../../Zotlabs/Module/Register.php:294 ../../boot.php:1593
+#: ../../Code/Module/Register.php:294 ../../boot.php:1593
 #: ../../include/nav.php:158
 msgid "Register"
 msgstr "Inscripció"
 
-#: ../../Zotlabs/Module/Register.php:295
+#: ../../Code/Module/Register.php:295
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr "Aquest node demana que es verifiquin els comptes de correu. Un cop completat el formulari, comprova la teva safata d'entrada i segueix les instruccions que hi trobaràs."
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Cover_photo.php:218
+#: ../../Code/Module/Cover_photo.php:168
+#: ../../Code/Module/Cover_photo.php:218
 msgid "Cover Photos"
 msgstr "Fotos de Portada"
 
-#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4502
+#: ../../Code/Module/Cover_photo.php:269 ../../include/items.php:4502
 msgid "female"
 msgstr "femení"
 
-#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4503
+#: ../../Code/Module/Cover_photo.php:270 ../../include/items.php:4503
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s actualitzà el seu %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4504
+#: ../../Code/Module/Cover_photo.php:271 ../../include/items.php:4504
 msgid "male"
 msgstr "masculí"
 
-#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4505
+#: ../../Code/Module/Cover_photo.php:272 ../../include/items.php:4505
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s actualitzà el seu %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4507
+#: ../../Code/Module/Cover_photo.php:274 ../../include/items.php:4507
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s actualitzà els seus %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2081
+#: ../../Code/Module/Cover_photo.php:276 ../../include/channel.php:2081
 msgid "cover photo"
 msgstr "Foto de la portada"
 
-#: ../../Zotlabs/Module/Cover_photo.php:390
+#: ../../Code/Module/Cover_photo.php:390
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr "La teva foto de portada és pública i visible a tothom."
 
-#: ../../Zotlabs/Module/Cover_photo.php:394
+#: ../../Code/Module/Cover_photo.php:394
 msgid "Change Cover Photo"
 msgstr "Canvia la foto de portada"
 
-#: ../../Zotlabs/Module/Help.php:23
+#: ../../Code/Module/Help.php:23
 msgid "Documentation Search"
 msgstr "Cerca de Documentació"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1833
+#: ../../Code/Module/Help.php:80 ../../include/conversation.php:1833
 #: ../../include/nav.php:383
 msgid "About"
 msgstr "El Meu Perfil"
 
-#: ../../Zotlabs/Module/Help.php:82
+#: ../../Code/Module/Help.php:82
 msgid "Administrators"
 msgstr "Administradors"
 
-#: ../../Zotlabs/Module/Help.php:83
+#: ../../Code/Module/Help.php:83
 msgid "Developers"
 msgstr "Desenvolupadors"
 
-#: ../../Zotlabs/Module/Help.php:84
+#: ../../Code/Module/Help.php:84
 msgid "Tutorials"
 msgstr "Tutorials"
 
-#: ../../Zotlabs/Module/Help.php:95
+#: ../../Code/Module/Help.php:95
 msgid "$Projectname Documentation"
 msgstr "$Projectname Documentació"
 
-#: ../../Zotlabs/Module/Help.php:96
+#: ../../Code/Module/Help.php:96
 msgid "Contents"
 msgstr "Continguts"
 
-#: ../../Zotlabs/Module/Display.php:394
+#: ../../Code/Module/Display.php:394
 msgid "Article"
 msgstr "Article"
 
-#: ../../Zotlabs/Module/Display.php:446
+#: ../../Code/Module/Display.php:446
 msgid "Item has been removed."
 msgstr "S'ha esborrat l'element."
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr "S'ha tret l'etiqueta"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr "Elimina l'etiqueta d'element"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr "Tria l'etiqueta a eliminar:"
 
-#: ../../Zotlabs/Module/Network.php:116
+#: ../../Code/Module/Network.php:116
 msgid "No such group"
 msgstr "No existeix el grup"
 
-#: ../../Zotlabs/Module/Network.php:157
+#: ../../Code/Module/Network.php:157
 msgid "No such channel"
 msgstr "No existeix el canal"
 
-#: ../../Zotlabs/Module/Network.php:242
+#: ../../Code/Module/Network.php:242
 msgid "Privacy group is empty"
 msgstr "El grup de privacitat està buit"
 
-#: ../../Zotlabs/Module/Network.php:253
+#: ../../Code/Module/Network.php:253
 msgid "Privacy group: "
 msgstr "Grup de privacitat:"
 
-#: ../../Zotlabs/Module/Network.php:304 ../../addon/redred/redred.php:65
+#: ../../Code/Module/Network.php:304 ../../addon/redred/redred.php:65
 msgid "Invalid channel."
 msgstr "El canal no és vàlid."
 
-#: ../../Zotlabs/Module/Acl.php:359
+#: ../../Code/Module/Acl.php:359
 msgid "network"
 msgstr "xarxa"
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
+#: ../../Code/Module/Home.php:74 ../../Code/Module/Home.php:82
+#: ../../Code/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../Zotlabs/Module/Home.php:92
+#: ../../Code/Module/Home.php:92
 #, php-format
 msgid "Welcome to %s"
 msgstr "Benvingut a %s"
 
-#: ../../Zotlabs/Module/Filestorage.php:79
+#: ../../Code/Module/Filestorage.php:79
 msgid "Permission Denied."
 msgstr "Permisos Denegats."
 
-#: ../../Zotlabs/Module/Filestorage.php:112
+#: ../../Code/Module/Filestorage.php:112
 msgid "File not found."
 msgstr "Arxiu no torbat."
 
-#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Code/Module/Filestorage.php:165
 msgid "Edit file permissions"
 msgstr "Edita els permisos d'arxiu"
 
-#: ../../Zotlabs/Module/Filestorage.php:177
+#: ../../Code/Module/Filestorage.php:177
 msgid "Set/edit permissions"
 msgstr "Canvia/edita permisos"
 
-#: ../../Zotlabs/Module/Filestorage.php:178
+#: ../../Code/Module/Filestorage.php:178
 msgid "Include all files and sub folders"
 msgstr "Inclou tots als arxius i subdirectoris"
 
-#: ../../Zotlabs/Module/Filestorage.php:179
+#: ../../Code/Module/Filestorage.php:179
 msgid "Return to file list"
 msgstr "Tornar al llistat d'arxius"
 
-#: ../../Zotlabs/Module/Filestorage.php:181
+#: ../../Code/Module/Filestorage.php:181
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Copia/enganxa aquest codi per a adjuntar un arxiu a l'entrada"
 
-#: ../../Zotlabs/Module/Filestorage.php:182
+#: ../../Code/Module/Filestorage.php:182
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Copia/enganxa aquesta URL per a enllaçar l'arxiu d'una pàgina web"
 
-#: ../../Zotlabs/Module/Filestorage.php:184
+#: ../../Code/Module/Filestorage.php:184
 msgid "Share this file"
 msgstr "Comparteix l'arxiu"
 
-#: ../../Zotlabs/Module/Filestorage.php:185
+#: ../../Code/Module/Filestorage.php:185
 msgid "Show URL to this file"
 msgstr "Mostra la URL d'aquest arxiu"
 
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Storage/Browser.php:405
+#: ../../Code/Module/Filestorage.php:186
+#: ../../Code/Storage/Browser.php:405
 msgid "Show in your contacts shared folder"
 msgstr "Mostra les carpetes compartides dels teus contactes"
 
-#: ../../Zotlabs/Module/Common.php:14
+#: ../../Code/Module/Common.php:14
 msgid "No channel."
 msgstr "No s'ha trobat el canal"
 
-#: ../../Zotlabs/Module/Common.php:45
+#: ../../Code/Module/Common.php:45
 msgid "No connections in common."
 msgstr "No hi ha connexions en comú."
 
-#: ../../Zotlabs/Module/Common.php:65
+#: ../../Code/Module/Common.php:65
 msgid "View Common Connections"
 msgstr "Mostra les connexions en comú"
 
-#: ../../Zotlabs/Module/Email_resend.php:30
+#: ../../Code/Module/Email_resend.php:30
 msgid "Email verification resent"
 msgstr "S'ha tornat a enviar la verificació de orreu"
 
-#: ../../Zotlabs/Module/Email_resend.php:33
+#: ../../Code/Module/Email_resend.php:33
 msgid "Unable to resend email verification message."
 msgstr "No s'ha pogut tornar a enviar el correu de verificació."
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
+#: ../../Code/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Sense connexions."
 
-#: ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Code/Module/Viewconnections.php:83
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visita el perfil [%s] de %s"
 
-#: ../../Zotlabs/Module/Viewconnections.php:113
+#: ../../Code/Module/Viewconnections.php:113
 msgid "View Connections"
 msgstr "Veure Connexions"
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Code/Module/Admin.php:97
 msgid "Blocked accounts"
 msgstr "Comptes bloquejats"
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Code/Module/Admin.php:98
 msgid "Expired accounts"
 msgstr "Comptes caducats"
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Code/Module/Admin.php:99
 msgid "Expiring accounts"
 msgstr "Comptes a punt de caducar"
 
-#: ../../Zotlabs/Module/Admin.php:116
+#: ../../Code/Module/Admin.php:116
 msgid "Clones"
 msgstr "Clons"
 
-#: ../../Zotlabs/Module/Admin.php:122
+#: ../../Code/Module/Admin.php:122
 msgid "Message queues"
 msgstr "Cues de missatges"
 
-#: ../../Zotlabs/Module/Admin.php:136
+#: ../../Code/Module/Admin.php:136
 msgid "Your software should be updated"
 msgstr "El teu programari cal que s'actualitzi"
 
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Code/Module/Admin.php:141
 msgid "Summary"
 msgstr "Sumari"
 
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Code/Module/Admin.php:144
 msgid "Registered accounts"
 msgstr "Comptes registrades"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Code/Module/Admin.php:145
 msgid "Pending registrations"
 msgstr "Comptes pendents d'inscripció"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Code/Module/Admin.php:146
 msgid "Registered channels"
 msgstr "Canals registrats"
 
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Code/Module/Admin.php:147
 msgid "Active addons"
 msgstr "Extensions actives"
 
-#: ../../Zotlabs/Module/Admin.php:148
+#: ../../Code/Module/Admin.php:148
 msgid "Version"
 msgstr "Versió"
 
-#: ../../Zotlabs/Module/Admin.php:149
+#: ../../Code/Module/Admin.php:149
 msgid "Repository version (master)"
 msgstr "Versió (master) del repositori"
 
-#: ../../Zotlabs/Module/Admin.php:150
+#: ../../Code/Module/Admin.php:150
 msgid "Repository version (dev)"
 msgstr "Versió (desenvolupament) del repositori"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "No s'han trobat restriccions de clase."
 
-#: ../../Zotlabs/Module/Rate.php:156
+#: ../../Code/Module/Rate.php:156
 msgid "Website:"
 msgstr "Lloc web:"
 
-#: ../../Zotlabs/Module/Rate.php:159
+#: ../../Code/Module/Rate.php:159
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Canal Remot [%s] (encara no es coneix en aquest lloc)"
 
-#: ../../Zotlabs/Module/Rate.php:160
+#: ../../Code/Module/Rate.php:160
 msgid "Rating (this information is public)"
 msgstr "Valoració (aquesta informació és pública)"
 
-#: ../../Zotlabs/Module/Rate.php:161
+#: ../../Code/Module/Rate.php:161
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Opcionalment pots explicar la teva qualificació (aquesta informació és pública)"
 
-#: ../../Zotlabs/Module/Card_edit.php:128
+#: ../../Code/Module/Card_edit.php:128
 msgid "Edit Card"
 msgstr "Edita la targeta"
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "No es troba un compte vàlid."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "Sol·licitud de restabliment de contrasenya emesa. Consulta el teu correu electrònic."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:108
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Lloc d'Usuari (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../Code/Module/Lostpass.php:44 ../../Code/Module/Lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "S'ha soŀlicitat restablir la contrasenya al hub %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../Code/Module/Lostpass.php:68
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1622
+#: ../../Code/Module/Lostpass.php:91 ../../boot.php:1622
 msgid "Password Reset"
 msgstr "Restabliment de contrasenya"
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your password has been reset as requested."
 msgstr "S'ha restablert la vostra contrasenya."
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Your new password is"
 msgstr "La nova contrasenya és"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "Save or copy your new password - and then"
 msgstr "Desa o copia la nova contrasenya, i després"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid "click here to login"
 msgstr "fes clic aquí per iniciar sessió"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../Code/Module/Lostpass.php:96
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr "Pots canviar la contrasenya a la pàgina Paràmetres, un cop iniciada la sessió."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
+#: ../../Code/Module/Lostpass.php:117
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "La teva contrasenya a %s ha canviat"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Forgot your Password?"
 msgstr "No recordes la contrasenya?"
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../Code/Module/Lostpass.php:131
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Escriu la teva adreça de correu electrònic i envia per restablir la contrasenya. Després revisa el seu correu electrònic per obtenir més instruccions."
 
-#: ../../Zotlabs/Module/Lostpass.php:132
+#: ../../Code/Module/Lostpass.php:132
 msgid "Email Address"
 msgstr "Adreça electrònica"
 
-#: ../../Zotlabs/Module/Notifications.php:60
-#: ../../Zotlabs/Lib/ThreadItem.php:413
+#: ../../Code/Module/Notifications.php:60
+#: ../../Code/Lib/ThreadItem.php:413
 msgid "Mark all seen"
 msgstr "Marca tot com ja vist"
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Code/Lib/Techlevels.php:10
 msgid "0. Beginner/Basic"
 msgstr "0. Bàsic, principiant"
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Code/Lib/Techlevels.php:11
 msgid "1. Novice - not skilled but willing to learn"
 msgstr "1. Novell - amb pocs coneixements però amb ganes d'aprendre"
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Code/Lib/Techlevels.php:12
 msgid "2. Intermediate - somewhat comfortable"
 msgstr "2. Intermedi - més o menys còmode"
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Code/Lib/Techlevels.php:13
 msgid "3. Advanced - very comfortable"
 msgstr "3. Avançat - molt còmode"
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Code/Lib/Techlevels.php:14
 msgid "4. Expert - I can write computer code"
 msgstr "4. Expert - puc escriure codi en algun llenguatge de programació"
 
-#: ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Code/Lib/Techlevels.php:15
 msgid "5. Wizard - I probably know more than you do"
 msgstr "5. Ninja - probablement en sé més que tu"
 
-#: ../../Zotlabs/Lib/Apps.php:294
+#: ../../Code/Lib/Apps.php:294
 msgid "Site Admin"
 msgstr "Administració"
 
-#: ../../Zotlabs/Lib/Apps.php:295 ../../addon/buglink/buglink.php:16
+#: ../../Code/Lib/Apps.php:295 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr "Informa d'errors"
 
-#: ../../Zotlabs/Lib/Apps.php:296
+#: ../../Code/Lib/Apps.php:296
 msgid "View Bookmarks"
 msgstr "Marcadors"
 
-#: ../../Zotlabs/Lib/Apps.php:297
+#: ../../Code/Lib/Apps.php:297
 msgid "My Chatrooms"
 msgstr "Les meves Sales de Xat"
 
-#: ../../Zotlabs/Lib/Apps.php:299
+#: ../../Code/Lib/Apps.php:299
 msgid "Remote Diagnostics"
 msgstr "Diagnòstics Remots"
 
-#: ../../Zotlabs/Lib/Apps.php:300 ../../include/features.php:435
+#: ../../Code/Lib/Apps.php:300 ../../include/features.php:435
 msgid "Suggest Channels"
 msgstr "Suggerir Canals"
 
-#: ../../Zotlabs/Lib/Apps.php:301 ../../boot.php:1613
+#: ../../Code/Lib/Apps.php:301 ../../boot.php:1613
 #: ../../include/nav.php:120 ../../include/nav.php:124
 msgid "Login"
 msgstr "Identifica't"
 
-#: ../../Zotlabs/Lib/Apps.php:303
+#: ../../Code/Lib/Apps.php:303
 msgid "Activity"
 msgstr "Activitat"
 
-#: ../../Zotlabs/Lib/Apps.php:307 ../../include/conversation.php:1940
+#: ../../Code/Lib/Apps.php:307 ../../include/conversation.php:1940
 #: ../../include/features.php:96 ../../include/nav.php:489
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:308
+#: ../../Code/Lib/Apps.php:308
 msgid "Channel Home"
 msgstr "Canal Personal"
 
-#: ../../Zotlabs/Lib/Apps.php:311 ../../include/conversation.php:1862
+#: ../../Code/Lib/Apps.php:311 ../../include/conversation.php:1862
 #: ../../include/conversation.php:1865
 msgid "Events"
 msgstr "Esdeveniments"
 
-#: ../../Zotlabs/Lib/Apps.php:312
+#: ../../Code/Lib/Apps.php:312
 msgid "Directory"
 msgstr "Directori"
 
-#: ../../Zotlabs/Lib/Apps.php:314
+#: ../../Code/Lib/Apps.php:314
 msgid "Mail"
 msgstr "Correu"
 
-#: ../../Zotlabs/Lib/Apps.php:317
+#: ../../Code/Lib/Apps.php:317
 msgid "Chat"
 msgstr "Xerrar"
 
-#: ../../Zotlabs/Lib/Apps.php:319
+#: ../../Code/Lib/Apps.php:319
 msgid "Probe"
 msgstr "Sondeig"
 
-#: ../../Zotlabs/Lib/Apps.php:320
+#: ../../Code/Lib/Apps.php:320
 msgid "Suggest"
 msgstr "Suggeriment"
 
-#: ../../Zotlabs/Lib/Apps.php:321
+#: ../../Code/Lib/Apps.php:321
 msgid "Random Channel"
 msgstr "Canal Aleatori"
 
-#: ../../Zotlabs/Lib/Apps.php:322
+#: ../../Code/Lib/Apps.php:322
 msgid "Invite"
 msgstr "Convida"
 
-#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Code/Lib/Apps.php:323 ../../Code/Widget/Admin.php:26
 msgid "Features"
 msgstr "Funcionalitats"
 
-#: ../../Zotlabs/Lib/Apps.php:324 ../../addon/openid/MysqlProvider.php:69
+#: ../../Code/Lib/Apps.php:324 ../../addon/openid/MysqlProvider.php:69
 msgid "Language"
 msgstr "Idioma"
 
-#: ../../Zotlabs/Lib/Apps.php:325
+#: ../../Code/Lib/Apps.php:325
 msgid "Post"
 msgstr "Entrada"
 
-#: ../../Zotlabs/Lib/Apps.php:326 ../../addon/openid/MysqlProvider.php:58
+#: ../../Code/Lib/Apps.php:326 ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
 #: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr "Foto del Perfil"
 
-#: ../../Zotlabs/Lib/Apps.php:473
+#: ../../Code/Lib/Apps.php:473
 msgid "Purchase"
 msgstr "Compra"
 
-#: ../../Zotlabs/Lib/Apps.php:477
+#: ../../Code/Lib/Apps.php:477
 msgid "Undelete"
 msgstr "Desfés l'operació d'esborrar"
 
-#: ../../Zotlabs/Lib/Apps.php:485
+#: ../../Code/Lib/Apps.php:485
 msgid "Add to app-tray"
 msgstr "Afegeix a la safata d'aplicacions"
 
-#: ../../Zotlabs/Lib/Apps.php:486
+#: ../../Code/Lib/Apps.php:486
 msgid "Remove from app-tray"
 msgstr "Esborra de la safata d'aplicacions"
 
-#: ../../Zotlabs/Lib/Apps.php:487
+#: ../../Code/Lib/Apps.php:487
 msgid "Pin to navbar"
 msgstr "Fixa a la barra de navegació"
 
-#: ../../Zotlabs/Lib/Apps.php:488
+#: ../../Code/Lib/Apps.php:488
 msgid "Unpin from navbar"
 msgstr "Treu de la barra de navegació"
 
-#: ../../Zotlabs/Lib/Permcat.php:82
+#: ../../Code/Lib/Permcat.php:82
 msgctxt "permcat"
 msgid "default"
 msgstr "per defecte"
 
-#: ../../Zotlabs/Lib/Permcat.php:133
+#: ../../Code/Lib/Permcat.php:133
 msgctxt "permcat"
 msgid "follower"
 msgstr "seguidor"
 
-#: ../../Zotlabs/Lib/Permcat.php:137
+#: ../../Code/Lib/Permcat.php:137
 msgctxt "permcat"
 msgid "contributor"
 msgstr "contribuïdor"
 
-#: ../../Zotlabs/Lib/Permcat.php:141
+#: ../../Code/Lib/Permcat.php:141
 msgctxt "permcat"
 msgid "publisher"
 msgstr "publicador"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:93
+#: ../../Code/Lib/NativeWikiPage.php:42
+#: ../../Code/Lib/NativeWikiPage.php:93
 msgid "(No Title)"
 msgstr "(sense títol)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:107
+#: ../../Code/Lib/NativeWikiPage.php:107
 msgid "Wiki page create failed."
 msgstr "No s'ha pogut crear la pàgina a la wiki."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:120
+#: ../../Code/Lib/NativeWikiPage.php:120
 msgid "Wiki not found."
 msgstr "No s'ha trobat la wiki."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:131
+#: ../../Code/Lib/NativeWikiPage.php:131
 msgid "Destination name already exists"
 msgstr "El nom de destí ja existeix"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:163
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Code/Lib/NativeWikiPage.php:163
+#: ../../Code/Lib/NativeWikiPage.php:359
 msgid "Page not found"
 msgstr "No s'ha trobat la pàgina"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:194
+#: ../../Code/Lib/NativeWikiPage.php:194
 msgid "Error reading page content"
 msgstr "S'ha produït un error en carregar el contingut de la pàgina"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:350
-#: ../../Zotlabs/Lib/NativeWikiPage.php:400
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Code/Lib/NativeWikiPage.php:350
+#: ../../Code/Lib/NativeWikiPage.php:400
+#: ../../Code/Lib/NativeWikiPage.php:467
+#: ../../Code/Lib/NativeWikiPage.php:508
 msgid "Error reading wiki"
 msgstr "S'ha produït un error en carregar la wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:388
+#: ../../Code/Lib/NativeWikiPage.php:388
 msgid "Page update failed."
 msgstr "No s'ha pogut actualitzar la pàgina."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:422
+#: ../../Code/Lib/NativeWikiPage.php:422
 msgid "Nothing deleted"
 msgstr "No s'ha esborrat res"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:488
+#: ../../Code/Lib/NativeWikiPage.php:488
 msgid "Compare: object not found."
 msgstr "S'ha produït un error en comparar la pàgina."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:494
+#: ../../Code/Lib/NativeWikiPage.php:494
 msgid "Page updated"
 msgstr "S'ha actualitzat la pàgina"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
+#: ../../Code/Lib/NativeWikiPage.php:497
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:503
+#: ../../Code/Lib/NativeWikiPage.php:503
 msgid "Wiki resource_id required for git commit"
 msgstr "Per a fer el git commit cal el resource_id de la wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:559
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+#: ../../Code/Lib/NativeWikiPage.php:559
+#: ../../Code/Widget/Wiki_page_history.php:23
 msgctxt "wiki_history"
 msgid "Message"
 msgstr "Missatge"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:746
+#: ../../Code/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:746
 #: ../../include/bbcode.php:916
 msgid "Different viewers will see this text differently"
 msgstr "Diferents observadors veuran aquest text de diferents formes"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../Code/Lib/PermissionDescription.php:34
 #: ../../include/acl_selectors.php:33
 msgid "Visible to your default audience"
 msgstr "Visible per a la teva audiència "
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../Code/Lib/PermissionDescription.php:107
 #: ../../include/acl_selectors.php:106
 msgid "Only me"
 msgstr "Només jo"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Code/Lib/PermissionDescription.php:108
 msgid "Public"
 msgstr "Públic"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#: ../../Code/Lib/PermissionDescription.php:109
 msgid "Anybody in the $Projectname network"
 msgstr "Ningú a la xarxa $Projectname"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#: ../../Code/Lib/PermissionDescription.php:110
 #, php-format
 msgid "Any account on %s"
 msgstr "Qualsevol compte a %s"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
+#: ../../Code/Lib/PermissionDescription.php:111
 msgid "Any of my connections"
 msgstr "Qualsevol de les meves connexions"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
+#: ../../Code/Lib/PermissionDescription.php:112
 msgid "Only connections I specifically allow"
 msgstr "Només les connexions que permeto específicament"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
+#: ../../Code/Lib/PermissionDescription.php:113
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr "Qualsevol persona autenticada (podria incloure als usuaris d'altres xarxes)"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
+#: ../../Code/Lib/PermissionDescription.php:114
 msgid "Any connections including those who haven't yet been approved"
 msgstr "Qualsevol connexió incloent aquells que encara no han estat aprovats"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
+#: ../../Code/Lib/PermissionDescription.php:150
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
 msgstr "Aquest és l'ajust per defecte per al públic del seu flux normal i entrades."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
+#: ../../Code/Lib/PermissionDescription.php:151
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
+#: ../../Code/Lib/PermissionDescription.php:152
 msgid "This is your default setting for who can view your connections"
 msgstr "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
+#: ../../Code/Lib/PermissionDescription.php:153
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
+#: ../../Code/Lib/PermissionDescription.php:154
 msgid "This is your default setting for the audience of your webpages"
 msgstr "Aquesta és la teva configuració per defecte per l'audiència de les teves pàgines web"
 
-#: ../../Zotlabs/Lib/Chatroom.php:23
+#: ../../Code/Lib/Chatroom.php:23
 msgid "Missing room name"
 msgstr "Perdut el nom de la sala"
 
-#: ../../Zotlabs/Lib/Chatroom.php:32
+#: ../../Code/Lib/Chatroom.php:32
 msgid "Duplicate room name"
 msgstr "Nom de la sala duplicat"
 
-#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90
+#: ../../Code/Lib/Chatroom.php:82 ../../Code/Lib/Chatroom.php:90
 msgid "Invalid room specifier."
 msgstr "Especificació de la sala invàlida."
 
-#: ../../Zotlabs/Lib/Chatroom.php:122
+#: ../../Code/Lib/Chatroom.php:122
 msgid "Room not found."
 msgstr "Sala no trobada."
 
-#: ../../Zotlabs/Lib/Chatroom.php:143
+#: ../../Code/Lib/Chatroom.php:143
 msgid "Room is full"
 msgstr "La sala es plena"
 
-#: ../../Zotlabs/Lib/Enotify.php:60
+#: ../../Code/Lib/Enotify.php:60
 msgid "$Projectname Notification"
 msgstr "Notificació de $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308
+#: ../../Code/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308
 #: ../../addon/diaspora/util.php:321 ../../addon/diaspora/p.php:48
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63
+#: ../../Code/Lib/Enotify.php:63
 msgid "Thank You,"
 msgstr "Gràcies,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33
+#: ../../Code/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
 
-#: ../../Zotlabs/Lib/Enotify.php:66
+#: ../../Code/Lib/Enotify.php:66
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr "Aquest correu ha estat enviat per %1$s a %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:67
+#: ../../Code/Lib/Enotify.php:67
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
 "at %s"
 msgstr "Per deixar de rebre aquests missatges, modifica la configuració de notificacions a %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Lib/Enotify.php:68
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr "Per deixar de rebre aquests missatges, modifica la teva %s."
 
-#: ../../Zotlabs/Lib/Enotify.php:123
+#: ../../Code/Lib/Enotify.php:123
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Code/Lib/Enotify.php:127
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname:Avís] S'ha rebut correu nou a %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:129
+#: ../../Code/Lib/Enotify.php:129
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s t'ha enviat un missatge privat a %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s t'ha enviat %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 msgid "a private message"
 msgstr "un missatge privat"
 
-#: ../../Zotlabs/Lib/Enotify.php:131
+#: ../../Code/Lib/Enotify.php:131
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Per favor, visita %s per a veure i/o respondre els teus missatges privats."
 
-#: ../../Zotlabs/Lib/Enotify.php:144
+#: ../../Code/Lib/Enotify.php:144
 msgid "commented on"
 msgstr "ha comentat"
 
-#: ../../Zotlabs/Lib/Enotify.php:155
+#: ../../Code/Lib/Enotify.php:155
 msgid "liked"
 msgstr "li ha agradat"
 
-#: ../../Zotlabs/Lib/Enotify.php:158
+#: ../../Code/Lib/Enotify.php:158
 msgid "disliked"
 msgstr "no li ha agradat"
 
-#: ../../Zotlabs/Lib/Enotify.php:201
+#: ../../Code/Lib/Enotify.php:201
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:209
+#: ../../Code/Lib/Enotify.php:209
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%5$s de %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:218
+#: ../../Code/Lib/Enotify.php:218
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]la teva %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:230
+#: ../../Code/Lib/Enotify.php:230
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Avís] S'ha moderat el comentari de %2$s a la conversa #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../Code/Lib/Enotify.php:232
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Avís] Comentari de %2$s a la conversa #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:233
+#: ../../Code/Lib/Enotify.php:233
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr "%1$s ha comentat en una conversa que estàs seguint."
 
-#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317
-#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358
-#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Code/Lib/Enotify.php:236 ../../Code/Lib/Enotify.php:317
+#: ../../Code/Lib/Enotify.php:333 ../../Code/Lib/Enotify.php:358
+#: ../../Code/Lib/Enotify.php:375 ../../Code/Lib/Enotify.php:388
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Si us plau visita %s per veure i/o contestar a la conversa"
 
-#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241
+#: ../../Code/Lib/Enotify.php:240 ../../Code/Lib/Enotify.php:241
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Vés a %s per a aprovar o rebutjar el comentari."
 
-#: ../../Zotlabs/Lib/Enotify.php:299
+#: ../../Code/Lib/Enotify.php:299
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr "A %1$s li ha agradat  [zrl=%2$s]la teva %3$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:313
+#: ../../Code/Lib/Enotify.php:313
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Avís] Un \"m'agrada\" a la conversa #%1$d de %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:314
+#: ../../Code/Lib/Enotify.php:314
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr "A %1$s li ha agradat una conversa que has creat."
 
-#: ../../Zotlabs/Lib/Enotify.php:325
+#: ../../Code/Lib/Enotify.php:325
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Avís] %s ha penjat una entrada al teu mur"
 
-#: ../../Zotlabs/Lib/Enotify.php:327
+#: ../../Code/Lib/Enotify.php:327
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s ha publicat al mur del teu perfil a %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:329
+#: ../../Code/Lib/Enotify.php:329
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$s ha publicat al [zrl=%2$s]teu mur[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:352
+#: ../../Code/Lib/Enotify.php:352
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Avís] %s t'ha etiquetat"
 
-#: ../../Zotlabs/Lib/Enotify.php:353
+#: ../../Code/Lib/Enotify.php:353
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s t'ha etiquetat a %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:354
+#: ../../Code/Lib/Enotify.php:354
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s [zrl=%2$s]t'ha etiquetat[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:365
+#: ../../Code/Lib/Enotify.php:365
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Avís] %1$s t'ha fet un toc"
 
-#: ../../Zotlabs/Lib/Enotify.php:366
+#: ../../Code/Lib/Enotify.php:366
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s t'ha fet un toc a  %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:367
+#: ../../Code/Lib/Enotify.php:367
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s]t'ha fet un toc[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:382
+#: ../../Code/Lib/Enotify.php:382
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Avís] %s t'ha etiquetat una entrada"
 
-#: ../../Zotlabs/Lib/Enotify.php:383
+#: ../../Code/Lib/Enotify.php:383
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s ha etiquetat una entrada teva a %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:384
+#: ../../Code/Lib/Enotify.php:384
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s ha etiquetat [zrl=%2$s]la teva entrada[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:395
+#: ../../Code/Lib/Enotify.php:395
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Avís] S'ha rebut una sol·licitud de connexió"
 
-#: ../../Zotlabs/Lib/Enotify.php:396
+#: ../../Code/Lib/Enotify.php:396
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr "Has rebut una soŀlicitud de connexió de '%1$s' a %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:397
+#: ../../Code/Lib/Enotify.php:397
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr "Has rebut  [zrl=%1$s]una soŀlicitud de connexió[/zrl] de %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418
+#: ../../Code/Lib/Enotify.php:400 ../../Code/Lib/Enotify.php:418
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Pots visitar el seu perfil a %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Code/Lib/Enotify.php:402
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Si us plau, visita %s per aprovar o rebutjar la petició de connexió."
 
-#: ../../Zotlabs/Lib/Enotify.php:409
+#: ../../Code/Lib/Enotify.php:409
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Avís] S'ha rebut una suggerència d'amistat"
 
-#: ../../Zotlabs/Lib/Enotify.php:410
+#: ../../Code/Lib/Enotify.php:410
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Has rebut una soŀlicitud d'amistat de '%1$s' a %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:411
+#: ../../Code/Lib/Enotify.php:411
 #, php-format
 msgid ""
 "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr "Has rebut [zrl=%1$s]una soŀlicitud d'amistat[/zrl] per a %2$s de part de %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Code/Lib/Enotify.php:416
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Code/Lib/Enotify.php:417
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../Zotlabs/Lib/Enotify.php:420
+#: ../../Code/Lib/Enotify.php:420
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Per favor, visita %s per a aprovar o rebutjar la suggerencia."
 
-#: ../../Zotlabs/Lib/Enotify.php:640
+#: ../../Code/Lib/Enotify.php:640
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Avís]"
 
-#: ../../Zotlabs/Lib/Enotify.php:808
+#: ../../Code/Lib/Enotify.php:808
 msgid "created a new post"
 msgstr "Creada una nova entrada"
 
-#: ../../Zotlabs/Lib/Enotify.php:809
+#: ../../Code/Lib/Enotify.php:809
 #, php-format
 msgid "commented on %s's post"
 msgstr "comentat a l'entrada de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:816
+#: ../../Code/Lib/Enotify.php:816
 #, php-format
 msgid "edited a post dated %s"
 msgstr "ha editat una entrada amb data de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Code/Lib/Enotify.php:820
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "ha editat un comentari amb data de %s"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:151
+#: ../../Code/Lib/NativeWiki.php:151
 msgid "Wiki updated successfully"
 msgstr "S'ha actualitzat la wiki amb èxit"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:205
+#: ../../Code/Lib/NativeWiki.php:205
 msgid "Wiki files deleted successfully"
 msgstr "S'han esborrat els fitxers de la wiki amb èxit"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:83
+#: ../../Code/Lib/DB_Upgrade.php:83
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error d'Actualització a %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:89
+#: ../../Code/Lib/DB_Upgrade.php:89
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "L'actualització %s ha fallat. Mira el registre d'errors."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:700
+#: ../../Code/Lib/ThreadItem.php:97 ../../include/conversation.php:700
 msgid "Private Message"
 msgstr "Missatge Privat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:152 ../../Zotlabs/Storage/Browser.php:280
+#: ../../Code/Lib/ThreadItem.php:152 ../../Code/Storage/Browser.php:280
 msgid "Admin Delete"
 msgstr "Esborrat amb privilegis d'administració"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:158 ../../include/conversation.php:690
+#: ../../Code/Lib/ThreadItem.php:158 ../../include/conversation.php:690
 msgid "Select"
 msgstr "Selecciona"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Code/Lib/ThreadItem.php:183
 msgid "I will attend"
 msgstr "Assistiré"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Code/Lib/ThreadItem.php:183
 msgid "I will not attend"
 msgstr "No assistiré"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Code/Lib/ThreadItem.php:183
 msgid "I might attend"
 msgstr "Podria assistir"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Lib/ThreadItem.php:193
 msgid "I agree"
 msgstr "D'acord"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Lib/ThreadItem.php:193
 msgid "I disagree"
 msgstr "En desacord"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Lib/ThreadItem.php:193
 msgid "I abstain"
 msgstr "M'abstinc"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:247 ../../include/conversation.php:695
+#: ../../Code/Lib/ThreadItem.php:247 ../../include/conversation.php:695
 msgid "Toggle Star Status"
 msgstr "Canvia el Estat de la Preferència"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:258 ../../include/conversation.php:707
+#: ../../Code/Lib/ThreadItem.php:258 ../../include/conversation.php:707
 msgid "Message signature validated"
 msgstr "Validada la signatura del missatge"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:259 ../../include/conversation.php:708
+#: ../../Code/Lib/ThreadItem.php:259 ../../include/conversation.php:708
 msgid "Message signature incorrect"
 msgstr "Signatura del missatge incorrecta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:267
+#: ../../Code/Lib/ThreadItem.php:267
 msgid "Add Tag"
 msgstr "Afegeix Etiqueta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../include/taxonomy.php:575
+#: ../../Code/Lib/ThreadItem.php:285 ../../include/taxonomy.php:575
 msgid "like"
 msgstr "agrada"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../include/taxonomy.php:576
+#: ../../Code/Lib/ThreadItem.php:286 ../../include/taxonomy.php:576
 msgid "dislike"
 msgstr "desagrada"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290
+#: ../../Code/Lib/ThreadItem.php:290
 msgid "Share This"
 msgstr "Comparteix Això"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290
+#: ../../Code/Lib/ThreadItem.php:290
 msgid "share"
 msgstr "comparteix"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:299
+#: ../../Code/Lib/ThreadItem.php:299
 msgid "Delivery Report"
 msgstr "Informe de Lliurament"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:317
+#: ../../Code/Lib/ThreadItem.php:317
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commentari"
 msgstr[1] "%d commentaris"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../Code/Lib/ThreadItem.php:347 ../../Code/Lib/ThreadItem.php:348
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Mostra el perfil de %s  - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:351
+#: ../../Code/Lib/ThreadItem.php:351
 msgid "to"
 msgstr "a"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:352
+#: ../../Code/Lib/ThreadItem.php:352
 msgid "via"
 msgstr "via"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353
+#: ../../Code/Lib/ThreadItem.php:353
 msgid "Wall-to-Wall"
 msgstr "Mur-a-Mur"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354
+#: ../../Code/Lib/ThreadItem.php:354
 msgid "via Wall-To-Wall:"
 msgstr "via Mur-a-Mur:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:766
+#: ../../Code/Lib/ThreadItem.php:367 ../../include/conversation.php:766
 #, php-format
 msgid "from %s"
 msgstr "De %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:370 ../../include/conversation.php:769
+#: ../../Code/Lib/ThreadItem.php:370 ../../include/conversation.php:769
 #, php-format
 msgid "last edited: %s"
 msgstr "últim editat: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:371 ../../include/conversation.php:770
+#: ../../Code/Lib/ThreadItem.php:371 ../../include/conversation.php:770
 #, php-format
 msgid "Expires: %s"
 msgstr "Expira: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:379
+#: ../../Code/Lib/ThreadItem.php:379
 msgid "Attend"
 msgstr "Assistir-hi"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:380
+#: ../../Code/Lib/ThreadItem.php:380
 msgid "Attendance Options"
 msgstr "Opcions d'assistència"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:381
+#: ../../Code/Lib/ThreadItem.php:381
 msgid "Vote"
 msgstr "Votar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:382
+#: ../../Code/Lib/ThreadItem.php:382
 msgid "Voting Options"
 msgstr "Opcions de votació"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:403
+#: ../../Code/Lib/ThreadItem.php:403
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr "Desa els marcadors"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:404
+#: ../../Code/Lib/ThreadItem.php:404
 msgid "Add to Calendar"
 msgstr "Afegeix al Calendari"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:431 ../../include/conversation.php:483
+#: ../../Code/Lib/ThreadItem.php:431 ../../include/conversation.php:483
 msgid "This is an unsaved preview"
 msgstr "Això només és una vista prèvia, no està desada"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:463 ../../include/js_strings.php:7
+#: ../../Code/Lib/ThreadItem.php:463 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s mostra-ho tot"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1388
+#: ../../Code/Lib/ThreadItem.php:758 ../../include/conversation.php:1388
 msgid "Bold"
 msgstr "Negreta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1389
+#: ../../Code/Lib/ThreadItem.php:759 ../../include/conversation.php:1389
 msgid "Italic"
 msgstr "Italica"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:760 ../../include/conversation.php:1390
+#: ../../Code/Lib/ThreadItem.php:760 ../../include/conversation.php:1390
 msgid "Underline"
 msgstr "Subratllat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:761 ../../include/conversation.php:1391
+#: ../../Code/Lib/ThreadItem.php:761 ../../include/conversation.php:1391
 msgid "Quote"
 msgstr "Cometes"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:762 ../../include/conversation.php:1392
+#: ../../Code/Lib/ThreadItem.php:762 ../../include/conversation.php:1392
 msgid "Code"
 msgstr "Codi"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:763
+#: ../../Code/Lib/ThreadItem.php:763
 msgid "Image"
 msgstr "Imatge"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:764 ../../include/conversation.php:1393
+#: ../../Code/Lib/ThreadItem.php:764 ../../include/conversation.php:1393
 msgid "Attach/Upload file"
 msgstr "Adjunta i puja un arxiu"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:765
+#: ../../Code/Lib/ThreadItem.php:765
 msgid "Insert Link"
 msgstr "Insereix Enllaç"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:766
+#: ../../Code/Lib/ThreadItem.php:766
 msgid "Video"
 msgstr "Video"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:776
+#: ../../Code/Lib/ThreadItem.php:776
 msgid "Your full name (required)"
 msgstr "Nom complet (obligatori)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:777
+#: ../../Code/Lib/ThreadItem.php:777
 msgid "Your email address (required)"
 msgstr "Adreça de correu (obligatòria)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:778
+#: ../../Code/Lib/ThreadItem.php:778
 msgid "Your website URL (optional)"
 msgstr "Adreça web (opcional)"
 
-#: ../../Zotlabs/Zot/Auth.php:152
+#: ../../Code/Zot/Auth.php:152
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "Autenticació remota bloquejada. Ha iniciat sessió en aquest lloc a nivell local. Si us plau, tanca la sessió i torna-ho a intentar."
 
-#: ../../Zotlabs/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
+#: ../../Code/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
 #: ../../addon/openid/Mod_Openid.php:178
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Benvingut %s. Autenticació remota reeixida."
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289
+#: ../../Code/Storage/Browser.php:107 ../../Code/Storage/Browser.php:289
 msgid "parent"
 msgstr "amunt"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2817
+#: ../../Code/Storage/Browser.php:131 ../../include/text.php:2817
 msgid "Collection"
 msgstr "Col·lecció"
 
-#: ../../Zotlabs/Storage/Browser.php:134
+#: ../../Code/Storage/Browser.php:134
 msgid "Principal"
 msgstr "Principal"
 
-#: ../../Zotlabs/Storage/Browser.php:137
+#: ../../Code/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Llista d'Adreçes"
 
-#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:412
+#: ../../Code/Storage/Browser.php:140 ../../include/nav.php:412
 #: ../../include/nav.php:415
 msgid "Calendar"
 msgstr "Calendari"
 
-#: ../../Zotlabs/Storage/Browser.php:143
+#: ../../Code/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Programació de la bústia d'entrada"
 
-#: ../../Zotlabs/Storage/Browser.php:146
+#: ../../Code/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "Programació de la bústia de sortida"
 
-#: ../../Zotlabs/Storage/Browser.php:273
+#: ../../Code/Storage/Browser.php:273
 msgid "Total"
 msgstr "Total"
 
-#: ../../Zotlabs/Storage/Browser.php:275
+#: ../../Code/Storage/Browser.php:275
 msgid "Shared"
 msgstr "Compartit"
 
-#: ../../Zotlabs/Storage/Browser.php:277
+#: ../../Code/Storage/Browser.php:277
 msgid "Add Files"
 msgstr "Afegeix arxius"
 
-#: ../../Zotlabs/Storage/Browser.php:361
+#: ../../Code/Storage/Browser.php:361
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Estàs emprant el %1$s de l'espai d'emmagatzematge disponible"
 
-#: ../../Zotlabs/Storage/Browser.php:366
+#: ../../Code/Storage/Browser.php:366
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "Estàs emprant %1$s de %2$s d'emmagatzematge d'arxius disponible.\n(%3$s%)"
 
-#: ../../Zotlabs/Storage/Browser.php:377
+#: ../../Code/Storage/Browser.php:377
 msgid "WARNING:"
 msgstr "ALERTA:"
 
-#: ../../Zotlabs/Storage/Browser.php:389
+#: ../../Code/Storage/Browser.php:389
 msgid "Create new folder"
 msgstr "Crea una nova carpeta"
 
-#: ../../Zotlabs/Storage/Browser.php:391
+#: ../../Code/Storage/Browser.php:391
 msgid "Upload file"
 msgstr "Puja arxiu"
 
-#: ../../Zotlabs/Storage/Browser.php:404
+#: ../../Code/Storage/Browser.php:404
 msgid "Drop files here to immediately upload"
 msgstr "Deixa anar fitxers aquí per a pujar-los immediatament"
 
-#: ../../Zotlabs/Widget/Forums.php:100
-#: ../../Zotlabs/Widget/Activity_filter.php:100
-#: ../../Zotlabs/Widget/Notifications.php:119
-#: ../../Zotlabs/Widget/Notifications.php:120
+#: ../../Code/Widget/Forums.php:100
+#: ../../Code/Widget/Activity_filter.php:100
+#: ../../Code/Widget/Notifications.php:119
+#: ../../Code/Widget/Notifications.php:120
 msgid "Forums"
 msgstr "Forums"
 
-#: ../../Zotlabs/Widget/Cdav.php:37
+#: ../../Code/Widget/Cdav.php:37
 msgid "Select Channel"
 msgstr "Escull canal"
 
-#: ../../Zotlabs/Widget/Cdav.php:42
+#: ../../Code/Widget/Cdav.php:42
 msgid "Read-write"
 msgstr "Llegir i escriure"
 
-#: ../../Zotlabs/Widget/Cdav.php:43
+#: ../../Code/Widget/Cdav.php:43
 msgid "Read-only"
 msgstr "Només lectura"
 
-#: ../../Zotlabs/Widget/Cdav.php:117
+#: ../../Code/Widget/Cdav.php:117
 msgid "My Calendars"
 msgstr "Els meus calendaris"
 
-#: ../../Zotlabs/Widget/Cdav.php:119
+#: ../../Code/Widget/Cdav.php:119
 msgid "Shared Calendars"
 msgstr "Calendaris compartits"
 
-#: ../../Zotlabs/Widget/Cdav.php:123
+#: ../../Code/Widget/Cdav.php:123
 msgid "Share this calendar"
 msgstr "Comparteix aquest calendari"
 
-#: ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Code/Widget/Cdav.php:125
 msgid "Calendar name and color"
 msgstr "Nom i color del calendari"
 
-#: ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Code/Widget/Cdav.php:127
 msgid "Create new calendar"
 msgstr "Crea un nou calendari"
 
-#: ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Code/Widget/Cdav.php:129
 msgid "Calendar Name"
 msgstr "Nom del calendari"
 
-#: ../../Zotlabs/Widget/Cdav.php:130
+#: ../../Code/Widget/Cdav.php:130
 msgid "Calendar Tools"
 msgstr "Eines de calendari"
 
-#: ../../Zotlabs/Widget/Cdav.php:131
+#: ../../Code/Widget/Cdav.php:131
 msgid "Import calendar"
 msgstr "Importa un calendari"
 
-#: ../../Zotlabs/Widget/Cdav.php:132
+#: ../../Code/Widget/Cdav.php:132
 msgid "Select a calendar to import to"
 msgstr "Escull el calendari a on importar"
 
-#: ../../Zotlabs/Widget/Cdav.php:159
+#: ../../Code/Widget/Cdav.php:159
 msgid "Addressbooks"
 msgstr "Llibretes d'adreces"
 
-#: ../../Zotlabs/Widget/Cdav.php:161
+#: ../../Code/Widget/Cdav.php:161
 msgid "Addressbook name"
 msgstr "Nom de llibreta d'adreces"
 
-#: ../../Zotlabs/Widget/Cdav.php:163
+#: ../../Code/Widget/Cdav.php:163
 msgid "Create new addressbook"
 msgstr "Crea una nova llibreta d'adreces"
 
-#: ../../Zotlabs/Widget/Cdav.php:164
+#: ../../Code/Widget/Cdav.php:164
 msgid "Addressbook Name"
 msgstr "Nom de llibreta d'adreces"
 
-#: ../../Zotlabs/Widget/Cdav.php:166
+#: ../../Code/Widget/Cdav.php:166
 msgid "Addressbook Tools"
 msgstr "Eines de llibreta d'adreces"
 
-#: ../../Zotlabs/Widget/Cdav.php:167
+#: ../../Code/Widget/Cdav.php:167
 msgid "Import addressbook"
 msgstr "Importa una llibreta d'adreces"
 
-#: ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Code/Widget/Cdav.php:168
 msgid "Select an addressbook to import to"
 msgstr "Escull la llibreta d'adreces a on importar"
 
-#: ../../Zotlabs/Widget/Appcategories.php:43
+#: ../../Code/Widget/Appcategories.php:43
 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141
 #: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409
 #: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511
@@ -8809,532 +8809,532 @@ msgstr "Escull la llibreta d'adreces a on importar"
 msgid "Categories"
 msgstr "Categories"
 
-#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
+#: ../../Code/Widget/Appcategories.php:46 ../../Code/Widget/Filer.php:31
 #: ../../widgets/Netselect/Netselect.php:26
 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100
 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189
 msgid "Everything"
 msgstr "Tot"
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
+#: ../../Code/Widget/Eventstools.php:13
 msgid "Events Tools"
 msgstr "Eina d'Esdeveniments"
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
+#: ../../Code/Widget/Eventstools.php:14
 msgid "Export Calendar"
 msgstr "Exportar Calendari"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
+#: ../../Code/Widget/Eventstools.php:15
 msgid "Import Calendar"
 msgstr "Importar Calendari"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
+#: ../../Code/Widget/Suggestedchats.php:32
 msgid "Suggested Chatrooms"
 msgstr "Sales de Xat Suggerides"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
+#: ../../Code/Widget/Hq_controls.php:14
 msgid "HQ Control Panel"
 msgstr "Panell de control"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
+#: ../../Code/Widget/Hq_controls.php:17
 msgid "Create a new post"
 msgstr "Crea una nova entrada"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
+#: ../../Code/Widget/Mailmenu.php:13
 msgid "Private Mail Menu"
 msgstr "Menú de Correu Privat"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
+#: ../../Code/Widget/Mailmenu.php:15
 msgid "Combined View"
 msgstr "Vista Combinada"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20
+#: ../../Code/Widget/Mailmenu.php:20
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
+#: ../../Code/Widget/Mailmenu.php:25
 msgid "Outbox"
 msgstr "Safata de sortida"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
+#: ../../Code/Widget/Mailmenu.php:30
 msgid "New Message"
 msgstr "Nou Missatge"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../Code/Widget/Chatroom_list.php:16
 #: ../../include/conversation.php:1876 ../../include/conversation.php:1879
 #: ../../include/nav.php:426 ../../include/nav.php:429
 msgid "Chatrooms"
 msgstr "Sala per Xerrar"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
+#: ../../Code/Widget/Chatroom_list.php:20
 msgid "Overview"
 msgstr "Visió General"
 
-#: ../../Zotlabs/Widget/Rating.php:51
+#: ../../Code/Widget/Rating.php:51
 msgid "Rating Tools"
 msgstr "Eines de Valoració"
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+#: ../../Code/Widget/Rating.php:55 ../../Code/Widget/Rating.php:57
 msgid "Rate Me"
 msgstr "Valora'm"
 
-#: ../../Zotlabs/Widget/Rating.php:60
+#: ../../Code/Widget/Rating.php:60
 msgid "View Ratings"
 msgstr "Veure Valoracions"
 
-#: ../../Zotlabs/Widget/Activity.php:50
+#: ../../Code/Widget/Activity.php:50
 msgctxt "widget"
 msgid "Activity"
 msgstr "Activitat"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:24
+#: ../../Code/Widget/Activity_filter.php:24
 msgid "Personal Posts"
 msgstr "Entrades personals"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:28
+#: ../../Code/Widget/Activity_filter.php:28
 msgid "Show posts that mention or involve me"
 msgstr "Mostra les entrades que m'inclouen"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:39
+#: ../../Code/Widget/Activity_filter.php:39
 msgid "Starred Posts"
 msgstr "Entrades destacades"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:43
+#: ../../Code/Widget/Activity_filter.php:43
 msgid "Show posts that I have starred"
 msgstr "Mostra les entrades que he destacat"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:63
+#: ../../Code/Widget/Activity_filter.php:63
 #, php-format
 msgid "Show posts related to the %s privacy group"
 msgstr "Mostra les entrades relacionades amb el grup de privacitat %s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:72
+#: ../../Code/Widget/Activity_filter.php:72
 msgid "Show my privacy groups"
 msgstr "Mostra els meus grups de privacitat"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:93
+#: ../../Code/Widget/Activity_filter.php:93
 msgid "Show posts to this forum"
 msgstr "Mostra les entrades a aquest fòrum"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:104
+#: ../../Code/Widget/Activity_filter.php:104
 msgid "Show forums"
 msgstr "Mostra els fòrums"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:128
+#: ../../Code/Widget/Activity_filter.php:128
 #, php-format
 msgid "Show posts that I have filed to %s"
 msgstr "Mostra les entrades que he penjat a %s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:134
-#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../Code/Widget/Activity_filter.php:134
+#: ../../Code/Widget/Filer.php:28 ../../include/contact_widgets.php:53
 #: ../../include/features.php:488
 msgid "Saved Folders"
 msgstr "Carpetes Guardades"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:138
+#: ../../Code/Widget/Activity_filter.php:138
 msgid "Show filed post categories"
 msgstr "Mostra les categories de les entrades pujades"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:152
+#: ../../Code/Widget/Activity_filter.php:152
 msgid "Panel search"
 msgstr "Panell de cerca"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:162
-#: ../../Zotlabs/Widget/Notifications.php:27
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:122
-#: ../../Zotlabs/Widget/Notifications.php:153
+#: ../../Code/Widget/Activity_filter.php:162
+#: ../../Code/Widget/Notifications.php:27
+#: ../../Code/Widget/Notifications.php:46
+#: ../../Code/Widget/Notifications.php:122
+#: ../../Code/Widget/Notifications.php:153
 msgid "Filter by name"
 msgstr "Filtra per nom"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:177
+#: ../../Code/Widget/Activity_filter.php:177
 msgid "Remove active filter"
 msgstr "Esborra el filtre actual"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:193
+#: ../../Code/Widget/Activity_filter.php:193
 msgid "Activity Filters"
 msgstr "Filtres d'activitat"
 
-#: ../../Zotlabs/Widget/Follow.php:22
+#: ../../Code/Widget/Follow.php:22
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr "Tens %1$.0f de %2$.0f connexions permeses."
 
-#: ../../Zotlabs/Widget/Follow.php:29
+#: ../../Code/Widget/Follow.php:29
 msgid "Add New Connection"
 msgstr "Afegeix una Nova Connexió"
 
-#: ../../Zotlabs/Widget/Follow.php:30
+#: ../../Code/Widget/Follow.php:30
 msgid "Enter channel address"
 msgstr "Introdueix l'adreça del canal"
 
-#: ../../Zotlabs/Widget/Follow.php:31
+#: ../../Code/Widget/Follow.php:31
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr "Exemples: bob@example.com, https://exemple.com/barbara"
 
-#: ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../Code/Widget/Wiki_list.php:15
 msgid "Wiki List"
 msgstr "Llista de Wikis"
 
-#: ../../Zotlabs/Widget/Archive.php:43
+#: ../../Code/Widget/Archive.php:43
 msgid "Archives"
 msgstr "Arxius"
 
-#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Code/Widget/Conversations.php:17
 msgid "Received Messages"
 msgstr "Missatges Rebuts"
 
-#: ../../Zotlabs/Widget/Conversations.php:21
+#: ../../Code/Widget/Conversations.php:21
 msgid "Sent Messages"
 msgstr "Missatges Enviats"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Code/Widget/Conversations.php:25
 msgid "Conversations"
 msgstr "Conversacions"
 
-#: ../../Zotlabs/Widget/Conversations.php:37
+#: ../../Code/Widget/Conversations.php:37
 msgid "No messages."
 msgstr "Sense missatges."
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Code/Widget/Conversations.php:57
 msgid "Delete conversation"
 msgstr "Conversació esborrada"
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
+#: ../../Code/Widget/Chatroom_members.php:11
 msgid "Chat Members"
 msgstr "Membres de la Sala de Xat"
 
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+#: ../../Code/Widget/Photo.php:48 ../../Code/Widget/Photo_rand.php:58
 msgid "photo/image"
 msgstr "foto/imatge"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
+#: ../../Code/Widget/Savedsearch.php:75
 msgid "Remove term"
 msgstr "Plaç de remoció"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381
+#: ../../Code/Widget/Savedsearch.php:83 ../../include/features.php:381
 msgid "Saved Searches"
 msgstr "Cerques Guardades"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:325
+#: ../../Code/Widget/Savedsearch.php:84 ../../include/group.php:325
 msgid "add"
 msgstr "afegeix"
 
-#: ../../Zotlabs/Widget/Notes.php:16
+#: ../../Code/Widget/Notes.php:16
 msgid "Notes"
 msgstr "Notes"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:89
+#: ../../Code/Widget/Wiki_pages.php:32
+#: ../../Code/Widget/Wiki_pages.php:89
 msgid "Add new page"
 msgstr "Afegeix una pàgina nova"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:83
+#: ../../Code/Widget/Wiki_pages.php:83
 msgid "Wiki Pages"
 msgstr "Pàgines de Wikis"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:94
+#: ../../Code/Widget/Wiki_pages.php:94
 msgid "Page name"
 msgstr "Canvia el nom de la pàgina"
 
-#: ../../Zotlabs/Widget/Affinity.php:45
+#: ../../Code/Widget/Affinity.php:45
 msgid "Refresh"
 msgstr "Refresc"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
+#: ../../Code/Widget/Tasklist.php:23
 msgid "Tasks"
 msgstr "Tasques"
 
-#: ../../Zotlabs/Widget/Suggestions.php:51
+#: ../../Code/Widget/Suggestions.php:51
 msgid "Suggestions"
 msgstr "Suggerencies"
 
-#: ../../Zotlabs/Widget/Suggestions.php:52
+#: ../../Code/Widget/Suggestions.php:52
 msgid "See more..."
 msgstr "Veure més....."
 
-#: ../../Zotlabs/Widget/Activity_order.php:86
+#: ../../Code/Widget/Activity_order.php:86
 msgid "Commented Date"
 msgstr "Data dels comentaris"
 
-#: ../../Zotlabs/Widget/Activity_order.php:90
+#: ../../Code/Widget/Activity_order.php:90
 msgid "Order by last commented date"
 msgstr "Ordena segons la data dels comentaris més recents"
 
-#: ../../Zotlabs/Widget/Activity_order.php:93
+#: ../../Code/Widget/Activity_order.php:93
 msgid "Posted Date"
 msgstr "Data de les entrades"
 
-#: ../../Zotlabs/Widget/Activity_order.php:97
+#: ../../Code/Widget/Activity_order.php:97
 msgid "Order by last posted date"
 msgstr "Ordena segons la data de publicació de les entrades"
 
-#: ../../Zotlabs/Widget/Activity_order.php:100
+#: ../../Code/Widget/Activity_order.php:100
 msgid "Date Unthreaded"
 msgstr "Data sense agrupar"
 
-#: ../../Zotlabs/Widget/Activity_order.php:104
+#: ../../Code/Widget/Activity_order.php:104
 msgid "Order unthreaded by date"
 msgstr "Ordena per data els comentaris i les publicacions sense agrupar-los per converses"
 
-#: ../../Zotlabs/Widget/Activity_order.php:119
+#: ../../Code/Widget/Activity_order.php:119
 msgid "Activity Order"
 msgstr "Ordre de les activitats"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:54
+#: ../../Code/Widget/Cover_photo.php:54
 msgid "Click to show more"
 msgstr "Fes clic per veure més"
 
-#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320
+#: ../../Code/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320
 #: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: ../../Zotlabs/Widget/Appstore.php:11
+#: ../../Code/Widget/Appstore.php:11
 msgid "App Collections"
 msgstr "Coŀleccions d'aplicacions"
 
-#: ../../Zotlabs/Widget/Appstore.php:13
+#: ../../Code/Widget/Appstore.php:13
 msgid "Available Apps"
 msgstr "Aplicacions disponibles"
 
-#: ../../Zotlabs/Widget/Appstore.php:14
+#: ../../Code/Widget/Appstore.php:14
 msgid "Installed apps"
 msgstr "Aplicacions instaŀlades"
 
-#: ../../Zotlabs/Widget/Newmember.php:24
+#: ../../Code/Widget/Newmember.php:24
 msgid "Profile Creation"
 msgstr "Creació de perfils"
 
-#: ../../Zotlabs/Widget/Newmember.php:26
+#: ../../Code/Widget/Newmember.php:26
 msgid "Upload profile photo"
 msgstr "Puja una foto de perfil"
 
-#: ../../Zotlabs/Widget/Newmember.php:27
+#: ../../Code/Widget/Newmember.php:27
 msgid "Upload cover photo"
 msgstr "Puja una foto de portada"
 
-#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:113
+#: ../../Code/Widget/Newmember.php:28 ../../include/nav.php:113
 msgid "Edit your profile"
 msgstr "Modifica el teu perfil"
 
-#: ../../Zotlabs/Widget/Newmember.php:31
+#: ../../Code/Widget/Newmember.php:31
 msgid "Find and Connect with others"
 msgstr "Cerca altres canals i connecta-t'hi"
 
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Code/Widget/Newmember.php:33
 msgid "View the directory"
 msgstr "Mostra la carpeta"
 
-#: ../../Zotlabs/Widget/Newmember.php:35
+#: ../../Code/Widget/Newmember.php:35
 msgid "Manage your connections"
 msgstr "Gestiona les teves conexions"
 
-#: ../../Zotlabs/Widget/Newmember.php:38
+#: ../../Code/Widget/Newmember.php:38
 msgid "Communicate"
 msgstr "Communica't"
 
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Code/Widget/Newmember.php:40
 msgid "View your channel homepage"
 msgstr "Mostra el teu canal"
 
-#: ../../Zotlabs/Widget/Newmember.php:41
+#: ../../Code/Widget/Newmember.php:41
 msgid "View your network stream"
 msgstr "Mostra el teu flux de xarxa"
 
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Code/Widget/Newmember.php:47
 msgid "Documentation"
 msgstr "Documentació"
 
-#: ../../Zotlabs/Widget/Newmember.php:58
+#: ../../Code/Widget/Newmember.php:58
 msgid "View public stream"
 msgstr "Mostra el flux públic"
 
-#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60
+#: ../../Code/Widget/Newmember.php:62 ../../include/features.php:60
 msgid "New Member Links"
 msgstr "Enllaços de membres nous"
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+#: ../../Code/Widget/Admin.php:23 ../../Code/Widget/Admin.php:60
 msgid "Member registrations waiting for confirmation"
 msgstr "Una inscripció per a ser membre està esperant confirmació"
 
-#: ../../Zotlabs/Widget/Admin.php:29
+#: ../../Code/Widget/Admin.php:29
 msgid "Inspect queue"
 msgstr "Revisa cua"
 
-#: ../../Zotlabs/Widget/Admin.php:31
+#: ../../Code/Widget/Admin.php:31
 msgid "DB updates"
 msgstr "Actualitzacions de Base de Dades"
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:191
+#: ../../Code/Widget/Admin.php:55 ../../include/nav.php:191
 msgid "Admin"
 msgstr "Administració"
 
-#: ../../Zotlabs/Widget/Admin.php:56
+#: ../../Code/Widget/Admin.php:56
 msgid "Addon Features"
 msgstr "Funcions de les extensions"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:35
+#: ../../Code/Widget/Settings_menu.php:35
 msgid "Account settings"
 msgstr "Configuració del compte"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:41
+#: ../../Code/Widget/Settings_menu.php:41
 msgid "Channel settings"
 msgstr "Configuració del canal"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:50
+#: ../../Code/Widget/Settings_menu.php:50
 msgid "Additional features"
 msgstr "Característiques addicionals"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:57
+#: ../../Code/Widget/Settings_menu.php:57
 msgid "Addon settings"
 msgstr "Configuració de les extensions"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:63
+#: ../../Code/Widget/Settings_menu.php:63
 msgid "Display settings"
 msgstr "Configuració de pantalla"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:70
+#: ../../Code/Widget/Settings_menu.php:70
 msgid "Manage locations"
 msgstr "Gestiona ubicacions"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:77
+#: ../../Code/Widget/Settings_menu.php:77
 msgid "Export channel"
 msgstr "Exportat canal"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:84
+#: ../../Code/Widget/Settings_menu.php:84
 msgid "OAuth1 apps"
 msgstr "Aplicacions OAuth1"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:92
+#: ../../Code/Widget/Settings_menu.php:92
 msgid "OAuth2 apps"
 msgstr "Aplicacions OAuth2"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:125
+#: ../../Code/Widget/Settings_menu.php:125
 msgid "Premium Channel Settings"
 msgstr "Configuració dels canals prèmium"
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+#: ../../Code/Widget/Bookmarkedchats.php:24
 msgid "Bookmarked Chatrooms"
 msgstr "Sales de xat desades"
 
-#: ../../Zotlabs/Widget/Notifications.php:16
+#: ../../Code/Widget/Notifications.php:16
 msgid "New Network Activity"
 msgstr "Activitat nova a la xarxa"
 
-#: ../../Zotlabs/Widget/Notifications.php:17
+#: ../../Code/Widget/Notifications.php:17
 msgid "New Network Activity Notifications"
 msgstr "Notificacions noves d'activitat a la xarxa"
 
-#: ../../Zotlabs/Widget/Notifications.php:20
+#: ../../Code/Widget/Notifications.php:20
 msgid "View your network activity"
 msgstr "Mostra l'activitat a la xarxa"
 
-#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Code/Widget/Notifications.php:23
 msgid "Mark all notifications read"
 msgstr "Marca totes les notificacions com a vistes"
 
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:45
-#: ../../Zotlabs/Widget/Notifications.php:152
+#: ../../Code/Widget/Notifications.php:26
+#: ../../Code/Widget/Notifications.php:45
+#: ../../Code/Widget/Notifications.php:152
 msgid "Show new posts only"
 msgstr "Mostra només les entrades noves"
 
-#: ../../Zotlabs/Widget/Notifications.php:35
+#: ../../Code/Widget/Notifications.php:35
 msgid "New Home Activity"
 msgstr "Activitat nova al mur"
 
-#: ../../Zotlabs/Widget/Notifications.php:36
+#: ../../Code/Widget/Notifications.php:36
 msgid "New Home Activity Notifications"
 msgstr "Notificacions noves d'activitat al mur"
 
-#: ../../Zotlabs/Widget/Notifications.php:39
+#: ../../Code/Widget/Notifications.php:39
 msgid "View your home activity"
 msgstr "Mostra l'activitat al teu mur"
 
-#: ../../Zotlabs/Widget/Notifications.php:42
-#: ../../Zotlabs/Widget/Notifications.php:149
+#: ../../Code/Widget/Notifications.php:42
+#: ../../Code/Widget/Notifications.php:149
 msgid "Mark all notifications seen"
 msgstr "Marca totes les notificacions com a vistes"
 
-#: ../../Zotlabs/Widget/Notifications.php:54
+#: ../../Code/Widget/Notifications.php:54
 msgid "New Mails"
 msgstr "Correus nous"
 
-#: ../../Zotlabs/Widget/Notifications.php:55
+#: ../../Code/Widget/Notifications.php:55
 msgid "New Mails Notifications"
 msgstr "Notificacions noves de correus"
 
-#: ../../Zotlabs/Widget/Notifications.php:58
+#: ../../Code/Widget/Notifications.php:58
 msgid "View your private mails"
 msgstr "Mostra els correus privats"
 
-#: ../../Zotlabs/Widget/Notifications.php:61
+#: ../../Code/Widget/Notifications.php:61
 msgid "Mark all messages seen"
 msgstr "Marca tots els missatges com a llegits"
 
-#: ../../Zotlabs/Widget/Notifications.php:69
+#: ../../Code/Widget/Notifications.php:69
 msgid "New Events"
 msgstr "Esdeveniments nous"
 
-#: ../../Zotlabs/Widget/Notifications.php:70
+#: ../../Code/Widget/Notifications.php:70
 msgid "New Events Notifications"
 msgstr "Notificacions noves d'esdeveniments"
 
-#: ../../Zotlabs/Widget/Notifications.php:73
+#: ../../Code/Widget/Notifications.php:73
 msgid "View events"
 msgstr "Mostra els esdeveniments"
 
-#: ../../Zotlabs/Widget/Notifications.php:76
+#: ../../Code/Widget/Notifications.php:76
 msgid "Mark all events seen"
 msgstr "Marcar tots els esdeveniments vistos"
 
-#: ../../Zotlabs/Widget/Notifications.php:85
+#: ../../Code/Widget/Notifications.php:85
 msgid "New Connections Notifications"
 msgstr "Notificacions noves de connexió"
 
-#: ../../Zotlabs/Widget/Notifications.php:88
+#: ../../Code/Widget/Notifications.php:88
 msgid "View all connections"
 msgstr "Mostra totes les connexions"
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Code/Widget/Notifications.php:96
 msgid "New Files"
 msgstr "Arxius nous"
 
-#: ../../Zotlabs/Widget/Notifications.php:97
+#: ../../Code/Widget/Notifications.php:97
 msgid "New Files Notifications"
 msgstr "Notificacions noves d'arxius"
 
-#: ../../Zotlabs/Widget/Notifications.php:104
-#: ../../Zotlabs/Widget/Notifications.php:105
+#: ../../Code/Widget/Notifications.php:104
+#: ../../Code/Widget/Notifications.php:105
 msgid "Notices"
 msgstr "Noticies"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Code/Widget/Notifications.php:108
 msgid "View all notices"
 msgstr "Mostra totes les notificacions"
 
-#: ../../Zotlabs/Widget/Notifications.php:111
+#: ../../Code/Widget/Notifications.php:111
 msgid "Mark all notices seen"
 msgstr "Marca totes les notificacions com a vistes"
 
-#: ../../Zotlabs/Widget/Notifications.php:132
+#: ../../Code/Widget/Notifications.php:132
 msgid "New Registrations"
 msgstr "Inscripcions noves"
 
-#: ../../Zotlabs/Widget/Notifications.php:133
+#: ../../Code/Widget/Notifications.php:133
 msgid "New Registrations Notifications"
 msgstr "Notificacions noves d'inscripció"
 
-#: ../../Zotlabs/Widget/Notifications.php:143
+#: ../../Code/Widget/Notifications.php:143
 msgid "Public Stream Notifications"
 msgstr "Notificacions del flux públic"
 
-#: ../../Zotlabs/Widget/Notifications.php:146
+#: ../../Code/Widget/Notifications.php:146
 msgid "View the public stream"
 msgstr "Mostra el flux públic"
 
-#: ../../Zotlabs/Widget/Notifications.php:161
+#: ../../Code/Widget/Notifications.php:161
 msgid "Sorry, you have got no notifications at the moment"
 msgstr "No tens cap notificació"
 
diff --git a/view/de-de/messages.po b/view/de-de/messages.po
index 171a07bc0..2c0a677a8 100644
--- a/view/de-de/messages.po
+++ b/view/de-de/messages.po
@@ -37,143 +37,143 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Code/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
 msgstr "Kann meinen Kanal-Stream und meine Beiträge sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:57
+#: ../../Code/Access/Permissions.php:57
 msgid "Can send me their channel stream and posts"
 msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
 
-#: ../../Zotlabs/Access/Permissions.php:58
+#: ../../Code/Access/Permissions.php:58
 msgid "Can view my default channel profile"
 msgstr "Kann mein Standardprofil sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Code/Access/Permissions.php:59
 msgid "Can view my connections"
 msgstr "Kann meine Verbindungen sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Code/Access/Permissions.php:60
 msgid "Can view my file storage and photos"
 msgstr "Kann meine Datei- und Bilderordner sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Code/Access/Permissions.php:61
 msgid "Can upload/modify my file storage and photos"
 msgstr "Kann in meine Datei- und Bilderordner hochladen/ändern"
 
-#: ../../Zotlabs/Access/Permissions.php:62
+#: ../../Code/Access/Permissions.php:62
 msgid "Can view my channel webpages"
 msgstr "Kann die Webseiten meines Kanals sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Code/Access/Permissions.php:63
 msgid "Can view my wiki pages"
 msgstr "Kann meine Wiki-Seiten sehen"
 
-#: ../../Zotlabs/Access/Permissions.php:64
+#: ../../Code/Access/Permissions.php:64
 msgid "Can create/edit my channel webpages"
 msgstr "Kann Webseiten in meinem Kanal erstellen/ändern"
 
-#: ../../Zotlabs/Access/Permissions.php:65
+#: ../../Code/Access/Permissions.php:65
 msgid "Can write to my wiki pages"
 msgstr "Kann meine Wiki-Seiten bearbeiten"
 
-#: ../../Zotlabs/Access/Permissions.php:66
+#: ../../Code/Access/Permissions.php:66
 msgid "Can post on my channel (wall) page"
 msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
 
-#: ../../Zotlabs/Access/Permissions.php:67
+#: ../../Code/Access/Permissions.php:67
 msgid "Can comment on or like my posts"
 msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
 
-#: ../../Zotlabs/Access/Permissions.php:68
+#: ../../Code/Access/Permissions.php:68
 msgid "Can send me private mail messages"
 msgstr "Kann mir private Nachrichten schicken"
 
-#: ../../Zotlabs/Access/Permissions.php:69
+#: ../../Code/Access/Permissions.php:69
 msgid "Can like/dislike profiles and profile things"
 msgstr "Kann Profile und Profilsachen mögen/nicht mögen"
 
-#: ../../Zotlabs/Access/Permissions.php:70
+#: ../../Code/Access/Permissions.php:70
 msgid "Can forward to all my channel connections via @+ mentions in posts"
 msgstr "Kann an alle meine Verbindungen via @-Erwähnungen Nachrichten weiterleiten"
 
-#: ../../Zotlabs/Access/Permissions.php:71
+#: ../../Code/Access/Permissions.php:71
 msgid "Can chat with me"
 msgstr "Kann mit mir chatten"
 
-#: ../../Zotlabs/Access/Permissions.php:72
+#: ../../Code/Access/Permissions.php:72
 msgid "Can source my public posts in derived channels"
 msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
 
-#: ../../Zotlabs/Access/Permissions.php:73
+#: ../../Code/Access/Permissions.php:73
 msgid "Can administer my channel"
 msgstr "Kann meinen Kanal administrieren"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:283
+#: ../../Code/Access/PermissionRoles.php:283
 msgid "Social Networking"
 msgstr "Soziales Netzwerk"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:284
+#: ../../Code/Access/PermissionRoles.php:284
 msgid "Social - Federation"
 msgstr "Soziales Netzwerk - Föderation (verbundene Netze)"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:285
+#: ../../Code/Access/PermissionRoles.php:285
 msgid "Social - Mostly Public"
 msgstr "Soziales Netzwerk - Weitgehend öffentlich"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:286
+#: ../../Code/Access/PermissionRoles.php:286
 msgid "Social - Restricted"
 msgstr "Soziales Netzwerk - Beschränkt"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
+#: ../../Code/Access/PermissionRoles.php:287
 msgid "Social - Private"
 msgstr "Soziales Netzwerk - Privat"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
+#: ../../Code/Access/PermissionRoles.php:290
 msgid "Community Forum"
 msgstr "Forum"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
+#: ../../Code/Access/PermissionRoles.php:291
 msgid "Forum - Mostly Public"
 msgstr "Forum - Weitgehend öffentlich"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:292
+#: ../../Code/Access/PermissionRoles.php:292
 msgid "Forum - Restricted"
 msgstr "Forum - Beschränkt"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:293
+#: ../../Code/Access/PermissionRoles.php:293
 msgid "Forum - Private"
 msgstr "Forum - Privat"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
+#: ../../Code/Access/PermissionRoles.php:296
 msgid "Feed Republish"
 msgstr "Teilen von Feeds"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
+#: ../../Code/Access/PermissionRoles.php:297
 msgid "Feed - Mostly Public"
 msgstr "Feeds - Weitgehend öffentlich"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:298
+#: ../../Code/Access/PermissionRoles.php:298
 msgid "Feed - Restricted"
 msgstr "Feeds - Beschränkt"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
+#: ../../Code/Access/PermissionRoles.php:301
 msgid "Special Purpose"
 msgstr "Für besondere Zwecke"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
+#: ../../Code/Access/PermissionRoles.php:302
 msgid "Special - Celebrity/Soapbox"
 msgstr "Speziell - Mitteilungs-Kanal (keine Kommentare)"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:303
+#: ../../Code/Access/PermissionRoles.php:303
 msgid "Special - Group Repository"
 msgstr "Speziell - Gruppenarchiv"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144
-#: ../../Zotlabs/Module/Settings/Channel.php:479
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49
+#: ../../Code/Access/PermissionRoles.php:306
+#: ../../Code/Module/Cdav.php:1182 ../../Code/Module/New_channel.php:144
+#: ../../Code/Module/Settings/Channel.php:479
+#: ../../Code/Module/Connedit.php:918 ../../Code/Module/Profiles.php:795
+#: ../../Code/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:697
@@ -181,77 +181,77 @@ msgstr "Speziell - Gruppenarchiv"
 msgid "Other"
 msgstr "Andere"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
+#: ../../Code/Access/PermissionRoles.php:307
 msgid "Custom/Expert Mode"
 msgstr "Benutzerdefiniert/Expertenmodus"
 
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29
-#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197
+#: ../../Code/Module/Blocks.php:33 ../../Code/Module/Articles.php:29
+#: ../../Code/Module/Editlayout.php:31 ../../Code/Module/Connect.php:17
+#: ../../Code/Module/Achievements.php:15 ../../Code/Module/Hcard.php:12
+#: ../../Code/Module/Editblock.php:31 ../../Code/Module/Profile.php:20
+#: ../../Code/Module/Layouts.php:31 ../../Code/Module/Editwebpage.php:32
+#: ../../Code/Module/Cards.php:33 ../../Code/Module/Webpages.php:33
+#: ../../Code/Module/Filestorage.php:51 ../../include/channel.php:1197
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht verfügbar."
 
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110
-#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Article_edit.php:51
-#: ../../Zotlabs/Module/New_channel.php:91
-#: ../../Zotlabs/Module/New_channel.php:116
-#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
-#: ../../Zotlabs/Module/Moderate.php:13
-#: ../../Zotlabs/Module/Settings/Features.php:38
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280
-#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
-#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
-#: ../../Zotlabs/Module/Profile_photo.php:302
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229
-#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
-#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107
-#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118
-#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74
-#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
-#: ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Cover_photo.php:281
-#: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Filestorage.php:15
-#: ../../Zotlabs/Module/Filestorage.php:70
-#: ../../Zotlabs/Module/Filestorage.php:85
-#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Card_edit.php:51
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
+#: ../../Code/Module/Blocks.php:73 ../../Code/Module/Blocks.php:80
+#: ../../Code/Module/Invite.php:17 ../../Code/Module/Invite.php:94
+#: ../../Code/Module/Articles.php:68 ../../Code/Module/Editlayout.php:67
+#: ../../Code/Module/Editlayout.php:90 ../../Code/Module/Channel.php:110
+#: ../../Code/Module/Channel.php:248 ../../Code/Module/Channel.php:288
+#: ../../Code/Module/Settings.php:59 ../../Code/Module/Locs.php:87
+#: ../../Code/Module/Mitem.php:115 ../../Code/Module/Events.php:271
+#: ../../Code/Module/Appman.php:87 ../../Code/Module/Regmod.php:21
+#: ../../Code/Module/Article_edit.php:51
+#: ../../Code/Module/New_channel.php:91
+#: ../../Code/Module/New_channel.php:116
+#: ../../Code/Module/Sharedwithme.php:16 ../../Code/Module/Setup.php:209
+#: ../../Code/Module/Moderate.php:13
+#: ../../Code/Module/Settings/Features.php:38
+#: ../../Code/Module/Achievements.php:34 ../../Code/Module/Thing.php:280
+#: ../../Code/Module/Thing.php:300 ../../Code/Module/Thing.php:341
+#: ../../Code/Module/Api.php:24 ../../Code/Module/Editblock.php:67
+#: ../../Code/Module/Profile.php:85 ../../Code/Module/Profile.php:101
+#: ../../Code/Module/Mood.php:116 ../../Code/Module/Connections.php:29
+#: ../../Code/Module/Viewsrc.php:19 ../../Code/Module/Bookmarks.php:64
+#: ../../Code/Module/Photos.php:69 ../../Code/Module/Wiki.php:50
+#: ../../Code/Module/Wiki.php:273 ../../Code/Module/Wiki.php:404
+#: ../../Code/Module/Pdledit.php:29 ../../Code/Module/Poke.php:149
+#: ../../Code/Module/Profile_photo.php:302
+#: ../../Code/Module/Profile_photo.php:315
+#: ../../Code/Module/Authtest.php:16 ../../Code/Module/Item.php:229
+#: ../../Code/Module/Item.php:246 ../../Code/Module/Item.php:256
+#: ../../Code/Module/Item.php:1106 ../../Code/Module/Page.php:34
+#: ../../Code/Module/Page.php:133 ../../Code/Module/Connedit.php:389
+#: ../../Code/Module/Chat.php:100 ../../Code/Module/Chat.php:105
+#: ../../Code/Module/Menu.php:78 ../../Code/Module/Layouts.php:71
+#: ../../Code/Module/Layouts.php:78 ../../Code/Module/Layouts.php:89
+#: ../../Code/Module/Defperms.php:173 ../../Code/Module/Group.php:13
+#: ../../Code/Module/Profiles.php:198 ../../Code/Module/Profiles.php:635
+#: ../../Code/Module/Editwebpage.php:68
+#: ../../Code/Module/Editwebpage.php:89
+#: ../../Code/Module/Editwebpage.php:107
+#: ../../Code/Module/Editwebpage.php:121 ../../Code/Module/Manage.php:10
+#: ../../Code/Module/Cards.php:72 ../../Code/Module/Webpages.php:118
+#: ../../Code/Module/Block.php:24 ../../Code/Module/Block.php:74
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Sources.php:74
+#: ../../Code/Module/Like.php:185 ../../Code/Module/Suggest.php:28
+#: ../../Code/Module/Message.php:18 ../../Code/Module/Mail.php:146
+#: ../../Code/Module/Register.php:77
+#: ../../Code/Module/Cover_photo.php:281
+#: ../../Code/Module/Cover_photo.php:294
+#: ../../Code/Module/Display.php:449 ../../Code/Module/Network.php:15
+#: ../../Code/Module/Filestorage.php:15
+#: ../../Code/Module/Filestorage.php:70
+#: ../../Code/Module/Filestorage.php:85
+#: ../../Code/Module/Filestorage.php:117 ../../Code/Module/Common.php:38
+#: ../../Code/Module/Viewconnections.php:28
+#: ../../Code/Module/Viewconnections.php:33
+#: ../../Code/Module/Service_limits.php:11
+#: ../../Code/Module/Rate.php:113 ../../Code/Module/Card_edit.php:51
+#: ../../Code/Module/Notifications.php:11
+#: ../../Code/Lib/Chatroom.php:133 ../../Code/Web/WebServer.php:123
 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
 #: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150
 #: ../../include/attach.php:197 ../../include/attach.php:270
@@ -264,206 +264,206 @@ msgstr "Das angefragte Profil ist nicht verfügbar."
 msgid "Permission denied."
 msgstr "Berechtigung verweigert."
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
+#: ../../Code/Module/Blocks.php:97 ../../Code/Module/Blocks.php:155
+#: ../../Code/Module/Editblock.php:113
 msgid "Block Name"
 msgstr "Block-Name"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422
+#: ../../Code/Module/Blocks.php:154 ../../include/text.php:2422
 msgid "Blocks"
 msgstr "Blöcke"
 
-#: ../../Zotlabs/Module/Blocks.php:156
+#: ../../Code/Module/Blocks.php:156
 msgid "Block Title"
 msgstr "Titel des Blocks"
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Code/Module/Blocks.php:157 ../../Code/Module/Menu.php:114
+#: ../../Code/Module/Layouts.php:191 ../../Code/Module/Webpages.php:251
 msgid "Created"
 msgstr "Erstellt"
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
+#: ../../Code/Module/Blocks.php:158 ../../Code/Module/Menu.php:115
+#: ../../Code/Module/Layouts.php:192 ../../Code/Module/Webpages.php:252
 msgid "Edited"
 msgstr "Geändert"
 
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239
-#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382
-#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
+#: ../../Code/Module/Blocks.php:159 ../../Code/Module/Articles.php:96
+#: ../../Code/Module/Cdav.php:1185 ../../Code/Module/New_channel.php:160
+#: ../../Code/Module/Connedit.php:921 ../../Code/Module/Menu.php:118
+#: ../../Code/Module/Layouts.php:185 ../../Code/Module/Profiles.php:798
+#: ../../Code/Module/Cards.php:100 ../../Code/Module/Webpages.php:239
+#: ../../Code/Storage/Browser.php:276 ../../Code/Storage/Browser.php:382
+#: ../../Code/Widget/Cdav.php:128 ../../Code/Widget/Cdav.php:165
 msgid "Create"
 msgstr "Erstelle"
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Admin/Profs.php:175
-#: ../../Zotlabs/Module/Settings/Oauth2.php:149
-#: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:281
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202
-#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121
-#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126
-#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296
+#: ../../Code/Module/Blocks.php:160 ../../Code/Module/Editlayout.php:114
+#: ../../Code/Module/Article_edit.php:99
+#: ../../Code/Module/Admin/Profs.php:175
+#: ../../Code/Module/Settings/Oauth2.php:149
+#: ../../Code/Module/Settings/Oauth.php:150
+#: ../../Code/Module/Thing.php:266 ../../Code/Module/Editblock.php:114
+#: ../../Code/Module/Connections.php:281
+#: ../../Code/Module/Connections.php:319
+#: ../../Code/Module/Connections.php:339 ../../Code/Module/Wiki.php:202
+#: ../../Code/Module/Wiki.php:362 ../../Code/Module/Menu.php:112
+#: ../../Code/Module/Layouts.php:193
+#: ../../Code/Module/Editwebpage.php:142
+#: ../../Code/Module/Webpages.php:240 ../../Code/Module/Card_edit.php:99
+#: ../../Code/Lib/Apps.php:409 ../../Code/Lib/ThreadItem.php:121
+#: ../../Code/Storage/Browser.php:288 ../../Code/Widget/Cdav.php:126
+#: ../../Code/Widget/Cdav.php:162 ../../include/channel.php:1296
 #: ../../include/channel.php:1300 ../../include/menu.php:113
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102
-#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124
+#: ../../Code/Module/Blocks.php:161 ../../Code/Module/Photos.php:1102
+#: ../../Code/Module/Wiki.php:287 ../../Code/Module/Layouts.php:194
+#: ../../Code/Module/Webpages.php:241 ../../Code/Widget/Cdav.php:124
 #: ../../include/conversation.php:1366
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
-#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Settings/Oauth2.php:150
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:289
-#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179
-#: ../../Zotlabs/Module/Profiles.php:800
-#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:242
-#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410
-#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:289
+#: ../../Code/Module/Blocks.php:162 ../../Code/Module/Editlayout.php:138
+#: ../../Code/Module/Cdav.php:897 ../../Code/Module/Cdav.php:1187
+#: ../../Code/Module/Article_edit.php:129
+#: ../../Code/Module/Admin/Accounts.php:175
+#: ../../Code/Module/Admin/Channels.php:149
+#: ../../Code/Module/Admin/Profs.php:176
+#: ../../Code/Module/Settings/Oauth2.php:150
+#: ../../Code/Module/Settings/Oauth.php:151
+#: ../../Code/Module/Thing.php:267 ../../Code/Module/Editblock.php:139
+#: ../../Code/Module/Connections.php:289
+#: ../../Code/Module/Photos.php:1203 ../../Code/Module/Connedit.php:654
+#: ../../Code/Module/Connedit.php:923 ../../Code/Module/Group.php:179
+#: ../../Code/Module/Profiles.php:800
+#: ../../Code/Module/Editwebpage.php:167
+#: ../../Code/Module/Webpages.php:242
+#: ../../Code/Module/Card_edit.php:129 ../../Code/Lib/Apps.php:410
+#: ../../Code/Lib/ThreadItem.php:141 ../../Code/Storage/Browser.php:289
 #: ../../include/conversation.php:690 ../../include/conversation.php:733
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60
+#: ../../Code/Module/Blocks.php:166 ../../Code/Module/Events.php:694
+#: ../../Code/Module/Wiki.php:204 ../../Code/Module/Layouts.php:198
+#: ../../Code/Module/Webpages.php:246 ../../Code/Module/Pubsites.php:60
 msgid "View"
 msgstr "Ansicht"
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Code/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
 msgstr "Einladungslimit überschritten."
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Code/Module/Invite.php:53
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : Keine gültige Email Adresse."
 
-#: ../../Zotlabs/Module/Invite.php:67
+#: ../../Code/Module/Invite.php:67
 msgid "Please join us on $Projectname"
 msgstr "Schließe Dich uns auf $Projectname an!"
 
-#: ../../Zotlabs/Module/Invite.php:77
+#: ../../Code/Module/Invite.php:77
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines $Projectname-Servers."
 
-#: ../../Zotlabs/Module/Invite.php:82
+#: ../../Code/Module/Invite.php:82
 #: ../../addon/notifyadmin/notifyadmin.php:40
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : Nachricht konnte nicht zugestellt werden."
 
-#: ../../Zotlabs/Module/Invite.php:86
+#: ../../Code/Module/Invite.php:86
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d Nachricht gesendet."
 msgstr[1] "%d Nachrichten gesendet."
 
-#: ../../Zotlabs/Module/Invite.php:107
+#: ../../Code/Module/Invite.php:107
 msgid "You have no more invitations available"
 msgstr "Du hast keine weiteren verfügbare Einladungen"
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Code/Module/Invite.php:138
 msgid "Send invitations"
 msgstr "Einladungen senden"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Code/Module/Invite.php:139
 msgid "Enter email addresses, one per line:"
 msgstr "Email-Adressen eintragen, eine pro Zeile:"
 
-#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
+#: ../../Code/Module/Invite.php:140 ../../Code/Module/Mail.php:285
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Code/Module/Invite.php:141
 msgid "Please join my community on $Projectname."
 msgstr "Schließe Dich uns auf $Projectname an!"
 
-#: ../../Zotlabs/Module/Invite.php:143
+#: ../../Code/Module/Invite.php:143
 msgid "You will need to supply this invitation code:"
 msgstr "Bitte verwende bei der Registrierung den folgenden Einladungscode:"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Code/Module/Invite.php:144
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
 
-#: ../../Zotlabs/Module/Invite.php:146
+#: ../../Code/Module/Invite.php:146
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Code/Module/Invite.php:147
 msgid "or visit"
 msgstr "oder besuche"
 
-#: ../../Zotlabs/Module/Invite.php:149
+#: ../../Code/Module/Invite.php:149
 msgid "3. Click [Connect]"
 msgstr "3. Klicke auf [Verbinden]"
 
-#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:153
-#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
-#: ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Plugins.php:438
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:296
-#: ../../Zotlabs/Module/Admin/Profs.php:178
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Security.php:104
-#: ../../Zotlabs/Module/Settings/Permcats.php:115
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-#: ../../Zotlabs/Module/Settings/Features.php:79
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Oauth2.php:84
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:54
-#: ../../Zotlabs/Module/Settings/Display.php:192
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379
-#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082
-#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240
-#: ../../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:40
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
-#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752
-#: ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:97
+#: ../../Code/Module/Invite.php:151 ../../Code/Module/Locs.php:121
+#: ../../Code/Module/Mitem.php:243 ../../Code/Module/Events.php:493
+#: ../../Code/Module/Appman.php:153
+#: ../../Code/Module/Import_items.php:129
+#: ../../Code/Module/Setup.php:308 ../../Code/Module/Setup.php:349
+#: ../../Code/Module/Connect.php:98
+#: ../../Code/Module/Admin/Features.php:66
+#: ../../Code/Module/Admin/Plugins.php:438
+#: ../../Code/Module/Admin/Accounts.php:168
+#: ../../Code/Module/Admin/Logs.php:84
+#: ../../Code/Module/Admin/Channels.php:147
+#: ../../Code/Module/Admin/Themes.php:158
+#: ../../Code/Module/Admin/Site.php:296
+#: ../../Code/Module/Admin/Profs.php:178
+#: ../../Code/Module/Admin/Account_edit.php:74
+#: ../../Code/Module/Admin/Security.php:104
+#: ../../Code/Module/Settings/Permcats.php:115
+#: ../../Code/Module/Settings/Channel.php:495
+#: ../../Code/Module/Settings/Features.php:79
+#: ../../Code/Module/Settings/Tokens.php:168
+#: ../../Code/Module/Settings/Oauth2.php:84
+#: ../../Code/Module/Settings/Account.php:118
+#: ../../Code/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Display.php:192
+#: ../../Code/Module/Settings/Oauth.php:88
+#: ../../Code/Module/Thing.php:326 ../../Code/Module/Thing.php:379
+#: ../../Code/Module/Import.php:530 ../../Code/Module/Cal.php:345
+#: ../../Code/Module/Mood.php:139 ../../Code/Module/Photos.php:1082
+#: ../../Code/Module/Photos.php:1122 ../../Code/Module/Photos.php:1240
+#: ../../Code/Module/Wiki.php:206 ../../Code/Module/Pdledit.php:98
+#: ../../Code/Module/Poke.php:200 ../../Code/Module/Connedit.php:887
+#: ../../Code/Module/Chat.php:196 ../../Code/Module/Chat.php:242
+#: ../../Code/Module/Email_validation.php:40
+#: ../../Code/Module/Pconfig.php:107 ../../Code/Module/Defperms.php:249
+#: ../../Code/Module/Group.php:87 ../../Code/Module/Profiles.php:723
+#: ../../Code/Module/Editpost.php:85 ../../Code/Module/Sources.php:114
+#: ../../Code/Module/Sources.php:149 ../../Code/Module/Xchan.php:15
+#: ../../Code/Module/Mail.php:431 ../../Code/Module/Filestorage.php:160
+#: ../../Code/Module/Rate.php:166 ../../Code/Lib/ThreadItem.php:752
+#: ../../Code/Widget/Eventstools.php:16
+#: ../../Code/Widget/Wiki_pages.php:40
+#: ../../Code/Widget/Wiki_pages.php:97
 #: ../../view/theme/redbasic_c/php/config.php:95
 #: ../../view/theme/redbasic/php/config.php:93
 #: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275
@@ -500,393 +500,393 @@ msgstr "3. Klicke auf [Verbinden]"
 msgid "Submit"
 msgstr "Absenden"
 
-#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191
-#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133
+#: ../../Code/Module/Articles.php:38 ../../Code/Module/Articles.php:191
+#: ../../Code/Lib/Apps.php:229 ../../include/features.php:133
 #: ../../include/nav.php:469
 msgid "Articles"
 msgstr "Artikel"
 
-#: ../../Zotlabs/Module/Articles.php:95
+#: ../../Code/Module/Articles.php:95
 msgid "Add Article"
 msgstr "Artikel hinzufügen"
 
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Article_edit.php:17
-#: ../../Zotlabs/Module/Article_edit.php:33
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Card_edit.php:17
-#: ../../Zotlabs/Module/Card_edit.php:33
+#: ../../Code/Module/Editlayout.php:79
+#: ../../Code/Module/Article_edit.php:17
+#: ../../Code/Module/Article_edit.php:33
+#: ../../Code/Module/Editblock.php:79 ../../Code/Module/Editblock.php:95
+#: ../../Code/Module/Editwebpage.php:80
+#: ../../Code/Module/Editpost.php:24 ../../Code/Module/Card_edit.php:17
+#: ../../Code/Module/Card_edit.php:33
 msgid "Item not found"
 msgstr "Element nicht gefunden"
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Code/Module/Editlayout.php:128
+#: ../../Code/Module/Layouts.php:129 ../../Code/Module/Layouts.php:189
 msgid "Layout Name"
 msgstr "Layout-Name"
 
-#: ../../Zotlabs/Module/Editlayout.php:129
-#: ../../Zotlabs/Module/Layouts.php:132
+#: ../../Code/Module/Editlayout.php:129
+#: ../../Code/Module/Layouts.php:132
 msgid "Layout Description (Optional)"
 msgstr "Layout-Beschreibung (optional)"
 
-#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Code/Module/Editlayout.php:137
 msgid "Edit Layout"
 msgstr "Layout bearbeiten"
 
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122
+#: ../../Code/Module/Profperm.php:28 ../../Code/Module/Subthread.php:86
+#: ../../Code/Module/Import_items.php:120
+#: ../../Code/Module/Cloud.php:117 ../../Code/Module/Group.php:74
+#: ../../Code/Module/Dreport.php:10 ../../Code/Module/Dreport.php:68
+#: ../../Code/Module/Like.php:296 ../../Code/Web/WebServer.php:122
 #: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73
 #: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109
 #: ../../include/items.php:358
 msgid "Permission denied"
 msgstr "Keine Berechtigung"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+#: ../../Code/Module/Profperm.php:34 ../../Code/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr "Ungültiger Profil-Identifikator"
 
-#: ../../Zotlabs/Module/Profperm.php:111
+#: ../../Code/Module/Profperm.php:111
 msgid "Profile Visibility Editor"
 msgstr "Profil-Sichtbarkeits-Editor"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644
+#: ../../Code/Module/Profperm.php:113 ../../include/channel.php:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Click on a contact to add or remove."
 msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
 
-#: ../../Zotlabs/Module/Profperm.php:124
+#: ../../Code/Module/Profperm.php:124
 msgid "Visible To"
 msgstr "Sichtbar für"
 
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:200
+#: ../../Code/Module/Profperm.php:140
+#: ../../Code/Module/Connections.php:200
 msgid "All Connections"
 msgstr "Alle Verbindungen"
 
-#: ../../Zotlabs/Module/Cdav.php:785
+#: ../../Code/Module/Cdav.php:785
 msgid "INVALID EVENT DISMISSED!"
 msgstr "UNGÜLTIGEN TERMIN ABGELEHNT!"
 
-#: ../../Zotlabs/Module/Cdav.php:786
+#: ../../Code/Module/Cdav.php:786
 msgid "Summary: "
 msgstr "Zusammenfassung:"
 
-#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787
-#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273
-#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891
+#: ../../Code/Module/Cdav.php:786 ../../Code/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:794 ../../Code/Module/Embedphotos.php:146
+#: ../../Code/Module/Photos.php:817 ../../Code/Module/Photos.php:1273
+#: ../../Code/Lib/Apps.php:754 ../../Code/Lib/Apps.php:833
+#: ../../Code/Storage/Browser.php:164 ../../Code/Widget/Portfolio.php:95
+#: ../../Code/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891
 #: ../../include/conversation.php:1160
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../../Zotlabs/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:787
 msgid "Date: "
 msgstr "Datum:"
 
-#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795
+#: ../../Code/Module/Cdav.php:788 ../../Code/Module/Cdav.php:795
 msgid "Reason: "
 msgstr "Grund:"
 
-#: ../../Zotlabs/Module/Cdav.php:793
+#: ../../Code/Module/Cdav.php:793
 msgid "INVALID CARD DISMISSED!"
 msgstr "UNGÜLTIGE KARTE ABGELEHNT!"
 
-#: ../../Zotlabs/Module/Cdav.php:794
+#: ../../Code/Module/Cdav.php:794
 msgid "Name: "
 msgstr "Name: "
 
-#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Cdav.php:868 ../../Code/Module/Events.php:460
 msgid "Event title"
 msgstr "Termintitel"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Events.php:466
 msgid "Start date and time"
 msgstr "Startdatum und -zeit"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Cdav.php:870
 msgid "Example: YYYY-MM-DD HH:mm"
 msgstr "Beispiel: JJJJ-MM-TT HH:mm"
 
-#: ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:870
 msgid "End date and time"
 msgstr "Enddatum und -zeit"
 
-#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Code/Module/Cdav.php:871 ../../Code/Module/Events.php:473
+#: ../../Code/Module/Appman.php:143 ../../Code/Module/Rbmark.php:101
 #: ../../addon/rendezvous/rendezvous.php:173
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
-#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
+#: ../../Code/Module/Cdav.php:872 ../../Code/Module/Locs.php:117
+#: ../../Code/Module/Events.php:475 ../../Code/Module/Profiles.php:509
+#: ../../Code/Module/Profiles.php:734 ../../Code/Module/Pubsites.php:52
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Ort"
 
-#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689
-#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971
+#: ../../Code/Module/Cdav.php:879 ../../Code/Module/Events.php:689
+#: ../../Code/Module/Events.php:698 ../../Code/Module/Cal.php:339
+#: ../../Code/Module/Cal.php:346 ../../Code/Module/Photos.php:971
 msgid "Previous"
 msgstr "Voriges"
 
-#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347
-#: ../../Zotlabs/Module/Photos.php:980
+#: ../../Code/Module/Cdav.php:880 ../../Code/Module/Events.php:690
+#: ../../Code/Module/Events.php:699 ../../Code/Module/Setup.php:263
+#: ../../Code/Module/Cal.php:340 ../../Code/Module/Cal.php:347
+#: ../../Code/Module/Photos.php:980
 msgid "Next"
 msgstr "Nächste"
 
-#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700
-#: ../../Zotlabs/Module/Cal.php:348
+#: ../../Code/Module/Cdav.php:881 ../../Code/Module/Events.php:700
+#: ../../Code/Module/Cal.php:348
 msgid "Today"
 msgstr "Heute"
 
-#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695
+#: ../../Code/Module/Cdav.php:882 ../../Code/Module/Events.php:695
 msgid "Month"
 msgstr "Monat"
 
-#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696
+#: ../../Code/Module/Cdav.php:883 ../../Code/Module/Events.php:696
 msgid "Week"
 msgstr "Woche"
 
-#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697
+#: ../../Code/Module/Cdav.php:884 ../../Code/Module/Events.php:697
 msgid "Day"
 msgstr "Tag"
 
-#: ../../Zotlabs/Module/Cdav.php:885
+#: ../../Code/Module/Cdav.php:885
 msgid "List month"
 msgstr "Liste Monat"
 
-#: ../../Zotlabs/Module/Cdav.php:886
+#: ../../Code/Module/Cdav.php:886
 msgid "List week"
 msgstr "Liste Woche"
 
-#: ../../Zotlabs/Module/Cdav.php:887
+#: ../../Code/Module/Cdav.php:887
 msgid "List day"
 msgstr "Liste Tag"
 
-#: ../../Zotlabs/Module/Cdav.php:894
+#: ../../Code/Module/Cdav.php:894
 msgid "More"
 msgstr "Mehr"
 
-#: ../../Zotlabs/Module/Cdav.php:895
+#: ../../Code/Module/Cdav.php:895
 msgid "Less"
 msgstr "Weniger"
 
-#: ../../Zotlabs/Module/Cdav.php:896
+#: ../../Code/Module/Cdav.php:896
 msgid "Select calendar"
 msgstr "Kalender auswählen"
 
-#: ../../Zotlabs/Module/Cdav.php:898
+#: ../../Code/Module/Cdav.php:898
 msgid "Delete all"
 msgstr "Alles löschen"
 
-#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Settings/Oauth2.php:85
-#: ../../Zotlabs/Module/Settings/Oauth2.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:464
-#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../Code/Module/Cdav.php:899 ../../Code/Module/Cdav.php:1188
+#: ../../Code/Module/Admin/Plugins.php:423
+#: ../../Code/Module/Settings/Oauth2.php:85
+#: ../../Code/Module/Settings/Oauth2.php:113
+#: ../../Code/Module/Settings/Oauth.php:89
+#: ../../Code/Module/Settings/Oauth.php:115
+#: ../../Code/Module/Wiki.php:347 ../../Code/Module/Wiki.php:379
+#: ../../Code/Module/Profile_photo.php:464
+#: ../../Code/Module/Connedit.php:924 ../../Code/Module/Fbrowser.php:66
+#: ../../Code/Module/Fbrowser.php:88 ../../Code/Module/Profiles.php:801
+#: ../../Code/Module/Filer.php:55 ../../Code/Module/Cover_photo.php:366
+#: ../../Code/Module/Tagrm.php:15 ../../Code/Module/Tagrm.php:138
 #: ../../include/conversation.php:1389 ../../include/conversation.php:1438
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../../Zotlabs/Module/Cdav.php:900
+#: ../../Code/Module/Cdav.php:900
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "Entschuldigung, aber das Bearbeiten von wiederkehrenden Veranstaltungen ist leider noch nicht implementiert."
 
-#: ../../Zotlabs/Module/Cdav.php:1170
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906
-#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558
-#: ../../Zotlabs/Storage/Browser.php:283
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../Code/Module/Cdav.php:1170
+#: ../../Code/Module/Sharedwithme.php:105
+#: ../../Code/Module/Admin/Channels.php:159
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth.php:116
+#: ../../Code/Module/Wiki.php:209 ../../Code/Module/Connedit.php:906
+#: ../../Code/Module/Chat.php:251 ../../Code/Lib/NativeWikiPage.php:558
+#: ../../Code/Storage/Browser.php:283
+#: ../../Code/Widget/Wiki_page_history.php:22
 #: ../../addon/rendezvous/rendezvous.php:172
 msgid "Name"
 msgstr "Name"
 
-#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907
+#: ../../Code/Module/Cdav.php:1171 ../../Code/Module/Connedit.php:907
 msgid "Organisation"
 msgstr "Organisation"
 
-#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Code/Module/Cdav.php:1172 ../../Code/Module/Connedit.php:908
 msgid "Title"
 msgstr "Titel"
 
-#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
-#: ../../Zotlabs/Module/Profiles.php:786
+#: ../../Code/Module/Cdav.php:1173 ../../Code/Module/Connedit.php:909
+#: ../../Code/Module/Profiles.php:786
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../../Zotlabs/Module/Cdav.php:1174
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Code/Module/Cdav.php:1174
+#: ../../Code/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:183
+#: ../../Code/Module/Connedit.php:910 ../../Code/Module/Profiles.php:787
 #: ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
 #: ../../addon/redred/redred.php:107 ../../include/network.php:1770
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
-#: ../../Zotlabs/Module/Profiles.php:788
+#: ../../Code/Module/Cdav.php:1175 ../../Code/Module/Connedit.php:911
+#: ../../Code/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr "Sofortnachrichtendienst"
 
-#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
-#: ../../Zotlabs/Module/Profiles.php:789
+#: ../../Code/Module/Cdav.php:1176 ../../Code/Module/Connedit.php:912
+#: ../../Code/Module/Profiles.php:789
 msgid "Website"
 msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Code/Module/Cdav.php:1177 ../../Code/Module/Locs.php:118
+#: ../../Code/Module/Admin/Channels.php:160
+#: ../../Code/Module/Connedit.php:913 ../../Code/Module/Profiles.php:502
+#: ../../Code/Module/Profiles.php:790
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
-#: ../../Zotlabs/Module/Profiles.php:791
+#: ../../Code/Module/Cdav.php:1178 ../../Code/Module/Connedit.php:914
+#: ../../Code/Module/Profiles.php:791
 msgid "Note"
 msgstr "Hinweis"
 
-#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
-#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308
+#: ../../Code/Module/Cdav.php:1179 ../../Code/Module/Connedit.php:915
+#: ../../Code/Module/Profiles.php:792 ../../include/event.php:1308
 #: ../../include/connections.php:690
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309
+#: ../../Code/Module/Cdav.php:1180 ../../Code/Module/Connedit.php:916
+#: ../../Code/Module/Profiles.php:793 ../../include/event.php:1309
 #: ../../include/connections.php:691
 msgid "Home"
 msgstr "Home"
 
-#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
-#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312
+#: ../../Code/Module/Cdav.php:1181 ../../Code/Module/Connedit.php:917
+#: ../../Code/Module/Profiles.php:794 ../../include/event.php:1312
 #: ../../include/connections.php:694
 msgid "Work"
 msgstr "Arbeit"
 
-#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
-#: ../../Zotlabs/Module/Profiles.php:796
+#: ../../Code/Module/Cdav.php:1183 ../../Code/Module/Connedit.php:919
+#: ../../Code/Module/Profiles.php:796
 #: ../../addon/jappixmini/jappixmini.php:368
 msgid "Add Contact"
 msgstr "Kontakt hinzufügen"
 
-#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Profiles.php:797
+#: ../../Code/Module/Cdav.php:1184 ../../Code/Module/Connedit.php:920
+#: ../../Code/Module/Profiles.php:797
 msgid "Add Field"
 msgstr "Feld hinzufügen"
 
-#: ../../Zotlabs/Module/Cdav.php:1186
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Settings/Oauth2.php:39
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth.php:43
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Lib/Apps.php:393
+#: ../../Code/Module/Cdav.php:1186
+#: ../../Code/Module/Admin/Plugins.php:453
+#: ../../Code/Module/Settings/Oauth2.php:39
+#: ../../Code/Module/Settings/Oauth2.php:112
+#: ../../Code/Module/Settings/Oauth.php:43
+#: ../../Code/Module/Settings/Oauth.php:114
+#: ../../Code/Module/Connedit.php:922 ../../Code/Module/Profiles.php:799
+#: ../../Code/Lib/Apps.php:393
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Code/Module/Cdav.php:1189 ../../Code/Module/Connedit.php:925
 msgid "P.O. Box"
 msgstr "Postfach"
 
-#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Code/Module/Cdav.php:1190 ../../Code/Module/Connedit.php:926
 msgid "Additional"
 msgstr "Zusätzlich"
 
-#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Code/Module/Cdav.php:1191 ../../Code/Module/Connedit.php:927
 msgid "Street"
 msgstr "Straße"
 
-#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Code/Module/Cdav.php:1192 ../../Code/Module/Connedit.php:928
 msgid "Locality"
 msgstr "Ortschaft"
 
-#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Code/Module/Cdav.php:1193 ../../Code/Module/Connedit.php:929
 msgid "Region"
 msgstr "Region"
 
-#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Code/Module/Cdav.php:1194 ../../Code/Module/Connedit.php:930
 msgid "ZIP Code"
 msgstr "Postleitzahl"
 
-#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Code/Module/Cdav.php:1195 ../../Code/Module/Connedit.php:931
+#: ../../Code/Module/Profiles.php:757
 msgid "Country"
 msgstr "Land"
 
-#: ../../Zotlabs/Module/Cdav.php:1242
+#: ../../Code/Module/Cdav.php:1242
 msgid "Default Calendar"
 msgstr "Standardkalender"
 
-#: ../../Zotlabs/Module/Cdav.php:1252
+#: ../../Code/Module/Cdav.php:1252
 msgid "Default Addressbook"
 msgstr "Standardadressbuch"
 
-#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
+#: ../../Code/Module/Regdir.php:49 ../../Code/Module/Dirsearch.php:25
 msgid "This site is not a directory server"
 msgstr "Diese Webseite ist kein Verzeichnisserver"
 
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32
-#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508
+#: ../../Code/Module/Channel.php:32 ../../Code/Module/Ochannel.php:32
+#: ../../Code/Module/Chat.php:25 ../../addon/chess/chess.php:508
 msgid "You must be logged in to see this page."
 msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
 
-#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37
-#: ../../Zotlabs/Module/Profile.php:45
+#: ../../Code/Module/Channel.php:47 ../../Code/Module/Hcard.php:37
+#: ../../Code/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr "Beiträge und Kommentare"
 
-#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44
-#: ../../Zotlabs/Module/Profile.php:52
+#: ../../Code/Module/Channel.php:54 ../../Code/Module/Hcard.php:44
+#: ../../Code/Module/Profile.php:52
 msgid "Only posts"
 msgstr "Nur Beiträge"
 
-#: ../../Zotlabs/Module/Channel.php:107
+#: ../../Code/Module/Channel.php:107
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+#: ../../Code/Module/Uexport.php:57 ../../Code/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Kanal exportieren"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Code/Module/Uexport.php:59
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält."
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Code/Module/Uexport.php:60
 msgid "Export Content"
 msgstr "Kanal und Inhalte exportieren"
 
-#: ../../Zotlabs/Module/Uexport.php:61
+#: ../../Code/Module/Uexport.php:61
 msgid ""
 "Export your channel information and recent content to a JSON backup that can"
 " be restored or imported to another server hub. This backs up all of your "
@@ -895,11 +895,11 @@ msgid ""
 " this download to begin."
 msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Code/Module/Uexport.php:63
 msgid "Export your posts from a given year."
 msgstr "Exportiert die Beiträge des angegebenen Jahres."
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Code/Module/Uexport.php:65
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -907,21 +907,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne."
 
-#: ../../Zotlabs/Module/Uexport.php:66
+#: ../../Code/Module/Uexport.php:66
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke %2$s."
 
-#: ../../Zotlabs/Module/Uexport.php:67
+#: ../../Code/Module/Uexport.php:67
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke %2$s."
 
-#: ../../Zotlabs/Module/Uexport.php:68
+#: ../../Code/Module/Uexport.php:68
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting %2$s auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "Welcome to Hubzilla!"
 msgstr "Willkommen bei Hubzilla!"
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "You have got no unseen posts..."
 msgstr "Du hast keine ungelesenen Beiträge..."
 
-#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
-#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30
-#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Code/Module/Search.php:17 ../../Code/Module/Photos.php:540
+#: ../../Code/Module/Ratings.php:83 ../../Code/Module/Directory.php:63
+#: ../../Code/Module/Directory.php:68 ../../Code/Module/Display.php:30
+#: ../../Code/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Öffentlichen Zugriff verweigert."
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335
-#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../Code/Module/Search.php:44 ../../Code/Module/Connections.php:335
+#: ../../Code/Lib/Apps.php:256 ../../Code/Widget/Sitesearch.php:31
 #: ../../include/text.php:1051 ../../include/text.php:1063
 #: ../../include/acl_selectors.php:118 ../../include/nav.php:179
 msgid "Search"
 msgstr "Suche"
 
-#: ../../Zotlabs/Module/Search.php:230
+#: ../../Code/Module/Search.php:230
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Beiträge mit Schlagwort: %s"
 
-#: ../../Zotlabs/Module/Search.php:232
+#: ../../Code/Module/Search.php:232
 #, php-format
 msgid "Search results for: %s"
 msgstr "Suchergebnisse für: %s"
 
-#: ../../Zotlabs/Module/Pubstream.php:95
-#: ../../Zotlabs/Widget/Notifications.php:131
+#: ../../Code/Module/Pubstream.php:95
+#: ../../Code/Widget/Notifications.php:131
 msgid "Public Stream"
 msgstr "Öffentlicher Beitrags-Stream"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+#: ../../Code/Module/Locs.php:25 ../../Code/Module/Locs.php:54
 msgid "Location not found."
 msgstr "Klon nicht gefunden."
 
-#: ../../Zotlabs/Module/Locs.php:62
+#: ../../Code/Module/Locs.php:62
 msgid "Location lookup failed."
 msgstr "Nachschlagen des Kanal-Ortes fehlgeschlagen"
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Code/Module/Locs.php:66
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
 msgstr "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst."
 
-#: ../../Zotlabs/Module/Locs.php:95
+#: ../../Code/Module/Locs.php:95
 msgid "Syncing locations"
 msgstr "Synchronisiere Klone"
 
-#: ../../Zotlabs/Module/Locs.php:105
+#: ../../Code/Module/Locs.php:105
 msgid "No locations found."
 msgstr "Keine Klon-Adressen gefunden."
 
-#: ../../Zotlabs/Module/Locs.php:116
+#: ../../Code/Module/Locs.php:116
 msgid "Manage Channel Locations"
 msgstr "Klon-Adressen verwalten"
 
-#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111
+#: ../../Code/Module/Locs.php:119 ../../Code/Module/Admin.php:111
 msgid "Primary"
 msgstr "Primär"
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+#: ../../Code/Module/Locs.php:120 ../../Code/Module/Menu.php:113
 msgid "Drop"
 msgstr "Löschen"
 
-#: ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Locs.php:122
 msgid "Sync Now"
 msgstr "Jetzt synchronisieren"
 
-#: ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!"
 
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Code/Module/Locs.php:124
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
 msgstr "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst."
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt."
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Reihenfolge der in der Navigation angepinnten Apps ändern"
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of App Tray Apps"
 msgstr "Reihenfolge der Apps im App-Menü ändern"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the"
 " navbar"
 msgstr "Benutze die Pfeil-Knöpfe, um die jeweilige App in der Navigationsleiste nach links (oben) oder rechts (unten) zu bewegen"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr "Benutze die Pfeil-Knöpfe, um die jeweilige App im App-Menü nach oben oder unten zu bewegen"
 
-#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
+#: ../../Code/Module/Mitem.php:28 ../../Code/Module/Menu.php:144
 msgid "Menu not found."
 msgstr "Menü nicht gefunden"
 
-#: ../../Zotlabs/Module/Mitem.php:52
+#: ../../Code/Module/Mitem.php:52
 msgid "Unable to create element."
 msgstr "Element konnte nicht erstellt werden."
 
-#: ../../Zotlabs/Module/Mitem.php:76
+#: ../../Code/Module/Mitem.php:76
 msgid "Unable to update menu element."
 msgstr "Kann Menü-Element nicht aktualisieren."
 
-#: ../../Zotlabs/Module/Mitem.php:92
+#: ../../Code/Module/Mitem.php:92
 msgid "Unable to add menu element."
 msgstr "Kann Menü-Bestandteil nicht hinzufügen."
 
-#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166
-#: ../../Zotlabs/Module/Xchan.php:41
+#: ../../Code/Module/Mitem.php:120 ../../Code/Module/Menu.php:166
+#: ../../Code/Module/Xchan.php:41
 msgid "Not found."
 msgstr "Nicht gefunden."
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+#: ../../Code/Module/Mitem.php:153 ../../Code/Module/Mitem.php:230
 msgid "Menu Item Permissions"
 msgstr "Zugriffsrechte des Menü-Elements"
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Code/Module/Mitem.php:154 ../../Code/Module/Mitem.php:231
+#: ../../Code/Module/Settings/Channel.php:528
 msgid "(click to open/close)"
 msgstr "(zum öffnen/schließen anklicken)"
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+#: ../../Code/Module/Mitem.php:160 ../../Code/Module/Mitem.php:176
 msgid "Link Name"
 msgstr "Name des Links"
 
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+#: ../../Code/Module/Mitem.php:161 ../../Code/Module/Mitem.php:239
 msgid "Link or Submenu Target"
 msgstr "Ziel des Links oder Untermenüs"
 
-#: ../../Zotlabs/Module/Mitem.php:161
+#: ../../Code/Module/Mitem.php:161
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen."
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:240
 msgid "Use magic-auth if available"
 msgstr "Magic-Auth verwenden, falls verfügbar"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:259
-#: ../../Zotlabs/Module/Settings/Channel.php:307
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:163
+#: ../../Code/Module/Mitem.php:240 ../../Code/Module/Mitem.php:241
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:259
+#: ../../Code/Module/Settings/Channel.php:307
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Api.php:99 ../../Code/Module/Photos.php:697
+#: ../../Code/Module/Wiki.php:218 ../../Code/Module/Wiki.php:219
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Connedit.php:779
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
+#: ../../Code/Module/Defperms.php:180 ../../Code/Module/Profiles.php:681
+#: ../../Code/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397 ../../boot.php:1594
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1134,21 +1134,21 @@ msgstr "Magic-Auth verwenden, falls verfügbar"
 msgid "No"
 msgstr "Nein"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:261
-#: ../../Zotlabs/Module/Settings/Channel.php:307
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180
-#: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:163
+#: ../../Code/Module/Mitem.php:240 ../../Code/Module/Mitem.php:241
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:261
+#: ../../Code/Module/Settings/Channel.php:307
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Api.php:98 ../../Code/Module/Photos.php:697
+#: ../../Code/Module/Wiki.php:218 ../../Code/Module/Wiki.php:219
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:157 ../../Code/Module/Defperms.php:180
+#: ../../Code/Module/Profiles.php:681
+#: ../../Code/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397 ../../boot.php:1594
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1186,431 +1186,431 @@ msgstr "Nein"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Code/Module/Mitem.php:163 ../../Code/Module/Mitem.php:241
 msgid "Open link in new window"
 msgstr "Öffne Link in neuem Fenster"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+#: ../../Code/Module/Mitem.php:164 ../../Code/Module/Mitem.php:242
 msgid "Order in list"
 msgstr "Reihenfolge in der Liste"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+#: ../../Code/Module/Mitem.php:164 ../../Code/Module/Mitem.php:242
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
 
-#: ../../Zotlabs/Module/Mitem.php:165
+#: ../../Code/Module/Mitem.php:165
 msgid "Submit and finish"
 msgstr "Absenden und fertigstellen"
 
-#: ../../Zotlabs/Module/Mitem.php:166
+#: ../../Code/Module/Mitem.php:166
 msgid "Submit and continue"
 msgstr "Absenden und fortfahren"
 
-#: ../../Zotlabs/Module/Mitem.php:174
+#: ../../Code/Module/Mitem.php:174
 msgid "Menu:"
 msgstr "Menü:"
 
-#: ../../Zotlabs/Module/Mitem.php:177
+#: ../../Code/Module/Mitem.php:177
 msgid "Link Target"
 msgstr "Ziel des Links"
 
-#: ../../Zotlabs/Module/Mitem.php:180
+#: ../../Code/Module/Mitem.php:180
 msgid "Edit menu"
 msgstr "Menü bearbeiten"
 
-#: ../../Zotlabs/Module/Mitem.php:183
+#: ../../Code/Module/Mitem.php:183
 msgid "Edit element"
 msgstr "Bestandteil bearbeiten"
 
-#: ../../Zotlabs/Module/Mitem.php:184
+#: ../../Code/Module/Mitem.php:184
 msgid "Drop element"
 msgstr "Bestandteil löschen"
 
-#: ../../Zotlabs/Module/Mitem.php:185
+#: ../../Code/Module/Mitem.php:185
 msgid "New element"
 msgstr "Neues Bestandteil"
 
-#: ../../Zotlabs/Module/Mitem.php:186
+#: ../../Code/Module/Mitem.php:186
 msgid "Edit this menu container"
 msgstr "Diesen Menü-Container bearbeiten"
 
-#: ../../Zotlabs/Module/Mitem.php:187
+#: ../../Code/Module/Mitem.php:187
 msgid "Add menu element"
 msgstr "Menüelement hinzufügen"
 
-#: ../../Zotlabs/Module/Mitem.php:188
+#: ../../Code/Module/Mitem.php:188
 msgid "Delete this menu item"
 msgstr "Lösche dieses Menü-Bestandteil"
 
-#: ../../Zotlabs/Module/Mitem.php:189
+#: ../../Code/Module/Mitem.php:189
 msgid "Edit this menu item"
 msgstr "Bearbeite dieses Menü-Bestandteil"
 
-#: ../../Zotlabs/Module/Mitem.php:206
+#: ../../Code/Module/Mitem.php:206
 msgid "Menu item not found."
 msgstr "Menü-Bestandteil nicht gefunden."
 
-#: ../../Zotlabs/Module/Mitem.php:219
+#: ../../Code/Module/Mitem.php:219
 msgid "Menu item deleted."
 msgstr "Menü-Bestandteil gelöscht."
 
-#: ../../Zotlabs/Module/Mitem.php:221
+#: ../../Code/Module/Mitem.php:221
 msgid "Menu item could not be deleted."
 msgstr "Menü-Bestandteil kann nicht gelöscht werden."
 
-#: ../../Zotlabs/Module/Mitem.php:228
+#: ../../Code/Module/Mitem.php:228
 msgid "Edit Menu Element"
 msgstr "Bearbeite Menü-Bestandteil"
 
-#: ../../Zotlabs/Module/Mitem.php:238
+#: ../../Code/Module/Mitem.php:238
 msgid "Link text"
 msgstr "Link Text"
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Code/Module/Events.php:25
 msgid "Calendar entries imported."
 msgstr "Kalendereinträge wurden importiert."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Code/Module/Events.php:27
 msgid "No calendar entries found."
 msgstr "Keine Kalendereinträge gefunden."
 
-#: ../../Zotlabs/Module/Events.php:110
+#: ../../Code/Module/Events.php:110
 msgid "Event can not end before it has started."
 msgstr "Termin-Ende liegt vor dem Beginn."
 
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
+#: ../../Code/Module/Events.php:112 ../../Code/Module/Events.php:121
+#: ../../Code/Module/Events.php:143
 msgid "Unable to generate preview."
 msgstr "Vorschau konnte nicht erzeugt werden."
 
-#: ../../Zotlabs/Module/Events.php:119
+#: ../../Code/Module/Events.php:119
 msgid "Event title and start time are required."
 msgstr "Titel und Startzeit des Termins sind erforderlich."
 
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+#: ../../Code/Module/Events.php:141 ../../Code/Module/Events.php:265
 msgid "Event not found."
 msgstr "Termin nicht gefunden."
 
-#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
-#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119
+#: ../../Code/Module/Events.php:260 ../../Code/Module/Tagger.php:73
+#: ../../Code/Module/Like.php:386 ../../include/conversation.php:119
 #: ../../include/text.php:2008 ../../include/event.php:1153
 msgid "event"
 msgstr "Termin"
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Termintitel bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142
-#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:465
+#: ../../Code/Module/Appman.php:141 ../../Code/Module/Appman.php:142
+#: ../../Code/Module/Profiles.php:745 ../../Code/Module/Profiles.php:749
 #: ../../include/datetime.php:211
 msgid "Required"
 msgstr "Benötigt"
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Code/Module/Events.php:462
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (Kommagetrennte Liste)"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Edit Category"
 msgstr "Kategorie bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Events.php:466
 msgid "Edit start date and time"
 msgstr "Startdatum und -zeit bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+#: ../../Code/Module/Events.php:467 ../../Code/Module/Events.php:470
 msgid "Finish date and time are not known or not relevant"
 msgstr "Enddatum und -zeit sind unbekannt oder irrelevant"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Edit finish date and time"
 msgstr "Enddatum und -zeit bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Finish date and time"
 msgstr "Enddatum und -zeit"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+#: ../../Code/Module/Events.php:471 ../../Code/Module/Events.php:472
 msgid "Adjust for viewer timezone"
 msgstr "An die Zeitzone des Betrachters anpassen"
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Code/Module/Events.php:471
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../Code/Module/Events.php:473
 msgid "Edit Description"
 msgstr "Beschreibung bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Code/Module/Events.php:475
 msgid "Edit Location"
 msgstr "Ort bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762
+#: ../../Code/Module/Events.php:478 ../../Code/Module/Photos.php:1123
+#: ../../Code/Module/Webpages.php:247 ../../Code/Lib/ThreadItem.php:762
 #: ../../include/conversation.php:1333
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405
+#: ../../Code/Module/Events.php:479 ../../include/conversation.php:1405
 msgid "Permission settings"
 msgstr "Berechtigungs-Einstellungen"
 
-#: ../../Zotlabs/Module/Events.php:489
+#: ../../Code/Module/Events.php:489
 msgid "Timezone:"
 msgstr "Zeitzone:"
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Code/Module/Events.php:494
 msgid "Advanced Options"
 msgstr "Weitere Optionen"
 
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266
+#: ../../Code/Module/Events.php:605 ../../Code/Module/Cal.php:266
 msgid "l, F j"
 msgstr "l, j. F"
 
-#: ../../Zotlabs/Module/Events.php:633
+#: ../../Code/Module/Events.php:633
 msgid "Edit event"
 msgstr "Termin bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:635
+#: ../../Code/Module/Events.php:635
 msgid "Delete event"
 msgstr "Termin löschen"
 
-#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315
+#: ../../Code/Module/Events.php:660 ../../Code/Module/Cal.php:315
 #: ../../include/text.php:1827
 msgid "Link to Source"
 msgstr "Link zur Quelle"
 
-#: ../../Zotlabs/Module/Events.php:669
+#: ../../Code/Module/Events.php:669
 msgid "calendar"
 msgstr "Kalender"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Edit Event"
 msgstr "Termin bearbeiten"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Create Event"
 msgstr "Termin anlegen"
 
-#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341
+#: ../../Code/Module/Events.php:691 ../../Code/Module/Cal.php:341
 #: ../../include/channel.php:1647
 msgid "Export"
 msgstr "Exportieren"
 
-#: ../../Zotlabs/Module/Events.php:731
+#: ../../Code/Module/Events.php:731
 msgid "Event removed"
 msgstr "Termin gelöscht"
 
-#: ../../Zotlabs/Module/Events.php:734
+#: ../../Code/Module/Events.php:734
 msgid "Failed to remove event"
 msgstr "Termin konnte nicht gelöscht werden"
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+#: ../../Code/Module/Appman.php:39 ../../Code/Module/Appman.php:56
 msgid "App installed."
 msgstr "App installiert."
 
-#: ../../Zotlabs/Module/Appman.php:49
+#: ../../Code/Module/Appman.php:49
 msgid "Malformed app."
 msgstr "Fehlerhafte App."
 
-#: ../../Zotlabs/Module/Appman.php:130
+#: ../../Code/Module/Appman.php:130
 msgid "Embed code"
 msgstr "Code einbetten"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Edit App"
 msgstr "App bearbeiten"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Create App"
 msgstr "App erstellen"
 
-#: ../../Zotlabs/Module/Appman.php:141
+#: ../../Code/Module/Appman.php:141
 msgid "Name of app"
 msgstr "Name der App"
 
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Code/Module/Appman.php:142
 msgid "Location (URL) of app"
 msgstr "Ort (URL) der App"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "Photo icon URL"
 msgstr "URL zum Icon"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 Pixel – optional"
 
-#: ../../Zotlabs/Module/Appman.php:145
+#: ../../Code/Module/Appman.php:145
 msgid "Categories (optional, comma separated list)"
 msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Code/Module/Appman.php:146
 msgid "Version ID"
 msgstr "Versions-ID"
 
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Code/Module/Appman.php:147
 msgid "Price of app"
 msgstr "Preis der App"
 
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Code/Module/Appman.php:148
 msgid "Location (URL) to purchase app"
 msgstr "Ort (URL), um die App zu kaufen"
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Bitte melde dich an."
 
-#: ../../Zotlabs/Module/Magic.php:72
+#: ../../Code/Module/Magic.php:72
 msgid "Hub not found."
 msgstr "Server nicht gefunden."
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Tagger.php:69
+#: ../../Code/Module/Like.php:384
 #: ../../addon/redphotos/redphotohelper.php:71
 #: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405
 #: ../../include/conversation.php:116 ../../include/text.php:2005
 msgid "photo"
 msgstr "Foto"
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Like.php:384
 #: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405
 #: ../../include/conversation.php:144 ../../include/text.php:2011
 msgid "status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Subthread.php:142
+#: ../../Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s folgt nun %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Subthread.php:144
+#: ../../Code/Module/Subthread.php:144
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s folgt %2$ss %3$s nicht mehr"
 
-#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75
-#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41
-#: ../../Zotlabs/Module/Card_edit.php:44
+#: ../../Code/Module/Article_edit.php:44 ../../Code/Module/Cal.php:62
+#: ../../Code/Module/Chanview.php:96 ../../Code/Module/Page.php:75
+#: ../../Code/Module/Wall_upload.php:31 ../../Code/Module/Block.php:41
+#: ../../Code/Module/Card_edit.php:44
 msgid "Channel not found."
 msgstr "Kanal nicht gefunden."
 
-#: ../../Zotlabs/Module/Article_edit.php:101
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
-#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Code/Module/Article_edit.php:101
+#: ../../Code/Module/Editblock.php:116 ../../Code/Module/Chat.php:207
+#: ../../Code/Module/Editwebpage.php:143 ../../Code/Module/Mail.php:288
+#: ../../Code/Module/Mail.php:430 ../../Code/Module/Card_edit.php:101
 #: ../../include/conversation.php:1278
 msgid "Insert web link"
 msgstr "Link einfügen"
 
-#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698
-#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117
+#: ../../Code/Module/Article_edit.php:117
+#: ../../Code/Module/Editblock.php:129 ../../Code/Module/Photos.php:698
+#: ../../Code/Module/Photos.php:1068 ../../Code/Module/Card_edit.php:117
 #: ../../include/conversation.php:1401
 msgid "Title (optional)"
 msgstr "Titel (optional)"
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Code/Module/Article_edit.php:128
 msgid "Edit Article"
 msgstr "Artikel bearbeiten"
 
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64
+#: ../../Code/Module/Import_items.php:48 ../../Code/Module/Import.php:64
 msgid "Nothing to import."
 msgstr "Nichts zu importieren."
 
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79
-#: ../../Zotlabs/Module/Import.php:95
+#: ../../Code/Module/Import_items.php:72 ../../Code/Module/Import.php:79
+#: ../../Code/Module/Import.php:95
 msgid "Unable to download data from old server"
 msgstr "Daten können vom alten Server nicht heruntergeladen werden"
 
-#: ../../Zotlabs/Module/Import_items.php:77
-#: ../../Zotlabs/Module/Import.php:102
+#: ../../Code/Module/Import_items.php:77
+#: ../../Code/Module/Import.php:102
 msgid "Imported file is empty."
 msgstr "Die importierte Datei ist leer."
 
-#: ../../Zotlabs/Module/Import_items.php:93
+#: ../../Code/Module/Import_items.php:93
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
 
-#: ../../Zotlabs/Module/Import_items.php:108
+#: ../../Code/Module/Import_items.php:108
 msgid "Import completed"
 msgstr "Import abgeschlossen"
 
-#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Code/Module/Import_items.php:125
 msgid "Import Items"
 msgstr "Beiträge importieren"
 
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Code/Module/Import_items.php:126
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
 
-#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:517
+#: ../../Code/Module/Import_items.php:127
+#: ../../Code/Module/Import.php:517
 msgid "File to Upload"
 msgstr "Hochzuladende Datei:"
 
-#: ../../Zotlabs/Module/New_channel.php:133
-#: ../../Zotlabs/Module/Manage.php:138
+#: ../../Code/Module/New_channel.php:133
+#: ../../Code/Module/Manage.php:138
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
 
-#: ../../Zotlabs/Module/New_channel.php:146
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/New_channel.php:146
+#: ../../Code/Module/Register.php:254
 msgid "Name or caption"
 msgstr "Name oder Titel"
 
-#: ../../Zotlabs/Module/New_channel.php:146
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/New_channel.php:146
+#: ../../Code/Module/Register.php:254
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
 msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
 
-#: ../../Zotlabs/Module/New_channel.php:148
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Code/Module/New_channel.php:148
+#: ../../Code/Module/Register.php:256
 msgid "Choose a short nickname"
 msgstr "Wähle einen kurzen Spitznamen"
 
-#: ../../Zotlabs/Module/New_channel.php:148
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Code/Module/New_channel.php:148
+#: ../../Code/Module/Register.php:256
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
 "e.g. nickname%s"
 msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Settings/Channel.php:539
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Settings/Channel.php:539
+#: ../../Code/Module/Register.php:257
 msgid "Channel role and privacy"
 msgstr "Kanaltyp und Privatspäre-Einstellungen"
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Register.php:257
 msgid "Select a channel role with your privacy requirements."
 msgstr "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Register.php:257
 msgid "Read more about roles"
 msgstr "Mehr Informationen über Rollen"
 
-#: ../../Zotlabs/Module/New_channel.php:152
+#: ../../Code/Module/New_channel.php:152
 msgid "Create Channel"
 msgstr "Einen neuen Kanal anlegen"
 
-#: ../../Zotlabs/Module/New_channel.php:153
+#: ../../Code/Module/New_channel.php:153
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed,"
@@ -1618,485 +1618,485 @@ msgid ""
 " share information with each other."
 msgstr "Ein Kanal ist eine eindeutige Identität. Er kann eine Person (Soziales Netzwerk-Profil), ein Forum (Gruppe), eine Unternehmens- oder Prominenten-Seite, einen Newsfeed oder viele andere Dinge repräsentieren. Kanäle können Verbindungen mit anderen Kanälen eingehen, um Informationen miteinander auszutauschen."
 
-#: ../../Zotlabs/Module/New_channel.php:153
+#: ../../Code/Module/New_channel.php:153
 msgid ""
 "The type of channel you create affects the basic privacy settings, the "
 "permissions that are granted to connections/friends, and also the channel's "
 "visibility across the network."
 msgstr "Die Art des Kanals, den Du erzeugst, beeinflusst die grundlegenden Privatsphäre-Einstellungen, die Rechte, die Verbindungen/Freunden gewährt werden, und auch die Sichtbarkeit des Kanals im gesamten Netzwerk."
 
-#: ../../Zotlabs/Module/New_channel.php:154
+#: ../../Code/Module/New_channel.php:154
 msgid ""
 "or import an existing channel from another location."
 msgstr "oder importiere einen bestehenden Kanal von einem anderen Server."
 
-#: ../../Zotlabs/Module/New_channel.php:159
+#: ../../Code/Module/New_channel.php:159
 msgid "Validate"
 msgstr "Überprüfe"
 
-#: ../../Zotlabs/Module/Removeme.php:35
+#: ../../Code/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."
 
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Code/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
+#: ../../Code/Module/Changeaddr.php:78
 msgid "WARNING: "
 msgstr "WARNUNG: "
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
 msgid "This action is permanent and can not be undone!"
 msgstr "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!"
 
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Changeaddr.php:79
+#: ../../Code/Module/Removeme.php:62
+#: ../../Code/Module/Removeaccount.php:59
+#: ../../Code/Module/Changeaddr.php:79
 msgid "Please enter your password for verification:"
 msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Code/Module/Removeme.php:64
+#: ../../Code/Module/Settings/Channel.php:600
 msgid "Remove Channel"
 msgstr "Kanal löschen"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Code/Module/Sharedwithme.php:104
 msgid "Files: shared with me"
 msgstr "Dateien, die mit mir geteilt wurden"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Code/Module/Sharedwithme.php:106
 msgid "NEW"
 msgstr "NEU"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434
+#: ../../Code/Module/Sharedwithme.php:107
+#: ../../Code/Storage/Browser.php:285 ../../include/text.php:1434
 msgid "Size"
 msgstr "Größe"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:286
+#: ../../Code/Module/Sharedwithme.php:108
+#: ../../Code/Storage/Browser.php:286
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Code/Module/Sharedwithme.php:109
 msgid "Remove all files"
 msgstr "Alle Dateien löschen"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
+#: ../../Code/Module/Sharedwithme.php:110
 msgid "Remove this file"
 msgstr "Diese Datei löschen"
 
-#: ../../Zotlabs/Module/Setup.php:170
+#: ../../Code/Module/Setup.php:170
 msgid "$Projectname Server - Setup"
 msgstr "$Projectname Server-Einrichtung"
 
-#: ../../Zotlabs/Module/Setup.php:174
+#: ../../Code/Module/Setup.php:174
 msgid "Could not connect to database."
 msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../Zotlabs/Module/Setup.php:178
+#: ../../Code/Module/Setup.php:178
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
 
-#: ../../Zotlabs/Module/Setup.php:185
+#: ../../Code/Module/Setup.php:185
 msgid "Could not create table."
 msgstr "Konnte Tabelle nicht erstellen."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Code/Module/Setup.php:191
 msgid "Your site database has been installed."
 msgstr "Die Datenbank Deines Hubs wurde installiert."
 
-#: ../../Zotlabs/Module/Setup.php:197
+#: ../../Code/Module/Setup.php:197
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
 
-#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:749
+#: ../../Code/Module/Setup.php:198 ../../Code/Module/Setup.php:262
+#: ../../Code/Module/Setup.php:749
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:259
+#: ../../Code/Module/Setup.php:259
 msgid "System check"
 msgstr "Systemprüfung"
 
-#: ../../Zotlabs/Module/Setup.php:264
+#: ../../Code/Module/Setup.php:264
 msgid "Check again"
 msgstr "Nochmal prüfen"
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Code/Module/Setup.php:286
 msgid "Database connection"
 msgstr "Datenbankverbindung"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Code/Module/Setup.php:287
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Um $Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Code/Module/Setup.php:288
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Code/Module/Setup.php:289
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Database Server Name"
 msgstr "Datenbankservername"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Default is 127.0.0.1"
 msgstr "Standard ist 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Database Port"
 msgstr "Datenbankport"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Communication port number - use 0 for default"
 msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Code/Module/Setup.php:295
 msgid "Database Login Name"
 msgstr "Datenbank-Benutzername"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Code/Module/Setup.php:296
 msgid "Database Login Password"
 msgstr "Datenbank-Passwort"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Database Name"
 msgstr "Datenbankname"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Database Type"
 msgstr "Datenbanktyp"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid "Site administrator email address"
 msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Die E-Mail-Adresse Deines Kontos muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Website URL"
 msgstr "Webseiten-URL"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Please use SSL (https) URL if available."
 msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
+#: ../../Code/Module/Setup.php:302 ../../Code/Module/Setup.php:345
 msgid "Please select a default timezone for your website"
 msgstr "Standard-Zeitzone für Deinen Server"
 
-#: ../../Zotlabs/Module/Setup.php:330
+#: ../../Code/Module/Setup.php:330
 msgid "Site settings"
 msgstr "Seiteneinstellungen"
 
-#: ../../Zotlabs/Module/Setup.php:384
+#: ../../Code/Module/Setup.php:384
 msgid "PHP version 5.5 or greater is required."
 msgstr "PHP-Version 5.5 oder höher ist erforderlich."
 
-#: ../../Zotlabs/Module/Setup.php:385
+#: ../../Code/Module/Setup.php:385
 msgid "PHP version"
 msgstr "PHP-Version"
 
-#: ../../Zotlabs/Module/Setup.php:401
+#: ../../Code/Module/Setup.php:401
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
 
-#: ../../Zotlabs/Module/Setup.php:402
+#: ../../Code/Module/Setup.php:402
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid "PHP executable path"
 msgstr "PHP-Pfad zu ausführbarer Datei"
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
 
-#: ../../Zotlabs/Module/Setup.php:411
+#: ../../Code/Module/Setup.php:411
 msgid "Command line PHP"
 msgstr "PHP-Befehlszeile"
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Code/Module/Setup.php:421
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "Prüfung auf Kommandozeilen-PHP fehlgeschlagen, da shell_exec() deaktiviert ist. Dies wird aber benötigt."
 
-#: ../../Zotlabs/Module/Setup.php:424
+#: ../../Code/Module/Setup.php:424
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
 
-#: ../../Zotlabs/Module/Setup.php:425
+#: ../../Code/Module/Setup.php:425
 msgid "This is required for message delivery to work."
 msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Code/Module/Setup.php:428
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Code/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden."
 
-#: ../../Zotlabs/Module/Setup.php:451
+#: ../../Code/Module/Setup.php:451
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Du kannst diese Einstellungen in der php.ini - Datei des Servers anpassen."
 
-#: ../../Zotlabs/Module/Setup.php:453
+#: ../../Code/Module/Setup.php:453
 msgid "PHP upload limits"
 msgstr "PHP-Hochladebeschränkungen"
 
-#: ../../Zotlabs/Module/Setup.php:476
+#: ../../Code/Module/Setup.php:476
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../Zotlabs/Module/Setup.php:477
+#: ../../Code/Module/Setup.php:477
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
 
-#: ../../Zotlabs/Module/Setup.php:480
+#: ../../Code/Module/Setup.php:480
 msgid "Generate encryption keys"
 msgstr "Verschlüsselungsschlüssel erzeugen"
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Code/Module/Setup.php:497
 msgid "libCurl PHP module"
 msgstr "libCurl-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Code/Module/Setup.php:498
 msgid "GD graphics PHP module"
 msgstr "GD-Grafik-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Code/Module/Setup.php:499
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Code/Module/Setup.php:500
 msgid "PDO database PHP module"
 msgstr "PDO-Datenbank-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Code/Module/Setup.php:501
 msgid "mb_string PHP module"
 msgstr "mb_string-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Code/Module/Setup.php:502
 msgid "xml PHP module"
 msgstr "xml-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Code/Module/Setup.php:503
 msgid "zip PHP module"
 msgstr "zip PHP Modul"
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+#: ../../Code/Module/Setup.php:507 ../../Code/Module/Setup.php:509
 msgid "Apache mod_rewrite module"
 msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Code/Module/Setup.php:507
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+#: ../../Code/Module/Setup.php:513 ../../Code/Module/Setup.php:516
 msgid "exec"
 msgstr "exec"
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Code/Module/Setup.php:513
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Fehler: exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+#: ../../Code/Module/Setup.php:519 ../../Code/Module/Setup.php:522
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Code/Module/Setup.php:519
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Fehler: shell_exec ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Code/Module/Setup.php:527
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Code/Module/Setup.php:531
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:535
+#: ../../Code/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Code/Module/Setup.php:539
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Fehler: PDO-Datenbank-PHP-Modul ist erforderlich, aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:543
+#: ../../Code/Module/Setup.php:543
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:547
+#: ../../Code/Module/Setup.php:547
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Code/Module/Setup.php:551
 msgid "Error: zip PHP module required but not installed."
 msgstr "Fehler: Das zip PHP Modul ist erforderlich, ist aber nicht installiert."
 
-#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579
+#: ../../Code/Module/Setup.php:570 ../../Code/Module/Setup.php:579
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Code/Module/Setup.php:575
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
 
-#: ../../Zotlabs/Module/Setup.php:576
+#: ../../Code/Module/Setup.php:576
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Code/Module/Setup.php:577
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Code/Module/Setup.php:593
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Diese Software verwendet die Smarty3 Template Engine, um Vorlagen für die Webdarstellung zu verarbeiten. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
 
-#: ../../Zotlabs/Module/Setup.php:594
+#: ../../Code/Module/Setup.php:594
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses."
 
-#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616
+#: ../../Code/Module/Setup.php:595 ../../Code/Module/Setup.php:616
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
 
-#: ../../Zotlabs/Module/Setup.php:596
+#: ../../Code/Module/Setup.php:596
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält."
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Code/Module/Setup.php:599
 #, php-format
 msgid "%s is writable"
 msgstr "%s ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:615
+#: ../../Code/Module/Setup.php:615
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
 " web folder"
 msgstr "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Web-Stammverzeichnisses."
 
-#: ../../Zotlabs/Module/Setup.php:619
+#: ../../Code/Module/Setup.php:619
 msgid "store is writable"
 msgstr "store ist schreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Code/Module/Setup.php:651
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Code/Module/Setup.php:652
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich."
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Code/Module/Setup.php:653
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können."
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Code/Module/Setup.php:654
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer $Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Code/Module/Setup.php:655
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen."
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Code/Module/Setup.php:656
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind."
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Code/Module/Setup.php:658
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -2104,1341 +2104,1341 @@ msgid ""
 "server communications."
 msgstr "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern."
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Code/Module/Setup.php:660
 msgid "SSL certificate validation"
 msgstr "SSL Zertifikatverifizierung"
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Code/Module/Setup.php:666
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:"
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Code/Module/Setup.php:669
 msgid "Url rewrite is working"
 msgstr "Url rewrite funktioniert"
 
-#: ../../Zotlabs/Module/Setup.php:683
+#: ../../Code/Module/Setup.php:683
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../Zotlabs/Module/Setup.php:707
+#: ../../Code/Module/Setup.php:707
 #: ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Code/Module/Setup.php:747
 msgid "
              What next?
              "
 msgstr "
              Wie geht es jetzt weiter?
              "
 
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Code/Module/Setup.php:748
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Code/Module/Connect.php:61 ../../Code/Module/Connect.php:109
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Code/Module/Connect.php:90
 msgid "Premium Channel Setup"
 msgstr "Premium-Kanal-Einrichtung"
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Code/Module/Connect.php:92
 msgid "Enable premium channel connection restrictions"
 msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Code/Module/Connect.php:93
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Code/Module/Connect.php:95 ../../Code/Module/Connect.php:115
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Code/Module/Connect.php:96
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Code/Module/Connect.php:97 ../../Code/Module/Connect.php:118
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided"
 " on this page."
 msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Code/Module/Connect.php:114
 msgid "Restricted or Premium Channel"
 msgstr "Eingeschränkter oder Premium-Kanal"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
+#: ../../Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr "Warteschlangenstatistiken"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
+#: ../../Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr "Einträge insgesamt"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
+#: ../../Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
+#: ../../Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr "Ziel-URL"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
+#: ../../Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr "Hub als permanent offline markieren"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
+#: ../../Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr "Warteschlange für diesen Hub leeren"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
+#: ../../Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr "Letzter Kontakt"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "Off"
 msgstr "Aus"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "On"
 msgstr "An"
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Admin/Features.php:56
 #, php-format
 msgid "Lock feature %s"
 msgstr "Blockiere die Funktion %s"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
+#: ../../Code/Module/Admin/Features.php:64
 msgid "Manage Additional Features"
 msgstr "Zusätzliche Funktionen verwalten"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Code/Module/Admin/Dbsync.php:19
 msgid "Update has been marked successful"
 msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:31
+#: ../../Code/Module/Admin/Dbsync.php:31
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:34
+#: ../../Code/Module/Admin/Dbsync.php:34
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s wurde erfolgreich ausgeführt."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:38
+#: ../../Code/Module/Admin/Dbsync.php:38
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:41
+#: ../../Code/Module/Admin/Dbsync.php:41
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update-Funktion %s konnte nicht gefunden werden."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Code/Module/Admin/Dbsync.php:59
 msgid "Failed Updates"
 msgstr "Fehlgeschlagene Aktualisierungen"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+#: ../../Code/Module/Admin/Dbsync.php:61
 msgid "Mark success (if update was manually applied)"
 msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+#: ../../Code/Module/Admin/Dbsync.php:62
 msgid "Attempt to execute this update step automatically"
 msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:67
+#: ../../Code/Module/Admin/Dbsync.php:67
 msgid "No failed updates."
 msgstr "Keine fehlgeschlagenen Aktualisierungen."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:259
-#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:453
-#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
+#: ../../Code/Module/Admin/Plugins.php:259
+#: ../../Code/Module/Admin/Themes.php:72 ../../Code/Module/Thing.php:94
+#: ../../Code/Module/Viewsrc.php:25 ../../Code/Module/Display.php:46
+#: ../../Code/Module/Display.php:453
+#: ../../Code/Module/Filestorage.php:24 ../../Code/Module/Admin.php:62
 #: ../../include/items.php:3619
 msgid "Item not found."
 msgstr "Element nicht gefunden."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#: ../../Code/Module/Admin/Plugins.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-In %s deaktiviert."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:294
+#: ../../Code/Module/Admin/Plugins.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-In %s aktiviert."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Code/Module/Admin/Plugins.php:310
+#: ../../Code/Module/Admin/Themes.php:95
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Code/Module/Admin/Plugins.php:313
+#: ../../Code/Module/Admin/Themes.php:97
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:341
-#: ../../Zotlabs/Module/Admin/Plugins.php:436
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:294
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin.php:136
+#: ../../Code/Module/Admin/Plugins.php:341
+#: ../../Code/Module/Admin/Plugins.php:436
+#: ../../Code/Module/Admin/Accounts.php:166
+#: ../../Code/Module/Admin/Logs.php:82
+#: ../../Code/Module/Admin/Channels.php:145
+#: ../../Code/Module/Admin/Themes.php:122
+#: ../../Code/Module/Admin/Themes.php:156
+#: ../../Code/Module/Admin/Site.php:294
+#: ../../Code/Module/Admin/Security.php:86
+#: ../../Code/Module/Admin.php:136
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:342
-#: ../../Zotlabs/Module/Admin/Plugins.php:437
-#: ../../Zotlabs/Widget/Admin.php:27
+#: ../../Code/Module/Admin/Plugins.php:342
+#: ../../Code/Module/Admin/Plugins.php:437
+#: ../../Code/Widget/Admin.php:27
 msgid "Plugins"
 msgstr "Plug-Ins"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Code/Module/Admin/Plugins.php:343
+#: ../../Code/Module/Admin/Themes.php:124
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242
-#: ../../Zotlabs/Widget/Newmember.php:46
-#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105
+#: ../../Code/Module/Admin/Plugins.php:344
+#: ../../Code/Module/Admin/Themes.php:125 ../../Code/Lib/Apps.php:242
+#: ../../Code/Widget/Newmember.php:46
+#: ../../Code/Widget/Settings_menu.php:141 ../../include/nav.php:105
 #: ../../include/nav.php:192
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Code/Module/Admin/Plugins.php:351
+#: ../../Code/Module/Admin/Themes.php:134
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Code/Module/Admin/Plugins.php:352
+#: ../../Code/Module/Admin/Themes.php:135
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
+#: ../../Code/Module/Admin/Plugins.php:353
 msgid "Minimum project version: "
 msgstr "Minimale Version des Projekts:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:354
+#: ../../Code/Module/Admin/Plugins.php:354
 msgid "Maximum project version: "
 msgstr "Maximale Version des Projekts:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:355
+#: ../../Code/Module/Admin/Plugins.php:355
 msgid "Minimum PHP version: "
 msgstr "Minimale PHP Version:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:356
+#: ../../Code/Module/Admin/Plugins.php:356
 msgid "Compatible Server Roles: "
 msgstr "Kompatible Serverrollen: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:357
+#: ../../Code/Module/Admin/Plugins.php:357
 msgid "Requires: "
 msgstr "Benötigt:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:358
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
+#: ../../Code/Module/Admin/Plugins.php:358
+#: ../../Code/Module/Admin/Plugins.php:442
 msgid "Disabled - version incompatibility"
 msgstr "Abgeschaltet - Versionsinkompatibilität"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:411
+#: ../../Code/Module/Admin/Plugins.php:411
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr "Gib die öffentliche Git-Repository-URL des Plugin-Repository an."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
+#: ../../Code/Module/Admin/Plugins.php:412
 msgid "Plugin repo git URL"
 msgstr "Plugin-Repository Git URL"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
+#: ../../Code/Module/Admin/Plugins.php:413
 msgid "Custom repo name"
 msgstr "Benutzerdefinierter Repository-Name"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
+#: ../../Code/Module/Admin/Plugins.php:413
 msgid "(optional)"
 msgstr "(optional)"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
+#: ../../Code/Module/Admin/Plugins.php:414
 msgid "Download Plugin Repo"
 msgstr "Plugin-Repository herunterladen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:421
+#: ../../Code/Module/Admin/Plugins.php:421
 msgid "Install new repo"
 msgstr "Neues Repository installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393
+#: ../../Code/Module/Admin/Plugins.php:422 ../../Code/Lib/Apps.php:393
 msgid "Install"
 msgstr "Installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
+#: ../../Code/Module/Admin/Plugins.php:445
 msgid "Manage Repos"
 msgstr "Repositorien verwalten"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:446
+#: ../../Code/Module/Admin/Plugins.php:446
 msgid "Installed Plugin Repositories"
 msgstr "Installierte Plugin-Repositorien"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:447
+#: ../../Code/Module/Admin/Plugins.php:447
 msgid "Install a New Plugin Repository"
 msgstr "Ein neues Plugin-Repository installieren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:454
+#: ../../Code/Module/Admin/Plugins.php:454
 msgid "Switch branch"
 msgstr "Zweig/Branch wechseln"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Code/Module/Admin/Plugins.php:455
+#: ../../Code/Module/Photos.php:1020 ../../Code/Module/Tagrm.php:137
 #: ../../addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:37
+#: ../../Code/Module/Admin/Accounts.php:37
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s Konto blockiert/freigegeben"
 msgstr[1] "%s Konten blockiert/freigegeben"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:44
+#: ../../Code/Module/Admin/Accounts.php:44
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s Konto gelöscht"
 msgstr[1] "%s Konten gelöscht"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:80
+#: ../../Code/Module/Admin/Accounts.php:80
 msgid "Account not found"
 msgstr "Konto nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473
+#: ../../Code/Module/Admin/Accounts.php:91 ../../include/channel.php:2473
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Konto '%s' gelöscht"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:99
+#: ../../Code/Module/Admin/Accounts.php:99
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Konto '%s' blockiert"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:107
+#: ../../Code/Module/Admin/Accounts.php:107
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Konto '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
-#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
+#: ../../Code/Module/Admin/Accounts.php:167
+#: ../../Code/Module/Admin/Accounts.php:180
+#: ../../Code/Module/Admin.php:96 ../../Code/Widget/Admin.php:23
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Channels.php:148
+#: ../../Code/Module/Admin/Accounts.php:169
+#: ../../Code/Module/Admin/Channels.php:148
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Code/Module/Admin/Accounts.php:170
 msgid "Registrations waiting for confirm"
 msgstr "Registrierungen warten auf Bestätigung"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:171
 msgid "Request date"
 msgstr "Antragsdatum"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Code/Module/Admin/Accounts.php:172
 msgid "No registrations."
 msgstr "Keine Registrierungen."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
-#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732
+#: ../../Code/Module/Admin/Accounts.php:173
+#: ../../Code/Module/Connections.php:303 ../../include/conversation.php:732
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Authorize.php:26
+#: ../../Code/Module/Admin/Accounts.php:174
+#: ../../Code/Module/Authorize.php:26
 msgid "Deny"
 msgstr "Verweigern"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:176
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:176
+#: ../../Code/Module/Connedit.php:622
 msgid "Block"
 msgstr "Blockieren"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:177
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:177
+#: ../../Code/Module/Connedit.php:622
 msgid "Unblock"
 msgstr "Freigeben"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182
+#: ../../Code/Module/Admin/Accounts.php:182
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284
+#: ../../Code/Module/Admin/Accounts.php:184 ../../include/group.php:284
 msgid "All Channels"
 msgstr "Alle Kanäle"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Code/Module/Admin/Accounts.php:185
 msgid "Register date"
 msgstr "Registrierungs-Datum"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Code/Module/Admin/Accounts.php:186
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:187
+#: ../../Code/Module/Admin/Accounts.php:187
 msgid "Expires"
 msgstr "Verfällt"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Code/Module/Admin/Accounts.php:188
 msgid "Service Class"
 msgstr "Service-Klasse"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:190
+#: ../../Code/Module/Admin/Accounts.php:190
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:191
+#: ../../Code/Module/Admin/Accounts.php:191
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Das Konto {0} wird gelöscht!\\n\\nAlles, was dieses Konto auf diesem Hub veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
+#: ../../Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
-#: ../../Zotlabs/Widget/Admin.php:58
+#: ../../Code/Module/Admin/Logs.php:83 ../../Code/Widget/Admin.php:48
+#: ../../Code/Widget/Admin.php:58
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
+#: ../../Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
+#: ../../Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Hubzilla-Stammverzeichnis."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
+#: ../../Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Protokollstufe"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
+#: ../../Code/Module/Admin/Channels.php:31
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s Kanal gesperrt/freigegeben"
 msgstr[1] "%s Kanäle gesperrt/freigegeben"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
+#: ../../Code/Module/Admin/Channels.php:40
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "Code für %s Kanal gesperrt/freigegeben"
 msgstr[1] "Code für %s Kanäle gesperrt/freigegeben"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
+#: ../../Code/Module/Admin/Channels.php:46
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s Kanal gelöscht"
 msgstr[1] "%s Kanäle gelöscht"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
+#: ../../Code/Module/Admin/Channels.php:65
 msgid "Channel not found"
 msgstr "Kanal nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
+#: ../../Code/Module/Admin/Channels.php:75
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanal '%s' gelöscht"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanal '%s' gesperrt"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanal '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Code für Kanal '%s' freigegeben"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Code für Kanal '%s' gesperrt"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24
+#: ../../Code/Module/Admin/Channels.php:146
+#: ../../Code/Module/Admin.php:110 ../../Code/Widget/Admin.php:24
 msgid "Channels"
 msgstr "Kanäle"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Code/Module/Admin/Channels.php:150
 msgid "Censor"
 msgstr "Sperren"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Code/Module/Admin/Channels.php:151
 msgid "Uncensor"
 msgstr "Freigeben"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
+#: ../../Code/Module/Admin/Channels.php:152
 msgid "Allow Code"
 msgstr "Code erlauben"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
+#: ../../Code/Module/Admin/Channels.php:153
 msgid "Disallow Code"
 msgstr "Code sperren"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../Code/Module/Admin/Channels.php:154
 #: ../../include/conversation.php:1811 ../../include/nav.php:378
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
+#: ../../Code/Module/Admin/Channels.php:158
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
+#: ../../Code/Module/Admin/Channels.php:162
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
+#: ../../Code/Module/Admin/Channels.php:163
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
+#: ../../Code/Module/Admin/Themes.php:26
 msgid "Theme settings updated."
 msgstr "Design-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
+#: ../../Code/Module/Admin/Themes.php:61
 msgid "No themes found."
 msgstr "Keine Designs gefunden."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
+#: ../../Code/Module/Admin/Themes.php:116
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+#: ../../Code/Module/Admin/Themes.php:123
+#: ../../Code/Module/Admin/Themes.php:157 ../../Code/Widget/Admin.php:28
 msgid "Themes"
 msgstr "Designs"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
+#: ../../Code/Module/Admin/Themes.php:162
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
+#: ../../Code/Module/Admin/Themes.php:163
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:165
+#: ../../Code/Module/Admin/Site.php:165
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:191
+#: ../../Code/Module/Admin/Site.php:191
 #: ../../view/theme/redbasic_c/php/config.php:15
 #: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106
 msgid "Default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Module/Admin/Site.php:202
-#: ../../Zotlabs/Module/Settings/Display.php:130
+#: ../../Code/Module/Admin/Site.php:202
+#: ../../Code/Module/Settings/Display.php:130
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Inkompatibel)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:209
+#: ../../Code/Module/Admin/Site.php:209
 msgid "mobile"
 msgstr "mobil"
 
-#: ../../Zotlabs/Module/Admin/Site.php:211
+#: ../../Code/Module/Admin/Site.php:211
 msgid "experimental"
 msgstr "experimentell"
 
-#: ../../Zotlabs/Module/Admin/Site.php:213
+#: ../../Code/Module/Admin/Site.php:213
 msgid "unsupported"
 msgstr "nicht unterstützt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:260
+#: ../../Code/Module/Admin/Site.php:260
 msgid "Yes - with approval"
 msgstr "Ja - mit Zustimmung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:266
+#: ../../Code/Module/Admin/Site.php:266
 msgid "My site is not a public server"
 msgstr "Mein Server ist kein öffentlicher Server"
 
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Code/Module/Admin/Site.php:267
 msgid "My site has paid access only"
 msgstr "Meine Seite hat nur bezahlten Zugriff"
 
-#: ../../Zotlabs/Module/Admin/Site.php:268
+#: ../../Code/Module/Admin/Site.php:268
 msgid "My site has free access only"
 msgstr "Meine Seite hat nur freien Zugriff"
 
-#: ../../Zotlabs/Module/Admin/Site.php:269
+#: ../../Code/Module/Admin/Site.php:269
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
 
-#: ../../Zotlabs/Module/Admin/Site.php:281
+#: ../../Code/Module/Admin/Site.php:281
 msgid "Beginner/Basic"
 msgstr "Anfänger/Basis"
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Code/Module/Admin/Site.php:282
 msgid "Novice - not skilled but willing to learn"
 msgstr "Anfänger - unerfahren, aber bereit zu lernen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:283
+#: ../../Code/Module/Admin/Site.php:283
 msgid "Intermediate - somewhat comfortable"
 msgstr "Fortgeschritten - relativ komfortabel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:284
+#: ../../Code/Module/Admin/Site.php:284
 msgid "Advanced - very comfortable"
 msgstr "Fortgeschritten - sehr komfortabel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
+#: ../../Code/Module/Admin/Site.php:285
 msgid "Expert - I can write computer code"
 msgstr "Experte - Ich kann Computercode schreiben"
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Code/Module/Admin/Site.php:286
 msgid "Wizard - I probably know more than you do"
 msgstr "Zauberer - ich kann wahrscheinlich mehr als Du"
 
-#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Code/Module/Admin/Site.php:295 ../../Code/Widget/Admin.php:22
 msgid "Site"
 msgstr "Seite"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-#: ../../Zotlabs/Module/Register.php:269
+#: ../../Code/Module/Admin/Site.php:297
+#: ../../Code/Module/Register.php:269
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Code/Module/Admin/Site.php:298
 msgid "File upload"
 msgstr "Dateiupload"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid "Policies"
 msgstr "Richtlinien"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Code/Module/Admin/Site.php:300
 #: ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Code/Module/Admin/Site.php:304
 #: ../../addon/statusnet/statusnet.php:891
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Site default technical skill level"
 msgstr "Standard-Qualifikationsstufe der Website"
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr "Dies wird verwendet, um eine Benutzererfahrung  passend zur technischen Qualifikationsstufe zu bieten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid "Lock the technical skill level setting"
 msgstr "Sperre die technische Qualifikationsstufe"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid "Members can set their own technical comfort level by default"
 msgstr "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr "Ungefiltertes HTML/CSS/JS ist erlaubt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid "Administrator Information"
 msgstr "Administrator-Informationen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Code/Module/Admin/Site.php:312
+#: ../../Code/Module/Siteinfo.php:21
 msgid "Site Information"
 msgstr "Seiteninformationen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Code/Module/Admin/Site.php:312
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Öffentlich sichtbare Beschreibung dieses Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann hier verwendet werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Code/Module/Admin/Site.php:313
 msgid "System language"
 msgstr "System-Sprache"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid "System theme"
 msgstr "System-Design"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Standard-System-Design – kann durch Nutzerprofile überschieben werden – Design-Einstellungen ändern"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "Allow Feeds as Connections"
 msgstr "Feeds als Verbindungen erlauben"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "(Heavy system resource usage)"
 msgstr "(führt zu hoher Systemlast)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:318
 msgid "Maximum image size"
 msgstr "Maximale Bildgröße"
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:318
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Does this site allow new member registration?"
 msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid "Invitation only"
 msgstr "Nur mit Einladung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Minimum age"
 msgstr "Mindestalter"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Minimum age (in years) for who may register on this site."
 msgstr "Mindestalter (in Jahren) für alle, die sich auf dieser Website anmelden möchten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Code/Module/Admin/Site.php:322
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid "Preserve site homepage URL"
 msgstr "Homepage-URL schützen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid "Accounts abandoned after x days"
 msgstr "Konten gelten nach X Tagen als unbenutzt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Code/Module/Admin/Site.php:328
 msgid "Verify Email Addresses"
 msgstr "E-Mail-Adressen überprüfen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Code/Module/Admin/Site.php:328
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid "Force publish"
 msgstr "Veröffentlichung erzwingen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "Import Public Streams"
 msgstr "Öffentliche Beiträge importieren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid "Site only Public Streams"
 msgstr "Öffentlichen Beitragsstrom auf diesen Server beschränken"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr "Erlaubt den Zugriff auf öffentliche Beiträge von ausschließlich dieser Website (diesem Server), wenn \"Öffentliche Beiträge importieren\" ausgeschaltet ist."
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr "Allen im Internet Zugriff auf den öffentlichen Beitragsstrom erlauben"
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr "Deaktiviert die erforderliche Authentifizierung vor dem Ansehen. Warnung: Diese Inhalte sind nicht moderiert."
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid "Login on Homepage"
 msgstr "Log-in auf der Startseite"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Enable context help"
 msgstr "Kontext-Hilfe aktivieren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Zeigt Kontext-sensitive Hilfe für die aktuelle Seite an, wenn der Hilfe-Knopf geklickt wird."
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Reply-to email address for system generated email."
 msgstr "Antwortadresse (reply-to) für Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Code/Module/Admin/Site.php:337
 msgid "Sender (From) email address for system generated email."
 msgstr "Absenderadresse (from) für Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid "Name of email sender for system generated email."
 msgstr "Name des Versenders von Emails, die vom System generiert wurden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Directory Server URL"
 msgstr "Verzeichnisserver-URL"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Default directory server"
 msgstr "Standard-Verzeichnisserver"
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Code/Module/Admin/Site.php:342
 msgid "Proxy user"
 msgstr "Proxy Benutzer"
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Code/Module/Admin/Site.php:343
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Network timeout"
 msgstr "Netzwerk-Timeout"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid "Delivery interval"
 msgstr "Auslieferung Intervall"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid "Deliveries per process"
 msgstr "Zustellungen pro Prozess"
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5."
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid "Queue Threshold"
 msgstr "Warteschlangen-Grenzwert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr "Unmittelbare Zustellung immer verzögern, wenn die Warteschlange mehr als diese Anzahl von Einträgen enthält."
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid "Poll interval"
 msgstr "Abfrageintervall"
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Code/Module/Admin/Site.php:349
 msgid "Path to ImageMagick convert program"
 msgstr "Pfad zum ImageMagick-Programm convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Code/Module/Admin/Site.php:349
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr "Wenn gesetzt, dann verwende dieses Programm zum Erzeugen von Vorschaubildern großer Fotos (>4000 Pixel in beiden Richtungen), anderenfalls kann Speicherüberlauf auftreten. Beispiel: /usr/bin/convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Code/Module/Admin/Site.php:350
 msgid "Allow SVG thumbnails in file browser"
 msgstr "Erlaube SVG-Vorschaubilder im Dateibrowser"
 
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Code/Module/Admin/Site.php:350
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "Warnung: SVG-Grafiken können Schadcode enthalten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid "Maximum Load Average"
 msgstr "Maximales Load Average"
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "0 for no expiration of imported content"
 msgstr "0 = keine Löschung importierter Inhalte"
 
-#: ../../Zotlabs/Module/Admin/Site.php:353
+#: ../../Code/Module/Admin/Site.php:353
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr "Lass keine Beiträge verfallen die Kommentare haben, die jünger als diese Anzahl von Tagen sind."
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr "Öffentliche Server: Optionale Einstiegsseite (landing page) für neue Mitglieder vor deren Anmeldung"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Erstelle zunächst die entsprechende Seite. Standard ist %s/register"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Page to display after creating a new channel"
 msgstr "Seite, die nach Erstellung eines neuen Kanals angezeigt werden soll"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Recommend: profiles, go, or settings"
 msgstr "Empfohlen: profiles, go oder settings"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Optional: site location"
 msgstr "Optional: Standort der Website"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Region or country"
 msgstr "Region oder Land"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
+#: ../../Code/Module/Admin/Profs.php:89
 msgid "New Profile Field"
 msgstr "Neues Profilfeld"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "Field nickname"
 msgstr "Kurzname für das Feld"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "System name of field"
 msgstr "Systemname des Feldes"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
+#: ../../Code/Module/Admin/Profs.php:91
+#: ../../Code/Module/Admin/Profs.php:111
 msgid "Input type"
 msgstr "Art des Inhalts"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Field Name"
 msgstr "Feldname"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Label on profile pages"
 msgstr "Bezeichnung auf Profilseiten"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Help text"
 msgstr "Hilfetext"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Additional info (optional)"
 msgstr "Zusätzliche Informationen (optional)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052
+#: ../../Code/Module/Admin/Profs.php:94
+#: ../../Code/Module/Admin/Profs.php:114 ../../Code/Module/Rbmark.php:32
+#: ../../Code/Module/Rbmark.php:104 ../../Code/Module/Filer.php:53
+#: ../../Code/Widget/Notes.php:18 ../../include/text.php:1052
 #: ../../include/text.php:1064
 msgid "Save"
 msgstr "Speichern"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
+#: ../../Code/Module/Admin/Profs.php:103
 msgid "Field definition not found"
 msgstr "Feld-Definition nicht gefunden"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
+#: ../../Code/Module/Admin/Profs.php:109
 msgid "Edit Profile Field"
 msgstr "Profilfeld bearbeiten"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30
+#: ../../Code/Module/Admin/Profs.php:168 ../../Code/Widget/Admin.php:30
 msgid "Profile Fields"
 msgstr "Profil Felder"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
+#: ../../Code/Module/Admin/Profs.php:169
 msgid "Basic Profile Fields"
 msgstr "Notwendige Profil Felder"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "Advanced Profile Fields"
 msgstr "Erweiterte Profil Felder"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "(In addition to basic fields)"
 msgstr "(zusätzlich zu notwendige Felder)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
+#: ../../Code/Module/Admin/Profs.php:172
 msgid "All available fields"
 msgstr "Alle verfügbaren Felder"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
+#: ../../Code/Module/Admin/Profs.php:173
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
+#: ../../Code/Module/Admin/Profs.php:177
 msgid "Create Custom Field"
 msgstr "Erstelle benutzerdefiniertes Feld"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#: ../../Code/Module/Admin/Account_edit.php:29
 #, php-format
 msgid "Password changed for account %d."
 msgstr "Passwort für Konto %d geändert."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+#: ../../Code/Module/Admin/Account_edit.php:46
 msgid "Account settings updated."
 msgstr "Kontoeinstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+#: ../../Code/Module/Admin/Account_edit.php:61
 msgid "Account not found."
 msgstr "Konto nicht gefunden."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+#: ../../Code/Module/Admin/Account_edit.php:68
 msgid "Account Edit"
 msgstr "Kontobearbeitung"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+#: ../../Code/Module/Admin/Account_edit.php:69
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+#: ../../Code/Module/Admin/Account_edit.php:70
 msgid "New Password again"
 msgstr "Neues Passwort wiederholen"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+#: ../../Code/Module/Admin/Account_edit.php:71
 msgid "Technical skill level"
 msgstr "Technische Qualifikationsstufe"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+#: ../../Code/Module/Admin/Account_edit.php:72
 msgid "Account language (for emails)"
 msgstr "Kontosprache (für E-Mails)"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Code/Module/Admin/Account_edit.php:73
 msgid "Service class"
 msgstr "Dienstklasse"
 
-#: ../../Zotlabs/Module/Admin/Security.php:77
+#: ../../Code/Module/Admin/Security.php:77
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
 msgstr "Standardmäßig wird ungefiltertes HTML in eingebetteten Inhalten zugelassen. Das ist prinzipiell unsicher."
 
-#: ../../Zotlabs/Module/Admin/Security.php:80
+#: ../../Code/Module/Admin/Security.php:80
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr "Die empfohlene Einstellung ist, ungefiltertes HTML nur von den nachfolgenden Webseiten zu erlauben:"
 
-#: ../../Zotlabs/Module/Admin/Security.php:81
+#: ../../Code/Module/Admin/Security.php:81
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/
              https://vimeo.com/
              https://soundcloud.com/
              "
 
-#: ../../Zotlabs/Module/Admin/Security.php:82
+#: ../../Code/Module/Admin/Security.php:82
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr "Alle anderen eingebetteten Inhalte werden gefiltert, es sei denn, eingebettete Inhalte von einer bestimmten Seite sind explizit blockiert."
 
-#: ../../Zotlabs/Module/Admin/Security.php:87
-#: ../../Zotlabs/Widget/Admin.php:25
+#: ../../Code/Module/Admin/Security.php:87
+#: ../../Code/Widget/Admin.php:25
 msgid "Security"
 msgstr "Sicherheit"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
+#: ../../Code/Module/Admin/Security.php:89
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
+#: ../../Code/Module/Admin/Security.php:89
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Blockiere den öffentlichen Zugriff auf alle ansonsten öffentlichen persönlichen Seiten dieser Website, sofern ein Besucher nicht angemeldet ist."
 
-#: ../../Zotlabs/Module/Admin/Security.php:90
+#: ../../Code/Module/Admin/Security.php:90
 msgid "Set \"Transport Security\" HTTP header"
 msgstr "Setze den \"Transport Security\" HTTP Header"
 
-#: ../../Zotlabs/Module/Admin/Security.php:91
+#: ../../Code/Module/Admin/Security.php:91
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr "Setze den \"Content Security Policy\" HTTP Header"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin/Security.php:92
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin/Security.php:92
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Code/Module/Admin/Security.php:93
 msgid "Not allowed email domains"
 msgstr "Nicht erlaubte Domains für E-Mails"
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Code/Module/Admin/Security.php:93
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde."
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
+#: ../../Code/Module/Admin/Security.php:94
 msgid "Allow communications only from these sites"
 msgstr "Kommunikation nur von diesen Servern/Domains erlauben"
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
+#: ../../Code/Module/Admin/Security.php:94
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Ein Eintrag pro Zeile. Lasse das Feld leer, um Kommunikation grundlegend von überall her zu erlauben."
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
+#: ../../Code/Module/Admin/Security.php:95
 msgid "Block communications from these sites"
 msgstr "Kommunikation von diesen Servern/Domains blockieren"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid "Allow communications only from these channels"
 msgstr "Kommunikation nur von diesen Kanälen erlauben"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "Ein Kanal (hash) pro Zeile. Leerlassen um jeden Kanal zuzulassen. "
 
-#: ../../Zotlabs/Module/Admin/Security.php:97
+#: ../../Code/Module/Admin/Security.php:97
 msgid "Block communications from these channels"
 msgstr "Kommunikation von folgenden Kanälen blockieren"
 
-#: ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Code/Module/Admin/Security.php:98
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr "Erlaube Einbettungen nur von sicheren (SSL) Webseiten und Links."
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Erlaube Einbettung von Inhalten mit ungefiltertem HTML nur von diesen Domains"
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "One site per line. By default embedded content is filtered."
 msgstr "Eine Website/Domain pro Zeile. Standardmäßig wird eingebetteter Inhalt gefiltert."
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
+#: ../../Code/Module/Admin/Security.php:100
 msgid "Block embedded HTML from these domains"
 msgstr "Eingebettete HTML Inhalte von diesen Servern/Domains blockieren"
 
-#: ../../Zotlabs/Module/Lockview.php:75
+#: ../../Code/Module/Lockview.php:75
 msgid "Remote privacy information not available."
 msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
 
-#: ../../Zotlabs/Module/Lockview.php:96
+#: ../../Code/Module/Lockview.php:96
 msgid "Visible to:"
 msgstr "Sichtbar für:"
 
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88
+#: ../../Code/Module/Lockview.php:117 ../../Code/Module/Lockview.php:153
+#: ../../Code/Module/Acl.php:121 ../../include/acl_selectors.php:88
 msgctxt "acl"
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../Zotlabs/Module/Moderate.php:65
+#: ../../Code/Module/Moderate.php:65
 msgid "Comment approved"
 msgstr "Kommentar bestätigt"
 
-#: ../../Zotlabs/Module/Moderate.php:69
+#: ../../Code/Module/Moderate.php:69
 msgid "Comment deleted"
 msgstr "Kommentar gelöscht"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:23
+#: ../../Code/Module/Settings/Permcats.php:23
 msgid "Permission Name is required."
 msgstr "Der Name der Berechtigung wird benötigt."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:42
+#: ../../Code/Module/Settings/Permcats.php:42
 msgid "Permission category saved."
 msgstr "Berechtigungsrolle gespeichert."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:66
+#: ../../Code/Module/Settings/Permcats.php:66
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
 msgstr "Verwende dieses Formular, um Berechtigungsrollen für verschiedene Gruppen von Personen oder Verbindungen zu erstellen."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:99
+#: ../../Code/Module/Settings/Permcats.php:99
 msgid "Permission Categories"
 msgstr "Berechtigungsrollen"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
+#: ../../Code/Module/Settings/Permcats.php:107
 msgid "Permission Name"
 msgstr "Name der Berechtigungsrolle"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250
+#: ../../Code/Module/Settings/Permcats.php:108
+#: ../../Code/Module/Settings/Tokens.php:161
+#: ../../Code/Module/Connedit.php:891 ../../Code/Module/Defperms.php:250
 msgid "My Settings"
 msgstr "Meine Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248
+#: ../../Code/Module/Settings/Permcats.php:110
+#: ../../Code/Module/Settings/Tokens.php:163
+#: ../../Code/Module/Connedit.php:886 ../../Code/Module/Defperms.php:248
 msgid "inherited"
 msgstr "geerbt"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:113
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253
+#: ../../Code/Module/Settings/Permcats.php:113
+#: ../../Code/Module/Settings/Tokens.php:166
+#: ../../Code/Module/Connedit.php:893 ../../Code/Module/Defperms.php:253
 msgid "Individual Permissions"
 msgstr "Individuelle Zugriffsrechte"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:114
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:894
+#: ../../Code/Module/Settings/Permcats.php:114
+#: ../../Code/Module/Settings/Tokens.php:167
+#: ../../Code/Module/Connedit.php:894
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -3446,19 +3446,19 @@ msgid ""
 " settings here."
 msgstr "Einige Berechtigungen werden möglicherweise von den globalen Sicherheits- und Privatsphäre-Einstellungen dieses Kanals vererbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung und können hier nicht verändert werden."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:68
-#: ../../Zotlabs/Module/Settings/Channel.php:69
-#: ../../Zotlabs/Module/Settings/Channel.php:72
-#: ../../Zotlabs/Module/Settings/Channel.php:83
-#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24
+#: ../../Code/Module/Settings/Channel.php:64
+#: ../../Code/Module/Settings/Channel.php:68
+#: ../../Code/Module/Settings/Channel.php:69
+#: ../../Code/Module/Settings/Channel.php:72
+#: ../../Code/Module/Settings/Channel.php:83
+#: ../../Code/Module/Connedit.php:711 ../../Code/Widget/Affinity.php:24
 #: ../../include/selectors.php:123 ../../include/channel.php:437
 #: ../../include/channel.php:438 ../../include/channel.php:445
 msgid "Friends"
 msgstr "Freunde"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:264
-#: ../../Zotlabs/Module/Defperms.php:103
+#: ../../Code/Module/Settings/Channel.php:264
+#: ../../Code/Module/Defperms.php:103
 #: ../../addon/rendezvous/rendezvous.php:82
 #: ../../addon/openstreetmap/openstreetmap.php:184
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
@@ -3467,958 +3467,958 @@ msgstr "Freunde"
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:325
+#: ../../Code/Module/Settings/Channel.php:325
 msgid "Nobody except yourself"
 msgstr "Niemand außer Dir selbst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:326
+#: ../../Code/Module/Settings/Channel.php:326
 msgid "Only those you specifically allow"
 msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:327
+#: ../../Code/Module/Settings/Channel.php:327
 msgid "Approved connections"
 msgstr "Angenommene Verbindungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:328
+#: ../../Code/Module/Settings/Channel.php:328
 msgid "Any connections"
 msgstr "Beliebige Verbindungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:329
+#: ../../Code/Module/Settings/Channel.php:329
 msgid "Anybody on this website"
 msgstr "Jeder auf dieser Website"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:330
+#: ../../Code/Module/Settings/Channel.php:330
 msgid "Anybody in this network"
 msgstr "Alle $Projectname-Mitglieder"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:331
+#: ../../Code/Module/Settings/Channel.php:331
 msgid "Anybody authenticated"
 msgstr "Jeder authentifizierte"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:332
+#: ../../Code/Module/Settings/Channel.php:332
 msgid "Anybody on the internet"
 msgstr "Jeder im Internet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:407
+#: ../../Code/Module/Settings/Channel.php:407
 msgid "Publish your default profile in the network directory"
 msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:412
+#: ../../Code/Module/Settings/Channel.php:412
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:416
+#: ../../Code/Module/Settings/Channel.php:416
 msgid "or"
 msgstr "oder"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:425
+#: ../../Code/Module/Settings/Channel.php:425
 msgid "Your channel address is"
 msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:428
+#: ../../Code/Module/Settings/Channel.php:428
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "Deine Dateien/Fotos sind via WebDAV verfügbar auf"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Code/Module/Settings/Channel.php:493
 msgid "Channel Settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Code/Module/Settings/Channel.php:500
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Code/Module/Settings/Channel.php:501
 #: ../../include/channel.php:1521
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:502
-#: ../../Zotlabs/Module/Settings/Account.php:119
+#: ../../Code/Module/Settings/Channel.php:502
+#: ../../Code/Module/Settings/Account.php:119
 msgid "Email Address:"
 msgstr "Email Adresse:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Code/Module/Settings/Channel.php:503
 msgid "Your Timezone:"
 msgstr "Ihre Zeitzone:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Code/Module/Settings/Channel.php:504
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Code/Module/Settings/Channel.php:504
 msgid "Geographical location to display on your posts"
 msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
+#: ../../Code/Module/Settings/Channel.php:505
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Code/Module/Settings/Channel.php:507
 msgid "Adult Content"
 msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Code/Module/Settings/Channel.php:507
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Code/Module/Settings/Channel.php:509
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Code/Module/Settings/Channel.php:511
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Code/Module/Settings/Channel.php:513
 msgid "Hide my online presence"
 msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Code/Module/Settings/Channel.php:513
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:515
+#: ../../Code/Module/Settings/Channel.php:515
 msgid "Simple Privacy Settings:"
 msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:516
+#: ../../Code/Module/Settings/Channel.php:516
 msgid ""
 "Very Public - extremely permissive (should be used with caution)"
 msgstr "Komplett offen – extrem ungeschützt (mit großer Vorsicht verwenden!)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:517
+#: ../../Code/Module/Settings/Channel.php:517
 msgid ""
 "Typical - default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)"
 msgstr "Typisch – Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Code/Module/Settings/Channel.php:518
 msgid "Private - default private, never open or public"
 msgstr "Privat – Standard privat, nie offen oder öffentlich"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Code/Module/Settings/Channel.php:519
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Blockiert – Alle standardmäßig blockiert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid "Allow others to tag your posts"
 msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
+#: ../../Code/Module/Settings/Channel.php:523
 msgid "Channel Permission Limits"
 msgstr "Kanal-Berechtigungslimits"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "Expire other channel content after this many days"
 msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "0 or blank to use the website limit."
 msgstr "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Diese Webseite läuft nach %d Tagen ab."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "This website does not expire imported content."
 msgstr "Diese Webseite lässt importierte Inhalte nicht verfallen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "May reduce spam activity"
 msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:527
+#: ../../Code/Module/Settings/Channel.php:527
 msgid "Default Privacy Group"
 msgstr "Standard-Gruppe"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Code/Module/Settings/Channel.php:529
 msgid "Use my default audience setting for the type of object published"
 msgstr "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Code/Module/Settings/Channel.php:530
 msgid "Profile to assign new connections"
 msgstr "Profil, welches neuen Verbindungen zugewiesen wird"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Code/Module/Settings/Channel.php:540
 msgid "Default Permissions Group"
 msgstr "Standard-Berechtigungsgruppe"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Useful to reduce spamming"
 msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Module/Settings/Channel.php:549
+#: ../../Code/Lib/Enotify.php:68
 msgid "Notification Settings"
 msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Code/Module/Settings/Channel.php:550
 msgid "By default post a status message when:"
 msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Code/Module/Settings/Channel.php:551
 msgid "accepting a friend request"
 msgstr "Du eine Verbindungsanfrage annimmst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Code/Module/Settings/Channel.php:552
 msgid "joining a forum/community"
 msgstr "Du einem Forum beitrittst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Code/Module/Settings/Channel.php:553
 msgid "making an interesting profile change"
 msgstr "Du eine interessante Änderung an Deinem Profil vornimmst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Code/Module/Settings/Channel.php:554
 msgid "Send a notification email when:"
 msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Code/Module/Settings/Channel.php:555
 msgid "You receive a connection request"
 msgstr "Du eine Verbindungsanfrage erhältst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Code/Module/Settings/Channel.php:556
 msgid "Your connections are confirmed"
 msgstr "Eine Verbindung bestätigt wurde"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Code/Module/Settings/Channel.php:557
 msgid "Someone writes on your profile wall"
 msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Code/Module/Settings/Channel.php:558
 msgid "Someone writes a followup comment"
 msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Code/Module/Settings/Channel.php:559
 msgid "You receive a private message"
 msgstr "Du eine private Nachricht erhältst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:560
+#: ../../Code/Module/Settings/Channel.php:560
 msgid "You receive a friend suggestion"
 msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Code/Module/Settings/Channel.php:561
 msgid "You are tagged in a post"
 msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:562
+#: ../../Code/Module/Settings/Channel.php:562
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:564
+#: ../../Code/Module/Settings/Channel.php:564
 msgid "Someone likes your post/comment"
 msgstr "Jemand mag Ihren Beitrag/Kommentar"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Code/Module/Settings/Channel.php:567
 msgid "Show visual notifications including:"
 msgstr "Visuelle Benachrichtigungen anzeigen für:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Code/Module/Settings/Channel.php:569
 msgid "Unseen grid activity"
 msgstr "Ungesehene Netzwerk-Aktivität"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Code/Module/Settings/Channel.php:570
 msgid "Unseen channel activity"
 msgstr "Ungesehene Kanal-Aktivität"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:571
 msgid "Unseen private messages"
 msgstr "Ungelesene persönliche Nachrichten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-#: ../../Zotlabs/Module/Settings/Channel.php:577
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:578
 #: ../../addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr "Empfohlen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Code/Module/Settings/Channel.php:572
 msgid "Upcoming events"
 msgstr "Baldige Termine"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Code/Module/Settings/Channel.php:573
 msgid "Events today"
 msgstr "Heutige Termine"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "Upcoming birthdays"
 msgstr "Baldige Geburtstage"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "Not available in all themes"
 msgstr "Nicht in allen Designs verfügbar"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Code/Module/Settings/Channel.php:575
 msgid "System (personal) notifications"
 msgstr "System – (persönliche) Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:576
 msgid "System info messages"
 msgstr "System – Info-Nachrichten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:577
 msgid "System critical alerts"
 msgstr "System – kritische Warnungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:578
 msgid "New connections"
 msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Code/Module/Settings/Channel.php:579
 msgid "System Registrations"
 msgstr "System – Registrierungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Code/Module/Settings/Channel.php:580
 msgid "Unseen shared files"
 msgstr "Ungesehene geteilte Dateien"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Code/Module/Settings/Channel.php:581
 msgid "Unseen public activity"
 msgstr "Ungesehene öffentliche Aktivität"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Code/Module/Settings/Channel.php:582
 msgid "Unseen likes and dislikes"
 msgstr "Ungesehene Likes und Dislikes"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 msgid "Email notification hub (hostname)"
 msgstr "Hub für E-Mail-Benachrichtigungen (Hostname)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple hubs, set this to your preferred "
 "location. This will prevent duplicate email notifications. Example: %s"
 msgstr "Wenn Dein Kanal auf mehreren Hubs geklont ist, setze die Einstellung auf deinen bevorzugten Hub. Dies verhindert Mehrfachzustellung von E-Mail-Benachrichtigungen. Beispiel: %s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:584
+#: ../../Code/Module/Settings/Channel.php:584
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr "Zeige neue Pinnwand Beiträge, private Nachrichten und Verbindungen unter den Notizen an."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Code/Module/Settings/Channel.php:586
 msgid "Notify me of events this many days in advance"
 msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Code/Module/Settings/Channel.php:586
 msgid "Must be greater than 0"
 msgstr "Muss größer als 0 sein"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:592
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Konten- und Seitenart-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Code/Module/Settings/Channel.php:593
 msgid "Change the behaviour of this account for special situations"
 msgstr "Ändere das Verhalten dieses Kontos unter speziellen Umständen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Miscellaneous Settings"
 msgstr "Sonstige Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:596
 msgid "Default photo upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Fotos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - aktuelles Jahr, %m -  aktueller Monat"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "Default file upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Dateien"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Code/Module/Settings/Channel.php:599
 msgid "Personal menu to display in your channel pages"
 msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Code/Module/Settings/Channel.php:601
 msgid "Remove this channel."
 msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:602
+#: ../../Code/Module/Settings/Channel.php:602
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-Provider für Firefox Share"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:603
+#: ../../Code/Module/Settings/Channel.php:603
 msgid "Start calendar week on Monday"
 msgstr "Beginne die kalendarische Woche am Montag"
 
-#: ../../Zotlabs/Module/Settings/Features.php:73
+#: ../../Code/Module/Settings/Features.php:73
 msgid "Additional Features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid "Your technical skill level"
 msgstr "Deine technische Qualifikationsstufe"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid ""
 "Used to provide a member experience and additional features consistent with "
 "your comfort level"
 msgstr "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen)."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#: ../../Code/Module/Settings/Tokens.php:31
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Dieser Kanal ist auf %d Token begrenzt"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
+#: ../../Code/Module/Settings/Tokens.php:37
 msgid "Name and Password are required."
 msgstr "Name und Passwort sind erforderlich."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
+#: ../../Code/Module/Settings/Tokens.php:77
 msgid "Token saved."
 msgstr "Token gespeichert."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
+#: ../../Code/Module/Settings/Tokens.php:113
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
 "visitors may login using these credentials to access private content."
 msgstr "Mit diesem Formular kannst Du temporäre Zugangs-IDs anlegen, um Inhalte mit Nicht-Mitgliedern zu teilen. Die IDs können in Berechtigungslisten (ACLs) verwendet werden, und Besucher können sich damit einloggen, um auf private Inhalte zuzugreifen."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
+#: ../../Code/Module/Settings/Tokens.php:115
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
 "Examples:"
 msgstr "Du kannst auch Dropbox-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:100
+#: ../../Code/Module/Settings/Tokens.php:150
+#: ../../Code/Widget/Settings_menu.php:100
 msgid "Guest Access Tokens"
 msgstr "Gastzugangstoken"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
+#: ../../Code/Module/Settings/Tokens.php:157
 msgid "Login Name"
 msgstr "Anmeldename"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
+#: ../../Code/Module/Settings/Tokens.php:158
 msgid "Login Password"
 msgstr "Anmeldepasswort"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
+#: ../../Code/Module/Settings/Tokens.php:159
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Läuft ab (jjjj-mm-tt)"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Code/Module/Settings/Tokens.php:160
+#: ../../Code/Module/Connedit.php:890
 msgid "Their Settings"
 msgstr "Deren Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:35
+#: ../../Code/Module/Settings/Oauth2.php:35
 msgid "Name and Secret are required"
 msgstr "Name und Geheimnis werden benötigt"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:83
+#: ../../Code/Module/Settings/Oauth2.php:83
 msgid "Add OAuth2 application"
 msgstr "OAuth2 Anwendung hinzufügen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:90
 msgid "Name of application"
 msgstr "Name der Anwendung"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth.php:118
 #: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:92
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth.php:119
 msgid "Redirect"
 msgstr "Umleitung"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:93
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:117
 msgid "Grant Types"
 msgstr "Genehmigungsarten"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "leave blank unless your application sepcifically requires this"
 msgstr "Frei lassen, es sei denn die Anwendung verlangt dies."
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "Authorization scope"
 msgstr "Rahmen der Berechtigungen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:102
+#: ../../Code/Module/Settings/Oauth2.php:102
 msgid "OAuth2 Application not found."
 msgstr "OAuth2 Anwendung konnte nicht gefunden werden"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:111
-#: ../../Zotlabs/Module/Settings/Oauth2.php:148
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
+#: ../../Code/Module/Settings/Oauth2.php:111
+#: ../../Code/Module/Settings/Oauth2.php:148
+#: ../../Code/Module/Settings/Oauth.php:87
+#: ../../Code/Module/Settings/Oauth.php:113
+#: ../../Code/Module/Settings/Oauth.php:149
 msgid "Add application"
 msgstr "Anwendung hinzufügen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:147
+#: ../../Code/Module/Settings/Oauth2.php:147
 msgid "Connected OAuth2 Apps"
 msgstr "Verbundene OAuth2 Anwendungen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:151
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
+#: ../../Code/Module/Settings/Oauth2.php:151
+#: ../../Code/Module/Settings/Oauth.php:152
 msgid "Client key starts with"
 msgstr "Client Key beginnt mit"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:152
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
+#: ../../Code/Module/Settings/Oauth2.php:152
+#: ../../Code/Module/Settings/Oauth.php:153
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:153
-#: ../../Zotlabs/Module/Settings/Oauth.php:154
+#: ../../Code/Module/Settings/Oauth2.php:153
+#: ../../Code/Module/Settings/Oauth.php:154
 msgid "Remove authorization"
 msgstr "Authorisierung aufheben"
 
-#: ../../Zotlabs/Module/Settings/Account.php:20
+#: ../../Code/Module/Settings/Account.php:20
 msgid "Not valid email."
 msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../Zotlabs/Module/Settings/Account.php:23
+#: ../../Code/Module/Settings/Account.php:23
 msgid "Protected email address. Cannot change to that email."
 msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 
-#: ../../Zotlabs/Module/Settings/Account.php:32
+#: ../../Code/Module/Settings/Account.php:32
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../Zotlabs/Module/Settings/Account.php:40
+#: ../../Code/Module/Settings/Account.php:40
 msgid "Technical skill level updated"
 msgstr "Technische Qualifikationsstufe aktualisiert"
 
-#: ../../Zotlabs/Module/Settings/Account.php:56
+#: ../../Code/Module/Settings/Account.php:56
 msgid "Password verification failed."
 msgstr "Passwortüberprüfung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Settings/Account.php:63
+#: ../../Code/Module/Settings/Account.php:63
 msgid "Passwords do not match. Password unchanged."
 msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Settings/Account.php:67
+#: ../../Code/Module/Settings/Account.php:67
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Settings/Account.php:81
+#: ../../Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr "Kennwort geändert."
 
-#: ../../Zotlabs/Module/Settings/Account.php:83
+#: ../../Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
-#: ../../Zotlabs/Module/Settings/Account.php:112
+#: ../../Code/Module/Settings/Account.php:112
 msgid "Account Settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:113
+#: ../../Code/Module/Settings/Account.php:113
 msgid "Current Password"
 msgstr "Aktuelles Passwort"
 
-#: ../../Zotlabs/Module/Settings/Account.php:114
+#: ../../Code/Module/Settings/Account.php:114
 msgid "Enter New Password"
 msgstr "Gib ein neues Passwort ein"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Confirm New Password"
 msgstr "Bestätige das neue Passwort"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Leave password fields blank unless changing"
 msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
 
-#: ../../Zotlabs/Module/Settings/Account.php:120
-#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Code/Module/Settings/Account.php:120
+#: ../../Code/Module/Removeaccount.php:61
 msgid "Remove Account"
 msgstr "Konto entfernen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:121
+#: ../../Code/Module/Settings/Account.php:121
 msgid "Remove this account including all its channels"
 msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:23
+#: ../../Code/Module/Settings/Featured.php:23
 msgid "Affinity Slider settings updated."
 msgstr "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:38
+#: ../../Code/Module/Settings/Featured.php:38
 msgid "No feature settings configured"
 msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "Default maximum affinity level"
 msgstr "Voreinstellung für maximalen Beziehungsgrad"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "0-99 default 99"
 msgstr "0-99 - Standard 99"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "Default minimum affinity level"
 msgstr "Voreinstellung für minimalen Beziehungsgrad"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "0-99 - default 0"
 msgstr "0-99 - Standard 0"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Featured.php:54
 msgid "Affinity Slider Settings"
 msgstr "Beziehungsgrad-Schieberegler-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:67
+#: ../../Code/Module/Settings/Featured.php:67
 msgid "Addon Settings"
 msgstr "Addon-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:68
+#: ../../Code/Module/Settings/Featured.php:68
 msgid "Please save/submit changes to any panel before opening another."
 msgstr "Bitte speichere alle Änderungen in diesem Bereich, bevor Du einen anderen öffnest."
 
-#: ../../Zotlabs/Module/Settings/Display.php:139
+#: ../../Code/Module/Settings/Display.php:139
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s – (experimentell)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:187
+#: ../../Code/Module/Settings/Display.php:187
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Code/Module/Settings/Display.php:188
 msgid "Theme Settings"
 msgstr "Design-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Code/Module/Settings/Display.php:189
 msgid "Custom Theme Settings"
 msgstr "Benutzerdefinierte Design-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Code/Module/Settings/Display.php:190
 msgid "Content Settings"
 msgstr "Inhaltseinstellungen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Code/Module/Settings/Display.php:196
 msgid "Display Theme:"
 msgstr "Anzeige-Design:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Code/Module/Settings/Display.php:197
 msgid "Select scheme"
 msgstr "Schema wählen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid "Preload images before rendering the page"
 msgstr "Bilder im voraus laden, bevor die Seite angezeigt wird"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
+#: ../../Code/Module/Settings/Display.php:200
 msgid "Enable user zoom on mobile devices"
 msgstr "Zoom auf Mobilgeräten aktivieren"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 Sekunden, kein Maximum"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum of 100 items"
 msgstr "Maximum: 100 Beiträge"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Code/Module/Settings/Display.php:203
 msgid "Show emoticons (smilies) as images"
 msgstr "Emoticons (Smilies) als Bilder anzeigen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Provide channel menu in navigation bar"
 msgstr "Kanal-Menü in der Navigationsleiste zur Verfügung stellen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Default: channel menu located in app menu"
 msgstr "Voreinstellung: Kanal-Menü ist im App-Menü integriert"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Manual conversation updates"
 msgstr "Manuelle Konversationsaktualisierung"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Default is on, turning this off may increase screen jumping"
 msgstr "Voreinstellung ist An, dies abzuschalten kann das unerwartete Springen der Seitenanzeige erhöhen."
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Code/Module/Settings/Display.php:206
 msgid "Link post titles to source"
 msgstr "Beitragstitel zum Originalbeitrag verlinken"
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
+#: ../../Code/Module/Settings/Display.php:207
 msgid "System Page Layout Editor - (advanced)"
 msgstr "System-Seitenlayout-Editor (für Experten)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:210
 msgid "Use blog/list mode on channel page"
 msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:211
 msgid "(comments displayed separately)"
 msgstr "(Kommentare werden separat angezeigt)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:211
 msgid "Use blog/list mode on grid page"
 msgstr "Blog-/Listenmodus auf der Netzwerkseite verwenden"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:212
 msgid "Channel page max height of content (in pixels)"
 msgstr "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:213
 msgid "click to expand content exceeding this height"
 msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden."
 
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:213
 msgid "Grid page max height of content (in pixels)"
 msgstr "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:35
+#: ../../Code/Module/Settings/Oauth.php:35
 msgid "Name is required"
 msgstr "Name ist erforderlich"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:39
+#: ../../Code/Module/Settings/Oauth.php:39
 msgid "Key and Secret are required"
 msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:117
 #: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Settings/Oauth.php:120
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Settings/Oauth.php:120
 msgid "Icon url"
 msgstr "Symbol-URL"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid "Optional"
 msgstr "Optional"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:105
+#: ../../Code/Module/Settings/Oauth.php:105
 msgid "Application not found."
 msgstr "Die Anwendung wurde nicht gefunden."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
+#: ../../Code/Module/Settings/Oauth.php:148
 msgid "Connected Apps"
 msgstr "Verbundene Apps"
 
-#: ../../Zotlabs/Module/Embedphotos.php:140
-#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350
-#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
+#: ../../Code/Module/Embedphotos.php:140
+#: ../../Code/Module/Photos.php:811 ../../Code/Module/Photos.php:1350
+#: ../../Code/Widget/Portfolio.php:87 ../../Code/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Foto ansehen"
 
-#: ../../Zotlabs/Module/Embedphotos.php:156
-#: ../../Zotlabs/Module/Photos.php:842 ../../Zotlabs/Widget/Portfolio.php:108
-#: ../../Zotlabs/Widget/Album.php:95
+#: ../../Code/Module/Embedphotos.php:156
+#: ../../Code/Module/Photos.php:842 ../../Code/Widget/Portfolio.php:108
+#: ../../Code/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Module/Photos.php:712
-#: ../../Zotlabs/Module/Profile_photo.php:458
-#: ../../Zotlabs/Module/Cover_photo.php:362
-#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133
-#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Widget/Album.php:97
+#: ../../Code/Module/Embedphotos.php:158
+#: ../../Code/Module/Photos.php:712
+#: ../../Code/Module/Profile_photo.php:458
+#: ../../Code/Module/Cover_photo.php:362
+#: ../../Code/Storage/Browser.php:384 ../../Code/Widget/Cdav.php:133
+#: ../../Code/Widget/Cdav.php:169 ../../Code/Widget/Portfolio.php:110
+#: ../../Code/Widget/Album.php:97
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../../Zotlabs/Module/Achievements.php:38
+#: ../../Code/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
 
-#: ../../Zotlabs/Module/Thing.php:120
+#: ../../Code/Module/Thing.php:120
 msgid "Thing updated"
 msgstr "Sache aktualisiert"
 
-#: ../../Zotlabs/Module/Thing.php:172
+#: ../../Code/Module/Thing.php:172
 msgid "Object store: failed"
 msgstr "Speichern des Objekts fehlgeschlagen"
 
-#: ../../Zotlabs/Module/Thing.php:176
+#: ../../Code/Module/Thing.php:176
 msgid "Thing added"
 msgstr "Sache hinzugefügt"
 
-#: ../../Zotlabs/Module/Thing.php:202
+#: ../../Code/Module/Thing.php:202
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Thing.php:265
+#: ../../Code/Module/Thing.php:265
 msgid "Show Thing"
 msgstr "Sache anzeigen"
 
-#: ../../Zotlabs/Module/Thing.php:272
+#: ../../Code/Module/Thing.php:272
 msgid "item not found."
 msgstr "Eintrag nicht gefunden"
 
-#: ../../Zotlabs/Module/Thing.php:305
+#: ../../Code/Module/Thing.php:305
 msgid "Edit Thing"
 msgstr "Sache bearbeiten"
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364
+#: ../../Code/Module/Thing.php:307 ../../Code/Module/Thing.php:364
 msgid "Select a profile"
 msgstr "Wähle ein Profil"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Post an activity"
 msgstr "Aktivitätsnachricht senden"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Nur an Betrachter des ausgewählten Profils senden"
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+#: ../../Code/Module/Thing.php:313 ../../Code/Module/Thing.php:369
 msgid "Name of thing e.g. something"
 msgstr "Name der Sache, z. B. irgendwas"
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370
+#: ../../Code/Module/Thing.php:315 ../../Code/Module/Thing.php:370
 msgid "URL of thing (optional)"
 msgstr "URL der Sache (optional)"
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371
+#: ../../Code/Module/Thing.php:317 ../../Code/Module/Thing.php:371
 msgid "URL for photo of thing (optional)"
 msgstr "URL eines Fotos der Sache (optional)"
 
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071
-#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
-#: ../../Zotlabs/Module/Filestorage.php:147
+#: ../../Code/Module/Thing.php:319 ../../Code/Module/Thing.php:372
+#: ../../Code/Module/Photos.php:702 ../../Code/Module/Photos.php:1071
+#: ../../Code/Module/Connedit.php:676 ../../Code/Module/Chat.php:235
+#: ../../Code/Module/Filestorage.php:147
 #: ../../include/acl_selectors.php:123
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../../Zotlabs/Module/Thing.php:362
+#: ../../Code/Module/Thing.php:362
 msgid "Add Thing to your Profile"
 msgstr "Die Sache Deinem Profil hinzufügen"
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:57
+#: ../../Code/Module/Notify.php:61
+#: ../../Code/Module/Notifications.php:57
 msgid "No more system notifications."
 msgstr "Keine System-Benachrichtigungen mehr."
 
-#: ../../Zotlabs/Module/Notify.php:65
-#: ../../Zotlabs/Module/Notifications.php:61
+#: ../../Code/Module/Notify.php:65
+#: ../../Code/Module/Notifications.php:61
 msgid "System Notifications"
 msgstr "System-Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Follow.php:36
+#: ../../Code/Module/Follow.php:36
 msgid "Connection added."
 msgstr "Verbindung hinzugefügt"
 
-#: ../../Zotlabs/Module/Import.php:144
+#: ../../Code/Module/Import.php:144
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Dein Vertrag erlaubt nur %d Kanäle."
 
-#: ../../Zotlabs/Module/Import.php:158
+#: ../../Code/Module/Import.php:158
 msgid "No channel. Import failed."
 msgstr "Kein Kanal. Import fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Import.php:482
+#: ../../Code/Module/Import.php:482
 #: ../../addon/diaspora/import_diaspora.php:139
 msgid "Import completed."
 msgstr "Import abgeschlossen."
 
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Code/Module/Import.php:510
 msgid "You must be logged in to use this feature."
 msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
 
-#: ../../Zotlabs/Module/Import.php:515
+#: ../../Code/Module/Import.php:515
 msgid "Import Channel"
 msgstr "Kanal importieren"
 
-#: ../../Zotlabs/Module/Import.php:516
+#: ../../Code/Module/Import.php:516
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
 
-#: ../../Zotlabs/Module/Import.php:518
+#: ../../Code/Module/Import.php:518
 msgid "Or provide the old server/hub details"
 msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein"
 
-#: ../../Zotlabs/Module/Import.php:519
+#: ../../Code/Module/Import.php:519
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:520
+#: ../../Code/Module/Import.php:520
 msgid "Your old login email address"
 msgstr "Deine alte Login-E-Mail-Adresse"
 
-#: ../../Zotlabs/Module/Import.php:521
+#: ../../Code/Module/Import.php:521
 msgid "Your old login password"
 msgstr "Dein altes Passwort"
 
-#: ../../Zotlabs/Module/Import.php:522
+#: ../../Code/Module/Import.php:522
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -4426,508 +4426,508 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
 
-#: ../../Zotlabs/Module/Import.php:523
+#: ../../Code/Module/Import.php:523
 msgid "Make this hub my primary location"
 msgstr "Dieser \$Projectname-Hub ist mein primärer Hub."
 
-#: ../../Zotlabs/Module/Import.php:524
+#: ../../Code/Module/Import.php:524
 msgid "Move this channel (disable all previous locations)"
 msgstr "Verschiebe diesen Kanal (deaktiviere alle vorherigen Adressen/Klone)"
 
-#: ../../Zotlabs/Module/Import.php:525
+#: ../../Code/Module/Import.php:525
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importiere die Beiträge einiger Monate, sofern möglich (beschränkt durch verfügbaren Speicher)"
 
-#: ../../Zotlabs/Module/Import.php:526
+#: ../../Code/Module/Import.php:526
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
 msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen."
 
-#: ../../Zotlabs/Module/Rmagic.php:35
+#: ../../Code/Module/Rmagic.php:35
 msgid "Authentication failed."
 msgstr "Authentifizierung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590
+#: ../../Code/Module/Rmagic.php:75 ../../boot.php:1590
 #: ../../include/channel.php:2318
 msgid "Remote Authentication"
 msgstr "Entfernte Authentifizierung"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319
+#: ../../Code/Module/Rmagic.php:76 ../../include/channel.php:2319
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320
+#: ../../Code/Module/Rmagic.php:77 ../../include/channel.php:2320
 msgid "Authenticate"
 msgstr "Authentifizieren"
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Code/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Berechtigung verweigert."
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446
+#: ../../Code/Module/Cal.php:344 ../../include/text.php:2446
 msgid "Import"
 msgstr "Import"
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+#: ../../Code/Module/Api.php:74 ../../Code/Module/Api.php:95
 msgid "Authorize application connection"
 msgstr "Zugriff für die Anwendung autorisieren"
 
-#: ../../Zotlabs/Module/Api.php:75
+#: ../../Code/Module/Api.php:75
 msgid "Return to your app and insert this Security Code:"
 msgstr "Gehen Sie zu Ihrer App zurück und tragen Sie diesen Sicherheitscode ein:"
 
-#: ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:85
 msgid "Please login to continue."
 msgstr "Zum Weitermachen, bitte einloggen."
 
-#: ../../Zotlabs/Module/Api.php:97
+#: ../../Code/Module/Api.php:97
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Element nicht verfügbar."
 
-#: ../../Zotlabs/Module/Editblock.php:138
+#: ../../Code/Module/Editblock.php:138
 msgid "Edit Block"
 msgstr "Block bearbeiten"
 
-#: ../../Zotlabs/Module/Profile.php:93
+#: ../../Code/Module/Profile.php:93
 msgid "vcard"
 msgstr "VCard"
 
-#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Code/Module/Apps.php:48 ../../Code/Lib/Apps.php:228
 msgid "Apps"
 msgstr "Apps"
 
-#: ../../Zotlabs/Module/Apps.php:51
+#: ../../Code/Module/Apps.php:51
 msgid "Manage apps"
 msgstr "Apps verwalten"
 
-#: ../../Zotlabs/Module/Apps.php:52
+#: ../../Code/Module/Apps.php:52
 msgid "Create new app"
 msgstr "Neue App erstellen"
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268
+#: ../../Code/Module/Mood.php:67 ../../include/conversation.php:268
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s ist %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253
+#: ../../Code/Module/Mood.php:135 ../../Code/Lib/Apps.php:253
 msgid "Mood"
 msgstr "Laune"
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Code/Module/Mood.php:136
 msgid "Set your current mood and tell your friends"
 msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
 
-#: ../../Zotlabs/Module/Connections.php:55
-#: ../../Zotlabs/Module/Connections.php:112
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Code/Module/Connections.php:55
+#: ../../Code/Module/Connections.php:112
+#: ../../Code/Module/Connections.php:256
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../../Zotlabs/Module/Connections.php:60
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Code/Module/Connections.php:60
+#: ../../Code/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:261
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: ../../Zotlabs/Module/Connections.php:65
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Code/Module/Connections.php:65
+#: ../../Code/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:260
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../../Zotlabs/Module/Connections.php:70
-#: ../../Zotlabs/Module/Connections.php:185
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Code/Module/Connections.php:70
+#: ../../Code/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:259
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../../Zotlabs/Module/Connections.php:75
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:75
+#: ../../Code/Module/Connections.php:178
 msgid "Archived/Unreachable"
 msgstr "Archiviert/Unerreichbar"
 
-#: ../../Zotlabs/Module/Connections.php:80
-#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116
-#: ../../Zotlabs/Module/Notifications.php:52
+#: ../../Code/Module/Connections.php:80
+#: ../../Code/Module/Connections.php:89 ../../Code/Module/Menu.php:116
+#: ../../Code/Module/Notifications.php:52
 #: ../../include/conversation.php:1717
 msgid "New"
 msgstr "Neu"
 
-#: ../../Zotlabs/Module/Connections.php:94
-#: ../../Zotlabs/Module/Connections.php:108
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
+#: ../../Code/Module/Connections.php:94
+#: ../../Code/Module/Connections.php:108
+#: ../../Code/Module/Connedit.php:713 ../../Code/Widget/Affinity.php:26
 msgid "All"
 msgstr "Alle"
 
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Code/Module/Connections.php:140
 msgid "Active Connections"
 msgstr "Aktive Verbindungen"
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Code/Module/Connections.php:143
 msgid "Show active connections"
 msgstr "Zeige die aktiven Verbindungen an"
 
-#: ../../Zotlabs/Module/Connections.php:147
-#: ../../Zotlabs/Widget/Notifications.php:84
+#: ../../Code/Module/Connections.php:147
+#: ../../Code/Widget/Notifications.php:84
 msgid "New Connections"
 msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Code/Module/Connections.php:150
 msgid "Show pending (new) connections"
 msgstr "Ausstehende (neue) Verbindungsanfragen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Code/Module/Connections.php:167
 msgid "Only show blocked connections"
 msgstr "Nur blockierte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:174
+#: ../../Code/Module/Connections.php:174
 msgid "Only show ignored connections"
 msgstr "Nur ignorierte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Code/Module/Connections.php:181
 msgid "Only show archived/unreachable connections"
 msgstr "Nur archivierte/unerreichbare Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Code/Module/Connections.php:188
 msgid "Only show hidden connections"
 msgstr "Nur versteckte Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Code/Module/Connections.php:203
 msgid "Show all connections"
 msgstr "Alle Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Connections.php:257
+#: ../../Code/Module/Connections.php:257
 msgid "Pending approval"
 msgstr "Wartet auf Genehmigung"
 
-#: ../../Zotlabs/Module/Connections.php:258
+#: ../../Code/Module/Connections.php:258
 msgid "Archived"
 msgstr "Archiviert"
 
-#: ../../Zotlabs/Module/Connections.php:262
+#: ../../Code/Module/Connections.php:262
 msgid "Not connected at this location"
 msgstr "An diesem Ort nicht verbunden"
 
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Code/Module/Connections.php:279
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Code/Module/Connections.php:280
 msgid "Edit connection"
 msgstr "Verbindung bearbeiten"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Code/Module/Connections.php:282
 msgid "Delete connection"
 msgstr "Verbindung löschen"
 
-#: ../../Zotlabs/Module/Connections.php:291
+#: ../../Code/Module/Connections.php:291
 msgid "Channel address"
 msgstr "Kanaladresse"
 
-#: ../../Zotlabs/Module/Connections.php:293
+#: ../../Code/Module/Connections.php:293
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Code/Module/Connections.php:296
 msgid "Call"
 msgstr "Anruf"
 
-#: ../../Zotlabs/Module/Connections.php:298
+#: ../../Code/Module/Connections.php:298
 msgid "Status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Code/Module/Connections.php:300
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../../Zotlabs/Module/Connections.php:302
+#: ../../Code/Module/Connections.php:302
 msgid "Approve connection"
 msgstr "Verbindung genehmigen"
 
-#: ../../Zotlabs/Module/Connections.php:304
+#: ../../Code/Module/Connections.php:304
 msgid "Ignore connection"
 msgstr "Verbindung ignorieren"
 
-#: ../../Zotlabs/Module/Connections.php:305
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connections.php:305
+#: ../../Code/Module/Connedit.php:630
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../../Zotlabs/Module/Connections.php:306
+#: ../../Code/Module/Connections.php:306
 msgid "Recent activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235
+#: ../../Code/Module/Connections.php:331 ../../Code/Lib/Apps.php:235
 #: ../../include/text.php:973
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Code/Module/Connections.php:336
 msgid "Search your connections"
 msgstr "Verbindungen durchsuchen"
 
-#: ../../Zotlabs/Module/Connections.php:337
+#: ../../Code/Module/Connections.php:337
 msgid "Connections search"
 msgstr "Verbindung suchen"
 
-#: ../../Zotlabs/Module/Connections.php:338
-#: ../../Zotlabs/Module/Directory.php:401
-#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23
+#: ../../Code/Module/Connections.php:338
+#: ../../Code/Module/Directory.php:401
+#: ../../Code/Module/Directory.php:406 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Finde"
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
+#: ../../Code/Module/Viewsrc.php:43
 msgid "item"
 msgstr "Beitrag"
 
-#: ../../Zotlabs/Module/Viewsrc.php:55
+#: ../../Code/Module/Viewsrc.php:55
 msgid "Source of Item"
 msgstr "Quelle des Elements"
 
-#: ../../Zotlabs/Module/Bookmarks.php:56
+#: ../../Code/Module/Bookmarks.php:56
 msgid "Bookmark added"
 msgstr "Lesezeichen hinzugefügt"
 
-#: ../../Zotlabs/Module/Bookmarks.php:79
+#: ../../Code/Module/Bookmarks.php:79
 msgid "My Bookmarks"
 msgstr "Meine Lesezeichen"
 
-#: ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../Code/Module/Bookmarks.php:90
 msgid "My Connections Bookmarks"
 msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../Code/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Dieses Konto löschen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Standardmäßig werden nur die Kanalklone auf diesem $Projectname-Hub aus dem Netzwerk entfernt"
 
-#: ../../Zotlabs/Module/Photos.php:78
+#: ../../Code/Module/Photos.php:78
 msgid "Page owner information could not be retrieved."
 msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
 
-#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
+#: ../../Code/Module/Photos.php:94 ../../Code/Module/Photos.php:120
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../Zotlabs/Module/Photos.php:103
+#: ../../Code/Module/Photos.php:103
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083
+#: ../../Code/Module/Photos.php:174 ../../Code/Module/Photos.php:1083
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
-#: ../../Zotlabs/Module/Photos.php:551
+#: ../../Code/Module/Photos.php:551
 msgid "No photos selected"
 msgstr "Keine Fotos ausgewählt"
 
-#: ../../Zotlabs/Module/Photos.php:600
+#: ../../Code/Module/Photos.php:600
 msgid "Access to this item is restricted."
 msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
 
-#: ../../Zotlabs/Module/Photos.php:646
+#: ../../Code/Module/Photos.php:646
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Photos.php:649
+#: ../../Code/Module/Photos.php:649
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB Foto-Speicher belegt."
 
-#: ../../Zotlabs/Module/Photos.php:691
+#: ../../Code/Module/Photos.php:691
 msgid "Upload Photos"
 msgstr "Fotos hochladen"
 
-#: ../../Zotlabs/Module/Photos.php:695
+#: ../../Code/Module/Photos.php:695
 msgid "Enter an album name"
 msgstr "Namen für ein neues Album eingeben"
 
-#: ../../Zotlabs/Module/Photos.php:696
+#: ../../Code/Module/Photos.php:696
 msgid "or select an existing album (doubleclick)"
 msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
 
-#: ../../Zotlabs/Module/Photos.php:697
+#: ../../Code/Module/Photos.php:697
 msgid "Create a status post for this upload"
 msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
 
-#: ../../Zotlabs/Module/Photos.php:699
+#: ../../Code/Module/Photos.php:699
 msgid "Description (optional)"
 msgstr "Beschreibung (optional)"
 
-#: ../../Zotlabs/Module/Photos.php:785
+#: ../../Code/Module/Photos.php:785
 msgid "Show Newest First"
 msgstr "Neueste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:787
+#: ../../Code/Module/Photos.php:787
 msgid "Show Oldest First"
 msgstr "Älteste zuerst anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381
+#: ../../Code/Module/Photos.php:844 ../../Code/Module/Photos.php:1381
 msgid "Add Photos"
 msgstr "Fotos hinzufügen"
 
-#: ../../Zotlabs/Module/Photos.php:892
+#: ../../Code/Module/Photos.php:892
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
 
-#: ../../Zotlabs/Module/Photos.php:894
+#: ../../Code/Module/Photos.php:894
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Code/Module/Photos.php:952
 msgid "Use as profile photo"
 msgstr "Als Profilfoto verwenden"
 
-#: ../../Zotlabs/Module/Photos.php:953
+#: ../../Code/Module/Photos.php:953
 msgid "Use as cover photo"
 msgstr "Als Titelbild verwenden"
 
-#: ../../Zotlabs/Module/Photos.php:960
+#: ../../Code/Module/Photos.php:960
 msgid "Private Photo"
 msgstr "Privates Foto"
 
-#: ../../Zotlabs/Module/Photos.php:975
+#: ../../Code/Module/Photos.php:975
 msgid "View Full Size"
 msgstr "In voller Größe anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:1057
+#: ../../Code/Module/Photos.php:1057
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../Zotlabs/Module/Photos.php:1059
+#: ../../Code/Module/Photos.php:1059
 msgid "Rotate CW (right)"
 msgstr "Drehen im UZS (rechts)"
 
-#: ../../Zotlabs/Module/Photos.php:1060
+#: ../../Code/Module/Photos.php:1060
 msgid "Rotate CCW (left)"
 msgstr "Drehen gegen UZS (links)"
 
-#: ../../Zotlabs/Module/Photos.php:1063
+#: ../../Code/Module/Photos.php:1063
 msgid "Move photo to album"
 msgstr "Foto in Album verschieben"
 
-#: ../../Zotlabs/Module/Photos.php:1064
+#: ../../Code/Module/Photos.php:1064
 msgid "Enter a new album name"
 msgstr "Gib einen Namen für ein neues Album ein"
 
-#: ../../Zotlabs/Module/Photos.php:1065
+#: ../../Code/Module/Photos.php:1065
 msgid "or select an existing one (doubleclick)"
 msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
 
-#: ../../Zotlabs/Module/Photos.php:1070
+#: ../../Code/Module/Photos.php:1070
 msgid "Add a Tag"
 msgstr "Schlagwort hinzufügen"
 
-#: ../../Zotlabs/Module/Photos.php:1078
+#: ../../Code/Module/Photos.php:1078
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
 
-#: ../../Zotlabs/Module/Photos.php:1081
+#: ../../Code/Module/Photos.php:1081
 msgid "Flag as adult in album view"
 msgstr "In der Albumansicht als nicht jugendfrei markieren"
 
-#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281
+#: ../../Code/Module/Photos.php:1100 ../../Code/Lib/ThreadItem.php:281
 msgid "I like this (toggle)"
 msgstr "Mir gefällt das (Umschalter)"
 
-#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282
+#: ../../Code/Module/Photos.php:1101 ../../Code/Lib/ThreadItem.php:282
 msgid "I don't like this (toggle)"
 msgstr "Mir gefällt das nicht (Umschalter)"
 
-#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427
+#: ../../Code/Module/Photos.php:1103 ../../Code/Lib/ThreadItem.php:427
 #: ../../include/conversation.php:785
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237
-#: ../../Zotlabs/Lib/ThreadItem.php:749
+#: ../../Code/Module/Photos.php:1119 ../../Code/Module/Photos.php:1237
+#: ../../Code/Lib/ThreadItem.php:749
 msgid "This is you"
 msgstr "Das bist Du"
 
-#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239
-#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6
+#: ../../Code/Module/Photos.php:1121 ../../Code/Module/Photos.php:1239
+#: ../../Code/Lib/ThreadItem.php:751 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618
+#: ../../Code/Module/Photos.php:1137 ../../include/conversation.php:618
 msgctxt "title"
 msgid "Likes"
 msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618
+#: ../../Code/Module/Photos.php:1137 ../../include/conversation.php:618
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Gefällt mir nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Agree"
 msgstr "Zustimmungen"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Disagree"
 msgstr "Ablehnungen"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Abstain"
 msgstr "Enthaltungen"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Attending"
 msgstr "Zusagen"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Not attending"
 msgstr "Absagen"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Might attend"
 msgstr "Vielleicht"
 
-#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168
-#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213
+#: ../../Code/Module/Photos.php:1156 ../../Code/Module/Photos.php:1168
+#: ../../Code/Lib/ThreadItem.php:201 ../../Code/Lib/ThreadItem.php:213
 msgid "View all"
 msgstr "Alles anzeigen"
 
-#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205
+#: ../../Code/Module/Photos.php:1160 ../../Code/Lib/ThreadItem.php:205
 #: ../../include/conversation.php:1981 ../../include/channel.php:1539
 #: ../../include/taxonomy.php:661
 msgctxt "noun"
@@ -4936,7 +4936,7 @@ msgid_plural "Likes"
 msgstr[0] "Gefällt mir"
 msgstr[1] "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210
+#: ../../Code/Module/Photos.php:1165 ../../Code/Lib/ThreadItem.php:210
 #: ../../include/conversation.php:1984
 msgctxt "noun"
 msgid "Dislike"
@@ -4944,517 +4944,517 @@ msgid_plural "Dislikes"
 msgstr[0] "Gefällt nicht"
 msgstr[1] "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1265
+#: ../../Code/Module/Photos.php:1265
 msgid "Photo Tools"
 msgstr "Fotowerkzeuge"
 
-#: ../../Zotlabs/Module/Photos.php:1274
+#: ../../Code/Module/Photos.php:1274
 msgid "In This Photo:"
 msgstr "Auf diesem Foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1279
+#: ../../Code/Module/Photos.php:1279
 msgid "Map"
 msgstr "Karte"
 
-#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415
+#: ../../Code/Module/Photos.php:1287 ../../Code/Lib/ThreadItem.php:415
 msgctxt "noun"
 msgid "Likes"
 msgstr "Gefällt mir"
 
-#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416
+#: ../../Code/Module/Photos.php:1288 ../../Code/Lib/ThreadItem.php:416
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421
+#: ../../Code/Module/Photos.php:1293 ../../Code/Lib/ThreadItem.php:421
 #: ../../include/acl_selectors.php:125
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378
-#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667
+#: ../../Code/Module/Photos.php:1365 ../../Code/Module/Photos.php:1378
+#: ../../Code/Module/Photos.php:1379 ../../include/photos.php:667
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
-#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135
+#: ../../Code/Module/Wiki.php:30 ../../addon/cart/cart.php:1135
 msgid "Profile Unavailable."
 msgstr "Profil nicht verfügbar."
 
-#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114
+#: ../../Code/Module/Wiki.php:44 ../../Code/Module/Cloud.php:114
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114
+#: ../../Code/Module/Wiki.php:68 ../../addon/cart/myshop.php:114
 #: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58
 msgid "Invalid channel"
 msgstr "Ungültiger Kanal"
 
-#: ../../Zotlabs/Module/Wiki.php:124
+#: ../../Code/Module/Wiki.php:124
 msgid "Error retrieving wiki"
 msgstr "Fehler beim Abrufen des Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:131
+#: ../../Code/Module/Wiki.php:131
 msgid "Error creating zip file export folder"
 msgstr "Fehler bei der Erzeugung des Zip-Datei Export-Verzeichnisses "
 
-#: ../../Zotlabs/Module/Wiki.php:182
+#: ../../Code/Module/Wiki.php:182
 msgid "Error downloading wiki: "
 msgstr "Fehler beim Herunterladen des Wiki:"
 
-#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928
+#: ../../Code/Module/Wiki.php:197 ../../include/conversation.php:1928
 #: ../../include/nav.php:494
 msgid "Wikis"
 msgstr "Wikis"
 
-#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../Code/Module/Wiki.php:203
 msgid "Download"
 msgstr "Herunterladen"
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256
-#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Wiki.php:205 ../../Code/Module/Chat.php:256
+#: ../../Code/Module/Profiles.php:831 ../../Code/Module/Manage.php:145
 msgid "Create New"
 msgstr "Neu anlegen"
 
-#: ../../Zotlabs/Module/Wiki.php:207
+#: ../../Code/Module/Wiki.php:207
 msgid "Wiki name"
 msgstr "Name des Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:208
+#: ../../Code/Module/Wiki.php:208
 msgid "Content type"
 msgstr "Inhaltstyp"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
 #: ../../include/text.php:1869
 msgid "Markdown"
 msgstr "Markdown"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1867
 msgid "BBcode"
 msgstr "BBcode"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870
+#: ../../Code/Module/Wiki.php:208 ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1870
 msgid "Text"
 msgstr "Text"
 
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284
+#: ../../Code/Module/Wiki.php:210 ../../Code/Storage/Browser.php:284
 msgid "Type"
 msgstr "Typ"
 
-#: ../../Zotlabs/Module/Wiki.php:211
+#: ../../Code/Module/Wiki.php:211
 msgid "Any type"
 msgstr "Alle Arten"
 
-#: ../../Zotlabs/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:218
 msgid "Lock content type"
 msgstr "Inhaltstyp sperren"
 
-#: ../../Zotlabs/Module/Wiki.php:219
+#: ../../Code/Module/Wiki.php:219
 msgid "Create a status post for this wiki"
 msgstr "Erzeuge einen Statusbeitrag für dieses Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:220
+#: ../../Code/Module/Wiki.php:220
 msgid "Edit Wiki Name"
 msgstr "Wiki-Namen bearbeiten"
 
-#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../Code/Module/Wiki.php:262
 msgid "Wiki not found"
 msgstr "Wiki nicht gefunden"
 
-#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../Code/Module/Wiki.php:286
 msgid "Rename page"
 msgstr "Seite umbenennen"
 
-#: ../../Zotlabs/Module/Wiki.php:307
+#: ../../Code/Module/Wiki.php:307
 msgid "Error retrieving page content"
 msgstr "Fehler beim Abrufen des Seiteninhalts"
 
-#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317
+#: ../../Code/Module/Wiki.php:315 ../../Code/Module/Wiki.php:317
 msgid "New page"
 msgstr "Neue Seite"
 
-#: ../../Zotlabs/Module/Wiki.php:345
+#: ../../Code/Module/Wiki.php:345
 msgid "Revision Comparison"
 msgstr "Revisionsvergleich"
 
-#: ../../Zotlabs/Module/Wiki.php:346
+#: ../../Code/Module/Wiki.php:346
 msgid "Revert"
 msgstr "Rückgängig machen"
 
-#: ../../Zotlabs/Module/Wiki.php:353
+#: ../../Code/Module/Wiki.php:353
 msgid "Short description of your changes (optional)"
 msgstr "Kurze Beschreibung Ihrer Änderungen (optional)"
 
-#: ../../Zotlabs/Module/Wiki.php:362
+#: ../../Code/Module/Wiki.php:362
 msgid "Source"
 msgstr "Quelle"
 
-#: ../../Zotlabs/Module/Wiki.php:372
+#: ../../Code/Module/Wiki.php:372
 msgid "New page name"
 msgstr "Neuer Seitenname"
 
-#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282
+#: ../../Code/Module/Wiki.php:377 ../../include/conversation.php:1282
 msgid "Embed image from photo albums"
 msgstr "Bild aus Fotoalben einbetten"
 
-#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388
+#: ../../Code/Module/Wiki.php:378 ../../include/conversation.php:1388
 msgid "Embed an image from your albums"
 msgstr "Betten Sie ein Bild aus Ihren Alben ein"
 
-#: ../../Zotlabs/Module/Wiki.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:465
-#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../Code/Module/Wiki.php:380
+#: ../../Code/Module/Profile_photo.php:465
+#: ../../Code/Module/Cover_photo.php:367
 #: ../../include/conversation.php:1390 ../../include/conversation.php:1437
 msgid "OK"
 msgstr "Ok"
 
-#: ../../Zotlabs/Module/Wiki.php:381
-#: ../../Zotlabs/Module/Profile_photo.php:466
-#: ../../Zotlabs/Module/Cover_photo.php:368
+#: ../../Code/Module/Wiki.php:381
+#: ../../Code/Module/Profile_photo.php:466
+#: ../../Code/Module/Cover_photo.php:368
 #: ../../include/conversation.php:1320
 msgid "Choose images to embed"
 msgstr "Wählen Sie Bilder zum Einbetten aus"
 
-#: ../../Zotlabs/Module/Wiki.php:382
-#: ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:369
+#: ../../Code/Module/Wiki.php:382
+#: ../../Code/Module/Profile_photo.php:467
+#: ../../Code/Module/Cover_photo.php:369
 #: ../../include/conversation.php:1321
 msgid "Choose an album"
 msgstr "Wählen Sie ein Album aus"
 
-#: ../../Zotlabs/Module/Wiki.php:383
-#: ../../Zotlabs/Module/Profile_photo.php:468
-#: ../../Zotlabs/Module/Cover_photo.php:370
+#: ../../Code/Module/Wiki.php:383
+#: ../../Code/Module/Profile_photo.php:468
+#: ../../Code/Module/Cover_photo.php:370
 msgid "Choose a different album"
 msgstr "Wählen Sie ein anderes Album aus"
 
-#: ../../Zotlabs/Module/Wiki.php:384
-#: ../../Zotlabs/Module/Profile_photo.php:469
-#: ../../Zotlabs/Module/Cover_photo.php:371
+#: ../../Code/Module/Wiki.php:384
+#: ../../Code/Module/Profile_photo.php:469
+#: ../../Code/Module/Cover_photo.php:371
 #: ../../include/conversation.php:1323
 msgid "Error getting album list"
 msgstr "Fehler beim Holen der Albenliste"
 
-#: ../../Zotlabs/Module/Wiki.php:385
-#: ../../Zotlabs/Module/Profile_photo.php:470
-#: ../../Zotlabs/Module/Cover_photo.php:372
+#: ../../Code/Module/Wiki.php:385
+#: ../../Code/Module/Profile_photo.php:470
+#: ../../Code/Module/Cover_photo.php:372
 #: ../../include/conversation.php:1324
 msgid "Error getting photo link"
 msgstr "Fehler beim Holen des Fotolinks"
 
-#: ../../Zotlabs/Module/Wiki.php:386
-#: ../../Zotlabs/Module/Profile_photo.php:471
-#: ../../Zotlabs/Module/Cover_photo.php:373
+#: ../../Code/Module/Wiki.php:386
+#: ../../Code/Module/Profile_photo.php:471
+#: ../../Code/Module/Cover_photo.php:373
 #: ../../include/conversation.php:1325
 msgid "Error getting album"
 msgstr "Fehler beim Holen des Albums"
 
-#: ../../Zotlabs/Module/Wiki.php:462
+#: ../../Code/Module/Wiki.php:462
 msgid "Error creating wiki. Invalid name."
 msgstr "Fehler beim Erstellen des Wiki. Ungültiger Name."
 
-#: ../../Zotlabs/Module/Wiki.php:469
+#: ../../Code/Module/Wiki.php:469
 msgid "A wiki with this name already exists."
 msgstr "Es existiert bereits ein Wiki mit diesem Namen."
 
-#: ../../Zotlabs/Module/Wiki.php:482
+#: ../../Code/Module/Wiki.php:482
 msgid "Wiki created, but error creating Home page."
 msgstr "Das Wiki wurde erzeugt, aber es gab einen Fehler bei der Erstellung der Startseite"
 
-#: ../../Zotlabs/Module/Wiki.php:489
+#: ../../Code/Module/Wiki.php:489
 msgid "Error creating wiki"
 msgstr "Fehler beim Erstellen des Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:512
+#: ../../Code/Module/Wiki.php:512
 msgid "Error updating wiki. Invalid name."
 msgstr "Fehler beim Aktualisieren des Wikis. Ungültiger Name."
 
-#: ../../Zotlabs/Module/Wiki.php:532
+#: ../../Code/Module/Wiki.php:532
 msgid "Error updating wiki"
 msgstr "Fehler beim Aktualisieren des Wikis"
 
-#: ../../Zotlabs/Module/Wiki.php:547
+#: ../../Code/Module/Wiki.php:547
 msgid "Wiki delete permission denied."
 msgstr "Wiki-Löschberechtigung verweigert."
 
-#: ../../Zotlabs/Module/Wiki.php:557
+#: ../../Code/Module/Wiki.php:557
 msgid "Error deleting wiki"
 msgstr "Fehler beim Löschen des Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:590
+#: ../../Code/Module/Wiki.php:590
 msgid "New page created"
 msgstr "Neue Seite erstellt"
 
-#: ../../Zotlabs/Module/Wiki.php:711
+#: ../../Code/Module/Wiki.php:711
 msgid "Cannot delete Home"
 msgstr "Kann die Startseite nicht löschen"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Current Revision"
 msgstr "Aktuelle Revision"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Selected Revision"
 msgstr "Ausgewählte Revision"
 
-#: ../../Zotlabs/Module/Wiki.php:825
+#: ../../Code/Module/Wiki.php:825
 msgid "You must be authenticated."
 msgstr "Sie müssen authenzifiziert sein."
 
-#: ../../Zotlabs/Module/Chanview.php:139
+#: ../../Code/Module/Chanview.php:139
 msgid "toggle full screen mode"
 msgstr "auf Vollbildmodus umschalten"
 
-#: ../../Zotlabs/Module/Pdledit.php:21
+#: ../../Code/Module/Pdledit.php:21
 msgid "Layout updated."
 msgstr "Layout aktualisiert."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
+#: ../../Code/Module/Pdledit.php:34 ../../Code/Module/Chat.php:219
 msgid "Feature disabled."
 msgstr "Funktion deaktiviert."
 
-#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90
+#: ../../Code/Module/Pdledit.php:47 ../../Code/Module/Pdledit.php:90
 msgid "Edit System Page Description"
 msgstr "Systemseitenbeschreibung bearbeiten"
 
-#: ../../Zotlabs/Module/Pdledit.php:68
+#: ../../Code/Module/Pdledit.php:68
 msgid "(modified)"
 msgstr "(geändert)"
 
-#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133
+#: ../../Code/Module/Pdledit.php:68 ../../Code/Module/Lostpass.php:133
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../../Zotlabs/Module/Pdledit.php:85
+#: ../../Code/Module/Pdledit.php:85
 msgid "Layout not found."
 msgstr "Layout nicht gefunden."
 
-#: ../../Zotlabs/Module/Pdledit.php:91
+#: ../../Code/Module/Pdledit.php:91
 msgid "Module Name:"
 msgstr "Modulname:"
 
-#: ../../Zotlabs/Module/Pdledit.php:92
+#: ../../Code/Module/Pdledit.php:92
 msgid "Layout Help"
 msgstr "Layout-Hilfe"
 
-#: ../../Zotlabs/Module/Pdledit.php:93
+#: ../../Code/Module/Pdledit.php:93
 msgid "Edit another layout"
 msgstr "Ein weiteres Layout bearbeiten"
 
-#: ../../Zotlabs/Module/Pdledit.php:94
+#: ../../Code/Module/Pdledit.php:94
 msgid "System layout"
 msgstr "System-Layout"
 
-#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254
+#: ../../Code/Module/Poke.php:182 ../../Code/Lib/Apps.php:254
 #: ../../include/conversation.php:1092
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../Zotlabs/Module/Poke.php:183
+#: ../../Code/Module/Poke.php:183
 msgid "Poke somebody"
 msgstr "Jemanden anstupsen"
 
-#: ../../Zotlabs/Module/Poke.php:186
+#: ../../Code/Module/Poke.php:186
 msgid "Poke/Prod"
 msgstr "Anstupsen/Knuffen"
 
-#: ../../Zotlabs/Module/Poke.php:187
+#: ../../Code/Module/Poke.php:187
 msgid "Poke, prod or do other things to somebody"
 msgstr "Jemanden anstupsen, knuffen oder sonstiges"
 
-#: ../../Zotlabs/Module/Poke.php:194
+#: ../../Code/Module/Poke.php:194
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: ../../Zotlabs/Module/Poke.php:195
+#: ../../Code/Module/Poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
 
-#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
+#: ../../Code/Module/Poke.php:198 ../../Code/Module/Poke.php:199
 msgid "Make this post private"
 msgstr "Diesen Beitrag privat machen"
 
-#: ../../Zotlabs/Module/Profile_photo.php:66
-#: ../../Zotlabs/Module/Cover_photo.php:56
+#: ../../Code/Module/Profile_photo.php:66
+#: ../../Code/Module/Cover_photo.php:56
 msgid "Image uploaded but image cropping failed."
 msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
 
-#: ../../Zotlabs/Module/Profile_photo.php:120
-#: ../../Zotlabs/Module/Profile_photo.php:248
+#: ../../Code/Module/Profile_photo.php:120
+#: ../../Code/Module/Profile_photo.php:248
 #: ../../include/photo/photo_driver.php:741
 msgid "Profile Photos"
 msgstr "Profilfotos"
 
-#: ../../Zotlabs/Module/Profile_photo.php:142
-#: ../../Zotlabs/Module/Cover_photo.php:159
+#: ../../Code/Module/Profile_photo.php:142
+#: ../../Code/Module/Cover_photo.php:159
 msgid "Image resize failed."
 msgstr "Bild-Anpassung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Profile_photo.php:218
+#: ../../Code/Module/Profile_photo.php:218
 #: ../../addon/openclipatar/openclipatar.php:298
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
 
-#: ../../Zotlabs/Module/Profile_photo.php:225
-#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195
+#: ../../Code/Module/Profile_photo.php:225
+#: ../../Code/Module/Cover_photo.php:173 ../../include/photos.php:195
 msgid "Unable to process image"
 msgstr "Kann Bild nicht verarbeiten"
 
-#: ../../Zotlabs/Module/Profile_photo.php:260
-#: ../../Zotlabs/Module/Cover_photo.php:197
+#: ../../Code/Module/Profile_photo.php:260
+#: ../../Code/Module/Cover_photo.php:197
 msgid "Image upload failed."
 msgstr "Hochladen des Bilds fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Profile_photo.php:279
-#: ../../Zotlabs/Module/Cover_photo.php:214
+#: ../../Code/Module/Profile_photo.php:279
+#: ../../Code/Module/Cover_photo.php:214
 msgid "Unable to process image."
 msgstr "Kann Bild nicht verarbeiten."
 
-#: ../../Zotlabs/Module/Profile_photo.php:343
-#: ../../Zotlabs/Module/Profile_photo.php:390
-#: ../../Zotlabs/Module/Cover_photo.php:307
-#: ../../Zotlabs/Module/Cover_photo.php:322
+#: ../../Code/Module/Profile_photo.php:343
+#: ../../Code/Module/Profile_photo.php:390
+#: ../../Code/Module/Cover_photo.php:307
+#: ../../Code/Module/Cover_photo.php:322
 msgid "Photo not available."
 msgstr "Foto nicht verfügbar."
 
-#: ../../Zotlabs/Module/Profile_photo.php:455
-#: ../../Zotlabs/Module/Cover_photo.php:359
+#: ../../Code/Module/Profile_photo.php:455
+#: ../../Code/Module/Cover_photo.php:359
 msgid "Upload File:"
 msgstr "Datei hochladen:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:456
-#: ../../Zotlabs/Module/Cover_photo.php:360
+#: ../../Code/Module/Profile_photo.php:456
+#: ../../Code/Module/Cover_photo.php:360
 msgid "Select a profile:"
 msgstr "Wähle ein Profil:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
+#: ../../Code/Module/Profile_photo.php:457
 msgid "Use Photo for Profile"
 msgstr "Foto für Profil verwenden"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
+#: ../../Code/Module/Profile_photo.php:457
 msgid "Change Profile Photo"
 msgstr "Profilfoto ändern"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Code/Module/Profile_photo.php:458
 msgid "Use"
 msgstr "Verwenden"
 
-#: ../../Zotlabs/Module/Profile_photo.php:462
-#: ../../Zotlabs/Module/Profile_photo.php:463
-#: ../../Zotlabs/Module/Cover_photo.php:364
-#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Code/Module/Profile_photo.php:462
+#: ../../Code/Module/Profile_photo.php:463
+#: ../../Code/Module/Cover_photo.php:364
+#: ../../Code/Module/Cover_photo.php:365
 msgid "Use a photo from your albums"
 msgstr "Ein Foto aus meinen Alben verwenden"
 
-#: ../../Zotlabs/Module/Profile_photo.php:473
-#: ../../Zotlabs/Module/Cover_photo.php:376
+#: ../../Code/Module/Profile_photo.php:473
+#: ../../Code/Module/Cover_photo.php:376
 msgid "Select existing photo"
 msgstr "Wähle ein vorhandenes Foto aus"
 
-#: ../../Zotlabs/Module/Profile_photo.php:492
-#: ../../Zotlabs/Module/Cover_photo.php:393
+#: ../../Code/Module/Profile_photo.php:492
+#: ../../Code/Module/Cover_photo.php:393
 msgid "Crop Image"
 msgstr "Bild zuschneiden"
 
-#: ../../Zotlabs/Module/Profile_photo.php:493
-#: ../../Zotlabs/Module/Cover_photo.php:394
+#: ../../Code/Module/Profile_photo.php:493
+#: ../../Code/Module/Cover_photo.php:394
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
-#: ../../Zotlabs/Module/Cover_photo.php:396
+#: ../../Code/Module/Profile_photo.php:495
+#: ../../Code/Module/Cover_photo.php:396
 msgid "Done Editing"
 msgstr "Bearbeitung fertigstellen"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
+#: ../../Code/Module/Chatsvc.php:131
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
+#: ../../Code/Module/Chatsvc.php:136
 msgid "Online"
 msgstr "Online"
 
-#: ../../Zotlabs/Module/Item.php:194
+#: ../../Code/Module/Item.php:194
 msgid "Unable to locate original post."
 msgstr "Originalbeitrag nicht gefunden."
 
-#: ../../Zotlabs/Module/Item.php:477
+#: ../../Code/Module/Item.php:477
 msgid "Empty post discarded."
 msgstr "Leeren Beitrag verworfen."
 
-#: ../../Zotlabs/Module/Item.php:874
+#: ../../Code/Module/Item.php:874
 msgid "Duplicate post suppressed."
 msgstr "Doppelter Beitrag unterdrückt."
 
-#: ../../Zotlabs/Module/Item.php:1019
+#: ../../Code/Module/Item.php:1019
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../Zotlabs/Module/Item.php:1055
+#: ../../Code/Module/Item.php:1055
 msgid "Your comment is awaiting approval."
 msgstr "Dein Kommentar muss noch bestätigt werden."
 
-#: ../../Zotlabs/Module/Item.php:1160
+#: ../../Code/Module/Item.php:1160
 msgid "Unable to obtain post information from database."
 msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
 
-#: ../../Zotlabs/Module/Item.php:1189
+#: ../../Code/Module/Item.php:1189
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../Zotlabs/Module/Item.php:1196
+#: ../../Code/Module/Item.php:1196
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
 
-#: ../../Zotlabs/Module/Ping.php:330
+#: ../../Code/Module/Ping.php:330
 msgid "sent you a private message"
 msgstr "hat Dir eine private Nachricht geschickt"
 
-#: ../../Zotlabs/Module/Ping.php:383
+#: ../../Code/Module/Ping.php:383
 msgid "added your channel"
 msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../Zotlabs/Module/Ping.php:407
+#: ../../Code/Module/Ping.php:407
 msgid "requires approval"
 msgstr "Zustimmung erforderlich"
 
-#: ../../Zotlabs/Module/Ping.php:417
+#: ../../Code/Module/Ping.php:417
 msgid "g A l F d"
 msgstr "l, d. F, G:i \\U\\h\\r"
 
-#: ../../Zotlabs/Module/Ping.php:435
+#: ../../Code/Module/Ping.php:435
 msgid "[today]"
 msgstr "[Heute]"
 
-#: ../../Zotlabs/Module/Ping.php:444
+#: ../../Code/Module/Ping.php:444
 msgid "posted an event"
 msgstr "hat einen Termin veröffentlicht"
 
-#: ../../Zotlabs/Module/Ping.php:477
+#: ../../Code/Module/Ping.php:477
 msgid "shared a file with you"
 msgstr "hat eine Datei mit Dir geteilt"
 
-#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
+#: ../../Code/Module/Page.php:39 ../../Code/Module/Block.php:29
 msgid "Invalid item."
 msgstr "Ungültiges Element."
 
-#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158
-#: ../../Zotlabs/Module/Display.php:175
-#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167
+#: ../../Code/Module/Page.php:136 ../../Code/Module/Block.php:77
+#: ../../Code/Module/Display.php:141 ../../Code/Module/Display.php:158
+#: ../../Code/Module/Display.php:175
+#: ../../Code/Lib/NativeWikiPage.php:519 ../../Code/Web/Router.php:167
 #: ../../include/help.php:81
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
-#: ../../Zotlabs/Module/Page.php:173
+#: ../../Code/Module/Page.php:173
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -5464,314 +5464,314 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59
+#: ../../Code/Module/Connedit.php:79 ../../Code/Module/Defperms.php:59
 msgid "Could not access contact record."
 msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
 
-#: ../../Zotlabs/Module/Connedit.php:109
+#: ../../Code/Module/Connedit.php:109
 msgid "Could not locate selected profile."
 msgstr "Gewähltes Profil nicht gefunden."
 
-#: ../../Zotlabs/Module/Connedit.php:246
+#: ../../Code/Module/Connedit.php:246
 msgid "Connection updated."
 msgstr "Verbindung aktualisiert."
 
-#: ../../Zotlabs/Module/Connedit.php:248
+#: ../../Code/Module/Connedit.php:248
 msgid "Failed to update connection record."
 msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../Zotlabs/Module/Connedit.php:302
+#: ../../Code/Module/Connedit.php:302
 msgid "is now connected to"
 msgstr "ist jetzt verbunden mit"
 
-#: ../../Zotlabs/Module/Connedit.php:427
+#: ../../Code/Module/Connedit.php:427
 msgid "Could not access address book record."
 msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
 
-#: ../../Zotlabs/Module/Connedit.php:475
+#: ../../Code/Module/Connedit.php:475
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
-#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499
-#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Code/Module/Connedit.php:490 ../../Code/Module/Connedit.php:499
+#: ../../Code/Module/Connedit.php:508 ../../Code/Module/Connedit.php:517
+#: ../../Code/Module/Connedit.php:530
 msgid "Unable to set address book parameters."
 msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Code/Module/Connedit.php:554
 msgid "Connection has been removed."
 msgstr "Verbindung wurde gelöscht."
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247
+#: ../../Code/Module/Connedit.php:594 ../../Code/Lib/Apps.php:247
 #: ../../addon/openclipatar/openclipatar.php:57
 #: ../../include/conversation.php:1032 ../../include/nav.php:114
 msgid "View Profile"
 msgstr "Profil ansehen"
 
-#: ../../Zotlabs/Module/Connedit.php:597
+#: ../../Code/Module/Connedit.php:597
 #, php-format
 msgid "View %s's profile"
 msgstr "%ss Profil ansehen"
 
-#: ../../Zotlabs/Module/Connedit.php:601
+#: ../../Code/Module/Connedit.php:601
 msgid "Refresh Permissions"
 msgstr "Zugriffsrechte neu laden"
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Code/Module/Connedit.php:604
 msgid "Fetch updated permissions"
 msgstr "Aktualisierte Zugriffsrechte abrufen"
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Code/Module/Connedit.php:608
 msgid "Refresh Photo"
 msgstr "Foto aktualisieren"
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Code/Module/Connedit.php:611
 msgid "Fetch updated photo"
 msgstr "Aktualisiertes Profilfoto abrufen"
 
-#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042
+#: ../../Code/Module/Connedit.php:615 ../../include/conversation.php:1042
 msgid "Recent Activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Code/Module/Connedit.php:618
 msgid "View recent posts and comments"
 msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Code/Module/Connedit.php:625
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen"
 
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Code/Module/Connedit.php:626
 msgid "This connection is blocked!"
 msgstr "Die Verbindung ist geblockt!"
 
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connedit.php:630
 msgid "Unignore"
 msgstr "Nicht ignorieren"
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Code/Module/Connedit.php:633
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen"
 
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Code/Module/Connedit.php:634
 msgid "This connection is ignored!"
 msgstr "Die Verbindung wird ignoriert!"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Unarchive"
 msgstr "Aus Archiv zurückholen"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Code/Module/Connedit.php:641
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)"
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Code/Module/Connedit.php:642
 msgid "This connection is archived!"
 msgstr "Die Verbindung ist archiviert!"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Unhide"
 msgstr "Wieder sichtbar machen"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Hide"
 msgstr "Verstecken"
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Code/Module/Connedit.php:649
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Diese Verbindung vor anderen Verbindungen verstecken/zeigen"
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Code/Module/Connedit.php:650
 msgid "This connection is hidden!"
 msgstr "Die Verbindung ist versteckt!"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Code/Module/Connedit.php:657
 msgid "Delete this connection"
 msgstr "Verbindung löschen"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Code/Module/Connedit.php:665
 msgid "Fetch Vcard"
 msgstr "Vcard abrufen"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Code/Module/Connedit.php:668
 msgid "Fetch electronic calling card for this connection"
 msgstr "Rufe eine digitale Visitenkarte für diese Verbindung ab"
 
-#: ../../Zotlabs/Module/Connedit.php:679
+#: ../../Code/Module/Connedit.php:679
 msgid "Open Individual Permissions section by default"
 msgstr "Öffne standardmäßig den Bereich für individuelle Berechtigungen"
 
-#: ../../Zotlabs/Module/Connedit.php:702
+#: ../../Code/Module/Connedit.php:702
 msgid "Affinity"
 msgstr "Beziehung"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Code/Module/Connedit.php:705
 msgid "Open Set Affinity section by default"
 msgstr "Öffne standardmäßig den Bereich für Beziehungsgrad-Einstellungen"
 
-#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22
+#: ../../Code/Module/Connedit.php:709 ../../Code/Widget/Affinity.php:22
 msgid "Me"
 msgstr "Ich"
 
-#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23
+#: ../../Code/Module/Connedit.php:710 ../../Code/Widget/Affinity.php:23
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25
+#: ../../Code/Module/Connedit.php:712 ../../Code/Widget/Affinity.php:25
 msgid "Acquaintances"
 msgstr "Bekannte"
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Code/Module/Connedit.php:739
 msgid "Filter"
 msgstr "Filter"
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Code/Module/Connedit.php:742
 msgid "Open Custom Filter section by default"
 msgstr "Öffne standardmäßig den Bereich für benutzerdefinierte Filter"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Approve this connection"
 msgstr "Verbindung genehmigen"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Accept connection to allow communication"
 msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
 
-#: ../../Zotlabs/Module/Connedit.php:784
+#: ../../Code/Module/Connedit.php:784
 msgid "Set Affinity"
 msgstr "Beziehung festlegen"
 
-#: ../../Zotlabs/Module/Connedit.php:787
+#: ../../Code/Module/Connedit.php:787
 msgid "Set Profile"
 msgstr "Profil festlegen"
 
-#: ../../Zotlabs/Module/Connedit.php:790
+#: ../../Code/Module/Connedit.php:790
 msgid "Set Affinity & Profile"
 msgstr "Beziehung und Profile festlegen"
 
-#: ../../Zotlabs/Module/Connedit.php:838
+#: ../../Code/Module/Connedit.php:838
 msgid "This connection is unreachable from this location."
 msgstr "Diese Verbindung ist von diesem Ort unerreichbar."
 
-#: ../../Zotlabs/Module/Connedit.php:839
+#: ../../Code/Module/Connedit.php:839
 msgid "This connection may be unreachable from other channel locations."
 msgstr "Diese Verbindung könnte von anderen Standpunkten des Kanals nicht erreichbar sein."
 
-#: ../../Zotlabs/Module/Connedit.php:841
+#: ../../Code/Module/Connedit.php:841
 msgid "Location independence is not supported by their network."
 msgstr "Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt."
 
-#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Code/Module/Connedit.php:847
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr "Diese Verbindung ist von diesem Standort aus unerreichbar. Standort Unabhängigkeit wird vom anderen Netzwerk nicht unterstützt."
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
-#: ../../Zotlabs/Widget/Settings_menu.php:117
+#: ../../Code/Module/Connedit.php:850 ../../Code/Module/Defperms.php:238
+#: ../../Code/Widget/Settings_menu.php:117
 msgid "Connection Default Permissions"
 msgstr "Standardzugriffsrechte für neue Verbindungen:"
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214
+#: ../../Code/Module/Connedit.php:850 ../../include/items.php:4214
 #, php-format
 msgid "Connection: %s"
 msgstr "Verbindung: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Connedit.php:851 ../../Code/Module/Defperms.php:239
 msgid "Apply these permissions automatically"
 msgstr "Diese Berechtigungen automatisch anwenden"
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Code/Module/Connedit.php:851
 msgid "Connection requests will be approved without your interaction"
 msgstr "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist."
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
 msgid "Permission role"
 msgstr "Berechtigungsrolle"
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
-#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
+#: ../../Code/Widget/Notifications.php:151 ../../include/nav.php:284
 msgid "Loading"
 msgstr "Lädt..."
 
-#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241
+#: ../../Code/Module/Connedit.php:853 ../../Code/Module/Defperms.php:241
 msgid "Add permission role"
 msgstr "Berechtigungsrolle hinzufügen"
 
-#: ../../Zotlabs/Module/Connedit.php:860
+#: ../../Code/Module/Connedit.php:860
 msgid "This connection's primary address is"
 msgstr "Die Hauptadresse der Verbindung ist"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Code/Module/Connedit.php:861
 msgid "Available locations:"
 msgstr "Verfügbare Klone:"
 
-#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
+#: ../../Code/Module/Connedit.php:866 ../../Code/Module/Defperms.php:245
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
 
-#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Code/Module/Connedit.php:867
 msgid "Connection Tools"
 msgstr "Verbindungswerkzeuge"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Code/Module/Connedit.php:869
 msgid "Slide to adjust your degree of friendship"
 msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155
+#: ../../Code/Module/Connedit.php:870 ../../Code/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Bewertung"
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Code/Module/Connedit.php:871
 msgid "Slide to adjust your rating"
 msgstr "Verschieben, um Deine Bewertung einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877
+#: ../../Code/Module/Connedit.php:872 ../../Code/Module/Connedit.php:877
 msgid "Optionally explain your rating"
 msgstr "Optional kannst Du Deine Bewertung begründen"
 
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Code/Module/Connedit.php:874
 msgid "Custom Filter"
 msgstr "Benutzerdefinierter Filter"
 
-#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../Code/Module/Connedit.php:875
 msgid "Only import posts with this text"
 msgstr "Nur Beiträge mit diesem Text importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:875 ../../Code/Module/Connedit.php:876
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren."
 
-#: ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:876
 msgid "Do not import posts with this text"
 msgstr "Beiträge mit diesem Text nicht importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Code/Module/Connedit.php:878
 msgid "This information is public!"
 msgstr "Diese Information ist öffentlich!"
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Code/Module/Connedit.php:883
 msgid "Connection Pending Approval"
 msgstr "Verbindung wartet auf Bestätigung"
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Code/Module/Connedit.php:888
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../Zotlabs/Module/Connedit.php:895
+#: ../../Code/Module/Connedit.php:895
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -5779,217 +5779,217 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Einige Berechtigungen werden möglicherweise von den globalen Sicherheits- und Privatsphäre-Einstellungen dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen."
 
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Code/Module/Connedit.php:896
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../Code/Module/Connedit.php:904
 msgid "Details"
 msgstr "Details"
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Code/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Chatraum nicht gefunden"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Code/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Raum verlassen"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Code/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Raum löschen"
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Code/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Ich bin gerade nicht da"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Code/Module/Chat.php:200
 msgid "I am online"
 msgstr "Ich bin online"
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Code/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Lesezeichen für diesen Raum setzen"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315
+#: ../../Code/Module/Chat.php:205 ../../Code/Module/Mail.php:241
+#: ../../Code/Module/Mail.php:362 ../../include/conversation.php:1315
 msgid "Please enter a link URL:"
 msgstr "Gib eine URL ein:"
 
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766
+#: ../../Code/Module/Chat.php:206 ../../Code/Module/Mail.php:294
+#: ../../Code/Module/Mail.php:436 ../../Code/Lib/ThreadItem.php:766
 #: ../../include/conversation.php:1435
 msgid "Encrypt text"
 msgstr "Text verschlüsseln"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Neuer Chatraum"
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Code/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Chatraumname"
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Code/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Verfall von Chats (Minuten)"
 
-#: ../../Zotlabs/Module/Chat.php:250
+#: ../../Code/Module/Chat.php:250
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "%1$ss Chaträume"
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Code/Module/Chat.php:255
 msgid "No chatrooms available"
 msgstr "Keine Chaträume verfügbar"
 
-#: ../../Zotlabs/Module/Chat.php:259
+#: ../../Code/Module/Chat.php:259
 msgid "Expiration"
 msgstr "Verfall"
 
-#: ../../Zotlabs/Module/Chat.php:260
+#: ../../Code/Module/Chat.php:260
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248
+#: ../../Code/Module/Fbrowser.php:29 ../../Code/Lib/Apps.php:248
 #: ../../include/conversation.php:1834 ../../include/nav.php:401
 msgid "Photos"
 msgstr "Fotos"
 
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243
-#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842
+#: ../../Code/Module/Fbrowser.php:85 ../../Code/Lib/Apps.php:243
+#: ../../Code/Storage/Browser.php:272 ../../include/conversation.php:1842
 #: ../../include/nav.php:409
 msgid "Files"
 msgstr "Dateien"
 
-#: ../../Zotlabs/Module/Menu.php:49
+#: ../../Code/Module/Menu.php:49
 msgid "Unable to update menu."
 msgstr "Kann Menü nicht aktualisieren."
 
-#: ../../Zotlabs/Module/Menu.php:60
+#: ../../Code/Module/Menu.php:60
 msgid "Unable to create menu."
 msgstr "Kann Menü nicht erstellen."
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+#: ../../Code/Module/Menu.php:98 ../../Code/Module/Menu.php:110
 msgid "Menu Name"
 msgstr "Name des Menüs"
 
-#: ../../Zotlabs/Module/Menu.php:98
+#: ../../Code/Module/Menu.php:98
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+#: ../../Code/Module/Menu.php:99 ../../Code/Module/Menu.php:111
 msgid "Menu Title"
 msgstr "Menütitel"
 
-#: ../../Zotlabs/Module/Menu.php:99
+#: ../../Code/Module/Menu.php:99
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
 
-#: ../../Zotlabs/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:100
 msgid "Allow Bookmarks"
 msgstr "Lesezeichen erlauben"
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+#: ../../Code/Module/Menu.php:101 ../../Code/Module/Menu.php:159
 msgid "Submit and proceed"
 msgstr "Absenden und fortfahren"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423
+#: ../../Code/Module/Menu.php:107 ../../include/text.php:2423
 msgid "Menus"
 msgstr "Menüs"
 
-#: ../../Zotlabs/Module/Menu.php:117
+#: ../../Code/Module/Menu.php:117
 msgid "Bookmarks allowed"
 msgstr "Lesezeichen erlaubt"
 
-#: ../../Zotlabs/Module/Menu.php:119
+#: ../../Code/Module/Menu.php:119
 msgid "Delete this menu"
 msgstr "Lösche dieses Menü"
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+#: ../../Code/Module/Menu.php:120 ../../Code/Module/Menu.php:154
 msgid "Edit menu contents"
 msgstr "Bearbeite Menü Inhalte"
 
-#: ../../Zotlabs/Module/Menu.php:121
+#: ../../Code/Module/Menu.php:121
 msgid "Edit this menu"
 msgstr "Dieses Menü bearbeiten"
 
-#: ../../Zotlabs/Module/Menu.php:136
+#: ../../Code/Module/Menu.php:136
 msgid "Menu could not be deleted."
 msgstr "Menü konnte nicht gelöscht werden."
 
-#: ../../Zotlabs/Module/Menu.php:149
+#: ../../Code/Module/Menu.php:149
 msgid "Edit Menu"
 msgstr "Menü bearbeiten"
 
-#: ../../Zotlabs/Module/Menu.php:153
+#: ../../Code/Module/Menu.php:153
 msgid "Add or remove entries to this menu"
 msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Menu name"
 msgstr "Menü Name"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Must be unique, only seen by you"
 msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title"
 msgstr "Menü Titel"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title as seen by others"
 msgstr "Menü Titel wie er von anderen gesehen wird"
 
-#: ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:157
 msgid "Allow bookmarks"
 msgstr "Erlaube Lesezeichen"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424
+#: ../../Code/Module/Layouts.php:184 ../../include/text.php:2424
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251
+#: ../../Code/Module/Layouts.php:186 ../../Code/Lib/Apps.php:251
 #: ../../include/nav.php:176 ../../include/nav.php:280
 #: ../../include/help.php:68 ../../include/help.php:74
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../Zotlabs/Module/Layouts.php:186
+#: ../../Code/Module/Layouts.php:186
 msgid "Comanche page description language help"
 msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Code/Module/Layouts.php:190
 msgid "Layout Description"
 msgstr "Layout-Beschreibung"
 
-#: ../../Zotlabs/Module/Layouts.php:195
+#: ../../Code/Module/Layouts.php:195
 msgid "Download PDL file"
 msgstr "PDL-Datei herunterladen"
 
-#: ../../Zotlabs/Module/Cloud.php:120
+#: ../../Code/Module/Cloud.php:120
 msgid "Please refresh page"
 msgstr "Bitte die Seite neu laden"
 
-#: ../../Zotlabs/Module/Cloud.php:123
+#: ../../Code/Module/Cloud.php:123
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../../Zotlabs/Module/Email_validation.php:24
-#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Code/Module/Email_validation.php:24
+#: ../../Code/Module/Email_resend.php:12
 msgid "Token verification failed."
 msgstr "Überprüfung des Verifizierungscodes fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Email_validation.php:36
+#: ../../Code/Module/Email_validation.php:36
 msgid "Email Verification Required"
 msgstr "Email-Überprüfung erforderlich"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../Code/Module/Email_validation.php:37
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -5997,1164 +5997,1164 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr "Ein Verifizierungscode wurde an Deine Emailadresse versendet [%s]. Gib diesen Code hier ein, um die Überprüfung abzuschließen. Bedenke, dass die Zustellung der Mail einige Zeit dauern kann, und überprüfe ggf. auch Spam- und andere Filter-Ordner, falls die Nachricht nicht erscheint."
 
-#: ../../Zotlabs/Module/Email_validation.php:38
+#: ../../Code/Module/Email_validation.php:38
 msgid "Resend Email"
 msgstr "Email erneut versenden"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
+#: ../../Code/Module/Email_validation.php:41
 msgid "Validation token"
 msgstr "Verifizierungscode"
 
-#: ../../Zotlabs/Module/Tagger.php:48
+#: ../../Code/Module/Tagger.php:48
 msgid "Post not found."
 msgstr "Beitrag nicht gefunden."
 
-#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160
+#: ../../Code/Module/Tagger.php:77 ../../include/markdown.php:160
 #: ../../include/bbcode.php:352
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
+#: ../../Code/Module/Tagger.php:79 ../../include/conversation.php:146
 #: ../../include/text.php:2013
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../Zotlabs/Module/Tagger.php:119
+#: ../../Code/Module/Tagger.php:119
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:26 ../../Code/Module/Pconfig.php:59
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert."
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Code/Module/Pconfig.php:48
 msgid "Configuration Editor"
 msgstr "Konfigurationseditor"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Code/Module/Pconfig.php:49
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please"
 " leave this page unless you are comfortable with and knowledgeable about how"
 " to correctly use this feature."
 msgstr "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird."
 
-#: ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Defperms.php:239
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr "Ist dies aktiviert, werden Verbindungsanfragen ohne Deine aktive Zustimmung bestätigt."
 
-#: ../../Zotlabs/Module/Defperms.php:246
+#: ../../Code/Module/Defperms.php:246
 msgid "Automatic approval settings"
 msgstr "Einstellungen für automatische Bestätigung"
 
-#: ../../Zotlabs/Module/Defperms.php:254
+#: ../../Code/Module/Defperms.php:254
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
 msgstr "Einige individuelle Berechtigungen können basierend auf Deinen Kanal- und Privatsphäre-Einstellungen vorbelegt oder gesperrt sein."
 
-#: ../../Zotlabs/Module/Authorize.php:17
+#: ../../Code/Module/Authorize.php:17
 msgid "Unknown App"
 msgstr "Unbekannte Anwendung"
 
-#: ../../Zotlabs/Module/Authorize.php:22
+#: ../../Code/Module/Authorize.php:22
 msgid "Authorize"
 msgstr "Berechtigen"
 
-#: ../../Zotlabs/Module/Authorize.php:23
+#: ../../Code/Module/Authorize.php:23
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr "Willst du die Anwendung %s dazu berechtigen auf die Daten deines Kanals zuzugreifen?"
 
-#: ../../Zotlabs/Module/Authorize.php:25
+#: ../../Code/Module/Authorize.php:25
 msgid "Allow"
 msgstr "Erlauben"
 
-#: ../../Zotlabs/Module/Group.php:24
+#: ../../Code/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Gruppe wurde erstellt."
 
-#: ../../Zotlabs/Module/Group.php:30
+#: ../../Code/Module/Group.php:30
 msgid "Could not create privacy group."
 msgstr "Gruppe konnte nicht erstellt werden."
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
+#: ../../Code/Module/Group.php:42 ../../Code/Module/Group.php:143
 #: ../../include/items.php:4181
 msgid "Privacy group not found."
 msgstr "Gruppe nicht gefunden."
 
-#: ../../Zotlabs/Module/Group.php:58
+#: ../../Code/Module/Group.php:58
 msgid "Privacy group updated."
 msgstr "Gruppe wurde aktualisiert."
 
-#: ../../Zotlabs/Module/Group.php:92
+#: ../../Code/Module/Group.php:92
 msgid "Create a group of channels."
 msgstr "Erstelle eine Gruppe für Kanäle."
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186
+#: ../../Code/Module/Group.php:93 ../../Code/Module/Group.php:186
 msgid "Privacy group name: "
 msgstr "Gruppenname:"
 
-#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189
+#: ../../Code/Module/Group.php:95 ../../Code/Module/Group.php:189
 msgid "Members are visible to other channels"
 msgstr "Mitglieder sind sichtbar für andere Kanäle"
 
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Code/Module/Group.php:113
 msgid "Privacy group removed."
 msgstr "Gruppe wurde entfernt."
 
-#: ../../Zotlabs/Module/Group.php:115
+#: ../../Code/Module/Group.php:115
 msgid "Unable to remove privacy group."
 msgstr "Gruppe konnte nicht entfernt werden."
 
-#: ../../Zotlabs/Module/Group.php:185
+#: ../../Code/Module/Group.php:185
 msgid "Privacy group editor"
 msgstr "Gruppeneditor"
 
-#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81
+#: ../../Code/Module/Group.php:199 ../../Code/Module/Help.php:81
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../../Zotlabs/Module/Group.php:201
+#: ../../Code/Module/Group.php:201
 msgid "All Connected Channels"
 msgstr "Alle verbundenen Kanäle"
 
-#: ../../Zotlabs/Module/Group.php:233
+#: ../../Code/Module/Group.php:233
 msgid "Click on a channel to add or remove."
 msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+#: ../../Code/Module/Profiles.php:24 ../../Code/Module/Profiles.php:184
+#: ../../Code/Module/Profiles.php:241 ../../Code/Module/Profiles.php:659
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
-#: ../../Zotlabs/Module/Profiles.php:44
+#: ../../Code/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+#: ../../Code/Module/Profiles.php:68 ../../Code/Module/Profiles.php:105
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+#: ../../Code/Module/Profiles.php:90 ../../Code/Module/Profiles.php:127
 msgid "New profile created."
 msgstr "Neues Profil erstellt."
 
-#: ../../Zotlabs/Module/Profiles.php:111
+#: ../../Code/Module/Profiles.php:111
 msgid "Profile unavailable to clone."
 msgstr "Profil kann nicht geklont werden."
 
-#: ../../Zotlabs/Module/Profiles.php:146
+#: ../../Code/Module/Profiles.php:146
 msgid "Profile unavailable to export."
 msgstr "Dieses Profil kann nicht exportiert werden."
 
-#: ../../Zotlabs/Module/Profiles.php:252
+#: ../../Code/Module/Profiles.php:252
 msgid "Profile Name is required."
 msgstr "Profil-Name erforderlich."
 
-#: ../../Zotlabs/Module/Profiles.php:459
+#: ../../Code/Module/Profiles.php:459
 msgid "Marital Status"
 msgstr "Familienstand"
 
-#: ../../Zotlabs/Module/Profiles.php:463
+#: ../../Code/Module/Profiles.php:463
 msgid "Romantic Partner"
 msgstr "Romantische Partner"
 
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772
+#: ../../Code/Module/Profiles.php:467 ../../Code/Module/Profiles.php:772
 msgid "Likes"
 msgstr "Gefällt"
 
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773
+#: ../../Code/Module/Profiles.php:471 ../../Code/Module/Profiles.php:773
 msgid "Dislikes"
 msgstr "Gefällt nicht"
 
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780
+#: ../../Code/Module/Profiles.php:475 ../../Code/Module/Profiles.php:780
 msgid "Work/Employment"
 msgstr "Arbeit/Anstellung"
 
-#: ../../Zotlabs/Module/Profiles.php:478
+#: ../../Code/Module/Profiles.php:478
 msgid "Religion"
 msgstr "Religion"
 
-#: ../../Zotlabs/Module/Profiles.php:482
+#: ../../Code/Module/Profiles.php:482
 msgid "Political Views"
 msgstr "Politische Ansichten"
 
-#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../Code/Module/Profiles.php:486
 #: ../../addon/openid/MysqlProvider.php:74
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: ../../Zotlabs/Module/Profiles.php:490
+#: ../../Code/Module/Profiles.php:490
 msgid "Sexual Preference"
 msgstr "Sexuelle Orientierung"
 
-#: ../../Zotlabs/Module/Profiles.php:494
+#: ../../Code/Module/Profiles.php:494
 msgid "Homepage"
 msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Profiles.php:498
+#: ../../Code/Module/Profiles.php:498
 msgid "Interests"
 msgstr "Hobbys/Interessen"
 
-#: ../../Zotlabs/Module/Profiles.php:594
+#: ../../Code/Module/Profiles.php:594
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../Zotlabs/Module/Profiles.php:678
+#: ../../Code/Module/Profiles.php:678
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Deine Verbindungen vor Betrachtern dieses Profils verbergen"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Code/Module/Profiles.php:722
 msgid "Edit Profile Details"
 msgstr "Bearbeite Profil-Details"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Code/Module/Profiles.php:724
 msgid "View this profile"
 msgstr "Dieses Profil ansehen"
 
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824
+#: ../../Code/Module/Profiles.php:725 ../../Code/Module/Profiles.php:824
 #: ../../include/channel.php:1319
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Profile Tools"
 msgstr "Profilwerkzeuge"
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Change cover photo"
 msgstr "Titelbild ändern"
 
-#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289
+#: ../../Code/Module/Profiles.php:728 ../../include/channel.php:1289
 msgid "Change profile photo"
 msgstr "Profilfoto ändern"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Code/Module/Profiles.php:729
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Clone this profile"
 msgstr "Dieses Profil klonen"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Profiles.php:731
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Profiles.php:732
 msgid "Add profile things"
 msgstr "Sachen zum Profil hinzufügen"
 
-#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708
+#: ../../Code/Module/Profiles.php:733 ../../include/conversation.php:1708
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Relationship"
 msgstr "Beziehung"
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44
+#: ../../Code/Module/Profiles.php:736 ../../Code/Widget/Newmember.php:44
 #: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Import profile from file"
 msgstr "Profil aus einer Datei importieren"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Export profile to file"
 msgstr "Profil in eine Datei exportieren"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Your gender"
 msgstr "Dein Geschlecht"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Marital status"
 msgstr "Familienstand"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Code/Module/Profiles.php:742
 msgid "Sexual preference"
 msgstr "Sexuelle Orientierung"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:745
 msgid "Profile name"
 msgstr "Profilname"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Code/Module/Profiles.php:747
 msgid "This is your default profile."
 msgstr "Das ist Dein Standardprofil."
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Profiles.php:749
 msgid "Your full name"
 msgstr "Dein voller Name"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Code/Module/Profiles.php:750
 msgid "Title/Description"
 msgstr "Titel/Beschreibung"
 
-#: ../../Zotlabs/Module/Profiles.php:753
+#: ../../Code/Module/Profiles.php:753
 msgid "Street address"
 msgstr "Straße und Hausnummer"
 
-#: ../../Zotlabs/Module/Profiles.php:754
+#: ../../Code/Module/Profiles.php:754
 msgid "Locality/City"
 msgstr "Wohnort"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Code/Module/Profiles.php:755
 msgid "Region/State"
 msgstr "Region/Bundesstaat"
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Code/Module/Profiles.php:756
 msgid "Postal/Zip code"
 msgstr "Postleitzahl"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Who (if applicable)"
 msgstr "Wer (falls anwendbar)"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../Zotlabs/Module/Profiles.php:763
+#: ../../Code/Module/Profiles.php:763
 msgid "Since (date)"
 msgstr "Seit (Datum)"
 
-#: ../../Zotlabs/Module/Profiles.php:766
+#: ../../Code/Module/Profiles.php:766
 msgid "Tell us about yourself"
 msgstr "Erzähle uns ein wenig von Dir"
 
-#: ../../Zotlabs/Module/Profiles.php:767
+#: ../../Code/Module/Profiles.php:767
 #: ../../addon/openid/MysqlProvider.php:68
 msgid "Homepage URL"
 msgstr "Homepage-URL"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Code/Module/Profiles.php:768
 msgid "Hometown"
 msgstr "Heimatort"
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Code/Module/Profiles.php:769
 msgid "Political views"
 msgstr "Politische Ansichten"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Code/Module/Profiles.php:770
 msgid "Religious views"
 msgstr "Religiöse Ansichten"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Keywords used in directory listings"
 msgstr "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Angeln Fotografie Software"
 
-#: ../../Zotlabs/Module/Profiles.php:774
+#: ../../Code/Module/Profiles.php:774
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../Zotlabs/Module/Profiles.php:775
+#: ../../Code/Module/Profiles.php:775
 msgid "Books, literature"
 msgstr "Bücher, Literatur"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Code/Module/Profiles.php:776
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Code/Module/Profiles.php:777
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Film/Tanz/Kultur/Unterhaltung"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Profiles.php:778
 msgid "Hobbies/Interests"
 msgstr "Hobbys/Interessen"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Code/Module/Profiles.php:779
 msgid "Love/Romance"
 msgstr "Liebe/Romantik"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Code/Module/Profiles.php:781
 msgid "School/Education"
 msgstr "Schule/Ausbildung"
 
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Code/Module/Profiles.php:782
 msgid "Contact information and social networks"
 msgstr "Kontaktinformation und soziale Netzwerke"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Code/Module/Profiles.php:783
 msgid "My other channels"
 msgstr "Meine anderen Kanäle"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Code/Module/Profiles.php:785
 msgid "Communications"
 msgstr "Kommunikation"
 
-#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315
+#: ../../Code/Module/Profiles.php:820 ../../include/channel.php:1315
 msgid "Profile Image"
 msgstr "Profilfoto:"
 
-#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296
+#: ../../Code/Module/Profiles.php:830 ../../include/channel.php:1296
 #: ../../include/nav.php:117
 msgid "Edit Profiles"
 msgstr "Profile bearbeiten"
 
-#: ../../Zotlabs/Module/Go.php:21
+#: ../../Code/Module/Go.php:21
 msgid "This page is available only to site members"
 msgstr "Diese Seite ist nur für Mitglieder verfügbar"
 
-#: ../../Zotlabs/Module/Go.php:27
+#: ../../Code/Module/Go.php:27
 msgid "Welcome"
 msgstr "Willkommen"
 
-#: ../../Zotlabs/Module/Go.php:29
+#: ../../Code/Module/Go.php:29
 msgid "What would you like to do?"
 msgstr "Was möchtest Du gerne tun?"
 
-#: ../../Zotlabs/Module/Go.php:31
+#: ../../Code/Module/Go.php:31
 msgid ""
 "Please bookmark this page if you would like to return to it in the future"
 msgstr "Bitte speichere diese Seite in Deinen Lesezeichen, falls Du später zu ihr zurückkehren möchtest."
 
-#: ../../Zotlabs/Module/Go.php:35
+#: ../../Code/Module/Go.php:35
 msgid "Upload a profile photo"
 msgstr "Ein Profilfoto hochladen"
 
-#: ../../Zotlabs/Module/Go.php:36
+#: ../../Code/Module/Go.php:36
 msgid "Upload a cover photo"
 msgstr "Ein Titelbild hochladen"
 
-#: ../../Zotlabs/Module/Go.php:37
+#: ../../Code/Module/Go.php:37
 msgid "Edit your default profile"
 msgstr "Dein Standardprofil bearbeiten"
 
-#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34
+#: ../../Code/Module/Go.php:38 ../../Code/Widget/Newmember.php:34
 msgid "View friend suggestions"
 msgstr "Freundschafts- und Verbindungsvorschläge ansehen"
 
-#: ../../Zotlabs/Module/Go.php:39
+#: ../../Code/Module/Go.php:39
 msgid "View the channel directory"
 msgstr "Das Kanalverzeichnis ansehen"
 
-#: ../../Zotlabs/Module/Go.php:40
+#: ../../Code/Module/Go.php:40
 msgid "View/edit your channel settings"
 msgstr "Deine Kanaleinstellungen ansehen/bearbeiten"
 
-#: ../../Zotlabs/Module/Go.php:41
+#: ../../Code/Module/Go.php:41
 msgid "View the site or project documentation"
 msgstr "Die Website-/Projektdokumentation ansehen"
 
-#: ../../Zotlabs/Module/Go.php:42
+#: ../../Code/Module/Go.php:42
 msgid "Visit your channel homepage"
 msgstr "Deine Kanal-Startseite aufrufen"
 
-#: ../../Zotlabs/Module/Go.php:43
+#: ../../Code/Module/Go.php:43
 msgid ""
 "View your connections and/or add somebody whose address you already know"
 msgstr "Deine Verbindungen ansehen und/oder jemanden hinzufügen, dessen Kanal-Adresse Du bereits kennst"
 
-#: ../../Zotlabs/Module/Go.php:44
+#: ../../Code/Module/Go.php:44
 msgid ""
 "View your personal stream (this may be empty until you add some connections)"
 msgstr "Deinen persönlichen Beitragsstrom ansehen (dieser kann leer sein, bis Du ein paar Verbindungen hinzugefügt hast)"
 
-#: ../../Zotlabs/Module/Go.php:52
+#: ../../Code/Module/Go.php:52
 msgid "View the public stream. Warning: this content is not moderated"
 msgstr "Den öffentlichen Beitragsstrom ansehen. Warnung: Diese Inhalte sind nicht moderiert."
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
+#: ../../Code/Module/Editwebpage.php:139
 msgid "Page link"
 msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
+#: ../../Code/Module/Editwebpage.php:166
 msgid "Edit Webpage"
 msgstr "Webseite bearbeiten"
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Manage.php:145
 msgid "Create a new channel"
 msgstr "Neuen Kanal anlegen"
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240
+#: ../../Code/Module/Manage.php:170 ../../Code/Lib/Apps.php:240
 #: ../../include/nav.php:102 ../../include/nav.php:190
 msgid "Channel Manager"
 msgstr "Kanal-Manager"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Code/Module/Manage.php:171
 msgid "Current Channel"
 msgstr "Aktueller Kanal"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Code/Module/Manage.php:173
 msgid "Switch to one of your channels by selecting it."
 msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Code/Module/Manage.php:174
 msgid "Default Channel"
 msgstr "Standard Kanal"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Code/Module/Manage.php:175
 msgid "Make Default"
 msgstr "Zum Standard machen"
 
-#: ../../Zotlabs/Module/Manage.php:178
+#: ../../Code/Module/Manage.php:178
 #, php-format
 msgid "%d new messages"
 msgstr "%d neue Nachrichten"
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Code/Module/Manage.php:179
 #, php-format
 msgid "%d new introductions"
 msgstr "%d neue Vorstellungen"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Code/Module/Manage.php:181
 msgid "Delegated Channel"
 msgstr "Delegierte Kanäle"
 
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893
+#: ../../Code/Module/Cards.php:42 ../../Code/Module/Cards.php:194
+#: ../../Code/Lib/Apps.php:230 ../../include/conversation.php:1893
 #: ../../include/features.php:123 ../../include/nav.php:458
 msgid "Cards"
 msgstr "Karten"
 
-#: ../../Zotlabs/Module/Cards.php:99
+#: ../../Code/Module/Cards.php:99
 msgid "Add Card"
 msgstr "Karte hinzufügen"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
+#: ../../Code/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "Dieser Verzeichnisserver benötigt einen Zugriffstoken"
 
-#: ../../Zotlabs/Module/Siteinfo.php:18
+#: ../../Code/Module/Siteinfo.php:18
 msgid "About this site"
 msgstr "Über diese Seite"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Code/Module/Siteinfo.php:19
 msgid "Site Name"
 msgstr "Seitenname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:23
+#: ../../Code/Module/Siteinfo.php:23
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232
+#: ../../Code/Module/Siteinfo.php:25 ../../Code/Module/Register.php:232
 msgid "Terms of Service"
 msgstr "Nutzungsbedingungen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
+#: ../../Code/Module/Siteinfo.php:26
 msgid "Software and Project information"
 msgstr "Software und Projektinformationen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:27
+#: ../../Code/Module/Siteinfo.php:27
 msgid "This site is powered by $Projectname"
 msgstr "Diese Website wird bereitgestellt durch $Projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Code/Module/Siteinfo.php:28
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr "Verbundene, dezentrale Netzwerk- und Identitätsdienste, ermöglicht mittels Zot"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Code/Module/Siteinfo.php:30
 #, php-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../Code/Module/Siteinfo.php:31
 msgid "Project homepage"
 msgstr "Projekt-Website"
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Code/Module/Siteinfo.php:32
 msgid "Developer homepage"
 msgstr "Entwickler-Website"
 
-#: ../../Zotlabs/Module/Ratings.php:70
+#: ../../Code/Module/Ratings.php:70
 msgid "No ratings"
 msgstr "Keine Bewertungen"
 
-#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
+#: ../../Code/Module/Ratings.php:97 ../../Code/Module/Pubsites.php:35
 #: ../../include/conversation.php:1082
 msgid "Ratings"
 msgstr "Bewertungen"
 
-#: ../../Zotlabs/Module/Ratings.php:98
+#: ../../Code/Module/Ratings.php:98
 msgid "Rating: "
 msgstr "Bewertung: "
 
-#: ../../Zotlabs/Module/Ratings.php:99
+#: ../../Code/Module/Ratings.php:99
 msgid "Website: "
 msgstr "Webseite: "
 
-#: ../../Zotlabs/Module/Ratings.php:101
+#: ../../Code/Module/Ratings.php:101
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../../Zotlabs/Module/Webpages.php:54
+#: ../../Code/Module/Webpages.php:54
 msgid "Import Webpage Elements"
 msgstr "Webseitenelemente importieren"
 
-#: ../../Zotlabs/Module/Webpages.php:55
+#: ../../Code/Module/Webpages.php:55
 msgid "Import selected"
 msgstr "Import ausgewählt"
 
-#: ../../Zotlabs/Module/Webpages.php:78
+#: ../../Code/Module/Webpages.php:78
 msgid "Export Webpage Elements"
 msgstr "Webseitenelemente exportieren"
 
-#: ../../Zotlabs/Module/Webpages.php:79
+#: ../../Code/Module/Webpages.php:79
 msgid "Export selected"
 msgstr "Exportieren ausgewählt"
 
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244
+#: ../../Code/Module/Webpages.php:237 ../../Code/Lib/Apps.php:244
 #: ../../include/conversation.php:1915 ../../include/nav.php:481
 msgid "Webpages"
 msgstr "Webseiten"
 
-#: ../../Zotlabs/Module/Webpages.php:248
+#: ../../Code/Module/Webpages.php:248
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../../Zotlabs/Module/Webpages.php:249
+#: ../../Code/Module/Webpages.php:249
 msgid "Page Link"
 msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Code/Module/Webpages.php:250
 msgid "Page Title"
 msgstr "Seitentitel"
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Code/Module/Webpages.php:280
 msgid "Invalid file type."
 msgstr "Ungültiger Dateityp."
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Code/Module/Webpages.php:292
 msgid "Error opening zip file"
 msgstr "Fehler beim Öffnen der ZIP-Datei"
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Code/Module/Webpages.php:303
 msgid "Invalid folder path."
 msgstr "Ungültiger Ordnerpfad."
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Code/Module/Webpages.php:330
 msgid "No webpage elements detected."
 msgstr "Keine Webseitenelemente erkannt."
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Code/Module/Webpages.php:405
 msgid "Import complete."
 msgstr "Import abgeschlossen."
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
+#: ../../Code/Module/Changeaddr.php:35
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account"
 " password."
 msgstr "Innerhalb von 48 Stunden nach einer Änderung des Konto-Passworts können Kanäle nicht umbenannt werden."
 
-#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214
+#: ../../Code/Module/Changeaddr.php:46 ../../include/channel.php:214
 #: ../../include/channel.php:599
 msgid "Reserved nickname. Please choose another."
 msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
 
-#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219
+#: ../../Code/Module/Changeaddr.php:51 ../../include/channel.php:219
 #: ../../include/channel.php:604
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
+#: ../../Code/Module/Changeaddr.php:77
 msgid "Change channel nickname/address"
 msgstr "Kanalname/-adresse ändern"
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Changeaddr.php:78
 msgid "Any/all connections on other networks will be lost!"
 msgstr "Jegliche/alle Verbindungen zu anderen Netzwerken gehen verloren!"
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
+#: ../../Code/Module/Changeaddr.php:80
 msgid "New channel address"
 msgstr "Neue Kanaladresse"
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
+#: ../../Code/Module/Changeaddr.php:81
 msgid "Rename Channel"
 msgstr "Kanal umbenennen"
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+#: ../../Code/Module/Editpost.php:38 ../../Code/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144
+#: ../../Code/Module/Editpost.php:108 ../../Code/Module/Rpost.php:144
 msgid "Edit post"
 msgstr "Bearbeite Beitrag"
 
-#: ../../Zotlabs/Module/Dreport.php:45
+#: ../../Code/Module/Dreport.php:45
 msgid "Invalid message"
 msgstr "Ungültige Beitrags-ID (mid)"
 
-#: ../../Zotlabs/Module/Dreport.php:78
+#: ../../Code/Module/Dreport.php:78
 msgid "no results"
 msgstr "keine Ergebnisse"
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Code/Module/Dreport.php:93
 msgid "channel sync processed"
 msgstr "Kanal-Sync verarbeitet"
 
-#: ../../Zotlabs/Module/Dreport.php:97
+#: ../../Code/Module/Dreport.php:97
 msgid "queued"
 msgstr "zur Warteschlange hinzugefügt"
 
-#: ../../Zotlabs/Module/Dreport.php:101
+#: ../../Code/Module/Dreport.php:101
 msgid "posted"
 msgstr "zugestellt"
 
-#: ../../Zotlabs/Module/Dreport.php:105
+#: ../../Code/Module/Dreport.php:105
 msgid "accepted for delivery"
 msgstr "für Zustellung akzeptiert"
 
-#: ../../Zotlabs/Module/Dreport.php:109
+#: ../../Code/Module/Dreport.php:109
 msgid "updated"
 msgstr "aktualisiert"
 
-#: ../../Zotlabs/Module/Dreport.php:112
+#: ../../Code/Module/Dreport.php:112
 msgid "update ignored"
 msgstr "Aktualisierung ignoriert"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Code/Module/Dreport.php:115
 msgid "permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Code/Module/Dreport.php:119
 msgid "recipient not found"
 msgstr "Empfänger nicht gefunden."
 
-#: ../../Zotlabs/Module/Dreport.php:122
+#: ../../Code/Module/Dreport.php:122
 msgid "mail recalled"
 msgstr "Mail widerrufen"
 
-#: ../../Zotlabs/Module/Dreport.php:125
+#: ../../Code/Module/Dreport.php:125
 msgid "duplicate mail received"
 msgstr "Doppelte Mail erhalten"
 
-#: ../../Zotlabs/Module/Dreport.php:128
+#: ../../Code/Module/Dreport.php:128
 msgid "mail delivered"
 msgstr "Mail zugestellt"
 
-#: ../../Zotlabs/Module/Dreport.php:148
+#: ../../Code/Module/Dreport.php:148
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Zustellungsbericht für %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Code/Module/Dreport.php:151 ../../Code/Widget/Wiki_pages.php:39
+#: ../../Code/Widget/Wiki_pages.php:96
 msgid "Options"
 msgstr "Optionen"
 
-#: ../../Zotlabs/Module/Dreport.php:152
+#: ../../Code/Module/Dreport.php:152
 msgid "Redeliver"
 msgstr "Erneut zustellen"
 
-#: ../../Zotlabs/Module/Sources.php:37
+#: ../../Code/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
 
-#: ../../Zotlabs/Module/Sources.php:51
+#: ../../Code/Module/Sources.php:51
 msgid "Source created."
 msgstr "Quelle erstellt."
 
-#: ../../Zotlabs/Module/Sources.php:64
+#: ../../Code/Module/Sources.php:64
 msgid "Source updated."
 msgstr "Quelle aktualisiert."
 
-#: ../../Zotlabs/Module/Sources.php:90
+#: ../../Code/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292
+#: ../../Code/Module/Sources.php:96
+#: ../../Code/Widget/Settings_menu.php:133 ../../include/features.php:292
 msgid "Channel Sources"
 msgstr "Kanal-Quellen"
 
-#: ../../Zotlabs/Module/Sources.php:97
+#: ../../Code/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr "Externe Inhaltsquellen für Deinen Kanal verwalten."
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+#: ../../Code/Module/Sources.php:98 ../../Code/Module/Sources.php:108
 msgid "New Source"
 msgstr "Neue Quelle"
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+#: ../../Code/Module/Sources.php:109 ../../Code/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+#: ../../Code/Module/Sources.php:111 ../../Code/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "Name des Kanals"
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr "Füge die folgenden Kategorien zu Beiträgen, die aus dieser Quelle importiert werden, hinzu (kommagetrennt)"
 
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+#: ../../Code/Module/Sources.php:133 ../../Code/Module/Sources.php:161
 msgid "Source not found."
 msgstr "Quelle nicht gefunden."
 
-#: ../../Zotlabs/Module/Sources.php:140
+#: ../../Code/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "Quelle bearbeiten"
 
-#: ../../Zotlabs/Module/Sources.php:141
+#: ../../Code/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "Quelle löschen"
 
-#: ../../Zotlabs/Module/Sources.php:169
+#: ../../Code/Module/Sources.php:169
 msgid "Source removed"
 msgstr "Quelle gelöscht"
 
-#: ../../Zotlabs/Module/Sources.php:171
+#: ../../Code/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr "Konnte die Quelle nicht löschen."
 
-#: ../../Zotlabs/Module/Like.php:54
+#: ../../Code/Module/Like.php:54
 msgid "Like/Dislike"
 msgstr "Mögen/Nicht mögen"
 
-#: ../../Zotlabs/Module/Like.php:59
+#: ../../Code/Module/Like.php:59
 msgid "This action is restricted to members."
 msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
 
-#: ../../Zotlabs/Module/Like.php:60
+#: ../../Code/Module/Like.php:60
 msgid ""
 "Please login with your $Projectname ID or register as a new $Projectname member to continue."
 msgstr "Um fortzufahren melde Dich bitte mit Deiner $Projectname-ID an oder registriere Dich als neues $Projectname-Mitglied."
 
-#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135
-#: ../../Zotlabs/Module/Like.php:173
+#: ../../Code/Module/Like.php:109 ../../Code/Module/Like.php:135
+#: ../../Code/Module/Like.php:173
 msgid "Invalid request."
 msgstr "Ungültige Anfrage."
 
-#: ../../Zotlabs/Module/Like.php:121 ../../include/conversation.php:122
+#: ../../Code/Module/Like.php:121 ../../include/conversation.php:122
 msgid "channel"
 msgstr "Kanal"
 
-#: ../../Zotlabs/Module/Like.php:150
+#: ../../Code/Module/Like.php:150
 msgid "thing"
 msgstr "Sache"
 
-#: ../../Zotlabs/Module/Like.php:196
+#: ../../Code/Module/Like.php:196
 msgid "Channel unavailable."
 msgstr "Kanal nicht vorhanden."
 
-#: ../../Zotlabs/Module/Like.php:244
+#: ../../Code/Module/Like.php:244
 msgid "Previous action reversed."
 msgstr "Die vorherige Aktion wurde rückgängig gemacht."
 
-#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529
+#: ../../Code/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529
 #: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s gefällt %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442
+#: ../../Code/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442
 #: ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s gefällt %2$ss %3$s nicht"
 
-#: ../../Zotlabs/Module/Like.php:442
+#: ../../Code/Module/Like.php:442
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s stimmt %2$ss %3$s zu"
 
-#: ../../Zotlabs/Module/Like.php:444
+#: ../../Code/Module/Like.php:444
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s lehnt %2$ss %3$s ab"
 
-#: ../../Zotlabs/Module/Like.php:446
+#: ../../Code/Module/Like.php:446
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s enthält sich zu %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072
+#: ../../Code/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s nimmt an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074
+#: ../../Code/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
 
-#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076
+#: ../../Code/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Like.php:564
+#: ../../Code/Module/Like.php:564
 msgid "Action completed."
 msgstr "Aktion durchgeführt."
 
-#: ../../Zotlabs/Module/Like.php:565
+#: ../../Code/Module/Like.php:565
 msgid "Thank you."
 msgstr "Vielen Dank."
 
-#: ../../Zotlabs/Module/Directory.php:106
+#: ../../Code/Module/Directory.php:106
 msgid "No default suggestions were found."
 msgstr "Es wurden keine Standard Vorschläge gefunden."
 
-#: ../../Zotlabs/Module/Directory.php:255
+#: ../../Code/Module/Directory.php:255
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d Bewertung"
 msgstr[1] "%d Bewertungen"
 
-#: ../../Zotlabs/Module/Directory.php:266
+#: ../../Code/Module/Directory.php:266
 msgid "Gender: "
 msgstr "Geschlecht:"
 
-#: ../../Zotlabs/Module/Directory.php:268
+#: ../../Code/Module/Directory.php:268
 msgid "Status: "
 msgstr "Status:"
 
-#: ../../Zotlabs/Module/Directory.php:270
+#: ../../Code/Module/Directory.php:270
 msgid "Homepage: "
 msgstr "Webseite:"
 
-#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564
+#: ../../Code/Module/Directory.php:319 ../../include/channel.php:1564
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391
+#: ../../Code/Module/Directory.php:324 ../../include/channel.php:1391
 #: ../../include/event.php:54 ../../include/event.php:86
 msgid "Location:"
 msgstr "Ort:"
 
-#: ../../Zotlabs/Module/Directory.php:330
+#: ../../Code/Module/Directory.php:330
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593
+#: ../../Code/Module/Directory.php:335 ../../include/channel.php:1593
 msgid "Hometown:"
 msgstr "Heimatstadt:"
 
-#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599
+#: ../../Code/Module/Directory.php:337 ../../include/channel.php:1599
 msgid "About:"
 msgstr "Über:"
 
-#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../Code/Module/Directory.php:338 ../../Code/Module/Suggest.php:56
+#: ../../Code/Widget/Follow.php:32 ../../Code/Widget/Suggestions.php:44
 #: ../../include/conversation.php:1052 ../../include/channel.php:1376
 #: ../../include/connections.php:110
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../../Zotlabs/Module/Directory.php:339
+#: ../../Code/Module/Directory.php:339
 msgid "Public Forum:"
 msgstr "Öffentliches Forum:"
 
-#: ../../Zotlabs/Module/Directory.php:342
+#: ../../Code/Module/Directory.php:342
 msgid "Keywords: "
 msgstr "Schlüsselwörter:"
 
-#: ../../Zotlabs/Module/Directory.php:345
+#: ../../Code/Module/Directory.php:345
 msgid "Don't suggest"
 msgstr "Nicht vorschlagen"
 
-#: ../../Zotlabs/Module/Directory.php:347
+#: ../../Code/Module/Directory.php:347
 msgid "Common connections (estimated):"
 msgstr "Gemeinsame Verbindungen (geschätzt):"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Global Directory"
 msgstr "Globales Verzeichnis"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Local Directory"
 msgstr "Lokales Verzeichnis"
 
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Code/Module/Directory.php:402
 msgid "Finding:"
 msgstr "Ergebnisse:"
 
-#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Code/Module/Directory.php:405 ../../Code/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Kanal-Vorschläge"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "next page"
 msgstr "nächste Seite"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "previous page"
 msgstr "vorherige Seite"
 
-#: ../../Zotlabs/Module/Directory.php:408
+#: ../../Code/Module/Directory.php:408
 msgid "Sort options"
 msgstr "Sortieroptionen"
 
-#: ../../Zotlabs/Module/Directory.php:409
+#: ../../Code/Module/Directory.php:409
 msgid "Alphabetic"
 msgstr "alphabetisch"
 
-#: ../../Zotlabs/Module/Directory.php:410
+#: ../../Code/Module/Directory.php:410
 msgid "Reverse Alphabetic"
 msgstr "Entgegengesetzt alphabetisch"
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Code/Module/Directory.php:411
 msgid "Newest to Oldest"
 msgstr "Neueste zuerst"
 
-#: ../../Zotlabs/Module/Directory.php:412
+#: ../../Code/Module/Directory.php:412
 msgid "Oldest to Newest"
 msgstr "Älteste zuerst"
 
-#: ../../Zotlabs/Module/Directory.php:429
+#: ../../Code/Module/Directory.php:429
 msgid "No entries (some entries may be hidden)."
 msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
-#: ../../Zotlabs/Module/Xchan.php:10
+#: ../../Code/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr "Xchan-Suche"
 
-#: ../../Zotlabs/Module/Xchan.php:13
+#: ../../Code/Module/Xchan.php:13
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Code/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Code/Module/Suggest.php:58 ../../Code/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verstecken"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "Konnte Deinen Server nicht finden."
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "Veröffentlichung erfolgreich."
 
-#: ../../Zotlabs/Module/Mail.php:73
+#: ../../Code/Module/Mail.php:73
 msgid "Unable to lookup recipient."
 msgstr "Konnte den Empfänger nicht finden."
 
-#: ../../Zotlabs/Module/Mail.php:80
+#: ../../Code/Module/Mail.php:80
 msgid "Unable to communicate with requested channel."
 msgstr "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Mail.php:87
+#: ../../Code/Module/Mail.php:87
 msgid "Cannot verify requested channel."
 msgstr "Verifizierung des angeforderten Kanals fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Mail.php:105
+#: ../../Code/Module/Mail.php:105
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Mail.php:160
+#: ../../Code/Module/Mail.php:160
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../../Zotlabs/Module/Mail.php:173
+#: ../../Code/Module/Mail.php:173
 msgid "message"
 msgstr "Nachricht"
 
-#: ../../Zotlabs/Module/Mail.php:214
+#: ../../Code/Module/Mail.php:214
 msgid "Message recalled."
 msgstr "Nachricht widerrufen."
 
-#: ../../Zotlabs/Module/Mail.php:227
+#: ../../Code/Module/Mail.php:227
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
+#: ../../Code/Module/Mail.php:242 ../../Code/Module/Mail.php:363
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verfällt YYYY-MM-DD HH;MM"
 
-#: ../../Zotlabs/Module/Mail.php:270
+#: ../../Code/Module/Mail.php:270
 msgid "Requested channel is not in this network"
 msgstr "Angeforderter Kanal ist nicht in diesem Netzwerk."
 
-#: ../../Zotlabs/Module/Mail.php:278
+#: ../../Code/Module/Mail.php:278
 msgid "Send Private Message"
 msgstr "Private Nachricht senden"
 
-#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
+#: ../../Code/Module/Mail.php:279 ../../Code/Module/Mail.php:421
 msgid "To:"
 msgstr "An:"
 
-#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
+#: ../../Code/Module/Mail.php:282 ../../Code/Module/Mail.php:423
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../Code/Module/Mail.php:287 ../../Code/Module/Mail.php:429
 #: ../../include/conversation.php:1385
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../Zotlabs/Module/Mail.php:289
+#: ../../Code/Module/Mail.php:289
 msgid "Send"
 msgstr "Absenden"
 
-#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../Code/Module/Mail.php:292 ../../Code/Module/Mail.php:434
 #: ../../include/conversation.php:1430
 msgid "Set expiration date"
 msgstr "Verfallsdatum"
 
-#: ../../Zotlabs/Module/Mail.php:393
+#: ../../Code/Module/Mail.php:393
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../Zotlabs/Module/Mail.php:394
+#: ../../Code/Module/Mail.php:394
 msgid "Delivery report"
 msgstr "Zustellungsbericht"
 
-#: ../../Zotlabs/Module/Mail.php:395
+#: ../../Code/Module/Mail.php:395
 msgid "Recall message"
 msgstr "Nachricht widerrufen"
 
-#: ../../Zotlabs/Module/Mail.php:397
+#: ../../Code/Module/Mail.php:397
 msgid "Message has been recalled."
 msgstr "Die Nachricht wurde widerrufen."
 
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Code/Module/Mail.php:414
 msgid "Delete Conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../Zotlabs/Module/Mail.php:416
+#: ../../Code/Module/Mail.php:416
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "Keine sichere Kommunikation verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten."
 
-#: ../../Zotlabs/Module/Mail.php:420
+#: ../../Code/Module/Mail.php:420
 msgid "Send Reply"
 msgstr "Antwort senden"
 
-#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Code/Module/Mail.php:425
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Deine Nachricht für %s (%s):"
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+#: ../../Code/Module/Pubsites.php:24 ../../Code/Widget/Pubsites.php:12
 msgid "Public Hubs"
 msgstr "Öffentliche Hubs"
 
-#: ../../Zotlabs/Module/Pubsites.php:27
+#: ../../Code/Module/Pubsites.php:27
 msgid ""
 "The listed hubs allow public registration for the $Projectname network. All "
 "hubs in the network are interlinked so membership on any of them conveys "
@@ -7163,1518 +7163,1518 @@ msgid ""
 "additional details."
 msgstr "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im $Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs könnten jeweils nähere Informationen dazu stehen."
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr "Hub-URL"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr "Zugriffstyp"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr "Registrierungsrichtlinien"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Stats"
 msgstr "Statistiken"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Software"
 msgstr "Software"
 
-#: ../../Zotlabs/Module/Pubsites.php:49
+#: ../../Code/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Bewerten"
 
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267
+#: ../../Code/Module/Impel.php:43 ../../include/bbcode.php:267
 msgid "webpage"
 msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273
+#: ../../Code/Module/Impel.php:48 ../../include/bbcode.php:273
 msgid "block"
 msgstr "Block"
 
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270
+#: ../../Code/Module/Impel.php:53 ../../include/bbcode.php:270
 msgid "layout"
 msgstr "Layout"
 
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276
+#: ../../Code/Module/Impel.php:60 ../../include/bbcode.php:276
 msgid "menu"
 msgstr "Menü"
 
-#: ../../Zotlabs/Module/Impel.php:183
+#: ../../Code/Module/Impel.php:183
 #, php-format
 msgid "%s element installed"
 msgstr "Element für %s installiert"
 
-#: ../../Zotlabs/Module/Impel.php:186
+#: ../../Code/Module/Impel.php:186
 #, php-format
 msgid "%s element installation failed"
 msgstr "Installation des Elements %s fehlgeschlagen"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Code/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr "Lesezeichenordner wählen"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Code/Module/Rbmark.php:99
 msgid "Save Bookmark"
 msgstr "Lesezeichen speichern"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Code/Module/Rbmark.php:100
 msgid "URL of bookmark"
 msgstr "URL des Lesezeichens"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Code/Module/Rbmark.php:105
 msgid "Or enter new bookmark folder name"
 msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "Enter a folder name"
 msgstr "Gib einen Ordnernamen ein"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "or select an existing folder (doubleclick)"
 msgstr "oder wähle einen vorhanden Ordner aus (Doppelklick)"
 
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151
+#: ../../Code/Module/Filer.php:54 ../../Code/Lib/ThreadItem.php:151
 msgid "Save to Folder"
 msgstr "In Ordner speichern"
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Code/Module/Probe.php:30 ../../Code/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Code/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Code/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Code/Module/Register.php:89
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../../Zotlabs/Module/Register.php:132
+#: ../../Code/Module/Register.php:132
 msgid "Registration successful. Continue to create your first channel..."
 msgstr "Registrierung erfolgreich. Fahre fort, indem Du Deinen ersten Kanal anlegst..."
 
-#: ../../Zotlabs/Module/Register.php:135
+#: ../../Code/Module/Register.php:135
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
 
-#: ../../Zotlabs/Module/Register.php:142
+#: ../../Code/Module/Register.php:142
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../Zotlabs/Module/Register.php:145
+#: ../../Code/Module/Register.php:145
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../Zotlabs/Module/Register.php:192
+#: ../../Code/Module/Register.php:192
 msgid "Registration on this hub is disabled."
 msgstr "Die Registrierung auf diesem Hub ist nicht möglich."
 
-#: ../../Zotlabs/Module/Register.php:201
+#: ../../Code/Module/Register.php:201
 msgid "Registration on this hub is by approval only."
 msgstr "Eine Registrierung auf diesem Hub erfordert die Zustimmung durch den Administrator."
 
-#: ../../Zotlabs/Module/Register.php:202
+#: ../../Code/Module/Register.php:202
 msgid "Register at another affiliated hub."
 msgstr "Registriere Dich auf einem der anderen verbundenen Hubs."
 
-#: ../../Zotlabs/Module/Register.php:212
+#: ../../Code/Module/Register.php:212
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: ../../Zotlabs/Module/Register.php:238
+#: ../../Code/Module/Register.php:238
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Ich akzeptiere die %s für diese Webseite"
 
-#: ../../Zotlabs/Module/Register.php:245
+#: ../../Code/Module/Register.php:245
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Ich bin älter als %s Jahre und akzeptiere die %s dieser Website."
 
-#: ../../Zotlabs/Module/Register.php:250
+#: ../../Code/Module/Register.php:250
 msgid "Your email address"
 msgstr "Ihre E-Mail Adresse"
 
-#: ../../Zotlabs/Module/Register.php:251
+#: ../../Code/Module/Register.php:251
 msgid "Choose a password"
 msgstr "Passwort"
 
-#: ../../Zotlabs/Module/Register.php:252
+#: ../../Code/Module/Register.php:252
 msgid "Please re-enter your password"
 msgstr "Bitte gib Dein Passwort noch einmal ein"
 
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Code/Module/Register.php:253
 msgid "Please enter your invitation code"
 msgstr "Bitte trage Deinen Einladungs-Code ein"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Code/Module/Register.php:258
 msgid "no"
 msgstr "nein"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Code/Module/Register.php:258
 msgid "yes"
 msgstr "ja"
 
-#: ../../Zotlabs/Module/Register.php:274
+#: ../../Code/Module/Register.php:274
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570
+#: ../../Code/Module/Register.php:286 ../../boot.php:1570
 #: ../../include/nav.php:164
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../../Zotlabs/Module/Register.php:287
+#: ../../Code/Module/Register.php:287
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr "Diese Website erfordert eine Email-Bestätigung. Bitte prüfe Deine Emails nach Ausfüllen und Absenden des Formulars, um weitere Hinweise zu bekommen."
 
-#: ../../Zotlabs/Module/Cover_photo.php:136
-#: ../../Zotlabs/Module/Cover_photo.php:186
+#: ../../Code/Module/Cover_photo.php:136
+#: ../../Code/Module/Cover_photo.php:186
 msgid "Cover Photos"
 msgstr "Cover Foto"
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558
+#: ../../Code/Module/Cover_photo.php:237 ../../include/items.php:4558
 msgid "female"
 msgstr "weiblich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559
+#: ../../Code/Module/Cover_photo.php:238 ../../include/items.php:4559
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s hat ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560
+#: ../../Code/Module/Cover_photo.php:239 ../../include/items.php:4560
 msgid "male"
 msgstr "männlich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561
+#: ../../Code/Module/Cover_photo.php:240 ../../include/items.php:4561
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s hat sein %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563
+#: ../../Code/Module/Cover_photo.php:242 ../../include/items.php:4563
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s hat sein/ihr %2$s aktualisiert"
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070
+#: ../../Code/Module/Cover_photo.php:244 ../../include/channel.php:2070
 msgid "cover photo"
 msgstr "Cover Foto"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Code/Module/Cover_photo.php:361
 msgid "Change Cover Photo"
 msgstr "Titelbild ändern"
 
-#: ../../Zotlabs/Module/Help.php:23
+#: ../../Code/Module/Help.php:23
 msgid "Documentation Search"
 msgstr "Suche in der Dokumentation"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824
+#: ../../Code/Module/Help.php:80 ../../include/conversation.php:1824
 #: ../../include/nav.php:391
 msgid "About"
 msgstr "Über"
 
-#: ../../Zotlabs/Module/Help.php:82
+#: ../../Code/Module/Help.php:82
 msgid "Administrators"
 msgstr "Administratoren"
 
-#: ../../Zotlabs/Module/Help.php:83
+#: ../../Code/Module/Help.php:83
 msgid "Developers"
 msgstr "Entwickler"
 
-#: ../../Zotlabs/Module/Help.php:84
+#: ../../Code/Module/Help.php:84
 msgid "Tutorials"
 msgstr "Tutorials"
 
-#: ../../Zotlabs/Module/Help.php:95
+#: ../../Code/Module/Help.php:95
 msgid "$Projectname Documentation"
 msgstr "$Projectname-Dokumentation"
 
-#: ../../Zotlabs/Module/Help.php:96
+#: ../../Code/Module/Help.php:96
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../../Zotlabs/Module/Display.php:394
+#: ../../Code/Module/Display.php:394
 msgid "Article"
 msgstr "Artikel"
 
-#: ../../Zotlabs/Module/Display.php:446
+#: ../../Code/Module/Display.php:446
 msgid "Item has been removed."
 msgstr "Der Beitrag wurde entfernt."
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr "Schlagwort entfernt"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr "Schlagwort entfernen"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr "Schlagwort zum Entfernen auswählen:"
 
-#: ../../Zotlabs/Module/Network.php:100
+#: ../../Code/Module/Network.php:100
 msgid "No such group"
 msgstr "Gruppe nicht gefunden"
 
-#: ../../Zotlabs/Module/Network.php:142
+#: ../../Code/Module/Network.php:142
 msgid "No such channel"
 msgstr "Kanal nicht gefunden"
 
-#: ../../Zotlabs/Module/Network.php:147
+#: ../../Code/Module/Network.php:147
 msgid "forum"
 msgstr "Forum"
 
-#: ../../Zotlabs/Module/Network.php:159
+#: ../../Code/Module/Network.php:159
 msgid "Search Results For:"
 msgstr "Suchergebnisse für:"
 
-#: ../../Zotlabs/Module/Network.php:229
+#: ../../Code/Module/Network.php:229
 msgid "Privacy group is empty"
 msgstr "Gruppe ist leer"
 
-#: ../../Zotlabs/Module/Network.php:238
+#: ../../Code/Module/Network.php:238
 msgid "Privacy group: "
 msgstr "Gruppe:"
 
-#: ../../Zotlabs/Module/Network.php:265
+#: ../../Code/Module/Network.php:265
 msgid "Invalid connection."
 msgstr "Ungültige Verbindung."
 
-#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65
+#: ../../Code/Module/Network.php:285 ../../addon/redred/redred.php:65
 msgid "Invalid channel."
 msgstr "Ungültiger Kanal."
 
-#: ../../Zotlabs/Module/Acl.php:361
+#: ../../Code/Module/Acl.php:361
 msgid "network"
 msgstr "Netzwerk"
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
+#: ../../Code/Module/Home.php:74 ../../Code/Module/Home.php:82
+#: ../../Code/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../Zotlabs/Module/Home.php:92
+#: ../../Code/Module/Home.php:92
 #, php-format
 msgid "Welcome to %s"
 msgstr "Willkommen auf %s"
 
-#: ../../Zotlabs/Module/Filestorage.php:79
+#: ../../Code/Module/Filestorage.php:79
 msgid "Permission Denied."
 msgstr "Zugriff verweigert."
 
-#: ../../Zotlabs/Module/Filestorage.php:95
+#: ../../Code/Module/Filestorage.php:95
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: ../../Zotlabs/Module/Filestorage.php:142
+#: ../../Code/Module/Filestorage.php:142
 msgid "Edit file permissions"
 msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../Zotlabs/Module/Filestorage.php:154
+#: ../../Code/Module/Filestorage.php:154
 msgid "Set/edit permissions"
 msgstr "Berechtigungen setzen/ändern"
 
-#: ../../Zotlabs/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:155
 msgid "Include all files and sub folders"
 msgstr "Alle Dateien und Unterverzeichnisse einbinden"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Code/Module/Filestorage.php:156
 msgid "Return to file list"
 msgstr "Zurück zur Dateiliste"
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Code/Module/Filestorage.php:158
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Code/Module/Filestorage.php:159
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Code/Module/Filestorage.php:161
 msgid "Share this file"
 msgstr "Diese Datei freigeben"
 
-#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Code/Module/Filestorage.php:162
 msgid "Show URL to this file"
 msgstr "URL zu dieser Datei anzeigen"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397
 msgid "Show in your contacts shared folder"
 msgstr "Im geteilten Ordner Deiner Kontakte anzeigen"
 
-#: ../../Zotlabs/Module/Common.php:14
+#: ../../Code/Module/Common.php:14
 msgid "No channel."
 msgstr "Kein Kanal."
 
-#: ../../Zotlabs/Module/Common.php:45
+#: ../../Code/Module/Common.php:45
 msgid "No connections in common."
 msgstr "Keine gemeinsamen Verbindungen."
 
-#: ../../Zotlabs/Module/Common.php:65
+#: ../../Code/Module/Common.php:65
 msgid "View Common Connections"
 msgstr "Zeige gemeinsame Verbindungen"
 
-#: ../../Zotlabs/Module/Email_resend.php:30
+#: ../../Code/Module/Email_resend.php:30
 msgid "Email verification resent"
 msgstr "Email zur Verifizierung wurde erneut versendet"
 
-#: ../../Zotlabs/Module/Email_resend.php:33
+#: ../../Code/Module/Email_resend.php:33
 msgid "Unable to resend email verification message."
 msgstr "Erneutes Versenden der Email zur Verifizierung nicht möglich."
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
+#: ../../Code/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Keine Verbindungen."
 
-#: ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Code/Module/Viewconnections.php:83
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "%ss Profil [%s] besuchen"
 
-#: ../../Zotlabs/Module/Viewconnections.php:113
+#: ../../Code/Module/Viewconnections.php:113
 msgid "View Connections"
 msgstr "Verbindungen anzeigen"
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Code/Module/Admin.php:97
 msgid "Blocked accounts"
 msgstr "Blockierte Benutzerkonten"
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Code/Module/Admin.php:98
 msgid "Expired accounts"
 msgstr "Abgelaufene Benutzerkonten"
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Code/Module/Admin.php:99
 msgid "Expiring accounts"
 msgstr "Ablaufende Benutzerkonten"
 
-#: ../../Zotlabs/Module/Admin.php:112
+#: ../../Code/Module/Admin.php:112
 msgid "Clones"
 msgstr "Klone"
 
-#: ../../Zotlabs/Module/Admin.php:118
+#: ../../Code/Module/Admin.php:118
 msgid "Message queues"
 msgstr "Nachrichten-Warteschlangen"
 
-#: ../../Zotlabs/Module/Admin.php:132
+#: ../../Code/Module/Admin.php:132
 msgid "Your software should be updated"
 msgstr "Die installierte Software sollte aktualisiert werden"
 
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Code/Module/Admin.php:137
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../Zotlabs/Module/Admin.php:140
+#: ../../Code/Module/Admin.php:140
 msgid "Registered accounts"
 msgstr "Registrierte Konten"
 
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Code/Module/Admin.php:141
 msgid "Pending registrations"
 msgstr "Ausstehende Registrierungen"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Code/Module/Admin.php:142
 msgid "Registered channels"
 msgstr "Registrierte Kanäle"
 
-#: ../../Zotlabs/Module/Admin.php:143
+#: ../../Code/Module/Admin.php:143
 msgid "Active plugins"
 msgstr "Aktive Plug-Ins"
 
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Code/Module/Admin.php:144
 msgid "Version"
 msgstr "Version"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Code/Module/Admin.php:145
 msgid "Repository version (master)"
 msgstr "Repository-Version (master)"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Code/Module/Admin.php:146
 msgid "Repository version (dev)"
 msgstr "Repository-Version (dev)"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "Keine Dienstklassenbeschränkungen gefunden."
 
-#: ../../Zotlabs/Module/Rate.php:156
+#: ../../Code/Module/Rate.php:156
 msgid "Website:"
 msgstr "Webseite:"
 
-#: ../../Zotlabs/Module/Rate.php:159
+#: ../../Code/Module/Rate.php:159
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
 
-#: ../../Zotlabs/Module/Rate.php:160
+#: ../../Code/Module/Rate.php:160
 msgid "Rating (this information is public)"
 msgstr "Bewertung (öffentlich sichtbar)"
 
-#: ../../Zotlabs/Module/Rate.php:161
+#: ../../Code/Module/Rate.php:161
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
 
-#: ../../Zotlabs/Module/Card_edit.php:128
+#: ../../Code/Module/Card_edit.php:128
 msgid "Edit Card"
 msgstr "Karte bearbeiten"
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "Kein gültiges Konto gefunden."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:108
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Nutzer (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../Code/Module/Lostpass.php:44 ../../Code/Module/Lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Passwort-Rücksetzung auf %s angefordert"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../Code/Module/Lostpass.php:68
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598
+#: ../../Code/Module/Lostpass.php:91 ../../boot.php:1598
 msgid "Password Reset"
 msgstr "Zurücksetzen des Kennworts"
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your password has been reset as requested."
 msgstr "Dein Passwort wurde wie angefordert neu erstellt."
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Your new password is"
 msgstr "Dein neues Passwort lautet"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "Save or copy your new password - and then"
 msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid "click here to login"
 msgstr "Klicke hier, um dich anzumelden"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../Code/Module/Lostpass.php:96
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr "Dein Passwort kann unter Einstellungen nach einer erfolgreichen Anmeldung geändert werden."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
+#: ../../Code/Module/Lostpass.php:117
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Auf %s wurde Dein Passwort geändert"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Forgot your Password?"
 msgstr "Kennwort vergessen?"
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../Code/Module/Lostpass.php:131
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
 
-#: ../../Zotlabs/Module/Lostpass.php:132
+#: ../../Code/Module/Lostpass.php:132
 msgid "Email Address"
 msgstr "E-Mail Adresse"
 
-#: ../../Zotlabs/Module/Notifications.php:62
-#: ../../Zotlabs/Lib/ThreadItem.php:408
+#: ../../Code/Module/Notifications.php:62
+#: ../../Code/Lib/ThreadItem.php:408
 msgid "Mark all seen"
 msgstr "Alle als gelesen markieren"
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Code/Lib/Techlevels.php:10
 msgid "0. Beginner/Basic"
 msgstr "0. Einsteiger/Basis"
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Code/Lib/Techlevels.php:11
 msgid "1. Novice - not skilled but willing to learn"
 msgstr "1. Anfänger - unerfahren, aber bereit zu lernen"
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Code/Lib/Techlevels.php:12
 msgid "2. Intermediate - somewhat comfortable"
 msgstr "2. Fortgeschritten - relativ komfortabel"
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Code/Lib/Techlevels.php:13
 msgid "3. Advanced - very comfortable"
 msgstr "3. Fortgeschritten - sehr komfortabel"
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Code/Lib/Techlevels.php:14
 msgid "4. Expert - I can write computer code"
 msgstr "4. Experte - Ich kann Computercode schreiben"
 
-#: ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Code/Lib/Techlevels.php:15
 msgid "5. Wizard - I probably know more than you do"
 msgstr "5. Zauberer - ich kann wahrscheinlich mehr als Du"
 
-#: ../../Zotlabs/Lib/Apps.php:231
+#: ../../Code/Lib/Apps.php:231
 msgid "Site Admin"
 msgstr "Hub-Administration"
 
-#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16
+#: ../../Code/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr "Fehler melden"
 
-#: ../../Zotlabs/Lib/Apps.php:233
+#: ../../Code/Lib/Apps.php:233
 msgid "View Bookmarks"
 msgstr "Lesezeichen ansehen"
 
-#: ../../Zotlabs/Lib/Apps.php:234
+#: ../../Code/Lib/Apps.php:234
 msgid "My Chatrooms"
 msgstr "Meine Chaträume"
 
-#: ../../Zotlabs/Lib/Apps.php:236
+#: ../../Code/Lib/Apps.php:236
 msgid "Firefox Share"
 msgstr "Teilen-Knopf für Firefox"
 
-#: ../../Zotlabs/Lib/Apps.php:237
+#: ../../Code/Lib/Apps.php:237
 msgid "Remote Diagnostics"
 msgstr "Ferndiagnose"
 
-#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417
+#: ../../Code/Lib/Apps.php:238 ../../include/features.php:417
 msgid "Suggest Channels"
 msgstr "Kanäle vorschlagen"
 
-#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589
+#: ../../Code/Lib/Apps.php:239 ../../boot.php:1589
 #: ../../include/nav.php:126 ../../include/nav.php:130
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../../Zotlabs/Lib/Apps.php:241
+#: ../../Code/Lib/Apps.php:241
 msgid "Activity"
 msgstr "Aktivität"
 
-#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931
+#: ../../Code/Lib/Apps.php:245 ../../include/conversation.php:1931
 #: ../../include/features.php:96 ../../include/nav.php:497
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:246
+#: ../../Code/Lib/Apps.php:246
 msgid "Channel Home"
 msgstr "Mein Kanal"
 
-#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853
+#: ../../Code/Lib/Apps.php:249 ../../include/conversation.php:1853
 #: ../../include/conversation.php:1856
 msgid "Events"
 msgstr "Termine"
 
-#: ../../Zotlabs/Lib/Apps.php:250
+#: ../../Code/Lib/Apps.php:250
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../../Zotlabs/Lib/Apps.php:252
+#: ../../Code/Lib/Apps.php:252
 msgid "Mail"
 msgstr "Mail"
 
-#: ../../Zotlabs/Lib/Apps.php:255
+#: ../../Code/Lib/Apps.php:255
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../Zotlabs/Lib/Apps.php:257
+#: ../../Code/Lib/Apps.php:257
 msgid "Probe"
 msgstr "Testen"
 
-#: ../../Zotlabs/Lib/Apps.php:258
+#: ../../Code/Lib/Apps.php:258
 msgid "Suggest"
 msgstr "Empfehlen"
 
-#: ../../Zotlabs/Lib/Apps.php:259
+#: ../../Code/Lib/Apps.php:259
 msgid "Random Channel"
 msgstr "Zufälliger Kanal"
 
-#: ../../Zotlabs/Lib/Apps.php:260
+#: ../../Code/Lib/Apps.php:260
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../../Zotlabs/Lib/Apps.php:261 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Code/Lib/Apps.php:261 ../../Code/Widget/Admin.php:26
 msgid "Features"
 msgstr "Funktionen"
 
-#: ../../Zotlabs/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69
+#: ../../Code/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69
 msgid "Language"
 msgstr "Sprache"
 
-#: ../../Zotlabs/Lib/Apps.php:263
+#: ../../Code/Lib/Apps.php:263
 msgid "Post"
 msgstr "Beitrag schreiben"
 
-#: ../../Zotlabs/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58
+#: ../../Code/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
 #: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr "Profilfoto"
 
-#: ../../Zotlabs/Lib/Apps.php:407
+#: ../../Code/Lib/Apps.php:407
 msgid "Purchase"
 msgstr "Kaufen"
 
-#: ../../Zotlabs/Lib/Apps.php:411
+#: ../../Code/Lib/Apps.php:411
 msgid "Undelete"
 msgstr "Wieder hergestellt"
 
-#: ../../Zotlabs/Lib/Apps.php:419
+#: ../../Code/Lib/Apps.php:419
 msgid "Add to app-tray"
 msgstr "Zum App-Menü hinzufügen"
 
-#: ../../Zotlabs/Lib/Apps.php:420
+#: ../../Code/Lib/Apps.php:420
 msgid "Remove from app-tray"
 msgstr "Aus dem App-Menü entfernen"
 
-#: ../../Zotlabs/Lib/Apps.php:421
+#: ../../Code/Lib/Apps.php:421
 msgid "Pin to navbar"
 msgstr "An Navigationsleiste anpinnen"
 
-#: ../../Zotlabs/Lib/Apps.php:422
+#: ../../Code/Lib/Apps.php:422
 msgid "Unpin from navbar"
 msgstr "Von Navigationsleiste entfernen"
 
-#: ../../Zotlabs/Lib/Permcat.php:82
+#: ../../Code/Lib/Permcat.php:82
 msgctxt "permcat"
 msgid "default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Lib/Permcat.php:133
+#: ../../Code/Lib/Permcat.php:133
 msgctxt "permcat"
 msgid "follower"
 msgstr "Abonnent"
 
-#: ../../Zotlabs/Lib/Permcat.php:137
+#: ../../Code/Lib/Permcat.php:137
 msgctxt "permcat"
 msgid "contributor"
 msgstr "Beitragender"
 
-#: ../../Zotlabs/Lib/Permcat.php:141
+#: ../../Code/Lib/Permcat.php:141
 msgctxt "permcat"
 msgid "publisher"
 msgstr "Autor"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:93
+#: ../../Code/Lib/NativeWikiPage.php:42
+#: ../../Code/Lib/NativeWikiPage.php:93
 msgid "(No Title)"
 msgstr "(Kein Titel)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:107
+#: ../../Code/Lib/NativeWikiPage.php:107
 msgid "Wiki page create failed."
 msgstr "Anlegen der Wiki-Seite fehlgeschlagen."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:120
+#: ../../Code/Lib/NativeWikiPage.php:120
 msgid "Wiki not found."
 msgstr "Wiki nicht gefunden."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:131
+#: ../../Code/Lib/NativeWikiPage.php:131
 msgid "Destination name already exists"
 msgstr "Zielname bereits vorhanden"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:163
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Code/Lib/NativeWikiPage.php:163
+#: ../../Code/Lib/NativeWikiPage.php:359
 msgid "Page not found"
 msgstr "Seite nicht gefunden"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:194
+#: ../../Code/Lib/NativeWikiPage.php:194
 msgid "Error reading page content"
 msgstr "Fehler beim Lesen des Seiteninhalts"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:350
-#: ../../Zotlabs/Lib/NativeWikiPage.php:400
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Code/Lib/NativeWikiPage.php:350
+#: ../../Code/Lib/NativeWikiPage.php:400
+#: ../../Code/Lib/NativeWikiPage.php:467
+#: ../../Code/Lib/NativeWikiPage.php:508
 msgid "Error reading wiki"
 msgstr "Fehler beim Lesen des Wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:388
+#: ../../Code/Lib/NativeWikiPage.php:388
 msgid "Page update failed."
 msgstr "Seitenaktualisierung fehlgeschlagen."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:422
+#: ../../Code/Lib/NativeWikiPage.php:422
 msgid "Nothing deleted"
 msgstr "Nichts gelöscht"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:488
+#: ../../Code/Lib/NativeWikiPage.php:488
 msgid "Compare: object not found."
 msgstr "Vergleichen: Objekt nicht gefunden."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:494
+#: ../../Code/Lib/NativeWikiPage.php:494
 msgid "Page updated"
 msgstr "Seite aktualisiert"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
+#: ../../Code/Lib/NativeWikiPage.php:497
 msgid "Untitled"
 msgstr "Ohne Titel"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:503
+#: ../../Code/Lib/NativeWikiPage.php:503
 msgid "Wiki resource_id required for git commit"
 msgstr "Die resource_id des Wiki wird benötigt für den git commit."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:559
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+#: ../../Code/Lib/NativeWikiPage.php:559
+#: ../../Code/Widget/Wiki_page_history.php:23
 msgctxt "wiki_history"
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744
+#: ../../Code/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744
 #: ../../include/bbcode.php:914
 msgid "Different viewers will see this text differently"
 msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../Code/Lib/PermissionDescription.php:34
 #: ../../include/acl_selectors.php:33
 msgid "Visible to your default audience"
 msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../Code/Lib/PermissionDescription.php:107
 #: ../../include/acl_selectors.php:106
 msgid "Only me"
 msgstr "Nur ich"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Code/Lib/PermissionDescription.php:108
 msgid "Public"
 msgstr "Öffentlich"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#: ../../Code/Lib/PermissionDescription.php:109
 msgid "Anybody in the $Projectname network"
 msgstr "Jeder innerhalb des $Projectname Netzwerks"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#: ../../Code/Lib/PermissionDescription.php:110
 #, php-format
 msgid "Any account on %s"
 msgstr "Jedes Nutzerkonto auf %s"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
+#: ../../Code/Lib/PermissionDescription.php:111
 msgid "Any of my connections"
 msgstr "Alle meine Verbindungen"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
+#: ../../Code/Lib/PermissionDescription.php:112
 msgid "Only connections I specifically allow"
 msgstr "Nur Verbindungen, denen ich es explizit erlaube"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
+#: ../../Code/Lib/PermissionDescription.php:113
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
+#: ../../Code/Lib/PermissionDescription.php:114
 msgid "Any connections including those who haven't yet been approved"
 msgstr "Alle Verbindungen einschließlich der noch nicht bestätigten"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
+#: ../../Code/Lib/PermissionDescription.php:150
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
 msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner normalen Beiträge (Stream)."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
+#: ../../Code/Lib/PermissionDescription.php:151
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deines Standard-Kanalprofils."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
+#: ../../Code/Lib/PermissionDescription.php:152
 msgid "This is your default setting for who can view your connections"
 msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
+#: ../../Code/Lib/PermissionDescription.php:153
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Dateien und Fotos."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
+#: ../../Code/Lib/PermissionDescription.php:154
 msgid "This is your default setting for the audience of your webpages"
 msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten."
 
-#: ../../Zotlabs/Lib/Chatroom.php:23
+#: ../../Code/Lib/Chatroom.php:23
 msgid "Missing room name"
 msgstr "Der Chatraum hat keinen Namen"
 
-#: ../../Zotlabs/Lib/Chatroom.php:32
+#: ../../Code/Lib/Chatroom.php:32
 msgid "Duplicate room name"
 msgstr "Name des Chatraums bereits vergeben"
 
-#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90
+#: ../../Code/Lib/Chatroom.php:82 ../../Code/Lib/Chatroom.php:90
 msgid "Invalid room specifier."
 msgstr "Ungültiger Raumbezeichner."
 
-#: ../../Zotlabs/Lib/Chatroom.php:122
+#: ../../Code/Lib/Chatroom.php:122
 msgid "Room not found."
 msgstr "Chatraum konnte nicht gefunden werden."
 
-#: ../../Zotlabs/Lib/Chatroom.php:143
+#: ../../Code/Lib/Chatroom.php:143
 msgid "Room is full"
 msgstr "Der Chatraum ist voll"
 
-#: ../../Zotlabs/Lib/Enotify.php:60
+#: ../../Code/Lib/Enotify.php:60
 msgid "$Projectname Notification"
 msgstr "$Projectname-Benachrichtigung"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308
+#: ../../Code/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308
 #: ../../addon/diaspora/util.php:321 ../../addon/diaspora/p.php:48
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63
+#: ../../Code/Lib/Enotify.php:63
 msgid "Thank You,"
 msgstr "Danke."
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33
+#: ../../Code/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:66
+#: ../../Code/Lib/Enotify.php:66
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr "Diese Email wurde von %1$s auf %2$s gesendet."
 
-#: ../../Zotlabs/Lib/Enotify.php:67
+#: ../../Code/Lib/Enotify.php:67
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
 "at %s"
 msgstr "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine Benachrichtigungseinstellungen unter folgendem Link an: %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Lib/Enotify.php:68
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine %s an."
 
-#: ../../Zotlabs/Lib/Enotify.php:123
+#: ../../Code/Lib/Enotify.php:123
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Code/Lib/Enotify.php:127
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname:Benachrichtigung] Neue Mail empfangen auf %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:129
+#: ../../Code/Lib/Enotify.php:129
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$shat dir auf %2$seine private Nachricht geschickt."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s hat Dir %2$s geschickt."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 msgid "a private message"
 msgstr "eine private Nachricht"
 
-#: ../../Zotlabs/Lib/Enotify.php:131
+#: ../../Code/Lib/Enotify.php:131
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
 
-#: ../../Zotlabs/Lib/Enotify.php:144
+#: ../../Code/Lib/Enotify.php:144
 msgid "commented on"
 msgstr "kommentierte"
 
-#: ../../Zotlabs/Lib/Enotify.php:155
+#: ../../Code/Lib/Enotify.php:155
 msgid "liked"
 msgstr "gefiel"
 
-#: ../../Zotlabs/Lib/Enotify.php:158
+#: ../../Code/Lib/Enotify.php:158
 msgid "disliked"
 msgstr "missfiel"
 
-#: ../../Zotlabs/Lib/Enotify.php:201
+#: ../../Code/Lib/Enotify.php:201
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]ein %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:209
+#: ../../Code/Lib/Enotify.php:209
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:218
+#: ../../Code/Lib/Enotify.php:218
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]dein %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:230
+#: ../../Code/Lib/Enotify.php:230
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Benachrichtigung] Moderierter Kommantar in Unterhaltung #%1$d von %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../Code/Lib/Enotify.php:232
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:233
+#: ../../Code/Lib/Enotify.php:233
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr "%1$shat einen Beitrag/eine Konversation kommentiert dem/der du folgst."
 
-#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317
-#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358
-#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Code/Lib/Enotify.php:236 ../../Code/Lib/Enotify.php:317
+#: ../../Code/Lib/Enotify.php:333 ../../Code/Lib/Enotify.php:358
+#: ../../Code/Lib/Enotify.php:375 ../../Code/Lib/Enotify.php:388
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
 
-#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241
+#: ../../Code/Lib/Enotify.php:240 ../../Code/Lib/Enotify.php:241
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Bitte besuche %s, um diesen Kommentar anzunehmen oder abzulehnen."
 
-#: ../../Zotlabs/Lib/Enotify.php:299
+#: ../../Code/Lib/Enotify.php:299
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr "%1$s mag [zrl=%2$s]dein %3$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:313
+#: ../../Code/Lib/Enotify.php:313
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Benachrichtigung] Gefällt mir in Unterhaltung #%1$d von %2$s erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:314
+#: ../../Code/Lib/Enotify.php:314
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr "%1$sgefällt ein Beitrag/eine Unterhaltung von dir."
 
-#: ../../Zotlabs/Lib/Enotify.php:325
+#: ../../Code/Lib/Enotify.php:325
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Benachrichtigung] %s schrieb auf Deine Pinnwand"
 
-#: ../../Zotlabs/Lib/Enotify.php:327
+#: ../../Code/Lib/Enotify.php:327
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$shat etwas auf deiner Profilwand auf %2$sveröffentlicht"
 
-#: ../../Zotlabs/Lib/Enotify.php:329
+#: ../../Code/Lib/Enotify.php:329
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$s schrieb auf [zrl=%2$s]Deine Pinnwand[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:352
+#: ../../Code/Lib/Enotify.php:352
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Benachrichtigung] %s hat Dich erwähnt"
 
-#: ../../Zotlabs/Lib/Enotify.php:353
+#: ../../Code/Lib/Enotify.php:353
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s hat dich auf %2$s getaggt"
 
-#: ../../Zotlabs/Lib/Enotify.php:354
+#: ../../Code/Lib/Enotify.php:354
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s hat [zrl=%2$s]Dich getagged[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:365
+#: ../../Code/Lib/Enotify.php:365
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Benachrichtigung] %1$s hat Dich angestupst"
 
-#: ../../Zotlabs/Lib/Enotify.php:366
+#: ../../Code/Lib/Enotify.php:366
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s hat dich auf %2$s angestupst"
 
-#: ../../Zotlabs/Lib/Enotify.php:367
+#: ../../Code/Lib/Enotify.php:367
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s]hat dich angestupst.[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:382
+#: ../../Code/Lib/Enotify.php:382
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
 
-#: ../../Zotlabs/Lib/Enotify.php:383
+#: ../../Code/Lib/Enotify.php:383
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s hat Deinen Beitrag auf %2$s getagged"
 
-#: ../../Zotlabs/Lib/Enotify.php:384
+#: ../../Code/Lib/Enotify.php:384
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s hat [zrl=%2$s]Deinen Beitrag[/zrl] getagged"
 
-#: ../../Zotlabs/Lib/Enotify.php:395
+#: ../../Code/Lib/Enotify.php:395
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Benachrichtigung] Verbindungsanfrage erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:396
+#: ../../Code/Lib/Enotify.php:396
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr "Du hast auf %2$s eine neue Verbindung von %1$s erhalten."
 
-#: ../../Zotlabs/Lib/Enotify.php:397
+#: ../../Code/Lib/Enotify.php:397
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr "Du hast [zrl=%1$s]eine neue Verbindungsanfrage[/zrl] von %2$s erhalten."
 
-#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418
+#: ../../Code/Lib/Enotify.php:400 ../../Code/Lib/Enotify.php:418
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Du kannst Dir das Profil unter %s ansehen"
 
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Code/Lib/Enotify.php:402
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
 
-#: ../../Zotlabs/Lib/Enotify.php:409
+#: ../../Code/Lib/Enotify.php:409
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Benachrichtigung] Freundschaftsvorschlag erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:410
+#: ../../Code/Lib/Enotify.php:410
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Du hast einen Freundschaftsvorschlag von %1$s auf %2$s erhalten"
 
-#: ../../Zotlabs/Lib/Enotify.php:411
+#: ../../Code/Lib/Enotify.php:411
 #, php-format
 msgid ""
 "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr "Du hast einen [zrl=%1$s]Freundschaftsvorschlag[/zrl] für %2$s von %3$s erhalten."
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Code/Lib/Enotify.php:416
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Code/Lib/Enotify.php:417
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../Zotlabs/Lib/Enotify.php:420
+#: ../../Code/Lib/Enotify.php:420
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../Zotlabs/Lib/Enotify.php:640
+#: ../../Code/Lib/Enotify.php:640
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Benachrichtigung]"
 
-#: ../../Zotlabs/Lib/Enotify.php:808
+#: ../../Code/Lib/Enotify.php:808
 msgid "created a new post"
 msgstr "Neuer Beitrag wurde erzeugt"
 
-#: ../../Zotlabs/Lib/Enotify.php:809
+#: ../../Code/Lib/Enotify.php:809
 #, php-format
 msgid "commented on %s's post"
 msgstr "hat %s's Beitrag kommentiert"
 
-#: ../../Zotlabs/Lib/Enotify.php:816
+#: ../../Code/Lib/Enotify.php:816
 #, php-format
 msgid "edited a post dated %s"
 msgstr "hat einen Beitrag vom %s bearbeitet"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Code/Lib/Enotify.php:820
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "hat einen Kommentar vom %s bearbeitet"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:151
+#: ../../Code/Lib/NativeWiki.php:151
 msgid "Wiki updated successfully"
 msgstr "Wiki erfolgreich aktualisiert"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:205
+#: ../../Code/Lib/NativeWiki.php:205
 msgid "Wiki files deleted successfully"
 msgstr "Wiki-Dateien erfolgreich gelöscht"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:83
+#: ../../Code/Lib/DB_Upgrade.php:83
 #, php-format
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:89
+#: ../../Code/Lib/DB_Upgrade.php:89
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697
+#: ../../Code/Lib/ThreadItem.php:97 ../../include/conversation.php:697
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689
+#: ../../Code/Lib/ThreadItem.php:147 ../../include/conversation.php:689
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I will attend"
 msgstr "Ich werde teilnehmen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I will not attend"
 msgstr "Ich werde nicht teilnehmen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I might attend"
 msgstr "Ich werde vielleicht teilnehmen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I agree"
 msgstr "Ich stimme zu"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I disagree"
 msgstr "Ich lehne ab"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I abstain"
 msgstr "Ich enthalte mich"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:238
+#: ../../Code/Lib/ThreadItem.php:238
 msgid "Add Star"
 msgstr "Stern hinzufügen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:239
+#: ../../Code/Lib/ThreadItem.php:239
 msgid "Remove Star"
 msgstr "Stern entfernen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240
+#: ../../Code/Lib/ThreadItem.php:240
 msgid "Toggle Star Status"
 msgstr "Markierungsstatus (Stern) umschalten"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:244
+#: ../../Code/Lib/ThreadItem.php:244
 msgid "starred"
 msgstr "markiert"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704
+#: ../../Code/Lib/ThreadItem.php:254 ../../include/conversation.php:704
 msgid "Message signature validated"
 msgstr "Signatur überprüft"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705
+#: ../../Code/Lib/ThreadItem.php:255 ../../include/conversation.php:705
 msgid "Message signature incorrect"
 msgstr "Signatur nicht korrekt"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:263
+#: ../../Code/Lib/ThreadItem.php:263
 msgid "Add Tag"
 msgstr "Tag hinzufügen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575
+#: ../../Code/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575
 msgid "like"
 msgstr "mag"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576
+#: ../../Code/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576
 msgid "dislike"
 msgstr "verurteile"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Code/Lib/ThreadItem.php:286
 msgid "Share This"
 msgstr "Teilen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Code/Lib/ThreadItem.php:286
 msgid "share"
 msgstr "Teilen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:295
+#: ../../Code/Lib/ThreadItem.php:295
 msgid "Delivery Report"
 msgstr "Zustellungsbericht"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:313
+#: ../../Code/Lib/ThreadItem.php:313
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344
+#: ../../Code/Lib/ThreadItem.php:343 ../../Code/Lib/ThreadItem.php:344
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Schaue Dir %ss Profil an – %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:347
+#: ../../Code/Lib/ThreadItem.php:347
 msgid "to"
 msgstr "an"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../Code/Lib/ThreadItem.php:348
 msgid "via"
 msgstr "via"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:349
+#: ../../Code/Lib/ThreadItem.php:349
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350
+#: ../../Code/Lib/ThreadItem.php:350
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763
+#: ../../Code/Lib/ThreadItem.php:363 ../../include/conversation.php:763
 #, php-format
 msgid "from %s"
 msgstr "via %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766
+#: ../../Code/Lib/ThreadItem.php:366 ../../include/conversation.php:766
 #, php-format
 msgid "last edited: %s"
 msgstr "zuletzt bearbeitet: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767
+#: ../../Code/Lib/ThreadItem.php:367 ../../include/conversation.php:767
 #, php-format
 msgid "Expires: %s"
 msgstr "Verfällt: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:374
+#: ../../Code/Lib/ThreadItem.php:374
 msgid "Attend"
 msgstr "Zusagen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:375
+#: ../../Code/Lib/ThreadItem.php:375
 msgid "Attendance Options"
 msgstr "Zusageoptionen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:376
+#: ../../Code/Lib/ThreadItem.php:376
 msgid "Vote"
 msgstr "Abstimmen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:377
+#: ../../Code/Lib/ThreadItem.php:377
 msgid "Voting Options"
 msgstr "Abstimmungsoptionen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:398
+#: ../../Code/Lib/ThreadItem.php:398
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr "Favoriten speichern"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:399
+#: ../../Code/Lib/ThreadItem.php:399
 msgid "Add to Calendar"
 msgstr "Zum Kalender hinzufügen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483
+#: ../../Code/Lib/ThreadItem.php:426 ../../include/conversation.php:483
 msgid "This is an unsaved preview"
 msgstr "Dies ist eine nicht gespeicherte Vorschau"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7
+#: ../../Code/Lib/ThreadItem.php:458 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s mehr anzeigen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380
+#: ../../Code/Lib/ThreadItem.php:753 ../../include/conversation.php:1380
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381
+#: ../../Code/Lib/ThreadItem.php:754 ../../include/conversation.php:1381
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382
+#: ../../Code/Lib/ThreadItem.php:755 ../../include/conversation.php:1382
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383
+#: ../../Code/Lib/ThreadItem.php:756 ../../include/conversation.php:1383
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384
+#: ../../Code/Lib/ThreadItem.php:757 ../../include/conversation.php:1384
 msgid "Code"
 msgstr "Code"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:758
+#: ../../Code/Lib/ThreadItem.php:758
 msgid "Image"
 msgstr "Bild"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:759
+#: ../../Code/Lib/ThreadItem.php:759
 msgid "Attach File"
 msgstr "Datei anhängen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:760
+#: ../../Code/Lib/ThreadItem.php:760
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:761
+#: ../../Code/Lib/ThreadItem.php:761
 msgid "Video"
 msgstr "Video"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:771
+#: ../../Code/Lib/ThreadItem.php:771
 msgid "Your full name (required)"
 msgstr "Ihr vollständiger Name (erforderlich)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:772
+#: ../../Code/Lib/ThreadItem.php:772
 msgid "Your email address (required)"
 msgstr "Ihre E-Mail-Adresse (erforderlich)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:773
+#: ../../Code/Lib/ThreadItem.php:773
 msgid "Your website URL (optional)"
 msgstr "Ihre Webseiten-URL (optional)"
 
-#: ../../Zotlabs/Zot/Auth.php:152
+#: ../../Code/Zot/Auth.php:152
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
 
-#: ../../Zotlabs/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
+#: ../../Code/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
 #: ../../addon/openid/Mod_Openid.php:178
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287
+#: ../../Code/Storage/Browser.php:107 ../../Code/Storage/Browser.php:287
 msgid "parent"
 msgstr "Übergeordnetes Verzeichnis"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845
+#: ../../Code/Storage/Browser.php:131 ../../include/text.php:2845
 msgid "Collection"
 msgstr "Sammlung"
 
-#: ../../Zotlabs/Storage/Browser.php:134
+#: ../../Code/Storage/Browser.php:134
 msgid "Principal"
 msgstr "Prinzipal"
 
-#: ../../Zotlabs/Storage/Browser.php:137
+#: ../../Code/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420
+#: ../../Code/Storage/Browser.php:140 ../../include/nav.php:420
 #: ../../include/nav.php:423
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:143
+#: ../../Code/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Posteingang für überwachte Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:146
+#: ../../Code/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "Postausgang für überwachte Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:273
+#: ../../Code/Storage/Browser.php:273
 msgid "Total"
 msgstr "Summe"
 
-#: ../../Zotlabs/Storage/Browser.php:275
+#: ../../Code/Storage/Browser.php:275
 msgid "Shared"
 msgstr "Geteilt"
 
-#: ../../Zotlabs/Storage/Browser.php:277
+#: ../../Code/Storage/Browser.php:277
 msgid "Add Files"
 msgstr "Dateien hinzufügen"
 
-#: ../../Zotlabs/Storage/Browser.php:353
+#: ../../Code/Storage/Browser.php:353
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Sie verwenden %1$s von Ihrem verfügbaren Dateispeicher."
 
-#: ../../Zotlabs/Storage/Browser.php:358
+#: ../../Code/Storage/Browser.php:358
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "Sie verwenden %1$s von %2$s verfügbarem Dateispeicher. (%3$s%)"
 
-#: ../../Zotlabs/Storage/Browser.php:369
+#: ../../Code/Storage/Browser.php:369
 msgid "WARNING:"
 msgstr "WARNUNG:"
 
-#: ../../Zotlabs/Storage/Browser.php:381
+#: ../../Code/Storage/Browser.php:381
 msgid "Create new folder"
 msgstr "Neuen Ordner anlegen"
 
-#: ../../Zotlabs/Storage/Browser.php:383
+#: ../../Code/Storage/Browser.php:383
 msgid "Upload file"
 msgstr "Datei hochladen"
 
-#: ../../Zotlabs/Storage/Browser.php:396
+#: ../../Code/Storage/Browser.php:396
 msgid "Drop files here to immediately upload"
 msgstr "Dateien zum sofortigen Hochladen hier fallen lassen"
 
-#: ../../Zotlabs/Widget/Forums.php:100
+#: ../../Code/Widget/Forums.php:100
 msgid "Forums"
 msgstr "Foren"
 
-#: ../../Zotlabs/Widget/Cdav.php:37
+#: ../../Code/Widget/Cdav.php:37
 msgid "Select Channel"
 msgstr "Kanal auswählen"
 
-#: ../../Zotlabs/Widget/Cdav.php:42
+#: ../../Code/Widget/Cdav.php:42
 msgid "Read-write"
 msgstr "Lesen-schreiben"
 
-#: ../../Zotlabs/Widget/Cdav.php:43
+#: ../../Code/Widget/Cdav.php:43
 msgid "Read-only"
 msgstr "Nur Lesen"
 
-#: ../../Zotlabs/Widget/Cdav.php:117
+#: ../../Code/Widget/Cdav.php:117
 msgid "My Calendars"
 msgstr "Meine Kalender"
 
-#: ../../Zotlabs/Widget/Cdav.php:119
+#: ../../Code/Widget/Cdav.php:119
 msgid "Shared Calendars"
 msgstr "Geteilte Kalender"
 
-#: ../../Zotlabs/Widget/Cdav.php:123
+#: ../../Code/Widget/Cdav.php:123
 msgid "Share this calendar"
 msgstr "Diesen Kalender teilen"
 
-#: ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Code/Widget/Cdav.php:125
 msgid "Calendar name and color"
 msgstr "Kalendername und -farbe"
 
-#: ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Code/Widget/Cdav.php:127
 msgid "Create new calendar"
 msgstr "Neuen Kalender erstellen"
 
-#: ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Code/Widget/Cdav.php:129
 msgid "Calendar Name"
 msgstr "Kalendername"
 
-#: ../../Zotlabs/Widget/Cdav.php:130
+#: ../../Code/Widget/Cdav.php:130
 msgid "Calendar Tools"
 msgstr "Kalenderwerkzeuge"
 
-#: ../../Zotlabs/Widget/Cdav.php:131
+#: ../../Code/Widget/Cdav.php:131
 msgid "Import calendar"
 msgstr "Kalender importieren"
 
-#: ../../Zotlabs/Widget/Cdav.php:132
+#: ../../Code/Widget/Cdav.php:132
 msgid "Select a calendar to import to"
 msgstr "Kalender zum Hineinimportieren auswählen"
 
-#: ../../Zotlabs/Widget/Cdav.php:159
+#: ../../Code/Widget/Cdav.php:159
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
-#: ../../Zotlabs/Widget/Cdav.php:161
+#: ../../Code/Widget/Cdav.php:161
 msgid "Addressbook name"
 msgstr "Adressbuchname"
 
-#: ../../Zotlabs/Widget/Cdav.php:163
+#: ../../Code/Widget/Cdav.php:163
 msgid "Create new addressbook"
 msgstr "Neues Adressbuch erstellen"
 
-#: ../../Zotlabs/Widget/Cdav.php:164
+#: ../../Code/Widget/Cdav.php:164
 msgid "Addressbook Name"
 msgstr "Adressbuchname"
 
-#: ../../Zotlabs/Widget/Cdav.php:166
+#: ../../Code/Widget/Cdav.php:166
 msgid "Addressbook Tools"
 msgstr "Adressbuchwerkzeuge"
 
-#: ../../Zotlabs/Widget/Cdav.php:167
+#: ../../Code/Widget/Cdav.php:167
 msgid "Import addressbook"
 msgstr "Adressbuch importieren"
 
-#: ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Code/Widget/Cdav.php:168
 msgid "Select an addressbook to import to"
 msgstr "Adressbuch zum Hineinimportieren auswählen"
 
-#: ../../Zotlabs/Widget/Appcategories.php:40
+#: ../../Code/Widget/Appcategories.php:40
 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141
 #: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409
 #: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511
@@ -8682,438 +8682,438 @@ msgstr "Adressbuch zum Hineinimportieren auswählen"
 msgid "Categories"
 msgstr "Kategorien"
 
-#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31
+#: ../../Code/Widget/Appcategories.php:43 ../../Code/Widget/Filer.php:31
 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100
 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189
 msgid "Everything"
 msgstr "Alles"
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
+#: ../../Code/Widget/Eventstools.php:13
 msgid "Events Tools"
 msgstr "Kalenderwerkzeuge"
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
+#: ../../Code/Widget/Eventstools.php:14
 msgid "Export Calendar"
 msgstr "Kalender exportieren"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
+#: ../../Code/Widget/Eventstools.php:15
 msgid "Import Calendar"
 msgstr "Kalender importieren"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
+#: ../../Code/Widget/Suggestedchats.php:32
 msgid "Suggested Chatrooms"
 msgstr "Chatraum-Vorschläge"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
+#: ../../Code/Widget/Hq_controls.php:14
 msgid "HQ Control Panel"
 msgstr "HQ-Einstellungen"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
+#: ../../Code/Widget/Hq_controls.php:17
 msgid "Create a new post"
 msgstr "Neuen Beitrag erstellen"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
+#: ../../Code/Widget/Mailmenu.php:13
 msgid "Private Mail Menu"
 msgstr "Private Nachrichten"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
+#: ../../Code/Widget/Mailmenu.php:15
 msgid "Combined View"
 msgstr "Kombinierte Anzeige"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20
+#: ../../Code/Widget/Mailmenu.php:20
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
+#: ../../Code/Widget/Mailmenu.php:25
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
+#: ../../Code/Widget/Mailmenu.php:30
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../Code/Widget/Chatroom_list.php:16
 #: ../../include/conversation.php:1867 ../../include/conversation.php:1870
 #: ../../include/nav.php:434 ../../include/nav.php:437
 msgid "Chatrooms"
 msgstr "Chaträume"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
+#: ../../Code/Widget/Chatroom_list.php:20
 msgid "Overview"
 msgstr "Übersicht"
 
-#: ../../Zotlabs/Widget/Rating.php:51
+#: ../../Code/Widget/Rating.php:51
 msgid "Rating Tools"
 msgstr "Bewertungswerkzeuge"
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+#: ../../Code/Widget/Rating.php:55 ../../Code/Widget/Rating.php:57
 msgid "Rate Me"
 msgstr "Bewerte mich"
 
-#: ../../Zotlabs/Widget/Rating.php:60
+#: ../../Code/Widget/Rating.php:60
 msgid "View Ratings"
 msgstr "Bewertungen ansehen"
 
-#: ../../Zotlabs/Widget/Activity.php:50
+#: ../../Code/Widget/Activity.php:50
 msgctxt "widget"
 msgid "Activity"
 msgstr "Aktivität"
 
-#: ../../Zotlabs/Widget/Follow.php:22
+#: ../../Code/Widget/Follow.php:22
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
 
-#: ../../Zotlabs/Widget/Follow.php:29
+#: ../../Code/Widget/Follow.php:29
 msgid "Add New Connection"
 msgstr "Neue Verbindung hinzufügen"
 
-#: ../../Zotlabs/Widget/Follow.php:30
+#: ../../Code/Widget/Follow.php:30
 msgid "Enter channel address"
 msgstr "Adresse des Kanals eingeben"
 
-#: ../../Zotlabs/Widget/Follow.php:31
+#: ../../Code/Widget/Follow.php:31
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr "Beispiele: bob@beispiel.com, http://beispiel.com/barbara"
 
-#: ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../Code/Widget/Wiki_list.php:15
 msgid "Wiki List"
 msgstr "Wikiliste"
 
-#: ../../Zotlabs/Widget/Archive.php:43
+#: ../../Code/Widget/Archive.php:43
 msgid "Archives"
 msgstr "Archive"
 
-#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Code/Widget/Conversations.php:17
 msgid "Received Messages"
 msgstr "Erhaltene Nachrichten"
 
-#: ../../Zotlabs/Widget/Conversations.php:21
+#: ../../Code/Widget/Conversations.php:21
 msgid "Sent Messages"
 msgstr "Gesendete Nachrichten"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Code/Widget/Conversations.php:25
 msgid "Conversations"
 msgstr "Konversationen"
 
-#: ../../Zotlabs/Widget/Conversations.php:37
+#: ../../Code/Widget/Conversations.php:37
 msgid "No messages."
 msgstr "Keine Nachrichten."
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Code/Widget/Conversations.php:57
 msgid "Delete conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
+#: ../../Code/Widget/Chatroom_members.php:11
 msgid "Chat Members"
 msgstr "Chatmitglieder"
 
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+#: ../../Code/Widget/Photo.php:48 ../../Code/Widget/Photo_rand.php:58
 msgid "photo/image"
 msgstr "Foto/Bild"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
+#: ../../Code/Widget/Savedsearch.php:75
 msgid "Remove term"
 msgstr "Eintrag löschen"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381
+#: ../../Code/Widget/Savedsearch.php:83 ../../include/features.php:381
 msgid "Saved Searches"
 msgstr "Gespeicherte Suchanfragen"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333
+#: ../../Code/Widget/Savedsearch.php:84 ../../include/group.php:333
 msgid "add"
 msgstr "hinzufügen"
 
-#: ../../Zotlabs/Widget/Notes.php:16
+#: ../../Code/Widget/Notes.php:16
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:89
+#: ../../Code/Widget/Wiki_pages.php:32
+#: ../../Code/Widget/Wiki_pages.php:89
 msgid "Add new page"
 msgstr "Neue Seite hinzufügen"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:83
+#: ../../Code/Widget/Wiki_pages.php:83
 msgid "Wiki Pages"
 msgstr "Wikiseiten"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:94
+#: ../../Code/Widget/Wiki_pages.php:94
 msgid "Page name"
 msgstr "Seitenname"
 
-#: ../../Zotlabs/Widget/Affinity.php:45
+#: ../../Code/Widget/Affinity.php:45
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
+#: ../../Code/Widget/Tasklist.php:23
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../../Zotlabs/Widget/Suggestions.php:51
+#: ../../Code/Widget/Suggestions.php:51
 msgid "Suggestions"
 msgstr "Vorschläge"
 
-#: ../../Zotlabs/Widget/Suggestions.php:52
+#: ../../Code/Widget/Suggestions.php:52
 msgid "See more..."
 msgstr "Mehr anzeigen …"
 
-#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../Code/Widget/Filer.php:28 ../../include/contact_widgets.php:53
 #: ../../include/features.php:470
 msgid "Saved Folders"
 msgstr "Gespeicherte Ordner"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:54
+#: ../../Code/Widget/Cover_photo.php:54
 msgid "Click to show more"
 msgstr "Klick, um mehr anzuzeigen"
 
-#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320
+#: ../../Code/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320
 #: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470
 msgid "Tags"
 msgstr "Schlagwörter"
 
-#: ../../Zotlabs/Widget/Newmember.php:24
+#: ../../Code/Widget/Newmember.php:24
 msgid "Profile Creation"
 msgstr "Profilerstellung"
 
-#: ../../Zotlabs/Widget/Newmember.php:26
+#: ../../Code/Widget/Newmember.php:26
 msgid "Upload profile photo"
 msgstr "Profilfoto hochladen"
 
-#: ../../Zotlabs/Widget/Newmember.php:27
+#: ../../Code/Widget/Newmember.php:27
 msgid "Upload cover photo"
 msgstr "Titelbild hochladen"
 
-#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119
+#: ../../Code/Widget/Newmember.php:28 ../../include/nav.php:119
 msgid "Edit your profile"
 msgstr "Profil bearbeiten"
 
-#: ../../Zotlabs/Widget/Newmember.php:31
+#: ../../Code/Widget/Newmember.php:31
 msgid "Find and Connect with others"
 msgstr "Finden und Verbinden von/mit Anderen"
 
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Code/Widget/Newmember.php:33
 msgid "View the directory"
 msgstr "Verzeichnis anzeigen"
 
-#: ../../Zotlabs/Widget/Newmember.php:35
+#: ../../Code/Widget/Newmember.php:35
 msgid "Manage your connections"
 msgstr "Deine Verbindungen verwalten"
 
-#: ../../Zotlabs/Widget/Newmember.php:38
+#: ../../Code/Widget/Newmember.php:38
 msgid "Communicate"
 msgstr "Kommunizieren"
 
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Code/Widget/Newmember.php:40
 msgid "View your channel homepage"
 msgstr "Deine Kanal-Startseite ansehen"
 
-#: ../../Zotlabs/Widget/Newmember.php:41
+#: ../../Code/Widget/Newmember.php:41
 msgid "View your network stream"
 msgstr "Deine Netzwerk-Aktivitäten ansehen"
 
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Code/Widget/Newmember.php:47
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: ../../Zotlabs/Widget/Newmember.php:58
+#: ../../Code/Widget/Newmember.php:58
 msgid "View public stream"
 msgstr "Zeige öffentlichen Beitrags-Stream"
 
-#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60
+#: ../../Code/Widget/Newmember.php:62 ../../include/features.php:60
 msgid "New Member Links"
 msgstr "Links für neue Mitglieder"
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+#: ../../Code/Widget/Admin.php:23 ../../Code/Widget/Admin.php:60
 msgid "Member registrations waiting for confirmation"
 msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
 
-#: ../../Zotlabs/Widget/Admin.php:29
+#: ../../Code/Widget/Admin.php:29
 msgid "Inspect queue"
 msgstr "Warteschlange kontrollieren"
 
-#: ../../Zotlabs/Widget/Admin.php:31
+#: ../../Code/Widget/Admin.php:31
 msgid "DB updates"
 msgstr "DB-Aktualisierungen"
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199
+#: ../../Code/Widget/Admin.php:55 ../../include/nav.php:199
 msgid "Admin"
 msgstr "Administration"
 
-#: ../../Zotlabs/Widget/Admin.php:56
+#: ../../Code/Widget/Admin.php:56
 msgid "Plugin Features"
 msgstr "Plug-In Funktionen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:35
+#: ../../Code/Widget/Settings_menu.php:35
 msgid "Account settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:41
+#: ../../Code/Widget/Settings_menu.php:41
 msgid "Channel settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:50
+#: ../../Code/Widget/Settings_menu.php:50
 msgid "Additional features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:57
+#: ../../Code/Widget/Settings_menu.php:57
 msgid "Addon settings"
 msgstr "Addon-Einstellungen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:63
+#: ../../Code/Widget/Settings_menu.php:63
 msgid "Display settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:70
+#: ../../Code/Widget/Settings_menu.php:70
 msgid "Manage locations"
 msgstr "Klon-Adressen verwalten"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:77
+#: ../../Code/Widget/Settings_menu.php:77
 msgid "Export channel"
 msgstr "Kanal exportieren"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:84
+#: ../../Code/Widget/Settings_menu.php:84
 msgid "OAuth1 apps"
 msgstr "OAuth1 Anwendungen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:92
+#: ../../Code/Widget/Settings_menu.php:92
 msgid "OAuth2 apps"
 msgstr "OAuth2 Anwendungen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240
+#: ../../Code/Widget/Settings_menu.php:108 ../../include/features.php:240
 msgid "Permission Groups"
 msgstr "Berechtigungsrollen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:125
+#: ../../Code/Widget/Settings_menu.php:125
 msgid "Premium Channel Settings"
 msgstr "Premium-Kanal-Einstellungen"
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+#: ../../Code/Widget/Bookmarkedchats.php:24
 msgid "Bookmarked Chatrooms"
 msgstr "Gespeicherte Chatrooms"
 
-#: ../../Zotlabs/Widget/Notifications.php:16
+#: ../../Code/Widget/Notifications.php:16
 msgid "New Network Activity"
 msgstr "Neue Netzwerk-Aktivitäten"
 
-#: ../../Zotlabs/Widget/Notifications.php:17
+#: ../../Code/Widget/Notifications.php:17
 msgid "New Network Activity Notifications"
 msgstr "Benachrichtigungen für neue Netzwerk-Aktivitäten"
 
-#: ../../Zotlabs/Widget/Notifications.php:20
+#: ../../Code/Widget/Notifications.php:20
 msgid "View your network activity"
 msgstr "Zeige Deine Netzwerk-Aktivitäten"
 
-#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Code/Widget/Notifications.php:23
 msgid "Mark all notifications read"
 msgstr "Alle Benachrichtigungen als gesehen markieren"
 
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:45
-#: ../../Zotlabs/Widget/Notifications.php:141
+#: ../../Code/Widget/Notifications.php:26
+#: ../../Code/Widget/Notifications.php:45
+#: ../../Code/Widget/Notifications.php:141
 msgid "Show new posts only"
 msgstr "Zeige nur neue Beiträge"
 
-#: ../../Zotlabs/Widget/Notifications.php:27
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:142
+#: ../../Code/Widget/Notifications.php:27
+#: ../../Code/Widget/Notifications.php:46
+#: ../../Code/Widget/Notifications.php:142
 msgid "Filter by name"
 msgstr "Nach Namen filtern"
 
-#: ../../Zotlabs/Widget/Notifications.php:35
+#: ../../Code/Widget/Notifications.php:35
 msgid "New Home Activity"
 msgstr "Neue Kanal-Aktivitäten"
 
-#: ../../Zotlabs/Widget/Notifications.php:36
+#: ../../Code/Widget/Notifications.php:36
 msgid "New Home Activity Notifications"
 msgstr "Benachrichtigungen für neue Kanal-Aktivitäten"
 
-#: ../../Zotlabs/Widget/Notifications.php:39
+#: ../../Code/Widget/Notifications.php:39
 msgid "View your home activity"
 msgstr "Zeige Deine Kanal-Aktivitäten"
 
-#: ../../Zotlabs/Widget/Notifications.php:42
-#: ../../Zotlabs/Widget/Notifications.php:138
+#: ../../Code/Widget/Notifications.php:42
+#: ../../Code/Widget/Notifications.php:138
 msgid "Mark all notifications seen"
 msgstr "Alle Benachrichtigungen als gesehen markieren"
 
-#: ../../Zotlabs/Widget/Notifications.php:54
+#: ../../Code/Widget/Notifications.php:54
 msgid "New Mails"
 msgstr "Neue Mails"
 
-#: ../../Zotlabs/Widget/Notifications.php:55
+#: ../../Code/Widget/Notifications.php:55
 msgid "New Mails Notifications"
 msgstr "Benachrichtigungen für neue Mails"
 
-#: ../../Zotlabs/Widget/Notifications.php:58
+#: ../../Code/Widget/Notifications.php:58
 msgid "View your private mails"
 msgstr "Zeige Deine persönlichen Mails"
 
-#: ../../Zotlabs/Widget/Notifications.php:61
+#: ../../Code/Widget/Notifications.php:61
 msgid "Mark all messages seen"
 msgstr "Alle Mails als gelesen markieren"
 
-#: ../../Zotlabs/Widget/Notifications.php:69
+#: ../../Code/Widget/Notifications.php:69
 msgid "New Events"
 msgstr "Neue Termine"
 
-#: ../../Zotlabs/Widget/Notifications.php:70
+#: ../../Code/Widget/Notifications.php:70
 msgid "New Events Notifications"
 msgstr "Benachrichtigungen für neue Termine"
 
-#: ../../Zotlabs/Widget/Notifications.php:73
+#: ../../Code/Widget/Notifications.php:73
 msgid "View events"
 msgstr "Termine ansehen"
 
-#: ../../Zotlabs/Widget/Notifications.php:76
+#: ../../Code/Widget/Notifications.php:76
 msgid "Mark all events seen"
 msgstr "Markiere alle Termine als gesehen"
 
-#: ../../Zotlabs/Widget/Notifications.php:85
+#: ../../Code/Widget/Notifications.php:85
 msgid "New Connections Notifications"
 msgstr "Benachrichtigungen für neue Verbindungen"
 
-#: ../../Zotlabs/Widget/Notifications.php:88
+#: ../../Code/Widget/Notifications.php:88
 msgid "View all connections"
 msgstr "Zeige alle Verbindungen"
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Code/Widget/Notifications.php:96
 msgid "New Files"
 msgstr "Neue Dateien"
 
-#: ../../Zotlabs/Widget/Notifications.php:97
+#: ../../Code/Widget/Notifications.php:97
 msgid "New Files Notifications"
 msgstr "Benachrichtigungen für neue Dateien"
 
-#: ../../Zotlabs/Widget/Notifications.php:104
-#: ../../Zotlabs/Widget/Notifications.php:105
+#: ../../Code/Widget/Notifications.php:104
+#: ../../Code/Widget/Notifications.php:105
 msgid "Notices"
 msgstr "Benachrichtigungen"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Code/Widget/Notifications.php:108
 msgid "View all notices"
 msgstr "Alle Notizen ansehen"
 
-#: ../../Zotlabs/Widget/Notifications.php:111
+#: ../../Code/Widget/Notifications.php:111
 msgid "Mark all notices seen"
 msgstr "Alle Notizen als gesehen markieren"
 
-#: ../../Zotlabs/Widget/Notifications.php:121
+#: ../../Code/Widget/Notifications.php:121
 msgid "New Registrations"
 msgstr "Neue Registrierungen"
 
-#: ../../Zotlabs/Widget/Notifications.php:122
+#: ../../Code/Widget/Notifications.php:122
 msgid "New Registrations Notifications"
 msgstr "Benachrichtigungen für neue Registrierungen"
 
-#: ../../Zotlabs/Widget/Notifications.php:132
+#: ../../Code/Widget/Notifications.php:132
 msgid "Public Stream Notifications"
 msgstr "Benachrichtigungen für öffentlichen Beitrags-Stream"
 
-#: ../../Zotlabs/Widget/Notifications.php:135
+#: ../../Code/Widget/Notifications.php:135
 msgid "View the public stream"
 msgstr "Zeige öffentlichen Beitrags-Stream"
 
-#: ../../Zotlabs/Widget/Notifications.php:150
+#: ../../Code/Widget/Notifications.php:150
 msgid "Sorry, you have got no notifications at the moment"
 msgstr "Du hast momentan keine Benachrichtigungen"
 
diff --git a/view/es-es/messages.po b/view/es-es/messages.po
index b87bb2ee9..673a4c393 100644
--- a/view/es-es/messages.po
+++ b/view/es-es/messages.po
@@ -21,128 +21,128 @@ msgstr ""
 "Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
-#: Zotlabs/Access/PermissionRoles.php:181
+#: Code/Access/PermissionRoles.php:181
 msgid "Social Networking"
 msgstr "Redes sociales"
 
-#: Zotlabs/Access/PermissionRoles.php:182
+#: Code/Access/PermissionRoles.php:182
 msgid "Social - Normal"
 msgstr "Social - Normal"
 
-#: Zotlabs/Access/PermissionRoles.php:183
+#: Code/Access/PermissionRoles.php:183
 msgid "Social - Restricted"
 msgstr "Social - Restringido"
 
-#: Zotlabs/Access/PermissionRoles.php:186
+#: Code/Access/PermissionRoles.php:186
 msgid "Community Group"
 msgstr "Grupo de la comunidad"
 
-#: Zotlabs/Access/PermissionRoles.php:187
+#: Code/Access/PermissionRoles.php:187
 msgid "Group - Normal"
 msgstr "Groupo - Normal"
 
-#: Zotlabs/Access/PermissionRoles.php:188
+#: Code/Access/PermissionRoles.php:188
 msgid "Group - Restricted"
 msgstr "Grupo - Restringido"
 
-#: Zotlabs/Access/PermissionRoles.php:189
+#: Code/Access/PermissionRoles.php:189
 msgid "Group - Moderated"
 msgstr "Grupo - Moderado"
 
-#: Zotlabs/Access/PermissionRoles.php:192 Zotlabs/Module/Directory.php:401
-#: Zotlabs/Module/Manage.php:77 Zotlabs/Module/Manage.php:174
-#: Zotlabs/Storage/Browser.php:148 include/text.php:3280
+#: Code/Access/PermissionRoles.php:192 Code/Module/Directory.php:401
+#: Code/Module/Manage.php:77 Code/Module/Manage.php:174
+#: Code/Storage/Browser.php:148 include/text.php:3280
 msgid "Collection"
 msgstr "Colección"
 
-#: Zotlabs/Access/PermissionRoles.php:193
+#: Code/Access/PermissionRoles.php:193
 msgid "Collection - Normal"
 msgstr "Colección - Normal"
 
-#: Zotlabs/Access/PermissionRoles.php:194
+#: Code/Access/PermissionRoles.php:194
 msgid "Collection - Restricted"
 msgstr "Colección - Restringida"
 
-#: Zotlabs/Access/Permissions.php:59
+#: Code/Access/Permissions.php:59
 msgid "Grant viewing access to and delivery of your channel stream and posts"
 msgstr ""
 "Permitir acceso de visualización y transmisión de su stream de canal y sus "
 "publicaciones"
 
-#: Zotlabs/Access/Permissions.php:60
+#: Code/Access/Permissions.php:60
 msgid "Grant viewing access to your default channel profile"
 msgstr "Otorgar acceso de visualización a su perfil de canal predeterminado"
 
-#: Zotlabs/Access/Permissions.php:61
+#: Code/Access/Permissions.php:61
 msgid "Grant viewing access to your address book (connections)"
 msgstr ""
 "Conceder acceso de visualización a su libreta de direcciones (conexiones)"
 
-#: Zotlabs/Access/Permissions.php:62
+#: Code/Access/Permissions.php:62
 msgid "Grant viewing access to your file storage and photos"
 msgstr "Permitir acceso de visualización a su repositorio de archivos y fotos"
 
-#: Zotlabs/Access/Permissions.php:63
+#: Code/Access/Permissions.php:63
 msgid "Grant permission to post on your channel (wall) page"
 msgstr "Conceder permiso para publicar en la página de su canal (muro)"
 
-#: Zotlabs/Access/Permissions.php:64
+#: Code/Access/Permissions.php:64
 msgid "Accept delivery of direct messages and personal mail"
 msgstr "Aceptar la entrega de mensajes directos y correo personal"
 
-#: Zotlabs/Access/Permissions.php:65
+#: Code/Access/Permissions.php:65
 msgid "Accept delivery of their posts and all comments to their posts"
 msgstr ""
 "Aceptar la entrega de sus mensajes y todos los comentarios a sus mensajes"
 
-#: Zotlabs/Access/Permissions.php:66
+#: Code/Access/Permissions.php:66
 msgid "Accept delivery of their comments and likes on your posts"
 msgstr "Aceptar la entrega de sus comentarios y likes en sus publicaciones"
 
-#: Zotlabs/Access/Permissions.php:67
+#: Code/Access/Permissions.php:67
 msgid "Grant upload permissions to your file storage and photos"
 msgstr "Conceder permisos de carga en su repositorio de ficheros y fotos"
 
-#: Zotlabs/Access/Permissions.php:68
+#: Code/Access/Permissions.php:68
 msgid "Grant permission to republish/mirror your posts"
 msgstr "Otorgar permiso para republicar / espejar sus entradas"
 
-#: Zotlabs/Access/Permissions.php:69
+#: Code/Access/Permissions.php:69
 msgid "Accept comments and wall posts only after approval (moderation)"
 msgstr ""
 "Aceptar comentarios y publicaciones en el muro sólo después de su aprobación"
 " (moderación)"
 
-#: Zotlabs/Access/Permissions.php:70
+#: Code/Access/Permissions.php:70
 msgid "Grant channel administration (delegation) permission"
 msgstr "Conceder permiso administrativo (delegación)"
 
-#: Zotlabs/Lib/Libzotdir.php:118
+#: Code/Lib/Libzotdir.php:118
 msgid "Directory Options"
 msgstr "Opciones del directorio"
 
-#: Zotlabs/Lib/Libzotdir.php:120 include/nav.php:107
+#: Code/Lib/Libzotdir.php:120 include/nav.php:107
 msgid "Safe Mode"
 msgstr "Modo seguro"
 
-#: Zotlabs/Lib/Libzotdir.php:120 Zotlabs/Lib/Libzotdir.php:121
-#: Zotlabs/Lib/Libzotdir.php:124 Zotlabs/Lib/Libzotdir.php:125
-#: Zotlabs/Module/Admin/Site.php:287 Zotlabs/Module/Api.php:110
-#: Zotlabs/Module/Connedit.php:345 Zotlabs/Module/Connedit.php:732
-#: Zotlabs/Module/Connedit.php:812 Zotlabs/Module/Defperms.php:193
-#: Zotlabs/Module/Events.php:518 Zotlabs/Module/Events.php:519
-#: Zotlabs/Module/Events.php:544 Zotlabs/Module/Filestorage.php:240
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Module/Mitem.php:188
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:268
-#: Zotlabs/Module/Mitem.php:269 Zotlabs/Module/Menu.php:168
-#: Zotlabs/Module/Menu.php:226 Zotlabs/Module/Profiles.php:724
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:24
-#: Zotlabs/Module/Settings/Display.php:113
-#: Zotlabs/Module/Settings/Channel.php:414
-#: Zotlabs/Module/Settings/Permcats.php:115 Zotlabs/Module/Sources.php:129
-#: Zotlabs/Module/Sources.php:165 Zotlabs/Module/Photos.php:730
-#: Zotlabs/Module/Import.php:692 Zotlabs/Module/Import.php:696
-#: Zotlabs/Module/Import.php:697 Zotlabs/Storage/Browser.php:435 boot.php:1731
+#: Code/Lib/Libzotdir.php:120 Code/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:124 Code/Lib/Libzotdir.php:125
+#: Code/Module/Admin/Site.php:287 Code/Module/Api.php:110
+#: Code/Module/Connedit.php:345 Code/Module/Connedit.php:732
+#: Code/Module/Connedit.php:812 Code/Module/Defperms.php:193
+#: Code/Module/Events.php:518 Code/Module/Events.php:519
+#: Code/Module/Events.php:544 Code/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:248 Code/Module/Mitem.php:188
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:268
+#: Code/Module/Mitem.php:269 Code/Module/Menu.php:168
+#: Code/Module/Menu.php:226 Code/Module/Profiles.php:724
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:24
+#: Code/Module/Settings/Display.php:113
+#: Code/Module/Settings/Channel.php:414
+#: Code/Module/Settings/Permcats.php:115 Code/Module/Sources.php:129
+#: Code/Module/Sources.php:165 Code/Module/Photos.php:730
+#: Code/Module/Import.php:692 Code/Module/Import.php:696
+#: Code/Module/Import.php:697 Code/Storage/Browser.php:435 boot.php:1731
 #: extend/addon/a/zotpost/Mod_zotpost.php:77
 #: extend/addon/a/content_import/Mod_content_import.php:137
 #: extend/addon/a/content_import/Mod_content_import.php:138
@@ -151,24 +151,24 @@ msgstr "Modo seguro"
 msgid "No"
 msgstr "No"
 
-#: Zotlabs/Lib/Libzotdir.php:120 Zotlabs/Lib/Libzotdir.php:121
-#: Zotlabs/Lib/Libzotdir.php:124 Zotlabs/Lib/Libzotdir.php:125
-#: Zotlabs/Module/Admin/Site.php:289 Zotlabs/Module/Api.php:109
-#: Zotlabs/Module/Connedit.php:345 Zotlabs/Module/Connedit.php:732
-#: Zotlabs/Module/Connedit.php:812 Zotlabs/Module/Defperms.php:193
-#: Zotlabs/Module/Events.php:518 Zotlabs/Module/Events.php:519
-#: Zotlabs/Module/Events.php:544 Zotlabs/Module/Filestorage.php:240
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Module/Mitem.php:188
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:268
-#: Zotlabs/Module/Mitem.php:269 Zotlabs/Module/Menu.php:168
-#: Zotlabs/Module/Menu.php:226 Zotlabs/Module/Profiles.php:724
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:24
-#: Zotlabs/Module/Settings/Display.php:113
-#: Zotlabs/Module/Settings/Channel.php:414
-#: Zotlabs/Module/Settings/Permcats.php:115 Zotlabs/Module/Sources.php:129
-#: Zotlabs/Module/Sources.php:165 Zotlabs/Module/Photos.php:730
-#: Zotlabs/Module/Import.php:692 Zotlabs/Module/Import.php:696
-#: Zotlabs/Module/Import.php:697 Zotlabs/Storage/Browser.php:435 boot.php:1731
+#: Code/Lib/Libzotdir.php:120 Code/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:124 Code/Lib/Libzotdir.php:125
+#: Code/Module/Admin/Site.php:289 Code/Module/Api.php:109
+#: Code/Module/Connedit.php:345 Code/Module/Connedit.php:732
+#: Code/Module/Connedit.php:812 Code/Module/Defperms.php:193
+#: Code/Module/Events.php:518 Code/Module/Events.php:519
+#: Code/Module/Events.php:544 Code/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:248 Code/Module/Mitem.php:188
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:268
+#: Code/Module/Mitem.php:269 Code/Module/Menu.php:168
+#: Code/Module/Menu.php:226 Code/Module/Profiles.php:724
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:24
+#: Code/Module/Settings/Display.php:113
+#: Code/Module/Settings/Channel.php:414
+#: Code/Module/Settings/Permcats.php:115 Code/Module/Sources.php:129
+#: Code/Module/Sources.php:165 Code/Module/Photos.php:730
+#: Code/Module/Import.php:692 Code/Module/Import.php:696
+#: Code/Module/Import.php:697 Code/Storage/Browser.php:435 boot.php:1731
 #: extend/addon/a/zotpost/Mod_zotpost.php:77
 #: extend/addon/a/content_import/Mod_content_import.php:137
 #: extend/addon/a/content_import/Mod_content_import.php:138
@@ -177,80 +177,80 @@ msgstr "No"
 msgid "Yes"
 msgstr "Sí"
 
-#: Zotlabs/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:121
 msgid "Groups Only"
 msgstr "Sólo grupos"
 
-#: Zotlabs/Lib/Libzotdir.php:124
+#: Code/Lib/Libzotdir.php:124
 msgid "This Website Only"
 msgstr "Solo este sitio web"
 
-#: Zotlabs/Lib/Libzotdir.php:125
+#: Code/Lib/Libzotdir.php:125
 msgid "Recently Updated"
 msgstr "Recientemente actualizado"
 
-#: Zotlabs/Lib/Markdown.php:219 include/bbcode.php:683
+#: Code/Lib/Markdown.php:219 include/bbcode.php:683
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s escribió %2$s siguiente %3$s"
 
-#: Zotlabs/Lib/Markdown.php:221 Zotlabs/Module/Tagger.php:92
+#: Code/Lib/Markdown.php:221 Code/Module/Tagger.php:92
 #: include/bbcode.php:677 include/conversation.php:161 include/text.php:2381
 msgid "post"
 msgstr "la entrada"
 
-#: Zotlabs/Lib/Permcat.php:75
+#: Code/Lib/Permcat.php:75
 msgctxt "permcat"
 msgid "default"
 msgstr "por defecto"
 
-#: Zotlabs/Lib/Permcat.php:129
+#: Code/Lib/Permcat.php:129
 msgctxt "permcat"
 msgid "follower"
 msgstr "seguidor"
 
-#: Zotlabs/Lib/Permcat.php:133
+#: Code/Lib/Permcat.php:133
 msgctxt "permcat"
 msgid "contributor"
 msgstr "contribuidor"
 
-#: Zotlabs/Lib/Permcat.php:137
+#: Code/Lib/Permcat.php:137
 msgctxt "permcat"
 msgid "publisher"
 msgstr "editor"
 
-#: Zotlabs/Lib/DB_Upgrade.php:68
+#: Code/Lib/DB_Upgrade.php:68
 msgid "Source code of failed update: "
 msgstr "Código fuente de la actualización fallida: "
 
-#: Zotlabs/Lib/DB_Upgrade.php:91
+#: Code/Lib/DB_Upgrade.php:91
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: Zotlabs/Lib/DB_Upgrade.php:98
+#: Code/Lib/DB_Upgrade.php:98
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: Zotlabs/Lib/Libsync.php:969
+#: Code/Lib/Libsync.php:969
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la firma del sitio para %s"
 
-#: Zotlabs/Lib/ThreadItem.php:116 include/conversation.php:608
+#: Code/Lib/ThreadItem.php:116 include/conversation.php:608
 msgid "Public visibility"
 msgstr "Visibilidad pública"
 
-#: Zotlabs/Lib/ThreadItem.php:118 include/conversation.php:610
+#: Code/Lib/ThreadItem.php:118 include/conversation.php:610
 msgid "Direct message (private mail)"
 msgstr "Mensaje directo (correo privado)"
 
-#: Zotlabs/Lib/ThreadItem.php:121 include/conversation.php:613
+#: Code/Lib/ThreadItem.php:121 include/conversation.php:613
 msgid "Restricted visibility"
 msgstr "Visibilidad restringida"
 
-#: Zotlabs/Lib/ThreadItem.php:146
+#: Code/Lib/ThreadItem.php:146
 msgid ""
 "This comment is part of a private conversation, yet was shared with the "
 "public. Discretion advised."
@@ -258,72 +258,72 @@ msgstr ""
 "Este comentario forma parte de una conversación privada, pero se ha "
 "compartido con el stream público. Se recomienda discreción."
 
-#: Zotlabs/Lib/ThreadItem.php:154 Zotlabs/Lib/Libprofile.php:203
-#: Zotlabs/Lib/Libprofile.php:206 Zotlabs/Lib/Apps.php:618
-#: Zotlabs/Module/Admin/Profs.php:188 Zotlabs/Module/Blocks.php:173
-#: Zotlabs/Module/Connections.php:319 Zotlabs/Module/Connections.php:358
-#: Zotlabs/Module/Connections.php:379 Zotlabs/Module/Editlayout.php:126
-#: Zotlabs/Module/Editwebpage.php:157 Zotlabs/Module/Thing.php:302
-#: Zotlabs/Module/Lists.php:335 Zotlabs/Module/Layouts.php:207
-#: Zotlabs/Module/Card_edit.php:108 Zotlabs/Module/Editblock.php:127
-#: Zotlabs/Module/Menu.php:181 Zotlabs/Module/Webpages.php:265
-#: Zotlabs/Module/Settings/Oauth.php:163
-#: Zotlabs/Module/Settings/Oauth2.php:211 Zotlabs/Storage/Browser.php:318
-#: Zotlabs/Widget/Cdav.php:146 Zotlabs/Widget/Cdav.php:181
+#: Code/Lib/ThreadItem.php:154 Code/Lib/Libprofile.php:203
+#: Code/Lib/Libprofile.php:206 Code/Lib/Apps.php:618
+#: Code/Module/Admin/Profs.php:188 Code/Module/Blocks.php:173
+#: Code/Module/Connections.php:319 Code/Module/Connections.php:358
+#: Code/Module/Connections.php:379 Code/Module/Editlayout.php:126
+#: Code/Module/Editwebpage.php:157 Code/Module/Thing.php:302
+#: Code/Module/Lists.php:335 Code/Module/Layouts.php:207
+#: Code/Module/Card_edit.php:108 Code/Module/Editblock.php:127
+#: Code/Module/Menu.php:181 Code/Module/Webpages.php:265
+#: Code/Module/Settings/Oauth.php:163
+#: Code/Module/Settings/Oauth2.php:211 Code/Storage/Browser.php:318
+#: Code/Widget/Cdav.php:146 Code/Widget/Cdav.php:181
 #: include/menu.php:138
 msgid "Edit"
 msgstr "Editar"
 
-#: Zotlabs/Lib/ThreadItem.php:191 Zotlabs/Lib/Apps.php:619
-#: Zotlabs/Module/Admin/Accounts.php:184 Zotlabs/Module/Admin/Channels.php:173
-#: Zotlabs/Module/Admin/Profs.php:189 Zotlabs/Module/Blocks.php:175
-#: Zotlabs/Module/Cdav.php:1058 Zotlabs/Module/Cdav.php:1367
-#: Zotlabs/Module/Connedit.php:616 Zotlabs/Module/Connedit.php:880
-#: Zotlabs/Module/Connections.php:327 Zotlabs/Module/Editlayout.php:150
-#: Zotlabs/Module/Editwebpage.php:182 Zotlabs/Module/Thing.php:303
-#: Zotlabs/Module/Card_edit.php:138 Zotlabs/Module/Editblock.php:152
-#: Zotlabs/Module/Webpages.php:267 Zotlabs/Module/Profiles.php:849
-#: Zotlabs/Module/Settings/Oauth.php:164
-#: Zotlabs/Module/Settings/Oauth2.php:212 Zotlabs/Module/Photos.php:1263
-#: Zotlabs/Storage/Browser.php:319 include/conversation.php:600
+#: Code/Lib/ThreadItem.php:191 Code/Lib/Apps.php:619
+#: Code/Module/Admin/Accounts.php:184 Code/Module/Admin/Channels.php:173
+#: Code/Module/Admin/Profs.php:189 Code/Module/Blocks.php:175
+#: Code/Module/Cdav.php:1058 Code/Module/Cdav.php:1367
+#: Code/Module/Connedit.php:616 Code/Module/Connedit.php:880
+#: Code/Module/Connections.php:327 Code/Module/Editlayout.php:150
+#: Code/Module/Editwebpage.php:182 Code/Module/Thing.php:303
+#: Code/Module/Card_edit.php:138 Code/Module/Editblock.php:152
+#: Code/Module/Webpages.php:267 Code/Module/Profiles.php:849
+#: Code/Module/Settings/Oauth.php:164
+#: Code/Module/Settings/Oauth2.php:212 Code/Module/Photos.php:1263
+#: Code/Storage/Browser.php:319 include/conversation.php:600
 #: include/conversation.php:654
 msgid "Delete"
 msgstr "Eliminar"
 
-#: Zotlabs/Lib/ThreadItem.php:194 Zotlabs/Storage/Browser.php:306
+#: Code/Lib/ThreadItem.php:194 Code/Storage/Browser.php:306
 msgid "Admin Delete"
 msgstr "Eliminar admin"
 
-#: Zotlabs/Lib/ThreadItem.php:199 include/conversation.php:599
+#: Code/Lib/ThreadItem.php:199 include/conversation.php:599
 msgid "Select"
 msgstr "Seleccionar"
 
-#: Zotlabs/Lib/ThreadItem.php:203 Zotlabs/Module/Filer.php:61
+#: Code/Lib/ThreadItem.php:203 Code/Module/Filer.php:61
 msgid "Save to Folder"
 msgstr "Guardar en carpeta"
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I will attend"
 msgstr "Participaré"
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I will not attend"
 msgstr "No participaré"
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I might attend"
 msgstr "Quizá participe"
 
-#: Zotlabs/Lib/ThreadItem.php:226
+#: Code/Lib/ThreadItem.php:226
 msgid "Undo attendance"
 msgstr "Deshacer la asistencia"
 
-#: Zotlabs/Lib/ThreadItem.php:241 Zotlabs/Lib/ThreadItem.php:261
-#: Zotlabs/Module/Photos.php:1223 Zotlabs/Module/Photos.php:1234
+#: Code/Lib/ThreadItem.php:241 Code/Lib/ThreadItem.php:261
+#: Code/Module/Photos.php:1223 Code/Module/Photos.php:1234
 msgid "View all"
 msgstr "Ver todo"
 
-#: Zotlabs/Lib/ThreadItem.php:246 Zotlabs/Module/Photos.php:1227
+#: Code/Lib/ThreadItem.php:246 Code/Module/Photos.php:1227
 #: include/taxonomy.php:741 include/conversation.php:2150
 msgctxt "noun"
 msgid "Like"
@@ -331,13 +331,13 @@ msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: Zotlabs/Lib/ThreadItem.php:248 Zotlabs/Lib/ThreadItem.php:495
-#: Zotlabs/Module/Photos.php:1343 include/conversation.php:2152
+#: Code/Lib/ThreadItem.php:248 Code/Lib/ThreadItem.php:495
+#: Code/Module/Photos.php:1343 include/conversation.php:2152
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: Zotlabs/Lib/ThreadItem.php:254 Zotlabs/Module/Photos.php:1231
+#: Code/Lib/ThreadItem.php:254 Code/Module/Photos.php:1231
 #: include/conversation.php:2157
 msgctxt "noun"
 msgid "Dislike"
@@ -345,224 +345,224 @@ msgid_plural "Dislikes"
 msgstr[0] "No me gusta"
 msgstr[1] "No me gusta"
 
-#: Zotlabs/Lib/ThreadItem.php:256 Zotlabs/Lib/ThreadItem.php:496
-#: Zotlabs/Module/Photos.php:1344 include/conversation.php:2159
+#: Code/Lib/ThreadItem.php:256 Code/Lib/ThreadItem.php:496
+#: Code/Module/Photos.php:1344 include/conversation.php:2159
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: Zotlabs/Lib/ThreadItem.php:282 Zotlabs/Module/Admin/Profs.php:99
-#: Zotlabs/Module/Admin/Profs.php:120 Zotlabs/Module/Filer.php:60
-#: Zotlabs/Widget/Notes.php:24
+#: Code/Lib/ThreadItem.php:282 Code/Module/Admin/Profs.php:99
+#: Code/Module/Admin/Profs.php:120 Code/Module/Filer.php:60
+#: Code/Widget/Notes.php:24
 #: extend/addon/a/queueworker/Mod_Queueworker.php:116 include/text.php:1049
 #: include/text.php:1062
 msgid "Save"
 msgstr "Guardar"
 
-#: Zotlabs/Lib/ThreadItem.php:291 include/conversation.php:621
+#: Code/Lib/ThreadItem.php:291 include/conversation.php:621
 msgid "Message signature validated"
 msgstr "Firma de mensaje validada"
 
-#: Zotlabs/Lib/ThreadItem.php:292 include/conversation.php:622
+#: Code/Lib/ThreadItem.php:292 include/conversation.php:622
 msgid "Message signature incorrect"
 msgstr "Firma de mensaje incorrecta"
 
-#: Zotlabs/Lib/ThreadItem.php:298
+#: Code/Lib/ThreadItem.php:298
 msgid "Add Tag"
 msgstr "Añadir etiqueta"
 
-#: Zotlabs/Lib/ThreadItem.php:318 Zotlabs/Module/Photos.php:1164
+#: Code/Lib/ThreadItem.php:318 Code/Module/Photos.php:1164
 msgid "I like this"
 msgstr "Me gusta esto"
 
-#: Zotlabs/Lib/ThreadItem.php:318 Zotlabs/Module/Photos.php:1168
+#: Code/Lib/ThreadItem.php:318 Code/Module/Photos.php:1168
 msgid "Undo like"
 msgstr "Deshacer \"Me gusta\""
 
-#: Zotlabs/Lib/ThreadItem.php:319 Zotlabs/Module/Photos.php:1167
+#: Code/Lib/ThreadItem.php:319 Code/Module/Photos.php:1167
 msgid "I don't like this"
 msgstr "No me gusta esto"
 
-#: Zotlabs/Lib/ThreadItem.php:319 Zotlabs/Module/Photos.php:1169
+#: Code/Lib/ThreadItem.php:319 Code/Module/Photos.php:1169
 msgid "Undo dislike"
 msgstr "Deshacer \"No me gusta\""
 
-#: Zotlabs/Lib/ThreadItem.php:325
+#: Code/Lib/ThreadItem.php:325
 msgid "Repeat This"
 msgstr "Repetir esto"
 
-#: Zotlabs/Lib/ThreadItem.php:326
+#: Code/Lib/ThreadItem.php:326
 msgid "Share this"
 msgstr "Compartir esto"
 
-#: Zotlabs/Lib/ThreadItem.php:337
+#: Code/Lib/ThreadItem.php:337
 msgid "Delivery Report"
 msgstr "Informe de transmisión"
 
-#: Zotlabs/Lib/ThreadItem.php:366
+#: Code/Lib/ThreadItem.php:366
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d comentario"
 msgstr[1] "%d comentarios"
 
-#: Zotlabs/Lib/ThreadItem.php:367
+#: Code/Lib/ThreadItem.php:367
 #, php-format
 msgid "%d unseen"
 msgstr "%dno visto"
 
-#: Zotlabs/Lib/ThreadItem.php:406 Zotlabs/Lib/ThreadItem.php:407
+#: Code/Lib/ThreadItem.php:406 Code/Lib/ThreadItem.php:407
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Ver el perfil de %s - %s"
 
-#: Zotlabs/Lib/ThreadItem.php:410
+#: Code/Lib/ThreadItem.php:410
 msgid "to"
 msgstr "a"
 
-#: Zotlabs/Lib/ThreadItem.php:411 include/conversation.php:684
+#: Code/Lib/ThreadItem.php:411 include/conversation.php:684
 msgid "via"
 msgstr "mediante"
 
-#: Zotlabs/Lib/ThreadItem.php:412
+#: Code/Lib/ThreadItem.php:412
 msgid "Wall-to-Wall"
 msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: Zotlabs/Lib/ThreadItem.php:413
+#: Code/Lib/ThreadItem.php:413
 msgid "via Wall-To-Wall:"
 msgstr ""
 "Mediante el procedimiento página del perfil a página del perfil (de \"muro\""
 " a \"muro\")"
 
-#: Zotlabs/Lib/ThreadItem.php:428 include/conversation.php:687
+#: Code/Lib/ThreadItem.php:428 include/conversation.php:687
 #, php-format
 msgid "from %s"
 msgstr "desde %s"
 
-#: Zotlabs/Lib/ThreadItem.php:431 include/conversation.php:690
+#: Code/Lib/ThreadItem.php:431 include/conversation.php:690
 #, php-format
 msgid "last edited: %s"
 msgstr "último cambio: %s"
 
-#: Zotlabs/Lib/ThreadItem.php:432 include/conversation.php:691
+#: Code/Lib/ThreadItem.php:432 include/conversation.php:691
 #, php-format
 msgid "Expires: %s"
 msgstr "Caduca: %s"
 
-#: Zotlabs/Lib/ThreadItem.php:442
+#: Code/Lib/ThreadItem.php:442
 msgid "Attend"
 msgstr "Participar o asistir"
 
-#: Zotlabs/Lib/ThreadItem.php:443
+#: Code/Lib/ThreadItem.php:443
 msgid "Attendance Options"
 msgstr "Opciones de participación o asistencia"
 
-#: Zotlabs/Lib/ThreadItem.php:444
+#: Code/Lib/ThreadItem.php:444
 msgid "Vote"
 msgstr "Votar"
 
-#: Zotlabs/Lib/ThreadItem.php:445
+#: Code/Lib/ThreadItem.php:445
 msgid "Voting Options"
 msgstr "Opciones de votación"
 
-#: Zotlabs/Lib/ThreadItem.php:446
+#: Code/Lib/ThreadItem.php:446
 msgid "Reply"
 msgstr "Responder"
 
-#: Zotlabs/Lib/ThreadItem.php:471 include/conversation.php:706
+#: Code/Lib/ThreadItem.php:471 include/conversation.php:706
 msgid "Pinned post"
 msgstr "Entrada anclada"
 
-#: Zotlabs/Lib/ThreadItem.php:473 include/js_strings.php:42
+#: Code/Lib/ThreadItem.php:473 include/js_strings.php:42
 #: include/conversation.php:708
 msgid "Unpin this post"
 msgstr "Desanclar esta entrada"
 
-#: Zotlabs/Lib/ThreadItem.php:473 include/js_strings.php:41
+#: Code/Lib/ThreadItem.php:473 include/js_strings.php:41
 #: include/conversation.php:708
 msgid "Pin this post"
 msgstr "Anclar esta entrada"
 
-#: Zotlabs/Lib/ThreadItem.php:475
+#: Code/Lib/ThreadItem.php:475
 msgid "Saved draft"
 msgstr "Borrador guardado"
 
-#: Zotlabs/Lib/ThreadItem.php:476
+#: Code/Lib/ThreadItem.php:476
 msgid "Save Bookmarks"
 msgstr "Guardar en Marcadores"
 
-#: Zotlabs/Lib/ThreadItem.php:477
+#: Code/Lib/ThreadItem.php:477
 msgid "Add to Calendar"
 msgstr "Añadir al calendario"
 
-#: Zotlabs/Lib/ThreadItem.php:488 Zotlabs/Module/Notifications.php:72
+#: Code/Lib/ThreadItem.php:488 Code/Module/Notifications.php:72
 msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
-#: Zotlabs/Lib/ThreadItem.php:501 Zotlabs/Module/Settings/Channel.php:686
-#: Zotlabs/Module/Photos.php:1349 include/acl_selectors.php:154
+#: Code/Lib/ThreadItem.php:501 Code/Module/Settings/Channel.php:686
+#: Code/Module/Photos.php:1349 include/acl_selectors.php:154
 #: include/conversation.php:1496
 msgid "Close"
 msgstr "Cerrar"
 
-#: Zotlabs/Lib/ThreadItem.php:506 include/conversation.php:412
+#: Code/Lib/ThreadItem.php:506 include/conversation.php:412
 msgid "This is an unsaved preview"
 msgstr "Esta es una previsualización sin guardar"
 
-#: Zotlabs/Lib/ThreadItem.php:507 Zotlabs/Module/Photos.php:1171
+#: Code/Lib/ThreadItem.php:507 Code/Module/Photos.php:1171
 #: include/conversation.php:711
 msgid "Please wait"
 msgstr "Espere por favor"
 
-#: Zotlabs/Lib/ThreadItem.php:572 include/js_strings.php:11
+#: Code/Lib/ThreadItem.php:572 include/js_strings.php:11
 #, php-format
 msgid "%s show all"
 msgstr "%s mostrar todo"
 
-#: Zotlabs/Lib/ThreadItem.php:947 Zotlabs/Module/Photos.php:1187
-#: Zotlabs/Module/Photos.php:1297
+#: Code/Lib/ThreadItem.php:947 Code/Module/Photos.php:1187
+#: Code/Module/Photos.php:1297
 msgid "This is you"
 msgstr "Este es usted"
 
-#: Zotlabs/Lib/ThreadItem.php:949 Zotlabs/Module/Photos.php:1189
-#: Zotlabs/Module/Photos.php:1299 include/js_strings.php:10
+#: Code/Lib/ThreadItem.php:949 Code/Module/Photos.php:1189
+#: Code/Module/Photos.php:1299 include/js_strings.php:10
 msgid "Comment"
 msgstr "Comentar"
 
-#: Zotlabs/Lib/ThreadItem.php:950 Zotlabs/Module/Admin/Account_edit.php:78
-#: Zotlabs/Module/Admin/Accounts.php:177 Zotlabs/Module/Admin/Addons.php:445
-#: Zotlabs/Module/Admin/Channels.php:171 Zotlabs/Module/Admin/Logs.php:84
-#: Zotlabs/Module/Admin/Profs.php:191 Zotlabs/Module/Admin/Security.php:169
-#: Zotlabs/Module/Admin/Site.php:312 Zotlabs/Module/Admin/Themes.php:170
-#: Zotlabs/Module/Cal.php:359 Zotlabs/Module/Expire.php:48
-#: Zotlabs/Module/Connedit.php:844 Zotlabs/Module/Appman.php:160
-#: Zotlabs/Module/Defperms.php:259 Zotlabs/Module/Events.php:541
-#: Zotlabs/Module/Email_validation.php:44 Zotlabs/Module/Invite.php:168
-#: Zotlabs/Module/Filestorage.php:245 Zotlabs/Module/Thing.php:362
-#: Zotlabs/Module/Thing.php:417 Zotlabs/Module/Chat.php:210
-#: Zotlabs/Module/Chat.php:247 Zotlabs/Module/Setup.php:332
-#: Zotlabs/Module/Setup.php:377 Zotlabs/Module/Lists.php:198
-#: Zotlabs/Module/Lists.php:210 Zotlabs/Module/Import_items.php:142
-#: Zotlabs/Module/Mitem.php:271 Zotlabs/Module/Finger.php:24
-#: Zotlabs/Module/Pconfig.php:129 Zotlabs/Module/Editpost.php:116
-#: Zotlabs/Module/Locs.php:136 Zotlabs/Module/Connect.php:95
-#: Zotlabs/Module/Mood.php:166 Zotlabs/Module/Pdledit.php:114
-#: Zotlabs/Module/Profiles.php:768 Zotlabs/Module/Poke.php:148
-#: Zotlabs/Module/Affinity.php:86 Zotlabs/Module/Zot_probe.php:21
-#: Zotlabs/Module/Ap_probe.php:25 Zotlabs/Module/Settings/Account.php:114
-#: Zotlabs/Module/Settings/Display.php:204
-#: Zotlabs/Module/Settings/Featured.php:59
-#: Zotlabs/Module/Settings/Features.php:63
-#: Zotlabs/Module/Settings/Network.php:44 Zotlabs/Module/Settings/Oauth.php:95
-#: Zotlabs/Module/Settings/Oauth2.php:113
-#: Zotlabs/Module/Settings/Tokens.php:314
-#: Zotlabs/Module/Settings/Channel.php:627
-#: Zotlabs/Module/Settings/Permcats.php:144 Zotlabs/Module/Sources.php:130
-#: Zotlabs/Module/Sources.php:168 Zotlabs/Module/Photos.php:1132
-#: Zotlabs/Module/Photos.php:1190 Zotlabs/Module/Photos.php:1300
-#: Zotlabs/Module/Import.php:703 Zotlabs/Module/Content_filter.php:66
-#: Zotlabs/Module/Superblock.php:255 Zotlabs/Module/Xchan.php:18
-#: Zotlabs/Module/Zotfinger.php:28 Zotlabs/Widget/Eventstools.php:19
+#: Code/Lib/ThreadItem.php:950 Code/Module/Admin/Account_edit.php:78
+#: Code/Module/Admin/Accounts.php:177 Code/Module/Admin/Addons.php:445
+#: Code/Module/Admin/Channels.php:171 Code/Module/Admin/Logs.php:84
+#: Code/Module/Admin/Profs.php:191 Code/Module/Admin/Security.php:169
+#: Code/Module/Admin/Site.php:312 Code/Module/Admin/Themes.php:170
+#: Code/Module/Cal.php:359 Code/Module/Expire.php:48
+#: Code/Module/Connedit.php:844 Code/Module/Appman.php:160
+#: Code/Module/Defperms.php:259 Code/Module/Events.php:541
+#: Code/Module/Email_validation.php:44 Code/Module/Invite.php:168
+#: Code/Module/Filestorage.php:245 Code/Module/Thing.php:362
+#: Code/Module/Thing.php:417 Code/Module/Chat.php:210
+#: Code/Module/Chat.php:247 Code/Module/Setup.php:332
+#: Code/Module/Setup.php:377 Code/Module/Lists.php:198
+#: Code/Module/Lists.php:210 Code/Module/Import_items.php:142
+#: Code/Module/Mitem.php:271 Code/Module/Finger.php:24
+#: Code/Module/Pconfig.php:129 Code/Module/Editpost.php:116
+#: Code/Module/Locs.php:136 Code/Module/Connect.php:95
+#: Code/Module/Mood.php:166 Code/Module/Pdledit.php:114
+#: Code/Module/Profiles.php:768 Code/Module/Poke.php:148
+#: Code/Module/Affinity.php:86 Code/Module/Zot_probe.php:21
+#: Code/Module/Ap_probe.php:25 Code/Module/Settings/Account.php:114
+#: Code/Module/Settings/Display.php:204
+#: Code/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Features.php:63
+#: Code/Module/Settings/Network.php:44 Code/Module/Settings/Oauth.php:95
+#: Code/Module/Settings/Oauth2.php:113
+#: Code/Module/Settings/Tokens.php:314
+#: Code/Module/Settings/Channel.php:627
+#: Code/Module/Settings/Permcats.php:144 Code/Module/Sources.php:130
+#: Code/Module/Sources.php:168 Code/Module/Photos.php:1132
+#: Code/Module/Photos.php:1190 Code/Module/Photos.php:1300
+#: Code/Module/Import.php:703 Code/Module/Content_filter.php:66
+#: Code/Module/Superblock.php:255 Code/Module/Xchan.php:18
+#: Code/Module/Zotfinger.php:28 Code/Widget/Eventstools.php:19
 #: extend/addon/a/logrot/logrot.php:36 extend/addon/a/nsfw/Mod_Nsfw.php:50
 #: extend/addon/a/zotpost/Mod_zotpost.php:81
 #: extend/addon/a/content_import/Mod_content_import.php:142
@@ -575,134 +575,134 @@ msgstr "Comentar"
 msgid "Submit"
 msgstr "Enviar"
 
-#: Zotlabs/Lib/ThreadItem.php:952 include/conversation.php:1414
+#: Code/Lib/ThreadItem.php:952 include/conversation.php:1414
 msgid "Bold"
 msgstr "Negrita"
 
-#: Zotlabs/Lib/ThreadItem.php:953 include/conversation.php:1415
+#: Code/Lib/ThreadItem.php:953 include/conversation.php:1415
 msgid "Italic"
 msgstr "Itálico "
 
-#: Zotlabs/Lib/ThreadItem.php:954 include/conversation.php:1416
+#: Code/Lib/ThreadItem.php:954 include/conversation.php:1416
 msgid "Underline"
 msgstr "Subrayar"
 
-#: Zotlabs/Lib/ThreadItem.php:955 include/conversation.php:1417
+#: Code/Lib/ThreadItem.php:955 include/conversation.php:1417
 msgid "Quote"
 msgstr "Citar"
 
-#: Zotlabs/Lib/ThreadItem.php:956 include/conversation.php:1418
+#: Code/Lib/ThreadItem.php:956 include/conversation.php:1418
 msgid "Code"
 msgstr "Código"
 
-#: Zotlabs/Lib/ThreadItem.php:957
+#: Code/Lib/ThreadItem.php:957
 msgid "Image"
 msgstr "Imagen"
 
-#: Zotlabs/Lib/ThreadItem.php:958 include/conversation.php:1419
+#: Code/Lib/ThreadItem.php:958 include/conversation.php:1419
 msgid "Attach/Upload file"
 msgstr "Adjuntar/cargar fichero"
 
-#: Zotlabs/Lib/ThreadItem.php:959
+#: Code/Lib/ThreadItem.php:959
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: Zotlabs/Lib/ThreadItem.php:960
+#: Code/Lib/ThreadItem.php:960
 msgid "Video"
 msgstr "Vídeo"
 
-#: Zotlabs/Lib/ThreadItem.php:961 Zotlabs/Module/Events.php:526
-#: Zotlabs/Module/Webpages.php:272 Zotlabs/Module/Photos.php:1191
+#: Code/Lib/ThreadItem.php:961 Code/Module/Events.php:526
+#: Code/Module/Webpages.php:272 Code/Module/Photos.php:1191
 #: include/conversation.php:1303
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: Zotlabs/Lib/ThreadItem.php:962 Zotlabs/Module/Lostpass.php:141
-#: Zotlabs/Module/Pdledit.php:71 Zotlabs/Module/Pdledit.php:79
+#: Code/Lib/ThreadItem.php:962 Code/Module/Lostpass.php:141
+#: Code/Module/Pdledit.php:71 Code/Module/Pdledit.php:79
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: Zotlabs/Lib/ThreadItem.php:967 Zotlabs/Module/Chat.php:218
+#: Code/Lib/ThreadItem.php:967 Code/Module/Chat.php:218
 #: include/conversation.php:1488
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
-#: Zotlabs/Lib/ThreadItem.php:972
+#: Code/Lib/ThreadItem.php:972
 msgid "Your full name (required)"
 msgstr "Su nombre completo (requerido)"
 
-#: Zotlabs/Lib/ThreadItem.php:973
+#: Code/Lib/ThreadItem.php:973
 msgid "Your email address (required)"
 msgstr "Su dirección de correo electrónico (requerido)"
 
-#: Zotlabs/Lib/ThreadItem.php:974
+#: Code/Lib/ThreadItem.php:974
 msgid "Your website URL (optional)"
 msgstr "La URL de su sitio web (opcional)"
 
-#: Zotlabs/Lib/Chatroom.php:28
+#: Code/Lib/Chatroom.php:28
 msgid "Missing room name"
 msgstr "Sala de chat sin nombre"
 
-#: Zotlabs/Lib/Chatroom.php:38
+#: Code/Lib/Chatroom.php:38
 msgid "Duplicate room name"
 msgstr "Nombre de sala duplicado."
 
-#: Zotlabs/Lib/Chatroom.php:94 Zotlabs/Lib/Chatroom.php:103
+#: Code/Lib/Chatroom.php:94 Code/Lib/Chatroom.php:103
 msgid "Invalid room specifier."
 msgstr "Especificador de sala no válido."
 
-#: Zotlabs/Lib/Chatroom.php:141
+#: Code/Lib/Chatroom.php:141
 msgid "Room not found."
 msgstr "Sala no encontrada."
 
-#: Zotlabs/Lib/Chatroom.php:153 Zotlabs/Module/Calendar.php:264
-#: Zotlabs/Module/Admin/Cover_photo.php:279
-#: Zotlabs/Module/Admin/Cover_photo.php:303
-#: Zotlabs/Module/Admin/Profile_photo.php:308
-#: Zotlabs/Module/Admin/Profile_photo.php:326 Zotlabs/Module/Api.php:35
-#: Zotlabs/Module/Common.php:48 Zotlabs/Module/Block.php:31
-#: Zotlabs/Module/Block.php:84 Zotlabs/Module/Cards.php:86
-#: Zotlabs/Module/Blocks.php:82 Zotlabs/Module/Blocks.php:89
-#: Zotlabs/Module/Connedit.php:338 Zotlabs/Module/Connections.php:36
-#: Zotlabs/Module/Item.php:611 Zotlabs/Module/Item.php:633
-#: Zotlabs/Module/Item.php:645 Zotlabs/Module/Item.php:1792
-#: Zotlabs/Module/Appman.php:97 Zotlabs/Module/Cover_photo.php:336
-#: Zotlabs/Module/Cover_photo.php:350 Zotlabs/Module/Defperms.php:180
-#: Zotlabs/Module/Defperms.php:186 Zotlabs/Module/Display.php:509
-#: Zotlabs/Module/Events.php:305 Zotlabs/Module/Editlayout.php:76
-#: Zotlabs/Module/Editlayout.php:99 Zotlabs/Module/Editwebpage.php:79
-#: Zotlabs/Module/Editwebpage.php:100 Zotlabs/Module/Editwebpage.php:119
-#: Zotlabs/Module/Editwebpage.php:135 Zotlabs/Module/Register.php:87
-#: Zotlabs/Module/Invite.php:99 Zotlabs/Module/Filestorage.php:25
-#: Zotlabs/Module/Filestorage.php:111 Zotlabs/Module/Filestorage.php:127
-#: Zotlabs/Module/Filestorage.php:155 Zotlabs/Module/Filestorage.php:188
-#: Zotlabs/Module/Filestorage.php:196 Zotlabs/Module/Thing.php:315
-#: Zotlabs/Module/Thing.php:336 Zotlabs/Module/Thing.php:378
-#: Zotlabs/Module/Chat.php:111 Zotlabs/Module/Chat.php:116
-#: Zotlabs/Module/Moderate.php:20 Zotlabs/Module/Setup.php:230
-#: Zotlabs/Module/Lists.php:84 Zotlabs/Module/Lists.php:96
-#: Zotlabs/Module/Lists.php:127 Zotlabs/Module/Layouts.php:80
-#: Zotlabs/Module/Layouts.php:87 Zotlabs/Module/Layouts.php:98
-#: Zotlabs/Module/Channel.php:236 Zotlabs/Module/Channel.php:414
-#: Zotlabs/Module/Channel.php:452 Zotlabs/Module/Card_edit.php:61
-#: Zotlabs/Module/Manage.php:18 Zotlabs/Module/Mitem.php:140
-#: Zotlabs/Module/Editblock.php:77 Zotlabs/Module/Menu.php:135
-#: Zotlabs/Module/Menu.php:146 Zotlabs/Module/Editpost.php:23
-#: Zotlabs/Module/Locs.php:107 Zotlabs/Module/Viewsrc.php:23
-#: Zotlabs/Module/New_channel.php:122 Zotlabs/Module/New_channel.php:147
-#: Zotlabs/Module/Notifications.php:16 Zotlabs/Module/Mood.php:132
-#: Zotlabs/Module/Vote.php:22 Zotlabs/Module/Webpages.php:139
-#: Zotlabs/Module/Page.php:41 Zotlabs/Module/Page.php:146
-#: Zotlabs/Module/Pdledit.php:36 Zotlabs/Module/Profiles.php:213
-#: Zotlabs/Module/Profiles.php:674 Zotlabs/Module/Profile_photo.php:344
-#: Zotlabs/Module/Profile_photo.php:358 Zotlabs/Module/Poke.php:115
-#: Zotlabs/Module/Regmod.php:24 Zotlabs/Module/Service_limits.php:16
-#: Zotlabs/Module/Settings.php:70 Zotlabs/Module/Sharedwithme.php:22
-#: Zotlabs/Module/Sources.php:89 Zotlabs/Module/Photos.php:70
-#: Zotlabs/Module/Profile.php:108 Zotlabs/Module/Profile.php:123
-#: Zotlabs/Module/Inspect.php:18 Zotlabs/Module/Suggestions.php:36
-#: Zotlabs/Module/Viewconnections.php:35 Zotlabs/Module/Viewconnections.php:40
-#: Zotlabs/Web/WebServer.php:70 include/photos.php:36 include/attach.php:160
+#: Code/Lib/Chatroom.php:153 Code/Module/Calendar.php:264
+#: Code/Module/Admin/Cover_photo.php:279
+#: Code/Module/Admin/Cover_photo.php:303
+#: Code/Module/Admin/Profile_photo.php:308
+#: Code/Module/Admin/Profile_photo.php:326 Code/Module/Api.php:35
+#: Code/Module/Common.php:48 Code/Module/Block.php:31
+#: Code/Module/Block.php:84 Code/Module/Cards.php:86
+#: Code/Module/Blocks.php:82 Code/Module/Blocks.php:89
+#: Code/Module/Connedit.php:338 Code/Module/Connections.php:36
+#: Code/Module/Item.php:611 Code/Module/Item.php:633
+#: Code/Module/Item.php:645 Code/Module/Item.php:1792
+#: Code/Module/Appman.php:97 Code/Module/Cover_photo.php:336
+#: Code/Module/Cover_photo.php:350 Code/Module/Defperms.php:180
+#: Code/Module/Defperms.php:186 Code/Module/Display.php:509
+#: Code/Module/Events.php:305 Code/Module/Editlayout.php:76
+#: Code/Module/Editlayout.php:99 Code/Module/Editwebpage.php:79
+#: Code/Module/Editwebpage.php:100 Code/Module/Editwebpage.php:119
+#: Code/Module/Editwebpage.php:135 Code/Module/Register.php:87
+#: Code/Module/Invite.php:99 Code/Module/Filestorage.php:25
+#: Code/Module/Filestorage.php:111 Code/Module/Filestorage.php:127
+#: Code/Module/Filestorage.php:155 Code/Module/Filestorage.php:188
+#: Code/Module/Filestorage.php:196 Code/Module/Thing.php:315
+#: Code/Module/Thing.php:336 Code/Module/Thing.php:378
+#: Code/Module/Chat.php:111 Code/Module/Chat.php:116
+#: Code/Module/Moderate.php:20 Code/Module/Setup.php:230
+#: Code/Module/Lists.php:84 Code/Module/Lists.php:96
+#: Code/Module/Lists.php:127 Code/Module/Layouts.php:80
+#: Code/Module/Layouts.php:87 Code/Module/Layouts.php:98
+#: Code/Module/Channel.php:236 Code/Module/Channel.php:414
+#: Code/Module/Channel.php:452 Code/Module/Card_edit.php:61
+#: Code/Module/Manage.php:18 Code/Module/Mitem.php:140
+#: Code/Module/Editblock.php:77 Code/Module/Menu.php:135
+#: Code/Module/Menu.php:146 Code/Module/Editpost.php:23
+#: Code/Module/Locs.php:107 Code/Module/Viewsrc.php:23
+#: Code/Module/New_channel.php:122 Code/Module/New_channel.php:147
+#: Code/Module/Notifications.php:16 Code/Module/Mood.php:132
+#: Code/Module/Vote.php:22 Code/Module/Webpages.php:139
+#: Code/Module/Page.php:41 Code/Module/Page.php:146
+#: Code/Module/Pdledit.php:36 Code/Module/Profiles.php:213
+#: Code/Module/Profiles.php:674 Code/Module/Profile_photo.php:344
+#: Code/Module/Profile_photo.php:358 Code/Module/Poke.php:115
+#: Code/Module/Regmod.php:24 Code/Module/Service_limits.php:16
+#: Code/Module/Settings.php:70 Code/Module/Sharedwithme.php:22
+#: Code/Module/Sources.php:89 Code/Module/Photos.php:70
+#: Code/Module/Profile.php:108 Code/Module/Profile.php:123
+#: Code/Module/Inspect.php:18 Code/Module/Suggestions.php:36
+#: Code/Module/Viewconnections.php:35 Code/Module/Viewconnections.php:40
+#: Code/Web/WebServer.php:70 include/photos.php:36 include/attach.php:160
 #: include/attach.php:209 include/attach.php:287 include/attach.php:413
 #: include/attach.php:428 include/attach.php:435 include/attach.php:514
 #: include/attach.php:1131 include/attach.php:1208 include/attach.php:1379
@@ -710,38 +710,38 @@ msgstr "Sala no encontrada."
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
-#: Zotlabs/Lib/Chatroom.php:164
+#: Code/Lib/Chatroom.php:164
 msgid "Room is full"
 msgstr "La sala está llena."
 
-#: Zotlabs/Lib/Enotify.php:70
+#: Code/Lib/Enotify.php:70
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
-#: Zotlabs/Lib/Enotify.php:71
+#: Code/Lib/Enotify.php:71
 msgid "$projectname"
 msgstr "$projectname"
 
-#: Zotlabs/Lib/Enotify.php:73
+#: Code/Lib/Enotify.php:73
 msgid "Thank You,"
 msgstr "Gracias,"
 
-#: Zotlabs/Lib/Enotify.php:75
+#: Code/Lib/Enotify.php:75
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
 
-#: Zotlabs/Lib/Enotify.php:76
+#: Code/Lib/Enotify.php:76
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr "Este email ha sido enviado por %1$s a %2$s."
 
-#: Zotlabs/Lib/Enotify.php:76 Zotlabs/Module/Home.php:142
-#: Zotlabs/Module/Home.php:151 extend/addon/a/opensearch/Mod_opensearch.php:28
+#: Code/Lib/Enotify.php:76 Code/Module/Home.php:142
+#: Code/Module/Home.php:151 extend/addon/a/opensearch/Mod_opensearch.php:28
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: Zotlabs/Lib/Enotify.php:77
+#: Code/Lib/Enotify.php:77
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
@@ -750,979 +750,979 @@ msgstr ""
 "Para dejar de recibir estos mensajes, por favor ajuste la configuración de "
 "notificación en %s"
 
-#: Zotlabs/Lib/Enotify.php:78
+#: Code/Lib/Enotify.php:78
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr "Para dejar de recibir estos mensajes, por favor, ajuste su %s"
 
-#: Zotlabs/Lib/Enotify.php:78
+#: Code/Lib/Enotify.php:78
 msgid "Notification Settings"
 msgstr "Configuración de las notificaciones"
 
-#: Zotlabs/Lib/Enotify.php:135
+#: Code/Lib/Enotify.php:135
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: Zotlabs/Lib/Enotify.php:139
+#: Code/Lib/Enotify.php:139
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname:Aviso] Nuevo correo recibido en %s"
 
-#: Zotlabs/Lib/Enotify.php:142
+#: Code/Lib/Enotify.php:142
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s le ha enviado un nuevo mensaje privado en %2$s."
 
-#: Zotlabs/Lib/Enotify.php:143
+#: Code/Lib/Enotify.php:143
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s le ha enviado %2$s."
 
-#: Zotlabs/Lib/Enotify.php:143 Zotlabs/Lib/Enotify.php:146
+#: Code/Lib/Enotify.php:143 Code/Lib/Enotify.php:146
 msgid "a private message"
 msgstr "un mensaje privado"
 
-#: Zotlabs/Lib/Enotify.php:145
+#: Code/Lib/Enotify.php:145
 #, php-format
 msgid "%1$s replied to a private message at %2$s."
 msgstr "%1$s ha respondido a un mensaje privado en %2$s"
 
-#: Zotlabs/Lib/Enotify.php:146
+#: Code/Lib/Enotify.php:146
 #, php-format
 msgid "%1$s replied to %2$s."
 msgstr "%1$sha respondido a %2$s"
 
-#: Zotlabs/Lib/Enotify.php:148
+#: Code/Lib/Enotify.php:148
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
 
-#: Zotlabs/Lib/Enotify.php:162
+#: Code/Lib/Enotify.php:162
 msgid "commented on"
 msgstr "ha comentado sobre "
 
-#: Zotlabs/Lib/Enotify.php:172
+#: Code/Lib/Enotify.php:172
 msgid "liked"
 msgstr "ha gustado de "
 
-#: Zotlabs/Lib/Enotify.php:176
+#: Code/Lib/Enotify.php:176
 msgid "disliked"
 msgstr "no ha gustado de "
 
-#: Zotlabs/Lib/Enotify.php:222
+#: Code/Lib/Enotify.php:222
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s%2$s [zrl=%3$s ]un %4$s[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:232
+#: Code/Lib/Enotify.php:232
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s %2$s[zrl=%3$s]%5$s de %4$s[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:244
+#: Code/Lib/Enotify.php:244
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]su %4$s[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:258
+#: Code/Lib/Enotify.php:258
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr ""
 "[$Projectname:Aviso] Comentario moderado en la conversación #%1$d por %2$s"
 
-#: Zotlabs/Lib/Enotify.php:261
+#: Code/Lib/Enotify.php:261
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 "[$Projectname:Aviso] Nuevo comentario de %2$s en la conversación #%1$d"
 
-#: Zotlabs/Lib/Enotify.php:263
+#: Code/Lib/Enotify.php:263
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr "%1$sha comentado un elemento/conversación que ha estado siguiendo."
 
-#: Zotlabs/Lib/Enotify.php:267
+#: Code/Lib/Enotify.php:267
 msgid "(Moderated)"
 msgstr "(Moderado/a)"
 
-#: Zotlabs/Lib/Enotify.php:270 Zotlabs/Lib/Enotify.php:354
-#: Zotlabs/Lib/Enotify.php:382 Zotlabs/Lib/Enotify.php:413
-#: Zotlabs/Lib/Enotify.php:432 Zotlabs/Lib/Enotify.php:447
+#: Code/Lib/Enotify.php:270 Code/Lib/Enotify.php:354
+#: Code/Lib/Enotify.php:382 Code/Lib/Enotify.php:413
+#: Code/Lib/Enotify.php:432 Code/Lib/Enotify.php:447
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Para ver o comentar la conversación, visite %s"
 
-#: Zotlabs/Lib/Enotify.php:274 Zotlabs/Lib/Enotify.php:275
+#: Code/Lib/Enotify.php:274 Code/Lib/Enotify.php:275
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Por favor, visite %s para aprobar o rechazar este comentario."
 
-#: Zotlabs/Lib/Enotify.php:335
+#: Code/Lib/Enotify.php:335
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr "A %1$sle ha gustado [zrl=%2$s]su %3$s [/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:350
+#: Code/Lib/Enotify.php:350
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Aviso] \"Me gusta\" de %2$s en la conversación #%1$d"
 
-#: Zotlabs/Lib/Enotify.php:351
+#: Code/Lib/Enotify.php:351
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr "A %1$s le ha gustado un elemento o conversación que ha creado usted."
 
-#: Zotlabs/Lib/Enotify.php:362
+#: Code/Lib/Enotify.php:362
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr ""
 "[$Projectname:Aviso] %s ha publicado una entrada en su página de inicio del "
 "perfil (\"muro\")"
 
-#: Zotlabs/Lib/Enotify.php:368
+#: Code/Lib/Enotify.php:368
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s ha publicado en su muro en %2$s"
 
-#: Zotlabs/Lib/Enotify.php:371
+#: Code/Lib/Enotify.php:371
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$sha publicado en [zrl=%2$s]su muro[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:378 Zotlabs/Lib/Enotify.php:379
+#: Code/Lib/Enotify.php:378 Code/Lib/Enotify.php:379
 msgid " - "
 msgstr " - "
 
-#: Zotlabs/Lib/Enotify.php:378 Zotlabs/Lib/Enotify.php:379
+#: Code/Lib/Enotify.php:378 Code/Lib/Enotify.php:379
 msgid "Moderated"
 msgstr "Moderado/a"
 
-#: Zotlabs/Lib/Enotify.php:387 Zotlabs/Lib/Enotify.php:388
+#: Code/Lib/Enotify.php:387 Code/Lib/Enotify.php:388
 #, php-format
 msgid "Please visit %s to approve or reject this post."
 msgstr "Por favor, visite %s para aprobar o rechazar esta entrada."
 
-#: Zotlabs/Lib/Enotify.php:405
+#: Code/Lib/Enotify.php:405
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Aviso] %s le ha etiquetado"
 
-#: Zotlabs/Lib/Enotify.php:406
+#: Code/Lib/Enotify.php:406
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$sle ha etiquetado en %2$s"
 
-#: Zotlabs/Lib/Enotify.php:408
+#: Code/Lib/Enotify.php:408
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s [zrl=%2$s]le ha etiquetado[/zrl]."
 
-#: Zotlabs/Lib/Enotify.php:420
+#: Code/Lib/Enotify.php:420
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Aviso] %1$s le ha dado un toque"
 
-#: Zotlabs/Lib/Enotify.php:421
+#: Code/Lib/Enotify.php:421
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$sle ha dado un toque en %2$s"
 
-#: Zotlabs/Lib/Enotify.php:423
+#: Code/Lib/Enotify.php:423
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s] le ha dado un toque[/zrl]."
 
-#: Zotlabs/Lib/Enotify.php:439
+#: Code/Lib/Enotify.php:439
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Aviso] %s ha etiquetado su entrada"
 
-#: Zotlabs/Lib/Enotify.php:440
+#: Code/Lib/Enotify.php:440
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$sha etiquetado su entrada en %2$s"
 
-#: Zotlabs/Lib/Enotify.php:442
+#: Code/Lib/Enotify.php:442
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s ha etiquetado [zrl=%2$s]su entrada[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:454
+#: Code/Lib/Enotify.php:454
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Aviso] Ha recibido una solicitud de conexión"
 
-#: Zotlabs/Lib/Enotify.php:455
+#: Code/Lib/Enotify.php:455
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr "Ha recibido una nueva solicitud de conexión de '%1$s' en %2$s"
 
-#: Zotlabs/Lib/Enotify.php:457
+#: Code/Lib/Enotify.php:457
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr "Ha recibido [zrl=%1$s]una nueva solicitud de conexión[/zrl] de %2$s."
 
-#: Zotlabs/Lib/Enotify.php:461 Zotlabs/Lib/Enotify.php:481
+#: Code/Lib/Enotify.php:461 Code/Lib/Enotify.php:481
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Puede visitar su perfil en %s"
 
-#: Zotlabs/Lib/Enotify.php:463
+#: Code/Lib/Enotify.php:463
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
 
-#: Zotlabs/Lib/Enotify.php:470
+#: Code/Lib/Enotify.php:470
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Aviso] Ha recibido una sugerencia de conexión"
 
-#: Zotlabs/Lib/Enotify.php:471
+#: Code/Lib/Enotify.php:471
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Ha recibido una sugerencia de amistad de '%1$s' en %2$s"
 
-#: Zotlabs/Lib/Enotify.php:473
+#: Code/Lib/Enotify.php:473
 #, php-format
 msgid ""
 "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr ""
 "Ha recibido [zrl=%1$s]una sugerencia de amistad[/zrl] para %2$s de %3$s."
 
-#: Zotlabs/Lib/Enotify.php:479
+#: Code/Lib/Enotify.php:479
 msgid "Name:"
 msgstr "Nombre:"
 
-#: Zotlabs/Lib/Enotify.php:480
+#: Code/Lib/Enotify.php:480
 msgid "Photo:"
 msgstr "Foto:"
 
-#: Zotlabs/Lib/Enotify.php:483
+#: Code/Lib/Enotify.php:483
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 
-#: Zotlabs/Lib/Enotify.php:741
+#: Code/Lib/Enotify.php:741
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Aviso]"
 
-#: Zotlabs/Lib/Enotify.php:923
+#: Code/Lib/Enotify.php:923
 msgid "created a new post"
 msgstr "ha creado una nueva entrada"
 
-#: Zotlabs/Lib/Enotify.php:924
+#: Code/Lib/Enotify.php:924
 #, php-format
 msgid "reacted to %s's conversation"
 msgstr "reaccionó a la conversación de %s"
 
-#: Zotlabs/Lib/Enotify.php:926
+#: Code/Lib/Enotify.php:926
 #, php-format
 msgid "shared %s's post"
 msgstr "compartió la entrada de %s"
 
-#: Zotlabs/Lib/Enotify.php:930
+#: Code/Lib/Enotify.php:930
 msgid "sent a direct message"
 msgstr "ha enviado un mensaje directo"
 
-#: Zotlabs/Lib/Enotify.php:937
+#: Code/Lib/Enotify.php:937
 #, php-format
 msgid "edited a post dated %s"
 msgstr "ha editado una entrada %s"
 
-#: Zotlabs/Lib/Enotify.php:940
+#: Code/Lib/Enotify.php:940
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "ha editado un comentario %s"
 
-#: Zotlabs/Lib/Connect.php:50 Zotlabs/Lib/Connect.php:172
+#: Code/Lib/Connect.php:50 Code/Lib/Connect.php:172
 msgid "Channel is blocked on this site."
 msgstr "El canal está bloqueado en este sitio."
 
-#: Zotlabs/Lib/Connect.php:55
+#: Code/Lib/Connect.php:55
 msgid "Channel location missing."
 msgstr "Falta la dirección del canal."
 
-#: Zotlabs/Lib/Connect.php:133
+#: Code/Lib/Connect.php:133
 msgid "Remote channel or protocol unavailable."
 msgstr "Canal remoto o protocolo no disponible."
 
-#: Zotlabs/Lib/Connect.php:166
+#: Code/Lib/Connect.php:166
 msgid "Channel discovery failed."
 msgstr "El intento de acceder al canal ha fallado."
 
-#: Zotlabs/Lib/Connect.php:180
+#: Code/Lib/Connect.php:180
 msgid "Protocol not supported"
 msgstr "Protocolo no soportado"
 
-#: Zotlabs/Lib/Connect.php:193
+#: Code/Lib/Connect.php:193
 msgid "Cannot connect to yourself."
 msgstr "No puede conectarse consigo mismo."
 
-#: Zotlabs/Lib/Connect.php:271
+#: Code/Lib/Connect.php:271
 msgid "error saving data"
 msgstr "error al guardar datos"
 
-#: Zotlabs/Lib/Libzot.php:761
+#: Code/Lib/Libzot.php:761
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la firma del canal"
 
-#: Zotlabs/Lib/Libprofile.php:36
+#: Code/Lib/Libprofile.php:36
 msgid "Requested channel is not available."
 msgstr "El canal solicitado no está disponible."
 
-#: Zotlabs/Lib/Libprofile.php:96 Zotlabs/Module/Cards.php:42
-#: Zotlabs/Module/Blocks.php:41 Zotlabs/Module/Editlayout.php:39
-#: Zotlabs/Module/Editwebpage.php:42 Zotlabs/Module/Hcard.php:18
-#: Zotlabs/Module/Layouts.php:39 Zotlabs/Module/Editblock.php:40
-#: Zotlabs/Module/Menu.php:97 Zotlabs/Module/Connect.php:19
-#: Zotlabs/Module/Webpages.php:44 Zotlabs/Module/Profile.php:28
+#: Code/Lib/Libprofile.php:96 Code/Module/Cards.php:42
+#: Code/Module/Blocks.php:41 Code/Module/Editlayout.php:39
+#: Code/Module/Editwebpage.php:42 Code/Module/Hcard.php:18
+#: Code/Module/Layouts.php:39 Code/Module/Editblock.php:40
+#: Code/Module/Menu.php:97 Code/Module/Connect.php:19
+#: Code/Module/Webpages.php:44 Code/Module/Profile.php:28
 #: extend/addon/a/gallery/Mod_Gallery.php:50
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
-#: Zotlabs/Lib/Libprofile.php:196 Zotlabs/Module/Profiles.php:773
+#: Code/Lib/Libprofile.php:196 Code/Module/Profiles.php:773
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
-#: Zotlabs/Lib/Libprofile.php:203 Zotlabs/Module/Profiles.php:878
+#: Code/Lib/Libprofile.php:203 Code/Module/Profiles.php:878
 #: include/nav.php:120
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
 
-#: Zotlabs/Lib/Libprofile.php:204
+#: Code/Lib/Libprofile.php:204
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: Zotlabs/Lib/Libprofile.php:206 include/nav.php:122
+#: Code/Lib/Libprofile.php:206 include/nav.php:122
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
-#: Zotlabs/Lib/Libprofile.php:223 Zotlabs/Module/Profiles.php:868
+#: Code/Lib/Libprofile.php:223 Code/Module/Profiles.php:868
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: Zotlabs/Lib/Libprofile.php:226
+#: Code/Lib/Libprofile.php:226
 msgid "Visible to everybody"
 msgstr "Visible para todos"
 
-#: Zotlabs/Lib/Libprofile.php:227 Zotlabs/Module/Profiles.php:770
-#: Zotlabs/Module/Profiles.php:872
+#: Code/Lib/Libprofile.php:227 Code/Module/Profiles.php:770
+#: Code/Module/Profiles.php:872
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
-#: Zotlabs/Lib/Libprofile.php:295 include/connections.php:175
+#: Code/Lib/Libprofile.php:295 include/connections.php:175
 #: include/conversation.php:993
 msgid "Direct Message"
 msgstr "Mensaje directo"
 
-#: Zotlabs/Lib/Libprofile.php:308 Zotlabs/Module/Directory.php:399
-#: Zotlabs/Module/Fedi_id.php:52 Zotlabs/Widget/Follow.php:38
-#: Zotlabs/Widget/Suggestions.php:50 include/connections.php:147
+#: Code/Lib/Libprofile.php:308 Code/Module/Directory.php:399
+#: Code/Module/Fedi_id.php:52 Code/Widget/Follow.php:38
+#: Code/Widget/Suggestions.php:50 include/connections.php:147
 #: include/conversation.php:973
 msgid "Connect"
 msgstr "Conectar"
 
-#: Zotlabs/Lib/Libprofile.php:327 Zotlabs/Module/Directory.php:381
+#: Code/Lib/Libprofile.php:327 Code/Module/Directory.php:381
 #: include/event.php:81 include/event.php:139
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: Zotlabs/Lib/Libprofile.php:332 Zotlabs/Lib/Libprofile.php:508
+#: Code/Lib/Libprofile.php:332 Code/Lib/Libprofile.php:508
 msgid "Gender:"
 msgstr "Género:"
 
-#: Zotlabs/Lib/Libprofile.php:333 Zotlabs/Lib/Libprofile.php:558
+#: Code/Lib/Libprofile.php:333 Code/Lib/Libprofile.php:558
 msgid "Status:"
 msgstr "Estado:"
 
-#: Zotlabs/Lib/Libprofile.php:334 Zotlabs/Lib/Libprofile.php:591
+#: Code/Lib/Libprofile.php:334 Code/Lib/Libprofile.php:591
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: Zotlabs/Lib/Libprofile.php:335 Zotlabs/Lib/Libprofile.php:587
+#: Code/Lib/Libprofile.php:335 Code/Lib/Libprofile.php:587
 msgid "Pronouns:"
 msgstr "Pronunciación: "
 
-#: Zotlabs/Lib/Libprofile.php:398 Zotlabs/Module/Connections.php:63
-#: Zotlabs/Module/Connections.php:122 Zotlabs/Module/Connections.php:133
-#: Zotlabs/Module/Connections.php:293
+#: Code/Lib/Libprofile.php:398 Code/Module/Connections.php:63
+#: Code/Module/Connections.php:122 Code/Module/Connections.php:133
+#: Code/Module/Connections.php:293
 msgid "Active"
 msgstr "Activo/a"
 
-#: Zotlabs/Lib/Libprofile.php:402
+#: Code/Lib/Libprofile.php:402
 msgid "Change your profile photo"
 msgstr "Cambiar su foto del perfil"
 
-#: Zotlabs/Lib/Libprofile.php:403
+#: Code/Lib/Libprofile.php:403
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#: Zotlabs/Lib/Libprofile.php:404
+#: Code/Lib/Libprofile.php:404
 msgid "Address copied to clipboard"
 msgstr "Dirección copiada en el portapapeles"
 
-#: Zotlabs/Lib/Libprofile.php:432 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003
+#: Code/Lib/Libprofile.php:432 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003
 msgid "Female"
 msgstr "Mujer"
 
-#: Zotlabs/Lib/Libprofile.php:435 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003
+#: Code/Lib/Libprofile.php:435 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003
 msgid "Male"
 msgstr "Hombre"
 
-#: Zotlabs/Lib/Libprofile.php:438
+#: Code/Lib/Libprofile.php:438
 msgid "Trans"
 msgstr "Trans"
 
-#: Zotlabs/Lib/Libprofile.php:441
+#: Code/Lib/Libprofile.php:441
 msgid "Inter"
 msgstr "Inter"
 
-#: Zotlabs/Lib/Libprofile.php:444 Zotlabs/Module/Profiles.php:985
+#: Code/Lib/Libprofile.php:444 Code/Module/Profiles.php:985
 msgid "Neuter"
 msgstr "Neutral"
 
-#: Zotlabs/Lib/Libprofile.php:447 Zotlabs/Module/Profiles.php:985
+#: Code/Lib/Libprofile.php:447 Code/Module/Profiles.php:985
 msgid "Non-specific"
 msgstr "No especificado"
 
-#: Zotlabs/Lib/Libprofile.php:461
+#: Code/Lib/Libprofile.php:461
 msgid "She"
 msgstr "Ella"
 
-#: Zotlabs/Lib/Libprofile.php:464
+#: Code/Lib/Libprofile.php:464
 msgid "Him"
 msgstr "Él"
 
-#: Zotlabs/Lib/Libprofile.php:467
+#: Code/Lib/Libprofile.php:467
 msgid "Them"
 msgstr "Ellos/Ellas"
 
-#: Zotlabs/Lib/Libprofile.php:505
+#: Code/Lib/Libprofile.php:505
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: Zotlabs/Lib/Libprofile.php:542
+#: Code/Lib/Libprofile.php:542
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: Zotlabs/Lib/Libprofile.php:543
+#: Code/Lib/Libprofile.php:543
 msgid "j F"
 msgstr "j F"
 
-#: Zotlabs/Lib/Libprofile.php:550
+#: Code/Lib/Libprofile.php:550
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: Zotlabs/Lib/Libprofile.php:554 Zotlabs/Module/Directory.php:376
+#: Code/Lib/Libprofile.php:554 Code/Module/Directory.php:376
 msgid "Age:"
 msgstr "Edad:"
 
-#: Zotlabs/Lib/Libprofile.php:566
+#: Code/Lib/Libprofile.php:566
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: Zotlabs/Lib/Libprofile.php:578
+#: Code/Lib/Libprofile.php:578
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: Zotlabs/Lib/Libprofile.php:583
+#: Code/Lib/Libprofile.php:583
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: Zotlabs/Lib/Libprofile.php:595 Zotlabs/Module/Directory.php:396
+#: Code/Lib/Libprofile.php:595 Code/Module/Directory.php:396
 msgid "Hometown:"
 msgstr "Lugar de nacimiento:"
 
-#: Zotlabs/Lib/Libprofile.php:599
+#: Code/Lib/Libprofile.php:599
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: Zotlabs/Lib/Libprofile.php:603
+#: Code/Lib/Libprofile.php:603
 msgid "Religion:"
 msgstr "Religión:"
 
-#: Zotlabs/Lib/Libprofile.php:607 Zotlabs/Module/Directory.php:398
+#: Code/Lib/Libprofile.php:607 Code/Module/Directory.php:398
 msgid "About:"
 msgstr "Sobre mí:"
 
-#: Zotlabs/Lib/Libprofile.php:611
+#: Code/Lib/Libprofile.php:611
 msgid "Hobbies/Interests:"
 msgstr "Aficciones o intereses:"
 
-#: Zotlabs/Lib/Libprofile.php:615
+#: Code/Lib/Libprofile.php:615
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: Zotlabs/Lib/Libprofile.php:619
+#: Code/Lib/Libprofile.php:619
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: Zotlabs/Lib/Libprofile.php:623
+#: Code/Lib/Libprofile.php:623
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: Zotlabs/Lib/Libprofile.php:627
+#: Code/Lib/Libprofile.php:627
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: Zotlabs/Lib/Libprofile.php:631
+#: Code/Lib/Libprofile.php:631
 msgid "Musical interests:"
 msgstr "Preferencias musicales:"
 
-#: Zotlabs/Lib/Libprofile.php:635
+#: Code/Lib/Libprofile.php:635
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: Zotlabs/Lib/Libprofile.php:639
+#: Code/Lib/Libprofile.php:639
 msgid "Television:"
 msgstr "Televisión:"
 
-#: Zotlabs/Lib/Libprofile.php:643
+#: Code/Lib/Libprofile.php:643
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: Zotlabs/Lib/Libprofile.php:647
+#: Code/Lib/Libprofile.php:647
 msgid "Love/Romance:"
 msgstr "Vida sentimental o amorosa:"
 
-#: Zotlabs/Lib/Libprofile.php:651
+#: Code/Lib/Libprofile.php:651
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: Zotlabs/Lib/Libprofile.php:655
+#: Code/Lib/Libprofile.php:655
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: Zotlabs/Lib/Libprofile.php:679 Zotlabs/Lib/Apps.php:391
-#: Zotlabs/Lib/Activity.php:2882 Zotlabs/Lib/Activity.php:2885
-#: Zotlabs/Lib/Activity.php:2905 Zotlabs/Module/Profperm.php:131
+#: Code/Lib/Libprofile.php:679 Code/Lib/Apps.php:391
+#: Code/Lib/Activity.php:2882 Code/Lib/Activity.php:2885
+#: Code/Lib/Activity.php:2905 Code/Module/Profperm.php:131
 msgid "Profile"
 msgstr "Perfil"
 
-#: Zotlabs/Lib/Libprofile.php:681
+#: Code/Lib/Libprofile.php:681
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
-#: Zotlabs/Lib/Libprofile.php:682 Zotlabs/Module/Cal.php:355
-#: Zotlabs/Module/Events.php:756
+#: Code/Lib/Libprofile.php:682 Code/Module/Cal.php:355
+#: Code/Module/Events.php:756
 msgid "Export"
 msgstr "Exportar"
 
-#: Zotlabs/Lib/Apps.php:339
+#: Code/Lib/Apps.php:339
 msgid "Site Admin"
 msgstr "Administrador del sitio"
 
-#: Zotlabs/Lib/Apps.php:340 include/nav.php:316
+#: Code/Lib/Apps.php:340 include/nav.php:316
 msgid "Apps"
 msgstr "Aplicaciones (apps)"
 
-#: Zotlabs/Lib/Apps.php:341 include/nav.php:494 include/features.php:144
+#: Code/Lib/Apps.php:341 include/nav.php:494 include/features.php:144
 msgid "Articles"
 msgstr "Artículos"
 
-#: Zotlabs/Lib/Apps.php:342
+#: Code/Lib/Apps.php:342
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: Zotlabs/Lib/Apps.php:343
+#: Code/Lib/Apps.php:343
 msgid "CardDAV"
 msgstr "CardDAV"
 
-#: Zotlabs/Lib/Apps.php:344 Zotlabs/Module/Cards.php:212 include/nav.php:483
+#: Code/Lib/Apps.php:344 Code/Module/Cards.php:212 include/nav.php:483
 #: include/conversation.php:2058
 msgid "Cards"
 msgstr "Fichas"
 
-#: Zotlabs/Lib/Apps.php:345 Zotlabs/Storage/Browser.php:157
+#: Code/Lib/Apps.php:345 Code/Storage/Browser.php:157
 #: include/nav.php:445 include/nav.php:448
 msgid "Calendar"
 msgstr "Calendario"
 
-#: Zotlabs/Lib/Apps.php:346 Zotlabs/Module/Cdav.php:1071
-#: Zotlabs/Widget/Appcategories.php:49 Zotlabs/Widget/Categories.php:85
-#: Zotlabs/Widget/Categories.php:133 Zotlabs/Widget/Categories.php:184
+#: Code/Lib/Apps.php:346 Code/Module/Cdav.php:1071
+#: Code/Widget/Appcategories.php:49 Code/Widget/Categories.php:85
+#: Code/Widget/Categories.php:133 Code/Widget/Categories.php:184
 #: include/taxonomy.php:465 include/taxonomy.php:559 include/taxonomy.php:581
 #: include/taxonomy.php:604
 msgid "Categories"
 msgstr "Temas"
 
-#: Zotlabs/Lib/Apps.php:347
+#: Code/Lib/Apps.php:347
 msgid "Channel Home"
 msgstr "Mi canal"
 
-#: Zotlabs/Lib/Apps.php:348
+#: Code/Lib/Apps.php:348
 msgid "Channel Manager"
 msgstr "Administración de canales"
 
-#: Zotlabs/Lib/Apps.php:349 Zotlabs/Module/Sources.php:112
+#: Code/Lib/Apps.php:349 Code/Module/Sources.php:112
 msgid "Channel Sources"
 msgstr "Orígenes de los contenidos del canal"
 
-#: Zotlabs/Lib/Apps.php:350
+#: Code/Lib/Apps.php:350
 msgid "Chat"
 msgstr "Chat"
 
-#: Zotlabs/Lib/Apps.php:351 Zotlabs/Widget/Chatroom_list.php:22
+#: Code/Lib/Apps.php:351 Code/Widget/Chatroom_list.php:22
 #: include/nav.php:459 include/nav.php:462 include/conversation.php:2032
 #: include/conversation.php:2035
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
-#: Zotlabs/Lib/Apps.php:352
+#: Code/Lib/Apps.php:352
 msgid "Clients"
 msgstr "Clientes"
 
-#: Zotlabs/Lib/Apps.php:353 include/conversation.php:1441
+#: Code/Lib/Apps.php:353 include/conversation.php:1441
 msgid "Comment Control"
 msgstr "Control de comentarios"
 
-#: Zotlabs/Lib/Apps.php:354 Zotlabs/Module/Connedit.php:674
-#: Zotlabs/Module/Connections.php:368 Zotlabs/Module/Stream.php:135
-#: Zotlabs/Module/Affinity.php:65 Zotlabs/Widget/Activity_filter.php:146
-#: Zotlabs/Widget/Affinity.php:30 include/connections.php:978
+#: Code/Lib/Apps.php:354 Code/Module/Connedit.php:674
+#: Code/Module/Connections.php:368 Code/Module/Stream.php:135
+#: Code/Module/Affinity.php:65 Code/Widget/Activity_filter.php:146
+#: Code/Widget/Affinity.php:30 include/connections.php:978
 msgid "Connections"
 msgstr "Conexiones"
 
-#: Zotlabs/Lib/Apps.php:355
+#: Code/Lib/Apps.php:355
 msgid "Content Filter"
 msgstr "Filtro de contenido"
 
-#: Zotlabs/Lib/Apps.php:356
+#: Code/Lib/Apps.php:356
 #: extend/addon/a/content_import/Mod_content_import.php:135
 msgid "Content Import"
 msgstr "Importación de contenidos"
 
-#: Zotlabs/Lib/Apps.php:357 Zotlabs/Module/Directory.php:472
+#: Code/Lib/Apps.php:357 Code/Module/Directory.php:472
 msgid "Directory"
 msgstr "Directorio"
 
-#: Zotlabs/Lib/Apps.php:358 Zotlabs/Widget/Activity_filter.php:77
+#: Code/Lib/Apps.php:358 Code/Widget/Activity_filter.php:77
 msgid "Drafts"
 msgstr "Borradores"
 
-#: Zotlabs/Lib/Apps.php:359 Zotlabs/Widget/Activity_filter.php:105
+#: Code/Lib/Apps.php:359 Code/Widget/Activity_filter.php:105
 #: include/conversation.php:2018 include/conversation.php:2021
 msgid "Events"
 msgstr "Eventos"
 
-#: Zotlabs/Lib/Apps.php:360
+#: Code/Lib/Apps.php:360
 msgid "Expire Posts"
 msgstr "Caducar entradas"
 
-#: Zotlabs/Lib/Apps.php:361
+#: Code/Lib/Apps.php:361
 msgid "Features"
 msgstr "Funcionalidades"
 
-#: Zotlabs/Lib/Apps.php:362 Zotlabs/Module/Fbrowser.php:93
-#: Zotlabs/Storage/Browser.php:298 include/nav.php:434
+#: Code/Lib/Apps.php:362 Code/Module/Fbrowser.php:93
+#: Code/Storage/Browser.php:298 include/nav.php:434
 #: include/conversation.php:2007
 msgid "Files"
 msgstr "Ficheros"
 
-#: Zotlabs/Lib/Apps.php:363 extend/addon/a/followlist/Mod_followlist.php:129
+#: Code/Lib/Apps.php:363 extend/addon/a/followlist/Mod_followlist.php:129
 msgid "Followlist"
 msgstr "Lista de seguimiento"
 
-#: Zotlabs/Lib/Apps.php:364 Zotlabs/Module/Connedit.php:663
+#: Code/Lib/Apps.php:364 Code/Module/Connedit.php:663
 msgid "Friend Zoom"
 msgstr "Zoom de amigo"
 
-#: Zotlabs/Lib/Apps.php:365
+#: Code/Lib/Apps.php:365
 msgid "Future Posting"
 msgstr "Futuras entradas"
 
-#: Zotlabs/Lib/Apps.php:366 extend/addon/a/gallery/Mod_Gallery.php:137
+#: Code/Lib/Apps.php:366 extend/addon/a/gallery/Mod_Gallery.php:137
 #: extend/addon/a/gallery/gallery.php:46
 msgid "Gallery"
 msgstr "Galería"
 
-#: Zotlabs/Lib/Apps.php:367
+#: Code/Lib/Apps.php:367
 msgid "Guest Pass"
 msgstr "Pase de invitado"
 
-#: Zotlabs/Lib/Apps.php:368 include/help.php:69 include/nav.php:177
+#: Code/Lib/Apps.php:368 include/help.php:69 include/nav.php:177
 #: include/nav.php:297
 msgid "Help"
 msgstr "Ayuda"
 
-#: Zotlabs/Lib/Apps.php:369
+#: Code/Lib/Apps.php:369
 msgid "Invite"
 msgstr "Invitar"
 
-#: Zotlabs/Lib/Apps.php:370
+#: Code/Lib/Apps.php:370
 msgid "Language"
 msgstr "Idioma"
 
-#: Zotlabs/Lib/Apps.php:371 Zotlabs/Lib/AccessList.php:391
-#: Zotlabs/Widget/Activity_filter.php:174 include/nav.php:103
+#: Code/Lib/Apps.php:371 Code/Lib/AccessList.php:391
+#: Code/Widget/Activity_filter.php:174 include/nav.php:103
 msgid "Lists"
 msgstr "Listas"
 
-#: Zotlabs/Lib/Apps.php:372 boot.php:1726 include/nav.php:128
+#: Code/Lib/Apps.php:372 boot.php:1726 include/nav.php:128
 #: include/nav.php:131
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: Zotlabs/Lib/Apps.php:373
+#: Code/Lib/Apps.php:373
 msgid "Mail"
 msgstr "Correo"
 
-#: Zotlabs/Lib/Apps.php:374
+#: Code/Lib/Apps.php:374
 msgid "Markup"
 msgstr "Marcar"
 
-#: Zotlabs/Lib/Apps.php:375 Zotlabs/Module/Mood.php:162
+#: Code/Lib/Apps.php:375 Code/Module/Mood.php:162
 msgid "Mood"
 msgstr "Estado de ánimo"
 
-#: Zotlabs/Lib/Apps.php:376
+#: Code/Lib/Apps.php:376
 msgid "My Chatrooms"
 msgstr "Mis salas de chat"
 
-#: Zotlabs/Lib/Apps.php:377
+#: Code/Lib/Apps.php:377
 msgid "No Comment"
 msgstr "Sin comentarios"
 
-#: Zotlabs/Lib/Apps.php:378 Zotlabs/Widget/Notes.php:22
+#: Code/Lib/Apps.php:378 Code/Widget/Notes.php:22
 msgid "Notes"
 msgstr "Notas"
 
-#: Zotlabs/Lib/Apps.php:379 Zotlabs/Module/Settings/Channel.php:687
+#: Code/Lib/Apps.php:379 Code/Module/Settings/Channel.php:687
 #: include/nav.php:320
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: Zotlabs/Lib/Apps.php:380
+#: Code/Lib/Apps.php:380
 msgid "OAuth Apps Manager"
 msgstr "Administrador de apps OAuth"
 
-#: Zotlabs/Lib/Apps.php:381
+#: Code/Lib/Apps.php:381
 msgid "OAuth2 Apps Manager"
 msgstr "Administrador de apps OAuth2"
 
-#: Zotlabs/Lib/Apps.php:382
+#: Code/Lib/Apps.php:382
 msgid "Order Apps"
 msgstr "Ordenar las apps"
 
-#: Zotlabs/Lib/Apps.php:383
+#: Code/Lib/Apps.php:383
 msgid "PDL Editor"
 msgstr "Editor PDL"
 
-#: Zotlabs/Lib/Apps.php:384 include/features.php:252
+#: Code/Lib/Apps.php:384 include/features.php:252
 msgid "Permission Categories"
 msgstr "Tipos de permisos"
 
-#: Zotlabs/Lib/Apps.php:385 Zotlabs/Module/Fbrowser.php:35 include/nav.php:426
+#: Code/Lib/Apps.php:385 Code/Module/Fbrowser.php:35 include/nav.php:426
 #: include/conversation.php:1999
 msgid "Photos"
 msgstr "Fotos"
 
-#: Zotlabs/Lib/Apps.php:386
+#: Code/Lib/Apps.php:386
 msgid "Photomap"
 msgstr "Photomap"
 
-#: Zotlabs/Lib/Apps.php:387 Zotlabs/Module/Poke.php:139
+#: Code/Lib/Apps.php:387 Code/Module/Poke.php:139
 msgid "Poke"
 msgstr "Toques y otras cosas"
 
-#: Zotlabs/Lib/Apps.php:388
+#: Code/Lib/Apps.php:388
 msgid "Post"
 msgstr "Publicación"
 
-#: Zotlabs/Lib/Apps.php:389
+#: Code/Lib/Apps.php:389
 msgid "Premium Channel"
 msgstr "Canal premium"
 
-#: Zotlabs/Lib/Apps.php:390
+#: Code/Lib/Apps.php:390
 msgid "Probe"
 msgstr "Probar"
 
-#: Zotlabs/Lib/Apps.php:392
+#: Code/Lib/Apps.php:392
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
-#: Zotlabs/Lib/Apps.php:393
+#: Code/Lib/Apps.php:393
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: Zotlabs/Lib/Apps.php:394 Zotlabs/Module/Pubstream.php:95
-#: Zotlabs/Widget/Notifications.php:131
+#: Code/Lib/Apps.php:394 Code/Module/Pubstream.php:95
+#: Code/Widget/Notifications.php:131
 msgid "Public Stream"
 msgstr "\"Stream\" público"
 
-#: Zotlabs/Lib/Apps.php:395
+#: Code/Lib/Apps.php:395
 msgid "Random Channel"
 msgstr "Canal aleatorio"
 
-#: Zotlabs/Lib/Apps.php:396
+#: Code/Lib/Apps.php:396
 msgid "Remote Diagnostics"
 msgstr "Diagnóstico remoto"
 
-#: Zotlabs/Lib/Apps.php:397
+#: Code/Lib/Apps.php:397
 msgid "Report Bug"
 msgstr "Informe de errores"
 
-#: Zotlabs/Lib/Apps.php:398
+#: Code/Lib/Apps.php:398
 msgid "Roles"
 msgstr "Roles"
 
-#: Zotlabs/Lib/Apps.php:399 Zotlabs/Module/Connections.php:375
-#: Zotlabs/Module/Search.php:61 Zotlabs/Widget/Sitesearch.php:35
+#: Code/Lib/Apps.php:399 Code/Module/Connections.php:375
+#: Code/Module/Search.php:61 Code/Widget/Sitesearch.php:35
 #: include/acl_selectors.php:147 include/nav.php:184 include/text.php:1048
 #: include/text.php:1061
 msgid "Search"
 msgstr "Buscar"
 
-#: Zotlabs/Lib/Apps.php:400
+#: Code/Lib/Apps.php:400
 msgid "Secrets"
 msgstr "Secrets"
 
-#: Zotlabs/Lib/Apps.php:401 Zotlabs/Module/Admin/Addons.php:346
-#: Zotlabs/Module/Admin/Themes.php:137 Zotlabs/Widget/Settings_menu.php:135
-#: Zotlabs/Widget/Newmember.php:54 include/nav.php:105
+#: Code/Lib/Apps.php:401 Code/Module/Admin/Addons.php:346
+#: Code/Module/Admin/Themes.php:137 Code/Widget/Settings_menu.php:135
+#: Code/Widget/Newmember.php:54 include/nav.php:105
 msgid "Settings"
 msgstr "Ajustes"
 
-#: Zotlabs/Lib/Apps.php:402
+#: Code/Lib/Apps.php:402
 msgid "Sites"
 msgstr "Sitios"
 
-#: Zotlabs/Lib/Apps.php:403
+#: Code/Lib/Apps.php:403
 msgid "Stream"
 msgstr "Stream"
 
-#: Zotlabs/Lib/Apps.php:404 Zotlabs/Widget/Stream_order.php:137
+#: Code/Lib/Apps.php:404 Code/Widget/Stream_order.php:137
 msgid "Stream Order"
 msgstr "Orden del stream"
 
-#: Zotlabs/Lib/Apps.php:405
+#: Code/Lib/Apps.php:405
 msgid "Suggest"
 msgstr "Sugerir"
 
-#: Zotlabs/Lib/Apps.php:406 Zotlabs/Module/Settings/Network.php:112
+#: Code/Lib/Apps.php:406 Code/Module/Settings/Network.php:112
 #: include/features.php:447
 msgid "Suggest Channels"
 msgstr "Sugerir canales"
 
-#: Zotlabs/Lib/Apps.php:407
+#: Code/Lib/Apps.php:407
 msgid "Tagadelic"
 msgstr "Tagadelic"
 
-#: Zotlabs/Lib/Apps.php:408 Zotlabs/Widget/Tasklist.php:30
+#: Code/Lib/Apps.php:408 Code/Widget/Tasklist.php:30
 msgid "Tasks"
 msgstr "Tareas"
 
-#: Zotlabs/Lib/Apps.php:409
+#: Code/Lib/Apps.php:409
 msgid "View Bookmarks"
 msgstr "Ver Marcadores"
 
-#: Zotlabs/Lib/Apps.php:410 Zotlabs/Module/Connedit.php:548
+#: Code/Lib/Apps.php:410 Code/Module/Connedit.php:548
 #: include/nav.php:117
 msgid "View Profile"
 msgstr "Ver el perfil"
 
-#: Zotlabs/Lib/Apps.php:411
+#: Code/Lib/Apps.php:411
 msgid "Virtual Lists"
 msgstr "Listas virtuales"
 
-#: Zotlabs/Lib/Apps.php:412 Zotlabs/Module/Webpages.php:262
+#: Code/Lib/Apps.php:412 Code/Module/Webpages.php:262
 #: include/nav.php:506 include/conversation.php:2080
 msgid "Webpages"
 msgstr "Páginas web"
 
-#: Zotlabs/Lib/Apps.php:413 include/nav.php:521 include/conversation.php:2096
+#: Code/Lib/Apps.php:413 include/nav.php:521 include/conversation.php:2096
 msgid "Wiki"
 msgstr "Wiki"
 
-#: Zotlabs/Lib/Apps.php:414 extend/addon/a/zotpost/Mod_zotpost.php:54
+#: Code/Lib/Apps.php:414 extend/addon/a/zotpost/Mod_zotpost.php:54
 msgid "ZotPost"
 msgstr "Entrada Zot"
 
-#: Zotlabs/Lib/Apps.php:591
+#: Code/Lib/Apps.php:591
 msgid "Installed"
 msgstr "Instalado/a/s"
 
-#: Zotlabs/Lib/Apps.php:591 Zotlabs/Module/Admin/Addons.php:429
+#: Code/Lib/Apps.php:591 Code/Module/Admin/Addons.php:429
 msgid "Install"
 msgstr "Instalar"
 
-#: Zotlabs/Lib/Apps.php:615
+#: Code/Lib/Apps.php:615
 msgid "Purchase"
 msgstr "Comprar"
 
-#: Zotlabs/Lib/Apps.php:620
+#: Code/Lib/Apps.php:620
 msgid "Undelete"
 msgstr "Recuperar"
 
-#: Zotlabs/Lib/Apps.php:630
+#: Code/Lib/Apps.php:630
 msgid "Add to app-tray"
 msgstr "Añadir a la bandeja de aplicaciones"
 
-#: Zotlabs/Lib/Apps.php:631
+#: Code/Lib/Apps.php:631
 msgid "Remove from app-tray"
 msgstr "Quitar de la bandeja de aplicaciones"
 
-#: Zotlabs/Lib/Apps.php:632
+#: Code/Lib/Apps.php:632
 msgid "Pin to navbar"
 msgstr "Fijar en la barra de navegación"
 
-#: Zotlabs/Lib/Apps.php:633
+#: Code/Lib/Apps.php:633
 msgid "Unpin from navbar"
 msgstr "Quitar de la barra de navegación"
 
-#: Zotlabs/Lib/Apps.php:1149 Zotlabs/Lib/Apps.php:1241
-#: Zotlabs/Lib/Activity.php:2194 Zotlabs/Module/Cdav.php:858
-#: Zotlabs/Module/Cdav.php:859 Zotlabs/Module/Cdav.php:865
-#: Zotlabs/Module/Embedphotos.php:214 Zotlabs/Module/Photos.php:854
-#: Zotlabs/Module/Photos.php:1329 Zotlabs/Storage/Browser.php:182
-#: Zotlabs/Widget/Album.php:94 Zotlabs/Widget/Portfolio.php:107
+#: Code/Lib/Apps.php:1149 Code/Lib/Apps.php:1241
+#: Code/Lib/Activity.php:2194 Code/Module/Cdav.php:858
+#: Code/Module/Cdav.php:859 Code/Module/Cdav.php:865
+#: Code/Module/Embedphotos.php:214 Code/Module/Photos.php:854
+#: Code/Module/Photos.php:1329 Code/Storage/Browser.php:182
+#: Code/Widget/Album.php:94 Code/Widget/Portfolio.php:107
 #: include/conversation.php:1080
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: Zotlabs/Lib/PermissionDescription.php:40 include/acl_selectors.php:37
+#: Code/Lib/PermissionDescription.php:40 include/acl_selectors.php:37
 msgid "Visible to your default audience"
 msgstr "Visible para su público predeterminado."
 
-#: Zotlabs/Lib/PermissionDescription.php:117 include/acl_selectors.php:135
+#: Code/Lib/PermissionDescription.php:117 include/acl_selectors.php:135
 msgid "Only me"
 msgstr "Sólo yo"
 
-#: Zotlabs/Lib/PermissionDescription.php:119
+#: Code/Lib/PermissionDescription.php:119
 msgid "Public"
 msgstr "Público"
 
-#: Zotlabs/Lib/PermissionDescription.php:121
+#: Code/Lib/PermissionDescription.php:121
 msgid "Anybody in the $Projectname network"
 msgstr "Cualquiera en la red $Projectname"
 
-#: Zotlabs/Lib/PermissionDescription.php:123
+#: Code/Lib/PermissionDescription.php:123
 #, php-format
 msgid "Any account on %s"
 msgstr "Cualquier cuenta en %s"
 
-#: Zotlabs/Lib/PermissionDescription.php:125
+#: Code/Lib/PermissionDescription.php:125
 msgid "Any of my connections"
 msgstr "Cualquiera de mis conexiones"
 
-#: Zotlabs/Lib/PermissionDescription.php:127
+#: Code/Lib/PermissionDescription.php:127
 msgid "Only connections I specifically allow"
 msgstr "Sólo las conexiones que yo permita de forma explícita"
 
-#: Zotlabs/Lib/PermissionDescription.php:129
+#: Code/Lib/PermissionDescription.php:129
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr ""
 "Cualquiera que esté autenticado (podría incluir a los visitantes de otras "
 "redes)"
 
-#: Zotlabs/Lib/PermissionDescription.php:131
+#: Code/Lib/PermissionDescription.php:131
 msgid "Any connections including those who haven't yet been approved"
 msgstr "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas"
 
-#: Zotlabs/Lib/PermissionDescription.php:180
+#: Code/Lib/PermissionDescription.php:180
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
@@ -1730,82 +1730,82 @@ msgstr ""
 "Esta es la configuración predeterminada para su flujo (stream) habitual de "
 "publicaciones."
 
-#: Zotlabs/Lib/PermissionDescription.php:182
+#: Code/Lib/PermissionDescription.php:182
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr ""
 "Esta es su configuración por defecto para establecer quién puede ver su "
 "perfil del canal predeterminado"
 
-#: Zotlabs/Lib/PermissionDescription.php:184
+#: Code/Lib/PermissionDescription.php:184
 msgid "This is your default setting for who can view your connections"
 msgstr ""
 "Este es su ajuste predeterminado para establecer quién puede ver sus "
 "conexiones"
 
-#: Zotlabs/Lib/PermissionDescription.php:186
+#: Code/Lib/PermissionDescription.php:186
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr ""
 "Este es su ajuste predeterminado para establecer quién puede ver su "
 "repositorio de ficheros y sus fotos"
 
-#: Zotlabs/Lib/PermissionDescription.php:188
+#: Code/Lib/PermissionDescription.php:188
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 "Este es el ajuste predeterminado para establecer la audiencia de sus páginas"
 " web"
 
-#: Zotlabs/Lib/Share.php:124 Zotlabs/Lib/Activity.php:2905
-#: Zotlabs/Module/Share.php:118 include/items.php:3414
+#: Code/Lib/Share.php:124 Code/Lib/Activity.php:2905
+#: Code/Module/Share.php:118 include/items.php:3414
 #, php-format
 msgid "🔁 Repeated %1$s's %2$s"
 msgstr "🔁 Repetidos %2$sde %1$s"
 
-#: Zotlabs/Lib/Activity.php:2882
+#: Code/Lib/Activity.php:2882
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr "Gusta de %2$sde %1$s"
 
-#: Zotlabs/Lib/Activity.php:2885
+#: Code/Lib/Activity.php:2885
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr "No le gusta %2$sde %1$s"
 
-#: Zotlabs/Lib/Activity.php:2891
+#: Code/Lib/Activity.php:2891
 #, php-format
 msgid "Will attend %s's event"
 msgstr "Asistirá al %sevento"
 
-#: Zotlabs/Lib/Activity.php:2894
+#: Code/Lib/Activity.php:2894
 #, php-format
 msgid "Will not attend %s's event"
 msgstr "No asistirá al %sevento"
 
-#: Zotlabs/Lib/Activity.php:2897
+#: Code/Lib/Activity.php:2897
 #, php-format
 msgid "May attend %s's event"
 msgstr "Puede que asista al %sevento"
 
-#: Zotlabs/Lib/Activity.php:2900
+#: Code/Lib/Activity.php:2900
 #, php-format
 msgid "May not attend %s's event"
 msgstr "Puede que no asista al %sevento"
 
-#: Zotlabs/Lib/Activity.php:3354 include/text.php:1693 include/text.php:3147
+#: Code/Lib/Activity.php:3354 include/text.php:1693 include/text.php:3147
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: Zotlabs/Lib/Language.php:408 include/language.php:429 include/text.php:2192
+#: Code/Lib/Language.php:408 include/language.php:429 include/text.php:2192
 msgid "default"
 msgstr "por defecto"
 
-#: Zotlabs/Lib/Language.php:421 include/language.php:442
+#: Code/Lib/Language.php:421 include/language.php:442
 msgid "Select an alternate language"
 msgstr "Seleccionar un idioma alternativo"
 
-#: Zotlabs/Lib/AccessList.php:29
+#: Code/Lib/AccessList.php:29
 msgid ""
 "A deleted list with this name was revived. Existing item permissions "
 "may apply to this list and any future members. If this is "
@@ -1816,258 +1816,258 @@ msgstr ""
 "miembro futuro. Si esto no es lo que pretendía, por favor cree otra lista "
 "con un nombre diferente."
 
-#: Zotlabs/Lib/AccessList.php:345
+#: Code/Lib/AccessList.php:345
 msgid "Add new connections to this access list"
 msgstr "Add new connections to this access list"
 
-#: Zotlabs/Lib/AccessList.php:372
+#: Code/Lib/AccessList.php:372
 msgid "edit"
 msgstr "editar"
 
-#: Zotlabs/Lib/AccessList.php:392
+#: Code/Lib/AccessList.php:392
 msgid "Edit list"
 msgstr "Modificar lista"
 
-#: Zotlabs/Lib/AccessList.php:393
+#: Code/Lib/AccessList.php:393
 msgid "Create new list"
 msgstr "Crear una lista nueva"
 
-#: Zotlabs/Lib/AccessList.php:394
+#: Code/Lib/AccessList.php:394
 msgid "Channels not in any access list"
 msgstr "Canales no incluidos en ninguna lista de acceso"
 
-#: Zotlabs/Lib/AccessList.php:396 Zotlabs/Widget/Savedsearch.php:95
+#: Code/Lib/AccessList.php:396 Code/Widget/Savedsearch.php:95
 msgid "add"
 msgstr "añadir"
 
-#: Zotlabs/Module/Lockview.php:86 Zotlabs/Module/Lockview.php:128
+#: Code/Module/Lockview.php:86 Code/Module/Lockview.php:128
 msgid "Visible to:"
 msgstr "Visible para:"
 
-#: Zotlabs/Module/Lockview.php:102
+#: Code/Module/Lockview.php:102
 msgid "Everybody"
 msgstr "Cualquiera"
 
-#: Zotlabs/Module/Calendar.php:93 Zotlabs/Module/Events.php:142
+#: Code/Module/Calendar.php:93 Code/Module/Events.php:142
 msgid "Event can not end before it has started."
 msgstr "Un evento no puede terminar antes de que haya comenzado."
 
-#: Zotlabs/Module/Calendar.php:95 Zotlabs/Module/Calendar.php:103
-#: Zotlabs/Module/Calendar.php:120 Zotlabs/Module/Events.php:144
-#: Zotlabs/Module/Events.php:153 Zotlabs/Module/Events.php:175
+#: Code/Module/Calendar.php:95 Code/Module/Calendar.php:103
+#: Code/Module/Calendar.php:120 Code/Module/Events.php:144
+#: Code/Module/Events.php:153 Code/Module/Events.php:175
 msgid "Unable to generate preview."
 msgstr "No se puede crear la vista previa."
 
-#: Zotlabs/Module/Calendar.php:101 Zotlabs/Module/Events.php:151
+#: Code/Module/Calendar.php:101 Code/Module/Events.php:151
 msgid "Event title and start time are required."
 msgstr "Se requieren el título del evento y su hora de inicio."
 
-#: Zotlabs/Module/Calendar.php:118 Zotlabs/Module/Calendar.php:258
-#: Zotlabs/Module/Events.php:173 Zotlabs/Module/Events.php:299
+#: Code/Module/Calendar.php:118 Code/Module/Calendar.php:258
+#: Code/Module/Events.php:173 Code/Module/Events.php:299
 msgid "Event not found."
 msgstr "Evento no encontrado."
 
-#: Zotlabs/Module/Calendar.php:254 Zotlabs/Module/Events.php:295
-#: Zotlabs/Module/Like.php:174 Zotlabs/Module/Tagger.php:88
+#: Code/Module/Calendar.php:254 Code/Module/Events.php:295
+#: Code/Module/Like.php:174 Code/Module/Tagger.php:88
 #: include/event.php:1338 include/conversation.php:132 include/text.php:2378
 msgid "event"
 msgstr "el/su evento"
 
-#: Zotlabs/Module/Calendar.php:423 Zotlabs/Module/Events.php:699
+#: Code/Module/Calendar.php:423 Code/Module/Events.php:699
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: Zotlabs/Module/Calendar.php:425 Zotlabs/Module/Events.php:701
+#: Code/Module/Calendar.php:425 Code/Module/Events.php:701
 msgid "Delete event"
 msgstr "Borrar evento"
 
-#: Zotlabs/Module/Calendar.php:439 Zotlabs/Module/Cdav.php:951
+#: Code/Module/Calendar.php:439 Code/Module/Cdav.php:951
 msgid "Link to source"
 msgstr "Enlace a la fuente"
 
-#: Zotlabs/Module/Calendar.php:453 Zotlabs/Module/Events.php:734
+#: Code/Module/Calendar.php:453 Code/Module/Events.php:734
 msgid "calendar"
 msgstr "calendario"
 
-#: Zotlabs/Module/Calendar.php:489 Zotlabs/Module/Events.php:860
+#: Code/Module/Calendar.php:489 Code/Module/Events.php:860
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
-#: Zotlabs/Module/Chanview.php:102 Zotlabs/Module/Cal.php:70
-#: Zotlabs/Module/Block.php:49 Zotlabs/Module/Card_edit.php:54
-#: Zotlabs/Module/Page.php:84 Zotlabs/Module/Superblock.php:64
-#: Zotlabs/Module/Wall_upload.php:37 include/items.php:4564
+#: Code/Module/Chanview.php:102 Code/Module/Cal.php:70
+#: Code/Module/Block.php:49 Code/Module/Card_edit.php:54
+#: Code/Module/Page.php:84 Code/Module/Superblock.php:64
+#: Code/Module/Wall_upload.php:37 include/items.php:4564
 msgid "Channel not found."
 msgstr "Canal no encontrado."
 
-#: Zotlabs/Module/Chanview.php:149 Zotlabs/Module/Chanview.php:150
+#: Code/Module/Chanview.php:149 Code/Module/Chanview.php:150
 msgid "Not available"
 msgstr "No disponible"
 
-#: Zotlabs/Module/Chanview.php:169
+#: Code/Module/Chanview.php:169
 msgid "Cover photo for this channel"
 msgstr "Foto de portada para este canal"
 
-#: Zotlabs/Module/Chanview.php:171
+#: Code/Module/Chanview.php:171
 msgid "Followers"
 msgstr "Seguidores"
 
-#: Zotlabs/Module/Chanview.php:172
+#: Code/Module/Chanview.php:172
 msgid "Following"
 msgstr "Siguiendo"
 
-#: Zotlabs/Module/Chanview.php:175 include/conversation.php:953
+#: Code/Module/Chanview.php:175 include/conversation.php:953
 msgid "Visit"
 msgstr "Visitar"
 
-#: Zotlabs/Module/Chanview.php:176
+#: Code/Module/Chanview.php:176
 msgid "toggle full screen mode"
 msgstr "cambiar al modo de pantalla completa"
 
-#: Zotlabs/Module/Admin/Account_edit.php:31
+#: Code/Module/Admin/Account_edit.php:31
 #, php-format
 msgid "Password changed for account %d."
 msgstr "Ha cambiado la contraseña para la cuenta %d."
 
-#: Zotlabs/Module/Admin/Account_edit.php:47
+#: Code/Module/Admin/Account_edit.php:47
 msgid "Account settings updated."
 msgstr "Se han actualizado los ajustes de la cuenta."
 
-#: Zotlabs/Module/Admin/Account_edit.php:66
+#: Code/Module/Admin/Account_edit.php:66
 msgid "Account not found."
 msgstr "No se ha encontrado la cuenta."
 
-#: Zotlabs/Module/Admin/Account_edit.php:73
+#: Code/Module/Admin/Account_edit.php:73
 msgid "Account Edit"
 msgstr "Editar la cuenta"
 
-#: Zotlabs/Module/Admin/Account_edit.php:74
+#: Code/Module/Admin/Account_edit.php:74
 msgid "New Password"
 msgstr "Nueva contraseña"
 
-#: Zotlabs/Module/Admin/Account_edit.php:75
+#: Code/Module/Admin/Account_edit.php:75
 msgid "New Password again"
 msgstr "Nueva contraseña otra vez"
 
-#: Zotlabs/Module/Admin/Account_edit.php:76
+#: Code/Module/Admin/Account_edit.php:76
 msgid "Account language (for emails)"
 msgstr "Idioma de la cuenta (para los correos electrónicos)"
 
-#: Zotlabs/Module/Admin/Account_edit.php:77
+#: Code/Module/Admin/Account_edit.php:77
 msgid "Service class"
 msgstr "Clase de servicio"
 
-#: Zotlabs/Module/Admin/Accounts.php:40
+#: Code/Module/Admin/Accounts.php:40
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s accounts blocked/unblocked"
 msgstr[0] "%scuentas bloqueadas/desbloqueadas"
 msgstr[1] "%s cuentas bloqueadas/desbloqueadas"
 
-#: Zotlabs/Module/Admin/Accounts.php:48
+#: Code/Module/Admin/Accounts.php:48
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s cuentas eliminadas"
 msgstr[1] "%s cuentas eliminadas"
 
-#: Zotlabs/Module/Admin/Accounts.php:88
+#: Code/Module/Admin/Accounts.php:88
 msgid "Account not found"
 msgstr "Cuenta no encontrada"
 
-#: Zotlabs/Module/Admin/Accounts.php:99 include/channel.php:2312
+#: Code/Module/Admin/Accounts.php:99 include/channel.php:2312
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "La cuenta '%s' ha sido eliminada"
 
-#: Zotlabs/Module/Admin/Accounts.php:108
+#: Code/Module/Admin/Accounts.php:108
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "La cuenta '%s' ha sido bloqueada"
 
-#: Zotlabs/Module/Admin/Accounts.php:117
+#: Code/Module/Admin/Accounts.php:117
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "La cuenta '%s' ha sido desbloqueada"
 
-#: Zotlabs/Module/Admin/Accounts.php:175 Zotlabs/Module/Admin/Addons.php:343
-#: Zotlabs/Module/Admin/Addons.php:443 Zotlabs/Module/Admin/Channels.php:169
-#: Zotlabs/Module/Admin/Logs.php:82 Zotlabs/Module/Admin/Security.php:135
-#: Zotlabs/Module/Admin/Site.php:310 Zotlabs/Module/Admin/Themes.php:134
-#: Zotlabs/Module/Admin/Themes.php:168 Zotlabs/Module/Admin.php:179
+#: Code/Module/Admin/Accounts.php:175 Code/Module/Admin/Addons.php:343
+#: Code/Module/Admin/Addons.php:443 Code/Module/Admin/Channels.php:169
+#: Code/Module/Admin/Logs.php:82 Code/Module/Admin/Security.php:135
+#: Code/Module/Admin/Site.php:310 Code/Module/Admin/Themes.php:134
+#: Code/Module/Admin/Themes.php:168 Code/Module/Admin.php:179
 msgid "Administration"
 msgstr "Administración"
 
-#: Zotlabs/Module/Admin/Accounts.php:176 Zotlabs/Module/Admin/Accounts.php:189
-#: Zotlabs/Module/Admin.php:123 Zotlabs/Widget/Admin.php:29
+#: Code/Module/Admin/Accounts.php:176 Code/Module/Admin/Accounts.php:189
+#: Code/Module/Admin.php:123 Code/Widget/Admin.php:29
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: Zotlabs/Module/Admin/Accounts.php:178 Zotlabs/Module/Admin/Channels.php:172
+#: Code/Module/Admin/Accounts.php:178 Code/Module/Admin/Channels.php:172
 msgid "select all"
 msgstr "seleccionar todo"
 
-#: Zotlabs/Module/Admin/Accounts.php:179
+#: Code/Module/Admin/Accounts.php:179
 msgid "Registrations waiting for confirm"
 msgstr "Inscripciones en espera de confirmación"
 
-#: Zotlabs/Module/Admin/Accounts.php:180
+#: Code/Module/Admin/Accounts.php:180
 msgid "Request date"
 msgstr "Fecha de solicitud"
 
-#: Zotlabs/Module/Admin/Accounts.php:180 Zotlabs/Module/Admin/Accounts.php:192
-#: Zotlabs/Module/Cdav.php:1354 Zotlabs/Module/Connedit.php:867
-#: Zotlabs/Module/Profiles.php:836 include/network.php:1715
+#: Code/Module/Admin/Accounts.php:180 Code/Module/Admin/Accounts.php:192
+#: Code/Module/Cdav.php:1354 Code/Module/Connedit.php:867
+#: Code/Module/Profiles.php:836 include/network.php:1715
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: Zotlabs/Module/Admin/Accounts.php:181
+#: Code/Module/Admin/Accounts.php:181
 msgid "No registrations."
 msgstr "Sin registros."
 
-#: Zotlabs/Module/Admin/Accounts.php:182 Zotlabs/Module/Connections.php:341
+#: Code/Module/Admin/Accounts.php:182 Code/Module/Connections.php:341
 #: include/conversation.php:653
 msgid "Approve"
 msgstr "Aprobar"
 
-#: Zotlabs/Module/Admin/Accounts.php:183 Zotlabs/Module/Authorize.php:39
+#: Code/Module/Admin/Accounts.php:183 Code/Module/Authorize.php:39
 msgid "Deny"
 msgstr "Rechazar"
 
-#: Zotlabs/Module/Admin/Accounts.php:185 Zotlabs/Module/Connedit.php:576
-#: Zotlabs/Widget/Sblock.php:21
+#: Code/Module/Admin/Accounts.php:185 Code/Module/Connedit.php:576
+#: Code/Widget/Sblock.php:21
 msgid "Block"
 msgstr "Bloquear"
 
-#: Zotlabs/Module/Admin/Accounts.php:186 Zotlabs/Module/Connedit.php:576
+#: Code/Module/Admin/Accounts.php:186 Code/Module/Connedit.php:576
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: Zotlabs/Module/Admin/Accounts.php:191
+#: Code/Module/Admin/Accounts.php:191
 msgid "ID"
 msgstr "ID"
 
-#: Zotlabs/Module/Admin/Accounts.php:193
+#: Code/Module/Admin/Accounts.php:193
 msgid "All Channels"
 msgstr "Todos los canales"
 
-#: Zotlabs/Module/Admin/Accounts.php:194
+#: Code/Module/Admin/Accounts.php:194
 msgid "Register date"
 msgstr "Fecha de registro"
 
-#: Zotlabs/Module/Admin/Accounts.php:195
+#: Code/Module/Admin/Accounts.php:195
 msgid "Last login"
 msgstr "Último acceso"
 
-#: Zotlabs/Module/Admin/Accounts.php:196
+#: Code/Module/Admin/Accounts.php:196
 msgid "Expires"
 msgstr "Caduca"
 
-#: Zotlabs/Module/Admin/Accounts.php:197
+#: Code/Module/Admin/Accounts.php:197
 msgid "Service Class"
 msgstr "Clase de servicio"
 
-#: Zotlabs/Module/Admin/Accounts.php:199
+#: Code/Module/Admin/Accounts.php:199
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2076,7 +2076,7 @@ msgstr ""
 "cuentas han publicado en este sitio será borrado de forma "
 "permanente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: Zotlabs/Module/Admin/Accounts.php:200
+#: Code/Module/Admin/Accounts.php:200
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2085,248 +2085,248 @@ msgstr ""
 "publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro "
 "de querer hacerlo?"
 
-#: Zotlabs/Module/Admin/Addons.php:259 Zotlabs/Module/Admin/Themes.php:80
-#: Zotlabs/Module/Admin.php:89 Zotlabs/Module/Display.php:64
-#: Zotlabs/Module/Display.php:512 Zotlabs/Module/Filestorage.php:37
-#: Zotlabs/Module/Thing.php:108 Zotlabs/Module/Search.php:185
-#: Zotlabs/Module/Viewsrc.php:28 Zotlabs/Module/Inspect.php:34
+#: Code/Module/Admin/Addons.php:259 Code/Module/Admin/Themes.php:80
+#: Code/Module/Admin.php:89 Code/Module/Display.php:64
+#: Code/Module/Display.php:512 Code/Module/Filestorage.php:37
+#: Code/Module/Thing.php:108 Code/Module/Search.php:185
+#: Code/Module/Viewsrc.php:28 Code/Module/Inspect.php:34
 #: extend/addon/a/flashcards/Mod_Flashcards.php:284
 #: extend/addon/a/flashcards/Mod_Flashcards.php:285 include/items.php:3895
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: Zotlabs/Module/Admin/Addons.php:289
+#: Code/Module/Admin/Addons.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Extensión %s desactivada."
 
-#: Zotlabs/Module/Admin/Addons.php:294
+#: Code/Module/Admin/Addons.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Extensión %s activada."
 
-#: Zotlabs/Module/Admin/Addons.php:311 Zotlabs/Module/Admin/Themes.php:105
+#: Code/Module/Admin/Addons.php:311 Code/Module/Admin/Themes.php:105
 msgid "Disable"
 msgstr "Desactivar"
 
-#: Zotlabs/Module/Admin/Addons.php:314 Zotlabs/Module/Admin/Themes.php:108
+#: Code/Module/Admin/Addons.php:314 Code/Module/Admin/Themes.php:108
 msgid "Enable"
 msgstr "Activar"
 
-#: Zotlabs/Module/Admin/Addons.php:344 Zotlabs/Module/Admin/Addons.php:444
-#: Zotlabs/Widget/Admin.php:33
+#: Code/Module/Admin/Addons.php:344 Code/Module/Admin/Addons.php:444
+#: Code/Widget/Admin.php:33
 msgid "Addons"
 msgstr "Addons"
 
-#: Zotlabs/Module/Admin/Addons.php:345 Zotlabs/Module/Admin/Themes.php:136
+#: Code/Module/Admin/Addons.php:345 Code/Module/Admin/Themes.php:136
 msgid "Toggle"
 msgstr "Cambiar"
 
-#: Zotlabs/Module/Admin/Addons.php:353 Zotlabs/Module/Admin/Themes.php:146
+#: Code/Module/Admin/Addons.php:353 Code/Module/Admin/Themes.php:146
 msgid "Author: "
 msgstr "Autor:"
 
-#: Zotlabs/Module/Admin/Addons.php:354 Zotlabs/Module/Admin/Themes.php:147
+#: Code/Module/Admin/Addons.php:354 Code/Module/Admin/Themes.php:147
 msgid "Maintainer: "
 msgstr "Mantenedor:"
 
-#: Zotlabs/Module/Admin/Addons.php:355
+#: Code/Module/Admin/Addons.php:355
 msgid "Minimum project version: "
 msgstr "Versión mínima del proyecto:"
 
-#: Zotlabs/Module/Admin/Addons.php:356
+#: Code/Module/Admin/Addons.php:356
 msgid "Maximum project version: "
 msgstr "Versión máxima del proyecto:"
 
-#: Zotlabs/Module/Admin/Addons.php:357
+#: Code/Module/Admin/Addons.php:357
 msgid "Minimum PHP version: "
 msgstr "Versión mínima de PHP:"
 
-#: Zotlabs/Module/Admin/Addons.php:358
+#: Code/Module/Admin/Addons.php:358
 msgid "Compatible Server Roles: "
 msgstr "Configuraciones compatibles con este servidor:"
 
-#: Zotlabs/Module/Admin/Addons.php:359
+#: Code/Module/Admin/Addons.php:359
 msgid "Requires: "
 msgstr "Se requiere:"
 
-#: Zotlabs/Module/Admin/Addons.php:360 Zotlabs/Module/Admin/Addons.php:449
+#: Code/Module/Admin/Addons.php:360 Code/Module/Admin/Addons.php:449
 msgid "Disabled - version incompatibility"
 msgstr "Deshabilitado - versiones incompatibles"
 
-#: Zotlabs/Module/Admin/Addons.php:417
+#: Code/Module/Admin/Addons.php:417
 msgid "Enter the public git repository URL of the addon repo."
 msgstr "Introduzca la URL del repositorio público de git del addon repo."
 
-#: Zotlabs/Module/Admin/Addons.php:418
+#: Code/Module/Admin/Addons.php:418
 msgid "Addon repo git URL"
 msgstr "URL del repositorio git del addon"
 
-#: Zotlabs/Module/Admin/Addons.php:419
+#: Code/Module/Admin/Addons.php:419
 msgid "Custom repo name"
 msgstr "Nombre personalizado del repositorio"
 
-#: Zotlabs/Module/Admin/Addons.php:419
+#: Code/Module/Admin/Addons.php:419
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: Zotlabs/Module/Admin/Addons.php:420
+#: Code/Module/Admin/Addons.php:420
 msgid "Download Addon Repo"
 msgstr "Descargar el repositorio"
 
-#: Zotlabs/Module/Admin/Addons.php:428
+#: Code/Module/Admin/Addons.php:428
 msgid "Install new repo"
 msgstr "Instalar un nuevo repositorio"
 
-#: Zotlabs/Module/Admin/Addons.php:430
-#: Zotlabs/Module/Admin/Cover_photo.php:378
-#: Zotlabs/Module/Admin/Profile_photo.php:474 Zotlabs/Module/Cdav.php:1060
-#: Zotlabs/Module/Cdav.php:1368 Zotlabs/Module/Connedit.php:881
-#: Zotlabs/Module/Cover_photo.php:424 Zotlabs/Module/Editlayout.php:152
-#: Zotlabs/Module/Editwebpage.php:184 Zotlabs/Module/Filer.php:62
-#: Zotlabs/Module/Fbrowser.php:73 Zotlabs/Module/Fbrowser.php:96
-#: Zotlabs/Module/Card_edit.php:140 Zotlabs/Module/Editblock.php:154
-#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Profiles.php:850
-#: Zotlabs/Module/Profile_photo.php:513 Zotlabs/Module/Settings/Oauth.php:96
-#: Zotlabs/Module/Settings/Oauth.php:124
-#: Zotlabs/Module/Settings/Oauth2.php:114
-#: Zotlabs/Module/Settings/Oauth2.php:144 Zotlabs/Module/Tagrm.php:21
-#: Zotlabs/Module/Tagrm.php:152 include/conversation.php:1425
+#: Code/Module/Admin/Addons.php:430
+#: Code/Module/Admin/Cover_photo.php:378
+#: Code/Module/Admin/Profile_photo.php:474 Code/Module/Cdav.php:1060
+#: Code/Module/Cdav.php:1368 Code/Module/Connedit.php:881
+#: Code/Module/Cover_photo.php:424 Code/Module/Editlayout.php:152
+#: Code/Module/Editwebpage.php:184 Code/Module/Filer.php:62
+#: Code/Module/Fbrowser.php:73 Code/Module/Fbrowser.php:96
+#: Code/Module/Card_edit.php:140 Code/Module/Editblock.php:154
+#: Code/Module/Editpost.php:147 Code/Module/Profiles.php:850
+#: Code/Module/Profile_photo.php:513 Code/Module/Settings/Oauth.php:96
+#: Code/Module/Settings/Oauth.php:124
+#: Code/Module/Settings/Oauth2.php:114
+#: Code/Module/Settings/Oauth2.php:144 Code/Module/Tagrm.php:21
+#: Code/Module/Tagrm.php:152 include/conversation.php:1425
 #: include/conversation.php:1491 include/conversation.php:1493
 #: include/conversation.php:1495
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Zotlabs/Module/Admin/Addons.php:452
+#: Code/Module/Admin/Addons.php:452
 msgid "Manage Repos"
 msgstr "Gestionar los repositorios"
 
-#: Zotlabs/Module/Admin/Addons.php:453
+#: Code/Module/Admin/Addons.php:453
 msgid "Installed Addon Repositories"
 msgstr "Repositorioe de addons instalados"
 
-#: Zotlabs/Module/Admin/Addons.php:454
+#: Code/Module/Admin/Addons.php:454
 msgid "Install a New Addon Repository"
 msgstr "Instalar un nuevo repositorio de addons"
 
-#: Zotlabs/Module/Admin/Addons.php:460 Zotlabs/Module/Cdav.php:1055
-#: Zotlabs/Module/Cdav.php:1366 Zotlabs/Module/Connedit.php:879
-#: Zotlabs/Module/Profiles.php:848 Zotlabs/Module/Settings/Oauth.php:45
-#: Zotlabs/Module/Settings/Oauth.php:123 Zotlabs/Module/Settings/Oauth2.php:55
-#: Zotlabs/Module/Settings/Oauth2.php:143
+#: Code/Module/Admin/Addons.php:460 Code/Module/Cdav.php:1055
+#: Code/Module/Cdav.php:1366 Code/Module/Connedit.php:879
+#: Code/Module/Profiles.php:848 Code/Module/Settings/Oauth.php:45
+#: Code/Module/Settings/Oauth.php:123 Code/Module/Settings/Oauth2.php:55
+#: Code/Module/Settings/Oauth2.php:143
 msgid "Update"
 msgstr "Actualizar"
 
-#: Zotlabs/Module/Admin/Addons.php:461
+#: Code/Module/Admin/Addons.php:461
 msgid "Switch branch"
 msgstr "Cambiar la rama"
 
-#: Zotlabs/Module/Admin/Addons.php:462 Zotlabs/Module/Photos.php:1068
-#: Zotlabs/Module/Tagrm.php:151 Zotlabs/Module/Superblock.php:234
-#: Zotlabs/Module/Superblock.php:251
+#: Code/Module/Admin/Addons.php:462 Code/Module/Photos.php:1068
+#: Code/Module/Tagrm.php:151 Code/Module/Superblock.php:234
+#: Code/Module/Superblock.php:251
 msgid "Remove"
 msgstr "Eliminar"
 
-#: Zotlabs/Module/Admin/Channels.php:37
+#: Code/Module/Admin/Channels.php:37
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s canales censurados/no censurados"
 msgstr[1] "%s canales censurados/no censurados"
 
-#: Zotlabs/Module/Admin/Channels.php:47
+#: Code/Module/Admin/Channels.php:47
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s código permitido/no permitido al canal"
 msgstr[1] "%s código permitido/no permitido al canal"
 
-#: Zotlabs/Module/Admin/Channels.php:53
+#: Code/Module/Admin/Channels.php:53
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canales eliminados"
 msgstr[1] "%s canales eliminados"
 
-#: Zotlabs/Module/Admin/Channels.php:74
+#: Code/Module/Admin/Channels.php:74
 msgid "Channel not found"
 msgstr "Canal no encontrado"
 
-#: Zotlabs/Module/Admin/Channels.php:85
+#: Code/Module/Admin/Channels.php:85
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Canal '%s' eliminado"
 
-#: Zotlabs/Module/Admin/Channels.php:100
+#: Code/Module/Admin/Channels.php:100
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Canal '%s' censurado"
 
-#: Zotlabs/Module/Admin/Channels.php:100
+#: Code/Module/Admin/Channels.php:100
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Canal '%s' no censurado"
 
-#: Zotlabs/Module/Admin/Channels.php:114
+#: Code/Module/Admin/Channels.php:114
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Código permitido al canal '%s'"
 
-#: Zotlabs/Module/Admin/Channels.php:114
+#: Code/Module/Admin/Channels.php:114
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Código no permitido al canal '%s'"
 
-#: Zotlabs/Module/Admin/Channels.php:170 Zotlabs/Module/Admin.php:142
-#: Zotlabs/Module/Manage.php:182 Zotlabs/Widget/Admin.php:30
+#: Code/Module/Admin/Channels.php:170 Code/Module/Admin.php:142
+#: Code/Module/Manage.php:182 Code/Widget/Admin.php:30
 #: include/nav.php:100
 msgid "Channels"
 msgstr "Canales"
 
-#: Zotlabs/Module/Admin/Channels.php:174 Zotlabs/Module/Connedit.php:592
-#: Zotlabs/Module/Directory.php:391
+#: Code/Module/Admin/Channels.php:174 Code/Module/Connedit.php:592
+#: Code/Module/Directory.php:391
 msgid "Censor"
 msgstr "Censurar"
 
-#: Zotlabs/Module/Admin/Channels.php:175 Zotlabs/Module/Connedit.php:592
-#: Zotlabs/Module/Directory.php:391
+#: Code/Module/Admin/Channels.php:175 Code/Module/Connedit.php:592
+#: Code/Module/Directory.php:391
 msgid "Uncensor"
 msgstr "No censurar"
 
-#: Zotlabs/Module/Admin/Channels.php:176
+#: Code/Module/Admin/Channels.php:176
 msgid "Allow Code"
 msgstr "Permitir código"
 
-#: Zotlabs/Module/Admin/Channels.php:177
+#: Code/Module/Admin/Channels.php:177
 msgid "Disallow Code"
 msgstr "No permitir código"
 
-#: Zotlabs/Module/Admin/Channels.php:178 include/nav.php:403
+#: Code/Module/Admin/Channels.php:178 include/nav.php:403
 #: include/conversation.php:1976
 msgid "Channel"
 msgstr "Canal"
 
-#: Zotlabs/Module/Admin/Channels.php:182
+#: Code/Module/Admin/Channels.php:182
 msgid "UID"
 msgstr "UID"
 
-#: Zotlabs/Module/Admin/Channels.php:183 Zotlabs/Module/Cdav.php:1350
-#: Zotlabs/Module/Connedit.php:863 Zotlabs/Module/Connections.php:236
-#: Zotlabs/Module/Chat.php:256 Zotlabs/Module/Lists.php:202
-#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth.php:125
-#: Zotlabs/Module/Settings/Oauth2.php:115
-#: Zotlabs/Module/Settings/Oauth2.php:145 Zotlabs/Module/Sharedwithme.php:107
-#: Zotlabs/Storage/Browser.php:313 Zotlabs/Widget/Activity_filter.php:294
+#: Code/Module/Admin/Channels.php:183 Code/Module/Cdav.php:1350
+#: Code/Module/Connedit.php:863 Code/Module/Connections.php:236
+#: Code/Module/Chat.php:256 Code/Module/Lists.php:202
+#: Code/Module/Settings/Oauth.php:97 Code/Module/Settings/Oauth.php:125
+#: Code/Module/Settings/Oauth2.php:115
+#: Code/Module/Settings/Oauth2.php:145 Code/Module/Sharedwithme.php:107
+#: Code/Storage/Browser.php:313 Code/Widget/Activity_filter.php:294
 msgid "Name"
 msgstr "Nombre"
 
-#: Zotlabs/Module/Admin/Channels.php:184 Zotlabs/Module/Cdav.php:1357
-#: Zotlabs/Module/Connedit.php:870 Zotlabs/Module/Locs.php:133
-#: Zotlabs/Module/Profiles.php:527 Zotlabs/Module/Profiles.php:839
+#: Code/Module/Admin/Channels.php:184 Code/Module/Cdav.php:1357
+#: Code/Module/Connedit.php:870 Code/Module/Locs.php:133
+#: Code/Module/Profiles.php:527 Code/Module/Profiles.php:839
 msgid "Address"
 msgstr "Dirección"
 
-#: Zotlabs/Module/Admin/Channels.php:186
+#: Code/Module/Admin/Channels.php:186
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2335,7 +2335,7 @@ msgstr ""
 "canales en este sitio se borrarán definitivamente!\\n\\n¿Está seguro de "
 "querer hacerlo?"
 
-#: Zotlabs/Module/Admin/Channels.php:187
+#: Code/Module/Admin/Channels.php:187
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2343,193 +2343,193 @@ msgstr ""
 "El canal {0} va a ser eliminado!\\n\\nTodo lo publicado por el canal en este"
 " sitio se borrará definitivamente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:64
-#: Zotlabs/Module/Admin/Profile_photo.php:67 Zotlabs/Module/Cover_photo.php:64
-#: Zotlabs/Module/Profile_photo.php:64
+#: Code/Module/Admin/Cover_photo.php:64
+#: Code/Module/Admin/Profile_photo.php:67 Code/Module/Cover_photo.php:64
+#: Code/Module/Profile_photo.php:64
 msgid "Image uploaded but image cropping failed."
 msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
 
-#: Zotlabs/Module/Admin/Cover_photo.php:175
-#: Zotlabs/Module/Admin/Cover_photo.php:259 Zotlabs/Module/Cover_photo.php:175
-#: Zotlabs/Module/Cover_photo.php:262
+#: Code/Module/Admin/Cover_photo.php:175
+#: Code/Module/Admin/Cover_photo.php:259 Code/Module/Cover_photo.php:175
+#: Code/Module/Cover_photo.php:262
 msgid "Cover Photos"
 msgstr "Imágenes de portada del perfil"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:199
-#: Zotlabs/Module/Admin/Profile_photo.php:145
-#: Zotlabs/Module/Cover_photo.php:199 Zotlabs/Module/Profile_photo.php:144
+#: Code/Module/Admin/Cover_photo.php:199
+#: Code/Module/Admin/Profile_photo.php:145
+#: Code/Module/Cover_photo.php:199 Code/Module/Profile_photo.php:144
 msgid "Image resize failed."
 msgstr "El ajuste del tamaño de la imagen ha fallado."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:208
-#: Zotlabs/Module/Admin/Profile_photo.php:191
-#: Zotlabs/Module/Cover_photo.php:211 Zotlabs/Module/Profile_photo.php:227
+#: Code/Module/Admin/Cover_photo.php:208
+#: Code/Module/Admin/Profile_photo.php:191
+#: Code/Module/Cover_photo.php:211 Code/Module/Profile_photo.php:227
 #: include/photos.php:200
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:317
-#: Zotlabs/Module/Admin/Cover_photo.php:333
-#: Zotlabs/Module/Admin/Profile_photo.php:354
-#: Zotlabs/Module/Admin/Profile_photo.php:397
-#: Zotlabs/Module/Cover_photo.php:364 Zotlabs/Module/Cover_photo.php:380
-#: Zotlabs/Module/Profile_photo.php:386 Zotlabs/Module/Profile_photo.php:437
+#: Code/Module/Admin/Cover_photo.php:317
+#: Code/Module/Admin/Cover_photo.php:333
+#: Code/Module/Admin/Profile_photo.php:354
+#: Code/Module/Admin/Profile_photo.php:397
+#: Code/Module/Cover_photo.php:364 Code/Module/Cover_photo.php:380
+#: Code/Module/Profile_photo.php:386 Code/Module/Profile_photo.php:437
 msgid "Photo not available."
 msgstr "Foto no disponible."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:369 Zotlabs/Module/Cover_photo.php:415
+#: Code/Module/Admin/Cover_photo.php:369 Code/Module/Cover_photo.php:415
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr "La foto de la portada puede ser visible para cualquiera en Internet"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:371
-#: Zotlabs/Module/Admin/Profile_photo.php:465
-#: Zotlabs/Module/Cover_photo.php:417 Zotlabs/Module/Profile_photo.php:504
+#: Code/Module/Admin/Cover_photo.php:371
+#: Code/Module/Admin/Profile_photo.php:465
+#: Code/Module/Cover_photo.php:417 Code/Module/Profile_photo.php:504
 msgid "Upload File:"
 msgstr "Subir fichero:"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:372
-#: Zotlabs/Module/Admin/Profile_photo.php:466
-#: Zotlabs/Module/Cover_photo.php:418 Zotlabs/Module/Profile_photo.php:505
+#: Code/Module/Admin/Cover_photo.php:372
+#: Code/Module/Admin/Profile_photo.php:466
+#: Code/Module/Cover_photo.php:418 Code/Module/Profile_photo.php:505
 msgid "Select a profile:"
 msgstr "Seleccionar un perfil:"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:373 Zotlabs/Module/Cover_photo.php:419
+#: Code/Module/Admin/Cover_photo.php:373 Code/Module/Cover_photo.php:419
 msgid "Change Cover Photo"
 msgstr "Cambiar la foto de portada del perfil"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:374
-#: Zotlabs/Module/Admin/Profile_photo.php:468
-#: Zotlabs/Module/Cover_photo.php:420 Zotlabs/Module/Embedphotos.php:225
-#: Zotlabs/Module/Profile_photo.php:507 Zotlabs/Module/Photos.php:746
-#: Zotlabs/Storage/Browser.php:422 Zotlabs/Widget/Album.php:107
-#: Zotlabs/Widget/Portfolio.php:122 Zotlabs/Widget/Cdav.php:154
-#: Zotlabs/Widget/Cdav.php:188
+#: Code/Module/Admin/Cover_photo.php:374
+#: Code/Module/Admin/Profile_photo.php:468
+#: Code/Module/Cover_photo.php:420 Code/Module/Embedphotos.php:225
+#: Code/Module/Profile_photo.php:507 Code/Module/Photos.php:746
+#: Code/Storage/Browser.php:422 Code/Widget/Album.php:107
+#: Code/Widget/Portfolio.php:122 Code/Widget/Cdav.php:154
+#: Code/Widget/Cdav.php:188
 msgid "Upload"
 msgstr "Subir"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:376
-#: Zotlabs/Module/Admin/Cover_photo.php:377
-#: Zotlabs/Module/Admin/Profile_photo.php:472
-#: Zotlabs/Module/Admin/Profile_photo.php:473
-#: Zotlabs/Module/Cover_photo.php:422 Zotlabs/Module/Cover_photo.php:423
-#: Zotlabs/Module/Profile_photo.php:511 Zotlabs/Module/Profile_photo.php:512
+#: Code/Module/Admin/Cover_photo.php:376
+#: Code/Module/Admin/Cover_photo.php:377
+#: Code/Module/Admin/Profile_photo.php:472
+#: Code/Module/Admin/Profile_photo.php:473
+#: Code/Module/Cover_photo.php:422 Code/Module/Cover_photo.php:423
+#: Code/Module/Profile_photo.php:511 Code/Module/Profile_photo.php:512
 msgid "Use a photo from your albums"
 msgstr "Usar una foto de sus álbumes"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:379
-#: Zotlabs/Module/Admin/Profile_photo.php:475
-#: Zotlabs/Module/Cover_photo.php:425 Zotlabs/Module/Profile_photo.php:514
+#: Code/Module/Admin/Cover_photo.php:379
+#: Code/Module/Admin/Profile_photo.php:475
+#: Code/Module/Cover_photo.php:425 Code/Module/Profile_photo.php:514
 #: include/conversation.php:1426 include/conversation.php:1490
 #: include/conversation.php:1492 include/conversation.php:1494
 msgid "OK"
 msgstr "OK"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:380
-#: Zotlabs/Module/Admin/Profile_photo.php:476
-#: Zotlabs/Module/Cover_photo.php:426 Zotlabs/Module/Profile_photo.php:515
+#: Code/Module/Admin/Cover_photo.php:380
+#: Code/Module/Admin/Profile_photo.php:476
+#: Code/Module/Cover_photo.php:426 Code/Module/Profile_photo.php:515
 #: include/conversation.php:1290
 msgid "Choose images to embed"
 msgstr "Elegir imágenes para incluir"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:381
-#: Zotlabs/Module/Admin/Profile_photo.php:477
-#: Zotlabs/Module/Cover_photo.php:427 Zotlabs/Module/Profile_photo.php:516
+#: Code/Module/Admin/Cover_photo.php:381
+#: Code/Module/Admin/Profile_photo.php:477
+#: Code/Module/Cover_photo.php:427 Code/Module/Profile_photo.php:516
 #: include/conversation.php:1291
 msgid "Choose an album"
 msgstr "Elegir un álbum"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:382
-#: Zotlabs/Module/Admin/Profile_photo.php:478
-#: Zotlabs/Module/Cover_photo.php:428 Zotlabs/Module/Profile_photo.php:517
+#: Code/Module/Admin/Cover_photo.php:382
+#: Code/Module/Admin/Profile_photo.php:478
+#: Code/Module/Cover_photo.php:428 Code/Module/Profile_photo.php:517
 msgid "Choose a different album"
 msgstr "Elegir un álbum diferente..."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:383
-#: Zotlabs/Module/Admin/Profile_photo.php:479
-#: Zotlabs/Module/Cover_photo.php:429 Zotlabs/Module/Profile_photo.php:518
+#: Code/Module/Admin/Cover_photo.php:383
+#: Code/Module/Admin/Profile_photo.php:479
+#: Code/Module/Cover_photo.php:429 Code/Module/Profile_photo.php:518
 #: include/conversation.php:1293
 msgid "Error getting album list"
 msgstr "Error al obtener la lista de álbumes"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:384
-#: Zotlabs/Module/Admin/Profile_photo.php:480
-#: Zotlabs/Module/Cover_photo.php:430 Zotlabs/Module/Profile_photo.php:519
+#: Code/Module/Admin/Cover_photo.php:384
+#: Code/Module/Admin/Profile_photo.php:480
+#: Code/Module/Cover_photo.php:430 Code/Module/Profile_photo.php:519
 #: include/conversation.php:1294
 msgid "Error getting photo link"
 msgstr "Error al obtener el enlace de la foto"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:385
-#: Zotlabs/Module/Admin/Profile_photo.php:481
-#: Zotlabs/Module/Cover_photo.php:431 Zotlabs/Module/Profile_photo.php:520
+#: Code/Module/Admin/Cover_photo.php:385
+#: Code/Module/Admin/Profile_photo.php:481
+#: Code/Module/Cover_photo.php:431 Code/Module/Profile_photo.php:520
 #: include/conversation.php:1295
 msgid "Error getting album"
 msgstr "Error al obtener el álbum"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:387
-#: Zotlabs/Module/Admin/Profile_photo.php:483
-#: Zotlabs/Module/Cover_photo.php:433 Zotlabs/Module/Profile_photo.php:522
+#: Code/Module/Admin/Cover_photo.php:387
+#: Code/Module/Admin/Profile_photo.php:483
+#: Code/Module/Cover_photo.php:433 Code/Module/Profile_photo.php:522
 msgid "Select previously uploaded photo"
 msgstr "Seleccionar una foto que haya subido previamente"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:403
-#: Zotlabs/Module/Admin/Profile_photo.php:498
-#: Zotlabs/Module/Cover_photo.php:449 Zotlabs/Module/Profile_photo.php:537
+#: Code/Module/Admin/Cover_photo.php:403
+#: Code/Module/Admin/Profile_photo.php:498
+#: Code/Module/Cover_photo.php:449 Code/Module/Profile_photo.php:537
 msgid "Crop Image"
 msgstr "Recortar imagen"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:404
-#: Zotlabs/Module/Admin/Profile_photo.php:499
-#: Zotlabs/Module/Cover_photo.php:450 Zotlabs/Module/Profile_photo.php:538
+#: Code/Module/Admin/Cover_photo.php:404
+#: Code/Module/Admin/Profile_photo.php:499
+#: Code/Module/Cover_photo.php:450 Code/Module/Profile_photo.php:538
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:406
-#: Zotlabs/Module/Admin/Profile_photo.php:501
-#: Zotlabs/Module/Cover_photo.php:452 Zotlabs/Module/Profile_photo.php:540
+#: Code/Module/Admin/Cover_photo.php:406
+#: Code/Module/Admin/Profile_photo.php:501
+#: Code/Module/Cover_photo.php:452 Code/Module/Profile_photo.php:540
 msgid "Done Editing"
 msgstr "Edición completada"
 
-#: Zotlabs/Module/Admin/Dbsync.php:20 Zotlabs/Module/Admin/Dbsync.php:55
+#: Code/Module/Admin/Dbsync.php:20 Code/Module/Admin/Dbsync.php:55
 msgid "Update has been marked successful"
 msgstr "La actualización ha sido marcada como exitosa"
 
-#: Zotlabs/Module/Admin/Dbsync.php:32
+#: Code/Module/Admin/Dbsync.php:32
 #, php-format
 msgid "Verification of update %s failed. Check system logs."
 msgstr ""
 "Error en la verificación de la actualización %s. Compruebe los registros del"
 " sistema."
 
-#: Zotlabs/Module/Admin/Dbsync.php:34 Zotlabs/Module/Admin/Dbsync.php:69
+#: Code/Module/Admin/Dbsync.php:34 Code/Module/Admin/Dbsync.php:69
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "La actualización de %s se ha realizado exitosamente."
 
-#: Zotlabs/Module/Admin/Dbsync.php:37
+#: Code/Module/Admin/Dbsync.php:37
 #, php-format
 msgid "Verifying update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 "La verificación de la actualización %s no devuelve un estado. Desconocido si"
 " tuvo éxito."
 
-#: Zotlabs/Module/Admin/Dbsync.php:40
+#: Code/Module/Admin/Dbsync.php:40
 #, php-format
 msgid "Update %s does not contain a verification function."
 msgstr "La actualización %s no contiene una función de verificación."
 
-#: Zotlabs/Module/Admin/Dbsync.php:43 Zotlabs/Module/Admin/Dbsync.php:75
+#: Code/Module/Admin/Dbsync.php:43 Code/Module/Admin/Dbsync.php:75
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "No se encuentra la función de actualización de %s."
 
-#: Zotlabs/Module/Admin/Dbsync.php:67
+#: Code/Module/Admin/Dbsync.php:67
 #, php-format
 msgid "Executing update procedure %s failed. Check system logs."
 msgstr ""
 "Error al ejecutar el procedimiento de actualización %s. Compruebe los "
 "registros del sistema."
 
-#: Zotlabs/Module/Admin/Dbsync.php:72
+#: Code/Module/Admin/Dbsync.php:72
 #, php-format
 msgid ""
 "Update %s did not return a status. It cannot be determined if it was "
@@ -2538,50 +2538,50 @@ msgstr ""
 "La actualización %s no devuelve un estado. No se puede determinar si tuvo "
 "éxito."
 
-#: Zotlabs/Module/Admin/Dbsync.php:95
+#: Code/Module/Admin/Dbsync.php:95
 msgid "Failed Updates"
 msgstr "Han fallado las actualizaciones"
 
-#: Zotlabs/Module/Admin/Dbsync.php:97
+#: Code/Module/Admin/Dbsync.php:97
 msgid "Mark success (if update was manually applied)"
 msgstr "Marcar como exitosa (si la actualización se ha hecho manualmente)"
 
-#: Zotlabs/Module/Admin/Dbsync.php:98
+#: Code/Module/Admin/Dbsync.php:98
 msgid "Attempt to verify this update if a verification procedure exists"
 msgstr ""
 "Intentar verificar esta actualización si existe un procedimiento de "
 "verificación."
 
-#: Zotlabs/Module/Admin/Dbsync.php:99
+#: Code/Module/Admin/Dbsync.php:99
 msgid "Attempt to execute this update step automatically"
 msgstr "Intentar ejecutar este paso de actualización automáticamente"
 
-#: Zotlabs/Module/Admin/Dbsync.php:103
+#: Code/Module/Admin/Dbsync.php:103
 msgid "No failed updates."
 msgstr "No ha fallado ninguna actualización."
 
-#: Zotlabs/Module/Admin/Logs.php:28
+#: Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "Actualizado el informe de configuraciones."
 
-#: Zotlabs/Module/Admin/Logs.php:83 Zotlabs/Widget/Admin.php:54
-#: Zotlabs/Widget/Admin.php:64
+#: Code/Module/Admin/Logs.php:83 Code/Widget/Admin.php:54
+#: Code/Widget/Admin.php:64
 msgid "Logs"
 msgstr "Informes"
 
-#: Zotlabs/Module/Admin/Logs.php:85
+#: Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Vaciar"
 
-#: Zotlabs/Module/Admin/Logs.php:91
+#: Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Depuración"
 
-#: Zotlabs/Module/Admin/Logs.php:92
+#: Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "Fichero de informe"
 
-#: Zotlabs/Module/Admin/Logs.php:92
+#: Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
@@ -2589,19 +2589,19 @@ msgstr ""
 "Debe tener permisos de escritura por el servidor web. La ruta es relativa al"
 " directorio web principal."
 
-#: Zotlabs/Module/Admin/Logs.php:93
+#: Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Nivel de depuración"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:121
-#: Zotlabs/Module/Admin/Profile_photo.php:251
-#: Zotlabs/Module/Profile_photo.php:118 Zotlabs/Module/Profile_photo.php:287
+#: Code/Module/Admin/Profile_photo.php:121
+#: Code/Module/Admin/Profile_photo.php:251
+#: Code/Module/Profile_photo.php:118 Code/Module/Profile_photo.php:287
 #: include/photo_factory.php:539
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:189
-#: Zotlabs/Module/Profile_photo.php:222
+#: Code/Module/Admin/Profile_photo.php:189
+#: Code/Module/Profile_photo.php:222
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
@@ -2609,18 +2609,18 @@ msgstr ""
 "Recargue la página o limpie el caché del navegador si la nueva foto no se "
 "muestra inmediatamente."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:266
-#: Zotlabs/Module/Profile_photo.php:302
+#: Code/Module/Admin/Profile_photo.php:266
+#: Code/Module/Profile_photo.php:302
 msgid "Image upload failed."
 msgstr "La carga de la imagen ha fallado."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:285
-#: Zotlabs/Module/Profile_photo.php:321
+#: Code/Module/Admin/Profile_photo.php:285
+#: Code/Module/Profile_photo.php:321
 msgid "Unable to process image."
 msgstr "No ha sido posible procesar la imagen."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:463
-#: Zotlabs/Module/Profile_photo.php:502
+#: Code/Module/Admin/Profile_photo.php:463
+#: Code/Module/Profile_photo.php:502
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
@@ -2629,7 +2629,7 @@ msgstr ""
 " fotos de perfil para perfiles alternativos heredarán los permisos del "
 "predeterminado."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:463
+#: Code/Module/Admin/Profile_photo.php:463
 msgid ""
 "Your site photo is visible to anybody on the internet and may be distributed"
 " to other websites."
@@ -2637,116 +2637,116 @@ msgstr ""
 "La foto de su sitio es visible para cualquier persona en Internet y puede "
 "ser distribuida a otros sitios web."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
+#: Code/Module/Admin/Profile_photo.php:467
 msgid "Use Photo for Site Logo"
 msgstr "Utilizar una foto para el logotipo del sitio"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
+#: Code/Module/Admin/Profile_photo.php:467
 msgid "Change Site Logo"
 msgstr "Cambiar el logo del sitio"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:468
-#: Zotlabs/Module/Profile_photo.php:507
+#: Code/Module/Admin/Profile_photo.php:468
+#: Code/Module/Profile_photo.php:507
 msgid "Use"
 msgstr "Usar"
 
-#: Zotlabs/Module/Admin/Profs.php:94
+#: Code/Module/Admin/Profs.php:94
 msgid "New Profile Field"
 msgstr "Nuevo campo en el perfil"
 
-#: Zotlabs/Module/Admin/Profs.php:95 Zotlabs/Module/Admin/Profs.php:116
+#: Code/Module/Admin/Profs.php:95 Code/Module/Admin/Profs.php:116
 msgid "Field nickname"
 msgstr "Alias del campo"
 
-#: Zotlabs/Module/Admin/Profs.php:95 Zotlabs/Module/Admin/Profs.php:116
+#: Code/Module/Admin/Profs.php:95 Code/Module/Admin/Profs.php:116
 msgid "System name of field"
 msgstr "Nombre del campo en el sistema"
 
-#: Zotlabs/Module/Admin/Profs.php:96 Zotlabs/Module/Admin/Profs.php:117
+#: Code/Module/Admin/Profs.php:96 Code/Module/Admin/Profs.php:117
 msgid "Input type"
 msgstr "Tipo de entrada"
 
-#: Zotlabs/Module/Admin/Profs.php:97 Zotlabs/Module/Admin/Profs.php:118
+#: Code/Module/Admin/Profs.php:97 Code/Module/Admin/Profs.php:118
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: Zotlabs/Module/Admin/Profs.php:97 Zotlabs/Module/Admin/Profs.php:118
+#: Code/Module/Admin/Profs.php:97 Code/Module/Admin/Profs.php:118
 msgid "Label on profile pages"
 msgstr "Etiqueta a mostrar en la página del perfil"
 
-#: Zotlabs/Module/Admin/Profs.php:98 Zotlabs/Module/Admin/Profs.php:119
+#: Code/Module/Admin/Profs.php:98 Code/Module/Admin/Profs.php:119
 msgid "Help text"
 msgstr "Texto de ayuda"
 
-#: Zotlabs/Module/Admin/Profs.php:98 Zotlabs/Module/Admin/Profs.php:119
+#: Code/Module/Admin/Profs.php:98 Code/Module/Admin/Profs.php:119
 msgid "Additional info (optional)"
 msgstr "Información adicional (opcional)"
 
-#: Zotlabs/Module/Admin/Profs.php:109
+#: Code/Module/Admin/Profs.php:109
 msgid "Field definition not found"
 msgstr "Definición del campo no encontrada"
 
-#: Zotlabs/Module/Admin/Profs.php:115
+#: Code/Module/Admin/Profs.php:115
 msgid "Edit Profile Field"
 msgstr "Modificar el campo del perfil"
 
-#: Zotlabs/Module/Admin/Profs.php:181
+#: Code/Module/Admin/Profs.php:181
 msgid "Profile Fields"
 msgstr "Campos del perfil"
 
-#: Zotlabs/Module/Admin/Profs.php:182
+#: Code/Module/Admin/Profs.php:182
 msgid "Basic Profile Fields"
 msgstr "Campos básicos del perfil"
 
-#: Zotlabs/Module/Admin/Profs.php:183
+#: Code/Module/Admin/Profs.php:183
 msgid "Advanced Profile Fields"
 msgstr "Campos avanzados del perfil"
 
-#: Zotlabs/Module/Admin/Profs.php:183
+#: Code/Module/Admin/Profs.php:183
 msgid "(In addition to basic fields)"
 msgstr "(Además de los campos básicos)"
 
-#: Zotlabs/Module/Admin/Profs.php:185
+#: Code/Module/Admin/Profs.php:185
 msgid "All available fields"
 msgstr "Todos los campos disponibles"
 
-#: Zotlabs/Module/Admin/Profs.php:186
+#: Code/Module/Admin/Profs.php:186
 msgid "Custom Fields"
 msgstr "Campos personalizados"
 
-#: Zotlabs/Module/Admin/Profs.php:190
+#: Code/Module/Admin/Profs.php:190
 msgid "Create Custom Field"
 msgstr "Crear un campo personalizado"
 
-#: Zotlabs/Module/Admin/Queue.php:35
+#: Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr "Estadísticas de la cola"
 
-#: Zotlabs/Module/Admin/Queue.php:36
+#: Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr "Total de entradas"
 
-#: Zotlabs/Module/Admin/Queue.php:37
+#: Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr "Prioridad"
 
-#: Zotlabs/Module/Admin/Queue.php:38
+#: Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr "Dirección de destino"
 
-#: Zotlabs/Module/Admin/Queue.php:39
+#: Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr "Marcar el servidor como permanentemente fuera de línea"
 
-#: Zotlabs/Module/Admin/Queue.php:40
+#: Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr "Vaciar la cola para este servidor"
 
-#: Zotlabs/Module/Admin/Queue.php:41
+#: Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr "Último contacto conocido"
 
-#: Zotlabs/Module/Admin/Security.php:126
+#: Code/Module/Admin/Security.php:126
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
@@ -2754,7 +2754,7 @@ msgstr ""
 "De forma predeterminada, el HTML sin filtrar está permitido en el contenido "
 "multimedia incorporado en una publicación. Esto es siempre inseguro."
 
-#: Zotlabs/Module/Admin/Security.php:129
+#: Code/Module/Admin/Security.php:129
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
@@ -2762,13 +2762,13 @@ msgstr ""
 "La configuración recomendada es que sólo se permita HTML sin filtrar desde "
 "los siguientes sitios: "
 
-#: Zotlabs/Module/Admin/Security.php:130
+#: Code/Module/Admin/Security.php:130
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/
              https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/
              https://vimeo.com/
              https://soundcloud.com/
              "
 
-#: Zotlabs/Module/Admin/Security.php:131
+#: Code/Module/Admin/Security.php:131
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
@@ -2776,15 +2776,15 @@ msgstr ""
 "El resto del contenido incrustado se filtrará, excepto si "
 "el contenido incorporado desde ese sitio está bloqueado de forma explícita."
 
-#: Zotlabs/Module/Admin/Security.php:136 Zotlabs/Widget/Admin.php:31
+#: Code/Module/Admin/Security.php:136 Code/Widget/Admin.php:31
 msgid "Security"
 msgstr "Seguridad"
 
-#: Zotlabs/Module/Admin/Security.php:138
+#: Code/Module/Admin/Security.php:138
 msgid "Block public"
 msgstr "Bloquear páginas públicas"
 
-#: Zotlabs/Module/Admin/Security.php:138
+#: Code/Module/Admin/Security.php:138
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
@@ -2792,38 +2792,38 @@ msgstr ""
 "Habilitar para impedir ver las páginas personales de este sitio a quien no "
 "esté actualmente autenticado."
 
-#: Zotlabs/Module/Admin/Security.php:139
+#: Code/Module/Admin/Security.php:139
 msgid "Block public search"
 msgstr "Bloquear la búsqueda pública"
 
-#: Zotlabs/Module/Admin/Security.php:139
+#: Code/Module/Admin/Security.php:139
 msgid ""
 "Prevent access to search content unless you are currently authenticated."
 msgstr ""
 "Evitar el acceso al contenido de la búsqueda a menos que esté autenticado "
 "actualmente."
 
-#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Security.php:140 Code/Module/Admin/Site.php:339
 msgid "Block directory from visitors"
 msgstr "Bloquear el directorio de visitantes"
 
-#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Security.php:140 Code/Module/Admin/Site.php:339
 msgid "Only allow authenticated access to directory."
 msgstr "Permitir sólo el acceso autentificado al directorio."
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid "Hide local directory"
 msgstr "Ocultar el directorio local"
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid "Only use the global directory"
 msgstr "Usar solo el directorio global"
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid "Provide a cloud root directory"
 msgstr "Proporcionar un directorio raíz de la nube"
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid ""
 "The cloud root directory lists all channel names which provide public files."
 " Otherwise only the names of connections are shown."
@@ -2832,51 +2832,51 @@ msgstr ""
 "proporcionan ficheros públicos. En caso contrario, solo se muestran los "
 "nombres de las conexiones."
 
-#: Zotlabs/Module/Admin/Security.php:143
+#: Code/Module/Admin/Security.php:143
 msgid "Show total disk space available to cloud uploads"
 msgstr ""
 "Mostrar el espacio total disponible en el disco para las cargas en la nube"
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "Allow SVG thumbnails in file browser"
 msgstr "Permitir miniaturas SVG en el navegador de archivos"
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "ADVERTENCIA: Las imágenes SVG pueden contener código malicioso."
 
-#: Zotlabs/Module/Admin/Security.php:146
+#: Code/Module/Admin/Security.php:146
 msgid "Allow embedded (inline) PDF files"
 msgstr "Permitir archivos PDF incrustados (en línea)"
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid "Permit anonymous comments"
 msgstr "Permitir comentarios anónimos"
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid ""
 "Moderation will be performed by channels that select this comment option."
 msgstr ""
 "La moderación será realizada por los canales que seleccionen esta opción en "
 "los comentarios."
 
-#: Zotlabs/Module/Admin/Security.php:148
+#: Code/Module/Admin/Security.php:148
 msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 "Habilitar \"Seguridad de transporte\" (\"Transport Security\") en la "
 "cabecera HTTP"
 
-#: Zotlabs/Module/Admin/Security.php:149
+#: Code/Module/Admin/Security.php:149
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 "Habilitar la \"Política de seguridad del contenido\" (\"Content Security "
 "Policy\") en la cabecera HTTP"
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid "Allowed email domains"
 msgstr "Se aceptan dominios de correo electrónico"
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
@@ -2886,11 +2886,11 @@ msgstr ""
 "de correo electrónico para registros en este sitio. Se permiten comodines. "
 "Dejar en claro para aceptar cualquier dominio. "
 
-#: Zotlabs/Module/Admin/Security.php:151
+#: Code/Module/Admin/Security.php:151
 msgid "Not allowed email domains"
 msgstr "No se permiten dominios de correo electrónico"
 
-#: Zotlabs/Module/Admin/Security.php:151
+#: Code/Module/Admin/Security.php:151
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
@@ -2901,11 +2901,11 @@ msgstr ""
 "comodines. Dejar en claro para no aceptar cualquier dominio, excepto los que"
 " se hayan autorizado."
 
-#: Zotlabs/Module/Admin/Security.php:152
+#: Code/Module/Admin/Security.php:152
 msgid "Allow communications only from these sites"
 msgstr "Permitir la comunicación solo desde estos sitios"
 
-#: Zotlabs/Module/Admin/Security.php:152 Zotlabs/Module/Admin/Security.php:157
+#: Code/Module/Admin/Security.php:152 Code/Module/Admin/Security.php:157
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
@@ -2913,15 +2913,15 @@ msgstr ""
 "Un sitio por línea. Dejar en blanco para permitir por defecto la "
 "comunicación desde cualquiera"
 
-#: Zotlabs/Module/Admin/Security.php:153
+#: Code/Module/Admin/Security.php:153
 msgid "Block communications from these sites"
 msgstr "Bloquear la comunicación desde estos sitios"
 
-#: Zotlabs/Module/Admin/Security.php:154
+#: Code/Module/Admin/Security.php:154
 msgid "Allow communications only from these channels"
 msgstr "Permitir la comunicación solo desde estos canales"
 
-#: Zotlabs/Module/Admin/Security.php:154 Zotlabs/Module/Admin/Security.php:159
+#: Code/Module/Admin/Security.php:154 Code/Module/Admin/Security.php:159
 msgid ""
 "One channel (hash) per line. Leave empty to allow communication from any "
 "channel by default"
@@ -2929,137 +2929,137 @@ msgstr ""
 "Un canal (hash) por línea. Dejar vacío para permitir la comunicación desde "
 "cualquier canal por defecto"
 
-#: Zotlabs/Module/Admin/Security.php:155
+#: Code/Module/Admin/Security.php:155
 msgid "Block communications from these channels"
 msgstr "Bloquear la comunicación desde estos canales"
 
-#: Zotlabs/Module/Admin/Security.php:157
+#: Code/Module/Admin/Security.php:157
 msgid "Allow public stream communications only from these sites"
 msgstr ""
 "Permitir las comunicaciones del stream público sólo desde estos sitios "
 
-#: Zotlabs/Module/Admin/Security.php:158
+#: Code/Module/Admin/Security.php:158
 msgid "Block public stream communications from these sites"
 msgstr "Bloquear comunicaciones del stream público desde estos sitios "
 
-#: Zotlabs/Module/Admin/Security.php:159
+#: Code/Module/Admin/Security.php:159
 msgid "Allow public stream communications only from these channels"
 msgstr ""
 "Permitir las comunicaciones del stream público sólo desde estos canales "
 
-#: Zotlabs/Module/Admin/Security.php:160
+#: Code/Module/Admin/Security.php:160
 msgid "Block public stream communications from these channels"
 msgstr "Bloquear las comunicaciones del stream público desde estos canales "
 
-#: Zotlabs/Module/Admin/Security.php:163
+#: Code/Module/Admin/Security.php:163
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 "Sólo se permite contenido multimedia incorporado desde sitios y enlaces "
 "seguros (SSL)."
 
-#: Zotlabs/Module/Admin/Security.php:164
+#: Code/Module/Admin/Security.php:164
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Permitir contenido HTML sin filtrar sólo desde estos dominios "
 
-#: Zotlabs/Module/Admin/Security.php:164
+#: Code/Module/Admin/Security.php:164
 msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 "Un sitio por línea. El contenido incorporado se filtra de forma "
 "predeterminada."
 
-#: Zotlabs/Module/Admin/Security.php:165
+#: Code/Module/Admin/Security.php:165
 msgid "Block embedded HTML from these domains"
 msgstr "Bloquear contenido con HTML incorporado desde estos dominios"
 
-#: Zotlabs/Module/Admin/Site.php:192
+#: Code/Module/Admin/Site.php:192
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: Zotlabs/Module/Admin/Site.php:221 include/text.php:3574
+#: Code/Module/Admin/Site.php:221 include/text.php:3574
 #: view/theme/redbasic/php/config.php:15
 msgid "Default"
 msgstr "Predeterminado"
 
-#: Zotlabs/Module/Admin/Site.php:232 Zotlabs/Module/Settings/Display.php:147
+#: Code/Module/Admin/Site.php:232 Code/Module/Settings/Display.php:147
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Incompatible)"
 
-#: Zotlabs/Module/Admin/Site.php:240
+#: Code/Module/Admin/Site.php:240
 msgid "mobile"
 msgstr "móvil"
 
-#: Zotlabs/Module/Admin/Site.php:243
+#: Code/Module/Admin/Site.php:243
 msgid "experimental"
 msgstr "experimental"
 
-#: Zotlabs/Module/Admin/Site.php:246
+#: Code/Module/Admin/Site.php:246
 msgid "unsupported"
 msgstr "no soportado"
 
-#: Zotlabs/Module/Admin/Site.php:288
+#: Code/Module/Admin/Site.php:288
 msgid "Yes - with approval"
 msgstr "Sí - con aprobación"
 
-#: Zotlabs/Module/Admin/Site.php:294
+#: Code/Module/Admin/Site.php:294
 msgid "My site is not a public server"
 msgstr "Mi sitio no es un servidor público"
 
-#: Zotlabs/Module/Admin/Site.php:295
+#: Code/Module/Admin/Site.php:295
 msgid "My site provides free public access"
 msgstr "Mi sitio proporciona acceso público gratuito"
 
-#: Zotlabs/Module/Admin/Site.php:296
+#: Code/Module/Admin/Site.php:296
 msgid "My site provides paid public access"
 msgstr "Mi sitio proporciona acceso público de pago"
 
-#: Zotlabs/Module/Admin/Site.php:297
+#: Code/Module/Admin/Site.php:297
 msgid "My site provides free public access and premium paid plans"
 msgstr "Mi sitio ofrece acceso público gratuito y planes de pago premium"
 
-#: Zotlabs/Module/Admin/Site.php:303
+#: Code/Module/Admin/Site.php:303
 msgid "Default permission role for new accounts"
 msgstr "Permisos de rol por defecto para las nuevas cuentas"
 
-#: Zotlabs/Module/Admin/Site.php:303
+#: Code/Module/Admin/Site.php:303
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr ""
 "Este rol se utilizará para el primer canal creado después del registro."
 
-#: Zotlabs/Module/Admin/Site.php:311 Zotlabs/Widget/Admin.php:26
+#: Code/Module/Admin/Site.php:311 Code/Widget/Admin.php:26
 msgid "Site"
 msgstr "Sitio"
 
-#: Zotlabs/Module/Admin/Site.php:313
+#: Code/Module/Admin/Site.php:313
 msgid "Site Configuration"
 msgstr "Ajustes del sitio"
 
-#: Zotlabs/Module/Admin/Site.php:314 Zotlabs/Module/Register.php:287
+#: Code/Module/Admin/Site.php:314 Code/Module/Register.php:287
 msgid "Registration"
 msgstr "Registro"
 
-#: Zotlabs/Module/Admin/Site.php:315
+#: Code/Module/Admin/Site.php:315
 msgid "File upload"
 msgstr "Subir fichero"
 
-#: Zotlabs/Module/Admin/Site.php:316
+#: Code/Module/Admin/Site.php:316
 msgid "Policies"
 msgstr "Políticas"
 
-#: Zotlabs/Module/Admin/Site.php:317 Zotlabs/Widget/Findpeople.php:26
+#: Code/Module/Admin/Site.php:317 Code/Widget/Findpeople.php:26
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: Zotlabs/Module/Admin/Site.php:319
+#: Code/Module/Admin/Site.php:319
 msgid "Site name"
 msgstr "Nombre del sitio"
 
-#: Zotlabs/Module/Admin/Site.php:320
+#: Code/Module/Admin/Site.php:320
 msgid "Administrator Information"
 msgstr "Información del Administrador"
 
-#: Zotlabs/Module/Admin/Site.php:320
+#: Code/Module/Admin/Site.php:320
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode may be used here."
@@ -3067,11 +3067,11 @@ msgstr ""
 "Información de contacto de los administradores del sitio. Se muestra en la "
 "página de información del sitio. BBCode puede ser usado aquí."
 
-#: Zotlabs/Module/Admin/Site.php:321 Zotlabs/Module/Siteinfo.php:38
+#: Code/Module/Admin/Site.php:321 Code/Module/Siteinfo.php:38
 msgid "Site Information"
 msgstr "Información sobre el sitio"
 
-#: Zotlabs/Module/Admin/Site.php:321
+#: Code/Module/Admin/Site.php:321
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode may be used here."
@@ -3079,15 +3079,15 @@ msgstr ""
 "Descripción públicamente visible de este sitio. Se muestra en la página de "
 "información del sitio. BBCode puede ser usado aquí."
 
-#: Zotlabs/Module/Admin/Site.php:322
+#: Code/Module/Admin/Site.php:322
 msgid "System language"
 msgstr "Idioma del sistema"
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid "System theme"
 msgstr "Tema gráfico del sistema"
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
@@ -3095,20 +3095,20 @@ msgstr ""
 "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario -"
 " modificar los ajustes del tema"
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid "ActivityPub protocol"
 msgstr "Protocolo ActivityPub"
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid "Provides access to software supporting the ActivityPub protocol."
 msgstr ""
 "Proporciona acceso al software que soporta el protocolo de ActivityPub."
 
-#: Zotlabs/Module/Admin/Site.php:327
+#: Code/Module/Admin/Site.php:327
 msgid "Maximum image size"
 msgstr "Tamaño máximo de la imagen"
 
-#: Zotlabs/Module/Admin/Site.php:327
+#: Code/Module/Admin/Site.php:327
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
@@ -3116,24 +3116,24 @@ msgstr ""
 "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que "
 "significa que no hay límites."
 
-#: Zotlabs/Module/Admin/Site.php:328
+#: Code/Module/Admin/Site.php:328
 msgid "Cache all public images"
 msgstr "Almacenar en la memoria caché todas las imágenes públicas"
 
-#: Zotlabs/Module/Admin/Site.php:328
+#: Code/Module/Admin/Site.php:328
 msgid "If disabled, proxy non-SSL images, but do not store locally"
 msgstr ""
 "Si se desactiva, proxy de imágenes no SSL, pero no almacenar localmente"
 
-#: Zotlabs/Module/Admin/Site.php:329
+#: Code/Module/Admin/Site.php:329
 msgid "Does this site allow new member registration?"
 msgstr "¿Debe este sitio permitir el registro de nuevos miembros?"
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid "Invitation only"
 msgstr "Solo con una invitación"
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid ""
 "Only allow new member registrations with an invitation code. New member "
 "registration must be allowed for this to work."
@@ -3141,19 +3141,19 @@ msgstr ""
 "Sólo se permite el registro de nuevos miembros con un código de invitación. "
 "Para que esto funcione, se debe permitir el registro de nuevos miembros."
 
-#: Zotlabs/Module/Admin/Site.php:332
+#: Code/Module/Admin/Site.php:332
 msgid "Minimum age"
 msgstr "Edad mínima"
 
-#: Zotlabs/Module/Admin/Site.php:332
+#: Code/Module/Admin/Site.php:332
 msgid "Minimum age (in years) for who may register on this site."
 msgstr "Edad mínima (en años) para poder registrarse en este sitio."
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?"
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid ""
 "If a public server policy is selected, this information may be displayed on "
 "the public server site list."
@@ -3161,21 +3161,21 @@ msgstr ""
 "si se selecciona una política de servidor público, esta información puede "
 "aparecer en la lista de sitios de servidores públicos."
 
-#: Zotlabs/Module/Admin/Site.php:334
+#: Code/Module/Admin/Site.php:334
 msgid "Register text"
 msgstr "Texto del registro"
 
-#: Zotlabs/Module/Admin/Site.php:334
+#: Code/Module/Admin/Site.php:334
 msgid "Will be displayed prominently on the registration page."
 msgstr "Se mostrará de forma destacada en la página de registro."
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 "Página personal que se mostrará a los visitantes (por defecto: la página de "
 "identificación)"
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
@@ -3184,11 +3184,11 @@ msgstr ""
 "para mostrar una página web del sistema llamada `home' o `incluir:home.html'"
 " para incluir un archivo."
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid "Preserve site homepage URL"
 msgstr "Preservar la dirección de la página personal"
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
@@ -3196,11 +3196,11 @@ msgstr ""
 "Presenta la página personal del sitio en un marco en la ubicación original, "
 "en vez de redirigirla."
 
-#: Zotlabs/Module/Admin/Site.php:338
+#: Code/Module/Admin/Site.php:338
 msgid "Accounts abandoned after x days"
 msgstr "Cuentas abandonadas después de x días"
 
-#: Zotlabs/Module/Admin/Site.php:338
+#: Code/Module/Admin/Site.php:338
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
@@ -3208,47 +3208,47 @@ msgstr ""
 "Para evitar consumir recursos del sistema intentando poner al día las "
 "cuentas abandonadas. Introduzca 0 para no tener límite de tiempo."
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid "Verify Email Addresses"
 msgstr "Verificar las direcciones de correo electrónico"
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 "Activar para la verificación de la dirección de correo electrónico en el "
 "registro de una cuenta (recomendado)."
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid "Force publish in directory"
 msgstr "Forzar la publicación en el directorio"
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 "Intentar forzar todos los perfiles para que sean listados en el directorio "
 "de este sitio."
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid "Public stream"
 msgstr "Stream público"
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid "Provide a Public stream on your site. This content is unmoderated."
 msgstr ""
 "Proporcionar un stream público en su sitio. Este contenido no está moderado."
 
-#: Zotlabs/Module/Admin/Site.php:344
+#: Code/Module/Admin/Site.php:344
 msgid "the Public stream is disabled"
 msgstr "El stream público está deshabilitado"
 
-#: Zotlabs/Module/Admin/Site.php:345
+#: Code/Module/Admin/Site.php:345
 msgid "the Public stream contains public conversations from this site only"
 msgstr ""
 "El stream público contiene solo las conversaciones públicas de este sitio"
 
-#: Zotlabs/Module/Admin/Site.php:346
+#: Code/Module/Admin/Site.php:346
 msgid ""
 "the Public stream contains public conversations from anywhere on the "
 "internet"
@@ -3256,11 +3256,11 @@ msgstr ""
 "el stream público contiene conversaciones públicas desde cualquier lugar de "
 "Internet"
 
-#: Zotlabs/Module/Admin/Site.php:349
+#: Code/Module/Admin/Site.php:349
 msgid "Allow anybody on the internet to access the Public stream"
 msgstr "Permitir que cualquier persona en Internet acceda al stream público"
 
-#: Zotlabs/Module/Admin/Site.php:349
+#: Code/Module/Admin/Site.php:349
 msgid ""
 "Default is to only allow viewing by site members. Warning: this content is "
 "unmoderated."
@@ -3268,11 +3268,11 @@ msgstr ""
 "Por defecto es sólo para permitir la visualización por los miembros del "
 "sitio. Advertencia: este contenido no está moderado."
 
-#: Zotlabs/Module/Admin/Site.php:350
+#: Code/Module/Admin/Site.php:350
 msgid "Show numbers of likes and dislikes in conversations"
 msgstr "Mostrar la cantidad de \"me gusta\" y \"no me gusta\" en las conversaciones"
 
-#: Zotlabs/Module/Admin/Site.php:350
+#: Code/Module/Admin/Site.php:350
 msgid ""
 "If disabled, the presence of likes and dislikes will be shown, but without "
 "totals."
@@ -3280,19 +3280,19 @@ msgstr ""
 "Si se desactiva, se mostrará la presencia de \"me gusta\" y \"no me gusta\","
 " pero sin totales."
 
-#: Zotlabs/Module/Admin/Site.php:351
+#: Code/Module/Admin/Site.php:351
 msgid "Permit animated profile photos"
 msgstr "Permitir fotos de perfil animadas"
 
-#: Zotlabs/Module/Admin/Site.php:351
+#: Code/Module/Admin/Site.php:351
 msgid "Changing this may take several days to work through the system"
 msgstr "El cambio puede tardar varios días en reflejarse en el sistema"
 
-#: Zotlabs/Module/Admin/Site.php:352
+#: Code/Module/Admin/Site.php:352
 msgid "Only import Public stream posts with this text"
 msgstr "Importar solo entradas del stream púlbico con este texto "
 
-#: Zotlabs/Module/Admin/Site.php:352 Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:352 Code/Module/Admin/Site.php:353
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
@@ -3300,15 +3300,15 @@ msgstr ""
 "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. "
 "Dejar en blanco para importarlo todo"
 
-#: Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:353
 msgid "Do not import Public stream posts with this text"
 msgstr "No importar entradas del stream público con este texto "
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid "Maximum number of imported friends of friends"
 msgstr "Número máximo de amigos de amigos importados"
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid ""
 "Warning: higher numbers will improve the quality of friend suggestions and "
 "directory results but can exponentially increase resource usage"
@@ -3317,11 +3317,11 @@ msgstr ""
 "de amigos y los resultados del directorio, pero pueden aumentar "
 "exponencialmente el uso de recursos"
 
-#: Zotlabs/Module/Admin/Site.php:355
+#: Code/Module/Admin/Site.php:355
 msgid "Login on Homepage"
 msgstr "Iniciar sesión en la página personal"
 
-#: Zotlabs/Module/Admin/Site.php:355
+#: Code/Module/Admin/Site.php:355
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
@@ -3329,11 +3329,11 @@ msgstr ""
 "Presentar a los visitantes una casilla de identificación en la página de "
 "inicio, si no se ha configurado otro tipo de contenido."
 
-#: Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:356
 msgid "Enable context help"
 msgstr "Habilitar la ayuda contextual"
 
-#: Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:356
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
@@ -3341,55 +3341,55 @@ msgstr ""
 "Ver la ayuda contextual para la página actual cuando se pulse el botón de "
 "Ayuda."
 
-#: Zotlabs/Module/Admin/Site.php:357
+#: Code/Module/Admin/Site.php:357
 msgid "Reply-to email address for system generated email."
 msgstr ""
 "Dirección de respuesta para el correo electrónico generado por el sistema."
 
-#: Zotlabs/Module/Admin/Site.php:358
+#: Code/Module/Admin/Site.php:358
 msgid "Sender (From) email address for system generated email."
 msgstr ""
 "Dirección del remitente (From) para el correo electrónico generado por el "
 "sistema."
 
-#: Zotlabs/Module/Admin/Site.php:359
+#: Code/Module/Admin/Site.php:359
 msgid "Display name of email sender for system generated email."
 msgstr "Nombre del remitente del correo electrónico generado por el sistema."
 
-#: Zotlabs/Module/Admin/Site.php:360
+#: Code/Module/Admin/Site.php:360
 msgid "Directory Server URL"
 msgstr "URL del servidor de directorio"
 
-#: Zotlabs/Module/Admin/Site.php:360
+#: Code/Module/Admin/Site.php:360
 msgid "Default directory server"
 msgstr "Servidor de directorio predeterminado"
 
-#: Zotlabs/Module/Admin/Site.php:361
+#: Code/Module/Admin/Site.php:361
 msgid "Proxy user"
 msgstr "Usuario del proxy"
 
-#: Zotlabs/Module/Admin/Site.php:362
+#: Code/Module/Admin/Site.php:362
 msgid "Proxy URL"
 msgstr "Dirección del proxy"
 
-#: Zotlabs/Module/Admin/Site.php:363
+#: Code/Module/Admin/Site.php:363
 msgid "Network fetch timeout"
 msgstr "Tiempo de espera de búsqueda en la red"
 
-#: Zotlabs/Module/Admin/Site.php:363 Zotlabs/Module/Admin/Site.php:364
+#: Code/Module/Admin/Site.php:363 Code/Module/Admin/Site.php:364
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)"
 
-#: Zotlabs/Module/Admin/Site.php:364
+#: Code/Module/Admin/Site.php:364
 msgid "Network post timeout"
 msgstr "Tiempo de espera de la entrada en la red"
 
-#: Zotlabs/Module/Admin/Site.php:365
+#: Code/Module/Admin/Site.php:365
 msgid "Delivery interval"
 msgstr "Intervalo de entrega"
 
-#: Zotlabs/Module/Admin/Site.php:365
+#: Code/Module/Admin/Site.php:365
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
@@ -3400,11 +3400,11 @@ msgstr ""
 "compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes "
 "servidores dedicados."
 
-#: Zotlabs/Module/Admin/Site.php:366
+#: Code/Module/Admin/Site.php:366
 msgid "Deliveries per process"
 msgstr "Intentos de envío por proceso"
 
-#: Zotlabs/Module/Admin/Site.php:366
+#: Code/Module/Admin/Site.php:366
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
@@ -3412,11 +3412,11 @@ msgstr ""
 "Numero de envíos a intentar en un único proceso del sistema operativo. "
 "Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5."
 
-#: Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:367
 msgid "Queue Threshold"
 msgstr "Umbral de la cola de espera"
 
-#: Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:367
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
@@ -3424,11 +3424,11 @@ msgstr ""
 "Aplazar siempre la entrega inmediata si la cola contiene más de este número "
 "de entradas."
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid "Poll interval"
 msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos"
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
@@ -3437,11 +3437,11 @@ msgstr ""
 "segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de "
 "entrega."
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid "Path to ImageMagick convert program"
 msgstr "Ruta al programa de conversión de ImageMagick"
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
@@ -3452,11 +3452,11 @@ msgstr ""
 "dimensiones), de lo contrario se puede agotar la memoria. Ejemplo: "
 "/usr/bin/convert"
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid "Maximum Load Average"
 msgstr "Carga media máxima"
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
@@ -3464,77 +3464,77 @@ msgstr ""
 "Carga máxima del sistema antes de que los procesos de entrega y envío se "
 "hayan retardado - por defecto, 50."
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid "Expiration period in days for imported streams and cached images"
 msgstr ""
 "Período de caducidad en días para los streams importados y las imágenes en "
 "caché"
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid "0 for no expiration of imported content"
 msgstr "0 para que no caduque el contenido importado"
 
-#: Zotlabs/Module/Admin/Site.php:372
+#: Code/Module/Admin/Site.php:372
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr ""
 "No caduque ningún mensaje que tenga menos comentarios que este hace muchos "
 "días"
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 "Servidores públicos: Página web de acogida (marketing) opcional para nuevos "
 "registros"
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Crear esta página primero. Por defecto es %s/register"
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "Page to display after creating a new channel"
 msgstr "Página a mostrar después de la creación de un nuevo canal"
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "Default: profiles"
 msgstr "Perfiles predeterminados"
 
-#: Zotlabs/Module/Admin/Site.php:375
+#: Code/Module/Admin/Site.php:375
 msgid "Site location"
 msgstr "Localización del sitio"
 
-#: Zotlabs/Module/Admin/Site.php:375
+#: Code/Module/Admin/Site.php:375
 msgid "Region or country - shared with other sites"
 msgstr "Región o país - compartido con otros sitios"
 
-#: Zotlabs/Module/Admin/Themes.php:29
+#: Code/Module/Admin/Themes.php:29
 msgid "Theme settings updated."
 msgstr "Ajustes del tema actualizados."
 
-#: Zotlabs/Module/Admin/Themes.php:69
+#: Code/Module/Admin/Themes.php:69
 msgid "No themes found."
 msgstr "No se han encontrado temas."
 
-#: Zotlabs/Module/Admin/Themes.php:127
+#: Code/Module/Admin/Themes.php:127
 msgid "Screenshot"
 msgstr "Instantánea de pantalla"
 
-#: Zotlabs/Module/Admin/Themes.php:135 Zotlabs/Module/Admin/Themes.php:169
-#: Zotlabs/Widget/Admin.php:34
+#: Code/Module/Admin/Themes.php:135 Code/Module/Admin/Themes.php:169
+#: Code/Widget/Admin.php:34
 msgid "Themes"
 msgstr "Temas"
 
-#: Zotlabs/Module/Admin/Themes.php:174
+#: Code/Module/Admin/Themes.php:174
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: Zotlabs/Module/Admin/Themes.php:175
+#: Code/Module/Admin/Themes.php:175
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: Zotlabs/Module/Drafts.php:23
+#: Code/Module/Drafts.php:23
 msgid ""
 "This app allows you to save posts you are writing and finish them later "
 "prior to sharing/publishing."
@@ -3542,19 +3542,19 @@ msgstr ""
 "Esta aplicación le permite guardar las entradas que está escribiendo y "
 "terminarlas más tarde antes de compartirlas/publicarlas."
 
-#: Zotlabs/Module/Api.php:84 Zotlabs/Module/Api.php:106
+#: Code/Module/Api.php:84 Code/Module/Api.php:106
 msgid "Authorize application connection"
 msgstr "Autorizar una conexión de aplicación"
 
-#: Zotlabs/Module/Api.php:85
+#: Code/Module/Api.php:85
 msgid "Return to your app and insert this Security Code:"
 msgstr "Vuelva a su aplicación e introduzca este código de seguridad: "
 
-#: Zotlabs/Module/Api.php:95
+#: Code/Module/Api.php:95
 msgid "Please login to continue."
 msgstr "Por favor inicie sesión para continuar."
 
-#: Zotlabs/Module/Api.php:108
+#: Code/Module/Api.php:108
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
@@ -3562,15 +3562,15 @@ msgstr ""
 "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y "
 "contactos, y/o crear nuevas publicaciones por usted?"
 
-#: Zotlabs/Module/Apporder.php:46
+#: Code/Module/Apporder.php:46
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Cambiar el orden de las aplicaciones fijas en la barra de navegación"
 
-#: Zotlabs/Module/Apporder.php:46
+#: Code/Module/Apporder.php:46
 msgid "Change Order of App Tray Apps"
 msgstr "Cambiar el orden de las aplicaciones de la bandeja de aplicaciones"
 
-#: Zotlabs/Module/Apporder.php:47
+#: Code/Module/Apporder.php:47
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the"
 " navbar"
@@ -3578,115 +3578,115 @@ msgstr ""
 "Use las flechas para mover la aplicación correspondiente a la izquierda "
 "(arriba) o derecha (abajo) en la barra de navegación."
 
-#: Zotlabs/Module/Apporder.php:48
+#: Code/Module/Apporder.php:48
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
 "Use las flechas para mover la aplicación correspondiente hacia arriba o "
 "hacia abajo en la bandeja de aplicaciones."
 
-#: Zotlabs/Module/Follow.php:135
+#: Code/Module/Follow.php:135
 msgid "Connection added."
 msgstr "Se ha incorporado una conexión."
 
-#: Zotlabs/Module/Apps.php:55 Zotlabs/Widget/Appstore.php:15
+#: Code/Module/Apps.php:55 Code/Widget/Appstore.php:15
 #: include/nav.php:317
 msgid "Available Apps"
 msgstr "Aplicaciones disponibles"
 
-#: Zotlabs/Module/Apps.php:55 Zotlabs/Widget/Appstore.php:14
+#: Code/Module/Apps.php:55 Code/Widget/Appstore.php:14
 #: include/nav.php:315
 msgid "Installed Apps"
 msgstr "Apps instaladas"
 
-#: Zotlabs/Module/Apps.php:58
+#: Code/Module/Apps.php:58
 msgid "Manage apps"
 msgstr "Gestionar apps"
 
-#: Zotlabs/Module/Apps.php:59
+#: Code/Module/Apps.php:59
 msgid "Create Custom App"
 msgstr "Crear una app personalizada"
 
-#: Zotlabs/Module/Common.php:21
+#: Code/Module/Common.php:21
 msgid "No channel."
 msgstr "Ningún canal."
 
-#: Zotlabs/Module/Common.php:55
+#: Code/Module/Common.php:55
 msgid "No connections in common."
 msgstr "Ninguna  conexión en común."
 
-#: Zotlabs/Module/Common.php:75
+#: Code/Module/Common.php:75
 msgid "View Common Connections"
 msgstr "Ver las conexiones comunes"
 
-#: Zotlabs/Module/Attach.php:18
+#: Code/Module/Attach.php:18
 msgid "Item not available."
 msgstr "Elemento no disponible"
 
-#: Zotlabs/Module/Authorize.php:23
+#: Code/Module/Authorize.php:23
 msgid "Unknown App"
 msgstr "Aplicación desconocida"
 
-#: Zotlabs/Module/Authorize.php:35
+#: Code/Module/Authorize.php:35
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: Zotlabs/Module/Authorize.php:36
+#: Code/Module/Authorize.php:36
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr "¿Autoriza a la aplicación %s a acceder a los datos de su canal?"
 
-#: Zotlabs/Module/Authorize.php:38
+#: Code/Module/Authorize.php:38
 msgid "Allow"
 msgstr "Permitir"
 
-#: Zotlabs/Module/Cal.php:77
+#: Code/Module/Cal.php:77
 msgid "Permissions denied."
 msgstr "Permisos denegados."
 
-#: Zotlabs/Module/Cal.php:283 Zotlabs/Module/Events.php:672
+#: Code/Module/Cal.php:283 Code/Module/Events.php:672
 msgid "l, F j"
 msgstr "l j F"
 
-#: Zotlabs/Module/Cal.php:331 Zotlabs/Module/Events.php:727
+#: Code/Module/Cal.php:331 Code/Module/Events.php:727
 #: include/text.php:2173
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
-#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753
+#: Code/Module/Cal.php:352 Code/Module/Events.php:753
 msgid "Edit Event"
 msgstr "Editar el evento"
 
-#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753
+#: Code/Module/Cal.php:352 Code/Module/Events.php:753
 msgid "Create Event"
 msgstr "Crear un evento"
 
-#: Zotlabs/Module/Cal.php:353 Zotlabs/Module/Cal.php:360
-#: Zotlabs/Module/Cdav.php:1037 Zotlabs/Module/Events.php:754
-#: Zotlabs/Module/Events.php:763 Zotlabs/Module/Photos.php:1015
+#: Code/Module/Cal.php:353 Code/Module/Cal.php:360
+#: Code/Module/Cdav.php:1037 Code/Module/Events.php:754
+#: Code/Module/Events.php:763 Code/Module/Photos.php:1015
 msgid "Previous"
 msgstr "Anterior"
 
-#: Zotlabs/Module/Cal.php:354 Zotlabs/Module/Cal.php:361
-#: Zotlabs/Module/Cdav.php:1038 Zotlabs/Module/Events.php:755
-#: Zotlabs/Module/Events.php:764 Zotlabs/Module/Setup.php:286
-#: Zotlabs/Module/Photos.php:1025
+#: Code/Module/Cal.php:354 Code/Module/Cal.php:361
+#: Code/Module/Cdav.php:1038 Code/Module/Events.php:755
+#: Code/Module/Events.php:764 Code/Module/Setup.php:286
+#: Code/Module/Photos.php:1025
 msgid "Next"
 msgstr "Siguiente"
 
-#: Zotlabs/Module/Cal.php:358 include/text.php:2881
+#: Code/Module/Cal.php:358 include/text.php:2881
 msgid "Import"
 msgstr "Importar"
 
-#: Zotlabs/Module/Cal.php:362 Zotlabs/Module/Cdav.php:1039
-#: Zotlabs/Module/Events.php:765
+#: Code/Module/Cal.php:362 Code/Module/Cdav.php:1039
+#: Code/Module/Events.php:765
 msgid "Today"
 msgstr "Hoy"
 
-#: Zotlabs/Module/Expire.php:25
+#: Code/Module/Expire.php:25
 msgid "Expiration settings updated."
 msgstr "Se han actualizado los ajustes de caducidad."
 
-#: Zotlabs/Module/Expire.php:35
+#: Code/Module/Expire.php:35
 msgid ""
 "This app allows you to set an optional expiration date/time for your own "
 "posts, after which they will be deleted. This must be at least fifteen "
@@ -3699,371 +3699,371 @@ msgstr ""
 " eliminar automáticamente todas sus publicaciones después de un número "
 "determinado de días"
 
-#: Zotlabs/Module/Expire.php:44
+#: Code/Module/Expire.php:44
 msgid "Expire and delete all my posts after this many days"
 msgstr "Caducar y borrar todas mis entradas transcurridos estos días "
 
-#: Zotlabs/Module/Expire.php:44
+#: Code/Module/Expire.php:44
 msgid ""
 "Leave at 0 if you wish to manually control expiration of specific posts."
 msgstr ""
 "Dejar a 0 si desea controlar manualmente  la caducidad de entradas "
 "específicas."
 
-#: Zotlabs/Module/Expire.php:48
+#: Code/Module/Expire.php:48
 msgid "Automatic Expiration Settings"
 msgstr "Ajustes de caducidad automática"
 
-#: Zotlabs/Module/Admin.php:124
+#: Code/Module/Admin.php:124
 msgid "Blocked accounts"
 msgstr "Cuentas bloqueadas"
 
-#: Zotlabs/Module/Admin.php:125
+#: Code/Module/Admin.php:125
 msgid "Expired accounts"
 msgstr "Cuentas caducadas"
 
-#: Zotlabs/Module/Admin.php:126
+#: Code/Module/Admin.php:126
 msgid "Expiring accounts"
 msgstr "Cuentas que caducan"
 
-#: Zotlabs/Module/Admin.php:143 Zotlabs/Module/Locs.php:134
+#: Code/Module/Admin.php:143 Code/Module/Locs.php:134
 msgid "Primary"
 msgstr "Primario"
 
-#: Zotlabs/Module/Admin.php:144
+#: Code/Module/Admin.php:144
 msgid "Clones"
 msgstr "Clones"
 
-#: Zotlabs/Module/Admin.php:150
+#: Code/Module/Admin.php:150
 msgid "Message queues"
 msgstr "Mensajes en cola"
 
-#: Zotlabs/Module/Admin.php:174
+#: Code/Module/Admin.php:174
 msgid "Your software should be updated"
 msgstr "Debe actualizar su software"
 
-#: Zotlabs/Module/Admin.php:180 include/conversation.php:1502
+#: Code/Module/Admin.php:180 include/conversation.php:1502
 msgid "Summary"
 msgstr "Sumario"
 
-#: Zotlabs/Module/Admin.php:183
+#: Code/Module/Admin.php:183
 msgid "Registered accounts"
 msgstr "Cuentas registradas"
 
-#: Zotlabs/Module/Admin.php:184
+#: Code/Module/Admin.php:184
 msgid "Pending registrations"
 msgstr "Registros pendientes"
 
-#: Zotlabs/Module/Admin.php:185
+#: Code/Module/Admin.php:185
 msgid "Registered channels"
 msgstr "Canales registrados"
 
-#: Zotlabs/Module/Admin.php:186
+#: Code/Module/Admin.php:186
 msgid "Active addons"
 msgstr "Addons acivos"
 
-#: Zotlabs/Module/Admin.php:187 Zotlabs/Module/Sites.php:103
+#: Code/Module/Admin.php:187 Code/Module/Sites.php:103
 msgid "Version"
 msgstr "Versión"
 
-#: Zotlabs/Module/Admin.php:188
+#: Code/Module/Admin.php:188
 msgid "Repository version (release)"
 msgstr "Versión del repositorio (release)"
 
-#: Zotlabs/Module/Admin.php:189
+#: Code/Module/Admin.php:189
 msgid "Repository version (dev)"
 msgstr "Versión del repositorio (dev)"
 
-#: Zotlabs/Module/Block.php:36 Zotlabs/Module/Page.php:46
+#: Code/Module/Block.php:36 Code/Module/Page.php:46
 msgid "Invalid item."
 msgstr "Elemento no válido."
 
-#: Zotlabs/Module/Block.php:86 Zotlabs/Module/Display.php:158
-#: Zotlabs/Module/Display.php:176 Zotlabs/Module/Display.php:194
-#: Zotlabs/Module/Display.php:200 Zotlabs/Module/Page.php:148
-#: Zotlabs/Web/Router.php:166
+#: Code/Module/Block.php:86 Code/Module/Display.php:158
+#: Code/Module/Display.php:176 Code/Module/Display.php:194
+#: Code/Module/Display.php:200 Code/Module/Page.php:148
+#: Code/Web/Router.php:166
 msgid "Page not found."
 msgstr "Página no encontrada."
 
-#: Zotlabs/Module/Cards.php:52
+#: Code/Module/Cards.php:52
 msgid "Create personal planning cards"
 msgstr "Crear fichas de planificación personal"
 
-#: Zotlabs/Module/Cards.php:110
+#: Code/Module/Cards.php:110
 msgid "Add Card"
 msgstr "Añadir una ficha"
 
-#: Zotlabs/Module/Cards.php:111 Zotlabs/Module/Blocks.php:172
-#: Zotlabs/Module/Cdav.php:1061 Zotlabs/Module/Cdav.php:1365
-#: Zotlabs/Module/Connedit.php:878 Zotlabs/Module/Layouts.php:199
-#: Zotlabs/Module/Menu.php:187 Zotlabs/Module/New_channel.php:203
-#: Zotlabs/Module/Webpages.php:264 Zotlabs/Module/Profiles.php:847
-#: Zotlabs/Storage/Browser.php:302 Zotlabs/Storage/Browser.php:420
-#: Zotlabs/Widget/Cdav.php:148 Zotlabs/Widget/Cdav.php:184
+#: Code/Module/Cards.php:111 Code/Module/Blocks.php:172
+#: Code/Module/Cdav.php:1061 Code/Module/Cdav.php:1365
+#: Code/Module/Connedit.php:878 Code/Module/Layouts.php:199
+#: Code/Module/Menu.php:187 Code/Module/New_channel.php:203
+#: Code/Module/Webpages.php:264 Code/Module/Profiles.php:847
+#: Code/Storage/Browser.php:302 Code/Storage/Browser.php:420
+#: Code/Widget/Cdav.php:148 Code/Widget/Cdav.php:184
 msgid "Create"
 msgstr "Crear"
 
-#: Zotlabs/Module/Blocks.php:106 Zotlabs/Module/Blocks.php:168
-#: Zotlabs/Module/Editblock.php:126
+#: Code/Module/Blocks.php:106 Code/Module/Blocks.php:168
+#: Code/Module/Editblock.php:126
 msgid "Block Name"
 msgstr "Nombre del bloque"
 
-#: Zotlabs/Module/Blocks.php:167 include/text.php:2856
+#: Code/Module/Blocks.php:167 include/text.php:2856
 msgid "Blocks"
 msgstr "Bloques"
 
-#: Zotlabs/Module/Blocks.php:169
+#: Code/Module/Blocks.php:169
 msgid "Block Title"
 msgstr "Título del bloque"
 
-#: Zotlabs/Module/Blocks.php:170 Zotlabs/Module/Connections.php:250
-#: Zotlabs/Module/Layouts.php:205 Zotlabs/Module/Menu.php:183
-#: Zotlabs/Module/Webpages.php:276
+#: Code/Module/Blocks.php:170 Code/Module/Connections.php:250
+#: Code/Module/Layouts.php:205 Code/Module/Menu.php:183
+#: Code/Module/Webpages.php:276
 msgid "Created"
 msgstr "Creado"
 
-#: Zotlabs/Module/Blocks.php:171 Zotlabs/Module/Layouts.php:206
-#: Zotlabs/Module/Menu.php:184 Zotlabs/Module/Webpages.php:277
+#: Code/Module/Blocks.php:171 Code/Module/Layouts.php:206
+#: Code/Module/Menu.php:184 Code/Module/Webpages.php:277
 msgid "Edited"
 msgstr "Editado"
 
-#: Zotlabs/Module/Blocks.php:174 Zotlabs/Module/Layouts.php:208
-#: Zotlabs/Module/Webpages.php:266 Zotlabs/Module/Photos.php:1170
-#: Zotlabs/Widget/Cdav.php:144 include/conversation.php:1399
+#: Code/Module/Blocks.php:174 Code/Module/Layouts.php:208
+#: Code/Module/Webpages.php:266 Code/Module/Photos.php:1170
+#: Code/Widget/Cdav.php:144 include/conversation.php:1399
 msgid "Share"
 msgstr "Compartir"
 
-#: Zotlabs/Module/Blocks.php:179 Zotlabs/Module/Events.php:759
-#: Zotlabs/Module/Layouts.php:212 Zotlabs/Module/Webpages.php:271
+#: Code/Module/Blocks.php:179 Code/Module/Events.php:759
+#: Code/Module/Layouts.php:212 Code/Module/Webpages.php:271
 msgid "View"
 msgstr "Ver"
 
-#: Zotlabs/Module/Cdav.php:793 Zotlabs/Module/Events.php:39
+#: Code/Module/Cdav.php:793 Code/Module/Events.php:39
 msgid "Calendar entries imported."
 msgstr "Entradas de calendario importadas."
 
-#: Zotlabs/Module/Cdav.php:795 Zotlabs/Module/Events.php:41
+#: Code/Module/Cdav.php:795 Code/Module/Events.php:41
 msgid "No calendar entries found."
 msgstr "No se han encontrado entradas de calendario."
 
-#: Zotlabs/Module/Cdav.php:857
+#: Code/Module/Cdav.php:857
 msgid "INVALID EVENT DISMISSED!"
 msgstr "¡EVENTO NO VÁLIDO RECHAZADO!"
 
-#: Zotlabs/Module/Cdav.php:858
+#: Code/Module/Cdav.php:858
 msgid "Summary: "
 msgstr "Resumen: "
 
-#: Zotlabs/Module/Cdav.php:859
+#: Code/Module/Cdav.php:859
 msgid "Date: "
 msgstr "Fecha: "
 
-#: Zotlabs/Module/Cdav.php:860 Zotlabs/Module/Cdav.php:866
+#: Code/Module/Cdav.php:860 Code/Module/Cdav.php:866
 msgid "Reason: "
 msgstr "Razón: "
 
-#: Zotlabs/Module/Cdav.php:864
+#: Code/Module/Cdav.php:864
 msgid "INVALID CARD DISMISSED!"
 msgstr "¡TARJETA NO VÁLIDA RECHAZADA!"
 
-#: Zotlabs/Module/Cdav.php:865
+#: Code/Module/Cdav.php:865
 msgid "Name: "
 msgstr "Nombre: "
 
-#: Zotlabs/Module/Cdav.php:886
+#: Code/Module/Cdav.php:886
 msgid "CardDAV App"
 msgstr "App CarDav"
 
-#: Zotlabs/Module/Cdav.php:886 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
+#: Code/Module/Cdav.php:886 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
 #: extend/addon/a/gallery/Mod_Gallery.php:59
 msgid "Not Installed"
 msgstr "No instalado/a"
 
-#: Zotlabs/Module/Cdav.php:887
+#: Code/Module/Cdav.php:887
 msgid "CalDAV capable addressbook"
 msgstr "Libreta de direcciones compatible con CalDav"
 
-#: Zotlabs/Module/Cdav.php:1014 Zotlabs/Module/Events.php:508
+#: Code/Module/Cdav.php:1014 Code/Module/Events.php:508
 msgid "Event title"
 msgstr "Título del evento"
 
-#: Zotlabs/Module/Cdav.php:1015 Zotlabs/Module/Events.php:514
+#: Code/Module/Cdav.php:1015 Code/Module/Events.php:514
 msgid "Start date and time"
 msgstr "Fecha y hora de comienzo"
 
-#: Zotlabs/Module/Cdav.php:1016
+#: Code/Module/Cdav.php:1016
 msgid "End date and time"
 msgstr "Fecha y hora de finalización"
 
-#: Zotlabs/Module/Cdav.php:1017 Zotlabs/Module/Appman.php:150
-#: Zotlabs/Module/Events.php:521
+#: Code/Module/Cdav.php:1017 Code/Module/Appman.php:150
+#: Code/Module/Events.php:521
 msgid "Description"
 msgstr "Descripción"
 
-#: Zotlabs/Module/Cdav.php:1018 Zotlabs/Module/Events.php:523
-#: Zotlabs/Module/Sites.php:94 Zotlabs/Module/Locs.php:132
-#: Zotlabs/Module/Profiles.php:536 Zotlabs/Module/Profiles.php:779
+#: Code/Module/Cdav.php:1018 Code/Module/Events.php:523
+#: Code/Module/Sites.php:94 Code/Module/Locs.php:132
+#: Code/Module/Profiles.php:536 Code/Module/Profiles.php:779
 #: include/js_strings.php:29
 msgid "Location"
 msgstr "Ubicación"
 
-#: Zotlabs/Module/Cdav.php:1040 Zotlabs/Module/Events.php:760
+#: Code/Module/Cdav.php:1040 Code/Module/Events.php:760
 msgid "Month"
 msgstr "Mes"
 
-#: Zotlabs/Module/Cdav.php:1041 Zotlabs/Module/Events.php:761
+#: Code/Module/Cdav.php:1041 Code/Module/Events.php:761
 msgid "Week"
 msgstr "Semana"
 
-#: Zotlabs/Module/Cdav.php:1042 Zotlabs/Module/Events.php:762
+#: Code/Module/Cdav.php:1042 Code/Module/Events.php:762
 msgid "Day"
 msgstr "Día"
 
-#: Zotlabs/Module/Cdav.php:1043
+#: Code/Module/Cdav.php:1043
 msgid "List month"
 msgstr "Lista mensual"
 
-#: Zotlabs/Module/Cdav.php:1044
+#: Code/Module/Cdav.php:1044
 msgid "List week"
 msgstr "Lista semanal"
 
-#: Zotlabs/Module/Cdav.php:1045
+#: Code/Module/Cdav.php:1045
 msgid "List day"
 msgstr "Lista diaria"
 
-#: Zotlabs/Module/Cdav.php:1053
+#: Code/Module/Cdav.php:1053
 msgid "More"
 msgstr "Más"
 
-#: Zotlabs/Module/Cdav.php:1054
+#: Code/Module/Cdav.php:1054
 msgid "Less"
 msgstr "Menos"
 
-#: Zotlabs/Module/Cdav.php:1056
+#: Code/Module/Cdav.php:1056
 msgid "Select calendar"
 msgstr "Seleccionar un calendario"
 
-#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:151
+#: Code/Module/Cdav.php:1057 Code/Widget/Cdav.php:151
 msgid "Channel Calendars"
 msgstr "Calendarios del canal"
 
-#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:137
-#: Zotlabs/Widget/Cdav.php:151
+#: Code/Module/Cdav.php:1057 Code/Widget/Cdav.php:137
+#: Code/Widget/Cdav.php:151
 msgid "CalDAV Calendars"
 msgstr "Calendarios CalDAV"
 
-#: Zotlabs/Module/Cdav.php:1059
+#: Code/Module/Cdav.php:1059
 msgid "Delete all"
 msgstr "Eliminar todos"
 
-#: Zotlabs/Module/Cdav.php:1062
+#: Code/Module/Cdav.php:1062
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."
 
-#: Zotlabs/Module/Cdav.php:1351 Zotlabs/Module/Connedit.php:864
+#: Code/Module/Cdav.php:1351 Code/Module/Connedit.php:864
 msgid "Organisation"
 msgstr "Organización"
 
-#: Zotlabs/Module/Cdav.php:1352 Zotlabs/Module/Connedit.php:865
+#: Code/Module/Cdav.php:1352 Code/Module/Connedit.php:865
 msgid "Title"
 msgstr "Título"
 
-#: Zotlabs/Module/Cdav.php:1353 Zotlabs/Module/Connedit.php:866
-#: Zotlabs/Module/Profiles.php:835
+#: Code/Module/Cdav.php:1353 Code/Module/Connedit.php:866
+#: Code/Module/Profiles.php:835
 msgid "Phone"
 msgstr "Teléfono"
 
-#: Zotlabs/Module/Cdav.php:1355 Zotlabs/Module/Connedit.php:868
-#: Zotlabs/Module/Profiles.php:837
+#: Code/Module/Cdav.php:1355 Code/Module/Connedit.php:868
+#: Code/Module/Profiles.php:837
 msgid "Instant messenger"
 msgstr "Mensajería instantánea"
 
-#: Zotlabs/Module/Cdav.php:1356 Zotlabs/Module/Connedit.php:869
-#: Zotlabs/Module/Profiles.php:838
+#: Code/Module/Cdav.php:1356 Code/Module/Connedit.php:869
+#: Code/Module/Profiles.php:838
 msgid "Website"
 msgstr "Sitio web"
 
-#: Zotlabs/Module/Cdav.php:1358 Zotlabs/Module/Connedit.php:871
-#: Zotlabs/Module/Profiles.php:840
+#: Code/Module/Cdav.php:1358 Code/Module/Connedit.php:871
+#: Code/Module/Profiles.php:840
 msgid "Note"
 msgstr "Nota"
 
-#: Zotlabs/Module/Cdav.php:1359 Zotlabs/Module/Connedit.php:872
-#: Zotlabs/Module/Profiles.php:841 include/event.php:1514
+#: Code/Module/Cdav.php:1359 Code/Module/Connedit.php:872
+#: Code/Module/Profiles.php:841 include/event.php:1514
 #: include/connections.php:849
 msgid "Mobile"
 msgstr "Móvil"
 
-#: Zotlabs/Module/Cdav.php:1360 Zotlabs/Module/Connedit.php:873
-#: Zotlabs/Module/Profiles.php:842 include/event.php:1515
+#: Code/Module/Cdav.php:1360 Code/Module/Connedit.php:873
+#: Code/Module/Profiles.php:842 include/event.php:1515
 #: include/connections.php:850
 msgid "Home"
 msgstr "Inicio"
 
-#: Zotlabs/Module/Cdav.php:1361 Zotlabs/Module/Connedit.php:874
-#: Zotlabs/Module/Profiles.php:843 include/event.php:1518
+#: Code/Module/Cdav.php:1361 Code/Module/Connedit.php:874
+#: Code/Module/Profiles.php:843 include/event.php:1518
 #: include/connections.php:853
 msgid "Work"
 msgstr "Trabajo"
 
-#: Zotlabs/Module/Cdav.php:1362 Zotlabs/Module/Connedit.php:875
-#: Zotlabs/Module/Profiles.php:844 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003 Zotlabs/Module/Profiles.php:1073
-#: Zotlabs/Module/Profiles.php:1110 include/event.php:1521
+#: Code/Module/Cdav.php:1362 Code/Module/Connedit.php:875
+#: Code/Module/Profiles.php:844 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003 Code/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1110 include/event.php:1521
 #: include/event.php:1527 include/connections.php:856
 #: include/connections.php:862
 msgid "Other"
 msgstr "Otro"
 
-#: Zotlabs/Module/Cdav.php:1363 Zotlabs/Module/Connedit.php:876
-#: Zotlabs/Module/Profiles.php:845
+#: Code/Module/Cdav.php:1363 Code/Module/Connedit.php:876
+#: Code/Module/Profiles.php:845
 msgid "Add Contact"
 msgstr "Añadir un contacto"
 
-#: Zotlabs/Module/Cdav.php:1364 Zotlabs/Module/Connedit.php:877
-#: Zotlabs/Module/Profiles.php:846
+#: Code/Module/Cdav.php:1364 Code/Module/Connedit.php:877
+#: Code/Module/Profiles.php:846
 msgid "Add Field"
 msgstr "Añadir un campo"
 
-#: Zotlabs/Module/Cdav.php:1369 Zotlabs/Module/Connedit.php:882
+#: Code/Module/Cdav.php:1369 Code/Module/Connedit.php:882
 msgid "P.O. Box"
 msgstr "Buzón de correos"
 
-#: Zotlabs/Module/Cdav.php:1370 Zotlabs/Module/Connedit.php:883
+#: Code/Module/Cdav.php:1370 Code/Module/Connedit.php:883
 msgid "Additional"
 msgstr "Adicional"
 
-#: Zotlabs/Module/Cdav.php:1371 Zotlabs/Module/Connedit.php:884
+#: Code/Module/Cdav.php:1371 Code/Module/Connedit.php:884
 msgid "Street"
 msgstr "Calle"
 
-#: Zotlabs/Module/Cdav.php:1372 Zotlabs/Module/Connedit.php:885
+#: Code/Module/Cdav.php:1372 Code/Module/Connedit.php:885
 msgid "Locality"
 msgstr "Localidad"
 
-#: Zotlabs/Module/Cdav.php:1373 Zotlabs/Module/Connedit.php:886
+#: Code/Module/Cdav.php:1373 Code/Module/Connedit.php:886
 msgid "Region"
 msgstr "Provincia, región o estado"
 
-#: Zotlabs/Module/Cdav.php:1374 Zotlabs/Module/Connedit.php:887
+#: Code/Module/Cdav.php:1374 Code/Module/Connedit.php:887
 msgid "ZIP Code"
 msgstr "Código postal"
 
-#: Zotlabs/Module/Cdav.php:1375 Zotlabs/Module/Connedit.php:888
-#: Zotlabs/Module/Profiles.php:803
+#: Code/Module/Cdav.php:1375 Code/Module/Connedit.php:888
+#: Code/Module/Profiles.php:803
 msgid "Country"
 msgstr "País"
 
-#: Zotlabs/Module/Cdav.php:1426
+#: Code/Module/Cdav.php:1426
 msgid "Default Calendar"
 msgstr "Calendario por defecto"
 
-#: Zotlabs/Module/Cdav.php:1437
+#: Code/Module/Cdav.php:1437
 msgid "Default Addressbook"
 msgstr "Agenda de direcciones por defecto"
 
-#: Zotlabs/Module/Changeaddr.php:57
+#: Code/Module/Changeaddr.php:57
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account"
 " password."
@@ -4071,12 +4071,12 @@ msgstr ""
 "Los cambios en el nombre de un canal no está permitida hasta pasadas 48 "
 "horas desde el cambio de contraseña de la cuenta."
 
-#: Zotlabs/Module/Changeaddr.php:69 include/channel.php:298
+#: Code/Module/Changeaddr.php:69 include/channel.php:298
 #: include/channel.php:749
 msgid "Reserved nickname. Please choose another."
 msgstr "Sobrenombre en uso. Por favor, elija otro."
 
-#: Zotlabs/Module/Changeaddr.php:74 include/channel.php:303
+#: Code/Module/Changeaddr.php:74 include/channel.php:303
 #: include/channel.php:754
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
@@ -4084,339 +4084,339 @@ msgstr ""
 "El alias contiene caracteres no admitidos o está ya en uso por otros "
 "miembros de este sitio."
 
-#: Zotlabs/Module/Changeaddr.php:88
+#: Code/Module/Changeaddr.php:88
 msgid "Feature has been disabled"
 msgstr "La funcionalidad ha sido deshabilitada"
 
-#: Zotlabs/Module/Changeaddr.php:107
+#: Code/Module/Changeaddr.php:107
 msgid "Change channel nickname/address"
 msgstr "Cambiar el alias o la dirección del canal"
 
-#: Zotlabs/Module/Changeaddr.php:108 Zotlabs/Module/Removeme.php:72
-#: Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Changeaddr.php:108 Code/Module/Removeme.php:72
+#: Code/Module/Removeaccount.php:72
 msgid "WARNING: "
 msgstr "ATENCIÓN:"
 
-#: Zotlabs/Module/Changeaddr.php:108
+#: Code/Module/Changeaddr.php:108
 msgid "Any/all connections on other networks will be lost!"
 msgstr "¡Cualquier/todas las conexiones en otras redes se perderán!"
 
-#: Zotlabs/Module/Changeaddr.php:109 Zotlabs/Module/Removeme.php:73
-#: Zotlabs/Module/Removeaccount.php:73
+#: Code/Module/Changeaddr.php:109 Code/Module/Removeme.php:73
+#: Code/Module/Removeaccount.php:73
 msgid "Please enter your password for verification:"
 msgstr "Por favor, introduzca su contraseña para su verificación:"
 
-#: Zotlabs/Module/Changeaddr.php:110
+#: Code/Module/Changeaddr.php:110
 msgid "New channel address"
 msgstr "Nueva dirección del canal"
 
-#: Zotlabs/Module/Changeaddr.php:111
+#: Code/Module/Changeaddr.php:111
 msgid "Rename Channel"
 msgstr "Renombrar el canal"
 
-#: Zotlabs/Module/Ping.php:432
+#: Code/Module/Ping.php:432
 msgid "added your channel"
 msgstr "añadió este canal a sus conexiones"
 
-#: Zotlabs/Module/Ping.php:457
+#: Code/Module/Ping.php:457
 msgid "requires approval"
 msgstr "requiere aprobación"
 
-#: Zotlabs/Module/Ping.php:466
+#: Code/Module/Ping.php:466
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: Zotlabs/Module/Ping.php:484
+#: Code/Module/Ping.php:484
 msgid "[today]"
 msgstr "[hoy]"
 
-#: Zotlabs/Module/Ping.php:494
+#: Code/Module/Ping.php:494
 msgid "posted an event"
 msgstr "publicó un evento"
 
-#: Zotlabs/Module/Ping.php:528
+#: Code/Module/Ping.php:528
 msgid "shared a file with you"
 msgstr "compartió un archivo con usted"
 
-#: Zotlabs/Module/Ping.php:556
+#: Code/Module/Ping.php:556
 msgid "reported content"
 msgstr "contenido denunciado"
 
-#: Zotlabs/Module/Ping.php:770
+#: Code/Module/Ping.php:770
 msgid "Private group"
 msgstr "Grupo privado"
 
-#: Zotlabs/Module/Ping.php:770
+#: Code/Module/Ping.php:770
 msgid "Public group"
 msgstr "Grupo público"
 
-#: Zotlabs/Module/Help.php:24
+#: Code/Module/Help.php:24
 msgid "Documentation Search"
 msgstr "Búsqueda de Documentación"
 
-#: Zotlabs/Module/Help.php:95
+#: Code/Module/Help.php:95
 msgid "Unknown language"
 msgstr "Idioma desconocido"
 
-#: Zotlabs/Module/Help.php:114
+#: Code/Module/Help.php:114
 msgid "$Projectname Documentation"
 msgstr "Documentación de $Projectname"
 
-#: Zotlabs/Module/Help.php:115
+#: Code/Module/Help.php:115
 msgid "Contents"
 msgstr "Contenidos"
 
-#: Zotlabs/Module/Chatsvc.php:146
+#: Code/Module/Chatsvc.php:146
 msgid "Away"
 msgstr "Ausente"
 
-#: Zotlabs/Module/Chatsvc.php:151
+#: Code/Module/Chatsvc.php:151
 msgid "Online"
 msgstr "Conectado/a"
 
-#: Zotlabs/Module/Connedit.php:88 Zotlabs/Module/Defperms.php:75
+#: Code/Module/Connedit.php:88 Code/Module/Defperms.php:75
 msgid "Could not access contact record."
 msgstr "No se ha podido acceder al registro de contacto."
 
-#: Zotlabs/Module/Connedit.php:120
+#: Code/Module/Connedit.php:120
 msgid "Could not locate selected profile."
 msgstr "No se ha podido localizar el perfil seleccionado."
 
-#: Zotlabs/Module/Connedit.php:203
+#: Code/Module/Connedit.php:203
 msgid "Connection updated."
 msgstr "Conexión actualizada."
 
-#: Zotlabs/Module/Connedit.php:205
+#: Code/Module/Connedit.php:205
 msgid "Failed to update connection record."
 msgstr "Error al actualizar el registro de la conexión."
 
-#: Zotlabs/Module/Connedit.php:250
+#: Code/Module/Connedit.php:250
 msgid "is now connected to"
 msgstr "ahora está conectado/a"
 
-#: Zotlabs/Module/Connedit.php:377
+#: Code/Module/Connedit.php:377
 msgid "Could not access address book record."
 msgstr "No se pudo acceder al registro en su libreta de direcciones."
 
-#: Zotlabs/Module/Connedit.php:423
+#: Code/Module/Connedit.php:423
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
 
-#: Zotlabs/Module/Connedit.php:450
+#: Code/Module/Connedit.php:450
 msgid "Added by Connedit"
 msgstr "Añadida por el editor de conexiones"
 
-#: Zotlabs/Module/Connedit.php:488
+#: Code/Module/Connedit.php:488
 msgid "Unable to set address book parameters."
 msgstr ""
 "No ha sido posible establecer los parámetros de la libreta de direcciones."
 
-#: Zotlabs/Module/Connedit.php:505
+#: Code/Module/Connedit.php:505
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: Zotlabs/Module/Connedit.php:551
+#: Code/Module/Connedit.php:551
 #, php-format
 msgid "View %s's profile"
 msgstr "Ver el perfil de %s"
 
-#: Zotlabs/Module/Connedit.php:555
+#: Code/Module/Connedit.php:555
 msgid "Refresh Permissions"
 msgstr "Recargar los permisos"
 
-#: Zotlabs/Module/Connedit.php:558
+#: Code/Module/Connedit.php:558
 msgid "Fetch updated permissions"
 msgstr "Obtener los permisos actualizados"
 
-#: Zotlabs/Module/Connedit.php:562
+#: Code/Module/Connedit.php:562
 msgid "Refresh Photo"
 msgstr "Actualizar la foto"
 
-#: Zotlabs/Module/Connedit.php:565
+#: Code/Module/Connedit.php:565
 msgid "Fetch updated photo"
 msgstr "Obtener una foto actualizada"
 
-#: Zotlabs/Module/Connedit.php:569 include/conversation.php:963
+#: Code/Module/Connedit.php:569 include/conversation.php:963
 msgid "Recent Activity"
 msgstr "Actividad reciente"
 
-#: Zotlabs/Module/Connedit.php:572
+#: Code/Module/Connedit.php:572
 msgid "View recent posts and comments"
 msgstr "Ver publicaciones y comentarios recientes"
 
-#: Zotlabs/Module/Connedit.php:579
+#: Code/Module/Connedit.php:579
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
 
-#: Zotlabs/Module/Connedit.php:580
+#: Code/Module/Connedit.php:580
 msgid "This connection is blocked"
 msgstr "Esta conexión está bloqueada"
 
-#: Zotlabs/Module/Connedit.php:584
+#: Code/Module/Connedit.php:584
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
-#: Zotlabs/Module/Connedit.php:584 Zotlabs/Module/Connections.php:343
+#: Code/Module/Connedit.php:584 Code/Module/Connections.php:343
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: Zotlabs/Module/Connedit.php:587
+#: Code/Module/Connedit.php:587
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta "
 "conexión"
 
-#: Zotlabs/Module/Connedit.php:588
+#: Code/Module/Connedit.php:588
 msgid "This connection is ignored"
 msgstr "Esta conexión es ignorada"
 
-#: Zotlabs/Module/Connedit.php:595
+#: Code/Module/Connedit.php:595
 msgid "Censor (or Uncensor) images from this connection"
 msgstr "Imágenes de Censor (o no Censor) de esta conexión"
 
-#: Zotlabs/Module/Connedit.php:596
+#: Code/Module/Connedit.php:596
 msgid "This connection is censored"
 msgstr "Esta conexión ha sido censurada"
 
-#: Zotlabs/Module/Connedit.php:600
+#: Code/Module/Connedit.php:600
 msgid "Unarchive"
 msgstr "Desarchivar"
 
-#: Zotlabs/Module/Connedit.php:600
+#: Code/Module/Connedit.php:600
 msgid "Archive"
 msgstr "Archivar"
 
-#: Zotlabs/Module/Connedit.php:603
+#: Code/Module/Connedit.php:603
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque "
 "mantiene sus contenidos"
 
-#: Zotlabs/Module/Connedit.php:604
+#: Code/Module/Connedit.php:604
 msgid "This connection is archived"
 msgstr "Esta conexión está archivada"
 
-#: Zotlabs/Module/Connedit.php:608
+#: Code/Module/Connedit.php:608
 msgid "Unhide"
 msgstr "Mostrar"
 
-#: Zotlabs/Module/Connedit.php:608
+#: Code/Module/Connedit.php:608
 msgid "Hide"
 msgstr "Ocultar"
 
-#: Zotlabs/Module/Connedit.php:611
+#: Code/Module/Connedit.php:611
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
 
-#: Zotlabs/Module/Connedit.php:612
+#: Code/Module/Connedit.php:612
 msgid "This connection is hidden"
 msgstr "Esta conexión está oculta"
 
-#: Zotlabs/Module/Connedit.php:619
+#: Code/Module/Connedit.php:619
 msgid "Delete this connection"
 msgstr "Eliminar esta conexión"
 
-#: Zotlabs/Module/Connedit.php:627
+#: Code/Module/Connedit.php:627
 msgid "Fetch Vcard"
 msgstr "Obtener una vcard"
 
-#: Zotlabs/Module/Connedit.php:630
+#: Code/Module/Connedit.php:630
 msgid "Fetch electronic calling card for this connection"
 msgstr "Obtener una tarjeta de llamada electrónica para esta conexión"
 
-#: Zotlabs/Module/Connedit.php:637 Zotlabs/Module/Filestorage.php:230
-#: Zotlabs/Module/Thing.php:355 Zotlabs/Module/Thing.php:410
-#: Zotlabs/Module/Chat.php:240 Zotlabs/Module/Photos.php:736
-#: Zotlabs/Module/Photos.php:1121
+#: Code/Module/Connedit.php:637 Code/Module/Filestorage.php:230
+#: Code/Module/Thing.php:355 Code/Module/Thing.php:410
+#: Code/Module/Chat.php:240 Code/Module/Photos.php:736
+#: Code/Module/Photos.php:1121
 #: extend/addon/a/flashcards/Mod_Flashcards.php:254
 #: extend/addon/a/faces/Mod_Faces.php:172 include/acl_selectors.php:152
 msgid "Permissions"
 msgstr "Permisos"
 
-#: Zotlabs/Module/Connedit.php:640
+#: Code/Module/Connedit.php:640
 msgid "Open Individual Permissions section by default"
 msgstr "Abrir la sección de permisos individuales por defecto"
 
-#: Zotlabs/Module/Connedit.php:666
+#: Code/Module/Connedit.php:666
 msgid "Open Friend Zoom section by default"
 msgstr "Abrir la sección \"Friend Zoom\" de forma predeterminada"
 
-#: Zotlabs/Module/Connedit.php:670 Zotlabs/Module/Affinity.php:61
-#: Zotlabs/Widget/Affinity.php:26
+#: Code/Module/Connedit.php:670 Code/Module/Affinity.php:61
+#: Code/Widget/Affinity.php:26
 msgid "Me"
 msgstr "Yo"
 
-#: Zotlabs/Module/Connedit.php:671 Zotlabs/Module/Affinity.php:62
-#: Zotlabs/Widget/Affinity.php:27
+#: Code/Module/Connedit.php:671 Code/Module/Affinity.php:62
+#: Code/Widget/Affinity.php:27
 msgid "Family"
 msgstr "Familia"
 
-#: Zotlabs/Module/Connedit.php:672 Zotlabs/Module/Profiles.php:1092
-#: Zotlabs/Module/Affinity.php:63 Zotlabs/Module/Settings/Channel.php:79
-#: Zotlabs/Module/Settings/Channel.php:82
-#: Zotlabs/Module/Settings/Channel.php:83
-#: Zotlabs/Module/Settings/Channel.php:87
-#: Zotlabs/Module/Settings/Channel.php:98 Zotlabs/Widget/Affinity.php:28
-#: Zotlabs/Import/Friendica.php:244 Zotlabs/Import/Friendica.php:245
-#: Zotlabs/Import/Friendica.php:253 include/channel.php:529
+#: Code/Module/Connedit.php:672 Code/Module/Profiles.php:1092
+#: Code/Module/Affinity.php:63 Code/Module/Settings/Channel.php:79
+#: Code/Module/Settings/Channel.php:82
+#: Code/Module/Settings/Channel.php:83
+#: Code/Module/Settings/Channel.php:87
+#: Code/Module/Settings/Channel.php:98 Code/Widget/Affinity.php:28
+#: Code/Import/Friendica.php:244 Code/Import/Friendica.php:245
+#: Code/Import/Friendica.php:253 include/channel.php:529
 #: include/channel.php:531
 msgid "Friends"
 msgstr "Amigos/as"
 
-#: Zotlabs/Module/Connedit.php:673 Zotlabs/Module/Affinity.php:64
-#: Zotlabs/Widget/Affinity.php:29
+#: Code/Module/Connedit.php:673 Code/Module/Affinity.php:64
+#: Code/Widget/Affinity.php:29
 msgid "Peers"
 msgstr "Pares"
 
-#: Zotlabs/Module/Connedit.php:675 Zotlabs/Module/Connections.php:88
-#: Zotlabs/Module/Connections.php:111 Zotlabs/Module/Affinity.php:66
-#: Zotlabs/Widget/Affinity.php:31
+#: Code/Module/Connedit.php:675 Code/Module/Connections.php:88
+#: Code/Module/Connections.php:111 Code/Module/Affinity.php:66
+#: Code/Widget/Affinity.php:31
 msgid "All"
 msgstr "Todos/as"
 
-#: Zotlabs/Module/Connedit.php:692
+#: Code/Module/Connedit.php:692
 msgid "Filter"
 msgstr "Filtrar"
 
-#: Zotlabs/Module/Connedit.php:695
+#: Code/Module/Connedit.php:695
 msgid "Open Custom Filter section by default"
 msgstr "Abrir por defecto la sección de  personalización de filtros"
 
-#: Zotlabs/Module/Connedit.php:732
+#: Code/Module/Connedit.php:732
 msgid "Approve this connection"
 msgstr "Aprobar esta conexión"
 
-#: Zotlabs/Module/Connedit.php:732
+#: Code/Module/Connedit.php:732
 msgid "Accept connection to allow communication"
 msgstr "Aceptar la conexión para permitir la comunicación"
 
-#: Zotlabs/Module/Connedit.php:737
+#: Code/Module/Connedit.php:737
 msgid "Set Friend Zoom"
 msgstr "Establecer \"Friend Zoom\""
 
-#: Zotlabs/Module/Connedit.php:741
+#: Code/Module/Connedit.php:741
 msgid "Set Profile"
 msgstr "Ajustar el perfil"
 
-#: Zotlabs/Module/Connedit.php:745
+#: Code/Module/Connedit.php:745
 msgid "Set Friend Zoom & Profile"
 msgstr "Establecer \"Friend Zoom\" y Perfil"
 
-#: Zotlabs/Module/Connedit.php:793
+#: Code/Module/Connedit.php:793
 msgid "This connection is unreachable from this location."
 msgstr "No se puede acceder a la conexión desde este sitio."
 
-#: Zotlabs/Module/Connedit.php:794
+#: Code/Module/Connedit.php:794
 msgid "This connection may be unreachable from other channel locations."
 msgstr ""
 "Esta conexión puede ser inaccesible desde otras ubicaciones del canal."
 
-#: Zotlabs/Module/Connedit.php:796
+#: Code/Module/Connedit.php:796
 msgid "Location independence is not supported by their network."
 msgstr "La independencia de ubicación no es compatible con su red."
 
-#: Zotlabs/Module/Connedit.php:801
+#: Code/Module/Connedit.php:801
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
@@ -4424,54 +4424,54 @@ msgstr ""
 "Esta conexión no es accesible desde este sitio. La independencia de "
 "ubicación no es compatible con su red."
 
-#: Zotlabs/Module/Connedit.php:805 Zotlabs/Module/Defperms.php:248
+#: Code/Module/Connedit.php:805 Code/Module/Defperms.php:248
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: Zotlabs/Module/Connedit.php:805 include/items.php:4562
+#: Code/Module/Connedit.php:805 include/items.php:4562
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: Zotlabs/Module/Connedit.php:806 Zotlabs/Module/Defperms.php:249
+#: Code/Module/Connedit.php:806 Code/Module/Defperms.php:249
 msgid "Apply these permissions automatically"
 msgstr "Aplicar estos permisos automaticamente"
 
-#: Zotlabs/Module/Connedit.php:806
+#: Code/Module/Connedit.php:806
 msgid "Connection requests will be approved without your interaction"
 msgstr "Las solicitudes de conexión serán aprobadas sin su intervención"
 
-#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:250
+#: Code/Module/Connedit.php:807 Code/Module/Defperms.php:250
 msgid "Permission role"
 msgstr "Permisos de rol"
 
-#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:250
-#: Zotlabs/Module/New_channel.php:171 Zotlabs/Module/New_channel.php:178
-#: Zotlabs/Widget/Notifications.php:151 include/nav.php:301
+#: Code/Module/Connedit.php:807 Code/Module/Defperms.php:250
+#: Code/Module/New_channel.php:171 Code/Module/New_channel.php:178
+#: Code/Widget/Notifications.php:151 include/nav.php:301
 msgid "Loading"
 msgstr "Cargando"
 
-#: Zotlabs/Module/Connedit.php:808 Zotlabs/Module/Defperms.php:251
+#: Code/Module/Connedit.php:808 Code/Module/Defperms.php:251
 msgid "Add permission role"
 msgstr "Añadir permisos de rol"
 
-#: Zotlabs/Module/Connedit.php:812
+#: Code/Module/Connedit.php:812
 msgid "Ignore shares and repeats this connection posts"
 msgstr "Ignora las acciones y repite las entradas de esta conexión"
 
-#: Zotlabs/Module/Connedit.php:812
+#: Code/Module/Connedit.php:812
 msgid "Note: This is not recommended for Groups."
 msgstr "Aviso: esto no es recomendable para los grupos."
 
-#: Zotlabs/Module/Connedit.php:816
+#: Code/Module/Connedit.php:816
 msgid "This connection's primary address is"
 msgstr "La dirección primaria de esta conexión es"
 
-#: Zotlabs/Module/Connedit.php:817
+#: Code/Module/Connedit.php:817
 msgid "Available locations:"
 msgstr "Ubicaciones disponibles:"
 
-#: Zotlabs/Module/Connedit.php:822 Zotlabs/Module/Defperms.php:255
+#: Code/Module/Connedit.php:822 Code/Module/Defperms.php:255
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
@@ -4479,35 +4479,35 @@ msgstr ""
 "Los permisos indicados en esta página serán aplicados en todas las nuevas "
 "conexiones."
 
-#: Zotlabs/Module/Connedit.php:823
+#: Code/Module/Connedit.php:823
 msgid "Connection Tools"
 msgstr "Gestión de las conexiones"
 
-#: Zotlabs/Module/Connedit.php:825
+#: Code/Module/Connedit.php:825
 msgid "Slide to adjust your degree of friendship"
 msgstr "Deslizar para ajustar el grado de amistad"
 
-#: Zotlabs/Module/Connedit.php:826 include/js_strings.php:24
+#: Code/Module/Connedit.php:826 include/js_strings.php:24
 msgid "Rating"
 msgstr "Valoración"
 
-#: Zotlabs/Module/Connedit.php:827
+#: Code/Module/Connedit.php:827
 msgid "Slide to adjust your rating"
 msgstr "Deslizar para ajustar su valoración"
 
-#: Zotlabs/Module/Connedit.php:828 Zotlabs/Module/Connedit.php:834
+#: Code/Module/Connedit.php:828 Code/Module/Connedit.php:834
 msgid "Optionally explain your rating"
 msgstr "Opcionalmente, puede explicar su valoración"
 
-#: Zotlabs/Module/Connedit.php:830
+#: Code/Module/Connedit.php:830
 msgid "Custom Filter"
 msgstr "Filtro personalizado"
 
-#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Content_filter.php:51
+#: Code/Module/Connedit.php:831 Code/Module/Content_filter.php:51
 msgid "Only import posts with this text"
 msgstr "Importar solo entradas que contengan este texto"
 
-#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Connedit.php:832
+#: Code/Module/Connedit.php:831 Code/Module/Connedit.php:832
 msgid ""
 "words one per line or #tags, $categories, /patterns/, or lang=xx, leave "
 "blank to import all posts"
@@ -4515,27 +4515,27 @@ msgstr ""
 "una palabra por línea o #tags, $categorías, /patrones/, o lang=xx, dejar en "
 "blanco para importar todas las entradas"
 
-#: Zotlabs/Module/Connedit.php:832 Zotlabs/Module/Content_filter.php:59
+#: Code/Module/Connedit.php:832 Code/Module/Content_filter.php:59
 msgid "Do not import posts with this text"
 msgstr "No importar entradas que contengan este texto"
 
-#: Zotlabs/Module/Connedit.php:833 extend/addon/a/zotpost/Mod_zotpost.php:69
+#: Code/Module/Connedit.php:833 extend/addon/a/zotpost/Mod_zotpost.php:69
 msgid "Nickname"
 msgstr "Alias"
 
-#: Zotlabs/Module/Connedit.php:833
+#: Code/Module/Connedit.php:833
 msgid "optional - allows you to search by a name that you have chosen"
 msgstr "opcional - se le permite buscar por un nombre que haya escogido"
 
-#: Zotlabs/Module/Connedit.php:835
+#: Code/Module/Connedit.php:835
 msgid "This information is public!"
 msgstr "¡Esta información es pública!"
 
-#: Zotlabs/Module/Connedit.php:840
+#: Code/Module/Connedit.php:840
 msgid "Connection Pending Approval"
 msgstr "Conexión pendiente de aprobación"
 
-#: Zotlabs/Module/Connedit.php:845
+#: Code/Module/Connedit.php:845
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
@@ -4544,24 +4544,24 @@ msgstr ""
 "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su "
 "perfil de forma segura."
 
-#: Zotlabs/Module/Connedit.php:847 Zotlabs/Module/Settings/Tokens.php:306
+#: Code/Module/Connedit.php:847 Code/Module/Settings/Tokens.php:306
 msgid "Their Settings"
 msgstr "Sus ajustes"
 
-#: Zotlabs/Module/Connedit.php:848 Zotlabs/Module/Defperms.php:260
-#: Zotlabs/Module/Settings/Tokens.php:307
-#: Zotlabs/Module/Settings/Permcats.php:136
+#: Code/Module/Connedit.php:848 Code/Module/Defperms.php:260
+#: Code/Module/Settings/Tokens.php:307
+#: Code/Module/Settings/Permcats.php:136
 msgid "My Settings"
 msgstr "Mis ajustes"
 
-#: Zotlabs/Module/Connedit.php:850 Zotlabs/Module/Defperms.php:263
-#: Zotlabs/Module/Settings/Tokens.php:312
-#: Zotlabs/Module/Settings/Permcats.php:142
+#: Code/Module/Connedit.php:850 Code/Module/Defperms.php:263
+#: Code/Module/Settings/Tokens.php:312
+#: Code/Module/Settings/Permcats.php:142
 msgid "Individual Permissions"
 msgstr "Permisos individuales"
 
-#: Zotlabs/Module/Connedit.php:851 Zotlabs/Module/Connedit.php:852
-#: Zotlabs/Module/Defperms.php:264 Zotlabs/Module/Settings/Permcats.php:143
+#: Code/Module/Connedit.php:851 Code/Module/Connedit.php:852
+#: Code/Module/Defperms.php:264 Code/Module/Settings/Permcats.php:143
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
@@ -4569,189 +4569,189 @@ msgstr ""
 "Es posible que se hayan preestablecido o bloqueado algunos permisos "
 "individuales según el tipo de canal y la configuración de privacidad."
 
-#: Zotlabs/Module/Connedit.php:853
+#: Code/Module/Connedit.php:853
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: Zotlabs/Module/Connedit.php:861
+#: Code/Module/Connedit.php:861
 msgid "Details"
 msgstr "Detalles"
 
-#: Zotlabs/Module/Connections.php:68 Zotlabs/Module/Connections.php:155
-#: Zotlabs/Module/Connections.php:298
+#: Code/Module/Connections.php:68 Code/Module/Connections.php:155
+#: Code/Module/Connections.php:298
 msgid "Blocked"
 msgstr "Bloqueadas"
 
-#: Zotlabs/Module/Connections.php:73 Zotlabs/Module/Connections.php:162
-#: Zotlabs/Module/Connections.php:297
+#: Code/Module/Connections.php:73 Code/Module/Connections.php:162
+#: Code/Module/Connections.php:297
 msgid "Ignored"
 msgstr "Ignoradas"
 
-#: Zotlabs/Module/Connections.php:78 Zotlabs/Module/Connections.php:176
-#: Zotlabs/Module/Connections.php:296
+#: Code/Module/Connections.php:78 Code/Module/Connections.php:176
+#: Code/Module/Connections.php:296
 msgid "Hidden"
 msgstr "Ocultas"
 
-#: Zotlabs/Module/Connections.php:83 Zotlabs/Module/Connections.php:169
+#: Code/Module/Connections.php:83 Code/Module/Connections.php:169
 msgid "Archived/Unreachable"
 msgstr "Archivadas o inaccesibles"
 
-#: Zotlabs/Module/Connections.php:93 Zotlabs/Module/Connections.php:107
-#: Zotlabs/Module/Menu.php:185 Zotlabs/Module/Notifications.php:63
+#: Code/Module/Connections.php:93 Code/Module/Connections.php:107
+#: Code/Module/Menu.php:185 Code/Module/Notifications.php:63
 msgid "New"
 msgstr "Nuevas"
 
-#: Zotlabs/Module/Connections.php:141
+#: Code/Module/Connections.php:141
 msgid "Active Connections"
 msgstr "Conexiones activas"
 
-#: Zotlabs/Module/Connections.php:144
+#: Code/Module/Connections.php:144
 msgid "Show active connections"
 msgstr "Mostrar las conexiones activas"
 
-#: Zotlabs/Module/Connections.php:148 Zotlabs/Widget/Notifications.php:73
+#: Code/Module/Connections.php:148 Code/Widget/Notifications.php:73
 msgid "New Connections"
 msgstr "Nuevas conexiones"
 
-#: Zotlabs/Module/Connections.php:151
+#: Code/Module/Connections.php:151
 msgid "Show pending (new) connections"
 msgstr "Mostrar conexiones (nuevas) pendientes"
 
-#: Zotlabs/Module/Connections.php:158
+#: Code/Module/Connections.php:158
 msgid "Only show blocked connections"
 msgstr "Mostrar solo las conexiones bloqueadas"
 
-#: Zotlabs/Module/Connections.php:165
+#: Code/Module/Connections.php:165
 msgid "Only show ignored connections"
 msgstr "Mostrar solo conexiones ignoradas"
 
-#: Zotlabs/Module/Connections.php:172
+#: Code/Module/Connections.php:172
 msgid "Only show archived/unreachable connections"
 msgstr "Mostrar solo las conexiones archivadas o no localizables"
 
-#: Zotlabs/Module/Connections.php:179
+#: Code/Module/Connections.php:179
 msgid "Only show hidden connections"
 msgstr "Mostrar solo las conexiones ocultas"
 
-#: Zotlabs/Module/Connections.php:183 Zotlabs/Module/Profperm.php:158
+#: Code/Module/Connections.php:183 Code/Module/Profperm.php:158
 msgid "All Connections"
 msgstr "Todas las conexiones"
 
-#: Zotlabs/Module/Connections.php:186
+#: Code/Module/Connections.php:186
 msgid "Show all connections"
 msgstr "Mostrar todas las conexiones"
 
-#: Zotlabs/Module/Connections.php:239
+#: Code/Module/Connections.php:239
 msgid "Order by name"
 msgstr "Ordenar por nombre"
 
-#: Zotlabs/Module/Connections.php:243
+#: Code/Module/Connections.php:243
 msgid "Recent"
 msgstr "Reciente"
 
-#: Zotlabs/Module/Connections.php:246
+#: Code/Module/Connections.php:246
 msgid "Order by recent"
 msgstr "Ordenar por la más reciente"
 
-#: Zotlabs/Module/Connections.php:253
+#: Code/Module/Connections.php:253
 msgid "Order by date"
 msgstr "Ordenar por fecha"
 
-#: Zotlabs/Module/Connections.php:294
+#: Code/Module/Connections.php:294
 msgid "Pending approval"
 msgstr "Pendiente de aprobación"
 
-#: Zotlabs/Module/Connections.php:295
+#: Code/Module/Connections.php:295
 msgid "Archived"
 msgstr "Archivadas"
 
-#: Zotlabs/Module/Connections.php:299
+#: Code/Module/Connections.php:299
 msgid "Not connected at this location"
 msgstr "No está conectado/a en esta ubicación"
 
-#: Zotlabs/Module/Connections.php:317
+#: Code/Module/Connections.php:317
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: Zotlabs/Module/Connections.php:318
+#: Code/Module/Connections.php:318
 msgid "Edit connection"
 msgstr "Editar conexión"
 
-#: Zotlabs/Module/Connections.php:320
+#: Code/Module/Connections.php:320
 msgid "Delete connection"
 msgstr "Eliminar conexión"
 
-#: Zotlabs/Module/Connections.php:329
+#: Code/Module/Connections.php:329
 msgid "Channel address"
 msgstr "Dirección del canal"
 
-#: Zotlabs/Module/Connections.php:331
+#: Code/Module/Connections.php:331
 msgid "Network"
 msgstr "Red"
 
-#: Zotlabs/Module/Connections.php:334
+#: Code/Module/Connections.php:334
 msgid "Call"
 msgstr "Llamar"
 
-#: Zotlabs/Module/Connections.php:336
+#: Code/Module/Connections.php:336
 msgid "Status"
 msgstr "Estado"
 
-#: Zotlabs/Module/Connections.php:338
+#: Code/Module/Connections.php:338
 msgid "Connected"
 msgstr "Conectado/a"
 
-#: Zotlabs/Module/Connections.php:340
+#: Code/Module/Connections.php:340
 msgid "Approve connection"
 msgstr "Aprobar esta conexión"
 
-#: Zotlabs/Module/Connections.php:342
+#: Code/Module/Connections.php:342
 msgid "Ignore connection"
 msgstr "Ignorar esta conexión"
 
-#: Zotlabs/Module/Connections.php:344
+#: Code/Module/Connections.php:344
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: Zotlabs/Module/Connections.php:371
+#: Code/Module/Connections.php:371
 msgid "Filter by"
 msgstr "Filtrar por "
 
-#: Zotlabs/Module/Connections.php:372
+#: Code/Module/Connections.php:372
 msgid "Sort by"
 msgstr "Clasificar por "
 
-#: Zotlabs/Module/Connections.php:376
+#: Code/Module/Connections.php:376
 msgid "Search your connections"
 msgstr "Buscar sus conexiones"
 
-#: Zotlabs/Module/Connections.php:377
+#: Code/Module/Connections.php:377
 msgid "Connections search"
 msgstr "Buscar conexiones"
 
-#: Zotlabs/Module/Connections.php:378 Zotlabs/Module/Directory.php:477
-#: Zotlabs/Module/Directory.php:482 Zotlabs/Widget/Findpeople.php:33
+#: Code/Module/Connections.php:378 Code/Module/Directory.php:477
+#: Code/Module/Directory.php:482 Code/Widget/Findpeople.php:33
 msgid "Find"
 msgstr "Encontrar"
 
-#: Zotlabs/Module/Item.php:570 Zotlabs/Module/Pin.php:49
+#: Code/Module/Item.php:570 Code/Module/Pin.php:49
 msgid "Unable to locate original post."
 msgstr "No ha sido posible encontrar la entrada original."
 
-#: Zotlabs/Module/Item.php:665
+#: Code/Module/Item.php:665
 msgid "Comment may be moderated."
 msgstr "Los comentarios pueden ser moderados."
 
-#: Zotlabs/Module/Item.php:901
+#: Code/Module/Item.php:901
 msgid "Empty post discarded."
 msgstr "La entrada vacía ha sido desechada."
 
-#: Zotlabs/Module/Item.php:1507
+#: Code/Module/Item.php:1507
 msgid "Duplicate post suppressed."
 msgstr "Se ha suprimido la entrada duplicada."
 
-#: Zotlabs/Module/Item.php:1554
+#: Code/Module/Item.php:1554
 msgid ""
 "Draft saved. Use Drafts app to continue "
 "editing."
@@ -4759,345 +4759,345 @@ msgstr ""
 "Borrador salvado. Use la app Borradores para "
 "continuar editando."
 
-#: Zotlabs/Module/Item.php:1598
+#: Code/Module/Item.php:1598
 msgid "Your comment has been posted."
 msgstr "Su comentario ha sido publicado."
 
-#: Zotlabs/Module/Item.php:1667
+#: Code/Module/Item.php:1667
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: Zotlabs/Module/Item.php:1709
+#: Code/Module/Item.php:1709
 msgid "Your post/comment is awaiting approval."
 msgstr "Su entrada/comentario está a la espera de ser aprobado."
 
-#: Zotlabs/Module/Item.php:1744 Zotlabs/Module/Cloud.php:132
+#: Code/Module/Item.php:1744 Code/Module/Cloud.php:132
 msgid "Not found"
 msgstr "No encontrado"
 
-#: Zotlabs/Module/Item.php:1878
+#: Code/Module/Item.php:1878
 msgid "Unable to obtain post information from database."
 msgstr ""
 "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: Zotlabs/Module/Item.php:1886
+#: Code/Module/Item.php:1886
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: Zotlabs/Module/Item.php:1892
+#: Code/Module/Item.php:1892
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
 
-#: Zotlabs/Module/Appman.php:46 Zotlabs/Module/Appman.php:63
+#: Code/Module/Appman.php:46 Code/Module/Appman.php:63
 msgid "App installed."
 msgstr "Aplicación instalada."
 
-#: Zotlabs/Module/Appman.php:56
+#: Code/Module/Appman.php:56
 msgid "Malformed app."
 msgstr "Aplicación con errores"
 
-#: Zotlabs/Module/Appman.php:139
+#: Code/Module/Appman.php:139
 msgid "Embed code"
 msgstr "Código incorporado"
 
-#: Zotlabs/Module/Appman.php:143
+#: Code/Module/Appman.php:143
 msgid "Edit App"
 msgstr "Modificar la aplicación"
 
-#: Zotlabs/Module/Appman.php:143
+#: Code/Module/Appman.php:143
 msgid "Create App"
 msgstr "Crear una aplicación"
 
-#: Zotlabs/Module/Appman.php:148
+#: Code/Module/Appman.php:148
 msgid "Name of app"
 msgstr "Nombre de la aplicación"
 
-#: Zotlabs/Module/Appman.php:148 Zotlabs/Module/Appman.php:149
-#: Zotlabs/Module/Events.php:508 Zotlabs/Module/Events.php:513
-#: Zotlabs/Module/Profiles.php:791 Zotlabs/Module/Profiles.php:795
+#: Code/Module/Appman.php:148 Code/Module/Appman.php:149
+#: Code/Module/Events.php:508 Code/Module/Events.php:513
+#: Code/Module/Profiles.php:791 Code/Module/Profiles.php:795
 #: include/datetime.php:249
 msgid "Required"
 msgstr "Obligatorio"
 
-#: Zotlabs/Module/Appman.php:149
+#: Code/Module/Appman.php:149
 msgid "Location (URL) of app"
 msgstr "Dirección (URL) de la aplicación"
 
-#: Zotlabs/Module/Appman.php:151
+#: Code/Module/Appman.php:151
 msgid "Photo icon URL"
 msgstr "Dirección del icono"
 
-#: Zotlabs/Module/Appman.php:151
+#: Code/Module/Appman.php:151
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels - opcional"
 
-#: Zotlabs/Module/Appman.php:152
+#: Code/Module/Appman.php:152
 msgid "Categories (optional, comma separated list)"
 msgstr "Temas (opcional, lista separada por comas)"
 
-#: Zotlabs/Module/Appman.php:153
+#: Code/Module/Appman.php:153
 msgid "Version ID"
 msgstr "Versión"
 
-#: Zotlabs/Module/Appman.php:154
+#: Code/Module/Appman.php:154
 msgid "Price of app"
 msgstr "Precio de la aplicación"
 
-#: Zotlabs/Module/Appman.php:155
+#: Code/Module/Appman.php:155
 msgid "Location (URL) to purchase app"
 msgstr "Dirección (URL) donde adquirir la aplicación"
 
-#: Zotlabs/Module/Cover_photo.php:281 include/items.php:4913
+#: Code/Module/Cover_photo.php:281 include/items.php:4913
 msgid "female"
 msgstr "mujer"
 
-#: Zotlabs/Module/Cover_photo.php:282 include/items.php:4914
+#: Code/Module/Cover_photo.php:282 include/items.php:4914
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: Zotlabs/Module/Cover_photo.php:283 include/items.php:4915
+#: Code/Module/Cover_photo.php:283 include/items.php:4915
 msgid "male"
 msgstr "hombre"
 
-#: Zotlabs/Module/Cover_photo.php:284 include/items.php:4916
+#: Code/Module/Cover_photo.php:284 include/items.php:4916
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: Zotlabs/Module/Cover_photo.php:286 include/items.php:4918
+#: Code/Module/Cover_photo.php:286 include/items.php:4918
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: Zotlabs/Module/Cover_photo.php:289 include/channel.php:1841
+#: Code/Module/Cover_photo.php:289 include/channel.php:1841
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
-#: Zotlabs/Module/Defperms.php:107 Zotlabs/Module/Settings/Channel.php:358
+#: Code/Module/Defperms.php:107 Code/Module/Settings/Channel.php:358
 #: extend/addon/a/logrot/logrot.php:55
 #: extend/addon/a/openstreetmap/openstreetmap.php:222
 #: extend/addon/a/faces/faces.php:208
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
-#: Zotlabs/Module/Defperms.php:249 Zotlabs/Module/Settings/Channel.php:584
+#: Code/Module/Defperms.php:249 Code/Module/Settings/Channel.php:584
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr ""
 "Si está habilitado, las solicitudes de conexión serán aprobadas sin su "
 "intervención."
 
-#: Zotlabs/Module/Defperms.php:256
+#: Code/Module/Defperms.php:256
 msgid "Automatic approval settings"
 msgstr "Opciones de autorización automática"
 
-#: Zotlabs/Module/Defperms.php:258 Zotlabs/Module/Settings/Tokens.php:309
-#: Zotlabs/Module/Settings/Permcats.php:139
+#: Code/Module/Defperms.php:258 Code/Module/Settings/Tokens.php:309
+#: Code/Module/Settings/Permcats.php:139
 msgid "inherited"
 msgstr "heredado"
 
-#: Zotlabs/Module/Directory.php:96 Zotlabs/Module/Directory.php:103
-#: Zotlabs/Module/Display.php:47 Zotlabs/Module/Search.php:41
-#: Zotlabs/Module/Photos.php:579 Zotlabs/Module/Viewconnections.php:30
+#: Code/Module/Directory.php:96 Code/Module/Directory.php:103
+#: Code/Module/Display.php:47 Code/Module/Search.php:41
+#: Code/Module/Photos.php:579 Code/Module/Viewconnections.php:30
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
-#: Zotlabs/Module/Directory.php:159
+#: Code/Module/Directory.php:159
 msgid "No default suggestions were found."
 msgstr "No se encontraron sugerencias por defecto."
 
-#: Zotlabs/Module/Directory.php:326
+#: Code/Module/Directory.php:326
 msgid "Gender: "
 msgstr "Género:"
 
-#: Zotlabs/Module/Directory.php:327
+#: Code/Module/Directory.php:327
 msgid "Status: "
 msgstr "Estado:"
 
-#: Zotlabs/Module/Directory.php:328
+#: Code/Module/Directory.php:328
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: Zotlabs/Module/Directory.php:389
+#: Code/Module/Directory.php:389
 msgid "Description:"
 msgstr "Descripción:"
 
-#: Zotlabs/Module/Directory.php:400 Zotlabs/Module/Manage.php:78
-#: Zotlabs/Module/Manage.php:175
+#: Code/Module/Directory.php:400 Code/Module/Manage.php:78
+#: Code/Module/Manage.php:175
 msgid "Group"
 msgstr "Groupo"
 
-#: Zotlabs/Module/Directory.php:404
+#: Code/Module/Directory.php:404
 msgid "Keywords: "
 msgstr "Palabras clave:"
 
-#: Zotlabs/Module/Directory.php:407
+#: Code/Module/Directory.php:407
 msgid "Don't suggest"
 msgstr "No sugerir:"
 
-#: Zotlabs/Module/Directory.php:409
+#: Code/Module/Directory.php:409
 msgid "Suggestion ranking:"
 msgstr "Ranking de sugerencias: "
 
-#: Zotlabs/Module/Directory.php:472
+#: Code/Module/Directory.php:472
 msgid "Local Directory"
 msgstr "Directorio local:"
 
-#: Zotlabs/Module/Directory.php:478
+#: Code/Module/Directory.php:478
 msgid "Finding:"
 msgstr "Encontrar:"
 
-#: Zotlabs/Module/Directory.php:481 Zotlabs/Widget/Findpeople.php:34
+#: Code/Module/Directory.php:481 Code/Widget/Findpeople.php:34
 msgid "Channel Suggestions"
 msgstr "Sugerencias de canales"
 
-#: Zotlabs/Module/Directory.php:483
+#: Code/Module/Directory.php:483
 msgid "next page"
 msgstr "siguiente página"
 
-#: Zotlabs/Module/Directory.php:483
+#: Code/Module/Directory.php:483
 msgid "previous page"
 msgstr "página anterior"
 
-#: Zotlabs/Module/Directory.php:484
+#: Code/Module/Directory.php:484
 msgid "Sort options"
 msgstr "Ordenar opciones"
 
-#: Zotlabs/Module/Directory.php:485
+#: Code/Module/Directory.php:485
 msgid "Alphabetic"
 msgstr "Alfabético"
 
-#: Zotlabs/Module/Directory.php:486
+#: Code/Module/Directory.php:486
 msgid "Reverse Alphabetic"
 msgstr "Alfabético inverso"
 
-#: Zotlabs/Module/Directory.php:487
+#: Code/Module/Directory.php:487
 msgid "Newest to Oldest"
 msgstr "De más nuevo a más antiguo"
 
-#: Zotlabs/Module/Directory.php:488
+#: Code/Module/Directory.php:488
 msgid "Oldest to Newest"
 msgstr "De más antiguo a más nuevo"
 
-#: Zotlabs/Module/Directory.php:513
+#: Code/Module/Directory.php:513
 msgid "No entries (some entries may be hidden)."
 msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
 
-#: Zotlabs/Module/Display.php:98 Zotlabs/Module/Channel.php:287
-#: Zotlabs/Module/Hq.php:153 Zotlabs/Module/Rpost.php:241
-#: Zotlabs/Module/Pubstream.php:86 Zotlabs/Module/Stream.php:246
+#: Code/Module/Display.php:98 Code/Module/Channel.php:287
+#: Code/Module/Hq.php:153 Code/Module/Rpost.php:241
+#: Code/Module/Pubstream.php:86 Code/Module/Stream.php:246
 msgid "Reset form"
 msgstr "Reiniciar el formulario"
 
-#: Zotlabs/Module/Display.php:390
+#: Code/Module/Display.php:390
 #, php-format
 msgid "\"%1$s\", shared by %2$s with %3$s"
 msgstr "\"%1$s\", compartido por %2$s con %3$s"
 
-#: Zotlabs/Module/Display.php:391
+#: Code/Module/Display.php:391
 #, php-format
 msgid "%1$s shared this post with %2$s"
 msgstr "%1$s ha compartido esta entrada con %2$s"
 
-#: Zotlabs/Module/Display.php:395
+#: Code/Module/Display.php:395
 msgid "Not much to read, click to see the post."
 msgstr "No hay mucho que leer, haga clic para ver el post."
 
-#: Zotlabs/Module/Display.php:399
+#: Code/Module/Display.php:399
 #, php-format
 msgid "%1$s shared a reaction to \"%2$s\""
 msgstr "%1$s ha compartido una reacción con \"%2$s\""
 
-#: Zotlabs/Module/Display.php:400
+#: Code/Module/Display.php:400
 #, php-format
 msgid "%s shared a reaction to this post/conversation"
 msgstr "%s ha compartido una reacción en esta entrada/conversación"
 
-#: Zotlabs/Module/Display.php:407
+#: Code/Module/Display.php:407
 #, php-format
 msgid "%1$s commented \"%2$s\""
 msgstr "%1$s ha comentado \"%2$s\""
 
-#: Zotlabs/Module/Display.php:408
+#: Code/Module/Display.php:408
 #, php-format
 msgid "%s shared a comment of this post/conversation"
 msgstr "%s ha compartido un comentario de esta entrada/conversación"
 
-#: Zotlabs/Module/Display.php:412
+#: Code/Module/Display.php:412
 #, php-format
 msgid "%1$s wrote this: \"%2$s\""
 msgstr "%1$s ha escrito esto: \"%2$s\""
 
-#: Zotlabs/Module/Display.php:437 Zotlabs/Module/Channel.php:556
+#: Code/Module/Display.php:437 Code/Module/Channel.php:556
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr ""
 "Debe habilitar javascript para poder ver este contenido en su navegador."
 
-#: Zotlabs/Module/Display.php:454
+#: Code/Module/Display.php:454
 msgid "Article"
 msgstr "Artículo"
 
-#: Zotlabs/Module/Display.php:507
+#: Code/Module/Display.php:507
 msgid "Item has been removed."
 msgstr "Se ha eliminado el elemento."
 
-#: Zotlabs/Module/Events.php:492
+#: Code/Module/Events.php:492
 msgid "day(s)"
 msgstr "día(s)"
 
-#: Zotlabs/Module/Events.php:493
+#: Code/Module/Events.php:493
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: Zotlabs/Module/Events.php:494
+#: Code/Module/Events.php:494
 msgid "month(s)"
 msgstr "mes(s)"
 
-#: Zotlabs/Module/Events.php:495
+#: Code/Module/Events.php:495
 msgid "year(s)"
 msgstr "año(s)"
 
-#: Zotlabs/Module/Events.php:508
+#: Code/Module/Events.php:508
 msgid "Edit event title"
 msgstr "Editar el título del evento"
 
-#: Zotlabs/Module/Events.php:510
+#: Code/Module/Events.php:510
 msgid "Categories (comma-separated list)"
 msgstr "Temas (lista separada por comas)"
 
-#: Zotlabs/Module/Events.php:511
+#: Code/Module/Events.php:511
 msgid "Edit Category"
 msgstr "Modificar el tema"
 
-#: Zotlabs/Module/Events.php:511
+#: Code/Module/Events.php:511
 msgid "Category"
 msgstr "Tema"
 
-#: Zotlabs/Module/Events.php:514
+#: Code/Module/Events.php:514
 msgid "Edit start date and time"
 msgstr "Modificar la fecha y hora de comienzo"
 
-#: Zotlabs/Module/Events.php:515 Zotlabs/Module/Events.php:518
+#: Code/Module/Events.php:515 Code/Module/Events.php:518
 msgid "Finish date and time are not known or not relevant"
 msgstr "La fecha y hora de terminación no se conocen o no son relevantes"
 
-#: Zotlabs/Module/Events.php:517
+#: Code/Module/Events.php:517
 msgid "Edit finish date and time"
 msgstr "Modificar la fecha y hora de terminación"
 
-#: Zotlabs/Module/Events.php:517
+#: Code/Module/Events.php:517
 msgid "Finish date and time"
 msgstr "Fecha y hora de terminación"
 
-#: Zotlabs/Module/Events.php:519 Zotlabs/Module/Events.php:520
+#: Code/Module/Events.php:519 Code/Module/Events.php:520
 msgid "Adjust for viewer timezone"
 msgstr "Ajustar para obtener el visor de los husos horarios"
 
-#: Zotlabs/Module/Events.php:519
+#: Code/Module/Events.php:519
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
@@ -5105,125 +5105,125 @@ msgstr ""
 "Importante para los eventos que suceden en un lugar determinado. No es "
 "práctico para los globales."
 
-#: Zotlabs/Module/Events.php:521
+#: Code/Module/Events.php:521
 msgid "Edit Description"
 msgstr "Editar la descripción"
 
-#: Zotlabs/Module/Events.php:523
+#: Code/Module/Events.php:523
 msgid "Edit Location"
 msgstr "Modificar la dirección"
 
-#: Zotlabs/Module/Events.php:527 include/conversation.php:1453
+#: Code/Module/Events.php:527 include/conversation.php:1453
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
-#: Zotlabs/Module/Events.php:537
+#: Code/Module/Events.php:537
 msgid "Timezone:"
 msgstr "Zona horaria: "
 
-#: Zotlabs/Module/Events.php:542
+#: Code/Module/Events.php:542
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: Zotlabs/Module/Events.php:544
+#: Code/Module/Events.php:544
 msgid "Event repeat"
 msgstr "Repetición de eventos"
 
-#: Zotlabs/Module/Events.php:545
+#: Code/Module/Events.php:545
 msgid "Repeat frequency"
 msgstr "Frecuencia de la repetición"
 
-#: Zotlabs/Module/Events.php:546
+#: Code/Module/Events.php:546
 msgid "Repeat every"
 msgstr "Repetir cada "
 
-#: Zotlabs/Module/Events.php:547
+#: Code/Module/Events.php:547
 msgid "Number of total repeats"
 msgstr "Cantidad total de repeticiones"
 
-#: Zotlabs/Module/Events.php:858
+#: Code/Module/Events.php:858
 msgid "Event removed"
 msgstr "Evento borrado"
 
-#: Zotlabs/Module/Editlayout.php:88 Zotlabs/Module/Editwebpage.php:91
-#: Zotlabs/Module/Card_edit.php:25 Zotlabs/Module/Card_edit.php:43
-#: Zotlabs/Module/Editblock.php:89 Zotlabs/Module/Editblock.php:107
-#: Zotlabs/Module/Editpost.php:30 Zotlabs/Module/Dreport.php:67
+#: Code/Module/Editlayout.php:88 Code/Module/Editwebpage.php:91
+#: Code/Module/Card_edit.php:25 Code/Module/Card_edit.php:43
+#: Code/Module/Editblock.php:89 Code/Module/Editblock.php:107
+#: Code/Module/Editpost.php:30 Code/Module/Dreport.php:67
 msgid "Item not found"
 msgstr "Elemento no encontrado"
 
-#: Zotlabs/Module/Editlayout.php:140 Zotlabs/Module/Layouts.php:139
-#: Zotlabs/Module/Layouts.php:203
+#: Code/Module/Editlayout.php:140 Code/Module/Layouts.php:139
+#: Code/Module/Layouts.php:203
 msgid "Layout Name"
 msgstr "Nombre de la plantilla"
 
-#: Zotlabs/Module/Editlayout.php:141 Zotlabs/Module/Layouts.php:142
+#: Code/Module/Editlayout.php:141 Code/Module/Layouts.php:142
 msgid "Layout Description (Optional)"
 msgstr "Descripción de la plantilla (opcional)"
 
-#: Zotlabs/Module/Editlayout.php:149
+#: Code/Module/Editlayout.php:149
 msgid "Edit Layout"
 msgstr "Modificar la plantilla"
 
-#: Zotlabs/Module/Plike.php:128 include/conversation.php:135
+#: Code/Module/Plike.php:128 include/conversation.php:135
 msgid "channel"
 msgstr "el canal"
 
-#: Zotlabs/Module/Plike.php:202 Zotlabs/Module/Like.php:221
+#: Code/Module/Plike.php:202 Code/Module/Like.php:221
 #: include/conversation.php:178
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: Zotlabs/Module/Plike.php:205 Zotlabs/Module/Like.php:224
+#: Code/Module/Plike.php:205 Code/Module/Like.php:224
 #: include/conversation.php:180
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
 
-#: Zotlabs/Module/Notes.php:52
+#: Code/Module/Notes.php:52
 msgid "This app allows you to create private notes for your personal use."
 msgstr "Esta aplicación le permite crear notas privadas para su uso personal."
 
-#: Zotlabs/Module/Notes.php:60
+#: Code/Module/Notes.php:60
 msgid ""
 "This app is installed. The Notes tool can be found on your stream page."
 msgstr ""
 "Esta aplicación está instalada. La herramienta Notas se puede encontrar en "
 "su página de stream."
 
-#: Zotlabs/Module/Editwebpage.php:154
+#: Code/Module/Editwebpage.php:154
 msgid "Page link"
 msgstr "Enlace de la página"
 
-#: Zotlabs/Module/Editwebpage.php:158 Zotlabs/Module/Chat.php:219
-#: Zotlabs/Module/Card_edit.php:110 Zotlabs/Module/Editblock.php:129
+#: Code/Module/Editwebpage.php:158 Code/Module/Chat.php:219
+#: Code/Module/Card_edit.php:110 Code/Module/Editblock.php:129
 #: include/conversation.php:1235
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
-#: Zotlabs/Module/Editwebpage.php:181
+#: Code/Module/Editwebpage.php:181
 msgid "Edit Webpage"
 msgstr "Editar la página web"
 
-#: Zotlabs/Module/Email_resend.php:15 Zotlabs/Module/Email_validation.php:27
+#: Code/Module/Email_resend.php:15 Code/Module/Email_validation.php:27
 msgid "Token verification failed."
 msgstr "Ha fallado el token de verificación."
 
-#: Zotlabs/Module/Email_resend.php:33
+#: Code/Module/Email_resend.php:33
 msgid "Email verification resent"
 msgstr "Reenvío del email de verificación"
 
-#: Zotlabs/Module/Email_resend.php:35
+#: Code/Module/Email_resend.php:35
 msgid "Unable to resend email verification message."
 msgstr ""
 "No se puede reenviar el mensaje de verificación por correo electrónico."
 
-#: Zotlabs/Module/Email_validation.php:40
+#: Code/Module/Email_validation.php:40
 msgid "Email Verification Required"
 msgstr "Verificación obligatoria del correo electrónico"
 
-#: Zotlabs/Module/Email_validation.php:41
+#: Code/Module/Email_validation.php:41
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -5235,53 +5235,53 @@ msgstr ""
 "cuenta. Por favor, espere unos minutos para el envío, y revise su carpeta de"
 " spam si no ve el mensaje."
 
-#: Zotlabs/Module/Email_validation.php:42
+#: Code/Module/Email_validation.php:42
 msgid "Resend Email"
 msgstr "Reenvío de correo electrónico"
 
-#: Zotlabs/Module/Email_validation.php:45
+#: Code/Module/Email_validation.php:45
 msgid "Validation token"
 msgstr "Token de validación"
 
-#: Zotlabs/Module/Embedphotos.php:103 include/bbcode.php:258
+#: Code/Module/Embedphotos.php:103 include/bbcode.php:258
 #: include/bbcode.php:1125 include/bbcode.php:2031 include/bbcode.php:2033
 #: include/bbcode.php:2036 include/text.php:1834 include/text.php:1835
 msgid "Image/photo"
 msgstr "Imagen/foto"
 
-#: Zotlabs/Module/Embedphotos.php:208 Zotlabs/Module/Photos.php:848
-#: Zotlabs/Module/Photos.php:1405 Zotlabs/Widget/Album.php:88
-#: Zotlabs/Widget/Portfolio.php:99
+#: Code/Module/Embedphotos.php:208 Code/Module/Photos.php:848
+#: Code/Module/Photos.php:1405 Code/Widget/Album.php:88
+#: Code/Widget/Portfolio.php:99
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: Zotlabs/Module/Embedphotos.php:223 Zotlabs/Module/Photos.php:879
-#: Zotlabs/Widget/Album.php:105 Zotlabs/Widget/Portfolio.php:120
+#: Code/Module/Embedphotos.php:223 Code/Module/Photos.php:879
+#: Code/Widget/Album.php:105 Code/Widget/Portfolio.php:120
 msgid "Edit Album"
 msgstr "Editar álbum"
 
-#: Zotlabs/Module/Register.php:60
+#: Code/Module/Register.php:60
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por "
 "favor, pruebe de nuevo mañana."
 
-#: Zotlabs/Module/Register.php:66
+#: Code/Module/Register.php:66
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 "Por favor, confirme que acepta los Términos del servicio. El registro ha "
 "fallado."
 
-#: Zotlabs/Module/Register.php:100
+#: Code/Module/Register.php:100
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: Zotlabs/Module/Register.php:151
+#: Code/Module/Register.php:151
 msgid "Registration successful. Continue to create your first channel..."
 msgstr "Registro exitoso. Continúe creando tu primer canal..."
 
-#: Zotlabs/Module/Register.php:153
+#: Code/Module/Register.php:153
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
@@ -5289,28 +5289,28 @@ msgstr ""
 "Registro realizado con éxito. Por favor, compruebe su correo electrónico "
 "para ver las instrucciones para validarlo."
 
-#: Zotlabs/Module/Register.php:159
+#: Code/Module/Register.php:159
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 "Su registro está pendiente de aprobación por el propietario del sitio."
 
-#: Zotlabs/Module/Register.php:161
+#: Code/Module/Register.php:161
 msgid "Your registration can not be processed."
 msgstr "Su registro no puede ser procesado."
 
-#: Zotlabs/Module/Register.php:206
+#: Code/Module/Register.php:206
 msgid "Registration on this website is disabled."
 msgstr "El registro en este sitio web está deshabilitado."
 
-#: Zotlabs/Module/Register.php:215
+#: Code/Module/Register.php:215
 msgid "Registration on this website is by approval only."
 msgstr "El registro en este sitio web requiere aprobación."
 
-#: Zotlabs/Module/Register.php:223
+#: Code/Module/Register.php:223
 msgid "Registration on this site is by invitation only."
 msgstr "El registro en este sitio web requiere una invitación."
 
-#: Zotlabs/Module/Register.php:236
+#: Code/Module/Register.php:236
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
@@ -5318,49 +5318,49 @@ msgstr ""
 "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por "
 "favor, inténtelo de nuevo mañana."
 
-#: Zotlabs/Module/Register.php:252 Zotlabs/Module/Siteinfo.php:42
+#: Code/Module/Register.php:252 Code/Module/Siteinfo.php:42
 msgid "Terms of Service"
 msgstr "Términos del servicio"
 
-#: Zotlabs/Module/Register.php:258
+#: Code/Module/Register.php:258
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Acepto los %s de este sitio"
 
-#: Zotlabs/Module/Register.php:264
+#: Code/Module/Register.php:264
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Tengo más de %s años de edad y acepto los %s de este sitio web"
 
-#: Zotlabs/Module/Register.php:269
+#: Code/Module/Register.php:269
 msgid "Your email address"
 msgstr "Su dirección de correo electrónico"
 
-#: Zotlabs/Module/Register.php:270
+#: Code/Module/Register.php:270
 msgid "Choose a password"
 msgstr "Elija una contraseña"
 
-#: Zotlabs/Module/Register.php:271
+#: Code/Module/Register.php:271
 msgid "Please re-enter your password"
 msgstr "Por favor, vuelva a escribir su contraseña"
 
-#: Zotlabs/Module/Register.php:272
+#: Code/Module/Register.php:272
 msgid "Please enter your invitation code"
 msgstr "Por favor, introduzca el código de su invitación"
 
-#: Zotlabs/Module/Register.php:273
+#: Code/Module/Register.php:273
 msgid "Your Name"
 msgstr "Su nombre"
 
-#: Zotlabs/Module/Register.php:273
+#: Code/Module/Register.php:273
 msgid "Real names are preferred."
 msgstr "Se prefieren los nombres reales"
 
-#: Zotlabs/Module/Register.php:275 Zotlabs/Module/New_channel.php:191
+#: Code/Module/Register.php:275 Code/Module/New_channel.php:191
 msgid "Choose a short nickname"
 msgstr "Elija un alias corto"
 
-#: Zotlabs/Module/Register.php:275
+#: Code/Module/Register.php:275
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
@@ -5369,11 +5369,11 @@ msgstr ""
 "Su alias se usará para crear una dirección de canal fácil de recordar, p. "
 "ej.: alias%s"
 
-#: Zotlabs/Module/Register.php:276 Zotlabs/Module/New_channel.php:192
+#: Code/Module/Register.php:276 Code/Module/New_channel.php:192
 msgid "Channel role and privacy"
 msgstr "Clase de canal y privacidad"
 
-#: Zotlabs/Module/Register.php:276
+#: Code/Module/Register.php:276
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
@@ -5381,15 +5381,15 @@ msgstr ""
 "Seleccione unos permisos de rol del canal compatibles con sus necesidades de"
 " uso y requisitos de privacidad."
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "no"
 msgstr "no"
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "yes"
 msgstr "sí"
 
-#: Zotlabs/Module/Register.php:290
+#: Code/Module/Register.php:290
 msgid ""
 "Show affiliated sites - some of which may allow "
 "registration."
@@ -5397,12 +5397,12 @@ msgstr ""
 "Mostrar los sitios afiliados, algunos de los cuales pueden"
 " permitir el registro. "
 
-#: Zotlabs/Module/Register.php:303 Zotlabs/Module/Sites.php:55 boot.php:1706
+#: Code/Module/Register.php:303 Code/Module/Sites.php:55 boot.php:1706
 #: include/nav.php:164
 msgid "Register"
 msgstr "Registrarse"
 
-#: Zotlabs/Module/Register.php:304
+#: Code/Module/Register.php:304
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
@@ -5411,86 +5411,86 @@ msgstr ""
 "completar este formulario, por favor revise su correo electrónico para más "
 "instrucciones."
 
-#: Zotlabs/Module/Invite.php:35
+#: Code/Module/Invite.php:35
 msgid "Total invitation limit exceeded."
 msgstr "Se ha superado el límite máximo de invitaciones."
 
-#: Zotlabs/Module/Invite.php:60
+#: Code/Module/Invite.php:60
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : No es una dirección de correo electrónico válida. "
 
-#: Zotlabs/Module/Invite.php:73
+#: Code/Module/Invite.php:73
 msgid "Please join us on $Projectname"
 msgstr "Únase a nosotros en $Projectname"
 
-#: Zotlabs/Module/Invite.php:83
+#: Code/Module/Invite.php:83
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 "Excedido el límite de invitaciones. Por favor, contacte con el Administrador"
 " de su sitio."
 
-#: Zotlabs/Module/Invite.php:87
+#: Code/Module/Invite.php:87
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : Falló el envío del mensaje."
 
-#: Zotlabs/Module/Invite.php:90
+#: Code/Module/Invite.php:90
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d mensajes enviados."
 msgstr[1] "%d mensajes enviados."
 
-#: Zotlabs/Module/Invite.php:108
+#: Code/Module/Invite.php:108
 msgid "Send email invitations to join this network"
 msgstr "Enviar invitaciones por correo electrónico para unirse a esta red"
 
-#: Zotlabs/Module/Invite.php:121
+#: Code/Module/Invite.php:121
 msgid "You have no more invitations available"
 msgstr "No tiene más invitaciones disponibles"
 
-#: Zotlabs/Module/Invite.php:155
+#: Code/Module/Invite.php:155
 msgid "Send invitations"
 msgstr "Enviar invitaciones"
 
-#: Zotlabs/Module/Invite.php:156
+#: Code/Module/Invite.php:156
 msgid "Enter email addresses, one per line:"
 msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
-#: Zotlabs/Module/Invite.php:157
+#: Code/Module/Invite.php:157
 msgid "Your message:"
 msgstr "Su mensaje:"
 
-#: Zotlabs/Module/Invite.php:158
+#: Code/Module/Invite.php:158
 msgid "Please join my community on $Projectname."
 msgstr "Por favor, únase a mi comunidad en $Projectname."
 
-#: Zotlabs/Module/Invite.php:160
+#: Code/Module/Invite.php:160
 msgid "You will need to supply this invitation code:"
 msgstr "Tendrá que suministrar este código de invitación:"
 
-#: Zotlabs/Module/Invite.php:161
+#: Code/Module/Invite.php:161
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 "1. Regístrese en cualquier sitio de $Projectname (están todos "
 "interconectados)"
 
-#: Zotlabs/Module/Invite.php:163
+#: Code/Module/Invite.php:163
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
 
-#: Zotlabs/Module/Invite.php:164
+#: Code/Module/Invite.php:164
 msgid "or visit"
 msgstr "o visitar"
 
-#: Zotlabs/Module/Invite.php:166
+#: Code/Module/Invite.php:166
 msgid "3. Click [Connect]"
 msgstr "3. Pulse [conectar]"
 
-#: Zotlabs/Module/Sites.php:17
+#: Code/Module/Sites.php:17
 msgid ""
 "This page provides information about related projects and websites that are "
 "currently known to this system. These are a small fraction of the thousands "
@@ -5502,275 +5502,275 @@ msgstr ""
 "los miles de sitios web y decenas de proyectos y proveedores que componen el"
 " fediverso."
 
-#: Zotlabs/Module/Sites.php:45
+#: Code/Module/Sites.php:45
 msgid "free"
 msgstr "libre"
 
-#: Zotlabs/Module/Sites.php:47
+#: Code/Module/Sites.php:47
 msgid "subscription"
 msgstr "suscripción"
 
-#: Zotlabs/Module/Sites.php:49
+#: Code/Module/Sites.php:49
 msgid "tiered service plans"
 msgstr "planes de servicio por niveles"
 
-#: Zotlabs/Module/Sites.php:57
+#: Code/Module/Sites.php:57
 msgid "Register (requires approval)"
 msgstr "Registro (requiere aprobación)"
 
-#: Zotlabs/Module/Sites.php:101
+#: Code/Module/Sites.php:101
 msgid "Project"
 msgstr "Proyecto"
 
-#: Zotlabs/Module/Sites.php:109
+#: Code/Module/Sites.php:109
 msgid "Access type"
 msgstr "Tipo de acceso"
 
-#: Zotlabs/Module/Sites.php:115
+#: Code/Module/Sites.php:115
 msgid "Affiliated Sites"
 msgstr "Sitios afiliados"
 
-#: Zotlabs/Module/Filer.php:59
+#: Code/Module/Filer.php:59
 msgid "Enter a folder name"
 msgstr "Escriba un nombre de carpeta"
 
-#: Zotlabs/Module/Filer.php:59
+#: Code/Module/Filer.php:59
 msgid "or select an existing folder (doubleclick)"
 msgstr "o seleccione una (con un doble click)"
 
-#: Zotlabs/Module/Filestorage.php:98
+#: Code/Module/Filestorage.php:98
 msgid "Channel unavailable."
 msgstr "Canal no disponible."
 
-#: Zotlabs/Module/Filestorage.php:142
+#: Code/Module/Filestorage.php:142
 msgid "File not found."
 msgstr "Fichero no encontrado."
 
-#: Zotlabs/Module/Filestorage.php:225
+#: Code/Module/Filestorage.php:225
 msgid "Edit file permissions"
 msgstr "Modificar los permisos del fichero"
 
-#: Zotlabs/Module/Filestorage.php:237
+#: Code/Module/Filestorage.php:237
 msgid "Change filename to"
 msgstr "Cambiar el nombre de archivo a "
 
-#: Zotlabs/Module/Filestorage.php:237
+#: Code/Module/Filestorage.php:237
 msgid "Leave blank to keep the existing filename"
 msgstr "Dejar en blanco para mantener el nombre de archivo existente"
 
-#: Zotlabs/Module/Filestorage.php:238
+#: Code/Module/Filestorage.php:238
 msgid "Move to directory"
 msgstr "Mover al directorio "
 
-#: Zotlabs/Module/Filestorage.php:239
+#: Code/Module/Filestorage.php:239
 #: extend/addon/a/flashcards/Mod_Flashcards.php:261
 #: extend/addon/a/faces/Mod_Faces.php:179
 msgid "Set/edit permissions"
 msgstr "Establecer/editar los permisos"
 
-#: Zotlabs/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:240
 msgid "Include all files and sub folders"
 msgstr "Incluir todos los ficheros y subcarpetas"
 
-#: Zotlabs/Module/Filestorage.php:241
+#: Code/Module/Filestorage.php:241
 msgid "Return to file list"
 msgstr "Volver a la lista de ficheros"
 
-#: Zotlabs/Module/Filestorage.php:243
+#: Code/Module/Filestorage.php:243
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Copiar/pegar este código para adjuntar el fichero al envío"
 
-#: Zotlabs/Module/Filestorage.php:244
+#: Code/Module/Filestorage.php:244
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 "Copiar/pegar esta dirección para enlazar el fichero desde una página web"
 
-#: Zotlabs/Module/Filestorage.php:246
+#: Code/Module/Filestorage.php:246
 msgid "Share this file"
 msgstr "Compartir este fichero"
 
-#: Zotlabs/Module/Filestorage.php:247
+#: Code/Module/Filestorage.php:247
 msgid "Show URL to this file"
 msgstr "Mostrar la dirección de este fichero"
 
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Storage/Browser.php:435
+#: Code/Module/Filestorage.php:248 Code/Storage/Browser.php:435
 msgid "Show in your contacts shared folder"
 msgstr "Mostrar en la carpeta compartida con sus contactos"
 
-#: Zotlabs/Module/Dircensor.php:45
+#: Code/Module/Dircensor.php:45
 msgid "Entry censored"
 msgstr "Acceso censurado"
 
-#: Zotlabs/Module/Dircensor.php:47
+#: Code/Module/Dircensor.php:47
 msgid "Entry uncensored"
 msgstr "Entrada sin censurar"
 
-#: Zotlabs/Module/Impel.php:56 include/bbcode.php:416
+#: Code/Module/Impel.php:56 include/bbcode.php:416
 msgid "webpage"
 msgstr "página web"
 
-#: Zotlabs/Module/Impel.php:61 include/bbcode.php:422
+#: Code/Module/Impel.php:61 include/bbcode.php:422
 msgid "block"
 msgstr "bloque"
 
-#: Zotlabs/Module/Impel.php:66 include/bbcode.php:419
+#: Code/Module/Impel.php:66 include/bbcode.php:419
 msgid "layout"
 msgstr "plantilla"
 
-#: Zotlabs/Module/Impel.php:73 include/bbcode.php:425
+#: Code/Module/Impel.php:73 include/bbcode.php:425
 msgid "menu"
 msgstr "menú"
 
-#: Zotlabs/Module/Impel.php:206
+#: Code/Module/Impel.php:206
 #, php-format
 msgid "%s element installed"
 msgstr "%s elemento instalado"
 
-#: Zotlabs/Module/Impel.php:208
+#: Code/Module/Impel.php:208
 #, php-format
 msgid "%s element installation failed"
 msgstr "Elemento con instalación fallida: %s"
 
-#: Zotlabs/Module/Thing.php:139
+#: Code/Module/Thing.php:139
 msgid "Thing updated"
 msgstr "Elemento actualizado."
 
-#: Zotlabs/Module/Thing.php:200
+#: Code/Module/Thing.php:200
 msgid "Object store: failed"
 msgstr "Guardar objeto: ha fallado"
 
-#: Zotlabs/Module/Thing.php:204
+#: Code/Module/Thing.php:204
 msgid "Thing added"
 msgstr "Elemento añadido"
 
-#: Zotlabs/Module/Thing.php:232
+#: Code/Module/Thing.php:232
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: Zotlabs/Module/Thing.php:301
+#: Code/Module/Thing.php:301
 msgid "Show Thing"
 msgstr "Mostrar elemento"
 
-#: Zotlabs/Module/Thing.php:307
+#: Code/Module/Thing.php:307
 msgid "item not found."
 msgstr "elemento no encontrado."
 
-#: Zotlabs/Module/Thing.php:341
+#: Code/Module/Thing.php:341
 msgid "Edit Thing"
 msgstr "Editar elemento"
 
-#: Zotlabs/Module/Thing.php:343 Zotlabs/Module/Thing.php:402
+#: Code/Module/Thing.php:343 Code/Module/Thing.php:402
 msgid "Select a profile"
 msgstr "Seleccionar un perfil"
 
-#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405
+#: Code/Module/Thing.php:347 Code/Module/Thing.php:405
 msgid "Post an activity"
 msgstr "Publicar una actividad"
 
-#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405
+#: Code/Module/Thing.php:347 Code/Module/Thing.php:405
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Sólo enviar a espectadores del perfil pertinente."
 
-#: Zotlabs/Module/Thing.php:349 Zotlabs/Module/Thing.php:407
+#: Code/Module/Thing.php:349 Code/Module/Thing.php:407
 msgid "Name of thing e.g. something"
 msgstr "Nombre del elemento, p. ej.:. \"algo\""
 
-#: Zotlabs/Module/Thing.php:351 Zotlabs/Module/Thing.php:408
+#: Code/Module/Thing.php:351 Code/Module/Thing.php:408
 msgid "URL of thing (optional)"
 msgstr "Dirección del elemento (opcional)"
 
-#: Zotlabs/Module/Thing.php:353 Zotlabs/Module/Thing.php:409
+#: Code/Module/Thing.php:353 Code/Module/Thing.php:409
 msgid "URL for photo of thing (optional)"
 msgstr "Dirección para la foto o elemento (opcional)"
 
-#: Zotlabs/Module/Thing.php:400
+#: Code/Module/Thing.php:400
 msgid "Add Thing to your Profile"
 msgstr "Añadir alguna cosa a su perfil"
 
-#: Zotlabs/Module/Chat.php:30 Zotlabs/Module/Channel.php:58
+#: Code/Module/Chat.php:30 Code/Module/Channel.php:58
 msgid "You must be logged in to see this page."
 msgstr "Debe haber iniciado sesión para poder ver esta página."
 
-#: Zotlabs/Module/Chat.php:194
+#: Code/Module/Chat.php:194
 msgid "Room not found"
 msgstr "Sala no encontrada"
 
-#: Zotlabs/Module/Chat.php:211
+#: Code/Module/Chat.php:211
 msgid "Leave Room"
 msgstr "Abandonar la sala"
 
-#: Zotlabs/Module/Chat.php:212
+#: Code/Module/Chat.php:212
 msgid "Delete Room"
 msgstr "Eliminar esta sala"
 
-#: Zotlabs/Module/Chat.php:213
+#: Code/Module/Chat.php:213
 msgid "I am away right now"
 msgstr "Estoy ausente momentáneamente"
 
-#: Zotlabs/Module/Chat.php:214
+#: Code/Module/Chat.php:214
 msgid "I am online"
 msgstr "Estoy conectado/a"
 
-#: Zotlabs/Module/Chat.php:217 include/conversation.php:1285
+#: Code/Module/Chat.php:217 include/conversation.php:1285
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: Zotlabs/Module/Chat.php:237
+#: Code/Module/Chat.php:237
 msgid "New Chatroom"
 msgstr "Nueva sala de chat"
 
-#: Zotlabs/Module/Chat.php:238
+#: Code/Module/Chat.php:238
 msgid "Chatroom name"
 msgstr "Nombre de la sala de chat"
 
-#: Zotlabs/Module/Chat.php:239
+#: Code/Module/Chat.php:239
 msgid "Expiration of chats (minutes)"
 msgstr "Caducidad de los mensajes en los chats (en minutos)"
 
-#: Zotlabs/Module/Chat.php:255
+#: Code/Module/Chat.php:255
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Salas de chat de %1$s"
 
-#: Zotlabs/Module/Chat.php:260
+#: Code/Module/Chat.php:260
 msgid "No chatrooms available"
 msgstr "No hay salas de chat disponibles"
 
-#: Zotlabs/Module/Chat.php:261 Zotlabs/Module/Manage.php:154
-#: Zotlabs/Module/Profiles.php:879
+#: Code/Module/Chat.php:261 Code/Module/Manage.php:154
+#: Code/Module/Profiles.php:879
 msgid "Create New"
 msgstr "Crear"
 
-#: Zotlabs/Module/Chat.php:264
+#: Code/Module/Chat.php:264
 msgid "Expiration"
 msgstr "Caducidad"
 
-#: Zotlabs/Module/Chat.php:265
+#: Code/Module/Chat.php:265
 msgid "min"
 msgstr "min"
 
-#: Zotlabs/Module/Moderate.php:35
+#: Code/Module/Moderate.php:35
 msgid "No entries."
 msgstr "No hay entradas."
 
-#: Zotlabs/Module/Moderate.php:80
+#: Code/Module/Moderate.php:80
 msgid "Comment approved"
 msgstr "El comentario ha sido aprobado"
 
-#: Zotlabs/Module/Moderate.php:83
+#: Code/Module/Moderate.php:83
 msgid "Comment deleted"
 msgstr "Se ha eliminado el comentario"
 
-#: Zotlabs/Module/Setup.php:192
+#: Code/Module/Setup.php:192
 msgid "$Projectname Server - Setup"
 msgstr "Servidor $Projectname - Configuración"
 
-#: Zotlabs/Module/Setup.php:196
+#: Code/Module/Setup.php:196
 msgid "Could not connect to database."
 msgstr "No se ha podido conectar a la base de datos."
 
-#: Zotlabs/Module/Setup.php:200
+#: Code/Module/Setup.php:200
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
@@ -5778,23 +5778,23 @@ msgstr ""
 "No se puede conectar con la dirección del sitio indicada. Podría tratarse de"
 " un problema de SSL o DNS."
 
-#: Zotlabs/Module/Setup.php:208
+#: Code/Module/Setup.php:208
 msgid "Could not create table."
 msgstr "No se puede crear la tabla."
 
-#: Zotlabs/Module/Setup.php:211
+#: Code/Module/Setup.php:211
 msgid "Installation succeeded!"
 msgstr "La instalación se ha realizado con éxito."
 
-#: Zotlabs/Module/Setup.php:213
+#: Code/Module/Setup.php:213
 msgid "Your site database has been installed."
 msgstr "La base de datos del sitio ha sido instalada."
 
-#: Zotlabs/Module/Setup.php:217
+#: Code/Module/Setup.php:217
 msgid "Database install failed!"
 msgstr "¡La instalación de la base de datos ha fallado!"
 
-#: Zotlabs/Module/Setup.php:219
+#: Code/Module/Setup.php:219
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
@@ -5802,23 +5802,23 @@ msgstr ""
 "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" "
 "usando un cliente de base de datos."
 
-#: Zotlabs/Module/Setup.php:220 Zotlabs/Module/Setup.php:285
+#: Code/Module/Setup.php:220 Code/Module/Setup.php:285
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
-#: Zotlabs/Module/Setup.php:282
+#: Code/Module/Setup.php:282
 msgid "System check"
 msgstr "Verificación del sistema"
 
-#: Zotlabs/Module/Setup.php:287
+#: Code/Module/Setup.php:287
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: Zotlabs/Module/Setup.php:313
+#: Code/Module/Setup.php:313
 msgid "Database connection"
 msgstr "Conexión a la base de datos"
 
-#: Zotlabs/Module/Setup.php:314
+#: Code/Module/Setup.php:314
 msgid ""
 "In order to install this software we need to know how to connect to your "
 "database."
@@ -5826,7 +5826,7 @@ msgstr ""
 "Para poder instalar este software necesitamos saber cómo conectarnos a su "
 "base de datos."
 
-#: Zotlabs/Module/Setup.php:315
+#: Code/Module/Setup.php:315
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
@@ -5834,7 +5834,7 @@ msgstr ""
 "Por favor, contacte con el proveedor de servicios o el administrador del "
 "sitio si tiene dudas sobre estos ajustes."
 
-#: Zotlabs/Module/Setup.php:316
+#: Code/Module/Setup.php:316
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
@@ -5842,43 +5842,43 @@ msgstr ""
 "La base de datos que especifique a continuación debe existir ya. Si no es "
 "así, por favor, créela antes de seguir."
 
-#: Zotlabs/Module/Setup.php:320
+#: Code/Module/Setup.php:320
 msgid "Database Server Name"
 msgstr "Nombre del servidor de base de datos"
 
-#: Zotlabs/Module/Setup.php:320
+#: Code/Module/Setup.php:320
 msgid "Default is 127.0.0.1"
 msgstr "De forma predeterminada es 127.0.0.1"
 
-#: Zotlabs/Module/Setup.php:321
+#: Code/Module/Setup.php:321
 msgid "Database Port"
 msgstr "Puerto de la base de datos"
 
-#: Zotlabs/Module/Setup.php:321
+#: Code/Module/Setup.php:321
 msgid "Communication port number - use 0 for default"
 msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto"
 
-#: Zotlabs/Module/Setup.php:322
+#: Code/Module/Setup.php:322
 msgid "Database Login Name"
 msgstr "Usuario de la base de datos"
 
-#: Zotlabs/Module/Setup.php:323
+#: Code/Module/Setup.php:323
 msgid "Database Login Password"
 msgstr "Contraseña de acceso a la base de datos"
 
-#: Zotlabs/Module/Setup.php:324
+#: Code/Module/Setup.php:324
 msgid "Database Name"
 msgstr "Nombre de la base de datos"
 
-#: Zotlabs/Module/Setup.php:325
+#: Code/Module/Setup.php:325
 msgid "Database Type"
 msgstr "Tipo de base de datos"
 
-#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369
+#: Code/Module/Setup.php:327 Code/Module/Setup.php:369
 msgid "Site administrator email address"
 msgstr "Dirección de correo electrónico del administrador del sitio"
 
-#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369
+#: Code/Module/Setup.php:327 Code/Module/Setup.php:369
 msgid ""
 "Required. Your account email address must match this in order to use the web"
 " admin panel."
@@ -5886,37 +5886,37 @@ msgstr ""
 "Necesario: La dirección de correo electrónico de su cuenta debe coincidir "
 "con esta para poder utilizar el panel de administración web."
 
-#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:328 Code/Module/Setup.php:371
 msgid "Website URL"
 msgstr "Dirección del sitio web"
 
-#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:328 Code/Module/Setup.php:371
 msgid "Required. Please use SSL (https) URL if available."
 msgstr "Necesario: Por favor, use SSL (https) si está disponible."
 
-#: Zotlabs/Module/Setup.php:329 Zotlabs/Module/Setup.php:373
+#: Code/Module/Setup.php:329 Code/Module/Setup.php:373
 msgid "Please select a default timezone for your website"
 msgstr "Por favor, selecciones el huso horario por defecto de su sitio web"
 
-#: Zotlabs/Module/Setup.php:357
+#: Code/Module/Setup.php:357
 msgid "Site settings"
 msgstr "Ajustes del sitio"
 
-#: Zotlabs/Module/Setup.php:415
+#: Code/Module/Setup.php:415
 msgid "PHP version 7.1 or greater is required."
 msgstr "Se requiere la versión 7.1 o superior de PHP."
 
-#: Zotlabs/Module/Setup.php:416
+#: Code/Module/Setup.php:416
 msgid "PHP version"
 msgstr "Versión de PHP"
 
-#: Zotlabs/Module/Setup.php:431
+#: Code/Module/Setup.php:431
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 "No se puede encontrar una versión en línea de comandos de PHP en la ruta del"
 " servidor web."
 
-#: Zotlabs/Module/Setup.php:432
+#: Code/Module/Setup.php:432
 msgid ""
 "If you do not have a command line version of PHP installed on server, you "
 "will not be able to run background tasks - including message delivery."
@@ -5925,11 +5925,11 @@ msgstr ""
 "servidor, no podrá ejecutar tareas en segundo plano, incluyendo la entrega "
 "de mensajes."
 
-#: Zotlabs/Module/Setup.php:436
+#: Code/Module/Setup.php:436
 msgid "PHP executable path"
 msgstr "Ruta del ejecutable PHP"
 
-#: Zotlabs/Module/Setup.php:436
+#: Code/Module/Setup.php:436
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
@@ -5937,11 +5937,11 @@ msgstr ""
 "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en "
 "blanco para continuar la instalación."
 
-#: Zotlabs/Module/Setup.php:441
+#: Code/Module/Setup.php:441
 msgid "Command line PHP"
 msgstr "PHP en línea de comandos"
 
-#: Zotlabs/Module/Setup.php:451
+#: Code/Module/Setup.php:451
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
@@ -5949,7 +5949,7 @@ msgstr ""
 "No se puede comprobar la línea de comandos PHP, ya que shell_exec() está "
 "deshabilitado. Es necesario que esté activado."
 
-#: Zotlabs/Module/Setup.php:455
+#: Code/Module/Setup.php:455
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
@@ -5957,15 +5957,15 @@ msgstr ""
 "La línea de comandos PHP de su sistema no tiene activado "
 "\"register_argc_argv\"."
 
-#: Zotlabs/Module/Setup.php:456
+#: Code/Module/Setup.php:456
 msgid "This is required for message delivery to work."
 msgstr "Esto es necesario para que funcione la transmisión de mensajes."
 
-#: Zotlabs/Module/Setup.php:459
+#: Code/Module/Setup.php:459
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: Zotlabs/Module/Setup.php:479
+#: Code/Module/Setup.php:479
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 2MB (2097152 bytes) at once."
@@ -5973,7 +5973,7 @@ msgstr ""
 "Esto no es suficiente para subir imágenes o archivos más grandes. Debería "
 "poder cargar al menos 2MB (2097152 bytes) a la vez."
 
-#: Zotlabs/Module/Setup.php:483
+#: Code/Module/Setup.php:483
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
@@ -5983,15 +5983,15 @@ msgstr ""
 "máximo de un fichero está establecido en %s. Está permitido subir hasta un "
 "máximo de %d ficheros de una sola vez."
 
-#: Zotlabs/Module/Setup.php:490
+#: Code/Module/Setup.php:490
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Puede ajustar estos valores en el fichero php.ini de su servidor."
 
-#: Zotlabs/Module/Setup.php:492
+#: Code/Module/Setup.php:492
 msgid "PHP upload limits"
 msgstr "Límites PHP de subida"
 
-#: Zotlabs/Module/Setup.php:515
+#: Code/Module/Setup.php:515
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
@@ -5999,7 +5999,7 @@ msgstr ""
 "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de "
 "general claves de cifrado."
 
-#: Zotlabs/Module/Setup.php:516
+#: Code/Module/Setup.php:516
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
@@ -6007,54 +6007,54 @@ msgstr ""
 "Si está en un servidor Windows, por favor, lea "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: Zotlabs/Module/Setup.php:519
+#: Code/Module/Setup.php:519
 msgid "Generate encryption keys"
 msgstr "Generar claves de cifrado"
 
-#: Zotlabs/Module/Setup.php:538
+#: Code/Module/Setup.php:538
 msgid "libCurl PHP module"
 msgstr "módulo libCurl PHP"
 
-#: Zotlabs/Module/Setup.php:539
+#: Code/Module/Setup.php:539
 msgid "GD graphics PHP module"
 msgstr "módulo PHP GD graphics"
 
-#: Zotlabs/Module/Setup.php:540
+#: Code/Module/Setup.php:540
 msgid "OpenSSL PHP module"
 msgstr "módulo PHP OpenSSL"
 
-#: Zotlabs/Module/Setup.php:541
+#: Code/Module/Setup.php:541
 msgid "PDO database PHP module"
 msgstr "Módulo PHP de la base de datos PDO "
 
-#: Zotlabs/Module/Setup.php:542
+#: Code/Module/Setup.php:542
 msgid "mb_string PHP module"
 msgstr "módulo PHP mb_string"
 
-#: Zotlabs/Module/Setup.php:543
+#: Code/Module/Setup.php:543
 msgid "xml PHP module"
 msgstr "módulo PHP xml"
 
-#: Zotlabs/Module/Setup.php:544
+#: Code/Module/Setup.php:544
 msgid "zip PHP module"
 msgstr "Módulo zip PHP"
 
-#: Zotlabs/Module/Setup.php:548 Zotlabs/Module/Setup.php:550
+#: Code/Module/Setup.php:548 Code/Module/Setup.php:550
 msgid "Apache mod_rewrite module"
 msgstr "módulo Apache mod_rewrite "
 
-#: Zotlabs/Module/Setup.php:548
+#: Code/Module/Setup.php:548
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no "
 "está instalado."
 
-#: Zotlabs/Module/Setup.php:554 Zotlabs/Module/Setup.php:556
+#: Code/Module/Setup.php:554 Code/Module/Setup.php:556
 msgid "exec"
 msgstr "ejecutable"
 
-#: Zotlabs/Module/Setup.php:554
+#: Code/Module/Setup.php:554
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
@@ -6062,11 +6062,11 @@ msgstr ""
 "Error: se necesita un ejecutable pero o no se instaló o está deshabilitado "
 "en php.ini"
 
-#: Zotlabs/Module/Setup.php:559 Zotlabs/Module/Setup.php:561
+#: Code/Module/Setup.php:559 Code/Module/Setup.php:561
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: Zotlabs/Module/Setup.php:559
+#: Code/Module/Setup.php:559
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
@@ -6074,11 +6074,11 @@ msgstr ""
 "Error: se necesita shell_exec pero o no se instaló o está deshabilitado en "
 "php.ini"
 
-#: Zotlabs/Module/Setup.php:566
+#: Code/Module/Setup.php:566
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP libCURL pero no está instalado."
 
-#: Zotlabs/Module/Setup.php:570
+#: Code/Module/Setup.php:570
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
@@ -6086,41 +6086,41 @@ msgstr ""
 "Error: Se requiere el módulo GD PHP con soporte para JPEG o la biblioteca de"
 " gráficos ImageMagick, pero no está instalado."
 
-#: Zotlabs/Module/Setup.php:574
+#: Code/Module/Setup.php:574
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: el módulo PHP openssl es necesario, pero no está instalado."
 
-#: Zotlabs/Module/Setup.php:580
+#: Code/Module/Setup.php:580
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr ""
 "Error: El módulo PHP de la base de datos PDO carece de un controlador para "
 "mysql o pgsql."
 
-#: Zotlabs/Module/Setup.php:585
+#: Code/Module/Setup.php:585
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 "Error: se necesita el módulo PHP de la base de datos PDO, pero no está "
 "instalado."
 
-#: Zotlabs/Module/Setup.php:589
+#: Code/Module/Setup.php:589
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: el módulo PHP mb_string es necesario, pero no está instalado."
 
-#: Zotlabs/Module/Setup.php:593
+#: Code/Module/Setup.php:593
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."
 
-#: Zotlabs/Module/Setup.php:597
+#: Code/Module/Setup.php:597
 msgid "Error: zip PHP module required but not installed."
 msgstr "Error: se requiere el módulo zip PHP pero no está instalado."
 
-#: Zotlabs/Module/Setup.php:619 Zotlabs/Module/Setup.php:628
+#: Code/Module/Setup.php:619 Code/Module/Setup.php:628
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php tiene permisos de escritura"
 
-#: Zotlabs/Module/Setup.php:624
+#: Code/Module/Setup.php:624
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
@@ -6128,7 +6128,7 @@ msgstr ""
 "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en "
 "la carpeta base de su servidor."
 
-#: Zotlabs/Module/Setup.php:625
+#: Code/Module/Setup.php:625
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
@@ -6137,11 +6137,11 @@ msgstr ""
 " servidor web tiene prohibido modificar ficheros en su carpeta - incluso si "
 "usted mismo tiene esos permisos."
 
-#: Zotlabs/Module/Setup.php:626
+#: Code/Module/Setup.php:626
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Por favor, consulte install/INSTALL.txt para más información."
 
-#: Zotlabs/Module/Setup.php:645
+#: Code/Module/Setup.php:645
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
@@ -6150,7 +6150,7 @@ msgstr ""
 "plantillas gráficas. Smarty3 compila las plantillas a PHP para acelerar la "
 "renderización."
 
-#: Zotlabs/Module/Setup.php:646
+#: Code/Module/Setup.php:646
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
@@ -6159,7 +6159,7 @@ msgstr ""
 "Para poder guardar las plantillas compiladas, el servidor web necesita "
 "permisos para acceder al directorio %s en la carpeta web principal."
 
-#: Zotlabs/Module/Setup.php:647 Zotlabs/Module/Setup.php:668
+#: Code/Module/Setup.php:647 Code/Module/Setup.php:668
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
@@ -6168,12 +6168,12 @@ msgstr ""
 "usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, "
 "www-data)."
 
-#: Zotlabs/Module/Setup.php:650
+#: Code/Module/Setup.php:650
 #, php-format
 msgid "%s is writable"
 msgstr "%s tiene permisos de escritura"
 
-#: Zotlabs/Module/Setup.php:667
+#: Code/Module/Setup.php:667
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
@@ -6183,11 +6183,11 @@ msgstr ""
 "ficheros subidos. El servidor web debe tener acceso de escritura a este "
 "directorio en la carpeta de nivel superior"
 
-#: Zotlabs/Module/Setup.php:671
+#: Code/Module/Setup.php:671
 msgid "store is writable"
 msgstr "\"store\" tiene permisos de escritura"
 
-#: Zotlabs/Module/Setup.php:703
+#: Code/Module/Setup.php:703
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
@@ -6195,7 +6195,7 @@ msgstr ""
 "El certificado SSL no ha podido ser validado. Corrija este problema o "
 "desactive el acceso https a este sitio."
 
-#: Zotlabs/Module/Setup.php:704
+#: Code/Module/Setup.php:704
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
@@ -6205,7 +6205,7 @@ msgstr ""
 "puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un "
 "certificado válido. No debe usar un certificado firmado por usted mismo."
 
-#: Zotlabs/Module/Setup.php:705
+#: Code/Module/Setup.php:705
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
@@ -6213,7 +6213,7 @@ msgstr ""
 "Se ha incorporado esta restricción para evitar que sus entradas públicas "
 "hagan referencia a imágenes en su propio servidor."
 
-#: Zotlabs/Module/Setup.php:706
+#: Code/Module/Setup.php:706
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
@@ -6222,7 +6222,7 @@ msgstr ""
 "Si su certificado no ha sido reconocido, los miembros de otros sitios (con "
 "certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
 
-#: Zotlabs/Module/Setup.php:707
+#: Code/Module/Setup.php:707
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
@@ -6230,7 +6230,7 @@ msgstr ""
 "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su"
 " propio sitio), debemos insistir en estos requisitos."
 
-#: Zotlabs/Module/Setup.php:708
+#: Code/Module/Setup.php:708
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
@@ -6238,7 +6238,7 @@ msgstr ""
 "Existen varias Autoridades de Certificación que le pueden proporcionar "
 "certificados válidos."
 
-#: Zotlabs/Module/Setup.php:710
+#: Code/Module/Setup.php:710
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -6251,11 +6251,11 @@ msgstr ""
 "navegadores, pero son necesarios para las comunicaciones de servidor a "
 "servidor."
 
-#: Zotlabs/Module/Setup.php:712
+#: Code/Module/Setup.php:712
 msgid "SSL certificate validation"
 msgstr "validación del certificado SSL"
 
-#: Zotlabs/Module/Setup.php:718
+#: Code/Module/Setup.php:718
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
@@ -6263,11 +6263,11 @@ msgstr ""
 "No se pueden reescribir las direcciones web en .htaccess. Compruebe la "
 "configuración de su servidor:"
 
-#: Zotlabs/Module/Setup.php:721
+#: Code/Module/Setup.php:721
 msgid "Url rewrite is working"
 msgstr "La reescritura de las direcciones funciona correctamente"
 
-#: Zotlabs/Module/Setup.php:736
+#: Code/Module/Setup.php:736
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
@@ -6277,19 +6277,19 @@ msgstr ""
 "podido modificar. Por favor, copie el texto generado en un fichero con ese "
 "nombre en el directorio raíz de su servidor."
 
-#: Zotlabs/Module/Setup.php:762 extend/addon/a/faces/faces.php:219
+#: Code/Module/Setup.php:762 extend/addon/a/faces/faces.php:219
 msgid "Errors encountered creating database tables."
 msgstr "Se han encontrado errores al crear las tablas de la base de datos."
 
-#: Zotlabs/Module/Setup.php:807
+#: Code/Module/Setup.php:807
 msgid "registration page"
 msgstr "página de registro "
 
-#: Zotlabs/Module/Setup.php:810
+#: Code/Module/Setup.php:810
 msgid "
              What next?
              "
 msgstr "
              ¿Qué sigue?
              "
 
-#: Zotlabs/Module/Setup.php:812
+#: Code/Module/Setup.php:812
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -6297,7 +6297,7 @@ msgstr ""
 "IMPORTANTE: Debe crear [manualmente] una tarea programada para el "
 "\"poller\"."
 
-#: Zotlabs/Module/Setup.php:814
+#: Code/Module/Setup.php:814
 msgid ""
 "Please see the file \"install/INSTALL.txt\" for more information and "
 "instructions."
@@ -6305,7 +6305,7 @@ msgstr ""
 "Consulte el archivo \"install/INSTALL.txt\" para obtener más información e "
 "instrucciones."
 
-#: Zotlabs/Module/Setup.php:816
+#: Code/Module/Setup.php:816
 #, php-format
 msgid ""
 "Go to your new hub %s and register as new member. Please use the same email "
@@ -6317,420 +6317,420 @@ msgstr ""
 " administrador, ya que esto permitirá que su nueva cuenta entre en el panel "
 "de administración del sitio."
 
-#: Zotlabs/Module/Hcard.php:45 Zotlabs/Module/Profile.php:55
+#: Code/Module/Hcard.php:45 Code/Module/Profile.php:55
 msgid "Posts and comments"
 msgstr "Publicaciones y comentarios"
 
-#: Zotlabs/Module/Hcard.php:52 Zotlabs/Module/Channel.php:85
-#: Zotlabs/Module/Profile.php:62
+#: Code/Module/Hcard.php:52 Code/Module/Channel.php:85
+#: Code/Module/Profile.php:62
 msgid "Only posts"
 msgstr "Solo publicaciones"
 
-#: Zotlabs/Module/Lists.php:107
+#: Code/Module/Lists.php:107
 msgid "Access list created."
 msgstr "Lista de acceso creada"
 
-#: Zotlabs/Module/Lists.php:109
+#: Code/Module/Lists.php:109
 msgid "Could not create access list."
 msgstr "No se puede crear la lista de acceso"
 
-#: Zotlabs/Module/Lists.php:129 Zotlabs/Module/Lists.php:276
+#: Code/Module/Lists.php:129 Code/Module/Lists.php:276
 #: include/items.php:4530
 msgid "Access list not found."
 msgstr "No se ha encontrado la lista de acceso"
 
-#: Zotlabs/Module/Lists.php:146
+#: Code/Module/Lists.php:146
 msgid "Access list updated."
 msgstr "Se ha actualizado la lista de acceso"
 
-#: Zotlabs/Module/Lists.php:169 Zotlabs/Module/Lists.php:215
-#: Zotlabs/Module/Lists.php:244 Zotlabs/Module/Lists.php:287
-#: Zotlabs/Module/Import_items.php:133 Zotlabs/Module/Cloud.php:134
-#: Zotlabs/Module/Like.php:109 Zotlabs/Module/Share.php:81
-#: Zotlabs/Module/Dreport.php:16 Zotlabs/Module/Dreport.php:86
-#: Zotlabs/Module/Profperm.php:35 Zotlabs/Module/Subthread.php:97
-#: Zotlabs/Web/WebServer.php:69 include/items.php:491
+#: Code/Module/Lists.php:169 Code/Module/Lists.php:215
+#: Code/Module/Lists.php:244 Code/Module/Lists.php:287
+#: Code/Module/Import_items.php:133 Code/Module/Cloud.php:134
+#: Code/Module/Like.php:109 Code/Module/Share.php:81
+#: Code/Module/Dreport.php:16 Code/Module/Dreport.php:86
+#: Code/Module/Profperm.php:35 Code/Module/Subthread.php:97
+#: Code/Web/WebServer.php:69 include/items.php:491
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: Zotlabs/Module/Lists.php:190 Zotlabs/Module/Lists.php:201
+#: Code/Module/Lists.php:190 Code/Module/Lists.php:201
 msgid "Access Lists"
 msgstr "Listas de acceso"
 
-#: Zotlabs/Module/Lists.php:191
+#: Code/Module/Lists.php:191
 msgid "Create access list"
 msgstr "Crear una lista de acceso"
 
-#: Zotlabs/Module/Lists.php:195
+#: Code/Module/Lists.php:195
 msgid "Access list name"
 msgstr "Nombre de la lista de acceso"
 
-#: Zotlabs/Module/Lists.php:196 Zotlabs/Module/Lists.php:339
+#: Code/Module/Lists.php:196 Code/Module/Lists.php:339
 msgid "Members are visible to other channels"
 msgstr "Los miembros son visibles para otros canales"
 
-#: Zotlabs/Module/Lists.php:203
+#: Code/Module/Lists.php:203
 msgid "Members"
 msgstr "Miembros"
 
-#: Zotlabs/Module/Lists.php:232
+#: Code/Module/Lists.php:232
 msgid "Access list removed."
 msgstr "Eliminada la lista de acceso"
 
-#: Zotlabs/Module/Lists.php:234
+#: Code/Module/Lists.php:234
 msgid "Unable to remove access list."
 msgstr "No se puede eliminar la lista de acceso"
 
-#: Zotlabs/Module/Lists.php:299 Zotlabs/Module/Lists.php:351
-#: Zotlabs/Module/Followers.php:86 Zotlabs/Module/Following.php:88
+#: Code/Module/Lists.php:299 Code/Module/Lists.php:351
+#: Code/Module/Followers.php:86 Code/Module/Following.php:88
 msgid "List members"
 msgstr "Miembros de la lista"
 
-#: Zotlabs/Module/Lists.php:334
+#: Code/Module/Lists.php:334
 #, php-format
 msgid "Access List: %s"
 msgstr "Lista de acceso %s"
 
-#: Zotlabs/Module/Lists.php:336
+#: Code/Module/Lists.php:336
 msgid "Access list name: "
 msgstr "Nombre de la lista de acceso: "
 
-#: Zotlabs/Module/Lists.php:341
+#: Code/Module/Lists.php:341
 msgid "Delete access list"
 msgstr "Eliminar una lista de acceso"
 
-#: Zotlabs/Module/Lists.php:353
+#: Code/Module/Lists.php:353
 msgid "Not in this list"
 msgstr "No en esta lista"
 
-#: Zotlabs/Module/Lists.php:386
+#: Code/Module/Lists.php:386
 msgid "Select a channel to toggle membership"
 msgstr "Seleccione un canal para cambiar de suscripción"
 
-#: Zotlabs/Module/Layouts.php:198 include/text.php:2858
+#: Code/Module/Layouts.php:198 include/text.php:2858
 msgid "Layouts"
 msgstr "Plantillas"
 
-#: Zotlabs/Module/Layouts.php:204
+#: Code/Module/Layouts.php:204
 msgid "Layout Description"
 msgstr "Descripción de la plantilla"
 
-#: Zotlabs/Module/Layouts.php:209
+#: Code/Module/Layouts.php:209
 msgid "Download PDL file"
 msgstr "Descargar el fichero PDL"
 
-#: Zotlabs/Module/Channel.php:176
+#: Code/Module/Channel.php:176
 #, php-format
 msgid "This is the home page of %s."
 msgstr "Esta es la página personal de %s."
 
-#: Zotlabs/Module/Channel.php:233
+#: Code/Module/Channel.php:233
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 
-#: Zotlabs/Module/Channel.php:249 Zotlabs/Module/Stream.php:215
+#: Code/Module/Channel.php:249 Code/Module/Stream.php:215
 msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
-#: Zotlabs/Module/Channel.php:604
+#: Code/Module/Channel.php:604
 #, php-format
 msgid "This post was published on the home page of %s."
 msgstr "Este post fue publicado en la página de inicio de %s."
 
-#: Zotlabs/Module/Card_edit.php:126 Zotlabs/Module/Editblock.php:142
-#: Zotlabs/Module/Photos.php:732 Zotlabs/Module/Photos.php:1118
+#: Code/Module/Card_edit.php:126 Code/Module/Editblock.php:142
+#: Code/Module/Photos.php:732 Code/Module/Photos.php:1118
 #: include/conversation.php:1449
 msgid "Title (optional)"
 msgstr "Título (opcional)"
 
-#: Zotlabs/Module/Card_edit.php:137
+#: Code/Module/Card_edit.php:137
 msgid "Edit Card"
 msgstr "Editar la ficha"
 
-#: Zotlabs/Module/Import_items.php:54 Zotlabs/Module/Import.php:73
+#: Code/Module/Import_items.php:54 Code/Module/Import.php:73
 msgid "Nothing to import."
 msgstr "No hay nada para importar."
 
-#: Zotlabs/Module/Import_items.php:79 Zotlabs/Module/Import.php:88
-#: Zotlabs/Module/Import.php:103
+#: Code/Module/Import_items.php:79 Code/Module/Import.php:88
+#: Code/Module/Import.php:103
 msgid "Unable to download data from old server"
 msgstr "No se han podido descargar datos de su antiguo servidor"
 
-#: Zotlabs/Module/Import_items.php:85 Zotlabs/Module/Import.php:110
+#: Code/Module/Import_items.php:85 Code/Module/Import.php:110
 msgid "Imported file is empty."
 msgstr "El fichero importado está vacío."
 
-#: Zotlabs/Module/Import_items.php:110
+#: Code/Module/Import_items.php:110
 msgid "Data export format is not compatible with this software"
 msgstr "El formato de exportación de datos no es compatible con este software"
 
-#: Zotlabs/Module/Import_items.php:120
+#: Code/Module/Import_items.php:120
 msgid "Import completed"
 msgstr "Importación completada"
 
-#: Zotlabs/Module/Import_items.php:138
+#: Code/Module/Import_items.php:138
 msgid "Import Items"
 msgstr "Importar elementos"
 
-#: Zotlabs/Module/Import_items.php:139
+#: Code/Module/Import_items.php:139
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr ""
 "Utilice este formulario para importar entradas y contenido desde un archivo "
 "de exportación."
 
-#: Zotlabs/Module/Import_items.php:140 Zotlabs/Module/Import.php:687
+#: Code/Module/Import_items.php:140 Code/Module/Import.php:687
 msgid "File to Upload"
 msgstr "Fichero para subir"
 
-#: Zotlabs/Module/Cloud.php:136
+#: Code/Module/Cloud.php:136
 msgid "Please refresh page"
 msgstr "Por favor, recargue la página"
 
-#: Zotlabs/Module/Cloud.php:142
+#: Code/Module/Cloud.php:142
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: Zotlabs/Module/Manage.php:148 Zotlabs/Module/New_channel.php:165
+#: Code/Module/Manage.php:148 Code/Module/New_channel.php:165
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
 
-#: Zotlabs/Module/Manage.php:154
+#: Code/Module/Manage.php:154
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: Zotlabs/Module/Manage.php:183
+#: Code/Module/Manage.php:183
 msgid "Current Channel"
 msgstr "Canal actual"
 
-#: Zotlabs/Module/Manage.php:185
+#: Code/Module/Manage.php:185
 msgid "Switch to one of your channels by selecting it."
 msgstr "Cambiar a uno de sus canales seleccionándolo."
 
-#: Zotlabs/Module/Manage.php:186
+#: Code/Module/Manage.php:186
 msgid "Default Login Channel"
 msgstr "Acceso predeterminado al canal"
 
-#: Zotlabs/Module/Manage.php:187
+#: Code/Module/Manage.php:187
 msgid "Make Default"
 msgstr "Convertir en predeterminado"
 
-#: Zotlabs/Module/Manage.php:188 Zotlabs/Module/Manage.php:189
+#: Code/Module/Manage.php:188 Code/Module/Manage.php:189
 msgid "Add to menu"
 msgstr "Añadir al menú"
 
-#: Zotlabs/Module/Manage.php:192
+#: Code/Module/Manage.php:192
 #, php-format
 msgid "%d new messages"
 msgstr "%d mensajes nuevos"
 
-#: Zotlabs/Module/Manage.php:193
+#: Code/Module/Manage.php:193
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nuevas solicitudes de conexión"
 
-#: Zotlabs/Module/Manage.php:195
+#: Code/Module/Manage.php:195
 msgid "Delegated Channel"
 msgstr "Canal delegado"
 
-#: Zotlabs/Module/Lang.php:21
+#: Code/Module/Lang.php:21
 msgid "Change UI language"
 msgstr "Cambiar el idioma de la interfaz de usuario"
 
-#: Zotlabs/Module/Mitem.php:41 Zotlabs/Module/Menu.php:213
+#: Code/Module/Mitem.php:41 Code/Module/Menu.php:213
 msgid "Menu not found."
 msgstr "Menú no encontrado"
 
-#: Zotlabs/Module/Mitem.php:75
+#: Code/Module/Mitem.php:75
 msgid "Unable to create element."
 msgstr "No se puede crear el elemento."
 
-#: Zotlabs/Module/Mitem.php:100
+#: Code/Module/Mitem.php:100
 msgid "Unable to update menu element."
 msgstr "No es posible actualizar el elemento del menú."
 
-#: Zotlabs/Module/Mitem.php:114
+#: Code/Module/Mitem.php:114
 msgid "Unable to add menu element."
 msgstr "No es posible añadir el elemento al menú"
 
-#: Zotlabs/Module/Mitem.php:145 Zotlabs/Module/Menu.php:234
-#: Zotlabs/Module/Xchan.php:46
+#: Code/Module/Mitem.php:145 Code/Module/Menu.php:234
+#: Code/Module/Xchan.php:46
 msgid "Not found."
 msgstr "No encontrado."
 
-#: Zotlabs/Module/Mitem.php:179 Zotlabs/Module/Mitem.php:258
+#: Code/Module/Mitem.php:179 Code/Module/Mitem.php:258
 msgid "Menu Item Permissions"
 msgstr "Permisos del elemento del menú"
 
-#: Zotlabs/Module/Mitem.php:180 Zotlabs/Module/Mitem.php:259
-#: Zotlabs/Module/Settings/Channel.php:659
+#: Code/Module/Mitem.php:180 Code/Module/Mitem.php:259
+#: Code/Module/Settings/Channel.php:659
 msgid "(click to open/close)"
 msgstr "(pulsar para abrir o cerrar)"
 
-#: Zotlabs/Module/Mitem.php:186 Zotlabs/Module/Mitem.php:203
+#: Code/Module/Mitem.php:186 Code/Module/Mitem.php:203
 msgid "Link Name"
 msgstr "Nombre del enlace"
 
-#: Zotlabs/Module/Mitem.php:187 Zotlabs/Module/Mitem.php:267
+#: Code/Module/Mitem.php:187 Code/Module/Mitem.php:267
 msgid "Link or Submenu Target"
 msgstr "Destino del enlace o submenú"
 
-#: Zotlabs/Module/Mitem.php:187
+#: Code/Module/Mitem.php:187
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 "Introducir la dirección del enlace o seleccionar el nombre de un submenú"
 
-#: Zotlabs/Module/Mitem.php:188 Zotlabs/Module/Mitem.php:268
+#: Code/Module/Mitem.php:188 Code/Module/Mitem.php:268
 msgid "Use magic-auth if available"
 msgstr "Usar la autenticación mágica si está disponible"
 
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:269
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:269
 msgid "Open link in new window"
 msgstr "Abrir el enlace en una nueva ventana"
 
-#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270
+#: Code/Module/Mitem.php:190 Code/Module/Mitem.php:270
 msgid "Order in list"
 msgstr "Orden en la lista"
 
-#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270
+#: Code/Module/Mitem.php:190 Code/Module/Mitem.php:270
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Los números más altos irán al final de la lista"
 
-#: Zotlabs/Module/Mitem.php:191
+#: Code/Module/Mitem.php:191
 msgid "Submit and finish"
 msgstr "Enviar y terminar"
 
-#: Zotlabs/Module/Mitem.php:192
+#: Code/Module/Mitem.php:192
 msgid "Submit and continue"
 msgstr "Enviar y continuar"
 
-#: Zotlabs/Module/Mitem.php:201
+#: Code/Module/Mitem.php:201
 msgid "Menu:"
 msgstr "Menú:"
 
-#: Zotlabs/Module/Mitem.php:204
+#: Code/Module/Mitem.php:204
 msgid "Link Target"
 msgstr "Destino del enlace"
 
-#: Zotlabs/Module/Mitem.php:207
+#: Code/Module/Mitem.php:207
 msgid "Edit menu"
 msgstr "Editar menú"
 
-#: Zotlabs/Module/Mitem.php:210
+#: Code/Module/Mitem.php:210
 msgid "Edit element"
 msgstr "Editar el elemento"
 
-#: Zotlabs/Module/Mitem.php:211
+#: Code/Module/Mitem.php:211
 msgid "Drop element"
 msgstr "Eliminar el elemento"
 
-#: Zotlabs/Module/Mitem.php:212
+#: Code/Module/Mitem.php:212
 msgid "New element"
 msgstr "Nuevo elemento"
 
-#: Zotlabs/Module/Mitem.php:213
+#: Code/Module/Mitem.php:213
 msgid "Edit this menu container"
 msgstr "Modificar el contenedor del menú"
 
-#: Zotlabs/Module/Mitem.php:214
+#: Code/Module/Mitem.php:214
 msgid "Add menu element"
 msgstr "Añadir un elemento al menú"
 
-#: Zotlabs/Module/Mitem.php:215
+#: Code/Module/Mitem.php:215
 msgid "Delete this menu item"
 msgstr "Eliminar este elemento del menú"
 
-#: Zotlabs/Module/Mitem.php:216
+#: Code/Module/Mitem.php:216
 msgid "Edit this menu item"
 msgstr "Modificar este elemento del menú"
 
-#: Zotlabs/Module/Mitem.php:233
+#: Code/Module/Mitem.php:233
 msgid "Menu item not found."
 msgstr "Este elemento del menú no se ha encontrado"
 
-#: Zotlabs/Module/Mitem.php:246
+#: Code/Module/Mitem.php:246
 msgid "Menu item deleted."
 msgstr "Este elemento del menú ha sido borrado"
 
-#: Zotlabs/Module/Mitem.php:248
+#: Code/Module/Mitem.php:248
 msgid "Menu item could not be deleted."
 msgstr "Este elemento del menú no puede ser borrado."
 
-#: Zotlabs/Module/Mitem.php:256
+#: Code/Module/Mitem.php:256
 msgid "Edit Menu Element"
 msgstr "Editar elemento del menú"
 
-#: Zotlabs/Module/Mitem.php:266
+#: Code/Module/Mitem.php:266
 msgid "Link text"
 msgstr "Texto del enlace"
 
-#: Zotlabs/Module/Finger.php:22
+#: Code/Module/Finger.php:22
 msgid "Webfinger Diagnostic"
 msgstr "Diagnóstico de Webfinger"
 
-#: Zotlabs/Module/Finger.php:23
+#: Code/Module/Finger.php:23
 msgid "Lookup address or URL"
 msgstr "Dirección o URL de búsqueda"
 
-#: Zotlabs/Module/Editblock.php:151
+#: Code/Module/Editblock.php:151
 msgid "Edit Block"
 msgstr "Modificar este bloque"
 
-#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124
-#: Zotlabs/Module/Tagger.php:84 include/conversation.php:129
+#: Code/Module/Like.php:172 Code/Module/Subthread.php:124
+#: Code/Module/Tagger.php:84 include/conversation.php:129
 #: include/text.php:2375
 msgid "photo"
 msgstr "foto"
 
-#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124
+#: Code/Module/Like.php:172 Code/Module/Subthread.php:124
 msgid "status"
 msgstr "el mensaje de estado "
 
-#: Zotlabs/Module/Like.php:217
+#: Code/Module/Like.php:217
 msgid "Undo a previous action"
 msgstr "Deshacer una acción previa"
 
-#: Zotlabs/Module/Like.php:227
+#: Code/Module/Like.php:227
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s participa"
 
-#: Zotlabs/Module/Like.php:230
+#: Code/Module/Like.php:230
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no participa"
 
-#: Zotlabs/Module/Like.php:233
+#: Code/Module/Like.php:233
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s quizá participe"
 
-#: Zotlabs/Module/Share.php:134
+#: Code/Module/Share.php:134
 msgid "Post repeated"
 msgstr "Entrada repetida"
 
-#: Zotlabs/Module/Lostpass.php:25
+#: Code/Module/Lostpass.php:25
 msgid "No valid account found."
 msgstr "No se ha encontrado una cuenta válida."
 
-#: Zotlabs/Module/Lostpass.php:40
+#: Code/Module/Lostpass.php:40
 msgid "Password reset request issued. Check your email."
 msgstr ""
 "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su "
 "correo electrónico."
 
-#: Zotlabs/Module/Lostpass.php:47 Zotlabs/Module/Lostpass.php:119
+#: Code/Module/Lostpass.php:47 Code/Module/Lostpass.php:119
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Usuario del sitio (%s)"
 
-#: Zotlabs/Module/Lostpass.php:52 Zotlabs/Module/Lostpass.php:57
+#: Code/Module/Lostpass.php:52 Code/Module/Lostpass.php:57
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Se ha solicitado restablecer la contraseña en %s"
 
-#: Zotlabs/Module/Lostpass.php:78
+#: Code/Module/Lostpass.php:78
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
@@ -6738,27 +6738,27 @@ msgstr ""
 "La solicitud no ha podido ser verificada. (Puede que la haya enviado con "
 "anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: Zotlabs/Module/Lostpass.php:102 boot.php:1735
+#: Code/Module/Lostpass.php:102 boot.php:1735
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
-#: Zotlabs/Module/Lostpass.php:103
+#: Code/Module/Lostpass.php:103
 msgid "Your password has been reset as requested."
 msgstr "Su contraseña ha sido restablecida según lo solicitó."
 
-#: Zotlabs/Module/Lostpass.php:104
+#: Code/Module/Lostpass.php:104
 msgid "Your new password is"
 msgstr "Su nueva contraseña es"
 
-#: Zotlabs/Module/Lostpass.php:105
+#: Code/Module/Lostpass.php:105
 msgid "Save or copy your new password - and then"
 msgstr "Guarde o copie su nueva contraseña - y después"
 
-#: Zotlabs/Module/Lostpass.php:106
+#: Code/Module/Lostpass.php:106
 msgid "click here to login"
 msgstr "pulse aquí para conectarse"
 
-#: Zotlabs/Module/Lostpass.php:107
+#: Code/Module/Lostpass.php:107
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
@@ -6766,16 +6766,16 @@ msgstr ""
 "Puede cambiar la contraseña en la página Ajustes una vez iniciada "
 "la sesión."
 
-#: Zotlabs/Module/Lostpass.php:127
+#: Code/Module/Lostpass.php:127
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Su contraseña en %s ha sido cambiada"
 
-#: Zotlabs/Module/Lostpass.php:138
+#: Code/Module/Lostpass.php:138
 msgid "Forgot your Password?"
 msgstr "¿Ha olvidado su contraseña?"
 
-#: Zotlabs/Module/Lostpass.php:139
+#: Code/Module/Lostpass.php:139
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
@@ -6784,112 +6784,112 @@ msgstr ""
 "restablecimiento de su contraseña. Luego revise su correo para obtener más "
 "instrucciones."
 
-#: Zotlabs/Module/Lostpass.php:140 Zotlabs/Module/Settings/Channel.php:634
+#: Code/Module/Lostpass.php:140 Code/Module/Settings/Channel.php:634
 msgid "Email Address"
 msgstr "Dirección de correo electrónico"
 
-#: Zotlabs/Module/Menu.php:76
+#: Code/Module/Menu.php:76
 msgid "Unable to update menu."
 msgstr "No se puede actualizar el menú."
 
-#: Zotlabs/Module/Menu.php:86
+#: Code/Module/Menu.php:86
 msgid "Unable to create menu."
 msgstr "No se puede crear el menú."
 
-#: Zotlabs/Module/Menu.php:166 Zotlabs/Module/Menu.php:179
+#: Code/Module/Menu.php:166 Code/Module/Menu.php:179
 msgid "Menu Name"
 msgstr "Nombre del menú"
 
-#: Zotlabs/Module/Menu.php:166
+#: Code/Module/Menu.php:166
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Nombre único (no será visible en la página web) - requerido"
 
-#: Zotlabs/Module/Menu.php:167 Zotlabs/Module/Menu.php:180
+#: Code/Module/Menu.php:167 Code/Module/Menu.php:180
 msgid "Menu Title"
 msgstr "Título del menú"
 
-#: Zotlabs/Module/Menu.php:167
+#: Code/Module/Menu.php:167
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Visible en la página web - no ponga nada si no desea un título"
 
-#: Zotlabs/Module/Menu.php:168
+#: Code/Module/Menu.php:168
 msgid "Allow Bookmarks"
 msgstr "Permitir marcadores"
 
-#: Zotlabs/Module/Menu.php:168 Zotlabs/Module/Menu.php:226
+#: Code/Module/Menu.php:168 Code/Module/Menu.php:226
 msgid "Menu may be used to store saved bookmarks"
 msgstr "El menú se puede usar para guardar marcadores"
 
-#: Zotlabs/Module/Menu.php:169 Zotlabs/Module/Menu.php:229
+#: Code/Module/Menu.php:169 Code/Module/Menu.php:229
 msgid "Submit and proceed"
 msgstr "Enviar y proceder"
 
-#: Zotlabs/Module/Menu.php:176 include/text.php:2857
+#: Code/Module/Menu.php:176 include/text.php:2857
 msgid "Menus"
 msgstr "Menús"
 
-#: Zotlabs/Module/Menu.php:182 Zotlabs/Module/Locs.php:135
+#: Code/Module/Menu.php:182 Code/Module/Locs.php:135
 msgid "Drop"
 msgstr "Eliminar"
 
-#: Zotlabs/Module/Menu.php:186
+#: Code/Module/Menu.php:186
 msgid "Bookmarks allowed"
 msgstr "Marcadores permitidos"
 
-#: Zotlabs/Module/Menu.php:188
+#: Code/Module/Menu.php:188
 msgid "Delete this menu"
 msgstr "Borrar este menú"
 
-#: Zotlabs/Module/Menu.php:189 Zotlabs/Module/Menu.php:223
+#: Code/Module/Menu.php:189 Code/Module/Menu.php:223
 msgid "Edit menu contents"
 msgstr "Editar los contenidos del menú"
 
-#: Zotlabs/Module/Menu.php:190
+#: Code/Module/Menu.php:190
 msgid "Edit this menu"
 msgstr "Modificar este menú"
 
-#: Zotlabs/Module/Menu.php:204
+#: Code/Module/Menu.php:204
 msgid "Menu could not be deleted."
 msgstr "El menú no puede ser eliminado."
 
-#: Zotlabs/Module/Menu.php:218
+#: Code/Module/Menu.php:218
 msgid "Edit Menu"
 msgstr "Modificar el menú"
 
-#: Zotlabs/Module/Menu.php:222
+#: Code/Module/Menu.php:222
 msgid "Add or remove entries to this menu"
 msgstr "Añadir o quitar entradas en este menú"
 
-#: Zotlabs/Module/Menu.php:224
+#: Code/Module/Menu.php:224
 msgid "Menu name"
 msgstr "Nombre del menú"
 
-#: Zotlabs/Module/Menu.php:224
+#: Code/Module/Menu.php:224
 msgid "Must be unique, only seen by you"
 msgstr "Debe ser único, solo será visible para usted"
 
-#: Zotlabs/Module/Menu.php:225
+#: Code/Module/Menu.php:225
 msgid "Menu title"
 msgstr "Título del menú"
 
-#: Zotlabs/Module/Menu.php:225
+#: Code/Module/Menu.php:225
 msgid "Menu title as seen by others"
 msgstr "El título del menú tal como será visto por los demás"
 
-#: Zotlabs/Module/Menu.php:226
+#: Code/Module/Menu.php:226
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
-#: Zotlabs/Module/Pconfig.php:37 Zotlabs/Module/Pconfig.php:73
+#: Code/Module/Pconfig.php:37 Code/Module/Pconfig.php:73
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."
 
-#: Zotlabs/Module/Pconfig.php:63
+#: Code/Module/Pconfig.php:63
 msgid "Configuration Editor"
 msgstr "Editor de configuración"
 
-#: Zotlabs/Module/Pconfig.php:64
+#: Code/Module/Pconfig.php:64
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please"
 " leave this page unless you are comfortable with and knowledgeable about how"
@@ -6899,41 +6899,41 @@ msgstr ""
 "Por favor, abandone la página excepto que esté seguro y sepa cómo usar "
 "correctamente esta característica."
 
-#: Zotlabs/Module/Editpost.php:44
+#: Code/Module/Editpost.php:44
 msgid "Item is not editable"
 msgstr "El elemento no es editable"
 
-#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Rpost.php:247
+#: Code/Module/Editpost.php:147 Code/Module/Rpost.php:247
 msgid "Edit post"
 msgstr "Editar la entrada"
 
-#: Zotlabs/Module/Search.php:347
+#: Code/Module/Search.php:347
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "elementos etiquetados con: %s"
 
-#: Zotlabs/Module/Search.php:349
+#: Code/Module/Search.php:349
 #, php-format
 msgid "Search results for: %s"
 msgstr "Resultados de la búsqueda para: %s"
 
-#: Zotlabs/Module/Hq.php:160
+#: Code/Module/Hq.php:160
 msgid "Welcome to $Projectname!"
 msgstr "¡Bienvenido a  $Projectname!"
 
-#: Zotlabs/Module/Hq.php:160
+#: Code/Module/Hq.php:160
 msgid "You have got no unseen posts..."
 msgstr "No tiene ningún mensaje sin leer..."
 
-#: Zotlabs/Module/Locs.php:31 Zotlabs/Module/Locs.php:72
+#: Code/Module/Locs.php:31 Code/Module/Locs.php:72
 msgid "Location not found."
 msgstr "Dirección no encontrada."
 
-#: Zotlabs/Module/Locs.php:81
+#: Code/Module/Locs.php:81
 msgid "Location lookup failed."
 msgstr "Ha fallado la búsqueda de la dirección."
 
-#: Zotlabs/Module/Locs.php:85
+#: Code/Module/Locs.php:85
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
@@ -6941,27 +6941,27 @@ msgstr ""
 "Por favor, seleccione una copia de su canal (un clon) para convertirlo en "
 "primario antes de eliminar su canal principal."
 
-#: Zotlabs/Module/Locs.php:115
+#: Code/Module/Locs.php:115
 msgid "Pushing location info"
 msgstr "Mostrar la información de ubicación"
 
-#: Zotlabs/Module/Locs.php:126
+#: Code/Module/Locs.php:126
 msgid "No locations found."
 msgstr "No encontrada ninguna dirección."
 
-#: Zotlabs/Module/Locs.php:131
+#: Code/Module/Locs.php:131
 msgid "Manage Channel Locations"
 msgstr "Gestionar las direcciones del canal"
 
-#: Zotlabs/Module/Locs.php:137
+#: Code/Module/Locs.php:137
 msgid "Publish these settings"
 msgstr "Publicar estos ajustes"
 
-#: Zotlabs/Module/Locs.php:138
+#: Code/Module/Locs.php:138
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Por favor, espere algunos minutos entre operaciones consecutivas."
 
-#: Zotlabs/Module/Locs.php:139
+#: Code/Module/Locs.php:139
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
@@ -6969,43 +6969,43 @@ msgstr ""
 "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o"
 " \"hub\" y borrando su canal."
 
-#: Zotlabs/Module/Locs.php:140
+#: Code/Module/Locs.php:140
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 "Utilice este formulario para eliminar la dirección si el \"hub\" no está "
 "funcionando desde hace tiempo."
 
-#: Zotlabs/Module/Viewsrc.php:48
+#: Code/Module/Viewsrc.php:48
 msgid "item"
 msgstr "elemento"
 
-#: Zotlabs/Module/Viewsrc.php:58
+#: Code/Module/Viewsrc.php:58
 msgid "Inspect"
 msgstr "Inspeccionar"
 
-#: Zotlabs/Module/Viewsrc.php:63
+#: Code/Module/Viewsrc.php:63
 msgid "Local id:"
 msgstr "ID local: "
 
-#: Zotlabs/Module/Viewsrc.php:63
+#: Code/Module/Viewsrc.php:63
 msgid "Permanent link"
 msgstr "Enlace permanente "
 
-#: Zotlabs/Module/Viewsrc.php:63
+#: Code/Module/Viewsrc.php:63
 msgid "Local link"
 msgstr "Enlace local "
 
-#: Zotlabs/Module/New_channel.php:173
+#: Code/Module/New_channel.php:173
 msgid "Your real name is recommended."
 msgstr "Se recomienda su nombre real."
 
-#: Zotlabs/Module/New_channel.php:174
+#: Code/Module/New_channel.php:174
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
 msgstr ""
 "Ejemplos: \"Juan García\", \"Luisa y sus caballos\", \"Fútbol\", \"Grupo de "
 "aviación\""
 
-#: Zotlabs/Module/New_channel.php:179
+#: Code/Module/New_channel.php:179
 msgid ""
 "This will be used to create a unique network address (like an email "
 "address)."
@@ -7013,15 +7013,15 @@ msgstr ""
 "Esto se utilizará para crear una dirección de red única (como una dirección "
 "de correo electrónico)."
 
-#: Zotlabs/Module/New_channel.php:181
+#: Code/Module/New_channel.php:181
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr "Los caracteres permitidos son a-z 0-9, - and _"
 
-#: Zotlabs/Module/New_channel.php:189
+#: Code/Module/New_channel.php:189
 msgid "Channel name"
 msgstr "Nombre del canal"
 
-#: Zotlabs/Module/New_channel.php:192
+#: Code/Module/New_channel.php:192
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
@@ -7029,11 +7029,11 @@ msgstr ""
 "Seleccione unos permisos de rol del canal compatibles con sus necesidades de"
 " uso y requisitos de privacidad."
 
-#: Zotlabs/Module/New_channel.php:195
+#: Code/Module/New_channel.php:195
 msgid "Create a Channel"
 msgstr "Crear un canal"
 
-#: Zotlabs/Module/New_channel.php:196
+#: Code/Module/New_channel.php:196
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed,"
@@ -7043,28 +7043,28 @@ msgstr ""
 "(un perfil de una red social), un foro o grupo, un negocio o una página de "
 "una celebridad, un \"feed\" de noticias, y muchas otras cosas."
 
-#: Zotlabs/Module/New_channel.php:197
+#: Code/Module/New_channel.php:197
 msgid ""
 "or import an existing channel from another location."
 msgstr "O importar un canal  desde otro lugar."
 
-#: Zotlabs/Module/New_channel.php:202
+#: Code/Module/New_channel.php:202
 msgid "Validate"
 msgstr "Validar"
 
-#: Zotlabs/Module/Connect.php:56 Zotlabs/Module/Connect.php:106
+#: Code/Module/Connect.php:56 Code/Module/Connect.php:106
 msgid "Continue"
 msgstr "Continuar"
 
-#: Zotlabs/Module/Connect.php:87
+#: Code/Module/Connect.php:87
 msgid "Premium Channel Setup"
 msgstr "Configuración del canal premium"
 
-#: Zotlabs/Module/Connect.php:89
+#: Code/Module/Connect.php:89
 msgid "Enable premium channel connection restrictions"
 msgstr "Habilitar restricciones de conexión del canal premium"
 
-#: Zotlabs/Module/Connect.php:90
+#: Code/Module/Connect.php:90
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
@@ -7072,7 +7072,7 @@ msgstr ""
 "Por favor introduzca sus restricciones o condiciones, como recibo de paypal,"
 " normas de uso, etc."
 
-#: Zotlabs/Module/Connect.php:92 Zotlabs/Module/Connect.php:112
+#: Code/Module/Connect.php:92 Code/Module/Connect.php:112
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
@@ -7080,14 +7080,14 @@ msgstr ""
 "Este canal puede requerir antes de conectar unos pasos adicionales o el "
 "conocimiento de las siguientes condiciones:"
 
-#: Zotlabs/Module/Connect.php:93
+#: Code/Module/Connect.php:93
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr ""
 "Las posibles conexiones verán, por tanto, el siguiente texto antes de "
 "proceder:"
 
-#: Zotlabs/Module/Connect.php:94 Zotlabs/Module/Connect.php:115
+#: Code/Module/Connect.php:94 Code/Module/Connect.php:115
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided"
 " on this page."
@@ -7095,109 +7095,109 @@ msgstr ""
 "Al continuar, certifico que he cumplido con todas las instrucciones "
 "proporcionadas en esta página."
 
-#: Zotlabs/Module/Connect.php:102
+#: Code/Module/Connect.php:102
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 "(No ha sido proporcionada ninguna instrucción específica por el propietario "
 "del canal.)"
 
-#: Zotlabs/Module/Connect.php:111
+#: Code/Module/Connect.php:111
 msgid "Restricted or Premium Channel"
 msgstr "Canal premium o restringido"
 
-#: Zotlabs/Module/Notifications.php:67 Zotlabs/Module/Notify.php:73
+#: Code/Module/Notifications.php:67 Code/Module/Notify.php:73
 msgid "No more system notifications."
 msgstr "No hay más notificaciones del sistema"
 
-#: Zotlabs/Module/Notifications.php:71 Zotlabs/Module/Notify.php:77
+#: Code/Module/Notifications.php:71 Code/Module/Notify.php:77
 msgid "System Notifications"
 msgstr "Notificaciones del sistema"
 
-#: Zotlabs/Module/Notify.php:42
+#: Code/Module/Notify.php:42
 #, php-format
 msgid "A notification with that id was not found for channel '%s'"
 msgstr "No se ha encontrado una notificación con ese id para el canal '%s'"
 
-#: Zotlabs/Module/Acl.php:261
+#: Code/Module/Acl.php:261
 msgid "network"
 msgstr "red"
 
-#: Zotlabs/Module/Mood.php:80 include/conversation.php:296
+#: Code/Module/Mood.php:80 include/conversation.php:296
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: Zotlabs/Module/Mood.php:141 Zotlabs/Module/Mood.php:163
+#: Code/Module/Mood.php:141 Code/Module/Mood.php:163
 msgid "Set your current mood and tell your friends"
 msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
 
-#: Zotlabs/Module/Vote.php:41
+#: Code/Module/Vote.php:41
 msgid "Poll not found."
 msgstr "Encuesta no encontrada."
 
-#: Zotlabs/Module/Vote.php:72
+#: Code/Module/Vote.php:72
 msgid "Invalid response."
 msgstr "Respuesta no válida."
 
-#: Zotlabs/Module/Vote.php:131
+#: Code/Module/Vote.php:131
 msgid "Response submitted. Updates may not appear instantly."
 msgstr ""
 "Respuesta enviada. Las actualizaciones pueden no aparecer al instante."
 
-#: Zotlabs/Module/Webpages.php:54
+#: Code/Module/Webpages.php:54
 msgid "Provide managed web pages on your channel"
 msgstr "Proveer páginas web gestionadas en su canal"
 
-#: Zotlabs/Module/Webpages.php:74
+#: Code/Module/Webpages.php:74
 msgid "Import Webpage Elements"
 msgstr "Importar elementos de una página web"
 
-#: Zotlabs/Module/Webpages.php:75
+#: Code/Module/Webpages.php:75
 msgid "Import selected"
 msgstr "Importar elementos seleccionados"
 
-#: Zotlabs/Module/Webpages.php:98
+#: Code/Module/Webpages.php:98
 msgid "Export Webpage Elements"
 msgstr "Exportar elementos de una página web"
 
-#: Zotlabs/Module/Webpages.php:99
+#: Code/Module/Webpages.php:99
 msgid "Export selected"
 msgstr "Exportar los elementos seleccionados"
 
-#: Zotlabs/Module/Webpages.php:273
+#: Code/Module/Webpages.php:273
 msgid "Actions"
 msgstr "Acciones"
 
-#: Zotlabs/Module/Webpages.php:274
+#: Code/Module/Webpages.php:274
 msgid "Page Link"
 msgstr "Vínculo de la página"
 
-#: Zotlabs/Module/Webpages.php:275
+#: Code/Module/Webpages.php:275
 msgid "Page Title"
 msgstr "Título de página"
 
-#: Zotlabs/Module/Webpages.php:305
+#: Code/Module/Webpages.php:305
 msgid "Invalid file type."
 msgstr "Tipo de fichero no válido."
 
-#: Zotlabs/Module/Webpages.php:317
+#: Code/Module/Webpages.php:317
 msgid "Error opening zip file"
 msgstr "Error al abrir el fichero comprimido zip"
 
-#: Zotlabs/Module/Webpages.php:327
+#: Code/Module/Webpages.php:327
 msgid "Invalid folder path."
 msgstr "La ruta de la carpeta no es válida."
 
-#: Zotlabs/Module/Webpages.php:353
+#: Code/Module/Webpages.php:353
 msgid "No webpage elements detected."
 msgstr "No se han detectado elementos de ninguna página web."
 
-#: Zotlabs/Module/Webpages.php:427 Zotlabs/Import/Friendica.php:360
+#: Code/Module/Webpages.php:427 Code/Import/Friendica.php:360
 msgid "Import complete."
 msgstr "Importación completada."
 
-#: Zotlabs/Module/Page.php:187
+#: Code/Module/Page.php:187
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -7213,7 +7213,7 @@ msgstr ""
 "cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: Zotlabs/Module/Removeme.php:48
+#: Code/Module/Removeme.php:48
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
@@ -7221,672 +7221,672 @@ msgstr ""
 "La eliminación de canales no está permitida hasta pasadas 48 horas desde el "
 "último cambio de contraseña."
 
-#: Zotlabs/Module/Removeme.php:71
+#: Code/Module/Removeme.php:71
 msgid "Remove This Channel"
 msgstr "Eliminar este canal"
 
-#: Zotlabs/Module/Removeme.php:72
+#: Code/Module/Removeme.php:72
 msgid "This channel will be completely removed from this server. "
 msgstr "Este canal será eliminado completamente de este servidor."
 
-#: Zotlabs/Module/Removeme.php:72 Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Removeme.php:72 Code/Module/Removeaccount.php:72
 msgid "This action is permanent and can not be undone!"
 msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
 
-#: Zotlabs/Module/Removeme.php:74 Zotlabs/Module/Settings/Channel.php:745
+#: Code/Module/Removeme.php:74 Code/Module/Settings/Channel.php:745
 msgid "Remove Channel"
 msgstr "Eliminar el canal"
 
-#: Zotlabs/Module/Pdledit.php:27
+#: Code/Module/Pdledit.php:27
 msgid "Layout updated."
 msgstr "Plantilla actualizada."
 
-#: Zotlabs/Module/Pdledit.php:49 Zotlabs/Module/Pdledit.php:106
+#: Code/Module/Pdledit.php:49 Code/Module/Pdledit.php:106
 msgid "Edit System Page Description"
 msgstr "Editor del Sistema de Descripción de Páginas"
 
-#: Zotlabs/Module/Pdledit.php:71 Zotlabs/Module/Pdledit.php:79
+#: Code/Module/Pdledit.php:71 Code/Module/Pdledit.php:79
 msgid "(modified)"
 msgstr "(modificado)"
 
-#: Zotlabs/Module/Pdledit.php:101
+#: Code/Module/Pdledit.php:101
 msgid "Layout not found."
 msgstr "Plantilla no encontrada"
 
-#: Zotlabs/Module/Pdledit.php:107
+#: Code/Module/Pdledit.php:107
 msgid "Module Name:"
 msgstr "Nombre del módulo:"
 
-#: Zotlabs/Module/Pdledit.php:108
+#: Code/Module/Pdledit.php:108
 msgid "Layout Help"
 msgstr "Ayuda para el diseño de plantillas de página"
 
-#: Zotlabs/Module/Pdledit.php:109
+#: Code/Module/Pdledit.php:109
 msgid "Edit another layout"
 msgstr "Editar otro diseño"
 
-#: Zotlabs/Module/Pdledit.php:110
+#: Code/Module/Pdledit.php:110
 msgid "System layout"
 msgstr "Diseño del sistema"
 
-#: Zotlabs/Module/Dreport.php:35
+#: Code/Module/Dreport.php:35
 msgid "Invalid message"
 msgstr "Mensaje no válido"
 
-#: Zotlabs/Module/Dreport.php:63
+#: Code/Module/Dreport.php:63
 msgid "Delivery Log"
 msgstr "Informe de transmisión"
 
-#: Zotlabs/Module/Dreport.php:97
+#: Code/Module/Dreport.php:97
 msgid "no results"
 msgstr "sin resultados"
 
-#: Zotlabs/Module/Dreport.php:109
+#: Code/Module/Dreport.php:109
 msgid "channel sync processed"
 msgstr "se ha realizado la sincronización del canal"
 
-#: Zotlabs/Module/Dreport.php:113
+#: Code/Module/Dreport.php:113
 msgid "queued"
 msgstr "encolado"
 
-#: Zotlabs/Module/Dreport.php:117
+#: Code/Module/Dreport.php:117
 msgid "site dead"
 msgstr "sitio muerto "
 
-#: Zotlabs/Module/Dreport.php:121
+#: Code/Module/Dreport.php:121
 msgid "site might be dead - deferred"
 msgstr "el sitio podría estar muerto - aplazado"
 
-#: Zotlabs/Module/Dreport.php:125
+#: Code/Module/Dreport.php:125
 msgid "posted"
 msgstr "enviado"
 
-#: Zotlabs/Module/Dreport.php:129
+#: Code/Module/Dreport.php:129
 msgid "accepted for delivery"
 msgstr "aceptado para el envío"
 
-#: Zotlabs/Module/Dreport.php:133
+#: Code/Module/Dreport.php:133
 msgid "updated"
 msgstr "actualizado"
 
-#: Zotlabs/Module/Dreport.php:136
+#: Code/Module/Dreport.php:136
 msgid "update ignored"
 msgstr "actualización ignorada"
 
-#: Zotlabs/Module/Dreport.php:139
+#: Code/Module/Dreport.php:139
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: Zotlabs/Module/Dreport.php:143
+#: Code/Module/Dreport.php:143
 msgid "recipient not found"
 msgstr "destinatario no encontrado"
 
-#: Zotlabs/Module/Dreport.php:146
+#: Code/Module/Dreport.php:146
 msgid "mail recalled"
 msgstr "mensaje de correo revocado"
 
-#: Zotlabs/Module/Dreport.php:149
+#: Code/Module/Dreport.php:149
 msgid "duplicate mail received"
 msgstr "se ha recibido mensaje duplicado"
 
-#: Zotlabs/Module/Dreport.php:152
+#: Code/Module/Dreport.php:152
 msgid "mail delivered"
 msgstr "correo enviado"
 
-#: Zotlabs/Module/Dreport.php:156
+#: Code/Module/Dreport.php:156
 msgid "delivery rejected"
 msgstr "entrega rechazada "
 
-#: Zotlabs/Module/Dreport.php:175
+#: Code/Module/Dreport.php:175
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Informe de entrega para %1$s"
 
-#: Zotlabs/Module/Dreport.php:178
+#: Code/Module/Dreport.php:178
 msgid "Options"
 msgstr "Opciones"
 
-#: Zotlabs/Module/Dreport.php:179
+#: Code/Module/Dreport.php:179
 msgid "Redeliver"
 msgstr "Volver a enviar"
 
-#: Zotlabs/Module/Profiles.php:32 Zotlabs/Module/Profiles.php:198
-#: Zotlabs/Module/Profiles.php:254 Zotlabs/Module/Profiles.php:701
+#: Code/Module/Profiles.php:32 Code/Module/Profiles.php:198
+#: Code/Module/Profiles.php:254 Code/Module/Profiles.php:701
 msgid "Profile not found."
 msgstr "Perfil no encontrado."
 
-#: Zotlabs/Module/Profiles.php:53
+#: Code/Module/Profiles.php:53
 msgid "Profile deleted."
 msgstr "Perfil eliminado."
 
-#: Zotlabs/Module/Profiles.php:76 Zotlabs/Module/Profiles.php:118
+#: Code/Module/Profiles.php:76 Code/Module/Profiles.php:118
 msgid "Profile-"
 msgstr "Perfil-"
 
-#: Zotlabs/Module/Profiles.php:101 Zotlabs/Module/Profiles.php:142
+#: Code/Module/Profiles.php:101 Code/Module/Profiles.php:142
 msgid "New profile created."
 msgstr "El nuevo perfil ha sido creado."
 
-#: Zotlabs/Module/Profiles.php:125
+#: Code/Module/Profiles.php:125
 msgid "Profile unavailable to clone."
 msgstr "Perfil no disponible para clonar."
 
-#: Zotlabs/Module/Profiles.php:162
+#: Code/Module/Profiles.php:162
 msgid "Profile unavailable to export."
 msgstr "Perfil no disponible para exportar."
 
-#: Zotlabs/Module/Profiles.php:265
+#: Code/Module/Profiles.php:265
 msgid "Profile Name is required."
 msgstr "Se necesita el nombre del perfil."
 
-#: Zotlabs/Module/Profiles.php:484
+#: Code/Module/Profiles.php:484
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: Zotlabs/Module/Profiles.php:488
+#: Code/Module/Profiles.php:488
 msgid "Romantic Partner"
 msgstr "Pareja sentimental"
 
-#: Zotlabs/Module/Profiles.php:492 Zotlabs/Module/Profiles.php:821
+#: Code/Module/Profiles.php:492 Code/Module/Profiles.php:821
 msgid "Likes"
 msgstr "Me gusta"
 
-#: Zotlabs/Module/Profiles.php:496 Zotlabs/Module/Profiles.php:822
+#: Code/Module/Profiles.php:496 Code/Module/Profiles.php:822
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: Zotlabs/Module/Profiles.php:500 Zotlabs/Module/Profiles.php:829
+#: Code/Module/Profiles.php:500 Code/Module/Profiles.php:829
 msgid "Work/Employment"
 msgstr "Trabajo:"
 
-#: Zotlabs/Module/Profiles.php:503
+#: Code/Module/Profiles.php:503
 msgid "Religion"
 msgstr "Religión"
 
-#: Zotlabs/Module/Profiles.php:507
+#: Code/Module/Profiles.php:507
 msgid "Political Views"
 msgstr "Ideas políticas"
 
-#: Zotlabs/Module/Profiles.php:511
+#: Code/Module/Profiles.php:511
 msgid "Gender"
 msgstr "Género"
 
-#: Zotlabs/Module/Profiles.php:515
+#: Code/Module/Profiles.php:515
 msgid "Sexual Preference"
 msgstr "Preferencia sexual"
 
-#: Zotlabs/Module/Profiles.php:519
+#: Code/Module/Profiles.php:519
 msgid "Homepage"
 msgstr "Página personal"
 
-#: Zotlabs/Module/Profiles.php:523
+#: Code/Module/Profiles.php:523
 msgid "Interests"
 msgstr "Intereses"
 
-#: Zotlabs/Module/Profiles.php:623
+#: Code/Module/Profiles.php:623
 msgid "Profile updated."
 msgstr "Perfil actualizado."
 
-#: Zotlabs/Module/Profiles.php:721
+#: Code/Module/Profiles.php:721
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Ocultar la lista de conexiones a los visitantes del perfil"
 
-#: Zotlabs/Module/Profiles.php:767
+#: Code/Module/Profiles.php:767
 msgid "Edit Profile Details"
 msgstr "Modificar los detalles de este perfil"
 
-#: Zotlabs/Module/Profiles.php:769
+#: Code/Module/Profiles.php:769
 msgid "View this profile"
 msgstr "Ver este perfil"
 
-#: Zotlabs/Module/Profiles.php:771
+#: Code/Module/Profiles.php:771
 msgid "Profile Tools"
 msgstr "Gestión del perfil"
 
-#: Zotlabs/Module/Profiles.php:772
+#: Code/Module/Profiles.php:772
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: Zotlabs/Module/Profiles.php:774
+#: Code/Module/Profiles.php:774
 msgid "Create a new profile using these settings"
 msgstr "Crear un nuevo perfil usando estos ajustes"
 
-#: Zotlabs/Module/Profiles.php:775
+#: Code/Module/Profiles.php:775
 msgid "Clone this profile"
 msgstr "Clonar este perfil"
 
-#: Zotlabs/Module/Profiles.php:776
+#: Code/Module/Profiles.php:776
 msgid "Delete this profile"
 msgstr "Eliminar este perfil"
 
-#: Zotlabs/Module/Profiles.php:777
+#: Code/Module/Profiles.php:777
 msgid "Add profile things"
 msgstr "Añadir cosas al perfil"
 
-#: Zotlabs/Module/Profiles.php:778
+#: Code/Module/Profiles.php:778
 msgid "Personal"
 msgstr "Personales"
 
-#: Zotlabs/Module/Profiles.php:780
+#: Code/Module/Profiles.php:780
 msgid "Relationship"
 msgstr "Relación"
 
-#: Zotlabs/Module/Profiles.php:781 Zotlabs/Module/Settings/Channel.php:740
-#: Zotlabs/Widget/Newmember.php:52 include/datetime.php:72
+#: Code/Module/Profiles.php:781 Code/Module/Settings/Channel.php:740
+#: Code/Widget/Newmember.php:52 include/datetime.php:72
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: Zotlabs/Module/Profiles.php:783
+#: Code/Module/Profiles.php:783
 msgid "Import profile from file"
 msgstr "Importar perfil desde un fichero"
 
-#: Zotlabs/Module/Profiles.php:784
+#: Code/Module/Profiles.php:784
 msgid "Export profile to file"
 msgstr "Exportar perfil a un fichero"
 
-#: Zotlabs/Module/Profiles.php:785
+#: Code/Module/Profiles.php:785
 msgid "Your gender"
 msgstr "Género"
 
-#: Zotlabs/Module/Profiles.php:786
+#: Code/Module/Profiles.php:786
 msgid "Marital status"
 msgstr "Estado civil"
 
-#: Zotlabs/Module/Profiles.php:787
+#: Code/Module/Profiles.php:787
 msgid "Sexual preference"
 msgstr "Preferencia sexual"
 
-#: Zotlabs/Module/Profiles.php:788
+#: Code/Module/Profiles.php:788
 msgid "Pronouns"
 msgstr "Pronunciación"
 
-#: Zotlabs/Module/Profiles.php:791
+#: Code/Module/Profiles.php:791
 msgid "Profile name"
 msgstr "Nombre del perfil"
 
-#: Zotlabs/Module/Profiles.php:795
+#: Code/Module/Profiles.php:795
 msgid "Your full name"
 msgstr "Nombre completo"
 
-#: Zotlabs/Module/Profiles.php:796
+#: Code/Module/Profiles.php:796
 msgid "Title/Description"
 msgstr "Título o descripción"
 
-#: Zotlabs/Module/Profiles.php:799
+#: Code/Module/Profiles.php:799
 msgid "Street address"
 msgstr "Dirección"
 
-#: Zotlabs/Module/Profiles.php:800
+#: Code/Module/Profiles.php:800
 msgid "Locality/City"
 msgstr "Ciudad"
 
-#: Zotlabs/Module/Profiles.php:801
+#: Code/Module/Profiles.php:801
 msgid "Region/State"
 msgstr "Región o Estado"
 
-#: Zotlabs/Module/Profiles.php:802
+#: Code/Module/Profiles.php:802
 msgid "Postal/Zip code"
 msgstr "Código postal"
 
-#: Zotlabs/Module/Profiles.php:809
+#: Code/Module/Profiles.php:809
 msgid "Who (if applicable)"
 msgstr "Quién (si es pertinente)"
 
-#: Zotlabs/Module/Profiles.php:809
+#: Code/Module/Profiles.php:809
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com"
 
-#: Zotlabs/Module/Profiles.php:810
+#: Code/Module/Profiles.php:810
 msgid "Since (date)"
 msgstr "Desde (fecha)"
 
-#: Zotlabs/Module/Profiles.php:815
+#: Code/Module/Profiles.php:815
 msgid "Tell us about yourself"
 msgstr "Háblenos de usted"
 
-#: Zotlabs/Module/Profiles.php:816
+#: Code/Module/Profiles.php:816
 msgid "Homepage URL"
 msgstr "Dirección de la página personal"
 
-#: Zotlabs/Module/Profiles.php:817
+#: Code/Module/Profiles.php:817
 msgid "Hometown"
 msgstr "Lugar de nacimiento"
 
-#: Zotlabs/Module/Profiles.php:818
+#: Code/Module/Profiles.php:818
 msgid "Political views"
 msgstr "Ideas políticas"
 
-#: Zotlabs/Module/Profiles.php:819
+#: Code/Module/Profiles.php:819
 msgid "Religious views"
 msgstr "Creencias religiosas"
 
-#: Zotlabs/Module/Profiles.php:820
+#: Code/Module/Profiles.php:820
 msgid "Keywords used in directory listings"
 msgstr "Palabras clave utilizadas en los listados de directorios"
 
-#: Zotlabs/Module/Profiles.php:820
+#: Code/Module/Profiles.php:820
 msgid "Example: fishing photography software"
 msgstr "Por ejemplo: software de fotografía submarina"
 
-#: Zotlabs/Module/Profiles.php:823
+#: Code/Module/Profiles.php:823
 msgid "Musical interests"
 msgstr "Preferencias musicales"
 
-#: Zotlabs/Module/Profiles.php:824
+#: Code/Module/Profiles.php:824
 msgid "Books, literature"
 msgstr "Libros, literatura"
 
-#: Zotlabs/Module/Profiles.php:825
+#: Code/Module/Profiles.php:825
 msgid "Television"
 msgstr "Televisión"
 
-#: Zotlabs/Module/Profiles.php:826
+#: Code/Module/Profiles.php:826
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Cine, danza, cultura, entretenimiento"
 
-#: Zotlabs/Module/Profiles.php:827
+#: Code/Module/Profiles.php:827
 msgid "Hobbies/Interests"
 msgstr "Aficiones o intereses"
 
-#: Zotlabs/Module/Profiles.php:828
+#: Code/Module/Profiles.php:828
 msgid "Love/Romance"
 msgstr "Vida sentimental o amorosa"
 
-#: Zotlabs/Module/Profiles.php:830
+#: Code/Module/Profiles.php:830
 msgid "School/Education"
 msgstr "Estudios"
 
-#: Zotlabs/Module/Profiles.php:831
+#: Code/Module/Profiles.php:831
 msgid "Contact information and social networks"
 msgstr "Información de contacto y redes sociales"
 
-#: Zotlabs/Module/Profiles.php:832
+#: Code/Module/Profiles.php:832
 msgid "My other channels"
 msgstr "Mis otros canales"
 
-#: Zotlabs/Module/Profiles.php:834
+#: Code/Module/Profiles.php:834
 msgid "Communications"
 msgstr "Comunicaciones"
 
-#: Zotlabs/Module/Profiles.php:932
+#: Code/Module/Profiles.php:932
 msgid " and "
 msgstr "  y "
 
-#: Zotlabs/Module/Profiles.php:934
+#: Code/Module/Profiles.php:934
 msgid ", "
 msgstr ", "
 
-#: Zotlabs/Module/Profiles.php:941
+#: Code/Module/Profiles.php:941
 msgid "public profile"
 msgstr "el perfil público"
 
-#: Zotlabs/Module/Profiles.php:951
+#: Code/Module/Profiles.php:951
 #, php-format
 msgid "%1$s changed %2$s to “%3$s”"
 msgstr "%1$s ha cambiado %2$s a “%3$s”"
 
-#: Zotlabs/Module/Profiles.php:952
+#: Code/Module/Profiles.php:952
 #, php-format
 msgid "Visit %1$s's %2$s"
 msgstr "Visitar %2$s de %1$s"
 
-#: Zotlabs/Module/Profiles.php:954
+#: Code/Module/Profiles.php:954
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Currently Male"
 msgstr "Actualmente hombre"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Currently Female"
 msgstr "Actualmente mujer"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Mostly Male"
 msgstr "Generalmente hombre"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Mostly Female"
 msgstr "Generalmente mujer"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Transgender"
 msgstr "Transgénero"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Intersex"
 msgstr "Intersexual"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Transsexual"
 msgstr "Transexual"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Hermaphrodite"
 msgstr "Hermafrodita"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Undecided"
 msgstr "Indeciso/a"
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "He/Him"
 msgstr "Él/Ella"
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "She/Her"
 msgstr "Ella/Él"
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "They/Them"
 msgstr "Ellos/Ellas"
 
-#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1053 Code/Module/Profiles.php:1073
 msgid "Males"
 msgstr "Hombres"
 
-#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1053 Code/Module/Profiles.php:1073
 msgid "Females"
 msgstr "Mujeres"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Gay"
 msgstr "Homosexual"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Lesbian"
 msgstr "Lesbiana"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "No Preference"
 msgstr "Sin preferencias"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Bisexual"
 msgstr "Bisexual"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Autosexual"
 msgstr "Autosexual"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Abstinent"
 msgstr "Casto/a"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Virgin"
 msgstr "Virgen"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Deviant"
 msgstr "Fuera de lo común"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Fetish"
 msgstr "Fetichista"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Oodles"
 msgstr "Orgías"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Nonsexual"
 msgstr "Asexual"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Single"
 msgstr "Soltero/a"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Lonely"
 msgstr "Solo/a"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Available"
 msgstr "Disponible"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Has crush"
 msgstr "Enamorado/a"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Infatuated"
 msgstr "Apasionado/a"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Dating"
 msgstr "Saliendo con alguien"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unfaithful"
 msgstr "Infiel"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Sex Addict"
 msgstr "Con adicción al sexo"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Friends/Benefits"
 msgstr "Amigos con algo extra"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Casual"
 msgstr "Casual"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Engaged"
 msgstr "Prometido/a"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Married"
 msgstr "Casado/a"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Imaginarily married"
 msgstr "Casado/a en sueños"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Partners"
 msgstr "Pareja"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Cohabiting"
 msgstr "Cohabitando"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Common law"
 msgstr "Matrimonio tradicional"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Happy"
 msgstr "Felíz"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Not looking"
 msgstr "No estoy buscando"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Swinger"
 msgstr "Libertino"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Betrayed"
 msgstr "Engañado/a"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Separated"
 msgstr "Separado/a"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unstable"
 msgstr "Inestable"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Divorced"
 msgstr "Divorciado/a"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Imaginarily divorced"
 msgstr "Divorciado/a en sueños"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Widowed"
 msgstr "Viudo/a"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Uncertain"
 msgstr "Indeterminado"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "It's complicated"
 msgstr "Es complicado"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Don't care"
 msgstr "No me importa"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Ask me"
 msgstr "Pregúnteme"
 
-#: Zotlabs/Module/Stream.php:139 Zotlabs/Widget/Activity_filter.php:149
+#: Code/Module/Stream.php:139 Code/Widget/Activity_filter.php:149
 #: include/network.php:1718
 msgid "Nomad"
 msgstr "Nomad"
 
-#: Zotlabs/Module/Stream.php:143 Zotlabs/Widget/Activity_filter.php:152
+#: Code/Module/Stream.php:143 Code/Widget/Activity_filter.php:152
 #: include/network.php:1714
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
-#: Zotlabs/Module/Stream.php:158
+#: Code/Module/Stream.php:158
 msgid "Access list not found"
 msgstr "No se encuentra el acceso"
 
-#: Zotlabs/Module/Stream.php:202
+#: Code/Module/Stream.php:202
 msgid "No such channel"
 msgstr "No se encuentra el  canal"
 
-#: Zotlabs/Module/Stream.php:288
+#: Code/Module/Stream.php:288
 msgid "Access list is empty"
 msgstr "La lista de acceso está vacía"
 
-#: Zotlabs/Module/Stream.php:302 include/items.php:4553
+#: Code/Module/Stream.php:302 include/items.php:4553
 #, php-format
 msgid "Access list: %s"
 msgstr "Lista de acceso: %s"
 
-#: Zotlabs/Module/Stream.php:345 extend/addon/a/zotpost/Mod_zotpost.php:29
+#: Code/Module/Stream.php:345 extend/addon/a/zotpost/Mod_zotpost.php:29
 msgid "Invalid channel."
 msgstr "El canal no es válido."
 
-#: Zotlabs/Module/Profile_photo.php:502
+#: Code/Module/Profile_photo.php:502
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
@@ -7894,60 +7894,60 @@ msgstr ""
 "La foto de su perfil es visible para cualquiera en Internet y puede ser "
 "distribuida en otros sitios web."
 
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Profile_photo.php:506
 msgid "Use Photo for Profile"
 msgstr "Usar la fotografía para el perfil"
 
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Profile_photo.php:506
 msgid "Change Profile Photo"
 msgstr "Cambiar la foto del perfil"
 
-#: Zotlabs/Module/Poke.php:104
+#: Code/Module/Poke.php:104
 #, php-format
 msgid "You %1$s %2$s"
 msgstr "Usted %1$s%2$s"
 
-#: Zotlabs/Module/Poke.php:120
+#: Code/Module/Poke.php:120
 msgid "Poke App (Not Installed)"
 msgstr "Poke App (No instalado)"
 
-#: Zotlabs/Module/Poke.php:121
+#: Code/Module/Poke.php:121
 msgid "Poke or do something else to somebody"
 msgstr "Dar un toque o otra cosa a alguien"
 
-#: Zotlabs/Module/Poke.php:140
+#: Code/Module/Poke.php:140
 msgid "Poke, prod or do other things to somebody"
 msgstr "Dar un toque, incitar o hacer otras cosas a alguien"
 
-#: Zotlabs/Module/Poke.php:145
+#: Code/Module/Poke.php:145
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: Zotlabs/Module/Poke.php:146
+#: Code/Module/Poke.php:146
 msgid "Choose your default action"
 msgstr "Elija su acción predetermminada"
 
-#: Zotlabs/Module/Profperm.php:41 Zotlabs/Module/Profperm.php:75
+#: Code/Module/Profperm.php:41 Code/Module/Profperm.php:75
 msgid "Invalid profile identifier."
 msgstr "Identificador del perfil no válido"
 
-#: Zotlabs/Module/Profperm.php:129
+#: Code/Module/Profperm.php:129
 msgid "Profile Visibility Editor"
 msgstr "Editor de visibilidad del perfil"
 
-#: Zotlabs/Module/Profperm.php:133
+#: Code/Module/Profperm.php:133
 msgid "Click on a contact to add or remove."
 msgstr "Pulsar en un contacto para añadirlo o eliminarlo."
 
-#: Zotlabs/Module/Profperm.php:142
+#: Code/Module/Profperm.php:142
 msgid "Visible To"
 msgstr "Visible para"
 
-#: Zotlabs/Module/Affinity.php:31
+#: Code/Module/Affinity.php:31
 msgid "Friend Zoom settings updated."
 msgstr "Se han actualizado los ajustes de \"Friend Zoom\"."
 
-#: Zotlabs/Module/Affinity.php:41
+#: Code/Module/Affinity.php:41
 msgid ""
 "This app (when installed) presents a slider control in your connection "
 "editor and also on your stream page. The slider represents your degree of "
@@ -7960,7 +7960,7 @@ msgstr ""
 "alejar el zoom y mostrar las conversaciones sólo de sus amigos más cercanos "
 "o de todos los que están en su stream."
 
-#: Zotlabs/Module/Affinity.php:49
+#: Code/Module/Affinity.php:49
 msgid ""
 "The number below represents the default maximum slider position for your "
 "stream page as a percentage."
@@ -7968,48 +7968,48 @@ msgstr ""
 "El número que aparece a continuación representa la posición máxima del "
 "deslizador por defecto para su página de stream como porcentaje."
 
-#: Zotlabs/Module/Affinity.php:74
+#: Code/Module/Affinity.php:74
 msgid "Default friend zoom in/out"
 msgstr "Ampliar o reducir el zoom de un amigo por defecto"
 
-#: Zotlabs/Module/Affinity.php:75 Zotlabs/Widget/Affinity.php:40
+#: Code/Module/Affinity.php:75 Code/Widget/Affinity.php:40
 msgid "Refresh"
 msgstr "Recargar"
 
-#: Zotlabs/Module/Affinity.php:86
+#: Code/Module/Affinity.php:86
 msgid "Friend Zoom Settings"
 msgstr "Ajustes de \"Friend Zoom\""
 
-#: Zotlabs/Module/Zot_probe.php:18
+#: Code/Module/Zot_probe.php:18
 msgid "Zot6 Probe Diagnostic"
 msgstr "Prueba de diagnóstico de Zot6"
 
-#: Zotlabs/Module/Zot_probe.php:19 Zotlabs/Module/Ap_probe.php:23
+#: Code/Module/Zot_probe.php:19 Code/Module/Ap_probe.php:23
 msgid "Object URL"
 msgstr "URL del objeto"
 
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:24
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:24
 msgid "Authenticated fetch"
 msgstr "Obtención autenticada"
 
-#: Zotlabs/Module/Home.php:161
+#: Code/Module/Home.php:161
 #, php-format
 msgid "Welcome to %s"
 msgstr "Bienvenido a %s"
 
-#: Zotlabs/Module/Oexchange.php:28
+#: Code/Module/Oexchange.php:28
 msgid "Unable to find your site."
 msgstr "No se puede encontrar su sitio."
 
-#: Zotlabs/Module/Oexchange.php:42
+#: Code/Module/Oexchange.php:42
 msgid "Post successful."
 msgstr "Enviado con éxito."
 
-#: Zotlabs/Module/Regmod.php:19
+#: Code/Module/Regmod.php:19
 msgid "Please login."
 msgstr "Por favor, inicie sesión."
 
-#: Zotlabs/Module/Removeaccount.php:49
+#: Code/Module/Removeaccount.php:49
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
@@ -8017,11 +8017,11 @@ msgstr ""
 "La eliminación de cuentas no está permitida hasta después de que hayan "
 "transcurrido 48 horas desde el último cambio de contraseña."
 
-#: Zotlabs/Module/Removeaccount.php:71
+#: Code/Module/Removeaccount.php:71
 msgid "Remove This Account"
 msgstr "Eliminar esta cuenta"
 
-#: Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Removeaccount.php:72
 msgid ""
 "This account and all its channels will be completely removed from this "
 "server. "
@@ -8029,136 +8029,136 @@ msgstr ""
 "Esta cuenta y todos sus canales serán eliminados completamente de este "
 "servidor. "
 
-#: Zotlabs/Module/Removeaccount.php:74 Zotlabs/Module/Settings/Account.php:116
+#: Code/Module/Removeaccount.php:74 Code/Module/Settings/Account.php:116
 msgid "Remove Account"
 msgstr "Eliminar cuenta"
 
-#: Zotlabs/Module/Rmagic.php:44
+#: Code/Module/Rmagic.php:44
 msgid "Authentication failed."
 msgstr "Falló la autenticación."
 
-#: Zotlabs/Module/Rmagic.php:84 boot.php:1727 include/channel.php:2142
+#: Code/Module/Rmagic.php:84 boot.php:1727 include/channel.php:2142
 msgid "Remote Authentication"
 msgstr "Acceso desde su servidor"
 
-#: Zotlabs/Module/Rmagic.php:85 include/channel.php:2143
+#: Code/Module/Rmagic.php:85 include/channel.php:2143
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
 
-#: Zotlabs/Module/Rmagic.php:88 include/channel.php:2144
+#: Code/Module/Rmagic.php:88 include/channel.php:2144
 msgid "Authenticate"
 msgstr "Acceder"
 
-#: Zotlabs/Module/Ap_probe.php:22
+#: Code/Module/Ap_probe.php:22
 msgid "ActivityPub Probe Diagnostic"
 msgstr "Diagnóstico de prueba de ActivityPub"
 
-#: Zotlabs/Module/Tasks.php:106
+#: Code/Module/Tasks.php:106
 msgid "This app provides a simple personal and task list."
 msgstr "Esta aplicación proporciona una simple lista personal de tareas."
 
-#: Zotlabs/Module/Service_limits.php:28
+#: Code/Module/Service_limits.php:28
 msgid "No service class restrictions found."
 msgstr "No se han encontrado restricciones sobre esta clase de servicio."
 
-#: Zotlabs/Module/Settings/Account.php:23
+#: Code/Module/Settings/Account.php:23
 msgid "Not valid email."
 msgstr "Correo electrónico no válido."
 
-#: Zotlabs/Module/Settings/Account.php:27
+#: Code/Module/Settings/Account.php:27
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 "Dirección de correo electrónico protegida. No se puede cambiar a ella."
 
-#: Zotlabs/Module/Settings/Account.php:37
+#: Code/Module/Settings/Account.php:37
 msgid "System failure storing new email. Please try again."
 msgstr ""
 "Fallo de sistema al guardar el nuevo correo electrónico. Por favor, "
 "inténtelo de nuevo."
 
-#: Zotlabs/Module/Settings/Account.php:55
+#: Code/Module/Settings/Account.php:55
 msgid "Password verification failed."
 msgstr "La comprobación de la contraseña ha fallado."
 
-#: Zotlabs/Module/Settings/Account.php:62
+#: Code/Module/Settings/Account.php:62
 msgid "Passwords do not match. Password unchanged."
 msgstr "Las contraseñas no coinciden. La contraseña no se ha cambiado."
 
-#: Zotlabs/Module/Settings/Account.php:66
+#: Code/Module/Settings/Account.php:66
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "No se permiten contraseñas vacías. La contraseña no se ha cambiado."
 
-#: Zotlabs/Module/Settings/Account.php:81
+#: Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr "Contraseña cambiada."
 
-#: Zotlabs/Module/Settings/Account.php:83
+#: Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr ""
 "La actualización de la contraseña ha fallado. Por favor, inténtalo de nuevo."
 
-#: Zotlabs/Module/Settings/Account.php:110
+#: Code/Module/Settings/Account.php:110
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
-#: Zotlabs/Module/Settings/Account.php:111
+#: Code/Module/Settings/Account.php:111
 msgid "Current Password"
 msgstr "Contraseña actual"
 
-#: Zotlabs/Module/Settings/Account.php:112
+#: Code/Module/Settings/Account.php:112
 msgid "Enter New Password"
 msgstr "Escribir una nueva contraseña"
 
-#: Zotlabs/Module/Settings/Account.php:113
+#: Code/Module/Settings/Account.php:113
 msgid "Confirm New Password"
 msgstr "Confirmar la nueva contraseña"
 
-#: Zotlabs/Module/Settings/Account.php:113
+#: Code/Module/Settings/Account.php:113
 msgid "Leave password fields blank unless changing"
 msgstr "Dejar en blanco la contraseña a menos que desee cambiarla."
 
-#: Zotlabs/Module/Settings/Account.php:115
+#: Code/Module/Settings/Account.php:115
 msgid "Email Address:"
 msgstr "Dirección de correo electrónico:"
 
-#: Zotlabs/Module/Settings/Account.php:117
+#: Code/Module/Settings/Account.php:117
 msgid "Remove this account including all its channels"
 msgstr "Eliminar esta cuenta incluyendo todos sus canales"
 
-#: Zotlabs/Module/Settings/Display.php:156
+#: Code/Module/Settings/Display.php:156
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: Zotlabs/Module/Settings/Display.php:199
+#: Code/Module/Settings/Display.php:199
 msgid "Display Settings"
 msgstr "Ajustes de visualización"
 
-#: Zotlabs/Module/Settings/Display.php:200
+#: Code/Module/Settings/Display.php:200
 msgid "Theme Settings"
 msgstr "Ajustes del tema"
 
-#: Zotlabs/Module/Settings/Display.php:201
+#: Code/Module/Settings/Display.php:201
 msgid "Custom Theme Settings"
 msgstr "Ajustes personalizados del tema"
 
-#: Zotlabs/Module/Settings/Display.php:202
+#: Code/Module/Settings/Display.php:202
 msgid "Content Settings"
 msgstr "Ajustes del contenido"
 
-#: Zotlabs/Module/Settings/Display.php:208
+#: Code/Module/Settings/Display.php:208
 msgid "Display Theme:"
 msgstr "Tema gráfico del perfil:"
 
-#: Zotlabs/Module/Settings/Display.php:209
+#: Code/Module/Settings/Display.php:209
 msgid "Select scheme"
 msgstr "Elegir un esquema"
 
-#: Zotlabs/Module/Settings/Display.php:211
+#: Code/Module/Settings/Display.php:211
 msgid "Preload images before rendering the page"
 msgstr "Carga previa de las imágenes antes de generar la página"
 
-#: Zotlabs/Module/Settings/Display.php:211
+#: Code/Module/Settings/Display.php:211
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
@@ -8166,141 +8166,141 @@ msgstr ""
 "El tiempo subjetivo de carga de la página será más largo, pero la página "
 "estará lista cuando se muestre."
 
-#: Zotlabs/Module/Settings/Display.php:212
+#: Code/Module/Settings/Display.php:212
 msgid "Enable user zoom on mobile devices"
 msgstr "Habilitar zoom de usuario en dispositivos móviles"
 
-#: Zotlabs/Module/Settings/Display.php:213
+#: Code/Module/Settings/Display.php:213
 msgid "Update notifications every xx seconds"
 msgstr "Actualizar las notificaciones cada xx segundos"
 
-#: Zotlabs/Module/Settings/Display.php:213
+#: Code/Module/Settings/Display.php:213
 msgid "Minimum of 15 seconds, no maximum"
 msgstr "Mínimo de 15 segundos, sin máximo"
 
-#: Zotlabs/Module/Settings/Display.php:214
+#: Code/Module/Settings/Display.php:214
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Máximo número de conversaciones a cargar en cualquier momento:"
 
-#: Zotlabs/Module/Settings/Display.php:214
+#: Code/Module/Settings/Display.php:214
 msgid "Maximum of 100 items"
 msgstr "Máximo de 100 elementos"
 
-#: Zotlabs/Module/Settings/Display.php:215
+#: Code/Module/Settings/Display.php:215
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostrar emoticonos (smilies) como imágenes"
 
-#: Zotlabs/Module/Settings/Display.php:216
+#: Code/Module/Settings/Display.php:216
 msgid "Provide channel menu in navigation bar"
 msgstr "Proporcionar un menú de canales en la barra de navegación"
 
-#: Zotlabs/Module/Settings/Display.php:216
+#: Code/Module/Settings/Display.php:216
 msgid "Default: channel menu located in app menu"
 msgstr "Predeterminado: menú de canales ubicado en el menú de aplicaciones"
 
-#: Zotlabs/Module/Settings/Display.php:217
+#: Code/Module/Settings/Display.php:217
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Editor de diseño de página del sistema - (avanzado)"
 
-#: Zotlabs/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:220
 msgid "Channel page max height of content (in pixels)"
 msgstr "Altura máxima del contenido de la página del canal (en píxeles)"
 
-#: Zotlabs/Module/Settings/Display.php:220
-#: Zotlabs/Module/Settings/Display.php:221
+#: Code/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:221
 msgid "click to expand content exceeding this height"
 msgstr "haga clic para expandir el contenido que exceda esta altura"
 
-#: Zotlabs/Module/Settings/Display.php:221
+#: Code/Module/Settings/Display.php:221
 msgid "Stream page max height of content (in pixels)"
 msgstr "Altura máxima del contenido de la página de stream (en píxeles)"
 
-#: Zotlabs/Module/Settings/Display.php:222
+#: Code/Module/Settings/Display.php:222
 msgid "Indent threaded comments this many pixels from the parent"
 msgstr ""
 "Los comentarios enhebrados tienen una sangría de tantos píxeles con respecto"
 " al padre"
 
-#: Zotlabs/Module/Settings/Display.php:222
+#: Code/Module/Settings/Display.php:222
 msgid "0-20"
 msgstr "0-20"
 
-#: Zotlabs/Module/Settings/Featured.php:28
+#: Code/Module/Settings/Featured.php:28
 msgid "Affinity Slider settings updated."
 msgstr "Actualización de la configuración del control deslizante de afinidad."
 
-#: Zotlabs/Module/Settings/Featured.php:43
+#: Code/Module/Settings/Featured.php:43
 msgid "No feature settings configured"
 msgstr "No se ha establecido la configuración de los complementos"
 
-#: Zotlabs/Module/Settings/Featured.php:50
+#: Code/Module/Settings/Featured.php:50
 msgid "Default maximum affinity level"
 msgstr "Nivel máximo de afinidad por defecto"
 
-#: Zotlabs/Module/Settings/Featured.php:50
+#: Code/Module/Settings/Featured.php:50
 msgid "0-99 default 99"
 msgstr "0-99 por defecto 99"
 
-#: Zotlabs/Module/Settings/Featured.php:55
+#: Code/Module/Settings/Featured.php:55
 msgid "Default minimum affinity level"
 msgstr "Nivel mínimo de afinidad por defecto"
 
-#: Zotlabs/Module/Settings/Featured.php:55
+#: Code/Module/Settings/Featured.php:55
 msgid "0-99 - default 0"
 msgstr "0-99 - por defecto 0"
 
-#: Zotlabs/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Featured.php:59
 msgid "Affinity Slider Settings"
 msgstr "Ajustes del control deslizante de afinidad"
 
-#: Zotlabs/Module/Settings/Featured.php:72
+#: Code/Module/Settings/Featured.php:72
 msgid "Addon Settings"
 msgstr "Ajustes de los complementos"
 
-#: Zotlabs/Module/Settings/Featured.php:73
+#: Code/Module/Settings/Featured.php:73
 msgid "Please save/submit changes to any panel before opening another."
 msgstr "Guarde o envíe los cambios a cualquier panel antes de abrir otro."
 
-#: Zotlabs/Module/Settings/Features.php:51
-#: Zotlabs/Module/Settings/Network.php:33
+#: Code/Module/Settings/Features.php:51
+#: Code/Module/Settings/Network.php:33
 msgid "Off"
 msgstr "Desactivado"
 
-#: Zotlabs/Module/Settings/Features.php:51
-#: Zotlabs/Module/Settings/Network.php:33
+#: Code/Module/Settings/Features.php:51
+#: Code/Module/Settings/Network.php:33
 msgid "On"
 msgstr "Activado"
 
-#: Zotlabs/Module/Settings/Features.php:59
+#: Code/Module/Settings/Features.php:59
 msgid "Additional Features"
 msgstr "Funcionalidades"
 
-#: Zotlabs/Module/Settings/Network.php:41
+#: Code/Module/Settings/Network.php:41
 msgid "Activity Settings"
 msgstr "Opciones de actividad"
 
-#: Zotlabs/Module/Settings/Network.php:56 include/features.php:383
+#: Code/Module/Settings/Network.php:56 include/features.php:383
 msgid "Search by Date"
 msgstr "Buscar por fecha"
 
-#: Zotlabs/Module/Settings/Network.php:57 include/features.php:384
+#: Code/Module/Settings/Network.php:57 include/features.php:384
 msgid "Ability to select posts by date ranges"
 msgstr "Capacidad de seleccionar entradas por rango de fechas"
 
-#: Zotlabs/Module/Settings/Network.php:64 Zotlabs/Widget/Savedsearch.php:94
+#: Code/Module/Settings/Network.php:64 Code/Widget/Savedsearch.php:94
 #: include/features.php:393
 msgid "Saved Searches"
 msgstr "Búsquedas guardadas"
 
-#: Zotlabs/Module/Settings/Network.php:65 include/features.php:394
+#: Code/Module/Settings/Network.php:65 include/features.php:394
 msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
 
-#: Zotlabs/Module/Settings/Network.php:72 include/features.php:402
+#: Code/Module/Settings/Network.php:72 include/features.php:402
 msgid "Alternate Stream Order"
 msgstr "Orden de stream alternativo"
 
-#: Zotlabs/Module/Settings/Network.php:73 include/features.php:403
+#: Code/Module/Settings/Network.php:73 include/features.php:403
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
@@ -8308,100 +8308,100 @@ msgstr ""
 "Posibilidad de ordenar el stream por última fecha de publicación, última "
 "fecha de comentario o actividades sin hilo"
 
-#: Zotlabs/Module/Settings/Network.php:80 include/features.php:411
+#: Code/Module/Settings/Network.php:80 include/features.php:411
 msgid "Contact Filter"
 msgstr "Filtro de contactos"
 
-#: Zotlabs/Module/Settings/Network.php:81 include/features.php:412
+#: Code/Module/Settings/Network.php:81 include/features.php:412
 msgid "Ability to display only posts of a selected contact"
 msgstr "Posibilidad de mostrar sólo los mensajes de un contacto seleccionado"
 
-#: Zotlabs/Module/Settings/Network.php:88 include/features.php:420
+#: Code/Module/Settings/Network.php:88 include/features.php:420
 msgid "Forum Filter"
 msgstr "Filtro de foro"
 
-#: Zotlabs/Module/Settings/Network.php:89 include/features.php:421
+#: Code/Module/Settings/Network.php:89 include/features.php:421
 msgid "Ability to display only posts of a specific forum"
 msgstr "Posibilidad de mostrar sólo los mensajes de un foro específico"
 
-#: Zotlabs/Module/Settings/Network.php:96 include/features.php:429
+#: Code/Module/Settings/Network.php:96 include/features.php:429
 msgid "Personal Posts Filter"
 msgstr "Filtro de entradas personales"
 
-#: Zotlabs/Module/Settings/Network.php:97 include/features.php:430
+#: Code/Module/Settings/Network.php:97 include/features.php:430
 msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 "Posibilidad de mostrar sólo los mensajes en los que usted haya interactuado"
 
-#: Zotlabs/Module/Settings/Network.php:104 include/features.php:438
+#: Code/Module/Settings/Network.php:104 include/features.php:438
 msgid "Affinity Tool"
 msgstr "Herramienta de afinidad"
 
-#: Zotlabs/Module/Settings/Network.php:105 include/features.php:439
+#: Code/Module/Settings/Network.php:105 include/features.php:439
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrar la actividad del stream por la profundidad de las relaciones"
 
-#: Zotlabs/Module/Settings/Network.php:113 include/features.php:448
+#: Code/Module/Settings/Network.php:113 include/features.php:448
 msgid "Show friend and connection suggestions"
 msgstr "Mostrar a un amigo y sugerencias de conexión"
 
-#: Zotlabs/Module/Settings/Network.php:120 include/features.php:456
+#: Code/Module/Settings/Network.php:120 include/features.php:456
 msgid "Connection Filtering"
 msgstr "Filtrado de conexiones"
 
-#: Zotlabs/Module/Settings/Network.php:121 include/features.php:457
+#: Code/Module/Settings/Network.php:121 include/features.php:457
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
 
-#: Zotlabs/Module/Settings/Oauth.php:37
+#: Code/Module/Settings/Oauth.php:37
 msgid "Name is required"
 msgstr "El nombre es obligatorio"
 
-#: Zotlabs/Module/Settings/Oauth.php:41
+#: Code/Module/Settings/Oauth.php:41
 msgid "Key and Secret are required"
 msgstr "\"Key\" y \"Secret\" son obligatorios"
 
-#: Zotlabs/Module/Settings/Oauth.php:94 Zotlabs/Module/Settings/Oauth.php:122
-#: Zotlabs/Module/Settings/Oauth.php:162
-#: Zotlabs/Module/Settings/Oauth2.php:142
-#: Zotlabs/Module/Settings/Oauth2.php:210
+#: Code/Module/Settings/Oauth.php:94 Code/Module/Settings/Oauth.php:122
+#: Code/Module/Settings/Oauth.php:162
+#: Code/Module/Settings/Oauth2.php:142
+#: Code/Module/Settings/Oauth2.php:210
 msgid "Add application"
 msgstr "Añadir aplicación"
 
-#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth2.php:115
-#: Zotlabs/Module/Settings/Oauth2.php:145
+#: Code/Module/Settings/Oauth.php:97 Code/Module/Settings/Oauth2.php:115
+#: Code/Module/Settings/Oauth2.php:145
 msgid "Name of application"
 msgstr "Nombre de la aplicación"
 
-#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:126
+#: Code/Module/Settings/Oauth.php:98 Code/Module/Settings/Oauth.php:126
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:99
-#: Zotlabs/Module/Settings/Oauth2.php:116
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:146
-#: Zotlabs/Module/Settings/Oauth2.php:147
+#: Code/Module/Settings/Oauth.php:98 Code/Module/Settings/Oauth.php:99
+#: Code/Module/Settings/Oauth2.php:116
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:146
+#: Code/Module/Settings/Oauth2.php:147
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 "Generado automáticamente - si lo desea,  cámbielo. Longitud máxima: 20"
 
-#: Zotlabs/Module/Settings/Oauth.php:99 Zotlabs/Module/Settings/Oauth.php:127
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:147
+#: Code/Module/Settings/Oauth.php:99 Code/Module/Settings/Oauth.php:127
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:147
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: Zotlabs/Module/Settings/Oauth.php:100 Zotlabs/Module/Settings/Oauth.php:128
-#: Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth.php:100 Code/Module/Settings/Oauth.php:128
+#: Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:148
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: Zotlabs/Module/Settings/Oauth.php:100
-#: Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth.php:100
+#: Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:148
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
@@ -8409,90 +8409,90 @@ msgstr ""
 "URI de redirección - dejar en blanco a menos que su aplicación "
 "específicamente lo requiera"
 
-#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Settings/Oauth.php:129
+#: Code/Module/Settings/Oauth.php:101 Code/Module/Settings/Oauth.php:129
 msgid "Icon url"
 msgstr "Dirección del icono"
 
-#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Sources.php:128
-#: Zotlabs/Module/Sources.php:164
+#: Code/Module/Settings/Oauth.php:101 Code/Module/Sources.php:128
+#: Code/Module/Sources.php:164
 msgid "Optional"
 msgstr "Opcional"
 
-#: Zotlabs/Module/Settings/Oauth.php:114
+#: Code/Module/Settings/Oauth.php:114
 msgid "Application not found."
 msgstr "Aplicación no encontrada."
 
-#: Zotlabs/Module/Settings/Oauth.php:161
+#: Code/Module/Settings/Oauth.php:161
 msgid "Connected Apps"
 msgstr "Apps conectadas"
 
-#: Zotlabs/Module/Settings/Oauth.php:165
-#: Zotlabs/Module/Settings/Oauth2.php:213
+#: Code/Module/Settings/Oauth.php:165
+#: Code/Module/Settings/Oauth2.php:213
 msgid "Client key starts with"
 msgstr "La \"client key\" empieza por"
 
-#: Zotlabs/Module/Settings/Oauth.php:166
-#: Zotlabs/Module/Settings/Oauth2.php:214
+#: Code/Module/Settings/Oauth.php:166
+#: Code/Module/Settings/Oauth2.php:214
 msgid "No name"
 msgstr "Sin nombre"
 
-#: Zotlabs/Module/Settings/Oauth.php:167
-#: Zotlabs/Module/Settings/Oauth2.php:215
+#: Code/Module/Settings/Oauth.php:167
+#: Code/Module/Settings/Oauth2.php:215
 msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
-#: Zotlabs/Module/Settings/Oauth2.php:51
+#: Code/Module/Settings/Oauth2.php:51
 msgid "ID and Secret are required"
 msgstr "Se requieren ID y Secret"
 
-#: Zotlabs/Module/Settings/Oauth2.php:112
+#: Code/Module/Settings/Oauth2.php:112
 msgid "Add OAuth2 application"
 msgstr "Añadir aplicación OAuth2"
 
-#: Zotlabs/Module/Settings/Oauth2.php:116
-#: Zotlabs/Module/Settings/Oauth2.php:146
+#: Code/Module/Settings/Oauth2.php:116
+#: Code/Module/Settings/Oauth2.php:146
 msgid "Consumer ID"
 msgstr "ID de Cliente"
 
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:149
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:149
 msgid "Grant Types"
 msgstr "Tipos de permisos"
 
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:149
-#: Zotlabs/Module/Settings/Oauth2.php:150
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:149
+#: Code/Module/Settings/Oauth2.php:150
 msgid "leave blank unless your application specifically requires this"
 msgstr "dejar en blanco a menos que su aplicación lo requiera específicamente"
 
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:150
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:150
 msgid "Authorization scope"
 msgstr "Alcance de la autorización"
 
-#: Zotlabs/Module/Settings/Oauth2.php:133
+#: Code/Module/Settings/Oauth2.php:133
 msgid "OAuth2 Application not found."
 msgstr "No se ha encontrado la aplicación OAuth2."
 
-#: Zotlabs/Module/Settings/Oauth2.php:209
+#: Code/Module/Settings/Oauth2.php:209
 msgid "Connected OAuth2 Apps"
 msgstr "Aplicaciones OAuth2 conectadas"
 
-#: Zotlabs/Module/Settings/Tokens.php:45
+#: Code/Module/Settings/Tokens.php:45
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Este canal tiene un límite de %d tokens"
 
-#: Zotlabs/Module/Settings/Tokens.php:51
+#: Code/Module/Settings/Tokens.php:51
 msgid "Name and Password are required."
 msgstr "Se requiere el nombre y la contraseña."
 
-#: Zotlabs/Module/Settings/Tokens.php:187
+#: Code/Module/Settings/Tokens.php:187
 msgid "Token saved."
 msgstr "Token salvado."
 
-#: Zotlabs/Module/Settings/Tokens.php:258
+#: Code/Module/Settings/Tokens.php:258
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
@@ -8504,7 +8504,7 @@ msgstr ""
 "iniciar sesión, utilizando estas credenciales, para acceder a su contenido "
 "privado."
 
-#: Zotlabs/Module/Settings/Tokens.php:260
+#: Code/Module/Settings/Tokens.php:260
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
@@ -8514,23 +8514,23 @@ msgstr ""
 "acceso a sus amigos y asociados añadiendo la contraseña de inicio de sesión "
 "a cualquier dirección URL, como se muestra. Ejemplos: "
 
-#: Zotlabs/Module/Settings/Tokens.php:295
+#: Code/Module/Settings/Tokens.php:295
 msgid "Guest Access Tokens"
 msgstr "Tokens de acceso para invitados"
 
-#: Zotlabs/Module/Settings/Tokens.php:303
+#: Code/Module/Settings/Tokens.php:303
 msgid "Login Name"
 msgstr "Nombre de inicio de sesión"
 
-#: Zotlabs/Module/Settings/Tokens.php:304
+#: Code/Module/Settings/Tokens.php:304
 msgid "Login Password"
 msgstr "Contraseña de inicio de sesión"
 
-#: Zotlabs/Module/Settings/Tokens.php:305
+#: Code/Module/Settings/Tokens.php:305
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Expira (aaaa-mm-dd)"
 
-#: Zotlabs/Module/Settings/Tokens.php:313
+#: Code/Module/Settings/Tokens.php:313
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -8542,36 +8542,36 @@ msgstr ""
 " los cuales tienen una prioridad más alta que los ajustes individuales. "
 "No puede cambiar estos ajustes aquí."
 
-#: Zotlabs/Module/Settings/Channel.php:434 include/conversation.php:1353
+#: Code/Module/Settings/Channel.php:434 include/conversation.php:1353
 msgid "Restricted - from connections only"
 msgstr "Restringido: sólo desde las conexiones"
 
-#: Zotlabs/Module/Settings/Channel.php:435 include/conversation.php:1354
+#: Code/Module/Settings/Channel.php:435 include/conversation.php:1354
 msgid "Semi-public - from anybody that can be identified"
 msgstr "Semipúblico: de cualquier persona que pueda ser identificada"
 
-#: Zotlabs/Module/Settings/Channel.php:436 include/conversation.php:1355
+#: Code/Module/Settings/Channel.php:436 include/conversation.php:1355
 msgid "Public - from anybody on the internet"
 msgstr "Público: de cualquier persona en internet"
 
-#: Zotlabs/Module/Settings/Channel.php:514
+#: Code/Module/Settings/Channel.php:514
 msgid "Publish your profile in the network directory"
 msgstr "Publicar su perfil en el directorio de la red"
 
-#: Zotlabs/Module/Settings/Channel.php:519
+#: Code/Module/Settings/Channel.php:519
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?"
 
-#: Zotlabs/Module/Settings/Channel.php:523
-#: Zotlabs/Module/Settings/Channel.php:537
+#: Code/Module/Settings/Channel.php:523
+#: Code/Module/Settings/Channel.php:537
 msgid "or"
 msgstr "o"
 
-#: Zotlabs/Module/Settings/Channel.php:529
+#: Code/Module/Settings/Channel.php:529
 msgid "Your channel address is"
 msgstr "Su dirección de canal es"
 
-#: Zotlabs/Module/Settings/Channel.php:531
+#: Code/Module/Settings/Channel.php:531
 msgid ""
 "Friends using compatible applications can use this address to connect with "
 "you."
@@ -8579,27 +8579,27 @@ msgstr ""
 "Los amigos que usan aplicaciones compatibles pueden usar esta dirección para"
 " conectarse con usted."
 
-#: Zotlabs/Module/Settings/Channel.php:533
+#: Code/Module/Settings/Channel.php:533
 msgid "Your files/photos are accessible as a network drive at"
 msgstr "Sus archivos/fotos son accesibles como una unidad de red en "
 
-#: Zotlabs/Module/Settings/Channel.php:535
+#: Code/Module/Settings/Channel.php:535
 msgid "(Windows)"
 msgstr "(Windows)"
 
-#: Zotlabs/Module/Settings/Channel.php:536
+#: Code/Module/Settings/Channel.php:536
 msgid "(other platforms)"
 msgstr "(otras plataformas)"
 
-#: Zotlabs/Module/Settings/Channel.php:584
+#: Code/Module/Settings/Channel.php:584
 msgid "Automatic membership approval"
 msgstr "Aprobación automática de nuevos miembros"
 
-#: Zotlabs/Module/Settings/Channel.php:589
+#: Code/Module/Settings/Channel.php:589
 msgid "Friend-of-friend conversations"
 msgstr "Conversaciones entre amigos"
 
-#: Zotlabs/Module/Settings/Channel.php:589
+#: Code/Module/Settings/Channel.php:589
 msgid ""
 "Import public third-party conversations in which your connections "
 "participate."
@@ -8607,55 +8607,55 @@ msgstr ""
 "Importar conversaciones públicas de terceros en las que participen sus "
 "conexiones."
 
-#: Zotlabs/Module/Settings/Channel.php:593
+#: Code/Module/Settings/Channel.php:593
 msgid "Enable ActivityPub protocol"
 msgstr "Activar el protocolo ActivityPub"
 
-#: Zotlabs/Module/Settings/Channel.php:593
+#: Code/Module/Settings/Channel.php:593
 msgid "ActivityPub is an emerging internet standard for social communications"
 msgstr ""
 "ActivityPub es un estándar emergente de Internet para las comunicaciones "
 "sociales"
 
-#: Zotlabs/Module/Settings/Channel.php:626
+#: Code/Module/Settings/Channel.php:626
 msgid "Channel Settings"
 msgstr "Ajustes del canal"
 
-#: Zotlabs/Module/Settings/Channel.php:632
+#: Code/Module/Settings/Channel.php:632
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: Zotlabs/Module/Settings/Channel.php:633
+#: Code/Module/Settings/Channel.php:633
 msgid "Full name"
 msgstr "Nombre completo "
 
-#: Zotlabs/Module/Settings/Channel.php:635
+#: Code/Module/Settings/Channel.php:635
 msgid "Your timezone"
 msgstr "Su zona horaria "
 
-#: Zotlabs/Module/Settings/Channel.php:635
+#: Code/Module/Settings/Channel.php:635
 msgid "This is important for showing the correct time on shared events"
 msgstr ""
 "Esto es importante para mostrar la hora correcta en eventos compartidos"
 
-#: Zotlabs/Module/Settings/Channel.php:636
+#: Code/Module/Settings/Channel.php:636
 msgid "Default post location"
 msgstr "Localización predeterminada de la entrada"
 
-#: Zotlabs/Module/Settings/Channel.php:636
+#: Code/Module/Settings/Channel.php:636
 msgid "Optional geographical location to display on your posts"
 msgstr "Ubicación geográfica opcional para mostrar en sus entradas"
 
-#: Zotlabs/Module/Settings/Channel.php:637
+#: Code/Module/Settings/Channel.php:637
 msgid "Obtain post location from your web browser or device"
 msgstr ""
 "Obtener la ubicación de la publicación desde su navegador web o dispositivo"
 
-#: Zotlabs/Module/Settings/Channel.php:639
+#: Code/Module/Settings/Channel.php:639
 msgid "Adult content"
 msgstr "Contenido para adultos"
 
-#: Zotlabs/Module/Settings/Channel.php:639
+#: Code/Module/Settings/Channel.php:639
 msgid ""
 "Enable to indicate if this channel frequently or regularly publishes adult "
 "content. (Please also tag any adult material and/or nudity with #NSFW)"
@@ -8664,246 +8664,246 @@ msgstr ""
 "regularidad contenido para adultos. (Por favor, también etiquete cualquier "
 "material para adultos y/o desnudos con #NSFW)"
 
-#: Zotlabs/Module/Settings/Channel.php:641
+#: Code/Module/Settings/Channel.php:641
 msgid "Security and Privacy"
 msgstr "Seguridad y Privacidad"
 
-#: Zotlabs/Module/Settings/Channel.php:643
+#: Code/Module/Settings/Channel.php:643
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar"
 
-#: Zotlabs/Module/Settings/Channel.php:645
+#: Code/Module/Settings/Channel.php:645
 msgid "Hide my online presence"
 msgstr "Ocultar mi presencia en línea"
 
-#: Zotlabs/Module/Settings/Channel.php:645
+#: Code/Module/Settings/Channel.php:645
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Evitar mostrar en su perfil que está en línea"
 
-#: Zotlabs/Module/Settings/Channel.php:646
+#: Code/Module/Settings/Channel.php:646
 msgid "Allow others to view your friends and connections"
 msgstr "Permitir que otros vean a sus amigos y conexiones"
 
-#: Zotlabs/Module/Settings/Channel.php:650
+#: Code/Module/Settings/Channel.php:650
 msgid "Forbid indexing of your channel content by search engines"
 msgstr ""
 "Prohibir la indexación del contenido de su canal por los motores de búsqueda"
 
-#: Zotlabs/Module/Settings/Channel.php:651
+#: Code/Module/Settings/Channel.php:651
 msgid "Disable acceptance of comments on my posts after this many days"
 msgstr ""
 "Desactivar la aceptación de comentarios en mis posts después de este número "
 "de días "
 
-#: Zotlabs/Module/Settings/Channel.php:651
+#: Code/Module/Settings/Channel.php:651
 msgid "Leave unset or enter 0 to allow comments indefinitely"
 msgstr ""
 "Dejar sin definir o introducir 0 para permitir los comentarios "
 "indefinidamente"
 
-#: Zotlabs/Module/Settings/Channel.php:652
+#: Code/Module/Settings/Channel.php:652
 msgid "Allow others to tag your posts"
 msgstr "Permitir a otros etiquetar sus publicaciones"
 
-#: Zotlabs/Module/Settings/Channel.php:652
+#: Code/Module/Settings/Channel.php:652
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 "A menudo usado por la comunidad para marcar contenido inapropiado de forma "
 "retroactiva."
 
-#: Zotlabs/Module/Settings/Channel.php:654
+#: Code/Module/Settings/Channel.php:654
 msgid "Channel Permission Limits"
 msgstr "Límites de los permisos del canal"
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "Expire conversations you have not participated in after this many days"
 msgstr ""
 "Caducar las conversaciones en las que no haya participado después de este "
 "número de días "
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "0 or blank to use the website limit."
 msgstr "0 o en blanco para usar el límite del sitio web."
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Este sitio web caduca después de %d días."
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "This website does not provide an expiration policy."
 msgstr "Este sitio no ofrece una política de caducidad."
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 "El límite del sitio web tiene prioridad si es inferior a su propio límite."
 
-#: Zotlabs/Module/Settings/Channel.php:657
+#: Code/Module/Settings/Channel.php:657
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo de solicitudes de amistad por día:"
 
-#: Zotlabs/Module/Settings/Channel.php:657
+#: Code/Module/Settings/Channel.php:657
 msgid "May reduce spam activity"
 msgstr "Podría reducir la actividad de spam"
 
-#: Zotlabs/Module/Settings/Channel.php:658
+#: Code/Module/Settings/Channel.php:658
 msgid "Default Access List"
 msgstr "Lista de acceso predeterminada"
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"
 
-#: Zotlabs/Module/Settings/Channel.php:661
+#: Code/Module/Settings/Channel.php:661
 msgid "Profile to assign new connections"
 msgstr "Perfil para asignar a las nuevas conexiones"
 
-#: Zotlabs/Module/Settings/Channel.php:672
+#: Code/Module/Settings/Channel.php:672
 msgid "Channel type and privacy"
 msgstr "Tipo de canal y privacidad"
 
-#: Zotlabs/Module/Settings/Channel.php:673
+#: Code/Module/Settings/Channel.php:673
 msgid "Default Permissions Group"
 msgstr "Grupo de permisos predeterminado"
 
-#: Zotlabs/Module/Settings/Channel.php:679
+#: Code/Module/Settings/Channel.php:679
 msgid "Maximum direct messages per day from unknown people:"
 msgstr "Máximo de mensajes directos al día de personas desconocidas: "
 
-#: Zotlabs/Module/Settings/Channel.php:679
+#: Code/Module/Settings/Channel.php:679
 msgid ""
 "Useful to reduce spamming if you allow direct messages from unknown people"
 msgstr ""
 "Útil para reducir el spam si permite los mensajes directos de personas "
 "desconocidas"
 
-#: Zotlabs/Module/Settings/Channel.php:688
+#: Code/Module/Settings/Channel.php:688
 msgid "By default post a status message when:"
 msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
-#: Zotlabs/Module/Settings/Channel.php:689
+#: Code/Module/Settings/Channel.php:689
 msgid "accepting a friend request"
 msgstr "Acepte una solicitud de amistad"
 
-#: Zotlabs/Module/Settings/Channel.php:690
+#: Code/Module/Settings/Channel.php:690
 msgid "joining a forum/community"
 msgstr "al unirse a un foro o comunidad"
 
-#: Zotlabs/Module/Settings/Channel.php:691
+#: Code/Module/Settings/Channel.php:691
 msgid "making an interesting profile change"
 msgstr "Realice un cambio interesante en su perfil"
 
-#: Zotlabs/Module/Settings/Channel.php:692
+#: Code/Module/Settings/Channel.php:692
 msgid "Send a notification email when:"
 msgstr "Enviar una notificación por correo electrónico cuando:"
 
-#: Zotlabs/Module/Settings/Channel.php:693
+#: Code/Module/Settings/Channel.php:693
 msgid "You receive a connection request"
 msgstr "Reciba una solicitud de conexión"
 
-#: Zotlabs/Module/Settings/Channel.php:695
+#: Code/Module/Settings/Channel.php:695
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en la página de su perfil (\"muro\")"
 
-#: Zotlabs/Module/Settings/Channel.php:696
+#: Code/Module/Settings/Channel.php:696
 msgid "Someone writes a followup comment"
 msgstr "Alguien escriba un comentario sobre sus publicaciones"
 
-#: Zotlabs/Module/Settings/Channel.php:697
+#: Code/Module/Settings/Channel.php:697
 msgid "Someone shares a followed conversation"
 msgstr "Alguien comparte una conversación seguida"
 
-#: Zotlabs/Module/Settings/Channel.php:698
+#: Code/Module/Settings/Channel.php:698
 msgid "You receive a direct (private) message"
 msgstr "Recibe un mensaje directo (privado)"
 
-#: Zotlabs/Module/Settings/Channel.php:700
+#: Code/Module/Settings/Channel.php:700
 msgid "You are tagged in a post"
 msgstr "Usted sea etiquetado en una publicación"
 
-#: Zotlabs/Module/Settings/Channel.php:703
+#: Code/Module/Settings/Channel.php:703
 msgid "Someone likes your post/comment"
 msgstr "Alguien muestre agrado por su entrada o comentario"
 
-#: Zotlabs/Module/Settings/Channel.php:706
+#: Code/Module/Settings/Channel.php:706
 msgid "Show visual notifications including:"
 msgstr "Mostrar notificaciones visuales que incluyan:"
 
-#: Zotlabs/Module/Settings/Channel.php:708
+#: Code/Module/Settings/Channel.php:708
 msgid "Unseen stream activity"
 msgstr "Actividad no vista del stream"
 
-#: Zotlabs/Module/Settings/Channel.php:709
+#: Code/Module/Settings/Channel.php:709
 msgid "Unseen channel activity"
 msgstr "Actividad no vista en el canal"
 
-#: Zotlabs/Module/Settings/Channel.php:710
+#: Code/Module/Settings/Channel.php:710
 msgid "Unseen direct messages"
 msgstr "Mensajes directos no vistos"
 
-#: Zotlabs/Module/Settings/Channel.php:710
-#: Zotlabs/Module/Settings/Channel.php:715
-#: Zotlabs/Module/Settings/Channel.php:716
-#: Zotlabs/Module/Settings/Channel.php:717
+#: Code/Module/Settings/Channel.php:710
+#: Code/Module/Settings/Channel.php:715
+#: Code/Module/Settings/Channel.php:716
+#: Code/Module/Settings/Channel.php:717
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: Zotlabs/Module/Settings/Channel.php:711
+#: Code/Module/Settings/Channel.php:711
 msgid "Upcoming events"
 msgstr "Próximos eventos"
 
-#: Zotlabs/Module/Settings/Channel.php:712
+#: Code/Module/Settings/Channel.php:712
 msgid "Events today"
 msgstr "Eventos de hoy"
 
-#: Zotlabs/Module/Settings/Channel.php:713
+#: Code/Module/Settings/Channel.php:713
 msgid "Upcoming birthdays"
 msgstr "Próximos cumpleaños"
 
-#: Zotlabs/Module/Settings/Channel.php:713
+#: Code/Module/Settings/Channel.php:713
 msgid "Not available in all themes"
 msgstr "No disponible en todos los temas"
 
-#: Zotlabs/Module/Settings/Channel.php:714
+#: Code/Module/Settings/Channel.php:714
 msgid "System (personal) notifications"
 msgstr "Notificaciones del sistema (personales)"
 
-#: Zotlabs/Module/Settings/Channel.php:715
+#: Code/Module/Settings/Channel.php:715
 msgid "System info messages"
 msgstr "Mensajes de información del sistema"
 
-#: Zotlabs/Module/Settings/Channel.php:716
+#: Code/Module/Settings/Channel.php:716
 msgid "System critical alerts"
 msgstr "Alertas críticas del sistema"
 
-#: Zotlabs/Module/Settings/Channel.php:717
+#: Code/Module/Settings/Channel.php:717
 msgid "New connections"
 msgstr "Nuevas conexiones"
 
-#: Zotlabs/Module/Settings/Channel.php:718
+#: Code/Module/Settings/Channel.php:718
 msgid "System Registrations"
 msgstr "Registros del sistema"
 
-#: Zotlabs/Module/Settings/Channel.php:720
+#: Code/Module/Settings/Channel.php:720
 msgid "Unseen public stream activity"
 msgstr "Actividad no vista del stream público"
 
-#: Zotlabs/Module/Settings/Channel.php:721
+#: Code/Module/Settings/Channel.php:721
 msgid "Unseen likes and dislikes"
 msgstr "Los \"me gusta\" y \"no me gusta\" no vistos"
 
-#: Zotlabs/Module/Settings/Channel.php:722
+#: Code/Module/Settings/Channel.php:722
 msgid "Unseen forum posts"
 msgstr "Entradas no vistas en el foro"
 
-#: Zotlabs/Module/Settings/Channel.php:723
+#: Code/Module/Settings/Channel.php:723
 msgid "Reported content"
 msgstr "Contenido reportado"
 
-#: Zotlabs/Module/Settings/Channel.php:724
+#: Code/Module/Settings/Channel.php:724
 msgid ""
 "Desktop notifications are unavailable because the required browser "
 "permission has not been granted"
@@ -8911,15 +8911,15 @@ msgstr ""
 "Las notificaciones de escritorio no están disponibles porque no se ha "
 "concedido el permiso necesario al navegador"
 
-#: Zotlabs/Module/Settings/Channel.php:725
+#: Code/Module/Settings/Channel.php:725
 msgid "Grant permission"
 msgstr "Conceder permiso"
 
-#: Zotlabs/Module/Settings/Channel.php:726
+#: Code/Module/Settings/Channel.php:726
 msgid "Email notifications sent from (hostname)"
 msgstr "Notificaciones por correo electrónico enviadas desde (nombre de host)"
 
-#: Zotlabs/Module/Settings/Channel.php:726
+#: Code/Module/Settings/Channel.php:726
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple locations, set this to your "
@@ -8930,43 +8930,43 @@ msgstr ""
 "preferida. Esto evitará la duplicación de notificaciones por correo "
 "electrónico. Ejemplo: %s"
 
-#: Zotlabs/Module/Settings/Channel.php:727
+#: Code/Module/Settings/Channel.php:727
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
 "Mostrar nuevos mensajes en el muro, mensajes privados y conexiones en Avisos"
 
-#: Zotlabs/Module/Settings/Channel.php:728
+#: Code/Module/Settings/Channel.php:728
 msgid "Accept messages from strangers which mention you"
 msgstr "Aceptar mensajes de desconocidos que le mencionen"
 
-#: Zotlabs/Module/Settings/Channel.php:728
+#: Code/Module/Settings/Channel.php:728
 msgid "This setting bypasses normal permissions"
 msgstr "Este ajuste evita los permisos normales"
 
-#: Zotlabs/Module/Settings/Channel.php:729
+#: Code/Module/Settings/Channel.php:729
 msgid ""
 "Accept messages from strangers which include any of the following hashtags"
 msgstr ""
 "Aceptar mensajes de desconocidos que incluyan cualquiera de los siguientes "
 "hashtags"
 
-#: Zotlabs/Module/Settings/Channel.php:729
+#: Code/Module/Settings/Channel.php:729
 msgid "comma separated, do not include the #"
 msgstr "separados por comas, no incluyen el #"
 
-#: Zotlabs/Module/Settings/Channel.php:730
+#: Code/Module/Settings/Channel.php:730
 msgid "Notify me of events this many days in advance"
 msgstr "Avisarme de los eventos con algunos días de antelación"
 
-#: Zotlabs/Module/Settings/Channel.php:730
+#: Code/Module/Settings/Channel.php:730
 msgid "Must be greater than 0"
 msgstr "Debe ser mayor que 0"
 
-#: Zotlabs/Module/Settings/Channel.php:735
+#: Code/Module/Settings/Channel.php:735
 msgid "Date and time"
 msgstr "Fecha y hora"
 
-#: Zotlabs/Module/Settings/Channel.php:736
+#: Code/Module/Settings/Channel.php:736
 msgid ""
 "This section is reserved for use by optional addons and apps to provide "
 "additional settings."
@@ -8974,40 +8974,40 @@ msgstr ""
 "Esta sección está reservada para ser utilizada por los complementos y "
 "aplicaciones opcionales para proporcionar ajustes adicionales."
 
-#: Zotlabs/Module/Settings/Channel.php:737
+#: Code/Module/Settings/Channel.php:737
 msgid "Advanced Account/Page Type Settings"
 msgstr "Ajustes avanzados de la cuenta y de los tipos de página"
 
-#: Zotlabs/Module/Settings/Channel.php:738
+#: Code/Module/Settings/Channel.php:738
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
 
-#: Zotlabs/Module/Settings/Channel.php:741
+#: Code/Module/Settings/Channel.php:741
 msgid "Default photo upload folder name"
 msgstr "Nombre predeterminado de la carpeta de carga de fotos"
 
-#: Zotlabs/Module/Settings/Channel.php:741
-#: Zotlabs/Module/Settings/Channel.php:742
+#: Code/Module/Settings/Channel.php:741
+#: Code/Module/Settings/Channel.php:742
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - año en curso, %m - mes actual"
 
-#: Zotlabs/Module/Settings/Channel.php:742
+#: Code/Module/Settings/Channel.php:742
 msgid "Default file upload folder name"
 msgstr "Nombre predeterminado de la carpeta de carga de archivos"
 
-#: Zotlabs/Module/Settings/Channel.php:744
+#: Code/Module/Settings/Channel.php:744
 msgid "Personal menu to display in your channel pages"
 msgstr "Menú personal que debe mostrarse en las páginas de su canal"
 
-#: Zotlabs/Module/Settings/Channel.php:746
+#: Code/Module/Settings/Channel.php:746
 msgid "Remove this channel."
 msgstr "Eliminar este canal."
 
-#: Zotlabs/Module/Settings/Channel.php:747
+#: Code/Module/Settings/Channel.php:747
 msgid "Mentions should display"
 msgstr "Deben mostrarse las menciones"
 
-#: Zotlabs/Module/Settings/Channel.php:747
+#: Code/Module/Settings/Channel.php:747
 msgid ""
 "Changes to this setting are applied to new posts/comments only. It is not "
 "retroactive."
@@ -9015,74 +9015,74 @@ msgstr ""
 "Los cambios en esta configuración se aplican solo a las nuevas entradas o "
 "comentarios. No son retroactivos."
 
-#: Zotlabs/Module/Settings/Channel.php:749
+#: Code/Module/Settings/Channel.php:749
 msgid "the channel display name [example: @Barbara Jenkins]"
 msgstr "el nombre de pantalla del canal [por ejemplo: @Barbara Jenkins]"
 
-#: Zotlabs/Module/Settings/Channel.php:750
+#: Code/Module/Settings/Channel.php:750
 msgid "the channel nickname [example: @barbara1976]"
 msgstr "el alias del canal [por ejemplo: @barbara1976]"
 
-#: Zotlabs/Module/Settings/Channel.php:751
+#: Code/Module/Settings/Channel.php:751
 msgid "combined [example: @Barbara Jenkins (barbara1976)]"
 msgstr "combinados [por ejemplo: @Barbara Jenkins (barbara1976)]"
 
-#: Zotlabs/Module/Settings/Channel.php:752
+#: Code/Module/Settings/Channel.php:752
 msgid "no preference, use the system default"
 msgstr "sin preferencia, usar el predeterminado del sistema"
 
-#: Zotlabs/Module/Settings/Channel.php:755
+#: Code/Module/Settings/Channel.php:755
 msgid "Calendar week begins on"
 msgstr "La semana del calendario empieza el "
 
-#: Zotlabs/Module/Settings/Channel.php:755
+#: Code/Module/Settings/Channel.php:755
 msgid "This varies by country/culture"
 msgstr "Esto varía según el país o la cultura"
 
-#: Zotlabs/Module/Settings/Channel.php:756 include/js_strings.php:93
+#: Code/Module/Settings/Channel.php:756 include/js_strings.php:93
 #: include/text.php:1433
 msgid "Sunday"
 msgstr "domingo"
 
-#: Zotlabs/Module/Settings/Channel.php:757 include/js_strings.php:94
+#: Code/Module/Settings/Channel.php:757 include/js_strings.php:94
 #: include/text.php:1433
 msgid "Monday"
 msgstr "lunes"
 
-#: Zotlabs/Module/Settings/Channel.php:758 include/js_strings.php:95
+#: Code/Module/Settings/Channel.php:758 include/js_strings.php:95
 #: include/text.php:1433
 msgid "Tuesday"
 msgstr "martes"
 
-#: Zotlabs/Module/Settings/Channel.php:759 include/js_strings.php:96
+#: Code/Module/Settings/Channel.php:759 include/js_strings.php:96
 #: include/text.php:1433
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: Zotlabs/Module/Settings/Channel.php:760 include/js_strings.php:97
+#: Code/Module/Settings/Channel.php:760 include/js_strings.php:97
 #: include/text.php:1433
 msgid "Thursday"
 msgstr "jueves"
 
-#: Zotlabs/Module/Settings/Channel.php:761 include/js_strings.php:98
+#: Code/Module/Settings/Channel.php:761 include/js_strings.php:98
 #: include/text.php:1433
 msgid "Friday"
 msgstr "viernes"
 
-#: Zotlabs/Module/Settings/Channel.php:762 include/js_strings.php:99
+#: Code/Module/Settings/Channel.php:762 include/js_strings.php:99
 #: include/text.php:1433
 msgid "Saturday"
 msgstr "sábado"
 
-#: Zotlabs/Module/Settings/Permcats.php:31
+#: Code/Module/Settings/Permcats.php:31
 msgid "Permission Name is required."
 msgstr "El nombre del permiso es obligatorio."
 
-#: Zotlabs/Module/Settings/Permcats.php:50
+#: Code/Module/Settings/Permcats.php:50
 msgid "Permission role saved."
 msgstr "Permisos de rol guardados."
 
-#: Zotlabs/Module/Settings/Permcats.php:77
+#: Code/Module/Settings/Permcats.php:77
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
@@ -9090,71 +9090,71 @@ msgstr ""
 "Utilice este formulario para crear reglas de permiso para varias clases de "
 "personas o conexiones."
 
-#: Zotlabs/Module/Settings/Permcats.php:127
-#: Zotlabs/Widget/Settings_menu.php:110
+#: Code/Module/Settings/Permcats.php:127
+#: Code/Widget/Settings_menu.php:110
 msgid "Permission Roles"
 msgstr "Permisos de roles"
 
-#: Zotlabs/Module/Settings/Permcats.php:135
+#: Code/Module/Settings/Permcats.php:135
 msgid "Role name"
 msgstr "Nombre del rol "
 
-#: Zotlabs/Module/Subthread.php:139
+#: Code/Module/Subthread.php:139
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s está siguiendo %3$s de %2$s"
 
-#: Zotlabs/Module/Subthread.php:142
+#: Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s ha dejado de seguir %3$s de %2$s"
 
-#: Zotlabs/Module/Sharedwithme.php:106
+#: Code/Module/Sharedwithme.php:106
 msgid "Files: shared with me"
 msgstr "Ficheros: compartidos conmigo"
 
-#: Zotlabs/Module/Sharedwithme.php:108
+#: Code/Module/Sharedwithme.php:108
 msgid "NEW"
 msgstr "NUEVO"
 
-#: Zotlabs/Module/Sharedwithme.php:109 Zotlabs/Storage/Browser.php:315
+#: Code/Module/Sharedwithme.php:109 Code/Storage/Browser.php:315
 #: include/text.php:1540
 msgid "Size"
 msgstr "Tamaño"
 
-#: Zotlabs/Module/Sharedwithme.php:110 Zotlabs/Storage/Browser.php:316
+#: Code/Module/Sharedwithme.php:110 Code/Storage/Browser.php:316
 msgid "Last Modified"
 msgstr "Última modificación"
 
-#: Zotlabs/Module/Sharedwithme.php:111
+#: Code/Module/Sharedwithme.php:111
 msgid "Remove all files"
 msgstr "Eliminar todos los ficheros"
 
-#: Zotlabs/Module/Sharedwithme.php:112
+#: Code/Module/Sharedwithme.php:112
 msgid "Remove this file"
 msgstr "Eliminar este fichero"
 
-#: Zotlabs/Module/Siteinfo.php:34
+#: Code/Module/Siteinfo.php:34
 msgid "About this site"
 msgstr "Acerca de este sitio"
 
-#: Zotlabs/Module/Siteinfo.php:36
+#: Code/Module/Siteinfo.php:36
 msgid "Site Name"
 msgstr "Nombre del sitio"
 
-#: Zotlabs/Module/Siteinfo.php:40
+#: Code/Module/Siteinfo.php:40
 msgid "Administrator"
 msgstr "Administrador"
 
-#: Zotlabs/Module/Siteinfo.php:43
+#: Code/Module/Siteinfo.php:43
 msgid "Software and Project information"
 msgstr "Información sobre el software y el proyecto"
 
-#: Zotlabs/Module/Siteinfo.php:44
+#: Code/Module/Siteinfo.php:44
 msgid "This site is powered by $Projectname"
 msgstr "Este sitio funciona con $Projectname"
 
-#: Zotlabs/Module/Siteinfo.php:45
+#: Code/Module/Siteinfo.php:45
 msgid ""
 "Federated and decentralised networking and identity services provided by "
 "Nomad"
@@ -9162,28 +9162,28 @@ msgstr ""
 "Servicios de red e identidad federados y descentralizados proporcionados por"
 " Nomad"
 
-#: Zotlabs/Module/Siteinfo.php:49
+#: Code/Module/Siteinfo.php:49
 msgid "Protocols:"
 msgstr "Protocolos: "
 
-#: Zotlabs/Module/Siteinfo.php:51
+#: Code/Module/Siteinfo.php:51
 #, php-format
 msgid "Version %s"
 msgstr "Versión %s"
 
-#: Zotlabs/Module/Siteinfo.php:52
+#: Code/Module/Siteinfo.php:52
 msgid "Project homepage"
 msgstr "Página principal del proyecto"
 
-#: Zotlabs/Module/Siteinfo.php:53
+#: Code/Module/Siteinfo.php:53
 msgid "Developer homepage"
 msgstr "Página principal del desarrollador"
 
-#: Zotlabs/Module/Uexport.php:64 Zotlabs/Module/Uexport.php:65
+#: Code/Module/Uexport.php:64 Code/Module/Uexport.php:65
 msgid "Export Channel"
 msgstr "Exportar el canal"
 
-#: Zotlabs/Module/Uexport.php:66
+#: Code/Module/Uexport.php:66
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
@@ -9194,11 +9194,11 @@ msgstr ""
 "puede usarse para importar sus datos a un nuevo servidor, pero no incluye su"
 " contenido."
 
-#: Zotlabs/Module/Uexport.php:67
+#: Code/Module/Uexport.php:67
 msgid "Export Content"
 msgstr "Exportar contenidos"
 
-#: Zotlabs/Module/Uexport.php:68
+#: Code/Module/Uexport.php:68
 msgid ""
 "Export your channel information and recent content to a JSON backup that can"
 " be restored or imported to another server hub. This backs up all of your "
@@ -9212,11 +9212,11 @@ msgstr ""
 "publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea"
 " paciente, la descarga puede tardar varios minutos en comenzar."
 
-#: Zotlabs/Module/Uexport.php:70
+#: Code/Module/Uexport.php:70
 msgid "Export your posts from a given year."
 msgstr "Exporta sus publicaciones de un año dado."
 
-#: Zotlabs/Module/Uexport.php:72
+#: Code/Module/Uexport.php:72
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -9229,7 +9229,7 @@ msgstr ""
 "agotamiento de la memoria del servidor hub), por favor, intente de nuevo la "
 "selección de un rango de fechas más pequeño."
 
-#: Zotlabs/Module/Uexport.php:73
+#: Code/Module/Uexport.php:73
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 
-#: Zotlabs/Module/Uexport.php:74
+#: Code/Module/Uexport.php:74
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
@@ -9247,7 +9247,7 @@ msgstr ""
 "Para seleccionar todos los mensajes de un mes determinado, como el de enero "
 "de este año, visite %2$s"
 
-#: Zotlabs/Module/Uexport.php:75
+#: Code/Module/Uexport.php:75
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:70
+#: ../../Code/Module/Uexport.php:70
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
@@ -1779,7 +1779,7 @@ msgstr ""
 "Pour sélectionner toutes les publications pour un mois donné, par exemple "
 "janvier, visitez %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:71
+#: ../../Code/Module/Uexport.php:71
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting "
@@ -1791,7 +1791,7 @@ msgstr ""
 "de meilleurs résultats merci de les importer par ordre chronologique (les "
 "plus anciens d'abord)."
 
-#: ../../Zotlabs/Module/Photomap.php:12
+#: ../../Code/Module/Photomap.php:12
 msgid ""
 "This app provides a displayable map when viewing detail of photos that "
 "contain location information."
@@ -1799,11 +1799,11 @@ msgstr ""
 "Cette application permet d'afficher une carte lors de la visualisation d'une"
 " photo contenant des informations de géolocalisation."
 
-#: ../../Zotlabs/Module/Photomap.php:20
+#: ../../Code/Module/Photomap.php:20
 msgid "This app is currently installed."
 msgstr "Cette application est déjà installée."
 
-#: ../../Zotlabs/Module/Vlists.php:14
+#: ../../Code/Module/Vlists.php:14
 msgid ""
 "This app creates dynamic access lists corresponding to [1] all connections, "
 "[2] all ActivityPub protocol connections, and [3] all Zot/6 protocol "
@@ -1815,66 +1815,66 @@ msgstr ""
 " toutes les connexions via le protocole Zot/6. Ces listes seront accessibles"
 " dans le réglage des droits d'accès."
 
-#: ../../Zotlabs/Module/Vlists.php:21
+#: ../../Code/Module/Vlists.php:21
 msgid "This app is installed. "
 msgstr "Cette application est installée."
 
-#: ../../Zotlabs/Module/Editwebpage.php:72
-#: ../../Zotlabs/Module/Editwebpage.php:93
-#: ../../Zotlabs/Module/Editwebpage.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:125 ../../Zotlabs/Module/Events.php:295
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Setup.php:221
-#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Suggestions.php:31
-#: ../../Zotlabs/Module/Block.php:25 ../../Zotlabs/Module/Block.php:75
-#: ../../Zotlabs/Module/Poke.php:155 ../../Zotlabs/Module/Photos.php:72
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:99
-#: ../../Zotlabs/Module/Menu.php:132 ../../Zotlabs/Module/Menu.php:143
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:307
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:325
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:281
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:303
-#: ../../Zotlabs/Module/Locs.php:90 ../../Zotlabs/Module/Moderate.php:15
-#: ../../Zotlabs/Module/New_channel.php:115
-#: ../../Zotlabs/Module/New_channel.php:140 ../../Zotlabs/Module/Mitem.php:133
-#: ../../Zotlabs/Module/Connections.php:33
-#: ../../Zotlabs/Module/Profile_photo.php:342
-#: ../../Zotlabs/Module/Profile_photo.php:356 ../../Zotlabs/Module/Lists.php:99
-#: ../../Zotlabs/Module/Lists.php:110 ../../Zotlabs/Module/Editblock.php:71
-#: ../../Zotlabs/Module/Common.php:42 ../../Zotlabs/Module/Display.php:487
-#: ../../Zotlabs/Module/Page.php:38 ../../Zotlabs/Module/Page.php:137
-#: ../../Zotlabs/Module/Manage.php:15 ../../Zotlabs/Module/Chat.php:107
-#: ../../Zotlabs/Module/Chat.php:112 ../../Zotlabs/Module/Inspect.php:16
-#: ../../Zotlabs/Module/Filestorage.php:22
-#: ../../Zotlabs/Module/Filestorage.php:107
-#: ../../Zotlabs/Module/Filestorage.php:125
-#: ../../Zotlabs/Module/Filestorage.php:152
-#: ../../Zotlabs/Module/Filestorage.php:185
-#: ../../Zotlabs/Module/Filestorage.php:193
-#: ../../Zotlabs/Module/Editlayout.php:71
-#: ../../Zotlabs/Module/Editlayout.php:94 ../../Zotlabs/Module/Defperms.php:164
-#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Viewconnections.php:32
-#: ../../Zotlabs/Module/Viewconnections.php:37
-#: ../../Zotlabs/Module/Webpages.php:134 ../../Zotlabs/Module/Regmod.php:20
-#: ../../Zotlabs/Module/Cards.php:82 ../../Zotlabs/Module/Profiles.php:197
-#: ../../Zotlabs/Module/Profiles.php:633 ../../Zotlabs/Module/Register.php:82
-#: ../../Zotlabs/Module/Mood.php:124 ../../Zotlabs/Module/Card_edit.php:53
-#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Blocks.php:77
-#: ../../Zotlabs/Module/Blocks.php:84 ../../Zotlabs/Module/Sharedwithme.php:16
-#: ../../Zotlabs/Module/Settings.php:66 ../../Zotlabs/Module/Viewsrc.php:22
-#: ../../Zotlabs/Module/Sources.php:83 ../../Zotlabs/Module/Layouts.php:77
-#: ../../Zotlabs/Module/Layouts.php:84 ../../Zotlabs/Module/Layouts.php:95
-#: ../../Zotlabs/Module/Connedit.php:326 ../../Zotlabs/Module/Profile.php:123
-#: ../../Zotlabs/Module/Profile.php:139
-#: ../../Zotlabs/Module/Cover_photo.php:342
-#: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Calendar.php:263 ../../Zotlabs/Module/Pdledit.php:29
-#: ../../Zotlabs/Module/Item.php:513 ../../Zotlabs/Module/Item.php:535
-#: ../../Zotlabs/Module/Item.php:546 ../../Zotlabs/Module/Item.php:1587
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Channel.php:211 ../../Zotlabs/Module/Channel.php:397
-#: ../../Zotlabs/Module/Channel.php:436 ../../Zotlabs/Module/Thing.php:299
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:360
-#: ../../Zotlabs/Lib/Chatroom.php:135 ../../Zotlabs/Web/WebServer.php:129
+#: ../../Code/Module/Editwebpage.php:72
+#: ../../Code/Module/Editwebpage.php:93
+#: ../../Code/Module/Editwebpage.php:111
+#: ../../Code/Module/Editwebpage.php:125 ../../Code/Module/Events.php:295
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Setup.php:221
+#: ../../Code/Module/Appman.php:87 ../../Code/Module/Suggestions.php:31
+#: ../../Code/Module/Block.php:25 ../../Code/Module/Block.php:75
+#: ../../Code/Module/Poke.php:155 ../../Code/Module/Photos.php:72
+#: ../../Code/Module/Api.php:24 ../../Code/Module/Invite.php:99
+#: ../../Code/Module/Menu.php:132 ../../Code/Module/Menu.php:143
+#: ../../Code/Module/Admin/Profile_photo.php:307
+#: ../../Code/Module/Admin/Profile_photo.php:325
+#: ../../Code/Module/Admin/Cover_photo.php:281
+#: ../../Code/Module/Admin/Cover_photo.php:303
+#: ../../Code/Module/Locs.php:90 ../../Code/Module/Moderate.php:15
+#: ../../Code/Module/New_channel.php:115
+#: ../../Code/Module/New_channel.php:140 ../../Code/Module/Mitem.php:133
+#: ../../Code/Module/Connections.php:33
+#: ../../Code/Module/Profile_photo.php:342
+#: ../../Code/Module/Profile_photo.php:356 ../../Code/Module/Lists.php:99
+#: ../../Code/Module/Lists.php:110 ../../Code/Module/Editblock.php:71
+#: ../../Code/Module/Common.php:42 ../../Code/Module/Display.php:487
+#: ../../Code/Module/Page.php:38 ../../Code/Module/Page.php:137
+#: ../../Code/Module/Manage.php:15 ../../Code/Module/Chat.php:107
+#: ../../Code/Module/Chat.php:112 ../../Code/Module/Inspect.php:16
+#: ../../Code/Module/Filestorage.php:22
+#: ../../Code/Module/Filestorage.php:107
+#: ../../Code/Module/Filestorage.php:125
+#: ../../Code/Module/Filestorage.php:152
+#: ../../Code/Module/Filestorage.php:185
+#: ../../Code/Module/Filestorage.php:193
+#: ../../Code/Module/Editlayout.php:71
+#: ../../Code/Module/Editlayout.php:94 ../../Code/Module/Defperms.php:164
+#: ../../Code/Module/Vote.php:19 ../../Code/Module/Viewconnections.php:32
+#: ../../Code/Module/Viewconnections.php:37
+#: ../../Code/Module/Webpages.php:134 ../../Code/Module/Regmod.php:20
+#: ../../Code/Module/Cards.php:82 ../../Code/Module/Profiles.php:197
+#: ../../Code/Module/Profiles.php:633 ../../Code/Module/Register.php:82
+#: ../../Code/Module/Mood.php:124 ../../Code/Module/Card_edit.php:53
+#: ../../Code/Module/Notifications.php:11 ../../Code/Module/Blocks.php:77
+#: ../../Code/Module/Blocks.php:84 ../../Code/Module/Sharedwithme.php:16
+#: ../../Code/Module/Settings.php:66 ../../Code/Module/Viewsrc.php:22
+#: ../../Code/Module/Sources.php:83 ../../Code/Module/Layouts.php:77
+#: ../../Code/Module/Layouts.php:84 ../../Code/Module/Layouts.php:95
+#: ../../Code/Module/Connedit.php:326 ../../Code/Module/Profile.php:123
+#: ../../Code/Module/Profile.php:139
+#: ../../Code/Module/Cover_photo.php:342
+#: ../../Code/Module/Cover_photo.php:355
+#: ../../Code/Module/Calendar.php:263 ../../Code/Module/Pdledit.php:29
+#: ../../Code/Module/Item.php:513 ../../Code/Module/Item.php:535
+#: ../../Code/Module/Item.php:546 ../../Code/Module/Item.php:1587
+#: ../../Code/Module/Service_limits.php:11
+#: ../../Code/Module/Channel.php:211 ../../Code/Module/Channel.php:397
+#: ../../Code/Module/Channel.php:436 ../../Code/Module/Thing.php:299
+#: ../../Code/Module/Thing.php:319 ../../Code/Module/Thing.php:360
+#: ../../Code/Lib/Chatroom.php:135 ../../Code/Web/WebServer.php:129
 #: ../../include/attach.php:155 ../../include/attach.php:202
 #: ../../include/attach.php:278 ../../include/attach.php:397
 #: ../../include/attach.php:411 ../../include/attach.php:418
@@ -1884,176 +1884,176 @@ msgstr "Cette application est installée."
 msgid "Permission denied."
 msgstr "Accès refusé."
 
-#: ../../Zotlabs/Module/Editwebpage.php:84 ../../Zotlabs/Module/Editpost.php:24
-#: ../../Zotlabs/Module/Editblock.php:83 ../../Zotlabs/Module/Editblock.php:99
-#: ../../Zotlabs/Module/Editlayout.php:83 ../../Zotlabs/Module/Card_edit.php:19
-#: ../../Zotlabs/Module/Card_edit.php:35
+#: ../../Code/Module/Editwebpage.php:84 ../../Code/Module/Editpost.php:24
+#: ../../Code/Module/Editblock.php:83 ../../Code/Module/Editblock.php:99
+#: ../../Code/Module/Editlayout.php:83 ../../Code/Module/Card_edit.php:19
+#: ../../Code/Module/Card_edit.php:35
 msgid "Item not found"
 msgstr "Élément introuvable"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Code/Module/Editwebpage.php:143
 msgid "Page link"
 msgstr "Lien"
 
-#: ../../Zotlabs/Module/Editwebpage.php:147
-#: ../../Zotlabs/Module/Editblock.php:120 ../../Zotlabs/Module/Chat.php:212
-#: ../../Zotlabs/Module/Card_edit.php:103 ../../include/conversation.php:1286
+#: ../../Code/Module/Editwebpage.php:147
+#: ../../Code/Module/Editblock.php:120 ../../Code/Module/Chat.php:212
+#: ../../Code/Module/Card_edit.php:103 ../../include/conversation.php:1286
 msgid "Insert web link"
 msgstr "Insérer le lien web"
 
-#: ../../Zotlabs/Module/Editwebpage.php:170
+#: ../../Code/Module/Editwebpage.php:170
 msgid "Edit Webpage"
 msgstr "Modifier la page web"
 
-#: ../../Zotlabs/Module/Editwebpage.php:173
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Settings/Oauth2.php:106
-#: ../../Zotlabs/Module/Settings/Oauth2.php:135
-#: ../../Zotlabs/Module/Editpost.php:120
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:471
-#: ../../Zotlabs/Module/Admin/Addons.php:421
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:378
-#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1367
-#: ../../Zotlabs/Module/Profile_photo.php:509
-#: ../../Zotlabs/Module/Editblock.php:145 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Module/Editlayout.php:144
-#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Card_edit.php:133
-#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Fbrowser.php:63
-#: ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1418
+#: ../../Code/Module/Editwebpage.php:173
+#: ../../Code/Module/Settings/Oauth.php:89
+#: ../../Code/Module/Settings/Oauth.php:115
+#: ../../Code/Module/Settings/Oauth2.php:106
+#: ../../Code/Module/Settings/Oauth2.php:135
+#: ../../Code/Module/Editpost.php:120
+#: ../../Code/Module/Admin/Profile_photo.php:471
+#: ../../Code/Module/Admin/Addons.php:421
+#: ../../Code/Module/Admin/Cover_photo.php:378
+#: ../../Code/Module/Cdav.php:1055 ../../Code/Module/Cdav.php:1367
+#: ../../Code/Module/Profile_photo.php:509
+#: ../../Code/Module/Editblock.php:145 ../../Code/Module/Filer.php:53
+#: ../../Code/Module/Editlayout.php:144
+#: ../../Code/Module/Profiles.php:803 ../../Code/Module/Card_edit.php:133
+#: ../../Code/Module/Connedit.php:867 ../../Code/Module/Fbrowser.php:63
+#: ../../Code/Module/Fbrowser.php:85
+#: ../../Code/Module/Cover_photo.php:429 ../../Code/Module/Tagrm.php:15
+#: ../../Code/Module/Tagrm.php:138 ../../include/conversation.php:1418
 #: ../../include/conversation.php:1475 ../../include/conversation.php:1477
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../../Zotlabs/Module/Settings/Features.php:47
-#: ../../Zotlabs/Module/Settings/Network.php:30
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:47
+#: ../../Code/Module/Settings/Network.php:30
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
 msgid "Off"
 msgstr "Inactif"
 
-#: ../../Zotlabs/Module/Settings/Features.php:47
-#: ../../Zotlabs/Module/Settings/Network.php:30
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:47
+#: ../../Code/Module/Settings/Network.php:30
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
 msgid "On"
 msgstr "Actif"
 
-#: ../../Zotlabs/Module/Settings/Features.php:55
+#: ../../Code/Module/Settings/Features.php:55
 msgid "Additional Features"
 msgstr "Fonctionnalités additionnelles"
 
-#: ../../Zotlabs/Module/Settings/Account.php:19
+#: ../../Code/Module/Settings/Account.php:19
 msgid "Not valid email."
 msgstr "Adresse de courriel non valide."
 
-#: ../../Zotlabs/Module/Settings/Account.php:22
+#: ../../Code/Module/Settings/Account.php:22
 msgid "Protected email address. Cannot change to that email."
 msgstr "Adresse de courriel protégée. Impossible de l'utiliser."
 
-#: ../../Zotlabs/Module/Settings/Account.php:31
+#: ../../Code/Module/Settings/Account.php:31
 msgid "System failure storing new email. Please try again."
 msgstr ""
 "Défaillance système lors du stockage de la nouvelle adresse de courriel. "
 "Merci d'essayer à nouveau."
 
-#: ../../Zotlabs/Module/Settings/Account.php:48
+#: ../../Code/Module/Settings/Account.php:48
 msgid "Password verification failed."
 msgstr "La vérification du mot de passe a échoué."
 
-#: ../../Zotlabs/Module/Settings/Account.php:55
+#: ../../Code/Module/Settings/Account.php:55
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 "Les deux saisies du mot de passe ne correspondent pas. Il n'a donc pas été "
 "changé."
 
-#: ../../Zotlabs/Module/Settings/Account.php:59
+#: ../../Code/Module/Settings/Account.php:59
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Le mot de passe ne peut pas être vide. Il n'a donc pas été changé."
 
-#: ../../Zotlabs/Module/Settings/Account.php:73
+#: ../../Code/Module/Settings/Account.php:73
 msgid "Password changed."
 msgstr "Le mot de passe a été changé."
 
-#: ../../Zotlabs/Module/Settings/Account.php:75
+#: ../../Code/Module/Settings/Account.php:75
 msgid "Password update failed. Please try again."
 msgstr "La mise à jour du mot de passe a échoué. Merci d'essayer à nouveau."
 
-#: ../../Zotlabs/Module/Settings/Account.php:100
+#: ../../Code/Module/Settings/Account.php:100
 msgid "Account Settings"
 msgstr "Paramètres du compte"
 
-#: ../../Zotlabs/Module/Settings/Account.php:101
+#: ../../Code/Module/Settings/Account.php:101
 msgid "Current Password"
 msgstr "Mot de passe actuel"
 
-#: ../../Zotlabs/Module/Settings/Account.php:102
+#: ../../Code/Module/Settings/Account.php:102
 msgid "Enter New Password"
 msgstr "Entrez votre nouveau mot de passe"
 
-#: ../../Zotlabs/Module/Settings/Account.php:103
+#: ../../Code/Module/Settings/Account.php:103
 msgid "Confirm New Password"
 msgstr "Confirmez le nouveau mot de passe"
 
-#: ../../Zotlabs/Module/Settings/Account.php:103
+#: ../../Code/Module/Settings/Account.php:103
 msgid "Leave password fields blank unless changing"
 msgstr "Laissez les mots de passe vides si vous ne voulez pas les modifier"
 
-#: ../../Zotlabs/Module/Settings/Account.php:105
+#: ../../Code/Module/Settings/Account.php:105
 msgid "Email Address:"
 msgstr "Adresse de courriel :"
 
-#: ../../Zotlabs/Module/Settings/Account.php:106
-#: ../../Zotlabs/Module/Removeaccount.php:70
+#: ../../Code/Module/Settings/Account.php:106
+#: ../../Code/Module/Removeaccount.php:70
 msgid "Remove Account"
 msgstr "Supprimer le compte"
 
-#: ../../Zotlabs/Module/Settings/Account.php:107
+#: ../../Code/Module/Settings/Account.php:107
 msgid "Remove this account including all its channels"
 msgstr "Supprimer ce compte et tous ses canaux"
 
-#: ../../Zotlabs/Module/Settings/Display.php:124
-#: ../../Zotlabs/Module/Admin/Site.php:200
+#: ../../Code/Module/Settings/Display.php:124
+#: ../../Code/Module/Admin/Site.php:200
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Incompatible)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:133
+#: ../../Code/Module/Settings/Display.php:133
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Expérimental)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:176
+#: ../../Code/Module/Settings/Display.php:176
 msgid "Display Settings"
 msgstr "Paramètres d'affichage"
 
-#: ../../Zotlabs/Module/Settings/Display.php:177
+#: ../../Code/Module/Settings/Display.php:177
 msgid "Theme Settings"
 msgstr "Paramètres de thème"
 
-#: ../../Zotlabs/Module/Settings/Display.php:178
+#: ../../Code/Module/Settings/Display.php:178
 msgid "Custom Theme Settings"
 msgstr "Paramètres personnels du thème"
 
-#: ../../Zotlabs/Module/Settings/Display.php:179
+#: ../../Code/Module/Settings/Display.php:179
 msgid "Content Settings"
 msgstr "Paramètres liés au contenu"
 
-#: ../../Zotlabs/Module/Settings/Display.php:185
+#: ../../Code/Module/Settings/Display.php:185
 msgid "Display Theme:"
 msgstr "Thème à utiliser :"
 
-#: ../../Zotlabs/Module/Settings/Display.php:186
+#: ../../Code/Module/Settings/Display.php:186
 msgid "Select scheme"
 msgstr "Choisir la palette de couleurs"
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Code/Module/Settings/Display.php:188
 msgid "Preload images before rendering the page"
 msgstr "Pré-charger les images avant d'afficher la page"
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Code/Module/Settings/Display.php:188
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
@@ -2061,70 +2061,70 @@ msgstr ""
 "Le temps de chargement de la page paraîtra plus long mais la page sera "
 "complète quand elle s'affichera"
 
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Code/Module/Settings/Display.php:189
 msgid "Enable user zoom on mobile devices"
 msgstr "Permettre à l'utilisateur d'un mobile d'agrandir le contenu"
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Code/Module/Settings/Display.php:190
 msgid "Update browser every xx seconds"
 msgstr "Mettre à jour le navigateur toutes les xx secondes"
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Code/Module/Settings/Display.php:190
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 secondes, pas de maximum"
 
-#: ../../Zotlabs/Module/Settings/Display.php:191
+#: ../../Code/Module/Settings/Display.php:191
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 "Nombre maximal de conversations pouvant être chargées en même temps :"
 
-#: ../../Zotlabs/Module/Settings/Display.php:191
+#: ../../Code/Module/Settings/Display.php:191
 msgid "Maximum of 100 items"
 msgstr "100 éléments au maximum"
 
-#: ../../Zotlabs/Module/Settings/Display.php:192
+#: ../../Code/Module/Settings/Display.php:192
 msgid "Show emoticons (smilies) as images"
 msgstr "Remplacer les émoticônes (smileys) par des images"
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
+#: ../../Code/Module/Settings/Display.php:193
 msgid "Provide channel menu in navigation bar"
 msgstr "Fournir le menu du canal dans la barre de navigation"
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
+#: ../../Code/Module/Settings/Display.php:193
 msgid "Default: channel menu located in app menu"
 msgstr "Par défaut : menu du canal situé dans le menu des applications."
 
-#: ../../Zotlabs/Module/Settings/Display.php:194
+#: ../../Code/Module/Settings/Display.php:194
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Éditeur d'agencement des pages système - (avancé)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Code/Module/Settings/Display.php:197
 msgid "Channel page max height of content (in pixels)"
 msgstr "Hauteur maximale du contenu pour la page du canal (en pixels)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
-#: ../../Zotlabs/Module/Settings/Display.php:198
+#: ../../Code/Module/Settings/Display.php:197
+#: ../../Code/Module/Settings/Display.php:198
 msgid "click to expand content exceeding this height"
 msgstr "cliquer pour dérouler le contenu dépassant cette limite"
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
+#: ../../Code/Module/Settings/Display.php:198
 msgid "Stream page max height of content (in pixels)"
 msgstr "Hauteur maximale du contenu pour la page du flux (en pixels)"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:33
+#: ../../Code/Module/Settings/Tokens.php:33
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Ce canal est limité à %d jetons"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:39
+#: ../../Code/Module/Settings/Tokens.php:39
 msgid "Name and Password are required."
 msgstr "Le nom et le mot de passe sont requis"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:81
+#: ../../Code/Module/Settings/Tokens.php:81
 msgid "Token saved."
 msgstr "Jeton sauvegardé"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:117
+#: ../../Code/Module/Settings/Tokens.php:117
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
@@ -2135,7 +2135,7 @@ msgstr ""
 "utilisées dans les listes de contrôle d'accès et les visiteurs peuvent se "
 "connecter en utilisant ces identifiants pour accéder au contenu privé."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:119
+#: ../../Code/Module/Settings/Tokens.php:119
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
@@ -2145,44 +2145,44 @@ msgstr ""
 " amis et aux connaissances en ajoutant le mot de passe de connexion à l'URL "
 "d'un site spécifique, comme indiqué. Exemples:"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
+#: ../../Code/Module/Settings/Tokens.php:159
 msgid "Login Name"
 msgstr "Nom d'utilisateur"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
+#: ../../Code/Module/Settings/Tokens.php:160
 msgid "Login Password"
 msgstr "Mot de passe"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Code/Module/Settings/Tokens.php:161
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Date d'expiration sous la forme année mois jour (AAAA-MM-JJ)"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:162
-#: ../../Zotlabs/Module/Connedit.php:833
+#: ../../Code/Module/Settings/Tokens.php:162
+#: ../../Code/Module/Connedit.php:833
 msgid "Their Settings"
 msgstr "Ses paramètres"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Settings/Permcats.php:109
-#: ../../Zotlabs/Module/Defperms.php:240 ../../Zotlabs/Module/Connedit.php:834
+#: ../../Code/Module/Settings/Tokens.php:163
+#: ../../Code/Module/Settings/Permcats.php:109
+#: ../../Code/Module/Defperms.php:240 ../../Code/Module/Connedit.php:834
 msgid "My Settings"
 msgstr "Mes paramètres"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:165
-#: ../../Zotlabs/Module/Settings/Permcats.php:111
-#: ../../Zotlabs/Module/Defperms.php:238 ../../Zotlabs/Module/Connedit.php:829
+#: ../../Code/Module/Settings/Tokens.php:165
+#: ../../Code/Module/Settings/Permcats.php:111
+#: ../../Code/Module/Defperms.php:238 ../../Code/Module/Connedit.php:829
 msgid "inherited"
 msgstr "héritée"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Permcats.php:114
-#: ../../Zotlabs/Module/Defperms.php:243 ../../Zotlabs/Module/Connedit.php:836
+#: ../../Code/Module/Settings/Tokens.php:168
+#: ../../Code/Module/Settings/Permcats.php:114
+#: ../../Code/Module/Defperms.php:243 ../../Code/Module/Connedit.php:836
 msgid "Individual Permissions"
 msgstr "Droits d'accès individuels"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:169
-#: ../../Zotlabs/Module/Settings/Permcats.php:115
-#: ../../Zotlabs/Module/Connedit.php:837
+#: ../../Code/Module/Settings/Tokens.php:169
+#: ../../Code/Module/Settings/Permcats.php:115
+#: ../../Code/Module/Connedit.php:837
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
@@ -2193,15 +2193,15 @@ msgstr ""
 "canal, lesquels sont prioritaires sur les réglages individuels. Vous ne "
 "pouvez pas modifier ces droits d'accès-ci ici."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:24
+#: ../../Code/Module/Settings/Permcats.php:24
 msgid "Permission Name is required."
 msgstr "Le nom de permission est requis."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:43
+#: ../../Code/Module/Settings/Permcats.php:43
 msgid "Permission category saved."
 msgstr "Profil d'accès enregistré."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:67
+#: ../../Code/Module/Settings/Permcats.php:67
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
@@ -2209,135 +2209,135 @@ msgstr ""
 "Utilisez ce formulaire pour créer des règles d'accès pour différentes "
 "catégories de personnes ou de contacts."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
+#: ../../Code/Module/Settings/Permcats.php:108
 msgid "Permission Name"
 msgstr "Nom du droit d'accès"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:35
+#: ../../Code/Module/Settings/Oauth.php:35
 msgid "Name is required"
 msgstr "Le nom est requis"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:39
+#: ../../Code/Module/Settings/Oauth.php:39
 msgid "Key and Secret are required"
 msgstr "La clef et le secret sont requis"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:43
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Settings/Oauth2.php:52
-#: ../../Zotlabs/Module/Settings/Oauth2.php:134
-#: ../../Zotlabs/Module/Admin/Addons.php:451 ../../Zotlabs/Module/Cdav.php:1050
-#: ../../Zotlabs/Module/Cdav.php:1365 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Lib/Apps.php:557
+#: ../../Code/Module/Settings/Oauth.php:43
+#: ../../Code/Module/Settings/Oauth.php:114
+#: ../../Code/Module/Settings/Oauth2.php:52
+#: ../../Code/Module/Settings/Oauth2.php:134
+#: ../../Code/Module/Admin/Addons.php:451 ../../Code/Module/Cdav.php:1050
+#: ../../Code/Module/Cdav.php:1365 ../../Code/Module/Profiles.php:801
+#: ../../Code/Module/Connedit.php:865 ../../Code/Lib/Apps.php:557
 msgid "Update"
 msgstr "Mise à jour"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Settings/Oauth2.php:133
-#: ../../Zotlabs/Module/Settings/Oauth2.php:195
+#: ../../Code/Module/Settings/Oauth.php:87
+#: ../../Code/Module/Settings/Oauth.php:113
+#: ../../Code/Module/Settings/Oauth.php:149
+#: ../../Code/Module/Settings/Oauth2.php:133
+#: ../../Code/Module/Settings/Oauth2.php:195
 msgid "Add application"
 msgstr "Ajouter l'application"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:107
-#: ../../Zotlabs/Module/Settings/Oauth2.php:136
+#: ../../Code/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth2.php:107
+#: ../../Code/Module/Settings/Oauth2.php:136
 msgid "Name of application"
 msgstr "Nom de l'application"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:117
 msgid "Consumer Key"
 msgstr "Clef client"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth2.php:108
-#: ../../Zotlabs/Module/Settings/Oauth2.php:109
-#: ../../Zotlabs/Module/Settings/Oauth2.php:137
-#: ../../Zotlabs/Module/Settings/Oauth2.php:138
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth2.php:108
+#: ../../Code/Module/Settings/Oauth2.php:109
+#: ../../Code/Module/Settings/Oauth2.php:137
+#: ../../Code/Module/Settings/Oauth2.php:138
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 "Générée automatiquement - à changer si besoin. Longueur maximale 20 "
 "caractères."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
-#: ../../Zotlabs/Module/Settings/Oauth2.php:109
-#: ../../Zotlabs/Module/Settings/Oauth2.php:138
+#: ../../Code/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth.php:118
+#: ../../Code/Module/Settings/Oauth2.php:109
+#: ../../Code/Module/Settings/Oauth2.php:138
 msgid "Consumer Secret"
 msgstr "Secret du client"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
-#: ../../Zotlabs/Module/Settings/Oauth2.php:110
-#: ../../Zotlabs/Module/Settings/Oauth2.php:139
+#: ../../Code/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth.php:119
+#: ../../Code/Module/Settings/Oauth2.php:110
+#: ../../Code/Module/Settings/Oauth2.php:139
 msgid "Redirect"
 msgstr "Rediriger"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth2.php:110
-#: ../../Zotlabs/Module/Settings/Oauth2.php:139
+#: ../../Code/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth2.php:110
+#: ../../Code/Module/Settings/Oauth2.php:139
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 "URI de redirection - laissez vide, sauf si votre application le requiert "
 "spécifiquement"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Settings/Oauth.php:120
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Settings/Oauth.php:120
 msgid "Icon url"
 msgstr "URL de l'icône"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:156
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Sources.php:121 ../../Code/Module/Sources.php:156
 msgid "Optional"
 msgstr "Facultatif"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:105
+#: ../../Code/Module/Settings/Oauth.php:105
 msgid "Application not found."
 msgstr "Application introuvable."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
+#: ../../Code/Module/Settings/Oauth.php:148
 msgid "Connected Apps"
 msgstr "Applications connectées"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
-#: ../../Zotlabs/Module/Settings/Oauth2.php:198
+#: ../../Code/Module/Settings/Oauth.php:152
+#: ../../Code/Module/Settings/Oauth2.php:198
 msgid "Client key starts with"
 msgstr "La clef du client commence par"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
-#: ../../Zotlabs/Module/Settings/Oauth2.php:199
+#: ../../Code/Module/Settings/Oauth.php:153
+#: ../../Code/Module/Settings/Oauth2.php:199
 msgid "No name"
 msgstr "Sans nom"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:154
-#: ../../Zotlabs/Module/Settings/Oauth2.php:200
+#: ../../Code/Module/Settings/Oauth.php:154
+#: ../../Code/Module/Settings/Oauth2.php:200
 msgid "Remove authorization"
 msgstr "Révoquer l'autorisation"
 
-#: ../../Zotlabs/Module/Settings/Network.php:38
+#: ../../Code/Module/Settings/Network.php:38
 msgid "Activity Settings"
 msgstr "Paramètres d'activité"
 
-#: ../../Zotlabs/Module/Settings/Network.php:52 ../../include/features.php:375
+#: ../../Code/Module/Settings/Network.php:52 ../../include/features.php:375
 msgid "Search by Date"
 msgstr "Chercher par date"
 
-#: ../../Zotlabs/Module/Settings/Network.php:53 ../../include/features.php:376
+#: ../../Code/Module/Settings/Network.php:53 ../../include/features.php:376
 msgid "Ability to select posts by date ranges"
 msgstr "Pouvoir sélectionner des publications par date"
 
-#: ../../Zotlabs/Module/Settings/Network.php:61 ../../include/features.php:386
+#: ../../Code/Module/Settings/Network.php:61 ../../include/features.php:386
 msgid "Save search terms for re-use"
 msgstr "Sauvegarder des termes de recherche pour utilisation ultérieure"
 
-#: ../../Zotlabs/Module/Settings/Network.php:68 ../../include/features.php:394
+#: ../../Code/Module/Settings/Network.php:68 ../../include/features.php:394
 msgid "Alternate Stream Order"
 msgstr "Ordre du flux alternatif"
 
-#: ../../Zotlabs/Module/Settings/Network.php:69 ../../include/features.php:395
+#: ../../Code/Module/Settings/Network.php:69 ../../include/features.php:395
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
@@ -2346,189 +2346,189 @@ msgstr ""
 "commentaires  les plus récents ou sans organiser activités par conversation."
 " "
 
-#: ../../Zotlabs/Module/Settings/Network.php:76 ../../include/features.php:403
+#: ../../Code/Module/Settings/Network.php:76 ../../include/features.php:403
 msgid "Contact Filter"
 msgstr "Filtre par connexion"
 
-#: ../../Zotlabs/Module/Settings/Network.php:77 ../../include/features.php:404
+#: ../../Code/Module/Settings/Network.php:77 ../../include/features.php:404
 msgid "Ability to display only posts of a selected contact"
 msgstr ""
 "Possibilité de n'afficher les publications que d'une connexion sélectionnée"
 
-#: ../../Zotlabs/Module/Settings/Network.php:84 ../../include/features.php:412
+#: ../../Code/Module/Settings/Network.php:84 ../../include/features.php:412
 msgid "Forum Filter"
 msgstr "Filtre par groupe"
 
-#: ../../Zotlabs/Module/Settings/Network.php:85 ../../include/features.php:413
+#: ../../Code/Module/Settings/Network.php:85 ../../include/features.php:413
 msgid "Ability to display only posts of a specific forum"
 msgstr ""
 "Possibilité de n'afficher les publications que d'un seul groupe sélectionné"
 
-#: ../../Zotlabs/Module/Settings/Network.php:92 ../../include/features.php:421
+#: ../../Code/Module/Settings/Network.php:92 ../../include/features.php:421
 msgid "Personal Posts Filter"
 msgstr "Filtre les publications personnelles"
 
-#: ../../Zotlabs/Module/Settings/Network.php:93 ../../include/features.php:422
+#: ../../Code/Module/Settings/Network.php:93 ../../include/features.php:422
 msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 "Possibilité de n'afficher que les publications avec lesquelles vous avez "
 "interagi."
 
-#: ../../Zotlabs/Module/Settings/Network.php:100 ../../include/features.php:430
+#: ../../Code/Module/Settings/Network.php:100 ../../include/features.php:430
 msgid "Affinity Tool"
 msgstr "Outil d'affinité"
 
-#: ../../Zotlabs/Module/Settings/Network.php:101 ../../include/features.php:431
+#: ../../Code/Module/Settings/Network.php:101 ../../include/features.php:431
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrer le flux d'activité en fonction de la profondeur des relations"
 
-#: ../../Zotlabs/Module/Settings/Network.php:108 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Code/Module/Settings/Network.php:108 ../../Code/Lib/Apps.php:330
 #: ../../include/features.php:439
 msgid "Suggest Channels"
 msgstr "Suggérer des canaux"
 
-#: ../../Zotlabs/Module/Settings/Network.php:109 ../../include/features.php:440
+#: ../../Code/Module/Settings/Network.php:109 ../../include/features.php:440
 msgid "Show friend and connection suggestions"
 msgstr "Afficher la connexion et les suggestions d'ajout"
 
-#: ../../Zotlabs/Module/Settings/Network.php:116 ../../include/features.php:448
+#: ../../Code/Module/Settings/Network.php:116 ../../include/features.php:448
 msgid "Connection Filtering"
 msgstr "Filtrage des connexions"
 
-#: ../../Zotlabs/Module/Settings/Network.php:117 ../../include/features.php:449
+#: ../../Code/Module/Settings/Network.php:117 ../../include/features.php:449
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 "Filtrer les publications entrantes de mes connexions sur la base de mots-"
 "clefs"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:48
+#: ../../Code/Module/Settings/Oauth2.php:48
 msgid "ID and Secret are required"
 msgstr "Un identifiant et un secret son nécessaires"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:104
+#: ../../Code/Module/Settings/Oauth2.php:104
 msgid "Add OAuth2 application"
 msgstr "Ajouter une application OAuth2"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:108
-#: ../../Zotlabs/Module/Settings/Oauth2.php:137
+#: ../../Code/Module/Settings/Oauth2.php:108
+#: ../../Code/Module/Settings/Oauth2.php:137
 msgid "Consumer ID"
 msgstr "Identifiant client"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:111
-#: ../../Zotlabs/Module/Settings/Oauth2.php:140
+#: ../../Code/Module/Settings/Oauth2.php:111
+#: ../../Code/Module/Settings/Oauth2.php:140
 msgid "Grant Types"
 msgstr "Types d'autorisation accordée"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:111
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth2.php:140
-#: ../../Zotlabs/Module/Settings/Oauth2.php:141
+#: ../../Code/Module/Settings/Oauth2.php:111
+#: ../../Code/Module/Settings/Oauth2.php:112
+#: ../../Code/Module/Settings/Oauth2.php:140
+#: ../../Code/Module/Settings/Oauth2.php:141
 msgid "leave blank unless your application specifically requires this"
 msgstr "Laissez vide, sauf si votre application le requiert spécifiquement"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth2.php:141
+#: ../../Code/Module/Settings/Oauth2.php:112
+#: ../../Code/Module/Settings/Oauth2.php:141
 msgid "Authorization scope"
 msgstr "Portée de l'autorisation"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:124
+#: ../../Code/Module/Settings/Oauth2.php:124
 msgid "OAuth2 Application not found."
 msgstr "Application OAuth2 introuvable"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:194
+#: ../../Code/Module/Settings/Oauth2.php:194
 msgid "Connected OAuth2 Apps"
 msgstr "Applications OAuth2 connectées"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:25
+#: ../../Code/Module/Settings/Featured.php:25
 msgid "Affinity Slider settings updated."
 msgstr "Paramètres du curseur d'affinité mis à jour."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:40
+#: ../../Code/Module/Settings/Featured.php:40
 msgid "No feature settings configured"
 msgstr "Aucun paramètre de fonctionnalité configuré"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:47
+#: ../../Code/Module/Settings/Featured.php:47
 msgid "Default maximum affinity level"
 msgstr "Niveau d'affinité maximum par défaut"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:47
+#: ../../Code/Module/Settings/Featured.php:47
 msgid "0-99 default 99"
 msgstr "0-99 par défaut 99"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:52
+#: ../../Code/Module/Settings/Featured.php:52
 msgid "Default minimum affinity level"
 msgstr "Niveau d'affinité minimum par défaut"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:52
+#: ../../Code/Module/Settings/Featured.php:52
 msgid "0-99 - default 0"
 msgstr "0-99 par défaut 0"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:56
+#: ../../Code/Module/Settings/Featured.php:56
 msgid "Affinity Slider Settings"
 msgstr "Paramètres du curseur d'affinité"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:69
+#: ../../Code/Module/Settings/Featured.php:69
 msgid "Addon Settings"
 msgstr "Paramètres de l'addon"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:70
+#: ../../Code/Module/Settings/Featured.php:70
 msgid "Please save/submit changes to any panel before opening another."
 msgstr ""
 "Veuillez enregistrer/soumettre les changements à n'importe quel panneau "
 "avant d'en ouvrir un autre."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:381
+#: ../../Code/Module/Settings/Channel.php:381
 msgid "Nobody except yourself"
 msgstr "Personne sauf vous"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:382
+#: ../../Code/Module/Settings/Channel.php:382
 msgid "Only those you specifically allow"
 msgstr "Seulement ceux que vous autorisez spécifiquement"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:383
+#: ../../Code/Module/Settings/Channel.php:383
 msgid "Approved connections"
 msgstr "Connexions validées"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:384
+#: ../../Code/Module/Settings/Channel.php:384
 msgid "Any connections"
 msgstr "Toutes les connexions"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:385
+#: ../../Code/Module/Settings/Channel.php:385
 msgid "Anybody on this website"
 msgstr "Tous les utilisateurs du serveur"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:386
+#: ../../Code/Module/Settings/Channel.php:386
 msgid "Anybody in this network"
 msgstr "Tous les utilisateurs sur ce réseau"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:387
+#: ../../Code/Module/Settings/Channel.php:387
 msgid "Anybody authenticated"
 msgstr "Tous les utilisateurs authentifiés"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:388
+#: ../../Code/Module/Settings/Channel.php:388
 msgid "Anybody on the internet"
 msgstr "Tous les utilisateurs d'Internet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:468
+#: ../../Code/Module/Settings/Channel.php:468
 msgid "Publish your profile in the network directory"
 msgstr "Publier votre profil dans l'annuaire réseau"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:473
+#: ../../Code/Module/Settings/Channel.php:473
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 "Nous autoriser à vous suggérer comme ami(e) potentiel(le) aux nouveaux "
 "membres?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:477
-#: ../../Zotlabs/Module/Settings/Channel.php:491
+#: ../../Code/Module/Settings/Channel.php:477
+#: ../../Code/Module/Settings/Channel.php:491
 msgid "or"
 msgstr "ou"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:483
+#: ../../Code/Module/Settings/Channel.php:483
 msgid "Your channel address is"
 msgstr "L'adresse de votre canal est"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:485
+#: ../../Code/Module/Settings/Channel.php:485
 msgid ""
 "Friends using compatible applications can use this address to connect with "
 "you."
@@ -2536,57 +2536,57 @@ msgstr ""
 "Vos amis utilisant des applications compatibles peuvent utiliser cette "
 "adresse entrer en contact avec vous."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:487
+#: ../../Code/Module/Settings/Channel.php:487
 msgid "Your files/photos are accessible as a network drive at"
 msgstr ""
 "Vos fichiers/photos sont accessibles comme un disque réseau à l'adresse"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:489
+#: ../../Code/Module/Settings/Channel.php:489
 msgid "(Windows)"
 msgstr "(Windows)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:490
+#: ../../Code/Module/Settings/Channel.php:490
 msgid "(other platforms)"
 msgstr "(autres plateformes)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
+#: ../../Code/Module/Settings/Channel.php:536
 msgid "Automatic membership approval"
 msgstr "Approbation automatique des inscriptions"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
-#: ../../Zotlabs/Module/Defperms.php:229
+#: ../../Code/Module/Settings/Channel.php:536
+#: ../../Code/Module/Defperms.php:229
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr ""
 "Si cette option est activée, les demandes de connexion seront approuvées "
 "automatiquement."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Code/Module/Settings/Channel.php:542
 msgid "Friend-of-friend conversations"
 msgstr "Conversations des amis d'amis"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Code/Module/Settings/Channel.php:542
 msgid ""
 "Import public third-party conversations in which your connections "
 "participate."
 msgstr ""
 "Importer les conversations publiques auxquelles vos connexions participent"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Enable ActivityPub protocol"
 msgstr "Activer le protocole ActivityPub"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553 ../../include/network.php:1511
+#: ../../Code/Module/Settings/Channel.php:553 ../../include/network.php:1511
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Code/Module/Settings/Channel.php:554
 msgid ""
 "ActivityPub is an emerging internet standard for social communications. "
 msgstr ""
 "ActivityPub est un standard internet émergent de communications sociales."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Code/Module/Settings/Channel.php:554
 msgid ""
 "It provides access to a large and growing number of existing users and "
 "supported software applications, however it is still evolving. If this is "
@@ -2599,51 +2599,51 @@ msgstr ""
 "plus importante, cependant vous rencontrerez probablement des problèmes de "
 "compatibilité."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Code/Module/Settings/Channel.php:585
 msgid "Channel Settings"
 msgstr "Paramètres du canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:591
+#: ../../Code/Module/Settings/Channel.php:591
 msgid "Basic Settings"
 msgstr "Paramètres standard"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:592
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
-#: ../../Zotlabs/Module/Lostpass.php:132
+#: ../../Code/Module/Settings/Channel.php:593
+#: ../../Code/Module/Lostpass.php:132
 msgid "Email Address"
 msgstr "Adresse de courriel"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Code/Module/Settings/Channel.php:594
 msgid "Your timezone"
 msgstr "Votre fuseau horaire"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Code/Module/Settings/Channel.php:594
 msgid "This is important for showing the correct time on shared events"
 msgstr ""
 "Ceci est important pour montrer l'heure correcte sur les évènements partagés"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Default post location"
 msgstr "Géolocalisation des publications par défaut"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Optional geographical location to display on your posts"
 msgstr "Géolocalisation à afficher de façon optionnelle sur vos publications"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:596
 msgid "Obtain post location from your web browser or device"
 msgstr ""
 "Obtenir la géolocalisation de votre publication via votre navigateur web ou "
 "votre appareil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:598
+#: ../../Code/Module/Settings/Channel.php:598
 msgid "Adult content"
 msgstr "Contenu pour adultes"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:598
+#: ../../Code/Module/Settings/Channel.php:598
 msgid ""
 "Enable to indicate if this channel frequently or regularly publishes adult "
 "content. (Please also tag any adult material and/or nudity with #NSFW)"
@@ -2652,246 +2652,246 @@ msgstr ""
 "contenu à réserver aux adultes. (Pensez également à étiqueter tous le "
 "contenu pour adultes et/ou la nudité avec #NSFW)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Code/Module/Settings/Channel.php:600
 msgid "Security and Privacy"
 msgstr "Sécurité et vie privée"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:602
+#: ../../Code/Module/Settings/Channel.php:602
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Vos droits d'accès sont déjà paramétrés. Cliquer pour voir/modifier"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:604
+#: ../../Code/Module/Settings/Channel.php:604
 msgid "Hide my online presence"
 msgstr "Cacher ma présence en ligne"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:604
+#: ../../Code/Module/Settings/Channel.php:604
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Cacher votre statut (en ligne/hors ligne) sur votre profil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:605
+#: ../../Code/Module/Settings/Channel.php:605
 msgid "Allow others to view your friends and connections"
 msgstr "Autoriser les autres à voir vos contacts et connexions"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:608
+#: ../../Code/Module/Settings/Channel.php:608
 msgid "Forbid indexing of your channel content by search engines"
 msgstr ""
 "Interdire l'indexation du contenu de votre canal par les moteurs de "
 "recherche"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:609
+#: ../../Code/Module/Settings/Channel.php:609
 msgid "Allow others to tag your posts"
 msgstr "Autoriser les autres à étiqueter vos publications"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:609
+#: ../../Code/Module/Settings/Channel.php:609
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 "Souvent utilisé par la communauté pour identifier un contenu inapproprié à "
 "posteriori "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:611
+#: ../../Code/Module/Settings/Channel.php:611
 msgid "Channel Permission Limits"
 msgstr "Limites des droits d'accès du canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:613
+#: ../../Code/Module/Settings/Channel.php:613
 msgid "Expire other channel content after this many days"
 msgstr "Faire expirer le contenu des autres canaux après ce délai en jours"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:613
+#: ../../Code/Module/Settings/Channel.php:613
 msgid "0 or blank to use the website limit."
 msgstr "0 ou vide pour utiliser la limite du serveur"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:613
+#: ../../Code/Module/Settings/Channel.php:613
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Ce serveur expire après %d jours."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:613
+#: ../../Code/Module/Settings/Channel.php:613
 msgid "This website does not expire imported content."
 msgstr "Ce serveur ne fait pas expirer le contenu importé."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:613
+#: ../../Code/Module/Settings/Channel.php:613
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "La limite du serveur a priorité si elle est inférieure à votre limite."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:614
+#: ../../Code/Module/Settings/Channel.php:614
 msgid "Maximum Friend Requests/Day:"
 msgstr "Nombre maximum de demandes de connexion par jour :"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:614
+#: ../../Code/Module/Settings/Channel.php:614
 msgid "May reduce spam activity"
 msgstr "Peut contribuer à réduire l'impact des indésirables"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:615
+#: ../../Code/Module/Settings/Channel.php:615
 msgid "Default Access List"
 msgstr "Liste d'accès par défaut"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:616
-#: ../../Zotlabs/Module/Mitem.php:172 ../../Zotlabs/Module/Mitem.php:251
+#: ../../Code/Module/Settings/Channel.php:616
+#: ../../Code/Module/Mitem.php:172 ../../Code/Module/Mitem.php:251
 msgid "(click to open/close)"
 msgstr "(cliquer pour ouvrir/fermer)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:617
+#: ../../Code/Module/Settings/Channel.php:617
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 "Utiliser mon paramètre de publication par défaut pour le type d'objet publié"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:618
+#: ../../Code/Module/Settings/Channel.php:618
 msgid "Profile to assign new connections"
 msgstr "Profil à assigner aux nouvelles connexions"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:629
-#: ../../Zotlabs/Module/New_channel.php:185
-#: ../../Zotlabs/Module/Register.php:272
+#: ../../Code/Module/Settings/Channel.php:629
+#: ../../Code/Module/New_channel.php:185
+#: ../../Code/Module/Register.php:272
 msgid "Channel role and privacy"
 msgstr "Rôle et confidentialité du canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:630
+#: ../../Code/Module/Settings/Channel.php:630
 msgid "Default Permissions Group"
 msgstr "Groupe d'accès par défaut"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:636
+#: ../../Code/Module/Settings/Channel.php:636
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Nombre maximum de messages privés émanant d'inconnus, par jour :"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:636
+#: ../../Code/Module/Settings/Channel.php:636
 msgid "Useful to reduce spamming"
 msgstr "Utile pour réduire les indésirables"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:645
-#: ../../Zotlabs/Module/Photos.php:1283 ../../Zotlabs/Lib/ThreadItem.php:460
+#: ../../Code/Module/Settings/Channel.php:645
+#: ../../Code/Module/Photos.php:1283 ../../Code/Lib/ThreadItem.php:460
 #: ../../include/conversation.php:1478 ../../include/acl_selectors.php:140
 msgid "Close"
 msgstr "Fermer"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:646 ../../Zotlabs/Lib/Apps.php:368
+#: ../../Code/Module/Settings/Channel.php:646 ../../Code/Lib/Apps.php:368
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:647
+#: ../../Code/Module/Settings/Channel.php:647
 msgid "By default post a status message when:"
 msgstr "Par défaut, publier un statut quand :"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:648
+#: ../../Code/Module/Settings/Channel.php:648
 msgid "accepting a friend request"
 msgstr "vous acceptez une demande d'ajout de connexion"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:649
+#: ../../Code/Module/Settings/Channel.php:649
 msgid "joining a forum/community"
 msgstr "vous rejoignez un groupe/une communauté"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:650
+#: ../../Code/Module/Settings/Channel.php:650
 msgid "making an interesting profile change"
 msgstr "vous faîtes une modification intéressante de votre profil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:651
+#: ../../Code/Module/Settings/Channel.php:651
 msgid "Send a notification email when:"
 msgstr "Envoyer un courriel de notification quand :"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:652
+#: ../../Code/Module/Settings/Channel.php:652
 msgid "You receive a connection request"
 msgstr "Vous recevez une demande d'ajout de connexion"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:654
+#: ../../Code/Module/Settings/Channel.php:654
 msgid "Someone writes on your profile wall"
 msgstr "Quelqu'un a écrit sur votre mur"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:655
+#: ../../Code/Module/Settings/Channel.php:655
 msgid "Someone writes a followup comment"
 msgstr "Quelqu'un a commenté vos publications"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:656
+#: ../../Code/Module/Settings/Channel.php:656
 msgid "You receive a direct (private) message"
 msgstr "Vous avez reçu un message direct (privé)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:658
+#: ../../Code/Module/Settings/Channel.php:658
 msgid "You are tagged in a post"
 msgstr "Vous êtes étiqueté dans une publication"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:661
+#: ../../Code/Module/Settings/Channel.php:661
 msgid "Someone likes your post/comment"
 msgstr "Quelqu'un aime votre publication/commentaire"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:664
+#: ../../Code/Module/Settings/Channel.php:664
 msgid "Show visual notifications including:"
 msgstr "Afficher des notifications visuelles y compris :"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:666
+#: ../../Code/Module/Settings/Channel.php:666
 msgid "Unseen stream activity"
 msgstr "Activité non vue sur le flux"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:667
+#: ../../Code/Module/Settings/Channel.php:667
 msgid "Unseen channel activity"
 msgstr "Activité non vue sur le canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:668
+#: ../../Code/Module/Settings/Channel.php:668
 msgid "Unseen direct messages"
 msgstr "Messages directs non vus"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:668
-#: ../../Zotlabs/Module/Settings/Channel.php:673
-#: ../../Zotlabs/Module/Settings/Channel.php:674
-#: ../../Zotlabs/Module/Settings/Channel.php:675
+#: ../../Code/Module/Settings/Channel.php:668
+#: ../../Code/Module/Settings/Channel.php:673
+#: ../../Code/Module/Settings/Channel.php:674
+#: ../../Code/Module/Settings/Channel.php:675
 msgid "Recommended"
 msgstr "Recommandé"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:669
+#: ../../Code/Module/Settings/Channel.php:669
 msgid "Upcoming events"
 msgstr "Évènements à venir"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:670
+#: ../../Code/Module/Settings/Channel.php:670
 msgid "Events today"
 msgstr "Évènements aujourd'hui"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:671
+#: ../../Code/Module/Settings/Channel.php:671
 msgid "Upcoming birthdays"
 msgstr "Anniversaires à venir"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:671
+#: ../../Code/Module/Settings/Channel.php:671
 msgid "Not available in all themes"
 msgstr "Pas disponible dans tous les thèmes"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:672
+#: ../../Code/Module/Settings/Channel.php:672
 msgid "System (personal) notifications"
 msgstr "Notifications système (personnelles)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:673
+#: ../../Code/Module/Settings/Channel.php:673
 msgid "System info messages"
 msgstr "Messages d'info système"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:674
+#: ../../Code/Module/Settings/Channel.php:674
 msgid "System critical alerts"
 msgstr "Alertes système critiques"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:675
+#: ../../Code/Module/Settings/Channel.php:675
 msgid "New connections"
 msgstr "Nouvelles connexions"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:676
+#: ../../Code/Module/Settings/Channel.php:676
 msgid "System Registrations"
 msgstr "Inscriptions système"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:678
+#: ../../Code/Module/Settings/Channel.php:678
 msgid "Unseen public activity"
 msgstr "Activité publique non vue"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:679
+#: ../../Code/Module/Settings/Channel.php:679
 msgid "Unseen likes and dislikes"
 msgstr "Aime et n'aime pas non consultés"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:680
+#: ../../Code/Module/Settings/Channel.php:680
 msgid "Unseen forum posts"
 msgstr "Publications dans un groupe non vues"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:681
+#: ../../Code/Module/Settings/Channel.php:681
 msgid "Reported content"
 msgstr "Contenu signalé"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:682
+#: ../../Code/Module/Settings/Channel.php:682
 msgid "Email notification hub (hostname)"
 msgstr "Concentrateur de notification par courriel (nom d'hôte)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:682
+#: ../../Code/Module/Settings/Channel.php:682
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple locations, set this to your "
@@ -2902,44 +2902,44 @@ msgstr ""
 "emplacement préféré. Cela vous évitera des notifications par courriel en "
 "double. Exemple : %s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:683
+#: ../../Code/Module/Settings/Channel.php:683
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
 "Montrer les nouveaux envois, messages privés et les nouvelles connexions "
 "dans les Notifications"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:684
+#: ../../Code/Module/Settings/Channel.php:684
 msgid "Accept messages from strangers which mention me"
 msgstr "Accepter les messages d'inconnus qui me mentionnent"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:684
+#: ../../Code/Module/Settings/Channel.php:684
 msgid "This setting bypasses normal permissions"
 msgstr "Ce réglage outrepasse les réglages d'accès normaux"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:685
+#: ../../Code/Module/Settings/Channel.php:685
 msgid ""
 "Accept messages from strangers which include any of the following hashtags"
 msgstr ""
 "Accepter les messages d'inconnus qui incluent n'importe lequel des hashtags "
 "suivants"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:685
+#: ../../Code/Module/Settings/Channel.php:685
 msgid "comma separated, do not include the #"
 msgstr "séparés par des virgules, ne mettez pas le #"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:686
+#: ../../Code/Module/Settings/Channel.php:686
 msgid "Notify me of events this many days in advance"
 msgstr "Me prévenir d’événements à venir tant de jours en avance"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:686
+#: ../../Code/Module/Settings/Channel.php:686
 msgid "Must be greater than 0"
 msgstr "Doit être supérieur à 0"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:691
+#: ../../Code/Module/Settings/Channel.php:691
 msgid "Date and time"
 msgstr "Date et heure"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:692
+#: ../../Code/Module/Settings/Channel.php:692
 msgid ""
 "This section is reserved for use by optional addons and apps to provide "
 "additional settings."
@@ -2947,45 +2947,45 @@ msgstr ""
 "Cette section est réservée pour les addons optionnels et les applications "
 "qui fournissent des réglages additionnels."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:693
+#: ../../Code/Module/Settings/Channel.php:693
 msgid "Advanced Account/Page Type Settings"
 msgstr "Paramètres avancés de compte/type de page"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:694
+#: ../../Code/Module/Settings/Channel.php:694
 msgid "Change the behaviour of this account for special situations"
 msgstr "Modifie le comportement de ce compte pour des situations particulières"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:697
+#: ../../Code/Module/Settings/Channel.php:697
 msgid "Default photo upload folder name"
 msgstr "Nom du dossier de téléversement par défaut des photos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:697
-#: ../../Zotlabs/Module/Settings/Channel.php:698
+#: ../../Code/Module/Settings/Channel.php:697
+#: ../../Code/Module/Settings/Channel.php:698
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - année en cours, %m - mois en cours"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:698
+#: ../../Code/Module/Settings/Channel.php:698
 msgid "Default file upload folder name"
 msgstr "Nom du dossier de téléversement de fichiers par défaut"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:700
+#: ../../Code/Module/Settings/Channel.php:700
 msgid "Personal menu to display in your channel pages"
 msgstr "Menu personnel à afficher sur les pages de votre canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:701
-#: ../../Zotlabs/Module/Removeme.php:70
+#: ../../Code/Module/Settings/Channel.php:701
+#: ../../Code/Module/Removeme.php:70
 msgid "Remove Channel"
 msgstr "Supprimer le canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:702
+#: ../../Code/Module/Settings/Channel.php:702
 msgid "Remove this channel."
 msgstr "Supprimer ce canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:703
+#: ../../Code/Module/Settings/Channel.php:703
 msgid "Mentions should display"
 msgstr "Les mentions doivent montrer"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:703
+#: ../../Code/Module/Settings/Channel.php:703
 msgid ""
 "Changes to this setting are applied to new posts/comments only. It is not "
 "retroactive."
@@ -2993,167 +2993,167 @@ msgstr ""
 "La modification de ce paramètre sera appliquée aux nouvelles publications et"
 " nouveaux commentaires uniquement. Elle ne sera pas rétroactive."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:705
+#: ../../Code/Module/Settings/Channel.php:705
 msgid "the channel display name [example: @Barbara Jenkins]"
 msgstr "le nom complet du canal [exemple : @Carole Durand]"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:706
+#: ../../Code/Module/Settings/Channel.php:706
 msgid "the channel nickname [example: @barbara1976]"
 msgstr "le nom d'utilisateur du canal [exemple : @carole1976]"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:707
+#: ../../Code/Module/Settings/Channel.php:707
 msgid "combined [example: @Barbara Jenkins (barbara1976)]"
 msgstr "une combinaison des deux [exemple : @Carole Durand (carole1976)]"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:708
+#: ../../Code/Module/Settings/Channel.php:708
 msgid "no preference, use the system default"
 msgstr "pas de préférence, utiliser le réglage système"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:711
+#: ../../Code/Module/Settings/Channel.php:711
 msgid "Calendar week begins on"
 msgstr "La semaine calendaire débute le"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:711
+#: ../../Code/Module/Settings/Channel.php:711
 msgid "This varies by country/culture"
 msgstr "Ceci est en fonction du pays ou de la culture"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:712 ../../include/text.php:1307
+#: ../../Code/Module/Settings/Channel.php:712 ../../include/text.php:1307
 #: ../../include/js_strings.php:88
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:713 ../../include/text.php:1307
+#: ../../Code/Module/Settings/Channel.php:713 ../../include/text.php:1307
 #: ../../include/js_strings.php:89
 msgid "Monday"
 msgstr "Lundi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:714 ../../include/text.php:1307
+#: ../../Code/Module/Settings/Channel.php:714 ../../include/text.php:1307
 #: ../../include/js_strings.php:90
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:715 ../../include/text.php:1307
+#: ../../Code/Module/Settings/Channel.php:715 ../../include/text.php:1307
 #: ../../include/js_strings.php:91
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:716 ../../include/text.php:1307
+#: ../../Code/Module/Settings/Channel.php:716 ../../include/text.php:1307
 #: ../../include/js_strings.php:92
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:717 ../../include/text.php:1307
+#: ../../Code/Module/Settings/Channel.php:717 ../../include/text.php:1307
 #: ../../include/js_strings.php:93
 msgid "Friday"
 msgstr "Vendredi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:718 ../../include/text.php:1307
+#: ../../Code/Module/Settings/Channel.php:718 ../../include/text.php:1307
 #: ../../include/js_strings.php:94
 msgid "Saturday"
 msgstr "Samedi"
 
-#: ../../Zotlabs/Module/Events.php:33 ../../Zotlabs/Module/Cdav.php:786
+#: ../../Code/Module/Events.php:33 ../../Code/Module/Cdav.php:786
 msgid "Calendar entries imported."
 msgstr "Entrées de calendrier importées."
 
-#: ../../Zotlabs/Module/Events.php:35 ../../Zotlabs/Module/Cdav.php:789
+#: ../../Code/Module/Events.php:35 ../../Code/Module/Cdav.php:789
 msgid "No calendar entries found."
 msgstr "Aucune entrée de calendrier trouvée."
 
-#: ../../Zotlabs/Module/Events.php:135 ../../Zotlabs/Module/Calendar.php:93
+#: ../../Code/Module/Events.php:135 ../../Code/Module/Calendar.php:93
 msgid "Event can not end before it has started."
 msgstr "La fin de l'événement ne peut être antérieure à son début."
 
-#: ../../Zotlabs/Module/Events.php:137 ../../Zotlabs/Module/Events.php:146
-#: ../../Zotlabs/Module/Events.php:167 ../../Zotlabs/Module/Calendar.php:95
-#: ../../Zotlabs/Module/Calendar.php:103 ../../Zotlabs/Module/Calendar.php:119
+#: ../../Code/Module/Events.php:137 ../../Code/Module/Events.php:146
+#: ../../Code/Module/Events.php:167 ../../Code/Module/Calendar.php:95
+#: ../../Code/Module/Calendar.php:103 ../../Code/Module/Calendar.php:119
 msgid "Unable to generate preview."
 msgstr "Impossible de générer l'aperçu."
 
-#: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Calendar.php:101
+#: ../../Code/Module/Events.php:144 ../../Code/Module/Calendar.php:101
 msgid "Event title and start time are required."
 msgstr "Un titre et une date de début sont requises pour l'événement."
 
-#: ../../Zotlabs/Module/Events.php:165 ../../Zotlabs/Module/Events.php:289
-#: ../../Zotlabs/Module/Calendar.php:117 ../../Zotlabs/Module/Calendar.php:257
+#: ../../Code/Module/Events.php:165 ../../Code/Module/Events.php:289
+#: ../../Code/Module/Calendar.php:117 ../../Code/Module/Calendar.php:257
 msgid "Event not found."
 msgstr "Événement introuvable."
 
-#: ../../Zotlabs/Module/Events.php:284 ../../Zotlabs/Module/Like.php:350
-#: ../../Zotlabs/Module/Tagger.php:75 ../../Zotlabs/Module/Calendar.php:252
+#: ../../Code/Module/Events.php:284 ../../Code/Module/Like.php:350
+#: ../../Code/Module/Tagger.php:75 ../../Code/Module/Calendar.php:252
 #: ../../include/event.php:1209 ../../include/conversation.php:123
 #: ../../include/text.php:2111
 msgid "event"
 msgstr "événement"
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Code/Module/Events.php:475
 msgid "day(s)"
 msgstr "jour(s)"
 
-#: ../../Zotlabs/Module/Events.php:476
+#: ../../Code/Module/Events.php:476
 msgid "week(s)"
 msgstr "semaine(s)"
 
-#: ../../Zotlabs/Module/Events.php:477
+#: ../../Code/Module/Events.php:477
 msgid "month(s)"
 msgstr "mois"
 
-#: ../../Zotlabs/Module/Events.php:478
+#: ../../Code/Module/Events.php:478
 msgid "year(s)"
 msgstr "an(s)"
 
-#: ../../Zotlabs/Module/Events.php:491
+#: ../../Code/Module/Events.php:491
 msgid "Edit event title"
 msgstr "Modifier le titre de l'événement"
 
-#: ../../Zotlabs/Module/Events.php:491 ../../Zotlabs/Module/Cdav.php:1009
+#: ../../Code/Module/Events.php:491 ../../Code/Module/Cdav.php:1009
 msgid "Event title"
 msgstr "Titre de l'évènement"
 
-#: ../../Zotlabs/Module/Events.php:491 ../../Zotlabs/Module/Events.php:496
-#: ../../Zotlabs/Module/Appman.php:132 ../../Zotlabs/Module/Appman.php:133
-#: ../../Zotlabs/Module/Profiles.php:744 ../../Zotlabs/Module/Profiles.php:748
+#: ../../Code/Module/Events.php:491 ../../Code/Module/Events.php:496
+#: ../../Code/Module/Appman.php:132 ../../Code/Module/Appman.php:133
+#: ../../Code/Module/Profiles.php:744 ../../Code/Module/Profiles.php:748
 #: ../../include/datetime.php:213
 msgid "Required"
 msgstr "Requis"
 
-#: ../../Zotlabs/Module/Events.php:493
+#: ../../Code/Module/Events.php:493
 msgid "Categories (comma-separated list)"
 msgstr "Catégories (séparées par des virgules)"
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Code/Module/Events.php:494
 msgid "Edit Category"
 msgstr "Modifier la catégorie"
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Code/Module/Events.php:494
 msgid "Category"
 msgstr "Catégorie"
 
-#: ../../Zotlabs/Module/Events.php:497
+#: ../../Code/Module/Events.php:497
 msgid "Edit start date and time"
 msgstr "Modifier la date et l'heure de début"
 
-#: ../../Zotlabs/Module/Events.php:497 ../../Zotlabs/Module/Cdav.php:1010
+#: ../../Code/Module/Events.php:497 ../../Code/Module/Cdav.php:1010
 msgid "Start date and time"
 msgstr "Date et heure de début"
 
-#: ../../Zotlabs/Module/Events.php:498 ../../Zotlabs/Module/Events.php:501
+#: ../../Code/Module/Events.php:498 ../../Code/Module/Events.php:501
 msgid "Finish date and time are not known or not relevant"
 msgstr "Date et heure de fin inconnues ou sans objet"
 
-#: ../../Zotlabs/Module/Events.php:500
+#: ../../Code/Module/Events.php:500
 msgid "Edit finish date and time"
 msgstr "Modifier la date et l'heure de fin"
 
-#: ../../Zotlabs/Module/Events.php:500
+#: ../../Code/Module/Events.php:500
 msgid "Finish date and time"
 msgstr "Date et heure de fin"
 
-#: ../../Zotlabs/Module/Events.php:502 ../../Zotlabs/Module/Events.php:503
+#: ../../Code/Module/Events.php:502 ../../Code/Module/Events.php:503
 msgid "Adjust for viewer timezone"
 msgstr "Ajuster au fuseau horaire du visiteur"
 
-#: ../../Zotlabs/Module/Events.php:502
+#: ../../Code/Module/Events.php:502
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
@@ -3161,210 +3161,210 @@ msgstr ""
 "Important pour les événements se tenant en un lieu particulier. Pas pratique"
 " pour les vacances communes à de nombreux pays dans le monde."
 
-#: ../../Zotlabs/Module/Events.php:504
+#: ../../Code/Module/Events.php:504
 msgid "Edit Description"
 msgstr "Modifier la description"
 
-#: ../../Zotlabs/Module/Events.php:504 ../../Zotlabs/Module/Appman.php:134
-#: ../../Zotlabs/Module/Cdav.php:1012
+#: ../../Code/Module/Events.php:504 ../../Code/Module/Appman.php:134
+#: ../../Code/Module/Cdav.php:1012
 msgid "Description"
 msgstr "Description"
 
-#: ../../Zotlabs/Module/Events.php:506
+#: ../../Code/Module/Events.php:506
 msgid "Edit Location"
 msgstr "Modifier le lieu"
 
-#: ../../Zotlabs/Module/Events.php:506 ../../Zotlabs/Module/Locs.php:120
-#: ../../Zotlabs/Module/Sites.php:67 ../../Zotlabs/Module/Cdav.php:1013
-#: ../../Zotlabs/Module/Profiles.php:507 ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Events.php:506 ../../Code/Module/Locs.php:120
+#: ../../Code/Module/Sites.php:67 ../../Code/Module/Cdav.php:1013
+#: ../../Code/Module/Profiles.php:507 ../../Code/Module/Profiles.php:732
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Lieu"
 
-#: ../../Zotlabs/Module/Events.php:509 ../../Zotlabs/Module/Photos.php:1117
-#: ../../Zotlabs/Module/Webpages.php:263 ../../Zotlabs/Lib/ThreadItem.php:914
+#: ../../Code/Module/Events.php:509 ../../Code/Module/Photos.php:1117
+#: ../../Code/Module/Webpages.php:263 ../../Code/Lib/ThreadItem.php:914
 #: ../../include/conversation.php:1348
 msgid "Preview"
 msgstr "Aperçu"
 
-#: ../../Zotlabs/Module/Events.php:510 ../../include/conversation.php:1439
+#: ../../Code/Module/Events.php:510 ../../include/conversation.php:1439
 msgid "Permission settings"
 msgstr "Gérer les droits d'accès"
 
-#: ../../Zotlabs/Module/Events.php:520
+#: ../../Code/Module/Events.php:520
 msgid "Timezone:"
 msgstr "Fuseau horaire :"
 
-#: ../../Zotlabs/Module/Events.php:525
+#: ../../Code/Module/Events.php:525
 msgid "Advanced Options"
 msgstr "Options avancées"
 
-#: ../../Zotlabs/Module/Events.php:527
+#: ../../Code/Module/Events.php:527
 msgid "Event repeat"
 msgstr "Répétition de l'évènement"
 
-#: ../../Zotlabs/Module/Events.php:528
+#: ../../Code/Module/Events.php:528
 msgid "Repeat frequency"
 msgstr "Fréquence de répétition"
 
-#: ../../Zotlabs/Module/Events.php:529
+#: ../../Code/Module/Events.php:529
 msgid "Repeat every"
 msgstr "Répéter tou(te)s les"
 
-#: ../../Zotlabs/Module/Events.php:530
+#: ../../Code/Module/Events.php:530
 msgid "Number of total repeats"
 msgstr "Nombre total de répétitions"
 
-#: ../../Zotlabs/Module/Events.php:643 ../../Zotlabs/Module/Cal.php:270
+#: ../../Code/Module/Events.php:643 ../../Code/Module/Cal.php:270
 msgid "l, F j"
 msgstr "l, F j"
 
-#: ../../Zotlabs/Module/Events.php:671 ../../Zotlabs/Module/Calendar.php:419
+#: ../../Code/Module/Events.php:671 ../../Code/Module/Calendar.php:419
 msgid "Edit event"
 msgstr "Modifier l'événement"
 
-#: ../../Zotlabs/Module/Events.php:673 ../../Zotlabs/Module/Calendar.php:421
+#: ../../Code/Module/Events.php:673 ../../Code/Module/Calendar.php:421
 msgid "Delete event"
 msgstr "Supprimer l'événement"
 
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Cal.php:320
+#: ../../Code/Module/Events.php:699 ../../Code/Module/Cal.php:320
 #: ../../include/text.php:1934
 msgid "Link to Source"
 msgstr "Lien vers la Source"
 
-#: ../../Zotlabs/Module/Events.php:708 ../../Zotlabs/Module/Calendar.php:449
+#: ../../Code/Module/Events.php:708 ../../Code/Module/Calendar.php:449
 msgid "calendar"
 msgstr "calendrier"
 
-#: ../../Zotlabs/Module/Events.php:727 ../../Zotlabs/Module/Cal.php:343
+#: ../../Code/Module/Events.php:727 ../../Code/Module/Cal.php:343
 msgid "Edit Event"
 msgstr "Modifier l'évènement"
 
-#: ../../Zotlabs/Module/Events.php:727 ../../Zotlabs/Module/Cal.php:343
+#: ../../Code/Module/Events.php:727 ../../Code/Module/Cal.php:343
 msgid "Create Event"
 msgstr "Créer un évènement"
 
-#: ../../Zotlabs/Module/Events.php:728 ../../Zotlabs/Module/Events.php:737
-#: ../../Zotlabs/Module/Photos.php:967 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Cal.php:351 ../../Zotlabs/Module/Cdav.php:1032
+#: ../../Code/Module/Events.php:728 ../../Code/Module/Events.php:737
+#: ../../Code/Module/Photos.php:967 ../../Code/Module/Cal.php:344
+#: ../../Code/Module/Cal.php:351 ../../Code/Module/Cdav.php:1032
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../../Zotlabs/Module/Events.php:729 ../../Zotlabs/Module/Events.php:738
-#: ../../Zotlabs/Module/Setup.php:275 ../../Zotlabs/Module/Photos.php:976
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Cal.php:352
-#: ../../Zotlabs/Module/Cdav.php:1033
+#: ../../Code/Module/Events.php:729 ../../Code/Module/Events.php:738
+#: ../../Code/Module/Setup.php:275 ../../Code/Module/Photos.php:976
+#: ../../Code/Module/Cal.php:345 ../../Code/Module/Cal.php:352
+#: ../../Code/Module/Cdav.php:1033
 msgid "Next"
 msgstr "Suivant"
 
-#: ../../Zotlabs/Module/Events.php:730 ../../Zotlabs/Module/Cal.php:346
-#: ../../Zotlabs/Lib/Libprofile.php:575
+#: ../../Code/Module/Events.php:730 ../../Code/Module/Cal.php:346
+#: ../../Code/Lib/Libprofile.php:575
 msgid "Export"
 msgstr "Export"
 
-#: ../../Zotlabs/Module/Events.php:733 ../../Zotlabs/Module/Webpages.php:262
-#: ../../Zotlabs/Module/Blocks.php:170 ../../Zotlabs/Module/Layouts.php:204
+#: ../../Code/Module/Events.php:733 ../../Code/Module/Webpages.php:262
+#: ../../Code/Module/Blocks.php:170 ../../Code/Module/Layouts.php:204
 msgid "View"
 msgstr "Voir"
 
-#: ../../Zotlabs/Module/Events.php:734 ../../Zotlabs/Module/Cdav.php:1035
+#: ../../Code/Module/Events.php:734 ../../Code/Module/Cdav.php:1035
 msgid "Month"
 msgstr "Mois"
 
-#: ../../Zotlabs/Module/Events.php:735 ../../Zotlabs/Module/Cdav.php:1036
+#: ../../Code/Module/Events.php:735 ../../Code/Module/Cdav.php:1036
 msgid "Week"
 msgstr "Semaine"
 
-#: ../../Zotlabs/Module/Events.php:736 ../../Zotlabs/Module/Cdav.php:1037
+#: ../../Code/Module/Events.php:736 ../../Code/Module/Cdav.php:1037
 msgid "Day"
 msgstr "Jour"
 
-#: ../../Zotlabs/Module/Events.php:739 ../../Zotlabs/Module/Cal.php:353
-#: ../../Zotlabs/Module/Cdav.php:1034
+#: ../../Code/Module/Events.php:739 ../../Code/Module/Cal.php:353
+#: ../../Code/Module/Cdav.php:1034
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ../../Zotlabs/Module/Events.php:826
+#: ../../Code/Module/Events.php:826
 msgid "Event removed"
 msgstr "Événement supprimé"
 
-#: ../../Zotlabs/Module/Events.php:829 ../../Zotlabs/Module/Calendar.php:482
+#: ../../Code/Module/Events.php:829 ../../Code/Module/Calendar.php:482
 msgid "Failed to remove event"
 msgstr "Impossible de supprimer l'événement"
 
-#: ../../Zotlabs/Module/Superblock.php:53
-#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:42
-#: ../../Zotlabs/Module/Cal.php:70 ../../Zotlabs/Module/Page.php:79
-#: ../../Zotlabs/Module/Card_edit.php:46 ../../Zotlabs/Module/Chanview.php:94
+#: ../../Code/Module/Superblock.php:53
+#: ../../Code/Module/Wall_upload.php:31 ../../Code/Module/Block.php:42
+#: ../../Code/Module/Cal.php:70 ../../Code/Module/Page.php:79
+#: ../../Code/Module/Card_edit.php:46 ../../Code/Module/Chanview.php:94
 #: ../../include/items.php:4063
 msgid "Channel not found."
 msgstr "Canal introuvable."
 
-#: ../../Zotlabs/Module/Superblock.php:81
+#: ../../Code/Module/Superblock.php:81
 msgid "Added by Superblock"
 msgstr "Ajouté par Superblock"
 
-#: ../../Zotlabs/Module/Superblock.php:181
+#: ../../Code/Module/Superblock.php:181
 msgid "superblock settings updated"
 msgstr "Les paramètres de Superblock ont été mis à jour"
 
-#: ../../Zotlabs/Module/Superblock.php:212
+#: ../../Code/Module/Superblock.php:212
 msgid "Blocked channels"
 msgstr "Canaux bloqués"
 
-#: ../../Zotlabs/Module/Superblock.php:214
+#: ../../Code/Module/Superblock.php:214
 msgid "No channels currently blocked"
 msgstr "Aucun canal n'est actuellement bloqué"
 
-#: ../../Zotlabs/Module/Superblock.php:216
-#: ../../Zotlabs/Module/Superblock.php:233 ../../Zotlabs/Module/Photos.php:1016
-#: ../../Zotlabs/Module/Admin/Addons.php:453 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Code/Module/Superblock.php:216
+#: ../../Code/Module/Superblock.php:233 ../../Code/Module/Photos.php:1016
+#: ../../Code/Module/Admin/Addons.php:453 ../../Code/Module/Tagrm.php:137
 msgid "Remove"
 msgstr "Retirer"
 
-#: ../../Zotlabs/Module/Superblock.php:229
+#: ../../Code/Module/Superblock.php:229
 msgid "Blocked servers"
 msgstr "Serveurs bloqués"
 
-#: ../../Zotlabs/Module/Superblock.php:231
+#: ../../Code/Module/Superblock.php:231
 msgid "No servers currently blocked"
 msgstr "Aucun serveur n'est actuellement bloqué"
 
-#: ../../Zotlabs/Module/Categories.php:29
+#: ../../Code/Module/Categories.php:29
 msgid "This app allows you to add categories to posts and events."
 msgstr ""
 "Cette application vous permet d'ajouter des catégories aux publications et "
 "évènements."
 
-#: ../../Zotlabs/Module/Dircensor.php:42
+#: ../../Code/Module/Dircensor.php:42
 msgid "Entry censored"
 msgstr "Entrée censurée"
 
-#: ../../Zotlabs/Module/Dircensor.php:45
+#: ../../Code/Module/Dircensor.php:45
 msgid "Entry uncensored"
 msgstr "Entrée dé-censurée"
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+#: ../../Code/Module/Editpost.php:38 ../../Code/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "Elément non modifiable"
 
-#: ../../Zotlabs/Module/Editpost.php:119 ../../Zotlabs/Module/Rpost.php:149
+#: ../../Code/Module/Editpost.php:119 ../../Code/Module/Rpost.php:149
 msgid "Edit post"
 msgstr "Modifier la publication"
 
-#: ../../Zotlabs/Module/Regdir.php:52
+#: ../../Code/Module/Regdir.php:52
 msgid "This site is not a directory server"
 msgstr "Ce site n'est pas un serveur d'annuaire"
 
-#: ../../Zotlabs/Module/Setup.php:182
+#: ../../Code/Module/Setup.php:182
 msgid "$Projectname Server - Setup"
 msgstr "Serveur $Projectname - Configuration"
 
-#: ../../Zotlabs/Module/Setup.php:186
+#: ../../Code/Module/Setup.php:186
 msgid "Could not connect to database."
 msgstr "Impossible de se connecter à la base de données."
 
-#: ../../Zotlabs/Module/Setup.php:190
+#: ../../Code/Module/Setup.php:190
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
@@ -3372,15 +3372,15 @@ msgstr ""
 "Impossible de se connecter à l'URL indiquée. Problème potentiel de "
 "certificat SSL/TLS ou de DNS."
 
-#: ../../Zotlabs/Module/Setup.php:197
+#: ../../Code/Module/Setup.php:197
 msgid "Could not create table."
 msgstr "Impossible de créer la table."
 
-#: ../../Zotlabs/Module/Setup.php:203
+#: ../../Code/Module/Setup.php:203
 msgid "Your site database has been installed."
 msgstr "La base de données de votre site a été installée."
 
-#: ../../Zotlabs/Module/Setup.php:209
+#: ../../Code/Module/Setup.php:209
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
@@ -3388,24 +3388,24 @@ msgstr ""
 "Vous pourriez avoir besoin d'importer le fichier \"install/schema_xxx.sql\" "
 "manuellement via un client de base de données."
 
-#: ../../Zotlabs/Module/Setup.php:210 ../../Zotlabs/Module/Setup.php:274
-#: ../../Zotlabs/Module/Setup.php:784
+#: ../../Code/Module/Setup.php:210 ../../Code/Module/Setup.php:274
+#: ../../Code/Module/Setup.php:784
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Merci de consulter le fichier \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:271
+#: ../../Code/Module/Setup.php:271
 msgid "System check"
 msgstr "Vérification du système"
 
-#: ../../Zotlabs/Module/Setup.php:276
+#: ../../Code/Module/Setup.php:276
 msgid "Check again"
 msgstr "Re-vérifier"
 
-#: ../../Zotlabs/Module/Setup.php:299
+#: ../../Code/Module/Setup.php:299
 msgid "Database connection"
 msgstr "Connexion à la base de données"
 
-#: ../../Zotlabs/Module/Setup.php:300
+#: ../../Code/Module/Setup.php:300
 msgid ""
 "In order to install this software we need to know how to connect to your "
 "database."
@@ -3413,7 +3413,7 @@ msgstr ""
 "Pour installer ce logiciel nous avons besoin de savoir comment se connecter "
 "à votre base de données."
 
-#: ../../Zotlabs/Module/Setup.php:301
+#: ../../Code/Module/Setup.php:301
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
@@ -3421,7 +3421,7 @@ msgstr ""
 "Merci de contacter votre prestataire d'hébergement ou votre administrateur "
 "si vous avez des questions à propos de ces paramètres."
 
-#: ../../Zotlabs/Module/Setup.php:302
+#: ../../Code/Module/Setup.php:302
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
@@ -3429,43 +3429,43 @@ msgstr ""
 "La base de données que vous allez spécifier doit exister. Si ce n'est pas "
 "déjà le cas, merci de la créer avant de continuer."
 
-#: ../../Zotlabs/Module/Setup.php:306
+#: ../../Code/Module/Setup.php:306
 msgid "Database Server Name"
 msgstr "Nom du serveur de base de données"
 
-#: ../../Zotlabs/Module/Setup.php:306
+#: ../../Code/Module/Setup.php:306
 msgid "Default is 127.0.0.1"
 msgstr "Par défaut 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:307
+#: ../../Code/Module/Setup.php:307
 msgid "Database Port"
 msgstr "Port de la base de données"
 
-#: ../../Zotlabs/Module/Setup.php:307
+#: ../../Code/Module/Setup.php:307
 msgid "Communication port number - use 0 for default"
 msgstr "Numéro du port de communication - utilisez 0 pour la valeur par défaut"
 
-#: ../../Zotlabs/Module/Setup.php:308
+#: ../../Code/Module/Setup.php:308
 msgid "Database Login Name"
 msgstr "Identifiant de connexion à la Base de Données"
 
-#: ../../Zotlabs/Module/Setup.php:309
+#: ../../Code/Module/Setup.php:309
 msgid "Database Login Password"
 msgstr "Mot de passe de connexion à la Base de Données"
 
-#: ../../Zotlabs/Module/Setup.php:310
+#: ../../Code/Module/Setup.php:310
 msgid "Database Name"
 msgstr "Nom de la Base de Données"
 
-#: ../../Zotlabs/Module/Setup.php:311
+#: ../../Code/Module/Setup.php:311
 msgid "Database Type"
 msgstr "Type de base de données"
 
-#: ../../Zotlabs/Module/Setup.php:313 ../../Zotlabs/Module/Setup.php:356
+#: ../../Code/Module/Setup.php:313 ../../Code/Module/Setup.php:356
 msgid "Site administrator email address"
 msgstr "Adresse de courriel de l'administrateur du site"
 
-#: ../../Zotlabs/Module/Setup.php:313 ../../Zotlabs/Module/Setup.php:356
+#: ../../Code/Module/Setup.php:313 ../../Code/Module/Setup.php:356
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
@@ -3473,36 +3473,36 @@ msgstr ""
 "Votre compte devra utiliser la même adresse de courriel pour pouvoir "
 "utiliser l'administration web."
 
-#: ../../Zotlabs/Module/Setup.php:314 ../../Zotlabs/Module/Setup.php:358
+#: ../../Code/Module/Setup.php:314 ../../Code/Module/Setup.php:358
 msgid "Website URL"
 msgstr "URL du site web"
 
-#: ../../Zotlabs/Module/Setup.php:314 ../../Zotlabs/Module/Setup.php:358
+#: ../../Code/Module/Setup.php:314 ../../Code/Module/Setup.php:358
 msgid "Please use SSL (https) URL if available."
 msgstr "Veuillez utiliser SSL/TLS (https) si disponible."
 
-#: ../../Zotlabs/Module/Setup.php:315 ../../Zotlabs/Module/Setup.php:360
+#: ../../Code/Module/Setup.php:315 ../../Code/Module/Setup.php:360
 msgid "Please select a default timezone for your website"
 msgstr "Veuillez choisir un fuseau horaire par défaut pour votre site"
 
-#: ../../Zotlabs/Module/Setup.php:344
+#: ../../Code/Module/Setup.php:344
 msgid "Site settings"
 msgstr "Paramètres du site"
 
-#: ../../Zotlabs/Module/Setup.php:399
+#: ../../Code/Module/Setup.php:399
 msgid "PHP version 7.1 or greater is required."
 msgstr "Une version de PHP égale ou supérieure à 7.1 est nécessaire"
 
-#: ../../Zotlabs/Module/Setup.php:400
+#: ../../Code/Module/Setup.php:400
 msgid "PHP version"
 msgstr "Version de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:416
+#: ../../Code/Module/Setup.php:416
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 "Impossible de trouver une version CLI de PHP dans le PATH du serveur web."
 
-#: ../../Zotlabs/Module/Setup.php:417
+#: ../../Code/Module/Setup.php:417
 msgid ""
 "If you do not have a command line version of PHP installed on server, you "
 "will not be able to run background tasks - including message delivery."
@@ -3511,11 +3511,11 @@ msgstr ""
 "sur votre serveur, vous ne pourrez pas exécuter les tâches de fond - "
 "notamment l'envoi de messages."
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Code/Module/Setup.php:421
 msgid "PHP executable path"
 msgstr "Chemin vers l'éxecutable PHP"
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Code/Module/Setup.php:421
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
@@ -3523,11 +3523,11 @@ msgstr ""
 "Entrez le chemin complet vers l'exécutable php. Vous pouvez continuer "
 "l'installation sans."
 
-#: ../../Zotlabs/Module/Setup.php:426
+#: ../../Code/Module/Setup.php:426
 msgid "Command line PHP"
 msgstr "PHP en ligne de commande (CLI)"
 
-#: ../../Zotlabs/Module/Setup.php:436
+#: ../../Code/Module/Setup.php:436
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
@@ -3535,7 +3535,7 @@ msgstr ""
 "Impossible de vérifier la ligne de commande PHP, car shell_exec () est "
 "désactivé. Ceci est nécessaire."
 
-#: ../../Zotlabs/Module/Setup.php:439
+#: ../../Code/Module/Setup.php:439
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
@@ -3543,15 +3543,15 @@ msgstr ""
 "La version CLI de PHP sur votre système n'a pas l'option "
 "\"register_argc_argv\" activée."
 
-#: ../../Zotlabs/Module/Setup.php:440
+#: ../../Code/Module/Setup.php:440
 msgid "This is required for message delivery to work."
 msgstr "Elle est nécessaire pour la distribution des messages."
 
-#: ../../Zotlabs/Module/Setup.php:443
+#: ../../Code/Module/Setup.php:443
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:461
+#: ../../Code/Module/Setup.php:461
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 2MB (2097152 bytes) at once."
@@ -3560,7 +3560,7 @@ msgstr ""
 " Vous devriez faire en sorte de pouvoir téléverser au moins 2MB (2097152 "
 "bytes) en une seule fois."
 
-#: ../../Zotlabs/Module/Setup.php:464
+#: ../../Code/Module/Setup.php:464
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to "
@@ -3570,15 +3570,15 @@ msgstr ""
 "taille maximale d'un seul fichier à téléverser est fixée à %s. Vous pouvez "
 "téléverser jusqu'à %d fichiers à la fois."
 
-#: ../../Zotlabs/Module/Setup.php:471
+#: ../../Code/Module/Setup.php:471
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Vous pouvez ajuster ces paramètres dans le fichier php.ini du serveur."
 
-#: ../../Zotlabs/Module/Setup.php:473
+#: ../../Code/Module/Setup.php:473
 msgid "PHP upload limits"
 msgstr "Limites de téléversement de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:496
+#: ../../Code/Module/Setup.php:496
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
@@ -3586,7 +3586,7 @@ msgstr ""
 "Erreur : la fonction \"openssl_pkey_new\" de ce système n'est pas "
 "capable de générer des clefs de chiffrement"
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Code/Module/Setup.php:497
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
@@ -3594,54 +3594,54 @@ msgstr ""
 "Si vous êtes sur un serveur Windows, merci de consulter "
 "\"http://www.php.net/manual/fr/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Code/Module/Setup.php:500
 msgid "Generate encryption keys"
 msgstr "Générer les clefs de chiffrement"
 
-#: ../../Zotlabs/Module/Setup.php:517
+#: ../../Code/Module/Setup.php:517
 msgid "libCurl PHP module"
 msgstr "module PHP libCurl"
 
-#: ../../Zotlabs/Module/Setup.php:518
+#: ../../Code/Module/Setup.php:518
 msgid "GD graphics PHP module"
 msgstr "module PHP GD graphics"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Code/Module/Setup.php:519
 msgid "OpenSSL PHP module"
 msgstr "module PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:520
+#: ../../Code/Module/Setup.php:520
 msgid "PDO database PHP module"
 msgstr "module PDO de la base de données PHP"
 
-#: ../../Zotlabs/Module/Setup.php:521
+#: ../../Code/Module/Setup.php:521
 msgid "mb_string PHP module"
 msgstr "module PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:522
+#: ../../Code/Module/Setup.php:522
 msgid "xml PHP module"
 msgstr "module PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:523
+#: ../../Code/Module/Setup.php:523
 msgid "zip PHP module"
 msgstr "module PHP zip"
 
-#: ../../Zotlabs/Module/Setup.php:527 ../../Zotlabs/Module/Setup.php:529
+#: ../../Code/Module/Setup.php:527 ../../Code/Module/Setup.php:529
 msgid "Apache mod_rewrite module"
 msgstr "module Apache mod_rewrite"
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Code/Module/Setup.php:527
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 "Erreur : le module mod-rewrite du serveur web Apache est requis, mais "
 "pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:533 ../../Zotlabs/Module/Setup.php:536
+#: ../../Code/Module/Setup.php:533 ../../Code/Module/Setup.php:536
 msgid "exec"
 msgstr "exec"
 
-#: ../../Zotlabs/Module/Setup.php:533
+#: ../../Code/Module/Setup.php:533
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
@@ -3649,11 +3649,11 @@ msgstr ""
 "Erreur: exec est requis mais soit il n'est pas installé, soit il a été "
 "désactivé dans php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:539 ../../Zotlabs/Module/Setup.php:542
+#: ../../Code/Module/Setup.php:539 ../../Code/Module/Setup.php:542
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Code/Module/Setup.php:539
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
@@ -3661,11 +3661,11 @@ msgstr ""
 "Erreur : shell_exec est requis mais soit il n'est pas installé, soit il"
 " a été désactivé dans php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:547
+#: ../../Code/Module/Setup.php:547
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Erreur : le module libCURL de PHP est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Code/Module/Setup.php:551
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
@@ -3673,42 +3673,42 @@ msgstr ""
 "Erreur : le module GD de PHP  avec support de JPEG  ou la librairie "
 "graphique ImageMagick sont requis, mais pas installés."
 
-#: ../../Zotlabs/Module/Setup.php:555
+#: ../../Code/Module/Setup.php:555
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Erreur : le module openssl de PHP est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:561
+#: ../../Code/Module/Setup.php:561
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr ""
 "Erreur: le module PDO de base de données PHP n'a pas de pilote pour mysql ou"
 " pgsql."
 
-#: ../../Zotlabs/Module/Setup.php:566
+#: ../../Code/Module/Setup.php:566
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 "Erreur: le module PDO de base de données PHP est requis mais n'est pas "
 "installé."
 
-#: ../../Zotlabs/Module/Setup.php:570
+#: ../../Code/Module/Setup.php:570
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 "Erreur : le module mb_string de PHP est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:574
+#: ../../Code/Module/Setup.php:574
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 "Erreur : le module xml de PHP est requis pour DAV, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Code/Module/Setup.php:578
 msgid "Error: zip PHP module required but not installed."
 msgstr "Erreur : le module zip de PHP est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:597 ../../Zotlabs/Module/Setup.php:606
+#: ../../Code/Module/Setup.php:597 ../../Code/Module/Setup.php:606
 msgid ".htconfig.php is writable"
 msgstr "Le fichier .htconfig.php est accessible en écriture"
 
-#: ../../Zotlabs/Module/Setup.php:602
+#: ../../Code/Module/Setup.php:602
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
@@ -3716,7 +3716,7 @@ msgstr ""
 "L'installeur web a besoin de créer un fichier \".htconfig.php\" à la racine "
 "de votre serveur web, mais en est incapable."
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Code/Module/Setup.php:603
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
@@ -3725,13 +3725,13 @@ msgstr ""
 " serveur web est interdit d'écriture dans le répertoire concerné - alors que"
 " votre propre utilisateur en a le droit."
 
-#: ../../Zotlabs/Module/Setup.php:604
+#: ../../Code/Module/Setup.php:604
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr ""
 "Merci de vous reporter à install/INSTALL.txt pour des informations "
 "supplémentaires."
 
-#: ../../Zotlabs/Module/Setup.php:622
+#: ../../Code/Module/Setup.php:622
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
@@ -3739,7 +3739,7 @@ msgstr ""
 "Ce logiciel utilise Smarty3 comme moteur de template pour afficher ses vues "
 "Web. Smarty3 compile ses modèles en PHP pour accélérer le rendu."
 
-#: ../../Zotlabs/Module/Setup.php:623
+#: ../../Code/Module/Setup.php:623
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
@@ -3748,7 +3748,7 @@ msgstr ""
 "Afin de stocker ces modèles compilés, le serveur Web doit disposer d'un "
 "accès en écriture au répertoire %s du dossier Web racine."
 
-#: ../../Zotlabs/Module/Setup.php:624 ../../Zotlabs/Module/Setup.php:645
+#: ../../Code/Module/Setup.php:624 ../../Code/Module/Setup.php:645
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
@@ -3757,7 +3757,7 @@ msgstr ""
 "(le plus souvent, www-data) a bien l'autorisation d'écrire dans ce "
 "répertoire."
 
-#: ../../Zotlabs/Module/Setup.php:625
+#: ../../Code/Module/Setup.php:625
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
@@ -3767,12 +3767,12 @@ msgstr ""
 "d'écriture au serveur web sur %s uniquement, pas sur les fichiers "
 "individuels (.tpl) qu'il contient."
 
-#: ../../Zotlabs/Module/Setup.php:628
+#: ../../Code/Module/Setup.php:628
 #, php-format
 msgid "%s is writable"
 msgstr "%s est accessible en écriture"
 
-#: ../../Zotlabs/Module/Setup.php:644
+#: ../../Code/Module/Setup.php:644
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level "
@@ -3782,11 +3782,11 @@ msgstr ""
 "téléversés. Le serveur Web doit disposer d'un accès en écriture au "
 "répertoire de stockage dans le dossier web racine."
 
-#: ../../Zotlabs/Module/Setup.php:648
+#: ../../Code/Module/Setup.php:648
 msgid "store is writable"
 msgstr "'store' est accessible en écriture"
 
-#: ../../Zotlabs/Module/Setup.php:680
+#: ../../Code/Module/Setup.php:680
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
@@ -3794,7 +3794,7 @@ msgstr ""
 "Le certificat SSL/TLS n'a pas pu être validé. Merci de le corriger, ou de "
 "désactiver l'accès https à ce site (non recommandé)."
 
-#: ../../Zotlabs/Module/Setup.php:681
+#: ../../Code/Module/Setup.php:681
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
@@ -3805,7 +3805,7 @@ msgstr ""
 "utiliser un certificat valide. Vous ne DEVEZ PAS utiliser un certificat "
 "autosigné !"
 
-#: ../../Zotlabs/Module/Setup.php:682
+#: ../../Code/Module/Setup.php:682
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
@@ -3814,7 +3814,7 @@ msgstr ""
 "publiques ne fassent référence par exemple à des images sur votre propre "
 "serveur."
 
-#: ../../Zotlabs/Module/Setup.php:683
+#: ../../Code/Module/Setup.php:683
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
@@ -3824,7 +3824,7 @@ msgstr ""
 " peuvent avoir des certificats valides) recevront des messages "
 "d'avertissement sur leur propre site se plaignant de problèmes de sécurité."
 
-#: ../../Zotlabs/Module/Setup.php:684
+#: ../../Code/Module/Setup.php:684
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
@@ -3832,14 +3832,14 @@ msgstr ""
 "Ceci peut causer des problèmes d'ergonomie ailleurs (pas seulement sur votre"
 " site), nous devons donc insister sur ce prérequis."
 
-#: ../../Zotlabs/Module/Setup.php:685
+#: ../../Code/Module/Setup.php:685
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 "Il existe des autorités de certification qui vous fourniront gratuitement un"
 " certificat valide."
 
-#: ../../Zotlabs/Module/Setup.php:687
+#: ../../Code/Module/Setup.php:687
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -3851,11 +3851,11 @@ msgstr ""
 "aurait échoué. Ceux-ci ne sont normalement pas requis par les navigateurs, "
 "mais ils sont requis pour les communications entre serveurs."
 
-#: ../../Zotlabs/Module/Setup.php:689
+#: ../../Code/Module/Setup.php:689
 msgid "SSL certificate validation"
 msgstr "Validation du certificat SSL/TLS"
 
-#: ../../Zotlabs/Module/Setup.php:695
+#: ../../Code/Module/Setup.php:695
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
@@ -3863,11 +3863,11 @@ msgstr ""
 "La réécriture d'URL définie dans le .htaccess ne fonctionne pas. Vérifiez "
 "votre configuration serveur. Test :"
 
-#: ../../Zotlabs/Module/Setup.php:698
+#: ../../Code/Module/Setup.php:698
 msgid "Url rewrite is working"
 msgstr "La réécriture d'URL fonctionne"
 
-#: ../../Zotlabs/Module/Setup.php:712
+#: ../../Code/Module/Setup.php:712
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
@@ -3877,127 +3877,127 @@ msgstr ""
 "peut être écrit. Merci de copier le texte généré dans un fichier à ce nom, à"
 " la racine de votre serveur web."
 
-#: ../../Zotlabs/Module/Setup.php:782
+#: ../../Code/Module/Setup.php:782
 msgid "
              What next?
              "
 msgstr "
              Et maintenant ?
              "
 
-#: ../../Zotlabs/Module/Setup.php:783
+#: ../../Code/Module/Setup.php:783
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 "IMPORTANT : Vous devez créer [manuellement] une tâche planifiée pour "
 "les mises à jour du réseau."
 
-#: ../../Zotlabs/Module/Appman.php:40 ../../Zotlabs/Module/Appman.php:57
+#: ../../Code/Module/Appman.php:40 ../../Code/Module/Appman.php:57
 msgid "App installed."
 msgstr "Application installée."
 
-#: ../../Zotlabs/Module/Appman.php:50
+#: ../../Code/Module/Appman.php:50
 msgid "Malformed app."
 msgstr "Application mal formée."
 
-#: ../../Zotlabs/Module/Appman.php:123
+#: ../../Code/Module/Appman.php:123
 msgid "Embed code"
 msgstr "Intégrer le code"
 
-#: ../../Zotlabs/Module/Appman.php:127
+#: ../../Code/Module/Appman.php:127
 msgid "Edit App"
 msgstr "Modifier l'application"
 
-#: ../../Zotlabs/Module/Appman.php:127
+#: ../../Code/Module/Appman.php:127
 msgid "Create App"
 msgstr "Créer une application"
 
-#: ../../Zotlabs/Module/Appman.php:132
+#: ../../Code/Module/Appman.php:132
 msgid "Name of app"
 msgstr "Nom de l'application"
 
-#: ../../Zotlabs/Module/Appman.php:133
+#: ../../Code/Module/Appman.php:133
 msgid "Location (URL) of app"
 msgstr "Emplacement (URL) de l'application"
 
-#: ../../Zotlabs/Module/Appman.php:135
+#: ../../Code/Module/Appman.php:135
 msgid "Photo icon URL"
 msgstr "URL de l'icône photo"
 
-#: ../../Zotlabs/Module/Appman.php:135
+#: ../../Code/Module/Appman.php:135
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels - facultatif"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Categories (optional, comma separated list)"
 msgstr "Catégories (en option, séparées par des virgules)"
 
-#: ../../Zotlabs/Module/Appman.php:137
+#: ../../Code/Module/Appman.php:137
 msgid "Version ID"
 msgstr "Identifiant de version"
 
-#: ../../Zotlabs/Module/Appman.php:138
+#: ../../Code/Module/Appman.php:138
 msgid "Price of app"
 msgstr "Prix de l'application"
 
-#: ../../Zotlabs/Module/Appman.php:139
+#: ../../Code/Module/Appman.php:139
 msgid "Location (URL) to purchase app"
 msgstr "Emplacement (URL) pour l'achat de l'application"
 
-#: ../../Zotlabs/Module/Like.php:104 ../../Zotlabs/Module/Like.php:130
+#: ../../Code/Module/Like.php:104 ../../Code/Module/Like.php:130
 msgid "Invalid request."
 msgstr "Requête invalide."
 
-#: ../../Zotlabs/Module/Like.php:116 ../../include/conversation.php:126
+#: ../../Code/Module/Like.php:116 ../../include/conversation.php:126
 msgid "channel"
 msgstr "canal"
 
-#: ../../Zotlabs/Module/Like.php:145
+#: ../../Code/Module/Like.php:145
 msgid "thing"
 msgstr "chose"
 
-#: ../../Zotlabs/Module/Like.php:269 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:79 ../../Zotlabs/Module/Lists.php:182
-#: ../../Zotlabs/Module/Lists.php:210 ../../Zotlabs/Module/Import_items.php:116
-#: ../../Zotlabs/Module/Subthread.php:85 ../../Zotlabs/Module/Profperm.php:32
-#: ../../Zotlabs/Module/Cloud.php:127 ../../Zotlabs/Module/Share.php:69
-#: ../../Zotlabs/Web/WebServer.php:128 ../../include/items.php:438
+#: ../../Code/Module/Like.php:269 ../../Code/Module/Dreport.php:10
+#: ../../Code/Module/Dreport.php:79 ../../Code/Module/Lists.php:182
+#: ../../Code/Module/Lists.php:210 ../../Code/Module/Import_items.php:116
+#: ../../Code/Module/Subthread.php:85 ../../Code/Module/Profperm.php:32
+#: ../../Code/Module/Cloud.php:127 ../../Code/Module/Share.php:69
+#: ../../Code/Web/WebServer.php:128 ../../include/items.php:438
 msgid "Permission denied"
 msgstr "Accès refusé"
 
-#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Subthread.php:112
-#: ../../Zotlabs/Module/Tagger.php:71 ../../include/conversation.php:120
+#: ../../Code/Module/Like.php:348 ../../Code/Module/Subthread.php:112
+#: ../../Code/Module/Tagger.php:71 ../../include/conversation.php:120
 #: ../../include/text.php:2108
 msgid "photo"
 msgstr "photo"
 
-#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Subthread.php:112
+#: ../../Code/Module/Like.php:348 ../../Code/Module/Subthread.php:112
 #: ../../include/text.php:2114
 msgid "status"
 msgstr "état"
 
-#: ../../Zotlabs/Module/Like.php:393 ../../include/conversation.php:167
+#: ../../Code/Module/Like.php:393 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s aime %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:395 ../../include/conversation.php:170
+#: ../../Code/Module/Like.php:395 ../../include/conversation.php:170
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s n'aime pas %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:397
+#: ../../Code/Module/Like.php:397
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s participe à %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:399
+#: ../../Code/Module/Like.php:399
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s ne participe pas à %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:401
+#: ../../Code/Module/Like.php:401
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s participe peut-être à %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Suggestions.php:39
+#: ../../Code/Module/Suggestions.php:39
 msgid ""
 "This app (when installed) displays a small number of friend suggestions on "
 "selected pages or you can run the app to display a full list of channel "
@@ -4008,321 +4008,321 @@ msgstr ""
 "l'application pour qu'elle affiche une liste complète de suggestions de "
 "contacts/canaux."
 
-#: ../../Zotlabs/Module/Dreport.php:56
+#: ../../Code/Module/Dreport.php:56
 msgid "Invalid message"
 msgstr "Message non valide"
 
-#: ../../Zotlabs/Module/Dreport.php:89
+#: ../../Code/Module/Dreport.php:89
 msgid "no results"
 msgstr "aucun résultat"
 
-#: ../../Zotlabs/Module/Dreport.php:103
+#: ../../Code/Module/Dreport.php:103
 msgid "channel sync processed"
 msgstr "Synchronisation de canal effectuée"
 
-#: ../../Zotlabs/Module/Dreport.php:107
+#: ../../Code/Module/Dreport.php:107
 msgid "queued"
 msgstr "mis dans la file d'attente"
 
-#: ../../Zotlabs/Module/Dreport.php:111
+#: ../../Code/Module/Dreport.php:111
 msgid "posted"
 msgstr "publié"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Code/Module/Dreport.php:115
 msgid "accepted for delivery"
 msgstr "accepté pour la distribution"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Code/Module/Dreport.php:119
 msgid "updated"
 msgstr "mis à jour"
 
-#: ../../Zotlabs/Module/Dreport.php:122
+#: ../../Code/Module/Dreport.php:122
 msgid "update ignored"
 msgstr "mise à jour ignorée"
 
-#: ../../Zotlabs/Module/Dreport.php:125
+#: ../../Code/Module/Dreport.php:125
 msgid "permission denied"
 msgstr "accès refusé"
 
-#: ../../Zotlabs/Module/Dreport.php:129
+#: ../../Code/Module/Dreport.php:129
 msgid "recipient not found"
 msgstr "destinataire introuvable"
 
-#: ../../Zotlabs/Module/Dreport.php:132
+#: ../../Code/Module/Dreport.php:132
 msgid "mail recalled"
 msgstr "courriel rappelé"
 
-#: ../../Zotlabs/Module/Dreport.php:135
+#: ../../Code/Module/Dreport.php:135
 msgid "duplicate mail received"
 msgstr "courriel reçu en double"
 
-#: ../../Zotlabs/Module/Dreport.php:138
+#: ../../Code/Module/Dreport.php:138
 msgid "mail delivered"
 msgstr "courriel distribué"
 
-#: ../../Zotlabs/Module/Dreport.php:158
+#: ../../Code/Module/Dreport.php:158
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Rapport de distribution pour %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:161
+#: ../../Code/Module/Dreport.php:161
 msgid "Options"
 msgstr "Options"
 
-#: ../../Zotlabs/Module/Dreport.php:162
+#: ../../Code/Module/Dreport.php:162
 msgid "Redeliver"
 msgstr "Transférer à nouveau"
 
-#: ../../Zotlabs/Module/Home.php:93 ../../Zotlabs/Module/Home.php:102
-#: ../../Zotlabs/Lib/Enotify.php:72
+#: ../../Code/Module/Home.php:93 ../../Code/Module/Home.php:102
+#: ../../Code/Lib/Enotify.php:72
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../Zotlabs/Module/Home.php:112
+#: ../../Code/Module/Home.php:112
 #, php-format
 msgid "Welcome to %s"
 msgstr "Bienvenue sur %s"
 
-#: ../../Zotlabs/Module/Block.php:30 ../../Zotlabs/Module/Page.php:43
+#: ../../Code/Module/Block.php:30 ../../Code/Module/Page.php:43
 msgid "Invalid item."
 msgstr "Élément invalide."
 
-#: ../../Zotlabs/Module/Block.php:78 ../../Zotlabs/Module/Display.php:145
-#: ../../Zotlabs/Module/Display.php:162 ../../Zotlabs/Module/Display.php:179
-#: ../../Zotlabs/Module/Display.php:185 ../../Zotlabs/Module/Page.php:140
-#: ../../Zotlabs/Web/Router.php:169
+#: ../../Code/Module/Block.php:78 ../../Code/Module/Display.php:145
+#: ../../Code/Module/Display.php:162 ../../Code/Module/Display.php:179
+#: ../../Code/Module/Display.php:185 ../../Code/Module/Page.php:140
+#: ../../Code/Web/Router.php:169
 msgid "Page not found."
 msgstr "Page introuvable."
 
-#: ../../Zotlabs/Module/Poke.php:164
+#: ../../Code/Module/Poke.php:164
 msgid "Poke somebody in your addressbook"
 msgstr "Faire signe à quelqu'un de votre carnet d'adresses"
 
-#: ../../Zotlabs/Module/Poke.php:197 ../../Zotlabs/Lib/Apps.php:352
+#: ../../Code/Module/Poke.php:197 ../../Code/Lib/Apps.php:352
 msgid "Poke"
 msgstr "Tapoter"
 
-#: ../../Zotlabs/Module/Poke.php:198
+#: ../../Code/Module/Poke.php:198
 msgid "Poke somebody"
 msgstr "Faire signe à quelqu'un"
 
-#: ../../Zotlabs/Module/Poke.php:201
+#: ../../Code/Module/Poke.php:201
 msgid "Poke/Prod"
 msgstr "Faire signe/Encourager"
 
-#: ../../Zotlabs/Module/Poke.php:202
+#: ../../Code/Module/Poke.php:202
 msgid "Poke, prod or do other things to somebody"
 msgstr "Faire signe, encourager ou faire autre chose à quelqu'un"
 
-#: ../../Zotlabs/Module/Poke.php:209
+#: ../../Code/Module/Poke.php:209
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: ../../Zotlabs/Module/Poke.php:210
+#: ../../Code/Module/Poke.php:210
 msgid "Choose what you wish to do to recipient"
 msgstr "Choisir ce que vous voulez faire au destinataire"
 
-#: ../../Zotlabs/Module/Poke.php:213 ../../Zotlabs/Module/Poke.php:214
+#: ../../Code/Module/Poke.php:213 ../../Code/Module/Poke.php:214
 msgid "Make this post private"
 msgstr "Rendre cette publication privée"
 
-#: ../../Zotlabs/Module/Photos.php:80
+#: ../../Code/Module/Photos.php:80
 msgid "Page owner information could not be retrieved."
 msgstr "Impossible d'obtenir des informations sur le propriétaire de la page."
 
-#: ../../Zotlabs/Module/Photos.php:95 ../../Zotlabs/Module/Photos.php:114
+#: ../../Code/Module/Photos.php:95 ../../Code/Module/Photos.php:114
 msgid "Album not found."
 msgstr "Album introuvable."
 
-#: ../../Zotlabs/Module/Photos.php:104
+#: ../../Code/Module/Photos.php:104
 msgid "Delete Album"
 msgstr "Supprimer l'album"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1077
+#: ../../Code/Module/Photos.php:174 ../../Code/Module/Photos.php:1077
 msgid "Delete Photo"
 msgstr "Supprimer la photo"
 
-#: ../../Zotlabs/Module/Photos.php:535 ../../Zotlabs/Module/Display.php:34
-#: ../../Zotlabs/Module/Directory.php:80 ../../Zotlabs/Module/Directory.php:87
-#: ../../Zotlabs/Module/Viewconnections.php:27
-#: ../../Zotlabs/Module/Search.php:27
+#: ../../Code/Module/Photos.php:535 ../../Code/Module/Display.php:34
+#: ../../Code/Module/Directory.php:80 ../../Code/Module/Directory.php:87
+#: ../../Code/Module/Viewconnections.php:27
+#: ../../Code/Module/Search.php:27
 msgid "Public access denied."
 msgstr "Accès public refusé."
 
-#: ../../Zotlabs/Module/Photos.php:546
+#: ../../Code/Module/Photos.php:546
 msgid "No photos selected"
 msgstr "Aucune photo selectionnée"
 
-#: ../../Zotlabs/Module/Photos.php:595
+#: ../../Code/Module/Photos.php:595
 msgid "Access to this item is restricted."
 msgstr "L'accès à l'élément est restreint."
 
-#: ../../Zotlabs/Module/Photos.php:638
+#: ../../Code/Module/Photos.php:638
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 "Vous avez utilisé %1$.2f mégaoctets sur les %2$.2f autorisés pour le "
 "stockage des photos."
 
-#: ../../Zotlabs/Module/Photos.php:641
+#: ../../Code/Module/Photos.php:641
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f méga-octets utilisés pour le stockage des photos."
 
-#: ../../Zotlabs/Module/Photos.php:683
+#: ../../Code/Module/Photos.php:683
 msgid "Upload Photos"
 msgstr "Téléverser des photos"
 
-#: ../../Zotlabs/Module/Photos.php:687
+#: ../../Code/Module/Photos.php:687
 msgid "Enter an album name"
 msgstr "Entrer un nom d'album"
 
-#: ../../Zotlabs/Module/Photos.php:688
+#: ../../Code/Module/Photos.php:688
 msgid "or select an existing album (doubleclick)"
 msgstr "ou sélectionner un album existant (double-clic)"
 
-#: ../../Zotlabs/Module/Photos.php:689
+#: ../../Code/Module/Photos.php:689
 msgid "Create a status post for this upload"
 msgstr "Créer une publication de statut pour cet envoi"
 
-#: ../../Zotlabs/Module/Photos.php:690 ../../Zotlabs/Module/Photos.php:1062
-#: ../../Zotlabs/Module/Editblock.php:133
-#: ../../Zotlabs/Module/Card_edit.php:119 ../../include/conversation.php:1435
+#: ../../Code/Module/Photos.php:690 ../../Code/Module/Photos.php:1062
+#: ../../Code/Module/Editblock.php:133
+#: ../../Code/Module/Card_edit.php:119 ../../include/conversation.php:1435
 msgid "Title (optional)"
 msgstr "Titre (facultatif)"
 
-#: ../../Zotlabs/Module/Photos.php:691
+#: ../../Code/Module/Photos.php:691
 msgid "Description (optional)"
 msgstr "Description (facultative)"
 
-#: ../../Zotlabs/Module/Photos.php:779
+#: ../../Code/Module/Photos.php:779
 msgid "Date descending"
 msgstr "Date ascendante"
 
-#: ../../Zotlabs/Module/Photos.php:780
+#: ../../Code/Module/Photos.php:780
 msgid "Date ascending"
 msgstr "Date descendante"
 
-#: ../../Zotlabs/Module/Photos.php:781
+#: ../../Code/Module/Photos.php:781
 msgid "Name ascending"
 msgstr "Ordre alphabétique"
 
-#: ../../Zotlabs/Module/Photos.php:840 ../../Zotlabs/Module/Photos.php:1366
+#: ../../Code/Module/Photos.php:840 ../../Code/Module/Photos.php:1366
 msgid "Add Photos"
 msgstr "Ajouter des photos"
 
-#: ../../Zotlabs/Module/Photos.php:842
+#: ../../Code/Module/Photos.php:842
 msgid "Sort"
 msgstr "Trier par"
 
-#: ../../Zotlabs/Module/Photos.php:886
+#: ../../Code/Module/Photos.php:886
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Accès refusé. L'accès à cet élément peut avoir été restreint."
 
-#: ../../Zotlabs/Module/Photos.php:888
+#: ../../Code/Module/Photos.php:888
 msgid "Photo not available"
 msgstr "Photo non disponible"
 
-#: ../../Zotlabs/Module/Photos.php:948
+#: ../../Code/Module/Photos.php:948
 msgid "Use as profile photo"
 msgstr "Utiliser comme photo du profil"
 
-#: ../../Zotlabs/Module/Photos.php:949
+#: ../../Code/Module/Photos.php:949
 msgid "Use as cover photo"
 msgstr "Utilisez comme bannière"
 
-#: ../../Zotlabs/Module/Photos.php:956
+#: ../../Code/Module/Photos.php:956
 msgid "Private Photo"
 msgstr "Photo privée"
 
-#: ../../Zotlabs/Module/Photos.php:971
+#: ../../Code/Module/Photos.php:971
 msgid "View Full Size"
 msgstr "Voir en taille réelle"
 
-#: ../../Zotlabs/Module/Photos.php:1053
+#: ../../Code/Module/Photos.php:1053
 msgid "Edit photo"
 msgstr "Modifier la photo"
 
-#: ../../Zotlabs/Module/Photos.php:1057
+#: ../../Code/Module/Photos.php:1057
 msgid "Move photo to album"
 msgstr "Déplacer la photo dans l'album"
 
-#: ../../Zotlabs/Module/Photos.php:1058
+#: ../../Code/Module/Photos.php:1058
 msgid "Enter a new album name"
 msgstr "Entrer un nouveau nom d'album"
 
-#: ../../Zotlabs/Module/Photos.php:1059
+#: ../../Code/Module/Photos.php:1059
 msgid "or select an existing one (doubleclick)"
 msgstr "ou en sélectionner un existant (double-clic)"
 
-#: ../../Zotlabs/Module/Photos.php:1064
+#: ../../Code/Module/Photos.php:1064
 msgid "Add a Tag"
 msgstr "Ajouter une étiquette"
 
-#: ../../Zotlabs/Module/Photos.php:1072
+#: ../../Code/Module/Photos.php:1072
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 "Exemple : @marc, @Barbara_Jensen, @charles@exemple.com, #Ile_de_France,"
 " #marathon"
 
-#: ../../Zotlabs/Module/Photos.php:1075
+#: ../../Code/Module/Photos.php:1075
 msgid "Flag as adult in album view"
 msgstr "Marquer comme \"adulte\" dans l'affichage de l'album"
 
-#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Lib/ThreadItem.php:284
+#: ../../Code/Module/Photos.php:1094 ../../Code/Lib/ThreadItem.php:284
 msgid "I like this (toggle)"
 msgstr "J'aime (oui/non)"
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Lib/ThreadItem.php:285
+#: ../../Code/Module/Photos.php:1095 ../../Code/Lib/ThreadItem.php:285
 msgid "I don't like this (toggle)"
 msgstr "Je n'aime pas (oui/non)"
 
-#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Lib/ThreadItem.php:466
+#: ../../Code/Module/Photos.php:1097 ../../Code/Lib/ThreadItem.php:466
 #: ../../include/conversation.php:800
 msgid "Please wait"
 msgstr "Merci de patienter"
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../Zotlabs/Module/Photos.php:1231
-#: ../../Zotlabs/Lib/ThreadItem.php:900
+#: ../../Code/Module/Photos.php:1113 ../../Code/Module/Photos.php:1231
+#: ../../Code/Lib/ThreadItem.php:900
 msgid "This is you"
 msgstr "C'est vous"
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Module/Photos.php:1233
-#: ../../Zotlabs/Lib/ThreadItem.php:902 ../../include/js_strings.php:6
+#: ../../Code/Module/Photos.php:1115 ../../Code/Module/Photos.php:1233
+#: ../../Code/Lib/ThreadItem.php:902 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Commenter"
 
-#: ../../Zotlabs/Module/Photos.php:1131 ../../include/conversation.php:618
+#: ../../Code/Module/Photos.php:1131 ../../include/conversation.php:618
 msgctxt "title"
 msgid "Likes"
 msgstr "Aime"
 
-#: ../../Zotlabs/Module/Photos.php:1132 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1132 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Dislikes"
 msgstr "N'aime pas"
 
-#: ../../Zotlabs/Module/Photos.php:1133 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1133 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Attending"
 msgstr "Participent"
 
-#: ../../Zotlabs/Module/Photos.php:1134 ../../include/conversation.php:621
+#: ../../Code/Module/Photos.php:1134 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Not attending"
 msgstr "Ne participent pas"
 
-#: ../../Zotlabs/Module/Photos.php:1135 ../../include/conversation.php:622
+#: ../../Code/Module/Photos.php:1135 ../../include/conversation.php:622
 msgctxt "title"
 msgid "Might attend"
 msgstr "Participent peut-être"
 
-#: ../../Zotlabs/Module/Photos.php:1149 ../../Zotlabs/Module/Photos.php:1161
-#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Lib/ThreadItem.php:228
+#: ../../Code/Module/Photos.php:1149 ../../Code/Module/Photos.php:1161
+#: ../../Code/Lib/ThreadItem.php:206 ../../Code/Lib/ThreadItem.php:228
 msgid "View all"
 msgstr "Voir tout"
 
-#: ../../Zotlabs/Module/Photos.php:1153 ../../Zotlabs/Lib/ThreadItem.php:211
+#: ../../Code/Module/Photos.php:1153 ../../Code/Lib/ThreadItem.php:211
 #: ../../include/taxonomy.php:675 ../../include/conversation.php:2094
 msgctxt "noun"
 msgid "Like"
@@ -4330,7 +4330,7 @@ msgid_plural "Likes"
 msgstr[0] "Aime"
 msgstr[1] "Aime"
 
-#: ../../Zotlabs/Module/Photos.php:1158 ../../Zotlabs/Lib/ThreadItem.php:220
+#: ../../Code/Module/Photos.php:1158 ../../Code/Lib/ThreadItem.php:220
 #: ../../include/conversation.php:2102
 msgctxt "noun"
 msgid "Dislike"
@@ -4338,120 +4338,120 @@ msgid_plural "Dislikes"
 msgstr[0] "N'aime pas"
 msgstr[1] "N'aime pas"
 
-#: ../../Zotlabs/Module/Photos.php:1255
+#: ../../Code/Module/Photos.php:1255
 msgid "Photo Tools"
 msgstr "Outils pour les photos"
 
-#: ../../Zotlabs/Module/Photos.php:1264
+#: ../../Code/Module/Photos.php:1264
 msgid "In This Photo:"
 msgstr "Dans cette photo :"
 
-#: ../../Zotlabs/Module/Photos.php:1269
+#: ../../Code/Module/Photos.php:1269
 msgid "Map"
 msgstr "Carte"
 
-#: ../../Zotlabs/Module/Photos.php:1277 ../../Zotlabs/Lib/ThreadItem.php:214
-#: ../../Zotlabs/Lib/ThreadItem.php:454 ../../include/conversation.php:2097
+#: ../../Code/Module/Photos.php:1277 ../../Code/Lib/ThreadItem.php:214
+#: ../../Code/Lib/ThreadItem.php:454 ../../include/conversation.php:2097
 msgctxt "noun"
 msgid "Likes"
 msgstr "Aime"
 
-#: ../../Zotlabs/Module/Photos.php:1278 ../../Zotlabs/Lib/ThreadItem.php:223
-#: ../../Zotlabs/Lib/ThreadItem.php:455 ../../include/conversation.php:2105
+#: ../../Code/Module/Photos.php:1278 ../../Code/Lib/ThreadItem.php:223
+#: ../../Code/Lib/ThreadItem.php:455 ../../include/conversation.php:2105
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "N'aime pas"
 
-#: ../../Zotlabs/Module/Photos.php:1349 ../../Zotlabs/Module/Photos.php:1363
-#: ../../Zotlabs/Module/Photos.php:1364 ../../include/photos.php:713
+#: ../../Code/Module/Photos.php:1349 ../../Code/Module/Photos.php:1363
+#: ../../Code/Module/Photos.php:1364 ../../include/photos.php:713
 msgid "Recent Photos"
 msgstr "Photos récentes"
 
-#: ../../Zotlabs/Module/Admin.php:117
+#: ../../Code/Module/Admin.php:117
 msgid "Blocked accounts"
 msgstr "Comptes bloqués"
 
-#: ../../Zotlabs/Module/Admin.php:118
+#: ../../Code/Module/Admin.php:118
 msgid "Expired accounts"
 msgstr "Comptes expirés"
 
-#: ../../Zotlabs/Module/Admin.php:119
+#: ../../Code/Module/Admin.php:119
 msgid "Expiring accounts"
 msgstr "Comptes arrivant à expiration"
 
-#: ../../Zotlabs/Module/Admin.php:135 ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Admin.php:135 ../../Code/Module/Locs.php:122
 msgid "Primary"
 msgstr "Primaire"
 
-#: ../../Zotlabs/Module/Admin.php:136
+#: ../../Code/Module/Admin.php:136
 msgid "Clones"
 msgstr "Clones"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Code/Module/Admin.php:142
 msgid "Message queues"
 msgstr "Files d'attente des messages"
 
-#: ../../Zotlabs/Module/Admin.php:167
+#: ../../Code/Module/Admin.php:167
 msgid "Your software should be updated"
 msgstr "Votre logiciel doit être mis à jour"
 
-#: ../../Zotlabs/Module/Admin.php:172 ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Channels.php:152
-#: ../../Zotlabs/Module/Admin/Addons.php:339
-#: ../../Zotlabs/Module/Admin/Addons.php:434
-#: ../../Zotlabs/Module/Admin/Security.php:128
-#: ../../Zotlabs/Module/Admin/Site.php:283
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
+#: ../../Code/Module/Admin.php:172 ../../Code/Module/Admin/Logs.php:82
+#: ../../Code/Module/Admin/Channels.php:152
+#: ../../Code/Module/Admin/Addons.php:339
+#: ../../Code/Module/Admin/Addons.php:434
+#: ../../Code/Module/Admin/Security.php:128
+#: ../../Code/Module/Admin/Site.php:283
+#: ../../Code/Module/Admin/Themes.php:122
+#: ../../Code/Module/Admin/Themes.php:156
+#: ../../Code/Module/Admin/Accounts.php:166
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../Zotlabs/Module/Admin.php:173 ../../include/conversation.php:1484
+#: ../../Code/Module/Admin.php:173 ../../include/conversation.php:1484
 msgid "Summary"
 msgstr "Résumé"
 
-#: ../../Zotlabs/Module/Admin.php:176
+#: ../../Code/Module/Admin.php:176
 msgid "Registered accounts"
 msgstr "Comptes validés"
 
-#: ../../Zotlabs/Module/Admin.php:177
+#: ../../Code/Module/Admin.php:177
 msgid "Pending registrations"
 msgstr "Inscriptions en attente de validation"
 
-#: ../../Zotlabs/Module/Admin.php:178
+#: ../../Code/Module/Admin.php:178
 msgid "Registered channels"
 msgstr "Canaux enregistrés"
 
-#: ../../Zotlabs/Module/Admin.php:179
+#: ../../Code/Module/Admin.php:179
 msgid "Active addons"
 msgstr "Addons activés"
 
-#: ../../Zotlabs/Module/Admin.php:180 ../../Zotlabs/Module/Sites.php:76
+#: ../../Code/Module/Admin.php:180 ../../Code/Module/Sites.php:76
 msgid "Version"
 msgstr "Version"
 
-#: ../../Zotlabs/Module/Admin.php:181
+#: ../../Code/Module/Admin.php:181
 msgid "Repository version (release)"
 msgstr "Version du dépôt (release)"
 
-#: ../../Zotlabs/Module/Admin.php:182
+#: ../../Code/Module/Admin.php:182
 msgid "Repository version (dev)"
 msgstr "Version du dépôt (dev)"
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+#: ../../Code/Module/Api.php:74 ../../Code/Module/Api.php:95
 msgid "Authorize application connection"
 msgstr "Autoriser l'application à se connecter"
 
-#: ../../Zotlabs/Module/Api.php:75
+#: ../../Code/Module/Api.php:75
 msgid "Return to your app and insert this Security Code:"
 msgstr "Revenez dans votre application et saisissez ce code de sécurité"
 
-#: ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:85
 msgid "Please login to continue."
 msgstr "Merci de vous identifier pour continuer."
 
-#: ../../Zotlabs/Module/Api.php:97
+#: ../../Code/Module/Api.php:97
 msgid ""
 "Do you want to authorize this application to access your posts and contacts, "
 "and/or create new posts for you?"
@@ -4459,230 +4459,230 @@ msgstr ""
 "Voulez-vous autoriser cette application à accéder à vos publications et "
 "connexions, et/ou à publier en votre nom?"
 
-#: ../../Zotlabs/Module/Invite.php:34
+#: ../../Code/Module/Invite.php:34
 msgid "Total invitation limit exceeded."
 msgstr "Limite du nombre total d'invitations dépassée."
 
-#: ../../Zotlabs/Module/Invite.php:58
+#: ../../Code/Module/Invite.php:58
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : adresse courriel invalide."
 
-#: ../../Zotlabs/Module/Invite.php:72
+#: ../../Code/Module/Invite.php:72
 msgid "Please join us on $Projectname"
 msgstr "Rejoignez-nous sur $Projectname"
 
-#: ../../Zotlabs/Module/Invite.php:82
+#: ../../Code/Module/Invite.php:82
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 "Limite du nombre d'invitations dépassée. Merci de contacter l'administrateur"
 " de votre site."
 
-#: ../../Zotlabs/Module/Invite.php:87
+#: ../../Code/Module/Invite.php:87
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : Échec de distribution du message."
 
-#: ../../Zotlabs/Module/Invite.php:91
+#: ../../Code/Module/Invite.php:91
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d message envoyé."
 msgstr[1] "%d messages envoyés."
 
-#: ../../Zotlabs/Module/Invite.php:108
+#: ../../Code/Module/Invite.php:108
 msgid "Send email invitations to join this network"
 msgstr "Envoyer des invitations à rejoindre ce réseau par courriel"
 
-#: ../../Zotlabs/Module/Invite.php:121
+#: ../../Code/Module/Invite.php:121
 msgid "You have no more invitations available"
 msgstr "Vous ne disposez plus d'aucune invitation"
 
-#: ../../Zotlabs/Module/Invite.php:152
+#: ../../Code/Module/Invite.php:152
 msgid "Send invitations"
 msgstr "Envoyer des invitations"
 
-#: ../../Zotlabs/Module/Invite.php:153
+#: ../../Code/Module/Invite.php:153
 msgid "Enter email addresses, one per line:"
 msgstr "Entrez les adresses de courriel, une par ligne :"
 
-#: ../../Zotlabs/Module/Invite.php:154
+#: ../../Code/Module/Invite.php:154
 msgid "Your message:"
 msgstr "Votre message :"
 
-#: ../../Zotlabs/Module/Invite.php:155
+#: ../../Code/Module/Invite.php:155
 msgid "Please join my community on $Projectname."
 msgstr "Rejoignez ma communauté sur $Projectname."
 
-#: ../../Zotlabs/Module/Invite.php:157
+#: ../../Code/Module/Invite.php:157
 msgid "You will need to supply this invitation code:"
 msgstr "Vous devrez fournir le code d'invitation suivant :"
 
-#: ../../Zotlabs/Module/Invite.php:158
+#: ../../Code/Module/Invite.php:158
 msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 "1. Enregistrez-vous sur n'importe quel serveur $Projectname (ils sont tous "
 "inter-connectés)"
 
-#: ../../Zotlabs/Module/Invite.php:160
+#: ../../Code/Module/Invite.php:160
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 "2. Saisissez l'adresse de mon canal $Projectname dans la barre de recherche "
 "du site."
 
-#: ../../Zotlabs/Module/Invite.php:161
+#: ../../Code/Module/Invite.php:161
 msgid "or visit"
 msgstr "ou rendez-vous sur"
 
-#: ../../Zotlabs/Module/Invite.php:163
+#: ../../Code/Module/Invite.php:163
 msgid "3. Click [Connect]"
 msgstr "3. Cliquez sur [Ajouter]"
 
-#: ../../Zotlabs/Module/Menu.php:70
+#: ../../Code/Module/Menu.php:70
 msgid "Unable to update menu."
 msgstr "Impossible de mettre le menu à jour."
 
-#: ../../Zotlabs/Module/Menu.php:81
+#: ../../Code/Module/Menu.php:81
 msgid "Unable to create menu."
 msgstr "Impossible de créer le menu."
 
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:176
+#: ../../Code/Module/Menu.php:163 ../../Code/Module/Menu.php:176
 msgid "Menu Name"
 msgstr "Nom du menu"
 
-#: ../../Zotlabs/Module/Menu.php:163
+#: ../../Code/Module/Menu.php:163
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Nom unique (non visible sur la page web) - requis"
 
-#: ../../Zotlabs/Module/Menu.php:164 ../../Zotlabs/Module/Menu.php:177
+#: ../../Code/Module/Menu.php:164 ../../Code/Module/Menu.php:177
 msgid "Menu Title"
 msgstr "Titre du menu"
 
-#: ../../Zotlabs/Module/Menu.php:164
+#: ../../Code/Module/Menu.php:164
 msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 "Visible pour la page web - laisser vide pour qu'il n'y ait pas de titre"
 
-#: ../../Zotlabs/Module/Menu.php:165
+#: ../../Code/Module/Menu.php:165
 msgid "Allow Bookmarks"
 msgstr "Autoriser l'usage de marque-pages"
 
-#: ../../Zotlabs/Module/Menu.php:165 ../../Zotlabs/Module/Menu.php:224
+#: ../../Code/Module/Menu.php:165 ../../Code/Module/Menu.php:224
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Le menu pourra être utilisé pour stocker des marque-pages"
 
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Menu.php:227
+#: ../../Code/Module/Menu.php:166 ../../Code/Module/Menu.php:227
 msgid "Submit and proceed"
 msgstr "Valider et continuer"
 
-#: ../../Zotlabs/Module/Menu.php:173 ../../include/text.php:2556
+#: ../../Code/Module/Menu.php:173 ../../include/text.php:2556
 msgid "Menus"
 msgstr "Menus"
 
-#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Menu.php:179 ../../Code/Module/Locs.php:123
 msgid "Drop"
 msgstr "Supprimer"
 
-#: ../../Zotlabs/Module/Menu.php:180 ../../Zotlabs/Module/Connections.php:245
-#: ../../Zotlabs/Module/Webpages.php:267 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Layouts.php:197
+#: ../../Code/Module/Menu.php:180 ../../Code/Module/Connections.php:245
+#: ../../Code/Module/Webpages.php:267 ../../Code/Module/Blocks.php:161
+#: ../../Code/Module/Layouts.php:197
 msgid "Created"
 msgstr "Créé(e)"
 
-#: ../../Zotlabs/Module/Menu.php:181 ../../Zotlabs/Module/Webpages.php:268
-#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Layouts.php:198
+#: ../../Code/Module/Menu.php:181 ../../Code/Module/Webpages.php:268
+#: ../../Code/Module/Blocks.php:162 ../../Code/Module/Layouts.php:198
 msgid "Edited"
 msgstr "Modifié(e)"
 
-#: ../../Zotlabs/Module/Menu.php:182 ../../Zotlabs/Module/Connections.php:90
-#: ../../Zotlabs/Module/Connections.php:103
-#: ../../Zotlabs/Module/Notifications.php:50
+#: ../../Code/Module/Menu.php:182 ../../Code/Module/Connections.php:90
+#: ../../Code/Module/Connections.php:103
+#: ../../Code/Module/Notifications.php:50
 msgid "New"
 msgstr "Nouveautés"
 
-#: ../../Zotlabs/Module/Menu.php:183
+#: ../../Code/Module/Menu.php:183
 msgid "Bookmarks allowed"
 msgstr "Marque-pages autorisés"
 
-#: ../../Zotlabs/Module/Menu.php:185
+#: ../../Code/Module/Menu.php:185
 msgid "Delete this menu"
 msgstr "Supprimer ce menu"
 
-#: ../../Zotlabs/Module/Menu.php:186 ../../Zotlabs/Module/Menu.php:221
+#: ../../Code/Module/Menu.php:186 ../../Code/Module/Menu.php:221
 msgid "Edit menu contents"
 msgstr "Modifier le contenu du menu"
 
-#: ../../Zotlabs/Module/Menu.php:187
+#: ../../Code/Module/Menu.php:187
 msgid "Edit this menu"
 msgstr "Modifier ce menu"
 
-#: ../../Zotlabs/Module/Menu.php:203
+#: ../../Code/Module/Menu.php:203
 msgid "Menu could not be deleted."
 msgstr "Impossible de supprimer le menu."
 
-#: ../../Zotlabs/Module/Menu.php:211 ../../Zotlabs/Module/Mitem.php:35
+#: ../../Code/Module/Menu.php:211 ../../Code/Module/Mitem.php:35
 msgid "Menu not found."
 msgstr "Menu introuvable."
 
-#: ../../Zotlabs/Module/Menu.php:216
+#: ../../Code/Module/Menu.php:216
 msgid "Edit Menu"
 msgstr "Modifier le menu"
 
-#: ../../Zotlabs/Module/Menu.php:220
+#: ../../Code/Module/Menu.php:220
 msgid "Add or remove entries to this menu"
 msgstr "Ajouter/supprimer des entrées à ce menu"
 
-#: ../../Zotlabs/Module/Menu.php:222
+#: ../../Code/Module/Menu.php:222
 msgid "Menu name"
 msgstr "Nom du menu"
 
-#: ../../Zotlabs/Module/Menu.php:222
+#: ../../Code/Module/Menu.php:222
 msgid "Must be unique, only seen by you"
 msgstr "Doit être unique, ne sera vu que par vous"
 
-#: ../../Zotlabs/Module/Menu.php:223
+#: ../../Code/Module/Menu.php:223
 msgid "Menu title"
 msgstr "Titre du menu"
 
-#: ../../Zotlabs/Module/Menu.php:223
+#: ../../Code/Module/Menu.php:223
 msgid "Menu title as seen by others"
 msgstr "Titre du menu tel que vu par les visiteurs"
 
-#: ../../Zotlabs/Module/Menu.php:224
+#: ../../Code/Module/Menu.php:224
 msgid "Allow bookmarks"
 msgstr "Autoriser l'usage de marque-pages"
 
-#: ../../Zotlabs/Module/Menu.php:234 ../../Zotlabs/Module/Mitem.php:138
-#: ../../Zotlabs/Module/Xchan.php:41
+#: ../../Code/Module/Menu.php:234 ../../Code/Module/Mitem.php:138
+#: ../../Code/Module/Xchan.php:41
 msgid "Not found."
 msgstr "Introuvable."
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Admin/Features.php:56
 #, php-format
 msgid "Lock feature %s"
 msgstr "Verrouiller fonctionnalité %s"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
+#: ../../Code/Module/Admin/Features.php:64
 msgid "Manage Additional Features"
 msgstr "Gérer les fonctionnalités additionnelles"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
+#: ../../Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "Paramètres du journal mis à jour."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
+#: ../../Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Vider"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
+#: ../../Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Débogage"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "Fichier du journal"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
@@ -4690,34 +4690,34 @@ msgstr ""
 "Doit être permettre d'écrire par le serveur web. En relation avec le "
 "répertoire de votre site."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
+#: ../../Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Niveau de journalisation"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:66
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:63
-#: ../../Zotlabs/Module/Profile_photo.php:63
-#: ../../Zotlabs/Module/Cover_photo.php:63
+#: ../../Code/Module/Admin/Profile_photo.php:66
+#: ../../Code/Module/Admin/Cover_photo.php:63
+#: ../../Code/Module/Profile_photo.php:63
+#: ../../Code/Module/Cover_photo.php:63
 msgid "Image uploaded but image cropping failed."
 msgstr "L'image a été téléversée, mais le recadrage a échoué."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:119
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:252
-#: ../../Zotlabs/Module/Profile_photo.php:116
-#: ../../Zotlabs/Module/Profile_photo.php:287
+#: ../../Code/Module/Admin/Profile_photo.php:119
+#: ../../Code/Module/Admin/Profile_photo.php:252
+#: ../../Code/Module/Profile_photo.php:116
+#: ../../Code/Module/Profile_photo.php:287
 #: ../../include/photo_factory.php:525
 msgid "Profile Photos"
 msgstr "Photos du profil"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:143
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:198
-#: ../../Zotlabs/Module/Profile_photo.php:140
-#: ../../Zotlabs/Module/Cover_photo.php:198
+#: ../../Code/Module/Admin/Profile_photo.php:143
+#: ../../Code/Module/Admin/Cover_photo.php:198
+#: ../../Code/Module/Profile_photo.php:140
+#: ../../Code/Module/Cover_photo.php:198
 msgid "Image resize failed."
 msgstr "Le redimensionnement de l'image a échoué."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:184
-#: ../../Zotlabs/Module/Profile_photo.php:216
+#: ../../Code/Module/Admin/Profile_photo.php:184
+#: ../../Code/Module/Profile_photo.php:216
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
@@ -4725,36 +4725,36 @@ msgstr ""
 "Shift-rechargez votre page, ou videz le cache du navigateur si la photo ne "
 "s'affiche pas immédiatement."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:188
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:208
-#: ../../Zotlabs/Module/Profile_photo.php:223
-#: ../../Zotlabs/Module/Cover_photo.php:212 ../../include/photos.php:196
+#: ../../Code/Module/Admin/Profile_photo.php:188
+#: ../../Code/Module/Admin/Cover_photo.php:208
+#: ../../Code/Module/Profile_photo.php:223
+#: ../../Code/Module/Cover_photo.php:212 ../../include/photos.php:196
 msgid "Unable to process image"
 msgstr "Impossible de traiter l'image"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:266
-#: ../../Zotlabs/Module/Profile_photo.php:301
+#: ../../Code/Module/Admin/Profile_photo.php:266
+#: ../../Code/Module/Profile_photo.php:301
 msgid "Image upload failed."
 msgstr "Le téléversement de l'image a échoué."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:285
-#: ../../Zotlabs/Module/Profile_photo.php:320
+#: ../../Code/Module/Admin/Profile_photo.php:285
+#: ../../Code/Module/Profile_photo.php:320
 msgid "Unable to process image."
 msgstr "Impossible de traiter l'image."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:352
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:392
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:316
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:332
-#: ../../Zotlabs/Module/Profile_photo.php:383
-#: ../../Zotlabs/Module/Profile_photo.php:431
-#: ../../Zotlabs/Module/Cover_photo.php:368
-#: ../../Zotlabs/Module/Cover_photo.php:384
+#: ../../Code/Module/Admin/Profile_photo.php:352
+#: ../../Code/Module/Admin/Profile_photo.php:392
+#: ../../Code/Module/Admin/Cover_photo.php:316
+#: ../../Code/Module/Admin/Cover_photo.php:332
+#: ../../Code/Module/Profile_photo.php:383
+#: ../../Code/Module/Profile_photo.php:431
+#: ../../Code/Module/Cover_photo.php:368
+#: ../../Code/Module/Cover_photo.php:384
 msgid "Photo not available."
 msgstr "Photo inaccessible."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:460
-#: ../../Zotlabs/Module/Profile_photo.php:498
+#: ../../Code/Module/Admin/Profile_photo.php:460
+#: ../../Code/Module/Profile_photo.php:498
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
@@ -4763,7 +4763,7 @@ msgstr ""
 " Les photos des autres profils se verront appliquer les permissions du "
 "profil concerné."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:460
+#: ../../Code/Module/Admin/Profile_photo.php:460
 msgid ""
 "Your site photo is visible to anybody on the internet and may be distributed "
 "to other websites."
@@ -4771,212 +4771,212 @@ msgstr ""
 "La photo de votre serveur est visible pour n'importe qui sur internet et peut"
 " être accessible à d'autres sites web"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:462
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:371
-#: ../../Zotlabs/Module/Profile_photo.php:500
-#: ../../Zotlabs/Module/Cover_photo.php:422
+#: ../../Code/Module/Admin/Profile_photo.php:462
+#: ../../Code/Module/Admin/Cover_photo.php:371
+#: ../../Code/Module/Profile_photo.php:500
+#: ../../Code/Module/Cover_photo.php:422
 msgid "Upload File:"
 msgstr "Téléverser le fichier :"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:463
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:372
-#: ../../Zotlabs/Module/Profile_photo.php:501
-#: ../../Zotlabs/Module/Cover_photo.php:423
+#: ../../Code/Module/Admin/Profile_photo.php:463
+#: ../../Code/Module/Admin/Cover_photo.php:372
+#: ../../Code/Module/Profile_photo.php:501
+#: ../../Code/Module/Cover_photo.php:423
 msgid "Select a profile:"
 msgstr "Choisir un profil :"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:464
+#: ../../Code/Module/Admin/Profile_photo.php:464
 msgid "Use Photo for Site Logo"
 msgstr "Utiliser la photo comme logo du serveur"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:464
+#: ../../Code/Module/Admin/Profile_photo.php:464
 msgid "Change Site Logo"
 msgstr "Changer le logo du serveur"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:465
-#: ../../Zotlabs/Module/Profile_photo.php:503
+#: ../../Code/Module/Admin/Profile_photo.php:465
+#: ../../Code/Module/Profile_photo.php:503
 msgid "Use"
 msgstr "Utiliser"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:469
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:470
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:376
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:507
-#: ../../Zotlabs/Module/Profile_photo.php:508
-#: ../../Zotlabs/Module/Cover_photo.php:427
-#: ../../Zotlabs/Module/Cover_photo.php:428
+#: ../../Code/Module/Admin/Profile_photo.php:469
+#: ../../Code/Module/Admin/Profile_photo.php:470
+#: ../../Code/Module/Admin/Cover_photo.php:376
+#: ../../Code/Module/Admin/Cover_photo.php:377
+#: ../../Code/Module/Profile_photo.php:507
+#: ../../Code/Module/Profile_photo.php:508
+#: ../../Code/Module/Cover_photo.php:427
+#: ../../Code/Module/Cover_photo.php:428
 msgid "Use a photo from your albums"
 msgstr "Utiliser une photo de vos albums"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:472
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:510
-#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1419
+#: ../../Code/Module/Admin/Profile_photo.php:472
+#: ../../Code/Module/Admin/Cover_photo.php:379
+#: ../../Code/Module/Profile_photo.php:510
+#: ../../Code/Module/Cover_photo.php:430 ../../include/conversation.php:1419
 #: ../../include/conversation.php:1474 ../../include/conversation.php:1476
 msgid "OK"
 msgstr "OK"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:473
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:511
-#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1334
+#: ../../Code/Module/Admin/Profile_photo.php:473
+#: ../../Code/Module/Admin/Cover_photo.php:380
+#: ../../Code/Module/Profile_photo.php:511
+#: ../../Code/Module/Cover_photo.php:431 ../../include/conversation.php:1334
 msgid "Choose images to embed"
 msgstr "Choisissez des images à intégrer"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:474
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:381
-#: ../../Zotlabs/Module/Profile_photo.php:512
-#: ../../Zotlabs/Module/Cover_photo.php:432 ../../include/conversation.php:1335
+#: ../../Code/Module/Admin/Profile_photo.php:474
+#: ../../Code/Module/Admin/Cover_photo.php:381
+#: ../../Code/Module/Profile_photo.php:512
+#: ../../Code/Module/Cover_photo.php:432 ../../include/conversation.php:1335
 msgid "Choose an album"
 msgstr "Choisir un album"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:475
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:382
-#: ../../Zotlabs/Module/Profile_photo.php:513
-#: ../../Zotlabs/Module/Cover_photo.php:433
+#: ../../Code/Module/Admin/Profile_photo.php:475
+#: ../../Code/Module/Admin/Cover_photo.php:382
+#: ../../Code/Module/Profile_photo.php:513
+#: ../../Code/Module/Cover_photo.php:433
 msgid "Choose a different album"
 msgstr "Choisissez un autre album"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:476
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:383
-#: ../../Zotlabs/Module/Profile_photo.php:514
-#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1337
+#: ../../Code/Module/Admin/Profile_photo.php:476
+#: ../../Code/Module/Admin/Cover_photo.php:383
+#: ../../Code/Module/Profile_photo.php:514
+#: ../../Code/Module/Cover_photo.php:434 ../../include/conversation.php:1337
 msgid "Error getting album list"
 msgstr "Erreur en récupérant la liste des albums"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:477
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:384
-#: ../../Zotlabs/Module/Profile_photo.php:515
-#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1338
+#: ../../Code/Module/Admin/Profile_photo.php:477
+#: ../../Code/Module/Admin/Cover_photo.php:384
+#: ../../Code/Module/Profile_photo.php:515
+#: ../../Code/Module/Cover_photo.php:435 ../../include/conversation.php:1338
 msgid "Error getting photo link"
 msgstr "Erreur en récupérant le lien de la photo"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:478
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:385
-#: ../../Zotlabs/Module/Profile_photo.php:516
-#: ../../Zotlabs/Module/Cover_photo.php:436 ../../include/conversation.php:1339
+#: ../../Code/Module/Admin/Profile_photo.php:478
+#: ../../Code/Module/Admin/Cover_photo.php:385
+#: ../../Code/Module/Profile_photo.php:516
+#: ../../Code/Module/Cover_photo.php:436 ../../include/conversation.php:1339
 msgid "Error getting album"
 msgstr "Erreur en récupérant l'album"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:480
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:387
-#: ../../Zotlabs/Module/Profile_photo.php:518
-#: ../../Zotlabs/Module/Cover_photo.php:438
+#: ../../Code/Module/Admin/Profile_photo.php:480
+#: ../../Code/Module/Admin/Cover_photo.php:387
+#: ../../Code/Module/Profile_photo.php:518
+#: ../../Code/Module/Cover_photo.php:438
 msgid "Select previously uploaded photo"
 msgstr "Sélectionner la photo téléverseé précédemment"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:497
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:404
-#: ../../Zotlabs/Module/Profile_photo.php:535
-#: ../../Zotlabs/Module/Cover_photo.php:455
+#: ../../Code/Module/Admin/Profile_photo.php:497
+#: ../../Code/Module/Admin/Cover_photo.php:404
+#: ../../Code/Module/Profile_photo.php:535
+#: ../../Code/Module/Cover_photo.php:455
 msgid "Crop Image"
 msgstr "Recadrer l'image"
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:498
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:405
-#: ../../Zotlabs/Module/Profile_photo.php:536
-#: ../../Zotlabs/Module/Cover_photo.php:456
+#: ../../Code/Module/Admin/Profile_photo.php:498
+#: ../../Code/Module/Admin/Cover_photo.php:405
+#: ../../Code/Module/Profile_photo.php:536
+#: ../../Code/Module/Cover_photo.php:456
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Merci de recadrer l'image à votre convenance."
 
-#: ../../Zotlabs/Module/Admin/Profile_photo.php:500
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:407
-#: ../../Zotlabs/Module/Profile_photo.php:538
-#: ../../Zotlabs/Module/Cover_photo.php:458
+#: ../../Code/Module/Admin/Profile_photo.php:500
+#: ../../Code/Module/Admin/Cover_photo.php:407
+#: ../../Code/Module/Profile_photo.php:538
+#: ../../Code/Module/Cover_photo.php:458
 msgid "Done Editing"
 msgstr "J'ai terminé"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:35
+#: ../../Code/Module/Admin/Channels.php:35
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s canal censuré/dé-censuré"
 msgstr[1] "%s canaux censurés/dé-censurés"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:44
+#: ../../Code/Module/Admin/Channels.php:44
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "code autorisé/interdit pour %s canal"
 msgstr[1] "code autorisé/interdit pour %s canaux"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:50
+#: ../../Code/Module/Admin/Channels.php:50
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canal supprimé"
 msgstr[1] "%s canaux supprimés"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:69
+#: ../../Code/Module/Admin/Channels.php:69
 msgid "Channel not found"
 msgstr "Canal introuvable"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:79
+#: ../../Code/Module/Admin/Channels.php:79
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Canal '%s' supprimé"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:91
+#: ../../Code/Module/Admin/Channels.php:91
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Canal '%s' censuré"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:91
+#: ../../Code/Module/Admin/Channels.php:91
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Canal '%s' non censuré"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:102
+#: ../../Code/Module/Admin/Channels.php:102
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Code autorisé pour le canal '%s'"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:102
+#: ../../Code/Module/Admin/Channels.php:102
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Code interdit pour le canal '%s'"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:155
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Code/Module/Admin/Channels.php:155
+#: ../../Code/Module/Admin/Accounts.php:169
 msgid "select all"
 msgstr "tout sélectionner"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:157
-#: ../../Zotlabs/Module/Directory.php:365 ../../Zotlabs/Module/Connedit.php:584
+#: ../../Code/Module/Admin/Channels.php:157
+#: ../../Code/Module/Directory.php:365 ../../Code/Module/Connedit.php:584
 msgid "Censor"
 msgstr "Censurer"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
-#: ../../Zotlabs/Module/Directory.php:365 ../../Zotlabs/Module/Connedit.php:584
+#: ../../Code/Module/Admin/Channels.php:158
+#: ../../Code/Module/Directory.php:365 ../../Code/Module/Connedit.php:584
 msgid "Uncensor"
 msgstr "Ne plus censurer"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Code/Module/Admin/Channels.php:159
 msgid "Allow Code"
 msgstr "Autoriser le code"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Code/Module/Admin/Channels.php:160
 msgid "Disallow Code"
 msgstr "Interdire le code"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:161 ../../include/nav.php:385
+#: ../../Code/Module/Admin/Channels.php:161 ../../include/nav.php:385
 #: ../../include/conversation.php:1923
 msgid "Channel"
 msgstr "Canal"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:165
+#: ../../Code/Module/Admin/Channels.php:165
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:167
-#: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Cdav.php:1356
-#: ../../Zotlabs/Module/Profiles.php:500 ../../Zotlabs/Module/Profiles.php:792
-#: ../../Zotlabs/Module/Connedit.php:856
+#: ../../Code/Module/Admin/Channels.php:167
+#: ../../Code/Module/Locs.php:121 ../../Code/Module/Cdav.php:1356
+#: ../../Code/Module/Profiles.php:500 ../../Code/Module/Profiles.php:792
+#: ../../Code/Module/Connedit.php:856
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:169
+#: ../../Code/Module/Admin/Channels.php:169
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -4985,7 +4985,7 @@ msgstr ""
 "publié dans ces canaux sur ce site sera définitivement supprimé !\\n"
 "\\nÊtes-vous sûr ?"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:170
+#: ../../Code/Module/Admin/Channels.php:170
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -4993,77 +4993,77 @@ msgstr ""
 "Le canal {0} sera supprimé !\\n\\nTout ce qui a été publié sur ce canal"
 " sera définitivement supprimé !\\n\\nÊtes-vous sûr(e) ?"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:33
+#: ../../Code/Module/Admin/Queue.php:33
 msgid "Queue Statistics"
 msgstr "Statistiques de file d'attente"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:34
+#: ../../Code/Module/Admin/Queue.php:34
 msgid "Total Entries"
 msgstr "Nombre d'entrées total"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
+#: ../../Code/Module/Admin/Queue.php:35
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
+#: ../../Code/Module/Admin/Queue.php:36
 msgid "Destination URL"
 msgstr "URL de destination"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
+#: ../../Code/Module/Admin/Queue.php:37
 msgid "Mark hub permanently offline"
 msgstr "Marquer le serveur comme étant hors ligne de manière permanente"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
+#: ../../Code/Module/Admin/Queue.php:38
 msgid "Empty queue for this hub"
 msgstr "Vider la file d'attente pour ce serveur"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
+#: ../../Code/Module/Admin/Queue.php:39
 msgid "Last known contact"
 msgstr "Dernier contact connu"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Code/Module/Admin/Dbsync.php:19
+#: ../../Code/Module/Admin/Dbsync.php:59
 msgid "Update has been marked successful"
 msgstr "La mise à jour a été marquée comme réussie"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#: ../../Code/Module/Admin/Dbsync.php:32
 #, php-format
 msgid "Verification of update %s failed. Check system logs."
 msgstr ""
 "La vérification de la mise à jour %s a échoué. Consultez les journaux "
 "système."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:35
-#: ../../Zotlabs/Module/Admin/Dbsync.php:74
+#: ../../Code/Module/Admin/Dbsync.php:35
+#: ../../Code/Module/Admin/Dbsync.php:74
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "La mise à jour %s a été appliquée avec succès."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#: ../../Code/Module/Admin/Dbsync.php:39
 #, php-format
 msgid "Verifying update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 "La vérification de la mise à jour %s n'a pas retourné d'information. "
 "Impossible de savoir si elle a réussi."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:42
+#: ../../Code/Module/Admin/Dbsync.php:42
 #, php-format
 msgid "Update %s does not contain a verification function."
 msgstr "La mise à jour %s n'a pas de fonction de vérification."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:46
-#: ../../Zotlabs/Module/Admin/Dbsync.php:81
+#: ../../Code/Module/Admin/Dbsync.php:46
+#: ../../Code/Module/Admin/Dbsync.php:81
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "La fonction de mise à jour %s est introuvable."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:71
+#: ../../Code/Module/Admin/Dbsync.php:71
 #, php-format
 msgid "Executing update procedure %s failed. Check system logs."
 msgstr ""
 "La procédure de mise à jour %s a échoué. Consultez les journaux système."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:78
+#: ../../Code/Module/Admin/Dbsync.php:78
 #, php-format
 msgid ""
 "Update %s did not return a status. It cannot be determined if it was "
@@ -5072,241 +5072,241 @@ msgstr ""
 "La mise à jour %s n'a pas retourné d'information. Impossible de savoir si "
 "elle a réussi."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:99
+#: ../../Code/Module/Admin/Dbsync.php:99
 msgid "Failed Updates"
 msgstr "Mises à jour défaillantes"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:101
+#: ../../Code/Module/Admin/Dbsync.php:101
 msgid "Mark success (if update was manually applied)"
 msgstr "Marquer comme réussie (si la mise à jour a été réalisée manuellement)"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:102
+#: ../../Code/Module/Admin/Dbsync.php:102
 msgid "Attempt to verify this update if a verification procedure exists"
 msgstr ""
 "Tenter une vérification de la mise à jour, si une procédure de vérification "
 "existe"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:103
+#: ../../Code/Module/Admin/Dbsync.php:103
 msgid "Attempt to execute this update step automatically"
 msgstr "Tenter de réaliser cette étape de mise à jour automatiquement"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:108
+#: ../../Code/Module/Admin/Dbsync.php:108
 msgid "No failed updates."
 msgstr "Aucune mise à jour défaillante."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:287
+#: ../../Code/Module/Admin/Addons.php:287
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Greffon %s désactivé."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:292
+#: ../../Code/Module/Admin/Addons.php:292
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Greffon %s activé."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:308
-#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Code/Module/Admin/Addons.php:308
+#: ../../Code/Module/Admin/Themes.php:95
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:311
-#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Code/Module/Admin/Addons.php:311
+#: ../../Code/Module/Admin/Themes.php:97
 msgid "Enable"
 msgstr "Activer"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:341
-#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Code/Module/Admin/Addons.php:341
+#: ../../Code/Module/Admin/Themes.php:124
 msgid "Toggle"
 msgstr "(Dés)activer"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:349
-#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Code/Module/Admin/Addons.php:349
+#: ../../Code/Module/Admin/Themes.php:134
 msgid "Author: "
 msgstr "Auteur :"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:350
-#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Code/Module/Admin/Addons.php:350
+#: ../../Code/Module/Admin/Themes.php:135
 msgid "Maintainer: "
 msgstr "Maintenu par :"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:351
+#: ../../Code/Module/Admin/Addons.php:351
 msgid "Minimum project version: "
 msgstr "Version minimum du projet :"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:352
+#: ../../Code/Module/Admin/Addons.php:352
 msgid "Maximum project version: "
 msgstr "Version maximum du projet :"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:353
+#: ../../Code/Module/Admin/Addons.php:353
 msgid "Minimum PHP version: "
 msgstr "Version minimum de PHP :"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:354
+#: ../../Code/Module/Admin/Addons.php:354
 msgid "Compatible Server Roles: "
 msgstr "Rôles du serveur "
 
-#: ../../Zotlabs/Module/Admin/Addons.php:355
+#: ../../Code/Module/Admin/Addons.php:355
 msgid "Requires: "
 msgstr "Requiert :"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:356
-#: ../../Zotlabs/Module/Admin/Addons.php:440
+#: ../../Code/Module/Admin/Addons.php:356
+#: ../../Code/Module/Admin/Addons.php:440
 msgid "Disabled - version incompatibility"
 msgstr "Désactivé - version incompatible"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:409
+#: ../../Code/Module/Admin/Addons.php:409
 msgid "Enter the public git repository URL of the addon repo."
 msgstr "Saisir l'adresse du dépôt git public des addons"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:410
+#: ../../Code/Module/Admin/Addons.php:410
 msgid "Addon repo git URL"
 msgstr "URL du dépôt git des addons"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:411
+#: ../../Code/Module/Admin/Addons.php:411
 msgid "Custom repo name"
 msgstr "Nom du dépôt"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:411
+#: ../../Code/Module/Admin/Addons.php:411
 msgid "(optional)"
 msgstr "(en option)"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:412
+#: ../../Code/Module/Admin/Addons.php:412
 msgid "Download Addon Repo"
 msgstr "Télécharger le dépôt des addons"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:419
+#: ../../Code/Module/Admin/Addons.php:419
 msgid "Install new repo"
 msgstr "Installer un nouveau dépôt"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:420 ../../Zotlabs/Lib/Apps.php:557
+#: ../../Code/Module/Admin/Addons.php:420 ../../Code/Lib/Apps.php:557
 msgid "Install"
 msgstr "Installer"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:443
+#: ../../Code/Module/Admin/Addons.php:443
 msgid "Manage Repos"
 msgstr "Gérer les dépôts"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:444
+#: ../../Code/Module/Admin/Addons.php:444
 msgid "Installed Addon Repositories"
 msgstr "Dépôts d'addons installés"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:445
+#: ../../Code/Module/Admin/Addons.php:445
 msgid "Install a New Addon Repository"
 msgstr "Installer un nouveau dépôt d'addons"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:452
+#: ../../Code/Module/Admin/Addons.php:452
 msgid "Switch branch"
 msgstr "Changer de branche"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
+#: ../../Code/Module/Admin/Profs.php:89
 msgid "New Profile Field"
 msgstr "Nouveau champ de profil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "Field nickname"
 msgstr "Nom court du champ"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "System name of field"
 msgstr "Nom système du champ"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
+#: ../../Code/Module/Admin/Profs.php:91
+#: ../../Code/Module/Admin/Profs.php:111
 msgid "Input type"
 msgstr "Type de champ"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Field Name"
 msgstr "Nom du champ"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Label on profile pages"
 msgstr "Étiquette sur les pages de profil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Help text"
 msgstr "Aide à la saisie"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Additional info (optional)"
 msgstr "Informations additionnelles (facultatif)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
+#: ../../Code/Module/Admin/Profs.php:103
 msgid "Field definition not found"
 msgstr "Définition du champ introuvable"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
+#: ../../Code/Module/Admin/Profs.php:109
 msgid "Edit Profile Field"
 msgstr "Modifier le champ de profil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:168
+#: ../../Code/Module/Admin/Profs.php:168
 msgid "Profile Fields"
 msgstr "Champs de profil"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
+#: ../../Code/Module/Admin/Profs.php:169
 msgid "Basic Profile Fields"
 msgstr "Champs de profil de base"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "Advanced Profile Fields"
 msgstr "Champs de profil avancés"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "(In addition to basic fields)"
 msgstr "(en plus des champs de base)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
+#: ../../Code/Module/Admin/Profs.php:172
 msgid "All available fields"
 msgstr "Tous les champs disponibles"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
+#: ../../Code/Module/Admin/Profs.php:173
 msgid "Custom Fields"
 msgstr "Champs personnalisés"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
+#: ../../Code/Module/Admin/Profs.php:177
 msgid "Create Custom Field"
 msgstr "Créer un champ personnalisé"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#: ../../Code/Module/Admin/Account_edit.php:29
 #, php-format
 msgid "Password changed for account %d."
 msgstr "Le mot de passe a été modifié pour le compte %d."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:44
+#: ../../Code/Module/Admin/Account_edit.php:44
 msgid "Account settings updated."
 msgstr "Paramétrage du compte mis à jour"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:59
+#: ../../Code/Module/Admin/Account_edit.php:59
 msgid "Account not found."
 msgstr "Compte introuvable"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:66
+#: ../../Code/Module/Admin/Account_edit.php:66
 msgid "Account Edit"
 msgstr "Modifier votre compte"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:67
+#: ../../Code/Module/Admin/Account_edit.php:67
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+#: ../../Code/Module/Admin/Account_edit.php:68
 msgid "New Password again"
 msgstr "Nouveau mot de passe (encore)"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+#: ../../Code/Module/Admin/Account_edit.php:69
 msgid "Account language (for emails)"
 msgstr "Langue de votre compte (pour email)"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+#: ../../Code/Module/Admin/Account_edit.php:70
 msgid "Service class"
 msgstr "Classe de service"
 
-#: ../../Zotlabs/Module/Admin/Security.php:119
+#: ../../Code/Module/Admin/Security.php:119
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
 "insecure."
@@ -5314,13 +5314,13 @@ msgstr ""
 "Par défaut le code HTML est autorisé pour les média par exemple les vidéos "
 "embarquées. Cependant cela peut poser un faille de sécurité."
 
-#: ../../Zotlabs/Module/Admin/Security.php:122
+#: ../../Code/Module/Admin/Security.php:122
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr "Ce paramétrage autorisant le HTML pour les sites suivants."
 
-#: ../../Zotlabs/Module/Admin/Security.php:123
+#: ../../Code/Module/Admin/Security.php:123
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/"
 "
              https://vimeo.com/
              https://soundcloud.com/
              "
@@ -5329,7 +5329,7 @@ msgstr ""
 ">https://vimeo.com/
              https://soundcloud.com/
              "
 " "
 
-#: ../../Zotlabs/Module/Admin/Security.php:124
+#: ../../Code/Module/Admin/Security.php:124
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
@@ -5337,11 +5337,11 @@ msgstr ""
 "Les contenus html seront filtrés sauf ceux des sites "
 "explicitement bloqués."
 
-#: ../../Zotlabs/Module/Admin/Security.php:131
+#: ../../Code/Module/Admin/Security.php:131
 msgid "Block public"
 msgstr "Bloquer \"public\""
 
-#: ../../Zotlabs/Module/Admin/Security.php:131
+#: ../../Code/Module/Admin/Security.php:131
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
@@ -5349,66 +5349,66 @@ msgstr ""
 "Sélectionner pour ne permettre l'accès aux pages personnelles \"publiques\" "
 "du site qu'aux personnes authentifiées, pas aux personnes anonymes du web."
 
-#: ../../Zotlabs/Module/Admin/Security.php:132
+#: ../../Code/Module/Admin/Security.php:132
 msgid "Block public search"
 msgstr "Recherche protégée"
 
-#: ../../Zotlabs/Module/Admin/Security.php:132
+#: ../../Code/Module/Admin/Security.php:132
 msgid ""
 "Prevent access to search content unless you are currently authenticated."
 msgstr ""
 "N'autoriser la recherche de contenus que pour les personnes authentifiées."
 
-#: ../../Zotlabs/Module/Admin/Security.php:133
+#: ../../Code/Module/Admin/Security.php:133
 msgid "Hide local directory"
 msgstr "Cacher l'annuaire local"
 
-#: ../../Zotlabs/Module/Admin/Security.php:133
+#: ../../Code/Module/Admin/Security.php:133
 msgid "Only use the global directory"
 msgstr "N'utiliser que l'annuaire global"
 
-#: ../../Zotlabs/Module/Admin/Security.php:134
+#: ../../Code/Module/Admin/Security.php:134
 msgid "Provide a cloud root directory"
 msgstr "Permettre l'accès au dossier racine du stockage 'cloud'"
 
-#: ../../Zotlabs/Module/Admin/Security.php:134
+#: ../../Code/Module/Admin/Security.php:134
 msgid ""
 "The cloud root directory lists all channel names which provide public files"
 msgstr ""
 "Tous les canaux mettant à disposition des fichiers publics sont listés dans "
 "le dossier racine du stockage 'cloud'"
 
-#: ../../Zotlabs/Module/Admin/Security.php:135
+#: ../../Code/Module/Admin/Security.php:135
 msgid "Show total disk space available to cloud uploads"
 msgstr ""
 "Montrer l'espace disque disponible pour les téléversements vers le stockage "
 "'cloud'"
 
-#: ../../Zotlabs/Module/Admin/Security.php:136
+#: ../../Code/Module/Admin/Security.php:136
 msgid "Allow SVG thumbnails in file browser"
 msgstr "Autoriser les vignettes SVG dans le navigateur de fichiers"
 
-#: ../../Zotlabs/Module/Admin/Security.php:136
+#: ../../Code/Module/Admin/Security.php:136
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "ATTENTION : les images SVG peuvent contenir du code malveillant."
 
-#: ../../Zotlabs/Module/Admin/Security.php:138
+#: ../../Code/Module/Admin/Security.php:138
 msgid "Allow embedded (inline) PDF files"
 msgstr "Autoriser les fichier PDF intégrés (en ligne)"
 
-#: ../../Zotlabs/Module/Admin/Security.php:140
+#: ../../Code/Module/Admin/Security.php:140
 msgid "Set \"Transport Security\" HTTP header"
 msgstr "Paramétrer \"Transport Security\" pour l'entête HTTP"
 
-#: ../../Zotlabs/Module/Admin/Security.php:141
+#: ../../Code/Module/Admin/Security.php:141
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr "Paramétrer \"Content Security Policy\" pour l'entête HTTP"
 
-#: ../../Zotlabs/Module/Admin/Security.php:142
+#: ../../Code/Module/Admin/Security.php:142
 msgid "Allowed email domains"
 msgstr "Domaines de courriels autorisés"
 
-#: ../../Zotlabs/Module/Admin/Security.php:142
+#: ../../Code/Module/Admin/Security.php:142
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
@@ -5418,11 +5418,11 @@ msgstr ""
 "courriel seront autorisées lors de l'inscription à ce site. Les caractères "
 "génériques (*) sont acceptés. Laissez vide pour accepter tous les domaines."
 
-#: ../../Zotlabs/Module/Admin/Security.php:143
+#: ../../Code/Module/Admin/Security.php:143
 msgid "Not allowed email domains"
 msgstr "Domaines de courriel non autorisés"
 
-#: ../../Zotlabs/Module/Admin/Security.php:143
+#: ../../Code/Module/Admin/Security.php:143
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
@@ -5433,12 +5433,12 @@ msgstr ""
 "caractères génériques (*) sont acceptés. Laissez vide pour accepter tous les"
 " domaines, sauf si des domaines autorisés ont été définis."
 
-#: ../../Zotlabs/Module/Admin/Security.php:144
+#: ../../Code/Module/Admin/Security.php:144
 msgid "Allow communications only from these sites"
 msgstr "N'autorisez que les communications venant de ces sites"
 
-#: ../../Zotlabs/Module/Admin/Security.php:144
-#: ../../Zotlabs/Module/Admin/Security.php:149
+#: ../../Code/Module/Admin/Security.php:144
+#: ../../Code/Module/Admin/Security.php:149
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
@@ -5446,135 +5446,135 @@ msgstr ""
 "Un site par ligne. Laisser vide pour autoriser les communications de tous "
 "les sites, par défaut."
 
-#: ../../Zotlabs/Module/Admin/Security.php:145
+#: ../../Code/Module/Admin/Security.php:145
 msgid "Block communications from these sites"
 msgstr "Bloquer les communications de ces sites"
 
-#: ../../Zotlabs/Module/Admin/Security.php:146
+#: ../../Code/Module/Admin/Security.php:146
 msgid "Allow communications only from these channels"
 msgstr "N'autoriser que les communications de ces canaux"
 
-#: ../../Zotlabs/Module/Admin/Security.php:146
-#: ../../Zotlabs/Module/Admin/Security.php:151
+#: ../../Code/Module/Admin/Security.php:146
+#: ../../Code/Module/Admin/Security.php:151
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr ""
 "Un canal (adresse) par ligne. Laisser vide pour autoriser les communications"
 " de tous les canaux, par défaut"
 
-#: ../../Zotlabs/Module/Admin/Security.php:147
+#: ../../Code/Module/Admin/Security.php:147
 msgid "Block communications from these channels"
 msgstr "Bloquer les communications de ces canaux"
 
-#: ../../Zotlabs/Module/Admin/Security.php:149
+#: ../../Code/Module/Admin/Security.php:149
 msgid "Allow public stream communications only from these sites"
 msgstr ""
 "Autoriser uniquement les communications de flux public provenant de ces "
 "sites"
 
-#: ../../Zotlabs/Module/Admin/Security.php:150
+#: ../../Code/Module/Admin/Security.php:150
 msgid "Block public stream communications from these sites"
 msgstr "Bloquer les communications de flux public en provenance de ces sites"
 
-#: ../../Zotlabs/Module/Admin/Security.php:151
+#: ../../Code/Module/Admin/Security.php:151
 msgid "Allow public stream communications only from these channels"
 msgstr ""
 "Autoriser uniquement les communications de flux public provenant de ces "
 "canaux"
 
-#: ../../Zotlabs/Module/Admin/Security.php:152
+#: ../../Code/Module/Admin/Security.php:152
 msgid "Block public stream communications from these channels"
 msgstr "Bloquer les communications de flux public en provenance de ces canaux"
 
-#: ../../Zotlabs/Module/Admin/Security.php:155
+#: ../../Code/Module/Admin/Security.php:155
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 "Seuls les sites et liens sécurisés sont autorisé pour intégrer du code HTML"
 
-#: ../../Zotlabs/Module/Admin/Security.php:156
+#: ../../Code/Module/Admin/Security.php:156
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Autoriser le contenu HTML embarqué uniquement à partir de ces domaines"
 
-#: ../../Zotlabs/Module/Admin/Security.php:156
+#: ../../Code/Module/Admin/Security.php:156
 msgid "One site per line. By default embedded content is filtered."
 msgstr "Un site par ligne. Par défaut le contenu embarqué est filtré."
 
-#: ../../Zotlabs/Module/Admin/Security.php:157
+#: ../../Code/Module/Admin/Security.php:157
 msgid "Block embedded HTML from these domains"
 msgstr "Bloquer le HTML embarqué à partir de ces domaines"
 
-#: ../../Zotlabs/Module/Admin/Site.php:162
+#: ../../Code/Module/Admin/Site.php:162
 msgid "Site settings updated."
 msgstr "Paramètres du site sauvegardés."
 
-#: ../../Zotlabs/Module/Admin/Site.php:207
+#: ../../Code/Module/Admin/Site.php:207
 msgid "mobile"
 msgstr "mobile"
 
-#: ../../Zotlabs/Module/Admin/Site.php:209
+#: ../../Code/Module/Admin/Site.php:209
 msgid "experimental"
 msgstr "expérimental"
 
-#: ../../Zotlabs/Module/Admin/Site.php:211
+#: ../../Code/Module/Admin/Site.php:211
 msgid "unsupported"
 msgstr "non maintenu"
 
-#: ../../Zotlabs/Module/Admin/Site.php:252
+#: ../../Code/Module/Admin/Site.php:252
 msgid "Yes - with approval"
 msgstr "Oui - avec approbation"
 
-#: ../../Zotlabs/Module/Admin/Site.php:258
+#: ../../Code/Module/Admin/Site.php:258
 msgid "My site is not a public server"
 msgstr "Mon site n'est pas un serveur public"
 
-#: ../../Zotlabs/Module/Admin/Site.php:259
+#: ../../Code/Module/Admin/Site.php:259
 msgid "My site provides free public access"
 msgstr "Mon site offre un accès gratuit au public"
 
-#: ../../Zotlabs/Module/Admin/Site.php:260
+#: ../../Code/Module/Admin/Site.php:260
 msgid "My site provides paid public access"
 msgstr "Mon site propose un accès payant au public"
 
-#: ../../Zotlabs/Module/Admin/Site.php:261
+#: ../../Code/Module/Admin/Site.php:261
 msgid "My site provides free public access and premium paid plans"
 msgstr ""
 "Mon site offre un accès gratuit au public et de formules premium payantes"
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Code/Module/Admin/Site.php:276
 msgid "Default permission role for new accounts"
 msgstr "Rôle d'accès par défaut pour les nouveaux comptes"
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Code/Module/Admin/Site.php:276
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr "Ce rôle sera utilisé pour le premier canal créé après l'inscription."
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Code/Module/Admin/Site.php:286
 msgid "Site Configuration"
 msgstr "Configuration du site"
 
-#: ../../Zotlabs/Module/Admin/Site.php:287
-#: ../../Zotlabs/Module/Register.php:283
+#: ../../Code/Module/Admin/Site.php:287
+#: ../../Code/Module/Register.php:283
 msgid "Registration"
 msgstr "Inscription"
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
+#: ../../Code/Module/Admin/Site.php:288
 msgid "File upload"
 msgstr "Envoi de fichier"
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Code/Module/Admin/Site.php:289
 msgid "Policies"
 msgstr "Stratégies"
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Code/Module/Admin/Site.php:292
 msgid "Site name"
 msgstr "Nom du site"
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Code/Module/Admin/Site.php:293
 msgid "Administrator Information"
 msgstr "Informations de l'administrateur"
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Code/Module/Admin/Site.php:293
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode may be used here."
@@ -5582,11 +5582,11 @@ msgstr ""
 "Informations de contact des administrateurs. Affichées sur la page "
 "'siteinfo'. Vous pouvez utiliser du BBCode ici."
 
-#: ../../Zotlabs/Module/Admin/Site.php:294 ../../Zotlabs/Module/Siteinfo.php:33
+#: ../../Code/Module/Admin/Site.php:294 ../../Code/Module/Siteinfo.php:33
 msgid "Site Information"
 msgstr "Informations concernant le site"
 
-#: ../../Zotlabs/Module/Admin/Site.php:294
+#: ../../Code/Module/Admin/Site.php:294
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode may be used here."
@@ -5594,15 +5594,15 @@ msgstr ""
 "Description du site disponible publiquement. Affichée sur la page "
 "d'information du site. BBCode peut être utilisé ici."
 
-#: ../../Zotlabs/Module/Admin/Site.php:295
+#: ../../Code/Module/Admin/Site.php:295
 msgid "System language"
 msgstr "Langue du système"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Code/Module/Admin/Site.php:296
 msgid "System theme"
 msgstr "Thème du système"
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Code/Module/Admin/Site.php:296
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
@@ -5610,20 +5610,20 @@ msgstr ""
 "Thème par défaut - il peut être changé pour chaque profil utilisateur - modifier le thème"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid "ActivityPub protocol"
 msgstr "Protocole ActivityPub"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid "Provides access to software supporting the ActivityPub protocol."
 msgstr ""
 "Autorise un accès par des applications utilisant le protocole ActivityPub"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Code/Module/Admin/Site.php:300
 msgid "Maximum image size"
 msgstr "Taille maximale des images"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Code/Module/Admin/Site.php:300
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
@@ -5631,27 +5631,27 @@ msgstr ""
 "Taille maximum, en octets, des images envoyées. Par défaut 0, soit sans "
 "limite."
 
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Code/Module/Admin/Site.php:301
 msgid "Cache all public images"
 msgstr "Mettre les images publiques en cache"
 
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Code/Module/Admin/Site.php:301
 msgid "If disabled, proxy non-SSL images, but do not store locally"
 msgstr ""
 "Si désactivé, on utilise un proxy pour les images non-SSL, sans les stocker"
 " localement"
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Code/Module/Admin/Site.php:302
 msgid "Does this site allow new member registration?"
 msgstr ""
 "Est-ce que l'enregistrement de nouveaux membres est autorisé sur ce "
 "site ?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Code/Module/Admin/Site.php:303
 msgid "Invitation only"
 msgstr "Sur invitation seulement"
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Code/Module/Admin/Site.php:303
 msgid ""
 "Only allow new member registrations with an invitation code. New member "
 "registration must be allowed for this to work."
@@ -5660,22 +5660,22 @@ msgstr ""
 "d'invitation. L'inscription de nouveaux membres doit être autorisée pour que"
 " ceci fonctionne."
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Code/Module/Admin/Site.php:304
 msgid "Minimum age"
 msgstr "Âge minimum"
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Code/Module/Admin/Site.php:304
 msgid "Minimum age (in years) for who may register on this site."
 msgstr ""
 "Âge minimum (en années) pour les personnes pouvant s'inscrire sur ce site."
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Code/Module/Admin/Site.php:305
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 "Quelle est la meilleure description des types de comptes proposés sur ce "
 "hub ?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Code/Module/Admin/Site.php:305
 msgid ""
 "If a public server policy is selected, this information may be displayed on "
 "the public server site list."
@@ -5683,21 +5683,21 @@ msgstr ""
 "Si une politique offrant un accès au public est choisie, cette information "
 "pourra être affichée sur la liste des serveurs publics."
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Register text"
 msgstr "Texte d'inscription"
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Will be displayed prominently on the registration page."
 msgstr "Sera affiché de manière bien visible sur le formulaire d'inscription."
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 "Page d'accueil du site à montrer aux visiteurs (par défaut : boîte de "
 "dialogue de connexion)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
@@ -5706,11 +5706,11 @@ msgstr ""
 "montrer une page système appelée 'home' ou 'include:home.html' pour inclure "
 "un fichier."
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Code/Module/Admin/Site.php:309
 msgid "Preserve site homepage URL"
 msgstr "Préserver l'adresse d'accueil du site"
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Code/Module/Admin/Site.php:309
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
@@ -5718,11 +5718,11 @@ msgstr ""
 "Présenter la page d'accueil du site dans un cadre à l'adresse d'origine, "
 "plutôt que de rediriger"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid "Accounts abandoned after x days"
 msgstr "Les comptes sont abandonnés après x jours"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
@@ -5731,41 +5731,41 @@ msgstr ""
 "distants pour des canaux abandonnés. Mettez 0 pour ne pas avoir de limite de"
 " temps."
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid "Block directory from visitors"
 msgstr "Cacher l'annuaire aux visiteurs"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid "Only allow authenticated access to directory."
 msgstr "Autoriser uniquement les accès authentifiés à l'annuaire"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Code/Module/Admin/Site.php:312
 msgid "Verify Email Addresses"
 msgstr "Demander vérification des adresses de courriel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Code/Module/Admin/Site.php:312
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 "Cocher pour que les adresses utilisées à l'inscription soient vérifiées "
 "(recommandé)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Code/Module/Admin/Site.php:313
 msgid "Force publish in directory"
 msgstr "Forcer la publication dans l'annuaire"
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Code/Module/Admin/Site.php:313
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 "Cocher pour forcer la publication de tous les profils du site dans "
 "l'annuaire."
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid "Public stream"
 msgstr "Flux public"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid ""
 "Provide access to public content from other sites. Warning: this content is "
 "unmoderated."
@@ -5773,11 +5773,11 @@ msgstr ""
 "Permettre l'accès au contenu public d'autres serveurs. Attention : ce"
 " contenu n'est pas modéré."
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Code/Module/Admin/Site.php:315
 msgid "Site only Public stream"
 msgstr "Flux public du serveur uniquement"
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Code/Module/Admin/Site.php:315
 msgid ""
 "Provide access to public content originating only from this site if Public "
 "stream is disabled."
@@ -5785,11 +5785,11 @@ msgstr ""
 "Permettre l'accès au contenu public de ce serveur uniquement, si le flux"
 " public global est désactivé."
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Code/Module/Admin/Site.php:316
 msgid "Allow anybody on the internet to access the Public stream"
 msgstr "Autoriser n'importe qui sur internet à accéder au flux public"
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Code/Module/Admin/Site.php:316
 msgid ""
 "Default is to only allow viewing by site members. Warning: this content is "
 "unmoderated."
@@ -5797,13 +5797,13 @@ msgstr ""
 "Par défaut, on autorise uniquement l'accès aux membres du site. "
 "Attention : ce contenu n'est pas modéré."
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "Show numbers of likes and dislikes in conversations"
 msgstr ""
 "Montrer le nombre de réactions 'J'aime' et 'Je n'aime pas' dans les "
 "discussions"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid ""
 "If disabled, the presence of likes and dislikes will be shown, but without "
 "totals."
@@ -5811,13 +5811,13 @@ msgstr ""
 "Si désactivé, l'existence de réactions 'J'aime' et/ou 'Je n'aime pas' sera "
 "montrée, sans détail des nombres."
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:318
 msgid "Only import Public stream posts with this text"
 msgstr ""
 "N'importer les publications publiques que si elles comprennent ce texte"
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:319
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
@@ -5825,16 +5825,16 @@ msgstr ""
 "Mots (un par ligne), #étiquettes, $catégories, /motif/, ou lang=xx - laisser"
 " vide pour importer toutes les publications."
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Do not import Public stream posts with this text"
 msgstr ""
 "Ne pas importer les publications publiques si elles comprennent ce texte"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid "Maximum number of imported friends of friends"
 msgstr "Nombre maximal des amis d'amis importés"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid ""
 "Warning: higher numbers will improve the quality of friend suggestions and "
 "directory results but can exponentially increase resource usage"
@@ -5843,11 +5843,11 @@ msgstr ""
 " de contacts et les résultats de l'annuaire, mais peut augmenter"
 " l'utilisation des ressources de façon exponentielle"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Login on Homepage"
 msgstr "Connexion sur la page d'accueil"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
@@ -5855,60 +5855,60 @@ msgstr ""
 "Présenter une boîte de dialogue de connexion aux visiteurs sur la page "
 "d'accueil si aucun autre contenu n'a été configuré."
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Code/Module/Admin/Site.php:322
 msgid "Enable context help"
 msgstr "Permettre l'aide contextuelle"
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Code/Module/Admin/Site.php:322
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr "Afficher l'aide contextuel en cliquant sur le bouton aide."
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Reply-to email address for system generated email."
 msgstr ""
 "Adresse courriel de retour pour les courriels générés par l'application."
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid "Sender (From) email address for system generated email."
 msgstr ""
 "Adresse courriel de l'expéditeur (champ \"De\") pour les courriels générés "
 "par l'application."
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid "Display name of email sender for system generated email."
 msgstr "Nom affiché pour l'expéditeur des courriels générés par le système."
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid "Directory Server URL"
 msgstr "URL du serveur d'annuaire"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid "Default directory server"
 msgstr "Serveur d'annuaire par défaut"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid "Proxy user"
 msgstr "Utilisateur du proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Code/Module/Admin/Site.php:328
 msgid "Proxy URL"
 msgstr "URL du proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid "Network timeout"
 msgstr "Délai maximal du réseau"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 "En secondes. Mettre à 0 pour ne pas avoir de délai maximal (non recommandé)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "Delivery interval"
 msgstr "Intervalle de distribution"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
@@ -5918,11 +5918,11 @@ msgstr ""
 "charge sur le système. Valeurs recommandées : 4-5 pour les serveurs "
 "mutualisés, 2-3 pour les VPS. 0-1 pour les gros serveurs dédiés."
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid "Deliveries per process"
 msgstr "Distributions par processus"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
@@ -5931,11 +5931,11 @@ msgstr ""
 "Ajuster si nécessaire pour affiner la performance du système. "
 "Recommandé:1-5."
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid "Queue Threshold"
 msgstr "Seuil de file d'attente"
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
@@ -5943,11 +5943,11 @@ msgstr ""
 "Reportez toujours la livraison immédiate si la file d'attente contient plus "
 "que ce nombre d'entrées."
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid "Poll interval"
 msgstr "Intervalle de scrutation"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
@@ -5955,11 +5955,11 @@ msgstr ""
 "Temporise le processus de scrutation en tâche de fond de tant de secondes, "
 "pour réduire la charge. Si 0, utilise l'intervalle de distribution."
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Path to ImageMagick convert program"
 msgstr "Chemin d'accès au programme \"convert\" de ImageMagick"
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
@@ -5970,11 +5970,11 @@ msgstr ""
 "l'autre dimension), sinon la mémoire risque de s'épuiser. Exemple : "
 "/usr/bin/convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Code/Module/Admin/Site.php:335
 msgid "Maximum Load Average"
 msgstr "Charge maximale moyenne"
 
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Code/Module/Admin/Site.php:335
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
@@ -5982,180 +5982,180 @@ msgstr ""
 "Charge système maximale au-delà de laquelle distribution et scrutation sont "
 "reportées - par défaut 50."
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Expiration period in days for imported streams and cached images"
 msgstr ""
 "Délai d'expiration en jours pour les flux importés les et images mises en "
 "cache"
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "0 for no expiration of imported content"
 msgstr "0 pour ne pas expirer le contenu importé"
 
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Code/Module/Admin/Site.php:337
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr ""
 "Ne pas considérer comme expirés les messages qui ont reçu des commentaires "
 "depuis moins de ce nombre de jours"
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 "Serveurs publics : page Web facultative d'atterrissage (marketing) pour les "
 "nouveaux inscrits."
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Créez d'abord cette page. La valeur par défaut est %s /register"
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Code/Module/Admin/Site.php:339
 msgid "Page to display after creating a new channel"
 msgstr "Page à afficher après la création d'un nouveau canal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Code/Module/Admin/Site.php:339
 msgid "Default: profiles"
 msgstr "Par défaut : profiles"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Site location"
 msgstr "Localisation du serveur"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Region or country - shared with other sites"
 msgstr "Région ou Pays - partagé avec les autres serveurs"
 
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:174
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:261
-#: ../../Zotlabs/Module/Cover_photo.php:174
-#: ../../Zotlabs/Module/Cover_photo.php:265
+#: ../../Code/Module/Admin/Cover_photo.php:174
+#: ../../Code/Module/Admin/Cover_photo.php:261
+#: ../../Code/Module/Cover_photo.php:174
+#: ../../Code/Module/Cover_photo.php:265
 msgid "Cover Photos"
 msgstr "Bannières"
 
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:369
-#: ../../Zotlabs/Module/Cover_photo.php:420
+#: ../../Code/Module/Admin/Cover_photo.php:369
+#: ../../Code/Module/Cover_photo.php:420
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr "Votre bannière peut être vue par n'importe qui sur internet"
 
-#: ../../Zotlabs/Module/Admin/Cover_photo.php:373
-#: ../../Zotlabs/Module/Cover_photo.php:424
+#: ../../Code/Module/Admin/Cover_photo.php:373
+#: ../../Code/Module/Cover_photo.php:424
 msgid "Change Cover Photo"
 msgstr "Changer la bannière"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
+#: ../../Code/Module/Admin/Themes.php:26
 msgid "Theme settings updated."
 msgstr "Paramètres du thème mis à jour."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
+#: ../../Code/Module/Admin/Themes.php:61
 msgid "No themes found."
 msgstr "Aucun thème trouvé."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
+#: ../../Code/Module/Admin/Themes.php:116
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
+#: ../../Code/Module/Admin/Themes.php:162
 msgid "[Experimental]"
 msgstr "[Expérimental]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
+#: ../../Code/Module/Admin/Themes.php:163
 msgid "[Unsupported]"
 msgstr "[Non maintenu]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:37
+#: ../../Code/Module/Admin/Accounts.php:37
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s compte bloqué/débloqué"
 msgstr[1] "%s comptes bloqués/débloqués"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:45
+#: ../../Code/Module/Admin/Accounts.php:45
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s compte supprimé"
 msgstr[1] "%s comptes supprimés"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:83
+#: ../../Code/Module/Admin/Accounts.php:83
 msgid "Account not found"
 msgstr "Compte introuvable"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:94 ../../include/channel.php:2108
+#: ../../Code/Module/Admin/Accounts.php:94 ../../include/channel.php:2108
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Compte '%s' supprimé"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:102
+#: ../../Code/Module/Admin/Accounts.php:102
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Compte '%s' bloqué"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:110
+#: ../../Code/Module/Admin/Accounts.php:110
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Compte '%s' débloqué"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Code/Module/Admin/Accounts.php:170
 msgid "Registrations waiting for confirm"
 msgstr "Inscriptions en attente d'approbation"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:171
 msgid "Request date"
 msgstr "Date de la demande"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-#: ../../Zotlabs/Module/Cdav.php:1353 ../../Zotlabs/Module/Profiles.php:789
-#: ../../Zotlabs/Module/Connedit.php:853 ../../include/network.php:1512
+#: ../../Code/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:183
+#: ../../Code/Module/Cdav.php:1353 ../../Code/Module/Profiles.php:789
+#: ../../Code/Module/Connedit.php:853 ../../include/network.php:1512
 msgid "Email"
 msgstr "Courriel"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Code/Module/Admin/Accounts.php:172
 msgid "No registrations."
 msgstr "Pas d'inscriptions."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
-#: ../../Zotlabs/Module/Connections.php:337 ../../include/conversation.php:743
+#: ../../Code/Module/Admin/Accounts.php:173
+#: ../../Code/Module/Connections.php:337 ../../include/conversation.php:743
 msgid "Approve"
 msgstr "Approuver"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Authorize.php:33
+#: ../../Code/Module/Admin/Accounts.php:174
+#: ../../Code/Module/Authorize.php:33
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:177
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Code/Module/Admin/Accounts.php:177
+#: ../../Code/Module/Connedit.php:568
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182
+#: ../../Code/Module/Admin/Accounts.php:182
 msgid "ID"
 msgstr "Identifiant"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../Code/Module/Admin/Accounts.php:184
 msgid "All Channels"
 msgstr "Tous les canaux"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Code/Module/Admin/Accounts.php:185
 msgid "Register date"
 msgstr "Date d'inscription"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Code/Module/Admin/Accounts.php:186
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:187
+#: ../../Code/Module/Admin/Accounts.php:187
 msgid "Expires"
 msgstr "Expire le"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Code/Module/Admin/Accounts.php:188
 msgid "Service Class"
 msgstr "Classe de service"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:190
+#: ../../Code/Module/Admin/Accounts.php:190
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -6164,7 +6164,7 @@ msgstr ""
 "utilisateurs ont publié sur ce site sera détruit de manière "
 "définitive !\\n\\nÊtes-vous sûr ?"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:191
+#: ../../Code/Module/Admin/Accounts.php:191
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
@@ -6173,7 +6173,7 @@ msgstr ""
 " sur ce site sera détruit de manière définitive !\\n\\nÊtes-vous "
 "sûr ?"
 
-#: ../../Zotlabs/Module/Clients.php:14
+#: ../../Code/Module/Clients.php:14
 msgid ""
 "This app allows you to authorize mobile apps using OAuth and OpenID to "
 "access your channel."
@@ -6181,29 +6181,29 @@ msgstr ""
 "Cette application vous permet d'autoriser les applications mobiles utilisant"
 " OAuth et OpenID à accéder à votre canal."
 
-#: ../../Zotlabs/Module/Authorize.php:17
+#: ../../Code/Module/Authorize.php:17
 msgid "Unknown App"
 msgstr "Application inconnue"
 
-#: ../../Zotlabs/Module/Authorize.php:29
+#: ../../Code/Module/Authorize.php:29
 msgid "Authorize"
 msgstr "Autoriser"
 
-#: ../../Zotlabs/Module/Authorize.php:30
+#: ../../Code/Module/Authorize.php:30
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr ""
 "Autorisez vous l'application %s à accéder aux données de votre canal ?"
 
-#: ../../Zotlabs/Module/Authorize.php:32
+#: ../../Code/Module/Authorize.php:32
 msgid "Allow"
 msgstr "Permettre"
 
-#: ../../Zotlabs/Module/Content_filter.php:25
+#: ../../Code/Module/Content_filter.php:25
 msgid "Content Filter settings updated."
 msgstr "Paramètres du filtre de contenus mis à jour."
 
-#: ../../Zotlabs/Module/Content_filter.php:36
+#: ../../Code/Module/Content_filter.php:36
 msgid ""
 "This app (when installed) allows you to filter incoming content from all "
 "sources or from specific connections. The filtering may be based on words, "
@@ -6214,7 +6214,7 @@ msgstr ""
 "spécifiques. Le filtrage peut être basé sur des mots, des étiquettes, des "
 "expressions régulières ou la langue"
 
-#: ../../Zotlabs/Module/Content_filter.php:44
+#: ../../Code/Module/Content_filter.php:44
 msgid ""
 "The settings on this page apply to all incoming content. To edit the "
 "settings for individual connetions, see the similar settings on the "
@@ -6225,13 +6225,13 @@ msgstr ""
 " mêmes "
 "paramètres sur la page de modification de la connexion."
 
-#: ../../Zotlabs/Module/Content_filter.php:51
-#: ../../Zotlabs/Module/Connedit.php:817
+#: ../../Code/Module/Content_filter.php:51
+#: ../../Code/Module/Connedit.php:817
 msgid "Only import posts with this text"
 msgstr "N'importer que les publications comprenant ce texte"
 
-#: ../../Zotlabs/Module/Content_filter.php:53
-#: ../../Zotlabs/Module/Content_filter.php:61
+#: ../../Code/Module/Content_filter.php:53
+#: ../../Code/Module/Content_filter.php:61
 msgid ""
 "words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - "
 "leave blank to import all posts"
@@ -6239,32 +6239,32 @@ msgstr ""
 "Mots (un par ligne), #étiquettes, $catégories, /motif/, lang=xx ou !lang=xx "
 "- laisser vide pour importer toutes les publications."
 
-#: ../../Zotlabs/Module/Content_filter.php:59
-#: ../../Zotlabs/Module/Connedit.php:818
+#: ../../Code/Module/Content_filter.php:59
+#: ../../Code/Module/Connedit.php:818
 msgid "Do not import posts with this text"
 msgstr "Ne pas importer les publications comprenant ce texte"
 
-#: ../../Zotlabs/Module/Content_filter.php:66
+#: ../../Code/Module/Content_filter.php:66
 msgid "Content Filter Settings"
 msgstr "Paramètres du filtre de contenus"
 
-#: ../../Zotlabs/Module/Cal.php:77
+#: ../../Code/Module/Cal.php:77
 msgid "Permissions denied."
 msgstr "Accès refusé."
 
-#: ../../Zotlabs/Module/Cal.php:349 ../../include/text.php:2579
+#: ../../Code/Module/Cal.php:349 ../../include/text.php:2579
 msgid "Import"
 msgstr "Importer"
 
-#: ../../Zotlabs/Module/Locs.php:28 ../../Zotlabs/Module/Locs.php:57
+#: ../../Code/Module/Locs.php:28 ../../Code/Module/Locs.php:57
 msgid "Location not found."
 msgstr "Emplacement introuvable."
 
-#: ../../Zotlabs/Module/Locs.php:65
+#: ../../Code/Module/Locs.php:65
 msgid "Location lookup failed."
 msgstr "Echec de la recherche de l'emplacement."
 
-#: ../../Zotlabs/Module/Locs.php:69
+#: ../../Code/Module/Locs.php:69
 msgid ""
 "Please select another location to become primary before removing the primary "
 "location."
@@ -6272,27 +6272,27 @@ msgstr ""
 "Merci de sélectionner un autre emplacement comme nouvel emplacement primaire"
 " avant de supprimer l'emplacement primaire actuel."
 
-#: ../../Zotlabs/Module/Locs.php:98
+#: ../../Code/Module/Locs.php:98
 msgid "Pushing location info"
 msgstr "Informations d'emplacement envoyées"
 
-#: ../../Zotlabs/Module/Locs.php:108
+#: ../../Code/Module/Locs.php:108
 msgid "No locations found."
 msgstr "Emplacement(s) introuvable."
 
-#: ../../Zotlabs/Module/Locs.php:119
+#: ../../Code/Module/Locs.php:119
 msgid "Manage Channel Locations"
 msgstr "Gérer les emplacements des canaux"
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Publish these settings"
 msgstr "Publier ces paramètres"
 
-#: ../../Zotlabs/Module/Locs.php:126
+#: ../../Code/Module/Locs.php:126
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Merci d'attendre plusieurs minutes entre opérations successives."
 
-#: ../../Zotlabs/Module/Locs.php:127
+#: ../../Code/Module/Locs.php:127
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing "
 "your channel."
@@ -6300,13 +6300,13 @@ msgstr ""
 "Quand c'est possible, abandonnez un emplacement en vous connectant sur le "
 "serveur concerné et en supprimant votre canal."
 
-#: ../../Zotlabs/Module/Locs.php:128
+#: ../../Code/Module/Locs.php:128
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 "Utilisez ce formulaire pour abandonner l'emplacement si le hub n'est plus "
 "actif."
 
-#: ../../Zotlabs/Module/Changeaddr.php:48
+#: ../../Code/Module/Changeaddr.php:48
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account "
 "password."
@@ -6314,12 +6314,12 @@ msgstr ""
 "Les changements de nom de canal ne sont pas autorisés dans les 48 heures "
 "suivant la modification du mot de passe du compte."
 
-#: ../../Zotlabs/Module/Changeaddr.php:59 ../../include/channel.php:223
+#: ../../Code/Module/Changeaddr.php:59 ../../include/channel.php:223
 #: ../../include/channel.php:655
 msgid "Reserved nickname. Please choose another."
 msgstr "Nom d'utilisateur indisponible. Merci d'en choisir un autre."
 
-#: ../../Zotlabs/Module/Changeaddr.php:64 ../../include/channel.php:228
+#: ../../Code/Module/Changeaddr.php:64 ../../include/channel.php:228
 #: ../../include/channel.php:660
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
@@ -6327,51 +6327,51 @@ msgstr ""
 "Le nom d'utilisateur contient des caractères interdits ou est déjà pris sur "
 "ce site."
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Changeaddr.php:78
 msgid "Feature has been disabled"
 msgstr "La fonctionnalité a été désactivée"
 
-#: ../../Zotlabs/Module/Changeaddr.php:96
+#: ../../Code/Module/Changeaddr.php:96
 msgid "Change channel nickname/address"
 msgstr "Changer le nom d'utilisateur/l'adresse du canal"
 
-#: ../../Zotlabs/Module/Changeaddr.php:97
-#: ../../Zotlabs/Module/Removeaccount.php:68
-#: ../../Zotlabs/Module/Removeme.php:68
+#: ../../Code/Module/Changeaddr.php:97
+#: ../../Code/Module/Removeaccount.php:68
+#: ../../Code/Module/Removeme.php:68
 msgid "WARNING: "
 msgstr "AVERTISSEMENT :"
 
-#: ../../Zotlabs/Module/Changeaddr.php:97
+#: ../../Code/Module/Changeaddr.php:97
 msgid "Any/all connections on other networks will be lost!"
 msgstr "Toutes les connexions sur d'autres réseaux seront perdues !"
 
-#: ../../Zotlabs/Module/Changeaddr.php:98
-#: ../../Zotlabs/Module/Removeaccount.php:69
-#: ../../Zotlabs/Module/Removeme.php:69
+#: ../../Code/Module/Changeaddr.php:98
+#: ../../Code/Module/Removeaccount.php:69
+#: ../../Code/Module/Removeme.php:69
 msgid "Please enter your password for verification:"
 msgstr "Merci de saisir votre mot de passe pour vérification :"
 
-#: ../../Zotlabs/Module/Changeaddr.php:99
+#: ../../Code/Module/Changeaddr.php:99
 msgid "New channel address"
 msgstr "Nouvelle adresse de canal"
 
-#: ../../Zotlabs/Module/Changeaddr.php:100
+#: ../../Code/Module/Changeaddr.php:100
 msgid "Rename Channel"
 msgstr "Renommer le canal"
 
-#: ../../Zotlabs/Module/Connect.php:54 ../../Zotlabs/Module/Connect.php:102
+#: ../../Code/Module/Connect.php:54 ../../Code/Module/Connect.php:102
 msgid "Continue"
 msgstr "Continuer"
 
-#: ../../Zotlabs/Module/Connect.php:83
+#: ../../Code/Module/Connect.php:83
 msgid "Premium Channel Setup"
 msgstr "Configuration du canal VIP"
 
-#: ../../Zotlabs/Module/Connect.php:85
+#: ../../Code/Module/Connect.php:85
 msgid "Enable premium channel connection restrictions"
 msgstr "Activer les restrictions liées au canal VIP"
 
-#: ../../Zotlabs/Module/Connect.php:86
+#: ../../Code/Module/Connect.php:86
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
@@ -6379,7 +6379,7 @@ msgstr ""
 "Merci de saisir vos restrictions et/ou conditions - reçu Paypal, ligne de "
 "conduite, etc."
 
-#: ../../Zotlabs/Module/Connect.php:88 ../../Zotlabs/Module/Connect.php:108
+#: ../../Code/Module/Connect.php:88 ../../Code/Module/Connect.php:108
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
@@ -6387,14 +6387,14 @@ msgstr ""
 "Avant d'autoriser la connexion, ce canal peut nécessiter des étapes "
 "additionnelles ou votre adhésion aux conditions suivantes :"
 
-#: ../../Zotlabs/Module/Connect.php:89
+#: ../../Code/Module/Connect.php:89
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr ""
 "Les contacts potentiels verront ce qui suit avant de pouvoir "
 "continuer :"
 
-#: ../../Zotlabs/Module/Connect.php:90 ../../Zotlabs/Module/Connect.php:111
+#: ../../Code/Module/Connect.php:90 ../../Code/Module/Connect.php:111
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided "
 "on this page."
@@ -6402,33 +6402,33 @@ msgstr ""
 "En continuant, je certifie que je me suis conformé à toutes les instructions"
 " indiquées sur cette page."
 
-#: ../../Zotlabs/Module/Connect.php:99
+#: ../../Code/Module/Connect.php:99
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 "(Aucune instruction spécifique n'a été fournie par le propriétaire du "
 "canal.)"
 
-#: ../../Zotlabs/Module/Connect.php:107
+#: ../../Code/Module/Connect.php:107
 msgid "Restricted or Premium Channel"
 msgstr "Canal VIP ou restreint"
 
-#: ../../Zotlabs/Module/Moderate.php:29
+#: ../../Code/Module/Moderate.php:29
 msgid "No entries."
 msgstr "Aucune entrée."
 
-#: ../../Zotlabs/Module/Moderate.php:73
+#: ../../Code/Module/Moderate.php:73
 msgid "Comment approved"
 msgstr "Commentaire validé"
 
-#: ../../Zotlabs/Module/Moderate.php:77
+#: ../../Code/Module/Moderate.php:77
 msgid "Comment deleted"
 msgstr "Commentaire supprimé"
 
-#: ../../Zotlabs/Module/Lang.php:18
+#: ../../Code/Module/Lang.php:18
 msgid "Change UI language"
 msgstr "Changer la langue de l'interface"
 
-#: ../../Zotlabs/Module/Sites.php:12
+#: ../../Code/Module/Sites.php:12
 msgid ""
 "This page provides information about related projects and websites that are "
 "currently known to this system. These are a small fraction of the thousands "
@@ -6438,216 +6438,216 @@ msgstr ""
 " actuellement connus par ce système. Ils ne sont qu'une fraction des milliers"
 " de serveurs et des douzaines de projets et fournisseurs qui font le Fédivers."
 
-#: ../../Zotlabs/Module/Sites.php:23
+#: ../../Code/Module/Sites.php:23
 msgid "free"
 msgstr "ouvert"
 
-#: ../../Zotlabs/Module/Sites.php:25
+#: ../../Code/Module/Sites.php:25
 msgid "subscription"
 msgstr "souscription"
 
-#: ../../Zotlabs/Module/Sites.php:27
+#: ../../Code/Module/Sites.php:27
 msgid "tiered service plans"
 msgstr "forfaits à prix progressifs"
 
-#: ../../Zotlabs/Module/Sites.php:34
+#: ../../Code/Module/Sites.php:34
 msgid "Register (requires approval)"
 msgstr "S'inscrire (nécessite une approbation)"
 
-#: ../../Zotlabs/Module/Sites.php:74
+#: ../../Code/Module/Sites.php:74
 msgid "Project"
 msgstr "Projet"
 
-#: ../../Zotlabs/Module/Sites.php:82
+#: ../../Code/Module/Sites.php:82
 msgid "Access type"
 msgstr "Type d'accès"
 
-#: ../../Zotlabs/Module/Cdav.php:852
+#: ../../Code/Module/Cdav.php:852
 msgid "INVALID EVENT DISMISSED!"
 msgstr "ÉVÈNEMENT INVALIDE REJETÉ!"
 
-#: ../../Zotlabs/Module/Cdav.php:853
+#: ../../Code/Module/Cdav.php:853
 msgid "Summary: "
 msgstr "Résumé :"
 
-#: ../../Zotlabs/Module/Cdav.php:854
+#: ../../Code/Module/Cdav.php:854
 msgid "Date: "
 msgstr "Date :"
 
-#: ../../Zotlabs/Module/Cdav.php:855 ../../Zotlabs/Module/Cdav.php:862
+#: ../../Code/Module/Cdav.php:855 ../../Code/Module/Cdav.php:862
 msgid "Reason: "
 msgstr "Raison :"
 
-#: ../../Zotlabs/Module/Cdav.php:860
+#: ../../Code/Module/Cdav.php:860
 msgid "INVALID CARD DISMISSED!"
 msgstr "ÉVÈNEMENT INVALIDE REJETÉ!"
 
-#: ../../Zotlabs/Module/Cdav.php:861
+#: ../../Code/Module/Cdav.php:861
 msgid "Name: "
 msgstr "Nom :"
 
-#: ../../Zotlabs/Module/Cdav.php:882
+#: ../../Code/Module/Cdav.php:882
 msgid "CardDAV App"
 msgstr "Application CardDAV"
 
-#: ../../Zotlabs/Module/Cdav.php:883
+#: ../../Code/Module/Cdav.php:883
 msgid "CalDAV capable addressbook"
 msgstr "Carnet d'adresses compatible CalDAV"
 
-#: ../../Zotlabs/Module/Cdav.php:947 ../../Zotlabs/Module/Calendar.php:435
+#: ../../Code/Module/Cdav.php:947 ../../Code/Module/Calendar.php:435
 msgid "Link to source"
 msgstr "Lien vers la source"
 
-#: ../../Zotlabs/Module/Cdav.php:1011
+#: ../../Code/Module/Cdav.php:1011
 msgid "End date and time"
 msgstr "Date et heure de fin"
 
-#: ../../Zotlabs/Module/Cdav.php:1038
+#: ../../Code/Module/Cdav.php:1038
 msgid "List month"
 msgstr "Liste mois"
 
-#: ../../Zotlabs/Module/Cdav.php:1039
+#: ../../Code/Module/Cdav.php:1039
 msgid "List week"
 msgstr "Liste semaine"
 
-#: ../../Zotlabs/Module/Cdav.php:1040
+#: ../../Code/Module/Cdav.php:1040
 msgid "List day"
 msgstr "Liste jour"
 
-#: ../../Zotlabs/Module/Cdav.php:1048
+#: ../../Code/Module/Cdav.php:1048
 msgid "More"
 msgstr "Plus"
 
-#: ../../Zotlabs/Module/Cdav.php:1049
+#: ../../Code/Module/Cdav.php:1049
 msgid "Less"
 msgstr "Moins"
 
-#: ../../Zotlabs/Module/Cdav.php:1051
+#: ../../Code/Module/Cdav.php:1051
 msgid "Select calendar"
 msgstr "Sélectionner un agenda"
 
-#: ../../Zotlabs/Module/Cdav.php:1054
+#: ../../Code/Module/Cdav.php:1054
 msgid "Delete all"
 msgstr "Tout supprimer"
 
-#: ../../Zotlabs/Module/Cdav.php:1057
+#: ../../Code/Module/Cdav.php:1057
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 "Désolé ! La modification d'évènements récurrents n'est pas encore "
 "implémentée."
 
-#: ../../Zotlabs/Module/Cdav.php:1350 ../../Zotlabs/Module/Connedit.php:850
+#: ../../Code/Module/Cdav.php:1350 ../../Code/Module/Connedit.php:850
 msgid "Organisation"
 msgstr "Organisation"
 
-#: ../../Zotlabs/Module/Cdav.php:1351 ../../Zotlabs/Module/Connedit.php:851
+#: ../../Code/Module/Cdav.php:1351 ../../Code/Module/Connedit.php:851
 msgid "Title"
 msgstr "Titre"
 
-#: ../../Zotlabs/Module/Cdav.php:1352 ../../Zotlabs/Module/Profiles.php:788
-#: ../../Zotlabs/Module/Connedit.php:852
+#: ../../Code/Module/Cdav.php:1352 ../../Code/Module/Profiles.php:788
+#: ../../Code/Module/Connedit.php:852
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../../Zotlabs/Module/Cdav.php:1354 ../../Zotlabs/Module/Profiles.php:790
-#: ../../Zotlabs/Module/Connedit.php:854
+#: ../../Code/Module/Cdav.php:1354 ../../Code/Module/Profiles.php:790
+#: ../../Code/Module/Connedit.php:854
 msgid "Instant messenger"
 msgstr "Messagerie instantanée"
 
-#: ../../Zotlabs/Module/Cdav.php:1355 ../../Zotlabs/Module/Profiles.php:791
-#: ../../Zotlabs/Module/Connedit.php:855
+#: ../../Code/Module/Cdav.php:1355 ../../Code/Module/Profiles.php:791
+#: ../../Code/Module/Connedit.php:855
 msgid "Website"
 msgstr "Site web"
 
-#: ../../Zotlabs/Module/Cdav.php:1357 ../../Zotlabs/Module/Profiles.php:793
-#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../Code/Module/Cdav.php:1357 ../../Code/Module/Profiles.php:793
+#: ../../Code/Module/Connedit.php:857
 msgid "Note"
 msgstr "Note"
 
-#: ../../Zotlabs/Module/Cdav.php:1358 ../../Zotlabs/Module/Profiles.php:794
-#: ../../Zotlabs/Module/Connedit.php:858 ../../include/event.php:1374
+#: ../../Code/Module/Cdav.php:1358 ../../Code/Module/Profiles.php:794
+#: ../../Code/Module/Connedit.php:858 ../../include/event.php:1374
 #: ../../include/connections.php:775
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../../Zotlabs/Module/Cdav.php:1359 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Connedit.php:859 ../../include/event.php:1375
+#: ../../Code/Module/Cdav.php:1359 ../../Code/Module/Profiles.php:795
+#: ../../Code/Module/Connedit.php:859 ../../include/event.php:1375
 #: ../../include/connections.php:776
 msgid "Home"
 msgstr "Domicile"
 
-#: ../../Zotlabs/Module/Cdav.php:1360 ../../Zotlabs/Module/Profiles.php:796
-#: ../../Zotlabs/Module/Connedit.php:860 ../../include/event.php:1378
+#: ../../Code/Module/Cdav.php:1360 ../../Code/Module/Profiles.php:796
+#: ../../Code/Module/Connedit.php:860 ../../include/event.php:1378
 #: ../../include/connections.php:779
 msgid "Work"
 msgstr "Travail"
 
-#: ../../Zotlabs/Module/Cdav.php:1361 ../../Zotlabs/Module/Profiles.php:797
-#: ../../Zotlabs/Module/Profiles.php:936 ../../Zotlabs/Module/Profiles.php:953
-#: ../../Zotlabs/Module/Profiles.php:1021
-#: ../../Zotlabs/Module/Profiles.php:1057 ../../Zotlabs/Module/Connedit.php:861
+#: ../../Code/Module/Cdav.php:1361 ../../Code/Module/Profiles.php:797
+#: ../../Code/Module/Profiles.php:936 ../../Code/Module/Profiles.php:953
+#: ../../Code/Module/Profiles.php:1021
+#: ../../Code/Module/Profiles.php:1057 ../../Code/Module/Connedit.php:861
 #: ../../include/event.php:1381 ../../include/event.php:1388
 #: ../../include/connections.php:782 ../../include/connections.php:789
 msgid "Other"
 msgstr "Autre"
 
-#: ../../Zotlabs/Module/Cdav.php:1362 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:862
+#: ../../Code/Module/Cdav.php:1362 ../../Code/Module/Profiles.php:798
+#: ../../Code/Module/Connedit.php:862
 msgid "Add Contact"
 msgstr "Ajouter un contact"
 
-#: ../../Zotlabs/Module/Cdav.php:1363 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Module/Connedit.php:863
+#: ../../Code/Module/Cdav.php:1363 ../../Code/Module/Profiles.php:799
+#: ../../Code/Module/Connedit.php:863
 msgid "Add Field"
 msgstr "Ajouter un champ"
 
-#: ../../Zotlabs/Module/Cdav.php:1368 ../../Zotlabs/Module/Connedit.php:868
+#: ../../Code/Module/Cdav.php:1368 ../../Code/Module/Connedit.php:868
 msgid "P.O. Box"
 msgstr "Boîte postale"
 
-#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:869
+#: ../../Code/Module/Cdav.php:1369 ../../Code/Module/Connedit.php:869
 msgid "Additional"
 msgstr "Information complémentaires"
 
-#: ../../Zotlabs/Module/Cdav.php:1370 ../../Zotlabs/Module/Connedit.php:870
+#: ../../Code/Module/Cdav.php:1370 ../../Code/Module/Connedit.php:870
 msgid "Street"
 msgstr "Rue"
 
-#: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Connedit.php:871
+#: ../../Code/Module/Cdav.php:1371 ../../Code/Module/Connedit.php:871
 msgid "Locality"
 msgstr "Localité"
 
-#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Connedit.php:872
+#: ../../Code/Module/Cdav.php:1372 ../../Code/Module/Connedit.php:872
 msgid "Region"
 msgstr "Région"
 
-#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:873
+#: ../../Code/Module/Cdav.php:1373 ../../Code/Module/Connedit.php:873
 msgid "ZIP Code"
 msgstr "Code postal"
 
-#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Profiles.php:756
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Code/Module/Cdav.php:1374 ../../Code/Module/Profiles.php:756
+#: ../../Code/Module/Connedit.php:874
 msgid "Country"
 msgstr "Pays"
 
-#: ../../Zotlabs/Module/Cdav.php:1423
+#: ../../Code/Module/Cdav.php:1423
 msgid "Default Calendar"
 msgstr "Agenda par défaut"
 
-#: ../../Zotlabs/Module/Cdav.php:1434
+#: ../../Code/Module/Cdav.php:1434
 msgid "Default Addressbook"
 msgstr "Carnet d'adresses par défaut"
 
-#: ../../Zotlabs/Module/New_channel.php:157 ../../Zotlabs/Module/Manage.php:144
+#: ../../Code/Module/New_channel.php:157 ../../Code/Module/Manage.php:144
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Vous avez créé %1$.0f des %2$.0f canaux autorisés."
 
-#: ../../Zotlabs/Module/New_channel.php:166
+#: ../../Code/Module/New_channel.php:166
 msgid "Your real name is recommended."
 msgstr "Votre nom véritable est recommandé."
 
-#: ../../Zotlabs/Module/New_channel.php:167
+#: ../../Code/Module/New_channel.php:167
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
@@ -6655,27 +6655,27 @@ msgstr ""
 "Exemples : \"Jérôme Dutilleul\", \"Louise et ses chevaux\", "
 "\"Football\", \"Club d'aéromodélisme\""
 
-#: ../../Zotlabs/Module/New_channel.php:172
+#: ../../Code/Module/New_channel.php:172
 msgid ""
 "This will be used to create a unique network address (like an email address)."
 msgstr ""
 "Ceci sera utilisa pour créer une adresse réseau unique (comme une adresse de"
 " courriel)"
 
-#: ../../Zotlabs/Module/New_channel.php:174
+#: ../../Code/Module/New_channel.php:174
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr "Les caractères autorisés sont a-z, 0-9, -, et _"
 
-#: ../../Zotlabs/Module/New_channel.php:182
+#: ../../Code/Module/New_channel.php:182
 msgid "Channel name"
 msgstr "Nom du canal"
 
-#: ../../Zotlabs/Module/New_channel.php:184
-#: ../../Zotlabs/Module/Register.php:271
+#: ../../Code/Module/New_channel.php:184
+#: ../../Code/Module/Register.php:271
 msgid "Choose a short nickname"
 msgstr "Choisissez un nom d'utilisateur court"
 
-#: ../../Zotlabs/Module/New_channel.php:185
+#: ../../Code/Module/New_channel.php:185
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
@@ -6683,11 +6683,11 @@ msgstr ""
 "Choisissez un rôle de canal adapté à votre usage et à vos exigences en "
 "matière de vie privée."
 
-#: ../../Zotlabs/Module/New_channel.php:188
+#: ../../Code/Module/New_channel.php:188
 msgid "Create a Channel"
 msgstr "Créer un canal"
 
-#: ../../Zotlabs/Module/New_channel.php:189
+#: ../../Code/Module/New_channel.php:189
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed, "
@@ -6697,300 +6697,300 @@ msgstr ""
 " (profil de réseau social), un groupe de discussion, un flux de "
 "d'information, un page de célébrité, ou bien d'autres choses."
 
-#: ../../Zotlabs/Module/New_channel.php:190
+#: ../../Code/Module/New_channel.php:190
 msgid ""
 "or import an existing channel from another location."
 msgstr ""
 "ou importer un canal existant d'un autre serveur."
 
-#: ../../Zotlabs/Module/New_channel.php:195
+#: ../../Code/Module/New_channel.php:195
 msgid "Validate"
 msgstr "Valider"
 
-#: ../../Zotlabs/Module/Mitem.php:67
+#: ../../Code/Module/Mitem.php:67
 msgid "Unable to create element."
 msgstr "Impossible de créer l'entrée."
 
-#: ../../Zotlabs/Module/Mitem.php:91
+#: ../../Code/Module/Mitem.php:91
 msgid "Unable to update menu element."
 msgstr "Impossible de mettre à jour l'entrée de menu."
 
-#: ../../Zotlabs/Module/Mitem.php:107
+#: ../../Code/Module/Mitem.php:107
 msgid "Unable to add menu element."
 msgstr "Impossible d'ajouter l'entrée de menu."
 
-#: ../../Zotlabs/Module/Mitem.php:171 ../../Zotlabs/Module/Mitem.php:250
+#: ../../Code/Module/Mitem.php:171 ../../Code/Module/Mitem.php:250
 msgid "Menu Item Permissions"
 msgstr "Droits d'accès de l'entrée de menu"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:195
+#: ../../Code/Module/Mitem.php:178 ../../Code/Module/Mitem.php:195
 msgid "Link Name"
 msgstr "Nom du lien"
 
-#: ../../Zotlabs/Module/Mitem.php:179 ../../Zotlabs/Module/Mitem.php:259
+#: ../../Code/Module/Mitem.php:179 ../../Code/Module/Mitem.php:259
 msgid "Link or Submenu Target"
 msgstr "Lien ou sous-menu cible"
 
-#: ../../Zotlabs/Module/Mitem.php:179
+#: ../../Code/Module/Mitem.php:179
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 "Entrez l'URL du lien ou sélectionnez un nom de menu pour créer un sous-menu"
 
-#: ../../Zotlabs/Module/Mitem.php:180 ../../Zotlabs/Module/Mitem.php:260
+#: ../../Code/Module/Mitem.php:180 ../../Code/Module/Mitem.php:260
 msgid "Use magic-auth if available"
 msgstr "Utiliser l'authentification distante, quand disponible"
 
-#: ../../Zotlabs/Module/Mitem.php:181 ../../Zotlabs/Module/Mitem.php:261
+#: ../../Code/Module/Mitem.php:181 ../../Code/Module/Mitem.php:261
 msgid "Open link in new window"
 msgstr "Ouvrir le lien dans une nouvelle fenêtre"
 
-#: ../../Zotlabs/Module/Mitem.php:182 ../../Zotlabs/Module/Mitem.php:262
+#: ../../Code/Module/Mitem.php:182 ../../Code/Module/Mitem.php:262
 msgid "Order in list"
 msgstr "Ordre dans la liste"
 
-#: ../../Zotlabs/Module/Mitem.php:182 ../../Zotlabs/Module/Mitem.php:262
+#: ../../Code/Module/Mitem.php:182 ../../Code/Module/Mitem.php:262
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Les nombres les plus élevés seront au bas de la liste"
 
-#: ../../Zotlabs/Module/Mitem.php:183
+#: ../../Code/Module/Mitem.php:183
 msgid "Submit and finish"
 msgstr "Valider et terminer"
 
-#: ../../Zotlabs/Module/Mitem.php:184
+#: ../../Code/Module/Mitem.php:184
 msgid "Submit and continue"
 msgstr "Valider et continuer"
 
-#: ../../Zotlabs/Module/Mitem.php:193
+#: ../../Code/Module/Mitem.php:193
 msgid "Menu:"
 msgstr "Menu :"
 
-#: ../../Zotlabs/Module/Mitem.php:196
+#: ../../Code/Module/Mitem.php:196
 msgid "Link Target"
 msgstr "Cible du lien"
 
-#: ../../Zotlabs/Module/Mitem.php:199
+#: ../../Code/Module/Mitem.php:199
 msgid "Edit menu"
 msgstr "Modifier le menu"
 
-#: ../../Zotlabs/Module/Mitem.php:202
+#: ../../Code/Module/Mitem.php:202
 msgid "Edit element"
 msgstr "Modifier l'entrée"
 
-#: ../../Zotlabs/Module/Mitem.php:203
+#: ../../Code/Module/Mitem.php:203
 msgid "Drop element"
 msgstr "Supprimer l'entrée"
 
-#: ../../Zotlabs/Module/Mitem.php:204
+#: ../../Code/Module/Mitem.php:204
 msgid "New element"
 msgstr "Nouvelle entrée"
 
-#: ../../Zotlabs/Module/Mitem.php:205
+#: ../../Code/Module/Mitem.php:205
 msgid "Edit this menu container"
 msgstr "Éditer ce bloc de menu"
 
-#: ../../Zotlabs/Module/Mitem.php:206
+#: ../../Code/Module/Mitem.php:206
 msgid "Add menu element"
 msgstr "Ajouter une entrée au menu"
 
-#: ../../Zotlabs/Module/Mitem.php:207
+#: ../../Code/Module/Mitem.php:207
 msgid "Delete this menu item"
 msgstr "Supprimer cette entrée du menu"
 
-#: ../../Zotlabs/Module/Mitem.php:208
+#: ../../Code/Module/Mitem.php:208
 msgid "Edit this menu item"
 msgstr "Modifier cette entrée du menu"
 
-#: ../../Zotlabs/Module/Mitem.php:226
+#: ../../Code/Module/Mitem.php:226
 msgid "Menu item not found."
 msgstr "Entrée de menu introuvable."
 
-#: ../../Zotlabs/Module/Mitem.php:239
+#: ../../Code/Module/Mitem.php:239
 msgid "Menu item deleted."
 msgstr "Entrée de menu supprimée."
 
-#: ../../Zotlabs/Module/Mitem.php:241
+#: ../../Code/Module/Mitem.php:241
 msgid "Menu item could not be deleted."
 msgstr "Impossible de supprimer l'entrée de menu."
 
-#: ../../Zotlabs/Module/Mitem.php:248
+#: ../../Code/Module/Mitem.php:248
 msgid "Edit Menu Element"
 msgstr "Modifier l'entrée de menu"
 
-#: ../../Zotlabs/Module/Mitem.php:258
+#: ../../Code/Module/Mitem.php:258
 msgid "Link text"
 msgstr "Texte du lien"
 
-#: ../../Zotlabs/Module/Connections.php:60
-#: ../../Zotlabs/Module/Connections.php:119
-#: ../../Zotlabs/Module/Connections.php:132
-#: ../../Zotlabs/Module/Connections.php:290
-#: ../../Zotlabs/Lib/Libprofile.php:351
+#: ../../Code/Module/Connections.php:60
+#: ../../Code/Module/Connections.php:119
+#: ../../Code/Module/Connections.php:132
+#: ../../Code/Module/Connections.php:290
+#: ../../Code/Lib/Libprofile.php:351
 msgid "Active"
 msgstr "Canal actif"
 
-#: ../../Zotlabs/Module/Connections.php:65
-#: ../../Zotlabs/Module/Connections.php:154
-#: ../../Zotlabs/Module/Connections.php:295
+#: ../../Code/Module/Connections.php:65
+#: ../../Code/Module/Connections.php:154
+#: ../../Code/Module/Connections.php:295
 msgid "Blocked"
 msgstr "Bloqué(e)"
 
-#: ../../Zotlabs/Module/Connections.php:70
-#: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:294
+#: ../../Code/Module/Connections.php:70
+#: ../../Code/Module/Connections.php:161
+#: ../../Code/Module/Connections.php:294
 msgid "Ignored"
 msgstr "Ignoré(e)"
 
-#: ../../Zotlabs/Module/Connections.php:75
-#: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:293
+#: ../../Code/Module/Connections.php:75
+#: ../../Code/Module/Connections.php:175
+#: ../../Code/Module/Connections.php:293
 msgid "Hidden"
 msgstr "Caché"
 
-#: ../../Zotlabs/Module/Connections.php:80
-#: ../../Zotlabs/Module/Connections.php:168
+#: ../../Code/Module/Connections.php:80
+#: ../../Code/Module/Connections.php:168
 msgid "Archived/Unreachable"
 msgstr "Archivé/Injoignable"
 
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Code/Module/Connections.php:140
 msgid "Active Connections"
 msgstr "Connexions actives"
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Code/Module/Connections.php:143
 msgid "Show active connections"
 msgstr "Voir les connexions actives"
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Code/Module/Connections.php:150
 msgid "Show pending (new) connections"
 msgstr "Voir les (nouvelles) connexions en attente"
 
-#: ../../Zotlabs/Module/Connections.php:157
+#: ../../Code/Module/Connections.php:157
 msgid "Only show blocked connections"
 msgstr "Ne montrer que les connexions bloquées"
 
-#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:164
 msgid "Only show ignored connections"
 msgstr "Ne montrer que les connexions ignorées"
 
-#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:171
 msgid "Only show archived/unreachable connections"
 msgstr "Ne montrer que les connexions archivées/injoignables"
 
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:178
 msgid "Only show hidden connections"
 msgstr "Ne montrer que les connexions cachées"
 
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Profperm.php:144
+#: ../../Code/Module/Connections.php:182
+#: ../../Code/Module/Profperm.php:144
 msgid "All Connections"
 msgstr "Toutes les connexions"
 
-#: ../../Zotlabs/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:185
 msgid "Show all connections"
 msgstr "Voir toutes les connexions"
 
-#: ../../Zotlabs/Module/Connections.php:234
+#: ../../Code/Module/Connections.php:234
 msgid "Order by name"
 msgstr "Trier par nom"
 
-#: ../../Zotlabs/Module/Connections.php:238
+#: ../../Code/Module/Connections.php:238
 msgid "Recent"
 msgstr "Récents"
 
-#: ../../Zotlabs/Module/Connections.php:241
+#: ../../Code/Module/Connections.php:241
 msgid "Order by recent"
 msgstr "Trier par récent"
 
-#: ../../Zotlabs/Module/Connections.php:248
+#: ../../Code/Module/Connections.php:248
 msgid "Order by date"
 msgstr "Trier par date"
 
-#: ../../Zotlabs/Module/Connections.php:291
+#: ../../Code/Module/Connections.php:291
 msgid "Pending approval"
 msgstr "En attente de validation"
 
-#: ../../Zotlabs/Module/Connections.php:292
+#: ../../Code/Module/Connections.php:292
 msgid "Archived"
 msgstr "Archivé"
 
-#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Code/Module/Connections.php:296
 msgid "Not connected at this location"
 msgstr "Connexion introuvable à cette adresse"
 
-#: ../../Zotlabs/Module/Connections.php:313
+#: ../../Code/Module/Connections.php:313
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:314
+#: ../../Code/Module/Connections.php:314
 msgid "Edit connection"
 msgstr "Modifier la connexion"
 
-#: ../../Zotlabs/Module/Connections.php:316
+#: ../../Code/Module/Connections.php:316
 msgid "Delete connection"
 msgstr "Supprimer la connexion"
 
-#: ../../Zotlabs/Module/Connections.php:325
+#: ../../Code/Module/Connections.php:325
 msgid "Channel address"
 msgstr "Adresse du canal"
 
-#: ../../Zotlabs/Module/Connections.php:327
+#: ../../Code/Module/Connections.php:327
 msgid "Network"
 msgstr "Réseau"
 
-#: ../../Zotlabs/Module/Connections.php:330
+#: ../../Code/Module/Connections.php:330
 msgid "Call"
 msgstr "Appeler"
 
-#: ../../Zotlabs/Module/Connections.php:332
+#: ../../Code/Module/Connections.php:332
 msgid "Status"
 msgstr "État"
 
-#: ../../Zotlabs/Module/Connections.php:334
+#: ../../Code/Module/Connections.php:334
 msgid "Connected"
 msgstr "Connexion"
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Code/Module/Connections.php:336
 msgid "Approve connection"
 msgstr "Valider la connexion"
 
-#: ../../Zotlabs/Module/Connections.php:338
+#: ../../Code/Module/Connections.php:338
 msgid "Ignore connection"
 msgstr "Ignorer la connexion"
 
-#: ../../Zotlabs/Module/Connections.php:339
-#: ../../Zotlabs/Module/Connedit.php:576
+#: ../../Code/Module/Connections.php:339
+#: ../../Code/Module/Connedit.php:576
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../../Zotlabs/Module/Connections.php:340
+#: ../../Code/Module/Connections.php:340
 msgid "Recent activity"
 msgstr "Activité récente"
 
-#: ../../Zotlabs/Module/Connections.php:369
+#: ../../Code/Module/Connections.php:369
 msgid "Filter by"
 msgstr "Filtrer par"
 
-#: ../../Zotlabs/Module/Connections.php:370
+#: ../../Code/Module/Connections.php:370
 msgid "Sort by"
 msgstr "Trier par"
 
-#: ../../Zotlabs/Module/Connections.php:374
+#: ../../Code/Module/Connections.php:374
 msgid "Search your connections"
 msgstr "Chercher parmi vos connexions"
 
-#: ../../Zotlabs/Module/Connections.php:375
+#: ../../Code/Module/Connections.php:375
 msgid "Connections search"
 msgstr "Chercher des connexions"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Changer l'ordre des applications épinglées dans la barre de navigation"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid "Change Order of App Tray Apps"
 msgstr "Changer l'ordre des applications du menu déroulant"
 
-#: ../../Zotlabs/Module/Apporder.php:46
+#: ../../Code/Module/Apporder.php:46
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the "
 "navbar"
@@ -6998,13 +6998,13 @@ msgstr ""
 "Utilisez les flèches pour déplacer l'application correspondante vers la "
 "gauche (haut) ou la droite (bas) dans la barre de navigation."
 
-#: ../../Zotlabs/Module/Apporder.php:47
+#: ../../Code/Module/Apporder.php:47
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
 "Utilisez les flèches pour déplacer l'application correspondante vers le haut"
 " ou vers le bas dans le panneau d'applications."
 
-#: ../../Zotlabs/Module/Removeaccount.php:46
+#: ../../Code/Module/Removeaccount.php:46
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
@@ -7012,23 +7012,23 @@ msgstr ""
 "Il est impossible de supprimer un compte dans les 48 heures après avoir "
 "changé le mot de passe du compte."
 
-#: ../../Zotlabs/Module/Removeaccount.php:67
+#: ../../Code/Module/Removeaccount.php:67
 msgid "Remove This Account"
 msgstr "Supprimer ce compte"
 
-#: ../../Zotlabs/Module/Removeaccount.php:68
+#: ../../Code/Module/Removeaccount.php:68
 msgid ""
 "This account and all its channels will be completely removed from this "
 "server. "
 msgstr ""
 "Ce compte et tous ses canaux seront définitivement supprimés de ce serveur."
 
-#: ../../Zotlabs/Module/Removeaccount.php:68
-#: ../../Zotlabs/Module/Removeme.php:68
+#: ../../Code/Module/Removeaccount.php:68
+#: ../../Code/Module/Removeme.php:68
 msgid "This action is permanent and can not be undone!"
 msgstr "Cette action est irréversible !"
 
-#: ../../Zotlabs/Module/Profile_photo.php:498
+#: ../../Code/Module/Profile_photo.php:498
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
@@ -7036,144 +7036,144 @@ msgstr ""
 "Votre photo de profil est visible par n'importe qui sur internet et peut "
 "être distribuée à d'autres sites web."
 
-#: ../../Zotlabs/Module/Profile_photo.php:502
+#: ../../Code/Module/Profile_photo.php:502
 msgid "Use Photo for Profile"
 msgstr "Utiliser la photo pour le profil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:502
+#: ../../Code/Module/Profile_photo.php:502
 msgid "Change Profile Photo"
 msgstr "Changer la photo du profil"
 
-#: ../../Zotlabs/Module/Email_resend.php:12
-#: ../../Zotlabs/Module/Email_validation.php:24
+#: ../../Code/Module/Email_resend.php:12
+#: ../../Code/Module/Email_validation.php:24
 msgid "Token verification failed."
 msgstr "La vérification du jeton a échoué."
 
-#: ../../Zotlabs/Module/Email_resend.php:30
+#: ../../Code/Module/Email_resend.php:30
 msgid "Email verification resent"
 msgstr "Vérification de courriel renvoyé"
 
-#: ../../Zotlabs/Module/Email_resend.php:33
+#: ../../Code/Module/Email_resend.php:33
 msgid "Unable to resend email verification message."
 msgstr "Impossible de renvoyer le courriel de vérification."
 
-#: ../../Zotlabs/Module/Ping.php:375
+#: ../../Code/Module/Ping.php:375
 msgid "added your channel"
 msgstr "a ajouté votre canal"
 
-#: ../../Zotlabs/Module/Ping.php:399
+#: ../../Code/Module/Ping.php:399
 msgid "requires approval"
 msgstr "nécessite une approbation"
 
-#: ../../Zotlabs/Module/Ping.php:408
+#: ../../Code/Module/Ping.php:408
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../Zotlabs/Module/Ping.php:426
+#: ../../Code/Module/Ping.php:426
 msgid "[today]"
 msgstr "[aujourd'hui]"
 
-#: ../../Zotlabs/Module/Ping.php:436
+#: ../../Code/Module/Ping.php:436
 msgid "posted an event"
 msgstr "a publié un événement"
 
-#: ../../Zotlabs/Module/Ping.php:469
+#: ../../Code/Module/Ping.php:469
 msgid "shared a file with you"
 msgstr "a partagé un fichier avec vous"
 
-#: ../../Zotlabs/Module/Ping.php:497
+#: ../../Code/Module/Ping.php:497
 msgid "reported content"
 msgstr "a signalé un contenu"
 
-#: ../../Zotlabs/Module/Ping.php:674
+#: ../../Code/Module/Ping.php:674
 msgid "Private group"
 msgstr "Groupe privé"
 
-#: ../../Zotlabs/Module/Ping.php:674
+#: ../../Code/Module/Ping.php:674
 msgid "Public group"
 msgstr "Groupe public"
 
-#: ../../Zotlabs/Module/Lists.php:121
+#: ../../Code/Module/Lists.php:121
 msgid "Access list created."
 msgstr "Liste d'accès créée"
 
-#: ../../Zotlabs/Module/Lists.php:124
+#: ../../Code/Module/Lists.php:124
 msgid "Could not create access list."
 msgstr "La liste d'accès n'a pas pu être créée."
 
-#: ../../Zotlabs/Module/Lists.php:137 ../../Zotlabs/Module/Lists.php:306
+#: ../../Code/Module/Lists.php:137 ../../Code/Module/Lists.php:306
 #: ../../include/items.php:4028
 msgid "Access list not found."
 msgstr "Liste d'accès introuvable."
 
-#: ../../Zotlabs/Module/Lists.php:153
+#: ../../Code/Module/Lists.php:153
 msgid "Access list updated."
 msgstr "Liste d'accès mise à jour."
 
-#: ../../Zotlabs/Module/Lists.php:194 ../../Zotlabs/Module/Lists.php:356
+#: ../../Code/Module/Lists.php:194 ../../Code/Module/Lists.php:356
 msgid "List members"
 msgstr "Membres de la liste"
 
-#: ../../Zotlabs/Module/Lists.php:200
+#: ../../Code/Module/Lists.php:200
 msgid "List not found"
 msgstr "List introuvable"
 
-#: ../../Zotlabs/Module/Lists.php:238 ../../Zotlabs/Module/Lists.php:249
+#: ../../Code/Module/Lists.php:238 ../../Code/Module/Lists.php:249
 msgid "Access Lists"
 msgstr "Listes d'accès"
 
-#: ../../Zotlabs/Module/Lists.php:239
+#: ../../Code/Module/Lists.php:239
 msgid "Create access list"
 msgstr "Créer une liste d'accès"
 
-#: ../../Zotlabs/Module/Lists.php:243
+#: ../../Code/Module/Lists.php:243
 msgid "Access list name"
 msgstr "Nom de la liste d'accès"
 
-#: ../../Zotlabs/Module/Lists.php:244 ../../Zotlabs/Module/Lists.php:344
+#: ../../Code/Module/Lists.php:244 ../../Code/Module/Lists.php:344
 msgid "Members are visible to other channels"
 msgstr "Les membres sont visibles par les autres canaux"
 
-#: ../../Zotlabs/Module/Lists.php:251
+#: ../../Code/Module/Lists.php:251
 msgid "Members"
 msgstr "Membres"
 
-#: ../../Zotlabs/Module/Lists.php:276
+#: ../../Code/Module/Lists.php:276
 msgid "Access list removed."
 msgstr "Liste d'accès supprimée."
 
-#: ../../Zotlabs/Module/Lists.php:278
+#: ../../Code/Module/Lists.php:278
 msgid "Unable to remove access list."
 msgstr "Impossible de supprimer la liste d'accès."
 
-#: ../../Zotlabs/Module/Lists.php:339
+#: ../../Code/Module/Lists.php:339
 #, php-format
 msgid "Access List: %s"
 msgstr "Liste d'accès : %s"
 
-#: ../../Zotlabs/Module/Lists.php:341
+#: ../../Code/Module/Lists.php:341
 msgid "Access list name: "
 msgstr "Nom de la liste d'accès :"
 
-#: ../../Zotlabs/Module/Lists.php:346
+#: ../../Code/Module/Lists.php:346
 msgid "Delete access list"
 msgstr "Supprimer la liste d'accès"
 
-#: ../../Zotlabs/Module/Lists.php:358
+#: ../../Code/Module/Lists.php:358
 msgid "Not in this list"
 msgstr "Pas dans la liste"
 
-#: ../../Zotlabs/Module/Lists.php:390
+#: ../../Code/Module/Lists.php:390
 msgid "Select a channel to toggle membership"
 msgstr ""
 "Cliquez sur un canal pour le faire modifier son appartenance ou non à la "
 "liste"
 
-#: ../../Zotlabs/Module/Affinity.php:26
+#: ../../Code/Module/Affinity.php:26
 msgid "Friend Zoom settings updated."
 msgstr "Paramètres du Friend Zoom mis à jour."
 
-#: ../../Zotlabs/Module/Affinity.php:37
+#: ../../Code/Module/Affinity.php:37
 msgid ""
 "This app (when installed) presents a slider control in your connection "
 "editor and also on your stream page. The slider represents your degree of "
@@ -7186,7 +7186,7 @@ msgstr ""
 " dézoomer et d'afficher vos échanges avec vos contacts les plus proches ou "
 "avec tout le monde sur votre flux."
 
-#: ../../Zotlabs/Module/Affinity.php:45
+#: ../../Code/Module/Affinity.php:45
 msgid ""
 "The number below represents the default maximum slider position for your "
 "stream page as a percentage."
@@ -7194,15 +7194,15 @@ msgstr ""
 "Le nombre ci-dessous indique le niveau de proximité par défaut choisi pour "
 "l'affichage sur votre flux."
 
-#: ../../Zotlabs/Module/Affinity.php:71
+#: ../../Code/Module/Affinity.php:71
 msgid "Default friend zoom in/out"
 msgstr "Régler le niveau de zoom"
 
-#: ../../Zotlabs/Module/Affinity.php:83
+#: ../../Code/Module/Affinity.php:83
 msgid "Friend Zoom Settings"
 msgstr "Paramètres du Friend Zoom"
 
-#: ../../Zotlabs/Module/Markup.php:14
+#: ../../Code/Module/Markup.php:14
 msgid ""
 "This app adds editor buttons for bold, italic, underline, quote, and "
 "possibly other common richtext constructs."
@@ -7210,96 +7210,96 @@ msgstr ""
 "Cette application ajoute à l'éditeur des boutons de mise en forme du texte"
 " (gras, italique, sougligné, citation, etc.)"
 
-#: ../../Zotlabs/Module/Editblock.php:117 ../../Zotlabs/Module/Blocks.php:101
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Code/Module/Editblock.php:117 ../../Code/Module/Blocks.php:101
+#: ../../Code/Module/Blocks.php:159
 msgid "Block Name"
 msgstr "Nom du Bloc"
 
-#: ../../Zotlabs/Module/Editblock.php:142
+#: ../../Code/Module/Editblock.php:142
 msgid "Edit Block"
 msgstr "Modifier le bloc"
 
-#: ../../Zotlabs/Module/Common.php:18
+#: ../../Code/Module/Common.php:18
 msgid "No channel."
 msgstr "Pas de canal."
 
-#: ../../Zotlabs/Module/Common.php:49
+#: ../../Code/Module/Common.php:49
 msgid "No connections in common."
 msgstr "Pas de connexions en commun."
 
-#: ../../Zotlabs/Module/Common.php:69
+#: ../../Code/Module/Common.php:69
 msgid "View Common Connections"
 msgstr "Voir les connexions en commun"
 
-#: ../../Zotlabs/Module/Finger.php:20
+#: ../../Code/Module/Finger.php:20
 msgid "Webfinger Diagnostic"
 msgstr "Diagnostic Webfinger"
 
-#: ../../Zotlabs/Module/Finger.php:21
+#: ../../Code/Module/Finger.php:21
 msgid "Lookup address or URL"
 msgstr "Adresse ou URL de recherche"
 
-#: ../../Zotlabs/Module/Display.php:85 ../../Zotlabs/Module/Rpost.php:143
-#: ../../Zotlabs/Module/Stream.php:215 ../../Zotlabs/Module/Hq.php:137
-#: ../../Zotlabs/Module/Pubstream.php:84 ../../Zotlabs/Module/Channel.php:265
+#: ../../Code/Module/Display.php:85 ../../Code/Module/Rpost.php:143
+#: ../../Code/Module/Stream.php:215 ../../Code/Module/Hq.php:137
+#: ../../Code/Module/Pubstream.php:84 ../../Code/Module/Channel.php:265
 msgid "Reset form"
 msgstr "Réinitialiser le formulaire"
 
-#: ../../Zotlabs/Module/Display.php:371
+#: ../../Code/Module/Display.php:371
 #, php-format
 msgid "\"%1$s\", shared by %2$s with %3$s"
 msgstr "\"%1$s\", partagé par %2$s avec %3$s"
 
-#: ../../Zotlabs/Module/Display.php:372
+#: ../../Code/Module/Display.php:372
 #, php-format
 msgid "%1$s shared this post with %2$s"
 msgstr "%1$s a partagé cette publication avec %2$s"
 
-#: ../../Zotlabs/Module/Display.php:376
+#: ../../Code/Module/Display.php:376
 msgid "Not much to read, click to see the post."
 msgstr "Rien à lire, cliquez pour voir la publication"
 
-#: ../../Zotlabs/Module/Display.php:381
+#: ../../Code/Module/Display.php:381
 #, php-format
 msgid "%1$s shared a reaction to \"%2$s\""
 msgstr "%1$s a partagé sa réaction à \"%2$s\""
 
-#: ../../Zotlabs/Module/Display.php:382
+#: ../../Code/Module/Display.php:382
 #, php-format
 msgid "%s shared a reaction to this post/conversation"
 msgstr "%s a partagé sa réaction à cette publication/conversation"
 
-#: ../../Zotlabs/Module/Display.php:390
+#: ../../Code/Module/Display.php:390
 #, php-format
 msgid "%1$s commented \"%2$s\""
 msgstr "%1$s a commenté \"%2$s\""
 
-#: ../../Zotlabs/Module/Display.php:391
+#: ../../Code/Module/Display.php:391
 #, php-format
 msgid "%s shared a comment of this post/conversation"
 msgstr "%s a partagé un commentaire sur cette publication/conversation"
 
-#: ../../Zotlabs/Module/Display.php:395
+#: ../../Code/Module/Display.php:395
 #, php-format
 msgid "%1$s wrote this: \"%2$s\""
 msgstr "%1$s a écrit ceci : \"%2$s\""
 
-#: ../../Zotlabs/Module/Display.php:414 ../../Zotlabs/Module/Channel.php:537
+#: ../../Code/Module/Display.php:414 ../../Code/Module/Channel.php:537
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr ""
 "Javascript doit être activé dans votre navigateur pour pouvoir visualiser ce"
 " contenu."
 
-#: ../../Zotlabs/Module/Display.php:432
+#: ../../Code/Module/Display.php:432
 msgid "Article"
 msgstr "Article"
 
-#: ../../Zotlabs/Module/Display.php:484
+#: ../../Code/Module/Display.php:484
 msgid "Item has been removed."
 msgstr "L'élément a été supprimé."
 
-#: ../../Zotlabs/Module/Page.php:177
+#: ../../Code/Module/Page.php:177
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
@@ -7315,354 +7315,354 @@ msgstr ""
 "cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../Zotlabs/Module/Tasks.php:102
+#: ../../Code/Module/Tasks.php:102
 msgid "This app provides a simple personal and task list."
 msgstr "Cette application fournit une liste de tâches simple et personnelle."
 
-#: ../../Zotlabs/Module/Manage.php:74 ../../Zotlabs/Module/Manage.php:171
-#: ../../Zotlabs/Module/Directory.php:374
+#: ../../Code/Module/Manage.php:74 ../../Code/Module/Manage.php:171
+#: ../../Code/Module/Directory.php:374
 msgid "Group"
 msgstr "Groupe"
 
-#: ../../Zotlabs/Module/Manage.php:151
+#: ../../Code/Module/Manage.php:151
 msgid "Create a new channel"
 msgstr "Créer un nouveau canal"
 
-#: ../../Zotlabs/Module/Manage.php:151 ../../Zotlabs/Module/Chat.php:254
-#: ../../Zotlabs/Module/Profiles.php:833
+#: ../../Code/Module/Manage.php:151 ../../Code/Module/Chat.php:254
+#: ../../Code/Module/Profiles.php:833
 msgid "Create New"
 msgstr "Nouveau"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Code/Module/Manage.php:181
 msgid "Current Channel"
 msgstr "Canal actif"
 
-#: ../../Zotlabs/Module/Manage.php:183
+#: ../../Code/Module/Manage.php:183
 msgid "Switch to one of your channels by selecting it."
 msgstr "Pour changer de canal, sélectionnez-en un"
 
-#: ../../Zotlabs/Module/Manage.php:184
+#: ../../Code/Module/Manage.php:184
 msgid "Default Login Channel"
 msgstr "Canal par défaut à la connexion"
 
-#: ../../Zotlabs/Module/Manage.php:185
+#: ../../Code/Module/Manage.php:185
 msgid "Make Default"
 msgstr "Définir comme par défaut"
 
-#: ../../Zotlabs/Module/Manage.php:186 ../../Zotlabs/Module/Manage.php:187
+#: ../../Code/Module/Manage.php:186 ../../Code/Module/Manage.php:187
 msgid "Add to menu"
 msgstr "Ajouter au menu"
 
-#: ../../Zotlabs/Module/Manage.php:190
+#: ../../Code/Module/Manage.php:190
 #, php-format
 msgid "%d new messages"
 msgstr "%d nouveaux messages"
 
-#: ../../Zotlabs/Module/Manage.php:191
+#: ../../Code/Module/Manage.php:191
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nouvelles demandes de relation"
 
-#: ../../Zotlabs/Module/Manage.php:193
+#: ../../Code/Module/Manage.php:193
 msgid "Delegated Channel"
 msgstr "Canaux délégués"
 
-#: ../../Zotlabs/Module/Zotfinger.php:23
+#: ../../Code/Module/Zotfinger.php:23
 msgid "Zotfinger Diagnostic"
 msgstr "Diagnostic Zotfinger"
 
-#: ../../Zotlabs/Module/Zotfinger.php:24
+#: ../../Code/Module/Zotfinger.php:24
 msgid "Lookup URL"
 msgstr "URL de recherche"
 
-#: ../../Zotlabs/Module/Directory.php:137
+#: ../../Code/Module/Directory.php:137
 msgid "No default suggestions were found."
 msgstr "Aucune suggestion par défaut n'a été trouvée."
 
-#: ../../Zotlabs/Module/Directory.php:300
+#: ../../Code/Module/Directory.php:300
 msgid "Gender: "
 msgstr "Genre :"
 
-#: ../../Zotlabs/Module/Directory.php:301
+#: ../../Code/Module/Directory.php:301
 msgid "Status: "
 msgstr "Statut conjugal :"
 
-#: ../../Zotlabs/Module/Directory.php:302
+#: ../../Code/Module/Directory.php:302
 msgid "Homepage: "
 msgstr "Site web :"
 
-#: ../../Zotlabs/Module/Directory.php:350 ../../Zotlabs/Lib/Libprofile.php:490
+#: ../../Code/Module/Directory.php:350 ../../Code/Lib/Libprofile.php:490
 msgid "Age:"
 msgstr "Age :"
 
-#: ../../Zotlabs/Module/Directory.php:355 ../../Zotlabs/Lib/Libprofile.php:285
+#: ../../Code/Module/Directory.php:355 ../../Code/Lib/Libprofile.php:285
 #: ../../include/event.php:62 ../../include/event.php:119
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: ../../Zotlabs/Module/Directory.php:363
+#: ../../Code/Module/Directory.php:363
 msgid "Description:"
 msgstr "Description :"
 
-#: ../../Zotlabs/Module/Directory.php:370 ../../Zotlabs/Lib/Libprofile.php:521
+#: ../../Code/Module/Directory.php:370 ../../Code/Lib/Libprofile.php:521
 msgid "Hometown:"
 msgstr "Ville natale :"
 
-#: ../../Zotlabs/Module/Directory.php:372 ../../Zotlabs/Lib/Libprofile.php:527
+#: ../../Code/Module/Directory.php:372 ../../Code/Lib/Libprofile.php:527
 msgid "About:"
 msgstr "À propos :"
 
-#: ../../Zotlabs/Module/Directory.php:378
+#: ../../Code/Module/Directory.php:378
 msgid "Keywords: "
 msgstr "Mots-clefs :"
 
-#: ../../Zotlabs/Module/Directory.php:381
+#: ../../Code/Module/Directory.php:381
 msgid "Don't suggest"
 msgstr "Ne pas suggérer"
 
-#: ../../Zotlabs/Module/Directory.php:383
+#: ../../Code/Module/Directory.php:383
 msgid "Suggestion ranking:"
 msgstr "Degré de suggestion :"
 
-#: ../../Zotlabs/Module/Directory.php:433 ../../Zotlabs/Lib/Apps.php:348
+#: ../../Code/Module/Directory.php:433 ../../Code/Lib/Apps.php:348
 msgid "Directory"
 msgstr "Annuaire"
 
-#: ../../Zotlabs/Module/Directory.php:433
+#: ../../Code/Module/Directory.php:433
 msgid "Local Directory"
 msgstr "Annuaire local"
 
-#: ../../Zotlabs/Module/Directory.php:439
+#: ../../Code/Module/Directory.php:439
 msgid "Finding:"
 msgstr "Recherche :"
 
-#: ../../Zotlabs/Module/Directory.php:444
+#: ../../Code/Module/Directory.php:444
 msgid "next page"
 msgstr "page suivante"
 
-#: ../../Zotlabs/Module/Directory.php:444
+#: ../../Code/Module/Directory.php:444
 msgid "previous page"
 msgstr "page précédente"
 
-#: ../../Zotlabs/Module/Directory.php:445
+#: ../../Code/Module/Directory.php:445
 msgid "Sort options"
 msgstr "Options de tri"
 
-#: ../../Zotlabs/Module/Directory.php:446
+#: ../../Code/Module/Directory.php:446
 msgid "Alphabetic"
 msgstr "Alphabétique"
 
-#: ../../Zotlabs/Module/Directory.php:447
+#: ../../Code/Module/Directory.php:447
 msgid "Reverse Alphabetic"
 msgstr "Alphabétique inversé"
 
-#: ../../Zotlabs/Module/Directory.php:448
+#: ../../Code/Module/Directory.php:448
 msgid "Newest to Oldest"
 msgstr "Du plus récent au moins récent"
 
-#: ../../Zotlabs/Module/Directory.php:449
+#: ../../Code/Module/Directory.php:449
 msgid "Oldest to Newest"
 msgstr "Du moins récent du plus récent"
 
-#: ../../Zotlabs/Module/Directory.php:473
+#: ../../Code/Module/Directory.php:473
 msgid "No entries (some entries may be hidden)."
 msgstr "Pas d'entrées (certaines peuvent être cachées)."
 
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:71
+#: ../../Code/Module/Import_items.php:48 ../../Code/Module/Import.php:71
 msgid "Nothing to import."
 msgstr "Rien à importer."
 
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:87
-#: ../../Zotlabs/Module/Import.php:103
+#: ../../Code/Module/Import_items.php:72 ../../Code/Module/Import.php:87
+#: ../../Code/Module/Import.php:103
 msgid "Unable to download data from old server"
 msgstr "Impossible de récupérer les données de l'ancien serveur"
 
-#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:110
+#: ../../Code/Module/Import_items.php:77 ../../Code/Module/Import.php:110
 msgid "Imported file is empty."
 msgstr "Le fichier importé est vide."
 
-#: ../../Zotlabs/Module/Import_items.php:93
+#: ../../Code/Module/Import_items.php:93
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 "Attention : les versions de bases de données diffèrent de %1$d mises à "
 "jour."
 
-#: ../../Zotlabs/Module/Import_items.php:104
+#: ../../Code/Module/Import_items.php:104
 msgid "Import completed"
 msgstr "L'import est terminé."
 
-#: ../../Zotlabs/Module/Import_items.php:121
+#: ../../Code/Module/Import_items.php:121
 msgid "Import Items"
 msgstr "Importer les éléments"
 
-#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Code/Module/Import_items.php:122
 msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 "Utilisez ce formulaire pour importer des publications et du contenu "
 "existants depuis un fichier d'export."
 
-#: ../../Zotlabs/Module/Import_items.php:123
-#: ../../Zotlabs/Module/Import.php:577
+#: ../../Code/Module/Import_items.php:123
+#: ../../Code/Module/Import.php:577
 msgid "File to Upload"
 msgstr "Fichier à envoyer"
 
-#: ../../Zotlabs/Module/Filer.php:50
+#: ../../Code/Module/Filer.php:50
 msgid "Enter a folder name"
 msgstr "Saisissez un nom de dossier"
 
-#: ../../Zotlabs/Module/Filer.php:50
+#: ../../Code/Module/Filer.php:50
 msgid "or select an existing folder (doubleclick)"
 msgstr "ou sélectionnez un dossier existant (double-clic)"
 
-#: ../../Zotlabs/Module/Filer.php:52 ../../Zotlabs/Lib/ThreadItem.php:168
+#: ../../Code/Module/Filer.php:52 ../../Code/Lib/ThreadItem.php:168
 msgid "Save to Folder"
 msgstr "Enregistrer dans le dossier"
 
-#: ../../Zotlabs/Module/Help.php:26
+#: ../../Code/Module/Help.php:26
 msgid "Documentation Search"
 msgstr "Chercher dans la documentation"
 
-#: ../../Zotlabs/Module/Help.php:86
+#: ../../Code/Module/Help.php:86
 msgid "$Projectname Documentation"
 msgstr "Documentation de $Projectname"
 
-#: ../../Zotlabs/Module/Help.php:87
+#: ../../Code/Module/Help.php:87
 msgid "Contents"
 msgstr "Contenus"
 
-#: ../../Zotlabs/Module/Rmagic.php:39
+#: ../../Code/Module/Rmagic.php:39
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
-#: ../../Zotlabs/Module/Rmagic.php:81 ../../include/channel.php:1946
+#: ../../Code/Module/Rmagic.php:81 ../../include/channel.php:1946
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Entrez l'adresse de votre canal (par ex. moncanal@monsite.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:84 ../../include/channel.php:1947
+#: ../../Code/Module/Rmagic.php:84 ../../include/channel.php:1947
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: ../../Zotlabs/Module/Chat.php:26 ../../Zotlabs/Module/Channel.php:49
+#: ../../Code/Module/Chat.php:26 ../../Code/Module/Channel.php:49
 msgid "You must be logged in to see this page."
 msgstr "Vous devez vous connecter pour voir cette page."
 
-#: ../../Zotlabs/Module/Chat.php:187
+#: ../../Code/Module/Chat.php:187
 msgid "Room not found"
 msgstr "Salon introuvable"
 
-#: ../../Zotlabs/Module/Chat.php:204
+#: ../../Code/Module/Chat.php:204
 msgid "Leave Room"
 msgstr "Quitter le salon"
 
-#: ../../Zotlabs/Module/Chat.php:205
+#: ../../Code/Module/Chat.php:205
 msgid "Delete Room"
 msgstr "Supprimer le salon"
 
-#: ../../Zotlabs/Module/Chat.php:206
+#: ../../Code/Module/Chat.php:206
 msgid "I am away right now"
 msgstr "Je suis absent en ce moment"
 
-#: ../../Zotlabs/Module/Chat.php:207
+#: ../../Code/Module/Chat.php:207
 msgid "I am online"
 msgstr "Je suis en ligne"
 
-#: ../../Zotlabs/Module/Chat.php:210 ../../include/conversation.php:1329
+#: ../../Code/Module/Chat.php:210 ../../include/conversation.php:1329
 msgid "Please enter a link URL:"
 msgstr "Merci d'entrer l'URL d'un lien :"
 
-#: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Lib/ThreadItem.php:920
+#: ../../Code/Module/Chat.php:211 ../../Code/Lib/ThreadItem.php:920
 #: ../../include/conversation.php:1472
 msgid "Encrypt text"
 msgstr "Chiffrer le texte"
 
-#: ../../Zotlabs/Module/Chat.php:230
+#: ../../Code/Module/Chat.php:230
 msgid "New Chatroom"
 msgstr "Nouveau salon de clavardage"
 
-#: ../../Zotlabs/Module/Chat.php:231
+#: ../../Code/Module/Chat.php:231
 msgid "Chatroom name"
 msgstr "Nom du salon de clavardage"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "Expiration of chats (minutes)"
 msgstr "Expiration des discussions (en minutes)"
 
-#: ../../Zotlabs/Module/Chat.php:248
+#: ../../Code/Module/Chat.php:248
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Salons de clavardage de %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:253
+#: ../../Code/Module/Chat.php:253
 msgid "No chatrooms available"
 msgstr "Aucun salon de clavardage disponible"
 
-#: ../../Zotlabs/Module/Chat.php:257
+#: ../../Code/Module/Chat.php:257
 msgid "Expiration"
 msgstr "Expiration"
 
-#: ../../Zotlabs/Module/Chat.php:258
+#: ../../Code/Module/Chat.php:258
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
+#: ../../Code/Module/Siteinfo.php:29
 msgid "About this site"
 msgstr "À propos de ce serveur"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../Code/Module/Siteinfo.php:31
 msgid "Site Name"
 msgstr "Nom du serveur"
 
-#: ../../Zotlabs/Module/Siteinfo.php:35
+#: ../../Code/Module/Siteinfo.php:35
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../../Zotlabs/Module/Siteinfo.php:37 ../../Zotlabs/Module/Register.php:247
+#: ../../Code/Module/Siteinfo.php:37 ../../Code/Module/Register.php:247
 msgid "Terms of Service"
 msgstr "Conditions de service"
 
-#: ../../Zotlabs/Module/Siteinfo.php:38
+#: ../../Code/Module/Siteinfo.php:38
 msgid "Software and Project information"
 msgstr "Informations sur le logiciel et le projet"
 
-#: ../../Zotlabs/Module/Siteinfo.php:39
+#: ../../Code/Module/Siteinfo.php:39
 msgid "This site is powered by $Projectname"
 msgstr "Ce serveur est propulsé par $Projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
+#: ../../Code/Module/Siteinfo.php:40
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr ""
 "Réseau fédéré et décentralisé, et services d'identification fournis par Zot"
 
-#: ../../Zotlabs/Module/Siteinfo.php:44
+#: ../../Code/Module/Siteinfo.php:44
 msgid "Federated transport protocols:"
 msgstr "Protocoles de transport fédéré :"
 
-#: ../../Zotlabs/Module/Siteinfo.php:46
+#: ../../Code/Module/Siteinfo.php:46
 #, php-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:47
+#: ../../Code/Module/Siteinfo.php:47
 msgid "Project homepage"
 msgstr "Page d'accueil du projet"
 
-#: ../../Zotlabs/Module/Siteinfo.php:48
+#: ../../Code/Module/Siteinfo.php:48
 msgid "Developer homepage"
 msgstr "Page d'accueil des développeurs"
 
-#: ../../Zotlabs/Module/Subthread.php:126
+#: ../../Code/Module/Subthread.php:126
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s suit %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Subthread.php:129
+#: ../../Code/Module/Subthread.php:129
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s ne suit plus %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Secrets.php:13
+#: ../../Code/Module/Secrets.php:13
 msgid ""
 "This app allows you to protect messages with a secret passphrase. This only "
 "works across selected platforms."
@@ -7670,7 +7670,7 @@ msgstr ""
 "Cette application vous permet de protéger vos messages avec une passphrase"
 " secrète. Ceci ne fonctionnera qu'entre des plateformes sélectionnées."
 
-#: ../../Zotlabs/Module/Secrets.php:21
+#: ../../Code/Module/Secrets.php:21
 msgid ""
 "This app is installed. A button to encrypt content may be found in the post "
 "editor."
@@ -7678,82 +7678,82 @@ msgstr ""
 "Cette application est installée. Un bouton de chiffrement est disponible dans"
 " l'éditeur de publication."
 
-#: ../../Zotlabs/Module/Filestorage.php:94
+#: ../../Code/Module/Filestorage.php:94
 msgid "Channel unavailable."
 msgstr "Canal indisponible."
 
-#: ../../Zotlabs/Module/Filestorage.php:139
+#: ../../Code/Module/Filestorage.php:139
 msgid "File not found."
 msgstr "Fichier introuvable."
 
-#: ../../Zotlabs/Module/Filestorage.php:221
+#: ../../Code/Module/Filestorage.php:221
 msgid "Edit file permissions"
 msgstr "Modifier les droits d'accès au fichier"
 
-#: ../../Zotlabs/Module/Filestorage.php:233
+#: ../../Code/Module/Filestorage.php:233
 msgid "Change filename to"
 msgstr "Modifier le nom du fichier pour"
 
-#: ../../Zotlabs/Module/Filestorage.php:233
+#: ../../Code/Module/Filestorage.php:233
 msgid "Leave blank to keep the existing filename"
 msgstr "Laissez vide pour garder le nom de fichier actuel"
 
-#: ../../Zotlabs/Module/Filestorage.php:234
+#: ../../Code/Module/Filestorage.php:234
 msgid "Move to directory"
 msgstr "Déplacer dans l'annuaire"
 
-#: ../../Zotlabs/Module/Filestorage.php:236
+#: ../../Code/Module/Filestorage.php:236
 msgid "Include all files and sub folders"
 msgstr "Inclure tous fichiers et sous-répertoires"
 
-#: ../../Zotlabs/Module/Filestorage.php:237
+#: ../../Code/Module/Filestorage.php:237
 msgid "Return to file list"
 msgstr "Retourner à la liste des fichiers"
 
-#: ../../Zotlabs/Module/Filestorage.php:239
+#: ../../Code/Module/Filestorage.php:239
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Copiez/collez ce code pour joindre le fichier à une publication"
 
-#: ../../Zotlabs/Module/Filestorage.php:240
+#: ../../Code/Module/Filestorage.php:240
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 "Copiez/collez cette URL pour pointer vers ce fichier depuis une page web"
 
-#: ../../Zotlabs/Module/Filestorage.php:242
+#: ../../Code/Module/Filestorage.php:242
 msgid "Share this file"
 msgstr "Partager ce fichier"
 
-#: ../../Zotlabs/Module/Filestorage.php:243
+#: ../../Code/Module/Filestorage.php:243
 msgid "Show URL to this file"
 msgstr "Montrer l'URL de ce fichier"
 
-#: ../../Zotlabs/Module/Hcard.php:40 ../../Zotlabs/Module/Profile.php:52
+#: ../../Code/Module/Hcard.php:40 ../../Code/Module/Profile.php:52
 msgid "Posts and comments"
 msgstr "Publications et commentaires"
 
-#: ../../Zotlabs/Module/Hcard.php:47 ../../Zotlabs/Module/Profile.php:59
-#: ../../Zotlabs/Module/Channel.php:73
+#: ../../Code/Module/Hcard.php:47 ../../Code/Module/Profile.php:59
+#: ../../Code/Module/Channel.php:73
 msgid "Only posts"
 msgstr "Seulement les publications"
 
-#: ../../Zotlabs/Module/Editlayout.php:132 ../../Zotlabs/Module/Layouts.php:135
-#: ../../Zotlabs/Module/Layouts.php:195
+#: ../../Code/Module/Editlayout.php:132 ../../Code/Module/Layouts.php:135
+#: ../../Code/Module/Layouts.php:195
 msgid "Layout Name"
 msgstr "Nom de la mise en page"
 
-#: ../../Zotlabs/Module/Editlayout.php:133 ../../Zotlabs/Module/Layouts.php:138
+#: ../../Code/Module/Editlayout.php:133 ../../Code/Module/Layouts.php:138
 msgid "Layout Description (Optional)"
 msgstr "Description de la mise en page (facultatif)"
 
-#: ../../Zotlabs/Module/Editlayout.php:141
+#: ../../Code/Module/Editlayout.php:141
 msgid "Edit Layout"
 msgstr "Modifier la mise en page"
 
-#: ../../Zotlabs/Module/Expire.php:23
+#: ../../Code/Module/Expire.php:23
 msgid "Expiration settings updated."
 msgstr "Délai d'expiration mis à jour."
 
-#: ../../Zotlabs/Module/Expire.php:33
+#: ../../Code/Module/Expire.php:33
 msgid ""
 "This app allows you to set an optional expiration date/time for posts, after "
 "which they will be deleted. This must be at least fifteen minutes into the "
@@ -7766,39 +7766,39 @@ msgstr ""
 "pouvez également décider de supprimer automatiquement toutes vos "
 "publications après un nombre de jours donné."
 
-#: ../../Zotlabs/Module/Expire.php:42
+#: ../../Code/Module/Expire.php:42
 msgid "Expire and delete all my posts after this many days"
 msgstr ""
 "Faire expirer et supprimer toutes mes publications après ce nombre de jours"
 
-#: ../../Zotlabs/Module/Expire.php:42
+#: ../../Code/Module/Expire.php:42
 msgid ""
 "Leave at 0 if you wish to manually control expiration of specific posts."
 msgstr ""
 "Laissez à 0 si vous souhaitez définir manuellement le délai d'expiration "
 "pour des publications spécifiques."
 
-#: ../../Zotlabs/Module/Expire.php:46
+#: ../../Code/Module/Expire.php:46
 msgid "Automatic Expiration Settings"
 msgstr "Réglages du délai d'expiration automatique"
 
-#: ../../Zotlabs/Module/Defperms.php:59 ../../Zotlabs/Module/Connedit.php:83
+#: ../../Code/Module/Defperms.php:59 ../../Code/Module/Connedit.php:83
 msgid "Could not access contact record."
 msgstr "Impossible d'accéder aux détails de la connexion."
 
-#: ../../Zotlabs/Module/Defperms.php:229 ../../Zotlabs/Module/Connedit.php:793
+#: ../../Code/Module/Defperms.php:229 ../../Code/Module/Connedit.php:793
 msgid "Apply these permissions automatically"
 msgstr "Appliquer ces droits d'accès automatiquement"
 
-#: ../../Zotlabs/Module/Defperms.php:230 ../../Zotlabs/Module/Connedit.php:794
+#: ../../Code/Module/Defperms.php:230 ../../Code/Module/Connedit.php:794
 msgid "Permission role"
 msgstr "Rôle d'accès"
 
-#: ../../Zotlabs/Module/Defperms.php:231 ../../Zotlabs/Module/Connedit.php:795
+#: ../../Code/Module/Defperms.php:231 ../../Code/Module/Connedit.php:795
 msgid "Add permission role"
 msgstr "Ajouter un rôle d'accès"
 
-#: ../../Zotlabs/Module/Defperms.php:235 ../../Zotlabs/Module/Connedit.php:808
+#: ../../Code/Module/Defperms.php:235 ../../Code/Module/Connedit.php:808
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
@@ -7806,11 +7806,11 @@ msgstr ""
 "Les droits d'accès indiqués sur cette page seront appliqués à toutes vos "
 "nouvelles connexions."
 
-#: ../../Zotlabs/Module/Defperms.php:236
+#: ../../Code/Module/Defperms.php:236
 msgid "Automatic approval settings"
 msgstr "Paramètres d'approbation automatique"
 
-#: ../../Zotlabs/Module/Defperms.php:244
+#: ../../Code/Module/Defperms.php:244
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
@@ -7819,53 +7819,53 @@ msgstr ""
 "verrouillées en fonction de votre type de canal et de vos paramètres de "
 "confidentialité."
 
-#: ../../Zotlabs/Module/Vote.php:39
+#: ../../Code/Module/Vote.php:39
 msgid "Poll not found."
 msgstr "Sondage introuvable."
 
-#: ../../Zotlabs/Module/Vote.php:70
+#: ../../Code/Module/Vote.php:70
 msgid "Invalid response."
 msgstr "Réponse invalide."
 
-#: ../../Zotlabs/Module/Vote.php:129
+#: ../../Code/Module/Vote.php:129
 msgid "Response submitted. Updates may not appear instantly."
 msgstr "Réponse envoyée. La mise à jour peut ne pas apparaître instantanément."
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Code/Module/Viewconnections.php:62
 msgid "No connections."
 msgstr "Aucune connexion."
 
-#: ../../Zotlabs/Module/Viewconnections.php:80
+#: ../../Code/Module/Viewconnections.php:80
 #, php-format
 msgid "Visit %1$s's profile [%2$s]"
 msgstr "Visitez le profil [%2$s] de %1$s"
 
-#: ../../Zotlabs/Module/Viewconnections.php:109
+#: ../../Code/Module/Viewconnections.php:109
 msgid "View Connections"
 msgstr "Voir les connexions"
 
-#: ../../Zotlabs/Module/Import.php:150
+#: ../../Code/Module/Import.php:150
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Votre forfait n'autorise que %d canaux."
 
-#: ../../Zotlabs/Module/Import.php:180
+#: ../../Code/Module/Import.php:180
 msgid "No channel. Import failed."
 msgstr "Pas de canal. Echec de l'import."
 
-#: ../../Zotlabs/Module/Import.php:540
+#: ../../Code/Module/Import.php:540
 msgid "Import completed."
 msgstr "L'import est terminé."
 
-#: ../../Zotlabs/Module/Import.php:570
+#: ../../Code/Module/Import.php:570
 msgid "You must be logged in to use this feature."
 msgstr "Vous devez vous connecter pour utiliser cette fonctionnalité."
 
-#: ../../Zotlabs/Module/Import.php:575
+#: ../../Code/Module/Import.php:575
 msgid "Import Channel"
 msgstr "Importer le canal"
 
-#: ../../Zotlabs/Module/Import.php:576
+#: ../../Code/Module/Import.php:576
 msgid ""
 "Use this form to import an existing channel from a different server. You may "
 "retrieve the channel identity from the old server via the network or provide "
@@ -7875,29 +7875,29 @@ msgstr ""
 "serveur. Vous pouvez récupérer l'identité du canal depuis l'ancien serveur "
 "ou fournir un fichier d'export."
 
-#: ../../Zotlabs/Module/Import.php:578
+#: ../../Code/Module/Import.php:578
 msgid "Or provide the old server details"
 msgstr "Ou fournissez les détails de l'ancien serveur"
 
-#: ../../Zotlabs/Module/Import.php:579
+#: ../../Code/Module/Import.php:579
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Votre ancienne identité (zyx@exemple.com)"
 
-#: ../../Zotlabs/Module/Import.php:580
+#: ../../Code/Module/Import.php:580
 msgid "Your old login email address"
 msgstr "Votre ancienne adresse de courriel utilisée pour la connexion"
 
-#: ../../Zotlabs/Module/Import.php:581
+#: ../../Code/Module/Import.php:581
 msgid "Your old login password"
 msgstr "Votre ancien mot de passe"
 
-#: ../../Zotlabs/Module/Import.php:582
+#: ../../Code/Module/Import.php:582
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr ""
 "Importer plusieurs mois de publications si possible (limité par la mémoire "
 "disponible"
 
-#: ../../Zotlabs/Module/Import.php:584
+#: ../../Code/Module/Import.php:584
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be "
@@ -7910,19 +7910,19 @@ msgstr ""
 "seule peut être enregistrée comme stockage primaire de vos fichiers, photos "
 "et média."
 
-#: ../../Zotlabs/Module/Import.php:586
+#: ../../Code/Module/Import.php:586
 msgid "Make this hub my primary location"
 msgstr "Faire de ce serveur mon emplacement primaire"
 
-#: ../../Zotlabs/Module/Import.php:587
+#: ../../Code/Module/Import.php:587
 msgid "Move this channel (disable all previous locations)"
 msgstr "Déplacer ce canal (désactiver tous les emplacements précédents)"
 
-#: ../../Zotlabs/Module/Import.php:588
+#: ../../Code/Module/Import.php:588
 msgid "Use this channel nickname instead of the one provided"
 msgstr "Utiliser le nom d'utilisateur de ce canal au lieu de celui fourni"
 
-#: ../../Zotlabs/Module/Import.php:588
+#: ../../Code/Module/Import.php:588
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this site."
@@ -7931,7 +7931,7 @@ msgstr ""
 "existant. Un nom d'utilisateur similaire aléatoire vous sera attribué si le "
 "nom est déjà pris sur ce serveur."
 
-#: ../../Zotlabs/Module/Import.php:590
+#: ../../Code/Module/Import.php:590
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -7940,726 +7940,726 @@ msgstr ""
 "formulaire qu'une seule fois et de laisser cette page ouverte jusqu'à la "
 "fin."
 
-#: ../../Zotlabs/Module/Tagger.php:50
+#: ../../Code/Module/Tagger.php:50
 msgid "Post not found."
 msgstr "Publication introuvable."
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Markdown.php:205
+#: ../../Code/Module/Tagger.php:79 ../../Code/Lib/Markdown.php:205
 #: ../../include/bbcode.php:566 ../../include/conversation.php:151
 msgid "post"
 msgstr "publication"
 
-#: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:153
+#: ../../Code/Module/Tagger.php:81 ../../include/conversation.php:153
 #: ../../include/text.php:2116
 msgid "comment"
 msgstr "commentaire"
 
-#: ../../Zotlabs/Module/Tagger.php:121
+#: ../../Code/Module/Tagger.php:121
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s a étiqueté le %3$s de %2$s avec %4$s"
 
-#: ../../Zotlabs/Module/Apps.php:50
+#: ../../Code/Module/Apps.php:50
 msgid "Installed Apps"
 msgstr "Applications installées"
 
-#: ../../Zotlabs/Module/Apps.php:53
+#: ../../Code/Module/Apps.php:53
 msgid "Manage apps"
 msgstr "Gérer les applications"
 
-#: ../../Zotlabs/Module/Apps.php:54
+#: ../../Code/Module/Apps.php:54
 msgid "Create Custom App"
 msgstr "Créer une application personnalisée"
 
-#: ../../Zotlabs/Module/Acl.php:280
+#: ../../Code/Module/Acl.php:280
 msgid "network"
 msgstr "réseau"
 
-#: ../../Zotlabs/Module/Webpages.php:50
+#: ../../Code/Module/Webpages.php:50
 msgid "Provide managed web pages on your channel"
 msgstr "Fournir des pages web, sous votre contrôle, sur votre canal"
 
-#: ../../Zotlabs/Module/Webpages.php:70
+#: ../../Code/Module/Webpages.php:70
 msgid "Import Webpage Elements"
 msgstr "Importer éléments de page web"
 
-#: ../../Zotlabs/Module/Webpages.php:71
+#: ../../Code/Module/Webpages.php:71
 msgid "Import selected"
 msgstr "Importation sélectionnée"
 
-#: ../../Zotlabs/Module/Webpages.php:94
+#: ../../Code/Module/Webpages.php:94
 msgid "Export Webpage Elements"
 msgstr "Exporter éléments de pages web"
 
-#: ../../Zotlabs/Module/Webpages.php:95
+#: ../../Code/Module/Webpages.php:95
 msgid "Export selected"
 msgstr "Export sélectionné"
 
-#: ../../Zotlabs/Module/Webpages.php:253 ../../Zotlabs/Lib/Apps.php:339
+#: ../../Code/Module/Webpages.php:253 ../../Code/Lib/Apps.php:339
 #: ../../include/nav.php:488 ../../include/conversation.php:2027
 msgid "Webpages"
 msgstr "Pages web"
 
-#: ../../Zotlabs/Module/Webpages.php:264
+#: ../../Code/Module/Webpages.php:264
 msgid "Actions"
 msgstr "Actions"
 
-#: ../../Zotlabs/Module/Webpages.php:265
+#: ../../Code/Module/Webpages.php:265
 msgid "Page Link"
 msgstr "Lien vers la page"
 
-#: ../../Zotlabs/Module/Webpages.php:266
+#: ../../Code/Module/Webpages.php:266
 msgid "Page Title"
 msgstr "Titre de la page"
 
-#: ../../Zotlabs/Module/Webpages.php:296
+#: ../../Code/Module/Webpages.php:296
 msgid "Invalid file type."
 msgstr "Type de fichier invalide"
 
-#: ../../Zotlabs/Module/Webpages.php:308
+#: ../../Code/Module/Webpages.php:308
 msgid "Error opening zip file"
 msgstr "Erreur lors de l'ouverture du fichier zip"
 
-#: ../../Zotlabs/Module/Webpages.php:319
+#: ../../Code/Module/Webpages.php:319
 msgid "Invalid folder path."
 msgstr "Chemin du dossier invalide."
 
-#: ../../Zotlabs/Module/Webpages.php:346
+#: ../../Code/Module/Webpages.php:346
 msgid "No webpage elements detected."
 msgstr "Aucun élément de page Web détecté."
 
-#: ../../Zotlabs/Module/Webpages.php:421
+#: ../../Code/Module/Webpages.php:421
 msgid "Import complete."
 msgstr "Importation terminée."
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Merci de vous connecter."
 
-#: ../../Zotlabs/Module/Follow.php:143
+#: ../../Code/Module/Follow.php:143
 msgid "Connection added."
 msgstr "Connexion ajoutée."
 
-#: ../../Zotlabs/Module/Ap_probe.php:18
+#: ../../Code/Module/Ap_probe.php:18
 msgid "ActivityPub Probe Diagnostic"
 msgstr "Diagnostic de l'analyse d'ActivityPub"
 
-#: ../../Zotlabs/Module/Ap_probe.php:19
+#: ../../Code/Module/Ap_probe.php:19
 msgid "Object URL"
 msgstr "URL de l'objet"
 
-#: ../../Zotlabs/Module/Ap_probe.php:20
+#: ../../Code/Module/Ap_probe.php:20
 msgid "Authenticated fetch"
 msgstr "Récupération authentifiée"
 
-#: ../../Zotlabs/Module/Cards.php:48
+#: ../../Code/Module/Cards.php:48
 msgid "Create personal planning cards"
 msgstr "Créer des cartes de planification personnelle"
 
-#: ../../Zotlabs/Module/Cards.php:109
+#: ../../Code/Module/Cards.php:109
 msgid "Add Card"
 msgstr "Ajouter une carte"
 
-#: ../../Zotlabs/Module/Cards.php:204 ../../Zotlabs/Lib/Apps.php:315
+#: ../../Code/Module/Cards.php:204 ../../Code/Lib/Apps.php:315
 #: ../../include/nav.php:465 ../../include/conversation.php:2005
 msgid "Cards"
 msgstr "Cartes"
 
-#: ../../Zotlabs/Module/Profiles.php:28 ../../Zotlabs/Module/Profiles.php:183
-#: ../../Zotlabs/Module/Profiles.php:237 ../../Zotlabs/Module/Profiles.php:657
+#: ../../Code/Module/Profiles.php:28 ../../Code/Module/Profiles.php:183
+#: ../../Code/Module/Profiles.php:237 ../../Code/Module/Profiles.php:657
 msgid "Profile not found."
 msgstr "Profil introuvable."
 
-#: ../../Zotlabs/Module/Profiles.php:48
+#: ../../Code/Module/Profiles.php:48
 msgid "Profile deleted."
 msgstr "Profil supprimé."
 
-#: ../../Zotlabs/Module/Profiles.php:72 ../../Zotlabs/Module/Profiles.php:109
+#: ../../Code/Module/Profiles.php:72 ../../Code/Module/Profiles.php:109
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../Zotlabs/Module/Profiles.php:94 ../../Zotlabs/Module/Profiles.php:131
+#: ../../Code/Module/Profiles.php:94 ../../Code/Module/Profiles.php:131
 msgid "New profile created."
 msgstr "Nouveau profil créé."
 
-#: ../../Zotlabs/Module/Profiles.php:115
+#: ../../Code/Module/Profiles.php:115
 msgid "Profile unavailable to clone."
 msgstr "Profil impossible à cloner."
 
-#: ../../Zotlabs/Module/Profiles.php:150
+#: ../../Code/Module/Profiles.php:150
 msgid "Profile unavailable to export."
 msgstr "Impossible d'exporter le profil."
 
-#: ../../Zotlabs/Module/Profiles.php:248
+#: ../../Code/Module/Profiles.php:248
 msgid "Profile Name is required."
 msgstr "Le nom du profil est obligatoire."
 
-#: ../../Zotlabs/Module/Profiles.php:457
+#: ../../Code/Module/Profiles.php:457
 msgid "Marital Status"
 msgstr "Statut conjugal"
 
-#: ../../Zotlabs/Module/Profiles.php:461
+#: ../../Code/Module/Profiles.php:461
 msgid "Romantic Partner"
 msgstr "Partenaire amoureux"
 
-#: ../../Zotlabs/Module/Profiles.php:465 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Code/Module/Profiles.php:465 ../../Code/Module/Profiles.php:774
 msgid "Likes"
 msgstr "Aime"
 
-#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:775
+#: ../../Code/Module/Profiles.php:469 ../../Code/Module/Profiles.php:775
 msgid "Dislikes"
 msgstr "N'aime pas"
 
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:782
+#: ../../Code/Module/Profiles.php:473 ../../Code/Module/Profiles.php:782
 msgid "Work/Employment"
 msgstr "Travail/Occupation"
 
-#: ../../Zotlabs/Module/Profiles.php:476
+#: ../../Code/Module/Profiles.php:476
 msgid "Religion"
 msgstr "Religion"
 
-#: ../../Zotlabs/Module/Profiles.php:480
+#: ../../Code/Module/Profiles.php:480
 msgid "Political Views"
 msgstr "Opinions politiques"
 
-#: ../../Zotlabs/Module/Profiles.php:484
+#: ../../Code/Module/Profiles.php:484
 msgid "Gender"
 msgstr "Genre"
 
-#: ../../Zotlabs/Module/Profiles.php:488
+#: ../../Code/Module/Profiles.php:488
 msgid "Sexual Preference"
 msgstr "Orientation sexuelle"
 
-#: ../../Zotlabs/Module/Profiles.php:492
+#: ../../Code/Module/Profiles.php:492
 msgid "Homepage"
 msgstr "Site Internet"
 
-#: ../../Zotlabs/Module/Profiles.php:496
+#: ../../Code/Module/Profiles.php:496
 msgid "Interests"
 msgstr "Centres d'intérêt"
 
-#: ../../Zotlabs/Module/Profiles.php:594
+#: ../../Code/Module/Profiles.php:594
 msgid "Profile updated."
 msgstr "Profil mis à jour."
 
-#: ../../Zotlabs/Module/Profiles.php:676
+#: ../../Code/Module/Profiles.php:676
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Cacher la liste de vos connexions pour les visiteurs de votre profil"
 
-#: ../../Zotlabs/Module/Profiles.php:720
+#: ../../Code/Module/Profiles.php:720
 msgid "Edit Profile Details"
 msgstr "Modifier les détails du profil"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Code/Module/Profiles.php:722
 msgid "View this profile"
 msgstr "Voir ce profil"
 
-#: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Profiles.php:826
-#: ../../Zotlabs/Lib/Libprofile.php:212
+#: ../../Code/Module/Profiles.php:723 ../../Code/Module/Profiles.php:826
+#: ../../Code/Lib/Libprofile.php:212
 msgid "Edit visibility"
 msgstr "Changer la visibilité"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Code/Module/Profiles.php:724
 msgid "Profile Tools"
 msgstr "Outils pour votre profil"
 
-#: ../../Zotlabs/Module/Profiles.php:725
+#: ../../Code/Module/Profiles.php:725
 msgid "Change cover photo"
 msgstr "Modifier votre bannière"
 
-#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Lib/Libprofile.php:182
+#: ../../Code/Module/Profiles.php:726 ../../Code/Lib/Libprofile.php:182
 msgid "Change profile photo"
 msgstr "Changer la photo du profil"
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Create a new profile using these settings"
 msgstr "Créer un nouveau profil avec ces paramètres"
 
-#: ../../Zotlabs/Module/Profiles.php:728
+#: ../../Code/Module/Profiles.php:728
 msgid "Clone this profile"
 msgstr "Cloner ce profil"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Code/Module/Profiles.php:729
 msgid "Delete this profile"
 msgstr "Supprimer ce profil"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Add profile things"
 msgstr "Ajouter des éléments de profil"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Profiles.php:731
 msgid "Personal"
 msgstr "Me concernant"
 
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Code/Module/Profiles.php:733
 msgid "Relationship"
 msgstr "Relation"
 
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../Code/Module/Profiles.php:736
 msgid "Import profile from file"
 msgstr "Importer le profil à partir d'un fichier"
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Code/Module/Profiles.php:737
 msgid "Export profile to file"
 msgstr "Exporter le profil vers un fichier"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Your gender"
 msgstr "Votre genre"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Marital status"
 msgstr "Statut conjugal"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Sexual preference"
 msgstr "Orientation sexuelle"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Pronouns"
 msgstr "Pronoms"
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Code/Module/Profiles.php:744
 msgid "Profile name"
 msgstr "Nom du profil"
 
-#: ../../Zotlabs/Module/Profiles.php:748
+#: ../../Code/Module/Profiles.php:748
 msgid "Your full name"
 msgstr "Votre nom complet"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Profiles.php:749
 msgid "Title/Description"
 msgstr "Titre/description"
 
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Code/Module/Profiles.php:752
 msgid "Street address"
 msgstr "Adresse (Voie)"
 
-#: ../../Zotlabs/Module/Profiles.php:753
+#: ../../Code/Module/Profiles.php:753
 msgid "Locality/City"
 msgstr "Localité/Ville"
 
-#: ../../Zotlabs/Module/Profiles.php:754
+#: ../../Code/Module/Profiles.php:754
 msgid "Region/State"
 msgstr "Région/État"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Code/Module/Profiles.php:755
 msgid "Postal/Zip code"
 msgstr "Code postal"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Who (if applicable)"
 msgstr "Qui (si applicable)"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Exemples : marie123, Marie Deschamps, marie@exemple.com"
 
-#: ../../Zotlabs/Module/Profiles.php:763
+#: ../../Code/Module/Profiles.php:763
 msgid "Since (date)"
 msgstr "Depuis (date)"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Code/Module/Profiles.php:768
 msgid "Tell us about yourself"
 msgstr "Parlez nous de vous..."
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Code/Module/Profiles.php:769
 msgid "Homepage URL"
 msgstr "URL de mon site Internet :"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Code/Module/Profiles.php:770
 msgid "Hometown"
 msgstr "Ville de naissance"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Political views"
 msgstr "Opinions politiques"
 
-#: ../../Zotlabs/Module/Profiles.php:772
+#: ../../Code/Module/Profiles.php:772
 msgid "Religious views"
 msgstr "Convictions religieuses"
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Code/Module/Profiles.php:773
 msgid "Keywords used in directory listings"
 msgstr "Mots clés pour l'annuaire"
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Code/Module/Profiles.php:773
 msgid "Example: fishing photography software"
 msgstr "Exemple : escrime photographie modélisme"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Code/Module/Profiles.php:776
 msgid "Musical interests"
 msgstr "Goûts musicaux"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Code/Module/Profiles.php:777
 msgid "Books, literature"
 msgstr "Livres, littérature"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Profiles.php:778
 msgid "Television"
 msgstr "Télévision"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Code/Module/Profiles.php:779
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Cinéma/Danse/Culture/Divertissement"
 
-#: ../../Zotlabs/Module/Profiles.php:780
+#: ../../Code/Module/Profiles.php:780
 msgid "Hobbies/Interests"
 msgstr "Loisirs/Centres d'intêret"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Code/Module/Profiles.php:781
 msgid "Love/Romance"
 msgstr "Amour/Relation amoureuse"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Code/Module/Profiles.php:783
 msgid "School/Education"
 msgstr "Scolarité/Études"
 
-#: ../../Zotlabs/Module/Profiles.php:784
+#: ../../Code/Module/Profiles.php:784
 msgid "Contact information and social networks"
 msgstr "Coordonnées et autres réseaux sociaux"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Code/Module/Profiles.php:785
 msgid "My other channels"
 msgstr "Mes autres canaux"
 
-#: ../../Zotlabs/Module/Profiles.php:787
+#: ../../Code/Module/Profiles.php:787
 msgid "Communications"
 msgstr "Communications"
 
-#: ../../Zotlabs/Module/Profiles.php:822 ../../Zotlabs/Lib/Libprofile.php:208
+#: ../../Code/Module/Profiles.php:822 ../../Code/Lib/Libprofile.php:208
 msgid "Profile Image"
 msgstr "Image du profil"
 
-#: ../../Zotlabs/Module/Profiles.php:832 ../../Zotlabs/Lib/Libprofile.php:189
+#: ../../Code/Module/Profiles.php:832 ../../Code/Lib/Libprofile.php:189
 #: ../../include/nav.php:108
 msgid "Edit Profiles"
 msgstr "Modifier mes profils"
 
-#: ../../Zotlabs/Module/Profiles.php:884
+#: ../../Code/Module/Profiles.php:884
 msgid " and "
 msgstr "et"
 
-#: ../../Zotlabs/Module/Profiles.php:886
+#: ../../Code/Module/Profiles.php:886
 msgid ", "
 msgstr ","
 
-#: ../../Zotlabs/Module/Profiles.php:892
+#: ../../Code/Module/Profiles.php:892
 msgid "public profile"
 msgstr "profil public"
 
-#: ../../Zotlabs/Module/Profiles.php:901
+#: ../../Code/Module/Profiles.php:901
 #, php-format
 msgid "%1$s changed %2$s to “%3$s”"
 msgstr "%1$s a changé %2$s en “%3$s”"
 
-#: ../../Zotlabs/Module/Profiles.php:902
+#: ../../Code/Module/Profiles.php:902
 #, php-format
 msgid "Visit %1$s's %2$s"
 msgstr "Visiter %2$s de %1$s"
 
-#: ../../Zotlabs/Module/Profiles.php:905
+#: ../../Code/Module/Profiles.php:905
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s a mis à jour %2$s, modifiant %3$s."
 
-#: ../../Zotlabs/Module/Profiles.php:936 ../../Zotlabs/Module/Profiles.php:953
-#: ../../Zotlabs/Lib/Libprofile.php:384
+#: ../../Code/Module/Profiles.php:936 ../../Code/Module/Profiles.php:953
+#: ../../Code/Lib/Libprofile.php:384
 msgid "Male"
 msgstr "Homme"
 
-#: ../../Zotlabs/Module/Profiles.php:936 ../../Zotlabs/Module/Profiles.php:953
-#: ../../Zotlabs/Lib/Libprofile.php:382
+#: ../../Code/Module/Profiles.php:936 ../../Code/Module/Profiles.php:953
+#: ../../Code/Lib/Libprofile.php:382
 msgid "Female"
 msgstr "Femme"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Currently Male"
 msgstr "Actuellement homme"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Currently Female"
 msgstr "Actuellement femme"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Mostly Male"
 msgstr "Surtout homme"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Mostly Female"
 msgstr "Surtout femme"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Transgender"
 msgstr "Transgenre"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Intersex"
 msgstr "Intersexué"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Transsexual"
 msgstr "Transsexuel"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Hermaphrodite"
 msgstr "Hermaphrodite"
 
-#: ../../Zotlabs/Module/Profiles.php:936 ../../Zotlabs/Lib/Libprofile.php:390
+#: ../../Code/Module/Profiles.php:936 ../../Code/Lib/Libprofile.php:390
 msgid "Neuter"
 msgstr "Neutre"
 
-#: ../../Zotlabs/Module/Profiles.php:936 ../../Zotlabs/Lib/Libprofile.php:392
+#: ../../Code/Module/Profiles.php:936 ../../Code/Lib/Libprofile.php:392
 msgid "Non-specific"
 msgstr "Non spécifique"
 
-#: ../../Zotlabs/Module/Profiles.php:936
+#: ../../Code/Module/Profiles.php:936
 msgid "Undecided"
 msgstr "Indécis"
 
-#: ../../Zotlabs/Module/Profiles.php:970
+#: ../../Code/Module/Profiles.php:970
 msgid "He/Him"
 msgstr "Il/Lui"
 
-#: ../../Zotlabs/Module/Profiles.php:970
+#: ../../Code/Module/Profiles.php:970
 msgid "She/Her"
 msgstr "Elle"
 
-#: ../../Zotlabs/Module/Profiles.php:970
+#: ../../Code/Module/Profiles.php:970
 msgid "They/Them"
 msgstr "Ille"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
-#: ../../Zotlabs/Module/Profiles.php:1021
+#: ../../Code/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1021
 msgid "Males"
 msgstr "Hommes"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
-#: ../../Zotlabs/Module/Profiles.php:1021
+#: ../../Code/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1021
 msgid "Females"
 msgstr "Femmes"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Gay"
 msgstr "Gay"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Lesbian"
 msgstr "Lesbienne"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "No Preference"
 msgstr "Sans préférence"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Bisexual"
 msgstr "Bisexuel"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Autosexual"
 msgstr "Autosexuel"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Abstinent"
 msgstr "Abstinent"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Virgin"
 msgstr "Vierge"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Deviant"
 msgstr "Déviant"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Fetish"
 msgstr "Fétichiste"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Oodles"
 msgstr "Une floppée"
 
-#: ../../Zotlabs/Module/Profiles.php:1002
+#: ../../Code/Module/Profiles.php:1002
 msgid "Nonsexual"
 msgstr "Non-sexuel"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "Single"
 msgstr "Célibataire"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Lonely"
 msgstr "Solitaire"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Available"
 msgstr "Disponible"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Unavailable"
 msgstr "Indisponible"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Has crush"
 msgstr "A un béguin"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Infatuated"
 msgstr "Amoureux transi"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "Dating"
 msgstr "Sort avec quelqu'un"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Unfaithful"
 msgstr "Infidèle"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Sex Addict"
 msgstr "Accro au sexe"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Friends/Benefits"
 msgstr "Amis avec bénéfices"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Casual"
 msgstr "Sans engagement"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Engaged"
 msgstr "Fiancé(e)"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "Married"
 msgstr "Marié(e)"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Imaginarily married"
 msgstr "Marié(e) dans ses rêves"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Partners"
 msgstr "Partenaires"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "Cohabiting"
 msgstr "En cohabitation"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Common law"
 msgstr "Conjoints de fait"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Happy"
 msgstr "Heureux"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Not looking"
 msgstr "Pas en recherche"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Swinger"
 msgstr "Échangiste"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Betrayed"
 msgstr "Trahi(e)"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "Separated"
 msgstr "Séparé(e)"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Unstable"
 msgstr "Instable"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "Divorced"
 msgstr "Divorcé(e)"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Imaginarily divorced"
 msgstr "Divorcé(e) dans ses rêves"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "Widowed"
 msgstr "Veuf/veuve"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Uncertain"
 msgstr "Incertain"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
-#: ../../Zotlabs/Module/Profiles.php:1057
+#: ../../Code/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1057
 msgid "It's complicated"
 msgstr "C'est compliqué"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Don't care"
 msgstr "S'en fiche"
 
-#: ../../Zotlabs/Module/Profiles.php:1040
+#: ../../Code/Module/Profiles.php:1040
 msgid "Ask me"
 msgstr "Me demander"
 
-#: ../../Zotlabs/Module/Register.php:54
+#: ../../Code/Module/Register.php:54
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 "Nombre d'inscriptions quotidiennes dépassé. Merci d'essayer à nouveau "
 "demain."
 
-#: ../../Zotlabs/Module/Register.php:60
+#: ../../Code/Module/Register.php:60
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 "Merci d'indiquer votre adhésion aux conditions de service. L'inscription a "
 "échoué."
 
-#: ../../Zotlabs/Module/Register.php:95
+#: ../../Code/Module/Register.php:95
 msgid "Passwords do not match."
 msgstr "Les mots de passe ne concordent pas."
 
-#: ../../Zotlabs/Module/Register.php:142
+#: ../../Code/Module/Register.php:142
 msgid "Registration successful. Continue to create your first channel..."
 msgstr "Enregistrement réussi. Continuez  pour créer votre premier canal ..."
 
-#: ../../Zotlabs/Module/Register.php:145
+#: ../../Code/Module/Register.php:145
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr ""
 "Inscription réussie. Merci de vérifier vos courriels pour valider votre "
 "compte."
 
-#: ../../Zotlabs/Module/Register.php:152
+#: ../../Code/Module/Register.php:152
 msgid "Your registration is pending approval by the site owner."
 msgstr "Votre inscription est en attente d'approbation par l'administrateur."
 
-#: ../../Zotlabs/Module/Register.php:155
+#: ../../Code/Module/Register.php:155
 msgid "Your registration can not be processed."
 msgstr "Votre inscription ne peut être traitée."
 
-#: ../../Zotlabs/Module/Register.php:202
+#: ../../Code/Module/Register.php:202
 msgid "Registration on this website is disabled."
 msgstr "L'inscription sur ce serveur est désactivée."
 
-#: ../../Zotlabs/Module/Register.php:212
+#: ../../Code/Module/Register.php:212
 msgid "Registration on this website is by approval only."
 msgstr "L'inscription sur ce serveur exige une approbation."
 
-#: ../../Zotlabs/Module/Register.php:220
+#: ../../Code/Module/Register.php:220
 msgid "Registration on this site is by invitation only."
 msgstr "L'inscription sur ce serveur se fait uniquement sur invitation"
 
-#: ../../Zotlabs/Module/Register.php:231
+#: ../../Code/Module/Register.php:231
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
@@ -8667,41 +8667,41 @@ msgstr ""
 "Ce site a dépassé le nombre de création de comptes autorisé chaque jour. "
 "Merci d'essayer à nouveau demain."
 
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Code/Module/Register.php:253
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "J'accepte les %s de ce site"
 
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Code/Module/Register.php:260
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "J'ai plus de %s ans et j'accepte les %s de ce site."
 
-#: ../../Zotlabs/Module/Register.php:265
+#: ../../Code/Module/Register.php:265
 msgid "Your email address"
 msgstr "Votre adresse de courriel"
 
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Code/Module/Register.php:266
 msgid "Choose a password"
 msgstr "Choisissez un mot de passe"
 
-#: ../../Zotlabs/Module/Register.php:267
+#: ../../Code/Module/Register.php:267
 msgid "Please re-enter your password"
 msgstr "Merci de saisir à nouveau votre mot de passe"
 
-#: ../../Zotlabs/Module/Register.php:268
+#: ../../Code/Module/Register.php:268
 msgid "Please enter your invitation code"
 msgstr "Merci de saisir votre code d'invitation"
 
-#: ../../Zotlabs/Module/Register.php:269
+#: ../../Code/Module/Register.php:269
 msgid "Your Name"
 msgstr "Votre nom"
 
-#: ../../Zotlabs/Module/Register.php:269
+#: ../../Code/Module/Register.php:269
 msgid "Real names are preferred."
 msgstr "Les noms véritables sont préférables."
 
-#: ../../Zotlabs/Module/Register.php:271
+#: ../../Code/Module/Register.php:271
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
@@ -8710,7 +8710,7 @@ msgstr ""
 "Votre nom d'utilisateur sera utilisé pour créer une adresse de canal facile "
 "à mémoriser, par ex. pseudo%s"
 
-#: ../../Zotlabs/Module/Register.php:272
+#: ../../Code/Module/Register.php:272
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
@@ -8718,15 +8718,15 @@ msgstr ""
 "Choisissez un rôle de canal adapté à votre usage et à vos exigences en "
 "matière de vie privée."
 
-#: ../../Zotlabs/Module/Register.php:273
+#: ../../Code/Module/Register.php:273
 msgid "no"
 msgstr "non"
 
-#: ../../Zotlabs/Module/Register.php:273
+#: ../../Code/Module/Register.php:273
 msgid "yes"
 msgstr "oui"
 
-#: ../../Zotlabs/Module/Register.php:286
+#: ../../Code/Module/Register.php:286
 msgid ""
 "Show affiliated sites - some of which may allow "
 "registration."
@@ -8734,7 +8734,7 @@ msgstr ""
 "Montre les serveurs affiliés - certains peuvent être"
 " ouverts aux inscriptions."
 
-#: ../../Zotlabs/Module/Register.php:300
+#: ../../Code/Module/Register.php:300
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
@@ -8743,87 +8743,87 @@ msgstr ""
 "formulaire, veuillez consulter votre courriel pour obtenir des instructions "
 "supplémentaires."
 
-#: ../../Zotlabs/Module/Profperm.php:38 ../../Zotlabs/Module/Profperm.php:67
+#: ../../Code/Module/Profperm.php:38 ../../Code/Module/Profperm.php:67
 msgid "Invalid profile identifier."
 msgstr "Identifiant de profil invalide."
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Profile Visibility Editor"
 msgstr "Éditeur de visibilité de profil"
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../Zotlabs/Lib/Libprofile.php:572
-#: ../../Zotlabs/Lib/Activity.php:2213 ../../Zotlabs/Lib/Activity.php:2216
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Code/Module/Profperm.php:117 ../../Code/Lib/Libprofile.php:572
+#: ../../Code/Lib/Activity.php:2213 ../../Code/Lib/Activity.php:2216
+#: ../../Code/Lib/Apps.php:365
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../Zotlabs/Module/Profperm.php:119
+#: ../../Code/Module/Profperm.php:119
 msgid "Click on a contact to add or remove."
 msgstr "Cliquer sur une connexion pour l'ajouter ou la retirer."
 
-#: ../../Zotlabs/Module/Profperm.php:128
+#: ../../Code/Module/Profperm.php:128
 msgid "Visible To"
 msgstr "Visible par"
 
-#: ../../Zotlabs/Module/Mood.php:74 ../../include/conversation.php:284
+#: ../../Code/Module/Mood.php:74 ../../include/conversation.php:284
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s est %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:133 ../../Zotlabs/Module/Mood.php:153
+#: ../../Code/Module/Mood.php:133 ../../Code/Module/Mood.php:153
 msgid "Set your current mood and tell your friends"
 msgstr "Indiquez votre humeur du moment à vos amis"
 
-#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:351
+#: ../../Code/Module/Mood.php:152 ../../Code/Lib/Apps.php:351
 msgid "Mood"
 msgstr "Humeur"
 
-#: ../../Zotlabs/Module/Embedphotos.php:105 ../../include/bbcode.php:227
+#: ../../Code/Module/Embedphotos.php:105 ../../include/bbcode.php:227
 #: ../../include/bbcode.php:952 ../../include/bbcode.php:1620
 #: ../../include/bbcode.php:1622 ../../include/bbcode.php:1625
 msgid "Image/photo"
 msgstr "Image/photo"
 
-#: ../../Zotlabs/Module/Card_edit.php:130
+#: ../../Code/Module/Card_edit.php:130
 msgid "Edit Card"
 msgstr "Modifier la carte"
 
-#: ../../Zotlabs/Module/Stream.php:123
+#: ../../Code/Module/Stream.php:123
 msgid "Access list not found"
 msgstr "Liste d'accès introuvable"
 
-#: ../../Zotlabs/Module/Stream.php:164
+#: ../../Code/Module/Stream.php:164
 msgid "No such channel"
 msgstr "Canal introuvable"
 
-#: ../../Zotlabs/Module/Stream.php:177 ../../Zotlabs/Module/Channel.php:225
+#: ../../Code/Module/Stream.php:177 ../../Code/Module/Channel.php:225
 msgid "Search Results For:"
 msgstr "Résultats de recherche pour :"
 
-#: ../../Zotlabs/Module/Stream.php:254
+#: ../../Code/Module/Stream.php:254
 msgid "Access list is empty"
 msgstr "Liste d'accès vide"
 
-#: ../../Zotlabs/Module/Stream.php:265 ../../include/items.php:4051
+#: ../../Code/Module/Stream.php:265 ../../include/items.php:4051
 #, php-format
 msgid "Access list: %s"
 msgstr "Liste d'accès : %s"
 
-#: ../../Zotlabs/Module/Notifications.php:55 ../../Zotlabs/Module/Notify.php:63
+#: ../../Code/Module/Notifications.php:55 ../../Code/Module/Notify.php:63
 msgid "No more system notifications."
 msgstr "Pas d'autre notification du système."
 
-#: ../../Zotlabs/Module/Notifications.php:59 ../../Zotlabs/Module/Notify.php:67
+#: ../../Code/Module/Notifications.php:59 ../../Code/Module/Notify.php:67
 msgid "System Notifications"
 msgstr "Notifications du système"
 
-#: ../../Zotlabs/Module/Notifications.php:60
-#: ../../Zotlabs/Lib/ThreadItem.php:447
+#: ../../Code/Module/Notifications.php:60
+#: ../../Code/Lib/ThreadItem.php:447
 msgid "Mark all seen"
 msgstr "Tout marquer comme vu"
 
-#: ../../Zotlabs/Module/Future.php:13
+#: ../../Code/Module/Future.php:13
 msgid ""
 "This app allows you to set an optional publish date/time for posts, which "
 "may be in the future. This must be at least ten minutes into the future to "
@@ -8839,33 +8839,33 @@ msgstr ""
 "nouveau bouton apparaîtra dans l'éditeur de publication pour définir une "
 "date/heure."
 
-#: ../../Zotlabs/Module/Cloud.php:124
+#: ../../Code/Module/Cloud.php:124
 msgid "Not found"
 msgstr "Non trouvé"
 
-#: ../../Zotlabs/Module/Cloud.php:130
+#: ../../Code/Module/Cloud.php:130
 msgid "Please refresh page"
 msgstr "Veuillez rafraîchir la page"
 
-#: ../../Zotlabs/Module/Cloud.php:133
+#: ../../Code/Module/Cloud.php:133
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../include/text.php:2555
+#: ../../Code/Module/Blocks.php:158 ../../include/text.php:2555
 msgid "Blocks"
 msgstr "Blocs"
 
-#: ../../Zotlabs/Module/Blocks.php:160
+#: ../../Code/Module/Blocks.php:160
 msgid "Block Title"
 msgstr "Titre du bloc"
 
-#: ../../Zotlabs/Module/Nocomment.php:13
+#: ../../Code/Module/Nocomment.php:13
 msgid "This app allows you to disable comments on individual posts."
 msgstr ""
 "Cette application vous permet de désactiver les commentaires sur une "
 "publication. "
 
-#: ../../Zotlabs/Module/Nocomment.php:21
+#: ../../Code/Module/Nocomment.php:21
 msgid ""
 "This app is installed. A button to control the ability to comment may be "
 "found below the post editor."
@@ -8873,31 +8873,31 @@ msgstr ""
 "L'application est installée. Un bouton contrôlant la possibilité de "
 "commenter est disponible sous l'éditeur de publication."
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
+#: ../../Code/Module/Sharedwithme.php:103
 msgid "Files: shared with me"
 msgstr "Fichiers : partagés avec moi"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:105
+#: ../../Code/Module/Sharedwithme.php:105
 msgid "NEW"
 msgstr "NOUVEAU"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Code/Module/Sharedwithme.php:108
 msgid "Remove all files"
 msgstr "Supprimer tous les fichiers"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Code/Module/Sharedwithme.php:109
 msgid "Remove this file"
 msgstr "Supprimer ce fichier"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
+#: ../../Code/Module/Chatsvc.php:131
 msgid "Away"
 msgstr "Absent"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
+#: ../../Code/Module/Chatsvc.php:136
 msgid "Online"
 msgstr "En ligne"
 
-#: ../../Zotlabs/Module/Removeme.php:45
+#: ../../Code/Module/Removeme.php:45
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
@@ -8905,25 +8905,25 @@ msgstr ""
 "Il est impossible de supprimer un canal moins de 48 heures après avoir "
 "changé le mot de passe d'un compte."
 
-#: ../../Zotlabs/Module/Removeme.php:67
+#: ../../Code/Module/Removeme.php:67
 msgid "Remove This Channel"
 msgstr "Supprimer ce canal"
 
-#: ../../Zotlabs/Module/Removeme.php:68
+#: ../../Code/Module/Removeme.php:68
 msgid "This channel will be completely removed from this server. "
 msgstr "Ce canal sera définitivement supprimé de ce serveur"
 
-#: ../../Zotlabs/Module/Pconfig.php:33 ../../Zotlabs/Module/Pconfig.php:70
+#: ../../Code/Module/Pconfig.php:33 ../../Code/Module/Pconfig.php:70
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 "Ce paramètre nécessite un traitement spécial, les modifications ont été "
 "bloquées."
 
-#: ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:59
 msgid "Configuration Editor"
 msgstr "Editeur de configuration"
 
-#: ../../Zotlabs/Module/Pconfig.php:60
+#: ../../Code/Module/Pconfig.php:60
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please "
 "leave this page unless you are comfortable with and knowledgeable about how "
@@ -8933,63 +8933,63 @@ msgstr ""
 "inutilisable. Merci d'ignorer cette page à moins d'être certain de savoir "
 "comment utiliser correctement cette fonctionnalité."
 
-#: ../../Zotlabs/Module/Pin.php:42 ../../Zotlabs/Module/Item.php:475
+#: ../../Code/Module/Pin.php:42 ../../Code/Module/Item.php:475
 msgid "Unable to locate original post."
 msgstr "Impossible de localiser la publication initiale."
 
-#: ../../Zotlabs/Module/Notes.php:45
+#: ../../Code/Module/Notes.php:45
 msgid "This app allows you to create private notes for your personal use."
 msgstr ""
 "Cette application vous permet de créer des notes strictement personnelles"
 
-#: ../../Zotlabs/Module/Notes.php:53
+#: ../../Code/Module/Notes.php:53
 msgid "This app is installed. The Notes tool can be found on your stream page."
 msgstr ""
 "Cette application est installée. L'outil Notes est disponible sur votre page"
 " de flux"
 
-#: ../../Zotlabs/Module/Share.php:102 ../../Zotlabs/Lib/Activity.php:2236
+#: ../../Code/Module/Share.php:102 ../../Code/Lib/Activity.php:2236
 #, php-format
 msgid "🔁 Repeated %1$s's %2$s"
 msgstr "🔁 A partagé %2$s de %1$s"
 
-#: ../../Zotlabs/Module/Share.php:118
+#: ../../Code/Module/Share.php:118
 msgid "Post repeated"
 msgstr "Publication répétée"
 
-#: ../../Zotlabs/Module/Viewsrc.php:45
+#: ../../Code/Module/Viewsrc.php:45
 msgid "item"
 msgstr "item"
 
-#: ../../Zotlabs/Module/Viewsrc.php:55
+#: ../../Code/Module/Viewsrc.php:55
 msgid "inspect"
 msgstr "inspecter"
 
-#: ../../Zotlabs/Module/Sources.php:45
+#: ../../Code/Module/Sources.php:45
 msgid "Failed to create source. No channel selected."
 msgstr "Impossible de créer la source. Aucun canal selectionné."
 
-#: ../../Zotlabs/Module/Sources.php:61
+#: ../../Code/Module/Sources.php:61
 msgid "Source created."
 msgstr "Source créée."
 
-#: ../../Zotlabs/Module/Sources.php:74
+#: ../../Code/Module/Sources.php:74
 msgid "Source updated."
 msgstr "Source mise à jour."
 
-#: ../../Zotlabs/Module/Sources.php:99
+#: ../../Code/Module/Sources.php:99
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:106
+#: ../../Code/Module/Sources.php:106
 msgid "Manage remote sources of content for your channel."
 msgstr "Gérer les sources distantes de contenu pour votre canal."
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Module/Sources.php:117
+#: ../../Code/Module/Sources.php:107 ../../Code/Module/Sources.php:117
 msgid "New Source"
 msgstr "Nouvelle source"
 
-#: ../../Zotlabs/Module/Sources.php:118 ../../Zotlabs/Module/Sources.php:152
+#: ../../Code/Module/Sources.php:118 ../../Code/Module/Sources.php:152
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
@@ -8997,19 +8997,19 @@ msgstr ""
 "Importer le contenu sélectionné ou tout le contenu du canal suivant vers ce "
 "canal et le distribuer selon vos paramètres de canal."
 
-#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
+#: ../../Code/Module/Sources.php:119 ../../Code/Module/Sources.php:153
 msgid "Only import content with these words (one per line)"
 msgstr "N'importer le contenu que s'il contient ces mots (un par ligne)"
 
-#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
+#: ../../Code/Module/Sources.php:119 ../../Code/Module/Sources.php:153
 msgid "Leave blank to import all public content"
 msgstr "Laissez vide pour importer tout le contenu public"
 
-#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:159
+#: ../../Code/Module/Sources.php:120 ../../Code/Module/Sources.php:159
 msgid "Channel Name"
 msgstr "Nom du canal"
 
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:156
+#: ../../Code/Module/Sources.php:121 ../../Code/Module/Sources.php:156
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
@@ -9017,262 +9017,262 @@ msgstr ""
 "Ajouter les catégories suivantes aux publications importées à partir de "
 "cette source (séparer par des virgules)"
 
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
+#: ../../Code/Module/Sources.php:122 ../../Code/Module/Sources.php:157
 msgid "Resend posts with this channel as author"
 msgstr "Renouveler les publications avec ce canal en auteur"
 
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
+#: ../../Code/Module/Sources.php:122 ../../Code/Module/Sources.php:157
 msgid "Copyrights may apply"
 msgstr "Des droits de reproduction peuvent s'appliquer"
 
-#: ../../Zotlabs/Module/Sources.php:142 ../../Zotlabs/Module/Sources.php:172
+#: ../../Code/Module/Sources.php:142 ../../Code/Module/Sources.php:172
 msgid "Source not found."
 msgstr "Source introuvable."
 
-#: ../../Zotlabs/Module/Sources.php:149
+#: ../../Code/Module/Sources.php:149
 msgid "Edit Source"
 msgstr "Modifier la source"
 
-#: ../../Zotlabs/Module/Sources.php:150
+#: ../../Code/Module/Sources.php:150
 msgid "Delete Source"
 msgstr "Supprimer la source"
 
-#: ../../Zotlabs/Module/Sources.php:180
+#: ../../Code/Module/Sources.php:180
 msgid "Source removed"
 msgstr "Source supprimée"
 
-#: ../../Zotlabs/Module/Sources.php:182
+#: ../../Code/Module/Sources.php:182
 msgid "Unable to remove source."
 msgstr "Impossible de supprimer la source."
 
-#: ../../Zotlabs/Module/Layouts.php:190 ../../include/text.php:2557
+#: ../../Code/Module/Layouts.php:190 ../../include/text.php:2557
 msgid "Layouts"
 msgstr "Mises-en-page"
 
-#: ../../Zotlabs/Module/Layouts.php:196
+#: ../../Code/Module/Layouts.php:196
 msgid "Layout Description"
 msgstr "Description de la mise en page"
 
-#: ../../Zotlabs/Module/Layouts.php:201
+#: ../../Code/Module/Layouts.php:201
 msgid "Download PDL file"
 msgstr "Télécharger le fichier PDL"
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Élément indisponible."
 
-#: ../../Zotlabs/Module/Hq.php:143
+#: ../../Code/Module/Hq.php:143
 msgid "Welcome to Hubzilla!"
 msgstr "Bienvenue sur Hubzilla !"
 
-#: ../../Zotlabs/Module/Hq.php:143
+#: ../../Code/Module/Hq.php:143
 msgid "You have got no unseen posts..."
 msgstr "Vous n'avez aucune publication non-vue..."
 
-#: ../../Zotlabs/Module/Connedit.php:114
+#: ../../Code/Module/Connedit.php:114
 msgid "Could not locate selected profile."
 msgstr "Impossible de localiser le profil sélectionné."
 
-#: ../../Zotlabs/Module/Connedit.php:193
+#: ../../Code/Module/Connedit.php:193
 msgid "Connection updated."
 msgstr "Connexion mise à jour."
 
-#: ../../Zotlabs/Module/Connedit.php:196
+#: ../../Code/Module/Connedit.php:196
 msgid "Failed to update connection record."
 msgstr "Impossible de mettre à jour les détails de la connexion."
 
-#: ../../Zotlabs/Module/Connedit.php:240
+#: ../../Code/Module/Connedit.php:240
 msgid "is now connected to"
 msgstr "est maintenant connecté avec"
 
-#: ../../Zotlabs/Module/Connedit.php:365
+#: ../../Code/Module/Connedit.php:365
 msgid "Could not access address book record."
 msgstr "Impossible d'accéder aux détails du carnet d'adresses."
 
-#: ../../Zotlabs/Module/Connedit.php:414
+#: ../../Code/Module/Connedit.php:414
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Actualisation impossible - le canal est indisponible."
 
-#: ../../Zotlabs/Module/Connedit.php:440
+#: ../../Code/Module/Connedit.php:440
 msgid "Added by Connedit"
 msgstr "Ajouté par Connedit"
 
-#: ../../Zotlabs/Module/Connedit.php:478
+#: ../../Code/Module/Connedit.php:478
 msgid "Unable to set address book parameters."
 msgstr "Impossible de régler les paramètres du carnet d'adresses."
 
-#: ../../Zotlabs/Module/Connedit.php:495
+#: ../../Code/Module/Connedit.php:495
 msgid "Connection has been removed."
 msgstr "La connexion a été supprimée."
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Code/Module/Connedit.php:540 ../../Code/Lib/Apps.php:342
 #: ../../include/nav.php:105
 msgid "View Profile"
 msgstr "Voir mon profil"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Code/Module/Connedit.php:543
 #, php-format
 msgid "View %s's profile"
 msgstr "Voir le profil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:547
+#: ../../Code/Module/Connedit.php:547
 msgid "Refresh Permissions"
 msgstr "Actualiser les droits d'accès"
 
-#: ../../Zotlabs/Module/Connedit.php:550
+#: ../../Code/Module/Connedit.php:550
 msgid "Fetch updated permissions"
 msgstr "Récupérer les autorisations mises à jour"
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Code/Module/Connedit.php:554
 msgid "Refresh Photo"
 msgstr "Actualiser la photo"
 
-#: ../../Zotlabs/Module/Connedit.php:557
+#: ../../Code/Module/Connedit.php:557
 msgid "Fetch updated photo"
 msgstr "Récupérer la photo mise à jour"
 
-#: ../../Zotlabs/Module/Connedit.php:561 ../../include/conversation.php:1041
+#: ../../Code/Module/Connedit.php:561 ../../include/conversation.php:1041
 msgid "Recent Activity"
 msgstr "Activité récente"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Code/Module/Connedit.php:564
 msgid "View recent posts and comments"
 msgstr "Voir les publications et commentaires récents"
 
-#: ../../Zotlabs/Module/Connedit.php:571
+#: ../../Code/Module/Connedit.php:571
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Bloquer (ou débloquer) toute communication avec cette connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:572
+#: ../../Code/Module/Connedit.php:572
 msgid "This connection is blocked"
 msgstr "Cette connexion est bloquée"
 
-#: ../../Zotlabs/Module/Connedit.php:576
+#: ../../Code/Module/Connedit.php:576
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
-#: ../../Zotlabs/Module/Connedit.php:579
+#: ../../Code/Module/Connedit.php:579
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 "Ignorer (ou cesser d'ignorer) toute communication venant de cette connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:580
+#: ../../Code/Module/Connedit.php:580
 msgid "This connection is ignored"
 msgstr "Cette connexion est ignorée"
 
-#: ../../Zotlabs/Module/Connedit.php:587
+#: ../../Code/Module/Connedit.php:587
 msgid "Censor (or Uncensor) images from this connection"
 msgstr "Censurer (ou dé-censurer) les images provenant de cette connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:588
+#: ../../Code/Module/Connedit.php:588
 msgid "This connection is censored"
 msgstr "Cette connexion est censuré"
 
-#: ../../Zotlabs/Module/Connedit.php:592
+#: ../../Code/Module/Connedit.php:592
 msgid "Unarchive"
 msgstr "Désarchiver"
 
-#: ../../Zotlabs/Module/Connedit.php:592
+#: ../../Code/Module/Connedit.php:592
 msgid "Archive"
 msgstr "Archiver"
 
-#: ../../Zotlabs/Module/Connedit.php:595
+#: ../../Code/Module/Connedit.php:595
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 "Archiver (ou désarchiver) cette connexion - la marquer comme inactive mais "
 "conserver le contenu"
 
-#: ../../Zotlabs/Module/Connedit.php:596
+#: ../../Code/Module/Connedit.php:596
 msgid "This connection is archived"
 msgstr "Cette connexion est archivée"
 
-#: ../../Zotlabs/Module/Connedit.php:600
+#: ../../Code/Module/Connedit.php:600
 msgid "Unhide"
 msgstr "Ne plus cacher"
 
-#: ../../Zotlabs/Module/Connedit.php:600
+#: ../../Code/Module/Connedit.php:600
 msgid "Hide"
 msgstr "Cacher"
 
-#: ../../Zotlabs/Module/Connedit.php:603
+#: ../../Code/Module/Connedit.php:603
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Cacher ou ne plus cacher cette connexion à vos autres contacts"
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Code/Module/Connedit.php:604
 msgid "This connection is hidden"
 msgstr "Cette connexion est cachée"
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Code/Module/Connedit.php:611
 msgid "Delete this connection"
 msgstr "Supprimer cette connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:619
+#: ../../Code/Module/Connedit.php:619
 msgid "Fetch Vcard"
 msgstr "Récupérer la Vcard"
 
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Connedit.php:622
 msgid "Fetch electronic calling card for this connection"
 msgstr "Récupérer la carte de visite électronique de cette connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Code/Module/Connedit.php:633
 msgid "Open Individual Permissions section by default"
 msgstr "Ouvrir par défaut la section des droits d'accès individuels"
 
-#: ../../Zotlabs/Module/Connedit.php:656 ../../Zotlabs/Lib/Apps.php:311
+#: ../../Code/Module/Connedit.php:656 ../../Code/Lib/Apps.php:311
 msgid "Friend Zoom"
 msgstr "Friend Zoom"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Code/Module/Connedit.php:659
 msgid "Open Friend Zoom section by default"
 msgstr "Afficher la section Friend Zoom par défaut"
 
-#: ../../Zotlabs/Module/Connedit.php:685
+#: ../../Code/Module/Connedit.php:685
 msgid "Filter"
 msgstr "Filtrer"
 
-#: ../../Zotlabs/Module/Connedit.php:688
+#: ../../Code/Module/Connedit.php:688
 msgid "Open Custom Filter section by default"
 msgstr "Ouvrir par défaut la section Filtre personnalisé"
 
-#: ../../Zotlabs/Module/Connedit.php:725
+#: ../../Code/Module/Connedit.php:725
 msgid "Approve this connection"
 msgstr "Valider cette connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:725
+#: ../../Code/Module/Connedit.php:725
 msgid "Accept connection to allow communication"
 msgstr "Accepter la connexion pour permettre la communication"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Code/Module/Connedit.php:730
 msgid "Set Friend Zoom"
 msgstr "Définir le Friend Zoom"
 
-#: ../../Zotlabs/Module/Connedit.php:733
+#: ../../Code/Module/Connedit.php:733
 msgid "Set Profile"
 msgstr "Définir le profil"
 
-#: ../../Zotlabs/Module/Connedit.php:736
+#: ../../Code/Module/Connedit.php:736
 msgid "Set Friend Zoom & Profile"
 msgstr "Définir le Friend Zoom & le profil"
 
-#: ../../Zotlabs/Module/Connedit.php:780
+#: ../../Code/Module/Connedit.php:780
 msgid "This connection is unreachable from this location."
 msgstr "Cette connexion est injoignable à partir de ce serveur."
 
-#: ../../Zotlabs/Module/Connedit.php:781
+#: ../../Code/Module/Connedit.php:781
 msgid "This connection may be unreachable from other channel locations."
 msgstr ""
 "Cette connexion peut être injoignable à partir d'autres serveurs hébergeant"
 " ce "
 "canal."
 
-#: ../../Zotlabs/Module/Connedit.php:783
+#: ../../Code/Module/Connedit.php:783
 msgid "Location independence is not supported by their network."
 msgstr ""
 "Le réseau de cette connexion utilise un protocole qui ne gère pas l'identité"
 " nomade."
 
-#: ../../Zotlabs/Module/Connedit.php:789
+#: ../../Code/Module/Connedit.php:789
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
@@ -9280,48 +9280,48 @@ msgstr ""
 "Cette connexion est injoignable à partir de ce site. Son réseau utilise un "
 "protocole qui ne gère pas l'identité nomade."
 
-#: ../../Zotlabs/Module/Connedit.php:792 ../../include/items.php:4061
+#: ../../Code/Module/Connedit.php:792 ../../include/items.php:4061
 #, php-format
 msgid "Connection: %s"
 msgstr "Connexion : %s"
 
-#: ../../Zotlabs/Module/Connedit.php:793
+#: ../../Code/Module/Connedit.php:793
 msgid "Connection requests will be approved without your interaction"
 msgstr "Les demandes de connexion seront validées automatiquement"
 
-#: ../../Zotlabs/Module/Connedit.php:802
+#: ../../Code/Module/Connedit.php:802
 msgid "This connection's primary address is"
 msgstr "L'adresse principale de cette connexion est"
 
-#: ../../Zotlabs/Module/Connedit.php:803
+#: ../../Code/Module/Connedit.php:803
 msgid "Available locations:"
 msgstr "Emplacements disponibles :"
 
-#: ../../Zotlabs/Module/Connedit.php:809
+#: ../../Code/Module/Connedit.php:809
 msgid "Connection Tools"
 msgstr "Outils de gestion de la connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:811
+#: ../../Code/Module/Connedit.php:811
 msgid "Slide to adjust your degree of friendship"
 msgstr "Faites glisser pour ajuster votre proximité avec la connexion"
 
-#: ../../Zotlabs/Module/Connedit.php:812 ../../include/js_strings.php:20
+#: ../../Code/Module/Connedit.php:812 ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Evaluation"
 
-#: ../../Zotlabs/Module/Connedit.php:813
+#: ../../Code/Module/Connedit.php:813
 msgid "Slide to adjust your rating"
 msgstr "Faîtes glisser pour ajuster votre note"
 
-#: ../../Zotlabs/Module/Connedit.php:814 ../../Zotlabs/Module/Connedit.php:820
+#: ../../Code/Module/Connedit.php:814 ../../Code/Module/Connedit.php:820
 msgid "Optionally explain your rating"
 msgstr "Explication facultative de votre évaluation"
 
-#: ../../Zotlabs/Module/Connedit.php:816
+#: ../../Code/Module/Connedit.php:816
 msgid "Custom Filter"
 msgstr "Filtre personnalisé"
 
-#: ../../Zotlabs/Module/Connedit.php:817 ../../Zotlabs/Module/Connedit.php:818
+#: ../../Code/Module/Connedit.php:817 ../../Code/Module/Connedit.php:818
 msgid ""
 "words one per line or #tags, $categories, /patterns/, or lang=xx, leave "
 "blank to import all posts"
@@ -9329,20 +9329,20 @@ msgstr ""
 "Mots (un par ligne), #étiquettes, $catégories, /motif/, ou lang=xx - laisser"
 " vide pour importer toutes les publications."
 
-#: ../../Zotlabs/Module/Connedit.php:819
+#: ../../Code/Module/Connedit.php:819
 msgid "optional - allows you to search by a name that you have chosen"
 msgstr ""
 "Optionnel - permet une recherche  à partir d'un nom que vous avez choisi"
 
-#: ../../Zotlabs/Module/Connedit.php:821
+#: ../../Code/Module/Connedit.php:821
 msgid "This information is public!"
 msgstr "Cette information est publique !"
 
-#: ../../Zotlabs/Module/Connedit.php:826
+#: ../../Code/Module/Connedit.php:826
 msgid "Connection Pending Approval"
 msgstr "Connexion en attente d'approbation"
 
-#: ../../Zotlabs/Module/Connedit.php:831
+#: ../../Code/Module/Connedit.php:831
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
@@ -9351,7 +9351,7 @@ msgstr ""
 "Merci de choisir le profil que vous souhaitez montrer quand %s visite votre "
 "profil de manière authentifiée."
 
-#: ../../Zotlabs/Module/Connedit.php:838
+#: ../../Code/Module/Connedit.php:838
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
@@ -9364,19 +9364,19 @@ msgstr ""
 "modifier ces droits d'accès ici mais cela n'aura aucun effet à moins de "
 "changer les paramètres hérités."
 
-#: ../../Zotlabs/Module/Connedit.php:839
+#: ../../Code/Module/Connedit.php:839
 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 
-#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Code/Module/Connedit.php:847
 msgid "Details"
 msgstr "Détails"
 
-#: ../../Zotlabs/Module/Email_validation.php:36
+#: ../../Code/Module/Email_validation.php:36
 msgid "Email Verification Required"
 msgstr "Vérification de courriel requise"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../Code/Module/Email_validation.php:37
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -9388,199 +9388,199 @@ msgstr ""
 "minutes pour la réception et vérifiez votre dossier de spams si vous ne "
 "voyez pas le message."
 
-#: ../../Zotlabs/Module/Email_validation.php:38
+#: ../../Code/Module/Email_validation.php:38
 msgid "Resend Email"
 msgstr "Renvoyer le courriel"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
+#: ../../Code/Module/Email_validation.php:41
 msgid "Validation token"
 msgstr "Jeton de validation"
 
-#: ../../Zotlabs/Module/Fbrowser.php:26 ../../Zotlabs/Lib/Apps.php:343
+#: ../../Code/Module/Fbrowser.php:26 ../../Code/Lib/Apps.php:343
 #: ../../include/nav.php:408 ../../include/conversation.php:1946
 msgid "Photos"
 msgstr "Photos"
 
-#: ../../Zotlabs/Module/Profile.php:131
+#: ../../Code/Module/Profile.php:131
 msgid "vcard"
 msgstr "vcard"
 
-#: ../../Zotlabs/Module/Cover_photo.php:284 ../../include/items.php:4415
+#: ../../Code/Module/Cover_photo.php:284 ../../include/items.php:4415
 msgid "female"
 msgstr "femme"
 
-#: ../../Zotlabs/Module/Cover_photo.php:285 ../../include/items.php:4416
+#: ../../Code/Module/Cover_photo.php:285 ../../include/items.php:4416
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s a mis à jour son %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:287 ../../include/items.php:4417
+#: ../../Code/Module/Cover_photo.php:287 ../../include/items.php:4417
 msgid "male"
 msgstr "homme"
 
-#: ../../Zotlabs/Module/Cover_photo.php:288 ../../include/items.php:4418
+#: ../../Code/Module/Cover_photo.php:288 ../../include/items.php:4418
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s a mis à jour son %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:291 ../../include/items.php:4420
+#: ../../Code/Module/Cover_photo.php:291 ../../include/items.php:4420
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s a mis a jour sa %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:294 ../../include/channel.php:1668
+#: ../../Code/Module/Cover_photo.php:294 ../../include/channel.php:1668
 msgid "cover photo"
 msgstr "bannière"
 
-#: ../../Zotlabs/Module/Pdledit.php:21
+#: ../../Code/Module/Pdledit.php:21
 msgid "Layout updated."
 msgstr "Mise en page mise à jour."
 
-#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:97
+#: ../../Code/Module/Pdledit.php:42 ../../Code/Module/Pdledit.php:97
 msgid "Edit System Page Description"
 msgstr "Modifier la description de la page du système"
 
-#: ../../Zotlabs/Module/Pdledit.php:63 ../../Zotlabs/Module/Pdledit.php:71
+#: ../../Code/Module/Pdledit.php:63 ../../Code/Module/Pdledit.php:71
 msgid "(modified)"
 msgstr "(modifié)"
 
-#: ../../Zotlabs/Module/Pdledit.php:63 ../../Zotlabs/Module/Pdledit.php:71
-#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Lib/ThreadItem.php:915
+#: ../../Code/Module/Pdledit.php:63 ../../Code/Module/Pdledit.php:71
+#: ../../Code/Module/Lostpass.php:133 ../../Code/Lib/ThreadItem.php:915
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: ../../Zotlabs/Module/Pdledit.php:92
+#: ../../Code/Module/Pdledit.php:92
 msgid "Layout not found."
 msgstr "Mise en page introuvable."
 
-#: ../../Zotlabs/Module/Pdledit.php:98
+#: ../../Code/Module/Pdledit.php:98
 msgid "Module Name:"
 msgstr "Nom du module :"
 
-#: ../../Zotlabs/Module/Pdledit.php:99
+#: ../../Code/Module/Pdledit.php:99
 msgid "Layout Help"
 msgstr "Aide à la mise en page"
 
-#: ../../Zotlabs/Module/Pdledit.php:100
+#: ../../Code/Module/Pdledit.php:100
 msgid "Edit another layout"
 msgstr "Modifier une autre mise en page"
 
-#: ../../Zotlabs/Module/Pdledit.php:101
+#: ../../Code/Module/Pdledit.php:101
 msgid "System layout"
 msgstr "mise en page du système"
 
-#: ../../Zotlabs/Module/Item.php:564
+#: ../../Code/Module/Item.php:564
 msgid "Comment may be moderated."
 msgstr "Les commentaires peuvent être modérées"
 
-#: ../../Zotlabs/Module/Item.php:779
+#: ../../Code/Module/Item.php:779
 msgid "Empty post discarded."
 msgstr "Publication vide annulée."
 
-#: ../../Zotlabs/Module/Item.php:1347
+#: ../../Code/Module/Item.php:1347
 msgid "Duplicate post suppressed."
 msgstr "Publication en doublon supprimée."
 
-#: ../../Zotlabs/Module/Item.php:1479
+#: ../../Code/Module/Item.php:1479
 msgid "System error. Post not saved."
 msgstr "Erreur système. Publication non sauvegardée."
 
-#: ../../Zotlabs/Module/Item.php:1519
+#: ../../Code/Module/Item.php:1519
 msgid "Your post/comment is awaiting approval."
 msgstr "Votre publication/commentaire est en attente de validation."
 
-#: ../../Zotlabs/Module/Item.php:1670
+#: ../../Code/Module/Item.php:1670
 msgid "Unable to obtain post information from database."
 msgstr ""
 "Impossible d'obtenir les informations de la publication depuis la base de "
 "données."
 
-#: ../../Zotlabs/Module/Item.php:1678
+#: ../../Code/Module/Item.php:1678
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 "Vous avez atteint votre limite de %1$.0f contributions de premier niveau."
 
-#: ../../Zotlabs/Module/Item.php:1685
+#: ../../Code/Module/Item.php:1685
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Vous avez atteint votre limite de %1$.0f pages web."
 
-#: ../../Zotlabs/Module/Lockview.php:75
+#: ../../Code/Module/Lockview.php:75
 msgid "Remote privacy information not available."
 msgstr "Les informations distantes de confidentialité ne sont pas disponibles."
 
-#: ../../Zotlabs/Module/Lockview.php:96
+#: ../../Code/Module/Lockview.php:96
 msgid "Visible to:"
 msgstr "Visible par :"
 
-#: ../../Zotlabs/Module/Chanview.php:132
+#: ../../Code/Module/Chanview.php:132
 msgid "toggle full screen mode"
 msgstr "Basculer en mode plein écran"
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr "Étiquette retirée"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr "Retirer une étiquette à l'élément"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr "Étiquette à retirer :"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "Aucune restriction de classe de service trouvée."
 
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:343
+#: ../../Code/Module/Impel.php:43 ../../include/bbcode.php:343
 msgid "webpage"
 msgstr "pages web"
 
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:349
+#: ../../Code/Module/Impel.php:48 ../../include/bbcode.php:349
 msgid "block"
 msgstr "bloquer"
 
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:346
+#: ../../Code/Module/Impel.php:53 ../../include/bbcode.php:346
 msgid "layout"
 msgstr "mise en page"
 
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:352
+#: ../../Code/Module/Impel.php:60 ../../include/bbcode.php:352
 msgid "menu"
 msgstr "menu"
 
-#: ../../Zotlabs/Module/Impel.php:185
+#: ../../Code/Module/Impel.php:185
 #, php-format
 msgid "%s element installed"
 msgstr "Elément %s installé"
 
-#: ../../Zotlabs/Module/Impel.php:188
+#: ../../Code/Module/Impel.php:188
 #, php-format
 msgid "%s element installation failed"
 msgstr "L'installation de l'élément %s a échoué"
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "Aucun compte valide trouvé."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr ""
 "Demande de réinitialisation du mot de passe envoyée. Vérifiez votre "
 "courriel."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:108
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Membre du site (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../Code/Module/Lostpass.php:44 ../../Code/Module/Lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Demande de réinitialisation du mot de passe sur %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../Code/Module/Lostpass.php:68
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
@@ -9588,23 +9588,23 @@ msgstr ""
 "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) "
 "La réinitialisation du mot de passe a échoué."
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your password has been reset as requested."
 msgstr "Votre mot de passe a bien été réinitialisé."
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Your new password is"
 msgstr "Votre nouveau mot de passe est"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "Save or copy your new password - and then"
 msgstr "Enregistrez ou copiez votre nouveau mot de passe, puis"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid "click here to login"
 msgstr "cliquez ici pour vous connecter"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../Code/Module/Lostpass.php:96
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
@@ -9612,16 +9612,16 @@ msgstr ""
 "Votre mot de passe peut être changé depuis la page des Paramètres "
 "une fois connecté."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
+#: ../../Code/Module/Lostpass.php:117
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Votre mot de passe a été changé à %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Forgot your Password?"
 msgstr "Mot de passe oublié ?"
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../Code/Module/Lostpass.php:131
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
@@ -9630,133 +9630,133 @@ msgstr ""
 "mot de passe. Vérifiez ensuite votre boîte aux lettres pour la suite des "
 "instructions."
 
-#: ../../Zotlabs/Module/Xchan.php:10
+#: ../../Code/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr "Recherche xchan"
 
-#: ../../Zotlabs/Module/Xchan.php:13
+#: ../../Code/Module/Xchan.php:13
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Recherche xchan commençant par (ou adresse \"webbie\") :"
 
-#: ../../Zotlabs/Module/Channel.php:148
+#: ../../Code/Module/Channel.php:148
 #, php-format
 msgid "This is the home page of %s."
 msgstr "Page d'accueil du canal \"%s\""
 
-#: ../../Zotlabs/Module/Channel.php:208
+#: ../../Code/Module/Channel.php:208
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Droits d'accès insuffisants. Demande redirigée vers la page du profil."
 
-#: ../../Zotlabs/Module/Channel.php:585
+#: ../../Code/Module/Channel.php:585
 #, php-format
 msgid "This post was published on the home page of %s."
 msgstr "Publication mise en ligne sur la page de %s."
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "Impossible de trouver votre serveur."
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "Publication réussie."
 
-#: ../../Zotlabs/Module/Search.php:227
+#: ../../Code/Module/Search.php:227
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Eléments étiquetés avec : %s"
 
-#: ../../Zotlabs/Module/Search.php:229
+#: ../../Code/Module/Search.php:229
 #, php-format
 msgid "Search results for: %s"
 msgstr "Résultats de recherche pour : %s"
 
-#: ../../Zotlabs/Module/Thing.php:133
+#: ../../Code/Module/Thing.php:133
 msgid "Thing updated"
 msgstr "Elément mis à jour"
 
-#: ../../Zotlabs/Module/Thing.php:191
+#: ../../Code/Module/Thing.php:191
 msgid "Object store: failed"
 msgstr "Stockage de l'objet : échec"
 
-#: ../../Zotlabs/Module/Thing.php:195
+#: ../../Code/Module/Thing.php:195
 msgid "Thing added"
 msgstr "Elément ajouté"
 
-#: ../../Zotlabs/Module/Thing.php:221
+#: ../../Code/Module/Thing.php:221
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Thing.php:284
+#: ../../Code/Module/Thing.php:284
 msgid "Show Thing"
 msgstr "Montrer l'élément"
 
-#: ../../Zotlabs/Module/Thing.php:291
+#: ../../Code/Module/Thing.php:291
 msgid "item not found."
 msgstr "élément introuvable."
 
-#: ../../Zotlabs/Module/Thing.php:324
+#: ../../Code/Module/Thing.php:324
 msgid "Edit Thing"
 msgstr "Modifier élément"
 
-#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:383
+#: ../../Code/Module/Thing.php:326 ../../Code/Module/Thing.php:383
 msgid "Select a profile"
 msgstr "Choisissez un profil"
 
-#: ../../Zotlabs/Module/Thing.php:330 ../../Zotlabs/Module/Thing.php:386
+#: ../../Code/Module/Thing.php:330 ../../Code/Module/Thing.php:386
 msgid "Post an activity"
 msgstr "Publier une activité"
 
-#: ../../Zotlabs/Module/Thing.php:330 ../../Zotlabs/Module/Thing.php:386
+#: ../../Code/Module/Thing.php:330 ../../Code/Module/Thing.php:386
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Envoie exclusivement aux visiteurs du profil concerné"
 
-#: ../../Zotlabs/Module/Thing.php:332 ../../Zotlabs/Module/Thing.php:388
+#: ../../Code/Module/Thing.php:332 ../../Code/Module/Thing.php:388
 msgid "Name of thing e.g. something"
 msgstr "Nom de l'élément, p.ex. quelque-chose"
 
-#: ../../Zotlabs/Module/Thing.php:334 ../../Zotlabs/Module/Thing.php:389
+#: ../../Code/Module/Thing.php:334 ../../Code/Module/Thing.php:389
 msgid "URL of thing (optional)"
 msgstr "URL de l'élément (facultatif)"
 
-#: ../../Zotlabs/Module/Thing.php:336 ../../Zotlabs/Module/Thing.php:390
+#: ../../Code/Module/Thing.php:336 ../../Code/Module/Thing.php:390
 msgid "URL for photo of thing (optional)"
 msgstr "URL d'une photo de l'élément (facultatif)"
 
-#: ../../Zotlabs/Module/Thing.php:381
+#: ../../Code/Module/Thing.php:381
 msgid "Add Thing to your Profile"
 msgstr "Ajouter l'élément à  votre profil"
 
-#: ../../Zotlabs/Update/_1239.php:23
+#: ../../Code/Update/_1239.php:23
 msgid "Added by superblock"
 msgstr "Ajouté par Superblock"
 
-#: ../../Zotlabs/Lib/Markdown.php:203 ../../include/bbcode.php:570
+#: ../../Code/Lib/Markdown.php:203 ../../include/bbcode.php:570
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s a écrit %2$s qui suit %3$s"
 
-#: ../../Zotlabs/Lib/Libzotdir.php:165
+#: ../../Code/Lib/Libzotdir.php:165
 msgid "Directory Options"
 msgstr "Options d'annuaire"
 
-#: ../../Zotlabs/Lib/Libzotdir.php:167 ../../include/nav.php:95
+#: ../../Code/Lib/Libzotdir.php:167 ../../include/nav.php:95
 msgid "Safe Mode"
 msgstr "Mode sûr"
 
-#: ../../Zotlabs/Lib/Libzotdir.php:168
+#: ../../Code/Lib/Libzotdir.php:168
 msgid "Public Groups Only"
 msgstr "Uniquement les groupes publics"
 
-#: ../../Zotlabs/Lib/Libzotdir.php:169
+#: ../../Code/Lib/Libzotdir.php:169
 msgid "Collections Only"
 msgstr "Uniquement les Collections"
 
-#: ../../Zotlabs/Lib/Libzotdir.php:171
+#: ../../Code/Lib/Libzotdir.php:171
 msgid "This Website Only"
 msgstr "Ce site uniquement"
 
-#: ../../Zotlabs/Lib/AccessList.php:28
+#: ../../Code/Lib/AccessList.php:28
 msgid ""
 "A deleted list with this name was revived. Existing item permissions "
 "may apply to this list and any future members. If this is "
@@ -9767,296 +9767,296 @@ msgstr ""
 "aux membres futurs. Si ce n'est pas ce que vous souhaitiez, merci de créer "
 "une autre liste avec un nom différent."
 
-#: ../../Zotlabs/Lib/AccessList.php:285
+#: ../../Code/Lib/AccessList.php:285
 msgid "Add new connections to this access list"
 msgstr "Ajouter de nouvelles connexions à cette liste"
 
-#: ../../Zotlabs/Lib/AccessList.php:310
+#: ../../Code/Lib/AccessList.php:310
 msgid "edit"
 msgstr "modifier"
 
-#: ../../Zotlabs/Lib/AccessList.php:331
+#: ../../Code/Lib/AccessList.php:331
 msgid "Edit list"
 msgstr "Modifier la liste"
 
-#: ../../Zotlabs/Lib/AccessList.php:332
+#: ../../Code/Lib/AccessList.php:332
 msgid "Create new list"
 msgstr "Créer une nouvelle liste"
 
-#: ../../Zotlabs/Lib/AccessList.php:333
+#: ../../Code/Lib/AccessList.php:333
 msgid "Channels not in any access list"
 msgstr "Connexions ne figurant dans aucune liste"
 
-#: ../../Zotlabs/Lib/Libsync.php:891
+#: ../../Code/Lib/Libsync.php:891
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Impossible de vérifier la signature de site pour %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:67
+#: ../../Code/Lib/DB_Upgrade.php:67
 msgid "Source code of failed update: "
 msgstr "Code source de la mise à jour échouée:"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:88
+#: ../../Code/Lib/DB_Upgrade.php:88
 #, php-format
 msgid "Update Error at %s"
 msgstr "Erreur de mise à jour sur %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:94
+#: ../../Code/Lib/DB_Upgrade.php:94
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La mise-à-jour %s a échoué. Merci de consulter les journaux d'erreur."
 
-#: ../../Zotlabs/Lib/Libprofile.php:35
+#: ../../Code/Lib/Libprofile.php:35
 msgid "Requested channel is not available."
 msgstr "Canal demandé non disponible."
 
-#: ../../Zotlabs/Lib/Libprofile.php:190
+#: ../../Code/Lib/Libprofile.php:190
 msgid "Create New Profile"
 msgstr "Créer un nouveau profil"
 
-#: ../../Zotlabs/Lib/Libprofile.php:193 ../../include/nav.php:110
+#: ../../Code/Lib/Libprofile.php:193 ../../include/nav.php:110
 msgid "Edit Profile"
 msgstr "Éditeur de profil"
 
-#: ../../Zotlabs/Lib/Libprofile.php:211
+#: ../../Code/Lib/Libprofile.php:211
 msgid "Visible to everybody"
 msgstr "Visible de tous"
 
-#: ../../Zotlabs/Lib/Libprofile.php:289 ../../Zotlabs/Lib/Libprofile.php:445
+#: ../../Code/Lib/Libprofile.php:289 ../../Code/Lib/Libprofile.php:445
 msgid "Gender:"
 msgstr "Sexe :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:290 ../../Zotlabs/Lib/Libprofile.php:493
+#: ../../Code/Lib/Libprofile.php:290 ../../Code/Lib/Libprofile.php:493
 msgid "Status:"
 msgstr "État :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:291 ../../Zotlabs/Lib/Libprofile.php:519
+#: ../../Code/Lib/Libprofile.php:291 ../../Code/Lib/Libprofile.php:519
 msgid "Homepage:"
 msgstr "Site Internet :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:292 ../../Zotlabs/Lib/Libprofile.php:517
+#: ../../Code/Lib/Libprofile.php:292 ../../Code/Lib/Libprofile.php:517
 msgid "Pronouns:"
 msgstr "Pronoms :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:355
+#: ../../Code/Lib/Libprofile.php:355
 msgid "Change your profile photo"
 msgstr "Modifier votre photo de profil"
 
-#: ../../Zotlabs/Lib/Libprofile.php:386
+#: ../../Code/Lib/Libprofile.php:386
 msgid "Trans"
 msgstr "Trans"
 
-#: ../../Zotlabs/Lib/Libprofile.php:388
+#: ../../Code/Lib/Libprofile.php:388
 msgid "Inter"
 msgstr "Intersexe"
 
-#: ../../Zotlabs/Lib/Libprofile.php:404
+#: ../../Code/Lib/Libprofile.php:404
 msgid "She"
 msgstr "Elle"
 
-#: ../../Zotlabs/Lib/Libprofile.php:406
+#: ../../Code/Lib/Libprofile.php:406
 msgid "Him"
 msgstr "Lui"
 
-#: ../../Zotlabs/Lib/Libprofile.php:408
+#: ../../Code/Lib/Libprofile.php:408
 msgid "Them"
 msgstr "Iel"
 
-#: ../../Zotlabs/Lib/Libprofile.php:443
+#: ../../Code/Lib/Libprofile.php:443
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:478
+#: ../../Code/Lib/Libprofile.php:478
 msgid "j F, Y"
 msgstr "j F, Y"
 
-#: ../../Zotlabs/Lib/Libprofile.php:479
+#: ../../Code/Lib/Libprofile.php:479
 msgid "j F"
 msgstr "j F"
 
-#: ../../Zotlabs/Lib/Libprofile.php:486
+#: ../../Code/Lib/Libprofile.php:486
 msgid "Birthday:"
 msgstr "Date de naissance :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:499
+#: ../../Code/Lib/Libprofile.php:499
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "depuis %1$d %2$s"
 
-#: ../../Zotlabs/Lib/Libprofile.php:511
+#: ../../Code/Lib/Libprofile.php:511
 msgid "Tags:"
 msgstr "Étiquettes :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:515
+#: ../../Code/Lib/Libprofile.php:515
 msgid "Sexual Preference:"
 msgstr "Orientation sexuelle :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:523
+#: ../../Code/Lib/Libprofile.php:523
 msgid "Political Views:"
 msgstr "Opinions politiques :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:525
+#: ../../Code/Lib/Libprofile.php:525
 msgid "Religion:"
 msgstr "Religion :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:529
+#: ../../Code/Lib/Libprofile.php:529
 msgid "Hobbies/Interests:"
 msgstr "Occupations/Centres d'intérêt :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:531
+#: ../../Code/Lib/Libprofile.php:531
 msgid "Likes:"
 msgstr "Aime :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:533
+#: ../../Code/Lib/Libprofile.php:533
 msgid "Dislikes:"
 msgstr "N'aime pas :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:535
+#: ../../Code/Lib/Libprofile.php:535
 msgid "Contact information and Social Networks:"
 msgstr "Coordonnées et réseaux sociaux :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:537
+#: ../../Code/Lib/Libprofile.php:537
 msgid "My other channels:"
 msgstr "Mes autres canaux :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:539
+#: ../../Code/Lib/Libprofile.php:539
 msgid "Musical interests:"
 msgstr "Goûts musicaux :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:541
+#: ../../Code/Lib/Libprofile.php:541
 msgid "Books, literature:"
 msgstr "Lectures, goûts littéraires :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:543
+#: ../../Code/Lib/Libprofile.php:543
 msgid "Television:"
 msgstr "Télévision :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:545
+#: ../../Code/Lib/Libprofile.php:545
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cinéma/danse/culture/divertissement&nsbp;:"
 
-#: ../../Zotlabs/Lib/Libprofile.php:547
+#: ../../Code/Lib/Libprofile.php:547
 msgid "Love/Romance:"
 msgstr "Vie sentimentale/amoureuse :"
 
-#: ../../Zotlabs/Lib/Libprofile.php:549
+#: ../../Code/Lib/Libprofile.php:549
 msgid "Work/employment:"
 msgstr "Travail/Occupation "
 
-#: ../../Zotlabs/Lib/Libprofile.php:551
+#: ../../Code/Lib/Libprofile.php:551
 msgid "School/education:"
 msgstr "Études "
 
-#: ../../Zotlabs/Lib/Libprofile.php:574
+#: ../../Code/Lib/Libprofile.php:574
 msgid "Like this thing"
 msgstr "J'aime ceci"
 
-#: ../../Zotlabs/Lib/Connect.php:48 ../../Zotlabs/Lib/Connect.php:144
+#: ../../Code/Lib/Connect.php:48 ../../Code/Lib/Connect.php:144
 msgid "Channel is blocked on this site."
 msgstr "Ce canal est bloqué sur ce site."
 
-#: ../../Zotlabs/Lib/Connect.php:53
+#: ../../Code/Lib/Connect.php:53
 msgid "Channel location missing."
 msgstr "Emplacement du canal introuvable."
 
-#: ../../Zotlabs/Lib/Connect.php:105
+#: ../../Code/Lib/Connect.php:105
 msgid "Remote channel or protocol unavailable."
 msgstr "Canal distant ou protocole indisponible."
 
-#: ../../Zotlabs/Lib/Connect.php:138
+#: ../../Code/Lib/Connect.php:138
 msgid "Channel discovery failed."
 msgstr "La tentative d'accéder au canal a échoué."
 
-#: ../../Zotlabs/Lib/Connect.php:153
+#: ../../Code/Lib/Connect.php:153
 msgid "Protocol not supported"
 msgstr "Protocole non pris en charge"
 
-#: ../../Zotlabs/Lib/Connect.php:166
+#: ../../Code/Lib/Connect.php:166
 msgid "Cannot connect to yourself."
 msgstr "Ne peut pas se connecter à vous."
 
-#: ../../Zotlabs/Lib/Connect.php:244
+#: ../../Code/Lib/Connect.php:244
 msgid "error saving data"
 msgstr "erreur durant l'enregistrement des données"
 
-#: ../../Zotlabs/Lib/Permcat.php:73
+#: ../../Code/Lib/Permcat.php:73
 msgctxt "permcat"
 msgid "default"
 msgstr "défaut"
 
-#: ../../Zotlabs/Lib/Permcat.php:124
+#: ../../Code/Lib/Permcat.php:124
 msgctxt "permcat"
 msgid "follower"
 msgstr "abonné"
 
-#: ../../Zotlabs/Lib/Permcat.php:128
+#: ../../Code/Lib/Permcat.php:128
 msgctxt "permcat"
 msgid "contributor"
 msgstr "contributeur"
 
-#: ../../Zotlabs/Lib/Permcat.php:132
+#: ../../Code/Lib/Permcat.php:132
 msgctxt "permcat"
 msgid "publisher"
 msgstr "rédacteur"
 
-#: ../../Zotlabs/Lib/Activity.php:2213
+#: ../../Code/Lib/Activity.php:2213
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr "Aime %2$s de %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:2216
+#: ../../Code/Lib/Activity.php:2216
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr "N'aime pas %2$s de %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:2222
+#: ../../Code/Lib/Activity.php:2222
 #, php-format
 msgid "Will attend %s's event"
 msgstr "Participera à l'évènement de %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2225
+#: ../../Code/Lib/Activity.php:2225
 #, php-format
 msgid "Will not attend %s's event"
 msgstr "Ne participera pas à l'évènement de %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2228
+#: ../../Code/Lib/Activity.php:2228
 #, php-format
 msgid "May attend %s's event"
 msgstr "Participera peut-être à l'évènement de %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2231
+#: ../../Code/Lib/Activity.php:2231
 #, php-format
 msgid "May not attend %s's event"
 msgstr "Ne participera peut-être pas à l'évènement de %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2656 ../../include/text.php:2842
+#: ../../Code/Lib/Activity.php:2656 ../../include/text.php:2842
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: ../../Zotlabs/Lib/Enotify.php:66
+#: ../../Code/Lib/Enotify.php:66
 msgid "$Projectname Notification"
 msgstr "Notification $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:67
+#: ../../Code/Lib/Enotify.php:67
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:69
+#: ../../Code/Lib/Enotify.php:69
 msgid "Thank You,"
 msgstr "Merci,"
 
-#: ../../Zotlabs/Lib/Enotify.php:71
+#: ../../Code/Lib/Enotify.php:71
 #, php-format
 msgid "%s Administrator"
 msgstr "l'administrateur de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:72
+#: ../../Code/Lib/Enotify.php:72
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr "Cet courriel a été envoyé par %1$s à %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:73
+#: ../../Code/Lib/Enotify.php:73
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
@@ -10065,216 +10065,216 @@ msgstr ""
 "Pour ne plus recevoir ces messages, veuillez ajuster vos paramètres de "
 "notification à %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:74
+#: ../../Code/Lib/Enotify.php:74
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr "Pour ne plus recevoir ces messages, veuillez ajuster votre %s."
 
-#: ../../Zotlabs/Lib/Enotify.php:74
+#: ../../Code/Lib/Enotify.php:74
 msgid "Notification Settings"
 msgstr "Paramètres de notification"
 
-#: ../../Zotlabs/Lib/Enotify.php:129
+#: ../../Code/Lib/Enotify.php:129
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: ../../Zotlabs/Lib/Enotify.php:133
+#: ../../Code/Lib/Enotify.php:133
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname:Notify] Nouveau mail reçu sur %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:136
+#: ../../Code/Lib/Enotify.php:136
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s vous a envoyé un nouveau message privé à %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:137
+#: ../../Code/Lib/Enotify.php:137
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s vous a envoyé %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:137 ../../Zotlabs/Lib/Enotify.php:141
+#: ../../Code/Lib/Enotify.php:137 ../../Code/Lib/Enotify.php:141
 msgid "a private message"
 msgstr "un message privé"
 
-#: ../../Zotlabs/Lib/Enotify.php:140
+#: ../../Code/Lib/Enotify.php:140
 #, php-format
 msgid "%1$s replied to a private message at %2$s."
 msgstr "%1$s a répondu à un message privé à %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:141
+#: ../../Code/Lib/Enotify.php:141
 #, php-format
 msgid "%1$s replied to %2$s."
 msgstr "%1$s a répondu à %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:143
+#: ../../Code/Lib/Enotify.php:143
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Merci de visiter %s pour voir et/ou répondre à vos messages privés."
 
-#: ../../Zotlabs/Lib/Enotify.php:157
+#: ../../Code/Lib/Enotify.php:157
 msgid "commented on"
 msgstr "a commenté"
 
-#: ../../Zotlabs/Lib/Enotify.php:168
+#: ../../Code/Lib/Enotify.php:168
 msgid "liked"
 msgstr "a aimé"
 
-#: ../../Zotlabs/Lib/Enotify.php:171
+#: ../../Code/Lib/Enotify.php:171
 msgid "disliked"
 msgstr "n'a pas aimé"
 
-#: ../../Zotlabs/Lib/Enotify.php:214
+#: ../../Code/Lib/Enotify.php:214
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:222
+#: ../../Code/Lib/Enotify.php:222
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%4$s de %5$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:231
+#: ../../Code/Lib/Enotify.php:231
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]votre %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:243
+#: ../../Code/Lib/Enotify.php:243
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr ""
 "[$Projectname:Notification] Commentaire modéré pour la conversation n°%1$d "
 "par %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:247
+#: ../../Code/Lib/Enotify.php:247
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 "[$Projectname:Notify] Commentaire effectué sur la conversation #%1$d par "
 "%2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:248
+#: ../../Code/Lib/Enotify.php:248
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr "%1$s a commenté un élément ou une conversation que vous suivez."
 
-#: ../../Zotlabs/Lib/Enotify.php:252
+#: ../../Code/Lib/Enotify.php:252
 msgid "(Moderated)"
 msgstr "(Modéré)"
 
-#: ../../Zotlabs/Lib/Enotify.php:255 ../../Zotlabs/Lib/Enotify.php:336
-#: ../../Zotlabs/Lib/Enotify.php:362 ../../Zotlabs/Lib/Enotify.php:392
-#: ../../Zotlabs/Lib/Enotify.php:409 ../../Zotlabs/Lib/Enotify.php:422
+#: ../../Code/Lib/Enotify.php:255 ../../Code/Lib/Enotify.php:336
+#: ../../Code/Lib/Enotify.php:362 ../../Code/Lib/Enotify.php:392
+#: ../../Code/Lib/Enotify.php:409 ../../Code/Lib/Enotify.php:422
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Merci de visiter %s pour voir et/ou répondre sur cette conversation."
 
-#: ../../Zotlabs/Lib/Enotify.php:259 ../../Zotlabs/Lib/Enotify.php:260
+#: ../../Code/Lib/Enotify.php:259 ../../Code/Lib/Enotify.php:260
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Merci de visiter %s pour valider ou rejeter ce commentaire."
 
-#: ../../Zotlabs/Lib/Enotify.php:318
+#: ../../Code/Lib/Enotify.php:318
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr "%1$s aime [zrl=%2$s]votre %3$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:332
+#: ../../Code/Lib/Enotify.php:332
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Aime reçu à la convesation #%1$d par %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:333
+#: ../../Code/Lib/Enotify.php:333
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr "%1$sa commenté un élément ou une conversation que vous avez créée "
 
-#: ../../Zotlabs/Lib/Enotify.php:344
+#: ../../Code/Lib/Enotify.php:344
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Notify] %s a publié sur le mur de votre profil"
 
-#: ../../Zotlabs/Lib/Enotify.php:350
+#: ../../Code/Lib/Enotify.php:350
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s a posté sur le mur de votre profil à %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:352
+#: ../../Code/Lib/Enotify.php:352
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$s envoyé à [zrl=%2$s]votre mur[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:358 ../../Zotlabs/Lib/Enotify.php:359
+#: ../../Code/Lib/Enotify.php:358 ../../Code/Lib/Enotify.php:359
 msgid " - "
 msgstr "-"
 
-#: ../../Zotlabs/Lib/Enotify.php:358 ../../Zotlabs/Lib/Enotify.php:359
+#: ../../Code/Lib/Enotify.php:358 ../../Code/Lib/Enotify.php:359
 msgid "Moderated"
 msgstr "Modéré"
 
-#: ../../Zotlabs/Lib/Enotify.php:367 ../../Zotlabs/Lib/Enotify.php:368
+#: ../../Code/Lib/Enotify.php:367 ../../Code/Lib/Enotify.php:368
 #, php-format
 msgid "Please visit %s to approve or reject this post."
 msgstr "Merci de visiter %s pour valider ou rejeter cette publication."
 
-#: ../../Zotlabs/Lib/Enotify.php:386
+#: ../../Code/Lib/Enotify.php:386
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Notify] %s vous a étiquetté"
 
-#: ../../Zotlabs/Lib/Enotify.php:387
+#: ../../Code/Lib/Enotify.php:387
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s vous a étiqueté à %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Code/Lib/Enotify.php:388
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s [zrl=%2$s]vous a étiqueté[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:399
+#: ../../Code/Lib/Enotify.php:399
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Notify] %1$s vous a poké"
 
-#: ../../Zotlabs/Lib/Enotify.php:400
+#: ../../Code/Lib/Enotify.php:400
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s vous a tapoté à %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:401
+#: ../../Code/Lib/Enotify.php:401
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s]vous a tapoté[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Code/Lib/Enotify.php:416
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Notify] %s a étiquetté votre publication"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Code/Lib/Enotify.php:417
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s a étiqueté votre message à %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:418
+#: ../../Code/Lib/Enotify.php:418
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s a étiqueté [zrl=%2$s]votre message[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:429
+#: ../../Code/Lib/Enotify.php:429
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Notify] Demande de relation reçue"
 
-#: ../../Zotlabs/Lib/Enotify.php:430
+#: ../../Code/Lib/Enotify.php:430
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr ""
 "Vous avez reçu une nouvelle demande d'ajout de connexion de la part de '%1$s'"
 " à %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:431
+#: ../../Code/Lib/Enotify.php:431
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr ""
@@ -10282,334 +10282,334 @@ msgstr ""
 " la part "
 "de %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:434 ../../Zotlabs/Lib/Enotify.php:452
+#: ../../Code/Lib/Enotify.php:434 ../../Code/Lib/Enotify.php:452
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Vous pouvez visiter leur profil sur %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:436
+#: ../../Code/Lib/Enotify.php:436
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 "Merci de visiter %s pour valider (ou non) cette demande d'ajout de connexion."
 
-#: ../../Zotlabs/Lib/Enotify.php:443
+#: ../../Code/Lib/Enotify.php:443
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Notify] Suggestion d'amitié reçue"
 
-#: ../../Zotlabs/Lib/Enotify.php:444
+#: ../../Code/Lib/Enotify.php:444
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Vous avez reçu une suggestion d'ami de la part de '%1$s' à %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:445
+#: ../../Code/Lib/Enotify.php:445
 #, php-format
 msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr "Vous avez reçu [zrl=%1$s]une suggestion d'ami[/zrl] pour %2$s de %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:450
+#: ../../Code/Lib/Enotify.php:450
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../../Zotlabs/Lib/Enotify.php:451
+#: ../../Code/Lib/Enotify.php:451
 msgid "Photo:"
 msgstr "Photo :"
 
-#: ../../Zotlabs/Lib/Enotify.php:454
+#: ../../Code/Lib/Enotify.php:454
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Merci de visiter %s pour valider ou rejeter cette suggestion."
 
-#: ../../Zotlabs/Lib/Enotify.php:704
+#: ../../Code/Lib/Enotify.php:704
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Notify]"
 
-#: ../../Zotlabs/Lib/Enotify.php:887
+#: ../../Code/Lib/Enotify.php:887
 msgid "created a new post"
 msgstr "a publié un nouveau message"
 
-#: ../../Zotlabs/Lib/Enotify.php:888
+#: ../../Code/Lib/Enotify.php:888
 #, php-format
 msgid "reacted to %s's conversation"
 msgstr "a réagi à la conversation de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:890
+#: ../../Code/Lib/Enotify.php:890
 #, php-format
 msgid "shared %s's post"
 msgstr "a partagé la publication de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:894
+#: ../../Code/Lib/Enotify.php:894
 msgid "sent a direct message"
 msgstr "a envoyé un message direct"
 
-#: ../../Zotlabs/Lib/Enotify.php:901
+#: ../../Code/Lib/Enotify.php:901
 #, php-format
 msgid "edited a post dated %s"
 msgstr "a édité un post daté du %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:905
+#: ../../Code/Lib/Enotify.php:905
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "a édité un commentaire daté du %s"
 
-#: ../../Zotlabs/Lib/Apps.php:310
+#: ../../Code/Lib/Apps.php:310
 msgid "Apps"
 msgstr "Applications"
 
-#: ../../Zotlabs/Lib/Apps.php:312
+#: ../../Code/Lib/Apps.php:312
 msgid "Virtual Lists"
 msgstr "Listes virtuelles"
 
-#: ../../Zotlabs/Lib/Apps.php:313
+#: ../../Code/Lib/Apps.php:313
 msgid "Markup"
 msgstr "Balisage"
 
-#: ../../Zotlabs/Lib/Apps.php:314 ../../include/nav.php:476
+#: ../../Code/Lib/Apps.php:314 ../../include/nav.php:476
 #: ../../include/features.php:136
 msgid "Articles"
 msgstr "Articles"
 
-#: ../../Zotlabs/Lib/Apps.php:318
+#: ../../Code/Lib/Apps.php:318
 msgid "Clients"
 msgstr "Clients"
 
-#: ../../Zotlabs/Lib/Apps.php:319
+#: ../../Code/Lib/Apps.php:319
 msgid "Site Admin"
 msgstr "Administrateur"
 
-#: ../../Zotlabs/Lib/Apps.php:320
+#: ../../Code/Lib/Apps.php:320
 msgid "Content Filter"
 msgstr "Filtre de contenu"
 
-#: ../../Zotlabs/Lib/Apps.php:322
+#: ../../Code/Lib/Apps.php:322
 msgid "Report Bug"
 msgstr "Reporter des bogues"
 
-#: ../../Zotlabs/Lib/Apps.php:323
+#: ../../Code/Lib/Apps.php:323
 msgid "View Bookmarks"
 msgstr "Voir les marques-pages"
 
-#: ../../Zotlabs/Lib/Apps.php:327
+#: ../../Code/Lib/Apps.php:327
 msgid "Expire Posts"
 msgstr "Expiration des publications"
 
-#: ../../Zotlabs/Lib/Apps.php:328
+#: ../../Code/Lib/Apps.php:328
 msgid "Future Posting"
 msgstr "Publications programmées"
 
-#: ../../Zotlabs/Lib/Apps.php:329
+#: ../../Code/Lib/Apps.php:329
 msgid "Remote Diagnostics"
 msgstr "Diagnostics à distance"
 
-#: ../../Zotlabs/Lib/Apps.php:332
+#: ../../Code/Lib/Apps.php:332
 msgid "Channel Manager"
 msgstr "Gérer mes canaux"
 
-#: ../../Zotlabs/Lib/Apps.php:334
+#: ../../Code/Lib/Apps.php:334
 msgid "Stream"
 msgstr "Flux"
 
-#: ../../Zotlabs/Lib/Apps.php:335
+#: ../../Code/Lib/Apps.php:335
 msgid "Secrets"
 msgstr "Secrets"
 
-#: ../../Zotlabs/Lib/Apps.php:337
+#: ../../Code/Lib/Apps.php:337
 msgid "Sites"
 msgstr "Sites"
 
-#: ../../Zotlabs/Lib/Apps.php:340 ../../include/nav.php:503
+#: ../../Code/Lib/Apps.php:340 ../../include/nav.php:503
 #: ../../include/conversation.php:2043
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:341
+#: ../../Code/Lib/Apps.php:341
 msgid "Channel Home"
 msgstr "Mon canal"
 
-#: ../../Zotlabs/Lib/Apps.php:344
+#: ../../Code/Lib/Apps.php:344
 msgid "Photomap"
 msgstr "Géolocalisation photo"
 
-#: ../../Zotlabs/Lib/Apps.php:347
+#: ../../Code/Lib/Apps.php:347
 msgid "No Comment"
 msgstr "Sans commentaires"
 
-#: ../../Zotlabs/Lib/Apps.php:349 ../../include/help.php:50
+#: ../../Code/Lib/Apps.php:349 ../../include/help.php:50
 #: ../../include/nav.php:167 ../../include/nav.php:289
 msgid "Help"
 msgstr "Aide"
 
-#: ../../Zotlabs/Lib/Apps.php:350
+#: ../../Code/Lib/Apps.php:350
 msgid "Mail"
 msgstr "Messages"
 
-#: ../../Zotlabs/Lib/Apps.php:353
+#: ../../Code/Lib/Apps.php:353
 msgid "Chat"
 msgstr "Clavardage"
 
-#: ../../Zotlabs/Lib/Apps.php:356
+#: ../../Code/Lib/Apps.php:356
 msgid "Probe"
 msgstr "Sonder"
 
-#: ../../Zotlabs/Lib/Apps.php:357
+#: ../../Code/Lib/Apps.php:357
 msgid "Suggest"
 msgstr "Suggérer"
 
-#: ../../Zotlabs/Lib/Apps.php:358
+#: ../../Code/Lib/Apps.php:358
 msgid "Random Channel"
 msgstr "Un canal au hasard"
 
-#: ../../Zotlabs/Lib/Apps.php:359
+#: ../../Code/Lib/Apps.php:359
 msgid "Invite"
 msgstr "Invitation"
 
-#: ../../Zotlabs/Lib/Apps.php:360
+#: ../../Code/Lib/Apps.php:360
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: ../../Zotlabs/Lib/Apps.php:361
+#: ../../Code/Lib/Apps.php:361
 msgid "Language"
 msgstr "Langue"
 
-#: ../../Zotlabs/Lib/Apps.php:362
+#: ../../Code/Lib/Apps.php:362
 msgid "Post"
 msgstr "Envoyer"
 
-#: ../../Zotlabs/Lib/Apps.php:364
+#: ../../Code/Lib/Apps.php:364
 msgid "Profile Photo"
 msgstr "Photo du Profil"
 
-#: ../../Zotlabs/Lib/Apps.php:366
+#: ../../Code/Lib/Apps.php:366
 msgid "Profiles"
 msgstr "Profils"
 
-#: ../../Zotlabs/Lib/Apps.php:369
+#: ../../Code/Lib/Apps.php:369
 msgid "Order Apps"
 msgstr "Classer les applications"
 
-#: ../../Zotlabs/Lib/Apps.php:370
+#: ../../Code/Lib/Apps.php:370
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../../Zotlabs/Lib/Apps.php:371
+#: ../../Code/Lib/Apps.php:371
 msgid "CardDAV"
 msgstr "CardDAV"
 
-#: ../../Zotlabs/Lib/Apps.php:374
+#: ../../Code/Lib/Apps.php:374
 msgid "Guest Access"
 msgstr "Accès invité"
 
-#: ../../Zotlabs/Lib/Apps.php:376
+#: ../../Code/Lib/Apps.php:376
 msgid "OAuth Apps Manager"
 msgstr "Gestion des applications OAuth"
 
-#: ../../Zotlabs/Lib/Apps.php:377
+#: ../../Code/Lib/Apps.php:377
 msgid "OAuth2 Apps Manager"
 msgstr "Gestion des applications OAuth2"
 
-#: ../../Zotlabs/Lib/Apps.php:378
+#: ../../Code/Lib/Apps.php:378
 msgid "PDL Editor"
 msgstr "Éditeur de PDL"
 
-#: ../../Zotlabs/Lib/Apps.php:380
+#: ../../Code/Lib/Apps.php:380
 msgid "Premium Channel"
 msgstr "Canal VIP"
 
-#: ../../Zotlabs/Lib/Apps.php:382
+#: ../../Code/Lib/Apps.php:382
 msgid "My Chatrooms"
 msgstr "Mes salons de clavardage"
 
-#: ../../Zotlabs/Lib/Apps.php:574
+#: ../../Code/Lib/Apps.php:574
 msgid "Purchase"
 msgstr "Acheter"
 
-#: ../../Zotlabs/Lib/Apps.php:579
+#: ../../Code/Lib/Apps.php:579
 msgid "Undelete"
 msgstr "Restaurer"
 
-#: ../../Zotlabs/Lib/Apps.php:589
+#: ../../Code/Lib/Apps.php:589
 msgid "Add to app-tray"
 msgstr "Ajouter au menu des applications"
 
-#: ../../Zotlabs/Lib/Apps.php:590
+#: ../../Code/Lib/Apps.php:590
 msgid "Remove from app-tray"
 msgstr "Enlever du menu des applications"
 
-#: ../../Zotlabs/Lib/Apps.php:591
+#: ../../Code/Lib/Apps.php:591
 msgid "Pin to navbar"
 msgstr "Épingler à la barre de navigation"
 
-#: ../../Zotlabs/Lib/Apps.php:592
+#: ../../Code/Lib/Apps.php:592
 msgid "Unpin from navbar"
 msgstr "Détacher de la barre de navigation"
 
-#: ../../Zotlabs/Lib/Chatroom.php:25
+#: ../../Code/Lib/Chatroom.php:25
 msgid "Missing room name"
 msgstr "Il manque le nom du salon"
 
-#: ../../Zotlabs/Lib/Chatroom.php:34
+#: ../../Code/Lib/Chatroom.php:34
 msgid "Duplicate room name"
 msgstr "Un salon avec ce nom existe déjà"
 
-#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92
+#: ../../Code/Lib/Chatroom.php:84 ../../Code/Lib/Chatroom.php:92
 msgid "Invalid room specifier."
 msgstr "Identifiant de salon invalide."
 
-#: ../../Zotlabs/Lib/Chatroom.php:124
+#: ../../Code/Lib/Chatroom.php:124
 msgid "Room not found."
 msgstr "Salon introuvable."
 
-#: ../../Zotlabs/Lib/Chatroom.php:145
+#: ../../Code/Lib/Chatroom.php:145
 msgid "Room is full"
 msgstr "Le salon est plein"
 
-#: ../../Zotlabs/Lib/Libzot.php:718
+#: ../../Code/Lib/Libzot.php:718
 msgid "Unable to verify channel signature"
 msgstr "Impossible de vérifier la signature du canal"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../Code/Lib/PermissionDescription.php:34
 #: ../../include/acl_selectors.php:34
 msgid "Visible to your default audience"
 msgstr "Visible seulement pour votre audience par défaut"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../Code/Lib/PermissionDescription.php:107
 #: ../../include/acl_selectors.php:121
 msgid "Only me"
 msgstr "Seulement moi"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Code/Lib/PermissionDescription.php:108
 msgid "Public"
 msgstr "Public"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#: ../../Code/Lib/PermissionDescription.php:109
 msgid "Anybody in the $Projectname network"
 msgstr "N'importe appartenant au réseau de $Projectname"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#: ../../Code/Lib/PermissionDescription.php:110
 #, php-format
 msgid "Any account on %s"
 msgstr "N'importe quel compte sur %s"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
+#: ../../Code/Lib/PermissionDescription.php:111
 msgid "Any of my connections"
 msgstr "N'importe laquelle de mes connexions"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
+#: ../../Code/Lib/PermissionDescription.php:112
 msgid "Only connections I specifically allow"
 msgstr "Uniquement les connexions que j'ai expressément autorisés"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
+#: ../../Code/Lib/PermissionDescription.php:113
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr ""
 "N'importe qui d'authentifié (cela peut inclure des visiteurs d'autres "
 "réseaux)"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
+#: ../../Code/Lib/PermissionDescription.php:114
 msgid "Any connections including those who haven't yet been approved"
 msgstr ""
 "N'importe quelle connexion, y compris celles qui n'ont pas encore été validées"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
+#: ../../Code/Lib/PermissionDescription.php:150
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
@@ -10617,309 +10617,309 @@ msgstr ""
 "Ceci est votre réglage par défaut définissant l'audience de vos publications"
 " sur votre canal normal."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
+#: ../../Code/Lib/PermissionDescription.php:151
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr ""
 "Ceci est votre réglage par défaut définissant qui peut voir votre profil de "
 "canal par défaut."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
+#: ../../Code/Lib/PermissionDescription.php:152
 msgid "This is your default setting for who can view your connections"
 msgstr ""
 "Ceci est votre réglage par défaut définissant qui peut voir vos connexions."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
+#: ../../Code/Lib/PermissionDescription.php:153
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr ""
 "Ceci est votre réglage par défaut définissant qui peut voir vos fichiers ou "
 "photos"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
+#: ../../Code/Lib/PermissionDescription.php:154
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 "Ceci est votre réglage par défaut définissant l'audience de vos pages web."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:113 ../../include/conversation.php:705
+#: ../../Code/Lib/ThreadItem.php:113 ../../include/conversation.php:705
 msgid "Private Message"
 msgstr "Message Privé"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:164 ../../include/conversation.php:695
+#: ../../Code/Lib/ThreadItem.php:164 ../../include/conversation.php:695
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../Code/Lib/ThreadItem.php:191
 msgid "I will attend"
 msgstr "Je participerai"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../Code/Lib/ThreadItem.php:191
 msgid "I will not attend"
 msgstr "Je ne participerai pas"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../Code/Lib/ThreadItem.php:191
 msgid "I might attend"
 msgstr "Je participerai peut-être"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:259 ../../include/conversation.php:712
+#: ../../Code/Lib/ThreadItem.php:259 ../../include/conversation.php:712
 msgid "Message signature validated"
 msgstr "Signature du message validée"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:260 ../../include/conversation.php:713
+#: ../../Code/Lib/ThreadItem.php:260 ../../include/conversation.php:713
 msgid "Message signature incorrect"
 msgstr "Signature du message incorrecte"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:266
+#: ../../Code/Lib/ThreadItem.php:266
 msgid "Add Tag"
 msgstr "Ajouter une étiquette"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:284 ../../include/taxonomy.php:589
+#: ../../Code/Lib/ThreadItem.php:284 ../../include/taxonomy.php:589
 msgid "like"
 msgstr "aiment"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../include/taxonomy.php:590
+#: ../../Code/Lib/ThreadItem.php:285 ../../include/taxonomy.php:590
 msgid "dislike"
 msgstr "n'aiment pas"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:289
+#: ../../Code/Lib/ThreadItem.php:289
 msgid "Repeat This"
 msgstr "Répéter"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290
+#: ../../Code/Lib/ThreadItem.php:290
 msgid "Share this"
 msgstr "Partager"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:300
+#: ../../Code/Lib/ThreadItem.php:300
 msgid "Delivery Report"
 msgstr "Rapport de distribution"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:330
+#: ../../Code/Lib/ThreadItem.php:330
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commentaire"
 msgstr[1] "%d commentaires"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:331
+#: ../../Code/Lib/ThreadItem.php:331
 #, php-format
 msgid "%d unseen"
 msgstr "%d à decouvrir"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:369 ../../Zotlabs/Lib/ThreadItem.php:370
+#: ../../Code/Lib/ThreadItem.php:369 ../../Code/Lib/ThreadItem.php:370
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Voir le profil de %s - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:373
+#: ../../Code/Lib/ThreadItem.php:373
 msgid "to"
 msgstr "à"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:374 ../../include/conversation.php:773
+#: ../../Code/Lib/ThreadItem.php:374 ../../include/conversation.php:773
 msgid "via"
 msgstr "via"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:375
+#: ../../Code/Lib/ThreadItem.php:375
 msgid "Wall-to-Wall"
 msgstr "Mur-à-mur"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:376
+#: ../../Code/Lib/ThreadItem.php:376
 msgid "via Wall-To-Wall:"
 msgstr "par Mur-à-mur :"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:390 ../../include/conversation.php:776
+#: ../../Code/Lib/ThreadItem.php:390 ../../include/conversation.php:776
 #, php-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:393 ../../include/conversation.php:779
+#: ../../Code/Lib/ThreadItem.php:393 ../../include/conversation.php:779
 #, php-format
 msgid "last edited: %s"
 msgstr "dernière modification : %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:394 ../../include/conversation.php:780
+#: ../../Code/Lib/ThreadItem.php:394 ../../include/conversation.php:780
 #, php-format
 msgid "Expires: %s"
 msgstr "Expire : %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:403
+#: ../../Code/Lib/ThreadItem.php:403
 msgid "Attend"
 msgstr "En attente"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:404
+#: ../../Code/Lib/ThreadItem.php:404
 msgid "Attendance Options"
 msgstr "Options d'attente"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:405
+#: ../../Code/Lib/ThreadItem.php:405
 msgid "Vote"
 msgstr "Vote"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:406
+#: ../../Code/Lib/ThreadItem.php:406
 msgid "Voting Options"
 msgstr "Options de vote"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:407
+#: ../../Code/Lib/ThreadItem.php:407
 msgid "Reply"
 msgstr "Répondre"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:432 ../../include/conversation.php:795
+#: ../../Code/Lib/ThreadItem.php:432 ../../include/conversation.php:795
 msgid "Pinned post"
 msgstr "Publication épinglée"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:434 ../../include/conversation.php:797
+#: ../../Code/Lib/ThreadItem.php:434 ../../include/conversation.php:797
 #: ../../include/js_strings.php:38
 msgid "Unpin this post"
 msgstr "Épingler cette publication"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:434 ../../include/conversation.php:797
+#: ../../Code/Lib/ThreadItem.php:434 ../../include/conversation.php:797
 #: ../../include/js_strings.php:37
 msgid "Pin this post"
 msgstr "Détacher cette publication"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:435
+#: ../../Code/Lib/ThreadItem.php:435
 msgid "Save Bookmarks"
 msgstr "Enregistrer les favoris"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:436
+#: ../../Code/Lib/ThreadItem.php:436
 msgid "Add to Calendar"
 msgstr "Ajouter au Calendrier"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:465 ../../include/conversation.php:482
+#: ../../Code/Lib/ThreadItem.php:465 ../../include/conversation.php:482
 msgid "This is an unsaved preview"
 msgstr "Il s'agit d'une prévisualisation non sauvegardée."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:549 ../../include/js_strings.php:7
+#: ../../Code/Lib/ThreadItem.php:549 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s montre tout"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:905 ../../include/conversation.php:1407
+#: ../../Code/Lib/ThreadItem.php:905 ../../include/conversation.php:1407
 msgid "Bold"
 msgstr "Gras"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:906 ../../include/conversation.php:1408
+#: ../../Code/Lib/ThreadItem.php:906 ../../include/conversation.php:1408
 msgid "Italic"
 msgstr "Italique"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:907 ../../include/conversation.php:1409
+#: ../../Code/Lib/ThreadItem.php:907 ../../include/conversation.php:1409
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:908 ../../include/conversation.php:1410
+#: ../../Code/Lib/ThreadItem.php:908 ../../include/conversation.php:1410
 msgid "Quote"
 msgstr "Citation"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:909 ../../include/conversation.php:1411
+#: ../../Code/Lib/ThreadItem.php:909 ../../include/conversation.php:1411
 msgid "Code"
 msgstr "Code"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:910
+#: ../../Code/Lib/ThreadItem.php:910
 msgid "Image"
 msgstr "Image"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:911 ../../include/conversation.php:1412
+#: ../../Code/Lib/ThreadItem.php:911 ../../include/conversation.php:1412
 msgid "Attach/Upload file"
 msgstr "Joindre/Téléverser un fichier"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:912
+#: ../../Code/Lib/ThreadItem.php:912
 msgid "Insert Link"
 msgstr "Insérer un lien"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:913
+#: ../../Code/Lib/ThreadItem.php:913
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:925
+#: ../../Code/Lib/ThreadItem.php:925
 msgid "Your full name (required)"
 msgstr "Votre nom complet (obligatoire)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:926
+#: ../../Code/Lib/ThreadItem.php:926
 msgid "Your email address (required)"
 msgstr "Votre adresse de courriel (obligatoire)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:927
+#: ../../Code/Lib/ThreadItem.php:927
 msgid "Your website URL (optional)"
 msgstr "L'adresse de votre site web (optionelle)"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Code/Access/Permissions.php:56
 msgid "Grant viewing access to and delivery of your channel stream and posts"
 msgstr "Peut voir mon canal et mes publications"
 
-#: ../../Zotlabs/Access/Permissions.php:57
+#: ../../Code/Access/Permissions.php:57
 msgid "Grant viewing access to your default channel profile"
 msgstr "Peut voir le profil par défaut de mon canal"
 
-#: ../../Zotlabs/Access/Permissions.php:58
+#: ../../Code/Access/Permissions.php:58
 msgid "Grant viewing access to your address book (connections)"
 msgstr "Peut voir mon carnet d'adresses (connexions)"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Code/Access/Permissions.php:59
 msgid "Grant viewing access to your file storage and photos"
 msgstr "Peut voir mes fichiers et photos"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Code/Access/Permissions.php:60
 msgid "Grant permission to post on your channel (wall) page"
 msgstr "Peut poster sur mon canal (\"mur\")"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Code/Access/Permissions.php:61
 msgid "Accept delivery of their posts and all comments to their posts"
 msgstr ""
 "Peut m'envoyer ses publications et les commentaires sur ses publications"
 
-#: ../../Zotlabs/Access/Permissions.php:62
+#: ../../Code/Access/Permissions.php:62
 msgid "Accept delivery of their comments and likes on your posts"
 msgstr "Peuvent commenter et/ou réagir à mes publications"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Code/Access/Permissions.php:63
 msgid "Grant upload permissions to your file storage and photos"
 msgstr "Peut téléverser des documents vers mes fichiers et photos"
 
-#: ../../Zotlabs/Access/Permissions.php:64
+#: ../../Code/Access/Permissions.php:64
 msgid "Grant permission to republish/mirror your posts"
 msgstr "Peut partager mes publications"
 
-#: ../../Zotlabs/Access/Permissions.php:65
+#: ../../Code/Access/Permissions.php:65
 msgid "Accept comments and wall posts only after approval (moderation)"
 msgstr ""
 "Peut commenter ou publier sur mon canal uniquement après validation "
 "(modération)"
 
-#: ../../Zotlabs/Access/Permissions.php:66
+#: ../../Code/Access/Permissions.php:66
 msgid "Grant channel administration (delegation) permission"
 msgstr "Peut administrer mon canal"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:176
+#: ../../Code/Access/PermissionRoles.php:176
 msgid "Social Networking"
 msgstr "Réseau social"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:177
+#: ../../Code/Access/PermissionRoles.php:177
 msgid "Social - Normal"
 msgstr "Social - Principalement public"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:178
+#: ../../Code/Access/PermissionRoles.php:178
 msgid "Social - Restricted"
 msgstr "Social - Restreint"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:181
+#: ../../Code/Access/PermissionRoles.php:181
 msgid "Community Group"
 msgstr "Groupe / Communauté"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:182
+#: ../../Code/Access/PermissionRoles.php:182
 msgid "Group - Normal"
 msgstr "Groupe - Principalement public"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:183
+#: ../../Code/Access/PermissionRoles.php:183
 msgid "Group - Restricted"
 msgstr "Groupe - Restreint"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:184
+#: ../../Code/Access/PermissionRoles.php:184
 msgid "Group - Moderated"
 msgstr "Groupe - Modéré"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:188
+#: ../../Code/Access/PermissionRoles.php:188
 msgid "Collection - Normal"
 msgstr "Collection - Principalement publique"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:189
+#: ../../Code/Access/PermissionRoles.php:189
 msgid "Collection - Restricted"
 msgstr "Collection - Restreinte"
 
diff --git a/view/he/messages.po b/view/he/messages.po
index 4d98b8133..69a8a5d96 100644
--- a/view/he/messages.po
+++ b/view/he/messages.po
@@ -19,206 +19,206 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
+#: ../../Code/Storage/Browser.php:107 ../../Code/Storage/Browser.php:239
 msgid "parent"
 msgstr "הורה"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2621
+#: ../../Code/Storage/Browser.php:131 ../../include/text.php:2621
 msgid "Collection"
 msgstr "אוסף"
 
-#: ../../Zotlabs/Storage/Browser.php:134
+#: ../../Code/Storage/Browser.php:134
 msgid "Principal"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:137
+#: ../../Code/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "פנקס כתובות"
 
-#: ../../Zotlabs/Storage/Browser.php:140
+#: ../../Code/Storage/Browser.php:140
 msgid "Calendar"
 msgstr "לוח שנה"
 
-#: ../../Zotlabs/Storage/Browser.php:143
+#: ../../Code/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "תיבת דואר נכנס מתוזמנת"
 
-#: ../../Zotlabs/Storage/Browser.php:146
+#: ../../Code/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "תיבת דואר יוצא מתוזמנת"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243
-#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:489
-#: ../../Zotlabs/Lib/Apps.php:564 ../../include/conversation.php:1035
+#: ../../Code/Storage/Browser.php:164 ../../Code/Module/Photos.php:798
+#: ../../Code/Module/Photos.php:1243
+#: ../../Code/Module/Embedphotos.php:147 ../../Code/Lib/Apps.php:489
+#: ../../Code/Lib/Apps.php:564 ../../include/conversation.php:1035
 #: ../../include/widgets.php:1578
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/conversation.php:1654
+#: ../../Code/Storage/Browser.php:226 ../../Code/Module/Fbrowser.php:85
+#: ../../Code/Lib/Apps.php:216 ../../include/conversation.php:1654
 #: ../../include/nav.php:93
 msgid "Files"
 msgstr "קבצים"
 
-#: ../../Zotlabs/Storage/Browser.php:227
+#: ../../Code/Storage/Browser.php:227
 msgid "Total"
 msgstr "סה״כ"
 
-#: ../../Zotlabs/Storage/Browser.php:229
+#: ../../Code/Storage/Browser.php:229
 msgid "Shared"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:194
+#: ../../Code/Storage/Browser.php:230 ../../Code/Storage/Browser.php:306
+#: ../../Code/Module/Blocks.php:159 ../../Code/Module/Layouts.php:184
+#: ../../Code/Module/Menu.php:118 ../../Code/Module/New_channel.php:142
+#: ../../Code/Module/Webpages.php:194
 msgid "Create"
 msgstr "צור"
 
-#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
-#: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368
-#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1591
+#: ../../Code/Storage/Browser.php:231 ../../Code/Storage/Browser.php:308
+#: ../../Code/Module/Cover_photo.php:357
+#: ../../Code/Module/Photos.php:825 ../../Code/Module/Photos.php:1364
+#: ../../Code/Module/Profile_photo.php:368
+#: ../../Code/Module/Embedphotos.php:159 ../../include/widgets.php:1591
 msgid "Upload"
 msgstr "העלאה"
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
-#: ../../Zotlabs/Module/Sharedwithme.php:99
+#: ../../Code/Storage/Browser.php:235 ../../Code/Module/Chat.php:247
+#: ../../Code/Module/Admin.php:1223 ../../Code/Module/Settings.php:592
+#: ../../Code/Module/Settings.php:618
+#: ../../Code/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "שם"
 
-#: ../../Zotlabs/Storage/Browser.php:236
+#: ../../Code/Storage/Browser.php:236
 msgid "Type"
 msgstr "טיפוס"
 
-#: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Code/Storage/Browser.php:237
+#: ../../Code/Module/Sharedwithme.php:101 ../../include/text.php:1344
 msgid "Size"
 msgstr "גודל"
 
-#: ../../Zotlabs/Storage/Browser.php:238
-#: ../../Zotlabs/Module/Sharedwithme.php:102
+#: ../../Code/Storage/Browser.php:238
+#: ../../Code/Module/Sharedwithme.php:102
 msgid "Last Modified"
 msgstr "שונה לאחרונה"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Editblock.php:109
-#: ../../Zotlabs/Module/Connections.php:290
-#: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:195
-#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../Zotlabs/Lib/Apps.php:340
+#: ../../Code/Storage/Browser.php:240 ../../Code/Module/Blocks.php:160
+#: ../../Code/Module/Editblock.php:109
+#: ../../Code/Module/Connections.php:290
+#: ../../Code/Module/Connections.php:310
+#: ../../Code/Module/Editpost.php:84
+#: ../../Code/Module/Editlayout.php:114
+#: ../../Code/Module/Editwebpage.php:146
+#: ../../Code/Module/Layouts.php:192 ../../Code/Module/Menu.php:112
+#: ../../Code/Module/Admin.php:2113 ../../Code/Module/Settings.php:652
+#: ../../Code/Module/Thing.php:260 ../../Code/Module/Webpages.php:195
+#: ../../Code/Lib/ThreadItem.php:106 ../../Code/Lib/Apps.php:340
 #: ../../include/channel.php:918 ../../include/channel.php:922
 #: ../../include/menu.php:108 ../../include/page_widgets.php:9
 #: ../../include/page_widgets.php:39
 msgid "Edit"
 msgstr "ערוך"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Connedit.php:578
-#: ../../Zotlabs/Module/Editblock.php:134
-#: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
-#: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:197 ../../Zotlabs/Lib/ThreadItem.php:126
-#: ../../Zotlabs/Lib/Apps.php:341 ../../include/conversation.php:660
+#: ../../Code/Storage/Browser.php:241 ../../Code/Module/Blocks.php:162
+#: ../../Code/Module/Connedit.php:578
+#: ../../Code/Module/Editblock.php:134
+#: ../../Code/Module/Connections.php:263
+#: ../../Code/Module/Editlayout.php:137
+#: ../../Code/Module/Editwebpage.php:170 ../../Code/Module/Group.php:177
+#: ../../Code/Module/Photos.php:1173 ../../Code/Module/Admin.php:1039
+#: ../../Code/Module/Admin.php:1213 ../../Code/Module/Admin.php:2114
+#: ../../Code/Module/Settings.php:653 ../../Code/Module/Thing.php:261
+#: ../../Code/Module/Webpages.php:197 ../../Code/Lib/ThreadItem.php:126
+#: ../../Code/Lib/Apps.php:341 ../../include/conversation.php:660
 msgid "Delete"
 msgstr "מחק"
 
-#: ../../Zotlabs/Storage/Browser.php:285
+#: ../../Code/Storage/Browser.php:285
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "הינך משתמש ב- %1$s מתוך שטח אחסון קבצים זמין."
 
-#: ../../Zotlabs/Storage/Browser.php:290
+#: ../../Code/Storage/Browser.php:290
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "הינך משתמש ב- %1$s מתוך %2$s שטח אחסון קבצים זמין. (%3$s%)"
 
-#: ../../Zotlabs/Storage/Browser.php:302
+#: ../../Code/Storage/Browser.php:302
 msgid "WARNING:"
 msgstr "אזהרה:"
 
-#: ../../Zotlabs/Storage/Browser.php:305
+#: ../../Code/Storage/Browser.php:305
 msgid "Create new folder"
 msgstr "צור תיקייה חדשה"
 
-#: ../../Zotlabs/Storage/Browser.php:307
+#: ../../Code/Storage/Browser.php:307
 msgid "Upload file"
 msgstr "העלה קובץ"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../Code/Web/WebServer.php:120 ../../Code/Module/Dreport.php:10
+#: ../../Code/Module/Dreport.php:49 ../../Code/Module/Group.php:72
+#: ../../Code/Module/Like.php:284 ../../Code/Module/Import_items.php:112
+#: ../../Code/Module/Profperm.php:28 ../../Code/Module/Subthread.php:62
 #: ../../include/items.php:385
 msgid "Permission denied"
 msgstr "הרשאה נדחתה"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
-#: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:211
-#: ../../Zotlabs/Module/Item.php:219 ../../Zotlabs/Module/Item.php:1070
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
-#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
-#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
-#: ../../Zotlabs/Module/Thing.php:331
-#: ../../Zotlabs/Module/Viewconnections.php:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/photos.php:27
+#: ../../Code/Web/WebServer.php:121 ../../Code/Web/Router.php:65
+#: ../../Code/Module/Achievements.php:34 ../../Code/Module/Blocks.php:73
+#: ../../Code/Module/Blocks.php:80 ../../Code/Module/Channel.php:105
+#: ../../Code/Module/Channel.php:226 ../../Code/Module/Channel.php:267
+#: ../../Code/Module/Chat.php:100 ../../Code/Module/Chat.php:105
+#: ../../Code/Module/Authtest.php:16 ../../Code/Module/Block.php:26
+#: ../../Code/Module/Block.php:76 ../../Code/Module/Bookmarks.php:61
+#: ../../Code/Module/Connedit.php:366 ../../Code/Module/Editblock.php:67
+#: ../../Code/Module/Common.php:39 ../../Code/Module/Connections.php:33
+#: ../../Code/Module/Cover_photo.php:277
+#: ../../Code/Module/Cover_photo.php:290
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Events.php:265
+#: ../../Code/Module/Editlayout.php:67
+#: ../../Code/Module/Editlayout.php:90
+#: ../../Code/Module/Editwebpage.php:69
+#: ../../Code/Module/Editwebpage.php:90
+#: ../../Code/Module/Editwebpage.php:105
+#: ../../Code/Module/Editwebpage.php:127 ../../Code/Module/Group.php:13
+#: ../../Code/Module/Api.php:13 ../../Code/Module/Api.php:18
+#: ../../Code/Module/Filestorage.php:24
+#: ../../Code/Module/Filestorage.php:79
+#: ../../Code/Module/Filestorage.php:94
+#: ../../Code/Module/Filestorage.php:121 ../../Code/Module/Item.php:211
+#: ../../Code/Module/Item.php:219 ../../Code/Module/Item.php:1070
+#: ../../Code/Module/Layouts.php:71 ../../Code/Module/Layouts.php:78
+#: ../../Code/Module/Layouts.php:89 ../../Code/Module/Id.php:76
+#: ../../Code/Module/Like.php:181 ../../Code/Module/Invite.php:17
+#: ../../Code/Module/Invite.php:91 ../../Code/Module/Locs.php:87
+#: ../../Code/Module/Mail.php:129 ../../Code/Module/Manage.php:10
+#: ../../Code/Module/Menu.php:78 ../../Code/Module/Message.php:18
+#: ../../Code/Module/Mood.php:116 ../../Code/Module/Network.php:17
+#: ../../Code/Module/Mitem.php:115 ../../Code/Module/New_channel.php:77
+#: ../../Code/Module/New_channel.php:104
+#: ../../Code/Module/Notifications.php:70
+#: ../../Code/Module/Photos.php:75 ../../Code/Module/Page.php:35
+#: ../../Code/Module/Page.php:91 ../../Code/Module/Pdledit.php:26
+#: ../../Code/Module/Poke.php:137 ../../Code/Module/Profile.php:68
+#: ../../Code/Module/Profile.php:76 ../../Code/Module/Profiles.php:203
+#: ../../Code/Module/Profiles.php:601
+#: ../../Code/Module/Profile_photo.php:256
+#: ../../Code/Module/Profile_photo.php:269
+#: ../../Code/Module/Rate.php:113 ../../Code/Module/Appman.php:75
+#: ../../Code/Module/Register.php:77 ../../Code/Module/Regmod.php:21
+#: ../../Code/Module/Service_limits.php:11
+#: ../../Code/Module/Settings.php:572 ../../Code/Module/Setup.php:215
+#: ../../Code/Module/Sharedwithme.php:11
+#: ../../Code/Module/Sources.php:74 ../../Code/Module/Suggest.php:30
+#: ../../Code/Module/Thing.php:274 ../../Code/Module/Thing.php:294
+#: ../../Code/Module/Thing.php:331
+#: ../../Code/Module/Viewconnections.php:25
+#: ../../Code/Module/Viewconnections.php:30
+#: ../../Code/Module/Viewsrc.php:18 ../../Code/Module/Webpages.php:74
+#: ../../Code/Lib/Chatroom.php:137 ../../include/photos.php:27
 #: ../../include/attach.php:141 ../../include/attach.php:189
 #: ../../include/attach.php:252 ../../include/attach.php:266
 #: ../../include/attach.php:273 ../../include/attach.php:338
@@ -229,652 +229,652 @@ msgstr "הרשאה נדחתה"
 msgid "Permission denied."
 msgstr "הרשאה נדחתה."
 
-#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Help.php:94
+#: ../../Code/Web/Router.php:146 ../../Code/Module/Help.php:94
 msgid "Not Found"
 msgstr "לא נמצא"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:118 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:94
+#: ../../Code/Web/Router.php:149 ../../Code/Module/Block.php:79
+#: ../../Code/Module/Display.php:118 ../../Code/Module/Help.php:97
+#: ../../Code/Module/Page.php:94
 msgid "Page not found."
 msgstr "עמוד לא נמצא."
 
-#: ../../Zotlabs/Zot/Auth.php:138
+#: ../../Code/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr ""
 
-#: ../../Zotlabs/Zot/Auth.php:246 ../../Zotlabs/Module/Openid.php:76
-#: ../../Zotlabs/Module/Openid.php:183
+#: ../../Code/Zot/Auth.php:246 ../../Code/Module/Openid.php:76
+#: ../../Code/Module/Openid.php:183
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "ברוך בואך %s. אימות מרוחק הצליח."
 
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:33
-#: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:818
+#: ../../Code/Module/Achievements.php:15 ../../Code/Module/Blocks.php:33
+#: ../../Code/Module/Connect.php:17 ../../Code/Module/Editblock.php:31
+#: ../../Code/Module/Editlayout.php:31
+#: ../../Code/Module/Editwebpage.php:33
+#: ../../Code/Module/Filestorage.php:60 ../../Code/Module/Hcard.php:12
+#: ../../Code/Module/Layouts.php:31 ../../Code/Module/Profile.php:20
+#: ../../Code/Module/Webpages.php:34 ../../include/channel.php:818
 msgid "Requested profile is not available."
 msgstr "פרופיל מבוקש לא זמין."
 
-#: ../../Zotlabs/Module/Achievements.php:38
+#: ../../Code/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:108
+#: ../../Code/Module/Blocks.php:97 ../../Code/Module/Blocks.php:155
+#: ../../Code/Module/Editblock.php:108
 msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2266
+#: ../../Code/Module/Blocks.php:154 ../../include/text.php:2266
 msgid "Blocks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:156
+#: ../../Code/Module/Blocks.php:156
 msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:206
+#: ../../Code/Module/Blocks.php:157 ../../Code/Module/Layouts.php:190
+#: ../../Code/Module/Menu.php:114 ../../Code/Module/Webpages.php:206
 #: ../../include/page_widgets.php:47
 msgid "Created"
 msgstr "נוצר"
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:207
+#: ../../Code/Module/Blocks.php:158 ../../Code/Module/Layouts.php:191
+#: ../../Code/Module/Menu.php:115 ../../Code/Module/Webpages.php:207
 #: ../../include/page_widgets.php:48
 msgid "Edited"
 msgstr "נערך"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:196
+#: ../../Code/Module/Blocks.php:161 ../../Code/Module/Layouts.php:193
+#: ../../Code/Module/Photos.php:1072 ../../Code/Module/Webpages.php:196
 #: ../../include/conversation.php:1219
 msgid "Share"
 msgstr "שתף"
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:201
+#: ../../Code/Module/Blocks.php:166 ../../Code/Module/Layouts.php:197
+#: ../../Code/Module/Pubsites.php:47 ../../Code/Module/Webpages.php:201
 #: ../../include/page_widgets.php:42
 msgid "View"
 msgstr "תצוגה"
 
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
+#: ../../Code/Module/Cal.php:62 ../../Code/Module/Block.php:43
+#: ../../Code/Module/Page.php:56 ../../Code/Module/Wall_upload.php:33
 msgid "Channel not found."
 msgstr "ערוץ לא נמצא."
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Code/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "הרשאה נדחתה."
 
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
+#: ../../Code/Module/Cal.php:259 ../../Code/Module/Events.php:588
 msgid "l, F j"
 msgstr "l, F j"
 
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
+#: ../../Code/Module/Cal.php:308 ../../Code/Module/Events.php:637
 #: ../../include/text.php:1732
 msgid "Link to Source"
 msgstr "קישור למקור"
 
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
+#: ../../Code/Module/Cal.php:331 ../../Code/Module/Events.php:665
 msgid "Edit Event"
 msgstr "ערוך אירוע"
 
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
+#: ../../Code/Module/Cal.php:331 ../../Code/Module/Events.php:665
 msgid "Create Event"
 msgstr "צור אירוע"
 
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
+#: ../../Code/Module/Cal.php:332 ../../Code/Module/Cal.php:339
+#: ../../Code/Module/Events.php:666 ../../Code/Module/Events.php:673
+#: ../../Code/Module/Photos.php:949
 msgid "Previous"
 msgstr "קודם"
 
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
+#: ../../Code/Module/Cal.php:333 ../../Code/Module/Cal.php:340
+#: ../../Code/Module/Events.php:667 ../../Code/Module/Events.php:674
+#: ../../Code/Module/Photos.php:958 ../../Code/Module/Setup.php:267
 msgid "Next"
 msgstr "הבא"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
+#: ../../Code/Module/Cal.php:334 ../../Code/Module/Events.php:668
 #: ../../include/widgets.php:755
 msgid "Export"
 msgstr "יצא"
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
+#: ../../Code/Module/Cal.php:337 ../../Code/Module/Events.php:671
 #: ../../include/widgets.php:756
 msgid "Import"
 msgstr "יבא"
 
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:737 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703
-#: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754
-#: ../../Zotlabs/Module/Settings.php:842
-#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:22
+#: ../../Code/Module/Cal.php:338 ../../Code/Module/Chat.php:196
+#: ../../Code/Module/Chat.php:238 ../../Code/Module/Connect.php:98
+#: ../../Code/Module/Connedit.php:737 ../../Code/Module/Events.php:475
+#: ../../Code/Module/Events.php:672 ../../Code/Module/Group.php:85
+#: ../../Code/Module/Filestorage.php:162
+#: ../../Code/Module/Import.php:550
+#: ../../Code/Module/Import_items.php:120
+#: ../../Code/Module/Invite.php:146 ../../Code/Module/Locs.php:121
+#: ../../Code/Module/Mail.php:378 ../../Code/Module/Mood.php:139
+#: ../../Code/Module/Mitem.php:235 ../../Code/Module/Photos.php:677
+#: ../../Code/Module/Photos.php:1052 ../../Code/Module/Photos.php:1092
+#: ../../Code/Module/Photos.php:1210 ../../Code/Module/Pconfig.php:107
+#: ../../Code/Module/Pdledit.php:66 ../../Code/Module/Poke.php:186
+#: ../../Code/Module/Profiles.php:687 ../../Code/Module/Rate.php:170
+#: ../../Code/Module/Admin.php:492 ../../Code/Module/Admin.php:688
+#: ../../Code/Module/Admin.php:771 ../../Code/Module/Admin.php:1032
+#: ../../Code/Module/Admin.php:1211 ../../Code/Module/Admin.php:1421
+#: ../../Code/Module/Admin.php:1648 ../../Code/Module/Admin.php:1733
+#: ../../Code/Module/Admin.php:2116 ../../Code/Module/Appman.php:126
+#: ../../Code/Module/Settings.php:590 ../../Code/Module/Settings.php:703
+#: ../../Code/Module/Settings.php:731 ../../Code/Module/Settings.php:754
+#: ../../Code/Module/Settings.php:842
+#: ../../Code/Module/Settings.php:1034 ../../Code/Module/Setup.php:312
+#: ../../Code/Module/Setup.php:353 ../../Code/Module/Sources.php:114
+#: ../../Code/Module/Sources.php:149 ../../Code/Module/Thing.php:316
+#: ../../Code/Module/Thing.php:362 ../../Code/Module/Xchan.php:15
+#: ../../Code/Lib/ThreadItem.php:710 ../../include/js_strings.php:22
 #: ../../include/widgets.php:757 ../../include/widgets.php:769
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "שלח"
 
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
+#: ../../Code/Module/Cal.php:341 ../../Code/Module/Events.php:675
 msgid "Today"
 msgstr "היום"
 
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-#: ../../Zotlabs/Module/Wiki.php:20
+#: ../../Code/Module/Channel.php:29 ../../Code/Module/Chat.php:25
+#: ../../Code/Module/Wiki.php:20
 msgid "You must be logged in to see this page."
 msgstr "עליך להתחבר כדי לראות את עמוד זה."
 
-#: ../../Zotlabs/Module/Channel.php:41
+#: ../../Code/Module/Channel.php:41
 msgid "Posts and comments"
 msgstr "פוסטים ותגובות"
 
-#: ../../Zotlabs/Module/Channel.php:42
+#: ../../Code/Module/Channel.php:42
 msgid "Only posts"
 msgstr "רק פוסטים"
 
-#: ../../Zotlabs/Module/Channel.php:102
+#: ../../Code/Module/Channel.php:102
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Code/Module/Chat.php:181
 msgid "Room not found"
 msgstr "חדר לא נמצא"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Code/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "עזוב חדר"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Code/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "מחק חדר"
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Code/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "אני נעדר/ת ברגע זה"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Code/Module/Chat.php:200
 msgid "I am online"
 msgstr "אני במצב מקוון"
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Code/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "סמן את חדר זה"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1181
+#: ../../Code/Module/Chat.php:205 ../../Code/Module/Mail.php:205
+#: ../../Code/Module/Mail.php:314 ../../include/conversation.php:1181
 msgid "Please enter a link URL:"
 msgstr "אנא הזן URL קישור:"
 
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../Code/Module/Chat.php:206 ../../Code/Module/Mail.php:258
+#: ../../Code/Module/Mail.php:383 ../../Code/Lib/ThreadItem.php:722
 #: ../../include/conversation.php:1271
 msgid "Encrypt text"
 msgstr "הצפן טקסט"
 
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1146
+#: ../../Code/Module/Chat.php:207 ../../Code/Module/Editblock.php:111
+#: ../../Code/Module/Editwebpage.php:147 ../../Code/Module/Mail.php:252
+#: ../../Code/Module/Mail.php:377 ../../include/conversation.php:1146
 msgid "Insert web link"
 msgstr "הכנס קישור רשת"
 
-#: ../../Zotlabs/Module/Chat.php:218
+#: ../../Code/Module/Chat.php:218
 msgid "Feature disabled."
 msgstr "תכונה מנוטרלת."
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "חדר שיחה חדש"
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Code/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "שם חדר שיחה"
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Code/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "תפוגה של שיחות (דקות)"
 
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../Code/Module/Chat.php:235 ../../Code/Module/Filestorage.php:153
+#: ../../Code/Module/Photos.php:671 ../../Code/Module/Photos.php:1045
+#: ../../Code/Module/Thing.php:313 ../../Code/Module/Thing.php:359
 #: ../../include/acl_selectors.php:283
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: ../../Zotlabs/Module/Chat.php:246
+#: ../../Code/Module/Chat.php:246
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "חדרי שיחה של %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:251
+#: ../../Code/Module/Chat.php:251
 msgid "No chatrooms available"
 msgstr "אין חדרי שיחה זמינים"
 
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Chat.php:252 ../../Code/Module/Manage.php:143
+#: ../../Code/Module/Profiles.php:778
 msgid "Create New"
 msgstr "צור חדש"
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Code/Module/Chat.php:255
 msgid "Expiration"
 msgstr "תפוגה"
 
-#: ../../Zotlabs/Module/Chat.php:256
+#: ../../Code/Module/Chat.php:256
 msgid "min"
 msgstr "דקות"
 
-#: ../../Zotlabs/Module/Chatsvc.php:117
+#: ../../Code/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "נעדר"
 
-#: ../../Zotlabs/Module/Chatsvc.php:122
+#: ../../Code/Module/Chatsvc.php:122
 msgid "Online"
 msgstr "מקוון"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
+#: ../../Code/Module/Block.php:31 ../../Code/Module/Page.php:40
 msgid "Invalid item."
 msgstr "פריט שגוי."
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
+#: ../../Code/Module/Bookmarks.php:53
 msgid "Bookmark added"
 msgstr "סימנייה התווספה"
 
-#: ../../Zotlabs/Module/Bookmarks.php:75
+#: ../../Code/Module/Bookmarks.php:75
 msgid "My Bookmarks"
 msgstr "הסימניות שלי"
 
-#: ../../Zotlabs/Module/Bookmarks.php:86
+#: ../../Code/Module/Bookmarks.php:86
 msgid "My Connections Bookmarks"
 msgstr "סימניות החיבורים שלי"
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Code/Module/Connect.php:61 ../../Code/Module/Connect.php:109
 msgid "Continue"
 msgstr "המשך"
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Code/Module/Connect.php:90
 msgid "Premium Channel Setup"
 msgstr "הבניית ערוץ פרמיה"
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Code/Module/Connect.php:92
 msgid "Enable premium channel connection restrictions"
 msgstr "אפשר הגבלות חיבור ערוץ פרמיה"
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Code/Module/Connect.php:93
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Code/Module/Connect.php:95 ../../Code/Module/Connect.php:115
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Code/Module/Connect.php:96
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Code/Module/Connect.php:97 ../../Code/Module/Connect.php:118
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided"
 " on this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Code/Module/Connect.php:114
 msgid "Restricted or Premium Channel"
 msgstr "ערוץ מוגבל או פרמיה"
 
-#: ../../Zotlabs/Module/Connedit.php:80
+#: ../../Code/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:104
+#: ../../Code/Module/Connedit.php:104
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Code/Module/Connedit.php:227
 msgid "Connection updated."
 msgstr "חיבור התעדכן."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Code/Module/Connedit.php:229
 msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Code/Module/Connedit.php:276
 msgid "is now connected to"
 msgstr "כעת מחובר אל"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:660
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../Zotlabs/Module/Filestorage.php:157
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Code/Module/Connedit.php:379 ../../Code/Module/Connedit.php:660
+#: ../../Code/Module/Events.php:459 ../../Code/Module/Events.php:460
+#: ../../Code/Module/Events.php:469 ../../Code/Module/Api.php:89
+#: ../../Code/Module/Filestorage.php:157
+#: ../../Code/Module/Filestorage.php:165 ../../Code/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:157 ../../Code/Module/Mitem.php:158
+#: ../../Code/Module/Mitem.php:159 ../../Code/Module/Mitem.php:232
+#: ../../Code/Module/Mitem.php:233 ../../Code/Module/Photos.php:666
+#: ../../Code/Module/Profiles.php:647 ../../Code/Module/Admin.php:459
+#: ../../Code/Module/Removeme.php:61 ../../Code/Module/Settings.php:581
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr "לא"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../Zotlabs/Module/Filestorage.php:157
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Code/Module/Connedit.php:379 ../../Code/Module/Events.php:459
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:469
+#: ../../Code/Module/Api.php:88 ../../Code/Module/Filestorage.php:157
+#: ../../Code/Module/Filestorage.php:165 ../../Code/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:157 ../../Code/Module/Mitem.php:158
+#: ../../Code/Module/Mitem.php:159 ../../Code/Module/Mitem.php:232
+#: ../../Code/Module/Mitem.php:233 ../../Code/Module/Photos.php:666
+#: ../../Code/Module/Profiles.php:647 ../../Code/Module/Admin.php:461
+#: ../../Code/Module/Removeme.php:61 ../../Code/Module/Settings.php:581
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr "כן"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Code/Module/Connedit.php:411
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:431
+#: ../../Code/Module/Connedit.php:431
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "רענון נכשל - ערוץ אינו זמין כעת."
 
-#: ../../Zotlabs/Module/Connedit.php:446 ../../Zotlabs/Module/Connedit.php:455
-#: ../../Zotlabs/Module/Connedit.php:464 ../../Zotlabs/Module/Connedit.php:473
-#: ../../Zotlabs/Module/Connedit.php:486
+#: ../../Code/Module/Connedit.php:446 ../../Code/Module/Connedit.php:455
+#: ../../Code/Module/Connedit.php:464 ../../Code/Module/Connedit.php:473
+#: ../../Code/Module/Connedit.php:486
 msgid "Unable to set address book parameters."
 msgstr "לא מסוגל לקבוע פרמטרים של פנקס כתובות"
 
-#: ../../Zotlabs/Module/Connedit.php:509
+#: ../../Code/Module/Connedit.php:509
 msgid "Connection has been removed."
 msgstr "חיבור הוסר."
 
-#: ../../Zotlabs/Module/Connedit.php:525 ../../Zotlabs/Lib/Apps.php:220
+#: ../../Code/Module/Connedit.php:525 ../../Code/Lib/Apps.php:220
 #: ../../include/conversation.php:957 ../../include/nav.php:86
 msgid "View Profile"
 msgstr "הצג פרופיל"
 
-#: ../../Zotlabs/Module/Connedit.php:528
+#: ../../Code/Module/Connedit.php:528
 #, php-format
 msgid "View %s's profile"
 msgstr "צפה בפרופיל של %s"
 
-#: ../../Zotlabs/Module/Connedit.php:532
+#: ../../Code/Module/Connedit.php:532
 msgid "Refresh Permissions"
 msgstr "רענן הרשאות"
 
-#: ../../Zotlabs/Module/Connedit.php:535
+#: ../../Code/Module/Connedit.php:535
 msgid "Fetch updated permissions"
 msgstr "תפוס הרשאות מעודכנות"
 
-#: ../../Zotlabs/Module/Connedit.php:539
+#: ../../Code/Module/Connedit.php:539
 msgid "Recent Activity"
 msgstr "פעילות אחרונה"
 
-#: ../../Zotlabs/Module/Connedit.php:542
+#: ../../Code/Module/Connedit.php:542
 msgid "View recent posts and comments"
 msgstr "צפה בפוסטים ותגובות אחרונות"
 
-#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Code/Module/Connedit.php:546 ../../Code/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "בטל חסימה"
 
-#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Code/Module/Connedit.php:546 ../../Code/Module/Admin.php:1040
 msgid "Block"
 msgstr "חסום"
 
-#: ../../Zotlabs/Module/Connedit.php:549
+#: ../../Code/Module/Connedit.php:549
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "חסום (או בטל חסימה) את כל ההתקשרויות עם חיבור זה"
 
-#: ../../Zotlabs/Module/Connedit.php:550
+#: ../../Code/Module/Connedit.php:550
 msgid "This connection is blocked!"
 msgstr "חיבור זה הינו חסום!"
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Code/Module/Connedit.php:554
 msgid "Unignore"
 msgstr "בטל התעלמות"
 
-#: ../../Zotlabs/Module/Connedit.php:554
-#: ../../Zotlabs/Module/Connections.php:277
-#: ../../Zotlabs/Module/Notifications.php:55
+#: ../../Code/Module/Connedit.php:554
+#: ../../Code/Module/Connections.php:277
+#: ../../Code/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "התעלמות"
 
-#: ../../Zotlabs/Module/Connedit.php:557
+#: ../../Code/Module/Connedit.php:557
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "התעלם (או בטל התעלמות) מכל ההתקשרויות שפונות כלפי פנים (inbound) מתוך חיבור זה"
 
-#: ../../Zotlabs/Module/Connedit.php:558
+#: ../../Code/Module/Connedit.php:558
 msgid "This connection is ignored!"
 msgstr "חיבור זה הינו מנוכר!"
 
-#: ../../Zotlabs/Module/Connedit.php:562
+#: ../../Code/Module/Connedit.php:562
 msgid "Unarchive"
 msgstr "בטל גניזה"
 
-#: ../../Zotlabs/Module/Connedit.php:562
+#: ../../Code/Module/Connedit.php:562
 msgid "Archive"
 msgstr "גנוז"
 
-#: ../../Zotlabs/Module/Connedit.php:565
+#: ../../Code/Module/Connedit.php:565
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "גנוז את (או בטל את גניזת) חיבור זה - סמן את עמוד זה כמת אך השאר תוכן"
 
-#: ../../Zotlabs/Module/Connedit.php:566
+#: ../../Code/Module/Connedit.php:566
 msgid "This connection is archived!"
 msgstr "חיבור זה הינו גנוז!"
 
-#: ../../Zotlabs/Module/Connedit.php:570
+#: ../../Code/Module/Connedit.php:570
 msgid "Unhide"
 msgstr "חשוף"
 
-#: ../../Zotlabs/Module/Connedit.php:570
+#: ../../Code/Module/Connedit.php:570
 msgid "Hide"
 msgstr "הסתר"
 
-#: ../../Zotlabs/Module/Connedit.php:573
+#: ../../Code/Module/Connedit.php:573
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "הסתר או חשוף את חיבור זה מן החיבורים האחרים שלך"
 
-#: ../../Zotlabs/Module/Connedit.php:574
+#: ../../Code/Module/Connedit.php:574
 msgid "This connection is hidden!"
 msgstr "חיבור זה הינו מוסתר!"
 
-#: ../../Zotlabs/Module/Connedit.php:581
+#: ../../Code/Module/Connedit.php:581
 msgid "Delete this connection"
 msgstr "מחק את חיבור זה"
 
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:493
+#: ../../Code/Module/Connedit.php:596 ../../include/widgets.php:493
 msgid "Me"
 msgstr "אני"
 
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:494
+#: ../../Code/Module/Connedit.php:597 ../../include/widgets.php:494
 msgid "Family"
 msgstr "משפחה"
 
-#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
+#: ../../Code/Module/Connedit.php:598 ../../Code/Module/Settings.php:342
+#: ../../Code/Module/Settings.php:346 ../../Code/Module/Settings.php:347
+#: ../../Code/Module/Settings.php:350 ../../Code/Module/Settings.php:361
 #: ../../include/selectors.php:123 ../../include/channel.php:389
 #: ../../include/channel.php:390 ../../include/channel.php:397
 #: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "חברים"
 
-#: ../../Zotlabs/Module/Connedit.php:599 ../../include/widgets.php:496
+#: ../../Code/Module/Connedit.php:599 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "מכרים"
 
-#: ../../Zotlabs/Module/Connedit.php:600
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
+#: ../../Code/Module/Connedit.php:600
+#: ../../Code/Module/Connections.php:92
+#: ../../Code/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "הכל"
 
-#: ../../Zotlabs/Module/Connedit.php:660
+#: ../../Code/Module/Connedit.php:660
 msgid "Approve this connection"
 msgstr "אשר את חיבור זה"
 
-#: ../../Zotlabs/Module/Connedit.php:660
+#: ../../Code/Module/Connedit.php:660
 msgid "Accept connection to allow communication"
 msgstr "אשר חיבור כדי להתיר תקשורת"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Code/Module/Connedit.php:665
 msgid "Set Affinity"
 msgstr "הגדר קירבה"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Code/Module/Connedit.php:668
 msgid "Set Profile"
 msgstr "הגדר פרופיל"
 
-#: ../../Zotlabs/Module/Connedit.php:671
+#: ../../Code/Module/Connedit.php:671
 msgid "Set Affinity & Profile"
 msgstr "הגדר קירבה וגם פרופיל"
 
-#: ../../Zotlabs/Module/Connedit.php:704
+#: ../../Code/Module/Connedit.php:704
 msgid "none"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:708 ../../include/widgets.php:614
+#: ../../Code/Module/Connedit.php:708 ../../include/widgets.php:614
 msgid "Connection Default Permissions"
 msgstr "הרשאות שגרתיות של חיבור"
 
-#: ../../Zotlabs/Module/Connedit.php:708 ../../include/items.php:3937
+#: ../../Code/Module/Connedit.php:708 ../../include/items.php:3937
 #, php-format
 msgid "Connection: %s"
 msgstr "חיבור: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Code/Module/Connedit.php:709
 msgid "Apply these permissions automatically"
 msgstr "החל את הרשאות אלה אוטומטית"
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Code/Module/Connedit.php:709
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Code/Module/Connedit.php:711
 msgid "This connection's primary address is"
 msgstr "הכתובת העיקרית של חיבור זה היא"
 
-#: ../../Zotlabs/Module/Connedit.php:712
+#: ../../Code/Module/Connedit.php:712
 msgid "Available locations:"
 msgstr "מיקומים זמינים:"
 
-#: ../../Zotlabs/Module/Connedit.php:716
+#: ../../Code/Module/Connedit.php:716
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:717
+#: ../../Code/Module/Connedit.php:717
 msgid "Connection Tools"
 msgstr "כלי חיבור"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Code/Module/Connedit.php:719
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:720 ../../Zotlabs/Module/Rate.php:159
+#: ../../Code/Module/Connedit.php:720 ../../Code/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "דירוג"
 
-#: ../../Zotlabs/Module/Connedit.php:721
+#: ../../Code/Module/Connedit.php:721
 msgid "Slide to adjust your rating"
 msgstr "החלק כדי להתאים את הדירוג שלך"
 
-#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:727
+#: ../../Code/Module/Connedit.php:722 ../../Code/Module/Connedit.php:727
 msgid "Optionally explain your rating"
 msgstr "הסבר לפי הצורך את הדירוג שלך"
 
-#: ../../Zotlabs/Module/Connedit.php:724
+#: ../../Code/Module/Connedit.php:724
 msgid "Custom Filter"
 msgstr "מסנן מותאם"
 
-#: ../../Zotlabs/Module/Connedit.php:725
+#: ../../Code/Module/Connedit.php:725
 msgid "Only import posts with this text"
 msgstr "יבא רק פוסטים עם טקסט זה"
 
-#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Module/Connedit.php:726
+#: ../../Code/Module/Connedit.php:725 ../../Code/Module/Connedit.php:726
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:726
+#: ../../Code/Module/Connedit.php:726
 msgid "Do not import posts with this text"
 msgstr "אל תייבא פוסטים עם טקסט זה"
 
-#: ../../Zotlabs/Module/Connedit.php:728
+#: ../../Code/Module/Connedit.php:728
 msgid "This information is public!"
 msgstr "מידע זה הינו ציבורי!"
 
-#: ../../Zotlabs/Module/Connedit.php:733
+#: ../../Code/Module/Connedit.php:733
 msgid "Connection Pending Approval"
 msgstr "חיבור ממתין לאישור"
 
-#: ../../Zotlabs/Module/Connedit.php:736
+#: ../../Code/Module/Connedit.php:736
 msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Code/Module/Connedit.php:738
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Code/Module/Connedit.php:740
 msgid "Their Settings"
 msgstr "ההגדרות שלהם"
 
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Code/Module/Connedit.php:741
 msgid "My Settings"
 msgstr "ההגדרות שלי"
 
-#: ../../Zotlabs/Module/Connedit.php:743
+#: ../../Code/Module/Connedit.php:743
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:744
+#: ../../Code/Module/Connedit.php:744
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -882,7 +882,7 @@ msgid ""
 " settings here."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:745
+#: ../../Code/Module/Connedit.php:745
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -890,917 +890,917 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:746
+#: ../../Code/Module/Connedit.php:746
 msgid "Last update:"
 msgstr "עדכון אחרון:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
-#: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Code/Module/Directory.php:63 ../../Code/Module/Display.php:17
+#: ../../Code/Module/Photos.php:522 ../../Code/Module/Ratings.php:86
+#: ../../Code/Module/Search.php:17
+#: ../../Code/Module/Viewconnections.php:20
 msgid "Public access denied."
 msgstr "גישה ציבורית נדחתה."
 
-#: ../../Zotlabs/Module/Directory.php:243
+#: ../../Code/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "דירוג %d"
 msgstr[1] "%d דירוגים"
 
-#: ../../Zotlabs/Module/Directory.php:254
+#: ../../Code/Module/Directory.php:254
 msgid "Gender: "
 msgstr "מין: "
 
-#: ../../Zotlabs/Module/Directory.php:256
+#: ../../Code/Module/Directory.php:256
 msgid "Status: "
 msgstr "מצב: "
 
-#: ../../Zotlabs/Module/Directory.php:258
+#: ../../Code/Module/Directory.php:258
 msgid "Homepage: "
 msgstr "עמוד בית: "
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1164
+#: ../../Code/Module/Directory.php:306 ../../include/channel.php:1164
 msgid "Age:"
 msgstr "גיל:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
+#: ../../Code/Module/Directory.php:311 ../../include/event.php:52
 #: ../../include/event.php:84 ../../include/channel.php:1008
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "מיקום:"
 
-#: ../../Zotlabs/Module/Directory.php:317
+#: ../../Code/Module/Directory.php:317
 msgid "Description:"
 msgstr "תיאור:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1180
+#: ../../Code/Module/Directory.php:322 ../../include/channel.php:1180
 msgid "Hometown:"
 msgstr "עיר מגורים:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1188
+#: ../../Code/Module/Directory.php:324 ../../include/channel.php:1188
 msgid "About:"
 msgstr "אודות:"
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/conversation.php:959
+#: ../../Code/Module/Directory.php:325 ../../Code/Module/Match.php:68
+#: ../../Code/Module/Suggest.php:56 ../../include/conversation.php:959
 #: ../../include/channel.php:993 ../../include/connections.php:78
 #: ../../include/widgets.php:147 ../../include/widgets.php:184
 msgid "Connect"
 msgstr "התחבר"
 
-#: ../../Zotlabs/Module/Directory.php:326
+#: ../../Code/Module/Directory.php:326
 msgid "Public Forum:"
 msgstr "פורום ציבורי:"
 
-#: ../../Zotlabs/Module/Directory.php:329
+#: ../../Code/Module/Directory.php:329
 msgid "Keywords: "
 msgstr "מילות מפתח: "
 
-#: ../../Zotlabs/Module/Directory.php:332
+#: ../../Code/Module/Directory.php:332
 msgid "Don't suggest"
 msgstr "אל תציע"
 
-#: ../../Zotlabs/Module/Directory.php:334
+#: ../../Code/Module/Directory.php:334
 msgid "Common connections:"
 msgstr "חיבורים שכיחים:"
 
-#: ../../Zotlabs/Module/Directory.php:383
+#: ../../Code/Module/Directory.php:383
 msgid "Global Directory"
 msgstr "ספרייה גלובלית"
 
-#: ../../Zotlabs/Module/Directory.php:383
+#: ../../Code/Module/Directory.php:383
 msgid "Local Directory"
 msgstr "ספרייה מקומית"
 
-#: ../../Zotlabs/Module/Directory.php:388
-#: ../../Zotlabs/Module/Directory.php:393
-#: ../../Zotlabs/Module/Connections.php:309
+#: ../../Code/Module/Directory.php:388
+#: ../../Code/Module/Directory.php:393
+#: ../../Code/Module/Connections.php:309
 #: ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "מצא"
 
-#: ../../Zotlabs/Module/Directory.php:389
+#: ../../Code/Module/Directory.php:389
 msgid "Finding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Code/Module/Directory.php:392 ../../Code/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "הצעות ערוץ"
 
-#: ../../Zotlabs/Module/Directory.php:394
+#: ../../Code/Module/Directory.php:394
 msgid "next page"
 msgstr "עמוד הבא"
 
-#: ../../Zotlabs/Module/Directory.php:394
+#: ../../Code/Module/Directory.php:394
 msgid "previous page"
 msgstr "עמוד קודם"
 
-#: ../../Zotlabs/Module/Directory.php:395
+#: ../../Code/Module/Directory.php:395
 msgid "Sort options"
 msgstr "אפשרויות מיון"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Alphabetic"
 msgstr "אלפבתי"
 
-#: ../../Zotlabs/Module/Directory.php:397
+#: ../../Code/Module/Directory.php:397
 msgid "Reverse Alphabetic"
 msgstr "אלפבתי הפוך"
 
-#: ../../Zotlabs/Module/Directory.php:398
+#: ../../Code/Module/Directory.php:398
 msgid "Newest to Oldest"
 msgstr "מהחדשים יותר לישנים יותר"
 
-#: ../../Zotlabs/Module/Directory.php:399
+#: ../../Code/Module/Directory.php:399
 msgid "Oldest to Newest"
 msgstr "מהישנים יותר לחדשים יותר"
 
-#: ../../Zotlabs/Module/Directory.php:416
+#: ../../Code/Module/Directory.php:416
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3371
+#: ../../Code/Module/Display.php:40 ../../Code/Module/Filestorage.php:33
+#: ../../Code/Module/Admin.php:164 ../../Code/Module/Admin.php:1255
+#: ../../Code/Module/Admin.php:1561 ../../Code/Module/Thing.php:89
+#: ../../Code/Module/Viewsrc.php:24 ../../include/items.php:3371
 msgid "Item not found."
 msgstr "פריט לא נמצא."
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Code/Module/Editblock.php:79 ../../Code/Module/Editblock.php:95
+#: ../../Code/Module/Editpost.php:24 ../../Code/Module/Editlayout.php:79
+#: ../../Code/Module/Editwebpage.php:81
 msgid "Item not found"
 msgstr "פריט לא נמצא"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+#: ../../Code/Module/Editblock.php:124 ../../include/conversation.php:1243
 msgid "Title (optional)"
 msgstr "כותרת (רשות):"
 
-#: ../../Zotlabs/Module/Editblock.php:133
+#: ../../Code/Module/Editblock.php:133
 msgid "Edit Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
+#: ../../Code/Module/Common.php:14
 msgid "No channel."
 msgstr "אין ערוץ."
 
-#: ../../Zotlabs/Module/Common.php:43
+#: ../../Code/Module/Common.php:43
 msgid "Common connections"
 msgstr "חיבורים מצויים"
 
-#: ../../Zotlabs/Module/Common.php:48
+#: ../../Code/Module/Common.php:48
 msgid "No connections in common."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:56
-#: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:242
+#: ../../Code/Module/Connections.php:56
+#: ../../Code/Module/Connections.php:161
+#: ../../Code/Module/Connections.php:242
 msgid "Blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:61
-#: ../../Zotlabs/Module/Connections.php:168
-#: ../../Zotlabs/Module/Connections.php:241
+#: ../../Code/Module/Connections.php:61
+#: ../../Code/Module/Connections.php:168
+#: ../../Code/Module/Connections.php:241
 msgid "Ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:66
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:240
+#: ../../Code/Module/Connections.php:66
+#: ../../Code/Module/Connections.php:182
+#: ../../Code/Module/Connections.php:240
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: ../../Zotlabs/Module/Connections.php:71
-#: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:239
+#: ../../Code/Module/Connections.php:71
+#: ../../Code/Module/Connections.php:175
+#: ../../Code/Module/Connections.php:239
 msgid "Archived"
 msgstr "גנוזים"
 
-#: ../../Zotlabs/Module/Connections.php:76
-#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
+#: ../../Code/Module/Connections.php:76
+#: ../../Code/Module/Connections.php:86 ../../Code/Module/Menu.php:116
 #: ../../include/conversation.php:1550
 msgid "New"
 msgstr "חדש"
 
-#: ../../Zotlabs/Module/Connections.php:138
+#: ../../Code/Module/Connections.php:138
 msgid "New Connections"
 msgstr "חיבורים חדשים"
 
-#: ../../Zotlabs/Module/Connections.php:141
+#: ../../Code/Module/Connections.php:141
 msgid "Show pending (new) connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:145
-#: ../../Zotlabs/Module/Profperm.php:144
+#: ../../Code/Module/Connections.php:145
+#: ../../Code/Module/Profperm.php:144
 msgid "All Connections"
 msgstr "כל החיבורים"
 
-#: ../../Zotlabs/Module/Connections.php:148
+#: ../../Code/Module/Connections.php:148
 msgid "Show all connections"
 msgstr "הצג את כל החיבורים"
 
-#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:164
 msgid "Only show blocked connections"
 msgstr "הצג רק חיבורים חסומים"
 
-#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:171
 msgid "Only show ignored connections"
 msgstr "הצג רק חיבורים מנוכרים"
 
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:178
 msgid "Only show archived connections"
 msgstr "הצג רק חיבורים גנוזים"
 
-#: ../../Zotlabs/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:185
 msgid "Only show hidden connections"
 msgstr "הצג רק חיבורים מוסתרים"
 
-#: ../../Zotlabs/Module/Connections.php:238
+#: ../../Code/Module/Connections.php:238
 msgid "Pending approval"
 msgstr "ממתין לאישור"
 
-#: ../../Zotlabs/Module/Connections.php:254
+#: ../../Code/Module/Connections.php:254
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:255
+#: ../../Code/Module/Connections.php:255
 msgid "Edit connection"
 msgstr "ערוך חיבור"
 
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Code/Module/Connections.php:256
 msgid "Delete connection"
 msgstr "מחק חיבור"
 
-#: ../../Zotlabs/Module/Connections.php:265
+#: ../../Code/Module/Connections.php:265
 msgid "Channel address"
 msgstr "כתובת ערוץ"
 
-#: ../../Zotlabs/Module/Connections.php:267
+#: ../../Code/Module/Connections.php:267
 msgid "Network"
 msgstr "רשת"
 
-#: ../../Zotlabs/Module/Connections.php:270 ../../Zotlabs/Module/Admin.php:710
+#: ../../Code/Module/Connections.php:270 ../../Code/Module/Admin.php:710
 msgid "Status"
 msgstr "מצב"
 
-#: ../../Zotlabs/Module/Connections.php:272
+#: ../../Code/Module/Connections.php:272
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Code/Module/Connections.php:274
 msgid "Approve connection"
 msgstr "אשר חיבור"
 
-#: ../../Zotlabs/Module/Connections.php:275
-#: ../../Zotlabs/Module/Admin.php:1037
+#: ../../Code/Module/Connections.php:275
+#: ../../Code/Module/Admin.php:1037
 msgid "Approve"
 msgstr "אשר"
 
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Code/Module/Connections.php:276
 msgid "Ignore connection"
 msgstr "התעלם מחיבור"
 
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Code/Module/Connections.php:278
 msgid "Recent activity"
 msgstr "פעילות אחרונה"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
+#: ../../Code/Module/Connections.php:302 ../../Code/Lib/Apps.php:208
 #: ../../include/text.php:875 ../../include/nav.php:186
 msgid "Connections"
 msgstr "חיבורים"
 
-#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:229 ../../include/text.php:945
+#: ../../Code/Module/Connections.php:306 ../../Code/Module/Search.php:44
+#: ../../Code/Lib/Apps.php:229 ../../include/text.php:945
 #: ../../include/text.php:957 ../../include/nav.php:165
 #: ../../include/acl_selectors.php:276
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../../Zotlabs/Module/Connections.php:307
+#: ../../Code/Module/Connections.php:307
 msgid "Search your connections"
 msgstr "חפש את החיבורים שלך"
 
-#: ../../Zotlabs/Module/Connections.php:308
+#: ../../Code/Module/Connections.php:308
 msgid "Connections search"
 msgstr "חיפוש חיבורים"
 
-#: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Code/Module/Cover_photo.php:58
+#: ../../Code/Module/Profile_photo.php:79
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:134
-#: ../../Zotlabs/Module/Cover_photo.php:181
+#: ../../Code/Module/Cover_photo.php:134
+#: ../../Code/Module/Cover_photo.php:181
 msgid "Cover Photos"
 msgstr "תצלומי שער"
 
-#: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Code/Module/Cover_photo.php:154
+#: ../../Code/Module/Profile_photo.php:133
 msgid "Image resize failed."
 msgstr "שינוי גודל תמונה נכשל."
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:148
+#: ../../Code/Module/Cover_photo.php:168
+#: ../../Code/Module/Profile_photo.php:192 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr "לא מסוגל לעבד תמונה"
 
-#: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Code/Module/Cover_photo.php:192
+#: ../../Code/Module/Profile_photo.php:217
 msgid "Image upload failed."
 msgstr "העלאת תמונה נכשלה."
 
-#: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Code/Module/Cover_photo.php:210
+#: ../../Code/Module/Profile_photo.php:236
 msgid "Unable to process image."
 msgstr "לא מסוגל לעבד תמונה."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4298
+#: ../../Code/Module/Cover_photo.php:233 ../../include/items.php:4298
 msgid "female"
 msgstr "נקבה"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4299
+#: ../../Code/Module/Cover_photo.php:234 ../../include/items.php:4299
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s עדכנה את ה%2$s שלה"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4300
+#: ../../Code/Module/Cover_photo.php:235 ../../include/items.php:4300
 msgid "male"
 msgstr "זכר"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4301
+#: ../../Code/Module/Cover_photo.php:236 ../../include/items.php:4301
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s עדכן את ה%2$s שלו"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4303
+#: ../../Code/Module/Cover_photo.php:238 ../../include/items.php:4303
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s עדכנו את ה%2$s שלהם"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1642
+#: ../../Code/Module/Cover_photo.php:240 ../../include/channel.php:1642
 msgid "cover photo"
 msgstr "תצלום שער"
 
-#: ../../Zotlabs/Module/Cover_photo.php:303
-#: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Code/Module/Cover_photo.php:303
+#: ../../Code/Module/Cover_photo.php:318
+#: ../../Code/Module/Profile_photo.php:283
+#: ../../Code/Module/Profile_photo.php:324
 msgid "Photo not available."
 msgstr "תצלום לא זמין."
 
-#: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Code/Module/Cover_photo.php:354
+#: ../../Code/Module/Profile_photo.php:365
 msgid "Upload File:"
 msgstr "העלה קובץ:"
 
-#: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Code/Module/Cover_photo.php:355
+#: ../../Code/Module/Profile_photo.php:366
 msgid "Select a profile:"
 msgstr "בחר פרופיל:"
 
-#: ../../Zotlabs/Module/Cover_photo.php:356
+#: ../../Code/Module/Cover_photo.php:356
 msgid "Upload Cover Photo"
 msgstr "העלה תצלום שער"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Code/Module/Cover_photo.php:361
+#: ../../Code/Module/Profile_photo.php:374
+#: ../../Code/Module/Settings.php:985
 msgid "or"
 msgstr "או"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Code/Module/Cover_photo.php:361
+#: ../../Code/Module/Profile_photo.php:374
 msgid "skip this step"
 msgstr "דלג על צעד זה"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Code/Module/Cover_photo.php:361
+#: ../../Code/Module/Profile_photo.php:374
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Code/Module/Cover_photo.php:377
+#: ../../Code/Module/Profile_photo.php:390
 msgid "Crop Image"
 msgstr "גזור תמונה"
 
-#: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Code/Module/Cover_photo.php:378
+#: ../../Code/Module/Profile_photo.php:391
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Code/Module/Cover_photo.php:380
+#: ../../Code/Module/Profile_photo.php:393
 msgid "Done Editing"
 msgstr "סיים לערוך"
 
-#: ../../Zotlabs/Module/Editpost.php:35
+#: ../../Code/Module/Editpost.php:35
 msgid "Item is not editable"
 msgstr "פריט אינו עריך."
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
+#: ../../Code/Module/Editpost.php:106 ../../Code/Module/Rpost.php:135
 msgid "Edit post"
 msgstr "ערוך פוסט"
 
-#: ../../Zotlabs/Module/Events.php:26
+#: ../../Code/Module/Events.php:26
 msgid "Calendar entries imported."
 msgstr "רשומות לוח שנה הובאו."
 
-#: ../../Zotlabs/Module/Events.php:28
+#: ../../Code/Module/Events.php:28
 msgid "No calendar entries found."
 msgstr "לא נמצאו רשומות לוח שנה."
 
-#: ../../Zotlabs/Module/Events.php:105
+#: ../../Code/Module/Events.php:105
 msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
-#: ../../Zotlabs/Module/Events.php:136
+#: ../../Code/Module/Events.php:107 ../../Code/Module/Events.php:116
+#: ../../Code/Module/Events.php:136
 msgid "Unable to generate preview."
 msgstr "לא מסוגל להפיק תצוגה מקדימה."
 
-#: ../../Zotlabs/Module/Events.php:114
+#: ../../Code/Module/Events.php:114
 msgid "Event title and start time are required."
 msgstr "כותרת וזמן תחילת אירוע נדרשים"
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
+#: ../../Code/Module/Events.php:134 ../../Code/Module/Events.php:259
 msgid "Event not found."
 msgstr "אירוע לא נמצא."
 
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1944
+#: ../../Code/Module/Events.php:254 ../../Code/Module/Like.php:373
+#: ../../Code/Module/Tagger.php:51 ../../include/text.php:1944
 #: ../../include/event.php:949 ../../include/conversation.php:123
 msgid "event"
 msgstr "אירוע"
 
-#: ../../Zotlabs/Module/Events.php:449
+#: ../../Code/Module/Events.php:449
 msgid "Edit event title"
 msgstr "ערוך כותרת אירוע"
 
-#: ../../Zotlabs/Module/Events.php:449
+#: ../../Code/Module/Events.php:449
 msgid "Event title"
 msgstr "כותרת אירוע"
 
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Code/Module/Events.php:449 ../../Code/Module/Events.php:454
+#: ../../Code/Module/Profiles.php:709 ../../Code/Module/Profiles.php:713
+#: ../../Code/Module/Appman.php:115 ../../Code/Module/Appman.php:116
 #: ../../include/datetime.php:245
 msgid "Required"
 msgstr "נדרש"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Code/Module/Events.php:451
 msgid "Categories (comma-separated list)"
 msgstr "קטגוריות (רשימה מופרדת פסיקים)"
 
-#: ../../Zotlabs/Module/Events.php:452
+#: ../../Code/Module/Events.php:452
 msgid "Edit Category"
 msgstr "ערוך קטגוריה"
 
-#: ../../Zotlabs/Module/Events.php:452
+#: ../../Code/Module/Events.php:452
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../../Zotlabs/Module/Events.php:455
+#: ../../Code/Module/Events.php:455
 msgid "Edit start date and time"
 msgstr "ערוך זמן ותאריך התחלה"
 
-#: ../../Zotlabs/Module/Events.php:455
+#: ../../Code/Module/Events.php:455
 msgid "Start date and time"
 msgstr "זמן ותאריך התחלה"
 
-#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
+#: ../../Code/Module/Events.php:456 ../../Code/Module/Events.php:459
 msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:458
+#: ../../Code/Module/Events.php:458
 msgid "Edit finish date and time"
 msgstr "ערוך זמן ותאריך סיום"
 
-#: ../../Zotlabs/Module/Events.php:458
+#: ../../Code/Module/Events.php:458
 msgid "Finish date and time"
 msgstr "זמן ותאריך סיום"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:461
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Events.php:460
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Code/Module/Events.php:462
 msgid "Edit Description"
 msgstr "ערוך תיאור"
 
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Code/Module/Events.php:462 ../../Code/Module/Appman.php:117
+#: ../../Code/Module/Rbmark.php:101
 msgid "Description"
 msgstr "תיאור"
 
-#: ../../Zotlabs/Module/Events.php:464
+#: ../../Code/Module/Events.php:464
 msgid "Edit Location"
 msgstr "ערוך מיקום"
 
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+#: ../../Code/Module/Events.php:464 ../../Code/Module/Locs.php:117
+#: ../../Code/Module/Profiles.php:477 ../../Code/Module/Profiles.php:698
+#: ../../Code/Module/Pubsites.php:41 ../../include/js_strings.php:25
 msgid "Location"
 msgstr "מיקום"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:467 ../../Code/Module/Events.php:469
 msgid "Share this event"
 msgstr "שתף את אירוע זה"
 
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:202 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Photos.php:1093
+#: ../../Code/Module/Webpages.php:202 ../../Code/Lib/ThreadItem.php:719
 #: ../../include/conversation.php:1198 ../../include/page_widgets.php:43
 msgid "Preview"
 msgstr "תצוגה מקדימה"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1247
+#: ../../Code/Module/Events.php:471 ../../include/conversation.php:1247
 msgid "Permission settings"
 msgstr "הגדרות הרשאה"
 
-#: ../../Zotlabs/Module/Events.php:476
+#: ../../Code/Module/Events.php:476
 msgid "Advanced Options"
 msgstr "אפשרויות מתקדמות"
 
-#: ../../Zotlabs/Module/Events.php:610
+#: ../../Code/Module/Events.php:610
 msgid "Edit event"
 msgstr "ערוך אירוע"
 
-#: ../../Zotlabs/Module/Events.php:612
+#: ../../Code/Module/Events.php:612
 msgid "Delete event"
 msgstr "מחק אירוע"
 
-#: ../../Zotlabs/Module/Events.php:646
+#: ../../Code/Module/Events.php:646
 msgid "calendar"
 msgstr "לוח שנה"
 
-#: ../../Zotlabs/Module/Events.php:706
+#: ../../Code/Module/Events.php:706
 msgid "Event removed"
 msgstr "אירוע הוסר"
 
-#: ../../Zotlabs/Module/Events.php:709
+#: ../../Code/Module/Events.php:709
 msgid "Failed to remove event"
 msgstr "נכשל להסיר אירוע"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:221
+#: ../../Code/Module/Fbrowser.php:29 ../../Code/Lib/Apps.php:221
 #: ../../include/conversation.php:1647 ../../include/nav.php:92
 msgid "Photos"
 msgstr "תצלומים"
 
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1235
+#: ../../Code/Module/Fbrowser.php:66 ../../Code/Module/Fbrowser.php:88
+#: ../../Code/Module/Admin.php:1406 ../../Code/Module/Settings.php:591
+#: ../../Code/Module/Settings.php:617 ../../Code/Module/Tagrm.php:15
+#: ../../Code/Module/Tagrm.php:138 ../../include/conversation.php:1235
 #: ../../include/conversation.php:1274
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+#: ../../Code/Module/Dirsearch.php:25 ../../Code/Module/Regdir.php:49
 msgid "This site is not a directory server"
 msgstr "אתר זה אינו שרת ספרייה"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
+#: ../../Code/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "Save to Folder:"
 msgstr "שמור לתיקייה:"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "- select -"
 msgstr "- בחר -"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
+#: ../../Code/Module/Filer.php:53 ../../Code/Module/Admin.php:2033
+#: ../../Code/Module/Admin.php:2053 ../../Code/Module/Rbmark.php:32
+#: ../../Code/Module/Rbmark.php:104 ../../include/text.php:946
 #: ../../include/text.php:958 ../../include/widgets.php:201
 msgid "Save"
 msgstr "שמור"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Code/Module/Dreport.php:27
 msgid "Invalid message"
 msgstr "הודעה שגויה"
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Code/Module/Dreport.php:59
 msgid "no results"
 msgstr "אין תוצאות"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Code/Module/Dreport.php:64
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "דיווח מסירה עבור %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
+#: ../../Code/Module/Dreport.php:78
 msgid "channel sync processed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:82
+#: ../../Code/Module/Dreport.php:82
 msgid "queued"
 msgstr "בתור"
 
-#: ../../Zotlabs/Module/Dreport.php:86
+#: ../../Code/Module/Dreport.php:86
 msgid "posted"
 msgstr "פורסם"
 
-#: ../../Zotlabs/Module/Dreport.php:90
+#: ../../Code/Module/Dreport.php:90
 msgid "accepted for delivery"
 msgstr "נתקבל לצורך מסירה"
 
-#: ../../Zotlabs/Module/Dreport.php:94
+#: ../../Code/Module/Dreport.php:94
 msgid "updated"
 msgstr "עודכן"
 
-#: ../../Zotlabs/Module/Dreport.php:97
+#: ../../Code/Module/Dreport.php:97
 msgid "update ignored"
 msgstr "עדכון נוכר"
 
-#: ../../Zotlabs/Module/Dreport.php:100
+#: ../../Code/Module/Dreport.php:100
 msgid "permission denied"
 msgstr "הרשאה נדחתה"
 
-#: ../../Zotlabs/Module/Dreport.php:104
+#: ../../Code/Module/Dreport.php:104
 msgid "recipient not found"
 msgstr "נמען לא נמצא"
 
-#: ../../Zotlabs/Module/Dreport.php:107
+#: ../../Code/Module/Dreport.php:107
 msgid "mail recalled"
 msgstr "דואר הוחזר"
 
-#: ../../Zotlabs/Module/Dreport.php:110
+#: ../../Code/Module/Dreport.php:110
 msgid "duplicate mail received"
 msgstr "דואר כפול נתקבל"
 
-#: ../../Zotlabs/Module/Dreport.php:113
+#: ../../Code/Module/Dreport.php:113
 msgid "mail delivered"
 msgstr "דואר נמסר"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
+#: ../../Code/Module/Editlayout.php:127
+#: ../../Code/Module/Layouts.php:128 ../../Code/Module/Layouts.php:188
 msgid "Layout Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:131
+#: ../../Code/Module/Editlayout.php:128
+#: ../../Code/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:136
+#: ../../Code/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Code/Module/Editwebpage.php:143
 msgid "Page link"
 msgstr "קישור עמוד"
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Code/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr "ערוך עמוד רשת"
 
-#: ../../Zotlabs/Module/Follow.php:34
+#: ../../Code/Module/Follow.php:34
 msgid "Channel added."
 msgstr "ערוץ נתווסף."
 
-#: ../../Zotlabs/Module/Acl.php:227
+#: ../../Code/Module/Acl.php:227
 msgid "network"
 msgstr "רשת"
 
-#: ../../Zotlabs/Module/Acl.php:237
+#: ../../Code/Module/Acl.php:237
 msgid "RSS"
 msgstr "RSS"
 
-#: ../../Zotlabs/Module/Group.php:24
+#: ../../Code/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "קבוצת פרטיות נוצרה."
 
-#: ../../Zotlabs/Module/Group.php:30
+#: ../../Code/Module/Group.php:30
 msgid "Could not create privacy group."
 msgstr "לא היתה אפשרות ליצור קבוצת פרטיות."
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../Code/Module/Group.php:42 ../../Code/Module/Group.php:141
 #: ../../include/items.php:3904
 msgid "Privacy group not found."
 msgstr "קבוצת פרטיות לא נמצאה."
 
-#: ../../Zotlabs/Module/Group.php:58
+#: ../../Code/Module/Group.php:58
 msgid "Privacy group updated."
 msgstr "קבוצת פרטיות עודכנה."
 
-#: ../../Zotlabs/Module/Group.php:90
+#: ../../Code/Module/Group.php:90
 msgid "Create a group of channels."
 msgstr "צור אשכול של ערוצים."
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+#: ../../Code/Module/Group.php:91 ../../Code/Module/Group.php:184
 msgid "Privacy group name: "
 msgstr "שם קבוצת פרטיות:"
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+#: ../../Code/Module/Group.php:93 ../../Code/Module/Group.php:187
 msgid "Members are visible to other channels"
 msgstr "חברים הינם נראים לערוצים אחרים"
 
-#: ../../Zotlabs/Module/Group.php:111
+#: ../../Code/Module/Group.php:111
 msgid "Privacy group removed."
 msgstr "קבוצת פרטיות הוסרה."
 
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Code/Module/Group.php:113
 msgid "Unable to remove privacy group."
 msgstr "לא מסוגל להסיר קבוצת פרטיות."
 
-#: ../../Zotlabs/Module/Group.php:183
+#: ../../Code/Module/Group.php:183
 msgid "Privacy group editor"
 msgstr "עורך קבוצת פרטיות"
 
-#: ../../Zotlabs/Module/Group.php:197
+#: ../../Code/Module/Group.php:197
 msgid "Members"
 msgstr "חברים"
 
-#: ../../Zotlabs/Module/Group.php:199
+#: ../../Code/Module/Group.php:199
 msgid "All Connected Channels"
 msgstr "כל הערוצים המחוברים"
 
-#: ../../Zotlabs/Module/Group.php:231
+#: ../../Code/Module/Group.php:231
 msgid "Click on a channel to add or remove."
 msgstr "לחץ על ערוץ כדי להוסיף או להסיר"
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
+#: ../../Code/Module/Ffsapi.php:12
 msgid "Share content from Firefox to $Projectname"
 msgstr "שתף תוכן מתוך Firefox אל $Projectname"
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
+#: ../../Code/Module/Ffsapi.php:15
 msgid "Activate the Firefox $Projectname provider"
 msgstr "הפעל את ספק $Projectname של Firefox"
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:61 ../../Code/Module/Api.php:85
 msgid "Authorize application connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:62
+#: ../../Code/Module/Api.php:62
 msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:72
+#: ../../Code/Module/Api.php:72
 msgid "Please login to continue."
 msgstr "אנא התחבר כדי להמשיך."
 
-#: ../../Zotlabs/Module/Api.php:87
+#: ../../Code/Module/Api.php:87
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:26
+#: ../../Code/Module/Help.php:26
 msgid "Documentation Search"
 msgstr "חיפוש תיעוד"
 
-#: ../../Zotlabs/Module/Help.php:67 ../../Zotlabs/Module/Help.php:73
-#: ../../Zotlabs/Module/Help.php:79
+#: ../../Code/Module/Help.php:67 ../../Code/Module/Help.php:73
+#: ../../Code/Module/Help.php:79
 msgid "Help:"
 msgstr "עזרה:"
 
-#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:224
+#: ../../Code/Module/Help.php:85 ../../Code/Module/Help.php:90
+#: ../../Code/Module/Layouts.php:185 ../../Code/Lib/Apps.php:224
 #: ../../include/nav.php:159
 msgid "Help"
 msgstr "עזרה"
 
-#: ../../Zotlabs/Module/Help.php:120
+#: ../../Code/Module/Help.php:120
 msgid "$Projectname Documentation"
 msgstr "תיעוד $Projectname"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
+#: ../../Code/Module/Filestorage.php:88
 msgid "Permission Denied."
 msgstr "הרשאה נדחתה."
 
-#: ../../Zotlabs/Module/Filestorage.php:104
+#: ../../Code/Module/Filestorage.php:104
 msgid "File not found."
 msgstr "קובץ לא נמצא."
 
-#: ../../Zotlabs/Module/Filestorage.php:147
+#: ../../Code/Module/Filestorage.php:147
 msgid "Edit file permissions"
 msgstr "ערוך הרשאות קובץ"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Code/Module/Filestorage.php:156
 msgid "Set/edit permissions"
 msgstr "קבע/ערוך הרשאות"
 
-#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Code/Module/Filestorage.php:157
 msgid "Include all files and sub folders"
 msgstr "כלול כל קובץ ותיקיית משנה"
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Code/Module/Filestorage.php:158
 msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Code/Module/Filestorage.php:160
 msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Code/Module/Filestorage.php:161
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Code/Module/Filestorage.php:163
 msgid "Share this file"
 msgstr "שתף את קובץ זה"
 
-#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Code/Module/Filestorage.php:164
 msgid "Show URL to this file"
 msgstr "הצג URL לקובץ זה"
 
-#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Code/Module/Filestorage.php:165
 msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:163
+#: ../../Code/Module/Apps.php:47 ../../include/nav.php:163
 #: ../../include/widgets.php:102
 msgid "Apps"
 msgstr "אפליקציות"
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "פריט לא נמצא."
 
-#: ../../Zotlabs/Module/Import.php:32
+#: ../../Code/Module/Import.php:32
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
+#: ../../Code/Module/Import.php:70 ../../Code/Module/Import_items.php:42
 msgid "Nothing to import."
 msgstr "אין דבר ליבא."
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
+#: ../../Code/Module/Import.php:94 ../../Code/Module/Import_items.php:66
 msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
+#: ../../Code/Module/Import.php:100
+#: ../../Code/Module/Import_items.php:72
 msgid "Imported file is empty."
 msgstr "קובץ מיובא הינו ריק"
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
+#: ../../Code/Module/Import.php:122
+#: ../../Code/Module/Import_items.php:86
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
+#: ../../Code/Module/Import.php:150 ../../include/import.php:86
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:160
+#: ../../Code/Module/Import.php:160
 msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Code/Module/Import.php:510
 #: ../../include/Import/import_diaspora.php:142
 msgid "Import completed."
 msgstr "יבוא הושלם."
 
-#: ../../Zotlabs/Module/Import.php:532
+#: ../../Code/Module/Import.php:532
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:537
+#: ../../Code/Module/Import.php:537
 msgid "Import Channel"
 msgstr "יבא ערוץ"
 
-#: ../../Zotlabs/Module/Import.php:538
+#: ../../Code/Module/Import.php:538
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "השתמש בטופס זה כדי ליבא ערוץ קיים מתוך שרת/מוקד אחר. באפשרותך לאחזר את זהות הערוץ מתוך שרת/מוקד ישן דרך הרשת או לספק קובץ יצוא."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
+#: ../../Code/Module/Import.php:539
+#: ../../Code/Module/Import_items.php:119
 msgid "File to Upload"
 msgstr "קובץ להעלאה"
 
-#: ../../Zotlabs/Module/Import.php:540
+#: ../../Code/Module/Import.php:540
 msgid "Or provide the old server/hub details"
 msgstr "או ספק פרטי שרת/מוקד ישנים"
 
-#: ../../Zotlabs/Module/Import.php:541
+#: ../../Code/Module/Import.php:541
 msgid "Your old identity address (xyz@example.com)"
 msgstr "כתובת זיהוי ישנה (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:542
+#: ../../Code/Module/Import.php:542
 msgid "Your old login email address"
 msgstr "כתובת דוא״ל כניסה ישנה"
 
-#: ../../Zotlabs/Module/Import.php:543
+#: ../../Code/Module/Import.php:543
 msgid "Your old login password"
 msgstr "סיסמת כניסה ישנה"
 
-#: ../../Zotlabs/Module/Import.php:544
+#: ../../Code/Module/Import.php:544
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -1808,1244 +1808,1244 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:545
+#: ../../Code/Module/Import.php:545
 msgid "Make this hub my primary location"
 msgstr "הפוך את מוקד זה למיקום העיקרי שלי"
 
-#: ../../Zotlabs/Module/Import.php:546
+#: ../../Code/Module/Import.php:546
 msgid ""
 "Import existing posts if possible (experimental - limited by available "
 "memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:547
+#: ../../Code/Module/Import.php:547
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:179
+#: ../../Code/Module/Item.php:179
 msgid "Unable to locate original post."
 msgstr "לא מסוגל לאתר פוסט מקורי."
 
-#: ../../Zotlabs/Module/Item.php:428
+#: ../../Code/Module/Item.php:428
 msgid "Empty post discarded."
 msgstr "פוסט ריק סולק."
 
-#: ../../Zotlabs/Module/Item.php:468
+#: ../../Code/Module/Item.php:468
 msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:848
+#: ../../Code/Module/Item.php:848
 msgid "Duplicate post suppressed."
 msgstr "פוסט כפול הודחק."
 
-#: ../../Zotlabs/Module/Item.php:983
+#: ../../Code/Module/Item.php:983
 msgid "System error. Post not saved."
 msgstr "שגיאת מערכת. פוסט לא נשמר."
 
-#: ../../Zotlabs/Module/Item.php:1241
+#: ../../Code/Module/Item.php:1241
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1248
+#: ../../Code/Module/Item.php:1248
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1255
+#: ../../Code/Module/Item.php:1255
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2268
+#: ../../Code/Module/Layouts.php:183 ../../include/text.php:2268
 msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185
+#: ../../Code/Module/Layouts.php:185
 msgid "Comanche page description language help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:189
+#: ../../Code/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:194
+#: ../../Code/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr "הורד קובץ PDL"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
+#: ../../Code/Module/Home.php:61 ../../Code/Module/Home.php:69
+#: ../../Code/Module/Siteinfo.php:65
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../Zotlabs/Module/Home.php:79
+#: ../../Code/Module/Home.php:79
 #, php-format
 msgid "Welcome to %s"
 msgstr "ברוכים הבאים אל %s"
 
-#: ../../Zotlabs/Module/Id.php:13
+#: ../../Code/Module/Id.php:13
 msgid "First Name"
 msgstr "שם פרטי"
 
-#: ../../Zotlabs/Module/Id.php:14
+#: ../../Code/Module/Id.php:14
 msgid "Last Name"
 msgstr "שם משפחה"
 
-#: ../../Zotlabs/Module/Id.php:15
+#: ../../Code/Module/Id.php:15
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: ../../Zotlabs/Module/Id.php:16
+#: ../../Code/Module/Id.php:16
 msgid "Full Name"
 msgstr "שם מלא"
 
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../Code/Module/Id.php:17 ../../Code/Module/Id.php:18
+#: ../../Code/Module/Admin.php:1035 ../../Code/Module/Admin.php:1047
 #: ../../include/network.php:2176 ../../boot.php:1706
 msgid "Email"
 msgstr "דוא״ל"
 
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:237
+#: ../../Code/Module/Id.php:19 ../../Code/Module/Id.php:20
+#: ../../Code/Module/Id.php:21 ../../Code/Lib/Apps.php:237
 msgid "Profile Photo"
 msgstr "תצלום פרופיל"
 
-#: ../../Zotlabs/Module/Id.php:22
+#: ../../Code/Module/Id.php:22
 msgid "Profile Photo 16px"
 msgstr "תצלום פרופיל 16 פיקסל"
 
-#: ../../Zotlabs/Module/Id.php:23
+#: ../../Code/Module/Id.php:23
 msgid "Profile Photo 32px"
 msgstr "תצלום פרופיל 32 פיקסל"
 
-#: ../../Zotlabs/Module/Id.php:24
+#: ../../Code/Module/Id.php:24
 msgid "Profile Photo 48px"
 msgstr "תצלום פרופיל 48 פיקסל"
 
-#: ../../Zotlabs/Module/Id.php:25
+#: ../../Code/Module/Id.php:25
 msgid "Profile Photo 64px"
 msgstr "תצלום פרופיל 64 פיקסל"
 
-#: ../../Zotlabs/Module/Id.php:26
+#: ../../Code/Module/Id.php:26
 msgid "Profile Photo 80px"
 msgstr "תצלום פרופיל 80 פיקסל"
 
-#: ../../Zotlabs/Module/Id.php:27
+#: ../../Code/Module/Id.php:27
 msgid "Profile Photo 128px"
 msgstr "תצלום פרופיל 128 פיקסל"
 
-#: ../../Zotlabs/Module/Id.php:28
+#: ../../Code/Module/Id.php:28
 msgid "Timezone"
 msgstr "אזור זמן"
 
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Id.php:29 ../../Code/Module/Profiles.php:731
 msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:235
+#: ../../Code/Module/Id.php:30 ../../Code/Lib/Apps.php:235
 msgid "Language"
 msgstr "שפה"
 
-#: ../../Zotlabs/Module/Id.php:31
+#: ../../Code/Module/Id.php:31
 msgid "Birth Year"
 msgstr "שנת הולדת"
 
-#: ../../Zotlabs/Module/Id.php:32
+#: ../../Code/Module/Id.php:32
 msgid "Birth Month"
 msgstr "חודש הולדת"
 
-#: ../../Zotlabs/Module/Id.php:33
+#: ../../Code/Module/Id.php:33
 msgid "Birth Day"
 msgstr "יום הולדת"
 
-#: ../../Zotlabs/Module/Id.php:34
+#: ../../Code/Module/Id.php:34
 msgid "Birthdate"
 msgstr "יום הולדת"
 
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+#: ../../Code/Module/Id.php:35 ../../Code/Module/Profiles.php:454
 msgid "Gender"
 msgstr "מין"
 
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../Code/Module/Id.php:108 ../../include/selectors.php:49
 #: ../../include/selectors.php:66
 msgid "Male"
 msgstr "זכר"
 
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../Code/Module/Id.php:110 ../../include/selectors.php:49
 #: ../../include/selectors.php:66
 msgid "Female"
 msgstr "נקבה"
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+#: ../../Code/Module/Impel.php:41 ../../include/bbcode.php:192
 msgid "webpage"
 msgstr "עמוד רשת"
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+#: ../../Code/Module/Impel.php:46 ../../include/bbcode.php:198
 msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+#: ../../Code/Module/Impel.php:51 ../../include/bbcode.php:195
 msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+#: ../../Code/Module/Impel.php:58 ../../include/bbcode.php:201
 msgid "menu"
 msgstr "תפריט"
 
-#: ../../Zotlabs/Module/Impel.php:187
+#: ../../Code/Module/Impel.php:187
 #, php-format
 msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:190
+#: ../../Code/Module/Impel.php:190
 #, php-format
 msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:19
+#: ../../Code/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:24
+#: ../../Code/Module/Like.php:24
 msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:25
+#: ../../Code/Module/Like.php:25
 msgid ""
 "Please login with your $Projectname ID or register as a new $Projectname member to continue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
+#: ../../Code/Module/Like.php:105 ../../Code/Module/Like.php:131
+#: ../../Code/Module/Like.php:169
 msgid "Invalid request."
 msgstr "בקשה שגויה."
 
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+#: ../../Code/Module/Like.php:117 ../../include/conversation.php:126
 msgid "channel"
 msgstr "ערוץ"
 
-#: ../../Zotlabs/Module/Like.php:146
+#: ../../Code/Module/Like.php:146
 msgid "thing"
 msgstr "דבר"
 
-#: ../../Zotlabs/Module/Like.php:192
+#: ../../Code/Module/Like.php:192
 msgid "Channel unavailable."
 msgstr "עמוד לא זמין."
 
-#: ../../Zotlabs/Module/Like.php:240
+#: ../../Code/Module/Like.php:240
 msgid "Previous action reversed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1941
+#: ../../Code/Module/Like.php:371 ../../Code/Module/Subthread.php:87
+#: ../../Code/Module/Tagger.php:47 ../../include/text.php:1941
 #: ../../include/conversation.php:120
 msgid "photo"
 msgstr "תצלום"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Code/Module/Like.php:371 ../../Code/Module/Subthread.php:87
 #: ../../include/text.php:1947 ../../include/conversation.php:148
 msgid "status"
 msgstr "סטטוס"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Code/Module/Like.php:420 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Code/Module/Like.php:422 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Code/Module/Like.php:424
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Code/Module/Like.php:426
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Code/Module/Like.php:428
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Code/Module/Like.php:430
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Code/Module/Like.php:432
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Code/Module/Like.php:434
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Code/Module/Like.php:537
 msgid "Action completed."
 msgstr "פעולה הושלמה."
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Code/Module/Like.php:538
 msgid "Thank you."
 msgstr "תודה."
 
-#: ../../Zotlabs/Module/Import_items.php:102
+#: ../../Code/Module/Import_items.php:102
 msgid "Import completed"
 msgstr "יבוא הושלם"
 
-#: ../../Zotlabs/Module/Import_items.php:117
+#: ../../Code/Module/Import_items.php:117
 msgid "Import Items"
 msgstr "יבוא פריטים"
 
-#: ../../Zotlabs/Module/Import_items.php:118
+#: ../../Code/Module/Import_items.php:118
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Code/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
 msgstr "סך מגבלת הזמנות נגמרה."
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Code/Module/Invite.php:53
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : כתובת דוא״ל לא תקינה."
 
-#: ../../Zotlabs/Module/Invite.php:63
+#: ../../Code/Module/Invite.php:63
 msgid "Please join us on $Projectname"
 msgstr "נשמח אם תצטרף אלינו ברשת $Projectname"
 
-#: ../../Zotlabs/Module/Invite.php:74
+#: ../../Code/Module/Invite.php:74
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr "מגבלת הזמנות נגמרה. אנא צור קשר עם מנהל האתר שלך."
 
-#: ../../Zotlabs/Module/Invite.php:79
+#: ../../Code/Module/Invite.php:79
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : מסירת הודעה נכשלה."
 
-#: ../../Zotlabs/Module/Invite.php:83
+#: ../../Code/Module/Invite.php:83
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "הודעה %d נשלחה."
 msgstr[1] "%d הודעות נשלחו."
 
-#: ../../Zotlabs/Module/Invite.php:102
+#: ../../Code/Module/Invite.php:102
 msgid "You have no more invitations available"
 msgstr "לא נותרו לך עוד הזמנות זמינות"
 
-#: ../../Zotlabs/Module/Invite.php:133
+#: ../../Code/Module/Invite.php:133
 msgid "Send invitations"
 msgstr "שלח הזמנות"
 
-#: ../../Zotlabs/Module/Invite.php:134
+#: ../../Code/Module/Invite.php:134
 msgid "Enter email addresses, one per line:"
 msgstr "הזן כתובות דוא״ל, אחת בכל שורה:"
 
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
+#: ../../Code/Module/Invite.php:135 ../../Code/Module/Mail.php:249
 msgid "Your message:"
 msgstr "הודעתך:"
 
-#: ../../Zotlabs/Module/Invite.php:136
+#: ../../Code/Module/Invite.php:136
 msgid "Please join my community on $Projectname."
 msgstr "אשמח אם תצטרף לקהילה שלי ברשת $Projectname."
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Code/Module/Invite.php:138
 msgid "You will need to supply this invitation code:"
 msgstr "יהיה עליך לספק את קוד הזמנה זה:"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Code/Module/Invite.php:139
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. הירשם בכל מיקום $Projectname (כולם מחוברים ב אופן הדדי)"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Code/Module/Invite.php:141
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. הזן את כתובת רשת $Projectname שלי לתוך שורת החיפוש של האתר."
 
-#: ../../Zotlabs/Module/Invite.php:142
+#: ../../Code/Module/Invite.php:142
 msgid "or visit"
 msgstr "או בקר בכתובת"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Code/Module/Invite.php:144
 msgid "3. Click [Connect]"
 msgstr "3. לחץ [התחבר]"
 
-#: ../../Zotlabs/Module/Lockview.php:61
+#: ../../Code/Module/Lockview.php:61
 msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:82
+#: ../../Code/Module/Lockview.php:82
 msgid "Visible to:"
 msgstr "נראה לאלו:"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+#: ../../Code/Module/Locs.php:25 ../../Code/Module/Locs.php:54
 msgid "Location not found."
 msgstr "מיקום לא נמצא."
 
-#: ../../Zotlabs/Module/Locs.php:62
+#: ../../Code/Module/Locs.php:62
 msgid "Location lookup failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Code/Module/Locs.php:66
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:95
+#: ../../Code/Module/Locs.php:95
 msgid "Syncing locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:105
+#: ../../Code/Module/Locs.php:105
 msgid "No locations found."
 msgstr "לא נמצאו מיקומים."
 
-#: ../../Zotlabs/Module/Locs.php:116
+#: ../../Code/Module/Locs.php:116
 msgid "Manage Channel Locations"
 msgstr "נהל מיקומי ערוץ"
 
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
+#: ../../Code/Module/Locs.php:118 ../../Code/Module/Profiles.php:470
+#: ../../Code/Module/Admin.php:1224
 msgid "Address"
 msgstr "כתובת"
 
-#: ../../Zotlabs/Module/Locs.php:119
+#: ../../Code/Module/Locs.php:119
 msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+#: ../../Code/Module/Locs.php:120 ../../Code/Module/Menu.php:113
 msgid "Drop"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Locs.php:122
 msgid "Sync Now"
 msgstr "סנכרן עכשיו"
 
-#: ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Code/Module/Locs.php:124
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
 msgstr "כאשר ניתן, השמט מיקום על ידי כניסה לתוך אתר רשת/מוקד והסרת הערוץ שלך."
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "השתמש בטופס זה כדי לנטוש את המיקום אם המוקד אינו פועל עוד."
 
-#: ../../Zotlabs/Module/Magic.php:71
+#: ../../Code/Module/Magic.php:71
 msgid "Hub not found."
 msgstr "מוקד לא נמצא."
 
-#: ../../Zotlabs/Module/Mail.php:38
+#: ../../Code/Module/Mail.php:38
 msgid "Unable to lookup recipient."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:45
+#: ../../Code/Module/Mail.php:45
 msgid "Unable to communicate with requested channel."
 msgstr "לא מסוגל לתקשר עם ערוץ מבוקש"
 
-#: ../../Zotlabs/Module/Mail.php:52
+#: ../../Code/Module/Mail.php:52
 msgid "Cannot verify requested channel."
 msgstr "לא יכול לאמת ערוץ מבוקש."
 
-#: ../../Zotlabs/Module/Mail.php:78
+#: ../../Code/Module/Mail.php:78
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "על הערוץ הנבחר מוטלות הגבלות הודעה פרטית. שליחה נכשלה."
 
-#: ../../Zotlabs/Module/Mail.php:143
+#: ../../Code/Module/Mail.php:143
 msgid "Messages"
 msgstr "הודעות"
 
-#: ../../Zotlabs/Module/Mail.php:178
+#: ../../Code/Module/Mail.php:178
 msgid "Message recalled."
 msgstr "הודעה הוחזרה."
 
-#: ../../Zotlabs/Module/Mail.php:191
+#: ../../Code/Module/Mail.php:191
 msgid "Conversation removed."
 msgstr "דיון הוסר."
 
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
+#: ../../Code/Module/Mail.php:206 ../../Code/Module/Mail.php:315
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "פג YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:234
+#: ../../Code/Module/Mail.php:234
 msgid "Requested channel is not in this network"
 msgstr "הערוץ המבוקש אינו נמצא ברשת זו"
 
-#: ../../Zotlabs/Module/Mail.php:242
+#: ../../Code/Module/Mail.php:242
 msgid "Send Private Message"
 msgstr "שלח הודעה פרטית"
 
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../Code/Module/Mail.php:243 ../../Code/Module/Mail.php:368
 msgid "To:"
 msgstr "לכבוד:"
 
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
+#: ../../Code/Module/Mail.php:246 ../../Code/Module/Mail.php:370
 msgid "Subject:"
 msgstr "נושא:"
 
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
+#: ../../Code/Module/Mail.php:251 ../../Code/Module/Mail.php:376
 #: ../../include/conversation.php:1231
 msgid "Attach file"
 msgstr "צרף קובץ"
 
-#: ../../Zotlabs/Module/Mail.php:253
+#: ../../Code/Module/Mail.php:253
 msgid "Send"
 msgstr "שלח"
 
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
+#: ../../Code/Module/Mail.php:256 ../../Code/Module/Mail.php:381
 #: ../../include/conversation.php:1266
 msgid "Set expiration date"
 msgstr "קבע תאריך תפוגה"
 
-#: ../../Zotlabs/Module/Mail.php:340
+#: ../../Code/Module/Mail.php:340
 msgid "Delete message"
 msgstr "מחק הודעה"
 
-#: ../../Zotlabs/Module/Mail.php:341
+#: ../../Code/Module/Mail.php:341
 msgid "Delivery report"
 msgstr "דיווח מסירה"
 
-#: ../../Zotlabs/Module/Mail.php:342
+#: ../../Code/Module/Mail.php:342
 msgid "Recall message"
 msgstr "בטל הודעה"
 
-#: ../../Zotlabs/Module/Mail.php:344
+#: ../../Code/Module/Mail.php:344
 msgid "Message has been recalled."
 msgstr "הודעה הוחזרה."
 
-#: ../../Zotlabs/Module/Mail.php:361
+#: ../../Code/Module/Mail.php:361
 msgid "Delete Conversation"
 msgstr "מחק דיון"
 
-#: ../../Zotlabs/Module/Mail.php:363
+#: ../../Code/Module/Mail.php:363
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "אין חיבורים מאובטחים זמינים. אפשרי כי תהא באפשרותך להשיב מתוך עמוד הפרופיל של השולח."
 
-#: ../../Zotlabs/Module/Mail.php:367
+#: ../../Code/Module/Mail.php:367
 msgid "Send Reply"
 msgstr "שלח משוב"
 
-#: ../../Zotlabs/Module/Mail.php:372
+#: ../../Code/Module/Mail.php:372
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "הודעתך עבור %s ‏(%s):"
 
-#: ../../Zotlabs/Module/Manage.php:136
-#: ../../Zotlabs/Module/New_channel.php:121
+#: ../../Code/Module/Manage.php:136
+#: ../../Code/Module/New_channel.php:121
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:143
+#: ../../Code/Module/Manage.php:143
 msgid "Create a new channel"
 msgstr "צור ערוץ חדש"
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
+#: ../../Code/Module/Manage.php:164 ../../Code/Lib/Apps.php:213
 #: ../../include/nav.php:206
 msgid "Channel Manager"
 msgstr "מנהל ערוץ"
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Code/Module/Manage.php:165
 msgid "Current Channel"
 msgstr "ערוץ נוכחי"
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Code/Module/Manage.php:167
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:168
+#: ../../Code/Module/Manage.php:168
 msgid "Default Channel"
 msgstr "ערוץ שגרתי"
 
-#: ../../Zotlabs/Module/Manage.php:169
+#: ../../Code/Module/Manage.php:169
 msgid "Make Default"
 msgstr "הפוך לשגרתי"
 
-#: ../../Zotlabs/Module/Manage.php:172
+#: ../../Code/Module/Manage.php:172
 #, php-format
 msgid "%d new messages"
 msgstr "%d הודעות חדשות"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Code/Module/Manage.php:173
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Code/Module/Manage.php:175
 msgid "Delegated Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "לא נמצא חשבון תקין."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:107
 #, php-format
 msgid "Site Member (%s)"
 msgstr "חבר אתר (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44
+#: ../../Code/Module/Lostpass.php:44
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "בקשת איפוס סיסמה נתבקשה אצל %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:67
+#: ../../Code/Module/Lostpass.php:67
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712
+#: ../../Code/Module/Lostpass.php:90 ../../boot.php:1712
 msgid "Password Reset"
 msgstr "איפוס סיסמה"
 
-#: ../../Zotlabs/Module/Lostpass.php:91
+#: ../../Code/Module/Lostpass.php:91
 msgid "Your password has been reset as requested."
 msgstr "הסיסמה שלך אותחלה כנדרש."
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your new password is"
 msgstr "הסיסמה החדשה שלך היא"
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "click here to login"
 msgstr "לחץ כאן כדי להיכנס"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:112
+#: ../../Code/Module/Lostpass.php:112
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "הסיסמה שלך נשתנתה אצל %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:127
+#: ../../Code/Module/Lostpass.php:127
 msgid "Forgot your Password?"
 msgstr "שכחת את הסיסמה שלך?"
 
-#: ../../Zotlabs/Module/Lostpass.php:128
+#: ../../Code/Module/Lostpass.php:128
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:129
+#: ../../Code/Module/Lostpass.php:129
 msgid "Email Address"
 msgstr "כתובת דוא״ל"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Reset"
 msgstr "אפס"
 
-#: ../../Zotlabs/Module/Menu.php:49
+#: ../../Code/Module/Menu.php:49
 msgid "Unable to update menu."
 msgstr "לא מסוגל לעדכן תפריט."
 
-#: ../../Zotlabs/Module/Menu.php:60
+#: ../../Code/Module/Menu.php:60
 msgid "Unable to create menu."
 msgstr "לא מסוגל ליצור תפריט."
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+#: ../../Code/Module/Menu.php:98 ../../Code/Module/Menu.php:110
 msgid "Menu Name"
 msgstr "שם תפריט"
 
-#: ../../Zotlabs/Module/Menu.php:98
+#: ../../Code/Module/Menu.php:98
 msgid "Unique name (not visible on webpage) - required"
 msgstr "שם ייחודי (לא נראה בבלוג רשת) - נדרש"
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+#: ../../Code/Module/Menu.php:99 ../../Code/Module/Menu.php:111
 msgid "Menu Title"
 msgstr "כותרת תפריט"
 
-#: ../../Zotlabs/Module/Menu.php:99
+#: ../../Code/Module/Menu.php:99
 msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:100
 msgid "Allow Bookmarks"
 msgstr "התר סימניות"
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
 msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+#: ../../Code/Module/Menu.php:101 ../../Code/Module/Menu.php:159
 msgid "Submit and proceed"
 msgstr "שלח והמשך"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2267
+#: ../../Code/Module/Menu.php:107 ../../include/text.php:2267
 msgid "Menus"
 msgstr "תפריטים"
 
-#: ../../Zotlabs/Module/Menu.php:117
+#: ../../Code/Module/Menu.php:117
 msgid "Bookmarks allowed"
 msgstr "סימניות מותרות"
 
-#: ../../Zotlabs/Module/Menu.php:119
+#: ../../Code/Module/Menu.php:119
 msgid "Delete this menu"
 msgstr "מחק את תפריט זה"
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+#: ../../Code/Module/Menu.php:120 ../../Code/Module/Menu.php:154
 msgid "Edit menu contents"
 msgstr "ערוך תכני תפריט"
 
-#: ../../Zotlabs/Module/Menu.php:121
+#: ../../Code/Module/Menu.php:121
 msgid "Edit this menu"
 msgstr "ערוך את תפריט זה"
 
-#: ../../Zotlabs/Module/Menu.php:136
+#: ../../Code/Module/Menu.php:136
 msgid "Menu could not be deleted."
 msgstr "תפריט לא יכול היה להימחק."
 
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+#: ../../Code/Module/Menu.php:144 ../../Code/Module/Mitem.php:28
 msgid "Menu not found."
 msgstr "תפריט לא נמצא."
 
-#: ../../Zotlabs/Module/Menu.php:149
+#: ../../Code/Module/Menu.php:149
 msgid "Edit Menu"
 msgstr "ערוך תפריט"
 
-#: ../../Zotlabs/Module/Menu.php:153
+#: ../../Code/Module/Menu.php:153
 msgid "Add or remove entries to this menu"
 msgstr "הוסף או הסר רשומות מתפריט זה"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Menu name"
 msgstr "שם תפריט"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title"
 msgstr "כותרת תפריט"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:157
 msgid "Allow bookmarks"
 msgstr "התר סימניות"
 
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
+#: ../../Code/Module/Menu.php:166 ../../Code/Module/Mitem.php:120
+#: ../../Code/Module/Xchan.php:41
 msgid "Not found."
 msgstr "לא נמצא."
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#: ../../Code/Module/Mood.php:67 ../../include/conversation.php:260
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:226
+#: ../../Code/Module/Mood.php:135 ../../Code/Lib/Apps.php:226
 msgid "Mood"
 msgstr "מצב רוח"
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Code/Module/Mood.php:136
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:26
+#: ../../Code/Module/Match.php:26
 msgid "Profile Match"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:35
+#: ../../Code/Module/Match.php:35
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:67
+#: ../../Code/Module/Match.php:67
 msgid "is interested in:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:74
+#: ../../Code/Module/Match.php:74
 msgid "No matches"
 msgstr "אין התאמות"
 
-#: ../../Zotlabs/Module/Network.php:96
+#: ../../Code/Module/Network.php:96
 msgid "No such group"
 msgstr "אין קבוצה כזו"
 
-#: ../../Zotlabs/Module/Network.php:136
+#: ../../Code/Module/Network.php:136
 msgid "No such channel"
 msgstr "אין ערוץ כזה"
 
-#: ../../Zotlabs/Module/Network.php:141
+#: ../../Code/Module/Network.php:141
 msgid "forum"
 msgstr "פורום"
 
-#: ../../Zotlabs/Module/Network.php:153
+#: ../../Code/Module/Network.php:153
 msgid "Search Results For:"
 msgstr "תוצאות חיפוש עבור:"
 
-#: ../../Zotlabs/Module/Network.php:217
+#: ../../Code/Module/Network.php:217
 msgid "Privacy group is empty"
 msgstr "קבוצת פרטיות הינה ריקה"
 
-#: ../../Zotlabs/Module/Network.php:226
+#: ../../Code/Module/Network.php:226
 msgid "Privacy group: "
 msgstr "קבוצת פרטיות: "
 
-#: ../../Zotlabs/Module/Network.php:252
+#: ../../Code/Module/Network.php:252
 msgid "Invalid connection."
 msgstr "חיבור שגוי."
 
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
+#: ../../Code/Module/Notify.php:57
+#: ../../Code/Module/Notifications.php:98
 msgid "No more system notifications."
 msgstr "אין עוד התראות מערכת"
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
+#: ../../Code/Module/Notify.php:61
+#: ../../Code/Module/Notifications.php:102
 msgid "System Notifications"
 msgstr "התראות מערכת"
 
-#: ../../Zotlabs/Module/Mitem.php:52
+#: ../../Code/Module/Mitem.php:52
 msgid "Unable to create element."
 msgstr "לא מסוגל ליצור אלמנט"
 
-#: ../../Zotlabs/Module/Mitem.php:76
+#: ../../Code/Module/Mitem.php:76
 msgid "Unable to update menu element."
 msgstr "לא מסוגל לעדכן אלמנט תפריט."
 
-#: ../../Zotlabs/Module/Mitem.php:92
+#: ../../Code/Module/Mitem.php:92
 msgid "Unable to add menu element."
 msgstr "לא מסוגל להוסיף אלמנט תפריט."
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+#: ../../Code/Module/Mitem.php:153 ../../Code/Module/Mitem.php:226
 msgid "Menu Item Permissions"
 msgstr "הרשאות פריט תפריט"
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
+#: ../../Code/Module/Mitem.php:154 ../../Code/Module/Mitem.php:227
+#: ../../Code/Module/Settings.php:1068
 msgid "(click to open/close)"
 msgstr "(לחץ כדי לפתוח/לסגור)"
 
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+#: ../../Code/Module/Mitem.php:156 ../../Code/Module/Mitem.php:172
 msgid "Link Name"
 msgstr "שם קישור"
 
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+#: ../../Code/Module/Mitem.php:157 ../../Code/Module/Mitem.php:231
 msgid "Link or Submenu Target"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:157
+#: ../../Code/Module/Mitem.php:157
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+#: ../../Code/Module/Mitem.php:158 ../../Code/Module/Mitem.php:232
 msgid "Use magic-auth if available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+#: ../../Code/Module/Mitem.php:159 ../../Code/Module/Mitem.php:233
 msgid "Open link in new window"
 msgstr "פתח בתוך חלון חדש"
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+#: ../../Code/Module/Mitem.php:160 ../../Code/Module/Mitem.php:234
 msgid "Order in list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+#: ../../Code/Module/Mitem.php:160 ../../Code/Module/Mitem.php:234
 msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:161
+#: ../../Code/Module/Mitem.php:161
 msgid "Submit and finish"
 msgstr "שלח וסיים"
 
-#: ../../Zotlabs/Module/Mitem.php:162
+#: ../../Code/Module/Mitem.php:162
 msgid "Submit and continue"
 msgstr "שלח והמשך"
 
-#: ../../Zotlabs/Module/Mitem.php:170
+#: ../../Code/Module/Mitem.php:170
 msgid "Menu:"
 msgstr "תפריט:"
 
-#: ../../Zotlabs/Module/Mitem.php:173
+#: ../../Code/Module/Mitem.php:173
 msgid "Link Target"
 msgstr "יעד קישור"
 
-#: ../../Zotlabs/Module/Mitem.php:176
+#: ../../Code/Module/Mitem.php:176
 msgid "Edit menu"
 msgstr "ערוך תפריט"
 
-#: ../../Zotlabs/Module/Mitem.php:179
+#: ../../Code/Module/Mitem.php:179
 msgid "Edit element"
 msgstr "ערוך אלמנט"
 
-#: ../../Zotlabs/Module/Mitem.php:180
+#: ../../Code/Module/Mitem.php:180
 msgid "Drop element"
 msgstr "הטל אלמנט"
 
-#: ../../Zotlabs/Module/Mitem.php:181
+#: ../../Code/Module/Mitem.php:181
 msgid "New element"
 msgstr "אלמנט חדש"
 
-#: ../../Zotlabs/Module/Mitem.php:182
+#: ../../Code/Module/Mitem.php:182
 msgid "Edit this menu container"
 msgstr "ערוך את מכיל תפריט זה"
 
-#: ../../Zotlabs/Module/Mitem.php:183
+#: ../../Code/Module/Mitem.php:183
 msgid "Add menu element"
 msgstr "הוסף אלמנט תפריט"
 
-#: ../../Zotlabs/Module/Mitem.php:184
+#: ../../Code/Module/Mitem.php:184
 msgid "Delete this menu item"
 msgstr "מחק את פריט תפריט זה"
 
-#: ../../Zotlabs/Module/Mitem.php:185
+#: ../../Code/Module/Mitem.php:185
 msgid "Edit this menu item"
 msgstr "ערוך את פריט תפריט זה"
 
-#: ../../Zotlabs/Module/Mitem.php:202
+#: ../../Code/Module/Mitem.php:202
 msgid "Menu item not found."
 msgstr "פריט תפריט לא נמצא."
 
-#: ../../Zotlabs/Module/Mitem.php:215
+#: ../../Code/Module/Mitem.php:215
 msgid "Menu item deleted."
 msgstr "פריט תפריט נמחק."
 
-#: ../../Zotlabs/Module/Mitem.php:217
+#: ../../Code/Module/Mitem.php:217
 msgid "Menu item could not be deleted."
 msgstr "פריט תפריט לא יכול היה להימחק."
 
-#: ../../Zotlabs/Module/Mitem.php:224
+#: ../../Code/Module/Mitem.php:224
 msgid "Edit Menu Element"
 msgstr "ערוך אלמנט תפריט"
 
-#: ../../Zotlabs/Module/Mitem.php:230
+#: ../../Code/Module/Mitem.php:230
 msgid "Link text"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
+#: ../../Code/Module/New_channel.php:128
+#: ../../Code/Module/Register.php:231
 msgid "Name or caption"
 msgstr "שם או דברי הסבר"
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
+#: ../../Code/Module/New_channel.php:128
+#: ../../Code/Module/Register.php:231
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
 msgstr "דוגמאות: \"בוב ג׳יימסון\", \"ליסה והסוסים שלה\", \"טניס\", \"קבוצת תעופה\""
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
+#: ../../Code/Module/New_channel.php:130
+#: ../../Code/Module/Register.php:233
 msgid "Choose a short nickname"
 msgstr "בחר שם כינוי קצר"
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
+#: ../../Code/Module/New_channel.php:130
+#: ../../Code/Module/Register.php:233
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
 "e.g. nickname%s"
 msgstr "שם כינוי ישמש אותך כדי ליצור כתובת ערוץ קלה לזכירה למשל nickname%s"
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
+#: ../../Code/Module/New_channel.php:132
+#: ../../Code/Module/Register.php:235
 msgid "Channel role and privacy"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
+#: ../../Code/Module/New_channel.php:132
+#: ../../Code/Module/Register.php:235
 msgid "Select a channel role with your privacy requirements."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
+#: ../../Code/Module/New_channel.php:132
+#: ../../Code/Module/Register.php:235
 msgid "Read more about roles"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Code/Module/New_channel.php:135
 msgid "Create Channel"
 msgstr "צור ערוץ"
 
-#: ../../Zotlabs/Module/New_channel.php:136
+#: ../../Code/Module/New_channel.php:136
 msgid ""
 "A channel is your identity on this network. It can represent a person, a "
 "blog, or a forum to name a few. Channels can make connections with other "
 "channels to share information with highly detailed permissions."
 msgstr "ערוץ הוא הזהות שלך ברשת זו. זה יכול לייצג אדם, בלוג, או פורום (נמנו רק אחדים). ערוצים יכולים ליצור חיבורים עם ערוצים אחרים כדי לשתף מידע בעזרת הרשאות מפורטות מאוד."
 
-#: ../../Zotlabs/Module/New_channel.php:137
+#: ../../Code/Module/New_channel.php:137
 msgid ""
 "or import an existing channel from another location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:30
+#: ../../Code/Module/Notifications.php:30
 msgid "Invalid request identifier."
 msgstr "מזהה מבקש לא תקין."
 
-#: ../../Zotlabs/Module/Notifications.php:39
+#: ../../Code/Module/Notifications.php:39
 msgid "Discard"
 msgstr "סלק"
 
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
+#: ../../Code/Module/Notifications.php:103 ../../include/nav.php:191
 msgid "Mark all system notifications seen"
 msgstr "סמן את כל התראות המערכת כנקראו"
 
-#: ../../Zotlabs/Module/Photos.php:84
+#: ../../Code/Module/Photos.php:84
 msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
-#: ../../Zotlabs/Module/Profile_photo.php:114
-#: ../../Zotlabs/Module/Profile_photo.php:206
-#: ../../Zotlabs/Module/Profile_photo.php:294
+#: ../../Code/Module/Photos.php:99 ../../Code/Module/Photos.php:743
+#: ../../Code/Module/Profile_photo.php:114
+#: ../../Code/Module/Profile_photo.php:206
+#: ../../Code/Module/Profile_photo.php:294
 #: ../../include/photo/photo_driver.php:718
 msgid "Profile Photos"
 msgstr "תצלומי פרופיל"
 
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
+#: ../../Code/Module/Photos.php:105 ../../Code/Module/Photos.php:149
 msgid "Album not found."
 msgstr "אלבום לא נמצא."
 
-#: ../../Zotlabs/Module/Photos.php:132
+#: ../../Code/Module/Photos.php:132
 msgid "Delete Album"
 msgstr "מחק אלבום"
 
-#: ../../Zotlabs/Module/Photos.php:153
+#: ../../Code/Module/Photos.php:153
 msgid ""
 "Multiple storage folders exist with this album name, but within different "
 "directories. Please remove the desired folder or folders using the Files "
 "manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
+#: ../../Code/Module/Photos.php:210 ../../Code/Module/Photos.php:1053
 msgid "Delete Photo"
 msgstr "מחק תצלום"
 
-#: ../../Zotlabs/Module/Photos.php:533
+#: ../../Code/Module/Photos.php:533
 msgid "No photos selected"
 msgstr "לא נבחרו תצלומים"
 
-#: ../../Zotlabs/Module/Photos.php:582
+#: ../../Code/Module/Photos.php:582
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:621
+#: ../../Code/Module/Photos.php:621
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:624
+#: ../../Code/Module/Photos.php:624
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:660
+#: ../../Code/Module/Photos.php:660
 msgid "Upload Photos"
 msgstr "העלה תצלומים"
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Code/Module/Photos.php:664
 msgid "Enter an album name"
 msgstr "הזן שם אלבום"
 
-#: ../../Zotlabs/Module/Photos.php:665
+#: ../../Code/Module/Photos.php:665
 msgid "or select an existing album (doubleclick)"
 msgstr "או בחר אלבום קיים (לחיצה כפולה)"
 
-#: ../../Zotlabs/Module/Photos.php:666
+#: ../../Code/Module/Photos.php:666
 msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Code/Module/Photos.php:667
 msgid "Caption (optional):"
 msgstr "דברי הסבר (רשות):"
 
-#: ../../Zotlabs/Module/Photos.php:668
+#: ../../Code/Module/Photos.php:668
 msgid "Description (optional):"
 msgstr "תיאור (רשות):"
 
-#: ../../Zotlabs/Module/Photos.php:695
+#: ../../Code/Module/Photos.php:695
 msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:743
+#: ../../Code/Module/Photos.php:743
 msgid "Contact Photos"
 msgstr "תצלומי איש קשר"
 
-#: ../../Zotlabs/Module/Photos.php:766
+#: ../../Code/Module/Photos.php:766
 msgid "Show Newest First"
 msgstr "הצג את החדשים יותר בתחילה"
 
-#: ../../Zotlabs/Module/Photos.php:768
+#: ../../Code/Module/Photos.php:768
 msgid "Show Oldest First"
 msgstr "הצג את הישנים יותר בתחילה"
 
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1572
+#: ../../Code/Module/Photos.php:792 ../../Code/Module/Photos.php:1331
+#: ../../Code/Module/Embedphotos.php:141 ../../include/widgets.php:1572
 msgid "View Photo"
 msgstr "צפה בתצלום"
 
-#: ../../Zotlabs/Module/Photos.php:823
-#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1589
+#: ../../Code/Module/Photos.php:823
+#: ../../Code/Module/Embedphotos.php:157 ../../include/widgets.php:1589
 msgid "Edit Album"
 msgstr "ערוך אלבום"
 
-#: ../../Zotlabs/Module/Photos.php:870
+#: ../../Code/Module/Photos.php:870
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:872
+#: ../../Code/Module/Photos.php:872
 msgid "Photo not available"
 msgstr "תצלום לא זמין"
 
-#: ../../Zotlabs/Module/Photos.php:930
+#: ../../Code/Module/Photos.php:930
 msgid "Use as profile photo"
 msgstr "השתמש בתור תצלום פרופיל"
 
-#: ../../Zotlabs/Module/Photos.php:931
+#: ../../Code/Module/Photos.php:931
 msgid "Use as cover photo"
 msgstr "השתמש בתור תצלום שער"
 
-#: ../../Zotlabs/Module/Photos.php:938
+#: ../../Code/Module/Photos.php:938
 msgid "Private Photo"
 msgstr "תצלום פרטי"
 
-#: ../../Zotlabs/Module/Photos.php:953
+#: ../../Code/Module/Photos.php:953
 msgid "View Full Size"
 msgstr "צפה בגודל מלא"
 
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Code/Module/Photos.php:998 ../../Code/Module/Admin.php:1437
+#: ../../Code/Module/Tagrm.php:137
 msgid "Remove"
 msgstr "הסר"
 
-#: ../../Zotlabs/Module/Photos.php:1032
+#: ../../Code/Module/Photos.php:1032
 msgid "Edit photo"
 msgstr "ערוך תצלום"
 
-#: ../../Zotlabs/Module/Photos.php:1034
+#: ../../Code/Module/Photos.php:1034
 msgid "Rotate CW (right)"
 msgstr "סובב כיוון-שעון (ימין)"
 
-#: ../../Zotlabs/Module/Photos.php:1035
+#: ../../Code/Module/Photos.php:1035
 msgid "Rotate CCW (left)"
 msgstr "סובב נגד כיוון-שעון (שמאל)"
 
-#: ../../Zotlabs/Module/Photos.php:1038
+#: ../../Code/Module/Photos.php:1038
 msgid "Enter a new album name"
 msgstr "הזן שם אלבום חדש"
 
-#: ../../Zotlabs/Module/Photos.php:1039
+#: ../../Code/Module/Photos.php:1039
 msgid "or select an existing one (doubleclick)"
 msgstr "או בחר באחד קיים (לחיצה כפולה)"
 
-#: ../../Zotlabs/Module/Photos.php:1042
+#: ../../Code/Module/Photos.php:1042
 msgid "Caption"
 msgstr "דברי הסבר"
 
-#: ../../Zotlabs/Module/Photos.php:1044
+#: ../../Code/Module/Photos.php:1044
 msgid "Add a Tag"
 msgstr "הוסף תגית"
 
-#: ../../Zotlabs/Module/Photos.php:1048
+#: ../../Code/Module/Photos.php:1048
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "דוגמא: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../Zotlabs/Module/Photos.php:1051
+#: ../../Code/Module/Photos.php:1051
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
+#: ../../Code/Module/Photos.php:1070 ../../Code/Lib/ThreadItem.php:261
 msgid "I like this (toggle)"
 msgstr "אהבתי את זה (החלף)"
 
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
+#: ../../Code/Module/Photos.php:1071 ../../Code/Lib/ThreadItem.php:262
 msgid "I don't like this (toggle)"
 msgstr "לא אהבתי את זה (החלף)"
 
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../Code/Module/Photos.php:1073 ../../Code/Lib/ThreadItem.php:397
 #: ../../include/conversation.php:743
 msgid "Please wait"
 msgstr "אנא המתן"
 
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
+#: ../../Code/Module/Photos.php:1089 ../../Code/Module/Photos.php:1207
+#: ../../Code/Lib/ThreadItem.php:707
 msgid "This is you"
 msgstr "זה את/ה"
 
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+#: ../../Code/Module/Photos.php:1091 ../../Code/Module/Photos.php:1209
+#: ../../Code/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "תגובה"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577
+#: ../../Code/Module/Photos.php:1107 ../../include/conversation.php:577
 msgctxt "title"
 msgid "Likes"
 msgstr "אוהב"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577
+#: ../../Code/Module/Photos.php:1107 ../../include/conversation.php:577
 msgctxt "title"
 msgid "Dislikes"
 msgstr "לא אוהב"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
+#: ../../Code/Module/Photos.php:1108 ../../include/conversation.php:578
 msgctxt "title"
 msgid "Agree"
 msgstr "מסכים"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
+#: ../../Code/Module/Photos.php:1108 ../../include/conversation.php:578
 msgctxt "title"
 msgid "Disagree"
 msgstr "לא מסכים"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
+#: ../../Code/Module/Photos.php:1108 ../../include/conversation.php:578
 msgctxt "title"
 msgid "Abstain"
 msgstr "נמנע"
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
+#: ../../Code/Module/Photos.php:1109 ../../include/conversation.php:579
 msgctxt "title"
 msgid "Attending"
 msgstr "נוכח"
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
+#: ../../Code/Module/Photos.php:1109 ../../include/conversation.php:579
 msgctxt "title"
 msgid "Not attending"
 msgstr "לא נוכח"
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
+#: ../../Code/Module/Photos.php:1109 ../../include/conversation.php:579
 msgctxt "title"
 msgid "Might attend"
 msgstr "עשוי להיווכח"
 
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Module/Photos.php:1126 ../../Code/Module/Photos.php:1138
+#: ../../Code/Lib/ThreadItem.php:181 ../../Code/Lib/ThreadItem.php:193
 #: ../../include/conversation.php:1732
 msgid "View all"
 msgstr "צפה בכולם"
 
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../Code/Module/Photos.php:1130 ../../Code/Lib/ThreadItem.php:185
 #: ../../include/taxonomy.php:403 ../../include/conversation.php:1756
 #: ../../include/channel.php:1139
 msgctxt "noun"
@@ -3054,7 +3054,7 @@ msgid_plural "Likes"
 msgstr[0] "אוהב"
 msgstr[1] "אוהבים"
 
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../Code/Module/Photos.php:1135 ../../Code/Lib/ThreadItem.php:190
 #: ../../include/conversation.php:1759
 msgctxt "noun"
 msgid "Dislike"
@@ -3062,79 +3062,79 @@ msgid_plural "Dislikes"
 msgstr[0] "לא אוהב"
 msgstr[1] "לא אוהבים"
 
-#: ../../Zotlabs/Module/Photos.php:1235
+#: ../../Code/Module/Photos.php:1235
 msgid "Photo Tools"
 msgstr "כלי תצלום"
 
-#: ../../Zotlabs/Module/Photos.php:1244
+#: ../../Code/Module/Photos.php:1244
 msgid "In This Photo:"
 msgstr "בתצלום זה:"
 
-#: ../../Zotlabs/Module/Photos.php:1249
+#: ../../Code/Module/Photos.php:1249
 msgid "Map"
 msgstr "מפה"
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
+#: ../../Code/Module/Photos.php:1257 ../../Code/Lib/ThreadItem.php:386
 msgctxt "noun"
 msgid "Likes"
 msgstr "אוהב"
 
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
+#: ../../Code/Module/Photos.php:1258 ../../Code/Lib/ThreadItem.php:387
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "לא אוהב"
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../Code/Module/Photos.php:1263 ../../Code/Lib/ThreadItem.php:392
 #: ../../include/acl_selectors.php:285
 msgid "Close"
 msgstr "סגור"
 
-#: ../../Zotlabs/Module/Photos.php:1337
+#: ../../Code/Module/Photos.php:1337
 msgid "View Album"
 msgstr "צפה באלבום"
 
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
+#: ../../Code/Module/Photos.php:1348 ../../Code/Module/Photos.php:1361
+#: ../../Code/Module/Photos.php:1362
 msgid "Recent Photos"
 msgstr "תצלומים אחרונים"
 
-#: ../../Zotlabs/Module/Ping.php:265
+#: ../../Code/Module/Ping.php:265
 msgid "sent you a private message"
 msgstr "שלח לך הודעה פרטית"
 
-#: ../../Zotlabs/Module/Ping.php:313
+#: ../../Code/Module/Ping.php:313
 msgid "added your channel"
 msgstr "הוסיף את הערוץ שלך"
 
-#: ../../Zotlabs/Module/Ping.php:323
+#: ../../Code/Module/Ping.php:323
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../Zotlabs/Module/Ping.php:346
+#: ../../Code/Module/Ping.php:346
 msgid "[today]"
 msgstr "[היום]"
 
-#: ../../Zotlabs/Module/Ping.php:355
+#: ../../Code/Module/Ping.php:355
 msgid "posted an event"
 msgstr "פרסם אירוע"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "לא מסוגל למצוא את המוקד שלך."
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "פרסום הצליח."
 
-#: ../../Zotlabs/Module/Openid.php:30
+#: ../../Code/Module/Openid.php:30
 msgid "OpenID protocol error. No ID returned."
 msgstr "שגיאת פרוטוקול OpenID. לא הוחזר ID."
 
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
+#: ../../Code/Module/Openid.php:193 ../../include/auth.php:226
 msgid "Login failed."
 msgstr "התחברות נכשלה."
 
-#: ../../Zotlabs/Module/Page.php:131
+#: ../../Code/Module/Page.php:131
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -3144,378 +3144,378 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:26 ../../Code/Module/Pconfig.php:59
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Code/Module/Pconfig.php:48
 msgid "Configuration Editor"
 msgstr "עורך תצורה"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Code/Module/Pconfig.php:49
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please"
 " leave this page unless you are comfortable with and knowledgeable about how"
 " to correctly use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:18
+#: ../../Code/Module/Pdledit.php:18
 msgid "Layout updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+#: ../../Code/Module/Pdledit.php:34 ../../Code/Module/Pdledit.php:61
 msgid "Edit System Page Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:56
+#: ../../Code/Module/Pdledit.php:56
 msgid "Layout not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:62
+#: ../../Code/Module/Pdledit.php:62
 msgid "Module Name:"
 msgstr "שם מודול:"
 
-#: ../../Zotlabs/Module/Pdledit.php:63
+#: ../../Code/Module/Pdledit.php:63
 msgid "Layout Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:227
+#: ../../Code/Module/Poke.php:168 ../../Code/Lib/Apps.php:227
 #: ../../include/conversation.php:963
 msgid "Poke"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:169
+#: ../../Code/Module/Poke.php:169
 msgid "Poke somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:172
+#: ../../Code/Module/Poke.php:172
 msgid "Poke/Prod"
 msgstr "דחוף/עורר"
 
-#: ../../Zotlabs/Module/Poke.php:173
+#: ../../Code/Module/Poke.php:173
 msgid "Poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:180
+#: ../../Code/Module/Poke.php:180
 msgid "Recipient"
 msgstr "נמען"
 
-#: ../../Zotlabs/Module/Poke.php:181
+#: ../../Code/Module/Poke.php:181
 msgid "Choose what you wish to do to recipient"
 msgstr "בחר מה ברצונך לעשות לנמען"
 
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+#: ../../Code/Module/Poke.php:184 ../../Code/Module/Poke.php:185
 msgid "Make this post private"
 msgstr "הפוך את פוסט זה לפרטי"
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Code/Module/Probe.php:30 ../../Code/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
-#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
+#: ../../Code/Module/Profiles.php:24 ../../Code/Module/Profiles.php:189
+#: ../../Code/Module/Profiles.php:246 ../../Code/Module/Profiles.php:625
 msgid "Profile not found."
 msgstr "פרופיל לא נמצא."
 
-#: ../../Zotlabs/Module/Profiles.php:44
+#: ../../Code/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "פרופיל נמחק."
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
+#: ../../Code/Module/Profiles.php:68 ../../Code/Module/Profiles.php:104
 msgid "Profile-"
 msgstr "פרופיל-"
 
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
+#: ../../Code/Module/Profiles.php:89 ../../Code/Module/Profiles.php:132
 msgid "New profile created."
 msgstr "פרופיל חדש נוצר."
 
-#: ../../Zotlabs/Module/Profiles.php:110
+#: ../../Code/Module/Profiles.php:110
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:151
+#: ../../Code/Module/Profiles.php:151
 msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:256
+#: ../../Code/Module/Profiles.php:256
 msgid "Profile Name is required."
 msgstr "נדרש שם פרופיל."
 
-#: ../../Zotlabs/Module/Profiles.php:427
+#: ../../Code/Module/Profiles.php:427
 msgid "Marital Status"
 msgstr "מצב משפחתי"
 
-#: ../../Zotlabs/Module/Profiles.php:431
+#: ../../Code/Module/Profiles.php:431
 msgid "Romantic Partner"
 msgstr "שותף רומנטי"
 
-#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
+#: ../../Code/Module/Profiles.php:435 ../../Code/Module/Profiles.php:736
 msgid "Likes"
 msgstr "אוהב"
 
-#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
+#: ../../Code/Module/Profiles.php:439 ../../Code/Module/Profiles.php:737
 msgid "Dislikes"
 msgstr "לא אוהב"
 
-#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
+#: ../../Code/Module/Profiles.php:443 ../../Code/Module/Profiles.php:744
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:446
+#: ../../Code/Module/Profiles.php:446
 msgid "Religion"
 msgstr "דת"
 
-#: ../../Zotlabs/Module/Profiles.php:450
+#: ../../Code/Module/Profiles.php:450
 msgid "Political Views"
 msgstr "השקפות פוליטיות"
 
-#: ../../Zotlabs/Module/Profiles.php:458
+#: ../../Code/Module/Profiles.php:458
 msgid "Sexual Preference"
 msgstr "העדפה מינית"
 
-#: ../../Zotlabs/Module/Profiles.php:462
+#: ../../Code/Module/Profiles.php:462
 msgid "Homepage"
 msgstr "עמוד בית"
 
-#: ../../Zotlabs/Module/Profiles.php:466
+#: ../../Code/Module/Profiles.php:466
 msgid "Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:560
+#: ../../Code/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:644
+#: ../../Code/Module/Profiles.php:644
 msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:686
+#: ../../Code/Module/Profiles.php:686
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:688
+#: ../../Code/Module/Profiles.php:688
 msgid "View this profile"
 msgstr "צפה בפרופיל זה"
 
-#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:689 ../../Code/Module/Profiles.php:771
 #: ../../include/channel.php:940
 msgid "Edit visibility"
 msgstr "ערוך נראות"
 
-#: ../../Zotlabs/Module/Profiles.php:690
+#: ../../Code/Module/Profiles.php:690
 msgid "Profile Tools"
 msgstr "כלי פרופיל"
 
-#: ../../Zotlabs/Module/Profiles.php:691
+#: ../../Code/Module/Profiles.php:691
 msgid "Change cover photo"
 msgstr "שנה תצלום שער"
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:911
+#: ../../Code/Module/Profiles.php:692 ../../include/channel.php:911
 msgid "Change profile photo"
 msgstr "שנה תצלום פרופיל"
 
-#: ../../Zotlabs/Module/Profiles.php:693
+#: ../../Code/Module/Profiles.php:693
 msgid "Create a new profile using these settings"
 msgstr "צור פרופיל חדש באמצעות הגדרות אלו"
 
-#: ../../Zotlabs/Module/Profiles.php:694
+#: ../../Code/Module/Profiles.php:694
 msgid "Clone this profile"
 msgstr "שבט את פרופיל זה"
 
-#: ../../Zotlabs/Module/Profiles.php:695
+#: ../../Code/Module/Profiles.php:695
 msgid "Delete this profile"
 msgstr "מחק את פרופיל זה"
 
-#: ../../Zotlabs/Module/Profiles.php:696
+#: ../../Code/Module/Profiles.php:696
 msgid "Add profile things"
 msgstr "הוסף דברי פרופיל"
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../Code/Module/Profiles.php:697 ../../include/conversation.php:1541
 #: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "אישי"
 
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Code/Module/Profiles.php:699
 msgid "Relation"
 msgstr "יחס"
 
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
+#: ../../Code/Module/Profiles.php:700 ../../include/datetime.php:48
 msgid "Miscellaneous"
 msgstr "שונות"
 
-#: ../../Zotlabs/Module/Profiles.php:702
+#: ../../Code/Module/Profiles.php:702
 msgid "Import profile from file"
 msgstr "יבא פרופיל מתוך קובץ"
 
-#: ../../Zotlabs/Module/Profiles.php:703
+#: ../../Code/Module/Profiles.php:703
 msgid "Export profile to file"
 msgstr "יצא פרופיל לתוך קובץ"
 
-#: ../../Zotlabs/Module/Profiles.php:704
+#: ../../Code/Module/Profiles.php:704
 msgid "Your gender"
 msgstr "המין שלך"
 
-#: ../../Zotlabs/Module/Profiles.php:705
+#: ../../Code/Module/Profiles.php:705
 msgid "Marital status"
 msgstr "מצב משפחתי"
 
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Code/Module/Profiles.php:706
 msgid "Sexual preference"
 msgstr "העדפה מינית"
 
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Code/Module/Profiles.php:709
 msgid "Profile name"
 msgstr "שם פרופיל"
 
-#: ../../Zotlabs/Module/Profiles.php:711
+#: ../../Code/Module/Profiles.php:711
 msgid "This is your default profile."
 msgstr "זהו הפרופיל השגרתי שלך."
 
-#: ../../Zotlabs/Module/Profiles.php:713
+#: ../../Code/Module/Profiles.php:713
 msgid "Your full name"
 msgstr "שמך המלא"
 
-#: ../../Zotlabs/Module/Profiles.php:714
+#: ../../Code/Module/Profiles.php:714
 msgid "Title/Description"
 msgstr "כותרת/תיאור"
 
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Code/Module/Profiles.php:717
 msgid "Street address"
 msgstr "כתובת רחוב"
 
-#: ../../Zotlabs/Module/Profiles.php:718
+#: ../../Code/Module/Profiles.php:718
 msgid "Locality/City"
 msgstr "מקומיות/עיר"
 
-#: ../../Zotlabs/Module/Profiles.php:719
+#: ../../Code/Module/Profiles.php:719
 msgid "Region/State"
 msgstr "אזור/מחוז"
 
-#: ../../Zotlabs/Module/Profiles.php:720
+#: ../../Code/Module/Profiles.php:720
 msgid "Postal/Zip code"
 msgstr "דואר/מיקוד"
 
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Code/Module/Profiles.php:721
 msgid "Country"
 msgstr "ארץ"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Since (date)"
 msgstr "מאז (תאריך)"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Tell us about yourself"
 msgstr "ספר לנו אודותיך"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Profiles.php:732
 msgid "Hometown"
 msgstr "עיר מגורים"
 
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Code/Module/Profiles.php:733
 msgid "Political views"
 msgstr "השקפות פוליטיות"
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Code/Module/Profiles.php:734
 msgid "Religious views"
 msgstr "השקפות דתיות"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Musical interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Books, literature"
 msgstr "ספרים, ספרות"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Television"
 msgstr "טלוויזיה"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Code/Module/Profiles.php:742
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Code/Module/Profiles.php:743
 msgid "Love/Romance"
 msgstr "אהבה/רומנטיקה"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:745
 msgid "School/Education"
 msgstr "בית ספר/חינוך"
 
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Code/Module/Profiles.php:746
 msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Code/Module/Profiles.php:747
 msgid "My other channels"
 msgstr "הערוצים האחרים שלי"
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:936
+#: ../../Code/Module/Profiles.php:767 ../../include/channel.php:936
 msgid "Profile Image"
 msgstr "תמונת פרופיל"
 
-#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
+#: ../../Code/Module/Profiles.php:777 ../../include/nav.php:88
 #: ../../include/channel.php:918
 msgid "Edit Profiles"
 msgstr "ערוך פרופילים"
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
+#: ../../Code/Module/Profile_photo.php:179
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:367
+#: ../../Code/Module/Profile_photo.php:367
 msgid "Upload Profile Photo"
 msgstr "העלה תצלום פרופיל"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+#: ../../Code/Module/Profperm.php:34 ../../Code/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr "מזהה פרופיל לא תקין."
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1230
+#: ../../Code/Module/Profperm.php:117 ../../include/channel.php:1230
 msgid "Profile"
 msgstr "פרופיל"
 
-#: ../../Zotlabs/Module/Profperm.php:119
+#: ../../Code/Module/Profperm.php:119
 msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:128
+#: ../../Code/Module/Profperm.php:128
 msgid "Visible To"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1343
+#: ../../Code/Module/Pubsites.php:22 ../../include/widgets.php:1343
 msgid "Public Hubs"
 msgstr "מוקדים ציבוריים"
 
-#: ../../Zotlabs/Module/Pubsites.php:25
+#: ../../Code/Module/Pubsites.php:25
 msgid ""
 "The listed hubs allow public registration for the $Projectname network. All "
 "hubs in the network are interlinked so membership on any of them conveys "
@@ -3524,2667 +3524,2667 @@ msgid ""
 "additional details."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Hub URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Access Type"
 msgstr "טיפוס גישה"
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Registration Policy"
 msgstr "מדיניות רישום"
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Software"
 msgstr "תוכנה"
 
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../Code/Module/Pubsites.php:31 ../../Code/Module/Ratings.php:103
 #: ../../include/conversation.php:962
 msgid "Ratings"
 msgstr "דירוג"
 
-#: ../../Zotlabs/Module/Pubsites.php:38
+#: ../../Code/Module/Pubsites.php:38
 msgid "Rate"
 msgstr "דרג"
 
-#: ../../Zotlabs/Module/Rate.php:160
+#: ../../Code/Module/Rate.php:160
 msgid "Website:"
 msgstr "אתר רשת:"
 
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Code/Module/Rate.php:163
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "ערוץ מרוחק [%s] (לא מוכר עדיין באתר זה)"
 
-#: ../../Zotlabs/Module/Rate.php:164
+#: ../../Code/Module/Rate.php:164
 msgid "Rating (this information is public)"
 msgstr "דירוג (מידע זה הינו ציבורי)"
 
-#: ../../Zotlabs/Module/Rate.php:165
+#: ../../Code/Module/Rate.php:165
 msgid "Optionally explain your rating (this information is public)"
 msgstr "הסבר לפי הצורך את הדירוג שלך (מידע זה הינו ציבורי)"
 
-#: ../../Zotlabs/Module/Ratings.php:73
+#: ../../Code/Module/Ratings.php:73
 msgid "No ratings"
 msgstr "אין דירוג"
 
-#: ../../Zotlabs/Module/Ratings.php:104
+#: ../../Code/Module/Ratings.php:104
 msgid "Rating: "
 msgstr "דירוג: "
 
-#: ../../Zotlabs/Module/Ratings.php:105
+#: ../../Code/Module/Ratings.php:105
 msgid "Website: "
 msgstr "אתר רשת:"
 
-#: ../../Zotlabs/Module/Ratings.php:107
+#: ../../Code/Module/Ratings.php:107
 msgid "Description: "
 msgstr "תיאור: "
 
-#: ../../Zotlabs/Module/Admin.php:77
+#: ../../Code/Module/Admin.php:77
 msgid "Theme settings updated."
 msgstr "הגדרות ערכת נושא עודכנו."
 
-#: ../../Zotlabs/Module/Admin.php:197
+#: ../../Code/Module/Admin.php:197
 msgid "# Accounts"
 msgstr "# חשבונות"
 
-#: ../../Zotlabs/Module/Admin.php:198
+#: ../../Code/Module/Admin.php:198
 msgid "# blocked accounts"
 msgstr "# חשבונות חסומים"
 
-#: ../../Zotlabs/Module/Admin.php:199
+#: ../../Code/Module/Admin.php:199
 msgid "# expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:200
+#: ../../Code/Module/Admin.php:200
 msgid "# expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:211
+#: ../../Code/Module/Admin.php:211
 msgid "# Channels"
 msgstr "# ערוצים"
 
-#: ../../Zotlabs/Module/Admin.php:212
+#: ../../Code/Module/Admin.php:212
 msgid "# primary"
 msgstr "# עיקרי"
 
-#: ../../Zotlabs/Module/Admin.php:213
+#: ../../Code/Module/Admin.php:213
 msgid "# clones"
 msgstr "# שיבוטים"
 
-#: ../../Zotlabs/Module/Admin.php:219
+#: ../../Code/Module/Admin.php:219
 msgid "Message queues"
 msgstr "תור הודעות"
 
-#: ../../Zotlabs/Module/Admin.php:236
+#: ../../Code/Module/Admin.php:236
 msgid "Your software should be updated"
 msgstr "התוכנה שלך אמורה להיות מעודכנת"
 
-#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
-#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
-#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209
-#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419
-#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646
-#: ../../Zotlabs/Module/Admin.php:1731
+#: ../../Code/Module/Admin.php:241 ../../Code/Module/Admin.php:490
+#: ../../Code/Module/Admin.php:711 ../../Code/Module/Admin.php:755
+#: ../../Code/Module/Admin.php:1030 ../../Code/Module/Admin.php:1209
+#: ../../Code/Module/Admin.php:1329 ../../Code/Module/Admin.php:1419
+#: ../../Code/Module/Admin.php:1612 ../../Code/Module/Admin.php:1646
+#: ../../Code/Module/Admin.php:1731
 msgid "Administration"
 msgstr "הנהלה"
 
-#: ../../Zotlabs/Module/Admin.php:242
+#: ../../Code/Module/Admin.php:242
 msgid "Summary"
 msgstr "סיכום"
 
-#: ../../Zotlabs/Module/Admin.php:245
+#: ../../Code/Module/Admin.php:245
 msgid "Registered accounts"
 msgstr "חשבונות רשומים"
 
-#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
+#: ../../Code/Module/Admin.php:246 ../../Code/Module/Admin.php:715
 msgid "Pending registrations"
 msgstr "הרשמות תלויות ועומדות"
 
-#: ../../Zotlabs/Module/Admin.php:247
+#: ../../Code/Module/Admin.php:247
 msgid "Registered channels"
 msgstr "ערוצים רשומים"
 
-#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
+#: ../../Code/Module/Admin.php:248 ../../Code/Module/Admin.php:716
 msgid "Active plugins"
 msgstr "תוספים פעילים"
 
-#: ../../Zotlabs/Module/Admin.php:249
+#: ../../Code/Module/Admin.php:249
 msgid "Version"
 msgstr "גרסא"
 
-#: ../../Zotlabs/Module/Admin.php:250
+#: ../../Code/Module/Admin.php:250
 msgid "Repository version (master)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:251
+#: ../../Code/Module/Admin.php:251
 msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:373
+#: ../../Code/Module/Admin.php:373
 msgid "Site settings updated."
 msgstr "הגדרות אתר עודכנו."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2845
+#: ../../Code/Module/Admin.php:400 ../../include/text.php:2845
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Code/Module/Admin.php:410 ../../Code/Module/Settings.php:798
 msgid "mobile"
 msgstr "נייד"
 
-#: ../../Zotlabs/Module/Admin.php:412
+#: ../../Code/Module/Admin.php:412
 msgid "experimental"
 msgstr "ניסיוני"
 
-#: ../../Zotlabs/Module/Admin.php:414
+#: ../../Code/Module/Admin.php:414
 msgid "unsupported"
 msgstr "לא נתמך"
 
-#: ../../Zotlabs/Module/Admin.php:460
+#: ../../Code/Module/Admin.php:460
 msgid "Yes - with approval"
 msgstr "כן - עם אימות"
 
-#: ../../Zotlabs/Module/Admin.php:466
+#: ../../Code/Module/Admin.php:466
 msgid "My site is not a public server"
 msgstr "האתר שלי אינו שרת פומבי"
 
-#: ../../Zotlabs/Module/Admin.php:467
+#: ../../Code/Module/Admin.php:467
 msgid "My site has paid access only"
 msgstr "לאתר שלי ישנה גישה בתשלום בלבד"
 
-#: ../../Zotlabs/Module/Admin.php:468
+#: ../../Code/Module/Admin.php:468
 msgid "My site has free access only"
 msgstr "לאתר שלי ישנה גישה חופשית בלבד"
 
-#: ../../Zotlabs/Module/Admin.php:469
+#: ../../Code/Module/Admin.php:469
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "האתר שלי מציע חשבונות בחינם לצד אפשרות לשדרוגים בתשלום"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1455
+#: ../../Code/Module/Admin.php:491 ../../include/widgets.php:1455
 msgid "Site"
 msgstr "אתר"
 
-#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
+#: ../../Code/Module/Admin.php:493 ../../Code/Module/Register.php:245
 msgid "Registration"
 msgstr "רישום"
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Code/Module/Admin.php:494
 msgid "File upload"
 msgstr "העלאת קובץ"
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Code/Module/Admin.php:495
 msgid "Policies"
 msgstr "מדינויות"
 
-#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
+#: ../../Code/Module/Admin.php:496 ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: ../../Zotlabs/Module/Admin.php:500
+#: ../../Code/Module/Admin.php:500
 msgid "Site name"
 msgstr "שם אתר"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Code/Module/Admin.php:501
 msgid "Banner/Logo"
 msgstr "באנר/לוגו"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Code/Module/Admin.php:502
 msgid "Administrator Information"
 msgstr "מידע מנהל"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Code/Module/Admin.php:502
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Code/Module/Admin.php:503
 msgid "System language"
 msgstr "שפת מערכת"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Code/Module/Admin.php:504
 msgid "System theme"
 msgstr "מוטיב מערכת"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Code/Module/Admin.php:504
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Code/Module/Admin.php:505
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Code/Module/Admin.php:505
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:507
+#: ../../Code/Module/Admin.php:507
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:507
+#: ../../Code/Module/Admin.php:507
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:508
+#: ../../Code/Module/Admin.php:508
 msgid "Maximum image size"
 msgstr "גודל תמונה מרבי"
 
-#: ../../Zotlabs/Module/Admin.php:508
+#: ../../Code/Module/Admin.php:508
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:509
+#: ../../Code/Module/Admin.php:509
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:510
+#: ../../Code/Module/Admin.php:510
 msgid "Invitation only"
 msgstr "הזמנה בלבד"
 
-#: ../../Zotlabs/Module/Admin.php:510
+#: ../../Code/Module/Admin.php:510
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:511
+#: ../../Code/Module/Admin.php:511
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:512
+#: ../../Code/Module/Admin.php:512
 msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:512
+#: ../../Code/Module/Admin.php:512
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:513
+#: ../../Code/Module/Admin.php:513
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:513
+#: ../../Code/Module/Admin.php:513
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:514
+#: ../../Code/Module/Admin.php:514
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:514
+#: ../../Code/Module/Admin.php:514
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:515
+#: ../../Code/Module/Admin.php:515
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:515
+#: ../../Code/Module/Admin.php:515
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:516
+#: ../../Code/Module/Admin.php:516
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:516
+#: ../../Code/Module/Admin.php:516
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:517
+#: ../../Code/Module/Admin.php:517
 msgid "Allowed email domains"
 msgstr "מתחמי דוא״ל מורשים"
 
-#: ../../Zotlabs/Module/Admin.php:517
+#: ../../Code/Module/Admin.php:517
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:518
+#: ../../Code/Module/Admin.php:518
 msgid "Not allowed email domains"
 msgstr "מתחמי דוא״ל לא מורשים"
 
-#: ../../Zotlabs/Module/Admin.php:518
+#: ../../Code/Module/Admin.php:518
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:519
+#: ../../Code/Module/Admin.php:519
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:519
+#: ../../Code/Module/Admin.php:519
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:520
+#: ../../Code/Module/Admin.php:520
 msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:520
+#: ../../Code/Module/Admin.php:520
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:521
+#: ../../Code/Module/Admin.php:521
 msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:521
+#: ../../Code/Module/Admin.php:521
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:522
+#: ../../Code/Module/Admin.php:522
 msgid "Login on Homepage"
 msgstr "התחבר בעמוד בית"
 
-#: ../../Zotlabs/Module/Admin.php:522
+#: ../../Code/Module/Admin.php:522
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:523
+#: ../../Code/Module/Admin.php:523
 msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:523
+#: ../../Code/Module/Admin.php:523
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:525
+#: ../../Code/Module/Admin.php:525
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:525
+#: ../../Code/Module/Admin.php:525
 msgid "Default directory server"
 msgstr "שרת ספרייה שגרתי"
 
-#: ../../Zotlabs/Module/Admin.php:527
+#: ../../Code/Module/Admin.php:527
 msgid "Proxy user"
 msgstr "משתמש פרוקסי"
 
-#: ../../Zotlabs/Module/Admin.php:528
+#: ../../Code/Module/Admin.php:528
 msgid "Proxy URL"
 msgstr "URL פרוקסי"
 
-#: ../../Zotlabs/Module/Admin.php:529
+#: ../../Code/Module/Admin.php:529
 msgid "Network timeout"
 msgstr "פקיעת זמן רשת"
 
-#: ../../Zotlabs/Module/Admin.php:529
+#: ../../Code/Module/Admin.php:529
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:530
+#: ../../Code/Module/Admin.php:530
 msgid "Delivery interval"
 msgstr "תדירות שגרתית"
 
-#: ../../Zotlabs/Module/Admin.php:530
+#: ../../Code/Module/Admin.php:530
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:531
+#: ../../Code/Module/Admin.php:531
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:531
+#: ../../Code/Module/Admin.php:531
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:532
+#: ../../Code/Module/Admin.php:532
 msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:532
+#: ../../Code/Module/Admin.php:532
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:533
+#: ../../Code/Module/Admin.php:533
 msgid "Maximum Load Average"
 msgstr "עומס ממוצע מרבי"
 
-#: ../../Zotlabs/Module/Admin.php:533
+#: ../../Code/Module/Admin.php:533
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:534
+#: ../../Code/Module/Admin.php:534
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:534
+#: ../../Code/Module/Admin.php:534
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Code/Module/Admin.php:677 ../../Code/Module/Admin.php:678
+#: ../../Code/Module/Settings.php:722
 msgid "Off"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Code/Module/Admin.php:677 ../../Code/Module/Admin.php:678
+#: ../../Code/Module/Settings.php:722
 msgid "On"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:678
+#: ../../Code/Module/Admin.php:678
 #, php-format
 msgid "Lock feature %s"
 msgstr "נעל תכונת %s"
 
-#: ../../Zotlabs/Module/Admin.php:686
+#: ../../Code/Module/Admin.php:686
 msgid "Manage Additional Features"
 msgstr "נהל תכונות נוספות"
 
-#: ../../Zotlabs/Module/Admin.php:703
+#: ../../Code/Module/Admin.php:703
 msgid "No server found"
 msgstr "לא נמצא שרת"
 
-#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
+#: ../../Code/Module/Admin.php:710 ../../Code/Module/Admin.php:1046
 msgid "ID"
 msgstr "מזהה"
 
-#: ../../Zotlabs/Module/Admin.php:710
+#: ../../Code/Module/Admin.php:710
 msgid "for channel"
 msgstr "לערוץ"
 
-#: ../../Zotlabs/Module/Admin.php:710
+#: ../../Code/Module/Admin.php:710
 msgid "on server"
 msgstr "בשרת"
 
-#: ../../Zotlabs/Module/Admin.php:712
+#: ../../Code/Module/Admin.php:712
 msgid "Server"
 msgstr "שרת"
 
-#: ../../Zotlabs/Module/Admin.php:746
+#: ../../Code/Module/Admin.php:746
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:749
+#: ../../Code/Module/Admin.php:749
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:750
+#: ../../Code/Module/Admin.php:750
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:751
+#: ../../Code/Module/Admin.php:751
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1458
+#: ../../Code/Module/Admin.php:756 ../../include/widgets.php:1458
 msgid "Security"
 msgstr "אבטחה"
 
-#: ../../Zotlabs/Module/Admin.php:758
+#: ../../Code/Module/Admin.php:758
 msgid "Block public"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:758
+#: ../../Code/Module/Admin.php:758
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:759
+#: ../../Code/Module/Admin.php:759
 msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:760
+#: ../../Code/Module/Admin.php:760
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:761
+#: ../../Code/Module/Admin.php:761
 msgid "Allow communications only from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:761
+#: ../../Code/Module/Admin.php:761
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:762
+#: ../../Code/Module/Admin.php:762
 msgid "Block communications from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Code/Module/Admin.php:763
 msgid "Allow communications only from these channels"
 msgstr "התר התקשרויות רק מתוך ערוצים אלה"
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Code/Module/Admin.php:763
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:764
+#: ../../Code/Module/Admin.php:764
 msgid "Block communications from these channels"
 msgstr "חסום התקשרויות מתוך ערוצים אלה"
 
-#: ../../Zotlabs/Module/Admin.php:765
+#: ../../Code/Module/Admin.php:765
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr "התר שיבוצים מתוך אתרים וקישורים נאובטחים (SSL) בלבד."
 
-#: ../../Zotlabs/Module/Admin.php:766
+#: ../../Code/Module/Admin.php:766
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:766
+#: ../../Code/Module/Admin.php:766
 msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:767
+#: ../../Code/Module/Admin.php:767
 msgid "Block embedded HTML from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:785
+#: ../../Code/Module/Admin.php:785
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:795
+#: ../../Code/Module/Admin.php:795
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:798
+#: ../../Code/Module/Admin.php:798
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:802
+#: ../../Code/Module/Admin.php:802
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:805
+#: ../../Code/Module/Admin.php:805
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:821
+#: ../../Code/Module/Admin.php:821
 msgid "No failed updates."
 msgstr "אין עדכונים כושלים."
 
-#: ../../Zotlabs/Module/Admin.php:825
+#: ../../Code/Module/Admin.php:825
 msgid "Failed Updates"
 msgstr "עדכונים כושלים"
 
-#: ../../Zotlabs/Module/Admin.php:827
+#: ../../Code/Module/Admin.php:827
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:828
+#: ../../Code/Module/Admin.php:828
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:859
+#: ../../Code/Module/Admin.php:859
 msgid "Queue Statistics"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:860
+#: ../../Code/Module/Admin.php:860
 msgid "Total Entries"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:861
+#: ../../Code/Module/Admin.php:861
 msgid "Priority"
 msgstr "עדיפות"
 
-#: ../../Zotlabs/Module/Admin.php:862
+#: ../../Code/Module/Admin.php:862
 msgid "Destination URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:863
+#: ../../Code/Module/Admin.php:863
 msgid "Mark hub permanently offline"
 msgstr "סמן מוקד בלתי מקוון לצמיתות"
 
-#: ../../Zotlabs/Module/Admin.php:864
+#: ../../Code/Module/Admin.php:864
 msgid "Empty queue for this hub"
 msgstr "רוקן תור עבור מוקד זה"
 
-#: ../../Zotlabs/Module/Admin.php:865
+#: ../../Code/Module/Admin.php:865
 msgid "Last known contact"
 msgstr "איש קשר מוכר אחרון"
 
-#: ../../Zotlabs/Module/Admin.php:901
+#: ../../Code/Module/Admin.php:901
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:908
+#: ../../Code/Module/Admin.php:908
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "חשבון %s נמחק"
 msgstr[1] "%s חשבונות נמחקו"
 
-#: ../../Zotlabs/Module/Admin.php:944
+#: ../../Code/Module/Admin.php:944
 msgid "Account not found"
 msgstr "חשבון לא נמצא"
 
-#: ../../Zotlabs/Module/Admin.php:955
+#: ../../Code/Module/Admin.php:955
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "חשבון '%s' נמחק"
 
-#: ../../Zotlabs/Module/Admin.php:963
+#: ../../Code/Module/Admin.php:963
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "חשבון '%s' נחסם"
 
-#: ../../Zotlabs/Module/Admin.php:971
+#: ../../Code/Module/Admin.php:971
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "חשבון '%s' נפתח"
 
-#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
+#: ../../Code/Module/Admin.php:1031 ../../Code/Module/Admin.php:1044
 #: ../../include/widgets.php:1456
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212
+#: ../../Code/Module/Admin.php:1033 ../../Code/Module/Admin.php:1212
 msgid "select all"
 msgstr "בחר הכל"
 
-#: ../../Zotlabs/Module/Admin.php:1034
+#: ../../Code/Module/Admin.php:1034
 msgid "Registrations waiting for confirm"
 msgstr "הרשמות ממתינות לצורך אישור"
 
-#: ../../Zotlabs/Module/Admin.php:1035
+#: ../../Code/Module/Admin.php:1035
 msgid "Request date"
 msgstr "תאריך בקשה"
 
-#: ../../Zotlabs/Module/Admin.php:1036
+#: ../../Code/Module/Admin.php:1036
 msgid "No registrations."
 msgstr "אין הרשמות."
 
-#: ../../Zotlabs/Module/Admin.php:1038
+#: ../../Code/Module/Admin.php:1038
 msgid "Deny"
 msgstr "אסור"
 
-#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
+#: ../../Code/Module/Admin.php:1048 ../../include/group.php:267
 msgid "All Channels"
 msgstr "כל הערוצים"
 
-#: ../../Zotlabs/Module/Admin.php:1049
+#: ../../Code/Module/Admin.php:1049
 msgid "Register date"
 msgstr "תאריך רישום"
 
-#: ../../Zotlabs/Module/Admin.php:1050
+#: ../../Code/Module/Admin.php:1050
 msgid "Last login"
 msgstr "כניסה אחרונה"
 
-#: ../../Zotlabs/Module/Admin.php:1051
+#: ../../Code/Module/Admin.php:1051
 msgid "Expires"
 msgstr "פג"
 
-#: ../../Zotlabs/Module/Admin.php:1052
+#: ../../Code/Module/Admin.php:1052
 msgid "Service Class"
 msgstr "מחלקת שירות"
 
-#: ../../Zotlabs/Module/Admin.php:1054
+#: ../../Code/Module/Admin.php:1054
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1055
+#: ../../Code/Module/Admin.php:1055
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1091
+#: ../../Code/Module/Admin.php:1091
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1100
+#: ../../Code/Module/Admin.php:1100
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1106
+#: ../../Code/Module/Admin.php:1106
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "ערוץ %s נמחק"
 msgstr[1] "%s ערוצים נמחקו"
 
-#: ../../Zotlabs/Module/Admin.php:1126
+#: ../../Code/Module/Admin.php:1126
 msgid "Channel not found"
 msgstr "ערוץ לא נמצא"
 
-#: ../../Zotlabs/Module/Admin.php:1136
+#: ../../Code/Module/Admin.php:1136
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "ערוץ '%s' נמחק"
 
-#: ../../Zotlabs/Module/Admin.php:1148
+#: ../../Code/Module/Admin.php:1148
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "ערוץ '%s' צונזר"
 
-#: ../../Zotlabs/Module/Admin.php:1148
+#: ../../Code/Module/Admin.php:1148
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "ערוץ '%s' יצא מכלל צנזורה"
 
-#: ../../Zotlabs/Module/Admin.php:1159
+#: ../../Code/Module/Admin.php:1159
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1159
+#: ../../Code/Module/Admin.php:1159
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1457
+#: ../../Code/Module/Admin.php:1210 ../../include/widgets.php:1457
 msgid "Channels"
 msgstr "ערוצים"
 
-#: ../../Zotlabs/Module/Admin.php:1214
+#: ../../Code/Module/Admin.php:1214
 msgid "Censor"
 msgstr "צנזר"
 
-#: ../../Zotlabs/Module/Admin.php:1215
+#: ../../Code/Module/Admin.php:1215
 msgid "Uncensor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1216
+#: ../../Code/Module/Admin.php:1216
 msgid "Allow Code"
 msgstr "התר קוד"
 
-#: ../../Zotlabs/Module/Admin.php:1217
+#: ../../Code/Module/Admin.php:1217
 msgid "Disallow Code"
 msgstr "אסור קוד"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
+#: ../../Code/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr "ערוץ"
 
-#: ../../Zotlabs/Module/Admin.php:1222
+#: ../../Code/Module/Admin.php:1222
 msgid "UID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1226
+#: ../../Code/Module/Admin.php:1226
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1227
+#: ../../Code/Module/Admin.php:1227
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1284
+#: ../../Code/Module/Admin.php:1284
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "תוסף %s מנוטרל."
 
-#: ../../Zotlabs/Module/Admin.php:1288
+#: ../../Code/Module/Admin.php:1288
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "תוסף %s מאופשר."
 
-#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585
+#: ../../Code/Module/Admin.php:1298 ../../Code/Module/Admin.php:1585
 msgid "Disable"
 msgstr "נטרל"
 
-#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587
+#: ../../Code/Module/Admin.php:1301 ../../Code/Module/Admin.php:1587
 msgid "Enable"
 msgstr "אפשר"
 
-#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
+#: ../../Code/Module/Admin.php:1330 ../../Code/Module/Admin.php:1420
 #: ../../include/widgets.php:1460
 msgid "Plugins"
 msgstr "תוספות"
 
-#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614
+#: ../../Code/Module/Admin.php:1331 ../../Code/Module/Admin.php:1614
 msgid "Toggle"
 msgstr "החלף"
 
-#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:208
+#: ../../Code/Module/Admin.php:1332 ../../Code/Module/Admin.php:1615
+#: ../../Code/Lib/Apps.php:215 ../../include/nav.php:208
 #: ../../include/widgets.php:638
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624
+#: ../../Code/Module/Admin.php:1339 ../../Code/Module/Admin.php:1624
 msgid "Author: "
 msgstr "מחבר: "
 
-#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625
+#: ../../Code/Module/Admin.php:1340 ../../Code/Module/Admin.php:1625
 msgid "Maintainer: "
 msgstr "מתחזק: "
 
-#: ../../Zotlabs/Module/Admin.php:1341
+#: ../../Code/Module/Admin.php:1341
 msgid "Minimum project version: "
 msgstr "גרסת פרויקט נומינלית: "
 
-#: ../../Zotlabs/Module/Admin.php:1342
+#: ../../Code/Module/Admin.php:1342
 msgid "Maximum project version: "
 msgstr "גרסת פרויקט מרבית: "
 
-#: ../../Zotlabs/Module/Admin.php:1343
+#: ../../Code/Module/Admin.php:1343
 msgid "Minimum PHP version: "
 msgstr "גרסת PHP נומינלית: "
 
-#: ../../Zotlabs/Module/Admin.php:1344
+#: ../../Code/Module/Admin.php:1344
 msgid "Requires: "
 msgstr "מצריך: "
 
-#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425
+#: ../../Code/Module/Admin.php:1345 ../../Code/Module/Admin.php:1425
 msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1394
+#: ../../Code/Module/Admin.php:1394
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1395
+#: ../../Code/Module/Admin.php:1395
 msgid "Plugin repo git URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1396
+#: ../../Code/Module/Admin.php:1396
 msgid "Custom repo name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1396
+#: ../../Code/Module/Admin.php:1396
 msgid "(optional)"
 msgstr "(רשות)"
 
-#: ../../Zotlabs/Module/Admin.php:1397
+#: ../../Code/Module/Admin.php:1397
 msgid "Download Plugin Repo"
 msgstr "הורד מאגר תוספים"
 
-#: ../../Zotlabs/Module/Admin.php:1404
+#: ../../Code/Module/Admin.php:1404
 msgid "Install new repo"
 msgstr "התקן מאגר חדש"
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:333
+#: ../../Code/Module/Admin.php:1405 ../../Code/Lib/Apps.php:333
 msgid "Install"
 msgstr "התקן"
 
-#: ../../Zotlabs/Module/Admin.php:1427
+#: ../../Code/Module/Admin.php:1427
 msgid "Manage Repos"
 msgstr "נהל מאגרים"
 
-#: ../../Zotlabs/Module/Admin.php:1428
+#: ../../Code/Module/Admin.php:1428
 msgid "Installed Plugin Repositories"
 msgstr "מאגרי תוסף מותקנים"
 
-#: ../../Zotlabs/Module/Admin.php:1429
+#: ../../Code/Module/Admin.php:1429
 msgid "Install a New Plugin Repository"
 msgstr "התקן מאגר תוסף חדש"
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:333
+#: ../../Code/Module/Admin.php:1435 ../../Code/Module/Settings.php:77
+#: ../../Code/Module/Settings.php:616 ../../Code/Lib/Apps.php:333
 msgid "Update"
 msgstr "עדכן"
 
-#: ../../Zotlabs/Module/Admin.php:1436
+#: ../../Code/Module/Admin.php:1436
 msgid "Switch branch"
 msgstr "החלף ענף"
 
-#: ../../Zotlabs/Module/Admin.php:1550
+#: ../../Code/Module/Admin.php:1550
 msgid "No themes found."
 msgstr "לא נמצאו מוטיבים."
 
-#: ../../Zotlabs/Module/Admin.php:1606
+#: ../../Code/Module/Admin.php:1606
 msgid "Screenshot"
 msgstr "צילום מסך"
 
-#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
+#: ../../Code/Module/Admin.php:1613 ../../Code/Module/Admin.php:1647
 #: ../../include/widgets.php:1461
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: ../../Zotlabs/Module/Admin.php:1652
+#: ../../Code/Module/Admin.php:1652
 msgid "[Experimental]"
 msgstr "[ניסיוני]"
 
-#: ../../Zotlabs/Module/Admin.php:1653
+#: ../../Code/Module/Admin.php:1653
 msgid "[Unsupported]"
 msgstr "[לא נתמך]"
 
-#: ../../Zotlabs/Module/Admin.php:1677
+#: ../../Code/Module/Admin.php:1677
 msgid "Log settings updated."
 msgstr "הגדרות יומן עדכנו."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1482
+#: ../../Code/Module/Admin.php:1732 ../../include/widgets.php:1482
 #: ../../include/widgets.php:1492
 msgid "Logs"
 msgstr "יומנים"
 
-#: ../../Zotlabs/Module/Admin.php:1734
+#: ../../Code/Module/Admin.php:1734
 msgid "Clear"
 msgstr "טהר"
 
-#: ../../Zotlabs/Module/Admin.php:1740
+#: ../../Code/Module/Admin.php:1740
 msgid "Debugging"
 msgstr "דיבאג"
 
-#: ../../Zotlabs/Module/Admin.php:1741
+#: ../../Code/Module/Admin.php:1741
 msgid "Log file"
 msgstr "קובץ יומן"
 
-#: ../../Zotlabs/Module/Admin.php:1741
+#: ../../Code/Module/Admin.php:1741
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1742
+#: ../../Code/Module/Admin.php:1742
 msgid "Log level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2028
+#: ../../Code/Module/Admin.php:2028
 msgid "New Profile Field"
 msgstr "שדה פרופיל חדש"
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+#: ../../Code/Module/Admin.php:2029 ../../Code/Module/Admin.php:2049
 msgid "Field nickname"
 msgstr "שם כינוי שדה"
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+#: ../../Code/Module/Admin.php:2029 ../../Code/Module/Admin.php:2049
 msgid "System name of field"
 msgstr "שם מערכת של שדה"
 
-#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050
+#: ../../Code/Module/Admin.php:2030 ../../Code/Module/Admin.php:2050
 msgid "Input type"
 msgstr "טיפוס קלט"
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+#: ../../Code/Module/Admin.php:2031 ../../Code/Module/Admin.php:2051
 msgid "Field Name"
 msgstr "שם שדה"
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+#: ../../Code/Module/Admin.php:2031 ../../Code/Module/Admin.php:2051
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+#: ../../Code/Module/Admin.php:2032 ../../Code/Module/Admin.php:2052
 msgid "Help text"
 msgstr "טקסט עזרה"
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+#: ../../Code/Module/Admin.php:2032 ../../Code/Module/Admin.php:2052
 msgid "Additional info (optional)"
 msgstr "מידע נוסף (רשות)"
 
-#: ../../Zotlabs/Module/Admin.php:2042
+#: ../../Code/Module/Admin.php:2042
 msgid "Field definition not found"
 msgstr "הגדרת שדה לא נמצאה"
 
-#: ../../Zotlabs/Module/Admin.php:2048
+#: ../../Code/Module/Admin.php:2048
 msgid "Edit Profile Field"
 msgstr "ערוך שדה פרופיל"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1463
+#: ../../Code/Module/Admin.php:2106 ../../include/widgets.php:1463
 msgid "Profile Fields"
 msgstr "שדות פרופיל"
 
-#: ../../Zotlabs/Module/Admin.php:2107
+#: ../../Code/Module/Admin.php:2107
 msgid "Basic Profile Fields"
 msgstr "שדות פרופיל בסיסיים"
 
-#: ../../Zotlabs/Module/Admin.php:2108
+#: ../../Code/Module/Admin.php:2108
 msgid "Advanced Profile Fields"
 msgstr "שדות פרופיל מתקדמים"
 
-#: ../../Zotlabs/Module/Admin.php:2108
+#: ../../Code/Module/Admin.php:2108
 msgid "(In addition to basic fields)"
 msgstr "(בנוסף על שדות בסיסיים)"
 
-#: ../../Zotlabs/Module/Admin.php:2110
+#: ../../Code/Module/Admin.php:2110
 msgid "All available fields"
 msgstr "כל השדות הזמינים"
 
-#: ../../Zotlabs/Module/Admin.php:2111
+#: ../../Code/Module/Admin.php:2111
 msgid "Custom Fields"
 msgstr "שדות מותאמים"
 
-#: ../../Zotlabs/Module/Admin.php:2115
+#: ../../Code/Module/Admin.php:2115
 msgid "Create Custom Field"
 msgstr "צור שדה מותאם"
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+#: ../../Code/Module/Appman.php:37 ../../Code/Module/Appman.php:53
 msgid "App installed."
 msgstr "אפליקציה מותקנת."
 
-#: ../../Zotlabs/Module/Appman.php:46
+#: ../../Code/Module/Appman.php:46
 msgid "Malformed app."
 msgstr "אפליקציה פגומה."
 
-#: ../../Zotlabs/Module/Appman.php:104
+#: ../../Code/Module/Appman.php:104
 msgid "Embed code"
 msgstr "הטמע קוד"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+#: ../../Code/Module/Appman.php:110 ../../include/widgets.php:107
 msgid "Edit App"
 msgstr "ערוך אפליקציה"
 
-#: ../../Zotlabs/Module/Appman.php:110
+#: ../../Code/Module/Appman.php:110
 msgid "Create App"
 msgstr "צור אפליקציה"
 
-#: ../../Zotlabs/Module/Appman.php:115
+#: ../../Code/Module/Appman.php:115
 msgid "Name of app"
 msgstr "שם של אפליקציה"
 
-#: ../../Zotlabs/Module/Appman.php:116
+#: ../../Code/Module/Appman.php:116
 msgid "Location (URL) of app"
 msgstr "מיקום (URL) של אפליקציה"
 
-#: ../../Zotlabs/Module/Appman.php:118
+#: ../../Code/Module/Appman.php:118
 msgid "Photo icon URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118
+#: ../../Code/Module/Appman.php:118
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 פיקסלים - רשות"
 
-#: ../../Zotlabs/Module/Appman.php:119
+#: ../../Code/Module/Appman.php:119
 msgid "Categories (optional, comma separated list)"
 msgstr "קטגוריות (רשות, רשימה מופרדת פסיקים)"
 
-#: ../../Zotlabs/Module/Appman.php:120
+#: ../../Code/Module/Appman.php:120
 msgid "Version ID"
 msgstr "מזהה גרסא"
 
-#: ../../Zotlabs/Module/Appman.php:121
+#: ../../Code/Module/Appman.php:121
 msgid "Price of app"
 msgstr "מחיר אפליקציה"
 
-#: ../../Zotlabs/Module/Appman.php:122
+#: ../../Code/Module/Appman.php:122
 msgid "Location (URL) to purchase app"
 msgstr "מיקום (URL) כדי לרכוש אפליקציה"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Code/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr "בחר תיקיית סימניות"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Code/Module/Rbmark.php:99
 msgid "Save Bookmark"
 msgstr "שמור סימנייה"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Code/Module/Rbmark.php:100
 msgid "URL of bookmark"
 msgstr "URL של סימנייה"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Code/Module/Rbmark.php:105
 msgid "Or enter new bookmark folder name"
 msgstr "או הזן שם תיקיית סימניות חדש"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Code/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Code/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Code/Module/Register.php:89
 msgid "Passwords do not match."
 msgstr "סיסמאות לא תואמות."
 
-#: ../../Zotlabs/Module/Register.php:131
+#: ../../Code/Module/Register.php:131
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:137
+#: ../../Code/Module/Register.php:137
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:140
+#: ../../Code/Module/Register.php:140
 msgid "Your registration can not be processed."
 msgstr "הרשמתך לא ניתנת לעיבוד"
 
-#: ../../Zotlabs/Module/Register.php:184
+#: ../../Code/Module/Register.php:184
 msgid "Registration on this hub is disabled."
 msgstr "רישום על מוקד זה הינו מנוטרל."
 
-#: ../../Zotlabs/Module/Register.php:193
+#: ../../Code/Module/Register.php:193
 msgid "Registration on this hub is by approval only."
 msgstr "רישום על מוקד זה הינו מותנה באישור."
 
-#: ../../Zotlabs/Module/Register.php:194
+#: ../../Code/Module/Register.php:194
 msgid "Register at another affiliated hub."
 msgstr "הירשם במוקד מקושר אחר."
 
-#: ../../Zotlabs/Module/Register.php:204
+#: ../../Code/Module/Register.php:204
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:215
+#: ../../Code/Module/Register.php:215
 msgid "Terms of Service"
 msgstr "תנאי שימוש"
 
-#: ../../Zotlabs/Module/Register.php:221
+#: ../../Code/Module/Register.php:221
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "אני מקבל את ה%s לאתר רשת זה"
 
-#: ../../Zotlabs/Module/Register.php:223
+#: ../../Code/Module/Register.php:223
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "גילי מעל 13 שנה ואני מקבל את ה%s לאתר רשת זה"
 
-#: ../../Zotlabs/Module/Register.php:227
+#: ../../Code/Module/Register.php:227
 msgid "Your email address"
 msgstr "כתובת דוא״ל שלך"
 
-#: ../../Zotlabs/Module/Register.php:228
+#: ../../Code/Module/Register.php:228
 msgid "Choose a password"
 msgstr "בחר סיסמה"
 
-#: ../../Zotlabs/Module/Register.php:229
+#: ../../Code/Module/Register.php:229
 msgid "Please re-enter your password"
 msgstr "בבקשה הזן שוב את סיסמתך"
 
-#: ../../Zotlabs/Module/Register.php:230
+#: ../../Code/Module/Register.php:230
 msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:236
+#: ../../Code/Module/Register.php:236
 msgid "no"
 msgstr "לא"
 
-#: ../../Zotlabs/Module/Register.php:236
+#: ../../Code/Module/Register.php:236
 msgid "yes"
 msgstr "כן"
 
-#: ../../Zotlabs/Module/Register.php:250
+#: ../../Code/Module/Register.php:250
 msgid "Membership on this site is by invitation only."
 msgstr "חברות באתר זה היא באמצעות הזמנה בלבד."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
+#: ../../Code/Module/Register.php:262 ../../include/nav.php:147
 #: ../../boot.php:1686
 msgid "Register"
 msgstr "הרשמה"
 
-#: ../../Zotlabs/Module/Register.php:262
+#: ../../Code/Module/Register.php:262
 msgid "Proceed to create your first channel"
 msgstr "המשך כדי ליצור את הערוץ הראשון שלך"
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "אנא התחבר."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Code/Module/Removeaccount.php:34
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Code/Module/Removeaccount.php:56
 msgid "Remove This Account"
 msgstr "הסר את חשבון זה"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Code/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeme.php:59
 msgid "WARNING: "
 msgstr "אזהרה: "
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeaccount.php:57
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Code/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeme.php:59
 msgid "This action is permanent and can not be undone!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Code/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeme.php:60
 msgid "Please enter your password for verification:"
 msgstr "אנא הזן את הסיסמה שלך לצורך אימות:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Code/Module/Removeaccount.php:59
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Code/Module/Removeaccount.php:59
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Code/Module/Removeaccount.php:60
+#: ../../Code/Module/Settings.php:705
 msgid "Remove Account"
 msgstr "הסר חשבון"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Code/Module/Removeme.php:33
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Code/Module/Removeme.php:58
 msgid "Remove This Channel"
 msgstr "הסר את ערוץ זה"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Code/Module/Removeme.php:59
 msgid "This channel will be completely removed from the network. "
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid "Remove this channel and all its clones from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Code/Module/Removeme.php:62 ../../Code/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr "הסר ערוץ"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Code/Module/Rmagic.php:44
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Code/Module/Rmagic.php:44
 msgid "The error message was:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:48
+#: ../../Code/Module/Rmagic.php:48
 msgid "Authentication failed."
 msgstr "אימות נכשל."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
+#: ../../Code/Module/Rmagic.php:88
 msgid "Remote Authentication"
 msgstr "אימות מרוחק"
 
-#: ../../Zotlabs/Module/Rmagic.php:89
+#: ../../Code/Module/Rmagic.php:89
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:90
+#: ../../Code/Module/Rmagic.php:90
 msgid "Authenticate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:216
+#: ../../Code/Module/Search.php:216
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "פריטים מתוייגים עם: %s"
 
-#: ../../Zotlabs/Module/Search.php:218
+#: ../../Code/Module/Search.php:218
 #, php-format
 msgid "Search results for: %s"
 msgstr "תוצאות חיפוש עבור: %s"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "לא נמצאו הגבלות מחלקת ערוץ."
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Code/Module/Settings.php:69
 msgid "Name is required"
 msgstr "נדרש שם"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Code/Module/Settings.php:73
 msgid "Key and Secret are required"
 msgstr "מפתח וגם סוד הינם בגדר חובה."
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Code/Module/Settings.php:225
 msgid "Not valid email."
 msgstr "לא דוא״ל תקף."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Code/Module/Settings.php:228
 msgid "Protected email address. Cannot change to that email."
 msgstr "כתובת דוא״ל מוגנת. לא מסוגל לשנות לדוא״ל זה."
 
-#: ../../Zotlabs/Module/Settings.php:237
+#: ../../Code/Module/Settings.php:237
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:254
+#: ../../Code/Module/Settings.php:254
 msgid "Password verification failed."
 msgstr "אימות סיסמה נכשל."
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Code/Module/Settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr "סיסמאות לא תואמות. סיסמה לא שונתה."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Code/Module/Settings.php:265
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "סיסמאות ריקות לא מותרות. סיסמה לא שונתה."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Code/Module/Settings.php:279
 msgid "Password changed."
 msgstr "סיסמה שונתה."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Code/Module/Settings.php:281
 msgid "Password update failed. Please try again."
 msgstr "עדכון סיסמה נכשל. אנא נסה שוב."
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Code/Module/Settings.php:525
 msgid "Settings updated."
 msgstr "הגדרות עודכנו."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Code/Module/Settings.php:589 ../../Code/Module/Settings.php:615
+#: ../../Code/Module/Settings.php:651
 msgid "Add application"
 msgstr "הוסף אפליקציה"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Code/Module/Settings.php:592
 msgid "Name of application"
 msgstr "שם של אפליקציה"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Code/Module/Settings.php:593 ../../Code/Module/Settings.php:619
 msgid "Consumer Key"
 msgstr "מפתח צרכן"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Code/Module/Settings.php:593 ../../Code/Module/Settings.php:594
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Code/Module/Settings.php:594 ../../Code/Module/Settings.php:620
 msgid "Consumer Secret"
 msgstr "סוד צרכן"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Code/Module/Settings.php:595 ../../Code/Module/Settings.php:621
 msgid "Redirect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Code/Module/Settings.php:595
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Code/Module/Settings.php:596 ../../Code/Module/Settings.php:622
 msgid "Icon url"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
-#: ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Settings.php:596 ../../Code/Module/Sources.php:112
+#: ../../Code/Module/Sources.php:147
 msgid "Optional"
 msgstr "רשות"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Code/Module/Settings.php:607
 msgid "Application not found."
 msgstr "יישום לא נמצא."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Code/Module/Settings.php:650
 msgid "Connected Apps"
 msgstr "אפליקציות מחוברות"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Code/Module/Settings.php:654
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Code/Module/Settings.php:655
 msgid "No name"
 msgstr "אין שם"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Code/Module/Settings.php:656
 msgid "Remove authorization"
 msgstr "הסר אישור"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Code/Module/Settings.php:669
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Code/Module/Settings.php:676
 msgid "Feature/Addon Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Code/Module/Settings.php:699
 msgid "Account Settings"
 msgstr "הגדרות חשבון"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Code/Module/Settings.php:700
 msgid "Current Password"
 msgstr "סיסמה נוכחית"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Code/Module/Settings.php:701
 msgid "Enter New Password"
 msgstr "הזן סיסמה חדשה"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Code/Module/Settings.php:702
 msgid "Confirm New Password"
 msgstr "אמת סיסמה חדשה"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Code/Module/Settings.php:702
 msgid "Leave password fields blank unless changing"
 msgstr "השאר דשות סיסמה ריקים אלא אם כן ברצונך לשנות"
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Code/Module/Settings.php:704
+#: ../../Code/Module/Settings.php:1041
 msgid "Email Address:"
 msgstr "כתובת דוא״ל:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Code/Module/Settings.php:706
 msgid "Remove this account including all its channels"
 msgstr "הסר את חשבון זה לרבות כל הערוצים שלו"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Code/Module/Settings.php:729
 msgid "Additional Features"
 msgstr "תכונות נוספות"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Code/Module/Settings.php:753
 msgid "Connector Settings"
 msgstr "הגדרות מקשר"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Code/Module/Settings.php:792
 msgid "No special theme for mobile devices"
 msgstr "אין ערכת נושא מיוחדת להתקנים ניידים"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Code/Module/Settings.php:795
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (ניסיוני)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Code/Module/Settings.php:837
 msgid "Display Settings"
 msgstr "הגדרות תצוגה"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Code/Module/Settings.php:838
 msgid "Theme Settings"
 msgstr "הגדרות ערכת נושא"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Code/Module/Settings.php:839
 msgid "Custom Theme Settings"
 msgstr "הגדרות ערכת נושא מותאמת"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Code/Module/Settings.php:840
 msgid "Content Settings"
 msgstr "הגדרות תוכן"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Code/Module/Settings.php:846
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Code/Module/Settings.php:847
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Code/Module/Settings.php:848
 msgid "Preload images before rendering the page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Code/Module/Settings.php:848
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Code/Module/Settings.php:849
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Code/Module/Settings.php:850
 msgid "Update browser every xx seconds"
 msgstr "עדכן דפדפן כל xx שניות"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Code/Module/Settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "מינימום של 10 שניות, אין מקסימום"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Code/Module/Settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Code/Module/Settings.php:851
 msgid "Maximum of 100 items"
 msgstr "מקסימום של 100 פריטים"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Code/Module/Settings.php:852
 msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Code/Module/Settings.php:853
 msgid "Link post titles to source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Code/Module/Settings.php:854
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Code/Module/Settings.php:857
 msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Code/Module/Settings.php:857 ../../Code/Module/Settings.php:858
 msgid "(comments displayed separately)"
 msgstr "(תגובות מוצגות בנפרד)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Code/Module/Settings.php:858
 msgid "Use blog/list mode on grid page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Code/Module/Settings.php:859
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Code/Module/Settings.php:859 ../../Code/Module/Settings.php:860
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Code/Module/Settings.php:860
 msgid "Grid page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Code/Module/Settings.php:894
 msgid "Nobody except yourself"
 msgstr "אף אחד חוץ ממך"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Code/Module/Settings.php:895
 msgid "Only those you specifically allow"
 msgstr "רק אלו שהתרת להם במפורש"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Code/Module/Settings.php:896
 msgid "Approved connections"
 msgstr "חיבורים מאושרים"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Code/Module/Settings.php:897
 msgid "Any connections"
 msgstr "כל חיבור"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Code/Module/Settings.php:898
 msgid "Anybody on this website"
 msgstr "כל אחד באתר רשת זה"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Code/Module/Settings.php:899
 msgid "Anybody in this network"
 msgstr "כל אחד ברשת זו"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Code/Module/Settings.php:900
 msgid "Anybody authenticated"
 msgstr "כל אחד שאושר"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Code/Module/Settings.php:901
 msgid "Anybody on the internet"
 msgstr "כל אחד באינטרנט"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Code/Module/Settings.php:976
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Code/Module/Settings.php:981
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:990
+#: ../../Code/Module/Settings.php:990
 msgid "Your channel address is"
 msgstr "כתובת הערוץ שלך היא"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Code/Module/Settings.php:1032
 msgid "Channel Settings"
 msgstr "הגדרות ערוץ"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Code/Module/Settings.php:1039
 msgid "Basic Settings"
 msgstr "הגדרות בסיסיות"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1121
+#: ../../Code/Module/Settings.php:1040 ../../include/channel.php:1121
 msgid "Full Name:"
 msgstr "שם מלא:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Code/Module/Settings.php:1042
 msgid "Your Timezone:"
 msgstr "אזור זמן שלך:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Code/Module/Settings.php:1043
 msgid "Default Post Location:"
 msgstr "מיקום פוסט שגרתי:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Code/Module/Settings.php:1043
 msgid "Geographical location to display on your posts"
 msgstr "מיקום גיאוגרפי להצגה בפוסטים שלך"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Code/Module/Settings.php:1044
 msgid "Use Browser Location:"
 msgstr "השתמש במיקום דפדפן:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Code/Module/Settings.php:1046
 msgid "Adult Content"
 msgstr "תוכן מבוגרים"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Code/Module/Settings.php:1046
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "ערוץ זה מפרסם תוכן למבוגרים באופן תדיר או שגרתי. (אנא תייג כל חומר למבוגרים ו/או עירום עם NSFW#)"
 
-#: ../../Zotlabs/Module/Settings.php:1048
+#: ../../Code/Module/Settings.php:1048
 msgid "Security and Privacy Settings"
 msgstr "הגדרות אבטחה ופרטיות"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Code/Module/Settings.php:1051
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Code/Module/Settings.php:1053
 msgid "Hide my online presence"
 msgstr "הסתר את הנוכחות המקוונת שלי"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Code/Module/Settings.php:1053
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Code/Module/Settings.php:1055
 msgid "Simple Privacy Settings:"
 msgstr "הגדרות פרטיות פשוטות:"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Code/Module/Settings.php:1056
 msgid ""
 "Very Public - extremely permissive (should be used with caution)"
 msgstr "ציבורי מאוד - מתירני ביותר (יש להשתמש בזהירות)"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Code/Module/Settings.php:1057
 msgid ""
 "Typical - default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)"
 msgstr "טיפוסי - ציבורי שגרתי, פרטיות לפי דרישה (דומה להרשאות רשת חברתית אולם לצד פרטיות משופרת)"
 
-#: ../../Zotlabs/Module/Settings.php:1058
+#: ../../Code/Module/Settings.php:1058
 msgid "Private - default private, never open or public"
 msgstr "פרטי - פרטי שגרתי, אף פעם לא פתוח או ציבורי"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Code/Module/Settings.php:1059
 msgid "Blocked - default blocked to/from everybody"
 msgstr "חסום - חסום שגרתי אל/מן כל אחד"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Code/Module/Settings.php:1061
 msgid "Allow others to tag your posts"
 msgstr "התר לאחרים לתייג את הפוסטים שלך"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Code/Module/Settings.php:1061
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Code/Module/Settings.php:1063
 msgid "Advanced Privacy Settings"
 msgstr "הגדרות פרטיות מתקדמות"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Code/Module/Settings.php:1066
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Code/Module/Settings.php:1066
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Code/Module/Settings.php:1067
 msgid "Default Post and Publish Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Code/Module/Settings.php:1069
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Code/Module/Settings.php:1072
 msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Code/Module/Settings.php:1078
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Code/Module/Settings.php:1078
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Code/Module/Settings.php:1081
 msgid "Notification Settings"
 msgstr "הגדרות התראה"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Code/Module/Settings.php:1082
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Code/Module/Settings.php:1083
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Code/Module/Settings.php:1084
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Code/Module/Settings.php:1085
 msgid "making an interesting profile change"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Code/Module/Settings.php:1086
 msgid "Send a notification email when:"
 msgstr "שלח דוא״ל התראה כאשר:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Code/Module/Settings.php:1087
 msgid "You receive a connection request"
 msgstr "קיבלת בקשת חיבור"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Code/Module/Settings.php:1088
 msgid "Your connections are confirmed"
 msgstr "החיבורים שלך הינם מאומתים"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Code/Module/Settings.php:1089
 msgid "Someone writes on your profile wall"
 msgstr "מישהו כותב על קיר הפרופיל שלך"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Code/Module/Settings.php:1090
 msgid "Someone writes a followup comment"
 msgstr "מישהו רושם תגובת המשך"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Code/Module/Settings.php:1091
 msgid "You receive a private message"
 msgstr "קיבלת הודעה פרטית"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Code/Module/Settings.php:1092
 msgid "You receive a friend suggestion"
 msgstr "קיבלת הצעת ידידים"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Code/Module/Settings.php:1093
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Code/Module/Settings.php:1094
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Code/Module/Settings.php:1097
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Code/Module/Settings.php:1099
 msgid "Unseen grid activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Code/Module/Settings.php:1100
 msgid "Unseen channel activity"
 msgstr "פעילות ערוץ לא נראית"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Code/Module/Settings.php:1101
 msgid "Unseen private messages"
 msgstr "הודעות ערוץ לא נראות"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Code/Module/Settings.php:1101
+#: ../../Code/Module/Settings.php:1106
+#: ../../Code/Module/Settings.php:1107
+#: ../../Code/Module/Settings.php:1108
 msgid "Recommended"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Code/Module/Settings.php:1102
 msgid "Upcoming events"
 msgstr "אירועים קרובים"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Code/Module/Settings.php:1103
 msgid "Events today"
 msgstr "אירועים היום"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Code/Module/Settings.php:1104
 msgid "Upcoming birthdays"
 msgstr "ימי הולדת קרובים"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Code/Module/Settings.php:1104
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Code/Module/Settings.php:1105
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Code/Module/Settings.php:1106
 msgid "System info messages"
 msgstr "הודעות מידע מערכת"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Code/Module/Settings.php:1107
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Code/Module/Settings.php:1108
 msgid "New connections"
 msgstr "חיבורים חדשים"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Code/Module/Settings.php:1109
 msgid "System Registrations"
 msgstr "הרשמות מערכת"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Code/Module/Settings.php:1110
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Code/Module/Settings.php:1112
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Code/Module/Settings.php:1112
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Code/Module/Settings.php:1114
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Code/Module/Settings.php:1115
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Code/Module/Settings.php:1118
 msgid ""
 "Please enable expert mode (in Settings > "
 "Additional features) to adjust!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Code/Module/Settings.php:1119
 msgid "Miscellaneous Settings"
 msgstr "הגדרות שונות"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Code/Module/Settings.php:1120
 msgid "Default photo upload folder"
 msgstr "תיקיית העלאת תצלום שגרתית"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Code/Module/Settings.php:1120
+#: ../../Code/Module/Settings.php:1121
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - שנה נוכחית, %m -  חודש נוכחי"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Code/Module/Settings.php:1121
 msgid "Default file upload folder"
 msgstr "תיקיית העלאת קובץ שגרתית"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Code/Module/Settings.php:1123
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Code/Module/Settings.php:1125
 msgid "Remove this channel."
 msgstr "הסר את ערוץ זה."
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Code/Module/Settings.php:1126
 msgid "Firefox Share $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Code/Module/Settings.php:1127
 msgid "Start calendar week on monday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:179
+#: ../../Code/Module/Setup.php:179
 msgid "$Projectname Server - Setup"
 msgstr "שרת $Projectname - הבנייה"
 
-#: ../../Zotlabs/Module/Setup.php:183
+#: ../../Code/Module/Setup.php:183
 msgid "Could not connect to database."
 msgstr "לא היתה אפשרות להתחבר למסד נתונים."
 
-#: ../../Zotlabs/Module/Setup.php:187
+#: ../../Code/Module/Setup.php:187
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:194
+#: ../../Code/Module/Setup.php:194
 msgid "Could not create table."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:199
+#: ../../Code/Module/Setup.php:199
 msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:203
+#: ../../Code/Module/Setup.php:203
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Code/Module/Setup.php:204 ../../Code/Module/Setup.php:266
+#: ../../Code/Module/Setup.php:721
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:263
+#: ../../Code/Module/Setup.php:263
 msgid "System check"
 msgstr "בדיקת מערכת"
 
-#: ../../Zotlabs/Module/Setup.php:268
+#: ../../Code/Module/Setup.php:268
 msgid "Check again"
 msgstr "בדוק שוב"
 
-#: ../../Zotlabs/Module/Setup.php:290
+#: ../../Code/Module/Setup.php:290
 msgid "Database connection"
 msgstr "חיבור מסד נתונים"
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Code/Module/Setup.php:291
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:292
+#: ../../Code/Module/Setup.php:292
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Database Server Name"
 msgstr "שם שרת מסד נתונים"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Default is 127.0.0.1"
 msgstr "ברירת מחדל 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Database Port"
 msgstr "פורט מסד נתונים"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:299
+#: ../../Code/Module/Setup.php:299
 msgid "Database Login Name"
 msgstr "שם כניסה מסד נתונים"
 
-#: ../../Zotlabs/Module/Setup.php:300
+#: ../../Code/Module/Setup.php:300
 msgid "Database Login Password"
 msgstr "סיסמה מסד נתונים"
 
-#: ../../Zotlabs/Module/Setup.php:301
+#: ../../Code/Module/Setup.php:301
 msgid "Database Name"
 msgstr "שם מסד נתונים"
 
-#: ../../Zotlabs/Module/Setup.php:302
+#: ../../Code/Module/Setup.php:302
 msgid "Database Type"
 msgstr "טיפוס מסד נתונים"
 
-#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
+#: ../../Code/Module/Setup.php:304 ../../Code/Module/Setup.php:344
 msgid "Site administrator email address"
 msgstr "כתובת דוא״ל מנהל אתר"
 
-#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
+#: ../../Code/Module/Setup.php:304 ../../Code/Module/Setup.php:344
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
+#: ../../Code/Module/Setup.php:305 ../../Code/Module/Setup.php:346
 msgid "Website URL"
 msgstr "כתובת אתר אינטרנט"
 
-#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
+#: ../../Code/Module/Setup.php:305 ../../Code/Module/Setup.php:346
 msgid "Please use SSL (https) URL if available."
 msgstr "אנא השתמש בכתובת SSL (כלומר, https) אם זמינה."
 
-#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349
+#: ../../Code/Module/Setup.php:306 ../../Code/Module/Setup.php:349
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:333
+#: ../../Code/Module/Setup.php:333
 msgid "Site settings"
 msgstr "הגדרות אתר"
 
-#: ../../Zotlabs/Module/Setup.php:347
+#: ../../Code/Module/Setup.php:347
 msgid "Enable $Projectname advanced features?"
 msgstr "אפשר תכונות מתקדמות בפרויקט $Projectname?"
 
-#: ../../Zotlabs/Module/Setup.php:347
+#: ../../Code/Module/Setup.php:347
 msgid ""
 "Some advanced features, while useful - may be best suited for technically "
 "proficient audiences"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:388
+#: ../../Code/Module/Setup.php:388
 msgid "PHP version 5.5 or greater is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:389
+#: ../../Code/Module/Setup.php:389
 msgid "PHP version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:404
+#: ../../Code/Module/Setup.php:404
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:405
+#: ../../Code/Module/Setup.php:405
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:409
+#: ../../Code/Module/Setup.php:409
 msgid "PHP executable path"
 msgstr "נתיב PHP נתון ליישום"
 
-#: ../../Zotlabs/Module/Setup.php:409
+#: ../../Code/Module/Setup.php:409
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:414
+#: ../../Code/Module/Setup.php:414
 msgid "Command line PHP"
 msgstr "שורת פקודה PHP"
 
-#: ../../Zotlabs/Module/Setup.php:423
+#: ../../Code/Module/Setup.php:423
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:424
+#: ../../Code/Module/Setup.php:424
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:427
+#: ../../Code/Module/Setup.php:427
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:445
+#: ../../Code/Module/Setup.php:445
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:450
+#: ../../Code/Module/Setup.php:450
 msgid "You can adjust these settings in the servers php.ini."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:452
+#: ../../Code/Module/Setup.php:452
 msgid "PHP upload limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:475
+#: ../../Code/Module/Setup.php:475
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:476
+#: ../../Code/Module/Setup.php:476
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:479
+#: ../../Code/Module/Setup.php:479
 msgid "Generate encryption keys"
 msgstr "הפק מפתחות הצפנה"
 
-#: ../../Zotlabs/Module/Setup.php:491
+#: ../../Code/Module/Setup.php:491
 msgid "libCurl PHP module"
 msgstr "מודול libCurl PHP"
 
-#: ../../Zotlabs/Module/Setup.php:492
+#: ../../Code/Module/Setup.php:492
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:493
+#: ../../Code/Module/Setup.php:493
 msgid "OpenSSL PHP module"
 msgstr "מודול OpenSSL PHP"
 
-#: ../../Zotlabs/Module/Setup.php:494
+#: ../../Code/Module/Setup.php:494
 msgid "mysqli or postgres PHP module"
 msgstr "מודול mysqli PHP או postgres"
 
-#: ../../Zotlabs/Module/Setup.php:495
+#: ../../Code/Module/Setup.php:495
 msgid "mb_string PHP module"
 msgstr "מודול mb_string PHP"
 
-#: ../../Zotlabs/Module/Setup.php:496
+#: ../../Code/Module/Setup.php:496
 msgid "mcrypt PHP module"
 msgstr "מודול mcrypt PHP"
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Code/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "מודול xml PHP"
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Code/Module/Setup.php:501 ../../Code/Module/Setup.php:503
 msgid "Apache mod_rewrite module"
 msgstr "מודול Apache mod_rewrite"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Code/Module/Setup.php:501
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Code/Module/Setup.php:507 ../../Code/Module/Setup.php:510
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Code/Module/Setup.php:507
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Code/Module/Setup.php:515
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Code/Module/Setup.php:519
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:523
+#: ../../Code/Module/Setup.php:523
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Code/Module/Setup.php:527
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Code/Module/Setup.php:531
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:535
+#: ../../Code/Module/Setup.php:535
 msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Code/Module/Setup.php:539
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Code/Module/Setup.php:557
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Code/Module/Setup.php:558
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:559
+#: ../../Code/Module/Setup.php:559
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:560
+#: ../../Code/Module/Setup.php:560
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:563
+#: ../../Code/Module/Setup.php:563
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php הינו כתיב"
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Code/Module/Setup.php:577
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Code/Module/Setup.php:578
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Code/Module/Setup.php:579 ../../Code/Module/Setup.php:600
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Code/Module/Setup.php:580
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Code/Module/Setup.php:583
 #, php-format
 msgid "%s is writable"
 msgstr "%s הינו כתיב"
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Code/Module/Setup.php:599
 msgid ""
 "Red uses the store directory to save uploaded files. The web server needs to"
 " have write access to the store directory under the Red top level folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Code/Module/Setup.php:603
 msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Code/Module/Setup.php:636
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:637
+#: ../../Code/Module/Setup.php:637
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:638
+#: ../../Code/Module/Setup.php:638
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:639
+#: ../../Code/Module/Setup.php:639
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:640
+#: ../../Code/Module/Setup.php:640
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:641
+#: ../../Code/Module/Setup.php:641
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:643
+#: ../../Code/Module/Setup.php:643
 msgid "SSL certificate validation"
 msgstr "הוכחת תקפות של תעודת SSL"
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Code/Module/Setup.php:649
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Code/Module/Setup.php:652
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Code/Module/Setup.php:661
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:685
+#: ../../Code/Module/Setup.php:685
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Code/Module/Setup.php:719
 msgid "
              What next
              "
 msgstr "
              מה הלאה
              "
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Code/Module/Setup.php:720
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:98
+#: ../../Code/Module/Sharedwithme.php:98
 msgid "Files: shared with me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:100
+#: ../../Code/Module/Sharedwithme.php:100
 msgid "NEW"
 msgstr "חדש"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
+#: ../../Code/Module/Sharedwithme.php:103
 msgid "Remove all files"
 msgstr "הסר את כל הקבצים"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Code/Module/Sharedwithme.php:104
 msgid "Remove this file"
 msgstr "הסר את קובץ זה"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Code/Module/Siteinfo.php:19
 #, php-format
 msgid "Version %s"
 msgstr "גרסא %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
+#: ../../Code/Module/Siteinfo.php:40
 msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
+#: ../../Code/Module/Siteinfo.php:53
 msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
+#: ../../Code/Module/Siteinfo.php:66
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr "זהו מוקד של $Projectname - רשת קואופרטיבית מבוזרת של אתרי רשת בעלי פרטיות משוכללת."
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
+#: ../../Code/Module/Siteinfo.php:68
 msgid "Tag: "
 msgstr "תגית: "
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
+#: ../../Code/Module/Siteinfo.php:70
 msgid "Last background fetch: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
+#: ../../Code/Module/Siteinfo.php:72
 msgid "Current load average: "
 msgstr "עומס ממוצע נוכחי: "
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
+#: ../../Code/Module/Siteinfo.php:75
 msgid "Running at web location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
+#: ../../Code/Module/Siteinfo.php:76
 msgid ""
 "Please visit hubzilla.org to learn more "
 "about $Projectname."
 msgstr "אנא בקר באתר hubzilla.org כדי ללמוד עוד אודות $Projectname."
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
+#: ../../Code/Module/Siteinfo.php:77
 msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
+#: ../../Code/Module/Siteinfo.php:79
 msgid "$projectname issues"
 msgstr "סוגיות $projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:80
+#: ../../Code/Module/Siteinfo.php:80
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:82
+#: ../../Code/Module/Siteinfo.php:82
 msgid "Site Administrators"
 msgstr "מנהלי אתר"
 
-#: ../../Zotlabs/Module/Sources.php:37
+#: ../../Code/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:51
+#: ../../Code/Module/Sources.php:51
 msgid "Source created."
 msgstr "מקור נוצר."
 
-#: ../../Zotlabs/Module/Sources.php:64
+#: ../../Code/Module/Sources.php:64
 msgid "Source updated."
 msgstr "מקור עודכן."
 
-#: ../../Zotlabs/Module/Sources.php:90
+#: ../../Code/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:71
+#: ../../Code/Module/Sources.php:96 ../../include/features.php:71
 #: ../../include/widgets.php:630
 msgid "Channel Sources"
 msgstr "מקורות ערוץ"
 
-#: ../../Zotlabs/Module/Sources.php:97
+#: ../../Code/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+#: ../../Code/Module/Sources.php:98 ../../Code/Module/Sources.php:108
 msgid "New Source"
 msgstr "מקור חדש"
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+#: ../../Code/Module/Sources.php:109 ../../Code/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+#: ../../Code/Module/Sources.php:111 ../../Code/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "שם ערוץ"
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+#: ../../Code/Module/Sources.php:133 ../../Code/Module/Sources.php:161
 msgid "Source not found."
 msgstr "מקור לא נמצא."
 
-#: ../../Zotlabs/Module/Sources.php:140
+#: ../../Code/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "ערוך מקור"
 
-#: ../../Zotlabs/Module/Sources.php:141
+#: ../../Code/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "מחק מקור"
 
-#: ../../Zotlabs/Module/Sources.php:169
+#: ../../Code/Module/Sources.php:169
 msgid "Source removed"
 msgstr "מקור הוסר"
 
-#: ../../Zotlabs/Module/Sources.php:171
+#: ../../Code/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr ""
 
-#: ../../Zotlabs/Module/Subthread.php:118
+#: ../../Code/Module/Subthread.php:118
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Subthread.php:120
+#: ../../Code/Module/Subthread.php:120
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Code/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149
+#: ../../Code/Module/Suggest.php:58 ../../include/widgets.php:149
 msgid "Ignore/Hide"
 msgstr "התעלם/הסתר"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
+#: ../../Code/Module/Tagger.php:55 ../../include/bbcode.php:263
 msgid "post"
 msgstr "פוסט"
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1949
+#: ../../Code/Module/Tagger.php:57 ../../include/text.php:1949
 #: ../../include/conversation.php:150
 msgid "comment"
 msgstr "תגובה"
 
-#: ../../Zotlabs/Module/Tagger.php:100
+#: ../../Code/Module/Tagger.php:100
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:114
+#: ../../Code/Module/Thing.php:114
 msgid "Thing updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:166
+#: ../../Code/Module/Thing.php:166
 msgid "Object store: failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:170
+#: ../../Code/Module/Thing.php:170
 msgid "Thing added"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:196
+#: ../../Code/Module/Thing.php:196
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:259
+#: ../../Code/Module/Thing.php:259
 msgid "Show Thing"
 msgstr "הצג דבר"
 
-#: ../../Zotlabs/Module/Thing.php:266
+#: ../../Code/Module/Thing.php:266
 msgid "item not found."
 msgstr "פריט לא נמצא"
 
-#: ../../Zotlabs/Module/Thing.php:299
+#: ../../Code/Module/Thing.php:299
 msgid "Edit Thing"
 msgstr "ערוך דבר"
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+#: ../../Code/Module/Thing.php:301 ../../Code/Module/Thing.php:351
 msgid "Select a profile"
 msgstr "בחר פרופיל"
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+#: ../../Code/Module/Thing.php:305 ../../Code/Module/Thing.php:354
 msgid "Post an activity"
 msgstr "פרסם פעילות"
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+#: ../../Code/Module/Thing.php:305 ../../Code/Module/Thing.php:354
 msgid "Only sends to viewers of the applicable profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+#: ../../Code/Module/Thing.php:307 ../../Code/Module/Thing.php:356
 msgid "Name of thing e.g. something"
 msgstr "שם של דבר, לדוגמא: משהו"
 
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+#: ../../Code/Module/Thing.php:309 ../../Code/Module/Thing.php:357
 msgid "URL of thing (optional)"
 msgstr "URL של דבר (רשות)"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:358
 msgid "URL for photo of thing (optional)"
 msgstr "URL עבור תצלום של משהו (רשות)"
 
-#: ../../Zotlabs/Module/Thing.php:349
+#: ../../Code/Module/Thing.php:349
 msgid "Add Thing to your Profile"
 msgstr "הוסף דבר לפרופיל שלך"
 
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+#: ../../Code/Module/Uexport.php:55 ../../Code/Module/Uexport.php:56
 msgid "Export Channel"
 msgstr "יצא ערוץ"
 
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Code/Module/Uexport.php:57
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:58
+#: ../../Code/Module/Uexport.php:58
 msgid "Export Content"
 msgstr "יצא תוכן"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Code/Module/Uexport.php:59
 msgid ""
 "Export your channel information and recent content to a JSON backup that can"
 " be restored or imported to another server hub. This backs up all of your "
@@ -6193,11 +6193,11 @@ msgid ""
 " this download to begin."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Code/Module/Uexport.php:60
 msgid "Export your posts from a given year."
 msgstr "יצא פוסטים מתוך שנה נתונה."
 
-#: ../../Zotlabs/Module/Uexport.php:62
+#: ../../Code/Module/Uexport.php:62
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -6205,21 +6205,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Code/Module/Uexport.php:63
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:64
+#: ../../Code/Module/Uexport.php:64
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Code/Module/Uexport.php:65
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting "
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:104
+#: ../../Code/Lib/Enotify.php:104
 #, php-format
 msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr "[Hubzilla:התראה] דואר חדש נתקבל %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:106
+#: ../../Code/Lib/Enotify.php:106
 #, php-format
 msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr "%1$s, %2$s של לך הודעה פרטית חדשה באתר %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:107
+#: ../../Code/Lib/Enotify.php:107
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s שלח לך %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:107
+#: ../../Code/Lib/Enotify.php:107
 msgid "a private message"
 msgstr "הודעה פרטית"
 
-#: ../../Zotlabs/Lib/Enotify.php:108
+#: ../../Code/Lib/Enotify.php:108
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "אנא בקר בכתובת %s כדי לצפות ו/או להשיב להודעות הפרטיות שלך."
 
-#: ../../Zotlabs/Lib/Enotify.php:164
+#: ../../Code/Lib/Enotify.php:164
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:172
+#: ../../Code/Lib/Enotify.php:172
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:181
+#: ../../Code/Lib/Enotify.php:181
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:192
+#: ../../Code/Lib/Enotify.php:192
 #, php-format
 msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Hubzilla:התראה] תגובה לדיון #%1$d מאת %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:193
+#: ../../Code/Lib/Enotify.php:193
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211
-#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255
-#: ../../Zotlabs/Lib/Enotify.php:269
+#: ../../Code/Lib/Enotify.php:196 ../../Code/Lib/Enotify.php:211
+#: ../../Code/Lib/Enotify.php:237 ../../Code/Lib/Enotify.php:255
+#: ../../Code/Lib/Enotify.php:269
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:202
+#: ../../Code/Lib/Enotify.php:202
 #, php-format
 msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr "[Hubzilla:התראה] %s פרסם לקיר הפרופיל שלך"
 
-#: ../../Zotlabs/Lib/Enotify.php:204
+#: ../../Code/Lib/Enotify.php:204
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:206
+#: ../../Code/Lib/Enotify.php:206
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:230
+#: ../../Code/Lib/Enotify.php:230
 #, php-format
 msgid "[Hubzilla:Notify] %s tagged you"
 msgstr "[Hubzilla:התראה] %s תייג אותך"
 
-#: ../../Zotlabs/Lib/Enotify.php:231
+#: ../../Code/Lib/Enotify.php:231
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../Code/Lib/Enotify.php:232
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:244
+#: ../../Code/Lib/Enotify.php:244
 #, php-format
 msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:245
+#: ../../Code/Lib/Enotify.php:245
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:246
+#: ../../Code/Lib/Enotify.php:246
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:262
+#: ../../Code/Lib/Enotify.php:262
 #, php-format
 msgid "[Hubzilla:Notify] %s tagged your post"
 msgstr "[Hubzilla:התראה] %s תייג פוסט שלך"
 
-#: ../../Zotlabs/Lib/Enotify.php:263
+#: ../../Code/Lib/Enotify.php:263
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:264
+#: ../../Code/Lib/Enotify.php:264
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:276
+#: ../../Code/Lib/Enotify.php:276
 msgid "[Hubzilla:Notify] Introduction received"
 msgstr "[Hubzilla:התראה] היכרות פורמלית נתקבלה"
 
-#: ../../Zotlabs/Lib/Enotify.php:277
+#: ../../Code/Lib/Enotify.php:277
 #, php-format
 msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:278
+#: ../../Code/Lib/Enotify.php:278
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301
+#: ../../Code/Lib/Enotify.php:282 ../../Code/Lib/Enotify.php:301
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "אתה יכול לבקר את הפרופיל שלהם בקישור %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:284
+#: ../../Code/Lib/Enotify.php:284
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:291
+#: ../../Code/Lib/Enotify.php:291
 msgid "[Hubzilla:Notify] Friend suggestion received"
 msgstr "[Hubzilla:התראה] הצעת חבר נתקבלה"
 
-#: ../../Zotlabs/Lib/Enotify.php:292
+#: ../../Code/Lib/Enotify.php:292
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:293
+#: ../../Code/Lib/Enotify.php:293
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:299
+#: ../../Code/Lib/Enotify.php:299
 msgid "Name:"
 msgstr "שם:"
 
-#: ../../Zotlabs/Lib/Enotify.php:300
+#: ../../Code/Lib/Enotify.php:300
 msgid "Photo:"
 msgstr "תצלום:"
 
-#: ../../Zotlabs/Lib/Enotify.php:303
+#: ../../Code/Lib/Enotify.php:303
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:518
+#: ../../Code/Lib/Enotify.php:518
 msgid "[Hubzilla:Notify]"
 msgstr "[Hubzilla:התראה]"
 
-#: ../../Zotlabs/Lib/Enotify.php:667
+#: ../../Code/Lib/Enotify.php:667
 msgid "created a new post"
 msgstr "צור פוסט חדש"
 
-#: ../../Zotlabs/Lib/Enotify.php:668
+#: ../../Code/Lib/Enotify.php:668
 #, php-format
 msgid "commented on %s's post"
 msgstr "הגיב/ה על פוסט של %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
+#: ../../Code/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr "הודעה פרטית"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
+#: ../../Code/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr "בחר"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:136
+#: ../../Code/Lib/ThreadItem.php:136
 msgid "Save to Folder"
 msgstr "שמור לתיקייה"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
+#: ../../Code/Lib/ThreadItem.php:157
 msgid "I will attend"
 msgstr "אני אופיע"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
+#: ../../Code/Lib/ThreadItem.php:157
 msgid "I will not attend"
 msgstr "אני לא אופיע"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
+#: ../../Code/Lib/ThreadItem.php:157
 msgid "I might attend"
 msgstr "אני עשוי/ה להופיע"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
+#: ../../Code/Lib/ThreadItem.php:167
 msgid "I agree"
 msgstr "אני מסכים/ה"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
+#: ../../Code/Lib/ThreadItem.php:167
 msgid "I disagree"
 msgstr "אני לא מסכים/ה"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
+#: ../../Code/Lib/ThreadItem.php:167
 msgid "I abstain"
 msgstr "אני נמנע/ת"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:218
+#: ../../Code/Lib/ThreadItem.php:218
 msgid "Add Star"
 msgstr "הוסף כוכב"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:219
+#: ../../Code/Lib/ThreadItem.php:219
 msgid "Remove Star"
 msgstr "הסר כוכב"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:220
+#: ../../Code/Lib/ThreadItem.php:220
 msgid "Toggle Star Status"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:224
+#: ../../Code/Lib/ThreadItem.php:224
 msgid "starred"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
+#: ../../Code/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
+#: ../../Code/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:243
+#: ../../Code/Lib/ThreadItem.php:243
 msgid "Add Tag"
 msgstr "הוסף תגית"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:261 ../../include/taxonomy.php:316
+#: ../../Code/Lib/ThreadItem.php:261 ../../include/taxonomy.php:316
 msgid "like"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:262 ../../include/taxonomy.php:317
+#: ../../Code/Lib/ThreadItem.php:262 ../../include/taxonomy.php:317
 msgid "dislike"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:266
+#: ../../Code/Lib/ThreadItem.php:266
 msgid "Share This"
 msgstr "שתף זאת"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:266
+#: ../../Code/Lib/ThreadItem.php:266
 msgid "share"
 msgstr "שתף"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:275
+#: ../../Code/Lib/ThreadItem.php:275
 msgid "Delivery Report"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:293
+#: ../../Code/Lib/ThreadItem.php:293
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "תגובה %d"
 msgstr[1] "%d תגובות"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:322 ../../Zotlabs/Lib/ThreadItem.php:323
+#: ../../Code/Lib/ThreadItem.php:322 ../../Code/Lib/ThreadItem.php:323
 #, php-format
 msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:326
+#: ../../Code/Lib/ThreadItem.php:326
 msgid "to"
 msgstr "אל"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:327
+#: ../../Code/Lib/ThreadItem.php:327
 msgid "via"
 msgstr "מתוך"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:328
+#: ../../Code/Lib/ThreadItem.php:328
 msgid "Wall-to-Wall"
 msgstr "קיר-אל-קיר"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:329
+#: ../../Code/Lib/ThreadItem.php:329
 msgid "via Wall-To-Wall:"
 msgstr "מתוך קיר-אל-קיר:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
+#: ../../Code/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr "מאת %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
+#: ../../Code/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr "נערך לאחרונה: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
+#: ../../Code/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr "פג: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:370
+#: ../../Code/Lib/ThreadItem.php:370
 msgid "Save Bookmarks"
 msgstr "שמור סימניות"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:371
+#: ../../Code/Lib/ThreadItem.php:371
 msgid "Add to Calendar"
 msgstr "הוסף ללוח שנה"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:380
+#: ../../Code/Lib/ThreadItem.php:380
 msgid "Mark all seen"
 msgstr "סמן את הכל כנקראו"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
+#: ../../Code/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
 msgid "[+] show all"
 msgstr "[+] הצג הכל"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
+#: ../../Code/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr "מובלט"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
+#: ../../Code/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr "נטוי"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
+#: ../../Code/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr "קו תחתון"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
+#: ../../Code/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr "ציטוט"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
+#: ../../Code/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr "קוד"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:716
+#: ../../Code/Lib/ThreadItem.php:716
 msgid "Image"
 msgstr "תמונה"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:717
+#: ../../Code/Lib/ThreadItem.php:717
 msgid "Insert Link"
 msgstr "הכנס קישור"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:718
+#: ../../Code/Lib/ThreadItem.php:718
 msgid "Video"
 msgstr "וידאו"
 
-#: ../../Zotlabs/Lib/Apps.php:204
+#: ../../Code/Lib/Apps.php:204
 msgid "Site Admin"
 msgstr "מנהל אתר"
 
-#: ../../Zotlabs/Lib/Apps.php:205
+#: ../../Code/Lib/Apps.php:205
 msgid "Bug Report"
 msgstr "דיווח באג"
 
-#: ../../Zotlabs/Lib/Apps.php:206
+#: ../../Code/Lib/Apps.php:206
 msgid "View Bookmarks"
 msgstr "הצג סימניות"
 
-#: ../../Zotlabs/Lib/Apps.php:207
+#: ../../Code/Lib/Apps.php:207
 msgid "My Chatrooms"
 msgstr "חדרי השיחה שלי"
 
-#: ../../Zotlabs/Lib/Apps.php:209
+#: ../../Code/Lib/Apps.php:209
 msgid "Firefox Share"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:210
+#: ../../Code/Lib/Apps.php:210
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
+#: ../../Code/Lib/Apps.php:211 ../../include/features.php:89
 msgid "Suggest Channels"
 msgstr "הצע ערוצים"
 
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
+#: ../../Code/Lib/Apps.php:212 ../../include/nav.php:110
 #: ../../boot.php:1704
 msgid "Login"
 msgstr "כניסה"
 
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
+#: ../../Code/Lib/Apps.php:214 ../../include/nav.php:179
 msgid "Grid"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:182
+#: ../../Code/Lib/Apps.php:219 ../../include/nav.php:182
 msgid "Channel Home"
 msgstr "ערוץ בית"
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/conversation.php:1664
+#: ../../Code/Lib/Apps.php:222 ../../include/conversation.php:1664
 #: ../../include/conversation.php:1667 ../../include/nav.php:201
 msgid "Events"
 msgstr "אירועים"
 
-#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:167
+#: ../../Code/Lib/Apps.php:223 ../../include/nav.php:167
 msgid "Directory"
 msgstr "ספרייה"
 
-#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:193
+#: ../../Code/Lib/Apps.php:225 ../../include/nav.php:193
 msgid "Mail"
 msgstr "דואר"
 
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:96
+#: ../../Code/Lib/Apps.php:228 ../../include/nav.php:96
 msgid "Chat"
 msgstr "שיחה"
 
-#: ../../Zotlabs/Lib/Apps.php:230
+#: ../../Code/Lib/Apps.php:230
 msgid "Probe"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:231
+#: ../../Code/Lib/Apps.php:231
 msgid "Suggest"
 msgstr "הצע"
 
-#: ../../Zotlabs/Lib/Apps.php:232
+#: ../../Code/Lib/Apps.php:232
 msgid "Random Channel"
 msgstr "ערוץ אקראי"
 
-#: ../../Zotlabs/Lib/Apps.php:233
+#: ../../Code/Lib/Apps.php:233
 msgid "Invite"
 msgstr "הזמן"
 
-#: ../../Zotlabs/Lib/Apps.php:234 ../../include/widgets.php:1459
+#: ../../Code/Lib/Apps.php:234 ../../include/widgets.php:1459
 msgid "Features"
 msgstr "תכונות"
 
-#: ../../Zotlabs/Lib/Apps.php:236
+#: ../../Code/Lib/Apps.php:236
 msgid "Post"
 msgstr "פוסט"
 
-#: ../../Zotlabs/Lib/Apps.php:338
+#: ../../Code/Lib/Apps.php:338
 msgid "Purchase"
 msgstr "רכוש"
 
diff --git a/view/it/messages.po b/view/it/messages.po
index dcc16b9b1..7ffb6a7fc 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -20,143 +20,143 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Code/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
 msgstr "Può vedere i post e i contenuti del mio canale"
 
-#: ../../Zotlabs/Access/Permissions.php:57
+#: ../../Code/Access/Permissions.php:57
 msgid "Can send me their channel stream and posts"
 msgstr "È tra i canali che seguo"
 
-#: ../../Zotlabs/Access/Permissions.php:58
+#: ../../Code/Access/Permissions.php:58
 msgid "Can view my default channel profile"
 msgstr "Può vedere il profilo predefinito del canale"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Code/Access/Permissions.php:59
 msgid "Can view my connections"
 msgstr "Può vedere i miei contatti"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Code/Access/Permissions.php:60
 msgid "Can view my file storage and photos"
 msgstr "Può vedere il mio archivio file e foto"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Code/Access/Permissions.php:61
 msgid "Can upload/modify my file storage and photos"
 msgstr "Può caricare o modificare i file e le foto del mio archivio"
 
-#: ../../Zotlabs/Access/Permissions.php:62
+#: ../../Code/Access/Permissions.php:62
 msgid "Can view my channel webpages"
 msgstr "Può vedere le pagine web del mio canale"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Code/Access/Permissions.php:63
 msgid "Can view my wiki pages"
 msgstr "Può vedere le pagine del mio wiki"
 
-#: ../../Zotlabs/Access/Permissions.php:64
+#: ../../Code/Access/Permissions.php:64
 msgid "Can create/edit my channel webpages"
 msgstr "Può creare o modificare le pagine web del mio canale"
 
-#: ../../Zotlabs/Access/Permissions.php:65
+#: ../../Code/Access/Permissions.php:65
 msgid "Can write to my wiki pages"
 msgstr "Può scrivere nelle pagine del mio wiki"
 
-#: ../../Zotlabs/Access/Permissions.php:66
+#: ../../Code/Access/Permissions.php:66
 msgid "Can post on my channel (wall) page"
 msgstr "Può postare sulla mia bacheca"
 
-#: ../../Zotlabs/Access/Permissions.php:67
+#: ../../Code/Access/Permissions.php:67
 msgid "Can comment on or like my posts"
 msgstr "Può commentare o aggiungere \"mi piace\" ai miei post"
 
-#: ../../Zotlabs/Access/Permissions.php:68
+#: ../../Code/Access/Permissions.php:68
 msgid "Can send me private mail messages"
 msgstr "Può inviarmi messaggi privati"
 
-#: ../../Zotlabs/Access/Permissions.php:69
+#: ../../Code/Access/Permissions.php:69
 msgid "Can like/dislike profiles and profile things"
 msgstr "Può aggiungere un \"mi piace\" sul profilo e sugli oggetti del profilo"
 
-#: ../../Zotlabs/Access/Permissions.php:70
+#: ../../Code/Access/Permissions.php:70
 msgid "Can forward to all my channel connections via @+ mentions in posts"
 msgstr "Può inoltrare post a tutti i miei contatti con una menzione @+"
 
-#: ../../Zotlabs/Access/Permissions.php:71
+#: ../../Code/Access/Permissions.php:71
 msgid "Can chat with me"
 msgstr "Può aprire una chat con me"
 
-#: ../../Zotlabs/Access/Permissions.php:72
+#: ../../Code/Access/Permissions.php:72
 msgid "Can source my public posts in derived channels"
 msgstr "Può usare i miei post pubblici per creare canali derivati"
 
-#: ../../Zotlabs/Access/Permissions.php:73
+#: ../../Code/Access/Permissions.php:73
 msgid "Can administer my channel"
 msgstr "Può amministrare il mio canale"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:283
+#: ../../Code/Access/PermissionRoles.php:283
 msgid "Social Networking"
 msgstr "Social network"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:284
+#: ../../Code/Access/PermissionRoles.php:284
 msgid "Social - Party"
 msgstr "Social - Party"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:285
+#: ../../Code/Access/PermissionRoles.php:285
 msgid "Social - Mostly Public"
 msgstr "Social - Prevalentemente pubblico"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:286
+#: ../../Code/Access/PermissionRoles.php:286
 msgid "Social - Restricted"
 msgstr "Social - Con restrizioni"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
+#: ../../Code/Access/PermissionRoles.php:287
 msgid "Social - Private"
 msgstr "Social - Privato"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
+#: ../../Code/Access/PermissionRoles.php:290
 msgid "Community Forum"
 msgstr "Forum di discussione"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
+#: ../../Code/Access/PermissionRoles.php:291
 msgid "Forum - Mostly Public"
 msgstr "Social - Prevalentemente pubblico"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:292
+#: ../../Code/Access/PermissionRoles.php:292
 msgid "Forum - Restricted"
 msgstr "Forum - Con restrizioni"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:293
+#: ../../Code/Access/PermissionRoles.php:293
 msgid "Forum - Private"
 msgstr "Forum - Privato"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
+#: ../../Code/Access/PermissionRoles.php:296
 msgid "Feed Republish"
 msgstr "Aggregatore di feed esterni"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
+#: ../../Code/Access/PermissionRoles.php:297
 msgid "Feed - Mostly Public"
 msgstr "Feed - Prevalentemente pubblico"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:298
+#: ../../Code/Access/PermissionRoles.php:298
 msgid "Feed - Restricted"
 msgstr "Feed - Con restrizioni"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
+#: ../../Code/Access/PermissionRoles.php:301
 msgid "Special Purpose"
 msgstr "Per finalità speciali"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
+#: ../../Code/Access/PermissionRoles.php:302
 msgid "Special - Celebrity/Soapbox"
 msgstr "Speciale - Pagina per fan"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:303
+#: ../../Code/Access/PermissionRoles.php:303
 msgid "Special - Group Repository"
 msgstr "Speciale - Repository di gruppo"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144
-#: ../../Zotlabs/Module/Settings/Channel.php:479
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49
+#: ../../Code/Access/PermissionRoles.php:306
+#: ../../Code/Module/Cdav.php:1182 ../../Code/Module/New_channel.php:144
+#: ../../Code/Module/Settings/Channel.php:479
+#: ../../Code/Module/Connedit.php:918 ../../Code/Module/Profiles.php:795
+#: ../../Code/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:697
@@ -164,77 +164,77 @@ msgstr "Speciale - Repository di gruppo"
 msgid "Other"
 msgstr "Altro"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
+#: ../../Code/Access/PermissionRoles.php:307
 msgid "Custom/Expert Mode"
 msgstr "Personalizzazione per esperti"
 
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29
-#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197
+#: ../../Code/Module/Blocks.php:33 ../../Code/Module/Articles.php:29
+#: ../../Code/Module/Editlayout.php:31 ../../Code/Module/Connect.php:17
+#: ../../Code/Module/Achievements.php:15 ../../Code/Module/Hcard.php:12
+#: ../../Code/Module/Editblock.php:31 ../../Code/Module/Profile.php:20
+#: ../../Code/Module/Layouts.php:31 ../../Code/Module/Editwebpage.php:32
+#: ../../Code/Module/Cards.php:33 ../../Code/Module/Webpages.php:33
+#: ../../Code/Module/Filestorage.php:51 ../../include/channel.php:1197
 msgid "Requested profile is not available."
 msgstr "Il profilo richiesto non è disponibile."
 
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110
-#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Article_edit.php:51
-#: ../../Zotlabs/Module/New_channel.php:91
-#: ../../Zotlabs/Module/New_channel.php:116
-#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
-#: ../../Zotlabs/Module/Moderate.php:13
-#: ../../Zotlabs/Module/Settings/Features.php:38
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280
-#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
-#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
-#: ../../Zotlabs/Module/Profile_photo.php:302
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229
-#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
-#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107
-#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118
-#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74
-#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
-#: ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Cover_photo.php:281
-#: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Filestorage.php:15
-#: ../../Zotlabs/Module/Filestorage.php:70
-#: ../../Zotlabs/Module/Filestorage.php:85
-#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Card_edit.php:51
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
+#: ../../Code/Module/Blocks.php:73 ../../Code/Module/Blocks.php:80
+#: ../../Code/Module/Invite.php:17 ../../Code/Module/Invite.php:94
+#: ../../Code/Module/Articles.php:68 ../../Code/Module/Editlayout.php:67
+#: ../../Code/Module/Editlayout.php:90 ../../Code/Module/Channel.php:110
+#: ../../Code/Module/Channel.php:248 ../../Code/Module/Channel.php:288
+#: ../../Code/Module/Settings.php:59 ../../Code/Module/Locs.php:87
+#: ../../Code/Module/Mitem.php:115 ../../Code/Module/Events.php:271
+#: ../../Code/Module/Appman.php:87 ../../Code/Module/Regmod.php:21
+#: ../../Code/Module/Article_edit.php:51
+#: ../../Code/Module/New_channel.php:91
+#: ../../Code/Module/New_channel.php:116
+#: ../../Code/Module/Sharedwithme.php:16 ../../Code/Module/Setup.php:209
+#: ../../Code/Module/Moderate.php:13
+#: ../../Code/Module/Settings/Features.php:38
+#: ../../Code/Module/Achievements.php:34 ../../Code/Module/Thing.php:280
+#: ../../Code/Module/Thing.php:300 ../../Code/Module/Thing.php:341
+#: ../../Code/Module/Api.php:24 ../../Code/Module/Editblock.php:67
+#: ../../Code/Module/Profile.php:85 ../../Code/Module/Profile.php:101
+#: ../../Code/Module/Mood.php:116 ../../Code/Module/Connections.php:29
+#: ../../Code/Module/Viewsrc.php:19 ../../Code/Module/Bookmarks.php:64
+#: ../../Code/Module/Photos.php:69 ../../Code/Module/Wiki.php:50
+#: ../../Code/Module/Wiki.php:273 ../../Code/Module/Wiki.php:404
+#: ../../Code/Module/Pdledit.php:29 ../../Code/Module/Poke.php:149
+#: ../../Code/Module/Profile_photo.php:302
+#: ../../Code/Module/Profile_photo.php:315
+#: ../../Code/Module/Authtest.php:16 ../../Code/Module/Item.php:229
+#: ../../Code/Module/Item.php:246 ../../Code/Module/Item.php:256
+#: ../../Code/Module/Item.php:1106 ../../Code/Module/Page.php:34
+#: ../../Code/Module/Page.php:133 ../../Code/Module/Connedit.php:389
+#: ../../Code/Module/Chat.php:100 ../../Code/Module/Chat.php:105
+#: ../../Code/Module/Menu.php:78 ../../Code/Module/Layouts.php:71
+#: ../../Code/Module/Layouts.php:78 ../../Code/Module/Layouts.php:89
+#: ../../Code/Module/Defperms.php:173 ../../Code/Module/Group.php:13
+#: ../../Code/Module/Profiles.php:198 ../../Code/Module/Profiles.php:635
+#: ../../Code/Module/Editwebpage.php:68
+#: ../../Code/Module/Editwebpage.php:89
+#: ../../Code/Module/Editwebpage.php:107
+#: ../../Code/Module/Editwebpage.php:121 ../../Code/Module/Manage.php:10
+#: ../../Code/Module/Cards.php:72 ../../Code/Module/Webpages.php:118
+#: ../../Code/Module/Block.php:24 ../../Code/Module/Block.php:74
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Sources.php:74
+#: ../../Code/Module/Like.php:185 ../../Code/Module/Suggest.php:28
+#: ../../Code/Module/Message.php:18 ../../Code/Module/Mail.php:146
+#: ../../Code/Module/Register.php:77
+#: ../../Code/Module/Cover_photo.php:281
+#: ../../Code/Module/Cover_photo.php:294
+#: ../../Code/Module/Display.php:449 ../../Code/Module/Network.php:15
+#: ../../Code/Module/Filestorage.php:15
+#: ../../Code/Module/Filestorage.php:70
+#: ../../Code/Module/Filestorage.php:85
+#: ../../Code/Module/Filestorage.php:117 ../../Code/Module/Common.php:38
+#: ../../Code/Module/Viewconnections.php:28
+#: ../../Code/Module/Viewconnections.php:33
+#: ../../Code/Module/Service_limits.php:11
+#: ../../Code/Module/Rate.php:113 ../../Code/Module/Card_edit.php:51
+#: ../../Code/Module/Notifications.php:11
+#: ../../Code/Lib/Chatroom.php:133 ../../Code/Web/WebServer.php:123
 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
 #: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150
 #: ../../include/attach.php:197 ../../include/attach.php:270
@@ -247,206 +247,206 @@ msgstr "Il profilo richiesto non è disponibile."
 msgid "Permission denied."
 msgstr "Permesso negato."
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
+#: ../../Code/Module/Blocks.php:97 ../../Code/Module/Blocks.php:155
+#: ../../Code/Module/Editblock.php:113
 msgid "Block Name"
 msgstr "Nome del block"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422
+#: ../../Code/Module/Blocks.php:154 ../../include/text.php:2422
 msgid "Blocks"
 msgstr "Block"
 
-#: ../../Zotlabs/Module/Blocks.php:156
+#: ../../Code/Module/Blocks.php:156
 msgid "Block Title"
 msgstr "Titolo del block"
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Code/Module/Blocks.php:157 ../../Code/Module/Menu.php:114
+#: ../../Code/Module/Layouts.php:191 ../../Code/Module/Webpages.php:251
 msgid "Created"
 msgstr "Creato"
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
+#: ../../Code/Module/Blocks.php:158 ../../Code/Module/Menu.php:115
+#: ../../Code/Module/Layouts.php:192 ../../Code/Module/Webpages.php:252
 msgid "Edited"
 msgstr "Modificato"
 
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239
-#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382
-#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
+#: ../../Code/Module/Blocks.php:159 ../../Code/Module/Articles.php:96
+#: ../../Code/Module/Cdav.php:1185 ../../Code/Module/New_channel.php:160
+#: ../../Code/Module/Connedit.php:921 ../../Code/Module/Menu.php:118
+#: ../../Code/Module/Layouts.php:185 ../../Code/Module/Profiles.php:798
+#: ../../Code/Module/Cards.php:100 ../../Code/Module/Webpages.php:239
+#: ../../Code/Storage/Browser.php:276 ../../Code/Storage/Browser.php:382
+#: ../../Code/Widget/Cdav.php:128 ../../Code/Widget/Cdav.php:165
 msgid "Create"
 msgstr "Crea"
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Admin/Profs.php:175
-#: ../../Zotlabs/Module/Settings/Oauth2.php:149
-#: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:281
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202
-#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121
-#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126
-#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296
+#: ../../Code/Module/Blocks.php:160 ../../Code/Module/Editlayout.php:114
+#: ../../Code/Module/Article_edit.php:99
+#: ../../Code/Module/Admin/Profs.php:175
+#: ../../Code/Module/Settings/Oauth2.php:149
+#: ../../Code/Module/Settings/Oauth.php:150
+#: ../../Code/Module/Thing.php:266 ../../Code/Module/Editblock.php:114
+#: ../../Code/Module/Connections.php:281
+#: ../../Code/Module/Connections.php:319
+#: ../../Code/Module/Connections.php:339 ../../Code/Module/Wiki.php:202
+#: ../../Code/Module/Wiki.php:362 ../../Code/Module/Menu.php:112
+#: ../../Code/Module/Layouts.php:193
+#: ../../Code/Module/Editwebpage.php:142
+#: ../../Code/Module/Webpages.php:240 ../../Code/Module/Card_edit.php:99
+#: ../../Code/Lib/Apps.php:409 ../../Code/Lib/ThreadItem.php:121
+#: ../../Code/Storage/Browser.php:288 ../../Code/Widget/Cdav.php:126
+#: ../../Code/Widget/Cdav.php:162 ../../include/channel.php:1296
 #: ../../include/channel.php:1300 ../../include/menu.php:113
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102
-#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124
+#: ../../Code/Module/Blocks.php:161 ../../Code/Module/Photos.php:1102
+#: ../../Code/Module/Wiki.php:287 ../../Code/Module/Layouts.php:194
+#: ../../Code/Module/Webpages.php:241 ../../Code/Widget/Cdav.php:124
 #: ../../include/conversation.php:1366
 msgid "Share"
 msgstr "Condividi"
 
-#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
-#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Settings/Oauth2.php:150
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:289
-#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179
-#: ../../Zotlabs/Module/Profiles.php:800
-#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:242
-#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410
-#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:289
+#: ../../Code/Module/Blocks.php:162 ../../Code/Module/Editlayout.php:138
+#: ../../Code/Module/Cdav.php:897 ../../Code/Module/Cdav.php:1187
+#: ../../Code/Module/Article_edit.php:129
+#: ../../Code/Module/Admin/Accounts.php:175
+#: ../../Code/Module/Admin/Channels.php:149
+#: ../../Code/Module/Admin/Profs.php:176
+#: ../../Code/Module/Settings/Oauth2.php:150
+#: ../../Code/Module/Settings/Oauth.php:151
+#: ../../Code/Module/Thing.php:267 ../../Code/Module/Editblock.php:139
+#: ../../Code/Module/Connections.php:289
+#: ../../Code/Module/Photos.php:1203 ../../Code/Module/Connedit.php:654
+#: ../../Code/Module/Connedit.php:923 ../../Code/Module/Group.php:179
+#: ../../Code/Module/Profiles.php:800
+#: ../../Code/Module/Editwebpage.php:167
+#: ../../Code/Module/Webpages.php:242
+#: ../../Code/Module/Card_edit.php:129 ../../Code/Lib/Apps.php:410
+#: ../../Code/Lib/ThreadItem.php:141 ../../Code/Storage/Browser.php:289
 #: ../../include/conversation.php:690 ../../include/conversation.php:733
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60
+#: ../../Code/Module/Blocks.php:166 ../../Code/Module/Events.php:694
+#: ../../Code/Module/Wiki.php:204 ../../Code/Module/Layouts.php:198
+#: ../../Code/Module/Webpages.php:246 ../../Code/Module/Pubsites.php:60
 msgid "View"
 msgstr "Guarda"
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Code/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
 msgstr "Hai superato il numero massimo di inviti."
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Code/Module/Invite.php:53
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s: non è un indirizzo email valido."
 
-#: ../../Zotlabs/Module/Invite.php:67
+#: ../../Code/Module/Invite.php:67
 msgid "Please join us on $Projectname"
 msgstr "Unisciti a noi su $Projectname"
 
-#: ../../Zotlabs/Module/Invite.php:77
+#: ../../Code/Module/Invite.php:77
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario."
 
-#: ../../Zotlabs/Module/Invite.php:82
+#: ../../Code/Module/Invite.php:82
 #: ../../addon/notifyadmin/notifyadmin.php:40
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s: la consegna del messaggio è fallita."
 
-#: ../../Zotlabs/Module/Invite.php:86
+#: ../../Code/Module/Invite.php:86
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d messaggio inviato."
 msgstr[1] "%d messaggi inviati."
 
-#: ../../Zotlabs/Module/Invite.php:107
+#: ../../Code/Module/Invite.php:107
 msgid "You have no more invitations available"
 msgstr "Non hai altri inviti disponibili"
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Code/Module/Invite.php:138
 msgid "Send invitations"
 msgstr "Spedisci inviti"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Code/Module/Invite.php:139
 msgid "Enter email addresses, one per line:"
 msgstr "Inserisci gli indirizzi email, uno per riga:"
 
-#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
+#: ../../Code/Module/Invite.php:140 ../../Code/Module/Mail.php:285
 msgid "Your message:"
 msgstr "Il tuo messaggio:"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Code/Module/Invite.php:141
 msgid "Please join my community on $Projectname."
 msgstr "Entra nella mia comunità su $Projectname."
 
-#: ../../Zotlabs/Module/Invite.php:143
+#: ../../Code/Module/Invite.php:143
 msgid "You will need to supply this invitation code:"
 msgstr "Dovrai fornire questo codice invito:"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Code/Module/Invite.php:144
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Registrati su qualsiasi server $Projectname (sono tutti interconnessi)"
 
-#: ../../Zotlabs/Module/Invite.php:146
+#: ../../Code/Module/Invite.php:146
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Inserisci il mio indirizzo $Projectname nel riquadro di ricerca del sito."
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Code/Module/Invite.php:147
 msgid "or visit"
 msgstr "oppure visita"
 
-#: ../../Zotlabs/Module/Invite.php:149
+#: ../../Code/Module/Invite.php:149
 msgid "3. Click [Connect]"
 msgstr "3. Clicca su [Aggiungi]"
 
-#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:153
-#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
-#: ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Plugins.php:438
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:296
-#: ../../Zotlabs/Module/Admin/Profs.php:178
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Security.php:104
-#: ../../Zotlabs/Module/Settings/Permcats.php:115
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-#: ../../Zotlabs/Module/Settings/Features.php:79
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Oauth2.php:84
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:54
-#: ../../Zotlabs/Module/Settings/Display.php:192
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379
-#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082
-#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240
-#: ../../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:40
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
-#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752
-#: ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:97
+#: ../../Code/Module/Invite.php:151 ../../Code/Module/Locs.php:121
+#: ../../Code/Module/Mitem.php:243 ../../Code/Module/Events.php:493
+#: ../../Code/Module/Appman.php:153
+#: ../../Code/Module/Import_items.php:129
+#: ../../Code/Module/Setup.php:308 ../../Code/Module/Setup.php:349
+#: ../../Code/Module/Connect.php:98
+#: ../../Code/Module/Admin/Features.php:66
+#: ../../Code/Module/Admin/Plugins.php:438
+#: ../../Code/Module/Admin/Accounts.php:168
+#: ../../Code/Module/Admin/Logs.php:84
+#: ../../Code/Module/Admin/Channels.php:147
+#: ../../Code/Module/Admin/Themes.php:158
+#: ../../Code/Module/Admin/Site.php:296
+#: ../../Code/Module/Admin/Profs.php:178
+#: ../../Code/Module/Admin/Account_edit.php:74
+#: ../../Code/Module/Admin/Security.php:104
+#: ../../Code/Module/Settings/Permcats.php:115
+#: ../../Code/Module/Settings/Channel.php:495
+#: ../../Code/Module/Settings/Features.php:79
+#: ../../Code/Module/Settings/Tokens.php:168
+#: ../../Code/Module/Settings/Oauth2.php:84
+#: ../../Code/Module/Settings/Account.php:118
+#: ../../Code/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Display.php:192
+#: ../../Code/Module/Settings/Oauth.php:88
+#: ../../Code/Module/Thing.php:326 ../../Code/Module/Thing.php:379
+#: ../../Code/Module/Import.php:530 ../../Code/Module/Cal.php:345
+#: ../../Code/Module/Mood.php:139 ../../Code/Module/Photos.php:1082
+#: ../../Code/Module/Photos.php:1122 ../../Code/Module/Photos.php:1240
+#: ../../Code/Module/Wiki.php:206 ../../Code/Module/Pdledit.php:98
+#: ../../Code/Module/Poke.php:200 ../../Code/Module/Connedit.php:887
+#: ../../Code/Module/Chat.php:196 ../../Code/Module/Chat.php:242
+#: ../../Code/Module/Email_validation.php:40
+#: ../../Code/Module/Pconfig.php:107 ../../Code/Module/Defperms.php:249
+#: ../../Code/Module/Group.php:87 ../../Code/Module/Profiles.php:723
+#: ../../Code/Module/Editpost.php:85 ../../Code/Module/Sources.php:114
+#: ../../Code/Module/Sources.php:149 ../../Code/Module/Xchan.php:15
+#: ../../Code/Module/Mail.php:431 ../../Code/Module/Filestorage.php:160
+#: ../../Code/Module/Rate.php:166 ../../Code/Lib/ThreadItem.php:752
+#: ../../Code/Widget/Eventstools.php:16
+#: ../../Code/Widget/Wiki_pages.php:40
+#: ../../Code/Widget/Wiki_pages.php:97
 #: ../../view/theme/redbasic_c/php/config.php:95
 #: ../../view/theme/redbasic/php/config.php:93
 #: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275
@@ -482,393 +482,393 @@ msgstr "3. Clicca su [Aggiungi]"
 msgid "Submit"
 msgstr "Salva"
 
-#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191
-#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133
+#: ../../Code/Module/Articles.php:38 ../../Code/Module/Articles.php:191
+#: ../../Code/Lib/Apps.php:229 ../../include/features.php:133
 #: ../../include/nav.php:469
 msgid "Articles"
 msgstr "Articoli"
 
-#: ../../Zotlabs/Module/Articles.php:95
+#: ../../Code/Module/Articles.php:95
 msgid "Add Article"
 msgstr "Aggiungi un articolo"
 
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Article_edit.php:17
-#: ../../Zotlabs/Module/Article_edit.php:33
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Card_edit.php:17
-#: ../../Zotlabs/Module/Card_edit.php:33
+#: ../../Code/Module/Editlayout.php:79
+#: ../../Code/Module/Article_edit.php:17
+#: ../../Code/Module/Article_edit.php:33
+#: ../../Code/Module/Editblock.php:79 ../../Code/Module/Editblock.php:95
+#: ../../Code/Module/Editwebpage.php:80
+#: ../../Code/Module/Editpost.php:24 ../../Code/Module/Card_edit.php:17
+#: ../../Code/Module/Card_edit.php:33
 msgid "Item not found"
 msgstr "Elemento non trovato"
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Code/Module/Editlayout.php:128
+#: ../../Code/Module/Layouts.php:129 ../../Code/Module/Layouts.php:189
 msgid "Layout Name"
 msgstr "Nome layout"
 
-#: ../../Zotlabs/Module/Editlayout.php:129
-#: ../../Zotlabs/Module/Layouts.php:132
+#: ../../Code/Module/Editlayout.php:129
+#: ../../Code/Module/Layouts.php:132
 msgid "Layout Description (Optional)"
 msgstr "Descrizione del layout (facoltativa)"
 
-#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Code/Module/Editlayout.php:137
 msgid "Edit Layout"
 msgstr "Modifica il layout"
 
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122
+#: ../../Code/Module/Profperm.php:28 ../../Code/Module/Subthread.php:86
+#: ../../Code/Module/Import_items.php:120
+#: ../../Code/Module/Cloud.php:117 ../../Code/Module/Group.php:74
+#: ../../Code/Module/Dreport.php:10 ../../Code/Module/Dreport.php:68
+#: ../../Code/Module/Like.php:296 ../../Code/Web/WebServer.php:122
 #: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73
 #: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109
 #: ../../include/items.php:358
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+#: ../../Code/Module/Profperm.php:34 ../../Code/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr "Indentificativo del profilo non valido."
 
-#: ../../Zotlabs/Module/Profperm.php:111
+#: ../../Code/Module/Profperm.php:111
 msgid "Profile Visibility Editor"
 msgstr "Modifica la visibilità del profilo"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644
+#: ../../Code/Module/Profperm.php:113 ../../include/channel.php:1644
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Click on a contact to add or remove."
 msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
 
-#: ../../Zotlabs/Module/Profperm.php:124
+#: ../../Code/Module/Profperm.php:124
 msgid "Visible To"
 msgstr "Visibile a"
 
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:200
+#: ../../Code/Module/Profperm.php:140
+#: ../../Code/Module/Connections.php:200
 msgid "All Connections"
 msgstr "Tutti i contatti"
 
-#: ../../Zotlabs/Module/Cdav.php:785
+#: ../../Code/Module/Cdav.php:785
 msgid "INVALID EVENT DISMISSED!"
 msgstr "EVENTO NON VALIDO ELIMINATO!"
 
-#: ../../Zotlabs/Module/Cdav.php:786
+#: ../../Code/Module/Cdav.php:786
 msgid "Summary: "
 msgstr "Sommario:"
 
-#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787
-#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273
-#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:878
+#: ../../Code/Module/Cdav.php:786 ../../Code/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:794 ../../Code/Module/Embedphotos.php:146
+#: ../../Code/Module/Photos.php:817 ../../Code/Module/Photos.php:1273
+#: ../../Code/Lib/Apps.php:754 ../../Code/Lib/Apps.php:833
+#: ../../Code/Storage/Browser.php:164 ../../Code/Widget/Portfolio.php:95
+#: ../../Code/Widget/Album.php:84 ../../addon/pubcrawl/as.php:878
 #: ../../include/conversation.php:1160
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../../Zotlabs/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:787
 msgid "Date: "
 msgstr "Data:"
 
-#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795
+#: ../../Code/Module/Cdav.php:788 ../../Code/Module/Cdav.php:795
 msgid "Reason: "
 msgstr "Motivo:"
 
-#: ../../Zotlabs/Module/Cdav.php:793
+#: ../../Code/Module/Cdav.php:793
 msgid "INVALID CARD DISMISSED!"
 msgstr "CARD NON VALIDA ELIMINATA!"
 
-#: ../../Zotlabs/Module/Cdav.php:794
+#: ../../Code/Module/Cdav.php:794
 msgid "Name: "
 msgstr "Nome:"
 
-#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Cdav.php:868 ../../Code/Module/Events.php:460
 msgid "Event title"
 msgstr "Titolo dell'evento"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Events.php:466
 msgid "Start date and time"
 msgstr "Data e ora di inizio"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Cdav.php:870
 msgid "Example: YYYY-MM-DD HH:mm"
 msgstr "Esempio: YYYY-MM-DD HH:mm"
 
-#: ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:870
 msgid "End date and time"
 msgstr "Data e ora di fine"
 
-#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Code/Module/Cdav.php:871 ../../Code/Module/Events.php:473
+#: ../../Code/Module/Appman.php:143 ../../Code/Module/Rbmark.php:101
 #: ../../addon/rendezvous/rendezvous.php:173
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
-#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
+#: ../../Code/Module/Cdav.php:872 ../../Code/Module/Locs.php:117
+#: ../../Code/Module/Events.php:475 ../../Code/Module/Profiles.php:509
+#: ../../Code/Module/Profiles.php:734 ../../Code/Module/Pubsites.php:52
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Posizione geografica"
 
-#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689
-#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971
+#: ../../Code/Module/Cdav.php:879 ../../Code/Module/Events.php:689
+#: ../../Code/Module/Events.php:698 ../../Code/Module/Cal.php:339
+#: ../../Code/Module/Cal.php:346 ../../Code/Module/Photos.php:971
 msgid "Previous"
 msgstr "Precendente"
 
-#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347
-#: ../../Zotlabs/Module/Photos.php:980
+#: ../../Code/Module/Cdav.php:880 ../../Code/Module/Events.php:690
+#: ../../Code/Module/Events.php:699 ../../Code/Module/Setup.php:263
+#: ../../Code/Module/Cal.php:340 ../../Code/Module/Cal.php:347
+#: ../../Code/Module/Photos.php:980
 msgid "Next"
 msgstr "Successivo"
 
-#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700
-#: ../../Zotlabs/Module/Cal.php:348
+#: ../../Code/Module/Cdav.php:881 ../../Code/Module/Events.php:700
+#: ../../Code/Module/Cal.php:348
 msgid "Today"
 msgstr "Oggi"
 
-#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695
+#: ../../Code/Module/Cdav.php:882 ../../Code/Module/Events.php:695
 msgid "Month"
 msgstr "Mese"
 
-#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696
+#: ../../Code/Module/Cdav.php:883 ../../Code/Module/Events.php:696
 msgid "Week"
 msgstr "Settimana"
 
-#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697
+#: ../../Code/Module/Cdav.php:884 ../../Code/Module/Events.php:697
 msgid "Day"
 msgstr "Giorno"
 
-#: ../../Zotlabs/Module/Cdav.php:885
+#: ../../Code/Module/Cdav.php:885
 msgid "List month"
 msgstr "Lista del mese"
 
-#: ../../Zotlabs/Module/Cdav.php:886
+#: ../../Code/Module/Cdav.php:886
 msgid "List week"
 msgstr "Lista della settimana"
 
-#: ../../Zotlabs/Module/Cdav.php:887
+#: ../../Code/Module/Cdav.php:887
 msgid "List day"
 msgstr "Lista del giorno"
 
-#: ../../Zotlabs/Module/Cdav.php:894
+#: ../../Code/Module/Cdav.php:894
 msgid "More"
 msgstr "Di più"
 
-#: ../../Zotlabs/Module/Cdav.php:895
+#: ../../Code/Module/Cdav.php:895
 msgid "Less"
 msgstr "Meno"
 
-#: ../../Zotlabs/Module/Cdav.php:896
+#: ../../Code/Module/Cdav.php:896
 msgid "Select calendar"
 msgstr "Seleziona calendario"
 
-#: ../../Zotlabs/Module/Cdav.php:898
+#: ../../Code/Module/Cdav.php:898
 msgid "Delete all"
 msgstr "Elimina tutto"
 
-#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Settings/Oauth2.php:85
-#: ../../Zotlabs/Module/Settings/Oauth2.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:464
-#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../Code/Module/Cdav.php:899 ../../Code/Module/Cdav.php:1188
+#: ../../Code/Module/Admin/Plugins.php:423
+#: ../../Code/Module/Settings/Oauth2.php:85
+#: ../../Code/Module/Settings/Oauth2.php:113
+#: ../../Code/Module/Settings/Oauth.php:89
+#: ../../Code/Module/Settings/Oauth.php:115
+#: ../../Code/Module/Wiki.php:347 ../../Code/Module/Wiki.php:379
+#: ../../Code/Module/Profile_photo.php:464
+#: ../../Code/Module/Connedit.php:924 ../../Code/Module/Fbrowser.php:66
+#: ../../Code/Module/Fbrowser.php:88 ../../Code/Module/Profiles.php:801
+#: ../../Code/Module/Filer.php:55 ../../Code/Module/Cover_photo.php:366
+#: ../../Code/Module/Tagrm.php:15 ../../Code/Module/Tagrm.php:138
 #: ../../include/conversation.php:1389 ../../include/conversation.php:1438
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../../Zotlabs/Module/Cdav.php:900
+#: ../../Code/Module/Cdav.php:900
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "Spiacenti! La modifica di eventi ricorrenti non è ancora disponibile."
 
-#: ../../Zotlabs/Module/Cdav.php:1170
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906
-#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558
-#: ../../Zotlabs/Storage/Browser.php:283
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../Code/Module/Cdav.php:1170
+#: ../../Code/Module/Sharedwithme.php:105
+#: ../../Code/Module/Admin/Channels.php:159
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth.php:116
+#: ../../Code/Module/Wiki.php:209 ../../Code/Module/Connedit.php:906
+#: ../../Code/Module/Chat.php:251 ../../Code/Lib/NativeWikiPage.php:558
+#: ../../Code/Storage/Browser.php:283
+#: ../../Code/Widget/Wiki_page_history.php:22
 #: ../../addon/rendezvous/rendezvous.php:172
 msgid "Name"
 msgstr "Nome"
 
-#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907
+#: ../../Code/Module/Cdav.php:1171 ../../Code/Module/Connedit.php:907
 msgid "Organisation"
 msgstr "Organizzazione"
 
-#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Code/Module/Cdav.php:1172 ../../Code/Module/Connedit.php:908
 msgid "Title"
 msgstr "Titolo"
 
-#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
-#: ../../Zotlabs/Module/Profiles.php:786
+#: ../../Code/Module/Cdav.php:1173 ../../Code/Module/Connedit.php:909
+#: ../../Code/Module/Profiles.php:786
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../../Zotlabs/Module/Cdav.php:1174
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Code/Module/Cdav.php:1174
+#: ../../Code/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:183
+#: ../../Code/Module/Connedit.php:910 ../../Code/Module/Profiles.php:787
 #: ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
 #: ../../addon/redred/redred.php:107 ../../include/network.php:1769
 msgid "Email"
 msgstr "Email"
 
-#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
-#: ../../Zotlabs/Module/Profiles.php:788
+#: ../../Code/Module/Cdav.php:1175 ../../Code/Module/Connedit.php:911
+#: ../../Code/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr "Messaggistica istantanea"
 
-#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
-#: ../../Zotlabs/Module/Profiles.php:789
+#: ../../Code/Module/Cdav.php:1176 ../../Code/Module/Connedit.php:912
+#: ../../Code/Module/Profiles.php:789
 msgid "Website"
 msgstr "Sito web"
 
-#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Code/Module/Cdav.php:1177 ../../Code/Module/Locs.php:118
+#: ../../Code/Module/Admin/Channels.php:160
+#: ../../Code/Module/Connedit.php:913 ../../Code/Module/Profiles.php:502
+#: ../../Code/Module/Profiles.php:790
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
-#: ../../Zotlabs/Module/Profiles.php:791
+#: ../../Code/Module/Cdav.php:1178 ../../Code/Module/Connedit.php:914
+#: ../../Code/Module/Profiles.php:791
 msgid "Note"
 msgstr "Nota"
 
-#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
-#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308
+#: ../../Code/Module/Cdav.php:1179 ../../Code/Module/Connedit.php:915
+#: ../../Code/Module/Profiles.php:792 ../../include/event.php:1308
 #: ../../include/connections.php:690
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309
+#: ../../Code/Module/Cdav.php:1180 ../../Code/Module/Connedit.php:916
+#: ../../Code/Module/Profiles.php:793 ../../include/event.php:1309
 #: ../../include/connections.php:691
 msgid "Home"
 msgstr "Bacheca"
 
-#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
-#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312
+#: ../../Code/Module/Cdav.php:1181 ../../Code/Module/Connedit.php:917
+#: ../../Code/Module/Profiles.php:794 ../../include/event.php:1312
 #: ../../include/connections.php:694
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
-#: ../../Zotlabs/Module/Profiles.php:796
+#: ../../Code/Module/Cdav.php:1183 ../../Code/Module/Connedit.php:919
+#: ../../Code/Module/Profiles.php:796
 #: ../../addon/jappixmini/jappixmini.php:368
 msgid "Add Contact"
 msgstr "Aggiungi contatto"
 
-#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Profiles.php:797
+#: ../../Code/Module/Cdav.php:1184 ../../Code/Module/Connedit.php:920
+#: ../../Code/Module/Profiles.php:797
 msgid "Add Field"
 msgstr "Aggiungi campo"
 
-#: ../../Zotlabs/Module/Cdav.php:1186
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Settings/Oauth2.php:39
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth.php:43
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Lib/Apps.php:393
+#: ../../Code/Module/Cdav.php:1186
+#: ../../Code/Module/Admin/Plugins.php:453
+#: ../../Code/Module/Settings/Oauth2.php:39
+#: ../../Code/Module/Settings/Oauth2.php:112
+#: ../../Code/Module/Settings/Oauth.php:43
+#: ../../Code/Module/Settings/Oauth.php:114
+#: ../../Code/Module/Connedit.php:922 ../../Code/Module/Profiles.php:799
+#: ../../Code/Lib/Apps.php:393
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Code/Module/Cdav.php:1189 ../../Code/Module/Connedit.php:925
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Code/Module/Cdav.php:1190 ../../Code/Module/Connedit.php:926
 msgid "Additional"
 msgstr "Aggiuntivo"
 
-#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Code/Module/Cdav.php:1191 ../../Code/Module/Connedit.php:927
 msgid "Street"
 msgstr "Via"
 
-#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Code/Module/Cdav.php:1192 ../../Code/Module/Connedit.php:928
 msgid "Locality"
 msgstr "Località"
 
-#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Code/Module/Cdav.php:1193 ../../Code/Module/Connedit.php:929
 msgid "Region"
 msgstr "Regione"
 
-#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Code/Module/Cdav.php:1194 ../../Code/Module/Connedit.php:930
 msgid "ZIP Code"
 msgstr "CAP"
 
-#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Code/Module/Cdav.php:1195 ../../Code/Module/Connedit.php:931
+#: ../../Code/Module/Profiles.php:757
 msgid "Country"
 msgstr "Nazione"
 
-#: ../../Zotlabs/Module/Cdav.php:1242
+#: ../../Code/Module/Cdav.php:1242
 msgid "Default Calendar"
 msgstr "Calendario predefinito"
 
-#: ../../Zotlabs/Module/Cdav.php:1252
+#: ../../Code/Module/Cdav.php:1252
 msgid "Default Addressbook"
 msgstr "Rubrica predefinita"
 
-#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
+#: ../../Code/Module/Regdir.php:49 ../../Code/Module/Dirsearch.php:25
 msgid "This site is not a directory server"
 msgstr "Questo non è un directory server"
 
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32
-#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508
+#: ../../Code/Module/Channel.php:32 ../../Code/Module/Ochannel.php:32
+#: ../../Code/Module/Chat.php:25 ../../addon/chess/chess.php:508
 msgid "You must be logged in to see this page."
 msgstr "Devi aver effettuato l'accesso per vedere questa pagina."
 
-#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37
-#: ../../Zotlabs/Module/Profile.php:45
+#: ../../Code/Module/Channel.php:47 ../../Code/Module/Hcard.php:37
+#: ../../Code/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr "Post e commenti"
 
-#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44
-#: ../../Zotlabs/Module/Profile.php:52
+#: ../../Code/Module/Channel.php:54 ../../Code/Module/Hcard.php:44
+#: ../../Code/Module/Profile.php:52
 msgid "Only posts"
 msgstr "Solo post"
 
-#: ../../Zotlabs/Module/Channel.php:107
+#: ../../Code/Module/Channel.php:107
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+#: ../../Code/Module/Uexport.php:57 ../../Code/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Esporta il canale"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Code/Module/Uexport.php:59
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr "Esporta le informazioni di base del canale in un file. In pratica è un salvataggio delle tue connessioni, dei permessi che hai assegnato e del tuo profilo che così potrà essere importato su un altro server/hub. Il file non includerà i tuoi post e altri contenuti che hai creato o caricato."
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Code/Module/Uexport.php:60
 msgid "Export Content"
 msgstr "Esporta i contenuti"
 
-#: ../../Zotlabs/Module/Uexport.php:61
+#: ../../Code/Module/Uexport.php:61
 msgid ""
 "Export your channel information and recent content to a JSON backup that can"
 " be restored or imported to another server hub. This backs up all of your "
@@ -877,11 +877,11 @@ msgid ""
 " this download to begin."
 msgstr "Esporta il tuo canale e i contenuti recenti in un file di salvataggio che potrà essere importato su un altro server/hub. Sarà un backup dei tuoi contatti, dei permessi che hai assegnato, dei dati del profilo e dei post degli ultimi mesi. Il file potrebbe essere MOLTO grande. Sarà necessario attendere con pazienza - saranno necessari molti minuti prima che inizi lo scaricamento."
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Code/Module/Uexport.php:63
 msgid "Export your posts from a given year."
 msgstr "Esporta i tuoi post a partire dall'anno scelto."
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Code/Module/Uexport.php:65
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -889,21 +889,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr "Puoi anche esportare post e conversazioni di un particolare anno o mese. Modifica la data nella barra dell'indirizzo del browser per scegliere date differenti. Se l'esportazione dovesse fallire (la memoria sul server potrebbe non bastare), riprova scegliendo un intervallo più breve tra le date."
 
-#: ../../Zotlabs/Module/Uexport.php:66
+#: ../../Code/Module/Uexport.php:66
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr "Per selezionare tutti i post di un anno, come per esempio quello in corso, visita %2$s "
 
-#: ../../Zotlabs/Module/Uexport.php:67
+#: ../../Code/Module/Uexport.php:67
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr "Per selezionare tutti post di un dato mese, come per esempio gennaio di quest'anno, visita %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:68
+#: ../../Code/Module/Uexport.php:68
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting %2$s su qualsiasi sito/hub dove è presente il tuo canale. Per mantenere l'ordinamento originale fai attenzione ad importare i file secondo la data (prima il più vecchio)"
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "Welcome to Hubzilla!"
 msgstr "Benvenuto su Hubzilla!"
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "You have got no unseen posts..."
 msgstr "Non hai post non letti..."
 
-#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
-#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30
-#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Code/Module/Search.php:17 ../../Code/Module/Photos.php:540
+#: ../../Code/Module/Ratings.php:83 ../../Code/Module/Directory.php:63
+#: ../../Code/Module/Directory.php:68 ../../Code/Module/Display.php:30
+#: ../../Code/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Accesso pubblico negato."
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335
-#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../Code/Module/Search.php:44 ../../Code/Module/Connections.php:335
+#: ../../Code/Lib/Apps.php:256 ../../Code/Widget/Sitesearch.php:31
 #: ../../include/text.php:1051 ../../include/text.php:1063
 #: ../../include/acl_selectors.php:118 ../../include/nav.php:179
 msgid "Search"
 msgstr "Cerca"
 
-#: ../../Zotlabs/Module/Search.php:230
+#: ../../Code/Module/Search.php:230
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Elementi taggati con: %s"
 
-#: ../../Zotlabs/Module/Search.php:232
+#: ../../Code/Module/Search.php:232
 #, php-format
 msgid "Search results for: %s"
 msgstr "Risultati ricerca: %s"
 
-#: ../../Zotlabs/Module/Pubstream.php:95
-#: ../../Zotlabs/Widget/Notifications.php:131
+#: ../../Code/Module/Pubstream.php:95
+#: ../../Code/Widget/Notifications.php:131
 msgid "Public Stream"
 msgstr "Flusso pubblico"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+#: ../../Code/Module/Locs.php:25 ../../Code/Module/Locs.php:54
 msgid "Location not found."
 msgstr "Indirizzo non trovato."
 
-#: ../../Zotlabs/Module/Locs.php:62
+#: ../../Code/Module/Locs.php:62
 msgid "Location lookup failed."
 msgstr "La ricerca dell'indirizzo è fallita."
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Code/Module/Locs.php:66
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
 msgstr "Prima di rimuovere il tuo canale primario assicurati di avere scelto una sua copia (clone) come primaria."
 
-#: ../../Zotlabs/Module/Locs.php:95
+#: ../../Code/Module/Locs.php:95
 msgid "Syncing locations"
 msgstr "Sincronizzazione tra hub"
 
-#: ../../Zotlabs/Module/Locs.php:105
+#: ../../Code/Module/Locs.php:105
 msgid "No locations found."
 msgstr "Nessun indirizzo trovato."
 
-#: ../../Zotlabs/Module/Locs.php:116
+#: ../../Code/Module/Locs.php:116
 msgid "Manage Channel Locations"
 msgstr "Modifica gli indirizzi del canale"
 
-#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111
+#: ../../Code/Module/Locs.php:119 ../../Code/Module/Admin.php:111
 msgid "Primary"
 msgstr "Primario"
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+#: ../../Code/Module/Locs.php:120 ../../Code/Module/Menu.php:113
 msgid "Drop"
 msgstr "Elimina"
 
-#: ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Locs.php:122
 msgid "Sync Now"
 msgstr "Sincronizza ora"
 
-#: ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Si raccomanda di attendere alcuni minuti prima di effettuare una nuova sincronizzazione."
 
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Code/Module/Locs.php:124
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
 msgstr "Quando possibile, riduci il numero di cloni del tuo canale effettuando il login sul relativo hub e rimuovendoli."
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Usa questo modulo per abbandonare un canale su un hub che non è più funzionante."
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Cambia l'ordine della app bloccate sulla barra di navigazione"
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of App Tray Apps"
 msgstr "Cambia l'ordine delle app elencate nel menu delle app"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the"
 " navbar"
 msgstr "Utilizza le frecce per spostare l'app a sinistra (su) o destra (giù) nella barra di navigazione"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr "Utilizza le frecce per spostare l'app su o giù nel menu delle app"
 
-#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
+#: ../../Code/Module/Mitem.php:28 ../../Code/Module/Menu.php:144
 msgid "Menu not found."
 msgstr "Menù non trovato."
 
-#: ../../Zotlabs/Module/Mitem.php:52
+#: ../../Code/Module/Mitem.php:52
 msgid "Unable to create element."
 msgstr "Impossibile creare l'elemento."
 
-#: ../../Zotlabs/Module/Mitem.php:76
+#: ../../Code/Module/Mitem.php:76
 msgid "Unable to update menu element."
 msgstr "Non è possibile aggiornare l'elemento del menù."
 
-#: ../../Zotlabs/Module/Mitem.php:92
+#: ../../Code/Module/Mitem.php:92
 msgid "Unable to add menu element."
 msgstr "Impossibile aggiungere l'elemento al menù."
 
-#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166
-#: ../../Zotlabs/Module/Xchan.php:41
+#: ../../Code/Module/Mitem.php:120 ../../Code/Module/Menu.php:166
+#: ../../Code/Module/Xchan.php:41
 msgid "Not found."
 msgstr "Non trovato."
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+#: ../../Code/Module/Mitem.php:153 ../../Code/Module/Mitem.php:230
 msgid "Menu Item Permissions"
 msgstr "Permessi del menu"
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Code/Module/Mitem.php:154 ../../Code/Module/Mitem.php:231
+#: ../../Code/Module/Settings/Channel.php:528
 msgid "(click to open/close)"
 msgstr "(clicca per aprire/chiudere)"
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+#: ../../Code/Module/Mitem.php:160 ../../Code/Module/Mitem.php:176
 msgid "Link Name"
 msgstr "Nome link"
 
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+#: ../../Code/Module/Mitem.php:161 ../../Code/Module/Mitem.php:239
 msgid "Link or Submenu Target"
 msgstr "Azione del link o del sottomenu"
 
-#: ../../Zotlabs/Module/Mitem.php:161
+#: ../../Code/Module/Mitem.php:161
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr "Inserisci l'indirizzo del link o scegli il nome di un sottomenu"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:240
 msgid "Use magic-auth if available"
 msgstr "Usa l'autenticazione tramite il tuo hub, se disponibile"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:259
-#: ../../Zotlabs/Module/Settings/Channel.php:307
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:163
+#: ../../Code/Module/Mitem.php:240 ../../Code/Module/Mitem.php:241
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:259
+#: ../../Code/Module/Settings/Channel.php:307
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Api.php:99 ../../Code/Module/Photos.php:697
+#: ../../Code/Module/Wiki.php:218 ../../Code/Module/Wiki.php:219
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Connedit.php:779
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
+#: ../../Code/Module/Defperms.php:180 ../../Code/Module/Profiles.php:681
+#: ../../Code/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397 ../../boot.php:1594
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1116,21 +1116,21 @@ msgstr "Usa l'autenticazione tramite il tuo hub, se disponibile"
 msgid "No"
 msgstr "No"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:261
-#: ../../Zotlabs/Module/Settings/Channel.php:307
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180
-#: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:163
+#: ../../Code/Module/Mitem.php:240 ../../Code/Module/Mitem.php:241
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:261
+#: ../../Code/Module/Settings/Channel.php:307
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Api.php:98 ../../Code/Module/Photos.php:697
+#: ../../Code/Module/Wiki.php:218 ../../Code/Module/Wiki.php:219
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:157 ../../Code/Module/Defperms.php:180
+#: ../../Code/Module/Profiles.php:681
+#: ../../Code/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397 ../../boot.php:1594
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1168,908 +1168,908 @@ msgstr "No"
 msgid "Yes"
 msgstr "Sì"
 
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Code/Module/Mitem.php:163 ../../Code/Module/Mitem.php:241
 msgid "Open link in new window"
 msgstr "Apri il link in una nuova finestra"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+#: ../../Code/Module/Mitem.php:164 ../../Code/Module/Mitem.php:242
 msgid "Order in list"
 msgstr "Ordine dell'elenco"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+#: ../../Code/Module/Mitem.php:164 ../../Code/Module/Mitem.php:242
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "I numeri più alti andranno in fondo all'elenco"
 
-#: ../../Zotlabs/Module/Mitem.php:165
+#: ../../Code/Module/Mitem.php:165
 msgid "Submit and finish"
 msgstr "Salva e termina"
 
-#: ../../Zotlabs/Module/Mitem.php:166
+#: ../../Code/Module/Mitem.php:166
 msgid "Submit and continue"
 msgstr "Salva e continua"
 
-#: ../../Zotlabs/Module/Mitem.php:174
+#: ../../Code/Module/Mitem.php:174
 msgid "Menu:"
 msgstr "Menu:"
 
-#: ../../Zotlabs/Module/Mitem.php:177
+#: ../../Code/Module/Mitem.php:177
 msgid "Link Target"
 msgstr "Destinazione link"
 
-#: ../../Zotlabs/Module/Mitem.php:180
+#: ../../Code/Module/Mitem.php:180
 msgid "Edit menu"
 msgstr "Modifica il menù"
 
-#: ../../Zotlabs/Module/Mitem.php:183
+#: ../../Code/Module/Mitem.php:183
 msgid "Edit element"
 msgstr "Modifica l'elemento"
 
-#: ../../Zotlabs/Module/Mitem.php:184
+#: ../../Code/Module/Mitem.php:184
 msgid "Drop element"
 msgstr "Elimina l'elemento"
 
-#: ../../Zotlabs/Module/Mitem.php:185
+#: ../../Code/Module/Mitem.php:185
 msgid "New element"
 msgstr "Nuovo elemento"
 
-#: ../../Zotlabs/Module/Mitem.php:186
+#: ../../Code/Module/Mitem.php:186
 msgid "Edit this menu container"
 msgstr "Modifica il contenitore del menù"
 
-#: ../../Zotlabs/Module/Mitem.php:187
+#: ../../Code/Module/Mitem.php:187
 msgid "Add menu element"
 msgstr "Aggiungi un elemento al menù"
 
-#: ../../Zotlabs/Module/Mitem.php:188
+#: ../../Code/Module/Mitem.php:188
 msgid "Delete this menu item"
 msgstr "Elimina questo elemento del menù"
 
-#: ../../Zotlabs/Module/Mitem.php:189
+#: ../../Code/Module/Mitem.php:189
 msgid "Edit this menu item"
 msgstr "Modifica questo elemento del menù"
 
-#: ../../Zotlabs/Module/Mitem.php:206
+#: ../../Code/Module/Mitem.php:206
 msgid "Menu item not found."
 msgstr "L'elemento del menù non è stato trovato."
 
-#: ../../Zotlabs/Module/Mitem.php:219
+#: ../../Code/Module/Mitem.php:219
 msgid "Menu item deleted."
 msgstr "L'elemento del menù è stato eliminato."
 
-#: ../../Zotlabs/Module/Mitem.php:221
+#: ../../Code/Module/Mitem.php:221
 msgid "Menu item could not be deleted."
 msgstr "L'elemento del menù non può essere eliminato."
 
-#: ../../Zotlabs/Module/Mitem.php:228
+#: ../../Code/Module/Mitem.php:228
 msgid "Edit Menu Element"
 msgstr "Modifica l'elemento del menù"
 
-#: ../../Zotlabs/Module/Mitem.php:238
+#: ../../Code/Module/Mitem.php:238
 msgid "Link text"
 msgstr "Testo del link"
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Code/Module/Events.php:25
 msgid "Calendar entries imported."
 msgstr "Le voci del calendario sono state importate."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Code/Module/Events.php:27
 msgid "No calendar entries found."
 msgstr "Non sono state trovate voci del calendario."
 
-#: ../../Zotlabs/Module/Events.php:110
+#: ../../Code/Module/Events.php:110
 msgid "Event can not end before it has started."
 msgstr "Un evento non può terminare prima del suo inizio."
 
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
+#: ../../Code/Module/Events.php:112 ../../Code/Module/Events.php:121
+#: ../../Code/Module/Events.php:143
 msgid "Unable to generate preview."
 msgstr "Impossibile creare un'anteprima."
 
-#: ../../Zotlabs/Module/Events.php:119
+#: ../../Code/Module/Events.php:119
 msgid "Event title and start time are required."
 msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento."
 
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+#: ../../Code/Module/Events.php:141 ../../Code/Module/Events.php:265
 msgid "Event not found."
 msgstr "Evento non trovato."
 
-#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
-#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119
+#: ../../Code/Module/Events.php:260 ../../Code/Module/Tagger.php:73
+#: ../../Code/Module/Like.php:386 ../../include/conversation.php:119
 #: ../../include/text.php:2008 ../../include/event.php:1153
 msgid "event"
 msgstr "l'evento"
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Modifica il titolo dell'evento"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142
-#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:465
+#: ../../Code/Module/Appman.php:141 ../../Code/Module/Appman.php:142
+#: ../../Code/Module/Profiles.php:745 ../../Code/Module/Profiles.php:749
 #: ../../include/datetime.php:211
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Code/Module/Events.php:462
 msgid "Categories (comma-separated list)"
 msgstr "Categorie (separate da virgola)"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Edit Category"
 msgstr "Modifica la categoria"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Category"
 msgstr "Categoria"
 
-#: ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Events.php:466
 msgid "Edit start date and time"
 msgstr "Modifica data/ora di inizio"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+#: ../../Code/Module/Events.php:467 ../../Code/Module/Events.php:470
 msgid "Finish date and time are not known or not relevant"
 msgstr "La data e l'ora di fine non sono necessarie"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Edit finish date and time"
 msgstr "Modifica data/ora di fine"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Finish date and time"
 msgstr "Data e ora di fine"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+#: ../../Code/Module/Events.php:471 ../../Code/Module/Events.php:472
 msgid "Adjust for viewer timezone"
 msgstr "Adatta al fuso orario di chi legge"
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Code/Module/Events.php:471
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Importante per eventi che avvengono online ma con un certo fuso orario."
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../Code/Module/Events.php:473
 msgid "Edit Description"
 msgstr "Modifica la descrizione"
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Code/Module/Events.php:475
 msgid "Edit Location"
 msgstr "Modifica il luogo"
 
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762
+#: ../../Code/Module/Events.php:478 ../../Code/Module/Photos.php:1123
+#: ../../Code/Module/Webpages.php:247 ../../Code/Lib/ThreadItem.php:762
 #: ../../include/conversation.php:1333
 msgid "Preview"
 msgstr "Anteprima"
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405
+#: ../../Code/Module/Events.php:479 ../../include/conversation.php:1405
 msgid "Permission settings"
 msgstr "Permessi dei tuoi contatti"
 
-#: ../../Zotlabs/Module/Events.php:489
+#: ../../Code/Module/Events.php:489
 msgid "Timezone:"
 msgstr "Fuso orario: "
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Code/Module/Events.php:494
 msgid "Advanced Options"
 msgstr "Opzioni avanzate"
 
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266
+#: ../../Code/Module/Events.php:605 ../../Code/Module/Cal.php:266
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../Zotlabs/Module/Events.php:633
+#: ../../Code/Module/Events.php:633
 msgid "Edit event"
 msgstr "Modifica l'evento"
 
-#: ../../Zotlabs/Module/Events.php:635
+#: ../../Code/Module/Events.php:635
 msgid "Delete event"
 msgstr "Elimina l'evento"
 
-#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315
+#: ../../Code/Module/Events.php:660 ../../Code/Module/Cal.php:315
 #: ../../include/text.php:1827
 msgid "Link to Source"
 msgstr "Link al sito d'origine"
 
-#: ../../Zotlabs/Module/Events.php:669
+#: ../../Code/Module/Events.php:669
 msgid "calendar"
 msgstr "calendario"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Edit Event"
 msgstr "Modifica l'evento"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Create Event"
 msgstr "Crea un evento"
 
-#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341
+#: ../../Code/Module/Events.php:691 ../../Code/Module/Cal.php:341
 #: ../../include/channel.php:1647
 msgid "Export"
 msgstr "Esporta"
 
-#: ../../Zotlabs/Module/Events.php:731
+#: ../../Code/Module/Events.php:731
 msgid "Event removed"
 msgstr "Evento eliminato"
 
-#: ../../Zotlabs/Module/Events.php:734
+#: ../../Code/Module/Events.php:734
 msgid "Failed to remove event"
 msgstr "Impossibile eliminare l'evento"
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+#: ../../Code/Module/Appman.php:39 ../../Code/Module/Appman.php:56
 msgid "App installed."
 msgstr "App installata"
 
-#: ../../Zotlabs/Module/Appman.php:49
+#: ../../Code/Module/Appman.php:49
 msgid "Malformed app."
 msgstr "L'app contiene errori"
 
-#: ../../Zotlabs/Module/Appman.php:130
+#: ../../Code/Module/Appman.php:130
 msgid "Embed code"
 msgstr "Inserisci il codice"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Edit App"
 msgstr "Modifica app"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Create App"
 msgstr "Crea una app"
 
-#: ../../Zotlabs/Module/Appman.php:141
+#: ../../Code/Module/Appman.php:141
 msgid "Name of app"
 msgstr "Nome app"
 
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Code/Module/Appman.php:142
 msgid "Location (URL) of app"
 msgstr "Indirizzo (URL) della app"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "Photo icon URL"
 msgstr "URL icona"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixel - facoltativa"
 
-#: ../../Zotlabs/Module/Appman.php:145
+#: ../../Code/Module/Appman.php:145
 msgid "Categories (optional, comma separated list)"
 msgstr "Categorie (facoltative, lista separata da virgole)"
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Code/Module/Appman.php:146
 msgid "Version ID"
 msgstr "ID versione"
 
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Code/Module/Appman.php:147
 msgid "Price of app"
 msgstr "Prezzo app"
 
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Code/Module/Appman.php:148
 msgid "Location (URL) to purchase app"
 msgstr "Indirizzo (URL) per acquistare la app"
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Effettua l'accesso."
 
-#: ../../Zotlabs/Module/Magic.php:72
+#: ../../Code/Module/Magic.php:72
 msgid "Hub not found."
 msgstr "Hub non trovato."
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Tagger.php:69
+#: ../../Code/Module/Like.php:384
 #: ../../addon/redphotos/redphotohelper.php:71
 #: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388
 #: ../../include/conversation.php:116 ../../include/text.php:2005
 msgid "photo"
 msgstr "la foto"
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Like.php:384
 #: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388
 #: ../../include/conversation.php:144 ../../include/text.php:2011
 msgid "status"
 msgstr "messaggio di stato"
 
-#: ../../Zotlabs/Module/Subthread.php:142
+#: ../../Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s sta seguendo %3$s di %2$s"
 
-#: ../../Zotlabs/Module/Subthread.php:144
+#: ../../Code/Module/Subthread.php:144
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s non segue più %3$s di %2$s"
 
-#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75
-#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41
-#: ../../Zotlabs/Module/Card_edit.php:44
+#: ../../Code/Module/Article_edit.php:44 ../../Code/Module/Cal.php:62
+#: ../../Code/Module/Chanview.php:96 ../../Code/Module/Page.php:75
+#: ../../Code/Module/Wall_upload.php:31 ../../Code/Module/Block.php:41
+#: ../../Code/Module/Card_edit.php:44
 msgid "Channel not found."
 msgstr "Canale non trovato."
 
-#: ../../Zotlabs/Module/Article_edit.php:101
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
-#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Code/Module/Article_edit.php:101
+#: ../../Code/Module/Editblock.php:116 ../../Code/Module/Chat.php:207
+#: ../../Code/Module/Editwebpage.php:143 ../../Code/Module/Mail.php:288
+#: ../../Code/Module/Mail.php:430 ../../Code/Module/Card_edit.php:101
 #: ../../include/conversation.php:1278
 msgid "Insert web link"
 msgstr "Inserisci un indirizzo web"
 
-#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698
-#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117
+#: ../../Code/Module/Article_edit.php:117
+#: ../../Code/Module/Editblock.php:129 ../../Code/Module/Photos.php:698
+#: ../../Code/Module/Photos.php:1068 ../../Code/Module/Card_edit.php:117
 #: ../../include/conversation.php:1401
 msgid "Title (optional)"
 msgstr "Titolo (facoltativo)"
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Code/Module/Article_edit.php:128
 msgid "Edit Article"
 msgstr "Modifica l'articolo"
 
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64
+#: ../../Code/Module/Import_items.php:48 ../../Code/Module/Import.php:64
 msgid "Nothing to import."
 msgstr "Non c'è niente da importare."
 
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79
-#: ../../Zotlabs/Module/Import.php:95
+#: ../../Code/Module/Import_items.php:72 ../../Code/Module/Import.php:79
+#: ../../Code/Module/Import.php:95
 msgid "Unable to download data from old server"
 msgstr "Impossibile importare i dati dal vecchio hub"
 
-#: ../../Zotlabs/Module/Import_items.php:77
-#: ../../Zotlabs/Module/Import.php:102
+#: ../../Code/Module/Import_items.php:77
+#: ../../Code/Module/Import.php:102
 msgid "Imported file is empty."
 msgstr "Il file da importare è vuoto."
 
-#: ../../Zotlabs/Module/Import_items.php:93
+#: ../../Code/Module/Import_items.php:93
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Attenzione: le versioni di database differiscono di %1$d aggiornamenti."
 
-#: ../../Zotlabs/Module/Import_items.php:108
+#: ../../Code/Module/Import_items.php:108
 msgid "Import completed"
 msgstr "Importazione completata"
 
-#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Code/Module/Import_items.php:125
 msgid "Import Items"
 msgstr "Importa i contenuti"
 
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Code/Module/Import_items.php:126
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Usa questa funzionalità per importare i vecchi contenuti e i post da un file esportato in precedenza."
 
-#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:517
+#: ../../Code/Module/Import_items.php:127
+#: ../../Code/Module/Import.php:517
 msgid "File to Upload"
 msgstr "File da caricare"
 
-#: ../../Zotlabs/Module/New_channel.php:133
-#: ../../Zotlabs/Module/Manage.php:138
+#: ../../Code/Module/New_channel.php:133
+#: ../../Code/Module/Manage.php:138
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Hai creato %1$.0f dei %2$.0f canali permessi."
 
-#: ../../Zotlabs/Module/New_channel.php:146
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/New_channel.php:146
+#: ../../Code/Module/Register.php:254
 msgid "Name or caption"
 msgstr "Nome o titolo"
 
-#: ../../Zotlabs/Module/New_channel.php:146
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/New_channel.php:146
+#: ../../Code/Module/Register.php:254
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
 msgstr "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\""
 
-#: ../../Zotlabs/Module/New_channel.php:148
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Code/Module/New_channel.php:148
+#: ../../Code/Module/Register.php:256
 msgid "Choose a short nickname"
 msgstr "Scegli un nome breve"
 
-#: ../../Zotlabs/Module/New_channel.php:148
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Code/Module/New_channel.php:148
+#: ../../Code/Module/Register.php:256
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
 "e.g. nickname%s"
 msgstr "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale, per esempio nickname%s"
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Register.php:257
 msgid "Channel role and privacy"
 msgstr "Tipo di canale e privacy"
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Register.php:257
 msgid "Select a channel role with your privacy requirements."
 msgstr "Scegli il tipo di canale che vuoi e la privacy da applicare."
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Register.php:257
 msgid "Read more about roles"
 msgstr "Maggiori informazioni sui ruoli"
 
-#: ../../Zotlabs/Module/New_channel.php:152
+#: ../../Code/Module/New_channel.php:152
 msgid "Create Channel"
 msgstr "Crea un canale"
 
-#: ../../Zotlabs/Module/New_channel.php:153
+#: ../../Code/Module/New_channel.php:153
 msgid ""
 "A channel is your identity on this network. It can represent a person, a "
 "blog, or a forum to name a few. Channels can make connections with other "
 "channels to share information with highly detailed permissions."
 msgstr "Un canale è la tua identità su questa rete. Può rappresentare una persona, un blog o un forum, per esempio. Il tuo canale può essere in contatto con altri canali per condividere contenuti con permessi anche molto dettagliati."
 
-#: ../../Zotlabs/Module/New_channel.php:154
+#: ../../Code/Module/New_channel.php:154
 msgid ""
 "or import an existing channel from another location."
 msgstr "oppure importa un canale esistente da un altro server/hub."
 
-#: ../../Zotlabs/Module/New_channel.php:159
+#: ../../Code/Module/New_channel.php:159
 msgid "Validate"
 msgstr "Validazione"
 
-#: ../../Zotlabs/Module/Removeme.php:35
+#: ../../Code/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Non è possibile eliminare un canale prima di 48 ore dall'ultimo cambio password."
 
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Code/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Elimina questo canale"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
+#: ../../Code/Module/Changeaddr.php:78
 msgid "WARNING: "
 msgstr "ATTENZIONE:"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Questo canale sarà completamente eliminato dalla rete."
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
 msgid "This action is permanent and can not be undone!"
 msgstr "Questo comando è definitivo e non può essere annullato!"
 
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Changeaddr.php:79
+#: ../../Code/Module/Removeme.php:62
+#: ../../Code/Module/Removeaccount.php:59
+#: ../../Code/Module/Changeaddr.php:79
 msgid "Please enter your password for verification:"
 msgstr "Inserisci la tua password per verifica:"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Elimina questo canale e tutti i suoi cloni dalla rete"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Code/Module/Removeme.php:64
+#: ../../Code/Module/Settings/Channel.php:600
 msgid "Remove Channel"
 msgstr "Elimina questo canale"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Code/Module/Sharedwithme.php:104
 msgid "Files: shared with me"
 msgstr "File: condivisi con me"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Code/Module/Sharedwithme.php:106
 msgid "NEW"
 msgstr "NOVITÀ"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434
+#: ../../Code/Module/Sharedwithme.php:107
+#: ../../Code/Storage/Browser.php:285 ../../include/text.php:1434
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:286
+#: ../../Code/Module/Sharedwithme.php:108
+#: ../../Code/Storage/Browser.php:286
 msgid "Last Modified"
 msgstr "Ultima modifica"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Code/Module/Sharedwithme.php:109
 msgid "Remove all files"
 msgstr "Elimina tutti i file"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
+#: ../../Code/Module/Sharedwithme.php:110
 msgid "Remove this file"
 msgstr "Elimina questo file"
 
-#: ../../Zotlabs/Module/Setup.php:170
+#: ../../Code/Module/Setup.php:170
 msgid "$Projectname Server - Setup"
 msgstr "Server $Projectname - Installazione"
 
-#: ../../Zotlabs/Module/Setup.php:174
+#: ../../Code/Module/Setup.php:174
 msgid "Could not connect to database."
 msgstr " Impossibile connettersi al database."
 
-#: ../../Zotlabs/Module/Setup.php:178
+#: ../../Code/Module/Setup.php:178
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Non è possibile raggiungere l'indirizzo del sito specificato. Potrebbe essere un problema di SSL o DNS."
 
-#: ../../Zotlabs/Module/Setup.php:185
+#: ../../Code/Module/Setup.php:185
 msgid "Could not create table."
 msgstr "Impossibile creare le tabelle."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Code/Module/Setup.php:191
 msgid "Your site database has been installed."
 msgstr "Il database del sito è stato installato."
 
-#: ../../Zotlabs/Module/Setup.php:197
+#: ../../Code/Module/Setup.php:197
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Potresti dover importare il file 'install/schema_xxx.sql' manualmente usando un client per collegarti al db."
 
-#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:749
+#: ../../Code/Module/Setup.php:198 ../../Code/Module/Setup.php:262
+#: ../../Code/Module/Setup.php:749
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Leggi il file 'install/INSTALL.txt'."
 
-#: ../../Zotlabs/Module/Setup.php:259
+#: ../../Code/Module/Setup.php:259
 msgid "System check"
 msgstr "Verifica del sistema"
 
-#: ../../Zotlabs/Module/Setup.php:264
+#: ../../Code/Module/Setup.php:264
 msgid "Check again"
 msgstr "Verifica di nuovo"
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Code/Module/Setup.php:286
 msgid "Database connection"
 msgstr "Connessione al database"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Code/Module/Setup.php:287
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Per poter installare $Projectname è necessario fornire i parametri di connessione al tuo database."
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Code/Module/Setup.php:288
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Code/Module/Setup.php:289
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Il database deve già esistere. Se non esiste, crealo prima di continuare."
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Database Server Name"
 msgstr "Server del database"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Default is 127.0.0.1"
 msgstr "Il valore predefinito è 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Database Port"
 msgstr "Port del database"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Communication port number - use 0 for default"
 msgstr "Scrivi 0 per usare il valore standard"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Code/Module/Setup.php:295
 msgid "Database Login Name"
 msgstr "Utente database"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Code/Module/Setup.php:296
 msgid "Database Login Password"
 msgstr "Password database"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Database Name"
 msgstr "Nome database"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Database Type"
 msgstr "Tipo database"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid "Site administrator email address"
 msgstr "Indirizzo email dell'amministratore del hub"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Il tuo indirizzo email deve corrispondere a questo per poter usare il pannello di amministrazione di Hubzilla."
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Website URL"
 msgstr "URL completo del sito"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Please use SSL (https) URL if available."
 msgstr "Se disponibile, usa l'indirizzo SSL (https)."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
+#: ../../Code/Module/Setup.php:302 ../../Code/Module/Setup.php:345
 msgid "Please select a default timezone for your website"
 msgstr "Seleziona il fuso orario predefinito per il tuo hub"
 
-#: ../../Zotlabs/Module/Setup.php:330
+#: ../../Code/Module/Setup.php:330
 msgid "Site settings"
 msgstr "Impostazioni del hub"
 
-#: ../../Zotlabs/Module/Setup.php:384
+#: ../../Code/Module/Setup.php:384
 msgid "PHP version 5.5 or greater is required."
 msgstr "E' necessario PHP versione 5.5 o superiore."
 
-#: ../../Zotlabs/Module/Setup.php:385
+#: ../../Code/Module/Setup.php:385
 msgid "PHP version"
 msgstr "Versione PHP"
 
-#: ../../Zotlabs/Module/Setup.php:401
+#: ../../Code/Module/Setup.php:401
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Non è possibile trovare la versione di PHP da riga di comando nel PATH del server web"
 
-#: ../../Zotlabs/Module/Setup.php:402
+#: ../../Code/Module/Setup.php:402
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Se non hai installata la versione di PHP da riga di comando non potrai attivare il polling in background tramite cron."
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid "PHP executable path"
 msgstr "Path del comando PHP"
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Inserisci il percorso dell'eseguibile PHP. Puoi lasciarlo vuoto per continuare l'installazione."
 
-#: ../../Zotlabs/Module/Setup.php:411
+#: ../../Code/Module/Setup.php:411
 msgid "Command line PHP"
 msgstr "PHP da riga di comando"
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Code/Module/Setup.php:421
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "Non è possible accedere alla linea di comando PHP perché shell_exec() è disabilitato. Requisito necessario."
 
-#: ../../Zotlabs/Module/Setup.php:424
+#: ../../Code/Module/Setup.php:424
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "La versione da riga di comando di PHP nel sistema non ha abilitato \"register_argc_argv\"."
 
-#: ../../Zotlabs/Module/Setup.php:425
+#: ../../Code/Module/Setup.php:425
 msgid "This is required for message delivery to work."
 msgstr "E' necessario perché funzioni la consegna dei messaggi."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Code/Module/Setup.php:428
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Code/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "La dimensione massima di un caricamento è impostata a %s. Il singolo file non può superare %s. Ti è permesso caricare max %d file per volta."
 
-#: ../../Zotlabs/Module/Setup.php:451
+#: ../../Code/Module/Setup.php:451
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Puoi modificare queste impostazione nel file php.ini del server."
 
-#: ../../Zotlabs/Module/Setup.php:453
+#: ../../Code/Module/Setup.php:453
 msgid "PHP upload limits"
 msgstr "Limiti PHP in upload"
 
-#: ../../Zotlabs/Module/Setup.php:476
+#: ../../Code/Module/Setup.php:476
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Errore: la funzione \"openssl_pkey_new\" su questo sistema non è in grado di generare le chiavi di cifratura"
 
-#: ../../Zotlabs/Module/Setup.php:477
+#: ../../Code/Module/Setup.php:477
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Se stai usando un server windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:480
+#: ../../Code/Module/Setup.php:480
 msgid "Generate encryption keys"
 msgstr "Genera chiavi di cifratura"
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Code/Module/Setup.php:497
 msgid "libCurl PHP module"
 msgstr "modulo PHP libCurl"
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Code/Module/Setup.php:498
 msgid "GD graphics PHP module"
 msgstr "modulo PHP GD graphics"
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Code/Module/Setup.php:499
 msgid "OpenSSL PHP module"
 msgstr "modulo PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Code/Module/Setup.php:500
 msgid "PDO database PHP module"
 msgstr "PDO database PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Code/Module/Setup.php:501
 msgid "mb_string PHP module"
 msgstr "modulo PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Code/Module/Setup.php:502
 msgid "xml PHP module"
 msgstr "modulo xml PHP"
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Code/Module/Setup.php:503
 msgid "zip PHP module"
 msgstr "modulo zip del PHP"
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+#: ../../Code/Module/Setup.php:507 ../../Code/Module/Setup.php:509
 msgid "Apache mod_rewrite module"
 msgstr "modulo Apache mod_rewrite"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Code/Module/Setup.php:507
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Errore: il modulo mod-rewrite di Apache è richiesto ma non installato"
 
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+#: ../../Code/Module/Setup.php:513 ../../Code/Module/Setup.php:516
 msgid "exec"
 msgstr "exec"
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Code/Module/Setup.php:513
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Errore: exec è richiesto ma non è installato o è stato disabilitato nel php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+#: ../../Code/Module/Setup.php:519 ../../Code/Module/Setup.php:522
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Code/Module/Setup.php:519
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Errore: shell_exec è richiesto ma non è installato o è stato disabilitato in php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Code/Module/Setup.php:527
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Errore: il modulo libCURL di PHP è richiesto ma non installato."
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Code/Module/Setup.php:531
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non installato."
 
-#: ../../Zotlabs/Module/Setup.php:535
+#: ../../Code/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Errore: il modulo openssl di PHP è richiesto ma non installato."
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Code/Module/Setup.php:539
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Errore: PDO database PHP module è richiesto ma non installato."
 
-#: ../../Zotlabs/Module/Setup.php:543
+#: ../../Code/Module/Setup.php:543
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Errore: il modulo PHP mb_string è richiesto ma non installato."
 
-#: ../../Zotlabs/Module/Setup.php:547
+#: ../../Code/Module/Setup.php:547
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Errore: il modulo xml PHP è richiesto per DAV ma non è installato."
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Code/Module/Setup.php:551
 msgid "Error: zip PHP module required but not installed."
 msgstr "Errore: il modulo zip del PHP necessario ma non installato."
 
-#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579
+#: ../../Code/Module/Setup.php:570 ../../Code/Module/Setup.php:579
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php è scrivibile"
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Code/Module/Setup.php:575
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella di Hubzilla ma non è in grado di farlo."
 
-#: ../../Zotlabs/Module/Setup.php:576
+#: ../../Code/Module/Setup.php:576
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Spesso ciò è dovuto ai permessi di accesso al disco: il web server potrebbe non aver diritto di scrivere il file nella cartella, anche se tu puoi."
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Code/Module/Setup.php:577
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Leggi il file 'install/INSTALL.txt' per maggiori informazioni."
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Code/Module/Setup.php:593
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Questo software usa lo Smarty3 template engine per visualizzare le web views. Smarty3 compila i template in PHP per accelerarne la visualizzazione."
 
-#: ../../Zotlabs/Module/Setup.php:594
+#: ../../Code/Module/Setup.php:594
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Per poter memorizzare questi template, il server web deve avere i diritti di scrittura sulla directory %s"
 
-#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616
+#: ../../Code/Module/Setup.php:595 ../../Code/Module/Setup.php:616
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Assicurati che il tuo web server sia in esecuzione con un utente che ha diritto di scrittura su quella cartella (ad esempio www-data)."
 
-#: ../../Zotlabs/Module/Setup.php:596
+#: ../../Code/Module/Setup.php:596
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Nota bene: come precauzione, dovresti dare i diritti di scrittura solamente su %s e non sui file template (.tpl) che contiene."
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Code/Module/Setup.php:599
 #, php-format
 msgid "%s is writable"
 msgstr "%s è scrivibile"
 
-#: ../../Zotlabs/Module/Setup.php:615
+#: ../../Code/Module/Setup.php:615
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
 " web folder"
 msgstr "Questo software salva i file caricati nelle directory sul filesystem. Il server web necessita di permessi di scrittura sulle directory alla radice della cartella web"
 
-#: ../../Zotlabs/Module/Setup.php:619
+#: ../../Code/Module/Setup.php:619
 msgid "store is writable"
 msgstr "l'archivio è scrivibile"
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Code/Module/Setup.php:651
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "Il certificato SSL non può essere validato. Correggi l'errore o disabilita l'accesso https al sito."
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Code/Module/Setup.php:652
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Se abiliti https per il tuo sito o permetti connessioni TCP su port 443 (quella di https), DEVI usare un certificato riconosciuto dai browser internet. NON DEVI usare certificati self-signed generati da te!"
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Code/Module/Setup.php:653
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Questa restrizione è necessaria perché i tuoi post pubblici potrebbero contenere riferimenti a immagini sul tuo server."
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Code/Module/Setup.php:654
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Se il tuo certificato non è riconosciuto, gli utenti che ti seguono da altri siti (che avranno certificati validi) riceveranno gravi avvisi di sicurezza dal browser."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Code/Module/Setup.php:655
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Ciò può creare seri problemi di usabilità (non solo sul tuo sito), quindi dobbiamo insistere su questo punto."
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Code/Module/Setup.php:656
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Eventualmente, considera che esistono provider che rilasciano certificati gratuiti riconosciuti dai browser."
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Code/Module/Setup.php:658
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -2077,1341 +2077,1341 @@ msgid ""
 "server communications."
 msgstr "Se credi che il certificato sia valido e firmato da una authority, verifica se hai sbagliato a installare i certificati intermedi. Normalmente non sono richiesti dai browser, ma sono necessari per la comunicazione server-to-server."
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Code/Module/Setup.php:660
 msgid "SSL certificate validation"
 msgstr "Validazione del certificato SSL"
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Code/Module/Setup.php:666
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "In .htaccess la funzionalità url rewrite non funziona. Controlla la configurazione del server. Test:"
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Code/Module/Setup.php:669
 msgid "Url rewrite is working"
 msgstr "Url rewrite funziona correttamente"
 
-#: ../../Zotlabs/Module/Setup.php:683
+#: ../../Code/Module/Setup.php:683
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "Il file di configurazione del database \".htconfig.php\" non puo' essere scritto. Usa il testo qui di seguito per creare questo file di configurazione nella cartella principale del tuo sito."
 
-#: ../../Zotlabs/Module/Setup.php:707
+#: ../../Code/Module/Setup.php:707
 #: ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr "La creazione delle tabelle del database ha generato errori."
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Code/Module/Setup.php:747
 msgid "
              What next?
              "
 msgstr "
              E ora?
              "
 
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Code/Module/Setup.php:748
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "IMPORTANTE: Devi creare [manualmente] la pianificazione del polling."
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Code/Module/Connect.php:61 ../../Code/Module/Connect.php:109
 msgid "Continue"
 msgstr "Continua"
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Code/Module/Connect.php:90
 msgid "Premium Channel Setup"
 msgstr "Canale premium - configurazione"
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Code/Module/Connect.php:92
 msgid "Enable premium channel connection restrictions"
 msgstr "Abilita le restrizioni del canale premium"
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Code/Module/Connect.php:93
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr "Scrivi le condizioni d'uso e le restrizioni di questo canale, come per esempio le linee guida, il sistema di pagamento, ecc."
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Code/Module/Connect.php:95 ../../Code/Module/Connect.php:115
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr "Prima di connetterti a questo canale è necessario che tu accetti le seguenti condizioni:"
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Code/Module/Connect.php:96
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr "Il testo seguente comparirà a chi vorrà seguire il canale:"
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Code/Module/Connect.php:97 ../../Code/Module/Connect.php:118
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided"
 " on this page."
 msgstr "Continuando dichiaro di aver seguito tutte le indicazioni e le istruzioni fornite in questa pagina."
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr "(Il gestore del canale non ha fornito istruzioni specifiche)"
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Code/Module/Connect.php:114
 msgid "Restricted or Premium Channel"
 msgstr "Canale premium - con restrizioni"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
+#: ../../Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr "Statistiche della coda"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
+#: ../../Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr "Totale"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
+#: ../../Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr "Priorità"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
+#: ../../Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr "URL di destinazione"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
+#: ../../Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr "Questo hub è definitivamente offline"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
+#: ../../Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr "Svuota la coda per questo hub"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
+#: ../../Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr "Ultimo scambio dati"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "Off"
 msgstr "Off"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "On"
 msgstr "On"
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Admin/Features.php:56
 #, php-format
 msgid "Lock feature %s"
 msgstr "Rendi non modificabile %s"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
+#: ../../Code/Module/Admin/Features.php:64
 msgid "Manage Additional Features"
 msgstr "Funzionalità opzionali"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Code/Module/Admin/Dbsync.php:19
 msgid "Update has been marked successful"
 msgstr "L'aggiornamento è stato marcato come eseguito."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:31
+#: ../../Code/Module/Admin/Dbsync.php:31
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Fallita l'esecuzione di %s. Maggiori informazioni sui log di sistema."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:34
+#: ../../Code/Module/Admin/Dbsync.php:34
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "L'aggiornamento %s è terminato correttamente."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:38
+#: ../../Code/Module/Admin/Dbsync.php:38
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "L'aggiornamento %s non ha dato risposta. Impossibile determinare se è terminato correttamente."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:41
+#: ../../Code/Module/Admin/Dbsync.php:41
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Impossibile trovare la funzione di aggiornamento %s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Code/Module/Admin/Dbsync.php:59
 msgid "Failed Updates"
 msgstr "Aggiornamenti falliti."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+#: ../../Code/Module/Admin/Dbsync.php:61
 msgid "Mark success (if update was manually applied)"
 msgstr "Marca come eseguito (se applicato manualmente)."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+#: ../../Code/Module/Admin/Dbsync.php:62
 msgid "Attempt to execute this update step automatically"
 msgstr "Tenta di eseguire in automatico questo passaggio dell'aggiornamento."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:67
+#: ../../Code/Module/Admin/Dbsync.php:67
 msgid "No failed updates."
 msgstr "Nessun aggiornamento fallito."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:259
-#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:453
-#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
+#: ../../Code/Module/Admin/Plugins.php:259
+#: ../../Code/Module/Admin/Themes.php:72 ../../Code/Module/Thing.php:94
+#: ../../Code/Module/Viewsrc.php:25 ../../Code/Module/Display.php:46
+#: ../../Code/Module/Display.php:453
+#: ../../Code/Module/Filestorage.php:24 ../../Code/Module/Admin.php:62
 #: ../../include/items.php:3619
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#: ../../Code/Module/Admin/Plugins.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s non attivo."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:294
+#: ../../Code/Module/Admin/Plugins.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s attivo."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Code/Module/Admin/Plugins.php:310
+#: ../../Code/Module/Admin/Themes.php:95
 msgid "Disable"
 msgstr "Disattiva"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Code/Module/Admin/Plugins.php:313
+#: ../../Code/Module/Admin/Themes.php:97
 msgid "Enable"
 msgstr "Attiva"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:341
-#: ../../Zotlabs/Module/Admin/Plugins.php:436
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:294
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin.php:136
+#: ../../Code/Module/Admin/Plugins.php:341
+#: ../../Code/Module/Admin/Plugins.php:436
+#: ../../Code/Module/Admin/Accounts.php:166
+#: ../../Code/Module/Admin/Logs.php:82
+#: ../../Code/Module/Admin/Channels.php:145
+#: ../../Code/Module/Admin/Themes.php:122
+#: ../../Code/Module/Admin/Themes.php:156
+#: ../../Code/Module/Admin/Site.php:294
+#: ../../Code/Module/Admin/Security.php:86
+#: ../../Code/Module/Admin.php:136
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:342
-#: ../../Zotlabs/Module/Admin/Plugins.php:437
-#: ../../Zotlabs/Widget/Admin.php:27
+#: ../../Code/Module/Admin/Plugins.php:342
+#: ../../Code/Module/Admin/Plugins.php:437
+#: ../../Code/Widget/Admin.php:27
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Code/Module/Admin/Plugins.php:343
+#: ../../Code/Module/Admin/Themes.php:124
 msgid "Toggle"
 msgstr "Attiva/disattiva"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242
-#: ../../Zotlabs/Widget/Newmember.php:46
-#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105
+#: ../../Code/Module/Admin/Plugins.php:344
+#: ../../Code/Module/Admin/Themes.php:125 ../../Code/Lib/Apps.php:242
+#: ../../Code/Widget/Newmember.php:46
+#: ../../Code/Widget/Settings_menu.php:141 ../../include/nav.php:105
 #: ../../include/nav.php:192
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Code/Module/Admin/Plugins.php:351
+#: ../../Code/Module/Admin/Themes.php:134
 msgid "Author: "
 msgstr "Autore:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Code/Module/Admin/Plugins.php:352
+#: ../../Code/Module/Admin/Themes.php:135
 msgid "Maintainer: "
 msgstr "Gestore:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
+#: ../../Code/Module/Admin/Plugins.php:353
 msgid "Minimum project version: "
 msgstr "Minima versione hubzilla"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:354
+#: ../../Code/Module/Admin/Plugins.php:354
 msgid "Maximum project version: "
 msgstr "Massima versione hubzilla"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:355
+#: ../../Code/Module/Admin/Plugins.php:355
 msgid "Minimum PHP version: "
 msgstr "Minima versione PHP:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:356
+#: ../../Code/Module/Admin/Plugins.php:356
 msgid "Compatible Server Roles: "
 msgstr "Ruoli previsti per questo server"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:357
+#: ../../Code/Module/Admin/Plugins.php:357
 msgid "Requires: "
 msgstr "Necessita di:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:358
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
+#: ../../Code/Module/Admin/Plugins.php:358
+#: ../../Code/Module/Admin/Plugins.php:442
 msgid "Disabled - version incompatibility"
 msgstr "Disabilitato - incompatibilità di versione"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:411
+#: ../../Code/Module/Admin/Plugins.php:411
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr "Inserisci lo URL del repository git dei plugin."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
+#: ../../Code/Module/Admin/Plugins.php:412
 msgid "Plugin repo git URL"
 msgstr "URL git del repository del plugin"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
+#: ../../Code/Module/Admin/Plugins.php:413
 msgid "Custom repo name"
 msgstr "Nome repository personalizzato"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
+#: ../../Code/Module/Admin/Plugins.php:413
 msgid "(optional)"
 msgstr "(facoltativo)"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
+#: ../../Code/Module/Admin/Plugins.php:414
 msgid "Download Plugin Repo"
 msgstr "Scarica il repository del plugin"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:421
+#: ../../Code/Module/Admin/Plugins.php:421
 msgid "Install new repo"
 msgstr "Installa un nuovo repository"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393
+#: ../../Code/Module/Admin/Plugins.php:422 ../../Code/Lib/Apps.php:393
 msgid "Install"
 msgstr "Installa"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
+#: ../../Code/Module/Admin/Plugins.php:445
 msgid "Manage Repos"
 msgstr "Gestisci i repository"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:446
+#: ../../Code/Module/Admin/Plugins.php:446
 msgid "Installed Plugin Repositories"
 msgstr "Repository per i plugin installati"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:447
+#: ../../Code/Module/Admin/Plugins.php:447
 msgid "Install a New Plugin Repository"
 msgstr "Installa un nuovo repository per i plugin"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:454
+#: ../../Code/Module/Admin/Plugins.php:454
 msgid "Switch branch"
 msgstr "Cambia branch"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Code/Module/Admin/Plugins.php:455
+#: ../../Code/Module/Photos.php:1020 ../../Code/Module/Tagrm.php:137
 #: ../../addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:37
+#: ../../Code/Module/Admin/Accounts.php:37
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "Modificato il blocco su %s account"
 msgstr[1] "Modificato il blocco verso %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:44
+#: ../../Code/Module/Admin/Accounts.php:44
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s account eliminato"
 msgstr[1] "%s account eliminati"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:80
+#: ../../Code/Module/Admin/Accounts.php:80
 msgid "Account not found"
 msgstr "Account non trovato"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473
+#: ../../Code/Module/Admin/Accounts.php:91 ../../include/channel.php:2473
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Account '%s' eliminato"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:99
+#: ../../Code/Module/Admin/Accounts.php:99
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Aggiunto un blocco verso '%s'"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:107
+#: ../../Code/Module/Admin/Accounts.php:107
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Rimosso il blocco verso '%s'"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
-#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
+#: ../../Code/Module/Admin/Accounts.php:167
+#: ../../Code/Module/Admin/Accounts.php:180
+#: ../../Code/Module/Admin.php:96 ../../Code/Widget/Admin.php:23
 msgid "Accounts"
 msgstr "Account"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Channels.php:148
+#: ../../Code/Module/Admin/Accounts.php:169
+#: ../../Code/Module/Admin/Channels.php:148
 msgid "select all"
 msgstr "seleziona tutti"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Code/Module/Admin/Accounts.php:170
 msgid "Registrations waiting for confirm"
 msgstr "Registrazioni in attesa di conferma"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:171
 msgid "Request date"
 msgstr "Data richiesta"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Code/Module/Admin/Accounts.php:172
 msgid "No registrations."
 msgstr "Nessuna registrazione."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
-#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732
+#: ../../Code/Module/Admin/Accounts.php:173
+#: ../../Code/Module/Connections.php:303 ../../include/conversation.php:732
 msgid "Approve"
 msgstr "Approva"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Authorize.php:26
+#: ../../Code/Module/Admin/Accounts.php:174
+#: ../../Code/Module/Authorize.php:26
 msgid "Deny"
 msgstr "Nega"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:176
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:176
+#: ../../Code/Module/Connedit.php:622
 msgid "Block"
 msgstr "Blocca"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:177
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:177
+#: ../../Code/Module/Connedit.php:622
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182
+#: ../../Code/Module/Admin/Accounts.php:182
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284
+#: ../../Code/Module/Admin/Accounts.php:184 ../../include/group.php:284
 msgid "All Channels"
 msgstr "Tutti i canali"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Code/Module/Admin/Accounts.php:185
 msgid "Register date"
 msgstr "Data registrazione"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Code/Module/Admin/Accounts.php:186
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:187
+#: ../../Code/Module/Admin/Accounts.php:187
 msgid "Expires"
 msgstr "Con scadenza"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Code/Module/Admin/Accounts.php:188
 msgid "Service Class"
 msgstr "Classe dell'account"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:190
+#: ../../Code/Module/Admin/Accounts.php:190
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Gli account selezionati saranno eliminati!\\n\\nTutto ciò che hanno caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:191
+#: ../../Code/Module/Admin/Accounts.php:191
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "L'account {0} sarà eliminato!\\n\\nTutto ciò che ha caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
+#: ../../Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "Impostazioni di log aggiornate."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
-#: ../../Zotlabs/Widget/Admin.php:58
+#: ../../Code/Module/Admin/Logs.php:83 ../../Code/Widget/Admin.php:48
+#: ../../Code/Widget/Admin.php:58
 msgid "Logs"
 msgstr "Log"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
+#: ../../Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
+#: ../../Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "File di log"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr "Relativo alla directory base del server web. Deve essere scrivibile."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
+#: ../../Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Livello di log"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
+#: ../../Code/Module/Admin/Channels.php:31
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "Censura modificata per %s canale"
 msgstr[1] "Censura modificata per %s canali"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
+#: ../../Code/Module/Admin/Channels.php:40
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s canale permette/non permette codice nei contenuti"
 msgstr[1] "%s canali permettono/non permettono codice nei contenuti"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
+#: ../../Code/Module/Admin/Channels.php:46
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canale è stato rimosso"
 msgstr[1] "%s canali sono stati rimossi"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
+#: ../../Code/Module/Admin/Channels.php:65
 msgid "Channel not found"
 msgstr "Canale non trovato"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
+#: ../../Code/Module/Admin/Channels.php:75
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Il canale '%s' è stato rimosso"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Applicata una censura al canale '%s'"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Rimossa la censura dal canale '%s'"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Il canale '%s' permette codice nei contenuti"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Il canale '%s' non permette codice nei contenuti"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24
+#: ../../Code/Module/Admin/Channels.php:146
+#: ../../Code/Module/Admin.php:110 ../../Code/Widget/Admin.php:24
 msgid "Channels"
 msgstr "Canali"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Code/Module/Admin/Channels.php:150
 msgid "Censor"
 msgstr "Applica censura"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Code/Module/Admin/Channels.php:151
 msgid "Uncensor"
 msgstr "Rimuovi censura"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
+#: ../../Code/Module/Admin/Channels.php:152
 msgid "Allow Code"
 msgstr "Permetti codice"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
+#: ../../Code/Module/Admin/Channels.php:153
 msgid "Disallow Code"
 msgstr "Non permettere codice"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../Code/Module/Admin/Channels.php:154
 #: ../../include/conversation.php:1811 ../../include/nav.php:378
 msgid "Channel"
 msgstr "Canale"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
+#: ../../Code/Module/Admin/Channels.php:158
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
+#: ../../Code/Module/Admin/Channels.php:162
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "I canali selezionati saranno rimossi!\\n\\nTutto ciò che è stato pubblicato su questo server tramite questi canali sarà irreversibilmente eliminato!\\n\\nVuoi confermare?"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
+#: ../../Code/Module/Admin/Channels.php:163
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Il canale {0} sarà rimosso!\\n\\nTutto ciò che è stato pubblicato su questo server tramite questo canale sarà irreversibilmente eliminato!\\n\\nVuoi confermare?"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
+#: ../../Code/Module/Admin/Themes.php:26
 msgid "Theme settings updated."
 msgstr "Le impostazioni del tema sono state aggiornate."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
+#: ../../Code/Module/Admin/Themes.php:61
 msgid "No themes found."
 msgstr "Nessun tema trovato."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
+#: ../../Code/Module/Admin/Themes.php:116
 msgid "Screenshot"
 msgstr "Istantanea dello schermo"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+#: ../../Code/Module/Admin/Themes.php:123
+#: ../../Code/Module/Admin/Themes.php:157 ../../Code/Widget/Admin.php:28
 msgid "Themes"
 msgstr "Temi"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
+#: ../../Code/Module/Admin/Themes.php:162
 msgid "[Experimental]"
 msgstr "[Sperimentale]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
+#: ../../Code/Module/Admin/Themes.php:163
 msgid "[Unsupported]"
 msgstr "[Non supportato]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:165
+#: ../../Code/Module/Admin/Site.php:165
 msgid "Site settings updated."
 msgstr "Impostazioni del sito salvate correttamente."
 
-#: ../../Zotlabs/Module/Admin/Site.php:191
+#: ../../Code/Module/Admin/Site.php:191
 #: ../../view/theme/redbasic_c/php/config.php:15
 #: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:202
-#: ../../Zotlabs/Module/Settings/Display.php:130
+#: ../../Code/Module/Admin/Site.php:202
+#: ../../Code/Module/Settings/Display.php:130
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Incompatibile)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:209
+#: ../../Code/Module/Admin/Site.php:209
 msgid "mobile"
 msgstr "mobile"
 
-#: ../../Zotlabs/Module/Admin/Site.php:211
+#: ../../Code/Module/Admin/Site.php:211
 msgid "experimental"
 msgstr "sperimentale"
 
-#: ../../Zotlabs/Module/Admin/Site.php:213
+#: ../../Code/Module/Admin/Site.php:213
 msgid "unsupported"
 msgstr "non supportato"
 
-#: ../../Zotlabs/Module/Admin/Site.php:260
+#: ../../Code/Module/Admin/Site.php:260
 msgid "Yes - with approval"
 msgstr "Sì - con approvazione"
 
-#: ../../Zotlabs/Module/Admin/Site.php:266
+#: ../../Code/Module/Admin/Site.php:266
 msgid "My site is not a public server"
 msgstr "Non è un server pubblico"
 
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Code/Module/Admin/Site.php:267
 msgid "My site has paid access only"
 msgstr "È un servizio a pagamento"
 
-#: ../../Zotlabs/Module/Admin/Site.php:268
+#: ../../Code/Module/Admin/Site.php:268
 msgid "My site has free access only"
 msgstr "È un servizio gratuito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:269
+#: ../../Code/Module/Admin/Site.php:269
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "È un servizio gratuito con opzioni aggiuntive a pagamento"
 
-#: ../../Zotlabs/Module/Admin/Site.php:281
+#: ../../Code/Module/Admin/Site.php:281
 msgid "Beginner/Basic"
 msgstr "Principiante"
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Code/Module/Admin/Site.php:282
 msgid "Novice - not skilled but willing to learn"
 msgstr "Novizio - disposto a imparare"
 
-#: ../../Zotlabs/Module/Admin/Site.php:283
+#: ../../Code/Module/Admin/Site.php:283
 msgid "Intermediate - somewhat comfortable"
 msgstr "Intermedio - con alcune conoscenze tecniche"
 
-#: ../../Zotlabs/Module/Admin/Site.php:284
+#: ../../Code/Module/Admin/Site.php:284
 msgid "Advanced - very comfortable"
 msgstr "Avanzato - a mio agio con gli aspetti tecnici"
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
+#: ../../Code/Module/Admin/Site.php:285
 msgid "Expert - I can write computer code"
 msgstr "Esperto - posso scrivere codice"
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Code/Module/Admin/Site.php:286
 msgid "Wizard - I probably know more than you do"
 msgstr "Genio - probabilmente ne so più di te!"
 
-#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Code/Module/Admin/Site.php:295 ../../Code/Widget/Admin.php:22
 msgid "Site"
 msgstr "Sito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-#: ../../Zotlabs/Module/Register.php:269
+#: ../../Code/Module/Admin/Site.php:297
+#: ../../Code/Module/Register.php:269
 msgid "Registration"
 msgstr "Registrazione"
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Code/Module/Admin/Site.php:298
 msgid "File upload"
 msgstr "Caricamento file"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid "Policies"
 msgstr "Politiche"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Code/Module/Admin/Site.php:300
 #: ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Code/Module/Admin/Site.php:304
 #: ../../addon/statusnet/statusnet.php:891
 msgid "Site name"
 msgstr "Nome del sito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Site default technical skill level"
 msgstr "Livello tecnico predefinito per gli utenti del sito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr "Utile a fornire agli utenti un livello tecnico del sito che rispetti le loro conoscenze"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid "Lock the technical skill level setting"
 msgstr "Il livello tecnico non potrà essere modificato"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid "Members can set their own technical comfort level by default"
 msgstr "Gli utenti possono scegliere il livello tecnico preferito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid "Banner/Logo"
 msgstr "Banner o logo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr "È permesso un contenuto HTML/CSS/JS non filtrato"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid "Administrator Information"
 msgstr "Informazioni sull'amministratore"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Informazioni per contattare gli amministratori del sito. Saranno mostrate sulla pagina di informazioni. È consentito il BBcode"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Code/Module/Admin/Site.php:312
+#: ../../Code/Module/Siteinfo.php:21
 msgid "Site Information"
 msgstr "Informazioni sul sito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Code/Module/Admin/Site.php:312
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Descrizione del sito, visibile pubblicamente. Visualizzata sulla pagina siteinfo. Puoi usare il BBCode"
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Code/Module/Admin/Site.php:313
 msgid "System language"
 msgstr "Lingua di sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid "System theme"
 msgstr "Tema di sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Il tema di sistema può essere cambiato dai profili dei singoli utenti - Cambia le impostazioni del tema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "Allow Feeds as Connections"
 msgstr "Permetti di aggiungere i feed come contatti"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso delle risorse di sistema!)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:318
 msgid "Maximum image size"
 msgstr "Dimensione massima immagini"
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:318
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Massima dimensione in byte delle immagini caricate. Il default è 0, cioè nessun limite."
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Does this site allow new member registration?"
 msgstr "Questo sito permette a nuovi utenti di registrarsi?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid "Invitation only"
 msgstr "Solo con invito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "La registrazione è permessa solo a chi possiede un codice di invito. Funziona solo se la possibilità di registrarsi è impostata a 'Sì'."
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Minimum age"
 msgstr "Età minima"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Minimum age (in years) for who may register on this site."
 msgstr "L'età minima (in anni) richiesta per registrarsi su questo sito."
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Code/Module/Admin/Site.php:322
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Come descriveresti il tipo di servizio proposto da questo server?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Register text"
 msgstr "Testo di registrazione"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Will be displayed prominently on the registration page."
 msgstr "Sarà mostrato ben visibile nella pagina di registrazione."
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepage del sito da mostrare ai navigatori (predefinito: modulo di login)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "esempio: 'public' per mostrare i contenuti pubblici degli utenti, 'page/sys/home' per mostrare la pagina web definita come 'home' oppure 'include:home.html' per mostrare il contenuto di un file."
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid "Preserve site homepage URL"
 msgstr "Conserva l'URL della homepage"
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la homepage del sito in un frame all'indirizzo attuale invece di un redirect."
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid "Accounts abandoned after x days"
 msgstr "Account abbandonati dopo X giorni"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Eviterà di sprecare risorse di sistema controllando se i siti esterni hanno account abbandonati. Immettere 0 per non imporre nessun limite di tempo."
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid "Allowed friend domains"
 msgstr "Domini fidati e consentiti"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Elenco separato da virgola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Lascia vuoto per accettare connessioni da qualsiasi dominio."
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Code/Module/Admin/Site.php:328
 msgid "Verify Email Addresses"
 msgstr "Verifica l'indirizzo email"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Code/Module/Admin/Site.php:328
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Attiva per richiedere la verifica degli indirizzi email dei nuovi utenti (consigliato)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid "Force publish"
 msgstr "Forza la publicazione del profilo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Seleziona per pubblicare sui directory server tutti i profili registrati su questo sito."
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "Import Public Streams"
 msgstr "Suggerisci contenuti pubblici della rete Hubzilla"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Suggerisci e visualizza i post pubblici presenti su altri siti Hubzilla. Attenzione: i contenuti potrebbero essere inappropriati perché non sottoposti a moderazione."
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid "Site only Public Streams"
 msgstr "Solo i flussi pubblici su questo sito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr "Consenti l'accesso a contenuti pubblici originati solo da questo sito se se è disabilitata l'importazione di flussi pubblici."
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr "Permetti a chiunque su internet di accedere ai flussi pubblici"
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr "Disabilita per richiedere di autenticarsi prima di visualizzare. Attenzione: questo contenuto non è moderato."
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid "Login on Homepage"
 msgstr "Login sulla homepage"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presenta il modulo di login ai visitatori sulla homepage in mancanza di altri contenuti."
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Enable context help"
 msgstr "Abilita la guida contestuale"
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Quando è premuto, il bottone della guida mostra quella relativa alla pagina corrente"
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Reply-to email address for system generated email."
 msgstr "Indirizzo Reply-to per mail generate dal sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Code/Module/Admin/Site.php:337
 msgid "Sender (From) email address for system generated email."
 msgstr "Indirzzo email del mittente (From) per mail generate dal sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid "Name of email sender for system generated email."
 msgstr "Nome del mittente per mail generate dal sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Directory Server URL"
 msgstr "URL del directory server"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Default directory server"
 msgstr "Directory server predefinito"
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Code/Module/Admin/Site.php:342
 msgid "Proxy user"
 msgstr "Utente proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Code/Module/Admin/Site.php:343
 msgid "Proxy URL"
 msgstr "URL proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Network timeout"
 msgstr "Timeout rete"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valore in secondi. Imposta a 0 per illimitato (sconsigliato)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid "Delivery interval"
 msgstr "Recapito ritardato"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Numero di secondi di cui può essere ritardato il recapito, per ridurre il carico di sistema. Consigliati: 4-5 secondi per hosting condiviso, 2-3 per i VPS, 0-1 per grandi server dedicati."
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid "Deliveries per process"
 msgstr "Tentativi di recapito per processo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Numero di tentativi di recapito da tentare per ciascun processo. Può essere modificato per migliorare le performance di sistema. Raccomandato: 1-5"
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid "Queue Threshold"
 msgstr "Threshold della coda"
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr "Rinvia la consegna immediata se la coda contiene più di questo numero di elementi."
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid "Poll interval"
 msgstr "Intervallo di polling"
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Numero di secondi di cui può essere ritardato il polling in background, per ridurre il carico del sistema. Se 0, verrà usato lo stesso valore del 'Recapito ritardato'."
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Code/Module/Admin/Site.php:349
 msgid "Path to ImageMagick convert program"
 msgstr "Percorso del comando convert di ImageMagic"
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Code/Module/Admin/Site.php:349
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr "Se impostato, utilizza questo programma per generare le anteprime di immagini molto grandi ( > 4000 pixel in larghezza o altezza), per evitare di esaurire la memoria. Esempio: /user/bin/convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Code/Module/Admin/Site.php:350
 msgid "Allow SVG thumbnails in file browser"
 msgstr "Permetti le anteprime SVG nell'elenco dei file"
 
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Code/Module/Admin/Site.php:350
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "ATTENZIONE: le immagini SVG potrebbero contenere codice malevolo."
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid "Maximum Load Average"
 msgstr "Carico massimo medio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carico di sistema massimo perché i processi di recapito e polling siano ritardati - il valore predefinito è 50."
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Scadenza dei contenuti importati da altri siti (in giorni)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "0 for no expiration of imported content"
 msgstr "0 per non avere scadenza"
 
-#: ../../Zotlabs/Module/Admin/Site.php:353
+#: ../../Code/Module/Admin/Site.php:353
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr "Non far scadere nessun post che ha commenti più recenti di questo numero di giorni"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr "Server pubblici: Landing page (marketing) opzionale per utenti appena registrati"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Crea questa pagina prima. Il default è %s/register"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Page to display after creating a new channel"
 msgstr "Pagina da visualizzare dopo la creazione di un nuovo canale"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Recommend: profiles, go, or settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Optional: site location"
 msgstr "Opzionale: site location"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Region or country"
 msgstr "Regione o Paese"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
+#: ../../Code/Module/Admin/Profs.php:89
 msgid "New Profile Field"
 msgstr "Nuovo campo del profilo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "Field nickname"
 msgstr "Nome breve del campo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "System name of field"
 msgstr "Nome di sistema del campo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
+#: ../../Code/Module/Admin/Profs.php:91
+#: ../../Code/Module/Admin/Profs.php:111
 msgid "Input type"
 msgstr "Tipo di dati"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Field Name"
 msgstr "Nome del campo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Label on profile pages"
 msgstr "Etichetta da mostrare sulla pagina del profilo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Help text"
 msgstr "Testo di aiuto"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Additional info (optional)"
 msgstr "Informazioni aggiuntive (facoltative)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052
+#: ../../Code/Module/Admin/Profs.php:94
+#: ../../Code/Module/Admin/Profs.php:114 ../../Code/Module/Rbmark.php:32
+#: ../../Code/Module/Rbmark.php:104 ../../Code/Module/Filer.php:53
+#: ../../Code/Widget/Notes.php:18 ../../include/text.php:1052
 #: ../../include/text.php:1064
 msgid "Save"
 msgstr "Salva"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
+#: ../../Code/Module/Admin/Profs.php:103
 msgid "Field definition not found"
 msgstr "Impossibile trovare la definizione del campo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
+#: ../../Code/Module/Admin/Profs.php:109
 msgid "Edit Profile Field"
 msgstr "Modifica campo del profilo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30
+#: ../../Code/Module/Admin/Profs.php:168 ../../Code/Widget/Admin.php:30
 msgid "Profile Fields"
 msgstr "Campi del profilo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
+#: ../../Code/Module/Admin/Profs.php:169
 msgid "Basic Profile Fields"
 msgstr "Campi base del profilo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "Advanced Profile Fields"
 msgstr "Campi avanzati del profilo"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "(In addition to basic fields)"
 msgstr "(In aggiunta ai campi di base)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
+#: ../../Code/Module/Admin/Profs.php:172
 msgid "All available fields"
 msgstr "Tutti i campi disponibili"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
+#: ../../Code/Module/Admin/Profs.php:173
 msgid "Custom Fields"
 msgstr "Campi personalizzati"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
+#: ../../Code/Module/Admin/Profs.php:177
 msgid "Create Custom Field"
 msgstr "Aggiungi campo personalizzato"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#: ../../Code/Module/Admin/Account_edit.php:29
 #, php-format
 msgid "Password changed for account %d."
 msgstr "La password per l'utente %d è cambiata."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+#: ../../Code/Module/Admin/Account_edit.php:46
 msgid "Account settings updated."
 msgstr "L'impostazioni sono state aggiornate."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+#: ../../Code/Module/Admin/Account_edit.php:61
 msgid "Account not found."
 msgstr "Account non trovato."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+#: ../../Code/Module/Admin/Account_edit.php:68
 msgid "Account Edit"
 msgstr "Modifica le impostazioni"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+#: ../../Code/Module/Admin/Account_edit.php:69
 msgid "New Password"
 msgstr "Nuova password"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+#: ../../Code/Module/Admin/Account_edit.php:70
 msgid "New Password again"
 msgstr "Ripeti la nuova password"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+#: ../../Code/Module/Admin/Account_edit.php:71
 msgid "Technical skill level"
 msgstr "Livello tecnico"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+#: ../../Code/Module/Admin/Account_edit.php:72
 msgid "Account language (for emails)"
 msgstr "Lingua (per le email di sistema)"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Code/Module/Admin/Account_edit.php:73
 msgid "Service class"
 msgstr "Classe dell'account"
 
-#: ../../Zotlabs/Module/Admin/Security.php:77
+#: ../../Code/Module/Admin/Security.php:77
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
 msgstr "Il codice HTML degli oggetti multimediali incorporati nei post è consentito. Questo tipo di impostazione è insicura."
 
-#: ../../Zotlabs/Module/Admin/Security.php:80
+#: ../../Code/Module/Admin/Security.php:80
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr "L'impostazione consigliata è di permettere HTML non filtrato solo dai seguenti siti:"
 
-#: ../../Zotlabs/Module/Admin/Security.php:81
+#: ../../Code/Module/Admin/Security.php:81
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/
              https://vimeo.com/
              https://soundcloud.com/
              "
 
-#: ../../Zotlabs/Module/Admin/Security.php:82
+#: ../../Code/Module/Admin/Security.php:82
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr "Tutti gli altri contenuti incorporati saranno filtrati a meno che il contenuto incorporato di quel sito non sia esplicitamente bloccato."
 
-#: ../../Zotlabs/Module/Admin/Security.php:87
-#: ../../Zotlabs/Widget/Admin.php:25
+#: ../../Code/Module/Admin/Security.php:87
+#: ../../Code/Widget/Admin.php:25
 msgid "Security"
 msgstr "Sicurezza"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
+#: ../../Code/Module/Admin/Security.php:89
 msgid "Block public"
 msgstr "Blocca pagine pubbliche"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
+#: ../../Code/Module/Admin/Security.php:89
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso."
 
-#: ../../Zotlabs/Module/Admin/Security.php:90
+#: ../../Code/Module/Admin/Security.php:90
 msgid "Set \"Transport Security\" HTTP header"
 msgstr "Imposta il \"Transport Security\" HTTP header"
 
-#: ../../Zotlabs/Module/Admin/Security.php:91
+#: ../../Code/Module/Admin/Security.php:91
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr "Imposta il \"Content Security Policy\" HTTP header"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin/Security.php:92
 msgid "Allowed email domains"
 msgstr "Domini email consentiti"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin/Security.php:92
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione. Sono accettati caratteri jolly. Lascia vuoto per accettare qualsiasi dominio email"
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Code/Module/Admin/Security.php:93
 msgid "Not allowed email domains"
 msgstr "Domini email non consentiti"
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Code/Module/Admin/Security.php:93
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione a questo sito. Sono accettati caratteri jolly. Lascalo vuoto per accettare qualsiasi dominio."
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
+#: ../../Code/Module/Admin/Security.php:94
 msgid "Allow communications only from these sites"
 msgstr "Permetti la comunicazione solo da questi siti"
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
+#: ../../Code/Module/Admin/Security.php:94
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Un sito per riga. Lascia vuoto per permettere la comunicazione con tutti"
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
+#: ../../Code/Module/Admin/Security.php:95
 msgid "Block communications from these sites"
 msgstr "Blocca la comunicazione da questi siti"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid "Allow communications only from these channels"
 msgstr "Permetti la comunicazione solo da questi canali"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "Un canale (hash) per riga. Lascia vuoto per comunicare con tutti i canali"
 
-#: ../../Zotlabs/Module/Admin/Security.php:97
+#: ../../Code/Module/Admin/Security.php:97
 msgid "Block communications from these channels"
 msgstr "Blocca la comunicazione da questi canali"
 
-#: ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Code/Module/Admin/Security.php:98
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr "Permetti di incorporare contenuti solamente da siti sicuri (SSL)."
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Incorpora i contenuti HTML non filtrati solo da questi domini"
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "One site per line. By default embedded content is filtered."
 msgstr "Un sito per riga. Normalmente i contenuti incorporati sono filtrati."
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
+#: ../../Code/Module/Admin/Security.php:100
 msgid "Block embedded HTML from these domains"
 msgstr "Blocca i contenuti incorporati HTML da questi domini"
 
-#: ../../Zotlabs/Module/Lockview.php:75
+#: ../../Code/Module/Lockview.php:75
 msgid "Remote privacy information not available."
 msgstr "Le informazioni remote sulla privacy non sono disponibili."
 
-#: ../../Zotlabs/Module/Lockview.php:96
+#: ../../Code/Module/Lockview.php:96
 msgid "Visible to:"
 msgstr "Visibile a:"
 
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88
+#: ../../Code/Module/Lockview.php:117 ../../Code/Module/Lockview.php:153
+#: ../../Code/Module/Acl.php:121 ../../include/acl_selectors.php:88
 msgctxt "acl"
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../../Zotlabs/Module/Moderate.php:62
+#: ../../Code/Module/Moderate.php:62
 msgid "Comment approved"
 msgstr "Commento approvato"
 
-#: ../../Zotlabs/Module/Moderate.php:66
+#: ../../Code/Module/Moderate.php:66
 msgid "Comment deleted"
 msgstr "Commento eliminato"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:23
+#: ../../Code/Module/Settings/Permcats.php:23
 msgid "Permission Name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:42
+#: ../../Code/Module/Settings/Permcats.php:42
 msgid "Permission category saved."
 msgstr "Categoria di permessi salvata"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:66
+#: ../../Code/Module/Settings/Permcats.php:66
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
 msgstr "Usa questo modulo per definire i permessi specifici per classi di persone o connessioni."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:99
+#: ../../Code/Module/Settings/Permcats.php:99
 msgid "Permission Categories"
 msgstr "Categorie di permessi"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
+#: ../../Code/Module/Settings/Permcats.php:107
 msgid "Permission Name"
 msgstr "Nome del permesso"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250
+#: ../../Code/Module/Settings/Permcats.php:108
+#: ../../Code/Module/Settings/Tokens.php:161
+#: ../../Code/Module/Connedit.php:891 ../../Code/Module/Defperms.php:250
 msgid "My Settings"
 msgstr "Permessi che concedo"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248
+#: ../../Code/Module/Settings/Permcats.php:110
+#: ../../Code/Module/Settings/Tokens.php:163
+#: ../../Code/Module/Connedit.php:886 ../../Code/Module/Defperms.php:248
 msgid "inherited"
 msgstr "derivato"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:113
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253
+#: ../../Code/Module/Settings/Permcats.php:113
+#: ../../Code/Module/Settings/Tokens.php:166
+#: ../../Code/Module/Connedit.php:893 ../../Code/Module/Defperms.php:253
 msgid "Individual Permissions"
 msgstr "Permessi individuali"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:114
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:894
+#: ../../Code/Module/Settings/Permcats.php:114
+#: ../../Code/Module/Settings/Tokens.php:167
+#: ../../Code/Module/Connedit.php:894
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -3419,19 +3419,19 @@ msgid ""
 " settings here."
 msgstr "Alcuni permessi derivano dalle impostazioni di privacy del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Da questa pagina non puoi cambiarle."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:68
-#: ../../Zotlabs/Module/Settings/Channel.php:69
-#: ../../Zotlabs/Module/Settings/Channel.php:72
-#: ../../Zotlabs/Module/Settings/Channel.php:83
-#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24
+#: ../../Code/Module/Settings/Channel.php:64
+#: ../../Code/Module/Settings/Channel.php:68
+#: ../../Code/Module/Settings/Channel.php:69
+#: ../../Code/Module/Settings/Channel.php:72
+#: ../../Code/Module/Settings/Channel.php:83
+#: ../../Code/Module/Connedit.php:711 ../../Code/Widget/Affinity.php:24
 #: ../../include/selectors.php:123 ../../include/channel.php:437
 #: ../../include/channel.php:438 ../../include/channel.php:445
 msgid "Friends"
 msgstr "Amici"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:264
-#: ../../Zotlabs/Module/Defperms.php:103
+#: ../../Code/Module/Settings/Channel.php:264
+#: ../../Code/Module/Defperms.php:103
 #: ../../addon/rendezvous/rendezvous.php:82
 #: ../../addon/openstreetmap/openstreetmap.php:184
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
@@ -3440,962 +3440,962 @@ msgstr "Amici"
 msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:325
+#: ../../Code/Module/Settings/Channel.php:325
 msgid "Nobody except yourself"
 msgstr "Nessuno tranne te"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:326
+#: ../../Code/Module/Settings/Channel.php:326
 msgid "Only those you specifically allow"
 msgstr "Solo chi riceve il mio permesso"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:327
+#: ../../Code/Module/Settings/Channel.php:327
 msgid "Approved connections"
 msgstr "Contatti approvati"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:328
+#: ../../Code/Module/Settings/Channel.php:328
 msgid "Any connections"
 msgstr "Tutti i contatti"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:329
+#: ../../Code/Module/Settings/Channel.php:329
 msgid "Anybody on this website"
 msgstr "Chiunque su questo hub"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:330
+#: ../../Code/Module/Settings/Channel.php:330
 msgid "Anybody in this network"
 msgstr "Chiunque su questa rete"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:331
+#: ../../Code/Module/Settings/Channel.php:331
 msgid "Anybody authenticated"
 msgstr "Chiunque abbia effettuato l'accesso"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:332
+#: ../../Code/Module/Settings/Channel.php:332
 msgid "Anybody on the internet"
 msgstr "Chiunque su internet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:407
+#: ../../Code/Module/Settings/Channel.php:407
 msgid "Publish your default profile in the network directory"
 msgstr "Mostra il mio profilo predefinito negli elenchi pubblici dei canali"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:412
+#: ../../Code/Module/Settings/Channel.php:412
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Vuoi essere suggerito come amico ai nuovi membri?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:416
+#: ../../Code/Module/Settings/Channel.php:416
 msgid "or"
 msgstr "o"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:425
+#: ../../Code/Module/Settings/Channel.php:425
 msgid "Your channel address is"
 msgstr "L'indirizzo del tuo canale è"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:428
+#: ../../Code/Module/Settings/Channel.php:428
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "I tuoi file/foto sono accessibili via WebDAV all'indirizzo"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Code/Module/Settings/Channel.php:493
 msgid "Channel Settings"
 msgstr "Impostazioni del canale"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Code/Module/Settings/Channel.php:500
 msgid "Basic Settings"
 msgstr "Impostazioni di base"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Code/Module/Settings/Channel.php:501
 #: ../../include/channel.php:1521
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:502
-#: ../../Zotlabs/Module/Settings/Account.php:119
+#: ../../Code/Module/Settings/Channel.php:502
+#: ../../Code/Module/Settings/Account.php:119
 msgid "Email Address:"
 msgstr "Indirizzo email:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Code/Module/Settings/Channel.php:503
 msgid "Your Timezone:"
 msgstr "Il tuo fuso orario:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Code/Module/Settings/Channel.php:504
 msgid "Default Post Location:"
 msgstr "Località predefinita:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Code/Module/Settings/Channel.php:504
 msgid "Geographical location to display on your posts"
 msgstr "La posizione geografica da mostrare sui tuoi post"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
+#: ../../Code/Module/Settings/Channel.php:505
 msgid "Use Browser Location:"
 msgstr "Usa la località rilevata dal browser:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Code/Module/Settings/Channel.php:507
 msgid "Adult Content"
 msgstr "Contenuto per adulti"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Code/Module/Settings/Channel.php:507
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Questo canale pubblica frequentemente contenuto per adulti. (I contenuti per adulti vanno taggati #NSFW - Not Safe For Work)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Code/Module/Settings/Channel.php:509
 msgid "Security and Privacy Settings"
 msgstr "Impostazioni di sicurezza e privacy"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Code/Module/Settings/Channel.php:511
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "I tuoi permessi sono già stati configurati. Clicca per vederli o modificarli"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Code/Module/Settings/Channel.php:513
 msgid "Hide my online presence"
 msgstr "Nascondi la mia presenza online"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Code/Module/Settings/Channel.php:513
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Non mostrare sul tuo profilo quando sei online"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:515
+#: ../../Code/Module/Settings/Channel.php:515
 msgid "Simple Privacy Settings:"
 msgstr "Impostazioni di privacy semplificate"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:516
+#: ../../Code/Module/Settings/Channel.php:516
 msgid ""
 "Very Public - extremely permissive (should be used with caution)"
 msgstr "Tutto pubblico - estremamente permissivo (da usare con cautela)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:517
+#: ../../Code/Module/Settings/Channel.php:517
 msgid ""
 "Typical - default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)"
 msgstr "Standard - contenuti normalmente pubblici, ma anche privati se necessario (simile ai social network ma con privacy migliorata)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Code/Module/Settings/Channel.php:518
 msgid "Private - default private, never open or public"
 msgstr "Privato - contenuti normalmente privati, nulla è aperto o pubblico"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Code/Module/Settings/Channel.php:519
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Bloccato - bloccato in invio e ricezione dei contenuti"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid "Allow others to tag your posts"
 msgstr "Permetti ad altri di taggare i tuoi post"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Usato spesso dalla comunità per marcare contenuti inappropriati già esistenti"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
+#: ../../Code/Module/Settings/Channel.php:523
 msgid "Channel Permission Limits"
 msgstr "Limiti sui permessi del canale"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "Expire other channel content after this many days"
 msgstr "Giorni dopo cui mettere in scadenza gli altri contenuti del canale"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "0 or blank to use the website limit."
 msgstr "0 o vuoto per usare i valori predefiniti."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Per questo sito la scadenza è %d giorni. "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "This website does not expire imported content."
 msgstr "I contenuti di questo sito non hanno scadenza."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Il limite del server ha la precedenza, se minore di quello impostato da te."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "Maximum Friend Requests/Day:"
 msgstr "Numero massimo giornaliero di richieste di amicizia:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "May reduce spam activity"
 msgstr "Serve a ridurre lo spam"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:527
+#: ../../Code/Module/Settings/Channel.php:527
 msgid "Default Privacy Group"
 msgstr "Privacy Group predefinito"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Code/Module/Settings/Channel.php:529
 msgid "Use my default audience setting for the type of object published"
 msgstr "Mostra ai contatti secondo le impostazioni standard per questo tipo di contenuto"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Code/Module/Settings/Channel.php:530
 msgid "Profile to assign new connections"
 msgstr "Profilo da associare ai nuovi contatti"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Code/Module/Settings/Channel.php:539
 msgid "Channel permissions category:"
 msgstr "Categorie di permessi dei canali:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Code/Module/Settings/Channel.php:540
 msgid "Default Permissions Group"
 msgstr "Permission Group predefinito"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Useful to reduce spamming"
 msgstr "Serve e ridurre lo spam"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Module/Settings/Channel.php:549
+#: ../../Code/Lib/Enotify.php:68
 msgid "Notification Settings"
 msgstr "Impostazioni di notifica"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Code/Module/Settings/Channel.php:550
 msgid "By default post a status message when:"
 msgstr "Pubblica un messaggio di stato quando:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Code/Module/Settings/Channel.php:551
 msgid "accepting a friend request"
 msgstr "accetto una nuova amicizia"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Code/Module/Settings/Channel.php:552
 msgid "joining a forum/community"
 msgstr "entro a far parte di un forum"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Code/Module/Settings/Channel.php:553
 msgid "making an interesting profile change"
 msgstr "faccio un cambiamento interessante al mio profilo"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Code/Module/Settings/Channel.php:554
 msgid "Send a notification email when:"
 msgstr "Invia una email di notifica quando:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Code/Module/Settings/Channel.php:555
 msgid "You receive a connection request"
 msgstr "Ricevi una richiesta di entrare in contatto"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Code/Module/Settings/Channel.php:556
 msgid "Your connections are confirmed"
 msgstr "I tuoi contatti sono confermati"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Code/Module/Settings/Channel.php:557
 msgid "Someone writes on your profile wall"
 msgstr "Qualcuno scrive sulla tua bacheca"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Code/Module/Settings/Channel.php:558
 msgid "Someone writes a followup comment"
 msgstr "Qualcuno scrive un commento dopo di te"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Code/Module/Settings/Channel.php:559
 msgid "You receive a private message"
 msgstr "Ricevi un messaggio privato"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:560
+#: ../../Code/Module/Settings/Channel.php:560
 msgid "You receive a friend suggestion"
 msgstr "Ti viene suggerito un amico"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Code/Module/Settings/Channel.php:561
 msgid "You are tagged in a post"
 msgstr "Sei taggato in un post"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:562
+#: ../../Code/Module/Settings/Channel.php:562
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Ricevi un poke in un post"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:564
+#: ../../Code/Module/Settings/Channel.php:564
 msgid "Someone likes your post/comment"
 msgstr "Qualcuno mette mi piace al tuo post/commento"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Code/Module/Settings/Channel.php:567
 msgid "Show visual notifications including:"
 msgstr "Mostra queste notifiche a schermo:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Code/Module/Settings/Channel.php:569
 msgid "Unseen grid activity"
 msgstr "Nuove attività nella rete"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Code/Module/Settings/Channel.php:570
 msgid "Unseen channel activity"
 msgstr "Novità nei canali"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:571
 msgid "Unseen private messages"
 msgstr "Nuovi messaggi privati"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-#: ../../Zotlabs/Module/Settings/Channel.php:577
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:578
 #: ../../addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr "Consigliato"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Code/Module/Settings/Channel.php:572
 msgid "Upcoming events"
 msgstr "Prossimi eventi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Code/Module/Settings/Channel.php:573
 msgid "Events today"
 msgstr "Eventi di oggi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "Upcoming birthdays"
 msgstr "Prossimi compleanni"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "Not available in all themes"
 msgstr "Non disponibile in tutti i temi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Code/Module/Settings/Channel.php:575
 msgid "System (personal) notifications"
 msgstr "Notifiche personali dal sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:576
 msgid "System info messages"
 msgstr "Notifiche di sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:577
 msgid "System critical alerts"
 msgstr "Avvisi critici di sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:578
 msgid "New connections"
 msgstr "Nuovi contatti"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Code/Module/Settings/Channel.php:579
 msgid "System Registrations"
 msgstr "Registrazioni"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Code/Module/Settings/Channel.php:580
 msgid "Unseen shared files"
 msgstr "File condivisi non ancora visitati"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Code/Module/Settings/Channel.php:581
 msgid "Unseen public activity"
 msgstr "Attività pubblica non letta"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Code/Module/Settings/Channel.php:582
 msgid "Unseen likes and dislikes"
 msgstr "Mi piace e non mi piace da leggere"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 msgid "Email notification hub (hostname)"
 msgstr "Hub di notifica (hostname)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple hubs, set this to your preferred "
 "location. This will prevent duplicate email notifications. Example: %s"
 msgstr "Se il tuo canale è replicato su molti hub, scegli qui da dove saranno inviati i messaggi. Serve ad evitare di ricevere notifiche duplicate. Esempio: %s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:584
+#: ../../Code/Module/Settings/Channel.php:584
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr "Mostra i nuovi post in bacheca, i messaggi privati e le connessioni come Notifiche"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Code/Module/Settings/Channel.php:586
 msgid "Notify me of events this many days in advance"
 msgstr "Giorni di anticipo per notificare gli eventi"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Code/Module/Settings/Channel.php:586
 msgid "Must be greater than 0"
 msgstr "Maggiore di 0"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:592
 msgid "Advanced Account/Page Type Settings"
 msgstr "Impostazioni avanzate"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Code/Module/Settings/Channel.php:593
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambia il funzionamento di questo account per necessità particolari"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Miscellaneous Settings"
 msgstr "Impostazioni varie"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:596
 msgid "Default photo upload folder"
 msgstr "Cartella predefinita per le foto caricate"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - anno corrente, %m - mese corrente"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "Default file upload folder"
 msgstr "Cartella predefinita per i file caricati"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Code/Module/Settings/Channel.php:599
 msgid "Personal menu to display in your channel pages"
 msgstr "Menu personale da mostrare sulle pagine del tuo canale"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Code/Module/Settings/Channel.php:601
 msgid "Remove this channel."
 msgstr "Elimina questo canale."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:602
+#: ../../Code/Module/Settings/Channel.php:602
 msgid "Firefox Share $Projectname provider"
 msgstr "Attiva Firefox Share per $Projectname"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:603
+#: ../../Code/Module/Settings/Channel.php:603
 msgid "Start calendar week on Monday"
 msgstr "Inizia la settimana nel calendario da lunedì"
 
-#: ../../Zotlabs/Module/Settings/Features.php:73
+#: ../../Code/Module/Settings/Features.php:73
 msgid "Additional Features"
 msgstr "Funzionalità opzionali"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid "Your technical skill level"
 msgstr "Il tuo livello tecnico"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid ""
 "Used to provide a member experience and additional features consistent with "
 "your comfort level"
 msgstr "Serve ad adeguare l'interfaccia e le funzionalità mostrate alla tua dimestichezza"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#: ../../Code/Module/Settings/Tokens.php:31
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Questo canale è limitato a %d token"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
+#: ../../Code/Module/Settings/Tokens.php:37
 msgid "Name and Password are required."
 msgstr "Nome e password sono obbligatori."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
+#: ../../Code/Module/Settings/Tokens.php:77
 msgid "Token saved."
 msgstr "Token salvato."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
+#: ../../Code/Module/Settings/Tokens.php:113
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
 "visitors may login using these credentials to access private content."
 msgstr "Usa questo modulo per creare credenziali temporanee per condividere qualcosa con i non iscritti. A queste credenziali potrai dare o togliere diritti come a tutti gli altri utenti e i visitatori potranno usarle per accedere a contenuti privati."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
+#: ../../Code/Module/Settings/Tokens.php:115
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
 "Examples:"
 msgstr "Puoi anche fornire un accesso simile a dropbox agli amici o ai colleghi aggiungendo la password all'url che vuoi comunicare, come mostrato sotto. Esempi:"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:100
+#: ../../Code/Module/Settings/Tokens.php:150
+#: ../../Code/Widget/Settings_menu.php:100
 msgid "Guest Access Tokens"
 msgstr "Token di accesso ospite"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
+#: ../../Code/Module/Settings/Tokens.php:157
 msgid "Login Name"
 msgstr "Nome utente"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
+#: ../../Code/Module/Settings/Tokens.php:158
 msgid "Login Password"
 msgstr "Password"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
+#: ../../Code/Module/Settings/Tokens.php:159
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Con scadenza (aaaa-mm-gg)"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Code/Module/Settings/Tokens.php:160
+#: ../../Code/Module/Connedit.php:890
 msgid "Their Settings"
 msgstr "Permessi concessi a te"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:35
+#: ../../Code/Module/Settings/Oauth2.php:35
 msgid "Name and Secret are required"
 msgstr "Nome e Password sono obbligatori"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:83
+#: ../../Code/Module/Settings/Oauth2.php:83
 msgid "Add OAuth2 application"
 msgstr "Aggiungi applicazione OAuth2"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:90
 msgid "Name of application"
 msgstr "Nome dell'applicazione"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth.php:118
 #: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:92
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth.php:119
 msgid "Redirect"
 msgstr "Redirect"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:93
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI di riderezione - lasciare vuoto se non richiesto specificamente dall'applicazione"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:117
 msgid "Grant Types"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "leave blank unless your application sepcifically requires this"
 msgstr "lascia bianco a meno che la applicazione non lo richieda esplicitamente"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "Authorization scope"
 msgstr "Ambito dell'autorizzazione"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:102
+#: ../../Code/Module/Settings/Oauth2.php:102
 msgid "OAuth2 Application not found."
 msgstr "Applicazione OAuth2 non trovata."
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:111
-#: ../../Zotlabs/Module/Settings/Oauth2.php:148
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
+#: ../../Code/Module/Settings/Oauth2.php:111
+#: ../../Code/Module/Settings/Oauth2.php:148
+#: ../../Code/Module/Settings/Oauth.php:87
+#: ../../Code/Module/Settings/Oauth.php:113
+#: ../../Code/Module/Settings/Oauth.php:149
 msgid "Add application"
 msgstr "Aggiungi una app"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:147
+#: ../../Code/Module/Settings/Oauth2.php:147
 msgid "Connected OAuth2 Apps"
 msgstr "Applicazioni OAuth2 connesse"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:151
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
+#: ../../Code/Module/Settings/Oauth2.php:151
+#: ../../Code/Module/Settings/Oauth.php:152
 msgid "Client key starts with"
 msgstr "La client key inizia con"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:152
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
+#: ../../Code/Module/Settings/Oauth2.php:152
+#: ../../Code/Module/Settings/Oauth.php:153
 msgid "No name"
 msgstr "Nessun nome"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:153
-#: ../../Zotlabs/Module/Settings/Oauth.php:154
+#: ../../Code/Module/Settings/Oauth2.php:153
+#: ../../Code/Module/Settings/Oauth.php:154
 msgid "Remove authorization"
 msgstr "Revoca l'autorizzazione"
 
-#: ../../Zotlabs/Module/Settings/Account.php:20
+#: ../../Code/Module/Settings/Account.php:20
 msgid "Not valid email."
 msgstr "Email non valida."
 
-#: ../../Zotlabs/Module/Settings/Account.php:23
+#: ../../Code/Module/Settings/Account.php:23
 msgid "Protected email address. Cannot change to that email."
 msgstr "È un indirizzo email riservato. Non puoi sceglierlo."
 
-#: ../../Zotlabs/Module/Settings/Account.php:32
+#: ../../Code/Module/Settings/Account.php:32
 msgid "System failure storing new email. Please try again."
 msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore."
 
-#: ../../Zotlabs/Module/Settings/Account.php:40
+#: ../../Code/Module/Settings/Account.php:40
 msgid "Technical skill level updated"
 msgstr "Livello tecnico aggiornato"
 
-#: ../../Zotlabs/Module/Settings/Account.php:56
+#: ../../Code/Module/Settings/Account.php:56
 msgid "Password verification failed."
 msgstr "Verifica della password fallita."
 
-#: ../../Zotlabs/Module/Settings/Account.php:63
+#: ../../Code/Module/Settings/Account.php:63
 msgid "Passwords do not match. Password unchanged."
 msgstr "Le password non corrispondono. Password non cambiata."
 
-#: ../../Zotlabs/Module/Settings/Account.php:67
+#: ../../Code/Module/Settings/Account.php:67
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Le password non possono essere vuote. Password non cambiata."
 
-#: ../../Zotlabs/Module/Settings/Account.php:81
+#: ../../Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr "Password cambiata."
 
-#: ../../Zotlabs/Module/Settings/Account.php:83
+#: ../../Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr "Modifica password fallita. Prova ancora."
 
-#: ../../Zotlabs/Module/Settings/Account.php:112
+#: ../../Code/Module/Settings/Account.php:112
 msgid "Account Settings"
 msgstr "Il tuo account"
 
-#: ../../Zotlabs/Module/Settings/Account.php:113
+#: ../../Code/Module/Settings/Account.php:113
 msgid "Current Password"
 msgstr "Password attuale"
 
-#: ../../Zotlabs/Module/Settings/Account.php:114
+#: ../../Code/Module/Settings/Account.php:114
 msgid "Enter New Password"
 msgstr "Nuova password"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Confirm New Password"
 msgstr "Conferma la nuova password"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Leave password fields blank unless changing"
 msgstr "Lascia vuoti questi campi per non cambiare la password"
 
-#: ../../Zotlabs/Module/Settings/Account.php:120
-#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Code/Module/Settings/Account.php:120
+#: ../../Code/Module/Removeaccount.php:61
 msgid "Remove Account"
 msgstr "Elimina l'account"
 
-#: ../../Zotlabs/Module/Settings/Account.php:121
+#: ../../Code/Module/Settings/Account.php:121
 msgid "Remove this account including all its channels"
 msgstr "Elimina questo account e tutti i suoi canali"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:23
+#: ../../Code/Module/Settings/Featured.php:23
 msgid "Affinity Slider settings updated."
 msgstr "Impostazioni dell'Affinity Slider salvate."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:38
+#: ../../Code/Module/Settings/Featured.php:38
 msgid "No feature settings configured"
 msgstr "Non hai componenti aggiuntivi da personalizzare"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "Default maximum affinity level"
 msgstr "Livello di affinità predefinito massimo "
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "0-99 default 99"
 msgstr "0-99 predefinito 99"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "Default minimum affinity level"
 msgstr "Livello di affinità predefinito minimo"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "0-99 - default 0"
 msgstr "0-99 - predefinito 0"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Featured.php:54
 msgid "Affinity Slider Settings"
 msgstr "Impostazioni dell'Affinity Slider"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:67
+#: ../../Code/Module/Settings/Featured.php:67
 msgid "Addon Settings"
 msgstr "Impostazioni del componente aggiuntivo"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:68
+#: ../../Code/Module/Settings/Featured.php:68
 msgid "Please save/submit changes to any panel before opening another."
 msgstr "Salva/invia i cambiamenti prima di cambiare pannello."
 
-#: ../../Zotlabs/Module/Settings/Display.php:139
+#: ../../Code/Module/Settings/Display.php:139
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Sperimentale)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:187
+#: ../../Code/Module/Settings/Display.php:187
 msgid "Display Settings"
 msgstr "Aspetto"
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Code/Module/Settings/Display.php:188
 msgid "Theme Settings"
 msgstr "Impostazioni del tema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Code/Module/Settings/Display.php:189
 msgid "Custom Theme Settings"
 msgstr "Personalizzazione del tema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Code/Module/Settings/Display.php:190
 msgid "Content Settings"
 msgstr "Impostazioni dei contenuti"
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Code/Module/Settings/Display.php:196
 msgid "Display Theme:"
 msgstr "Tema per schermi medio grandi:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Code/Module/Settings/Display.php:197
 msgid "Select scheme"
 msgstr "Scegli uno schema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid "Preload images before rendering the page"
 msgstr "Carica le immagini prima del rendering della pagina"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "Il tempo di caricamento della pagina sarà più lungo ma sarà mostrato il rendering completo"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
+#: ../../Code/Module/Settings/Display.php:200
 msgid "Enable user zoom on mobile devices"
 msgstr "Attiva la possibilità di fare zoom sui dispositivi mobili"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Update browser every xx seconds"
 msgstr "Aggiorna il browser ogni x secondi"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimo 10 secondi, nessun limite massimo"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Massimo numero di conversazioni da mostrare ogni volta:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum of 100 items"
 msgstr "Massimo 100"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Code/Module/Settings/Display.php:203
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostra le faccine (smilies) come immagini"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Provide channel menu in navigation bar"
 msgstr "Visualizza il menu del canale nella barra di navigazione"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Default: channel menu located in app menu"
 msgstr "Predefinito: menu del canale nel menu delle app"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Manual conversation updates"
 msgstr "Aggiornamenti manuali alla conversazione"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Default is on, turning this off may increase screen jumping"
 msgstr "Se non è attiva può causare scorrimenti imprevisti della pagina"
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Code/Module/Settings/Display.php:206
 msgid "Link post titles to source"
 msgstr "Il link del titolo di un post porta al sito originale"
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
+#: ../../Code/Module/Settings/Display.php:207
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Modifica i layout di sistema (avanzato)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:210
 msgid "Use blog/list mode on channel page"
 msgstr "Mostra il canale nella modalità blog"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:211
 msgid "(comments displayed separately)"
 msgstr "(i commenti sono mostrati separatamente)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:211
 msgid "Use blog/list mode on grid page"
 msgstr "Mostra la tua rete in modalità blog"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:212
 msgid "Channel page max height of content (in pixels)"
 msgstr "Altezza massima dei contenuti del canale (in pixel)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:213
 msgid "click to expand content exceeding this height"
 msgstr "dovrai cliccare sul post per mostrare i contenuti di dimensioni maggiori"
 
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:213
 msgid "Grid page max height of content (in pixels)"
 msgstr "Altezza massima dei contenuti della tua rete (in pixel)"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:35
+#: ../../Code/Module/Settings/Oauth.php:35
 msgid "Name is required"
 msgstr "Il nome è obbligatorio"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:39
+#: ../../Code/Module/Settings/Oauth.php:39
 msgid "Key and Secret are required"
 msgstr "Key e Secret sono richiesti"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:117
 #: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Settings/Oauth.php:120
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Settings/Oauth.php:120
 msgid "Icon url"
 msgstr "Url icona"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid "Optional"
 msgstr "Facoltativo"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:105
+#: ../../Code/Module/Settings/Oauth.php:105
 msgid "Application not found."
 msgstr "Applicazione non trovata."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
+#: ../../Code/Module/Settings/Oauth.php:148
 msgid "Connected Apps"
 msgstr "App connesse"
 
-#: ../../Zotlabs/Module/Embedphotos.php:140
-#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350
-#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
+#: ../../Code/Module/Embedphotos.php:140
+#: ../../Code/Module/Photos.php:811 ../../Code/Module/Photos.php:1350
+#: ../../Code/Widget/Portfolio.php:87 ../../Code/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Guarda la foto"
 
-#: ../../Zotlabs/Module/Embedphotos.php:156
-#: ../../Zotlabs/Module/Photos.php:842 ../../Zotlabs/Widget/Portfolio.php:108
-#: ../../Zotlabs/Widget/Album.php:95
+#: ../../Code/Module/Embedphotos.php:156
+#: ../../Code/Module/Photos.php:842 ../../Code/Widget/Portfolio.php:108
+#: ../../Code/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Modifica album"
 
-#: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Module/Photos.php:712
-#: ../../Zotlabs/Module/Profile_photo.php:458
-#: ../../Zotlabs/Module/Cover_photo.php:362
-#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133
-#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Widget/Album.php:97
+#: ../../Code/Module/Embedphotos.php:158
+#: ../../Code/Module/Photos.php:712
+#: ../../Code/Module/Profile_photo.php:458
+#: ../../Code/Module/Cover_photo.php:362
+#: ../../Code/Storage/Browser.php:384 ../../Code/Widget/Cdav.php:133
+#: ../../Code/Widget/Cdav.php:169 ../../Code/Widget/Portfolio.php:110
+#: ../../Code/Widget/Album.php:97
 msgid "Upload"
 msgstr "Carica"
 
-#: ../../Zotlabs/Module/Achievements.php:38
+#: ../../Code/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr "Qualche suggerimento per i nuovi utenti su cosa fare"
 
-#: ../../Zotlabs/Module/Thing.php:120
+#: ../../Code/Module/Thing.php:120
 msgid "Thing updated"
 msgstr "L'oggetto è stato aggiornato"
 
-#: ../../Zotlabs/Module/Thing.php:172
+#: ../../Code/Module/Thing.php:172
 msgid "Object store: failed"
 msgstr "Impossibile memorizzare l'oggetto."
 
-#: ../../Zotlabs/Module/Thing.php:176
+#: ../../Code/Module/Thing.php:176
 msgid "Thing added"
 msgstr "L'Oggetto è stato aggiunto"
 
-#: ../../Zotlabs/Module/Thing.php:202
+#: ../../Code/Module/Thing.php:202
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Thing.php:265
+#: ../../Code/Module/Thing.php:265
 msgid "Show Thing"
 msgstr "Mostra l'oggetto"
 
-#: ../../Zotlabs/Module/Thing.php:272
+#: ../../Code/Module/Thing.php:272
 msgid "item not found."
 msgstr "non trovato."
 
-#: ../../Zotlabs/Module/Thing.php:305
+#: ../../Code/Module/Thing.php:305
 msgid "Edit Thing"
 msgstr "Modifica l'oggetto"
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364
+#: ../../Code/Module/Thing.php:307 ../../Code/Module/Thing.php:364
 msgid "Select a profile"
 msgstr "Scegli un profilo"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Post an activity"
 msgstr "Pubblica un'attività"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Invia solo a chi può vedere il profilo scelto"
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+#: ../../Code/Module/Thing.php:313 ../../Code/Module/Thing.php:369
 msgid "Name of thing e.g. something"
 msgstr "Nome dell'oggetto"
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370
+#: ../../Code/Module/Thing.php:315 ../../Code/Module/Thing.php:370
 msgid "URL of thing (optional)"
 msgstr "Indirizzo web dell'oggetto (facoltativo)"
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371
+#: ../../Code/Module/Thing.php:317 ../../Code/Module/Thing.php:371
 msgid "URL for photo of thing (optional)"
 msgstr "Indirizzo di un'immagine dell'oggetto (facoltativo)"
 
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071
-#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
-#: ../../Zotlabs/Module/Filestorage.php:147
+#: ../../Code/Module/Thing.php:319 ../../Code/Module/Thing.php:372
+#: ../../Code/Module/Photos.php:702 ../../Code/Module/Photos.php:1071
+#: ../../Code/Module/Connedit.php:676 ../../Code/Module/Chat.php:235
+#: ../../Code/Module/Filestorage.php:147
 #: ../../include/acl_selectors.php:123
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../../Zotlabs/Module/Thing.php:362
+#: ../../Code/Module/Thing.php:362
 msgid "Add Thing to your Profile"
 msgstr "Aggiungi l'oggetto al tuo profilo"
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:57
+#: ../../Code/Module/Notify.php:61
+#: ../../Code/Module/Notifications.php:57
 msgid "No more system notifications."
 msgstr "Non ci sono nuove notifiche di sistema."
 
-#: ../../Zotlabs/Module/Notify.php:65
-#: ../../Zotlabs/Module/Notifications.php:61
+#: ../../Code/Module/Notify.php:65
+#: ../../Code/Module/Notifications.php:61
 msgid "System Notifications"
 msgstr "Notifiche di sistema"
 
-#: ../../Zotlabs/Module/Follow.php:36
+#: ../../Code/Module/Follow.php:36
 msgid "Connection added."
 msgstr "Contatto aggiunto."
 
-#: ../../Zotlabs/Module/Import.php:144
+#: ../../Code/Module/Import.php:144
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Il tuo account permette di creare al massimo %d canali."
 
-#: ../../Zotlabs/Module/Import.php:158
+#: ../../Code/Module/Import.php:158
 msgid "No channel. Import failed."
 msgstr "Nessun canale. Import fallito."
 
-#: ../../Zotlabs/Module/Import.php:482
+#: ../../Code/Module/Import.php:482
 #: ../../addon/diaspora/import_diaspora.php:139
 msgid "Import completed."
 msgstr "L'importazione è terminata con successo."
 
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Code/Module/Import.php:510
 msgid "You must be logged in to use this feature."
 msgstr "Per questa funzionalità devi aver effettuato l'accesso."
 
-#: ../../Zotlabs/Module/Import.php:515
+#: ../../Code/Module/Import.php:515
 msgid "Import Channel"
 msgstr "Importa un canale"
 
-#: ../../Zotlabs/Module/Import.php:516
+#: ../../Code/Module/Import.php:516
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Usa questo modulo per importare un tuo canale da un altro hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro hub oppure tramite un file esportato in precedenza."
 
-#: ../../Zotlabs/Module/Import.php:518
+#: ../../Code/Module/Import.php:518
 msgid "Or provide the old server/hub details"
 msgstr "Oppure fornisci i dettagli del vecchio hub"
 
-#: ../../Zotlabs/Module/Import.php:519
+#: ../../Code/Module/Import.php:519
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)"
 
-#: ../../Zotlabs/Module/Import.php:520
+#: ../../Code/Module/Import.php:520
 msgid "Your old login email address"
 msgstr "L'email che usavi per accedere sul vecchio hub"
 
-#: ../../Zotlabs/Module/Import.php:521
+#: ../../Code/Module/Import.php:521
 msgid "Your old login password"
 msgstr "La password per il vecchio hub"
 
-#: ../../Zotlabs/Module/Import.php:522
+#: ../../Code/Module/Import.php:522
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -4403,508 +4403,508 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Scegli se vuoi spostare il tuo indirizzo primario su questo hub, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i hub, ma solamente uno sarà indicato come la posizione su cui risiedono i tuoi file, foto, ecc."
 
-#: ../../Zotlabs/Module/Import.php:523
+#: ../../Code/Module/Import.php:523
 msgid "Make this hub my primary location"
 msgstr "Rendi questo hub il mio indirizzo primario"
 
-#: ../../Zotlabs/Module/Import.php:524
+#: ../../Code/Module/Import.php:524
 msgid "Move this channel (disable all previous locations)"
 msgstr "Sposta questo canale (disabilita le posizioni precedenti)"
 
-#: ../../Zotlabs/Module/Import.php:525
+#: ../../Code/Module/Import.php:525
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importa alcune mesi di post se possibile (dipende dalla memoria disponibile"
 
-#: ../../Zotlabs/Module/Import.php:526
+#: ../../Code/Module/Import.php:526
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
 msgstr "Questa funzione potrebbe impiegare molto tempo a terminare. Per favore lanciala *una volta sola* e resta su questa pagina finché non avrà finito."
 
-#: ../../Zotlabs/Module/Rmagic.php:35
+#: ../../Code/Module/Rmagic.php:35
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590
+#: ../../Code/Module/Rmagic.php:75 ../../boot.php:1590
 #: ../../include/channel.php:2318
 msgid "Remote Authentication"
 msgstr "Accedi tramite il tuo hub"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319
+#: ../../Code/Module/Rmagic.php:76 ../../include/channel.php:2319
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320
+#: ../../Code/Module/Rmagic.php:77 ../../include/channel.php:2320
 msgid "Authenticate"
 msgstr "Accedi"
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Code/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Permesso negato."
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446
+#: ../../Code/Module/Cal.php:344 ../../include/text.php:2446
 msgid "Import"
 msgstr "Importa"
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+#: ../../Code/Module/Api.php:74 ../../Code/Module/Api.php:95
 msgid "Authorize application connection"
 msgstr "Autorizza la app"
 
-#: ../../Zotlabs/Module/Api.php:75
+#: ../../Code/Module/Api.php:75
 msgid "Return to your app and insert this Security Code:"
 msgstr "Ritorna alla tua app e inserisci questo Security Code:"
 
-#: ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:85
 msgid "Please login to continue."
 msgstr "Accedi al sito per continuare."
 
-#: ../../Zotlabs/Module/Api.php:97
+#: ../../Code/Module/Api.php:97
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Elemento non disponibile."
 
-#: ../../Zotlabs/Module/Editblock.php:138
+#: ../../Code/Module/Editblock.php:138
 msgid "Edit Block"
 msgstr "Modifica il block"
 
-#: ../../Zotlabs/Module/Profile.php:93
+#: ../../Code/Module/Profile.php:93
 msgid "vcard"
 msgstr "vcard"
 
-#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Code/Module/Apps.php:48 ../../Code/Lib/Apps.php:228
 msgid "Apps"
 msgstr "App"
 
-#: ../../Zotlabs/Module/Apps.php:51
+#: ../../Code/Module/Apps.php:51
 msgid "Manage apps"
 msgstr "Gestisci le app"
 
-#: ../../Zotlabs/Module/Apps.php:52
+#: ../../Code/Module/Apps.php:52
 msgid "Create new app"
 msgstr "Crea nuova app"
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268
+#: ../../Code/Module/Mood.php:67 ../../include/conversation.php:268
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s è %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253
+#: ../../Code/Module/Mood.php:135 ../../Code/Lib/Apps.php:253
 msgid "Mood"
 msgstr "Umore"
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Code/Module/Mood.php:136
 msgid "Set your current mood and tell your friends"
 msgstr "Scegli il tuo umore attuale per mostrarlo agli amici"
 
-#: ../../Zotlabs/Module/Connections.php:55
-#: ../../Zotlabs/Module/Connections.php:112
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Code/Module/Connections.php:55
+#: ../../Code/Module/Connections.php:112
+#: ../../Code/Module/Connections.php:256
 msgid "Active"
 msgstr "Attivo"
 
-#: ../../Zotlabs/Module/Connections.php:60
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Code/Module/Connections.php:60
+#: ../../Code/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:261
 msgid "Blocked"
 msgstr "Bloccati"
 
-#: ../../Zotlabs/Module/Connections.php:65
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Code/Module/Connections.php:65
+#: ../../Code/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:260
 msgid "Ignored"
 msgstr "Ignorati"
 
-#: ../../Zotlabs/Module/Connections.php:70
-#: ../../Zotlabs/Module/Connections.php:185
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Code/Module/Connections.php:70
+#: ../../Code/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:259
 msgid "Hidden"
 msgstr "Nascosti"
 
-#: ../../Zotlabs/Module/Connections.php:75
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:75
+#: ../../Code/Module/Connections.php:178
 msgid "Archived/Unreachable"
 msgstr "Archiviato/Irraggiungibile"
 
-#: ../../Zotlabs/Module/Connections.php:80
-#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116
-#: ../../Zotlabs/Module/Notifications.php:52
+#: ../../Code/Module/Connections.php:80
+#: ../../Code/Module/Connections.php:89 ../../Code/Module/Menu.php:116
+#: ../../Code/Module/Notifications.php:52
 #: ../../include/conversation.php:1717
 msgid "New"
 msgstr "Novità"
 
-#: ../../Zotlabs/Module/Connections.php:94
-#: ../../Zotlabs/Module/Connections.php:108
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
+#: ../../Code/Module/Connections.php:94
+#: ../../Code/Module/Connections.php:108
+#: ../../Code/Module/Connedit.php:713 ../../Code/Widget/Affinity.php:26
 msgid "All"
 msgstr "Tutti"
 
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Code/Module/Connections.php:140
 msgid "Active Connections"
 msgstr "Contatto Attivo"
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Code/Module/Connections.php:143
 msgid "Show active connections"
 msgstr "Mostra i contatti atttivi"
 
-#: ../../Zotlabs/Module/Connections.php:147
-#: ../../Zotlabs/Widget/Notifications.php:84
+#: ../../Code/Module/Connections.php:147
+#: ../../Code/Widget/Notifications.php:84
 msgid "New Connections"
 msgstr "Nuovi contatti"
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Code/Module/Connections.php:150
 msgid "Show pending (new) connections"
 msgstr "Richieste di contatto in attesa"
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Code/Module/Connections.php:167
 msgid "Only show blocked connections"
 msgstr "Mostra solo i contatti bloccati"
 
-#: ../../Zotlabs/Module/Connections.php:174
+#: ../../Code/Module/Connections.php:174
 msgid "Only show ignored connections"
 msgstr "Mostra solo i contatti ignorati"
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Code/Module/Connections.php:181
 msgid "Only show archived/unreachable connections"
 msgstr "Mostra solo i contatti archiviati/irraggiungibili"
 
-#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Code/Module/Connections.php:188
 msgid "Only show hidden connections"
 msgstr "Mostra solo i contatti nascosti"
 
-#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Code/Module/Connections.php:203
 msgid "Show all connections"
 msgstr "Mostra tutti i contatti"
 
-#: ../../Zotlabs/Module/Connections.php:257
+#: ../../Code/Module/Connections.php:257
 msgid "Pending approval"
 msgstr "In attesa di conferma"
 
-#: ../../Zotlabs/Module/Connections.php:258
+#: ../../Code/Module/Connections.php:258
 msgid "Archived"
 msgstr "Archiviati"
 
-#: ../../Zotlabs/Module/Connections.php:262
+#: ../../Code/Module/Connections.php:262
 msgid "Not connected at this location"
 msgstr "Non connesso a questa location"
 
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Code/Module/Connections.php:279
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Code/Module/Connections.php:280
 msgid "Edit connection"
 msgstr "Modifica il contatto"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Code/Module/Connections.php:282
 msgid "Delete connection"
 msgstr "Elimina il contatto"
 
-#: ../../Zotlabs/Module/Connections.php:291
+#: ../../Code/Module/Connections.php:291
 msgid "Channel address"
 msgstr "Indirizzo del canale"
 
-#: ../../Zotlabs/Module/Connections.php:293
+#: ../../Code/Module/Connections.php:293
 msgid "Network"
 msgstr "Network"
 
-#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Code/Module/Connections.php:296
 msgid "Call"
 msgstr "Chiama"
 
-#: ../../Zotlabs/Module/Connections.php:298
+#: ../../Code/Module/Connections.php:298
 msgid "Status"
 msgstr "Stato"
 
-#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Code/Module/Connections.php:300
 msgid "Connected"
 msgstr "In contatto"
 
-#: ../../Zotlabs/Module/Connections.php:302
+#: ../../Code/Module/Connections.php:302
 msgid "Approve connection"
 msgstr "Approva questo contatto"
 
-#: ../../Zotlabs/Module/Connections.php:304
+#: ../../Code/Module/Connections.php:304
 msgid "Ignore connection"
 msgstr "Ignora il contatto"
 
-#: ../../Zotlabs/Module/Connections.php:305
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connections.php:305
+#: ../../Code/Module/Connedit.php:630
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../../Zotlabs/Module/Connections.php:306
+#: ../../Code/Module/Connections.php:306
 msgid "Recent activity"
 msgstr "Attività recenti"
 
-#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235
+#: ../../Code/Module/Connections.php:331 ../../Code/Lib/Apps.php:235
 #: ../../include/text.php:973
 msgid "Connections"
 msgstr "Contatti"
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Code/Module/Connections.php:336
 msgid "Search your connections"
 msgstr "Cerca tra i contatti"
 
-#: ../../Zotlabs/Module/Connections.php:337
+#: ../../Code/Module/Connections.php:337
 msgid "Connections search"
 msgstr "Ricerca tra i contatti"
 
-#: ../../Zotlabs/Module/Connections.php:338
-#: ../../Zotlabs/Module/Directory.php:401
-#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23
+#: ../../Code/Module/Connections.php:338
+#: ../../Code/Module/Directory.php:401
+#: ../../Code/Module/Directory.php:406 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Cerca"
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
+#: ../../Code/Module/Viewsrc.php:43
 msgid "item"
 msgstr "elemento"
 
-#: ../../Zotlabs/Module/Viewsrc.php:55
+#: ../../Code/Module/Viewsrc.php:55
 msgid "Source of Item"
 msgstr "Sorgente"
 
-#: ../../Zotlabs/Module/Bookmarks.php:56
+#: ../../Code/Module/Bookmarks.php:56
 msgid "Bookmark added"
 msgstr "Segnalibro aggiunto"
 
-#: ../../Zotlabs/Module/Bookmarks.php:79
+#: ../../Code/Module/Bookmarks.php:79
 msgid "My Bookmarks"
 msgstr "I miei segnalibri"
 
-#: ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../Code/Module/Bookmarks.php:90
 msgid "My Connections Bookmarks"
 msgstr "I segnalibri dei miei contatti"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../Code/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Non è possibile eliminare il tuo account prima di 48 ore dall'ultimo cambio password."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Elimina questo account"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Questo account e tutti i suoi canali saranno completamente eliminati dalla rete."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Elimina dalla rete questo account, tutti i suoi canali e ANCHE tutti gli eventuali canali clonati."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "A meno che tu non lo richieda espressamente, solo i canali presenti su questo hub saranno rimossi dalla rete."
 
-#: ../../Zotlabs/Module/Photos.php:78
+#: ../../Code/Module/Photos.php:78
 msgid "Page owner information could not be retrieved."
 msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
 
-#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
+#: ../../Code/Module/Photos.php:94 ../../Code/Module/Photos.php:120
 msgid "Album not found."
 msgstr "Album non trovato."
 
-#: ../../Zotlabs/Module/Photos.php:103
+#: ../../Code/Module/Photos.php:103
 msgid "Delete Album"
 msgstr "Elimina album"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083
+#: ../../Code/Module/Photos.php:174 ../../Code/Module/Photos.php:1083
 msgid "Delete Photo"
 msgstr "Elimina foto"
 
-#: ../../Zotlabs/Module/Photos.php:551
+#: ../../Code/Module/Photos.php:551
 msgid "No photos selected"
 msgstr "Nessuna foto selezionata"
 
-#: ../../Zotlabs/Module/Photos.php:600
+#: ../../Code/Module/Photos.php:600
 msgid "Access to this item is restricted."
 msgstr "Questo elemento non è visibile a tutti."
 
-#: ../../Zotlabs/Module/Photos.php:646
+#: ../../Code/Module/Photos.php:646
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
 
-#: ../../Zotlabs/Module/Photos.php:649
+#: ../../Code/Module/Photos.php:649
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
 
-#: ../../Zotlabs/Module/Photos.php:691
+#: ../../Code/Module/Photos.php:691
 msgid "Upload Photos"
 msgstr "Carica foto"
 
-#: ../../Zotlabs/Module/Photos.php:695
+#: ../../Code/Module/Photos.php:695
 msgid "Enter an album name"
 msgstr "Scegli il nome dell'album"
 
-#: ../../Zotlabs/Module/Photos.php:696
+#: ../../Code/Module/Photos.php:696
 msgid "or select an existing album (doubleclick)"
 msgstr "o seleziona un album esistente (doppio click)"
 
-#: ../../Zotlabs/Module/Photos.php:697
+#: ../../Code/Module/Photos.php:697
 msgid "Create a status post for this upload"
 msgstr "Pubblica sulla bacheca"
 
-#: ../../Zotlabs/Module/Photos.php:699
+#: ../../Code/Module/Photos.php:699
 msgid "Description (optional)"
 msgstr "Descrizione (opzionale)"
 
-#: ../../Zotlabs/Module/Photos.php:785
+#: ../../Code/Module/Photos.php:785
 msgid "Show Newest First"
 msgstr "Prima i più recenti"
 
-#: ../../Zotlabs/Module/Photos.php:787
+#: ../../Code/Module/Photos.php:787
 msgid "Show Oldest First"
 msgstr "Prima i più vecchi"
 
-#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381
+#: ../../Code/Module/Photos.php:844 ../../Code/Module/Photos.php:1381
 msgid "Add Photos"
 msgstr "Aggiungi foto"
 
-#: ../../Zotlabs/Module/Photos.php:892
+#: ../../Code/Module/Photos.php:892
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
 
-#: ../../Zotlabs/Module/Photos.php:894
+#: ../../Code/Module/Photos.php:894
 msgid "Photo not available"
 msgstr "Foto non disponibile"
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Code/Module/Photos.php:952
 msgid "Use as profile photo"
 msgstr "Usa come foto del profilo"
 
-#: ../../Zotlabs/Module/Photos.php:953
+#: ../../Code/Module/Photos.php:953
 msgid "Use as cover photo"
 msgstr "Usa come copertina del canale"
 
-#: ../../Zotlabs/Module/Photos.php:960
+#: ../../Code/Module/Photos.php:960
 msgid "Private Photo"
 msgstr "Foto privata"
 
-#: ../../Zotlabs/Module/Photos.php:975
+#: ../../Code/Module/Photos.php:975
 msgid "View Full Size"
 msgstr "Vedi nelle dimensioni originali"
 
-#: ../../Zotlabs/Module/Photos.php:1057
+#: ../../Code/Module/Photos.php:1057
 msgid "Edit photo"
 msgstr "Modifica la foto"
 
-#: ../../Zotlabs/Module/Photos.php:1059
+#: ../../Code/Module/Photos.php:1059
 msgid "Rotate CW (right)"
 msgstr "Ruota (senso orario)"
 
-#: ../../Zotlabs/Module/Photos.php:1060
+#: ../../Code/Module/Photos.php:1060
 msgid "Rotate CCW (left)"
 msgstr "Ruota (senso antiorario)"
 
-#: ../../Zotlabs/Module/Photos.php:1063
+#: ../../Code/Module/Photos.php:1063
 msgid "Move photo to album"
 msgstr "Sposta la foto in un album"
 
-#: ../../Zotlabs/Module/Photos.php:1064
+#: ../../Code/Module/Photos.php:1064
 msgid "Enter a new album name"
 msgstr "Inserisci il nome del nuovo album"
 
-#: ../../Zotlabs/Module/Photos.php:1065
+#: ../../Code/Module/Photos.php:1065
 msgid "or select an existing one (doubleclick)"
 msgstr "o seleziona uno esistente (doppio click)"
 
-#: ../../Zotlabs/Module/Photos.php:1070
+#: ../../Code/Module/Photos.php:1070
 msgid "Add a Tag"
 msgstr "Aggiungi tag"
 
-#: ../../Zotlabs/Module/Photos.php:1078
+#: ../../Code/Module/Photos.php:1078
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../Zotlabs/Module/Photos.php:1081
+#: ../../Code/Module/Photos.php:1081
 msgid "Flag as adult in album view"
 msgstr "Marca come 'per adulti'"
 
-#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281
+#: ../../Code/Module/Photos.php:1100 ../../Code/Lib/ThreadItem.php:281
 msgid "I like this (toggle)"
 msgstr "Attiva/disattiva Mi piace"
 
-#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282
+#: ../../Code/Module/Photos.php:1101 ../../Code/Lib/ThreadItem.php:282
 msgid "I don't like this (toggle)"
 msgstr "Attiva/disattiva Non mi piace"
 
-#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427
+#: ../../Code/Module/Photos.php:1103 ../../Code/Lib/ThreadItem.php:427
 #: ../../include/conversation.php:785
 msgid "Please wait"
 msgstr "Attendere"
 
-#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237
-#: ../../Zotlabs/Lib/ThreadItem.php:749
+#: ../../Code/Module/Photos.php:1119 ../../Code/Module/Photos.php:1237
+#: ../../Code/Lib/ThreadItem.php:749
 msgid "This is you"
 msgstr "Questo sei tu"
 
-#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239
-#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6
+#: ../../Code/Module/Photos.php:1121 ../../Code/Module/Photos.php:1239
+#: ../../Code/Lib/ThreadItem.php:751 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Commento"
 
-#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618
+#: ../../Code/Module/Photos.php:1137 ../../include/conversation.php:618
 msgctxt "title"
 msgid "Likes"
 msgstr "\"Mi piace\""
 
-#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618
+#: ../../Code/Module/Photos.php:1137 ../../include/conversation.php:618
 msgctxt "title"
 msgid "Dislikes"
 msgstr "\"Non mi piace\""
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Agree"
 msgstr "D'accordo"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Disagree"
 msgstr "Non d'accordo"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Abstain"
 msgstr "Astenuti"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Attending"
 msgstr "Partecipano"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Not attending"
 msgstr "Non partecipano"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Might attend"
 msgstr "Forse partecipano"
 
-#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168
-#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213
+#: ../../Code/Module/Photos.php:1156 ../../Code/Module/Photos.php:1168
+#: ../../Code/Lib/ThreadItem.php:201 ../../Code/Lib/ThreadItem.php:213
 msgid "View all"
 msgstr "Vedi tutto"
 
-#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205
+#: ../../Code/Module/Photos.php:1160 ../../Code/Lib/ThreadItem.php:205
 #: ../../include/conversation.php:1981 ../../include/channel.php:1539
 #: ../../include/taxonomy.php:660
 msgctxt "noun"
@@ -4913,7 +4913,7 @@ msgid_plural "Likes"
 msgstr[0] "Mi piace"
 msgstr[1] "\"Mi piace\""
 
-#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210
+#: ../../Code/Module/Photos.php:1165 ../../Code/Lib/ThreadItem.php:210
 #: ../../include/conversation.php:1984
 msgctxt "noun"
 msgid "Dislike"
@@ -4921,517 +4921,517 @@ msgid_plural "Dislikes"
 msgstr[0] "Non mi piace"
 msgstr[1] "\"Non mi piace\""
 
-#: ../../Zotlabs/Module/Photos.php:1265
+#: ../../Code/Module/Photos.php:1265
 msgid "Photo Tools"
 msgstr "Gestione foto"
 
-#: ../../Zotlabs/Module/Photos.php:1274
+#: ../../Code/Module/Photos.php:1274
 msgid "In This Photo:"
 msgstr "In questa foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1279
+#: ../../Code/Module/Photos.php:1279
 msgid "Map"
 msgstr "Mappa"
 
-#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415
+#: ../../Code/Module/Photos.php:1287 ../../Code/Lib/ThreadItem.php:415
 msgctxt "noun"
 msgid "Likes"
 msgstr "\"Mi piace\""
 
-#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416
+#: ../../Code/Module/Photos.php:1288 ../../Code/Lib/ThreadItem.php:416
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "\"Non mi piace\""
 
-#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421
+#: ../../Code/Module/Photos.php:1293 ../../Code/Lib/ThreadItem.php:421
 #: ../../include/acl_selectors.php:125
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378
-#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:663
+#: ../../Code/Module/Photos.php:1365 ../../Code/Module/Photos.php:1378
+#: ../../Code/Module/Photos.php:1379 ../../include/photos.php:663
 msgid "Recent Photos"
 msgstr "Foto recenti"
 
-#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135
+#: ../../Code/Module/Wiki.php:30 ../../addon/cart/cart.php:1135
 msgid "Profile Unavailable."
 msgstr "Profilo non dispobibile"
 
-#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114
+#: ../../Code/Module/Wiki.php:44 ../../Code/Module/Cloud.php:114
 msgid "Not found"
 msgstr "Non trovato"
 
-#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114
+#: ../../Code/Module/Wiki.php:68 ../../addon/cart/myshop.php:114
 #: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58
 msgid "Invalid channel"
 msgstr "Canale non valido"
 
-#: ../../Zotlabs/Module/Wiki.php:124
+#: ../../Code/Module/Wiki.php:124
 msgid "Error retrieving wiki"
 msgstr "Errore caricamento wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:131
+#: ../../Code/Module/Wiki.php:131
 msgid "Error creating zip file export folder"
 msgstr "Errore nella creazione della cartella per l'esportazione in zip"
 
-#: ../../Zotlabs/Module/Wiki.php:182
+#: ../../Code/Module/Wiki.php:182
 msgid "Error downloading wiki: "
 msgstr "Errore scaricamento wiki:"
 
-#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928
+#: ../../Code/Module/Wiki.php:197 ../../include/conversation.php:1928
 #: ../../include/nav.php:494
 msgid "Wikis"
 msgstr "Pagine wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../Code/Module/Wiki.php:203
 msgid "Download"
 msgstr "Scarica"
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256
-#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Wiki.php:205 ../../Code/Module/Chat.php:256
+#: ../../Code/Module/Profiles.php:831 ../../Code/Module/Manage.php:145
 msgid "Create New"
 msgstr "Crea nuova"
 
-#: ../../Zotlabs/Module/Wiki.php:207
+#: ../../Code/Module/Wiki.php:207
 msgid "Wiki name"
 msgstr "Nome wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:208
+#: ../../Code/Module/Wiki.php:208
 msgid "Content type"
 msgstr "Tipo di contenuto"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
 #: ../../include/text.php:1869
 msgid "Markdown"
 msgstr "Markdown"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1867
 msgid "BBcode"
 msgstr "BBCode"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870
+#: ../../Code/Module/Wiki.php:208 ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1870
 msgid "Text"
 msgstr "Testo"
 
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284
+#: ../../Code/Module/Wiki.php:210 ../../Code/Storage/Browser.php:284
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../Zotlabs/Module/Wiki.php:211
+#: ../../Code/Module/Wiki.php:211
 msgid "Any type"
 msgstr "Qualsiasi tipo"
 
-#: ../../Zotlabs/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:218
 msgid "Lock content type"
 msgstr "Blocca il tipo di contenuto"
 
-#: ../../Zotlabs/Module/Wiki.php:219
+#: ../../Code/Module/Wiki.php:219
 msgid "Create a status post for this wiki"
 msgstr "Crea un messaggio di stato per questo wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:220
+#: ../../Code/Module/Wiki.php:220
 msgid "Edit Wiki Name"
 msgstr "Modifica il nome del Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../Code/Module/Wiki.php:262
 msgid "Wiki not found"
 msgstr "Wiki non trovato"
 
-#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../Code/Module/Wiki.php:286
 msgid "Rename page"
 msgstr "Rinomina la pagina"
 
-#: ../../Zotlabs/Module/Wiki.php:307
+#: ../../Code/Module/Wiki.php:307
 msgid "Error retrieving page content"
 msgstr "Errore nel caricamento del contenuto della pagina"
 
-#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317
+#: ../../Code/Module/Wiki.php:315 ../../Code/Module/Wiki.php:317
 msgid "New page"
 msgstr "Nuova pagina"
 
-#: ../../Zotlabs/Module/Wiki.php:345
+#: ../../Code/Module/Wiki.php:345
 msgid "Revision Comparison"
 msgstr "Confronto tra revisioni"
 
-#: ../../Zotlabs/Module/Wiki.php:346
+#: ../../Code/Module/Wiki.php:346
 msgid "Revert"
 msgstr "Ripristina"
 
-#: ../../Zotlabs/Module/Wiki.php:353
+#: ../../Code/Module/Wiki.php:353
 msgid "Short description of your changes (optional)"
 msgstr "Breve descrizione delle tue modifiche (opzionale)"
 
-#: ../../Zotlabs/Module/Wiki.php:362
+#: ../../Code/Module/Wiki.php:362
 msgid "Source"
 msgstr "Sorgente"
 
-#: ../../Zotlabs/Module/Wiki.php:372
+#: ../../Code/Module/Wiki.php:372
 msgid "New page name"
 msgstr "Nome della nuova pagina"
 
-#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282
+#: ../../Code/Module/Wiki.php:377 ../../include/conversation.php:1282
 msgid "Embed image from photo albums"
 msgstr "Inserisci un'immagine dall'album foto"
 
-#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388
+#: ../../Code/Module/Wiki.php:378 ../../include/conversation.php:1388
 msgid "Embed an image from your albums"
 msgstr "Inserisci un'immagine dai tuoi album"
 
-#: ../../Zotlabs/Module/Wiki.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:465
-#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../Code/Module/Wiki.php:380
+#: ../../Code/Module/Profile_photo.php:465
+#: ../../Code/Module/Cover_photo.php:367
 #: ../../include/conversation.php:1390 ../../include/conversation.php:1437
 msgid "OK"
 msgstr "OK"
 
-#: ../../Zotlabs/Module/Wiki.php:381
-#: ../../Zotlabs/Module/Profile_photo.php:466
-#: ../../Zotlabs/Module/Cover_photo.php:368
+#: ../../Code/Module/Wiki.php:381
+#: ../../Code/Module/Profile_photo.php:466
+#: ../../Code/Module/Cover_photo.php:368
 #: ../../include/conversation.php:1320
 msgid "Choose images to embed"
 msgstr "Scegli le immagini da inserire"
 
-#: ../../Zotlabs/Module/Wiki.php:382
-#: ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:369
+#: ../../Code/Module/Wiki.php:382
+#: ../../Code/Module/Profile_photo.php:467
+#: ../../Code/Module/Cover_photo.php:369
 #: ../../include/conversation.php:1321
 msgid "Choose an album"
 msgstr "Scegli un album"
 
-#: ../../Zotlabs/Module/Wiki.php:383
-#: ../../Zotlabs/Module/Profile_photo.php:468
-#: ../../Zotlabs/Module/Cover_photo.php:370
+#: ../../Code/Module/Wiki.php:383
+#: ../../Code/Module/Profile_photo.php:468
+#: ../../Code/Module/Cover_photo.php:370
 msgid "Choose a different album"
 msgstr "Scegli un album diverso"
 
-#: ../../Zotlabs/Module/Wiki.php:384
-#: ../../Zotlabs/Module/Profile_photo.php:469
-#: ../../Zotlabs/Module/Cover_photo.php:371
+#: ../../Code/Module/Wiki.php:384
+#: ../../Code/Module/Profile_photo.php:469
+#: ../../Code/Module/Cover_photo.php:371
 #: ../../include/conversation.php:1323
 msgid "Error getting album list"
 msgstr "Errore nell'ottenere l'elenco degli album"
 
-#: ../../Zotlabs/Module/Wiki.php:385
-#: ../../Zotlabs/Module/Profile_photo.php:470
-#: ../../Zotlabs/Module/Cover_photo.php:372
+#: ../../Code/Module/Wiki.php:385
+#: ../../Code/Module/Profile_photo.php:470
+#: ../../Code/Module/Cover_photo.php:372
 #: ../../include/conversation.php:1324
 msgid "Error getting photo link"
 msgstr "Errore nell'ottenere il link alla foto"
 
-#: ../../Zotlabs/Module/Wiki.php:386
-#: ../../Zotlabs/Module/Profile_photo.php:471
-#: ../../Zotlabs/Module/Cover_photo.php:373
+#: ../../Code/Module/Wiki.php:386
+#: ../../Code/Module/Profile_photo.php:471
+#: ../../Code/Module/Cover_photo.php:373
 #: ../../include/conversation.php:1325
 msgid "Error getting album"
 msgstr "Errore nell'ottenere l'album"
 
-#: ../../Zotlabs/Module/Wiki.php:462
+#: ../../Code/Module/Wiki.php:462
 msgid "Error creating wiki. Invalid name."
 msgstr "Errore nella creazione. Nome non valido."
 
-#: ../../Zotlabs/Module/Wiki.php:469
+#: ../../Code/Module/Wiki.php:469
 msgid "A wiki with this name already exists."
 msgstr "Un Wiki con questo nome esiste già"
 
-#: ../../Zotlabs/Module/Wiki.php:482
+#: ../../Code/Module/Wiki.php:482
 msgid "Wiki created, but error creating Home page."
 msgstr "Wiki creato, ma c'è stato un errore nella creazione della Home page."
 
-#: ../../Zotlabs/Module/Wiki.php:489
+#: ../../Code/Module/Wiki.php:489
 msgid "Error creating wiki"
 msgstr "Errore nella creazione del Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:512
+#: ../../Code/Module/Wiki.php:512
 msgid "Error updating wiki. Invalid name."
 msgstr "Errore nell'aggiornamento del Wiki. Nome non valido."
 
-#: ../../Zotlabs/Module/Wiki.php:532
+#: ../../Code/Module/Wiki.php:532
 msgid "Error updating wiki"
 msgstr "Errore nell'aggiornamento del Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:547
+#: ../../Code/Module/Wiki.php:547
 msgid "Wiki delete permission denied."
 msgstr "Permesso negato nell'eliminare del Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:557
+#: ../../Code/Module/Wiki.php:557
 msgid "Error deleting wiki"
 msgstr "Errore nell'eliminare il Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:590
+#: ../../Code/Module/Wiki.php:590
 msgid "New page created"
 msgstr "Nuova pagina creata"
 
-#: ../../Zotlabs/Module/Wiki.php:711
+#: ../../Code/Module/Wiki.php:711
 msgid "Cannot delete Home"
 msgstr "Non è possibile eliminare la Home"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Current Revision"
 msgstr "Revisione corrente"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Selected Revision"
 msgstr "Revisione selezionata"
 
-#: ../../Zotlabs/Module/Wiki.php:825
+#: ../../Code/Module/Wiki.php:825
 msgid "You must be authenticated."
 msgstr "Devi autenticarti."
 
-#: ../../Zotlabs/Module/Chanview.php:139
+#: ../../Code/Module/Chanview.php:139
 msgid "toggle full screen mode"
 msgstr "attiva/disattiva schermo intero"
 
-#: ../../Zotlabs/Module/Pdledit.php:21
+#: ../../Code/Module/Pdledit.php:21
 msgid "Layout updated."
 msgstr "Layout aggiornato."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
+#: ../../Code/Module/Pdledit.php:34 ../../Code/Module/Chat.php:219
 msgid "Feature disabled."
 msgstr "Funzionalità disattivata."
 
-#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90
+#: ../../Code/Module/Pdledit.php:47 ../../Code/Module/Pdledit.php:90
 msgid "Edit System Page Description"
 msgstr "Modifica i layout di sistema"
 
-#: ../../Zotlabs/Module/Pdledit.php:68
+#: ../../Code/Module/Pdledit.php:68
 msgid "(modified)"
 msgstr "(modificato)"
 
-#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133
+#: ../../Code/Module/Pdledit.php:68 ../../Code/Module/Lostpass.php:133
 msgid "Reset"
 msgstr "Reimposta"
 
-#: ../../Zotlabs/Module/Pdledit.php:85
+#: ../../Code/Module/Pdledit.php:85
 msgid "Layout not found."
 msgstr "Layout non trovato."
 
-#: ../../Zotlabs/Module/Pdledit.php:91
+#: ../../Code/Module/Pdledit.php:91
 msgid "Module Name:"
 msgstr "Nome del modulo:"
 
-#: ../../Zotlabs/Module/Pdledit.php:92
+#: ../../Code/Module/Pdledit.php:92
 msgid "Layout Help"
 msgstr "Guida al layout"
 
-#: ../../Zotlabs/Module/Pdledit.php:93
+#: ../../Code/Module/Pdledit.php:93
 msgid "Edit another layout"
 msgstr "Modifica un altro layout"
 
-#: ../../Zotlabs/Module/Pdledit.php:94
+#: ../../Code/Module/Pdledit.php:94
 msgid "System layout"
 msgstr "Layout di sistema"
 
-#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254
+#: ../../Code/Module/Poke.php:182 ../../Code/Lib/Apps.php:254
 #: ../../include/conversation.php:1092
 msgid "Poke"
 msgstr "Poke"
 
-#: ../../Zotlabs/Module/Poke.php:183
+#: ../../Code/Module/Poke.php:183
 msgid "Poke somebody"
 msgstr "Manda un poke"
 
-#: ../../Zotlabs/Module/Poke.php:186
+#: ../../Code/Module/Poke.php:186
 msgid "Poke/Prod"
 msgstr "Poke/Prod"
 
-#: ../../Zotlabs/Module/Poke.php:187
+#: ../../Code/Module/Poke.php:187
 msgid "Poke, prod or do other things to somebody"
 msgstr "Manda un poke o altro a qualcuno"
 
-#: ../../Zotlabs/Module/Poke.php:194
+#: ../../Code/Module/Poke.php:194
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../../Zotlabs/Module/Poke.php:195
+#: ../../Code/Module/Poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr "Scegli cosa vuoi inviare al destinatario"
 
-#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
+#: ../../Code/Module/Poke.php:198 ../../Code/Module/Poke.php:199
 msgid "Make this post private"
 msgstr "Rendi privato questo post"
 
-#: ../../Zotlabs/Module/Profile_photo.php:66
-#: ../../Zotlabs/Module/Cover_photo.php:56
+#: ../../Code/Module/Profile_photo.php:66
+#: ../../Code/Module/Cover_photo.php:56
 msgid "Image uploaded but image cropping failed."
 msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla."
 
-#: ../../Zotlabs/Module/Profile_photo.php:120
-#: ../../Zotlabs/Module/Profile_photo.php:248
+#: ../../Code/Module/Profile_photo.php:120
+#: ../../Code/Module/Profile_photo.php:248
 #: ../../include/photo/photo_driver.php:740
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
-#: ../../Zotlabs/Module/Profile_photo.php:142
-#: ../../Zotlabs/Module/Cover_photo.php:159
+#: ../../Code/Module/Profile_photo.php:142
+#: ../../Code/Module/Cover_photo.php:159
 msgid "Image resize failed."
 msgstr "Il ridimensionamento dell'immagine è fallito."
 
-#: ../../Zotlabs/Module/Profile_photo.php:218
+#: ../../Code/Module/Profile_photo.php:218
 #: ../../addon/openclipatar/openclipatar.php:298
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Forza l'aggiornamento della pagina o cancella la cache del browser se la nuova foto non viene visualizzata immediatamente."
 
-#: ../../Zotlabs/Module/Profile_photo.php:225
-#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195
+#: ../../Code/Module/Profile_photo.php:225
+#: ../../Code/Module/Cover_photo.php:173 ../../include/photos.php:195
 msgid "Unable to process image"
 msgstr "Impossibile elaborare l'immagine"
 
-#: ../../Zotlabs/Module/Profile_photo.php:260
-#: ../../Zotlabs/Module/Cover_photo.php:197
+#: ../../Code/Module/Profile_photo.php:260
+#: ../../Code/Module/Cover_photo.php:197
 msgid "Image upload failed."
 msgstr "Il caricamento dell'immagine è fallito."
 
-#: ../../Zotlabs/Module/Profile_photo.php:279
-#: ../../Zotlabs/Module/Cover_photo.php:214
+#: ../../Code/Module/Profile_photo.php:279
+#: ../../Code/Module/Cover_photo.php:214
 msgid "Unable to process image."
 msgstr "Impossibile elaborare l'immagine."
 
-#: ../../Zotlabs/Module/Profile_photo.php:343
-#: ../../Zotlabs/Module/Profile_photo.php:390
-#: ../../Zotlabs/Module/Cover_photo.php:307
-#: ../../Zotlabs/Module/Cover_photo.php:322
+#: ../../Code/Module/Profile_photo.php:343
+#: ../../Code/Module/Profile_photo.php:390
+#: ../../Code/Module/Cover_photo.php:307
+#: ../../Code/Module/Cover_photo.php:322
 msgid "Photo not available."
 msgstr "Foto non disponibile."
 
-#: ../../Zotlabs/Module/Profile_photo.php:455
-#: ../../Zotlabs/Module/Cover_photo.php:359
+#: ../../Code/Module/Profile_photo.php:455
+#: ../../Code/Module/Cover_photo.php:359
 msgid "Upload File:"
 msgstr "Carica un file:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:456
-#: ../../Zotlabs/Module/Cover_photo.php:360
+#: ../../Code/Module/Profile_photo.php:456
+#: ../../Code/Module/Cover_photo.php:360
 msgid "Select a profile:"
 msgstr "Seleziona un profilo:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
+#: ../../Code/Module/Profile_photo.php:457
 msgid "Use Photo for Profile"
 msgstr "Usa la foto per il profilo"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
+#: ../../Code/Module/Profile_photo.php:457
 msgid "Change Profile Photo"
 msgstr "Cambia la foto del profilo"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Code/Module/Profile_photo.php:458
 msgid "Use"
 msgstr "Usa"
 
-#: ../../Zotlabs/Module/Profile_photo.php:462
-#: ../../Zotlabs/Module/Profile_photo.php:463
-#: ../../Zotlabs/Module/Cover_photo.php:364
-#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Code/Module/Profile_photo.php:462
+#: ../../Code/Module/Profile_photo.php:463
+#: ../../Code/Module/Cover_photo.php:364
+#: ../../Code/Module/Cover_photo.php:365
 msgid "Use a photo from your albums"
 msgstr "Usa una foto presa dai tuoi album"
 
-#: ../../Zotlabs/Module/Profile_photo.php:473
-#: ../../Zotlabs/Module/Cover_photo.php:376
+#: ../../Code/Module/Profile_photo.php:473
+#: ../../Code/Module/Cover_photo.php:376
 msgid "Select existing photo"
 msgstr "Seleziona una foto esistente"
 
-#: ../../Zotlabs/Module/Profile_photo.php:492
-#: ../../Zotlabs/Module/Cover_photo.php:393
+#: ../../Code/Module/Profile_photo.php:492
+#: ../../Code/Module/Cover_photo.php:393
 msgid "Crop Image"
 msgstr "Ritaglia immagine"
 
-#: ../../Zotlabs/Module/Profile_photo.php:493
-#: ../../Zotlabs/Module/Cover_photo.php:394
+#: ../../Code/Module/Profile_photo.php:493
+#: ../../Code/Module/Cover_photo.php:394
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Ritaglia l'immagine per migliorarne la visualizzazione."
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
-#: ../../Zotlabs/Module/Cover_photo.php:396
+#: ../../Code/Module/Profile_photo.php:495
+#: ../../Code/Module/Cover_photo.php:396
 msgid "Done Editing"
 msgstr "Modifica terminata"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
+#: ../../Code/Module/Chatsvc.php:131
 msgid "Away"
 msgstr "Assente"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
+#: ../../Code/Module/Chatsvc.php:136
 msgid "Online"
 msgstr "Online"
 
-#: ../../Zotlabs/Module/Item.php:194
+#: ../../Code/Module/Item.php:194
 msgid "Unable to locate original post."
 msgstr "Impossibile trovare il messaggio originale."
 
-#: ../../Zotlabs/Module/Item.php:477
+#: ../../Code/Module/Item.php:477
 msgid "Empty post discarded."
 msgstr "Il post vuoto è stato ignorato."
 
-#: ../../Zotlabs/Module/Item.php:874
+#: ../../Code/Module/Item.php:874
 msgid "Duplicate post suppressed."
 msgstr "I post duplicati sono scartati."
 
-#: ../../Zotlabs/Module/Item.php:1019
+#: ../../Code/Module/Item.php:1019
 msgid "System error. Post not saved."
 msgstr "Errore di sistema. Post non salvato."
 
-#: ../../Zotlabs/Module/Item.php:1055
+#: ../../Code/Module/Item.php:1055
 msgid "Your comment is awaiting approval."
 msgstr "Il tuo contenuto è in attesa di approvazione."
 
-#: ../../Zotlabs/Module/Item.php:1160
+#: ../../Code/Module/Item.php:1160
 msgid "Unable to obtain post information from database."
 msgstr "Impossibile caricare il post dal database."
 
-#: ../../Zotlabs/Module/Item.php:1189
+#: ../../Code/Module/Item.php:1189
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale."
 
-#: ../../Zotlabs/Module/Item.php:1196
+#: ../../Code/Module/Item.php:1196
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
 
-#: ../../Zotlabs/Module/Ping.php:330
+#: ../../Code/Module/Ping.php:330
 msgid "sent you a private message"
 msgstr "ti ha inviato un messaggio privato"
 
-#: ../../Zotlabs/Module/Ping.php:383
+#: ../../Code/Module/Ping.php:383
 msgid "added your channel"
 msgstr "ha aggiunto il tuo canale"
 
-#: ../../Zotlabs/Module/Ping.php:407
+#: ../../Code/Module/Ping.php:407
 msgid "requires approval"
 msgstr "richiede approvazione"
 
-#: ../../Zotlabs/Module/Ping.php:417
+#: ../../Code/Module/Ping.php:417
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../Zotlabs/Module/Ping.php:435
+#: ../../Code/Module/Ping.php:435
 msgid "[today]"
 msgstr "[oggi]"
 
-#: ../../Zotlabs/Module/Ping.php:444
+#: ../../Code/Module/Ping.php:444
 msgid "posted an event"
 msgstr "ha creato un evento"
 
-#: ../../Zotlabs/Module/Ping.php:477
+#: ../../Code/Module/Ping.php:477
 msgid "shared a file with you"
 msgstr "ha condiviso un file con te"
 
-#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
+#: ../../Code/Module/Page.php:39 ../../Code/Module/Block.php:29
 msgid "Invalid item."
 msgstr "Elemento non valido."
 
-#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158
-#: ../../Zotlabs/Module/Display.php:175
-#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167
+#: ../../Code/Module/Page.php:136 ../../Code/Module/Block.php:77
+#: ../../Code/Module/Display.php:141 ../../Code/Module/Display.php:158
+#: ../../Code/Module/Display.php:175
+#: ../../Code/Lib/NativeWikiPage.php:519 ../../Code/Web/Router.php:167
 #: ../../include/help.php:81
 msgid "Page not found."
 msgstr "Pagina non trovata."
 
-#: ../../Zotlabs/Module/Page.php:173
+#: ../../Code/Module/Page.php:173
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -5441,314 +5441,314 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59
+#: ../../Code/Module/Connedit.php:79 ../../Code/Module/Defperms.php:59
 msgid "Could not access contact record."
 msgstr "Non è possibile accedere alle informazioni sul contatto."
 
-#: ../../Zotlabs/Module/Connedit.php:109
+#: ../../Code/Module/Connedit.php:109
 msgid "Could not locate selected profile."
 msgstr "Non riesco a trovare il profilo selezionato."
 
-#: ../../Zotlabs/Module/Connedit.php:246
+#: ../../Code/Module/Connedit.php:246
 msgid "Connection updated."
 msgstr "Contatto aggiornato."
 
-#: ../../Zotlabs/Module/Connedit.php:248
+#: ../../Code/Module/Connedit.php:248
 msgid "Failed to update connection record."
 msgstr "Impossibile aggiornare le informazioni del contatto."
 
-#: ../../Zotlabs/Module/Connedit.php:302
+#: ../../Code/Module/Connedit.php:302
 msgid "is now connected to"
 msgstr "ha come nuovo contatto"
 
-#: ../../Zotlabs/Module/Connedit.php:427
+#: ../../Code/Module/Connedit.php:427
 msgid "Could not access address book record."
 msgstr "Impossibile accedere alle informazioni della rubrica."
 
-#: ../../Zotlabs/Module/Connedit.php:475
+#: ../../Code/Module/Connedit.php:475
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Il canale non è disponibile - impossibile aggiornare."
 
-#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499
-#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Code/Module/Connedit.php:490 ../../Code/Module/Connedit.php:499
+#: ../../Code/Module/Connedit.php:508 ../../Code/Module/Connedit.php:517
+#: ../../Code/Module/Connedit.php:530
 msgid "Unable to set address book parameters."
 msgstr "Impossibile impostare i parametri della rubrica."
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Code/Module/Connedit.php:554
 msgid "Connection has been removed."
 msgstr "Il contatto è stato rimosso."
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247
+#: ../../Code/Module/Connedit.php:594 ../../Code/Lib/Apps.php:247
 #: ../../addon/openclipatar/openclipatar.php:57
 #: ../../include/conversation.php:1032 ../../include/nav.php:114
 msgid "View Profile"
 msgstr "Profilo"
 
-#: ../../Zotlabs/Module/Connedit.php:597
+#: ../../Code/Module/Connedit.php:597
 #, php-format
 msgid "View %s's profile"
 msgstr "Guarda il profilo di %s"
 
-#: ../../Zotlabs/Module/Connedit.php:601
+#: ../../Code/Module/Connedit.php:601
 msgid "Refresh Permissions"
 msgstr "Modifica i permessi"
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Code/Module/Connedit.php:604
 msgid "Fetch updated permissions"
 msgstr "Guarda e modifica i permessi assegnati"
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Code/Module/Connedit.php:608
 msgid "Refresh Photo"
 msgstr "Ricarica la foto"
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Code/Module/Connedit.php:611
 msgid "Fetch updated photo"
 msgstr "Aggiorna la foto"
 
-#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042
+#: ../../Code/Module/Connedit.php:615 ../../include/conversation.php:1042
 msgid "Recent Activity"
 msgstr "Attività recenti"
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Code/Module/Connedit.php:618
 msgid "View recent posts and comments"
 msgstr "Leggi i post recenti e i commenti"
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Code/Module/Connedit.php:625
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blocca ogni interazione con questo contatto (abilita/disabilita)"
 
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Code/Module/Connedit.php:626
 msgid "This connection is blocked!"
 msgstr "Questa connessione è tra quelle bloccate!"
 
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connedit.php:630
 msgid "Unignore"
 msgstr "Non ignorare"
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Code/Module/Connedit.php:633
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignora tutte le comunicazioni in arrivo da questo contatto (abilita/disabilita)"
 
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Code/Module/Connedit.php:634
 msgid "This connection is ignored!"
 msgstr "Questa connessione è tra quelle ignorate!"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Unarchive"
 msgstr "Non archiviare"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Archive"
 msgstr "Archivia"
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Code/Module/Connedit.php:641
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archivia questo contatto (abilita/disabilita) - segna il canale come non più attivo ma ne conserva i contenuti"
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Code/Module/Connedit.php:642
 msgid "This connection is archived!"
 msgstr "Questa connessione è tra quelle archiviate!"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Unhide"
 msgstr "Non nascondere"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Hide"
 msgstr "Nascondi"
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Code/Module/Connedit.php:649
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Nascondi questo contatto a tutti gli altri (abilita/disabilita)"
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Code/Module/Connedit.php:650
 msgid "This connection is hidden!"
 msgstr "Questa connessione è tra quelle nascoste!"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Code/Module/Connedit.php:657
 msgid "Delete this connection"
 msgstr "Elimina questo contatto"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Code/Module/Connedit.php:665
 msgid "Fetch Vcard"
 msgstr "Aggiorna la Vcard"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Code/Module/Connedit.php:668
 msgid "Fetch electronic calling card for this connection"
 msgstr "Scarica la scheda con le informazioni di questo contatto"
 
-#: ../../Zotlabs/Module/Connedit.php:679
+#: ../../Code/Module/Connedit.php:679
 msgid "Open Individual Permissions section by default"
 msgstr "Apri automaticamente la sezione Permessi individuali"
 
-#: ../../Zotlabs/Module/Connedit.php:702
+#: ../../Code/Module/Connedit.php:702
 msgid "Affinity"
 msgstr "Affinità"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Code/Module/Connedit.php:705
 msgid "Open Set Affinity section by default"
 msgstr "Apri la sezione Imposta affinità per default"
 
-#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22
+#: ../../Code/Module/Connedit.php:709 ../../Code/Widget/Affinity.php:22
 msgid "Me"
 msgstr "Me"
 
-#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23
+#: ../../Code/Module/Connedit.php:710 ../../Code/Widget/Affinity.php:23
 msgid "Family"
 msgstr "Famiglia"
 
-#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25
+#: ../../Code/Module/Connedit.php:712 ../../Code/Widget/Affinity.php:25
 msgid "Acquaintances"
 msgstr "Conoscenti"
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Code/Module/Connedit.php:739
 msgid "Filter"
 msgstr "Filtra"
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Code/Module/Connedit.php:742
 msgid "Open Custom Filter section by default"
 msgstr "Apri automaticamente la sezione con i Filtri personalizzati"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Approve this connection"
 msgstr "Approva questo contatto"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Accept connection to allow communication"
 msgstr "Entra in contatto per poter comunicare"
 
-#: ../../Zotlabs/Module/Connedit.php:784
+#: ../../Code/Module/Connedit.php:784
 msgid "Set Affinity"
 msgstr "Scegli l'affinità"
 
-#: ../../Zotlabs/Module/Connedit.php:787
+#: ../../Code/Module/Connedit.php:787
 msgid "Set Profile"
 msgstr "Scegli il profilo da mostrare"
 
-#: ../../Zotlabs/Module/Connedit.php:790
+#: ../../Code/Module/Connedit.php:790
 msgid "Set Affinity & Profile"
 msgstr "Affinità e profilo"
 
-#: ../../Zotlabs/Module/Connedit.php:838
+#: ../../Code/Module/Connedit.php:838
 msgid "This connection is unreachable from this location."
 msgstr "Questo contatto non è raggiungibile dal server in uso"
 
-#: ../../Zotlabs/Module/Connedit.php:839
+#: ../../Code/Module/Connedit.php:839
 msgid "This connection may be unreachable from other channel locations."
 msgstr "Questo contatto potrebbe non essere raggiungibile da altri canali"
 
-#: ../../Zotlabs/Module/Connedit.php:841
+#: ../../Code/Module/Connedit.php:841
 msgid "Location independence is not supported by their network."
 msgstr "Nella loro rete la location independence non è supportata."
 
-#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Code/Module/Connedit.php:847
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr "Il contatto indicato non è raggiungibile. Nella loro rete la location independence non è supportata."
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
-#: ../../Zotlabs/Widget/Settings_menu.php:117
+#: ../../Code/Module/Connedit.php:850 ../../Code/Module/Defperms.php:238
+#: ../../Code/Widget/Settings_menu.php:117
 msgid "Connection Default Permissions"
 msgstr "Permessi predefiniti dei nuovi contatti"
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214
+#: ../../Code/Module/Connedit.php:850 ../../include/items.php:4214
 #, php-format
 msgid "Connection: %s"
 msgstr "Contatto: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Connedit.php:851 ../../Code/Module/Defperms.php:239
 msgid "Apply these permissions automatically"
 msgstr "Applica automaticamente questi permessi"
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Code/Module/Connedit.php:851
 msgid "Connection requests will be approved without your interaction"
 msgstr "Le richieste di entrare in contatto saranno approvate in automatico"
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
 msgid "Permission role"
 msgstr "Ruolo"
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
-#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
+#: ../../Code/Widget/Notifications.php:151 ../../include/nav.php:284
 msgid "Loading"
 msgstr "Sto caricando"
 
-#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241
+#: ../../Code/Module/Connedit.php:853 ../../Code/Module/Defperms.php:241
 msgid "Add permission role"
 msgstr "Aggiungi un ruolo"
 
-#: ../../Zotlabs/Module/Connedit.php:860
+#: ../../Code/Module/Connedit.php:860
 msgid "This connection's primary address is"
 msgstr "Indirizzo primario di questo canale"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Code/Module/Connedit.php:861
 msgid "Available locations:"
 msgstr "Indirizzi disponibili"
 
-#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
+#: ../../Code/Module/Connedit.php:866 ../../Code/Module/Defperms.php:245
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "I permessi indicati su questa pagina saranno applicati a tutti i nuovi contatti da ora in poi."
 
-#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Code/Module/Connedit.php:867
 msgid "Connection Tools"
 msgstr "Gestione del contatto"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Code/Module/Connedit.php:869
 msgid "Slide to adjust your degree of friendship"
 msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155
+#: ../../Code/Module/Connedit.php:870 ../../Code/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valutazioni"
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Code/Module/Connedit.php:871
 msgid "Slide to adjust your rating"
 msgstr "Trascina per cambiare la tua valutazione"
 
-#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877
+#: ../../Code/Module/Connedit.php:872 ../../Code/Module/Connedit.php:877
 msgid "Optionally explain your rating"
 msgstr "Commento facoltativo"
 
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Code/Module/Connedit.php:874
 msgid "Custom Filter"
 msgstr "Filtro personalizzato"
 
-#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../Code/Module/Connedit.php:875
 msgid "Only import posts with this text"
 msgstr "Importa solo i post che contengono queste parole chiave"
 
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:875 ../../Code/Module/Connedit.php:876
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "per ogni riga: parole, #tag, /pattern/ o lang=xx , lascia vuoto per importare tutto"
 
-#: ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:876
 msgid "Do not import posts with this text"
 msgstr "Non importare i post con queste parole chiave"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Code/Module/Connedit.php:878
 msgid "This information is public!"
 msgstr "Questa informazione è pubblica!"
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Code/Module/Connedit.php:883
 msgid "Connection Pending Approval"
 msgstr "Contatti in attesa di approvazione"
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Code/Module/Connedit.php:888
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Seleziona il profilo che vuoi mostrare a %s dopo che ha effettuato l'accesso."
 
-#: ../../Zotlabs/Module/Connedit.php:895
+#: ../../Code/Module/Connedit.php:895
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -5756,217 +5756,217 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Alcuni permessi derivano dalle impostazioni di privacy del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Le personalizzazioni che effettuerai qui potrebbero non essere effettive a meno che tu non cambi le impostazioni generali."
 
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Code/Module/Connedit.php:896
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../Code/Module/Connedit.php:904
 msgid "Details"
 msgstr "Dettagli"
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Code/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Chat non trovata"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Code/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Lascia la chat"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Code/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Elimina questa chat"
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Code/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Non sono presente"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Code/Module/Chat.php:200
 msgid "I am online"
 msgstr "Sono online"
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Code/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Aggiungi questa chat ai segnalibri"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315
+#: ../../Code/Module/Chat.php:205 ../../Code/Module/Mail.php:241
+#: ../../Code/Module/Mail.php:362 ../../include/conversation.php:1315
 msgid "Please enter a link URL:"
 msgstr "Inserisci l'indirizzo del link:"
 
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766
+#: ../../Code/Module/Chat.php:206 ../../Code/Module/Mail.php:294
+#: ../../Code/Module/Mail.php:436 ../../Code/Lib/ThreadItem.php:766
 #: ../../include/conversation.php:1435
 msgid "Encrypt text"
 msgstr "Cifratura del messaggio"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Nuova chat"
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Code/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Nome chat"
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Code/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Scadenza dei messaggi della chat (minuti)"
 
-#: ../../Zotlabs/Module/Chat.php:250
+#: ../../Code/Module/Chat.php:250
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Le chat di %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Code/Module/Chat.php:255
 msgid "No chatrooms available"
 msgstr "Nessuna chat disponibile"
 
-#: ../../Zotlabs/Module/Chat.php:259
+#: ../../Code/Module/Chat.php:259
 msgid "Expiration"
 msgstr "Scadenza"
 
-#: ../../Zotlabs/Module/Chat.php:260
+#: ../../Code/Module/Chat.php:260
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248
+#: ../../Code/Module/Fbrowser.php:29 ../../Code/Lib/Apps.php:248
 #: ../../include/conversation.php:1834 ../../include/nav.php:401
 msgid "Photos"
 msgstr "Foto"
 
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243
-#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842
+#: ../../Code/Module/Fbrowser.php:85 ../../Code/Lib/Apps.php:243
+#: ../../Code/Storage/Browser.php:272 ../../include/conversation.php:1842
 #: ../../include/nav.php:409
 msgid "Files"
 msgstr "Archivio file"
 
-#: ../../Zotlabs/Module/Menu.php:49
+#: ../../Code/Module/Menu.php:49
 msgid "Unable to update menu."
 msgstr "Impossibile aggiornare il menù."
 
-#: ../../Zotlabs/Module/Menu.php:60
+#: ../../Code/Module/Menu.php:60
 msgid "Unable to create menu."
 msgstr "Impossibile creare il menù."
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+#: ../../Code/Module/Menu.php:98 ../../Code/Module/Menu.php:110
 msgid "Menu Name"
 msgstr "Nome del menu"
 
-#: ../../Zotlabs/Module/Menu.php:98
+#: ../../Code/Module/Menu.php:98
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Nome unico (non visibile sulla pagina) - obbligatorio"
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+#: ../../Code/Module/Menu.php:99 ../../Code/Module/Menu.php:111
 msgid "Menu Title"
 msgstr "Titolo del menu"
 
-#: ../../Zotlabs/Module/Menu.php:99
+#: ../../Code/Module/Menu.php:99
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Visibile sulla pagina - lascia vuoto per non avere un titolo"
 
-#: ../../Zotlabs/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:100
 msgid "Allow Bookmarks"
 msgstr "Permetti i segnalibri"
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Puoi salvare i segnalibri nei menù"
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+#: ../../Code/Module/Menu.php:101 ../../Code/Module/Menu.php:159
 msgid "Submit and proceed"
 msgstr "Salva e procedi"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423
+#: ../../Code/Module/Menu.php:107 ../../include/text.php:2423
 msgid "Menus"
 msgstr "Menù"
 
-#: ../../Zotlabs/Module/Menu.php:117
+#: ../../Code/Module/Menu.php:117
 msgid "Bookmarks allowed"
 msgstr "Permetti segnalibri"
 
-#: ../../Zotlabs/Module/Menu.php:119
+#: ../../Code/Module/Menu.php:119
 msgid "Delete this menu"
 msgstr "Elimina questo menù"
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+#: ../../Code/Module/Menu.php:120 ../../Code/Module/Menu.php:154
 msgid "Edit menu contents"
 msgstr "Modifica i contenuti del menù"
 
-#: ../../Zotlabs/Module/Menu.php:121
+#: ../../Code/Module/Menu.php:121
 msgid "Edit this menu"
 msgstr "Modifica questo menù"
 
-#: ../../Zotlabs/Module/Menu.php:136
+#: ../../Code/Module/Menu.php:136
 msgid "Menu could not be deleted."
 msgstr "Il menù non può essere eliminato."
 
-#: ../../Zotlabs/Module/Menu.php:149
+#: ../../Code/Module/Menu.php:149
 msgid "Edit Menu"
 msgstr "Modifica menù"
 
-#: ../../Zotlabs/Module/Menu.php:153
+#: ../../Code/Module/Menu.php:153
 msgid "Add or remove entries to this menu"
 msgstr "Aggiungi o rimuovi elementi di questo menù"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Menu name"
 msgstr "Nome del menù"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Must be unique, only seen by you"
 msgstr "Deve essere unico, lo vedrai solo tu"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title"
 msgstr "Titolo del menù"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title as seen by others"
 msgstr "Titolo del menù come comparirà a tutti"
 
-#: ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:157
 msgid "Allow bookmarks"
 msgstr "Permetti l'invio di segnalibri"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424
+#: ../../Code/Module/Layouts.php:184 ../../include/text.php:2424
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251
+#: ../../Code/Module/Layouts.php:186 ../../Code/Lib/Apps.php:251
 #: ../../include/nav.php:176 ../../include/nav.php:280
 #: ../../include/help.php:68 ../../include/help.php:74
 msgid "Help"
 msgstr "Guida"
 
-#: ../../Zotlabs/Module/Layouts.php:186
+#: ../../Code/Module/Layouts.php:186
 msgid "Comanche page description language help"
 msgstr "Guida di Comanche Page Description Language"
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Code/Module/Layouts.php:190
 msgid "Layout Description"
 msgstr "Descrizione del layout"
 
-#: ../../Zotlabs/Module/Layouts.php:195
+#: ../../Code/Module/Layouts.php:195
 msgid "Download PDL file"
 msgstr "Scarica il file PDL"
 
-#: ../../Zotlabs/Module/Cloud.php:120
+#: ../../Code/Module/Cloud.php:120
 msgid "Please refresh page"
 msgstr "Per favore ricarica la pagina"
 
-#: ../../Zotlabs/Module/Cloud.php:123
+#: ../../Code/Module/Cloud.php:123
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: ../../Zotlabs/Module/Email_validation.php:24
-#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Code/Module/Email_validation.php:24
+#: ../../Code/Module/Email_resend.php:12
 msgid "Token verification failed."
 msgstr "Verifica del token fallita"
 
-#: ../../Zotlabs/Module/Email_validation.php:36
+#: ../../Code/Module/Email_validation.php:36
 msgid "Email Verification Required"
 msgstr "È richiesta una verifica della mail"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../Code/Module/Email_validation.php:37
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -5974,1164 +5974,1164 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr "Un token di verifica è stato spedito al tuo indirizzo email [%s]. Inserisci il token qui per completare la verifica dell'account. Per favore attendi qualche minuti e controlla lo spam se non vedi il messaggio."
 
-#: ../../Zotlabs/Module/Email_validation.php:38
+#: ../../Code/Module/Email_validation.php:38
 msgid "Resend Email"
 msgstr "Reinvia la mail"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
+#: ../../Code/Module/Email_validation.php:41
 msgid "Validation token"
 msgstr "Token di validazione"
 
-#: ../../Zotlabs/Module/Tagger.php:48
+#: ../../Code/Module/Tagger.php:48
 msgid "Post not found."
 msgstr "Post non trovato."
 
-#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160
+#: ../../Code/Module/Tagger.php:77 ../../include/markdown.php:160
 #: ../../include/bbcode.php:352
 msgid "post"
 msgstr "il post"
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
+#: ../../Code/Module/Tagger.php:79 ../../include/conversation.php:146
 #: ../../include/text.php:2013
 msgid "comment"
 msgstr "il commento"
 
-#: ../../Zotlabs/Module/Tagger.php:119
+#: ../../Code/Module/Tagger.php:119
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s ha taggato %3$s di %2$s con %4$s"
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:26 ../../Code/Module/Pconfig.php:59
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Questa impostazione è bloccata, richiede criteri di modifica speciali"
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Code/Module/Pconfig.php:48
 msgid "Configuration Editor"
 msgstr "Editor di configurazione"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Code/Module/Pconfig.php:49
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please"
 " leave this page unless you are comfortable with and knowledgeable about how"
 " to correctly use this feature."
 msgstr "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare."
 
-#: ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Defperms.php:239
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr "Se abilitato, le richieste di contatto saranno approvate automaticamente"
 
-#: ../../Zotlabs/Module/Defperms.php:246
+#: ../../Code/Module/Defperms.php:246
 msgid "Automatic approval settings"
 msgstr "Impostazioni di approvazione automatica"
 
-#: ../../Zotlabs/Module/Defperms.php:254
+#: ../../Code/Module/Defperms.php:254
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:17
+#: ../../Code/Module/Authorize.php:17
 msgid "Unknown App"
 msgstr "Applicazione sconosciuta"
 
-#: ../../Zotlabs/Module/Authorize.php:22
+#: ../../Code/Module/Authorize.php:22
 msgid "Authorize"
 msgstr "Autorizza"
 
-#: ../../Zotlabs/Module/Authorize.php:23
+#: ../../Code/Module/Authorize.php:23
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr "Autorizzi la app %s ad accedere ai dati del tuo canale?"
 
-#: ../../Zotlabs/Module/Authorize.php:25
+#: ../../Code/Module/Authorize.php:25
 msgid "Allow"
 msgstr "Autorizza"
 
-#: ../../Zotlabs/Module/Group.php:24
+#: ../../Code/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Gruppo di canali creato."
 
-#: ../../Zotlabs/Module/Group.php:30
+#: ../../Code/Module/Group.php:30
 msgid "Could not create privacy group."
 msgstr "Impossibile creare il gruppo di canali."
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
+#: ../../Code/Module/Group.php:42 ../../Code/Module/Group.php:143
 #: ../../include/items.php:4181
 msgid "Privacy group not found."
 msgstr "Gruppo di canali non trovato."
 
-#: ../../Zotlabs/Module/Group.php:58
+#: ../../Code/Module/Group.php:58
 msgid "Privacy group updated."
 msgstr "Gruppo di canali aggiornato."
 
-#: ../../Zotlabs/Module/Group.php:92
+#: ../../Code/Module/Group.php:92
 msgid "Create a group of channels."
 msgstr "Crea un gruppo di canali."
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186
+#: ../../Code/Module/Group.php:93 ../../Code/Module/Group.php:186
 msgid "Privacy group name: "
 msgstr "Nome del gruppo di canali:"
 
-#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189
+#: ../../Code/Module/Group.php:95 ../../Code/Module/Group.php:189
 msgid "Members are visible to other channels"
 msgstr "I membri potranno vedere gli altri canali del gruppo"
 
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Code/Module/Group.php:113
 msgid "Privacy group removed."
 msgstr "Gruppo di canali rimosso."
 
-#: ../../Zotlabs/Module/Group.php:115
+#: ../../Code/Module/Group.php:115
 msgid "Unable to remove privacy group."
 msgstr "Impossibile rimuovere il gruppo di canali."
 
-#: ../../Zotlabs/Module/Group.php:185
+#: ../../Code/Module/Group.php:185
 msgid "Privacy group editor"
 msgstr "Editor dei gruppi di canali"
 
-#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81
+#: ../../Code/Module/Group.php:199 ../../Code/Module/Help.php:81
 msgid "Members"
 msgstr "Membri"
 
-#: ../../Zotlabs/Module/Group.php:201
+#: ../../Code/Module/Group.php:201
 msgid "All Connected Channels"
 msgstr "Tutti i canali connessi"
 
-#: ../../Zotlabs/Module/Group.php:233
+#: ../../Code/Module/Group.php:233
 msgid "Click on a channel to add or remove."
 msgstr "Clicca su un canale per aggiungerlo o rimuoverlo."
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+#: ../../Code/Module/Profiles.php:24 ../../Code/Module/Profiles.php:184
+#: ../../Code/Module/Profiles.php:241 ../../Code/Module/Profiles.php:659
 msgid "Profile not found."
 msgstr "Profilo non trovato."
 
-#: ../../Zotlabs/Module/Profiles.php:44
+#: ../../Code/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Profilo eliminato."
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+#: ../../Code/Module/Profiles.php:68 ../../Code/Module/Profiles.php:105
 msgid "Profile-"
 msgstr "Profilo-"
 
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+#: ../../Code/Module/Profiles.php:90 ../../Code/Module/Profiles.php:127
 msgid "New profile created."
 msgstr "Il nuovo profilo è stato creato."
 
-#: ../../Zotlabs/Module/Profiles.php:111
+#: ../../Code/Module/Profiles.php:111
 msgid "Profile unavailable to clone."
 msgstr "Impossibile duplicare il profilo."
 
-#: ../../Zotlabs/Module/Profiles.php:146
+#: ../../Code/Module/Profiles.php:146
 msgid "Profile unavailable to export."
 msgstr "Il profilo non è disponibile per l'export."
 
-#: ../../Zotlabs/Module/Profiles.php:252
+#: ../../Code/Module/Profiles.php:252
 msgid "Profile Name is required."
 msgstr "Il nome del profilo è obbligatorio."
 
-#: ../../Zotlabs/Module/Profiles.php:459
+#: ../../Code/Module/Profiles.php:459
 msgid "Marital Status"
 msgstr "Stato sentimentale"
 
-#: ../../Zotlabs/Module/Profiles.php:463
+#: ../../Code/Module/Profiles.php:463
 msgid "Romantic Partner"
 msgstr "Partner affettivo"
 
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772
+#: ../../Code/Module/Profiles.php:467 ../../Code/Module/Profiles.php:772
 msgid "Likes"
 msgstr "\"Mi piace\""
 
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773
+#: ../../Code/Module/Profiles.php:471 ../../Code/Module/Profiles.php:773
 msgid "Dislikes"
 msgstr "\"Non mi piace\""
 
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780
+#: ../../Code/Module/Profiles.php:475 ../../Code/Module/Profiles.php:780
 msgid "Work/Employment"
 msgstr "Lavoro/impiego"
 
-#: ../../Zotlabs/Module/Profiles.php:478
+#: ../../Code/Module/Profiles.php:478
 msgid "Religion"
 msgstr "Religione"
 
-#: ../../Zotlabs/Module/Profiles.php:482
+#: ../../Code/Module/Profiles.php:482
 msgid "Political Views"
 msgstr "Orientamento politico"
 
-#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../Code/Module/Profiles.php:486
 #: ../../addon/openid/MysqlProvider.php:74
 msgid "Gender"
 msgstr "Sesso"
 
-#: ../../Zotlabs/Module/Profiles.php:490
+#: ../../Code/Module/Profiles.php:490
 msgid "Sexual Preference"
 msgstr "Preferenze sessuali"
 
-#: ../../Zotlabs/Module/Profiles.php:494
+#: ../../Code/Module/Profiles.php:494
 msgid "Homepage"
 msgstr "Home page"
 
-#: ../../Zotlabs/Module/Profiles.php:498
+#: ../../Code/Module/Profiles.php:498
 msgid "Interests"
 msgstr "Interessi"
 
-#: ../../Zotlabs/Module/Profiles.php:594
+#: ../../Code/Module/Profiles.php:594
 msgid "Profile updated."
 msgstr "Profilo aggiornato."
 
-#: ../../Zotlabs/Module/Profiles.php:678
+#: ../../Code/Module/Profiles.php:678
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Nascondi la tua lista di contatti ai visitatori di questo profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Code/Module/Profiles.php:722
 msgid "Edit Profile Details"
 msgstr "Modifica i dettagli del profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Code/Module/Profiles.php:724
 msgid "View this profile"
 msgstr "Guarda questo profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824
+#: ../../Code/Module/Profiles.php:725 ../../Code/Module/Profiles.php:824
 #: ../../include/channel.php:1319
 msgid "Edit visibility"
 msgstr "Cambia la visibilità"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Profile Tools"
 msgstr "Gestione del profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Change cover photo"
 msgstr "Cambia la copertina del canale"
 
-#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289
+#: ../../Code/Module/Profiles.php:728 ../../include/channel.php:1289
 msgid "Change profile photo"
 msgstr "Cambia la foto del profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Code/Module/Profiles.php:729
 msgid "Create a new profile using these settings"
 msgstr "Crea un nuovo profilo usando queste impostazioni"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Clone this profile"
 msgstr "Clona questo profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Profiles.php:731
 msgid "Delete this profile"
 msgstr "Elimina questo profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Profiles.php:732
 msgid "Add profile things"
 msgstr "Aggiungi oggetti al profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708
+#: ../../Code/Module/Profiles.php:733 ../../include/conversation.php:1708
 msgid "Personal"
 msgstr "Personali"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Relationship"
 msgstr "Relazione"
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44
+#: ../../Code/Module/Profiles.php:736 ../../Code/Widget/Newmember.php:44
 #: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr "Altro"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Import profile from file"
 msgstr "Importa il profilo da un file"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Export profile to file"
 msgstr "Esporta il profilo in un file"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Your gender"
 msgstr "Sesso"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Marital status"
 msgstr "Stato civile"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Code/Module/Profiles.php:742
 msgid "Sexual preference"
 msgstr "Preferenze sessuali"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:745
 msgid "Profile name"
 msgstr "Nome del profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Code/Module/Profiles.php:747
 msgid "This is your default profile."
 msgstr "Questo è il tuo profilo predefinito."
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Profiles.php:749
 msgid "Your full name"
 msgstr "Il tuo nome completo"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Code/Module/Profiles.php:750
 msgid "Title/Description"
 msgstr "Titolo/descrizione"
 
-#: ../../Zotlabs/Module/Profiles.php:753
+#: ../../Code/Module/Profiles.php:753
 msgid "Street address"
 msgstr "Indirizzo (via/piazza)"
 
-#: ../../Zotlabs/Module/Profiles.php:754
+#: ../../Code/Module/Profiles.php:754
 msgid "Locality/City"
 msgstr "Località"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Code/Module/Profiles.php:755
 msgid "Region/State"
 msgstr "Regione/stato"
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Code/Module/Profiles.php:756
 msgid "Postal/Zip code"
 msgstr "CAP"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Who (if applicable)"
 msgstr "Con chi (se possibile)"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../Zotlabs/Module/Profiles.php:763
+#: ../../Code/Module/Profiles.php:763
 msgid "Since (date)"
 msgstr "dal (data)"
 
-#: ../../Zotlabs/Module/Profiles.php:766
+#: ../../Code/Module/Profiles.php:766
 msgid "Tell us about yourself"
 msgstr "Raccontaci di te..."
 
-#: ../../Zotlabs/Module/Profiles.php:767
+#: ../../Code/Module/Profiles.php:767
 #: ../../addon/openid/MysqlProvider.php:68
 msgid "Homepage URL"
 msgstr "Indirizzo home page"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Code/Module/Profiles.php:768
 msgid "Hometown"
 msgstr "Città dove vivo"
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Code/Module/Profiles.php:769
 msgid "Political views"
 msgstr "Orientamento politico"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Code/Module/Profiles.php:770
 msgid "Religious views"
 msgstr "Orientamento religioso"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Keywords used in directory listings"
 msgstr "Parole chiavi mostrate nell'elenco dei canali"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Example: fishing photography software"
 msgstr "Per esempio: pesca fotografia programmazione"
 
-#: ../../Zotlabs/Module/Profiles.php:774
+#: ../../Code/Module/Profiles.php:774
 msgid "Musical interests"
 msgstr "Interessi musicali"
 
-#: ../../Zotlabs/Module/Profiles.php:775
+#: ../../Code/Module/Profiles.php:775
 msgid "Books, literature"
 msgstr "Libri, letteratura"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Code/Module/Profiles.php:776
 msgid "Television"
 msgstr "Televisione"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Code/Module/Profiles.php:777
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Film, danza, cultura, intrattenimento"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Profiles.php:778
 msgid "Hobbies/Interests"
 msgstr "Hobby/interessi"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Code/Module/Profiles.php:779
 msgid "Love/Romance"
 msgstr "Amore"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Code/Module/Profiles.php:781
 msgid "School/Education"
 msgstr "Scuola/educazione"
 
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Code/Module/Profiles.php:782
 msgid "Contact information and social networks"
 msgstr "Contatti e social network"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Code/Module/Profiles.php:783
 msgid "My other channels"
 msgstr "I miei altri canali"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Code/Module/Profiles.php:785
 msgid "Communications"
 msgstr "Comunicazioni"
 
-#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315
+#: ../../Code/Module/Profiles.php:820 ../../include/channel.php:1315
 msgid "Profile Image"
 msgstr "Immagine del profilo"
 
-#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296
+#: ../../Code/Module/Profiles.php:830 ../../include/channel.php:1296
 #: ../../include/nav.php:117
 msgid "Edit Profiles"
 msgstr "Modifica i tuoi profili"
 
-#: ../../Zotlabs/Module/Go.php:21
+#: ../../Code/Module/Go.php:21
 msgid "This page is available only to site members"
 msgstr "Questa pagina è accessibile solo agli utenti registrati"
 
-#: ../../Zotlabs/Module/Go.php:27
+#: ../../Code/Module/Go.php:27
 msgid "Welcome"
 msgstr "Benvenuto"
 
-#: ../../Zotlabs/Module/Go.php:29
+#: ../../Code/Module/Go.php:29
 msgid "What would you like to do?"
 msgstr "Vorresti farlo?"
 
-#: ../../Zotlabs/Module/Go.php:31
+#: ../../Code/Module/Go.php:31
 msgid ""
 "Please bookmark this page if you would like to return to it in the future"
 msgstr "Per favore metti questa pagina nei preferiti se vuoi ritornarci in futuro"
 
-#: ../../Zotlabs/Module/Go.php:35
+#: ../../Code/Module/Go.php:35
 msgid "Upload a profile photo"
 msgstr "Carica una foto per il profilo"
 
-#: ../../Zotlabs/Module/Go.php:36
+#: ../../Code/Module/Go.php:36
 msgid "Upload a cover photo"
 msgstr "Carica una foto di copertina"
 
-#: ../../Zotlabs/Module/Go.php:37
+#: ../../Code/Module/Go.php:37
 msgid "Edit your default profile"
 msgstr "Modifica il tuo profilo predefinito"
 
-#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34
+#: ../../Code/Module/Go.php:38 ../../Code/Widget/Newmember.php:34
 msgid "View friend suggestions"
 msgstr "Guarda i suggerimenti di amicizia"
 
-#: ../../Zotlabs/Module/Go.php:39
+#: ../../Code/Module/Go.php:39
 msgid "View the channel directory"
 msgstr "Guarda l'elenco dei canali"
 
-#: ../../Zotlabs/Module/Go.php:40
+#: ../../Code/Module/Go.php:40
 msgid "View/edit your channel settings"
 msgstr "Guarda/modifica le impostazioni del tuo canale"
 
-#: ../../Zotlabs/Module/Go.php:41
+#: ../../Code/Module/Go.php:41
 msgid "View the site or project documentation"
 msgstr "Guarda la documentazione del sito o del progetto"
 
-#: ../../Zotlabs/Module/Go.php:42
+#: ../../Code/Module/Go.php:42
 msgid "Visit your channel homepage"
 msgstr "Visita la pagina iniziale del tuo canale"
 
-#: ../../Zotlabs/Module/Go.php:43
+#: ../../Code/Module/Go.php:43
 msgid ""
 "View your connections and/or add somebody whose address you already know"
 msgstr "Guarda i tuoi contatti e/o aggiungine qualcuno di cui hai l'indirizzo"
 
-#: ../../Zotlabs/Module/Go.php:44
+#: ../../Code/Module/Go.php:44
 msgid ""
 "View your personal stream (this may be empty until you add some connections)"
 msgstr "Guarda il tuo flusso personale (potrebbe essere vuoto finché non aggiungi connessioni)"
 
-#: ../../Zotlabs/Module/Go.php:52
+#: ../../Code/Module/Go.php:52
 msgid "View the public stream. Warning: this content is not moderated"
 msgstr "Vedi il flusso pubblico. Attenzione: contenuti non moderati"
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
+#: ../../Code/Module/Editwebpage.php:139
 msgid "Page link"
 msgstr "Link alla pagina"
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
+#: ../../Code/Module/Editwebpage.php:166
 msgid "Edit Webpage"
 msgstr "Modifica la pagina web"
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Manage.php:145
 msgid "Create a new channel"
 msgstr "Crea un nuovo canale"
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240
+#: ../../Code/Module/Manage.php:170 ../../Code/Lib/Apps.php:240
 #: ../../include/nav.php:102 ../../include/nav.php:190
 msgid "Channel Manager"
 msgstr "Gestione canali"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Code/Module/Manage.php:171
 msgid "Current Channel"
 msgstr "Canale attuale"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Code/Module/Manage.php:173
 msgid "Switch to one of your channels by selecting it."
 msgstr "Seleziona l'altro canale a cui vuoi passare."
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Code/Module/Manage.php:174
 msgid "Default Channel"
 msgstr "Canale predefinito"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Code/Module/Manage.php:175
 msgid "Make Default"
 msgstr "Rendi predefinito"
 
-#: ../../Zotlabs/Module/Manage.php:178
+#: ../../Code/Module/Manage.php:178
 #, php-format
 msgid "%d new messages"
 msgstr "%d nuovi messaggi"
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Code/Module/Manage.php:179
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nuove richieste di entrare in contatto"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Code/Module/Manage.php:181
 msgid "Delegated Channel"
 msgstr "Canale delegato"
 
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893
+#: ../../Code/Module/Cards.php:42 ../../Code/Module/Cards.php:194
+#: ../../Code/Lib/Apps.php:230 ../../include/conversation.php:1893
 #: ../../include/features.php:123 ../../include/nav.php:458
 msgid "Cards"
 msgstr "Card"
 
-#: ../../Zotlabs/Module/Cards.php:99
+#: ../../Code/Module/Cards.php:99
 msgid "Add Card"
 msgstr "Aggiungi card"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
+#: ../../Code/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "Questo directory server necessita di un token di autenticazione"
 
-#: ../../Zotlabs/Module/Siteinfo.php:18
+#: ../../Code/Module/Siteinfo.php:18
 msgid "About this site"
 msgstr "Informazioni su questo sito"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Code/Module/Siteinfo.php:19
 msgid "Site Name"
 msgstr "Nome del sito"
 
-#: ../../Zotlabs/Module/Siteinfo.php:23
+#: ../../Code/Module/Siteinfo.php:23
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232
+#: ../../Code/Module/Siteinfo.php:25 ../../Code/Module/Register.php:232
 msgid "Terms of Service"
 msgstr "Condizioni d'Uso"
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
+#: ../../Code/Module/Siteinfo.php:26
 msgid "Software and Project information"
 msgstr "Informazioni sul software e sul progetto"
 
-#: ../../Zotlabs/Module/Siteinfo.php:27
+#: ../../Code/Module/Siteinfo.php:27
 msgid "This site is powered by $Projectname"
 msgstr "Questo sito è costruito con $Projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Code/Module/Siteinfo.php:28
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Code/Module/Siteinfo.php:30
 #, php-format
 msgid "Version %s"
 msgstr "Versione %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../Code/Module/Siteinfo.php:31
 msgid "Project homepage"
 msgstr "Homepage del progetto"
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Code/Module/Siteinfo.php:32
 msgid "Developer homepage"
 msgstr "Homepege dello sviluppatore"
 
-#: ../../Zotlabs/Module/Ratings.php:70
+#: ../../Code/Module/Ratings.php:70
 msgid "No ratings"
 msgstr "Nessuna valutazione"
 
-#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
+#: ../../Code/Module/Ratings.php:97 ../../Code/Module/Pubsites.php:35
 #: ../../include/conversation.php:1082
 msgid "Ratings"
 msgstr "Valutazioni"
 
-#: ../../Zotlabs/Module/Ratings.php:98
+#: ../../Code/Module/Ratings.php:98
 msgid "Rating: "
 msgstr "Valutazione:"
 
-#: ../../Zotlabs/Module/Ratings.php:99
+#: ../../Code/Module/Ratings.php:99
 msgid "Website: "
 msgstr "Sito web:"
 
-#: ../../Zotlabs/Module/Ratings.php:101
+#: ../../Code/Module/Ratings.php:101
 msgid "Description: "
 msgstr "Descrizione:"
 
-#: ../../Zotlabs/Module/Webpages.php:54
+#: ../../Code/Module/Webpages.php:54
 msgid "Import Webpage Elements"
 msgstr "Importa gli elementi della pagina web"
 
-#: ../../Zotlabs/Module/Webpages.php:55
+#: ../../Code/Module/Webpages.php:55
 msgid "Import selected"
 msgstr "Importa i selezionati"
 
-#: ../../Zotlabs/Module/Webpages.php:78
+#: ../../Code/Module/Webpages.php:78
 msgid "Export Webpage Elements"
 msgstr "Esporta gli elementi della pagina web"
 
-#: ../../Zotlabs/Module/Webpages.php:79
+#: ../../Code/Module/Webpages.php:79
 msgid "Export selected"
 msgstr "Esporta i selezionati"
 
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244
+#: ../../Code/Module/Webpages.php:237 ../../Code/Lib/Apps.php:244
 #: ../../include/conversation.php:1915 ../../include/nav.php:481
 msgid "Webpages"
 msgstr "Pagine web"
 
-#: ../../Zotlabs/Module/Webpages.php:248
+#: ../../Code/Module/Webpages.php:248
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../../Zotlabs/Module/Webpages.php:249
+#: ../../Code/Module/Webpages.php:249
 msgid "Page Link"
 msgstr "Link alla pagina"
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Code/Module/Webpages.php:250
 msgid "Page Title"
 msgstr "Titolo della pagina"
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Code/Module/Webpages.php:280
 msgid "Invalid file type."
 msgstr "Tipo di file non valido."
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Code/Module/Webpages.php:292
 msgid "Error opening zip file"
 msgstr "Errore nell'apertura del file zip"
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Code/Module/Webpages.php:303
 msgid "Invalid folder path."
 msgstr "La cartella indicata non è valida."
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Code/Module/Webpages.php:330
 msgid "No webpage elements detected."
 msgstr "Nella pagina web non sono presenti elementi."
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Code/Module/Webpages.php:405
 msgid "Import complete."
 msgstr "Importazione completata."
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
+#: ../../Code/Module/Changeaddr.php:35
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account"
 " password."
 msgstr "Non è possibile cambiare il nome del canale entro le 48 dal cambio della password dell'account."
 
-#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214
+#: ../../Code/Module/Changeaddr.php:46 ../../include/channel.php:214
 #: ../../include/channel.php:599
 msgid "Reserved nickname. Please choose another."
 msgstr "Nome utente riservato. Per favore scegline un altro."
 
-#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219
+#: ../../Code/Module/Changeaddr.php:51 ../../include/channel.php:219
 #: ../../include/channel.php:604
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Il nome dell'account è già in uso oppure ha dei caratteri non supportati."
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
+#: ../../Code/Module/Changeaddr.php:77
 msgid "Change channel nickname/address"
 msgstr "Cambia il nome/indirizzo del canale"
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Changeaddr.php:78
 msgid "Any/all connections on other networks will be lost!"
 msgstr "Tutti i contatti su altre reti saranno persi!"
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
+#: ../../Code/Module/Changeaddr.php:80
 msgid "New channel address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
+#: ../../Code/Module/Changeaddr.php:81
 msgid "Rename Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+#: ../../Code/Module/Editpost.php:38 ../../Code/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "L'elemento non è modificabile"
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144
+#: ../../Code/Module/Editpost.php:108 ../../Code/Module/Rpost.php:144
 msgid "Edit post"
 msgstr "Modifica post"
 
-#: ../../Zotlabs/Module/Dreport.php:45
+#: ../../Code/Module/Dreport.php:45
 msgid "Invalid message"
 msgstr "Messaggio non valido"
 
-#: ../../Zotlabs/Module/Dreport.php:78
+#: ../../Code/Module/Dreport.php:78
 msgid "no results"
 msgstr "nessun risultato"
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Code/Module/Dreport.php:93
 msgid "channel sync processed"
 msgstr "sincronizzazione del canale effettuata"
 
-#: ../../Zotlabs/Module/Dreport.php:97
+#: ../../Code/Module/Dreport.php:97
 msgid "queued"
 msgstr "in coda"
 
-#: ../../Zotlabs/Module/Dreport.php:101
+#: ../../Code/Module/Dreport.php:101
 msgid "posted"
 msgstr "inviato"
 
-#: ../../Zotlabs/Module/Dreport.php:105
+#: ../../Code/Module/Dreport.php:105
 msgid "accepted for delivery"
 msgstr "accettato per la spedizione"
 
-#: ../../Zotlabs/Module/Dreport.php:109
+#: ../../Code/Module/Dreport.php:109
 msgid "updated"
 msgstr "aggiornato"
 
-#: ../../Zotlabs/Module/Dreport.php:112
+#: ../../Code/Module/Dreport.php:112
 msgid "update ignored"
 msgstr "aggiornamento ignorato"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Code/Module/Dreport.php:115
 msgid "permission denied"
 msgstr "permessi non sufficienti"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Code/Module/Dreport.php:119
 msgid "recipient not found"
 msgstr "Destinatario non trovato"
 
-#: ../../Zotlabs/Module/Dreport.php:122
+#: ../../Code/Module/Dreport.php:122
 msgid "mail recalled"
 msgstr "messaggio richiamato dal mittente"
 
-#: ../../Zotlabs/Module/Dreport.php:125
+#: ../../Code/Module/Dreport.php:125
 msgid "duplicate mail received"
 msgstr "ricevuto messaggio duplicato"
 
-#: ../../Zotlabs/Module/Dreport.php:128
+#: ../../Code/Module/Dreport.php:128
 msgid "mail delivered"
 msgstr "messaggio recapitato"
 
-#: ../../Zotlabs/Module/Dreport.php:148
+#: ../../Code/Module/Dreport.php:148
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Rapporto di consegna - %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Code/Module/Dreport.php:151 ../../Code/Widget/Wiki_pages.php:39
+#: ../../Code/Widget/Wiki_pages.php:96
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../../Zotlabs/Module/Dreport.php:152
+#: ../../Code/Module/Dreport.php:152
 msgid "Redeliver"
 msgstr "Reinvia"
 
-#: ../../Zotlabs/Module/Sources.php:37
+#: ../../Code/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr "Impossibile creare la sorgente. Nessun canale selezionato."
 
-#: ../../Zotlabs/Module/Sources.php:51
+#: ../../Code/Module/Sources.php:51
 msgid "Source created."
 msgstr "Sorgente creata."
 
-#: ../../Zotlabs/Module/Sources.php:64
+#: ../../Code/Module/Sources.php:64
 msgid "Source updated."
 msgstr "Sorgente aggiornata."
 
-#: ../../Zotlabs/Module/Sources.php:90
+#: ../../Code/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292
+#: ../../Code/Module/Sources.php:96
+#: ../../Code/Widget/Settings_menu.php:133 ../../include/features.php:292
 msgid "Channel Sources"
 msgstr "Sorgenti del canale"
 
-#: ../../Zotlabs/Module/Sources.php:97
+#: ../../Code/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr "Gestisci le sorgenti dei contenuti del tuo canale."
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+#: ../../Code/Module/Sources.php:98 ../../Code/Module/Sources.php:108
 msgid "New Source"
 msgstr "Nuova sorgente"
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+#: ../../Code/Module/Sources.php:109 ../../Code/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importa nel tuo canale tutti o una parte dei contenuti dal canale seguente."
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr "Importa solo i contenuti che hanno queste parole (una per riga)"
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr "Lascia vuoto per importare tutti i contenuti pubblici"
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+#: ../../Code/Module/Sources.php:111 ../../Code/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "Nome del canale"
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr "Aggiungi le seguenti categorie ai post importati da questa sorgente (separate da virgola)"
 
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+#: ../../Code/Module/Sources.php:133 ../../Code/Module/Sources.php:161
 msgid "Source not found."
 msgstr "Sorgente non trovata."
 
-#: ../../Zotlabs/Module/Sources.php:140
+#: ../../Code/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "Modifica la sorgente"
 
-#: ../../Zotlabs/Module/Sources.php:141
+#: ../../Code/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "Elimina la sorgente"
 
-#: ../../Zotlabs/Module/Sources.php:169
+#: ../../Code/Module/Sources.php:169
 msgid "Source removed"
 msgstr "Sorgente eliminata"
 
-#: ../../Zotlabs/Module/Sources.php:171
+#: ../../Code/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr "Impossibile rimuovere la sorgente."
 
-#: ../../Zotlabs/Module/Like.php:54
+#: ../../Code/Module/Like.php:54
 msgid "Like/Dislike"
 msgstr "Mi piace/Non mi piace"
 
-#: ../../Zotlabs/Module/Like.php:59
+#: ../../Code/Module/Like.php:59
 msgid "This action is restricted to members."
 msgstr "Questa funzionalità è riservata agli iscritti."
 
-#: ../../Zotlabs/Module/Like.php:60
+#: ../../Code/Module/Like.php:60
 msgid ""
 "Please login with your $Projectname ID or register as a new $Projectname member to continue."
 msgstr "Per continuare devi accedere con il tuo identificativo $Projectname o registrarti come nuovo utente $Projectname."
 
-#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135
-#: ../../Zotlabs/Module/Like.php:173
+#: ../../Code/Module/Like.php:109 ../../Code/Module/Like.php:135
+#: ../../Code/Module/Like.php:173
 msgid "Invalid request."
 msgstr "Richiesta non valida."
 
-#: ../../Zotlabs/Module/Like.php:121 ../../include/conversation.php:122
+#: ../../Code/Module/Like.php:121 ../../include/conversation.php:122
 msgid "channel"
 msgstr "il canale"
 
-#: ../../Zotlabs/Module/Like.php:150
+#: ../../Code/Module/Like.php:150
 msgid "thing"
 msgstr "Oggetto"
 
-#: ../../Zotlabs/Module/Like.php:196
+#: ../../Code/Module/Like.php:196
 msgid "Channel unavailable."
 msgstr "Canale non trovato."
 
-#: ../../Zotlabs/Module/Like.php:244
+#: ../../Code/Module/Like.php:244
 msgid "Previous action reversed."
 msgstr "Il comando precedente è stato annullato."
 
-#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529
+#: ../../Code/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529
 #: ../../addon/pubcrawl/as.php:1423 ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s piace %3$s di %2$s"
 
-#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1425
+#: ../../Code/Module/Like.php:440 ../../addon/pubcrawl/as.php:1425
 #: ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s non piace %3$s di %2$s"
 
-#: ../../Zotlabs/Module/Like.php:442
+#: ../../Code/Module/Like.php:442
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s è d'accordo"
 
-#: ../../Zotlabs/Module/Like.php:444
+#: ../../Code/Module/Like.php:444
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s non è d'accordo"
 
-#: ../../Zotlabs/Module/Like.php:446
+#: ../../Code/Module/Like.php:446
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s non si esprime"
 
-#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072
+#: ../../Code/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s partecipa"
 
-#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074
+#: ../../Code/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s non partecipa"
 
-#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076
+#: ../../Code/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s forse partecipa"
 
-#: ../../Zotlabs/Module/Like.php:564
+#: ../../Code/Module/Like.php:564
 msgid "Action completed."
 msgstr "Comando completato."
 
-#: ../../Zotlabs/Module/Like.php:565
+#: ../../Code/Module/Like.php:565
 msgid "Thank you."
 msgstr "Grazie."
 
-#: ../../Zotlabs/Module/Directory.php:106
+#: ../../Code/Module/Directory.php:106
 msgid "No default suggestions were found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:255
+#: ../../Code/Module/Directory.php:255
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d valutazione"
 msgstr[1] "%d valutazioni"
 
-#: ../../Zotlabs/Module/Directory.php:266
+#: ../../Code/Module/Directory.php:266
 msgid "Gender: "
 msgstr "Sesso:"
 
-#: ../../Zotlabs/Module/Directory.php:268
+#: ../../Code/Module/Directory.php:268
 msgid "Status: "
 msgstr "Stato:"
 
-#: ../../Zotlabs/Module/Directory.php:270
+#: ../../Code/Module/Directory.php:270
 msgid "Homepage: "
 msgstr "Homepage:"
 
-#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564
+#: ../../Code/Module/Directory.php:319 ../../include/channel.php:1564
 msgid "Age:"
 msgstr "Età:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391
+#: ../../Code/Module/Directory.php:324 ../../include/channel.php:1391
 #: ../../include/event.php:54 ../../include/event.php:86
 msgid "Location:"
 msgstr "Luogo:"
 
-#: ../../Zotlabs/Module/Directory.php:330
+#: ../../Code/Module/Directory.php:330
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593
+#: ../../Code/Module/Directory.php:335 ../../include/channel.php:1593
 msgid "Hometown:"
 msgstr "Città dove vivo:"
 
-#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599
+#: ../../Code/Module/Directory.php:337 ../../include/channel.php:1599
 msgid "About:"
 msgstr "Informazioni:"
 
-#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../Code/Module/Directory.php:338 ../../Code/Module/Suggest.php:56
+#: ../../Code/Widget/Follow.php:32 ../../Code/Widget/Suggestions.php:44
 #: ../../include/conversation.php:1052 ../../include/channel.php:1376
 #: ../../include/connections.php:110
 msgid "Connect"
 msgstr "Aggiungi"
 
-#: ../../Zotlabs/Module/Directory.php:339
+#: ../../Code/Module/Directory.php:339
 msgid "Public Forum:"
 msgstr "Forum pubblico:"
 
-#: ../../Zotlabs/Module/Directory.php:342
+#: ../../Code/Module/Directory.php:342
 msgid "Keywords: "
 msgstr "Parole chiave:"
 
-#: ../../Zotlabs/Module/Directory.php:345
+#: ../../Code/Module/Directory.php:345
 msgid "Don't suggest"
 msgstr "Non fornire suggerimenti"
 
-#: ../../Zotlabs/Module/Directory.php:347
+#: ../../Code/Module/Directory.php:347
 msgid "Common connections (estimated):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Global Directory"
 msgstr "Elenchi pubblici globali"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Local Directory"
 msgstr "Elenco canali su questo hub"
 
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Code/Module/Directory.php:402
 msgid "Finding:"
 msgstr "Ricerca:"
 
-#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Code/Module/Directory.php:405 ../../Code/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Canali suggeriti"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "next page"
 msgstr "pagina successiva"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "previous page"
 msgstr "pagina precedente"
 
-#: ../../Zotlabs/Module/Directory.php:408
+#: ../../Code/Module/Directory.php:408
 msgid "Sort options"
 msgstr "Opzioni di ordinamento"
 
-#: ../../Zotlabs/Module/Directory.php:409
+#: ../../Code/Module/Directory.php:409
 msgid "Alphabetic"
 msgstr "Alfabetico"
 
-#: ../../Zotlabs/Module/Directory.php:410
+#: ../../Code/Module/Directory.php:410
 msgid "Reverse Alphabetic"
 msgstr "Alfabetico inverso"
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Code/Module/Directory.php:411
 msgid "Newest to Oldest"
 msgstr "Prima i più recenti"
 
-#: ../../Zotlabs/Module/Directory.php:412
+#: ../../Code/Module/Directory.php:412
 msgid "Oldest to Newest"
 msgstr "Prima i più vecchi"
 
-#: ../../Zotlabs/Module/Directory.php:429
+#: ../../Code/Module/Directory.php:429
 msgid "No entries (some entries may be hidden)."
 msgstr "Nessun risultato (qualche elemento potrebbe essere nascosto)."
 
-#: ../../Zotlabs/Module/Xchan.php:10
+#: ../../Code/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr "Ricerca canale"
 
-#: ../../Zotlabs/Module/Xchan.php:13
+#: ../../Code/Module/Xchan.php:13
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Cerca un canale (o un webbie) che inizia per:"
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Code/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "Nessun suggerimento disponibile. Se questo sito è nuovo, riprova tra 24 ore."
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Code/Module/Suggest.php:58 ../../Code/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr "Ignora/nascondi"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "Impossibile raggiungere il tuo hub."
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "Inviato!"
 
-#: ../../Zotlabs/Module/Mail.php:73
+#: ../../Code/Module/Mail.php:73
 msgid "Unable to lookup recipient."
 msgstr "Impossibile associare un destinatario."
 
-#: ../../Zotlabs/Module/Mail.php:80
+#: ../../Code/Module/Mail.php:80
 msgid "Unable to communicate with requested channel."
 msgstr "Impossibile comunicare con il canale richiesto."
 
-#: ../../Zotlabs/Module/Mail.php:87
+#: ../../Code/Module/Mail.php:87
 msgid "Cannot verify requested channel."
 msgstr "Impossibile verificare il canale richiesto."
 
-#: ../../Zotlabs/Module/Mail.php:105
+#: ../../Code/Module/Mail.php:105
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito."
 
-#: ../../Zotlabs/Module/Mail.php:160
+#: ../../Code/Module/Mail.php:160
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../../Zotlabs/Module/Mail.php:173
+#: ../../Code/Module/Mail.php:173
 msgid "message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:214
+#: ../../Code/Module/Mail.php:214
 msgid "Message recalled."
 msgstr "Messaggio revocato."
 
-#: ../../Zotlabs/Module/Mail.php:227
+#: ../../Code/Module/Mail.php:227
 msgid "Conversation removed."
 msgstr "Conversazione rimossa."
 
-#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
+#: ../../Code/Module/Mail.php:242 ../../Code/Module/Mail.php:363
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Scade il YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:270
+#: ../../Code/Module/Mail.php:270
 msgid "Requested channel is not in this network"
 msgstr "Il canale cercato non è in questa rete"
 
-#: ../../Zotlabs/Module/Mail.php:278
+#: ../../Code/Module/Mail.php:278
 msgid "Send Private Message"
 msgstr "Invia un messaggio privato"
 
-#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
+#: ../../Code/Module/Mail.php:279 ../../Code/Module/Mail.php:421
 msgid "To:"
 msgstr "A:"
 
-#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
+#: ../../Code/Module/Mail.php:282 ../../Code/Module/Mail.php:423
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../Code/Module/Mail.php:287 ../../Code/Module/Mail.php:429
 #: ../../include/conversation.php:1385
 msgid "Attach file"
 msgstr "Allega file"
 
-#: ../../Zotlabs/Module/Mail.php:289
+#: ../../Code/Module/Mail.php:289
 msgid "Send"
 msgstr "Invia"
 
-#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../Code/Module/Mail.php:292 ../../Code/Module/Mail.php:434
 #: ../../include/conversation.php:1430
 msgid "Set expiration date"
 msgstr "Data di scadenza"
 
-#: ../../Zotlabs/Module/Mail.php:393
+#: ../../Code/Module/Mail.php:393
 msgid "Delete message"
 msgstr "Elimina il messaggio"
 
-#: ../../Zotlabs/Module/Mail.php:394
+#: ../../Code/Module/Mail.php:394
 msgid "Delivery report"
 msgstr "Rapporto di trasmissione"
 
-#: ../../Zotlabs/Module/Mail.php:395
+#: ../../Code/Module/Mail.php:395
 msgid "Recall message"
 msgstr "Revoca il messaggio"
 
-#: ../../Zotlabs/Module/Mail.php:397
+#: ../../Code/Module/Mail.php:397
 msgid "Message has been recalled."
 msgstr "Il messaggio è stato revocato."
 
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Code/Module/Mail.php:414
 msgid "Delete Conversation"
 msgstr "Elimina la conversazione"
 
-#: ../../Zotlabs/Module/Mail.php:416
+#: ../../Code/Module/Mail.php:416
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "Non è disponibile alcun modo sicuro di comunicare con questo canale. Se possibile, prova a rispondere direttamente dalla pagina del profilo del mittente."
 
-#: ../../Zotlabs/Module/Mail.php:420
+#: ../../Code/Module/Mail.php:420
 msgid "Send Reply"
 msgstr "Invia la risposta"
 
-#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Code/Module/Mail.php:425
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Il tuo messaggio per %s (%s):"
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+#: ../../Code/Module/Pubsites.php:24 ../../Code/Widget/Pubsites.php:12
 msgid "Public Hubs"
 msgstr "Hub pubblici"
 
-#: ../../Zotlabs/Module/Pubsites.php:27
+#: ../../Code/Module/Pubsites.php:27
 msgid ""
 "The listed hubs allow public registration for the $Projectname network. All "
 "hubs in the network are interlinked so membership on any of them conveys "
@@ -7140,643 +7140,643 @@ msgid ""
 "additional details."
 msgstr "I siti elencati permettono la registrazione libera sulla rete $Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero fornire alcune funzionalità o l'intero servizio a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco."
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr "URL del hub"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr "Tipo di accesso"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr "Politica di registrazione"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Stats"
 msgstr "Statistiche"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Software"
 msgstr "Software"
 
-#: ../../Zotlabs/Module/Pubsites.php:49
+#: ../../Code/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Valuta"
 
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267
+#: ../../Code/Module/Impel.php:43 ../../include/bbcode.php:267
 msgid "webpage"
 msgstr "pagina web"
 
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273
+#: ../../Code/Module/Impel.php:48 ../../include/bbcode.php:273
 msgid "block"
 msgstr "block"
 
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270
+#: ../../Code/Module/Impel.php:53 ../../include/bbcode.php:270
 msgid "layout"
 msgstr "layout"
 
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276
+#: ../../Code/Module/Impel.php:60 ../../include/bbcode.php:276
 msgid "menu"
 msgstr "menu"
 
-#: ../../Zotlabs/Module/Impel.php:183
+#: ../../Code/Module/Impel.php:183
 #, php-format
 msgid "%s element installed"
 msgstr "%s elemento installato"
 
-#: ../../Zotlabs/Module/Impel.php:186
+#: ../../Code/Module/Impel.php:186
 #, php-format
 msgid "%s element installation failed"
 msgstr "Elementi con installazione fallita: %s"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Code/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr "Scegli una cartella di segnalibri"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Code/Module/Rbmark.php:99
 msgid "Save Bookmark"
 msgstr "Salva segnalibro"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Code/Module/Rbmark.php:100
 msgid "URL of bookmark"
 msgstr "URL del segnalibro"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Code/Module/Rbmark.php:105
 msgid "Or enter new bookmark folder name"
 msgstr "O inserisci il nome di una nuova cartella di segnalibri"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "Enter a folder name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "or select an existing folder (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151
+#: ../../Code/Module/Filer.php:54 ../../Code/Lib/ThreadItem.php:151
 msgid "Save to Folder"
 msgstr "Salva nella cartella"
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Code/Module/Probe.php:30 ../../Code/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "La chiamata all'URL restituisce questo errore: %1$s"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Code/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "È stato superato il numero massimo giornaliero di registrazioni a questo sito. Riprova domani!"
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Code/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Impossibile proseguire. Devi prima accettare le Condizioni d'Uso del servizio."
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Code/Module/Register.php:89
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: ../../Zotlabs/Module/Register.php:132
+#: ../../Code/Module/Register.php:132
 msgid "Registration successful. Continue to create your first channel..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:135
+#: ../../Code/Module/Register.php:135
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "La registrazione è terminata correttamente. Per continuare controlla l'email che ti è stata inviata."
 
-#: ../../Zotlabs/Module/Register.php:142
+#: ../../Code/Module/Register.php:142
 msgid "Your registration is pending approval by the site owner."
 msgstr "La tua richiesta è in attesa di approvazione da parte dell'amministratore di questo hub."
 
-#: ../../Zotlabs/Module/Register.php:145
+#: ../../Code/Module/Register.php:145
 msgid "Your registration can not be processed."
 msgstr "La tua registrazione non puo' essere processata."
 
-#: ../../Zotlabs/Module/Register.php:192
+#: ../../Code/Module/Register.php:192
 msgid "Registration on this hub is disabled."
 msgstr "Su questo hub la registrazione non è permessa."
 
-#: ../../Zotlabs/Module/Register.php:201
+#: ../../Code/Module/Register.php:201
 msgid "Registration on this hub is by approval only."
 msgstr "La registrazione su questo hub è soggetta ad approvazione."
 
-#: ../../Zotlabs/Module/Register.php:202
+#: ../../Code/Module/Register.php:202
 msgid "Register at another affiliated hub."
 msgstr "Registrati su un altro server hubzilla."
 
-#: ../../Zotlabs/Module/Register.php:212
+#: ../../Code/Module/Register.php:212
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Questo hub ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani."
 
-#: ../../Zotlabs/Module/Register.php:238
+#: ../../Code/Module/Register.php:238
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Accetto le %s di questo sito"
 
-#: ../../Zotlabs/Module/Register.php:245
+#: ../../Code/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:250
+#: ../../Code/Module/Register.php:250
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: ../../Zotlabs/Module/Register.php:251
+#: ../../Code/Module/Register.php:251
 msgid "Choose a password"
 msgstr "Scegli una password"
 
-#: ../../Zotlabs/Module/Register.php:252
+#: ../../Code/Module/Register.php:252
 msgid "Please re-enter your password"
 msgstr "Ripeti la password per verifica"
 
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Code/Module/Register.php:253
 msgid "Please enter your invitation code"
 msgstr "Inserisci il codice dell'invito"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Code/Module/Register.php:258
 msgid "no"
 msgstr "no"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Code/Module/Register.php:258
 msgid "yes"
 msgstr "sì"
 
-#: ../../Zotlabs/Module/Register.php:274
+#: ../../Code/Module/Register.php:274
 msgid "Membership on this site is by invitation only."
 msgstr "Per registrarsi su questo hub è necessario un invito."
 
-#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570
+#: ../../Code/Module/Register.php:286 ../../boot.php:1570
 #: ../../include/nav.php:164
 msgid "Register"
 msgstr "Registrati"
 
-#: ../../Zotlabs/Module/Register.php:287
+#: ../../Code/Module/Register.php:287
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:136
-#: ../../Zotlabs/Module/Cover_photo.php:186
+#: ../../Code/Module/Cover_photo.php:136
+#: ../../Code/Module/Cover_photo.php:186
 msgid "Cover Photos"
 msgstr "Copertine del canale"
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558
+#: ../../Code/Module/Cover_photo.php:237 ../../include/items.php:4558
 msgid "female"
 msgstr "femmina"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559
+#: ../../Code/Module/Cover_photo.php:238 ../../include/items.php:4559
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "Aggiornamento: %2$s di %1$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560
+#: ../../Code/Module/Cover_photo.php:239 ../../include/items.php:4560
 msgid "male"
 msgstr "maschio"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561
+#: ../../Code/Module/Cover_photo.php:240 ../../include/items.php:4561
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "Aggiornamento: %2$s di %1$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563
+#: ../../Code/Module/Cover_photo.php:242 ../../include/items.php:4563
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "Aggiornamento: %2$s di %1$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070
+#: ../../Code/Module/Cover_photo.php:244 ../../include/channel.php:2070
 msgid "cover photo"
 msgstr "Copertina del canale"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Code/Module/Cover_photo.php:361
 msgid "Change Cover Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:23
+#: ../../Code/Module/Help.php:23
 msgid "Documentation Search"
 msgstr "Ricerca nella guida"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824
+#: ../../Code/Module/Help.php:80 ../../include/conversation.php:1824
 #: ../../include/nav.php:391
 msgid "About"
 msgstr "Informazioni"
 
-#: ../../Zotlabs/Module/Help.php:82
+#: ../../Code/Module/Help.php:82
 msgid "Administrators"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:83
+#: ../../Code/Module/Help.php:83
 msgid "Developers"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:84
+#: ../../Code/Module/Help.php:84
 msgid "Tutorials"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:95
+#: ../../Code/Module/Help.php:95
 msgid "$Projectname Documentation"
 msgstr "Guida di $Projectname"
 
-#: ../../Zotlabs/Module/Help.php:96
+#: ../../Code/Module/Help.php:96
 msgid "Contents"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:394
+#: ../../Code/Module/Display.php:394
 msgid "Article"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:446
+#: ../../Code/Module/Display.php:446
 msgid "Item has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr "Tag rimosso"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr "Rimuovi il tag"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr "Seleziona un tag da rimuovere: "
 
-#: ../../Zotlabs/Module/Network.php:100
+#: ../../Code/Module/Network.php:100
 msgid "No such group"
 msgstr "Impossibile trovare il gruppo di canali"
 
-#: ../../Zotlabs/Module/Network.php:142
+#: ../../Code/Module/Network.php:142
 msgid "No such channel"
 msgstr "Canale sconosciuto"
 
-#: ../../Zotlabs/Module/Network.php:147
+#: ../../Code/Module/Network.php:147
 msgid "forum"
 msgstr "forum"
 
-#: ../../Zotlabs/Module/Network.php:159
+#: ../../Code/Module/Network.php:159
 msgid "Search Results For:"
 msgstr "Cerca risultati con:"
 
-#: ../../Zotlabs/Module/Network.php:229
+#: ../../Code/Module/Network.php:229
 msgid "Privacy group is empty"
 msgstr "Il gruppo di canali è vuoto"
 
-#: ../../Zotlabs/Module/Network.php:238
+#: ../../Code/Module/Network.php:238
 msgid "Privacy group: "
 msgstr "Gruppo di canali:"
 
-#: ../../Zotlabs/Module/Network.php:265
+#: ../../Code/Module/Network.php:265
 msgid "Invalid connection."
 msgstr "Contatto non valido."
 
-#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65
+#: ../../Code/Module/Network.php:285 ../../addon/redred/redred.php:65
 msgid "Invalid channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:361
+#: ../../Code/Module/Acl.php:361
 msgid "network"
 msgstr "rete"
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
+#: ../../Code/Module/Home.php:74 ../../Code/Module/Home.php:82
+#: ../../Code/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../Zotlabs/Module/Home.php:92
+#: ../../Code/Module/Home.php:92
 #, php-format
 msgid "Welcome to %s"
 msgstr "%s ti dà il benvenuto"
 
-#: ../../Zotlabs/Module/Filestorage.php:79
+#: ../../Code/Module/Filestorage.php:79
 msgid "Permission Denied."
 msgstr "Permesso negato."
 
-#: ../../Zotlabs/Module/Filestorage.php:95
+#: ../../Code/Module/Filestorage.php:95
 msgid "File not found."
 msgstr "File non trovato."
 
-#: ../../Zotlabs/Module/Filestorage.php:142
+#: ../../Code/Module/Filestorage.php:142
 msgid "Edit file permissions"
 msgstr "Modifica i permessi del file"
 
-#: ../../Zotlabs/Module/Filestorage.php:154
+#: ../../Code/Module/Filestorage.php:154
 msgid "Set/edit permissions"
 msgstr "Modifica i permessi"
 
-#: ../../Zotlabs/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:155
 msgid "Include all files and sub folders"
 msgstr "Includi tutti i file e le sottocartelle"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Code/Module/Filestorage.php:156
 msgid "Return to file list"
 msgstr "Torna all'elenco dei file"
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Code/Module/Filestorage.php:158
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Copia/incolla questo codice per far comparire il file in un post"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Code/Module/Filestorage.php:159
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Copia/incolla questo indirizzo in una pagina web per avere un link al file"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Code/Module/Filestorage.php:161
 msgid "Share this file"
 msgstr "Condividi questo file"
 
-#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Code/Module/Filestorage.php:162
 msgid "Show URL to this file"
 msgstr "Mostra l'URL del file"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397
 msgid "Show in your contacts shared folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
+#: ../../Code/Module/Common.php:14
 msgid "No channel."
 msgstr "Nessun canale."
 
-#: ../../Zotlabs/Module/Common.php:45
+#: ../../Code/Module/Common.php:45
 msgid "No connections in common."
 msgstr "Nessun contatto in comune."
 
-#: ../../Zotlabs/Module/Common.php:65
+#: ../../Code/Module/Common.php:65
 msgid "View Common Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_resend.php:30
+#: ../../Code/Module/Email_resend.php:30
 msgid "Email verification resent"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_resend.php:33
+#: ../../Code/Module/Email_resend.php:33
 msgid "Unable to resend email verification message."
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
+#: ../../Code/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Nessun contatto."
 
-#: ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Code/Module/Viewconnections.php:83
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visita il profilo di %s [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:113
+#: ../../Code/Module/Viewconnections.php:113
 msgid "View Connections"
 msgstr "Elenco contatti"
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Code/Module/Admin.php:97
 msgid "Blocked accounts"
 msgstr "Account bloccati"
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Code/Module/Admin.php:98
 msgid "Expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Code/Module/Admin.php:99
 msgid "Expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:112
+#: ../../Code/Module/Admin.php:112
 msgid "Clones"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:118
+#: ../../Code/Module/Admin.php:118
 msgid "Message queues"
 msgstr "Coda messaggi in uscita"
 
-#: ../../Zotlabs/Module/Admin.php:132
+#: ../../Code/Module/Admin.php:132
 msgid "Your software should be updated"
 msgstr "Il tuo software necessita di un aggiornamento"
 
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Code/Module/Admin.php:137
 msgid "Summary"
 msgstr "Riepilogo"
 
-#: ../../Zotlabs/Module/Admin.php:140
+#: ../../Code/Module/Admin.php:140
 msgid "Registered accounts"
 msgstr "Account creati"
 
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Code/Module/Admin.php:141
 msgid "Pending registrations"
 msgstr "Registrazioni da approvare"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Code/Module/Admin.php:142
 msgid "Registered channels"
 msgstr "Canali creati"
 
-#: ../../Zotlabs/Module/Admin.php:143
+#: ../../Code/Module/Admin.php:143
 msgid "Active plugins"
 msgstr "Plugin attivi"
 
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Code/Module/Admin.php:144
 msgid "Version"
 msgstr "Versione"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Code/Module/Admin.php:145
 msgid "Repository version (master)"
 msgstr "Versione del repository (master)"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Code/Module/Admin.php:146
 msgid "Repository version (dev)"
 msgstr "Versione del repository (dev)"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "Non esistono restrizioni su questa classe di account."
 
-#: ../../Zotlabs/Module/Rate.php:156
+#: ../../Code/Module/Rate.php:156
 msgid "Website:"
 msgstr "Sito web:"
 
-#: ../../Zotlabs/Module/Rate.php:159
+#: ../../Code/Module/Rate.php:159
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)"
 
-#: ../../Zotlabs/Module/Rate.php:160
+#: ../../Code/Module/Rate.php:160
 msgid "Rating (this information is public)"
 msgstr "Valutazione (visibile a tutti)"
 
-#: ../../Zotlabs/Module/Rate.php:161
+#: ../../Code/Module/Rate.php:161
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Commento alla valutazione (facoltativo, visibile a tutti)"
 
-#: ../../Zotlabs/Module/Card_edit.php:128
+#: ../../Code/Module/Card_edit.php:128
 msgid "Edit Card"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "Nessun account valido trovato."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "La richiesta per reimpostare la password è stata inviata. Controlla la tua email."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:108
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Utente del sito (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../Code/Module/Lostpass.php:44 ../../Code/Module/Lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "È stato richiesto di reimpostare password su %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../Code/Module/Lostpass.php:68
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598
+#: ../../Code/Module/Lostpass.php:91 ../../boot.php:1598
 msgid "Password Reset"
 msgstr "Reimposta la password"
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your password has been reset as requested."
 msgstr "La password è stata reimpostata come richiesto."
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Your new password is"
 msgstr "La tua nuova password è"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "Save or copy your new password - and then"
 msgstr "Salva o copia la tua nuova password, quindi"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid "click here to login"
 msgstr "clicca qui per accedere"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../Code/Module/Lostpass.php:96
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr "Puoi cambiare la tua password dalla pagina delle Impostazioni dopo aver effettuato l'accesso."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
+#: ../../Code/Module/Lostpass.php:117
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "La tua password su %s è cambiata"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Forgot your Password?"
 msgstr "Hai dimenticato la password?"
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../Code/Module/Lostpass.php:131
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Inserisci il tuo indirizzo email per reimpostare la password. Dopo aver inviato la richiesta, controlla l'email e troverai le istruzioni per continuare."
 
-#: ../../Zotlabs/Module/Lostpass.php:132
+#: ../../Code/Module/Lostpass.php:132
 msgid "Email Address"
 msgstr "Indirizzo email"
 
-#: ../../Zotlabs/Module/Notifications.php:62
-#: ../../Zotlabs/Lib/ThreadItem.php:408
+#: ../../Code/Module/Notifications.php:62
+#: ../../Code/Lib/ThreadItem.php:408
 msgid "Mark all seen"
 msgstr "Marca tutto come letto"
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Code/Lib/Techlevels.php:10
 msgid "0. Beginner/Basic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Code/Lib/Techlevels.php:11
 msgid "1. Novice - not skilled but willing to learn"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Code/Lib/Techlevels.php:12
 msgid "2. Intermediate - somewhat comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Code/Lib/Techlevels.php:13
 msgid "3. Advanced - very comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Code/Lib/Techlevels.php:14
 msgid "4. Expert - I can write computer code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Code/Lib/Techlevels.php:15
 msgid "5. Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:231
+#: ../../Code/Lib/Apps.php:231
 msgid "Site Admin"
 msgstr "Amministrazione sito"
 
-#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16
+#: ../../Code/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr "Segnala il bug"
 
-#: ../../Zotlabs/Lib/Apps.php:233
+#: ../../Code/Lib/Apps.php:233
 msgid "View Bookmarks"
 msgstr "Vedi i segnalibri"
 
-#: ../../Zotlabs/Lib/Apps.php:234
+#: ../../Code/Lib/Apps.php:234
 msgid "My Chatrooms"
 msgstr "Le mie aree chat"
 
-#: ../../Zotlabs/Lib/Apps.php:236
+#: ../../Code/Lib/Apps.php:236
 msgid "Firefox Share"
 msgstr "Firefox Share"
 
-#: ../../Zotlabs/Lib/Apps.php:237
+#: ../../Code/Lib/Apps.php:237
 msgid "Remote Diagnostics"
 msgstr "Diagnostica remota"
 
-#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417
+#: ../../Code/Lib/Apps.php:238 ../../include/features.php:417
 msgid "Suggest Channels"
 msgstr "Suggerisci canali"
 
-#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589
+#: ../../Code/Lib/Apps.php:239 ../../boot.php:1589
 #: ../../include/nav.php:126 ../../include/nav.php:130
 msgid "Login"
 msgstr "Accedi"
 
-#: ../../Zotlabs/Lib/Apps.php:241
+#: ../../Code/Lib/Apps.php:241
 msgid "Activity"
 msgstr "Attività"
 
-#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931
+#: ../../Code/Lib/Apps.php:245 ../../include/conversation.php:1931
 #: ../../include/features.php:96 ../../include/nav.php:497
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:246
+#: ../../Code/Lib/Apps.php:246
 msgid "Channel Home"
 msgstr "Bacheca del canale"
 
-#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853
+#: ../../Code/Lib/Apps.php:249 ../../include/conversation.php:1853
 #: ../../include/conversation.php:1856
 msgid "Events"
 msgstr "Eventi"
 
-#: ../../Zotlabs/Lib/Apps.php:250
+#: ../../Code/Lib/Apps.php:250
 msgid "Directory"
 msgstr "Elenchi pubblici dei canali"
 
-#: ../../Zotlabs/Lib/Apps.php:252
+#: ../../Code/Lib/Apps.php:252
 msgid "Mail"
 msgstr "Messaggi"
 
-#: ../../Zotlabs/Lib/Apps.php:255
+#: ../../Code/Lib/Apps.php:255
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../Zotlabs/Lib/Apps.php:257
+#: ../../Code/Lib/Apps.php:257
 msgid "Probe"
 msgstr "Diagnostica"
 
-#: ../../Zotlabs/Lib/Apps.php:258
+#: ../../Code/Lib/Apps.php:258
 msgid "Suggest"
 msgstr "Suggerisci"
 
@@ -7784,1058 +7784,1058 @@ msgstr "Suggerisci"
 msgid "This email was sent by %1$s at %2$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:67
+#: ../../Code/Lib/Enotify.php:67
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
 "at %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Lib/Enotify.php:68
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:120
+#: ../../Code/Lib/Enotify.php:120
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: ../../Zotlabs/Lib/Enotify.php:124
+#: ../../Code/Lib/Enotify.php:124
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname:Notifica] Nuovo messaggio su %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:126
+#: ../../Code/Lib/Enotify.php:126
 #, php-format
 msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr "%1$s, %2$s  ti ha mandato un messaggio privato su %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Code/Lib/Enotify.php:127
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s ti ha mandato %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Code/Lib/Enotify.php:127
 msgid "a private message"
 msgstr "un messaggio privato"
 
-#: ../../Zotlabs/Lib/Enotify.php:128
+#: ../../Code/Lib/Enotify.php:128
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Visita %s per leggere i tuoi messaggi privati e rispondere."
 
-#: ../../Zotlabs/Lib/Enotify.php:141
+#: ../../Code/Lib/Enotify.php:141
 msgid "commented on"
 msgstr "ha commentato"
 
-#: ../../Zotlabs/Lib/Enotify.php:152
+#: ../../Code/Lib/Enotify.php:152
 msgid "liked"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:155
+#: ../../Code/Lib/Enotify.php:155
 msgid "disliked"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:198
+#: ../../Code/Lib/Enotify.php:198
 #, php-format
 msgid "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:207
+#: ../../Code/Lib/Enotify.php:207
 #, php-format
 msgid "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:217
+#: ../../Code/Lib/Enotify.php:217
 #, php-format
 msgid "%1$s, %2$s %3$s [zrl=%4$s]your %5$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:230
+#: ../../Code/Lib/Enotify.php:230
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../Code/Lib/Enotify.php:232
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notifica] Nuovo commento di %2$s alla conversazione #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:233
+#: ../../Code/Lib/Enotify.php:233
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr "%1$s, %2$s ha commentato un elemento che stavi seguendo."
 
-#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:318
-#: ../../Zotlabs/Lib/Enotify.php:335 ../../Zotlabs/Lib/Enotify.php:361
-#: ../../Zotlabs/Lib/Enotify.php:379 ../../Zotlabs/Lib/Enotify.php:393
+#: ../../Code/Lib/Enotify.php:236 ../../Code/Lib/Enotify.php:318
+#: ../../Code/Lib/Enotify.php:335 ../../Code/Lib/Enotify.php:361
+#: ../../Code/Lib/Enotify.php:379 ../../Code/Lib/Enotify.php:393
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Visita %s per leggere o commentare la conversazione."
 
-#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241
+#: ../../Code/Lib/Enotify.php:240 ../../Code/Lib/Enotify.php:241
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:299
+#: ../../Code/Lib/Enotify.php:299
 #, php-format
 msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, a %2$s [zrl=%3$s]tuo %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:314
+#: ../../Code/Lib/Enotify.php:314
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Ricevuto un mi piace alla conversazione #%1$d di %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:315
+#: ../../Code/Lib/Enotify.php:315
 #, php-format
 msgid "%1$s, %2$s liked an item/conversation you created."
 msgstr "%1$s, a %2$s piace l'elemento/conversazione che hai creato"
 
-#: ../../Zotlabs/Lib/Enotify.php:326
+#: ../../Code/Lib/Enotify.php:326
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Notifica] %s ha scritto sulla tua bacheca"
 
-#: ../../Zotlabs/Lib/Enotify.php:328
+#: ../../Code/Lib/Enotify.php:328
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr "%1$s, %2$s ha scritto sulla bacheca del tuo profilo su %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:330
+#: ../../Code/Lib/Enotify.php:330
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:354
+#: ../../Code/Lib/Enotify.php:354
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Notifica] %s ti ha taggato"
 
-#: ../../Zotlabs/Lib/Enotify.php:355
+#: ../../Code/Lib/Enotify.php:355
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr "%1$s, %2$s ti ha taggato su %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:356
+#: ../../Code/Lib/Enotify.php:356
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:368
+#: ../../Code/Lib/Enotify.php:368
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Notifica] %1$s ti ha mandato un poke"
 
-#: ../../Zotlabs/Lib/Enotify.php:369
+#: ../../Code/Lib/Enotify.php:369
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s ti ha mandato un poke su %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:370
+#: ../../Code/Lib/Enotify.php:370
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]ti ha mandato un poke[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:386
+#: ../../Code/Lib/Enotify.php:386
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Notifica] %s ha taggato il tuo post"
 
-#: ../../Zotlabs/Lib/Enotify.php:387
+#: ../../Code/Lib/Enotify.php:387
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr "%1$s, %2$s ha taggato il tuo post su %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Code/Lib/Enotify.php:388
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo post[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:400
+#: ../../Code/Lib/Enotify.php:400
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Notifica] Hai una richiesta di amicizia"
 
-#: ../../Zotlabs/Lib/Enotify.php:401
+#: ../../Code/Lib/Enotify.php:401
 #, php-format
 msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr "%1$s, hai ricevuto una richiesta di entrare in contatto da '%2$s' su %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Code/Lib/Enotify.php:402
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr "%1$s, hai ricevuto una [zrl=%2$s]richiesta di entrare in contatto[/zrl] da %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:425
+#: ../../Code/Lib/Enotify.php:406 ../../Code/Lib/Enotify.php:425
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Puoi visitare il suo profilo su %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:408
+#: ../../Code/Lib/Enotify.php:408
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Visita %s per approvare o rifiutare la richiesta di entrare in contatto."
 
-#: ../../Zotlabs/Lib/Enotify.php:415
+#: ../../Code/Lib/Enotify.php:415
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Notifica] Ti è stato suggerito un amico"
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Code/Lib/Enotify.php:416
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr "%1$s, ti è stato suggerito un amico da '%2$s' su %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Code/Lib/Enotify.php:417
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, %4$s ti [zrl=%2$s]ha suggerito %3$s[/zrl] come amico."
 
-#: ../../Zotlabs/Lib/Enotify.php:423
+#: ../../Code/Lib/Enotify.php:423
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../../Zotlabs/Lib/Enotify.php:424
+#: ../../Code/Lib/Enotify.php:424
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../Zotlabs/Lib/Enotify.php:427
+#: ../../Code/Lib/Enotify.php:427
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Visita %s per approvare o rifiutare il suggerimento."
 
-#: ../../Zotlabs/Lib/Enotify.php:647
+#: ../../Code/Lib/Enotify.php:647
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Notifica]"
 
-#: ../../Zotlabs/Lib/Enotify.php:815
+#: ../../Code/Lib/Enotify.php:815
 msgid "created a new post"
 msgstr "Ha creato un nuovo post"
 
-#: ../../Zotlabs/Lib/Enotify.php:816
+#: ../../Code/Lib/Enotify.php:816
 #, php-format
 msgid "commented on %s's post"
 msgstr "ha commentato il post di %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:823
+#: ../../Code/Lib/Enotify.php:823
 #, php-format
 msgid "edited a post dated %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:827
+#: ../../Code/Lib/Enotify.php:827
 #, php-format
 msgid "edited a comment dated %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:151
+#: ../../Code/Lib/NativeWiki.php:151
 msgid "Wiki updated successfully"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:198
+#: ../../Code/Lib/NativeWiki.php:198
 msgid "Wiki files deleted successfully"
 msgstr ""
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:83
+#: ../../Code/Lib/DB_Upgrade.php:83
 #, php-format
 msgid "Update Error at %s"
 msgstr "Errore di aggiornamento su %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:89
+#: ../../Code/Lib/DB_Upgrade.php:89
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "%s: aggiornamento fallito. Controlla i log di errore."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697
+#: ../../Code/Lib/ThreadItem.php:97 ../../include/conversation.php:697
 msgid "Private Message"
 msgstr "Messaggio privato"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689
+#: ../../Code/Lib/ThreadItem.php:147 ../../include/conversation.php:689
 msgid "Select"
 msgstr "Scegli"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I will attend"
 msgstr "Parteciperò"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I will not attend"
 msgstr "Non parteciperò"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I might attend"
 msgstr "Forse parteciperò"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I agree"
 msgstr "Sono d'accordo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I disagree"
 msgstr "Non sono d'accordo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I abstain"
 msgstr "Mi astengo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:238
+#: ../../Code/Lib/ThreadItem.php:238
 msgid "Add Star"
 msgstr "Aggiungi ai preferiti"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:239
+#: ../../Code/Lib/ThreadItem.php:239
 msgid "Remove Star"
 msgstr "Rimuovi dai preferiti"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240
+#: ../../Code/Lib/ThreadItem.php:240
 msgid "Toggle Star Status"
 msgstr "Attiva/disattiva preferito"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:244
+#: ../../Code/Lib/ThreadItem.php:244
 msgid "starred"
 msgstr "preferito"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704
+#: ../../Code/Lib/ThreadItem.php:254 ../../include/conversation.php:704
 msgid "Message signature validated"
 msgstr "Messaggio con firma verificata"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705
+#: ../../Code/Lib/ThreadItem.php:255 ../../include/conversation.php:705
 msgid "Message signature incorrect"
 msgstr "Massaggio con firma non corretta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:263
+#: ../../Code/Lib/ThreadItem.php:263
 msgid "Add Tag"
 msgstr "Aggiungi un tag"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:510
+#: ../../Code/Lib/ThreadItem.php:281 ../../include/taxonomy.php:510
 msgid "like"
 msgstr "mi piace"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:511
+#: ../../Code/Lib/ThreadItem.php:282 ../../include/taxonomy.php:511
 msgid "dislike"
 msgstr "non mi piace"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Code/Lib/ThreadItem.php:286
 msgid "Share This"
 msgstr "Condividi"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Code/Lib/ThreadItem.php:286
 msgid "share"
 msgstr "condividi"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:295
+#: ../../Code/Lib/ThreadItem.php:295
 msgid "Delivery Report"
 msgstr "Rapporto di trasmissione"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:313
+#: ../../Code/Lib/ThreadItem.php:313
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commento"
 msgstr[1] "%d commenti"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344
+#: ../../Code/Lib/ThreadItem.php:343 ../../Code/Lib/ThreadItem.php:344
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Guarda il profilo di %s - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:347
+#: ../../Code/Lib/ThreadItem.php:347
 msgid "to"
 msgstr "a"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../Code/Lib/ThreadItem.php:348
 msgid "via"
 msgstr "via"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:349
+#: ../../Code/Lib/ThreadItem.php:349
 msgid "Wall-to-Wall"
 msgstr "Da bacheca a bacheca"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350
+#: ../../Code/Lib/ThreadItem.php:350
 msgid "via Wall-To-Wall:"
 msgstr "da bacheca a bacheca:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763
+#: ../../Code/Lib/ThreadItem.php:363 ../../include/conversation.php:763
 #, php-format
 msgid "from %s"
 msgstr "da %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766
+#: ../../Code/Lib/ThreadItem.php:366 ../../include/conversation.php:766
 #, php-format
 msgid "last edited: %s"
 msgstr "ultima modifica: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767
+#: ../../Code/Lib/ThreadItem.php:367 ../../include/conversation.php:767
 #, php-format
 msgid "Expires: %s"
 msgstr "Scadenza: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:374
+#: ../../Code/Lib/ThreadItem.php:374
 msgid "Attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:375
+#: ../../Code/Lib/ThreadItem.php:375
 msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:376
+#: ../../Code/Lib/ThreadItem.php:376
 msgid "Vote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:377
+#: ../../Code/Lib/ThreadItem.php:377
 msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:398
+#: ../../Code/Lib/ThreadItem.php:398
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr "Salva segnalibro"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:399
+#: ../../Code/Lib/ThreadItem.php:399
 msgid "Add to Calendar"
 msgstr "Aggiungi al calendario"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483
+#: ../../Code/Lib/ThreadItem.php:426 ../../include/conversation.php:483
 msgid "This is an unsaved preview"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7
+#: ../../Code/Lib/ThreadItem.php:458 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s mostra tutto"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/conversation.php:1377
+#: ../../Code/Lib/ThreadItem.php:751 ../../include/conversation.php:1377
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:752 ../../include/conversation.php:1378
+#: ../../Code/Lib/ThreadItem.php:752 ../../include/conversation.php:1378
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1379
+#: ../../Code/Lib/ThreadItem.php:753 ../../include/conversation.php:1379
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1380
+#: ../../Code/Lib/ThreadItem.php:754 ../../include/conversation.php:1380
 msgid "Quote"
 msgstr "Citazione"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1381
+#: ../../Code/Lib/ThreadItem.php:755 ../../include/conversation.php:1381
 msgid "Code"
 msgstr "Codice"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:756
+#: ../../Code/Lib/ThreadItem.php:756
 msgid "Image"
 msgstr "Immagine"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:757
+#: ../../Code/Lib/ThreadItem.php:757
 msgid "Attach File"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:758
+#: ../../Code/Lib/ThreadItem.php:758
 msgid "Insert Link"
 msgstr "Collegamento"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:759
+#: ../../Code/Lib/ThreadItem.php:759
 msgid "Video"
 msgstr "Video"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:769
+#: ../../Code/Lib/ThreadItem.php:769
 msgid "Your full name (required)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:770
+#: ../../Code/Lib/ThreadItem.php:770
 msgid "Your email address (required)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:771
+#: ../../Code/Lib/ThreadItem.php:771
 msgid "Your website URL (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Zot/Auth.php:152
+#: ../../Code/Zot/Auth.php:152
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "L'autenticazione tramite il tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo."
 
-#: ../../Zotlabs/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
+#: ../../Code/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
 #: ../../addon/openid/Mod_Openid.php:178
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Ciao %s. L'accesso tramite il tuo hub è avvenuto con successo."
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287
+#: ../../Code/Storage/Browser.php:107 ../../Code/Storage/Browser.php:287
 msgid "parent"
 msgstr "cartella superiore"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2821
+#: ../../Code/Storage/Browser.php:131 ../../include/text.php:2821
 msgid "Collection"
 msgstr "Cartella"
 
-#: ../../Zotlabs/Storage/Browser.php:134
+#: ../../Code/Storage/Browser.php:134
 msgid "Principal"
 msgstr "Principale"
 
-#: ../../Zotlabs/Storage/Browser.php:137
+#: ../../Code/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Rubrica"
 
-#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420
+#: ../../Code/Storage/Browser.php:140 ../../include/nav.php:420
 #: ../../include/nav.php:423
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../../Zotlabs/Storage/Browser.php:143
+#: ../../Code/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Appuntamenti ricevuti"
 
-#: ../../Zotlabs/Storage/Browser.php:146
+#: ../../Code/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "Appuntamenti inviati"
 
-#: ../../Zotlabs/Storage/Browser.php:273
+#: ../../Code/Storage/Browser.php:273
 msgid "Total"
 msgstr "Totale"
 
-#: ../../Zotlabs/Storage/Browser.php:275
+#: ../../Code/Storage/Browser.php:275
 msgid "Shared"
 msgstr "Condiviso"
 
-#: ../../Zotlabs/Storage/Browser.php:353
+#: ../../Code/Storage/Browser.php:353
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Stai usando %1$s dello spazio disponibile per i tuoi file."
 
-#: ../../Zotlabs/Storage/Browser.php:358
+#: ../../Code/Storage/Browser.php:358
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "Stai usando %1$s di %2$s che hai a disposizione per i file. (%3$s%)"
 
-#: ../../Zotlabs/Storage/Browser.php:369
+#: ../../Code/Storage/Browser.php:369
 msgid "WARNING:"
 msgstr "ATTENZIONE:"
 
-#: ../../Zotlabs/Storage/Browser.php:381
+#: ../../Code/Storage/Browser.php:381
 msgid "Create new folder"
 msgstr "Nuova cartella"
 
-#: ../../Zotlabs/Storage/Browser.php:383
+#: ../../Code/Storage/Browser.php:383
 msgid "Upload file"
 msgstr "Carica un file"
 
-#: ../../Zotlabs/Storage/Browser.php:396
+#: ../../Code/Storage/Browser.php:396
 msgid "Drop files here to immediately upload"
 msgstr "Trascina i file qui per caricarli al volo"
 
-#: ../../Zotlabs/Widget/Forums.php:100
+#: ../../Code/Widget/Forums.php:100
 msgid "Forums"
 msgstr "Forum"
 
-#: ../../Zotlabs/Widget/Cdav.php:37
+#: ../../Code/Widget/Cdav.php:37
 msgid "Select Channel"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:42
+#: ../../Code/Widget/Cdav.php:42
 msgid "Read-write"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:43
+#: ../../Code/Widget/Cdav.php:43
 msgid "Read-only"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:117
+#: ../../Code/Widget/Cdav.php:117
 msgid "My Calendars"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:119
+#: ../../Code/Widget/Cdav.php:119
 msgid "Shared Calendars"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:123
+#: ../../Code/Widget/Cdav.php:123
 msgid "Share this calendar"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Code/Widget/Cdav.php:125
 msgid "Calendar name and color"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Code/Widget/Cdav.php:127
 msgid "Create new calendar"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Code/Widget/Cdav.php:129
 msgid "Calendar Name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:130
+#: ../../Code/Widget/Cdav.php:130
 msgid "Calendar Tools"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:131
+#: ../../Code/Widget/Cdav.php:131
 msgid "Import calendar"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:132
+#: ../../Code/Widget/Cdav.php:132
 msgid "Select a calendar to import to"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:159
+#: ../../Code/Widget/Cdav.php:159
 msgid "Addressbooks"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:161
+#: ../../Code/Widget/Cdav.php:161
 msgid "Addressbook name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:163
+#: ../../Code/Widget/Cdav.php:163
 msgid "Create new addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:164
+#: ../../Code/Widget/Cdav.php:164
 msgid "Addressbook Name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:166
+#: ../../Code/Widget/Cdav.php:166
 msgid "Addressbook Tools"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:167
+#: ../../Code/Widget/Cdav.php:167
 msgid "Import addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Code/Widget/Cdav.php:168
 msgid "Select an addressbook to import to"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Appcategories.php:40
-#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97
+#: ../../Code/Widget/Appcategories.php:40
+#: ../../Code/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97
 #: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186
 #: ../../include/taxonomy.php:344 ../../include/taxonomy.php:426
 #: ../../include/taxonomy.php:446 ../../include/taxonomy.php:467
 msgid "Categories"
 msgstr "Categorie"
 
-#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31
+#: ../../Code/Widget/Appcategories.php:43 ../../Code/Widget/Filer.php:31
 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100
 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189
 msgid "Everything"
 msgstr "Tutto"
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
+#: ../../Code/Widget/Eventstools.php:13
 msgid "Events Tools"
 msgstr "Gestione eventi"
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
+#: ../../Code/Widget/Eventstools.php:14
 msgid "Export Calendar"
 msgstr "Esporta calendario"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
+#: ../../Code/Widget/Eventstools.php:15
 msgid "Import Calendar"
 msgstr "Importa calendario"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
+#: ../../Code/Widget/Suggestedchats.php:32
 msgid "Suggested Chatrooms"
 msgstr "Chat suggerite"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
+#: ../../Code/Widget/Hq_controls.php:14
 msgid "HQ Control Panel"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
+#: ../../Code/Widget/Hq_controls.php:17
 msgid "Create a new post"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
+#: ../../Code/Widget/Mailmenu.php:13
 msgid "Private Mail Menu"
 msgstr "Menu messaggi privati"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
+#: ../../Code/Widget/Mailmenu.php:15
 msgid "Combined View"
 msgstr "Vista combinata"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20
+#: ../../Code/Widget/Mailmenu.php:20
 msgid "Inbox"
 msgstr "In arrivo"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
+#: ../../Code/Widget/Mailmenu.php:25
 msgid "Outbox"
 msgstr "Inviati"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
+#: ../../Code/Widget/Mailmenu.php:30
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../Code/Widget/Chatroom_list.php:16
 #: ../../include/conversation.php:1864 ../../include/conversation.php:1867
 #: ../../include/nav.php:434 ../../include/nav.php:437
 msgid "Chatrooms"
 msgstr "Chat"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
+#: ../../Code/Widget/Chatroom_list.php:20
 msgid "Overview"
 msgstr "Riepilogo"
 
-#: ../../Zotlabs/Widget/Rating.php:51
+#: ../../Code/Widget/Rating.php:51
 msgid "Rating Tools"
 msgstr "Valutazione"
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+#: ../../Code/Widget/Rating.php:55 ../../Code/Widget/Rating.php:57
 msgid "Rate Me"
 msgstr "Valutami"
 
-#: ../../Zotlabs/Widget/Rating.php:60
+#: ../../Code/Widget/Rating.php:60
 msgid "View Ratings"
 msgstr "Vedi le valutazioni ricevute"
 
-#: ../../Zotlabs/Widget/Activity.php:50
+#: ../../Code/Widget/Activity.php:50
 msgctxt "widget"
 msgid "Activity"
 msgstr "Attività"
 
-#: ../../Zotlabs/Widget/Follow.php:22
+#: ../../Code/Widget/Follow.php:22
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
 
-#: ../../Zotlabs/Widget/Follow.php:29
+#: ../../Code/Widget/Follow.php:29
 msgid "Add New Connection"
 msgstr "Aggiungi un contatto"
 
-#: ../../Zotlabs/Widget/Follow.php:30
+#: ../../Code/Widget/Follow.php:30
 msgid "Enter channel address"
 msgstr "Indirizzo del canale"
 
-#: ../../Zotlabs/Widget/Follow.php:31
+#: ../../Code/Widget/Follow.php:31
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr "Per esempio: bob@example.com, https://example.com/barbara"
 
-#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95
+#: ../../Code/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95
 msgid "Wiki List"
 msgstr "Elenco wiki"
 
-#: ../../Zotlabs/Widget/Archive.php:43
+#: ../../Code/Widget/Archive.php:43
 msgid "Archives"
 msgstr "Archivi"
 
-#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Code/Widget/Conversations.php:17
 msgid "Received Messages"
 msgstr "Ricevuti"
 
-#: ../../Zotlabs/Widget/Conversations.php:21
+#: ../../Code/Widget/Conversations.php:21
 msgid "Sent Messages"
 msgstr "Inviati"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Code/Widget/Conversations.php:25
 msgid "Conversations"
 msgstr "Conversazioni"
 
-#: ../../Zotlabs/Widget/Conversations.php:37
+#: ../../Code/Widget/Conversations.php:37
 msgid "No messages."
 msgstr "Nessun messaggio."
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Code/Widget/Conversations.php:57
 msgid "Delete conversation"
 msgstr "Elimina la conversazione"
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
+#: ../../Code/Widget/Chatroom_members.php:11
 msgid "Chat Members"
 msgstr "Partecipanti"
 
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+#: ../../Code/Widget/Photo.php:48 ../../Code/Widget/Photo_rand.php:58
 msgid "photo/image"
 msgstr "foto/immagine"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
+#: ../../Code/Widget/Savedsearch.php:75
 msgid "Remove term"
 msgstr "Rimuovi termine"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354
+#: ../../Code/Widget/Savedsearch.php:83 ../../include/features.php:354
 msgid "Saved Searches"
 msgstr "Ricerche salvate"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333
+#: ../../Code/Widget/Savedsearch.php:84 ../../include/group.php:333
 msgid "add"
 msgstr "aggiungi"
 
-#: ../../Zotlabs/Widget/Notes.php:16
+#: ../../Code/Widget/Notes.php:16
 msgid "Notes"
 msgstr "Note"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81
+#: ../../Code/Widget/Wiki_pages.php:32
+#: ../../Code/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81
 msgid "Add new page"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76
+#: ../../Code/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76
 msgid "Wiki Pages"
 msgstr "Pagine wiki"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82
+#: ../../Code/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82
 msgid "Page name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Affinity.php:45
+#: ../../Code/Widget/Affinity.php:45
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
+#: ../../Code/Widget/Tasklist.php:23
 msgid "Tasks"
 msgstr "Attività"
 
-#: ../../Zotlabs/Widget/Suggestions.php:51
+#: ../../Code/Widget/Suggestions.php:51
 msgid "Suggestions"
 msgstr "Suggerimenti"
 
-#: ../../Zotlabs/Widget/Suggestions.php:52
+#: ../../Code/Widget/Suggestions.php:52
 msgid "See more..."
 msgstr "Altro..."
 
-#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../Code/Widget/Filer.php:28 ../../include/contact_widgets.php:53
 #: ../../include/features.php:443
 msgid "Saved Folders"
 msgstr "Cartelle salvate"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:54
+#: ../../Code/Widget/Cover_photo.php:54
 msgid "Click to show more"
 msgstr "Clicca per mostrare tutto"
 
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Code/Widget/Newmember.php:33
 msgid "Profile Creation"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:35
+#: ../../Code/Widget/Newmember.php:35
 msgid "Upload profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:36
+#: ../../Code/Widget/Newmember.php:36
 msgid "Upload cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119
+#: ../../Code/Widget/Newmember.php:37 ../../include/nav.php:119
 msgid "Edit your profile"
 msgstr "Modifica il tuo profilo"
 
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Code/Widget/Newmember.php:40
 msgid "Find and Connect with others"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:44
+#: ../../Code/Widget/Newmember.php:44
 msgid "Manage your connections"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Code/Widget/Newmember.php:47
 msgid "Communicate"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:49
+#: ../../Code/Widget/Newmember.php:49
 msgid "View your channel homepage"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:50
+#: ../../Code/Widget/Newmember.php:50
 msgid "View your network stream"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:56
+#: ../../Code/Widget/Newmember.php:56
 msgid "Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:67
+#: ../../Code/Widget/Newmember.php:67
 msgid "View public stream. Warning: not moderated"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:71
+#: ../../Code/Widget/Newmember.php:71
 msgid "New Member Links"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+#: ../../Code/Widget/Admin.php:23 ../../Code/Widget/Admin.php:60
 msgid "Member registrations waiting for confirmation"
 msgstr "Richieste in attesa di conferma"
 
-#: ../../Zotlabs/Widget/Admin.php:29
+#: ../../Code/Widget/Admin.php:29
 msgid "Inspect queue"
 msgstr "Coda di attesa"
 
-#: ../../Zotlabs/Widget/Admin.php:31
+#: ../../Code/Widget/Admin.php:31
 msgid "DB updates"
 msgstr "Aggiornamenti al DB"
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199
+#: ../../Code/Widget/Admin.php:55 ../../include/nav.php:199
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../../Zotlabs/Widget/Admin.php:56
+#: ../../Code/Widget/Admin.php:56
 msgid "Plugin Features"
 msgstr "Plugin"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:35
+#: ../../Code/Widget/Settings_menu.php:35
 msgid "Account settings"
 msgstr "Il tuo account"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:41
+#: ../../Code/Widget/Settings_menu.php:41
 msgid "Channel settings"
 msgstr "Impostazioni del canale"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:50
+#: ../../Code/Widget/Settings_menu.php:50
 msgid "Additional features"
 msgstr "Funzionalità opzionali"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:57
+#: ../../Code/Widget/Settings_menu.php:57
 msgid "Addon settings"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:63
+#: ../../Code/Widget/Settings_menu.php:63
 msgid "Display settings"
 msgstr "Aspetto"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:70
+#: ../../Code/Widget/Settings_menu.php:70
 msgid "Manage locations"
 msgstr "Gestione cloni del tuo canale"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:77
+#: ../../Code/Widget/Settings_menu.php:77
 msgid "Export channel"
 msgstr "Esporta il canale"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:84
+#: ../../Code/Widget/Settings_menu.php:84
 msgid "Connected apps"
 msgstr "App connesse"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231
+#: ../../Code/Widget/Settings_menu.php:100 ../../include/features.php:231
 msgid "Permission Groups"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:117
+#: ../../Code/Widget/Settings_menu.php:117
 msgid "Premium Channel Settings"
 msgstr "Canale premium - impostazioni"
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+#: ../../Code/Widget/Bookmarkedchats.php:24
 msgid "Bookmarked Chatrooms"
 msgstr "Chat nei segnalibri"
 
-#: ../../Zotlabs/Widget/Notifications.php:16
+#: ../../Code/Widget/Notifications.php:16
 msgid "New Network Activity"
 msgstr "Nuova attività nella tua rete"
 
-#: ../../Zotlabs/Widget/Notifications.php:17
+#: ../../Code/Widget/Notifications.php:17
 msgid "New Network Activity Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:20
+#: ../../Code/Widget/Notifications.php:20
 msgid "View your network activity"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Code/Widget/Notifications.php:23
 msgid "Mark all notifications read"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:45
-#: ../../Zotlabs/Widget/Notifications.php:141
+#: ../../Code/Widget/Notifications.php:26
+#: ../../Code/Widget/Notifications.php:45
+#: ../../Code/Widget/Notifications.php:141
 msgid "Show new posts only"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:27
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:142
+#: ../../Code/Widget/Notifications.php:27
+#: ../../Code/Widget/Notifications.php:46
+#: ../../Code/Widget/Notifications.php:142
 msgid "Filter by name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:35
+#: ../../Code/Widget/Notifications.php:35
 msgid "New Home Activity"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:36
+#: ../../Code/Widget/Notifications.php:36
 msgid "New Home Activity Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:39
+#: ../../Code/Widget/Notifications.php:39
 msgid "View your home activity"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:42
-#: ../../Zotlabs/Widget/Notifications.php:138
+#: ../../Code/Widget/Notifications.php:42
+#: ../../Code/Widget/Notifications.php:138
 msgid "Mark all notifications seen"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:54
+#: ../../Code/Widget/Notifications.php:54
 msgid "New Mails"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:55
+#: ../../Code/Widget/Notifications.php:55
 msgid "New Mails Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:58
+#: ../../Code/Widget/Notifications.php:58
 msgid "View your private mails"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:61
+#: ../../Code/Widget/Notifications.php:61
 msgid "Mark all messages seen"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:69
+#: ../../Code/Widget/Notifications.php:69
 msgid "New Events"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:70
+#: ../../Code/Widget/Notifications.php:70
 msgid "New Events Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:73
+#: ../../Code/Widget/Notifications.php:73
 msgid "View events"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:76
+#: ../../Code/Widget/Notifications.php:76
 msgid "Mark all events seen"
 msgstr "Marca come letti tutti gli eventi"
 
-#: ../../Zotlabs/Widget/Notifications.php:85
+#: ../../Code/Widget/Notifications.php:85
 msgid "New Connections Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:88
+#: ../../Code/Widget/Notifications.php:88
 msgid "View all connections"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Code/Widget/Notifications.php:96
 msgid "New Files"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:97
+#: ../../Code/Widget/Notifications.php:97
 msgid "New Files Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:104
-#: ../../Zotlabs/Widget/Notifications.php:105
+#: ../../Code/Widget/Notifications.php:104
+#: ../../Code/Widget/Notifications.php:105
 msgid "Notices"
 msgstr "Avvisi"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Code/Widget/Notifications.php:108
 msgid "View all notices"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:111
+#: ../../Code/Widget/Notifications.php:111
 msgid "Mark all notices seen"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:121
+#: ../../Code/Widget/Notifications.php:121
 msgid "New Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:122
+#: ../../Code/Widget/Notifications.php:122
 msgid "New Registrations Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:132
+#: ../../Code/Widget/Notifications.php:132
 msgid "Public Stream Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:135
+#: ../../Code/Widget/Notifications.php:135
 msgid "View the public stream"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:150
+#: ../../Code/Widget/Notifications.php:150
 msgid "Sorry, you have got no notifications at the moment"
 msgstr ""
 
diff --git a/view/nb-no/messages.po b/view/nb-no/messages.po
index 877f5941c..4ed3b1590 100644
--- a/view/nb-no/messages.po
+++ b/view/nb-no/messages.po
@@ -18,204 +18,204 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
+#: ../../Code/Storage/Browser.php:107 ../../Code/Storage/Browser.php:239
 msgid "parent"
 msgstr "opp et nivå"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
+#: ../../Code/Storage/Browser.php:131 ../../include/text.php:2620
 msgid "Collection"
 msgstr "Samling"
 
-#: ../../Zotlabs/Storage/Browser.php:134
+#: ../../Code/Storage/Browser.php:134
 msgid "Principal"
 msgstr "Viktigste"
 
-#: ../../Zotlabs/Storage/Browser.php:137
+#: ../../Code/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: ../../Zotlabs/Storage/Browser.php:140
+#: ../../Code/Storage/Browser.php:140
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:143
+#: ../../Code/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Tidsplan innboks"
 
-#: ../../Zotlabs/Storage/Browser.php:146
+#: ../../Code/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "Tidsplan utboks"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
+#: ../../Code/Storage/Browser.php:164 ../../Code/Module/Photos.php:798
+#: ../../Code/Module/Photos.php:1243 ../../Code/Lib/Apps.php:486
+#: ../../Code/Lib/Apps.php:561 ../../include/widgets.php:1505
 #: ../../include/conversation.php:1032
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
+#: ../../Code/Storage/Browser.php:226 ../../Code/Module/Fbrowser.php:85
+#: ../../Code/Lib/Apps.php:216 ../../include/nav.php:93
 #: ../../include/conversation.php:1639
 msgid "Files"
 msgstr "Filer"
 
-#: ../../Zotlabs/Storage/Browser.php:227
+#: ../../Code/Storage/Browser.php:227
 msgid "Total"
 msgstr "Totalt"
 
-#: ../../Zotlabs/Storage/Browser.php:229
+#: ../../Code/Storage/Browser.php:229
 msgid "Shared"
 msgstr "Delt"
 
-#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Code/Storage/Browser.php:230 ../../Code/Storage/Browser.php:306
+#: ../../Code/Module/Blocks.php:156 ../../Code/Module/Layouts.php:182
+#: ../../Code/Module/Menu.php:118 ../../Code/Module/New_channel.php:142
+#: ../../Code/Module/Webpages.php:186
 msgid "Create"
 msgstr "Lag"
 
-#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
-#: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Code/Storage/Browser.php:231 ../../Code/Storage/Browser.php:308
+#: ../../Code/Module/Cover_photo.php:357
+#: ../../Code/Module/Photos.php:825 ../../Code/Module/Photos.php:1364
+#: ../../Code/Module/Profile_photo.php:368 ../../include/widgets.php:1518
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
-#: ../../Zotlabs/Module/Sharedwithme.php:99
+#: ../../Code/Storage/Browser.php:235 ../../Code/Module/Chat.php:247
+#: ../../Code/Module/Admin.php:1223 ../../Code/Module/Settings.php:592
+#: ../../Code/Module/Settings.php:618
+#: ../../Code/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Navn"
 
-#: ../../Zotlabs/Storage/Browser.php:236
+#: ../../Code/Storage/Browser.php:236
 msgid "Type"
 msgstr "Type"
 
-#: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Code/Storage/Browser.php:237
+#: ../../Code/Module/Sharedwithme.php:101 ../../include/text.php:1344
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../../Zotlabs/Storage/Browser.php:238
-#: ../../Zotlabs/Module/Sharedwithme.php:102
+#: ../../Code/Storage/Browser.php:238
+#: ../../Code/Module/Sharedwithme.php:102
 msgid "Last Modified"
 msgstr "Sist endret"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
-#: ../../Zotlabs/Module/Connections.php:290
-#: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
+#: ../../Code/Storage/Browser.php:240 ../../Code/Module/Blocks.php:157
+#: ../../Code/Module/Editblock.php:109
+#: ../../Code/Module/Connections.php:290
+#: ../../Code/Module/Connections.php:310
+#: ../../Code/Module/Editpost.php:84
+#: ../../Code/Module/Editlayout.php:113
+#: ../../Code/Module/Editwebpage.php:146
+#: ../../Code/Module/Layouts.php:190 ../../Code/Module/Menu.php:112
+#: ../../Code/Module/Admin.php:2113 ../../Code/Module/Settings.php:652
+#: ../../Code/Module/Thing.php:260 ../../Code/Module/Webpages.php:187
+#: ../../Code/Lib/Apps.php:337 ../../Code/Lib/ThreadItem.php:106
 #: ../../include/channel.php:937 ../../include/channel.php:941
 #: ../../include/menu.php:108 ../../include/page_widgets.php:8
 #: ../../include/page_widgets.php:36
 msgid "Edit"
 msgstr "Endre"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
-#: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
-#: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Code/Storage/Browser.php:241 ../../Code/Module/Blocks.php:159
+#: ../../Code/Module/Connedit.php:572
+#: ../../Code/Module/Editblock.php:134
+#: ../../Code/Module/Connections.php:263
+#: ../../Code/Module/Editlayout.php:136
+#: ../../Code/Module/Editwebpage.php:170 ../../Code/Module/Group.php:177
+#: ../../Code/Module/Photos.php:1173 ../../Code/Module/Admin.php:1039
+#: ../../Code/Module/Admin.php:1213 ../../Code/Module/Admin.php:2114
+#: ../../Code/Module/Settings.php:653 ../../Code/Module/Thing.php:261
+#: ../../Code/Module/Webpages.php:189 ../../Code/Lib/Apps.php:338
+#: ../../Code/Lib/ThreadItem.php:126 ../../include/conversation.php:657
 msgid "Delete"
 msgstr "Slett"
 
-#: ../../Zotlabs/Storage/Browser.php:285
+#: ../../Code/Storage/Browser.php:285
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Du bruker %1$s av din tilgjengelige lagringsplass."
 
-#: ../../Zotlabs/Storage/Browser.php:290
+#: ../../Code/Storage/Browser.php:290
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "Du bruker %1$s av %2$s tilgjengelig lagringsplass (%3$s%)"
 
-#: ../../Zotlabs/Storage/Browser.php:302
+#: ../../Code/Storage/Browser.php:302
 msgid "WARNING:"
 msgstr "ADVARSEL:"
 
-#: ../../Zotlabs/Storage/Browser.php:305
+#: ../../Code/Storage/Browser.php:305
 msgid "Create new folder"
 msgstr "Lag ny mappe"
 
-#: ../../Zotlabs/Storage/Browser.php:307
+#: ../../Code/Storage/Browser.php:307
 msgid "Upload file"
 msgstr "Last opp fil"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../Code/Web/WebServer.php:120 ../../Code/Module/Dreport.php:10
+#: ../../Code/Module/Dreport.php:49 ../../Code/Module/Group.php:72
+#: ../../Code/Module/Like.php:284 ../../Code/Module/Import_items.php:112
+#: ../../Code/Module/Profperm.php:28 ../../Code/Module/Subthread.php:62
 #: ../../include/items.php:385
 msgid "Permission denied"
 msgstr "Tillatelse avvist"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
-#: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
-#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
-#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
-#: ../../Zotlabs/Module/Thing.php:331
-#: ../../Zotlabs/Module/Viewconnections.php:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
+#: ../../Code/Web/WebServer.php:121 ../../Code/Web/Router.php:65
+#: ../../Code/Module/Achievements.php:34 ../../Code/Module/Blocks.php:73
+#: ../../Code/Module/Blocks.php:80 ../../Code/Module/Channel.php:105
+#: ../../Code/Module/Channel.php:226 ../../Code/Module/Channel.php:267
+#: ../../Code/Module/Chat.php:100 ../../Code/Module/Chat.php:105
+#: ../../Code/Module/Authtest.php:16 ../../Code/Module/Block.php:26
+#: ../../Code/Module/Block.php:76 ../../Code/Module/Bookmarks.php:61
+#: ../../Code/Module/Connedit.php:366 ../../Code/Module/Editblock.php:67
+#: ../../Code/Module/Common.php:39 ../../Code/Module/Connections.php:33
+#: ../../Code/Module/Cover_photo.php:277
+#: ../../Code/Module/Cover_photo.php:290
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Events.php:265
+#: ../../Code/Module/Editlayout.php:67
+#: ../../Code/Module/Editlayout.php:90
+#: ../../Code/Module/Editwebpage.php:69
+#: ../../Code/Module/Editwebpage.php:90
+#: ../../Code/Module/Editwebpage.php:105
+#: ../../Code/Module/Editwebpage.php:127 ../../Code/Module/Group.php:13
+#: ../../Code/Module/Api.php:13 ../../Code/Module/Api.php:18
+#: ../../Code/Module/Filestorage.php:24
+#: ../../Code/Module/Filestorage.php:79
+#: ../../Code/Module/Filestorage.php:94
+#: ../../Code/Module/Filestorage.php:121 ../../Code/Module/Item.php:210
+#: ../../Code/Module/Item.php:218 ../../Code/Module/Item.php:1070
+#: ../../Code/Module/Layouts.php:71 ../../Code/Module/Layouts.php:78
+#: ../../Code/Module/Layouts.php:89 ../../Code/Module/Id.php:76
+#: ../../Code/Module/Like.php:181 ../../Code/Module/Invite.php:17
+#: ../../Code/Module/Invite.php:91 ../../Code/Module/Locs.php:87
+#: ../../Code/Module/Mail.php:129 ../../Code/Module/Manage.php:10
+#: ../../Code/Module/Menu.php:78 ../../Code/Module/Message.php:18
+#: ../../Code/Module/Mood.php:116 ../../Code/Module/Network.php:17
+#: ../../Code/Module/Mitem.php:115 ../../Code/Module/New_channel.php:77
+#: ../../Code/Module/New_channel.php:104
+#: ../../Code/Module/Notifications.php:70
+#: ../../Code/Module/Photos.php:75 ../../Code/Module/Page.php:35
+#: ../../Code/Module/Page.php:90 ../../Code/Module/Pdledit.php:26
+#: ../../Code/Module/Poke.php:137 ../../Code/Module/Profile.php:68
+#: ../../Code/Module/Profile.php:76 ../../Code/Module/Profiles.php:203
+#: ../../Code/Module/Profiles.php:601
+#: ../../Code/Module/Profile_photo.php:256
+#: ../../Code/Module/Profile_photo.php:269
+#: ../../Code/Module/Rate.php:113 ../../Code/Module/Appman.php:75
+#: ../../Code/Module/Register.php:77 ../../Code/Module/Regmod.php:21
+#: ../../Code/Module/Service_limits.php:11
+#: ../../Code/Module/Settings.php:572 ../../Code/Module/Setup.php:215
+#: ../../Code/Module/Sharedwithme.php:11
+#: ../../Code/Module/Sources.php:74 ../../Code/Module/Suggest.php:30
+#: ../../Code/Module/Thing.php:274 ../../Code/Module/Thing.php:294
+#: ../../Code/Module/Thing.php:331
+#: ../../Code/Module/Viewconnections.php:25
+#: ../../Code/Module/Viewconnections.php:30
+#: ../../Code/Module/Viewsrc.php:18 ../../Code/Module/Webpages.php:74
+#: ../../Code/Lib/Chatroom.php:137 ../../include/items.php:3438
 #: ../../include/attach.php:141 ../../include/attach.php:189
 #: ../../include/attach.php:252 ../../include/attach.php:266
 #: ../../include/attach.php:273 ../../include/attach.php:338
@@ -226,651 +226,651 @@ msgstr "Tillatelse avvist"
 msgid "Permission denied."
 msgstr "Tillatelse avslått."
 
-#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Help.php:94
+#: ../../Code/Web/Router.php:146 ../../Code/Module/Help.php:94
 msgid "Not Found"
 msgstr "Ikke funnet"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Code/Web/Router.php:149 ../../Code/Module/Block.php:79
+#: ../../Code/Module/Display.php:117 ../../Code/Module/Help.php:97
+#: ../../Code/Module/Page.php:93
 msgid "Page not found."
 msgstr "Siden ikke funnet."
 
-#: ../../Zotlabs/Zot/Auth.php:138
+#: ../../Code/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "Fjernautentisering blokkert. Du er logget inn på dette nettstedet lokalt. Vennligst logg ut og prøv på nytt."
 
-#: ../../Zotlabs/Zot/Auth.php:246 ../../Zotlabs/Module/Openid.php:76
-#: ../../Zotlabs/Module/Openid.php:183
+#: ../../Code/Zot/Auth.php:246 ../../Code/Module/Openid.php:76
+#: ../../Code/Module/Openid.php:183
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Velkommen %s. Ekstern autentisering er vellykket."
 
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:33
-#: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Webpages.php:34 ../../include/channel.php:837
+#: ../../Code/Module/Achievements.php:15 ../../Code/Module/Blocks.php:33
+#: ../../Code/Module/Connect.php:17 ../../Code/Module/Editblock.php:31
+#: ../../Code/Module/Editlayout.php:31
+#: ../../Code/Module/Editwebpage.php:33
+#: ../../Code/Module/Filestorage.php:60 ../../Code/Module/Hcard.php:12
+#: ../../Code/Module/Layouts.php:31 ../../Code/Module/Profile.php:20
+#: ../../Code/Module/Webpages.php:34 ../../include/channel.php:837
 msgid "Requested profile is not available."
 msgstr "Forespurt profil er ikke tilgjengelig."
 
-#: ../../Zotlabs/Module/Achievements.php:38
+#: ../../Code/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr "En standardtekst om hva du bør gjøre som ny her"
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
-#: ../../Zotlabs/Module/Editblock.php:108
+#: ../../Code/Module/Blocks.php:97 ../../Code/Module/Blocks.php:152
+#: ../../Code/Module/Editblock.php:108
 msgid "Block Name"
 msgstr "Byggeklossens navn"
 
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265
+#: ../../Code/Module/Blocks.php:151 ../../include/text.php:2265
 msgid "Blocks"
 msgstr "Byggeklosser"
 
-#: ../../Zotlabs/Module/Blocks.php:153
+#: ../../Code/Module/Blocks.php:153
 msgid "Block Title"
 msgstr "Byggeklossens tittel"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../Zotlabs/Module/Layouts.php:188
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:198
+#: ../../Code/Module/Blocks.php:154 ../../Code/Module/Layouts.php:188
+#: ../../Code/Module/Menu.php:114 ../../Code/Module/Webpages.php:198
 #: ../../include/page_widgets.php:44
 msgid "Created"
 msgstr "Laget"
 
-#: ../../Zotlabs/Module/Blocks.php:155 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:199
+#: ../../Code/Module/Blocks.php:155 ../../Code/Module/Layouts.php:189
+#: ../../Code/Module/Menu.php:115 ../../Code/Module/Webpages.php:199
 #: ../../include/page_widgets.php:45
 msgid "Edited"
 msgstr "Endret"
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
+#: ../../Code/Module/Blocks.php:158 ../../Code/Module/Layouts.php:191
+#: ../../Code/Module/Photos.php:1072 ../../Code/Module/Webpages.php:188
 #: ../../include/conversation.php:1208
 msgid "Share"
 msgstr "Del"
 
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
+#: ../../Code/Module/Blocks.php:163 ../../Code/Module/Layouts.php:195
+#: ../../Code/Module/Pubsites.php:47 ../../Code/Module/Webpages.php:193
 #: ../../include/page_widgets.php:39
 msgid "View"
 msgstr "Vis"
 
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
+#: ../../Code/Module/Cal.php:62 ../../Code/Module/Block.php:43
+#: ../../Code/Module/Page.php:56 ../../Code/Module/Wall_upload.php:33
 msgid "Channel not found."
 msgstr "Kanalen ble ikke funnet."
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Code/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Tillatelse avvist."
 
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
+#: ../../Code/Module/Cal.php:259 ../../Code/Module/Events.php:588
 msgid "l, F j"
 msgstr "l, F j"
 
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
+#: ../../Code/Module/Cal.php:308 ../../Code/Module/Events.php:637
 #: ../../include/text.php:1732
 msgid "Link to Source"
 msgstr "Lenke til kilde"
 
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
+#: ../../Code/Module/Cal.php:331 ../../Code/Module/Events.php:665
 msgid "Edit Event"
 msgstr "Endre hendelse"
 
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
+#: ../../Code/Module/Cal.php:331 ../../Code/Module/Events.php:665
 msgid "Create Event"
 msgstr "Lag hendelse"
 
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
+#: ../../Code/Module/Cal.php:332 ../../Code/Module/Cal.php:339
+#: ../../Code/Module/Events.php:666 ../../Code/Module/Events.php:673
+#: ../../Code/Module/Photos.php:949
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
+#: ../../Code/Module/Cal.php:333 ../../Code/Module/Cal.php:340
+#: ../../Code/Module/Events.php:667 ../../Code/Module/Events.php:674
+#: ../../Code/Module/Photos.php:958 ../../Code/Module/Setup.php:267
 msgid "Next"
 msgstr "Neste"
 
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
+#: ../../Code/Module/Cal.php:334 ../../Code/Module/Events.php:668
 #: ../../include/widgets.php:755
 msgid "Export"
 msgstr "Eksport"
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
+#: ../../Code/Module/Cal.php:337 ../../Code/Module/Events.php:671
 #: ../../include/widgets.php:756
 msgid "Import"
 msgstr "Importer"
 
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703
-#: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754
-#: ../../Zotlabs/Module/Settings.php:842
-#: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
+#: ../../Code/Module/Cal.php:338 ../../Code/Module/Chat.php:196
+#: ../../Code/Module/Chat.php:238 ../../Code/Module/Connect.php:98
+#: ../../Code/Module/Connedit.php:731 ../../Code/Module/Events.php:475
+#: ../../Code/Module/Events.php:672 ../../Code/Module/Group.php:85
+#: ../../Code/Module/Filestorage.php:162
+#: ../../Code/Module/Import.php:550
+#: ../../Code/Module/Import_items.php:120
+#: ../../Code/Module/Invite.php:146 ../../Code/Module/Locs.php:121
+#: ../../Code/Module/Mail.php:378 ../../Code/Module/Mood.php:139
+#: ../../Code/Module/Mitem.php:235 ../../Code/Module/Photos.php:677
+#: ../../Code/Module/Photos.php:1052 ../../Code/Module/Photos.php:1092
+#: ../../Code/Module/Photos.php:1210 ../../Code/Module/Pconfig.php:107
+#: ../../Code/Module/Pdledit.php:66 ../../Code/Module/Poke.php:186
+#: ../../Code/Module/Profiles.php:687 ../../Code/Module/Rate.php:170
+#: ../../Code/Module/Admin.php:492 ../../Code/Module/Admin.php:688
+#: ../../Code/Module/Admin.php:771 ../../Code/Module/Admin.php:1032
+#: ../../Code/Module/Admin.php:1211 ../../Code/Module/Admin.php:1421
+#: ../../Code/Module/Admin.php:1648 ../../Code/Module/Admin.php:1733
+#: ../../Code/Module/Admin.php:2116 ../../Code/Module/Appman.php:126
+#: ../../Code/Module/Settings.php:590 ../../Code/Module/Settings.php:703
+#: ../../Code/Module/Settings.php:731 ../../Code/Module/Settings.php:754
+#: ../../Code/Module/Settings.php:842
+#: ../../Code/Module/Settings.php:1034 ../../Code/Module/Setup.php:312
+#: ../../Code/Module/Setup.php:353 ../../Code/Module/Sources.php:114
+#: ../../Code/Module/Sources.php:149 ../../Code/Module/Thing.php:316
+#: ../../Code/Module/Thing.php:362 ../../Code/Module/Xchan.php:15
+#: ../../Code/Lib/ThreadItem.php:710 ../../include/widgets.php:757
 #: ../../include/widgets.php:769 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Send"
 
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
+#: ../../Code/Module/Cal.php:341 ../../Code/Module/Events.php:675
 msgid "Today"
 msgstr "Idag"
 
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
+#: ../../Code/Module/Channel.php:29 ../../Code/Module/Chat.php:25
 msgid "You must be logged in to see this page."
 msgstr "Du må være innloegget for å se denne siden."
 
-#: ../../Zotlabs/Module/Channel.php:41
+#: ../../Code/Module/Channel.php:41
 msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:42
+#: ../../Code/Module/Channel.php:42
 msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:102
+#: ../../Code/Module/Channel.php:102
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden."
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Code/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Rommet ble ikke funnet"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Code/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Forlat rom"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Code/Module/Chat.php:198
 msgid "Delete Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Code/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Jeg er borte akkurat nå"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Code/Module/Chat.php:200
 msgid "I am online"
 msgstr "Jeg er online"
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Code/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Bokmerk dette rommet"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
+#: ../../Code/Module/Chat.php:205 ../../Code/Module/Mail.php:205
+#: ../../Code/Module/Mail.php:314 ../../include/conversation.php:1176
 msgid "Please enter a link URL:"
 msgstr "Vennligst skriv inn en lenke URL:"
 
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../Code/Module/Chat.php:206 ../../Code/Module/Mail.php:258
+#: ../../Code/Module/Mail.php:383 ../../Code/Lib/ThreadItem.php:722
 #: ../../include/conversation.php:1256
 msgid "Encrypt text"
 msgstr "Krypter tekst"
 
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
+#: ../../Code/Module/Chat.php:207 ../../Code/Module/Editblock.php:111
+#: ../../Code/Module/Editwebpage.php:147 ../../Code/Module/Mail.php:252
+#: ../../Code/Module/Mail.php:377 ../../include/conversation.php:1143
 msgid "Insert web link"
 msgstr "Sett inn web-lenke"
 
-#: ../../Zotlabs/Module/Chat.php:218
+#: ../../Code/Module/Chat.php:218
 msgid "Feature disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Nytt chatrom"
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Code/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Code/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Chat utgår (antall minutter)"
 
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../Code/Module/Chat.php:235 ../../Code/Module/Filestorage.php:153
+#: ../../Code/Module/Photos.php:671 ../../Code/Module/Photos.php:1045
+#: ../../Code/Module/Thing.php:313 ../../Code/Module/Thing.php:359
 #: ../../include/acl_selectors.php:283
 msgid "Permissions"
 msgstr "Tillatelser"
 
-#: ../../Zotlabs/Module/Chat.php:246
+#: ../../Code/Module/Chat.php:246
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "%1$s sine chatrom"
 
-#: ../../Zotlabs/Module/Chat.php:251
+#: ../../Code/Module/Chat.php:251
 msgid "No chatrooms available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Chat.php:252 ../../Code/Module/Manage.php:143
+#: ../../Code/Module/Profiles.php:778
 msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Code/Module/Chat.php:255
 msgid "Expiration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:256
+#: ../../Code/Module/Chat.php:256
 msgid "min"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:117
+#: ../../Code/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Borte"
 
-#: ../../Zotlabs/Module/Chatsvc.php:122
+#: ../../Code/Module/Chatsvc.php:122
 msgid "Online"
 msgstr "Online"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
+#: ../../Code/Module/Block.php:31 ../../Code/Module/Page.php:40
 msgid "Invalid item."
 msgstr "Ugyldig element."
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
+#: ../../Code/Module/Bookmarks.php:53
 msgid "Bookmark added"
 msgstr "Bokmerke lagt til"
 
-#: ../../Zotlabs/Module/Bookmarks.php:75
+#: ../../Code/Module/Bookmarks.php:75
 msgid "My Bookmarks"
 msgstr "Mine bokmerker"
 
-#: ../../Zotlabs/Module/Bookmarks.php:86
+#: ../../Code/Module/Bookmarks.php:86
 msgid "My Connections Bookmarks"
 msgstr "Mine forbindelsers bokmerker"
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Code/Module/Connect.php:61 ../../Code/Module/Connect.php:109
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Code/Module/Connect.php:90
 msgid "Premium Channel Setup"
 msgstr "Premiumkanal-oppsett"
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Code/Module/Connect.php:92
 msgid "Enable premium channel connection restrictions"
 msgstr "Slå på restriksjoner for forbindelse med premiumkanal"
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Code/Module/Connect.php:93
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre."
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Code/Module/Connect.php:95 ../../Code/Module/Connect.php:115
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:"
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Code/Module/Connect.php:96
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr "Potensielle forbindelser vil da se følgende tekst før de går videre:"
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Code/Module/Connect.php:97 ../../Code/Module/Connect.php:118
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided"
 " on this page."
 msgstr "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden."
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)"
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Code/Module/Connect.php:114
 msgid "Restricted or Premium Channel"
 msgstr "Begrenset kanal eller premiumkanal"
 
-#: ../../Zotlabs/Module/Connedit.php:80
+#: ../../Code/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr "Fikk ikke tilgang til kontaktinformasjonen."
 
-#: ../../Zotlabs/Module/Connedit.php:104
+#: ../../Code/Module/Connedit.php:104
 msgid "Could not locate selected profile."
 msgstr "Fant ikke valgt profil."
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Code/Module/Connedit.php:227
 msgid "Connection updated."
 msgstr "Forbindelsen er oppdatert."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Code/Module/Connedit.php:229
 msgid "Failed to update connection record."
 msgstr "Mislyktes med å oppdatere forbindelsesinformasjonen."
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Code/Module/Connedit.php:276
 msgid "is now connected to"
 msgstr "er nå forbundet til"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../Zotlabs/Module/Filestorage.php:157
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Code/Module/Connedit.php:379 ../../Code/Module/Connedit.php:654
+#: ../../Code/Module/Events.php:459 ../../Code/Module/Events.php:460
+#: ../../Code/Module/Events.php:469 ../../Code/Module/Api.php:89
+#: ../../Code/Module/Filestorage.php:157
+#: ../../Code/Module/Filestorage.php:165 ../../Code/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:157 ../../Code/Module/Mitem.php:158
+#: ../../Code/Module/Mitem.php:159 ../../Code/Module/Mitem.php:232
+#: ../../Code/Module/Mitem.php:233 ../../Code/Module/Photos.php:666
+#: ../../Code/Module/Profiles.php:647 ../../Code/Module/Admin.php:459
+#: ../../Code/Module/Removeme.php:61 ../../Code/Module/Settings.php:581
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
 msgid "No"
 msgstr "Nei"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../Zotlabs/Module/Filestorage.php:157
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Code/Module/Connedit.php:379 ../../Code/Module/Events.php:459
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:469
+#: ../../Code/Module/Api.php:88 ../../Code/Module/Filestorage.php:157
+#: ../../Code/Module/Filestorage.php:165 ../../Code/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:157 ../../Code/Module/Mitem.php:158
+#: ../../Code/Module/Mitem.php:159 ../../Code/Module/Mitem.php:232
+#: ../../Code/Module/Mitem.php:233 ../../Code/Module/Photos.php:666
+#: ../../Code/Module/Profiles.php:647 ../../Code/Module/Admin.php:461
+#: ../../Code/Module/Removeme.php:61 ../../Code/Module/Settings.php:581
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Code/Module/Connedit.php:411
 msgid "Could not access address book record."
 msgstr "Fikk ikke tilgang til informasjonen i adresseboken."
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Code/Module/Connedit.php:425
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Oppfrisking mislyktes - kanalen er for øyeblikket utilgjengelig."
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Code/Module/Connedit.php:440 ../../Code/Module/Connedit.php:449
+#: ../../Code/Module/Connedit.php:458 ../../Code/Module/Connedit.php:467
+#: ../../Code/Module/Connedit.php:480
 msgid "Unable to set address book parameters."
 msgstr "Ikke i stand til å angi parametre for adresseboken."
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Code/Module/Connedit.php:503
 msgid "Connection has been removed."
 msgstr "Forbindelsen har blitt fjernet."
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
+#: ../../Code/Module/Connedit.php:519 ../../Code/Lib/Apps.php:219
 #: ../../include/nav.php:86 ../../include/conversation.php:954
 msgid "View Profile"
 msgstr "Vis profil"
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Code/Module/Connedit.php:522
 #, php-format
 msgid "View %s's profile"
 msgstr "Vis %s sin profil"
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Code/Module/Connedit.php:526
 msgid "Refresh Permissions"
 msgstr "Oppfrisk tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Code/Module/Connedit.php:529
 msgid "Fetch updated permissions"
 msgstr "Hent oppdaterte tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Code/Module/Connedit.php:533
 msgid "Recent Activity"
 msgstr "Nylig aktivitet"
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Code/Module/Connedit.php:536
 msgid "View recent posts and comments"
 msgstr "Vis nylige innlegg og kommentarer"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Code/Module/Connedit.php:540 ../../Code/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "Ikke blokker lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Code/Module/Connedit.php:540 ../../Code/Module/Admin.php:1040
 msgid "Block"
 msgstr "Blokker"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Code/Module/Connedit.php:543
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokker eller fjern blokkering av all kommunikasjon med denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Code/Module/Connedit.php:544
 msgid "This connection is blocked!"
 msgstr "Denne forbindelsen er blokkert!"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Code/Module/Connedit.php:548
 msgid "Unignore"
 msgstr "Ikke ignorer lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:548
-#: ../../Zotlabs/Module/Connections.php:277
-#: ../../Zotlabs/Module/Notifications.php:55
+#: ../../Code/Module/Connedit.php:548
+#: ../../Code/Module/Connections.php:277
+#: ../../Code/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Code/Module/Connedit.php:551
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorer eller fjern ignorering av all inngående kommunikasjon fra denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Code/Module/Connedit.php:552
 msgid "This connection is ignored!"
 msgstr "Denne forbindelsen er ignorert!"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Code/Module/Connedit.php:556
 msgid "Unarchive"
 msgstr "Ikke arkiver lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Code/Module/Connedit.php:556
 msgid "Archive"
 msgstr "Arkiver"
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Code/Module/Connedit.php:559
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Arkiver eller fjern arkivering av denne forbindelsen - marker kanal som død, men behold innhold"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Code/Module/Connedit.php:560
 msgid "This connection is archived!"
 msgstr "Denne forbindelsen er arkivert!"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Code/Module/Connedit.php:564
 msgid "Unhide"
 msgstr "Ikke skjul lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Code/Module/Connedit.php:564
 msgid "Hide"
 msgstr "Skjul"
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Code/Module/Connedit.php:567
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Skjul eller fjern skjuling av denne forbindelsen fra dine andre forbindelser"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Code/Module/Connedit.php:568
 msgid "This connection is hidden!"
 msgstr "Denne forbindelsen er skjult!"
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Code/Module/Connedit.php:575
 msgid "Delete this connection"
 msgstr "Slett denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Code/Module/Connedit.php:590 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Meg"
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Code/Module/Connedit.php:591 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
+#: ../../Code/Module/Connedit.php:592 ../../Code/Module/Settings.php:342
+#: ../../Code/Module/Settings.php:346 ../../Code/Module/Settings.php:347
+#: ../../Code/Module/Settings.php:350 ../../Code/Module/Settings.php:361
 #: ../../include/widgets.php:495 ../../include/selectors.php:123
 #: ../../include/channel.php:389 ../../include/channel.php:390
 #: ../../include/channel.php:397
 msgid "Friends"
 msgstr "Venner"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Code/Module/Connedit.php:593 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Bekjente"
 
-#: ../../Zotlabs/Module/Connedit.php:594
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
+#: ../../Code/Module/Connedit.php:594
+#: ../../Code/Module/Connections.php:92
+#: ../../Code/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "Alle"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Code/Module/Connedit.php:654
 msgid "Approve this connection"
 msgstr "Godta denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Code/Module/Connedit.php:654
 msgid "Accept connection to allow communication"
 msgstr "Godta denne forbindelsen for å tillate kommunikasjon"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Code/Module/Connedit.php:659
 msgid "Set Affinity"
 msgstr "Angi nærhet"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Code/Module/Connedit.php:662
 msgid "Set Profile"
 msgstr "Angi profil"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Code/Module/Connedit.php:665
 msgid "Set Affinity & Profile"
 msgstr "Angi nærhet og profil"
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Code/Module/Connedit.php:698
 msgid "none"
 msgstr "ingen"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Code/Module/Connedit.php:702 ../../include/widgets.php:614
 msgid "Connection Default Permissions"
 msgstr "Forbindelsens standard tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Code/Module/Connedit.php:702 ../../include/items.php:3926
 #, php-format
 msgid "Connection: %s"
 msgstr "Forbindelse: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Code/Module/Connedit.php:703
 msgid "Apply these permissions automatically"
 msgstr "Bruk disse tillatelsene automatisk"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Code/Module/Connedit.php:703
 msgid "Connection requests will be approved without your interaction"
 msgstr "Forespørsler om forbindelse vil bli godkjent automatisk"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Code/Module/Connedit.php:705
 msgid "This connection's primary address is"
 msgstr "Denne forbindelsens primære adresse er"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Code/Module/Connedit.php:706
 msgid "Available locations:"
 msgstr "Tilgjengelige plasseringer:"
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Code/Module/Connedit.php:710
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Tillatelsene angitt på denne siden gjøres gjeldende for alle nye forbindelser."
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Code/Module/Connedit.php:711
 msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Code/Module/Connedit.php:713
 msgid "Slide to adjust your degree of friendship"
 msgstr "Flytt for å justere din grad av vennskap"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Code/Module/Connedit.php:714 ../../Code/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Vurdering"
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Code/Module/Connedit.php:715
 msgid "Slide to adjust your rating"
 msgstr "Flytt for å justere din vurdering"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Code/Module/Connedit.php:716 ../../Code/Module/Connedit.php:721
 msgid "Optionally explain your rating"
 msgstr "Velg om du vil forklare vurderingen"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Code/Module/Connedit.php:718
 msgid "Custom Filter"
 msgstr "Tilpasset filter"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Code/Module/Connedit.php:719
 msgid "Only import posts with this text"
 msgstr "Bare importer innlegg med disse ordene"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Code/Module/Connedit.php:719 ../../Code/Module/Connedit.php:720
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "ord per linje eller #merkelapper eller /mønster/ eller språk lang=xx, la stå blankt for å importere alle innlegg"
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Code/Module/Connedit.php:720
 msgid "Do not import posts with this text"
 msgstr "Ikke importer innlegg med denne teksten"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Code/Module/Connedit.php:722
 msgid "This information is public!"
 msgstr "Denne informasjonen er offentlig!"
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Code/Module/Connedit.php:727
 msgid "Connection Pending Approval"
 msgstr "Forbindelse venter på godkjenning"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Code/Module/Connedit.php:730
 msgid "inherited"
 msgstr "arvet"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Code/Module/Connedit.php:732
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Vennligst velg profilen du ønsker å vise %s når profilen din ses på en sikret måte. "
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Code/Module/Connedit.php:734
 msgid "Their Settings"
 msgstr "Deres innstillinger"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Code/Module/Connedit.php:735
 msgid "My Settings"
 msgstr "Mine innstillinger"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Code/Module/Connedit.php:737
 msgid "Individual Permissions"
 msgstr "Individuelle tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Code/Module/Connedit.php:738
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -878,7 +878,7 @@ msgid ""
 " settings here."
 msgstr "Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har høyere prioritet enn individuelle innstillinger. Du kan ikke endre arvede innstillingene her."
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Code/Module/Connedit.php:739
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -886,916 +886,916 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har høyere prioritet enn individuelle innstillinger. Du kan endre disse innstillingene her, men de vil ikke få noen effekt før de arvede innstillingene endres."
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Code/Module/Connedit.php:740
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
-#: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Code/Module/Directory.php:63 ../../Code/Module/Display.php:17
+#: ../../Code/Module/Photos.php:522 ../../Code/Module/Ratings.php:86
+#: ../../Code/Module/Search.php:17
+#: ../../Code/Module/Viewconnections.php:20
 msgid "Public access denied."
 msgstr "Offentlig tilgang avvist."
 
-#: ../../Zotlabs/Module/Directory.php:243
+#: ../../Code/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d vurdering"
 msgstr[1] "%d vurderinger"
 
-#: ../../Zotlabs/Module/Directory.php:254
+#: ../../Code/Module/Directory.php:254
 msgid "Gender: "
 msgstr "Kjønn:"
 
-#: ../../Zotlabs/Module/Directory.php:256
+#: ../../Code/Module/Directory.php:256
 msgid "Status: "
 msgstr "Status:"
 
-#: ../../Zotlabs/Module/Directory.php:258
+#: ../../Code/Module/Directory.php:258
 msgid "Homepage: "
 msgstr "Hjemmeside:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Code/Module/Directory.php:306 ../../include/channel.php:1183
 msgid "Age:"
 msgstr "Alder:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
+#: ../../Code/Module/Directory.php:311 ../../include/event.php:52
 #: ../../include/event.php:84 ../../include/channel.php:1027
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Plassering:"
 
-#: ../../Zotlabs/Module/Directory.php:317
+#: ../../Code/Module/Directory.php:317
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Code/Module/Directory.php:322 ../../include/channel.php:1199
 msgid "Hometown:"
 msgstr "Hjemby:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Code/Module/Directory.php:324 ../../include/channel.php:1207
 msgid "About:"
 msgstr "Om:"
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
+#: ../../Code/Module/Directory.php:325 ../../Code/Module/Match.php:68
+#: ../../Code/Module/Suggest.php:56 ../../include/widgets.php:147
 #: ../../include/widgets.php:184 ../../include/connections.php:78
 #: ../../include/conversation.php:956 ../../include/channel.php:1012
 msgid "Connect"
 msgstr "Koble"
 
-#: ../../Zotlabs/Module/Directory.php:326
+#: ../../Code/Module/Directory.php:326
 msgid "Public Forum:"
 msgstr "Offentlig forum:"
 
-#: ../../Zotlabs/Module/Directory.php:329
+#: ../../Code/Module/Directory.php:329
 msgid "Keywords: "
 msgstr "Nøkkelord:"
 
-#: ../../Zotlabs/Module/Directory.php:332
+#: ../../Code/Module/Directory.php:332
 msgid "Don't suggest"
 msgstr "Ikke foreslå"
 
-#: ../../Zotlabs/Module/Directory.php:334
+#: ../../Code/Module/Directory.php:334
 msgid "Common connections:"
 msgstr "Felles forbindelser:"
 
-#: ../../Zotlabs/Module/Directory.php:383
+#: ../../Code/Module/Directory.php:383
 msgid "Global Directory"
 msgstr "Global katalog"
 
-#: ../../Zotlabs/Module/Directory.php:383
+#: ../../Code/Module/Directory.php:383
 msgid "Local Directory"
 msgstr "Lokal katalog"
 
-#: ../../Zotlabs/Module/Directory.php:388
-#: ../../Zotlabs/Module/Directory.php:393
-#: ../../Zotlabs/Module/Connections.php:309
+#: ../../Code/Module/Directory.php:388
+#: ../../Code/Module/Directory.php:393
+#: ../../Code/Module/Connections.php:309
 #: ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Finn"
 
-#: ../../Zotlabs/Module/Directory.php:389
+#: ../../Code/Module/Directory.php:389
 msgid "Finding:"
 msgstr "Finner:"
 
-#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Code/Module/Directory.php:392 ../../Code/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Kanalforslag"
 
-#: ../../Zotlabs/Module/Directory.php:394
+#: ../../Code/Module/Directory.php:394
 msgid "next page"
 msgstr "Neste side"
 
-#: ../../Zotlabs/Module/Directory.php:394
+#: ../../Code/Module/Directory.php:394
 msgid "previous page"
 msgstr "Forrige side"
 
-#: ../../Zotlabs/Module/Directory.php:395
+#: ../../Code/Module/Directory.php:395
 msgid "Sort options"
 msgstr "Sorteringsvalg"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Alphabetic"
 msgstr "Alfabetisk"
 
-#: ../../Zotlabs/Module/Directory.php:397
+#: ../../Code/Module/Directory.php:397
 msgid "Reverse Alphabetic"
 msgstr "Omvendt alfabetisk"
 
-#: ../../Zotlabs/Module/Directory.php:398
+#: ../../Code/Module/Directory.php:398
 msgid "Newest to Oldest"
 msgstr "Nyest til eldst"
 
-#: ../../Zotlabs/Module/Directory.php:399
+#: ../../Code/Module/Directory.php:399
 msgid "Oldest to Newest"
 msgstr "Eldst til nyest"
 
-#: ../../Zotlabs/Module/Directory.php:416
+#: ../../Code/Module/Directory.php:416
 msgid "No entries (some entries may be hidden)."
 msgstr "Ingen oppføringer (noen oppføringer kan være skjult)."
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
+#: ../../Code/Module/Display.php:40 ../../Code/Module/Filestorage.php:33
+#: ../../Code/Module/Admin.php:164 ../../Code/Module/Admin.php:1255
+#: ../../Code/Module/Admin.php:1561 ../../Code/Module/Thing.php:89
+#: ../../Code/Module/Viewsrc.php:24 ../../include/items.php:3359
 msgid "Item not found."
 msgstr "Elementet ble ikke funnet."
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Code/Module/Editblock.php:79 ../../Code/Module/Editblock.php:95
+#: ../../Code/Module/Editpost.php:24 ../../Code/Module/Editlayout.php:79
+#: ../../Code/Module/Editwebpage.php:81
 msgid "Item not found"
 msgstr "Elementet ble ikke funnet."
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
+#: ../../Code/Module/Editblock.php:124 ../../include/conversation.php:1228
 msgid "Title (optional)"
 msgstr "Tittel (valgfri)"
 
-#: ../../Zotlabs/Module/Editblock.php:133
+#: ../../Code/Module/Editblock.php:133
 msgid "Edit Block"
 msgstr "Endre byggekloss"
 
-#: ../../Zotlabs/Module/Common.php:14
+#: ../../Code/Module/Common.php:14
 msgid "No channel."
 msgstr "Ingen kanal."
 
-#: ../../Zotlabs/Module/Common.php:43
+#: ../../Code/Module/Common.php:43
 msgid "Common connections"
 msgstr "Felles forbindelser"
 
-#: ../../Zotlabs/Module/Common.php:48
+#: ../../Code/Module/Common.php:48
 msgid "No connections in common."
 msgstr "Ingen forbindelser felles."
 
-#: ../../Zotlabs/Module/Connections.php:56
-#: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:242
+#: ../../Code/Module/Connections.php:56
+#: ../../Code/Module/Connections.php:161
+#: ../../Code/Module/Connections.php:242
 msgid "Blocked"
 msgstr "Blokkert"
 
-#: ../../Zotlabs/Module/Connections.php:61
-#: ../../Zotlabs/Module/Connections.php:168
-#: ../../Zotlabs/Module/Connections.php:241
+#: ../../Code/Module/Connections.php:61
+#: ../../Code/Module/Connections.php:168
+#: ../../Code/Module/Connections.php:241
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: ../../Zotlabs/Module/Connections.php:66
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:240
+#: ../../Code/Module/Connections.php:66
+#: ../../Code/Module/Connections.php:182
+#: ../../Code/Module/Connections.php:240
 msgid "Hidden"
 msgstr "Skjult"
 
-#: ../../Zotlabs/Module/Connections.php:71
-#: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:239
+#: ../../Code/Module/Connections.php:71
+#: ../../Code/Module/Connections.php:175
+#: ../../Code/Module/Connections.php:239
 msgid "Archived"
 msgstr "Arkivert"
 
-#: ../../Zotlabs/Module/Connections.php:76
-#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
+#: ../../Code/Module/Connections.php:76
+#: ../../Code/Module/Connections.php:86 ../../Code/Module/Menu.php:116
 #: ../../include/conversation.php:1535
 msgid "New"
 msgstr "Nye"
 
-#: ../../Zotlabs/Module/Connections.php:138
+#: ../../Code/Module/Connections.php:138
 msgid "New Connections"
 msgstr "Nye forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:141
+#: ../../Code/Module/Connections.php:141
 msgid "Show pending (new) connections"
 msgstr "Vis ventende (nye) forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:145
-#: ../../Zotlabs/Module/Profperm.php:144
+#: ../../Code/Module/Connections.php:145
+#: ../../Code/Module/Profperm.php:144
 msgid "All Connections"
 msgstr "Alle forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:148
+#: ../../Code/Module/Connections.php:148
 msgid "Show all connections"
 msgstr "Vis alle forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:164
 msgid "Only show blocked connections"
 msgstr "Vis bare forbindelser som er blokkert"
 
-#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:171
 msgid "Only show ignored connections"
 msgstr "Vis bare ignorerte forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:178
 msgid "Only show archived connections"
 msgstr "Vis bare arkiverte forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:185
 msgid "Only show hidden connections"
 msgstr "Vis bare skjulte forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:238
+#: ../../Code/Module/Connections.php:238
 msgid "Pending approval"
 msgstr "Venter på godkjenning"
 
-#: ../../Zotlabs/Module/Connections.php:254
+#: ../../Code/Module/Connections.php:254
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:255
+#: ../../Code/Module/Connections.php:255
 msgid "Edit connection"
 msgstr "Endre forbindelse"
 
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Code/Module/Connections.php:256
 msgid "Delete connection"
 msgstr "Slett forbindelse"
 
-#: ../../Zotlabs/Module/Connections.php:265
+#: ../../Code/Module/Connections.php:265
 msgid "Channel address"
 msgstr "Kanaladresse"
 
-#: ../../Zotlabs/Module/Connections.php:267
+#: ../../Code/Module/Connections.php:267
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../../Zotlabs/Module/Connections.php:270 ../../Zotlabs/Module/Admin.php:710
+#: ../../Code/Module/Connections.php:270 ../../Code/Module/Admin.php:710
 msgid "Status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Connections.php:272
+#: ../../Code/Module/Connections.php:272
 msgid "Connected"
 msgstr "Forbundet"
 
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Code/Module/Connections.php:274
 msgid "Approve connection"
 msgstr "Godkjenn forbindelse"
 
-#: ../../Zotlabs/Module/Connections.php:275
-#: ../../Zotlabs/Module/Admin.php:1037
+#: ../../Code/Module/Connections.php:275
+#: ../../Code/Module/Admin.php:1037
 msgid "Approve"
 msgstr "Godkjenn"
 
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Code/Module/Connections.php:276
 msgid "Ignore connection"
 msgstr "Ignorer forbindelse"
 
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Code/Module/Connections.php:278
 msgid "Recent activity"
 msgstr "Nylig aktivitet"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
+#: ../../Code/Module/Connections.php:302 ../../Code/Lib/Apps.php:208
 #: ../../include/text.php:875 ../../include/nav.php:186
 msgid "Connections"
 msgstr "Forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
+#: ../../Code/Module/Connections.php:306 ../../Code/Module/Search.php:44
+#: ../../Code/Lib/Apps.php:228 ../../include/text.php:945
 #: ../../include/text.php:957 ../../include/nav.php:165
 #: ../../include/acl_selectors.php:276
 msgid "Search"
 msgstr "Søk"
 
-#: ../../Zotlabs/Module/Connections.php:307
+#: ../../Code/Module/Connections.php:307
 msgid "Search your connections"
 msgstr "Søk blant dine forbindelser"
 
-#: ../../Zotlabs/Module/Connections.php:308
+#: ../../Code/Module/Connections.php:308
 msgid "Connections search"
 msgstr "Søk blant forbindelser"
 
-#: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Code/Module/Cover_photo.php:58
+#: ../../Code/Module/Profile_photo.php:79
 msgid "Image uploaded but image cropping failed."
 msgstr "Bildet ble lastet opp, men beskjæring av bildet mislyktes."
 
-#: ../../Zotlabs/Module/Cover_photo.php:134
-#: ../../Zotlabs/Module/Cover_photo.php:181
+#: ../../Code/Module/Cover_photo.php:134
+#: ../../Code/Module/Cover_photo.php:181
 msgid "Cover Photos"
 msgstr "Forsidebilder"
 
-#: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Code/Module/Cover_photo.php:154
+#: ../../Code/Module/Profile_photo.php:133
 msgid "Image resize failed."
 msgstr "Endring av bildestørrelse mislyktes."
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Code/Module/Cover_photo.php:168
+#: ../../Code/Module/Profile_photo.php:192 ../../include/photos.php:144
 msgid "Unable to process image"
 msgstr "Kan ikke behandle bildet"
 
-#: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Code/Module/Cover_photo.php:192
+#: ../../Code/Module/Profile_photo.php:217
 msgid "Image upload failed."
 msgstr "Opplasting av bildet mislyktes."
 
-#: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Code/Module/Cover_photo.php:210
+#: ../../Code/Module/Profile_photo.php:236
 msgid "Unable to process image."
 msgstr "Kan ikke behandle bildet."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Code/Module/Cover_photo.php:233 ../../include/items.php:4270
 msgid "female"
 msgstr "kvinne"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Code/Module/Cover_photo.php:234 ../../include/items.php:4271
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s oppdaterte %2$s sitt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4272
+#: ../../Code/Module/Cover_photo.php:235 ../../include/items.php:4272
 msgid "male"
 msgstr "mann"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Code/Module/Cover_photo.php:236 ../../include/items.php:4273
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s oppdaterte %2$s sitt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4275
+#: ../../Code/Module/Cover_photo.php:238 ../../include/items.php:4275
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s oppdaterte %2$s deres"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
+#: ../../Code/Module/Cover_photo.php:240 ../../include/channel.php:1661
 msgid "cover photo"
 msgstr "forsidebilde"
 
-#: ../../Zotlabs/Module/Cover_photo.php:303
-#: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Code/Module/Cover_photo.php:303
+#: ../../Code/Module/Cover_photo.php:318
+#: ../../Code/Module/Profile_photo.php:283
+#: ../../Code/Module/Profile_photo.php:324
 msgid "Photo not available."
 msgstr "Bildet er ikke tilgjengelig."
 
-#: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Code/Module/Cover_photo.php:354
+#: ../../Code/Module/Profile_photo.php:365
 msgid "Upload File:"
 msgstr "Last opp fil:"
 
-#: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Code/Module/Cover_photo.php:355
+#: ../../Code/Module/Profile_photo.php:366
 msgid "Select a profile:"
 msgstr "Velg en profil:"
 
-#: ../../Zotlabs/Module/Cover_photo.php:356
+#: ../../Code/Module/Cover_photo.php:356
 msgid "Upload Cover Photo"
 msgstr "Last opp forsidebilde"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Code/Module/Cover_photo.php:361
+#: ../../Code/Module/Profile_photo.php:374
+#: ../../Code/Module/Settings.php:985
 msgid "or"
 msgstr "eller"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Code/Module/Cover_photo.php:361
+#: ../../Code/Module/Profile_photo.php:374
 msgid "skip this step"
 msgstr "hopp over dette steget"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Code/Module/Cover_photo.php:361
+#: ../../Code/Module/Profile_photo.php:374
 msgid "select a photo from your photo albums"
 msgstr "velg et bilde fra dine fotoalbum"
 
-#: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Code/Module/Cover_photo.php:377
+#: ../../Code/Module/Profile_photo.php:390
 msgid "Crop Image"
 msgstr "Beskjær bildet"
 
-#: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Code/Module/Cover_photo.php:378
+#: ../../Code/Module/Profile_photo.php:391
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Vennligst juster bildebeskjæringen for optimal visning."
 
-#: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Code/Module/Cover_photo.php:380
+#: ../../Code/Module/Profile_photo.php:393
 msgid "Done Editing"
 msgstr "Avslutt redigering"
 
-#: ../../Zotlabs/Module/Editpost.php:35
+#: ../../Code/Module/Editpost.php:35
 msgid "Item is not editable"
 msgstr "Elementet kan ikke endres"
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
+#: ../../Code/Module/Editpost.php:106 ../../Code/Module/Rpost.php:135
 msgid "Edit post"
 msgstr "Endre innlegg"
 
-#: ../../Zotlabs/Module/Events.php:26
+#: ../../Code/Module/Events.php:26
 msgid "Calendar entries imported."
 msgstr "Kalenderhendelsene er importert."
 
-#: ../../Zotlabs/Module/Events.php:28
+#: ../../Code/Module/Events.php:28
 msgid "No calendar entries found."
 msgstr "Ingen kalenderhendelser funnet."
 
-#: ../../Zotlabs/Module/Events.php:105
+#: ../../Code/Module/Events.php:105
 msgid "Event can not end before it has started."
 msgstr "Hendelsen kan ikke slutte før den starter."
 
-#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
-#: ../../Zotlabs/Module/Events.php:136
+#: ../../Code/Module/Events.php:107 ../../Code/Module/Events.php:116
+#: ../../Code/Module/Events.php:136
 msgid "Unable to generate preview."
 msgstr "Klarer ikke å lage forhåndsvisning."
 
-#: ../../Zotlabs/Module/Events.php:114
+#: ../../Code/Module/Events.php:114
 msgid "Event title and start time are required."
 msgstr "Hendelsestittel og starttidspunkt er påkrevd."
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
+#: ../../Code/Module/Events.php:134 ../../Code/Module/Events.php:259
 msgid "Event not found."
 msgstr "Hendelsen ble ikke funnet."
 
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
+#: ../../Code/Module/Events.php:254 ../../Code/Module/Like.php:373
+#: ../../Code/Module/Tagger.php:51 ../../include/event.php:949
 #: ../../include/text.php:1943 ../../include/conversation.php:123
 msgid "event"
 msgstr "hendelse"
 
-#: ../../Zotlabs/Module/Events.php:449
+#: ../../Code/Module/Events.php:449
 msgid "Edit event title"
 msgstr "Endre tittel på hendelse"
 
-#: ../../Zotlabs/Module/Events.php:449
+#: ../../Code/Module/Events.php:449
 msgid "Event title"
 msgstr "Tittel på hendelse"
 
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Code/Module/Events.php:449 ../../Code/Module/Events.php:454
+#: ../../Code/Module/Profiles.php:709 ../../Code/Module/Profiles.php:713
+#: ../../Code/Module/Appman.php:115 ../../Code/Module/Appman.php:116
 #: ../../include/datetime.php:245
 msgid "Required"
 msgstr "Påkrevd"
 
-#: ../../Zotlabs/Module/Events.php:451
+#: ../../Code/Module/Events.php:451
 msgid "Categories (comma-separated list)"
 msgstr "Kategorier (kommaseparert liste)"
 
-#: ../../Zotlabs/Module/Events.php:452
+#: ../../Code/Module/Events.php:452
 msgid "Edit Category"
 msgstr "Endre kategori"
 
-#: ../../Zotlabs/Module/Events.php:452
+#: ../../Code/Module/Events.php:452
 msgid "Category"
 msgstr "Kategori"
 
-#: ../../Zotlabs/Module/Events.php:455
+#: ../../Code/Module/Events.php:455
 msgid "Edit start date and time"
 msgstr "Endre startdato og tidspunkt"
 
-#: ../../Zotlabs/Module/Events.php:455
+#: ../../Code/Module/Events.php:455
 msgid "Start date and time"
 msgstr "Startdato og tidspunkt"
 
-#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
+#: ../../Code/Module/Events.php:456 ../../Code/Module/Events.php:459
 msgid "Finish date and time are not known or not relevant"
 msgstr "Sluttdato og tidspunkt er ikke kjent eller ikke relevant"
 
-#: ../../Zotlabs/Module/Events.php:458
+#: ../../Code/Module/Events.php:458
 msgid "Edit finish date and time"
 msgstr "Endre sluttdato og tidspunkt"
 
-#: ../../Zotlabs/Module/Events.php:458
+#: ../../Code/Module/Events.php:458
 msgid "Finish date and time"
 msgstr "Sluttdato og tidspunkt"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:461
 msgid "Adjust for viewer timezone"
 msgstr "Juster i forhold til tilskuerens tidssone"
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Events.php:460
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager."
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Code/Module/Events.php:462
 msgid "Edit Description"
 msgstr "Endre beskrivelse"
 
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Code/Module/Events.php:462 ../../Code/Module/Appman.php:117
+#: ../../Code/Module/Rbmark.php:101
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../../Zotlabs/Module/Events.php:464
+#: ../../Code/Module/Events.php:464
 msgid "Edit Location"
 msgstr "Endre plassering"
 
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+#: ../../Code/Module/Events.php:464 ../../Code/Module/Locs.php:117
+#: ../../Code/Module/Profiles.php:477 ../../Code/Module/Profiles.php:698
+#: ../../Code/Module/Pubsites.php:41 ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Plassering"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:467 ../../Code/Module/Events.php:469
 msgid "Share this event"
 msgstr "Del denne hendelsen"
 
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Photos.php:1093
+#: ../../Code/Module/Webpages.php:194 ../../Code/Lib/ThreadItem.php:719
 #: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
+#: ../../Code/Module/Events.php:471 ../../include/conversation.php:1232
 msgid "Permission settings"
 msgstr "Tillatelser - innstillinger"
 
-#: ../../Zotlabs/Module/Events.php:476
+#: ../../Code/Module/Events.php:476
 msgid "Advanced Options"
 msgstr "Avanserte alternativer"
 
-#: ../../Zotlabs/Module/Events.php:610
+#: ../../Code/Module/Events.php:610
 msgid "Edit event"
 msgstr "Endre hendelse"
 
-#: ../../Zotlabs/Module/Events.php:612
+#: ../../Code/Module/Events.php:612
 msgid "Delete event"
 msgstr "Slett hendelse"
 
-#: ../../Zotlabs/Module/Events.php:646
+#: ../../Code/Module/Events.php:646
 msgid "calendar"
 msgstr "kalender"
 
-#: ../../Zotlabs/Module/Events.php:706
+#: ../../Code/Module/Events.php:706
 msgid "Event removed"
 msgstr "Hendelse slettet"
 
-#: ../../Zotlabs/Module/Events.php:709
+#: ../../Code/Module/Events.php:709
 msgid "Failed to remove event"
 msgstr "Mislyktes med å slette hendelse"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
+#: ../../Code/Module/Fbrowser.php:29 ../../Code/Lib/Apps.php:220
 #: ../../include/nav.php:92 ../../include/conversation.php:1632
 msgid "Photos"
 msgstr "Bilder"
 
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
+#: ../../Code/Module/Fbrowser.php:66 ../../Code/Module/Fbrowser.php:88
+#: ../../Code/Module/Admin.php:1406 ../../Code/Module/Settings.php:591
+#: ../../Code/Module/Settings.php:617 ../../Code/Module/Tagrm.php:15
+#: ../../Code/Module/Tagrm.php:138 ../../include/conversation.php:1259
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+#: ../../Code/Module/Dirsearch.php:25 ../../Code/Module/Regdir.php:49
 msgid "This site is not a directory server"
 msgstr "Dette nettstedet er ikke en katalogtjener"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
+#: ../../Code/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "Denne katalogtjeneren krever en tilgangsnøkkel (access token)"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "Save to Folder:"
 msgstr "Lagre til mappe:"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "- select -"
 msgstr "- velg -"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
+#: ../../Code/Module/Filer.php:53 ../../Code/Module/Admin.php:2033
+#: ../../Code/Module/Admin.php:2053 ../../Code/Module/Rbmark.php:32
+#: ../../Code/Module/Rbmark.php:104 ../../include/text.php:946
 #: ../../include/text.php:958 ../../include/widgets.php:201
 msgid "Save"
 msgstr "Lagre"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Code/Module/Dreport.php:27
 msgid "Invalid message"
 msgstr "Ugyldig melding"
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Code/Module/Dreport.php:59
 msgid "no results"
 msgstr "ingen resultater"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Code/Module/Dreport.php:64
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Leveringsrapport for %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
+#: ../../Code/Module/Dreport.php:78
 msgid "channel sync processed"
 msgstr "Kanalsynkronisering er behandlet"
 
-#: ../../Zotlabs/Module/Dreport.php:82
+#: ../../Code/Module/Dreport.php:82
 msgid "queued"
 msgstr "lagt i kø"
 
-#: ../../Zotlabs/Module/Dreport.php:86
+#: ../../Code/Module/Dreport.php:86
 msgid "posted"
 msgstr "lagt inn"
 
-#: ../../Zotlabs/Module/Dreport.php:90
+#: ../../Code/Module/Dreport.php:90
 msgid "accepted for delivery"
 msgstr "akseptert for levering"
 
-#: ../../Zotlabs/Module/Dreport.php:94
+#: ../../Code/Module/Dreport.php:94
 msgid "updated"
 msgstr "oppdatert"
 
-#: ../../Zotlabs/Module/Dreport.php:97
+#: ../../Code/Module/Dreport.php:97
 msgid "update ignored"
 msgstr "oppdatering ignorert"
 
-#: ../../Zotlabs/Module/Dreport.php:100
+#: ../../Code/Module/Dreport.php:100
 msgid "permission denied"
 msgstr "tillatelse avvist"
 
-#: ../../Zotlabs/Module/Dreport.php:104
+#: ../../Code/Module/Dreport.php:104
 msgid "recipient not found"
 msgstr "mottaker ble ikke funnet"
 
-#: ../../Zotlabs/Module/Dreport.php:107
+#: ../../Code/Module/Dreport.php:107
 msgid "mail recalled"
 msgstr "melding tilbakekalt"
 
-#: ../../Zotlabs/Module/Dreport.php:110
+#: ../../Code/Module/Dreport.php:110
 msgid "duplicate mail received"
 msgstr "duplikat av melding mottatt"
 
-#: ../../Zotlabs/Module/Dreport.php:113
+#: ../../Code/Module/Dreport.php:113
 msgid "mail delivered"
 msgstr "melding mottatt"
 
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Code/Module/Editlayout.php:126
+#: ../../Code/Module/Layouts.php:127 ../../Code/Module/Layouts.php:186
 msgid "Layout Name"
 msgstr "Layout-navn"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Code/Module/Editlayout.php:127
+#: ../../Code/Module/Layouts.php:130
 msgid "Layout Description (Optional)"
 msgstr "Layoutens beskrivelse (valgfritt)"
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Code/Module/Editlayout.php:135
 msgid "Edit Layout"
 msgstr "Endre layout"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Code/Module/Editwebpage.php:143
 msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Code/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr "Endre webside"
 
-#: ../../Zotlabs/Module/Follow.php:34
+#: ../../Code/Module/Follow.php:34
 msgid "Channel added."
 msgstr "Kanal lagt til."
 
-#: ../../Zotlabs/Module/Acl.php:227
+#: ../../Code/Module/Acl.php:227
 msgid "network"
 msgstr "nettverk"
 
-#: ../../Zotlabs/Module/Acl.php:237
+#: ../../Code/Module/Acl.php:237
 msgid "RSS"
 msgstr "RSS"
 
-#: ../../Zotlabs/Module/Group.php:24
+#: ../../Code/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Personverngruppen er opprettet."
 
-#: ../../Zotlabs/Module/Group.php:30
+#: ../../Code/Module/Group.php:30
 msgid "Could not create privacy group."
 msgstr "Kunne ikke opprette personverngruppen."
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../Code/Module/Group.php:42 ../../Code/Module/Group.php:141
 #: ../../include/items.php:3893
 msgid "Privacy group not found."
 msgstr "Personverngruppen ble ikke funnet"
 
-#: ../../Zotlabs/Module/Group.php:58
+#: ../../Code/Module/Group.php:58
 msgid "Privacy group updated."
 msgstr "Personverngruppen er oppdatert."
 
-#: ../../Zotlabs/Module/Group.php:90
+#: ../../Code/Module/Group.php:90
 msgid "Create a group of channels."
 msgstr "Lag en gruppe av kanaler."
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+#: ../../Code/Module/Group.php:91 ../../Code/Module/Group.php:184
 msgid "Privacy group name: "
 msgstr "Personverngruppens navn:"
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+#: ../../Code/Module/Group.php:93 ../../Code/Module/Group.php:187
 msgid "Members are visible to other channels"
 msgstr "Medlemmer er synlig for andre kanaler"
 
-#: ../../Zotlabs/Module/Group.php:111
+#: ../../Code/Module/Group.php:111
 msgid "Privacy group removed."
 msgstr "Personverngruppen er fjernet."
 
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Code/Module/Group.php:113
 msgid "Unable to remove privacy group."
 msgstr "Ikke i stand til å fjerne personverngruppen."
 
-#: ../../Zotlabs/Module/Group.php:183
+#: ../../Code/Module/Group.php:183
 msgid "Privacy group editor"
 msgstr "Personverngruppebehandler"
 
-#: ../../Zotlabs/Module/Group.php:197
+#: ../../Code/Module/Group.php:197
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../../Zotlabs/Module/Group.php:199
+#: ../../Code/Module/Group.php:199
 msgid "All Connected Channels"
 msgstr "Alle tilkoblede kanaler"
 
-#: ../../Zotlabs/Module/Group.php:231
+#: ../../Code/Module/Group.php:231
 msgid "Click on a channel to add or remove."
 msgstr "Klikk på en kanal for å legge til eller fjerne."
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
+#: ../../Code/Module/Ffsapi.php:12
 msgid "Share content from Firefox to $Projectname"
 msgstr "Del innhold fra Firefox til $Projectname"
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
+#: ../../Code/Module/Ffsapi.php:15
 msgid "Activate the Firefox $Projectname provider"
 msgstr "Skru på Firefox $Projectname tilbyderen"
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:61 ../../Code/Module/Api.php:85
 msgid "Authorize application connection"
 msgstr "Tillat programforbindelse"
 
-#: ../../Zotlabs/Module/Api.php:62
+#: ../../Code/Module/Api.php:62
 msgid "Return to your app and insert this Securty Code:"
 msgstr "Gå tilbake til din app og legg inn denne sikkerhetskoden:"
 
-#: ../../Zotlabs/Module/Api.php:72
+#: ../../Code/Module/Api.php:72
 msgid "Please login to continue."
 msgstr "Vennligst logg inn for å fortsette."
 
-#: ../../Zotlabs/Module/Api.php:87
+#: ../../Code/Module/Api.php:87
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?"
 
-#: ../../Zotlabs/Module/Help.php:26
+#: ../../Code/Module/Help.php:26
 msgid "Documentation Search"
 msgstr "Søk i dokumentasjon"
 
-#: ../../Zotlabs/Module/Help.php:67 ../../Zotlabs/Module/Help.php:73
-#: ../../Zotlabs/Module/Help.php:79
+#: ../../Code/Module/Help.php:67 ../../Code/Module/Help.php:73
+#: ../../Code/Module/Help.php:79
 msgid "Help:"
 msgstr "Hjelp:"
 
-#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
+#: ../../Code/Module/Help.php:85 ../../Code/Module/Help.php:90
+#: ../../Code/Module/Layouts.php:183 ../../Code/Lib/Apps.php:223
 #: ../../include/nav.php:159
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../../Zotlabs/Module/Help.php:120
+#: ../../Code/Module/Help.php:120
 msgid "$Projectname Documentation"
 msgstr "$Projectname dokumentasjon"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
+#: ../../Code/Module/Filestorage.php:88
 msgid "Permission Denied."
 msgstr "Tillatelse avvist."
 
-#: ../../Zotlabs/Module/Filestorage.php:104
+#: ../../Code/Module/Filestorage.php:104
 msgid "File not found."
 msgstr "Filen ble ikke funnet."
 
-#: ../../Zotlabs/Module/Filestorage.php:147
+#: ../../Code/Module/Filestorage.php:147
 msgid "Edit file permissions"
 msgstr "Endre filtillatelser"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Code/Module/Filestorage.php:156
 msgid "Set/edit permissions"
 msgstr "Angi/endre tillatelser"
 
-#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Code/Module/Filestorage.php:157
 msgid "Include all files and sub folders"
 msgstr "Inkluder alle filer og undermapper"
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Code/Module/Filestorage.php:158
 msgid "Return to file list"
 msgstr "Gå tilbake til filoversikten"
 
-#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Code/Module/Filestorage.php:160
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Kopier og lim inn denne koden for å legge til filen i et innlegg"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Code/Module/Filestorage.php:161
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Kopier og lim inn denne URL-en for å lenke til filen fra en webside"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
+#: ../../Code/Module/Filestorage.php:163
 msgid "Share this file"
 msgstr "Del denne filen"
 
-#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Code/Module/Filestorage.php:164
 msgid "Show URL to this file"
 msgstr "Vis URLen til denne filen"
 
-#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Code/Module/Filestorage.php:165
 msgid "Notify your contacts about this file"
 msgstr "Varsle dine kontakter om denne filen"
 
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
+#: ../../Code/Module/Apps.php:47 ../../include/widgets.php:102
 #: ../../include/nav.php:163
 msgid "Apps"
 msgstr "Apper"
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Elementet er ikke tilgjengelig."
 
-#: ../../Zotlabs/Module/Import.php:32
+#: ../../Code/Module/Import.php:32
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Din tjenesteplan tillater bare %d kanaler."
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
+#: ../../Code/Module/Import.php:70 ../../Code/Module/Import_items.php:42
 msgid "Nothing to import."
 msgstr "Ingenting å importere."
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
+#: ../../Code/Module/Import.php:94 ../../Code/Module/Import_items.php:66
 msgid "Unable to download data from old server"
 msgstr "Ikke i stand til å laste ned data fra gammel tjener"
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
+#: ../../Code/Module/Import.php:100
+#: ../../Code/Module/Import_items.php:72
 msgid "Imported file is empty."
 msgstr "Importert fil er tom."
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
+#: ../../Code/Module/Import.php:122
+#: ../../Code/Module/Import_items.php:86
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Advarsel: databaseversjoner avviker med %1$d oppdateringer."
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
+#: ../../Code/Module/Import.php:150 ../../include/import.php:86
 msgid "Cloned channel not found. Import failed."
 msgstr "Klonet kanal ble ikke funnet. Import mislyktes."
 
-#: ../../Zotlabs/Module/Import.php:160
+#: ../../Code/Module/Import.php:160
 msgid "No channel. Import failed."
 msgstr "Ingen kanal. Import mislyktes."
 
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Code/Module/Import.php:510
 #: ../../include/Import/import_diaspora.php:142
 msgid "Import completed."
 msgstr "Import ferdig."
 
-#: ../../Zotlabs/Module/Import.php:532
+#: ../../Code/Module/Import.php:532
 msgid "You must be logged in to use this feature."
 msgstr "Du må være innlogget for å bruke denne funksjonen."
 
-#: ../../Zotlabs/Module/Import.php:537
+#: ../../Code/Module/Import.php:537
 msgid "Import Channel"
 msgstr "Importer kanal"
 
-#: ../../Zotlabs/Module/Import.php:538
+#: ../../Code/Module/Import.php:538
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
+#: ../../Code/Module/Import.php:539
+#: ../../Code/Module/Import_items.php:119
 msgid "File to Upload"
 msgstr "Fil som skal lastes opp"
 
-#: ../../Zotlabs/Module/Import.php:540
+#: ../../Code/Module/Import.php:540
 msgid "Or provide the old server/hub details"
 msgstr "Eller oppgi detaljene fra den gamle tjeneren/hub-en"
 
-#: ../../Zotlabs/Module/Import.php:541
+#: ../../Code/Module/Import.php:541
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Din gamle identitetsadresse (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:542
+#: ../../Code/Module/Import.php:542
 msgid "Your old login email address"
 msgstr "Din gamle innloggings e-postadresse"
 
-#: ../../Zotlabs/Module/Import.php:543
+#: ../../Code/Module/Import.php:543
 msgid "Your old login password"
 msgstr "Ditt gamle innloggingspassord"
 
-#: ../../Zotlabs/Module/Import.php:544
+#: ../../Code/Module/Import.php:544
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -1803,1243 +1803,1243 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media."
 
-#: ../../Zotlabs/Module/Import.php:545
+#: ../../Code/Module/Import.php:545
 msgid "Make this hub my primary location"
 msgstr "Gjør dette nettstedet til min primære plassering"
 
-#: ../../Zotlabs/Module/Import.php:546
+#: ../../Code/Module/Import.php:546
 msgid ""
 "Import existing posts if possible (experimental - limited by available "
 "memory"
 msgstr "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)"
 
-#: ../../Zotlabs/Module/Import.php:547
+#: ../../Code/Module/Import.php:547
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
 msgstr "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig."
 
-#: ../../Zotlabs/Module/Item.php:178
+#: ../../Code/Module/Item.php:178
 msgid "Unable to locate original post."
 msgstr "Ikke i stand til å finne opprinnelig innlegg."
 
-#: ../../Zotlabs/Module/Item.php:427
+#: ../../Code/Module/Item.php:427
 msgid "Empty post discarded."
 msgstr "Tomt innlegg forkastet."
 
-#: ../../Zotlabs/Module/Item.php:467
+#: ../../Code/Module/Item.php:467
 msgid "Executable content type not permitted to this channel."
 msgstr "Kjørbar innholdstype er ikke tillat for denne kanalen."
 
-#: ../../Zotlabs/Module/Item.php:847
+#: ../../Code/Module/Item.php:847
 msgid "Duplicate post suppressed."
 msgstr "Duplikat av innlegg forhindret."
 
-#: ../../Zotlabs/Module/Item.php:977
+#: ../../Code/Module/Item.php:977
 msgid "System error. Post not saved."
 msgstr "Systemfeil. Innlegg ble ikke lagret."
 
-#: ../../Zotlabs/Module/Item.php:1241
+#: ../../Code/Module/Item.php:1241
 msgid "Unable to obtain post information from database."
 msgstr "Ikke i stand til å få tak i informasjon om innlegg fra databasen."
 
-#: ../../Zotlabs/Module/Item.php:1248
+#: ../../Code/Module/Item.php:1248
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Du har nådd din grense på %1$.0f startinnlegg."
 
-#: ../../Zotlabs/Module/Item.php:1255
+#: ../../Code/Module/Item.php:1255
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Du har nådd din grense på %1$.0f websider."
 
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+#: ../../Code/Module/Layouts.php:181 ../../include/text.php:2267
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Code/Module/Layouts.php:183
 msgid "Comanche page description language help"
 msgstr "Hjelp med Comanche sidebeskrivelsesspråk"
 
-#: ../../Zotlabs/Module/Layouts.php:187
+#: ../../Code/Module/Layouts.php:187
 msgid "Layout Description"
 msgstr "Layout-beskrivelse"
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Code/Module/Layouts.php:192
 msgid "Download PDL file"
 msgstr "Last ned PDL-fil"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
+#: ../../Code/Module/Home.php:61 ../../Code/Module/Home.php:69
+#: ../../Code/Module/Siteinfo.php:65
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../Zotlabs/Module/Home.php:79
+#: ../../Code/Module/Home.php:79
 #, php-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: ../../Zotlabs/Module/Id.php:13
+#: ../../Code/Module/Id.php:13
 msgid "First Name"
 msgstr "Fornavn"
 
-#: ../../Zotlabs/Module/Id.php:14
+#: ../../Code/Module/Id.php:14
 msgid "Last Name"
 msgstr "Etternavn"
 
-#: ../../Zotlabs/Module/Id.php:15
+#: ../../Code/Module/Id.php:15
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: ../../Zotlabs/Module/Id.php:16
+#: ../../Code/Module/Id.php:16
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../Code/Module/Id.php:17 ../../Code/Module/Id.php:18
+#: ../../Code/Module/Admin.php:1035 ../../Code/Module/Admin.php:1047
 #: ../../include/network.php:2151 ../../boot.php:1705
 msgid "Email"
 msgstr "E-post"
 
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
+#: ../../Code/Module/Id.php:19 ../../Code/Module/Id.php:20
+#: ../../Code/Module/Id.php:21 ../../Code/Lib/Apps.php:236
 msgid "Profile Photo"
 msgstr "Profilbilde"
 
-#: ../../Zotlabs/Module/Id.php:22
+#: ../../Code/Module/Id.php:22
 msgid "Profile Photo 16px"
 msgstr "Profilbilde 16px"
 
-#: ../../Zotlabs/Module/Id.php:23
+#: ../../Code/Module/Id.php:23
 msgid "Profile Photo 32px"
 msgstr "Profilbilde 32px"
 
-#: ../../Zotlabs/Module/Id.php:24
+#: ../../Code/Module/Id.php:24
 msgid "Profile Photo 48px"
 msgstr "Profilbilde 48px"
 
-#: ../../Zotlabs/Module/Id.php:25
+#: ../../Code/Module/Id.php:25
 msgid "Profile Photo 64px"
 msgstr "Profilbilde 64px"
 
-#: ../../Zotlabs/Module/Id.php:26
+#: ../../Code/Module/Id.php:26
 msgid "Profile Photo 80px"
 msgstr "Profilbilde 80px"
 
-#: ../../Zotlabs/Module/Id.php:27
+#: ../../Code/Module/Id.php:27
 msgid "Profile Photo 128px"
 msgstr "Profilbilde 128px"
 
-#: ../../Zotlabs/Module/Id.php:28
+#: ../../Code/Module/Id.php:28
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Id.php:29 ../../Code/Module/Profiles.php:731
 msgid "Homepage URL"
 msgstr "Hjemmeside URL"
 
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
+#: ../../Code/Module/Id.php:30 ../../Code/Lib/Apps.php:234
 msgid "Language"
 msgstr "Språk"
 
-#: ../../Zotlabs/Module/Id.php:31
+#: ../../Code/Module/Id.php:31
 msgid "Birth Year"
 msgstr "Fødselsår"
 
-#: ../../Zotlabs/Module/Id.php:32
+#: ../../Code/Module/Id.php:32
 msgid "Birth Month"
 msgstr "Fødselsmåne"
 
-#: ../../Zotlabs/Module/Id.php:33
+#: ../../Code/Module/Id.php:33
 msgid "Birth Day"
 msgstr "Fødselsdag"
 
-#: ../../Zotlabs/Module/Id.php:34
+#: ../../Code/Module/Id.php:34
 msgid "Birthdate"
 msgstr "Fødselsdato"
 
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+#: ../../Code/Module/Id.php:35 ../../Code/Module/Profiles.php:454
 msgid "Gender"
 msgstr "Kjønn"
 
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../Code/Module/Id.php:108 ../../include/selectors.php:49
 #: ../../include/selectors.php:66
 msgid "Male"
 msgstr "Mannlig"
 
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../Code/Module/Id.php:110 ../../include/selectors.php:49
 #: ../../include/selectors.php:66
 msgid "Female"
 msgstr "Kvinnelig"
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+#: ../../Code/Module/Impel.php:41 ../../include/bbcode.php:192
 msgid "webpage"
 msgstr "nettside"
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+#: ../../Code/Module/Impel.php:46 ../../include/bbcode.php:198
 msgid "block"
 msgstr "byggekloss"
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+#: ../../Code/Module/Impel.php:51 ../../include/bbcode.php:195
 msgid "layout"
 msgstr "layout"
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+#: ../../Code/Module/Impel.php:58 ../../include/bbcode.php:201
 msgid "menu"
 msgstr "meny"
 
-#: ../../Zotlabs/Module/Impel.php:196
+#: ../../Code/Module/Impel.php:196
 #, php-format
 msgid "%s element installed"
 msgstr "%s element installert"
 
-#: ../../Zotlabs/Module/Impel.php:199
+#: ../../Code/Module/Impel.php:199
 #, php-format
 msgid "%s element installation failed"
 msgstr "Installasjon av %s-element mislyktes"
 
-#: ../../Zotlabs/Module/Like.php:19
+#: ../../Code/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Liker/Liker ikke"
 
-#: ../../Zotlabs/Module/Like.php:24
+#: ../../Code/Module/Like.php:24
 msgid "This action is restricted to members."
 msgstr "Denne handlingen er begrenset til medlemmer."
 
-#: ../../Zotlabs/Module/Like.php:25
+#: ../../Code/Module/Like.php:25
 msgid ""
 "Please login with your $Projectname ID or register as a new $Projectname member to continue."
 msgstr "Vennligst logg inn med din $Projectname ID eller registrer deg som et nytt $Projectname-medlem for å fortsette"
 
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
+#: ../../Code/Module/Like.php:105 ../../Code/Module/Like.php:131
+#: ../../Code/Module/Like.php:169
 msgid "Invalid request."
 msgstr "Ugyldig forespørsel."
 
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+#: ../../Code/Module/Like.php:117 ../../include/conversation.php:126
 msgid "channel"
 msgstr "kanal"
 
-#: ../../Zotlabs/Module/Like.php:146
+#: ../../Code/Module/Like.php:146
 msgid "thing"
 msgstr "ting"
 
-#: ../../Zotlabs/Module/Like.php:192
+#: ../../Code/Module/Like.php:192
 msgid "Channel unavailable."
 msgstr "Kanalen er utilgjengelig."
 
-#: ../../Zotlabs/Module/Like.php:240
+#: ../../Code/Module/Like.php:240
 msgid "Previous action reversed."
 msgstr "Forrige handling er omgjort."
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940
+#: ../../Code/Module/Like.php:371 ../../Code/Module/Subthread.php:87
+#: ../../Code/Module/Tagger.php:47 ../../include/text.php:1940
 #: ../../include/conversation.php:120
 msgid "photo"
 msgstr "foto"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Code/Module/Like.php:371 ../../Code/Module/Subthread.php:87
 #: ../../include/text.php:1946 ../../include/conversation.php:148
 msgid "status"
 msgstr "status"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Code/Module/Like.php:420 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s liker %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Code/Module/Like.php:422 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s liker ikke %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Code/Module/Like.php:424
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s er enig med %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Code/Module/Like.php:426
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s er ikke enig med %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Code/Module/Like.php:428
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s avstår fra å mene noe om %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Code/Module/Like.php:430
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s deltar på %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Code/Module/Like.php:432
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s deltar ikke på %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Code/Module/Like.php:434
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s deltar kanskje på %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Code/Module/Like.php:537
 msgid "Action completed."
 msgstr "Handling ferdig."
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Code/Module/Like.php:538
 msgid "Thank you."
 msgstr "Tusen takk."
 
-#: ../../Zotlabs/Module/Import_items.php:102
+#: ../../Code/Module/Import_items.php:102
 msgid "Import completed"
 msgstr "Import ferdig"
 
-#: ../../Zotlabs/Module/Import_items.php:117
+#: ../../Code/Module/Import_items.php:117
 msgid "Import Items"
 msgstr "Importer elementer"
 
-#: ../../Zotlabs/Module/Import_items.php:118
+#: ../../Code/Module/Import_items.php:118
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil."
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Code/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
 msgstr "Grensen for totalt antall invitasjoner er overskredet."
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Code/Module/Invite.php:53
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : ikke en gyldig e-postadresse."
 
-#: ../../Zotlabs/Module/Invite.php:63
+#: ../../Code/Module/Invite.php:63
 msgid "Please join us on $Projectname"
 msgstr "Bli med oss på $Projectname"
 
-#: ../../Zotlabs/Module/Invite.php:74
+#: ../../Code/Module/Invite.php:74
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr "Invitasjonsgrensen er overskredet. Vennligst kontakt administratoren ved ditt nettsted."
 
-#: ../../Zotlabs/Module/Invite.php:79
+#: ../../Code/Module/Invite.php:79
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : meldingslevering feilet."
 
-#: ../../Zotlabs/Module/Invite.php:83
+#: ../../Code/Module/Invite.php:83
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d melding sendt."
 msgstr[1] "%d meldinger sendt."
 
-#: ../../Zotlabs/Module/Invite.php:102
+#: ../../Code/Module/Invite.php:102
 msgid "You have no more invitations available"
 msgstr "Du har ikke flere invitasjoner tilgjengelig"
 
-#: ../../Zotlabs/Module/Invite.php:133
+#: ../../Code/Module/Invite.php:133
 msgid "Send invitations"
 msgstr "Send invitasjoner"
 
-#: ../../Zotlabs/Module/Invite.php:134
+#: ../../Code/Module/Invite.php:134
 msgid "Enter email addresses, one per line:"
 msgstr "Skriv e-postadresser, en per linje:"
 
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
+#: ../../Code/Module/Invite.php:135 ../../Code/Module/Mail.php:249
 msgid "Your message:"
 msgstr "Din melding:"
 
-#: ../../Zotlabs/Module/Invite.php:136
+#: ../../Code/Module/Invite.php:136
 msgid "Please join my community on $Projectname."
 msgstr "Du er velkommen til å bli med i mitt fellesskap på $Projectname."
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Code/Module/Invite.php:138
 msgid "You will need to supply this invitation code:"
 msgstr "Du må oppgi denne invitasjonskoden:"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Code/Module/Invite.php:139
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Registrer ved enhver $Projectname-lokasjon (de er alle forbundet med hverandre)"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Code/Module/Invite.php:141
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Skriv inn min $Projectname-adresse i nettstedets søkefelt."
 
-#: ../../Zotlabs/Module/Invite.php:142
+#: ../../Code/Module/Invite.php:142
 msgid "or visit"
 msgstr "eller besøke"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Code/Module/Invite.php:144
 msgid "3. Click [Connect]"
 msgstr "3. Klikk [Forbindelse]"
 
-#: ../../Zotlabs/Module/Lockview.php:61
+#: ../../Code/Module/Lockview.php:61
 msgid "Remote privacy information not available."
 msgstr "Ekstern personverninformasjon er ikke tilgjengelig."
 
-#: ../../Zotlabs/Module/Lockview.php:82
+#: ../../Code/Module/Lockview.php:82
 msgid "Visible to:"
 msgstr "Synlig for:"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+#: ../../Code/Module/Locs.php:25 ../../Code/Module/Locs.php:54
 msgid "Location not found."
 msgstr "Plassering er ikke funnet."
 
-#: ../../Zotlabs/Module/Locs.php:62
+#: ../../Code/Module/Locs.php:62
 msgid "Location lookup failed."
 msgstr "Oppslag på plassering mislyktes."
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Code/Module/Locs.php:66
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
 msgstr "Vennligst velg en annen plassering som primær før du sletter gjeldende primære plassering."
 
-#: ../../Zotlabs/Module/Locs.php:95
+#: ../../Code/Module/Locs.php:95
 msgid "Syncing locations"
 msgstr "Synkroniserer plasseringer"
 
-#: ../../Zotlabs/Module/Locs.php:105
+#: ../../Code/Module/Locs.php:105
 msgid "No locations found."
 msgstr "Ingen plasseringer ble funnet."
 
-#: ../../Zotlabs/Module/Locs.php:116
+#: ../../Code/Module/Locs.php:116
 msgid "Manage Channel Locations"
 msgstr "Håndter kanalplasseringer"
 
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
+#: ../../Code/Module/Locs.php:118 ../../Code/Module/Profiles.php:470
+#: ../../Code/Module/Admin.php:1224
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../Zotlabs/Module/Locs.php:119
+#: ../../Code/Module/Locs.php:119
 msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+#: ../../Code/Module/Locs.php:120 ../../Code/Module/Menu.php:113
 msgid "Drop"
 msgstr "Slett"
 
-#: ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Locs.php:122
 msgid "Sync Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Vennligst vent flere minutter mellom hver etterfølgende operasjon."
 
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Code/Module/Locs.php:124
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
 msgstr "Når mulig, fjern en plassering ved å logge inn på det nettstedet eller den hub-en og fjern din kanal."
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Bruk dette skjemaet for å fjerne plasseringen hvis huben ikke er i drift lenger."
 
-#: ../../Zotlabs/Module/Magic.php:71
+#: ../../Code/Module/Magic.php:71
 msgid "Hub not found."
 msgstr "Hubben ble ikke funnet."
 
-#: ../../Zotlabs/Module/Mail.php:38
+#: ../../Code/Module/Mail.php:38
 msgid "Unable to lookup recipient."
 msgstr "Ikke i stand til å slå opp mottaker."
 
-#: ../../Zotlabs/Module/Mail.php:45
+#: ../../Code/Module/Mail.php:45
 msgid "Unable to communicate with requested channel."
 msgstr "Ikke i stand til å kommunisere med forespurt kanal."
 
-#: ../../Zotlabs/Module/Mail.php:52
+#: ../../Code/Module/Mail.php:52
 msgid "Cannot verify requested channel."
 msgstr "Kan ikke bekrefte forespurt kanal."
 
-#: ../../Zotlabs/Module/Mail.php:78
+#: ../../Code/Module/Mail.php:78
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Valgt kanal har restriksjoner for private meldinger. Sending feilet."
 
-#: ../../Zotlabs/Module/Mail.php:143
+#: ../../Code/Module/Mail.php:143
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../../Zotlabs/Module/Mail.php:178
+#: ../../Code/Module/Mail.php:178
 msgid "Message recalled."
 msgstr "Innlegg tilbakekalt."
 
-#: ../../Zotlabs/Module/Mail.php:191
+#: ../../Code/Module/Mail.php:191
 msgid "Conversation removed."
 msgstr "Samtale fjernet."
 
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
+#: ../../Code/Module/Mail.php:206 ../../Code/Module/Mail.php:315
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Utløper YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:234
+#: ../../Code/Module/Mail.php:234
 msgid "Requested channel is not in this network"
 msgstr "Forespurt kanal er ikke tilgjengelig i dette nettverket."
 
-#: ../../Zotlabs/Module/Mail.php:242
+#: ../../Code/Module/Mail.php:242
 msgid "Send Private Message"
 msgstr "Send privat melding"
 
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../Code/Module/Mail.php:243 ../../Code/Module/Mail.php:368
 msgid "To:"
 msgstr "Til:"
 
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
+#: ../../Code/Module/Mail.php:246 ../../Code/Module/Mail.php:370
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
+#: ../../Code/Module/Mail.php:251 ../../Code/Module/Mail.php:376
 #: ../../include/conversation.php:1220
 msgid "Attach file"
 msgstr "Legg ved fil"
 
-#: ../../Zotlabs/Module/Mail.php:253
+#: ../../Code/Module/Mail.php:253
 msgid "Send"
 msgstr "Send"
 
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
+#: ../../Code/Module/Mail.php:256 ../../Code/Module/Mail.php:381
 #: ../../include/conversation.php:1251
 msgid "Set expiration date"
 msgstr "Angi utløpsdato"
 
-#: ../../Zotlabs/Module/Mail.php:340
+#: ../../Code/Module/Mail.php:340
 msgid "Delete message"
 msgstr "Slett melding"
 
-#: ../../Zotlabs/Module/Mail.php:341
+#: ../../Code/Module/Mail.php:341
 msgid "Delivery report"
 msgstr "Leveringsrapport"
 
-#: ../../Zotlabs/Module/Mail.php:342
+#: ../../Code/Module/Mail.php:342
 msgid "Recall message"
 msgstr "Tilbakekall innlegg"
 
-#: ../../Zotlabs/Module/Mail.php:344
+#: ../../Code/Module/Mail.php:344
 msgid "Message has been recalled."
 msgstr "Innlegget har blitt tilbakekalt."
 
-#: ../../Zotlabs/Module/Mail.php:361
+#: ../../Code/Module/Mail.php:361
 msgid "Delete Conversation"
 msgstr "Slett samtale"
 
-#: ../../Zotlabs/Module/Mail.php:363
+#: ../../Code/Module/Mail.php:363
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "Ingen sikret kommunikasjon tilgjengelig. Du kan muligens greie å svare via senderens profilside."
 
-#: ../../Zotlabs/Module/Mail.php:367
+#: ../../Code/Module/Mail.php:367
 msgid "Send Reply"
 msgstr "Send svar"
 
-#: ../../Zotlabs/Module/Mail.php:372
+#: ../../Code/Module/Mail.php:372
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Din melding til %s (%s):"
 
-#: ../../Zotlabs/Module/Manage.php:136
-#: ../../Zotlabs/Module/New_channel.php:121
+#: ../../Code/Module/Manage.php:136
+#: ../../Code/Module/New_channel.php:121
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Du har laget %1$.0f av %2$.0f tillatte kanaler."
 
-#: ../../Zotlabs/Module/Manage.php:143
+#: ../../Code/Module/Manage.php:143
 msgid "Create a new channel"
 msgstr "Lag en ny kanal"
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
+#: ../../Code/Module/Manage.php:164 ../../Code/Lib/Apps.php:213
 #: ../../include/nav.php:206
 msgid "Channel Manager"
 msgstr "Kanalstyring"
 
-#: ../../Zotlabs/Module/Manage.php:165
+#: ../../Code/Module/Manage.php:165
 msgid "Current Channel"
 msgstr "Gjeldende kanal"
 
-#: ../../Zotlabs/Module/Manage.php:167
+#: ../../Code/Module/Manage.php:167
 msgid "Switch to one of your channels by selecting it."
 msgstr "Bytt til en av dine kanaler ved å velge den."
 
-#: ../../Zotlabs/Module/Manage.php:168
+#: ../../Code/Module/Manage.php:168
 msgid "Default Channel"
 msgstr "Standardkanal"
 
-#: ../../Zotlabs/Module/Manage.php:169
+#: ../../Code/Module/Manage.php:169
 msgid "Make Default"
 msgstr "Gjør til standard"
 
-#: ../../Zotlabs/Module/Manage.php:172
+#: ../../Code/Module/Manage.php:172
 #, php-format
 msgid "%d new messages"
 msgstr "%d nye meldinger"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Code/Module/Manage.php:173
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nye introduksjoner"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Code/Module/Manage.php:175
 msgid "Delegated Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "Ingen gyldig konto funnet."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:107
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Nettstedsmedlem (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44
+#: ../../Code/Module/Lostpass.php:44
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Forespurt om å tilbakestille passord hos %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:67
+#: ../../Code/Module/Lostpass.php:67
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes."
 
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
+#: ../../Code/Module/Lostpass.php:90 ../../boot.php:1711
 msgid "Password Reset"
 msgstr "Tilbakestill passord"
 
-#: ../../Zotlabs/Module/Lostpass.php:91
+#: ../../Code/Module/Lostpass.php:91
 msgid "Your password has been reset as requested."
 msgstr "Ditt passord har blitt tilbakestilt som forespurt."
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your new password is"
 msgstr "Ditt nye passord er"
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Save or copy your new password - and then"
 msgstr "Lagre eller kopier ditt nye passord, og deretter kan du"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "click here to login"
 msgstr "klikke her for å logge inn"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr "Ditt passord kan endres på siden Innstillinger etter vellykket innlogging."
 
-#: ../../Zotlabs/Module/Lostpass.php:112
+#: ../../Code/Module/Lostpass.php:112
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Ditt passord er endret hos %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:127
+#: ../../Code/Module/Lostpass.php:127
 msgid "Forgot your Password?"
 msgstr "Glemt passord ditt?"
 
-#: ../../Zotlabs/Module/Lostpass.php:128
+#: ../../Code/Module/Lostpass.php:128
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner."
 
-#: ../../Zotlabs/Module/Lostpass.php:129
+#: ../../Code/Module/Lostpass.php:129
 msgid "Email Address"
 msgstr "E-postadresse"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Reset"
 msgstr "Tilbakestill"
 
-#: ../../Zotlabs/Module/Menu.php:49
+#: ../../Code/Module/Menu.php:49
 msgid "Unable to update menu."
 msgstr "Ikke i stand til å oppdatere meny."
 
-#: ../../Zotlabs/Module/Menu.php:60
+#: ../../Code/Module/Menu.php:60
 msgid "Unable to create menu."
 msgstr "Ikke i stand til å lage meny."
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+#: ../../Code/Module/Menu.php:98 ../../Code/Module/Menu.php:110
 msgid "Menu Name"
 msgstr "Menynavn"
 
-#: ../../Zotlabs/Module/Menu.php:98
+#: ../../Code/Module/Menu.php:98
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Unikt navn (ikke synlig på websiden) - påkrevet"
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+#: ../../Code/Module/Menu.php:99 ../../Code/Module/Menu.php:111
 msgid "Menu Title"
 msgstr "Menytittel"
 
-#: ../../Zotlabs/Module/Menu.php:99
+#: ../../Code/Module/Menu.php:99
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Synlig på websiden - la stå tomt for ingen tittel"
 
-#: ../../Zotlabs/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:100
 msgid "Allow Bookmarks"
 msgstr "Tillat bokmerker"
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Menyen kan brukes til å lagre lagrede bokmerker"
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+#: ../../Code/Module/Menu.php:101 ../../Code/Module/Menu.php:159
 msgid "Submit and proceed"
 msgstr "Send inn og fortsett"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
+#: ../../Code/Module/Menu.php:107 ../../include/text.php:2266
 msgid "Menus"
 msgstr "Menyer"
 
-#: ../../Zotlabs/Module/Menu.php:117
+#: ../../Code/Module/Menu.php:117
 msgid "Bookmarks allowed"
 msgstr "Bokmerker tillatt"
 
-#: ../../Zotlabs/Module/Menu.php:119
+#: ../../Code/Module/Menu.php:119
 msgid "Delete this menu"
 msgstr "Slett denne menyen"
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+#: ../../Code/Module/Menu.php:120 ../../Code/Module/Menu.php:154
 msgid "Edit menu contents"
 msgstr "Endre menyinnholdet"
 
-#: ../../Zotlabs/Module/Menu.php:121
+#: ../../Code/Module/Menu.php:121
 msgid "Edit this menu"
 msgstr "Endre denne menyen"
 
-#: ../../Zotlabs/Module/Menu.php:136
+#: ../../Code/Module/Menu.php:136
 msgid "Menu could not be deleted."
 msgstr "Menyen kunne ikke bli slettet."
 
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+#: ../../Code/Module/Menu.php:144 ../../Code/Module/Mitem.php:28
 msgid "Menu not found."
 msgstr "Menyen ble ikke funnet."
 
-#: ../../Zotlabs/Module/Menu.php:149
+#: ../../Code/Module/Menu.php:149
 msgid "Edit Menu"
 msgstr "Endre meny"
 
-#: ../../Zotlabs/Module/Menu.php:153
+#: ../../Code/Module/Menu.php:153
 msgid "Add or remove entries to this menu"
 msgstr "Legg til eller fjern punkter i denne menyen"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Menu name"
 msgstr "Menynavn"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Must be unique, only seen by you"
 msgstr "Må være unik, ses bare av deg"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title"
 msgstr "Menytittel"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title as seen by others"
 msgstr "Menytittelen andre ser"
 
-#: ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:157
 msgid "Allow bookmarks"
 msgstr "Tillat bokmerker"
 
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
+#: ../../Code/Module/Menu.php:166 ../../Code/Module/Mitem.php:120
+#: ../../Code/Module/Xchan.php:41
 msgid "Not found."
 msgstr "Ikke funnet."
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#: ../../Code/Module/Mood.php:67 ../../include/conversation.php:260
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s er %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
+#: ../../Code/Module/Mood.php:135 ../../Code/Lib/Apps.php:225
 msgid "Mood"
 msgstr "Stemning"
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Code/Module/Mood.php:136
 msgid "Set your current mood and tell your friends"
 msgstr "Angi ditt nåværende humør og fortell dine venner"
 
-#: ../../Zotlabs/Module/Match.php:26
+#: ../../Code/Module/Match.php:26
 msgid "Profile Match"
 msgstr "Profiltreff"
 
-#: ../../Zotlabs/Module/Match.php:35
+#: ../../Code/Module/Match.php:35
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr "Ingen nøkkelord å sammenlikne. Vennligst legg til nøkkelord til din standardprofil."
 
-#: ../../Zotlabs/Module/Match.php:67
+#: ../../Code/Module/Match.php:67
 msgid "is interested in:"
 msgstr "er interessert i:"
 
-#: ../../Zotlabs/Module/Match.php:74
+#: ../../Code/Module/Match.php:74
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: ../../Zotlabs/Module/Network.php:96
+#: ../../Code/Module/Network.php:96
 msgid "No such group"
 msgstr "Gruppen finnes ikke"
 
-#: ../../Zotlabs/Module/Network.php:136
+#: ../../Code/Module/Network.php:136
 msgid "No such channel"
 msgstr "Ingen slik kanal"
 
-#: ../../Zotlabs/Module/Network.php:141
+#: ../../Code/Module/Network.php:141
 msgid "forum"
 msgstr "forum"
 
-#: ../../Zotlabs/Module/Network.php:153
+#: ../../Code/Module/Network.php:153
 msgid "Search Results For:"
 msgstr "Søkeresultat for:"
 
-#: ../../Zotlabs/Module/Network.php:217
+#: ../../Code/Module/Network.php:217
 msgid "Privacy group is empty"
 msgstr "Personverngruppen er tom"
 
-#: ../../Zotlabs/Module/Network.php:226
+#: ../../Code/Module/Network.php:226
 msgid "Privacy group: "
 msgstr "Personverngruppe:"
 
-#: ../../Zotlabs/Module/Network.php:252
+#: ../../Code/Module/Network.php:252
 msgid "Invalid connection."
 msgstr "Ugyldig forbindelse."
 
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
+#: ../../Code/Module/Notify.php:57
+#: ../../Code/Module/Notifications.php:98
 msgid "No more system notifications."
 msgstr "Ingen flere systemvarsler."
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
+#: ../../Code/Module/Notify.php:61
+#: ../../Code/Module/Notifications.php:102
 msgid "System Notifications"
 msgstr "Systemvarsler"
 
-#: ../../Zotlabs/Module/Mitem.php:52
+#: ../../Code/Module/Mitem.php:52
 msgid "Unable to create element."
 msgstr "Klarer ikke å lage element."
 
-#: ../../Zotlabs/Module/Mitem.php:76
+#: ../../Code/Module/Mitem.php:76
 msgid "Unable to update menu element."
 msgstr "Ikke i stand til å oppdatere menyelement."
 
-#: ../../Zotlabs/Module/Mitem.php:92
+#: ../../Code/Module/Mitem.php:92
 msgid "Unable to add menu element."
 msgstr "Ikke i stand til å legge til menyelement."
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+#: ../../Code/Module/Mitem.php:153 ../../Code/Module/Mitem.php:226
 msgid "Menu Item Permissions"
 msgstr "Menyelement Tillatelser"
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
+#: ../../Code/Module/Mitem.php:154 ../../Code/Module/Mitem.php:227
+#: ../../Code/Module/Settings.php:1068
 msgid "(click to open/close)"
 msgstr "(klikk for å åpne/lukke)"
 
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+#: ../../Code/Module/Mitem.php:156 ../../Code/Module/Mitem.php:172
 msgid "Link Name"
 msgstr "Lenkenavn"
 
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+#: ../../Code/Module/Mitem.php:157 ../../Code/Module/Mitem.php:231
 msgid "Link or Submenu Target"
 msgstr "Lenke- eller undermeny-mål"
 
-#: ../../Zotlabs/Module/Mitem.php:157
+#: ../../Code/Module/Mitem.php:157
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr "Skriv URL-en til lenken eller velg et menynavn for å lage en undermeny"
 
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+#: ../../Code/Module/Mitem.php:158 ../../Code/Module/Mitem.php:232
 msgid "Use magic-auth if available"
 msgstr "Bruk magic-autent hvis mulig"
 
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+#: ../../Code/Module/Mitem.php:159 ../../Code/Module/Mitem.php:233
 msgid "Open link in new window"
 msgstr "Åpne lenke i nytt vindu"
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+#: ../../Code/Module/Mitem.php:160 ../../Code/Module/Mitem.php:234
 msgid "Order in list"
 msgstr "Ordne i liste"
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+#: ../../Code/Module/Mitem.php:160 ../../Code/Module/Mitem.php:234
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Høyere tall vil synke mot bunnen av listen"
 
-#: ../../Zotlabs/Module/Mitem.php:161
+#: ../../Code/Module/Mitem.php:161
 msgid "Submit and finish"
 msgstr "Send inn og avslutt"
 
-#: ../../Zotlabs/Module/Mitem.php:162
+#: ../../Code/Module/Mitem.php:162
 msgid "Submit and continue"
 msgstr "Send inn og fortsett"
 
-#: ../../Zotlabs/Module/Mitem.php:170
+#: ../../Code/Module/Mitem.php:170
 msgid "Menu:"
 msgstr "Meny:"
 
-#: ../../Zotlabs/Module/Mitem.php:173
+#: ../../Code/Module/Mitem.php:173
 msgid "Link Target"
 msgstr "Lenkemål"
 
-#: ../../Zotlabs/Module/Mitem.php:176
+#: ../../Code/Module/Mitem.php:176
 msgid "Edit menu"
 msgstr "Endre meny"
 
-#: ../../Zotlabs/Module/Mitem.php:179
+#: ../../Code/Module/Mitem.php:179
 msgid "Edit element"
 msgstr "Endre element"
 
-#: ../../Zotlabs/Module/Mitem.php:180
+#: ../../Code/Module/Mitem.php:180
 msgid "Drop element"
 msgstr "Slett element"
 
-#: ../../Zotlabs/Module/Mitem.php:181
+#: ../../Code/Module/Mitem.php:181
 msgid "New element"
 msgstr "Nytt element"
 
-#: ../../Zotlabs/Module/Mitem.php:182
+#: ../../Code/Module/Mitem.php:182
 msgid "Edit this menu container"
 msgstr "Endre denne menybeholderen"
 
-#: ../../Zotlabs/Module/Mitem.php:183
+#: ../../Code/Module/Mitem.php:183
 msgid "Add menu element"
 msgstr "Legg til menyelement"
 
-#: ../../Zotlabs/Module/Mitem.php:184
+#: ../../Code/Module/Mitem.php:184
 msgid "Delete this menu item"
 msgstr "Slett dette menyelementet"
 
-#: ../../Zotlabs/Module/Mitem.php:185
+#: ../../Code/Module/Mitem.php:185
 msgid "Edit this menu item"
 msgstr "Endre dette menyelementet"
 
-#: ../../Zotlabs/Module/Mitem.php:202
+#: ../../Code/Module/Mitem.php:202
 msgid "Menu item not found."
 msgstr "Menyelement ble ikke funnet."
 
-#: ../../Zotlabs/Module/Mitem.php:215
+#: ../../Code/Module/Mitem.php:215
 msgid "Menu item deleted."
 msgstr "Menyelement slettet."
 
-#: ../../Zotlabs/Module/Mitem.php:217
+#: ../../Code/Module/Mitem.php:217
 msgid "Menu item could not be deleted."
 msgstr "Menyelement kunne ikke bli slettet."
 
-#: ../../Zotlabs/Module/Mitem.php:224
+#: ../../Code/Module/Mitem.php:224
 msgid "Edit Menu Element"
 msgstr "Endre menyelement"
 
-#: ../../Zotlabs/Module/Mitem.php:230
+#: ../../Code/Module/Mitem.php:230
 msgid "Link text"
 msgstr "Lenketekst"
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
+#: ../../Code/Module/New_channel.php:128
+#: ../../Code/Module/Register.php:231
 msgid "Name or caption"
 msgstr "Navn eller overskrift"
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
+#: ../../Code/Module/New_channel.php:128
+#: ../../Code/Module/Register.php:231
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
 msgstr "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\""
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
+#: ../../Code/Module/New_channel.php:130
+#: ../../Code/Module/Register.php:233
 msgid "Choose a short nickname"
 msgstr "Velg et kort kallenavn"
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
+#: ../../Code/Module/New_channel.php:130
+#: ../../Code/Module/Register.php:233
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
 "e.g. nickname%s"
 msgstr "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske, for eksempel kallenavn%s"
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
+#: ../../Code/Module/New_channel.php:132
+#: ../../Code/Module/Register.php:235
 msgid "Channel role and privacy"
 msgstr "Kanalrolle og personvern"
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
+#: ../../Code/Module/New_channel.php:132
+#: ../../Code/Module/Register.php:235
 msgid "Select a channel role with your privacy requirements."
 msgstr "Velg en kanalrolle for ditt personvernbehov."
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
+#: ../../Code/Module/New_channel.php:132
+#: ../../Code/Module/Register.php:235
 msgid "Read more about roles"
 msgstr "Les mer om roller"
 
-#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Code/Module/New_channel.php:135
 msgid "Create Channel"
 msgstr "Lag kanal"
 
-#: ../../Zotlabs/Module/New_channel.php:136
+#: ../../Code/Module/New_channel.php:136
 msgid ""
 "A channel is your identity on this network. It can represent a person, a "
 "blog, or a forum to name a few. Channels can make connections with other "
 "channels to share information with highly detailed permissions."
 msgstr "En kanal er din identitet i dette nettverket. Den kan representere en person, en blogg eller et forum for å nevne noe. Kanaler kan ha forbindelser til andre kanaler for å dele informasjon, og med svært detaljerte tillatelser."
 
-#: ../../Zotlabs/Module/New_channel.php:137
+#: ../../Code/Module/New_channel.php:137
 msgid ""
 "or import an existing channel from another location."
 msgstr "eller importer en eksisterende kanal fra et annet sted."
 
-#: ../../Zotlabs/Module/Notifications.php:30
+#: ../../Code/Module/Notifications.php:30
 msgid "Invalid request identifier."
 msgstr "Ugyldig forespørselsidentifikator."
 
-#: ../../Zotlabs/Module/Notifications.php:39
+#: ../../Code/Module/Notifications.php:39
 msgid "Discard"
 msgstr "Forkast"
 
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
+#: ../../Code/Module/Notifications.php:103 ../../include/nav.php:191
 msgid "Mark all system notifications seen"
 msgstr "Merk alle systemvarsler som sett"
 
-#: ../../Zotlabs/Module/Photos.php:84
+#: ../../Code/Module/Photos.php:84
 msgid "Page owner information could not be retrieved."
 msgstr "Informasjon om sideeier kunne ikke hentes."
 
-#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
-#: ../../Zotlabs/Module/Profile_photo.php:114
-#: ../../Zotlabs/Module/Profile_photo.php:206
-#: ../../Zotlabs/Module/Profile_photo.php:294
+#: ../../Code/Module/Photos.php:99 ../../Code/Module/Photos.php:743
+#: ../../Code/Module/Profile_photo.php:114
+#: ../../Code/Module/Profile_photo.php:206
+#: ../../Code/Module/Profile_photo.php:294
 #: ../../include/photo/photo_driver.php:718
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
+#: ../../Code/Module/Photos.php:105 ../../Code/Module/Photos.php:149
 msgid "Album not found."
 msgstr "Albumet ble ikke funnet."
 
-#: ../../Zotlabs/Module/Photos.php:132
+#: ../../Code/Module/Photos.php:132
 msgid "Delete Album"
 msgstr "Slett album"
 
-#: ../../Zotlabs/Module/Photos.php:153
+#: ../../Code/Module/Photos.php:153
 msgid ""
 "Multiple storage folders exist with this album name, but within different "
 "directories. Please remove the desired folder or folders using the Files "
 "manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
+#: ../../Code/Module/Photos.php:210 ../../Code/Module/Photos.php:1053
 msgid "Delete Photo"
 msgstr "Slett bilde"
 
-#: ../../Zotlabs/Module/Photos.php:533
+#: ../../Code/Module/Photos.php:533
 msgid "No photos selected"
 msgstr "Ingen bilder valgt"
 
-#: ../../Zotlabs/Module/Photos.php:582
+#: ../../Code/Module/Photos.php:582
 msgid "Access to this item is restricted."
 msgstr "Tilgang til dette elementet er begrenset."
 
-#: ../../Zotlabs/Module/Photos.php:621
+#: ../../Code/Module/Photos.php:621
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt."
 
-#: ../../Zotlabs/Module/Photos.php:624
+#: ../../Code/Module/Photos.php:624
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB lagringsplass til bilder er brukt."
 
-#: ../../Zotlabs/Module/Photos.php:660
+#: ../../Code/Module/Photos.php:660
 msgid "Upload Photos"
 msgstr "Last opp bilder"
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Code/Module/Photos.php:664
 msgid "Enter an album name"
 msgstr "Skriv et albumnavn"
 
-#: ../../Zotlabs/Module/Photos.php:665
+#: ../../Code/Module/Photos.php:665
 msgid "or select an existing album (doubleclick)"
 msgstr "eller velg et eksisterende album (dobbeltklikk)"
 
-#: ../../Zotlabs/Module/Photos.php:666
+#: ../../Code/Module/Photos.php:666
 msgid "Create a status post for this upload"
 msgstr "Lag et statusinnlegg for denne opplastingen"
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Code/Module/Photos.php:667
 msgid "Caption (optional):"
 msgstr "Bildetekst (valgfritt):"
 
-#: ../../Zotlabs/Module/Photos.php:668
+#: ../../Code/Module/Photos.php:668
 msgid "Description (optional):"
 msgstr "Beskrivelse (valgfritt):"
 
-#: ../../Zotlabs/Module/Photos.php:695
+#: ../../Code/Module/Photos.php:695
 msgid "Album name could not be decoded"
 msgstr "Albumnavnet kunne ikke dekodes"
 
-#: ../../Zotlabs/Module/Photos.php:743
+#: ../../Code/Module/Photos.php:743
 msgid "Contact Photos"
 msgstr "Kontaktbilder"
 
-#: ../../Zotlabs/Module/Photos.php:766
+#: ../../Code/Module/Photos.php:766
 msgid "Show Newest First"
 msgstr "Vis nyeste først"
 
-#: ../../Zotlabs/Module/Photos.php:768
+#: ../../Code/Module/Photos.php:768
 msgid "Show Oldest First"
 msgstr "Vis eldste først"
 
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
+#: ../../Code/Module/Photos.php:792 ../../Code/Module/Photos.php:1331
 #: ../../include/widgets.php:1499
 msgid "View Photo"
 msgstr "Vis foto"
 
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
+#: ../../Code/Module/Photos.php:823 ../../include/widgets.php:1516
 msgid "Edit Album"
 msgstr "Endre album"
 
-#: ../../Zotlabs/Module/Photos.php:870
+#: ../../Code/Module/Photos.php:870
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Tillatelse avvist. Tilgang til dette elementet kan være begrenset."
 
-#: ../../Zotlabs/Module/Photos.php:872
+#: ../../Code/Module/Photos.php:872
 msgid "Photo not available"
 msgstr "Bilde er utilgjengelig"
 
-#: ../../Zotlabs/Module/Photos.php:930
+#: ../../Code/Module/Photos.php:930
 msgid "Use as profile photo"
 msgstr "Bruk som profilbilde"
 
-#: ../../Zotlabs/Module/Photos.php:931
+#: ../../Code/Module/Photos.php:931
 msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:938
+#: ../../Code/Module/Photos.php:938
 msgid "Private Photo"
 msgstr "Privat bilde"
 
-#: ../../Zotlabs/Module/Photos.php:953
+#: ../../Code/Module/Photos.php:953
 msgid "View Full Size"
 msgstr "Vis i full størrelse"
 
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Code/Module/Photos.php:998 ../../Code/Module/Admin.php:1437
+#: ../../Code/Module/Tagrm.php:137
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../../Zotlabs/Module/Photos.php:1032
+#: ../../Code/Module/Photos.php:1032
 msgid "Edit photo"
 msgstr "Endre bilde"
 
-#: ../../Zotlabs/Module/Photos.php:1034
+#: ../../Code/Module/Photos.php:1034
 msgid "Rotate CW (right)"
 msgstr "Roter med klokka (mot høyre)"
 
-#: ../../Zotlabs/Module/Photos.php:1035
+#: ../../Code/Module/Photos.php:1035
 msgid "Rotate CCW (left)"
 msgstr "Roter mot klokka (venstre)"
 
-#: ../../Zotlabs/Module/Photos.php:1038
+#: ../../Code/Module/Photos.php:1038
 msgid "Enter a new album name"
 msgstr "Skriv et nytt albumnavn"
 
-#: ../../Zotlabs/Module/Photos.php:1039
+#: ../../Code/Module/Photos.php:1039
 msgid "or select an existing one (doubleclick)"
 msgstr "eller velg et eksisterende album (dobbeltklikk)"
 
-#: ../../Zotlabs/Module/Photos.php:1042
+#: ../../Code/Module/Photos.php:1042
 msgid "Caption"
 msgstr "Overskrift"
 
-#: ../../Zotlabs/Module/Photos.php:1044
+#: ../../Code/Module/Photos.php:1044
 msgid "Add a Tag"
 msgstr "Legg til merkelapp"
 
-#: ../../Zotlabs/Module/Photos.php:1048
+#: ../../Code/Module/Photos.php:1048
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Eksempel: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../Zotlabs/Module/Photos.php:1051
+#: ../../Code/Module/Photos.php:1051
 msgid "Flag as adult in album view"
 msgstr "Flag som voksent i albumvisning"
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
+#: ../../Code/Module/Photos.php:1070 ../../Code/Lib/ThreadItem.php:261
 msgid "I like this (toggle)"
 msgstr "Jeg liker dette (skru av og på)"
 
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
+#: ../../Code/Module/Photos.php:1071 ../../Code/Lib/ThreadItem.php:262
 msgid "I don't like this (toggle)"
 msgstr "Jeg liker ikke dette (skru av og på)"
 
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../Code/Module/Photos.php:1073 ../../Code/Lib/ThreadItem.php:397
 #: ../../include/conversation.php:740
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
+#: ../../Code/Module/Photos.php:1089 ../../Code/Module/Photos.php:1207
+#: ../../Code/Lib/ThreadItem.php:707
 msgid "This is you"
 msgstr "Dette er deg"
 
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+#: ../../Code/Module/Photos.php:1091 ../../Code/Module/Photos.php:1209
+#: ../../Code/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
+#: ../../Code/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Likes"
 msgstr "Liker"
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
+#: ../../Code/Module/Photos.php:1107 ../../include/conversation.php:574
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Liker ikke"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
+#: ../../Code/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Agree"
 msgstr "Enig"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
+#: ../../Code/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Disagree"
 msgstr "Uenig"
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
+#: ../../Code/Module/Photos.php:1108 ../../include/conversation.php:575
 msgctxt "title"
 msgid "Abstain"
 msgstr "Avstår"
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
+#: ../../Code/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Attending"
 msgstr "Deltar"
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
+#: ../../Code/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Not attending"
 msgstr "Deltar ikke"
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
+#: ../../Code/Module/Photos.php:1109 ../../include/conversation.php:576
 msgctxt "title"
 msgid "Might attend"
 msgstr "Deltar kanskje"
 
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Module/Photos.php:1126 ../../Code/Module/Photos.php:1138
+#: ../../Code/Lib/ThreadItem.php:181 ../../Code/Lib/ThreadItem.php:193
 #: ../../include/conversation.php:1717
 msgid "View all"
 msgstr "Vis alle"
 
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../Code/Module/Photos.php:1130 ../../Code/Lib/ThreadItem.php:185
 #: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
 #: ../../include/channel.php:1158
 msgctxt "noun"
@@ -3048,7 +3048,7 @@ msgid_plural "Likes"
 msgstr[0] "Liker"
 msgstr[1] "Liker"
 
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../Code/Module/Photos.php:1135 ../../Code/Lib/ThreadItem.php:190
 #: ../../include/conversation.php:1744
 msgctxt "noun"
 msgid "Dislike"
@@ -3056,79 +3056,79 @@ msgid_plural "Dislikes"
 msgstr[0] "Liker ikke"
 msgstr[1] "Liker ikke"
 
-#: ../../Zotlabs/Module/Photos.php:1235
+#: ../../Code/Module/Photos.php:1235
 msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1244
+#: ../../Code/Module/Photos.php:1244
 msgid "In This Photo:"
 msgstr "I dette bildet:"
 
-#: ../../Zotlabs/Module/Photos.php:1249
+#: ../../Code/Module/Photos.php:1249
 msgid "Map"
 msgstr "Kart"
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
+#: ../../Code/Module/Photos.php:1257 ../../Code/Lib/ThreadItem.php:386
 msgctxt "noun"
 msgid "Likes"
 msgstr "Liker"
 
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
+#: ../../Code/Module/Photos.php:1258 ../../Code/Lib/ThreadItem.php:387
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Liker ikke"
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../Code/Module/Photos.php:1263 ../../Code/Lib/ThreadItem.php:392
 #: ../../include/acl_selectors.php:285
 msgid "Close"
 msgstr "Lukk"
 
-#: ../../Zotlabs/Module/Photos.php:1337
+#: ../../Code/Module/Photos.php:1337
 msgid "View Album"
 msgstr "Vis album"
 
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
+#: ../../Code/Module/Photos.php:1348 ../../Code/Module/Photos.php:1361
+#: ../../Code/Module/Photos.php:1362
 msgid "Recent Photos"
 msgstr "Nye bilder"
 
-#: ../../Zotlabs/Module/Ping.php:265
+#: ../../Code/Module/Ping.php:265
 msgid "sent you a private message"
 msgstr "sendte deg en privat melding"
 
-#: ../../Zotlabs/Module/Ping.php:313
+#: ../../Code/Module/Ping.php:313
 msgid "added your channel"
 msgstr "la til din kanal"
 
-#: ../../Zotlabs/Module/Ping.php:323
+#: ../../Code/Module/Ping.php:323
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../Zotlabs/Module/Ping.php:346
+#: ../../Code/Module/Ping.php:346
 msgid "[today]"
 msgstr "[idag]"
 
-#: ../../Zotlabs/Module/Ping.php:355
+#: ../../Code/Module/Ping.php:355
 msgid "posted an event"
 msgstr "la ut en hendelse"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "Ikke i stand til å finne hubben din."
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "Innlegg vellykket."
 
-#: ../../Zotlabs/Module/Openid.php:30
+#: ../../Code/Module/Openid.php:30
 msgid "OpenID protocol error. No ID returned."
 msgstr "OpenID protokollfeil. Ingen ID ble returnert."
 
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
+#: ../../Code/Module/Openid.php:193 ../../include/auth.php:226
 msgid "Login failed."
 msgstr "Innlogging mislyktes."
 
-#: ../../Zotlabs/Module/Page.php:133
+#: ../../Code/Module/Page.php:133
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -3138,378 +3138,378 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:26 ../../Code/Module/Pconfig.php:59
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert."
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Code/Module/Pconfig.php:48
 msgid "Configuration Editor"
 msgstr "Konfigurasjonsbehandler"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Code/Module/Pconfig.php:49
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please"
 " leave this page unless you are comfortable with and knowledgeable about how"
 " to correctly use this feature."
 msgstr "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig."
 
-#: ../../Zotlabs/Module/Pdledit.php:18
+#: ../../Code/Module/Pdledit.php:18
 msgid "Layout updated."
 msgstr "Layout er oppdatert."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+#: ../../Code/Module/Pdledit.php:34 ../../Code/Module/Pdledit.php:61
 msgid "Edit System Page Description"
 msgstr "Endre beskrivelsen av systemsiden"
 
-#: ../../Zotlabs/Module/Pdledit.php:56
+#: ../../Code/Module/Pdledit.php:56
 msgid "Layout not found."
 msgstr "Layouten ble ikke funnet."
 
-#: ../../Zotlabs/Module/Pdledit.php:62
+#: ../../Code/Module/Pdledit.php:62
 msgid "Module Name:"
 msgstr "Modulnavn:"
 
-#: ../../Zotlabs/Module/Pdledit.php:63
+#: ../../Code/Module/Pdledit.php:63
 msgid "Layout Help"
 msgstr "Layout-hjelp"
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
+#: ../../Code/Module/Poke.php:168 ../../Code/Lib/Apps.php:226
 #: ../../include/conversation.php:960
 msgid "Poke"
 msgstr "Prikk"
 
-#: ../../Zotlabs/Module/Poke.php:169
+#: ../../Code/Module/Poke.php:169
 msgid "Poke somebody"
 msgstr "Dult noen"
 
-#: ../../Zotlabs/Module/Poke.php:172
+#: ../../Code/Module/Poke.php:172
 msgid "Poke/Prod"
 msgstr "Prikke/oppildne"
 
-#: ../../Zotlabs/Module/Poke.php:173
+#: ../../Code/Module/Poke.php:173
 msgid "Poke, prod or do other things to somebody"
 msgstr "Dult, prikk eller gjør andre ting med noen"
 
-#: ../../Zotlabs/Module/Poke.php:180
+#: ../../Code/Module/Poke.php:180
 msgid "Recipient"
 msgstr "Mottaker"
 
-#: ../../Zotlabs/Module/Poke.php:181
+#: ../../Code/Module/Poke.php:181
 msgid "Choose what you wish to do to recipient"
 msgstr "Velg hva du ønsker å gjøre med mottakeren"
 
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+#: ../../Code/Module/Poke.php:184 ../../Code/Module/Poke.php:185
 msgid "Make this post private"
 msgstr "Gjør dette innlegget privat"
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Code/Module/Probe.php:30 ../../Code/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Henting av URL gir følgende feil: %1$s"
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
-#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
+#: ../../Code/Module/Profiles.php:24 ../../Code/Module/Profiles.php:189
+#: ../../Code/Module/Profiles.php:246 ../../Code/Module/Profiles.php:625
 msgid "Profile not found."
 msgstr "Profilen ble ikke funnet."
 
-#: ../../Zotlabs/Module/Profiles.php:44
+#: ../../Code/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Profilen er slettet."
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
+#: ../../Code/Module/Profiles.php:68 ../../Code/Module/Profiles.php:104
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
+#: ../../Code/Module/Profiles.php:89 ../../Code/Module/Profiles.php:132
 msgid "New profile created."
 msgstr "Ny profil opprettet."
 
-#: ../../Zotlabs/Module/Profiles.php:110
+#: ../../Code/Module/Profiles.php:110
 msgid "Profile unavailable to clone."
 msgstr "Profilen er utilgjengelig for klonen."
 
-#: ../../Zotlabs/Module/Profiles.php:151
+#: ../../Code/Module/Profiles.php:151
 msgid "Profile unavailable to export."
 msgstr "Profilen er utilgjengelig for eksport."
 
-#: ../../Zotlabs/Module/Profiles.php:256
+#: ../../Code/Module/Profiles.php:256
 msgid "Profile Name is required."
 msgstr "Profilnavn er påkrevd."
 
-#: ../../Zotlabs/Module/Profiles.php:427
+#: ../../Code/Module/Profiles.php:427
 msgid "Marital Status"
 msgstr "Sivilstand"
 
-#: ../../Zotlabs/Module/Profiles.php:431
+#: ../../Code/Module/Profiles.php:431
 msgid "Romantic Partner"
 msgstr "Romantisk partner"
 
-#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
+#: ../../Code/Module/Profiles.php:435 ../../Code/Module/Profiles.php:736
 msgid "Likes"
 msgstr "Liker"
 
-#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
+#: ../../Code/Module/Profiles.php:439 ../../Code/Module/Profiles.php:737
 msgid "Dislikes"
 msgstr "Liker ikke"
 
-#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
+#: ../../Code/Module/Profiles.php:443 ../../Code/Module/Profiles.php:744
 msgid "Work/Employment"
 msgstr "Arbeid/sysselsetting"
 
-#: ../../Zotlabs/Module/Profiles.php:446
+#: ../../Code/Module/Profiles.php:446
 msgid "Religion"
 msgstr "Religion"
 
-#: ../../Zotlabs/Module/Profiles.php:450
+#: ../../Code/Module/Profiles.php:450
 msgid "Political Views"
 msgstr "Politiske synspunkter"
 
-#: ../../Zotlabs/Module/Profiles.php:458
+#: ../../Code/Module/Profiles.php:458
 msgid "Sexual Preference"
 msgstr "Seksuelle preferanser"
 
-#: ../../Zotlabs/Module/Profiles.php:462
+#: ../../Code/Module/Profiles.php:462
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ../../Zotlabs/Module/Profiles.php:466
+#: ../../Code/Module/Profiles.php:466
 msgid "Interests"
 msgstr "Interesser"
 
-#: ../../Zotlabs/Module/Profiles.php:560
+#: ../../Code/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Profilen er oppdatert."
 
-#: ../../Zotlabs/Module/Profiles.php:644
+#: ../../Code/Module/Profiles.php:644
 msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:686
+#: ../../Code/Module/Profiles.php:686
 msgid "Edit Profile Details"
 msgstr "Endre profildetaljer"
 
-#: ../../Zotlabs/Module/Profiles.php:688
+#: ../../Code/Module/Profiles.php:688
 msgid "View this profile"
 msgstr "Vis denne profilen"
 
-#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:689 ../../Code/Module/Profiles.php:771
 #: ../../include/channel.php:959
 msgid "Edit visibility"
 msgstr "Endre synlighet"
 
-#: ../../Zotlabs/Module/Profiles.php:690
+#: ../../Code/Module/Profiles.php:690
 msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:691
+#: ../../Code/Module/Profiles.php:691
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
+#: ../../Code/Module/Profiles.php:692 ../../include/channel.php:930
 msgid "Change profile photo"
 msgstr "Endre profilbilde"
 
-#: ../../Zotlabs/Module/Profiles.php:693
+#: ../../Code/Module/Profiles.php:693
 msgid "Create a new profile using these settings"
 msgstr "Lag en ny profil ved å bruke disse innstillingene"
 
-#: ../../Zotlabs/Module/Profiles.php:694
+#: ../../Code/Module/Profiles.php:694
 msgid "Clone this profile"
 msgstr "Klon denne profilen"
 
-#: ../../Zotlabs/Module/Profiles.php:695
+#: ../../Code/Module/Profiles.php:695
 msgid "Delete this profile"
 msgstr "Slett denne profilen"
 
-#: ../../Zotlabs/Module/Profiles.php:696
+#: ../../Code/Module/Profiles.php:696
 msgid "Add profile things"
 msgstr "Legg til profilting"
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
+#: ../../Code/Module/Profiles.php:697 ../../include/widgets.php:105
 #: ../../include/conversation.php:1526
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Code/Module/Profiles.php:699
 msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
+#: ../../Code/Module/Profiles.php:700 ../../include/datetime.php:48
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: ../../Zotlabs/Module/Profiles.php:702
+#: ../../Code/Module/Profiles.php:702
 msgid "Import profile from file"
 msgstr "Importer profil fra fil"
 
-#: ../../Zotlabs/Module/Profiles.php:703
+#: ../../Code/Module/Profiles.php:703
 msgid "Export profile to file"
 msgstr "Eksporter profil til fil"
 
-#: ../../Zotlabs/Module/Profiles.php:704
+#: ../../Code/Module/Profiles.php:704
 msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:705
+#: ../../Code/Module/Profiles.php:705
 msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Code/Module/Profiles.php:706
 msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Code/Module/Profiles.php:709
 msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:711
+#: ../../Code/Module/Profiles.php:711
 msgid "This is your default profile."
 msgstr "Dette er din standardprofil."
 
-#: ../../Zotlabs/Module/Profiles.php:713
+#: ../../Code/Module/Profiles.php:713
 msgid "Your full name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:714
+#: ../../Code/Module/Profiles.php:714
 msgid "Title/Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Code/Module/Profiles.php:717
 msgid "Street address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:718
+#: ../../Code/Module/Profiles.php:718
 msgid "Locality/City"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:719
+#: ../../Code/Module/Profiles.php:719
 msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:720
+#: ../../Code/Module/Profiles.php:720
 msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Code/Module/Profiles.php:721
 msgid "Country"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Eksempler: kari123, Kari Villiamsen, kari@example.com"
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Profiles.php:732
 msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Code/Module/Profiles.php:733
 msgid "Political views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Code/Module/Profiles.php:734
 msgid "Religious views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Example: fishing photography software"
 msgstr "Eksempel: fisking fotografering programvare"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Musical interests"
 msgstr "Musikkinteresser"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Books, literature"
 msgstr "Bøker, litteratur"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Television"
 msgstr "TV/fjernsyn"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Code/Module/Profiles.php:742
 msgid "Hobbies/Interests"
 msgstr "Hobbier/Interesser"
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Code/Module/Profiles.php:743
 msgid "Love/Romance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:745
 msgid "School/Education"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Code/Module/Profiles.php:746
 msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Code/Module/Profiles.php:747
 msgid "My other channels"
 msgstr "Mine andre kanaler"
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
+#: ../../Code/Module/Profiles.php:767 ../../include/channel.php:955
 msgid "Profile Image"
 msgstr "Profilbilde"
 
-#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
+#: ../../Code/Module/Profiles.php:777 ../../include/nav.php:88
 #: ../../include/channel.php:937
 msgid "Edit Profiles"
 msgstr "Endre profiler"
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
+#: ../../Code/Module/Profile_photo.php:179
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart."
 
-#: ../../Zotlabs/Module/Profile_photo.php:367
+#: ../../Code/Module/Profile_photo.php:367
 msgid "Upload Profile Photo"
 msgstr "Last opp profilbilde:"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+#: ../../Code/Module/Profperm.php:34 ../../Code/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr "Ugyldig profil-identifikator."
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Profile Visibility Editor"
 msgstr "Endre profilsynlighet"
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
+#: ../../Code/Module/Profperm.php:117 ../../include/channel.php:1249
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../Zotlabs/Module/Profperm.php:119
+#: ../../Code/Module/Profperm.php:119
 msgid "Click on a contact to add or remove."
 msgstr "Klikk på en kontakt for å legge til eller fjerne."
 
-#: ../../Zotlabs/Module/Profperm.php:128
+#: ../../Code/Module/Profperm.php:128
 msgid "Visible To"
 msgstr "Synlig for"
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
+#: ../../Code/Module/Pubsites.php:22 ../../include/widgets.php:1270
 msgid "Public Hubs"
 msgstr "Offentlige huber"
 
-#: ../../Zotlabs/Module/Pubsites.php:25
+#: ../../Code/Module/Pubsites.php:25
 msgid ""
 "The listed hubs allow public registration for the $Projectname network. All "
 "hubs in the network are interlinked so membership on any of them conveys "
@@ -3518,2667 +3518,2667 @@ msgid ""
 "additional details."
 msgstr "Nettstedene på listen tillater offentlig registrering i $Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i nettverket som helhet. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Nettstedene selv kan gi tilleggsopplysninger."
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Hub URL"
 msgstr "Nettstedets URL"
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Access Type"
 msgstr "Tilgangstype"
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Registration Policy"
 msgstr "Retningslinjer for registrering"
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
+#: ../../Code/Module/Pubsites.php:31
 msgid "Software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../Code/Module/Pubsites.php:31 ../../Code/Module/Ratings.php:103
 #: ../../include/conversation.php:959
 msgid "Ratings"
 msgstr "Vurderinger"
 
-#: ../../Zotlabs/Module/Pubsites.php:38
+#: ../../Code/Module/Pubsites.php:38
 msgid "Rate"
 msgstr "Vurder"
 
-#: ../../Zotlabs/Module/Rate.php:160
+#: ../../Code/Module/Rate.php:160
 msgid "Website:"
 msgstr "Nettsted:"
 
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Code/Module/Rate.php:163
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)"
 
-#: ../../Zotlabs/Module/Rate.php:164
+#: ../../Code/Module/Rate.php:164
 msgid "Rating (this information is public)"
 msgstr "Vurdering (denne informasjonen er offentlig)"
 
-#: ../../Zotlabs/Module/Rate.php:165
+#: ../../Code/Module/Rate.php:165
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)"
 
-#: ../../Zotlabs/Module/Ratings.php:73
+#: ../../Code/Module/Ratings.php:73
 msgid "No ratings"
 msgstr "Ingen vurderinger"
 
-#: ../../Zotlabs/Module/Ratings.php:104
+#: ../../Code/Module/Ratings.php:104
 msgid "Rating: "
 msgstr "Vurdering:"
 
-#: ../../Zotlabs/Module/Ratings.php:105
+#: ../../Code/Module/Ratings.php:105
 msgid "Website: "
 msgstr "Nettsted:"
 
-#: ../../Zotlabs/Module/Ratings.php:107
+#: ../../Code/Module/Ratings.php:107
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../../Zotlabs/Module/Admin.php:77
+#: ../../Code/Module/Admin.php:77
 msgid "Theme settings updated."
 msgstr "Temainnstillinger er oppdatert."
 
-#: ../../Zotlabs/Module/Admin.php:197
+#: ../../Code/Module/Admin.php:197
 msgid "# Accounts"
 msgstr "# Kontoer"
 
-#: ../../Zotlabs/Module/Admin.php:198
+#: ../../Code/Module/Admin.php:198
 msgid "# blocked accounts"
 msgstr "# blokkerte kontoer"
 
-#: ../../Zotlabs/Module/Admin.php:199
+#: ../../Code/Module/Admin.php:199
 msgid "# expired accounts"
 msgstr "# utgåtte kontoer"
 
-#: ../../Zotlabs/Module/Admin.php:200
+#: ../../Code/Module/Admin.php:200
 msgid "# expiring accounts"
 msgstr "# kontoer som holder på å gå ut"
 
-#: ../../Zotlabs/Module/Admin.php:211
+#: ../../Code/Module/Admin.php:211
 msgid "# Channels"
 msgstr "# Kanaler"
 
-#: ../../Zotlabs/Module/Admin.php:212
+#: ../../Code/Module/Admin.php:212
 msgid "# primary"
 msgstr "# hoved"
 
-#: ../../Zotlabs/Module/Admin.php:213
+#: ../../Code/Module/Admin.php:213
 msgid "# clones"
 msgstr "# kloner"
 
-#: ../../Zotlabs/Module/Admin.php:219
+#: ../../Code/Module/Admin.php:219
 msgid "Message queues"
 msgstr "Meldingskøer"
 
-#: ../../Zotlabs/Module/Admin.php:236
+#: ../../Code/Module/Admin.php:236
 msgid "Your software should be updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
-#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
-#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209
-#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419
-#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646
-#: ../../Zotlabs/Module/Admin.php:1731
+#: ../../Code/Module/Admin.php:241 ../../Code/Module/Admin.php:490
+#: ../../Code/Module/Admin.php:711 ../../Code/Module/Admin.php:755
+#: ../../Code/Module/Admin.php:1030 ../../Code/Module/Admin.php:1209
+#: ../../Code/Module/Admin.php:1329 ../../Code/Module/Admin.php:1419
+#: ../../Code/Module/Admin.php:1612 ../../Code/Module/Admin.php:1646
+#: ../../Code/Module/Admin.php:1731
 msgid "Administration"
 msgstr "Administrasjon"
 
-#: ../../Zotlabs/Module/Admin.php:242
+#: ../../Code/Module/Admin.php:242
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: ../../Zotlabs/Module/Admin.php:245
+#: ../../Code/Module/Admin.php:245
 msgid "Registered accounts"
 msgstr "Registrerte kontoer"
 
-#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
+#: ../../Code/Module/Admin.php:246 ../../Code/Module/Admin.php:715
 msgid "Pending registrations"
 msgstr "Ventende registreringer"
 
-#: ../../Zotlabs/Module/Admin.php:247
+#: ../../Code/Module/Admin.php:247
 msgid "Registered channels"
 msgstr "Registrerte kanaler"
 
-#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
+#: ../../Code/Module/Admin.php:248 ../../Code/Module/Admin.php:716
 msgid "Active plugins"
 msgstr "Aktive tilleggsfunksjoner"
 
-#: ../../Zotlabs/Module/Admin.php:249
+#: ../../Code/Module/Admin.php:249
 msgid "Version"
 msgstr "Versjon"
 
-#: ../../Zotlabs/Module/Admin.php:250
+#: ../../Code/Module/Admin.php:250
 msgid "Repository version (master)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:251
+#: ../../Code/Module/Admin.php:251
 msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:373
+#: ../../Code/Module/Admin.php:373
 msgid "Site settings updated."
 msgstr "Nettstedsinnstillinger er oppdatert."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Code/Module/Admin.php:400 ../../include/text.php:2841
 msgid "Default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Code/Module/Admin.php:410 ../../Code/Module/Settings.php:798
 msgid "mobile"
 msgstr "mobil"
 
-#: ../../Zotlabs/Module/Admin.php:412
+#: ../../Code/Module/Admin.php:412
 msgid "experimental"
 msgstr "eksperimentell"
 
-#: ../../Zotlabs/Module/Admin.php:414
+#: ../../Code/Module/Admin.php:414
 msgid "unsupported"
 msgstr "ikke støttet"
 
-#: ../../Zotlabs/Module/Admin.php:460
+#: ../../Code/Module/Admin.php:460
 msgid "Yes - with approval"
 msgstr "Ja - med godkjenning"
 
-#: ../../Zotlabs/Module/Admin.php:466
+#: ../../Code/Module/Admin.php:466
 msgid "My site is not a public server"
 msgstr "Mitt nettsted er ikke en offentlig tjeneste"
 
-#: ../../Zotlabs/Module/Admin.php:467
+#: ../../Code/Module/Admin.php:467
 msgid "My site has paid access only"
 msgstr "Mitt nettsted gir kun tilgang mot betaling"
 
-#: ../../Zotlabs/Module/Admin.php:468
+#: ../../Code/Module/Admin.php:468
 msgid "My site has free access only"
 msgstr "Mitt nettsted har kun gratis tilgang"
 
-#: ../../Zotlabs/Module/Admin.php:469
+#: ../../Code/Module/Admin.php:469
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mitt nettsted tilbyr gratis konto med valgfri oppgradering til betalt tjeneste"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+#: ../../Code/Module/Admin.php:491 ../../include/widgets.php:1382
 msgid "Site"
 msgstr "Nettsted"
 
-#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
+#: ../../Code/Module/Admin.php:493 ../../Code/Module/Register.php:245
 msgid "Registration"
 msgstr "Registrering"
 
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Code/Module/Admin.php:494
 msgid "File upload"
 msgstr "Last opp fil"
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Code/Module/Admin.php:495
 msgid "Policies"
 msgstr "Retningslinjer"
 
-#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
+#: ../../Code/Module/Admin.php:496 ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../../Zotlabs/Module/Admin.php:500
+#: ../../Code/Module/Admin.php:500
 msgid "Site name"
 msgstr "Nettstedets navn"
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Code/Module/Admin.php:501
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Code/Module/Admin.php:502
 msgid "Administrator Information"
 msgstr "Administratorinformasjon"
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Code/Module/Admin.php:502
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Kontaktinformasjon til nettstedsadministratorer. Vises på siteinfo-siden. BBCode kan brukes her"
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Code/Module/Admin.php:503
 msgid "System language"
 msgstr "Systemspråk"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Code/Module/Admin.php:504
 msgid "System theme"
 msgstr "Systemtema"
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Code/Module/Admin.php:504
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Standard systemtema - kan overstyres av brukerprofiler - endre temainnstillinger"
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Code/Module/Admin.php:505
 msgid "Mobile system theme"
 msgstr "Mobilt systemtema"
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Code/Module/Admin.php:505
 msgid "Theme for mobile devices"
 msgstr "Tema for mobile enheter"
 
-#: ../../Zotlabs/Module/Admin.php:507
+#: ../../Code/Module/Admin.php:507
 msgid "Allow Feeds as Connections"
 msgstr "Tillat strømmer som forbindelser"
 
-#: ../../Zotlabs/Module/Admin.php:507
+#: ../../Code/Module/Admin.php:507
 msgid "(Heavy system resource usage)"
 msgstr "(Tung bruk av systemressurser)"
 
-#: ../../Zotlabs/Module/Admin.php:508
+#: ../../Code/Module/Admin.php:508
 msgid "Maximum image size"
 msgstr "Største bildestørrelse"
 
-#: ../../Zotlabs/Module/Admin.php:508
+#: ../../Code/Module/Admin.php:508
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Største størrelse i bytes for opplastede bilder. Standard er 0, som betyr ubegrenset."
 
-#: ../../Zotlabs/Module/Admin.php:509
+#: ../../Code/Module/Admin.php:509
 msgid "Does this site allow new member registration?"
 msgstr "Tillater dette nettstedet registrering av nye medlemmer?"
 
-#: ../../Zotlabs/Module/Admin.php:510
+#: ../../Code/Module/Admin.php:510
 msgid "Invitation only"
 msgstr "Kun inviterte"
 
-#: ../../Zotlabs/Module/Admin.php:510
+#: ../../Code/Module/Admin.php:510
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Tillat bare nye medlemsregistreringer med en invitasjonskode. Ovenstående retningslinjer for registrering må være satt til Ja."
 
-#: ../../Zotlabs/Module/Admin.php:511
+#: ../../Code/Module/Admin.php:511
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Hvilket alternativ beskriver best hva slags kontotype som tilbys av dette nettstedet/denne hubben?"
 
-#: ../../Zotlabs/Module/Admin.php:512
+#: ../../Code/Module/Admin.php:512
 msgid "Register text"
 msgstr "Registreringstekst"
 
-#: ../../Zotlabs/Module/Admin.php:512
+#: ../../Code/Module/Admin.php:512
 msgid "Will be displayed prominently on the registration page."
 msgstr "Vil bli vist på en fremtredende måte på registreringssiden."
 
-#: ../../Zotlabs/Module/Admin.php:513
+#: ../../Code/Module/Admin.php:513
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Nettstedets hjemmeside som vises til besøkende (standard: innloggingsboks)"
 
-#: ../../Zotlabs/Module/Admin.php:513
+#: ../../Code/Module/Admin.php:513
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "eksempel: 'public' for å vise offentlig strøm av innlegg, 'page/sys/home/ for å vise en system-webside called 'home\" eller 'include:home.html' for å inkludere en fil."
 
-#: ../../Zotlabs/Module/Admin.php:514
+#: ../../Code/Module/Admin.php:514
 msgid "Preserve site homepage URL"
 msgstr "Bevar URL-en til nettstedets hjemmeside"
 
-#: ../../Zotlabs/Module/Admin.php:514
+#: ../../Code/Module/Admin.php:514
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenter hjemmesiden til nettstedet i en ramme fra den opprinnelige plasseringen i stedet for å omdirigere"
 
-#: ../../Zotlabs/Module/Admin.php:515
+#: ../../Code/Module/Admin.php:515
 msgid "Accounts abandoned after x days"
 msgstr "Kontoer forlatt etter x dager"
 
-#: ../../Zotlabs/Module/Admin.php:515
+#: ../../Code/Module/Admin.php:515
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Vil ikke kaste bort systemressurser på å spørre eksterne nettsteder etter forlatte kontoer. Skriv 0 for å ikke sette noen tidsgrense."
 
-#: ../../Zotlabs/Module/Admin.php:516
+#: ../../Code/Module/Admin.php:516
 msgid "Allowed friend domains"
 msgstr "Tillatte vennedomener"
 
-#: ../../Zotlabs/Module/Admin.php:516
+#: ../../Code/Module/Admin.php:516
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Kommaseparert liste over domener som har lov til å etablere vennskap med dette nettstedet. Jokertegn er akseptert. Tøm for å tillate alle domener."
 
-#: ../../Zotlabs/Module/Admin.php:517
+#: ../../Code/Module/Admin.php:517
 msgid "Allowed email domains"
 msgstr "Tillate e-postdomener"
 
-#: ../../Zotlabs/Module/Admin.php:517
+#: ../../Code/Module/Admin.php:517
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Kommaseparert liste med domener som er tillatt i e-postadresser ved registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle domener er tillatt"
 
-#: ../../Zotlabs/Module/Admin.php:518
+#: ../../Code/Module/Admin.php:518
 msgid "Not allowed email domains"
 msgstr "Ikke tillatte e-postdomener"
 
-#: ../../Zotlabs/Module/Admin.php:518
+#: ../../Code/Module/Admin.php:518
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Kommaseparert liste med domener som ikke er tillatt i e-postadresser ved registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle domener er tillatt, med mindre tillate domener er blitt definert."
 
-#: ../../Zotlabs/Module/Admin.php:519
+#: ../../Code/Module/Admin.php:519
 msgid "Verify Email Addresses"
 msgstr "Bekreft e-postadresser"
 
-#: ../../Zotlabs/Module/Admin.php:519
+#: ../../Code/Module/Admin.php:519
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Sett hake for å sjekke e-postadresser brukt ved kontoregistrering (anbefales)."
 
-#: ../../Zotlabs/Module/Admin.php:520
+#: ../../Code/Module/Admin.php:520
 msgid "Force publish"
 msgstr "Tving publisering"
 
-#: ../../Zotlabs/Module/Admin.php:520
+#: ../../Code/Module/Admin.php:520
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i nettstedet sin katalog."
 
-#: ../../Zotlabs/Module/Admin.php:521
+#: ../../Code/Module/Admin.php:521
 msgid "Import Public Streams"
 msgstr "Importer offentlige innholdsstrømmer"
 
-#: ../../Zotlabs/Module/Admin.php:521
+#: ../../Code/Module/Admin.php:521
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Importer og gi tilgang til offentlig innhold trukket inn fra andre nettsteder. Advarsel: dette innholdet er ikke moderert."
 
-#: ../../Zotlabs/Module/Admin.php:522
+#: ../../Code/Module/Admin.php:522
 msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:522
+#: ../../Code/Module/Admin.php:522
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presenter en innloggingsboks til besøkende på hjemmesiden hvis ikke noe annet innhold har blitt konfigurert."
 
-#: ../../Zotlabs/Module/Admin.php:523
+#: ../../Code/Module/Admin.php:523
 msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:523
+#: ../../Code/Module/Admin.php:523
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:525
+#: ../../Code/Module/Admin.php:525
 msgid "Directory Server URL"
 msgstr "Katalogtjener URL"
 
-#: ../../Zotlabs/Module/Admin.php:525
+#: ../../Code/Module/Admin.php:525
 msgid "Default directory server"
 msgstr "Standard katalogtjener"
 
-#: ../../Zotlabs/Module/Admin.php:527
+#: ../../Code/Module/Admin.php:527
 msgid "Proxy user"
 msgstr "Brukernavn mellomtjener"
 
-#: ../../Zotlabs/Module/Admin.php:528
+#: ../../Code/Module/Admin.php:528
 msgid "Proxy URL"
 msgstr "Mellomtjener URL"
 
-#: ../../Zotlabs/Module/Admin.php:529
+#: ../../Code/Module/Admin.php:529
 msgid "Network timeout"
 msgstr "Nettverk tidsavbrudd"
 
-#: ../../Zotlabs/Module/Admin.php:529
+#: ../../Code/Module/Admin.php:529
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Verdien i sekunder. Skriv 0 for ubegrenset (ikke anbefalt)."
 
-#: ../../Zotlabs/Module/Admin.php:530
+#: ../../Code/Module/Admin.php:530
 msgid "Delivery interval"
 msgstr "Leveringsinterval"
 
-#: ../../Zotlabs/Module/Admin.php:530
+#: ../../Code/Module/Admin.php:530
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Forsink leveringsprosessene i bakgrunnen med dette antall sekunder for å redusere systembelastningen. Anbefaling: 4-5 for delte tjenere, 2-3 for virtuelle tjenere, 0-1 for større dedikerte tjenere."
 
-#: ../../Zotlabs/Module/Admin.php:531
+#: ../../Code/Module/Admin.php:531
 msgid "Deliveries per process"
 msgstr "Leveranser per prosess"
 
-#: ../../Zotlabs/Module/Admin.php:531
+#: ../../Code/Module/Admin.php:531
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Antall leveranser som forsøkes i en enkelt operativsystemprosess. Juster om nødvendig for å fininnstille systemets yteevne. Anbefaling: 1-5."
 
-#: ../../Zotlabs/Module/Admin.php:532
+#: ../../Code/Module/Admin.php:532
 msgid "Poll interval"
 msgstr "Spørreintervall"
 
-#: ../../Zotlabs/Module/Admin.php:532
+#: ../../Code/Module/Admin.php:532
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Forsink spørreprosessene i bakgrunnen med dette antall sekunder for å redusere systembelastningen. Hvis 0, bruk dette leveringsintervallet."
 
-#: ../../Zotlabs/Module/Admin.php:533
+#: ../../Code/Module/Admin.php:533
 msgid "Maximum Load Average"
 msgstr "Største belastningsgjennomsnitt"
 
-#: ../../Zotlabs/Module/Admin.php:533
+#: ../../Code/Module/Admin.php:533
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Største systembelastning før leverings- og spørreprosesser blir utsatt - standard 50."
 
-#: ../../Zotlabs/Module/Admin.php:534
+#: ../../Code/Module/Admin.php:534
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Antall dager før importert innhold (nettet/nettverk) utgår"
 
-#: ../../Zotlabs/Module/Admin.php:534
+#: ../../Code/Module/Admin.php:534
 msgid "0 for no expiration of imported content"
 msgstr "0 dersom importert innhold ikke skal utgå"
 
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Code/Module/Admin.php:677 ../../Code/Module/Admin.php:678
+#: ../../Code/Module/Settings.php:722
 msgid "Off"
 msgstr "Av"
 
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Code/Module/Admin.php:677 ../../Code/Module/Admin.php:678
+#: ../../Code/Module/Settings.php:722
 msgid "On"
 msgstr "På"
 
-#: ../../Zotlabs/Module/Admin.php:678
+#: ../../Code/Module/Admin.php:678
 #, php-format
 msgid "Lock feature %s"
 msgstr "Lås funksjon %s"
 
-#: ../../Zotlabs/Module/Admin.php:686
+#: ../../Code/Module/Admin.php:686
 msgid "Manage Additional Features"
 msgstr "Håndter tilleggsfunksjoner"
 
-#: ../../Zotlabs/Module/Admin.php:703
+#: ../../Code/Module/Admin.php:703
 msgid "No server found"
 msgstr "Ingen tjener funnet"
 
-#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
+#: ../../Code/Module/Admin.php:710 ../../Code/Module/Admin.php:1046
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin.php:710
+#: ../../Code/Module/Admin.php:710
 msgid "for channel"
 msgstr "for kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:710
+#: ../../Code/Module/Admin.php:710
 msgid "on server"
 msgstr "på tjener"
 
-#: ../../Zotlabs/Module/Admin.php:712
+#: ../../Code/Module/Admin.php:712
 msgid "Server"
 msgstr "Tjener"
 
-#: ../../Zotlabs/Module/Admin.php:746
+#: ../../Code/Module/Admin.php:746
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:749
+#: ../../Code/Module/Admin.php:749
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:750
+#: ../../Code/Module/Admin.php:750
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:751
+#: ../../Code/Module/Admin.php:751
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+#: ../../Code/Module/Admin.php:756 ../../include/widgets.php:1385
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: ../../Zotlabs/Module/Admin.php:758
+#: ../../Code/Module/Admin.php:758
 msgid "Block public"
 msgstr "Blokker offentlig tilgang"
 
-#: ../../Zotlabs/Module/Admin.php:758
+#: ../../Code/Module/Admin.php:758
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Kryss av for å blokkere tilgang til alle personlige sider som ellers ville vært offentlig tilgjengelige på dette nettstedet med mindre du er logget inn."
 
-#: ../../Zotlabs/Module/Admin.php:759
+#: ../../Code/Module/Admin.php:759
 msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:760
+#: ../../Code/Module/Admin.php:760
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:761
+#: ../../Code/Module/Admin.php:761
 msgid "Allow communications only from these sites"
 msgstr "Tillat kommunikasjon med bare disse nettstedene"
 
-#: ../../Zotlabs/Module/Admin.php:761
+#: ../../Code/Module/Admin.php:761
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Et nettsted per linje. La det stå tomt for å tillate kommunikasjon med ethvert nettsted som standard"
 
-#: ../../Zotlabs/Module/Admin.php:762
+#: ../../Code/Module/Admin.php:762
 msgid "Block communications from these sites"
 msgstr "Blokker kommunikasjon fra disse nettstedene"
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Code/Module/Admin.php:763
 msgid "Allow communications only from these channels"
 msgstr "Tillat kommunikasjon med bare disse kanalene"
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Code/Module/Admin.php:763
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "En kanal (hash) per linje. La det stå tomt for å tillate enhver kanal som standard"
 
-#: ../../Zotlabs/Module/Admin.php:764
+#: ../../Code/Module/Admin.php:764
 msgid "Block communications from these channels"
 msgstr "Blokker kommunikasjon fra disse kanalene"
 
-#: ../../Zotlabs/Module/Admin.php:765
+#: ../../Code/Module/Admin.php:765
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:766
+#: ../../Code/Module/Admin.php:766
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:766
+#: ../../Code/Module/Admin.php:766
 msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:767
+#: ../../Code/Module/Admin.php:767
 msgid "Block embedded HTML from these domains"
 msgstr "Blokker innbygget HTML fra disse domenene"
 
-#: ../../Zotlabs/Module/Admin.php:785
+#: ../../Code/Module/Admin.php:785
 msgid "Update has been marked successful"
 msgstr "Oppdateringen har blitt merket som en suksess"
 
-#: ../../Zotlabs/Module/Admin.php:795
+#: ../../Code/Module/Admin.php:795
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Utføring av %s feilet. Sjekk systemlogger."
 
-#: ../../Zotlabs/Module/Admin.php:798
+#: ../../Code/Module/Admin.php:798
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Oppdatering %s ble gjennomført med suksess."
 
-#: ../../Zotlabs/Module/Admin.php:802
+#: ../../Code/Module/Admin.php:802
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Oppdatering %s returnerte ingen status. Det er ukjent om den ble vellykket."
 
-#: ../../Zotlabs/Module/Admin.php:805
+#: ../../Code/Module/Admin.php:805
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Oppdatering av funksjon %s kunne ikke finnes."
 
-#: ../../Zotlabs/Module/Admin.php:821
+#: ../../Code/Module/Admin.php:821
 msgid "No failed updates."
 msgstr "Ingen mislykkede oppdateringer."
 
-#: ../../Zotlabs/Module/Admin.php:825
+#: ../../Code/Module/Admin.php:825
 msgid "Failed Updates"
 msgstr "Mislykkede oppdateringer"
 
-#: ../../Zotlabs/Module/Admin.php:827
+#: ../../Code/Module/Admin.php:827
 msgid "Mark success (if update was manually applied)"
 msgstr "Marker suksess (hvis oppdateringen ble gjennomført manuelt)"
 
-#: ../../Zotlabs/Module/Admin.php:828
+#: ../../Code/Module/Admin.php:828
 msgid "Attempt to execute this update step automatically"
 msgstr "Prøv å gjennomføre dette oppdateringstrinnet automatisk"
 
-#: ../../Zotlabs/Module/Admin.php:859
+#: ../../Code/Module/Admin.php:859
 msgid "Queue Statistics"
 msgstr "Køstatistikk"
 
-#: ../../Zotlabs/Module/Admin.php:860
+#: ../../Code/Module/Admin.php:860
 msgid "Total Entries"
 msgstr "Totalt antall oppføringer"
 
-#: ../../Zotlabs/Module/Admin.php:861
+#: ../../Code/Module/Admin.php:861
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../../Zotlabs/Module/Admin.php:862
+#: ../../Code/Module/Admin.php:862
 msgid "Destination URL"
 msgstr "Mål-URL"
 
-#: ../../Zotlabs/Module/Admin.php:863
+#: ../../Code/Module/Admin.php:863
 msgid "Mark hub permanently offline"
 msgstr "Merk hub som permanent offline"
 
-#: ../../Zotlabs/Module/Admin.php:864
+#: ../../Code/Module/Admin.php:864
 msgid "Empty queue for this hub"
 msgstr "Tøm køen for denne hubben"
 
-#: ../../Zotlabs/Module/Admin.php:865
+#: ../../Code/Module/Admin.php:865
 msgid "Last known contact"
 msgstr "Siste kjente kontakt"
 
-#: ../../Zotlabs/Module/Admin.php:901
+#: ../../Code/Module/Admin.php:901
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s konto blokkert/ikke blokkert lenger"
 msgstr[1] "%s kontoer blokkert/ikke blokkert lenger"
 
-#: ../../Zotlabs/Module/Admin.php:908
+#: ../../Code/Module/Admin.php:908
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s konto slettet"
 msgstr[1] "%s kontoer slettet"
 
-#: ../../Zotlabs/Module/Admin.php:944
+#: ../../Code/Module/Admin.php:944
 msgid "Account not found"
 msgstr "Kontoen ble ikke funnet"
 
-#: ../../Zotlabs/Module/Admin.php:955
+#: ../../Code/Module/Admin.php:955
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Kontoen '%s' slettet"
 
-#: ../../Zotlabs/Module/Admin.php:963
+#: ../../Code/Module/Admin.php:963
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Kontoen '%s' blokkert"
 
-#: ../../Zotlabs/Module/Admin.php:971
+#: ../../Code/Module/Admin.php:971
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Kontoen '%s' er ikke blokkert lenger"
 
-#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
+#: ../../Code/Module/Admin.php:1031 ../../Code/Module/Admin.php:1044
 #: ../../include/widgets.php:1383
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212
+#: ../../Code/Module/Admin.php:1033 ../../Code/Module/Admin.php:1212
 msgid "select all"
 msgstr "velg alle"
 
-#: ../../Zotlabs/Module/Admin.php:1034
+#: ../../Code/Module/Admin.php:1034
 msgid "Registrations waiting for confirm"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1035
+#: ../../Code/Module/Admin.php:1035
 msgid "Request date"
 msgstr "Dato for forespørsel"
 
-#: ../../Zotlabs/Module/Admin.php:1036
+#: ../../Code/Module/Admin.php:1036
 msgid "No registrations."
 msgstr "Ingen registreringer."
 
-#: ../../Zotlabs/Module/Admin.php:1038
+#: ../../Code/Module/Admin.php:1038
 msgid "Deny"
 msgstr "Avslå"
 
-#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
+#: ../../Code/Module/Admin.php:1048 ../../include/group.php:267
 msgid "All Channels"
 msgstr "Alle kanaler"
 
-#: ../../Zotlabs/Module/Admin.php:1049
+#: ../../Code/Module/Admin.php:1049
 msgid "Register date"
 msgstr "Registreringsdato"
 
-#: ../../Zotlabs/Module/Admin.php:1050
+#: ../../Code/Module/Admin.php:1050
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: ../../Zotlabs/Module/Admin.php:1051
+#: ../../Code/Module/Admin.php:1051
 msgid "Expires"
 msgstr "Utløper"
 
-#: ../../Zotlabs/Module/Admin.php:1052
+#: ../../Code/Module/Admin.php:1052
 msgid "Service Class"
 msgstr "Tjenesteklasse"
 
-#: ../../Zotlabs/Module/Admin.php:1054
+#: ../../Code/Module/Admin.php:1054
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Valgte kontoer vil bli slettet!\\n\\nAlt disse kontoene har lagt inn på dette nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil slette disse valgte kontoene?"
 
-#: ../../Zotlabs/Module/Admin.php:1055
+#: ../../Code/Module/Admin.php:1055
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kontoen {0} vl bli slettet!\\n\\nAlt denne kontoen har lagt inn på dette nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil slette denne kontoen?"
 
-#: ../../Zotlabs/Module/Admin.php:1091
+#: ../../Code/Module/Admin.php:1091
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s kanal er sensurert/ikke sensurert lenger"
 msgstr[1] "%s kanaler er sensurert/ikke sensurert lenger"
 
-#: ../../Zotlabs/Module/Admin.php:1100
+#: ../../Code/Module/Admin.php:1100
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s kanal med kode tillatt/ikke tillatt"
 msgstr[1] "%s kanaler med kode tillatt/ikke tillatt"
 
-#: ../../Zotlabs/Module/Admin.php:1106
+#: ../../Code/Module/Admin.php:1106
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s kanal slettet"
 msgstr[1] "%s kanaler slettet"
 
-#: ../../Zotlabs/Module/Admin.php:1126
+#: ../../Code/Module/Admin.php:1126
 msgid "Channel not found"
 msgstr "Kanalen ble ikke funnet"
 
-#: ../../Zotlabs/Module/Admin.php:1136
+#: ../../Code/Module/Admin.php:1136
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanalen '%s' er slettet"
 
-#: ../../Zotlabs/Module/Admin.php:1148
+#: ../../Code/Module/Admin.php:1148
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanalen '%s' er sensurert"
 
-#: ../../Zotlabs/Module/Admin.php:1148
+#: ../../Code/Module/Admin.php:1148
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanalen '%s' er ikke sensurert lenger"
 
-#: ../../Zotlabs/Module/Admin.php:1159
+#: ../../Code/Module/Admin.php:1159
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Kanal '%s' kode tillatt"
 
-#: ../../Zotlabs/Module/Admin.php:1159
+#: ../../Code/Module/Admin.php:1159
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Kanal '%s' kode ikke tillatt"
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Code/Module/Admin.php:1210 ../../include/widgets.php:1384
 msgid "Channels"
 msgstr "Kanaler"
 
-#: ../../Zotlabs/Module/Admin.php:1214
+#: ../../Code/Module/Admin.php:1214
 msgid "Censor"
 msgstr "Sensurer"
 
-#: ../../Zotlabs/Module/Admin.php:1215
+#: ../../Code/Module/Admin.php:1215
 msgid "Uncensor"
 msgstr "Ikke sensurer lenger"
 
-#: ../../Zotlabs/Module/Admin.php:1216
+#: ../../Code/Module/Admin.php:1216
 msgid "Allow Code"
 msgstr "Tillat kode"
 
-#: ../../Zotlabs/Module/Admin.php:1217
+#: ../../Code/Module/Admin.php:1217
 msgid "Disallow Code"
 msgstr "Ikke tillat kode"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Code/Module/Admin.php:1218 ../../include/conversation.php:1611
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../../Zotlabs/Module/Admin.php:1222
+#: ../../Code/Module/Admin.php:1222
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin.php:1226
+#: ../../Code/Module/Admin.php:1226
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Valgte kanaler vil bli slettet!\\n\\nAlt innhold som er lagt inn i disse kanalene på dette nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du vil slette disse kanalene med alt innhold?"
 
-#: ../../Zotlabs/Module/Admin.php:1227
+#: ../../Code/Module/Admin.php:1227
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kanalen {0} vil bli slettet!\\n\\nAlt innhold som er lagt inn i denne kanalen på dettet nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du vil slette denne kanalen med alt innhold?"
 
-#: ../../Zotlabs/Module/Admin.php:1284
+#: ../../Code/Module/Admin.php:1284
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Tilleggsfunksjonen %s er avskrudd."
 
-#: ../../Zotlabs/Module/Admin.php:1288
+#: ../../Code/Module/Admin.php:1288
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Tilleggsfunksjonen %s er påskrudd."
 
-#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585
+#: ../../Code/Module/Admin.php:1298 ../../Code/Module/Admin.php:1585
 msgid "Disable"
 msgstr "Skru av"
 
-#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587
+#: ../../Code/Module/Admin.php:1301 ../../Code/Module/Admin.php:1587
 msgid "Enable"
 msgstr "Skru på"
 
-#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
+#: ../../Code/Module/Admin.php:1330 ../../Code/Module/Admin.php:1420
 #: ../../include/widgets.php:1387
 msgid "Plugins"
 msgstr "Tilleggsfunksjoner"
 
-#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614
+#: ../../Code/Module/Admin.php:1331 ../../Code/Module/Admin.php:1614
 msgid "Toggle"
 msgstr "Skru av og på"
 
-#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
+#: ../../Code/Module/Admin.php:1332 ../../Code/Module/Admin.php:1615
+#: ../../Code/Lib/Apps.php:215 ../../include/widgets.php:638
 #: ../../include/nav.php:208
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624
+#: ../../Code/Module/Admin.php:1339 ../../Code/Module/Admin.php:1624
 msgid "Author: "
 msgstr "Forfatter:"
 
-#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625
+#: ../../Code/Module/Admin.php:1340 ../../Code/Module/Admin.php:1625
 msgid "Maintainer: "
 msgstr "Vedlikeholder:"
 
-#: ../../Zotlabs/Module/Admin.php:1341
+#: ../../Code/Module/Admin.php:1341
 msgid "Minimum project version: "
 msgstr "Minimum prosjektversjon:"
 
-#: ../../Zotlabs/Module/Admin.php:1342
+#: ../../Code/Module/Admin.php:1342
 msgid "Maximum project version: "
 msgstr "Maksimum prosjektversjon:"
 
-#: ../../Zotlabs/Module/Admin.php:1343
+#: ../../Code/Module/Admin.php:1343
 msgid "Minimum PHP version: "
 msgstr "Minimum PHP-versjon:"
 
-#: ../../Zotlabs/Module/Admin.php:1344
+#: ../../Code/Module/Admin.php:1344
 msgid "Requires: "
 msgstr "Krever:"
 
-#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425
+#: ../../Code/Module/Admin.php:1345 ../../Code/Module/Admin.php:1425
 msgid "Disabled - version incompatibility"
 msgstr "Skrudd av - versjonsinkompatibilitet"
 
-#: ../../Zotlabs/Module/Admin.php:1394
+#: ../../Code/Module/Admin.php:1394
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1395
+#: ../../Code/Module/Admin.php:1395
 msgid "Plugin repo git URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1396
+#: ../../Code/Module/Admin.php:1396
 msgid "Custom repo name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1396
+#: ../../Code/Module/Admin.php:1396
 msgid "(optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1397
+#: ../../Code/Module/Admin.php:1397
 msgid "Download Plugin Repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1404
+#: ../../Code/Module/Admin.php:1404
 msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Code/Module/Admin.php:1405 ../../Code/Lib/Apps.php:330
 msgid "Install"
 msgstr "Installer"
 
-#: ../../Zotlabs/Module/Admin.php:1427
+#: ../../Code/Module/Admin.php:1427
 msgid "Manage Repos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1428
+#: ../../Code/Module/Admin.php:1428
 msgid "Installed Plugin Repositories"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1429
+#: ../../Code/Module/Admin.php:1429
 msgid "Install a New Plugin Repository"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Code/Module/Admin.php:1435 ../../Code/Module/Settings.php:77
+#: ../../Code/Module/Settings.php:616 ../../Code/Lib/Apps.php:330
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../../Zotlabs/Module/Admin.php:1436
+#: ../../Code/Module/Admin.php:1436
 msgid "Switch branch"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1550
+#: ../../Code/Module/Admin.php:1550
 msgid "No themes found."
 msgstr "Ingen temaer er funnet."
 
-#: ../../Zotlabs/Module/Admin.php:1606
+#: ../../Code/Module/Admin.php:1606
 msgid "Screenshot"
 msgstr "Skjermbilde"
 
-#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
+#: ../../Code/Module/Admin.php:1613 ../../Code/Module/Admin.php:1647
 #: ../../include/widgets.php:1388
 msgid "Themes"
 msgstr "Temaer"
 
-#: ../../Zotlabs/Module/Admin.php:1652
+#: ../../Code/Module/Admin.php:1652
 msgid "[Experimental]"
 msgstr "[Eksperimentelt]"
 
-#: ../../Zotlabs/Module/Admin.php:1653
+#: ../../Code/Module/Admin.php:1653
 msgid "[Unsupported]"
 msgstr "[Ingen støtte]"
 
-#: ../../Zotlabs/Module/Admin.php:1677
+#: ../../Code/Module/Admin.php:1677
 msgid "Log settings updated."
 msgstr "Logginnstillinger er oppdatert."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
+#: ../../Code/Module/Admin.php:1732 ../../include/widgets.php:1409
 #: ../../include/widgets.php:1419
 msgid "Logs"
 msgstr "Logger"
 
-#: ../../Zotlabs/Module/Admin.php:1734
+#: ../../Code/Module/Admin.php:1734
 msgid "Clear"
 msgstr "Tøm"
 
-#: ../../Zotlabs/Module/Admin.php:1740
+#: ../../Code/Module/Admin.php:1740
 msgid "Debugging"
 msgstr "Feilsøking"
 
-#: ../../Zotlabs/Module/Admin.php:1741
+#: ../../Code/Module/Admin.php:1741
 msgid "Log file"
 msgstr "Loggfil"
 
-#: ../../Zotlabs/Module/Admin.php:1741
+#: ../../Code/Module/Admin.php:1741
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1742
+#: ../../Code/Module/Admin.php:1742
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: ../../Zotlabs/Module/Admin.php:2028
+#: ../../Code/Module/Admin.php:2028
 msgid "New Profile Field"
 msgstr "Nytt profilfelt"
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+#: ../../Code/Module/Admin.php:2029 ../../Code/Module/Admin.php:2049
 msgid "Field nickname"
 msgstr "Feltets kallenavn"
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+#: ../../Code/Module/Admin.php:2029 ../../Code/Module/Admin.php:2049
 msgid "System name of field"
 msgstr "Systemnavnet til feltet"
 
-#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050
+#: ../../Code/Module/Admin.php:2030 ../../Code/Module/Admin.php:2050
 msgid "Input type"
 msgstr "Inndata-type"
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+#: ../../Code/Module/Admin.php:2031 ../../Code/Module/Admin.php:2051
 msgid "Field Name"
 msgstr "Feltnavn"
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+#: ../../Code/Module/Admin.php:2031 ../../Code/Module/Admin.php:2051
 msgid "Label on profile pages"
 msgstr "Merkelapp på profilsider"
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+#: ../../Code/Module/Admin.php:2032 ../../Code/Module/Admin.php:2052
 msgid "Help text"
 msgstr "Hjelpetekst"
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+#: ../../Code/Module/Admin.php:2032 ../../Code/Module/Admin.php:2052
 msgid "Additional info (optional)"
 msgstr "Tilleggsinformasjon (valgfritt)"
 
-#: ../../Zotlabs/Module/Admin.php:2042
+#: ../../Code/Module/Admin.php:2042
 msgid "Field definition not found"
 msgstr "Feltdefinisjonen ble ikke funnet"
 
-#: ../../Zotlabs/Module/Admin.php:2048
+#: ../../Code/Module/Admin.php:2048
 msgid "Edit Profile Field"
 msgstr "Endre profilfelt"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Code/Module/Admin.php:2106 ../../include/widgets.php:1390
 msgid "Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2107
+#: ../../Code/Module/Admin.php:2107
 msgid "Basic Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2108
+#: ../../Code/Module/Admin.php:2108
 msgid "Advanced Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2108
+#: ../../Code/Module/Admin.php:2108
 msgid "(In addition to basic fields)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2110
+#: ../../Code/Module/Admin.php:2110
 msgid "All available fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2111
+#: ../../Code/Module/Admin.php:2111
 msgid "Custom Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2115
+#: ../../Code/Module/Admin.php:2115
 msgid "Create Custom Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+#: ../../Code/Module/Appman.php:37 ../../Code/Module/Appman.php:53
 msgid "App installed."
 msgstr "App installert."
 
-#: ../../Zotlabs/Module/Appman.php:46
+#: ../../Code/Module/Appman.php:46
 msgid "Malformed app."
 msgstr "Feil oppsett for app-en."
 
-#: ../../Zotlabs/Module/Appman.php:104
+#: ../../Code/Module/Appman.php:104
 msgid "Embed code"
 msgstr "Innbyggingskode"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+#: ../../Code/Module/Appman.php:110 ../../include/widgets.php:107
 msgid "Edit App"
 msgstr "Endre app"
 
-#: ../../Zotlabs/Module/Appman.php:110
+#: ../../Code/Module/Appman.php:110
 msgid "Create App"
 msgstr "Lag app"
 
-#: ../../Zotlabs/Module/Appman.php:115
+#: ../../Code/Module/Appman.php:115
 msgid "Name of app"
 msgstr "Navn på app"
 
-#: ../../Zotlabs/Module/Appman.php:116
+#: ../../Code/Module/Appman.php:116
 msgid "Location (URL) of app"
 msgstr "Plassering (URL) til app"
 
-#: ../../Zotlabs/Module/Appman.php:118
+#: ../../Code/Module/Appman.php:118
 msgid "Photo icon URL"
 msgstr "Bildeikon URL"
 
-#: ../../Zotlabs/Module/Appman.php:118
+#: ../../Code/Module/Appman.php:118
 msgid "80 x 80 pixels - optional"
 msgstr "80 x80 pixler - valgfritt"
 
-#: ../../Zotlabs/Module/Appman.php:119
+#: ../../Code/Module/Appman.php:119
 msgid "Categories (optional, comma separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:120
+#: ../../Code/Module/Appman.php:120
 msgid "Version ID"
 msgstr "Versjons-ID"
 
-#: ../../Zotlabs/Module/Appman.php:121
+#: ../../Code/Module/Appman.php:121
 msgid "Price of app"
 msgstr "Pris på app"
 
-#: ../../Zotlabs/Module/Appman.php:122
+#: ../../Code/Module/Appman.php:122
 msgid "Location (URL) to purchase app"
 msgstr "Plassering (URL) for å kjøpe app"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Code/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr "Velg en bokmerkemappe"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Code/Module/Rbmark.php:99
 msgid "Save Bookmark"
 msgstr "Lagre bokmerke"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Code/Module/Rbmark.php:100
 msgid "URL of bookmark"
 msgstr "URL-en til bokmerket"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Code/Module/Rbmark.php:105
 msgid "Or enter new bookmark folder name"
 msgstr "Eller skriv nytt navn på bokmerkemappe"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Code/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Antallet daglige registreringer ved nettstedet er overskredet. Vær vennlig å prøve igjen imorgen."
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Code/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Vennligst angi at tjenesteavtalen er akseptert. Registrering mislyktes."
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Code/Module/Register.php:89
 msgid "Passwords do not match."
 msgstr "Passordene er ikke like."
 
-#: ../../Zotlabs/Module/Register.php:131
+#: ../../Code/Module/Register.php:131
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registreringen er vellykket. Vennligst sjekk e-posten din for å bekrefte opprettelsen."
 
-#: ../../Zotlabs/Module/Register.php:137
+#: ../../Code/Module/Register.php:137
 msgid "Your registration is pending approval by the site owner."
 msgstr "Din registrering venter på godkjenning av nettstedets eier."
 
-#: ../../Zotlabs/Module/Register.php:140
+#: ../../Code/Module/Register.php:140
 msgid "Your registration can not be processed."
 msgstr "Din registrering kan ikke behandles."
 
-#: ../../Zotlabs/Module/Register.php:184
+#: ../../Code/Module/Register.php:184
 msgid "Registration on this hub is disabled."
 msgstr "Registrering ved dette nettstedet er skrudd av."
 
-#: ../../Zotlabs/Module/Register.php:193
+#: ../../Code/Module/Register.php:193
 msgid "Registration on this hub is by approval only."
 msgstr "Registrering ved dette nettstedet skjer på godkjenning."
 
-#: ../../Zotlabs/Module/Register.php:194
+#: ../../Code/Module/Register.php:194
 msgid "Register at another affiliated hub."
 msgstr "Registrer ved et annet tilsluttet nettsted."
 
-#: ../../Zotlabs/Module/Register.php:204
+#: ../../Code/Module/Register.php:204
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Dette nettstedet har overskredet antallet tillate kontoregistreringer per dag. Vennligst prøv igjen imorgen."
 
-#: ../../Zotlabs/Module/Register.php:215
+#: ../../Code/Module/Register.php:215
 msgid "Terms of Service"
 msgstr "Tjenesteavtale"
 
-#: ../../Zotlabs/Module/Register.php:221
+#: ../../Code/Module/Register.php:221
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Jeg godtar %s for dette nettstedet"
 
-#: ../../Zotlabs/Module/Register.php:223
+#: ../../Code/Module/Register.php:223
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Jeg er over 13 år gammel og aksepterer %s for dette nettstedet."
 
-#: ../../Zotlabs/Module/Register.php:227
+#: ../../Code/Module/Register.php:227
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: ../../Zotlabs/Module/Register.php:228
+#: ../../Code/Module/Register.php:228
 msgid "Choose a password"
 msgstr "Velg et passord"
 
-#: ../../Zotlabs/Module/Register.php:229
+#: ../../Code/Module/Register.php:229
 msgid "Please re-enter your password"
 msgstr "Vennligst skriv ditt passord en gang til"
 
-#: ../../Zotlabs/Module/Register.php:230
+#: ../../Code/Module/Register.php:230
 msgid "Please enter your invitation code"
 msgstr "Vennligst skriv din invitasjonskode"
 
-#: ../../Zotlabs/Module/Register.php:236
+#: ../../Code/Module/Register.php:236
 msgid "no"
 msgstr "nei"
 
-#: ../../Zotlabs/Module/Register.php:236
+#: ../../Code/Module/Register.php:236
 msgid "yes"
 msgstr "ja"
 
-#: ../../Zotlabs/Module/Register.php:250
+#: ../../Code/Module/Register.php:250
 msgid "Membership on this site is by invitation only."
 msgstr "Medlemskap ved dette nettstedet skjer kun via invitasjon."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
+#: ../../Code/Module/Register.php:262 ../../include/nav.php:147
 #: ../../boot.php:1685
 msgid "Register"
 msgstr "Registrer"
 
-#: ../../Zotlabs/Module/Register.php:262
+#: ../../Code/Module/Register.php:262
 msgid "Proceed to create your first channel"
 msgstr "Gå videre for å lage din første kanal"
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Vennligst logg inn."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Code/Module/Removeaccount.php:34
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet."
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Code/Module/Removeaccount.php:56
 msgid "Remove This Account"
 msgstr "Slett denne kontoen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Code/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeme.php:59
 msgid "WARNING: "
 msgstr "ADVARSEL:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeaccount.php:57
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Code/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeme.php:59
 msgid "This action is permanent and can not be undone!"
 msgstr "Denne handlingen er permanent og kan ikke angres!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Code/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeme.php:60
 msgid "Please enter your password for verification:"
 msgstr "Vennligst skriv ditt passord for å få bekreftelse:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Code/Module/Removeaccount.php:59
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Slett denne kontoen, alle dens kanaler og alle dens kanalkloner fra dette nettverket"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Code/Module/Removeaccount.php:59
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Som standard vil bare forekomster av kanalene lokalisert på denne hubben bli slettet fra nettverket"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Code/Module/Removeaccount.php:60
+#: ../../Code/Module/Settings.php:705
 msgid "Remove Account"
 msgstr "Slett konto"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Code/Module/Removeme.php:33
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Fjerning av kanaler er ikke tillatt innen 48 timer etter endring av kontopassordet."
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Code/Module/Removeme.php:58
 msgid "Remove This Channel"
 msgstr "Fjern denne kanalen"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Code/Module/Removeme.php:59
 msgid "This channel will be completely removed from the network. "
 msgstr "Denne kanalen vil bli fullstendig fjernet fra nettverket."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid "Remove this channel and all its clones from the network"
 msgstr "Fjern denne kanalen og alle dens kloner fra nettverket"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Som standard vil bare forekomsten av denne kanalen lokalisert på denne hubben bli fjernet fra nettverket"
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Code/Module/Removeme.php:62 ../../Code/Module/Settings.php:1124
 msgid "Remove Channel"
 msgstr "Fjern kanal"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Code/Module/Rmagic.php:44
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig."
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Code/Module/Rmagic.php:44
 msgid "The error message was:"
 msgstr "Feilmeldingen var:"
 
-#: ../../Zotlabs/Module/Rmagic.php:48
+#: ../../Code/Module/Rmagic.php:48
 msgid "Authentication failed."
 msgstr "Autentisering mislyktes."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
+#: ../../Code/Module/Rmagic.php:88
 msgid "Remote Authentication"
 msgstr "Fjernautentisering"
 
-#: ../../Zotlabs/Module/Rmagic.php:89
+#: ../../Code/Module/Rmagic.php:89
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Skriv din kanaladresse (for eksempel channel@exampel.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:90
+#: ../../Code/Module/Rmagic.php:90
 msgid "Authenticate"
 msgstr "Autentiser"
 
-#: ../../Zotlabs/Module/Search.php:216
+#: ../../Code/Module/Search.php:216
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Elementer merket med: %s"
 
-#: ../../Zotlabs/Module/Search.php:218
+#: ../../Code/Module/Search.php:218
 #, php-format
 msgid "Search results for: %s"
 msgstr "Søkeresultater for: %s"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "Ingen restriksjoner er funnet i tjenesteklasse."
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Code/Module/Settings.php:69
 msgid "Name is required"
 msgstr "Navn er påkrevd"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Code/Module/Settings.php:73
 msgid "Key and Secret are required"
 msgstr "Nøkkel og hemmelighet er påkrevd"
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Code/Module/Settings.php:225
 msgid "Not valid email."
 msgstr "Ikke gyldig e-post."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Code/Module/Settings.php:228
 msgid "Protected email address. Cannot change to that email."
 msgstr "Beskyttet e-postadresse. Kan ikke endre til den e-postadressen."
 
-#: ../../Zotlabs/Module/Settings.php:237
+#: ../../Code/Module/Settings.php:237
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfeil ved lagring av ny e-post. Vennligst prøv igjen."
 
-#: ../../Zotlabs/Module/Settings.php:254
+#: ../../Code/Module/Settings.php:254
 msgid "Password verification failed."
 msgstr "Passordbekreftelsen mislyktes."
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Code/Module/Settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr "Passordene stemmer ikke overens. Passord uforandret."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Code/Module/Settings.php:265
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Tomme passord er ikke tillatt. Passord uforandret."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Code/Module/Settings.php:279
 msgid "Password changed."
 msgstr "Passord endret."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Code/Module/Settings.php:281
 msgid "Password update failed. Please try again."
 msgstr "Passord oppdatering mislyktes. Vennligst prøv igjen."
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Code/Module/Settings.php:525
 msgid "Settings updated."
 msgstr "Innstillinger oppdatert."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Code/Module/Settings.php:589 ../../Code/Module/Settings.php:615
+#: ../../Code/Module/Settings.php:651
 msgid "Add application"
 msgstr "Legg til program"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Code/Module/Settings.php:592
 msgid "Name of application"
 msgstr "Navn på program"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Code/Module/Settings.php:593 ../../Code/Module/Settings.php:619
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Code/Module/Settings.php:593 ../../Code/Module/Settings.php:594
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisk laget - kan endres om du vil. Største lengde 20"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Code/Module/Settings.php:594 ../../Code/Module/Settings.php:620
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Code/Module/Settings.php:595 ../../Code/Module/Settings.php:621
 msgid "Redirect"
 msgstr "Omdirigering"
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Code/Module/Settings.php:595
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Omdirigerings-URI - la stå tomt hvis ikke ditt program spesifikt krever dette"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Code/Module/Settings.php:596 ../../Code/Module/Settings.php:622
 msgid "Icon url"
 msgstr "Ikon-URL"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
-#: ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Settings.php:596 ../../Code/Module/Sources.php:112
+#: ../../Code/Module/Sources.php:147
 msgid "Optional"
 msgstr "Valgfritt"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Code/Module/Settings.php:607
 msgid "Application not found."
 msgstr "Programmet ble ikke funnet."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Code/Module/Settings.php:650
 msgid "Connected Apps"
 msgstr "Tilkoblede app-er"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Code/Module/Settings.php:654
 msgid "Client key starts with"
 msgstr "Klientnøkkel starter med"
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Code/Module/Settings.php:655
 msgid "No name"
 msgstr "Ikke noe navn"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Code/Module/Settings.php:656
 msgid "Remove authorization"
 msgstr "Fjern tillatelse"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Code/Module/Settings.php:669
 msgid "No feature settings configured"
 msgstr "Ingen funksjonsinnstillinger er konfigurert"
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Code/Module/Settings.php:676
 msgid "Feature/Addon Settings"
 msgstr "Funksjons-/Tilleggsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Code/Module/Settings.php:699
 msgid "Account Settings"
 msgstr "Kontoinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Code/Module/Settings.php:700
 msgid "Current Password"
 msgstr "Nåværende passord"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Code/Module/Settings.php:701
 msgid "Enter New Password"
 msgstr "Skriv nytt passord"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Code/Module/Settings.php:702
 msgid "Confirm New Password"
 msgstr "Bekreft nytt passord"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Code/Module/Settings.php:702
 msgid "Leave password fields blank unless changing"
 msgstr "La passordfeltene stå blanke om det ikke skal endres"
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Code/Module/Settings.php:704
+#: ../../Code/Module/Settings.php:1041
 msgid "Email Address:"
 msgstr "E-postadresse:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Code/Module/Settings.php:706
 msgid "Remove this account including all its channels"
 msgstr "Slett denne kontoen inkludert alle dens kanaler"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Code/Module/Settings.php:729
 msgid "Additional Features"
 msgstr "Ekstra funksjoner"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Code/Module/Settings.php:753
 msgid "Connector Settings"
 msgstr "Koblingsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Code/Module/Settings.php:792
 msgid "No special theme for mobile devices"
 msgstr "Ikke noe spesielt tema for mobile enheter"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Code/Module/Settings.php:795
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Eksperimentelt)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Code/Module/Settings.php:837
 msgid "Display Settings"
 msgstr "Visningsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Code/Module/Settings.php:838
 msgid "Theme Settings"
 msgstr "Temainnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Code/Module/Settings.php:839
 msgid "Custom Theme Settings"
 msgstr "Tilpassede temainnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Code/Module/Settings.php:840
 msgid "Content Settings"
 msgstr "Innholdsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Code/Module/Settings.php:846
 msgid "Display Theme:"
 msgstr "Visningstema:"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Code/Module/Settings.php:847
 msgid "Mobile Theme:"
 msgstr "Mobiltema:"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Code/Module/Settings.php:848
 msgid "Preload images before rendering the page"
 msgstr "Last inn bildene før gjengivelsen av siden"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Code/Module/Settings.php:848
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "Den personlige opplevelsen av lastetiden vil være lenger, men siden vil være klar når den vises"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Code/Module/Settings.php:849
 msgid "Enable user zoom on mobile devices"
 msgstr "Skru på brukerstyrt zoom på mobile enheter"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Code/Module/Settings.php:850
 msgid "Update browser every xx seconds"
 msgstr "Oppdater nettleser hvert xx sekunder"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Code/Module/Settings.php:850
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 sekunder, ikke noe maksimum"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Code/Module/Settings.php:851
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maksimalt antall samtaler å laste samtidig:"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Code/Module/Settings.php:851
 msgid "Maximum of 100 items"
 msgstr "Maksimum 100 elementer"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Code/Module/Settings.php:852
 msgid "Show emoticons (smilies) as images"
 msgstr "Vis emoticons (smilefjes) som bilder"
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Code/Module/Settings.php:853
 msgid "Link post titles to source"
 msgstr "Lenk innleggets tittel til kilden"
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Code/Module/Settings.php:854
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Systemsidens layoutbehandler - (avansert)"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Code/Module/Settings.php:857
 msgid "Use blog/list mode on channel page"
 msgstr "Bruk blogg-/listemodus på kanalsiden"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Code/Module/Settings.php:857 ../../Code/Module/Settings.php:858
 msgid "(comments displayed separately)"
 msgstr "(kommentarer vist separat)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Code/Module/Settings.php:858
 msgid "Use blog/list mode on grid page"
 msgstr "Bruk blogg-/liste-modus på nettverkssiden"
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Code/Module/Settings.php:859
 msgid "Channel page max height of content (in pixels)"
 msgstr "Kanalsidens makshøyde for innhold (i pixler)"
 
-#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Code/Module/Settings.php:859 ../../Code/Module/Settings.php:860
 msgid "click to expand content exceeding this height"
 msgstr "klikk for å utvide innhold som overstiger denne høyden"
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Code/Module/Settings.php:860
 msgid "Grid page max height of content (in pixels)"
 msgstr "Nettverkssidens makshøyde for innhold (i piksler)"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Code/Module/Settings.php:894
 msgid "Nobody except yourself"
 msgstr "Ingen unntatt deg selv"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Code/Module/Settings.php:895
 msgid "Only those you specifically allow"
 msgstr "Bare de du spesifikt tillater"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Code/Module/Settings.php:896
 msgid "Approved connections"
 msgstr "Godkjente forbindelser"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Code/Module/Settings.php:897
 msgid "Any connections"
 msgstr "Enhver forbindelse"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Code/Module/Settings.php:898
 msgid "Anybody on this website"
 msgstr "Enhver ved dette nettstedet"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Code/Module/Settings.php:899
 msgid "Anybody in this network"
 msgstr "Enhver i dette nettverket"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Code/Module/Settings.php:900
 msgid "Anybody authenticated"
 msgstr "Enhver som er autentisert"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Code/Module/Settings.php:901
 msgid "Anybody on the internet"
 msgstr "Enhver på Internett"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Code/Module/Settings.php:976
 msgid "Publish your default profile in the network directory"
 msgstr "Publiser din standardprofil i nettverkskatalogen"
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Code/Module/Settings.php:981
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Tillat oss å foreslå deg som en mulig venn til nye medlemmer?"
 
-#: ../../Zotlabs/Module/Settings.php:990
+#: ../../Code/Module/Settings.php:990
 msgid "Your channel address is"
 msgstr "Din kanaladresse er"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Code/Module/Settings.php:1032
 msgid "Channel Settings"
 msgstr "Kanalinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Code/Module/Settings.php:1039
 msgid "Basic Settings"
 msgstr "Grunninnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Code/Module/Settings.php:1040 ../../include/channel.php:1140
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Code/Module/Settings.php:1042
 msgid "Your Timezone:"
 msgstr "Din tidssone:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Code/Module/Settings.php:1043
 msgid "Default Post Location:"
 msgstr "Standard plassering ved innlegg:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Code/Module/Settings.php:1043
 msgid "Geographical location to display on your posts"
 msgstr "Geografisk plassering som vises på dine innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Code/Module/Settings.php:1044
 msgid "Use Browser Location:"
 msgstr "Bruk nettleseren sin plassering:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Code/Module/Settings.php:1046
 msgid "Adult Content"
 msgstr "Voksent innhold"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Code/Module/Settings.php:1046
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Denne kanalen vil ofte eller jevnlig publisere voksent innhold. (Vennligst merk alt voksent materiale og/eller nakenhet med #NSFW)"
 
-#: ../../Zotlabs/Module/Settings.php:1048
+#: ../../Code/Module/Settings.php:1048
 msgid "Security and Privacy Settings"
 msgstr "Sikkerhets- og personverninnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Code/Module/Settings.php:1051
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Dine tillatelser er allerede satt. Klikk for å se/justere."
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Code/Module/Settings.php:1053
 msgid "Hide my online presence"
 msgstr "Skjul min tilstedeværelse online"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Code/Module/Settings.php:1053
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Forhindrer visning på din profil av at du er online "
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Code/Module/Settings.php:1055
 msgid "Simple Privacy Settings:"
 msgstr "Enkle personverninnstillinger:"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Code/Module/Settings.php:1056
 msgid ""
 "Very Public - extremely permissive (should be used with caution)"
 msgstr "Svært offentlig - ekstremt åpent (bør brukes med varsomhet)"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Code/Module/Settings.php:1057
 msgid ""
 "Typical - default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)"
 msgstr "Typisk - standard er offentlig, personvern når ønsket (likner på tillatelser i sosiale nettverk, men med forbedret personvern)"
 
-#: ../../Zotlabs/Module/Settings.php:1058
+#: ../../Code/Module/Settings.php:1058
 msgid "Private - default private, never open or public"
 msgstr "Privat - standard er privat, aldri åpen eller offentlig"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Code/Module/Settings.php:1059
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Blokkert - standard blokkert til/fra alle"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Code/Module/Settings.php:1061
 msgid "Allow others to tag your posts"
 msgstr "Tillat andre å merke dine innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Code/Module/Settings.php:1061
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Ofte brukt av fellesskapet for å merke upassende innhold i etterkant"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Code/Module/Settings.php:1063
 msgid "Advanced Privacy Settings"
 msgstr "Avanserte personverninnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "Expire other channel content after this many days"
 msgstr "Annet kanal innhold utløper etter så mange dager"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Code/Module/Settings.php:1065
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Code/Module/Settings.php:1066
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maksimalt antall venneforespørsler per dag:"
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Code/Module/Settings.php:1066
 msgid "May reduce spam activity"
 msgstr "Kan redusere søppelpostaktivitet"
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Code/Module/Settings.php:1067
 msgid "Default Post and Publish Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Code/Module/Settings.php:1069
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Code/Module/Settings.php:1072
 msgid "Channel permissions category:"
 msgstr "Kategori med kanaltillatelser:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Code/Module/Settings.php:1078
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maksimalt antall private meldinger per dag fra ukjente personer:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Code/Module/Settings.php:1078
 msgid "Useful to reduce spamming"
 msgstr "Nyttig for å redusere søppelpost"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Code/Module/Settings.php:1081
 msgid "Notification Settings"
 msgstr "Varslingsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Code/Module/Settings.php:1082
 msgid "By default post a status message when:"
 msgstr "Legg inn en statusmelding når du:"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Code/Module/Settings.php:1083
 msgid "accepting a friend request"
 msgstr "aksepterer en venneforespørsel"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Code/Module/Settings.php:1084
 msgid "joining a forum/community"
 msgstr "blir med i et forum/miljø"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Code/Module/Settings.php:1085
 msgid "making an interesting profile change"
 msgstr "gjør en interessant profilendring"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Code/Module/Settings.php:1086
 msgid "Send a notification email when:"
 msgstr "Send en varsel-e-post når:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Code/Module/Settings.php:1087
 msgid "You receive a connection request"
 msgstr "Du har mottatt en forespørsel om forbindelse"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Code/Module/Settings.php:1088
 msgid "Your connections are confirmed"
 msgstr "Dine forbindelser er bekreftet"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Code/Module/Settings.php:1089
 msgid "Someone writes on your profile wall"
 msgstr "Noen skriver på din profilvegg"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Code/Module/Settings.php:1090
 msgid "Someone writes a followup comment"
 msgstr "Noen skriver en oppfølgende kommentar"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Code/Module/Settings.php:1091
 msgid "You receive a private message"
 msgstr "Du mottar en privat melding"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Code/Module/Settings.php:1092
 msgid "You receive a friend suggestion"
 msgstr "Du mottok et venneforslag"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Code/Module/Settings.php:1093
 msgid "You are tagged in a post"
 msgstr "Du merkes i et innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Code/Module/Settings.php:1094
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du ble prikket/oppildnet/og så vider i et innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Code/Module/Settings.php:1097
 msgid "Show visual notifications including:"
 msgstr "Vis visuelle varslinger om:"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Code/Module/Settings.php:1099
 msgid "Unseen grid activity"
 msgstr "Usett nettverksaktivitet"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Code/Module/Settings.php:1100
 msgid "Unseen channel activity"
 msgstr "Usett kanalaktivitet"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Code/Module/Settings.php:1101
 msgid "Unseen private messages"
 msgstr "Usette private meldinger"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Code/Module/Settings.php:1101
+#: ../../Code/Module/Settings.php:1106
+#: ../../Code/Module/Settings.php:1107
+#: ../../Code/Module/Settings.php:1108
 msgid "Recommended"
 msgstr "Anbefalt"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Code/Module/Settings.php:1102
 msgid "Upcoming events"
 msgstr "Kommende hendelser"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Code/Module/Settings.php:1103
 msgid "Events today"
 msgstr "Hendelser idag"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Code/Module/Settings.php:1104
 msgid "Upcoming birthdays"
 msgstr "Kommende fødselsdager"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Code/Module/Settings.php:1104
 msgid "Not available in all themes"
 msgstr "Ikke tilgjengelig i alle temaer"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Code/Module/Settings.php:1105
 msgid "System (personal) notifications"
 msgstr "System (personlige) varslinger"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Code/Module/Settings.php:1106
 msgid "System info messages"
 msgstr "System infomeldinger"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Code/Module/Settings.php:1107
 msgid "System critical alerts"
 msgstr "System kritiske varsel"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Code/Module/Settings.php:1108
 msgid "New connections"
 msgstr "Nye forbindelser"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Code/Module/Settings.php:1109
 msgid "System Registrations"
 msgstr "Systemregistreringer"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Code/Module/Settings.php:1110
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Vis også nye vegginnlegg, private meldinger og forbindelser under Varsler"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Code/Module/Settings.php:1112
 msgid "Notify me of events this many days in advance"
 msgstr "Varsle meg om hendelser dette antall dager på forhånd"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Code/Module/Settings.php:1112
 msgid "Must be greater than 0"
 msgstr "Må være større enn 0"
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Code/Module/Settings.php:1114
 msgid "Advanced Account/Page Type Settings"
 msgstr "Avanserte innstillinger for konto/sidetype"
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Code/Module/Settings.php:1115
 msgid "Change the behaviour of this account for special situations"
 msgstr "Endre oppførselen til denne kontoen i spesielle situasjoner"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Code/Module/Settings.php:1118
 msgid ""
 "Please enable expert mode (in Settings > "
 "Additional features) to adjust!"
 msgstr "Vennligst skru på ekspertmodus (under Innstillinger > Ekstra funksjoner) for å justere!"
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Code/Module/Settings.php:1119
 msgid "Miscellaneous Settings"
 msgstr "Diverse innstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Code/Module/Settings.php:1120
 msgid "Default photo upload folder"
 msgstr "Standard mappe for opplasting av bilder"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Code/Module/Settings.php:1120
+#: ../../Code/Module/Settings.php:1121
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - nåværende år, %m - nåværende måned"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Code/Module/Settings.php:1121
 msgid "Default file upload folder"
 msgstr "Standard mappe for opplasting av filer"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Code/Module/Settings.php:1123
 msgid "Personal menu to display in your channel pages"
 msgstr "Personlig meny som kan vises på dine kanalsider"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Code/Module/Settings.php:1125
 msgid "Remove this channel."
 msgstr "Fjern denne kanalen."
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Code/Module/Settings.php:1126
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname Firefox Share tilbyder"
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Code/Module/Settings.php:1127
 msgid "Start calendar week on monday"
 msgstr "Start uken med mandag i kalenderen"
 
-#: ../../Zotlabs/Module/Setup.php:179
+#: ../../Code/Module/Setup.php:179
 msgid "$Projectname Server - Setup"
 msgstr "$Projectname-tjener - oppsett"
 
-#: ../../Zotlabs/Module/Setup.php:183
+#: ../../Code/Module/Setup.php:183
 msgid "Could not connect to database."
 msgstr "Fikk ikke kontakt med databasen."
 
-#: ../../Zotlabs/Module/Setup.php:187
+#: ../../Code/Module/Setup.php:187
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens skyldes SSL-sertifikatet eller DNS."
 
-#: ../../Zotlabs/Module/Setup.php:194
+#: ../../Code/Module/Setup.php:194
 msgid "Could not create table."
 msgstr "Kunne ikke lage tabellen."
 
-#: ../../Zotlabs/Module/Setup.php:199
+#: ../../Code/Module/Setup.php:199
 msgid "Your site database has been installed."
 msgstr "Databasen til ditt nettsted har blitt installert."
 
-#: ../../Zotlabs/Module/Setup.php:203
+#: ../../Code/Module/Setup.php:203
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke en databaseklient."
 
-#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Code/Module/Setup.php:204 ../../Code/Module/Setup.php:266
+#: ../../Code/Module/Setup.php:721
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Vennligst les filen \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:263
+#: ../../Code/Module/Setup.php:263
 msgid "System check"
 msgstr "Systemsjekk"
 
-#: ../../Zotlabs/Module/Setup.php:268
+#: ../../Code/Module/Setup.php:268
 msgid "Check again"
 msgstr "Sjekk igjen"
 
-#: ../../Zotlabs/Module/Setup.php:290
+#: ../../Code/Module/Setup.php:290
 msgid "Database connection"
 msgstr "Databaseforbindelse"
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Code/Module/Setup.php:291
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "For å installere $Projectname må du oppgi hvordan din database kan kontaktes."
 
-#: ../../Zotlabs/Module/Setup.php:292
+#: ../../Code/Module/Setup.php:292
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du har spørsmål om disse innstillingene."
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes, vennligst lag den før du fortsetter."
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Database Server Name"
 msgstr "Navn på databasetjener"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Default is 127.0.0.1"
 msgstr "Standard er 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Database Port"
 msgstr "Databaseport"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Communication port number - use 0 for default"
 msgstr "Kommunikasjonsportnummer - bruk 0 for standard"
 
-#: ../../Zotlabs/Module/Setup.php:299
+#: ../../Code/Module/Setup.php:299
 msgid "Database Login Name"
 msgstr "Database innloggingsnavn"
 
-#: ../../Zotlabs/Module/Setup.php:300
+#: ../../Code/Module/Setup.php:300
 msgid "Database Login Password"
 msgstr "Database innloggingspassord"
 
-#: ../../Zotlabs/Module/Setup.php:301
+#: ../../Code/Module/Setup.php:301
 msgid "Database Name"
 msgstr "Databasenavn"
 
-#: ../../Zotlabs/Module/Setup.php:302
+#: ../../Code/Module/Setup.php:302
 msgid "Database Type"
 msgstr "Databasetype"
 
-#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
+#: ../../Code/Module/Setup.php:304 ../../Code/Module/Setup.php:344
 msgid "Site administrator email address"
 msgstr "E-postadressen til administrator ved nettstedet"
 
-#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
+#: ../../Code/Module/Setup.php:304 ../../Code/Module/Setup.php:344
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Din konto sin e-postadresse må være lik denne for å kunne bruke web-administrasjonspanelet."
 
-#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
+#: ../../Code/Module/Setup.php:305 ../../Code/Module/Setup.php:346
 msgid "Website URL"
 msgstr "Nettstedets URL"
 
-#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
+#: ../../Code/Module/Setup.php:305 ../../Code/Module/Setup.php:346
 msgid "Please use SSL (https) URL if available."
 msgstr "Vennligst bruk SSL (https) URL hvis tilgjengelig."
 
-#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349
+#: ../../Code/Module/Setup.php:306 ../../Code/Module/Setup.php:349
 msgid "Please select a default timezone for your website"
 msgstr "Vennligst velg en standard tidssone for ditt nettsted"
 
-#: ../../Zotlabs/Module/Setup.php:333
+#: ../../Code/Module/Setup.php:333
 msgid "Site settings"
 msgstr "Nettstedets innstillinger"
 
-#: ../../Zotlabs/Module/Setup.php:347
+#: ../../Code/Module/Setup.php:347
 msgid "Enable $Projectname advanced features?"
 msgstr "Skru på avanserteWhat next"
 msgstr "
              Hva gjenstår
              "
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Code/Module/Setup.php:720
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "VIKTIG: Du må [manuelt] sette opp en automatisert tidfestet oppgave til bakgrunnshenteren."
 
-#: ../../Zotlabs/Module/Sharedwithme.php:98
+#: ../../Code/Module/Sharedwithme.php:98
 msgid "Files: shared with me"
 msgstr "Filer: delt med meg"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:100
+#: ../../Code/Module/Sharedwithme.php:100
 msgid "NEW"
 msgstr "NY"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
+#: ../../Code/Module/Sharedwithme.php:103
 msgid "Remove all files"
 msgstr "Fjern alle filer"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Code/Module/Sharedwithme.php:104
 msgid "Remove this file"
 msgstr "Fjern denne filen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Code/Module/Siteinfo.php:19
 #, php-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
+#: ../../Code/Module/Siteinfo.php:40
 msgid "Installed plugins/addons/apps:"
 msgstr "Installerte tilleggsfunksjoner/tillegg/apper:"
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
+#: ../../Code/Module/Siteinfo.php:53
 msgid "No installed plugins/addons/apps"
 msgstr "Ingen installerte tilleggsfunksjoner/tillegg/apper"
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
+#: ../../Code/Module/Siteinfo.php:66
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr "Dette er en $Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern."
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
+#: ../../Code/Module/Siteinfo.php:68
 msgid "Tag: "
 msgstr "Merkelapp:"
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
+#: ../../Code/Module/Siteinfo.php:70
 msgid "Last background fetch: "
 msgstr "Siste innhenting i bakgrunnen:"
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
+#: ../../Code/Module/Siteinfo.php:72
 msgid "Current load average: "
 msgstr "Gjeldende belastningsgjennomsnitt:"
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
+#: ../../Code/Module/Siteinfo.php:75
 msgid "Running at web location"
 msgstr "Kjører på webplasseringen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
+#: ../../Code/Module/Siteinfo.php:76
 msgid ""
 "Please visit hubzilla.org to learn more "
 "about $Projectname."
 msgstr "Vennligst besøk hubzilla.org for å lære mer om $Projectname."
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
+#: ../../Code/Module/Siteinfo.php:77
 msgid "Bug reports and issues: please visit"
 msgstr "Feilmeldinger og feilretting: vennligst besøk"
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
+#: ../../Code/Module/Siteinfo.php:79
 msgid "$projectname issues"
 msgstr "$projectname problemer"
 
-#: ../../Zotlabs/Module/Siteinfo.php:80
+#: ../../Code/Module/Siteinfo.php:80
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
 msgstr "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com"
 
-#: ../../Zotlabs/Module/Siteinfo.php:82
+#: ../../Code/Module/Siteinfo.php:82
 msgid "Site Administrators"
 msgstr "Nettstedsadministratorer"
 
-#: ../../Zotlabs/Module/Sources.php:37
+#: ../../Code/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr "Mislyktes med å lage kilde. Ingen kanal er valgt."
 
-#: ../../Zotlabs/Module/Sources.php:51
+#: ../../Code/Module/Sources.php:51
 msgid "Source created."
 msgstr "Kilden er laget."
 
-#: ../../Zotlabs/Module/Sources.php:64
+#: ../../Code/Module/Sources.php:64
 msgid "Source updated."
 msgstr "Kilden er oppdatert."
 
-#: ../../Zotlabs/Module/Sources.php:90
+#: ../../Code/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
+#: ../../Code/Module/Sources.php:96 ../../include/widgets.php:630
 #: ../../include/features.php:71
 msgid "Channel Sources"
 msgstr "Kanalkilder"
 
-#: ../../Zotlabs/Module/Sources.php:97
+#: ../../Code/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr "Håndtere eksterne innholdskilder til din kanal."
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+#: ../../Code/Module/Sources.php:98 ../../Code/Module/Sources.php:108
 msgid "New Source"
 msgstr "Ny kilde"
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+#: ../../Code/Module/Sources.php:109 ../../Code/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne kanalen og distribuer det i henhold til dine egne kanalinnstillinger."
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr "Bare importer innhold med disse ordene (ett ord per linje)"
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr "La stå tomt for å importere alt offentlig innhold"
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+#: ../../Code/Module/Sources.php:111 ../../Code/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "Kanalnavn"
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+#: ../../Code/Module/Sources.php:133 ../../Code/Module/Sources.php:161
 msgid "Source not found."
 msgstr "Kilden ble ikke funnet."
 
-#: ../../Zotlabs/Module/Sources.php:140
+#: ../../Code/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "Endre kilde"
 
-#: ../../Zotlabs/Module/Sources.php:141
+#: ../../Code/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "Slett kilde"
 
-#: ../../Zotlabs/Module/Sources.php:169
+#: ../../Code/Module/Sources.php:169
 msgid "Source removed"
 msgstr "Kilden er fjernet"
 
-#: ../../Zotlabs/Module/Sources.php:171
+#: ../../Code/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr "Ikke i stand til å fjerne kilde."
 
-#: ../../Zotlabs/Module/Subthread.php:118
+#: ../../Code/Module/Subthread.php:118
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s følger %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Subthread.php:120
+#: ../../Code/Module/Subthread.php:120
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s stopped å følge %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Code/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "Ingen forslag tilgjengelige. Hvis dette er et nytt nettsted, vennligst prøv igjen om 24 timer."
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149
+#: ../../Code/Module/Suggest.php:58 ../../include/widgets.php:149
 msgid "Ignore/Hide"
 msgstr "Ignorer/Skjul"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
+#: ../../Code/Module/Tagger.php:55 ../../include/bbcode.php:256
 msgid "post"
 msgstr "innlegg"
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
+#: ../../Code/Module/Tagger.php:57 ../../include/text.php:1948
 #: ../../include/conversation.php:150
 msgid "comment"
 msgstr "kommentar"
 
-#: ../../Zotlabs/Module/Tagger.php:100
+#: ../../Code/Module/Tagger.php:100
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s merket %3$s til %2$s med %4$s"
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr "Merkelapp fjernet"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr "Fjern merkelapp fra element"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr "Velg merkelapp å fjerne:"
 
-#: ../../Zotlabs/Module/Thing.php:114
+#: ../../Code/Module/Thing.php:114
 msgid "Thing updated"
 msgstr "Tingen er oppdatert"
 
-#: ../../Zotlabs/Module/Thing.php:166
+#: ../../Code/Module/Thing.php:166
 msgid "Object store: failed"
 msgstr "Objektlagring: mislyktes"
 
-#: ../../Zotlabs/Module/Thing.php:170
+#: ../../Code/Module/Thing.php:170
 msgid "Thing added"
 msgstr "Ting lagt til"
 
-#: ../../Zotlabs/Module/Thing.php:196
+#: ../../Code/Module/Thing.php:196
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Thing.php:259
+#: ../../Code/Module/Thing.php:259
 msgid "Show Thing"
 msgstr "Vis ting"
 
-#: ../../Zotlabs/Module/Thing.php:266
+#: ../../Code/Module/Thing.php:266
 msgid "item not found."
 msgstr "element ble ikke funnet."
 
-#: ../../Zotlabs/Module/Thing.php:299
+#: ../../Code/Module/Thing.php:299
 msgid "Edit Thing"
 msgstr "Endre ting"
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+#: ../../Code/Module/Thing.php:301 ../../Code/Module/Thing.php:351
 msgid "Select a profile"
 msgstr "Velg en profil"
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+#: ../../Code/Module/Thing.php:305 ../../Code/Module/Thing.php:354
 msgid "Post an activity"
 msgstr "Legg inn en aktivitet"
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+#: ../../Code/Module/Thing.php:305 ../../Code/Module/Thing.php:354
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Sender bare til seere av den aktuelle profilen"
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+#: ../../Code/Module/Thing.php:307 ../../Code/Module/Thing.php:356
 msgid "Name of thing e.g. something"
 msgstr "Navn på ting for eksempel noe"
 
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+#: ../../Code/Module/Thing.php:309 ../../Code/Module/Thing.php:357
 msgid "URL of thing (optional)"
 msgstr "URL til ting (valgfritt)"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:358
 msgid "URL for photo of thing (optional)"
 msgstr "URL til bilde av ting (valgfritt)"
 
-#: ../../Zotlabs/Module/Thing.php:349
+#: ../../Code/Module/Thing.php:349
 msgid "Add Thing to your Profile"
 msgstr "Legg til ting i din profil"
 
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+#: ../../Code/Module/Uexport.php:55 ../../Code/Module/Uexport.php:56
 msgid "Export Channel"
 msgstr "Eksporter kanal"
 
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Code/Module/Uexport.php:57
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet."
 
-#: ../../Zotlabs/Module/Uexport.php:58
+#: ../../Code/Module/Uexport.php:58
 msgid "Export Content"
 msgstr "Eksporter innhold"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Code/Module/Uexport.php:59
 msgid ""
 "Export your channel information and recent content to a JSON backup that can"
 " be restored or imported to another server hub. This backs up all of your "
@@ -6187,11 +6187,11 @@ msgid ""
 " this download to begin."
 msgstr "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner."
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Code/Module/Uexport.php:60
 msgid "Export your posts from a given year."
 msgstr "Eksporter dine innlegg fra et bestemt år"
 
-#: ../../Zotlabs/Module/Uexport.php:62
+#: ../../Code/Module/Uexport.php:62
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -6199,21 +6199,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde."
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Code/Module/Uexport.php:63
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr "For å velge alle innlegg for et gitt år, slik som iår, besøk %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:64
+#: ../../Code/Module/Uexport.php:64
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Code/Module/Uexport.php:65
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting %2$s på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først)."
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Code/Module/Viewconnections.php:62
 msgid "No connections."
 msgstr "Ingen forbindelser."
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Code/Module/Viewconnections.php:75
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besøk %s sin profil [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Code/Module/Viewconnections.php:104
 msgid "View Connections"
 msgstr "Vis forbindelser"
 
-#: ../../Zotlabs/Module/Viewsrc.php:44
+#: ../../Code/Module/Viewsrc.php:44
 msgid "Source of Item"
 msgstr "Kilde til element"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
+#: ../../Code/Module/Webpages.php:184 ../../Code/Lib/Apps.php:217
 #: ../../include/nav.php:106 ../../include/conversation.php:1685
 msgid "Webpages"
 msgstr "Websider"
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
+#: ../../Code/Module/Webpages.php:195 ../../include/page_widgets.php:41
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
+#: ../../Code/Module/Webpages.php:196 ../../include/page_widgets.php:42
 msgid "Page Link"
 msgstr "Sidelenke"
 
-#: ../../Zotlabs/Module/Webpages.php:197
+#: ../../Code/Module/Webpages.php:197
 msgid "Page Title"
 msgstr "Sidetittel"
 
-#: ../../Zotlabs/Module/Xchan.php:10
+#: ../../Code/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr "Xchan oppslag"
 
-#: ../../Zotlabs/Module/Xchan.php:13
+#: ../../Code/Module/Xchan.php:13
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Slå opp xchan som begynner med (eller webbie):"
 
-#: ../../Zotlabs/Lib/Apps.php:204
+#: ../../Code/Lib/Apps.php:204
 msgid "Site Admin"
 msgstr "Nettstedsadministrator"
 
-#: ../../Zotlabs/Lib/Apps.php:205
+#: ../../Code/Lib/Apps.php:205
 msgid "Bug Report"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:206
+#: ../../Code/Lib/Apps.php:206
 msgid "View Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:207
+#: ../../Code/Lib/Apps.php:207
 msgid "My Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:209
+#: ../../Code/Lib/Apps.php:209
 msgid "Firefox Share"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:210
+#: ../../Code/Lib/Apps.php:210
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
+#: ../../Code/Lib/Apps.php:211 ../../include/features.php:89
 msgid "Suggest Channels"
 msgstr "Foreslå kanaler"
 
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
+#: ../../Code/Lib/Apps.php:212 ../../include/nav.php:110
 #: ../../boot.php:1703
 msgid "Login"
 msgstr "Logg inn"
 
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
+#: ../../Code/Lib/Apps.php:214 ../../include/nav.php:179
 msgid "Grid"
 msgstr "Nett"
 
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
+#: ../../Code/Lib/Apps.php:218 ../../include/nav.php:182
 msgid "Channel Home"
 msgstr "Kanalhjem"
 
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
+#: ../../Code/Lib/Apps.php:221 ../../include/nav.php:201
 #: ../../include/conversation.php:1649 ../../include/conversation.php:1652
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
+#: ../../Code/Lib/Apps.php:222 ../../include/nav.php:167
 msgid "Directory"
 msgstr "Katalog"
 
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
+#: ../../Code/Lib/Apps.php:224 ../../include/nav.php:193
 msgid "Mail"
 msgstr "Melding"
 
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
+#: ../../Code/Lib/Apps.php:227 ../../include/nav.php:96
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../Zotlabs/Lib/Apps.php:229
+#: ../../Code/Lib/Apps.php:229
 msgid "Probe"
 msgstr "Undersøk"
 
-#: ../../Zotlabs/Lib/Apps.php:230
+#: ../../Code/Lib/Apps.php:230
 msgid "Suggest"
 msgstr "Forreslå"
 
-#: ../../Zotlabs/Lib/Apps.php:231
+#: ../../Code/Lib/Apps.php:231
 msgid "Random Channel"
 msgstr "Tilfeldig kanal"
 
-#: ../../Zotlabs/Lib/Apps.php:232
+#: ../../Code/Lib/Apps.php:232
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
+#: ../../Code/Lib/Apps.php:233 ../../include/widgets.php:1386
 msgid "Features"
 msgstr "Funksjoner"
 
-#: ../../Zotlabs/Lib/Apps.php:235
+#: ../../Code/Lib/Apps.php:235
 msgid "Post"
 msgstr "Innlegg"
 
-#: ../../Zotlabs/Lib/Apps.php:335
+#: ../../Code/Lib/Apps.php:335
 msgid "Purchase"
 msgstr "Kjøp"
 
-#: ../../Zotlabs/Lib/Chatroom.php:27
+#: ../../Code/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr "Mangler romnavn"
 
-#: ../../Zotlabs/Lib/Chatroom.php:36
+#: ../../Code/Lib/Chatroom.php:36
 msgid "Duplicate room name"
 msgstr "Duplikat romnavn"
 
-#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+#: ../../Code/Lib/Chatroom.php:86 ../../Code/Lib/Chatroom.php:94
 msgid "Invalid room specifier."
 msgstr "Ugyldig rom-spesifisering"
 
-#: ../../Zotlabs/Lib/Chatroom.php:126
+#: ../../Code/Lib/Chatroom.php:126
 msgid "Room not found."
 msgstr "Rommet ble ikke funnet."
 
-#: ../../Zotlabs/Lib/Chatroom.php:147
+#: ../../Code/Lib/Chatroom.php:147
 msgid "Room is full"
 msgstr "Rommet er fullt"
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Code/Lib/Enotify.php:60 ../../include/network.php:1823
 msgid "$Projectname Notification"
 msgstr "$Projectname varsling"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Code/Lib/Enotify.php:61 ../../include/network.php:1824
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Code/Lib/Enotify.php:63 ../../include/network.php:1826
 msgid "Thank You,"
 msgstr "Tusen takk,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Code/Lib/Enotify.php:65 ../../include/network.php:1828
 #, php-format
 msgid "%s Administrator"
 msgstr "%s administrator"
 
-#: ../../Zotlabs/Lib/Enotify.php:100
+#: ../../Code/Lib/Enotify.php:100
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: ../../Zotlabs/Lib/Enotify.php:104
+#: ../../Code/Lib/Enotify.php:104
 #, php-format
 msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr "[Hubzilla:Notify] Ny melding mottatt hos %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:106
+#: ../../Code/Lib/Enotify.php:106
 #, php-format
 msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr "%1$s, %2$s sendte deg en ny privat melding på %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:107
+#: ../../Code/Lib/Enotify.php:107
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s sendte deg %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:107
+#: ../../Code/Lib/Enotify.php:107
 msgid "a private message"
 msgstr "en privat melding"
 
-#: ../../Zotlabs/Lib/Enotify.php:108
+#: ../../Code/Lib/Enotify.php:108
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Vennligst besøk %s for å se og/eller svare på dine private meldinger."
 
-#: ../../Zotlabs/Lib/Enotify.php:164
+#: ../../Code/Lib/Enotify.php:164
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s, %2$s kommenterte på [zrl=%3$s]a %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:172
+#: ../../Code/Lib/Enotify.php:172
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s, %2$s kommenterte på [zrl=%3$s]%4$s's %5$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:181
+#: ../../Code/Lib/Enotify.php:181
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s kommenterte på [zrl=%3$s]din %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:192
+#: ../../Code/Lib/Enotify.php:192
 #, php-format
 msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Hubzilla:Notify] Kommentar til samtale #%1$d av %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:193
+#: ../../Code/Lib/Enotify.php:193
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr "%1$s, %2$s kommenterte på et element eller en samtale du følger"
 
-#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211
-#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255
-#: ../../Zotlabs/Lib/Enotify.php:269
+#: ../../Code/Lib/Enotify.php:196 ../../Code/Lib/Enotify.php:211
+#: ../../Code/Lib/Enotify.php:237 ../../Code/Lib/Enotify.php:255
+#: ../../Code/Lib/Enotify.php:269
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Vennligst besøk %s for å se og/eller svare i samtalen"
 
-#: ../../Zotlabs/Lib/Enotify.php:202
+#: ../../Code/Lib/Enotify.php:202
 #, php-format
 msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr "[Hubzilla:Notify] %s skrev et innlegg på din profilvegg"
 
-#: ../../Zotlabs/Lib/Enotify.php:204
+#: ../../Code/Lib/Enotify.php:204
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr "%1$s, %2$s skrev et innlegg på din profilvegg på %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:206
+#: ../../Code/Lib/Enotify.php:206
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr "%1$s, %2$s skrev et innlegg på [zrl=%3$s]din vegg[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:230
+#: ../../Code/Lib/Enotify.php:230
 #, php-format
 msgid "[Hubzilla:Notify] %s tagged you"
 msgstr "[Hubzilla:Notify] %s merket deg"
 
-#: ../../Zotlabs/Lib/Enotify.php:231
+#: ../../Code/Lib/Enotify.php:231
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr "%1$s, %2$s merket deg på %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../Code/Lib/Enotify.php:232
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]merket deg[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:244
+#: ../../Code/Lib/Enotify.php:244
 #, php-format
 msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr "[Hubzilla:Notify] %1$s prikket deg"
 
-#: ../../Zotlabs/Lib/Enotify.php:245
+#: ../../Code/Lib/Enotify.php:245
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s dyttet deg på %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:246
+#: ../../Code/Lib/Enotify.php:246
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]dyttet deg[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:262
+#: ../../Code/Lib/Enotify.php:262
 #, php-format
 msgid "[Hubzilla:Notify] %s tagged your post"
 msgstr "[Hubzilla:Notify] %s merket ditt innlegg"
 
-#: ../../Zotlabs/Lib/Enotify.php:263
+#: ../../Code/Lib/Enotify.php:263
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr "%1$s, %2$s merket ditt innlegg på %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:264
+#: ../../Code/Lib/Enotify.php:264
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s merket [zrl=%3$s]ditt innlegg[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:276
+#: ../../Code/Lib/Enotify.php:276
 msgid "[Hubzilla:Notify] Introduction received"
 msgstr "[Hubzilla:Notify] Introduksjon mottatt"
 
-#: ../../Zotlabs/Lib/Enotify.php:277
+#: ../../Code/Lib/Enotify.php:277
 #, php-format
 msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr "%1$s, du har mottatt en ny forespørsel om forbindelse fra '%2$s' hos %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:278
+#: ../../Code/Lib/Enotify.php:278
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr "%1$s, du mottok [zrl=%2$s]en ny forespørsel om forbindelse[/zrl] fra %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301
+#: ../../Code/Lib/Enotify.php:282 ../../Code/Lib/Enotify.php:301
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Du kan besøke profilen deres på %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:284
+#: ../../Code/Lib/Enotify.php:284
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Vennligst besøk %s for å godkjenne eller avslå forespørselen om forbindelse."
 
-#: ../../Zotlabs/Lib/Enotify.php:291
+#: ../../Code/Lib/Enotify.php:291
 msgid "[Hubzilla:Notify] Friend suggestion received"
 msgstr "[Hubzilla:Notify] Venneforslag mottatt"
 
-#: ../../Zotlabs/Lib/Enotify.php:292
+#: ../../Code/Lib/Enotify.php:292
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr "%1$s, du har mottatt en venneforespørsel fra '%2$s' hos %3$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:293
+#: ../../Code/Lib/Enotify.php:293
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, du har mottatt [zrl=%2$s]et venneforslaget[/zrl] angående %3$s fra %4$s. "
 
-#: ../../Zotlabs/Lib/Enotify.php:299
+#: ../../Code/Lib/Enotify.php:299
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../../Zotlabs/Lib/Enotify.php:300
+#: ../../Code/Lib/Enotify.php:300
 msgid "Photo:"
 msgstr "Bilde:"
 
-#: ../../Zotlabs/Lib/Enotify.php:303
+#: ../../Code/Lib/Enotify.php:303
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Vennligst besøk %s for å godkjenne eller avslå dette forslaget."
 
-#: ../../Zotlabs/Lib/Enotify.php:518
+#: ../../Code/Lib/Enotify.php:518
 msgid "[Hubzilla:Notify]"
 msgstr "[Hubzilla:Notify]"
 
-#: ../../Zotlabs/Lib/Enotify.php:667
+#: ../../Code/Lib/Enotify.php:667
 msgid "created a new post"
 msgstr "laget et nytt innlegg"
 
-#: ../../Zotlabs/Lib/Enotify.php:668
+#: ../../Code/Lib/Enotify.php:668
 #, php-format
 msgid "commented on %s's post"
 msgstr "kommenterte på %s sitt innlegg"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Code/Lib/ThreadItem.php:95 ../../include/conversation.php:664
 msgid "Private Message"
 msgstr "Privat melding"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Code/Lib/ThreadItem.php:132 ../../include/conversation.php:656
 msgid "Select"
 msgstr "Velg"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:136
+#: ../../Code/Lib/ThreadItem.php:136
 msgid "Save to Folder"
 msgstr "Lagre i mappe"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
+#: ../../Code/Lib/ThreadItem.php:157
 msgid "I will attend"
 msgstr "Jeg vil delta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
+#: ../../Code/Lib/ThreadItem.php:157
 msgid "I will not attend"
 msgstr "Jeg deltar ikke"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
+#: ../../Code/Lib/ThreadItem.php:157
 msgid "I might attend"
 msgstr "Jeg vil kanskje delta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
+#: ../../Code/Lib/ThreadItem.php:167
 msgid "I agree"
 msgstr "Jeg er enig"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
+#: ../../Code/Lib/ThreadItem.php:167
 msgid "I disagree"
 msgstr "Jeg er uenig"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
+#: ../../Code/Lib/ThreadItem.php:167
 msgid "I abstain"
 msgstr "Jeg avstår"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:218
+#: ../../Code/Lib/ThreadItem.php:218
 msgid "Add Star"
 msgstr "Legg til stjerne"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:219
+#: ../../Code/Lib/ThreadItem.php:219
 msgid "Remove Star"
 msgstr "Fjern stjerne"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:220
+#: ../../Code/Lib/ThreadItem.php:220
 msgid "Toggle Star Status"
 msgstr "Skru av og på stjernestatus"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:224
+#: ../../Code/Lib/ThreadItem.php:224
 msgid "starred"
 msgstr "stjernemerket"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Code/Lib/ThreadItem.php:234 ../../include/conversation.php:671
 msgid "Message signature validated"
 msgstr "Innleggets signatur er bekreftet"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Code/Lib/ThreadItem.php:235 ../../include/conversation.php:672
 msgid "Message signature incorrect"
 msgstr "Innleggets signatur er feil"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:243
+#: ../../Code/Lib/ThreadItem.php:243
 msgid "Add Tag"
 msgstr "Legg til merkelapp"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:261 ../../include/taxonomy.php:316
+#: ../../Code/Lib/ThreadItem.php:261 ../../include/taxonomy.php:316
 msgid "like"
 msgstr "liker"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:262 ../../include/taxonomy.php:317
+#: ../../Code/Lib/ThreadItem.php:262 ../../include/taxonomy.php:317
 msgid "dislike"
 msgstr "misliker"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:266
+#: ../../Code/Lib/ThreadItem.php:266
 msgid "Share This"
 msgstr "Del dette"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:266
+#: ../../Code/Lib/ThreadItem.php:266
 msgid "share"
 msgstr "del"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:275
+#: ../../Code/Lib/ThreadItem.php:275
 msgid "Delivery Report"
 msgstr "Leveringsrapport"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:293
+#: ../../Code/Lib/ThreadItem.php:293
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d kommentar"
 msgstr[1] "%d kommentarer"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:322 ../../Zotlabs/Lib/ThreadItem.php:323
+#: ../../Code/Lib/ThreadItem.php:322 ../../Code/Lib/ThreadItem.php:323
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Vis %s sin profil - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:326
+#: ../../Code/Lib/ThreadItem.php:326
 msgid "to"
 msgstr "til"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:327
+#: ../../Code/Lib/ThreadItem.php:327
 msgid "via"
 msgstr "via"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:328
+#: ../../Code/Lib/ThreadItem.php:328
 msgid "Wall-to-Wall"
 msgstr "vegg-til-vegg"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:329
+#: ../../Code/Lib/ThreadItem.php:329
 msgid "via Wall-To-Wall:"
 msgstr "via vegg-til-vegg:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Code/Lib/ThreadItem.php:341 ../../include/conversation.php:719
 #, php-format
 msgid "from %s"
 msgstr "fra %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Code/Lib/ThreadItem.php:344 ../../include/conversation.php:722
 #, php-format
 msgid "last edited: %s"
 msgstr "sist endret: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Code/Lib/ThreadItem.php:345 ../../include/conversation.php:723
 #, php-format
 msgid "Expires: %s"
 msgstr "Utløper: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:370
+#: ../../Code/Lib/ThreadItem.php:370
 msgid "Save Bookmarks"
 msgstr "Lagre bokmerker"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:371
+#: ../../Code/Lib/ThreadItem.php:371
 msgid "Add to Calendar"
 msgstr "Legg til i kalender"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:380
+#: ../../Code/Lib/ThreadItem.php:380
 msgid "Mark all seen"
 msgstr "Merk alle som sett"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
+#: ../../Code/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
 msgid "[+] show all"
 msgstr "[+] Vis alle"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Code/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
 msgid "Bold"
 msgstr "Uthevet"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Code/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Code/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
 msgid "Underline"
 msgstr "Understreket"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Code/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
 msgid "Quote"
 msgstr "Sitat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Code/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
 msgid "Code"
 msgstr "Kode"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:716
+#: ../../Code/Lib/ThreadItem.php:716
 msgid "Image"
 msgstr "Bilde"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:717
+#: ../../Code/Lib/ThreadItem.php:717
 msgid "Insert Link"
 msgstr "Sett inn lenke"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:718
+#: ../../Code/Lib/ThreadItem.php:718
 msgid "Video"
 msgstr "Video"
 
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index d66464c99..3bc0a732b 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -20,143 +20,143 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Code/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
 msgstr "Kan mijn kanaal en berichten bekijken"
 
-#: ../../Zotlabs/Access/Permissions.php:57
+#: ../../Code/Access/Permissions.php:57
 msgid "Can send me their channel stream and posts"
 msgstr "Kan mij de inhoud van hun kanaal en berichten sturen"
 
-#: ../../Zotlabs/Access/Permissions.php:58
+#: ../../Code/Access/Permissions.php:58
 msgid "Can view my default channel profile"
 msgstr "Kan mijn standaard kanaalprofiel bekijken"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Code/Access/Permissions.php:59
 msgid "Can view my connections"
 msgstr "Kan een lijst met mijn connecties bekijken"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Code/Access/Permissions.php:60
 msgid "Can view my file storage and photos"
 msgstr "Kan mijn foto's en andere bestanden bekijken"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Code/Access/Permissions.php:61
 msgid "Can upload/modify my file storage and photos"
 msgstr "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen"
 
-#: ../../Zotlabs/Access/Permissions.php:62
+#: ../../Code/Access/Permissions.php:62
 msgid "Can view my channel webpages"
 msgstr "Kan de webpagina's van mijn kanaal bekijken"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Code/Access/Permissions.php:63
 msgid "Can view my wiki pages"
 msgstr "Kan mijn wiki-pagina's bekijken"
 
-#: ../../Zotlabs/Access/Permissions.php:64
+#: ../../Code/Access/Permissions.php:64
 msgid "Can create/edit my channel webpages"
 msgstr "Kan wegpagina's van mijn kanaal aanmaken en bewerken"
 
-#: ../../Zotlabs/Access/Permissions.php:65
+#: ../../Code/Access/Permissions.php:65
 msgid "Can write to my wiki pages"
 msgstr "Kan mijn wiki-pagina's bewerken"
 
-#: ../../Zotlabs/Access/Permissions.php:66
+#: ../../Code/Access/Permissions.php:66
 msgid "Can post on my channel (wall) page"
 msgstr "Kan een bericht in mijn kanaal plaatsen"
 
-#: ../../Zotlabs/Access/Permissions.php:67
+#: ../../Code/Access/Permissions.php:67
 msgid "Can comment on or like my posts"
 msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden"
 
-#: ../../Zotlabs/Access/Permissions.php:68
+#: ../../Code/Access/Permissions.php:68
 msgid "Can send me private mail messages"
 msgstr "Kan mij privéberichten sturen"
 
-#: ../../Zotlabs/Access/Permissions.php:69
+#: ../../Code/Access/Permissions.php:69
 msgid "Can like/dislike profiles and profile things"
 msgstr "Kan profielen en profieldingen leuk en niet leuk vinden "
 
-#: ../../Zotlabs/Access/Permissions.php:70
+#: ../../Code/Access/Permissions.php:70
 msgid "Can forward to all my channel connections via @+ mentions in posts"
 msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"
 
-#: ../../Zotlabs/Access/Permissions.php:71
+#: ../../Code/Access/Permissions.php:71
 msgid "Can chat with me"
 msgstr "Kan met mij chatten"
 
-#: ../../Zotlabs/Access/Permissions.php:72
+#: ../../Code/Access/Permissions.php:72
 msgid "Can source my public posts in derived channels"
 msgstr "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"
 
-#: ../../Zotlabs/Access/Permissions.php:73
+#: ../../Code/Access/Permissions.php:73
 msgid "Can administer my channel"
 msgstr "Kan mijn kanaal beheren"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:283
+#: ../../Code/Access/PermissionRoles.php:283
 msgid "Social Networking"
 msgstr "Sociaal netwerk"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:284
+#: ../../Code/Access/PermissionRoles.php:284
 msgid "Social - Federation"
 msgstr "Sociaal - Federatie"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:285
+#: ../../Code/Access/PermissionRoles.php:285
 msgid "Social - Mostly Public"
 msgstr "Sociaal - Vrijwel alles openbaar"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:286
+#: ../../Code/Access/PermissionRoles.php:286
 msgid "Social - Restricted"
 msgstr "Sociaal - Beperkt zichtbaar"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
+#: ../../Code/Access/PermissionRoles.php:287
 msgid "Social - Private"
 msgstr "Sociaal - Verborgen kanaal"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
+#: ../../Code/Access/PermissionRoles.php:290
 msgid "Community Forum"
 msgstr "Groepsforum"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
+#: ../../Code/Access/PermissionRoles.php:291
 msgid "Forum - Mostly Public"
 msgstr "Forum - Vrijwel alles openbaar"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:292
+#: ../../Code/Access/PermissionRoles.php:292
 msgid "Forum - Restricted"
 msgstr "Forum - Beperkt zichtbaar"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:293
+#: ../../Code/Access/PermissionRoles.php:293
 msgid "Forum - Private"
 msgstr "Forum - Verborgen kanaal"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
+#: ../../Code/Access/PermissionRoles.php:296
 msgid "Feed Republish"
 msgstr "Feed herpubliceren"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
+#: ../../Code/Access/PermissionRoles.php:297
 msgid "Feed - Mostly Public"
 msgstr "Feed - Vrijwel alles openbaar"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:298
+#: ../../Code/Access/PermissionRoles.php:298
 msgid "Feed - Restricted"
 msgstr "Feed - Beperkt zichtbaar"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
+#: ../../Code/Access/PermissionRoles.php:301
 msgid "Special Purpose"
 msgstr "Speciaal doel"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
+#: ../../Code/Access/PermissionRoles.php:302
 msgid "Special - Celebrity/Soapbox"
 msgstr "Speciaal - Beroemdheid/alleen volgen"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:303
+#: ../../Code/Access/PermissionRoles.php:303
 msgid "Special - Group Repository"
 msgstr "Speciaal - Groepsopslag"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144
-#: ../../Zotlabs/Module/Settings/Channel.php:479
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49
+#: ../../Code/Access/PermissionRoles.php:306
+#: ../../Code/Module/Cdav.php:1182 ../../Code/Module/New_channel.php:144
+#: ../../Code/Module/Settings/Channel.php:479
+#: ../../Code/Module/Connedit.php:918 ../../Code/Module/Profiles.php:795
+#: ../../Code/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:697
@@ -164,77 +164,77 @@ msgstr "Speciaal - Groepsopslag"
 msgid "Other"
 msgstr "Anders"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
+#: ../../Code/Access/PermissionRoles.php:307
 msgid "Custom/Expert Mode"
 msgstr "Expertmodus/handmatig aanpassen"
 
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29
-#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197
+#: ../../Code/Module/Blocks.php:33 ../../Code/Module/Articles.php:29
+#: ../../Code/Module/Editlayout.php:31 ../../Code/Module/Connect.php:17
+#: ../../Code/Module/Achievements.php:15 ../../Code/Module/Hcard.php:12
+#: ../../Code/Module/Editblock.php:31 ../../Code/Module/Profile.php:20
+#: ../../Code/Module/Layouts.php:31 ../../Code/Module/Editwebpage.php:32
+#: ../../Code/Module/Cards.php:33 ../../Code/Module/Webpages.php:33
+#: ../../Code/Module/Filestorage.php:51 ../../include/channel.php:1197
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:110
-#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Article_edit.php:51
-#: ../../Zotlabs/Module/New_channel.php:91
-#: ../../Zotlabs/Module/New_channel.php:116
-#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
-#: ../../Zotlabs/Module/Moderate.php:13
-#: ../../Zotlabs/Module/Settings/Features.php:38
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280
-#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
-#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
-#: ../../Zotlabs/Module/Profile_photo.php:302
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229
-#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
-#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107
-#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118
-#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:74
-#: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
-#: ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Cover_photo.php:281
-#: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Filestorage.php:15
-#: ../../Zotlabs/Module/Filestorage.php:70
-#: ../../Zotlabs/Module/Filestorage.php:85
-#: ../../Zotlabs/Module/Filestorage.php:117 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Card_edit.php:51
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
+#: ../../Code/Module/Blocks.php:73 ../../Code/Module/Blocks.php:80
+#: ../../Code/Module/Invite.php:17 ../../Code/Module/Invite.php:94
+#: ../../Code/Module/Articles.php:68 ../../Code/Module/Editlayout.php:67
+#: ../../Code/Module/Editlayout.php:90 ../../Code/Module/Channel.php:110
+#: ../../Code/Module/Channel.php:248 ../../Code/Module/Channel.php:288
+#: ../../Code/Module/Settings.php:59 ../../Code/Module/Locs.php:87
+#: ../../Code/Module/Mitem.php:115 ../../Code/Module/Events.php:271
+#: ../../Code/Module/Appman.php:87 ../../Code/Module/Regmod.php:21
+#: ../../Code/Module/Article_edit.php:51
+#: ../../Code/Module/New_channel.php:91
+#: ../../Code/Module/New_channel.php:116
+#: ../../Code/Module/Sharedwithme.php:16 ../../Code/Module/Setup.php:209
+#: ../../Code/Module/Moderate.php:13
+#: ../../Code/Module/Settings/Features.php:38
+#: ../../Code/Module/Achievements.php:34 ../../Code/Module/Thing.php:280
+#: ../../Code/Module/Thing.php:300 ../../Code/Module/Thing.php:341
+#: ../../Code/Module/Api.php:24 ../../Code/Module/Editblock.php:67
+#: ../../Code/Module/Profile.php:85 ../../Code/Module/Profile.php:101
+#: ../../Code/Module/Mood.php:116 ../../Code/Module/Connections.php:29
+#: ../../Code/Module/Viewsrc.php:19 ../../Code/Module/Bookmarks.php:64
+#: ../../Code/Module/Photos.php:69 ../../Code/Module/Wiki.php:50
+#: ../../Code/Module/Wiki.php:273 ../../Code/Module/Wiki.php:404
+#: ../../Code/Module/Pdledit.php:29 ../../Code/Module/Poke.php:149
+#: ../../Code/Module/Profile_photo.php:302
+#: ../../Code/Module/Profile_photo.php:315
+#: ../../Code/Module/Authtest.php:16 ../../Code/Module/Item.php:229
+#: ../../Code/Module/Item.php:246 ../../Code/Module/Item.php:256
+#: ../../Code/Module/Item.php:1106 ../../Code/Module/Page.php:34
+#: ../../Code/Module/Page.php:133 ../../Code/Module/Connedit.php:389
+#: ../../Code/Module/Chat.php:100 ../../Code/Module/Chat.php:105
+#: ../../Code/Module/Menu.php:78 ../../Code/Module/Layouts.php:71
+#: ../../Code/Module/Layouts.php:78 ../../Code/Module/Layouts.php:89
+#: ../../Code/Module/Defperms.php:173 ../../Code/Module/Group.php:13
+#: ../../Code/Module/Profiles.php:198 ../../Code/Module/Profiles.php:635
+#: ../../Code/Module/Editwebpage.php:68
+#: ../../Code/Module/Editwebpage.php:89
+#: ../../Code/Module/Editwebpage.php:107
+#: ../../Code/Module/Editwebpage.php:121 ../../Code/Module/Manage.php:10
+#: ../../Code/Module/Cards.php:72 ../../Code/Module/Webpages.php:118
+#: ../../Code/Module/Block.php:24 ../../Code/Module/Block.php:74
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Sources.php:74
+#: ../../Code/Module/Like.php:185 ../../Code/Module/Suggest.php:28
+#: ../../Code/Module/Message.php:18 ../../Code/Module/Mail.php:146
+#: ../../Code/Module/Register.php:77
+#: ../../Code/Module/Cover_photo.php:281
+#: ../../Code/Module/Cover_photo.php:294
+#: ../../Code/Module/Display.php:449 ../../Code/Module/Network.php:15
+#: ../../Code/Module/Filestorage.php:15
+#: ../../Code/Module/Filestorage.php:70
+#: ../../Code/Module/Filestorage.php:85
+#: ../../Code/Module/Filestorage.php:117 ../../Code/Module/Common.php:38
+#: ../../Code/Module/Viewconnections.php:28
+#: ../../Code/Module/Viewconnections.php:33
+#: ../../Code/Module/Service_limits.php:11
+#: ../../Code/Module/Rate.php:113 ../../Code/Module/Card_edit.php:51
+#: ../../Code/Module/Notifications.php:11
+#: ../../Code/Lib/Chatroom.php:133 ../../Code/Web/WebServer.php:123
 #: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
 #: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150
 #: ../../include/attach.php:197 ../../include/attach.php:270
@@ -247,206 +247,206 @@ msgstr "Opgevraagd profiel is niet beschikbaar"
 msgid "Permission denied."
 msgstr "Toegang geweigerd."
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
+#: ../../Code/Module/Blocks.php:97 ../../Code/Module/Blocks.php:155
+#: ../../Code/Module/Editblock.php:113
 msgid "Block Name"
 msgstr "Bloknaam"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2422
+#: ../../Code/Module/Blocks.php:154 ../../include/text.php:2422
 msgid "Blocks"
 msgstr "Blokken"
 
-#: ../../Zotlabs/Module/Blocks.php:156
+#: ../../Code/Module/Blocks.php:156
 msgid "Block Title"
 msgstr "Bloktitel"
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Code/Module/Blocks.php:157 ../../Code/Module/Menu.php:114
+#: ../../Code/Module/Layouts.php:191 ../../Code/Module/Webpages.php:251
 msgid "Created"
 msgstr "Aangemaakt"
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
+#: ../../Code/Module/Blocks.php:158 ../../Code/Module/Menu.php:115
+#: ../../Code/Module/Layouts.php:192 ../../Code/Module/Webpages.php:252
 msgid "Edited"
 msgstr "Bewerkt"
 
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239
-#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382
-#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
+#: ../../Code/Module/Blocks.php:159 ../../Code/Module/Articles.php:96
+#: ../../Code/Module/Cdav.php:1185 ../../Code/Module/New_channel.php:160
+#: ../../Code/Module/Connedit.php:921 ../../Code/Module/Menu.php:118
+#: ../../Code/Module/Layouts.php:185 ../../Code/Module/Profiles.php:798
+#: ../../Code/Module/Cards.php:100 ../../Code/Module/Webpages.php:239
+#: ../../Code/Storage/Browser.php:276 ../../Code/Storage/Browser.php:382
+#: ../../Code/Widget/Cdav.php:128 ../../Code/Widget/Cdav.php:165
 msgid "Create"
 msgstr "Aanmaken"
 
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Admin/Profs.php:175
-#: ../../Zotlabs/Module/Settings/Oauth2.php:149
-#: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:281
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202
-#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121
-#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126
-#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296
+#: ../../Code/Module/Blocks.php:160 ../../Code/Module/Editlayout.php:114
+#: ../../Code/Module/Article_edit.php:99
+#: ../../Code/Module/Admin/Profs.php:175
+#: ../../Code/Module/Settings/Oauth2.php:149
+#: ../../Code/Module/Settings/Oauth.php:150
+#: ../../Code/Module/Thing.php:266 ../../Code/Module/Editblock.php:114
+#: ../../Code/Module/Connections.php:281
+#: ../../Code/Module/Connections.php:319
+#: ../../Code/Module/Connections.php:339 ../../Code/Module/Wiki.php:202
+#: ../../Code/Module/Wiki.php:362 ../../Code/Module/Menu.php:112
+#: ../../Code/Module/Layouts.php:193
+#: ../../Code/Module/Editwebpage.php:142
+#: ../../Code/Module/Webpages.php:240 ../../Code/Module/Card_edit.php:99
+#: ../../Code/Lib/Apps.php:409 ../../Code/Lib/ThreadItem.php:121
+#: ../../Code/Storage/Browser.php:288 ../../Code/Widget/Cdav.php:126
+#: ../../Code/Widget/Cdav.php:162 ../../include/channel.php:1296
 #: ../../include/channel.php:1300 ../../include/menu.php:113
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102
-#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124
+#: ../../Code/Module/Blocks.php:161 ../../Code/Module/Photos.php:1102
+#: ../../Code/Module/Wiki.php:287 ../../Code/Module/Layouts.php:194
+#: ../../Code/Module/Webpages.php:241 ../../Code/Widget/Cdav.php:124
 #: ../../include/conversation.php:1366
 msgid "Share"
 msgstr "Delen"
 
-#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
-#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Settings/Oauth2.php:150
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:289
-#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179
-#: ../../Zotlabs/Module/Profiles.php:800
-#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:242
-#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410
-#: ../../Zotlabs/Lib/ThreadItem.php:141 ../../Zotlabs/Storage/Browser.php:289
+#: ../../Code/Module/Blocks.php:162 ../../Code/Module/Editlayout.php:138
+#: ../../Code/Module/Cdav.php:897 ../../Code/Module/Cdav.php:1187
+#: ../../Code/Module/Article_edit.php:129
+#: ../../Code/Module/Admin/Accounts.php:175
+#: ../../Code/Module/Admin/Channels.php:149
+#: ../../Code/Module/Admin/Profs.php:176
+#: ../../Code/Module/Settings/Oauth2.php:150
+#: ../../Code/Module/Settings/Oauth.php:151
+#: ../../Code/Module/Thing.php:267 ../../Code/Module/Editblock.php:139
+#: ../../Code/Module/Connections.php:289
+#: ../../Code/Module/Photos.php:1203 ../../Code/Module/Connedit.php:654
+#: ../../Code/Module/Connedit.php:923 ../../Code/Module/Group.php:179
+#: ../../Code/Module/Profiles.php:800
+#: ../../Code/Module/Editwebpage.php:167
+#: ../../Code/Module/Webpages.php:242
+#: ../../Code/Module/Card_edit.php:129 ../../Code/Lib/Apps.php:410
+#: ../../Code/Lib/ThreadItem.php:141 ../../Code/Storage/Browser.php:289
 #: ../../include/conversation.php:690 ../../include/conversation.php:733
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60
+#: ../../Code/Module/Blocks.php:166 ../../Code/Module/Events.php:694
+#: ../../Code/Module/Wiki.php:204 ../../Code/Module/Layouts.php:198
+#: ../../Code/Module/Webpages.php:246 ../../Code/Module/Pubsites.php:60
 msgid "View"
 msgstr "Tonen"
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Code/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
 msgstr "Limiet voor aantal uitnodigingen overschreden."
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Code/Module/Invite.php:53
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : Geen geldig e-mailadres."
 
-#: ../../Zotlabs/Module/Invite.php:67
+#: ../../Code/Module/Invite.php:67
 msgid "Please join us on $Projectname"
 msgstr "Uitnodiging voor $Projectname"
 
-#: ../../Zotlabs/Module/Invite.php:77
+#: ../../Code/Module/Invite.php:77
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."
 
-#: ../../Zotlabs/Module/Invite.php:82
+#: ../../Code/Module/Invite.php:82
 #: ../../addon/notifyadmin/notifyadmin.php:40
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s: Aflevering bericht mislukt."
 
-#: ../../Zotlabs/Module/Invite.php:86
+#: ../../Code/Module/Invite.php:86
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d bericht verzonden."
 msgstr[1] "%d berichten verzonden."
 
-#: ../../Zotlabs/Module/Invite.php:107
+#: ../../Code/Module/Invite.php:107
 msgid "You have no more invitations available"
 msgstr "Je hebt geen uitnodigingen meer beschikbaar"
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Code/Module/Invite.php:138
 msgid "Send invitations"
 msgstr "Uitnodigingen verzenden"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Code/Module/Invite.php:139
 msgid "Enter email addresses, one per line:"
 msgstr "Voer e-mailadressen in, één per regel:"
 
-#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285
+#: ../../Code/Module/Invite.php:140 ../../Code/Module/Mail.php:285
 msgid "Your message:"
 msgstr "Jouw bericht:"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Code/Module/Invite.php:141
 msgid "Please join my community on $Projectname."
 msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op http://hubzilla.org"
 
-#: ../../Zotlabs/Module/Invite.php:143
+#: ../../Code/Module/Invite.php:143
 msgid "You will need to supply this invitation code:"
 msgstr "Je moet deze uitnodigingscode opgeven:"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Code/Module/Invite.php:144
 msgid ""
 "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"
 
-#: ../../Zotlabs/Module/Invite.php:146
+#: ../../Code/Module/Invite.php:146
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:"
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Code/Module/Invite.php:147
 msgid "or visit"
 msgstr "of bezoek"
 
-#: ../../Zotlabs/Module/Invite.php:149
+#: ../../Code/Module/Invite.php:149
 msgid "3. Click [Connect]"
 msgstr "3. Klik op [+ Verbinden]"
 
-#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:153
-#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
-#: ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Plugins.php:438
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:296
-#: ../../Zotlabs/Module/Admin/Profs.php:178
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Security.php:104
-#: ../../Zotlabs/Module/Settings/Permcats.php:115
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-#: ../../Zotlabs/Module/Settings/Features.php:79
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Oauth2.php:84
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Featured.php:54
-#: ../../Zotlabs/Module/Settings/Display.php:192
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379
-#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082
-#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240
-#: ../../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:40
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
-#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752
-#: ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:97
+#: ../../Code/Module/Invite.php:151 ../../Code/Module/Locs.php:121
+#: ../../Code/Module/Mitem.php:243 ../../Code/Module/Events.php:493
+#: ../../Code/Module/Appman.php:153
+#: ../../Code/Module/Import_items.php:129
+#: ../../Code/Module/Setup.php:308 ../../Code/Module/Setup.php:349
+#: ../../Code/Module/Connect.php:98
+#: ../../Code/Module/Admin/Features.php:66
+#: ../../Code/Module/Admin/Plugins.php:438
+#: ../../Code/Module/Admin/Accounts.php:168
+#: ../../Code/Module/Admin/Logs.php:84
+#: ../../Code/Module/Admin/Channels.php:147
+#: ../../Code/Module/Admin/Themes.php:158
+#: ../../Code/Module/Admin/Site.php:296
+#: ../../Code/Module/Admin/Profs.php:178
+#: ../../Code/Module/Admin/Account_edit.php:74
+#: ../../Code/Module/Admin/Security.php:104
+#: ../../Code/Module/Settings/Permcats.php:115
+#: ../../Code/Module/Settings/Channel.php:495
+#: ../../Code/Module/Settings/Features.php:79
+#: ../../Code/Module/Settings/Tokens.php:168
+#: ../../Code/Module/Settings/Oauth2.php:84
+#: ../../Code/Module/Settings/Account.php:118
+#: ../../Code/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Display.php:192
+#: ../../Code/Module/Settings/Oauth.php:88
+#: ../../Code/Module/Thing.php:326 ../../Code/Module/Thing.php:379
+#: ../../Code/Module/Import.php:530 ../../Code/Module/Cal.php:345
+#: ../../Code/Module/Mood.php:139 ../../Code/Module/Photos.php:1082
+#: ../../Code/Module/Photos.php:1122 ../../Code/Module/Photos.php:1240
+#: ../../Code/Module/Wiki.php:206 ../../Code/Module/Pdledit.php:98
+#: ../../Code/Module/Poke.php:200 ../../Code/Module/Connedit.php:887
+#: ../../Code/Module/Chat.php:196 ../../Code/Module/Chat.php:242
+#: ../../Code/Module/Email_validation.php:40
+#: ../../Code/Module/Pconfig.php:107 ../../Code/Module/Defperms.php:249
+#: ../../Code/Module/Group.php:87 ../../Code/Module/Profiles.php:723
+#: ../../Code/Module/Editpost.php:85 ../../Code/Module/Sources.php:114
+#: ../../Code/Module/Sources.php:149 ../../Code/Module/Xchan.php:15
+#: ../../Code/Module/Mail.php:431 ../../Code/Module/Filestorage.php:160
+#: ../../Code/Module/Rate.php:166 ../../Code/Lib/ThreadItem.php:752
+#: ../../Code/Widget/Eventstools.php:16
+#: ../../Code/Widget/Wiki_pages.php:40
+#: ../../Code/Widget/Wiki_pages.php:97
 #: ../../view/theme/redbasic_c/php/config.php:95
 #: ../../view/theme/redbasic/php/config.php:93
 #: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275
@@ -483,393 +483,393 @@ msgstr "3. Klik op [+ Verbinden]"
 msgid "Submit"
 msgstr "Opslaan"
 
-#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191
-#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133
+#: ../../Code/Module/Articles.php:38 ../../Code/Module/Articles.php:191
+#: ../../Code/Lib/Apps.php:229 ../../include/features.php:133
 #: ../../include/nav.php:469
 msgid "Articles"
 msgstr "Artikelen"
 
-#: ../../Zotlabs/Module/Articles.php:95
+#: ../../Code/Module/Articles.php:95
 msgid "Add Article"
 msgstr "Artikel toevoegen"
 
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Article_edit.php:17
-#: ../../Zotlabs/Module/Article_edit.php:33
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Card_edit.php:17
-#: ../../Zotlabs/Module/Card_edit.php:33
+#: ../../Code/Module/Editlayout.php:79
+#: ../../Code/Module/Article_edit.php:17
+#: ../../Code/Module/Article_edit.php:33
+#: ../../Code/Module/Editblock.php:79 ../../Code/Module/Editblock.php:95
+#: ../../Code/Module/Editwebpage.php:80
+#: ../../Code/Module/Editpost.php:24 ../../Code/Module/Card_edit.php:17
+#: ../../Code/Module/Card_edit.php:33
 msgid "Item not found"
 msgstr "Item niet gevonden"
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Code/Module/Editlayout.php:128
+#: ../../Code/Module/Layouts.php:129 ../../Code/Module/Layouts.php:189
 msgid "Layout Name"
 msgstr "Naam lay-out"
 
-#: ../../Zotlabs/Module/Editlayout.php:129
-#: ../../Zotlabs/Module/Layouts.php:132
+#: ../../Code/Module/Editlayout.php:129
+#: ../../Code/Module/Layouts.php:132
 msgid "Layout Description (Optional)"
 msgstr "Lay-out-omschrijving (niet verplicht)"
 
-#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Code/Module/Editlayout.php:137
 msgid "Edit Layout"
 msgstr "Lay-out bewerken"
 
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122
+#: ../../Code/Module/Profperm.php:28 ../../Code/Module/Subthread.php:86
+#: ../../Code/Module/Import_items.php:120
+#: ../../Code/Module/Cloud.php:117 ../../Code/Module/Group.php:74
+#: ../../Code/Module/Dreport.php:10 ../../Code/Module/Dreport.php:68
+#: ../../Code/Module/Like.php:296 ../../Code/Web/WebServer.php:122
 #: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73
 #: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109
 #: ../../include/items.php:358
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+#: ../../Code/Module/Profperm.php:34 ../../Code/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr "Ongeldige profiel-identificator"
 
-#: ../../Zotlabs/Module/Profperm.php:111
+#: ../../Code/Module/Profperm.php:111
 msgid "Profile Visibility Editor"
 msgstr "Zichtbaarheid profiel "
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644
+#: ../../Code/Module/Profperm.php:113 ../../include/channel.php:1644
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Click on a contact to add or remove."
 msgstr "Klik op een connectie om deze toe te voegen of te verwijderen"
 
-#: ../../Zotlabs/Module/Profperm.php:124
+#: ../../Code/Module/Profperm.php:124
 msgid "Visible To"
 msgstr "Zichtbaar voor"
 
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:200
+#: ../../Code/Module/Profperm.php:140
+#: ../../Code/Module/Connections.php:200
 msgid "All Connections"
 msgstr "Alle connecties"
 
-#: ../../Zotlabs/Module/Cdav.php:785
+#: ../../Code/Module/Cdav.php:785
 msgid "INVALID EVENT DISMISSED!"
 msgstr "ONGELDIGE GEBEURTENIS VERWIJDERD!"
 
-#: ../../Zotlabs/Module/Cdav.php:786
+#: ../../Code/Module/Cdav.php:786
 msgid "Summary: "
 msgstr "Samenvatting: "
 
-#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787
-#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273
-#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891
+#: ../../Code/Module/Cdav.php:786 ../../Code/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:794 ../../Code/Module/Embedphotos.php:146
+#: ../../Code/Module/Photos.php:817 ../../Code/Module/Photos.php:1273
+#: ../../Code/Lib/Apps.php:754 ../../Code/Lib/Apps.php:833
+#: ../../Code/Storage/Browser.php:164 ../../Code/Widget/Portfolio.php:95
+#: ../../Code/Widget/Album.php:84 ../../addon/pubcrawl/as.php:891
 #: ../../include/conversation.php:1160
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../../Zotlabs/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:787
 msgid "Date: "
 msgstr "Datum: "
 
-#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795
+#: ../../Code/Module/Cdav.php:788 ../../Code/Module/Cdav.php:795
 msgid "Reason: "
 msgstr "Reden: "
 
-#: ../../Zotlabs/Module/Cdav.php:793
+#: ../../Code/Module/Cdav.php:793
 msgid "INVALID CARD DISMISSED!"
 msgstr "ONGELDIGE CONTACTKAART VERWIJDERD!"
 
-#: ../../Zotlabs/Module/Cdav.php:794
+#: ../../Code/Module/Cdav.php:794
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Cdav.php:868 ../../Code/Module/Events.php:460
 msgid "Event title"
 msgstr "Titel"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Events.php:466
 msgid "Start date and time"
 msgstr "Begindatum en -tijd"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Cdav.php:870
 msgid "Example: YYYY-MM-DD HH:mm"
 msgstr "Bijvoorbeeld: JJJJ-MM-DD UU:mm"
 
-#: ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:870
 msgid "End date and time"
 msgstr "Einddatum en -tijd"
 
-#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Code/Module/Cdav.php:871 ../../Code/Module/Events.php:473
+#: ../../Code/Module/Appman.php:143 ../../Code/Module/Rbmark.php:101
 #: ../../addon/rendezvous/rendezvous.php:173
 msgid "Description"
 msgstr "Omschrijving"
 
-#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
-#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
+#: ../../Code/Module/Cdav.php:872 ../../Code/Module/Locs.php:117
+#: ../../Code/Module/Events.php:475 ../../Code/Module/Profiles.php:509
+#: ../../Code/Module/Profiles.php:734 ../../Code/Module/Pubsites.php:52
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Locatie"
 
-#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689
-#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:971
+#: ../../Code/Module/Cdav.php:879 ../../Code/Module/Events.php:689
+#: ../../Code/Module/Events.php:698 ../../Code/Module/Cal.php:339
+#: ../../Code/Module/Cal.php:346 ../../Code/Module/Photos.php:971
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347
-#: ../../Zotlabs/Module/Photos.php:980
+#: ../../Code/Module/Cdav.php:880 ../../Code/Module/Events.php:690
+#: ../../Code/Module/Events.php:699 ../../Code/Module/Setup.php:263
+#: ../../Code/Module/Cal.php:340 ../../Code/Module/Cal.php:347
+#: ../../Code/Module/Photos.php:980
 msgid "Next"
 msgstr "Volgende"
 
-#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700
-#: ../../Zotlabs/Module/Cal.php:348
+#: ../../Code/Module/Cdav.php:881 ../../Code/Module/Events.php:700
+#: ../../Code/Module/Cal.php:348
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695
+#: ../../Code/Module/Cdav.php:882 ../../Code/Module/Events.php:695
 msgid "Month"
 msgstr "Maand"
 
-#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696
+#: ../../Code/Module/Cdav.php:883 ../../Code/Module/Events.php:696
 msgid "Week"
 msgstr "Week"
 
-#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697
+#: ../../Code/Module/Cdav.php:884 ../../Code/Module/Events.php:697
 msgid "Day"
 msgstr "Dag"
 
-#: ../../Zotlabs/Module/Cdav.php:885
+#: ../../Code/Module/Cdav.php:885
 msgid "List month"
 msgstr "Maand tonen"
 
-#: ../../Zotlabs/Module/Cdav.php:886
+#: ../../Code/Module/Cdav.php:886
 msgid "List week"
 msgstr "Week tonen"
 
-#: ../../Zotlabs/Module/Cdav.php:887
+#: ../../Code/Module/Cdav.php:887
 msgid "List day"
 msgstr "Dag tonen"
 
-#: ../../Zotlabs/Module/Cdav.php:894
+#: ../../Code/Module/Cdav.php:894
 msgid "More"
 msgstr "Meer"
 
-#: ../../Zotlabs/Module/Cdav.php:895
+#: ../../Code/Module/Cdav.php:895
 msgid "Less"
 msgstr "Minder"
 
-#: ../../Zotlabs/Module/Cdav.php:896
+#: ../../Code/Module/Cdav.php:896
 msgid "Select calendar"
 msgstr "Kies agenda"
 
-#: ../../Zotlabs/Module/Cdav.php:898
+#: ../../Code/Module/Cdav.php:898
 msgid "Delete all"
 msgstr "Alles verwijderen"
 
-#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Settings/Oauth2.php:85
-#: ../../Zotlabs/Module/Settings/Oauth2.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:464
-#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:366
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../Code/Module/Cdav.php:899 ../../Code/Module/Cdav.php:1188
+#: ../../Code/Module/Admin/Plugins.php:423
+#: ../../Code/Module/Settings/Oauth2.php:85
+#: ../../Code/Module/Settings/Oauth2.php:113
+#: ../../Code/Module/Settings/Oauth.php:89
+#: ../../Code/Module/Settings/Oauth.php:115
+#: ../../Code/Module/Wiki.php:347 ../../Code/Module/Wiki.php:379
+#: ../../Code/Module/Profile_photo.php:464
+#: ../../Code/Module/Connedit.php:924 ../../Code/Module/Fbrowser.php:66
+#: ../../Code/Module/Fbrowser.php:88 ../../Code/Module/Profiles.php:801
+#: ../../Code/Module/Filer.php:55 ../../Code/Module/Cover_photo.php:366
+#: ../../Code/Module/Tagrm.php:15 ../../Code/Module/Tagrm.php:138
 #: ../../include/conversation.php:1389 ../../include/conversation.php:1438
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../../Zotlabs/Module/Cdav.php:900
+#: ../../Code/Module/Cdav.php:900
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "Excuses! Bewerken van herhalende gebeurtenissen is nog niet geïmplementeerd."
 
-#: ../../Zotlabs/Module/Cdav.php:1170
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906
-#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558
-#: ../../Zotlabs/Storage/Browser.php:283
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../Code/Module/Cdav.php:1170
+#: ../../Code/Module/Sharedwithme.php:105
+#: ../../Code/Module/Admin/Channels.php:159
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth.php:116
+#: ../../Code/Module/Wiki.php:209 ../../Code/Module/Connedit.php:906
+#: ../../Code/Module/Chat.php:251 ../../Code/Lib/NativeWikiPage.php:558
+#: ../../Code/Storage/Browser.php:283
+#: ../../Code/Widget/Wiki_page_history.php:22
 #: ../../addon/rendezvous/rendezvous.php:172
 msgid "Name"
 msgstr "Naam"
 
-#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907
+#: ../../Code/Module/Cdav.php:1171 ../../Code/Module/Connedit.php:907
 msgid "Organisation"
 msgstr "Organisatie"
 
-#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Code/Module/Cdav.php:1172 ../../Code/Module/Connedit.php:908
 msgid "Title"
 msgstr "Titel"
 
-#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
-#: ../../Zotlabs/Module/Profiles.php:786
+#: ../../Code/Module/Cdav.php:1173 ../../Code/Module/Connedit.php:909
+#: ../../Code/Module/Profiles.php:786
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../../Zotlabs/Module/Cdav.php:1174
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Code/Module/Cdav.php:1174
+#: ../../Code/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:183
+#: ../../Code/Module/Connedit.php:910 ../../Code/Module/Profiles.php:787
 #: ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
 #: ../../addon/redred/redred.php:107 ../../include/network.php:1770
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
-#: ../../Zotlabs/Module/Profiles.php:788
+#: ../../Code/Module/Cdav.php:1175 ../../Code/Module/Connedit.php:911
+#: ../../Code/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr "Instant messenger"
 
-#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
-#: ../../Zotlabs/Module/Profiles.php:789
+#: ../../Code/Module/Cdav.php:1176 ../../Code/Module/Connedit.php:912
+#: ../../Code/Module/Profiles.php:789
 msgid "Website"
 msgstr "Website"
 
-#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Code/Module/Cdav.php:1177 ../../Code/Module/Locs.php:118
+#: ../../Code/Module/Admin/Channels.php:160
+#: ../../Code/Module/Connedit.php:913 ../../Code/Module/Profiles.php:502
+#: ../../Code/Module/Profiles.php:790
 msgid "Address"
 msgstr "Adres"
 
-#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
-#: ../../Zotlabs/Module/Profiles.php:791
+#: ../../Code/Module/Cdav.php:1178 ../../Code/Module/Connedit.php:914
+#: ../../Code/Module/Profiles.php:791
 msgid "Note"
 msgstr "Opmerking"
 
-#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
-#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308
+#: ../../Code/Module/Cdav.php:1179 ../../Code/Module/Connedit.php:915
+#: ../../Code/Module/Profiles.php:792 ../../include/event.php:1308
 #: ../../include/connections.php:690
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309
+#: ../../Code/Module/Cdav.php:1180 ../../Code/Module/Connedit.php:916
+#: ../../Code/Module/Profiles.php:793 ../../include/event.php:1309
 #: ../../include/connections.php:691
 msgid "Home"
 msgstr "Thuis"
 
-#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
-#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312
+#: ../../Code/Module/Cdav.php:1181 ../../Code/Module/Connedit.php:917
+#: ../../Code/Module/Profiles.php:794 ../../include/event.php:1312
 #: ../../include/connections.php:694
 msgid "Work"
 msgstr "Werk"
 
-#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
-#: ../../Zotlabs/Module/Profiles.php:796
+#: ../../Code/Module/Cdav.php:1183 ../../Code/Module/Connedit.php:919
+#: ../../Code/Module/Profiles.php:796
 #: ../../addon/jappixmini/jappixmini.php:368
 msgid "Add Contact"
 msgstr "Contact toevoegen"
 
-#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Profiles.php:797
+#: ../../Code/Module/Cdav.php:1184 ../../Code/Module/Connedit.php:920
+#: ../../Code/Module/Profiles.php:797
 msgid "Add Field"
 msgstr "Veld toevoegen"
 
-#: ../../Zotlabs/Module/Cdav.php:1186
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Settings/Oauth2.php:39
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth.php:43
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Lib/Apps.php:393
+#: ../../Code/Module/Cdav.php:1186
+#: ../../Code/Module/Admin/Plugins.php:453
+#: ../../Code/Module/Settings/Oauth2.php:39
+#: ../../Code/Module/Settings/Oauth2.php:112
+#: ../../Code/Module/Settings/Oauth.php:43
+#: ../../Code/Module/Settings/Oauth.php:114
+#: ../../Code/Module/Connedit.php:922 ../../Code/Module/Profiles.php:799
+#: ../../Code/Lib/Apps.php:393
 msgid "Update"
 msgstr "Bijwerken"
 
-#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Code/Module/Cdav.php:1189 ../../Code/Module/Connedit.php:925
 msgid "P.O. Box"
 msgstr "Postbus"
 
-#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Code/Module/Cdav.php:1190 ../../Code/Module/Connedit.php:926
 msgid "Additional"
 msgstr "Extra"
 
-#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Code/Module/Cdav.php:1191 ../../Code/Module/Connedit.php:927
 msgid "Street"
 msgstr "Straat en huisnummer"
 
-#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Code/Module/Cdav.php:1192 ../../Code/Module/Connedit.php:928
 msgid "Locality"
 msgstr "Plaats"
 
-#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Code/Module/Cdav.php:1193 ../../Code/Module/Connedit.php:929
 msgid "Region"
 msgstr "Provincie/staat/regio/enz."
 
-#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Code/Module/Cdav.php:1194 ../../Code/Module/Connedit.php:930
 msgid "ZIP Code"
 msgstr "Postcode"
 
-#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Code/Module/Cdav.php:1195 ../../Code/Module/Connedit.php:931
+#: ../../Code/Module/Profiles.php:757
 msgid "Country"
 msgstr "Land"
 
-#: ../../Zotlabs/Module/Cdav.php:1242
+#: ../../Code/Module/Cdav.php:1242
 msgid "Default Calendar"
 msgstr "Standaard agenda"
 
-#: ../../Zotlabs/Module/Cdav.php:1252
+#: ../../Code/Module/Cdav.php:1252
 msgid "Default Addressbook"
 msgstr "Standaard adresboek"
 
-#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
+#: ../../Code/Module/Regdir.php:49 ../../Code/Module/Dirsearch.php:25
 msgid "This site is not a directory server"
 msgstr "Deze hub is geen kanalengidshub (directoryserver)"
 
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32
-#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508
+#: ../../Code/Module/Channel.php:32 ../../Code/Module/Ochannel.php:32
+#: ../../Code/Module/Chat.php:25 ../../addon/chess/chess.php:508
 msgid "You must be logged in to see this page."
 msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
 
-#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:37
-#: ../../Zotlabs/Module/Profile.php:45
+#: ../../Code/Module/Channel.php:47 ../../Code/Module/Hcard.php:37
+#: ../../Code/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr "Berichten en reacties"
 
-#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:44
-#: ../../Zotlabs/Module/Profile.php:52
+#: ../../Code/Module/Channel.php:54 ../../Code/Module/Hcard.php:44
+#: ../../Code/Module/Profile.php:52
 msgid "Only posts"
 msgstr "Alleen berichten"
 
-#: ../../Zotlabs/Module/Channel.php:107
+#: ../../Code/Module/Channel.php:107
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+#: ../../Code/Module/Uexport.php:57 ../../Code/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Kanaal exporteren"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Code/Module/Uexport.php:59
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Code/Module/Uexport.php:60
 msgid "Export Content"
 msgstr "Inhoud exporteren"
 
-#: ../../Zotlabs/Module/Uexport.php:61
+#: ../../Code/Module/Uexport.php:61
 msgid ""
 "Export your channel information and recent content to a JSON backup that can"
 " be restored or imported to another server hub. This backs up all of your "
@@ -878,11 +878,11 @@ msgid ""
 " this download to begin."
 msgstr "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint."
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Code/Module/Uexport.php:63
 msgid "Export your posts from a given year."
 msgstr "Exporteer jouw berichten uit een bepaald jaar."
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Code/Module/Uexport.php:65
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -890,21 +890,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak."
 
-#: ../../Zotlabs/Module/Uexport.php:66
+#: ../../Code/Module/Uexport.php:66
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr "Bezoek %2$s om alle berichten van bijvoorbeeld dit jaar te selecteren. "
 
-#: ../../Zotlabs/Module/Uexport.php:67
+#: ../../Code/Module/Uexport.php:67
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr "Bezoek  %2$s om alle berichten van bijvoorbeeld januari dit jaar te selecteren."
 
-#: ../../Zotlabs/Module/Uexport.php:68
+#: ../../Code/Module/Uexport.php:68
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting %2$s te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen."
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "Welcome to Hubzilla!"
 msgstr "Welkom op Hubzilla!"
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "You have got no unseen posts..."
 msgstr "Je hebt geen ongeziene berichten..."
 
-#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:540
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
-#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30
-#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Code/Module/Search.php:17 ../../Code/Module/Photos.php:540
+#: ../../Code/Module/Ratings.php:83 ../../Code/Module/Directory.php:63
+#: ../../Code/Module/Directory.php:68 ../../Code/Module/Display.php:30
+#: ../../Code/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Openbare toegang geweigerd."
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335
-#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../Code/Module/Search.php:44 ../../Code/Module/Connections.php:335
+#: ../../Code/Lib/Apps.php:256 ../../Code/Widget/Sitesearch.php:31
 #: ../../include/text.php:1051 ../../include/text.php:1063
 #: ../../include/acl_selectors.php:118 ../../include/nav.php:179
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../../Zotlabs/Module/Search.php:230
+#: ../../Code/Module/Search.php:230
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Items getagd met %s"
 
-#: ../../Zotlabs/Module/Search.php:232
+#: ../../Code/Module/Search.php:232
 #, php-format
 msgid "Search results for: %s"
 msgstr "Zoekresultaten voor %s"
 
-#: ../../Zotlabs/Module/Pubstream.php:95
-#: ../../Zotlabs/Widget/Notifications.php:131
+#: ../../Code/Module/Pubstream.php:95
+#: ../../Code/Widget/Notifications.php:131
 msgid "Public Stream"
 msgstr "Openbare tijdlijn"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+#: ../../Code/Module/Locs.php:25 ../../Code/Module/Locs.php:54
 msgid "Location not found."
 msgstr "Locatie niet gevonden."
 
-#: ../../Zotlabs/Module/Locs.php:62
+#: ../../Code/Module/Locs.php:62
 msgid "Location lookup failed."
 msgstr "Opzoeken locatie mislukt"
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Code/Module/Locs.php:66
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
 msgstr "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen."
 
-#: ../../Zotlabs/Module/Locs.php:95
+#: ../../Code/Module/Locs.php:95
 msgid "Syncing locations"
 msgstr "Locaties synchronizeren"
 
-#: ../../Zotlabs/Module/Locs.php:105
+#: ../../Code/Module/Locs.php:105
 msgid "No locations found."
 msgstr "Geen locaties gevonden."
 
-#: ../../Zotlabs/Module/Locs.php:116
+#: ../../Code/Module/Locs.php:116
 msgid "Manage Channel Locations"
 msgstr "Kanaallocaties beheren"
 
-#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:111
+#: ../../Code/Module/Locs.php:119 ../../Code/Module/Admin.php:111
 msgid "Primary"
 msgstr "Primair"
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+#: ../../Code/Module/Locs.php:120 ../../Code/Module/Menu.php:113
 msgid "Drop"
 msgstr "Verwijderen"
 
-#: ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Locs.php:122
 msgid "Sync Now"
 msgstr "Nu synchroniseren"
 
-#: ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Wacht enkele minuten tussen opeenvolgende handelingen."
 
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Code/Module/Locs.php:124
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
 msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen."
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Volgorde veranderen van apps op de navigatiebalk"
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of App Tray Apps"
 msgstr "Volgorde veranderen van apps in het appmenu"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the"
 " navbar"
 msgstr "Gebruik de pijlen om de app naar links (omhoog) of naar recht (omlaag) op de navigatiebalk te verplaatsen"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr "Gebruik de pijlen om de app hoger of lager in het appmenu te tonen"
 
-#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
+#: ../../Code/Module/Mitem.php:28 ../../Code/Module/Menu.php:144
 msgid "Menu not found."
 msgstr "Menu niet gevonden."
 
-#: ../../Zotlabs/Module/Mitem.php:52
+#: ../../Code/Module/Mitem.php:52
 msgid "Unable to create element."
 msgstr "Niet in staat om onderdeel aan te maken."
 
-#: ../../Zotlabs/Module/Mitem.php:76
+#: ../../Code/Module/Mitem.php:76
 msgid "Unable to update menu element."
 msgstr "Menu-onderdeel kan niet worden geüpdatet."
 
-#: ../../Zotlabs/Module/Mitem.php:92
+#: ../../Code/Module/Mitem.php:92
 msgid "Unable to add menu element."
 msgstr "Menu-onderdeel kan niet worden toegevoegd."
 
-#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166
-#: ../../Zotlabs/Module/Xchan.php:41
+#: ../../Code/Module/Mitem.php:120 ../../Code/Module/Menu.php:166
+#: ../../Code/Module/Xchan.php:41
 msgid "Not found."
 msgstr "Niet gevonden."
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+#: ../../Code/Module/Mitem.php:153 ../../Code/Module/Mitem.php:230
 msgid "Menu Item Permissions"
 msgstr "Permissies menu-item"
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Code/Module/Mitem.php:154 ../../Code/Module/Mitem.php:231
+#: ../../Code/Module/Settings/Channel.php:528
 msgid "(click to open/close)"
 msgstr "(klik om te openen/sluiten)"
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+#: ../../Code/Module/Mitem.php:160 ../../Code/Module/Mitem.php:176
 msgid "Link Name"
 msgstr "Linknaam"
 
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+#: ../../Code/Module/Mitem.php:161 ../../Code/Module/Mitem.php:239
 msgid "Link or Submenu Target"
 msgstr "Linkdoel of submenu-doel"
 
-#: ../../Zotlabs/Module/Mitem.php:161
+#: ../../Code/Module/Mitem.php:161
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr "Geef de URL van de link of kies een menunaam om een submenu aan te maken"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:240
 msgid "Use magic-auth if available"
 msgstr "Gebruik magic-auth wanneer beschikbaar"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:259
-#: ../../Zotlabs/Module/Settings/Channel.php:307
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:163
+#: ../../Code/Module/Mitem.php:240 ../../Code/Module/Mitem.php:241
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:259
+#: ../../Code/Module/Settings/Channel.php:307
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Api.php:99 ../../Code/Module/Photos.php:697
+#: ../../Code/Module/Wiki.php:218 ../../Code/Module/Wiki.php:219
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Connedit.php:779
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
+#: ../../Code/Module/Defperms.php:180 ../../Code/Module/Profiles.php:681
+#: ../../Code/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397 ../../boot.php:1594
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1117,21 +1117,21 @@ msgstr "Gebruik magic-auth wanneer beschikbaar"
 msgid "No"
 msgstr "Nee"
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:261
-#: ../../Zotlabs/Module/Settings/Channel.php:307
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Defperms.php:180
-#: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Filestorage.php:155
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
+#: ../../Code/Module/Mitem.php:162 ../../Code/Module/Mitem.php:163
+#: ../../Code/Module/Mitem.php:240 ../../Code/Module/Mitem.php:241
+#: ../../Code/Module/Events.php:470 ../../Code/Module/Events.php:471
+#: ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Admin/Site.php:261
+#: ../../Code/Module/Settings/Channel.php:307
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Api.php:98 ../../Code/Module/Photos.php:697
+#: ../../Code/Module/Wiki.php:218 ../../Code/Module/Wiki.php:219
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:157 ../../Code/Module/Defperms.php:180
+#: ../../Code/Module/Profiles.php:681
+#: ../../Code/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397 ../../boot.php:1594
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1169,431 +1169,431 @@ msgstr "Nee"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Code/Module/Mitem.php:163 ../../Code/Module/Mitem.php:241
 msgid "Open link in new window"
 msgstr "Open link in nieuw venster"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+#: ../../Code/Module/Mitem.php:164 ../../Code/Module/Mitem.php:242
 msgid "Order in list"
 msgstr "Volgorde in lijst"
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+#: ../../Code/Module/Mitem.php:164 ../../Code/Module/Mitem.php:242
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Hogere nummers komen onderaan de lijst terecht"
 
-#: ../../Zotlabs/Module/Mitem.php:165
+#: ../../Code/Module/Mitem.php:165
 msgid "Submit and finish"
 msgstr "Opslaan en afsluiten"
 
-#: ../../Zotlabs/Module/Mitem.php:166
+#: ../../Code/Module/Mitem.php:166
 msgid "Submit and continue"
 msgstr "Opslaan en doorgaan"
 
-#: ../../Zotlabs/Module/Mitem.php:174
+#: ../../Code/Module/Mitem.php:174
 msgid "Menu:"
 msgstr "Menu:"
 
-#: ../../Zotlabs/Module/Mitem.php:177
+#: ../../Code/Module/Mitem.php:177
 msgid "Link Target"
 msgstr "Linkdoel"
 
-#: ../../Zotlabs/Module/Mitem.php:180
+#: ../../Code/Module/Mitem.php:180
 msgid "Edit menu"
 msgstr "Menu bewerken"
 
-#: ../../Zotlabs/Module/Mitem.php:183
+#: ../../Code/Module/Mitem.php:183
 msgid "Edit element"
 msgstr "Onderdeel bewerken"
 
-#: ../../Zotlabs/Module/Mitem.php:184
+#: ../../Code/Module/Mitem.php:184
 msgid "Drop element"
 msgstr "Onderdeel verwijderen"
 
-#: ../../Zotlabs/Module/Mitem.php:185
+#: ../../Code/Module/Mitem.php:185
 msgid "New element"
 msgstr "Nieuw element"
 
-#: ../../Zotlabs/Module/Mitem.php:186
+#: ../../Code/Module/Mitem.php:186
 msgid "Edit this menu container"
 msgstr "Deze menu-container bewerken"
 
-#: ../../Zotlabs/Module/Mitem.php:187
+#: ../../Code/Module/Mitem.php:187
 msgid "Add menu element"
 msgstr "Menu-element toevoegen"
 
-#: ../../Zotlabs/Module/Mitem.php:188
+#: ../../Code/Module/Mitem.php:188
 msgid "Delete this menu item"
 msgstr "Dit menu-item verwijderen"
 
-#: ../../Zotlabs/Module/Mitem.php:189
+#: ../../Code/Module/Mitem.php:189
 msgid "Edit this menu item"
 msgstr "Dit menu-item bewerken"
 
-#: ../../Zotlabs/Module/Mitem.php:206
+#: ../../Code/Module/Mitem.php:206
 msgid "Menu item not found."
 msgstr "Menu-item niet gevonden."
 
-#: ../../Zotlabs/Module/Mitem.php:219
+#: ../../Code/Module/Mitem.php:219
 msgid "Menu item deleted."
 msgstr "Menu-item verwijderd."
 
-#: ../../Zotlabs/Module/Mitem.php:221
+#: ../../Code/Module/Mitem.php:221
 msgid "Menu item could not be deleted."
 msgstr "Menu-item kon niet worden verwijderd."
 
-#: ../../Zotlabs/Module/Mitem.php:228
+#: ../../Code/Module/Mitem.php:228
 msgid "Edit Menu Element"
 msgstr "Menu-element bewerken"
 
-#: ../../Zotlabs/Module/Mitem.php:238
+#: ../../Code/Module/Mitem.php:238
 msgid "Link text"
 msgstr "Linktekst"
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Code/Module/Events.php:25
 msgid "Calendar entries imported."
 msgstr "Agenda-items geïmporteerd."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Code/Module/Events.php:27
 msgid "No calendar entries found."
 msgstr "Geen agenda-items gevonden."
 
-#: ../../Zotlabs/Module/Events.php:110
+#: ../../Code/Module/Events.php:110
 msgid "Event can not end before it has started."
 msgstr "Gebeurtenis kan niet eindigen voordat het is begonnen"
 
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
+#: ../../Code/Module/Events.php:112 ../../Code/Module/Events.php:121
+#: ../../Code/Module/Events.php:143
 msgid "Unable to generate preview."
 msgstr "Niet in staat om voorvertoning te genereren"
 
-#: ../../Zotlabs/Module/Events.php:119
+#: ../../Code/Module/Events.php:119
 msgid "Event title and start time are required."
 msgstr "Titel en begintijd van gebeurtenis zijn vereist."
 
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+#: ../../Code/Module/Events.php:141 ../../Code/Module/Events.php:265
 msgid "Event not found."
 msgstr "Gebeurtenis niet gevonden"
 
-#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
-#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119
+#: ../../Code/Module/Events.php:260 ../../Code/Module/Tagger.php:73
+#: ../../Code/Module/Like.php:386 ../../include/conversation.php:119
 #: ../../include/text.php:2008 ../../include/event.php:1153
 msgid "event"
 msgstr "gebeurtenis"
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Titel bewerken"
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142
-#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Events.php:460 ../../Code/Module/Events.php:465
+#: ../../Code/Module/Appman.php:141 ../../Code/Module/Appman.php:142
+#: ../../Code/Module/Profiles.php:745 ../../Code/Module/Profiles.php:749
 #: ../../include/datetime.php:211
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Code/Module/Events.php:462
 msgid "Categories (comma-separated list)"
 msgstr "Categorieën (door komma's gescheiden lijst)"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Edit Category"
 msgstr "Categorie"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Category"
 msgstr "Categorie"
 
-#: ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Events.php:466
 msgid "Edit start date and time"
 msgstr "Begindatum en -tijd bewerken"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+#: ../../Code/Module/Events.php:467 ../../Code/Module/Events.php:470
 msgid "Finish date and time are not known or not relevant"
 msgstr "Einddatum en -tijd zijn niet bekend of niet van toepassing"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Edit finish date and time"
 msgstr "Einddatum en -tijd bewerken"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Finish date and time"
 msgstr "Einddatum en -tijd"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+#: ../../Code/Module/Events.php:471 ../../Code/Module/Events.php:472
 msgid "Adjust for viewer timezone"
 msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Code/Module/Events.php:471
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../Code/Module/Events.php:473
 msgid "Edit Description"
 msgstr "Omschrijving bewerken"
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Code/Module/Events.php:475
 msgid "Edit Location"
 msgstr "Locatie bewerken"
 
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762
+#: ../../Code/Module/Events.php:478 ../../Code/Module/Photos.php:1123
+#: ../../Code/Module/Webpages.php:247 ../../Code/Lib/ThreadItem.php:762
 #: ../../include/conversation.php:1333
 msgid "Preview"
 msgstr "Voorvertoning"
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405
+#: ../../Code/Module/Events.php:479 ../../include/conversation.php:1405
 msgid "Permission settings"
 msgstr "Permissies"
 
-#: ../../Zotlabs/Module/Events.php:489
+#: ../../Code/Module/Events.php:489
 msgid "Timezone:"
 msgstr "Tijdzone:"
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Code/Module/Events.php:494
 msgid "Advanced Options"
 msgstr "Geavanceerde opties"
 
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266
+#: ../../Code/Module/Events.php:605 ../../Code/Module/Cal.php:266
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../Zotlabs/Module/Events.php:633
+#: ../../Code/Module/Events.php:633
 msgid "Edit event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../Zotlabs/Module/Events.php:635
+#: ../../Code/Module/Events.php:635
 msgid "Delete event"
 msgstr "Gebeurtenis verwijderen"
 
-#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315
+#: ../../Code/Module/Events.php:660 ../../Code/Module/Cal.php:315
 #: ../../include/text.php:1827
 msgid "Link to Source"
 msgstr "Originele locatie"
 
-#: ../../Zotlabs/Module/Events.php:669
+#: ../../Code/Module/Events.php:669
 msgid "calendar"
 msgstr "agenda"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Edit Event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Create Event"
 msgstr "Gebeurtenis aanmaken"
 
-#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341
+#: ../../Code/Module/Events.php:691 ../../Code/Module/Cal.php:341
 #: ../../include/channel.php:1647
 msgid "Export"
 msgstr "Exporteren"
 
-#: ../../Zotlabs/Module/Events.php:731
+#: ../../Code/Module/Events.php:731
 msgid "Event removed"
 msgstr "Gebeurtenis verwijderd"
 
-#: ../../Zotlabs/Module/Events.php:734
+#: ../../Code/Module/Events.php:734
 msgid "Failed to remove event"
 msgstr "Verwijderen gebeurtenis mislukt"
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+#: ../../Code/Module/Appman.php:39 ../../Code/Module/Appman.php:56
 msgid "App installed."
 msgstr "App geïnstalleerd"
 
-#: ../../Zotlabs/Module/Appman.php:49
+#: ../../Code/Module/Appman.php:49
 msgid "Malformed app."
 msgstr "Misvormde app."
 
-#: ../../Zotlabs/Module/Appman.php:130
+#: ../../Code/Module/Appman.php:130
 msgid "Embed code"
 msgstr "Insluitcode"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Edit App"
 msgstr "App bewerken"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Create App"
 msgstr "App maken"
 
-#: ../../Zotlabs/Module/Appman.php:141
+#: ../../Code/Module/Appman.php:141
 msgid "Name of app"
 msgstr "Naam van app"
 
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Code/Module/Appman.php:142
 msgid "Location (URL) of app"
 msgstr "Locatie (URL) van app"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "Photo icon URL"
 msgstr "URL van pictogram"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels (niet verplicht)"
 
-#: ../../Zotlabs/Module/Appman.php:145
+#: ../../Code/Module/Appman.php:145
 msgid "Categories (optional, comma separated list)"
 msgstr "Categorieën (niet verplicht,  door komma's gescheiden lijst)"
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Code/Module/Appman.php:146
 msgid "Version ID"
 msgstr "Versie-ID"
 
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Code/Module/Appman.php:147
 msgid "Price of app"
 msgstr "Prijs van de app"
 
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Code/Module/Appman.php:148
 msgid "Location (URL) to purchase app"
 msgstr "Locatie (URL) om de app aan te schaffen"
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Inloggen."
 
-#: ../../Zotlabs/Module/Magic.php:72
+#: ../../Code/Module/Magic.php:72
 msgid "Hub not found."
 msgstr "Hub niet gevonden."
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Tagger.php:69
+#: ../../Code/Module/Like.php:384
 #: ../../addon/redphotos/redphotohelper.php:71
 #: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405
 #: ../../include/conversation.php:116 ../../include/text.php:2005
 msgid "photo"
 msgstr "foto"
 
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Like.php:384
 #: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1405
 #: ../../include/conversation.php:144 ../../include/text.php:2011
 msgid "status"
 msgstr "bericht"
 
-#: ../../Zotlabs/Module/Subthread.php:142
+#: ../../Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s volgt het %3$s van %2$s"
 
-#: ../../Zotlabs/Module/Subthread.php:144
+#: ../../Code/Module/Subthread.php:144
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s volgt het %3$s van %2$s niet meer"
 
-#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75
-#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41
-#: ../../Zotlabs/Module/Card_edit.php:44
+#: ../../Code/Module/Article_edit.php:44 ../../Code/Module/Cal.php:62
+#: ../../Code/Module/Chanview.php:96 ../../Code/Module/Page.php:75
+#: ../../Code/Module/Wall_upload.php:31 ../../Code/Module/Block.php:41
+#: ../../Code/Module/Card_edit.php:44
 msgid "Channel not found."
 msgstr "Kanaal niet gevonden."
 
-#: ../../Zotlabs/Module/Article_edit.php:101
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
-#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Code/Module/Article_edit.php:101
+#: ../../Code/Module/Editblock.php:116 ../../Code/Module/Chat.php:207
+#: ../../Code/Module/Editwebpage.php:143 ../../Code/Module/Mail.php:288
+#: ../../Code/Module/Mail.php:430 ../../Code/Module/Card_edit.php:101
 #: ../../include/conversation.php:1278
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
-#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698
-#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117
+#: ../../Code/Module/Article_edit.php:117
+#: ../../Code/Module/Editblock.php:129 ../../Code/Module/Photos.php:698
+#: ../../Code/Module/Photos.php:1068 ../../Code/Module/Card_edit.php:117
 #: ../../include/conversation.php:1401
 msgid "Title (optional)"
 msgstr "Titel (niet verplicht)"
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Code/Module/Article_edit.php:128
 msgid "Edit Article"
 msgstr "Artikel bewerken"
 
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64
+#: ../../Code/Module/Import_items.php:48 ../../Code/Module/Import.php:64
 msgid "Nothing to import."
 msgstr "Niets gevonden om te importeren"
 
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79
-#: ../../Zotlabs/Module/Import.php:95
+#: ../../Code/Module/Import_items.php:72 ../../Code/Module/Import.php:79
+#: ../../Code/Module/Import.php:95
 msgid "Unable to download data from old server"
 msgstr "Niet in staat om gegevens van de oude hub te downloaden"
 
-#: ../../Zotlabs/Module/Import_items.php:77
-#: ../../Zotlabs/Module/Import.php:102
+#: ../../Code/Module/Import_items.php:77
+#: ../../Code/Module/Import.php:102
 msgid "Imported file is empty."
 msgstr "Geïmporteerde bestand is leeg"
 
-#: ../../Zotlabs/Module/Import_items.php:93
+#: ../../Code/Module/Import_items.php:93
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
 
-#: ../../Zotlabs/Module/Import_items.php:108
+#: ../../Code/Module/Import_items.php:108
 msgid "Import completed"
 msgstr "Importeren voltooid"
 
-#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Code/Module/Import_items.php:125
 msgid "Import Items"
 msgstr "Importeer items"
 
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Code/Module/Import_items.php:126
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren."
 
-#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:517
+#: ../../Code/Module/Import_items.php:127
+#: ../../Code/Module/Import.php:517
 msgid "File to Upload"
 msgstr "Bestand om te uploaden"
 
-#: ../../Zotlabs/Module/New_channel.php:133
-#: ../../Zotlabs/Module/Manage.php:138
+#: ../../Code/Module/New_channel.php:133
+#: ../../Code/Module/Manage.php:138
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."
 
-#: ../../Zotlabs/Module/New_channel.php:146
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/New_channel.php:146
+#: ../../Code/Module/Register.php:254
 msgid "Name or caption"
 msgstr "Naam"
 
-#: ../../Zotlabs/Module/New_channel.php:146
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/New_channel.php:146
+#: ../../Code/Module/Register.php:254
 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
 msgstr "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\""
 
-#: ../../Zotlabs/Module/New_channel.php:148
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Code/Module/New_channel.php:148
+#: ../../Code/Module/Register.php:256
 msgid "Choose a short nickname"
 msgstr "Korte bijnaam"
 
-#: ../../Zotlabs/Module/New_channel.php:148
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Code/Module/New_channel.php:148
+#: ../../Code/Module/Register.php:256
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
 "e.g. nickname%s"
 msgstr "Deze bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres van jouw kanaal aan te maken, die je dan met anderen kunt delen. Bijvoorbeeld: bijnaam%s"
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Settings/Channel.php:539
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Settings/Channel.php:539
+#: ../../Code/Module/Register.php:257
 msgid "Channel role and privacy"
 msgstr "Kanaaltype en privacy"
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Register.php:257
 msgid "Select a channel role with your privacy requirements."
 msgstr "Kies een kanaaltype met het door jou gewenste privacyniveau."
 
-#: ../../Zotlabs/Module/New_channel.php:149
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Code/Module/New_channel.php:149
+#: ../../Code/Module/Register.php:257
 msgid "Read more about roles"
 msgstr "Lees meer over kanaaltypes"
 
-#: ../../Zotlabs/Module/New_channel.php:152
+#: ../../Code/Module/New_channel.php:152
 msgid "Create Channel"
 msgstr "Kanaal aanmaken"
 
-#: ../../Zotlabs/Module/New_channel.php:153
+#: ../../Code/Module/New_channel.php:153
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed,"
@@ -1601,485 +1601,485 @@ msgid ""
 " share information with each other."
 msgstr "Een kanaal is een unieke netwerkidentiteit. Het kan een persoon (sociaal-netwerkprofiel), een forum (groep), een zakelijke of celebrity-pagina, een nieuwsfeed en vele andere dingen vertegenwoordigen. Kanalen kunnen met elkaar verbinden om informatie uit te wisselen."
 
-#: ../../Zotlabs/Module/New_channel.php:153
+#: ../../Code/Module/New_channel.php:153
 msgid ""
 "The type of channel you create affects the basic privacy settings, the "
 "permissions that are granted to connections/friends, and also the channel's "
 "visibility across the network."
 msgstr "Het type kanaal dat jij aanmaakt beïnvloedt de standaard privacyinstellingen, de permissies die aan connecties/vrienden worden gegeven, en tevens de zichtbaarheid van het kanaal in het netwerk."
 
-#: ../../Zotlabs/Module/New_channel.php:154
+#: ../../Code/Module/New_channel.php:154
 msgid ""
 "or import an existing channel from another location."
 msgstr "Of importeer een bestaand kanaal vanaf een andere locatie"
 
-#: ../../Zotlabs/Module/New_channel.php:159
+#: ../../Code/Module/New_channel.php:159
 msgid "Validate"
 msgstr "Valideren"
 
-#: ../../Zotlabs/Module/Removeme.php:35
+#: ../../Code/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."
 
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Code/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Verwijder dit kanaal"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
+#: ../../Code/Module/Changeaddr.php:78
 msgid "WARNING: "
 msgstr "WAARSCHUWING: "
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Dit kanaal wordt volledig uit het $Projectname-netwerk verwijderd."
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
 msgid "This action is permanent and can not be undone!"
 msgstr "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!"
 
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Changeaddr.php:79
+#: ../../Code/Module/Removeme.php:62
+#: ../../Code/Module/Removeaccount.php:59
+#: ../../Code/Module/Changeaddr.php:79
 msgid "Please enter your password for verification:"
 msgstr "Vul je wachtwoord in ter verificatie:"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Dit kanaal en alle klonen hiervan uit het $Projectname-netwerk verwijderen"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Code/Module/Removeme.php:64
+#: ../../Code/Module/Settings/Channel.php:600
 msgid "Remove Channel"
 msgstr "Kanaal verwijderen"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Code/Module/Sharedwithme.php:104
 msgid "Files: shared with me"
 msgstr "Bestanden: met mij gedeeld"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Code/Module/Sharedwithme.php:106
 msgid "NEW"
 msgstr "NIEUW"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:285 ../../include/text.php:1434
+#: ../../Code/Module/Sharedwithme.php:107
+#: ../../Code/Storage/Browser.php:285 ../../include/text.php:1434
 msgid "Size"
 msgstr "Grootte"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:286
+#: ../../Code/Module/Sharedwithme.php:108
+#: ../../Code/Storage/Browser.php:286
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Code/Module/Sharedwithme.php:109
 msgid "Remove all files"
 msgstr "Verwijder alle bestanden"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
+#: ../../Code/Module/Sharedwithme.php:110
 msgid "Remove this file"
 msgstr "Verwijder dit bestand"
 
-#: ../../Zotlabs/Module/Setup.php:170
+#: ../../Code/Module/Setup.php:170
 msgid "$Projectname Server - Setup"
 msgstr "$Projectname Hub - Setup"
 
-#: ../../Zotlabs/Module/Setup.php:174
+#: ../../Code/Module/Setup.php:174
 msgid "Could not connect to database."
 msgstr "Could not connect to database."
 
-#: ../../Zotlabs/Module/Setup.php:178
+#: ../../Code/Module/Setup.php:178
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."
 
-#: ../../Zotlabs/Module/Setup.php:185
+#: ../../Code/Module/Setup.php:185
 msgid "Could not create table."
 msgstr "Could not create table."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Code/Module/Setup.php:191
 msgid "Your site database has been installed."
 msgstr "Your hub database has been installed."
 
-#: ../../Zotlabs/Module/Setup.php:197
+#: ../../Code/Module/Setup.php:197
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "You may need to import the file \"install/schema_xxx.sql\" manually using a database client."
 
-#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:749
+#: ../../Code/Module/Setup.php:198 ../../Code/Module/Setup.php:262
+#: ../../Code/Module/Setup.php:749
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Please see the file \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:259
+#: ../../Code/Module/Setup.php:259
 msgid "System check"
 msgstr "System check"
 
-#: ../../Zotlabs/Module/Setup.php:264
+#: ../../Code/Module/Setup.php:264
 msgid "Check again"
 msgstr "Check again"
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Code/Module/Setup.php:286
 msgid "Database connection"
 msgstr "Database connection"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Code/Module/Setup.php:287
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "In order to install $Projectname we need to know how to connect to your database."
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Code/Module/Setup.php:288
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Please contact your hosting provider or server administrator if you have questions about these settings."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Code/Module/Setup.php:289
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "The database you specify below should already exist. If it does not, please create it before continuing."
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Database Server Name"
 msgstr "Database Server Name"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Default is 127.0.0.1"
 msgstr "Default is 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Database Port"
 msgstr "Database Port"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Communication port number - use 0 for default"
 msgstr "Communication port number - use 0 for default"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Code/Module/Setup.php:295
 msgid "Database Login Name"
 msgstr "Database Login Name"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Code/Module/Setup.php:296
 msgid "Database Login Password"
 msgstr "Database Login Password"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Database Name"
 msgstr "Database Name"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Database Type"
 msgstr "Database Type"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid "Site administrator email address"
 msgstr "Hub administrator email address"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Your account email address must match this in order to use the web admin panel."
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Website URL"
 msgstr "Hub URL"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Please use SSL (https) URL if available."
 msgstr "Please use SSL (https) URL if available."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
+#: ../../Code/Module/Setup.php:302 ../../Code/Module/Setup.php:345
 msgid "Please select a default timezone for your website"
 msgstr "Please select a default timezone for your hub"
 
-#: ../../Zotlabs/Module/Setup.php:330
+#: ../../Code/Module/Setup.php:330
 msgid "Site settings"
 msgstr "Hub settings"
 
-#: ../../Zotlabs/Module/Setup.php:384
+#: ../../Code/Module/Setup.php:384
 msgid "PHP version 5.5 or greater is required."
 msgstr "PHP version 5.5 or greater is required."
 
-#: ../../Zotlabs/Module/Setup.php:385
+#: ../../Code/Module/Setup.php:385
 msgid "PHP version"
 msgstr "PHP version"
 
-#: ../../Zotlabs/Module/Setup.php:401
+#: ../../Code/Module/Setup.php:401
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Could not find a command line version of PHP in the web server PATH."
 
-#: ../../Zotlabs/Module/Setup.php:402
+#: ../../Code/Module/Setup.php:402
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid "PHP executable path"
 msgstr "PHP executable path"
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Enter full path to php executable. You can leave this blank to continue the installation."
 
-#: ../../Zotlabs/Module/Setup.php:411
+#: ../../Code/Module/Setup.php:411
 msgid "Command line PHP"
 msgstr "Command line PHP"
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Code/Module/Setup.php:421
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "Unable to check command line PHP, as shell_exec() is disabled. This is required."
 
-#: ../../Zotlabs/Module/Setup.php:424
+#: ../../Code/Module/Setup.php:424
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."
 
-#: ../../Zotlabs/Module/Setup.php:425
+#: ../../Code/Module/Setup.php:425
 msgid "This is required for message delivery to work."
 msgstr "This is required for message delivery to work."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Code/Module/Setup.php:428
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Code/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."
 
-#: ../../Zotlabs/Module/Setup.php:451
+#: ../../Code/Module/Setup.php:451
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "You can adjust these settings in the server php.ini file."
 
-#: ../../Zotlabs/Module/Setup.php:453
+#: ../../Code/Module/Setup.php:453
 msgid "PHP upload limits"
 msgstr "PHP upload limits"
 
-#: ../../Zotlabs/Module/Setup.php:476
+#: ../../Code/Module/Setup.php:476
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"
 
-#: ../../Zotlabs/Module/Setup.php:477
+#: ../../Code/Module/Setup.php:477
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:480
+#: ../../Code/Module/Setup.php:480
 msgid "Generate encryption keys"
 msgstr "Generate encryption keys"
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Code/Module/Setup.php:497
 msgid "libCurl PHP module"
 msgstr "libCurl PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Code/Module/Setup.php:498
 msgid "GD graphics PHP module"
 msgstr "GD graphics PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Code/Module/Setup.php:499
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Code/Module/Setup.php:500
 msgid "PDO database PHP module"
 msgstr "PDO database PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Code/Module/Setup.php:501
 msgid "mb_string PHP module"
 msgstr "mb_string PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Code/Module/Setup.php:502
 msgid "xml PHP module"
 msgstr "xml PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Code/Module/Setup.php:503
 msgid "zip PHP module"
 msgstr "zip PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+#: ../../Code/Module/Setup.php:507 ../../Code/Module/Setup.php:509
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite module"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Code/Module/Setup.php:507
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: Apache webserver mod-rewrite module is required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+#: ../../Code/Module/Setup.php:513 ../../Code/Module/Setup.php:516
 msgid "exec"
 msgstr "exec"
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Code/Module/Setup.php:513
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Error: exec is required but is either not installed or has been disabled in php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+#: ../../Code/Module/Setup.php:519 ../../Code/Module/Setup.php:522
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Code/Module/Setup.php:519
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: shell_exec is required but is either not installed or has been disabled in php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Code/Module/Setup.php:527
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: libCURL PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Code/Module/Setup.php:531
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Error: GD graphics PHP module with JPEG support required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:535
+#: ../../Code/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: openssl PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Code/Module/Setup.php:539
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Error: PDO database PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:543
+#: ../../Code/Module/Setup.php:543
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: mb_string PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:547
+#: ../../Code/Module/Setup.php:547
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: xml PHP module required for DAV but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Code/Module/Setup.php:551
 msgid "Error: zip PHP module required but not installed."
 msgstr "Error: zip PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579
+#: ../../Code/Module/Setup.php:570 ../../Code/Module/Setup.php:579
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php is writable"
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Code/Module/Setup.php:575
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."
 
-#: ../../Zotlabs/Module/Setup.php:576
+#: ../../Code/Module/Setup.php:576
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Code/Module/Setup.php:577
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Please see install/INSTALL.txt for additional information."
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Code/Module/Setup.php:593
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."
 
-#: ../../Zotlabs/Module/Setup.php:594
+#: ../../Code/Module/Setup.php:594
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."
 
-#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616
+#: ../../Code/Module/Setup.php:595 ../../Code/Module/Setup.php:616
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."
 
-#: ../../Zotlabs/Module/Setup.php:596
+#: ../../Code/Module/Setup.php:596
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Code/Module/Setup.php:599
 #, php-format
 msgid "%s is writable"
 msgstr "%s is writable"
 
-#: ../../Zotlabs/Module/Setup.php:615
+#: ../../Code/Module/Setup.php:615
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
 " web folder"
 msgstr "This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"
 
-#: ../../Zotlabs/Module/Setup.php:619
+#: ../../Code/Module/Setup.php:619
 msgid "store is writable"
 msgstr "store is writable"
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Code/Module/Setup.php:651
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Code/Module/Setup.php:652
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Code/Module/Setup.php:653
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Code/Module/Setup.php:654
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Code/Module/Setup.php:655
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Code/Module/Setup.php:656
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Providers are available that issue free certificates which are browser-valid."
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Code/Module/Setup.php:658
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -2087,1341 +2087,1341 @@ msgid ""
 "server communications."
 msgstr "If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Code/Module/Setup.php:660
 msgid "SSL certificate validation"
 msgstr "SSL certificate validation"
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Code/Module/Setup.php:666
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "Url rewrite in .htaccess is not working. Check your server configuration.Test: "
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Code/Module/Setup.php:669
 msgid "Url rewrite is working"
 msgstr "Url rewrite is working"
 
-#: ../../Zotlabs/Module/Setup.php:683
+#: ../../Code/Module/Setup.php:683
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."
 
-#: ../../Zotlabs/Module/Setup.php:707
+#: ../../Code/Module/Setup.php:707
 #: ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr "Errors encountered creating database tables."
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Code/Module/Setup.php:747
 msgid "
              What next?
              "
 msgstr "
              What next?
              "
 
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Code/Module/Setup.php:748
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Code/Module/Connect.php:61 ../../Code/Module/Connect.php:109
 msgid "Continue"
 msgstr "Ga verder"
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Code/Module/Connect.php:90
 msgid "Premium Channel Setup"
 msgstr "Instellen premiumkanaal "
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Code/Module/Connect.php:92
 msgid "Enable premium channel connection restrictions"
 msgstr "Restricties voor connecties van premiumkanaal toestaan"
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Code/Module/Connect.php:93
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz."
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Code/Module/Connect.php:95 ../../Code/Module/Connect.php:115
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:"
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Code/Module/Connect.php:96
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:"
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Code/Module/Connect.php:97 ../../Code/Module/Connect.php:118
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided"
 " on this page."
 msgstr "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina."
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaaleigenaar verstrekt) "
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Code/Module/Connect.php:114
 msgid "Restricted or Premium Channel"
 msgstr "Beperkt of premiumkanaal"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
+#: ../../Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr "Wachtrij-statistieken"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
+#: ../../Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr "Aantal vermeldingen"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
+#: ../../Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
+#: ../../Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr "Doel-URL"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
+#: ../../Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr "Hub als permanent offline markeren"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
+#: ../../Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr "Berichtenwachtrij voor deze hub legen"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
+#: ../../Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr "Voor het laatst contact"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "Off"
 msgstr "Uit"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "On"
 msgstr "Aan"
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Admin/Features.php:56
 #, php-format
 msgid "Lock feature %s"
 msgstr "   Vergrendel de functie '%s'"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
+#: ../../Code/Module/Admin/Features.php:64
 msgid "Manage Additional Features"
 msgstr "Beheer - Extra functies"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Code/Module/Admin/Dbsync.php:19
 msgid "Update has been marked successful"
 msgstr "Update is als succesvol gemarkeerd"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:31
+#: ../../Code/Module/Admin/Dbsync.php:31
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:34
+#: ../../Code/Module/Admin/Dbsync.php:34
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s was geslaagd."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:38
+#: ../../Code/Module/Admin/Dbsync.php:38
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:41
+#: ../../Code/Module/Admin/Dbsync.php:41
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update-functie %s kon niet gevonden worden."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Code/Module/Admin/Dbsync.php:59
 msgid "Failed Updates"
 msgstr "Mislukte updates"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+#: ../../Code/Module/Admin/Dbsync.php:61
 msgid "Mark success (if update was manually applied)"
 msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+#: ../../Code/Module/Admin/Dbsync.php:62
 msgid "Attempt to execute this update step automatically"
 msgstr "Poging om deze stap van de update automatisch uit te voeren."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:67
+#: ../../Code/Module/Admin/Dbsync.php:67
 msgid "No failed updates."
 msgstr "Geen mislukte updates."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:259
-#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:453
-#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
+#: ../../Code/Module/Admin/Plugins.php:259
+#: ../../Code/Module/Admin/Themes.php:72 ../../Code/Module/Thing.php:94
+#: ../../Code/Module/Viewsrc.php:25 ../../Code/Module/Display.php:46
+#: ../../Code/Module/Display.php:453
+#: ../../Code/Module/Filestorage.php:24 ../../Code/Module/Admin.php:62
 #: ../../include/items.php:3619
 msgid "Item not found."
 msgstr "Item niet gevonden."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#: ../../Code/Module/Admin/Plugins.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-in %s uitgeschakeld."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:294
+#: ../../Code/Module/Admin/Plugins.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-in %s ingeschakeld"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Code/Module/Admin/Plugins.php:310
+#: ../../Code/Module/Admin/Themes.php:95
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Code/Module/Admin/Plugins.php:313
+#: ../../Code/Module/Admin/Themes.php:97
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:341
-#: ../../Zotlabs/Module/Admin/Plugins.php:436
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:294
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin.php:136
+#: ../../Code/Module/Admin/Plugins.php:341
+#: ../../Code/Module/Admin/Plugins.php:436
+#: ../../Code/Module/Admin/Accounts.php:166
+#: ../../Code/Module/Admin/Logs.php:82
+#: ../../Code/Module/Admin/Channels.php:145
+#: ../../Code/Module/Admin/Themes.php:122
+#: ../../Code/Module/Admin/Themes.php:156
+#: ../../Code/Module/Admin/Site.php:294
+#: ../../Code/Module/Admin/Security.php:86
+#: ../../Code/Module/Admin.php:136
 msgid "Administration"
 msgstr "Beheer"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:342
-#: ../../Zotlabs/Module/Admin/Plugins.php:437
-#: ../../Zotlabs/Widget/Admin.php:27
+#: ../../Code/Module/Admin/Plugins.php:342
+#: ../../Code/Module/Admin/Plugins.php:437
+#: ../../Code/Widget/Admin.php:27
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Code/Module/Admin/Plugins.php:343
+#: ../../Code/Module/Admin/Themes.php:124
 msgid "Toggle"
 msgstr "Omschakelen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242
-#: ../../Zotlabs/Widget/Newmember.php:46
-#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105
+#: ../../Code/Module/Admin/Plugins.php:344
+#: ../../Code/Module/Admin/Themes.php:125 ../../Code/Lib/Apps.php:242
+#: ../../Code/Widget/Newmember.php:46
+#: ../../Code/Widget/Settings_menu.php:141 ../../include/nav.php:105
 #: ../../include/nav.php:192
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Code/Module/Admin/Plugins.php:351
+#: ../../Code/Module/Admin/Themes.php:134
 msgid "Author: "
 msgstr "Auteur: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Code/Module/Admin/Plugins.php:352
+#: ../../Code/Module/Admin/Themes.php:135
 msgid "Maintainer: "
 msgstr "Beheerder: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
+#: ../../Code/Module/Admin/Plugins.php:353
 msgid "Minimum project version: "
 msgstr "Minimum versie Hubzilla: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:354
+#: ../../Code/Module/Admin/Plugins.php:354
 msgid "Maximum project version: "
 msgstr "Maximum versie Hubzilla:"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:355
+#: ../../Code/Module/Admin/Plugins.php:355
 msgid "Minimum PHP version: "
 msgstr "Minimum versie PHP: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:356
+#: ../../Code/Module/Admin/Plugins.php:356
 msgid "Compatible Server Roles: "
 msgstr "Werkt met configuratietypes: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:357
+#: ../../Code/Module/Admin/Plugins.php:357
 msgid "Requires: "
 msgstr "Vereist: "
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:358
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
+#: ../../Code/Module/Admin/Plugins.php:358
+#: ../../Code/Module/Admin/Plugins.php:442
 msgid "Disabled - version incompatibility"
 msgstr "Uitgeschakeld - versie is incompatibel"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:411
+#: ../../Code/Module/Admin/Plugins.php:411
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr "Vul de openbare Git-URL in van de plug-in-repository."
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
+#: ../../Code/Module/Admin/Plugins.php:412
 msgid "Plugin repo git URL"
 msgstr "Git-URL plug-in-repository"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
+#: ../../Code/Module/Admin/Plugins.php:413
 msgid "Custom repo name"
 msgstr "Handmatige repository-naam"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
+#: ../../Code/Module/Admin/Plugins.php:413
 msgid "(optional)"
 msgstr "(niet verplicht)"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
+#: ../../Code/Module/Admin/Plugins.php:414
 msgid "Download Plugin Repo"
 msgstr "Plug-in-repository downloaden"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:421
+#: ../../Code/Module/Admin/Plugins.php:421
 msgid "Install new repo"
 msgstr "Nieuwe repository installeren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:393
+#: ../../Code/Module/Admin/Plugins.php:422 ../../Code/Lib/Apps.php:393
 msgid "Install"
 msgstr "Installeren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
+#: ../../Code/Module/Admin/Plugins.php:445
 msgid "Manage Repos"
 msgstr "Repositories beheren"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:446
+#: ../../Code/Module/Admin/Plugins.php:446
 msgid "Installed Plugin Repositories"
 msgstr "Toegevoegde plug-in-repositories"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:447
+#: ../../Code/Module/Admin/Plugins.php:447
 msgid "Install a New Plugin Repository"
 msgstr "Nieuwe plug-in-repository toevoegen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:454
+#: ../../Code/Module/Admin/Plugins.php:454
 msgid "Switch branch"
 msgstr "Branch veranderen"
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:1020 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Code/Module/Admin/Plugins.php:455
+#: ../../Code/Module/Photos.php:1020 ../../Code/Module/Tagrm.php:137
 #: ../../addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:37
+#: ../../Code/Module/Admin/Accounts.php:37
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s account geblokkeerd/gedeblokkeerd"
 msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:44
+#: ../../Code/Module/Admin/Accounts.php:44
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s account verwijderd"
 msgstr[1] "%s accounts verwijderd"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:80
+#: ../../Code/Module/Admin/Accounts.php:80
 msgid "Account not found"
 msgstr "Account niet gevonden"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473
+#: ../../Code/Module/Admin/Accounts.php:91 ../../include/channel.php:2473
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Account '%s' verwijderd"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:99
+#: ../../Code/Module/Admin/Accounts.php:99
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Account '%s' geblokkeerd"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:107
+#: ../../Code/Module/Admin/Accounts.php:107
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Account '%s' gedeblokkeerd"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
-#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
+#: ../../Code/Module/Admin/Accounts.php:167
+#: ../../Code/Module/Admin/Accounts.php:180
+#: ../../Code/Module/Admin.php:96 ../../Code/Widget/Admin.php:23
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Channels.php:148
+#: ../../Code/Module/Admin/Accounts.php:169
+#: ../../Code/Module/Admin/Channels.php:148
 msgid "select all"
 msgstr "alles selecteren"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Code/Module/Admin/Accounts.php:170
 msgid "Registrations waiting for confirm"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:171
 msgid "Request date"
 msgstr "Tijd/datum verzoek"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Code/Module/Admin/Accounts.php:172
 msgid "No registrations."
 msgstr "Geen verzoeken."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
-#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732
+#: ../../Code/Module/Admin/Accounts.php:173
+#: ../../Code/Module/Connections.php:303 ../../include/conversation.php:732
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Authorize.php:26
+#: ../../Code/Module/Admin/Accounts.php:174
+#: ../../Code/Module/Authorize.php:26
 msgid "Deny"
 msgstr "Afkeuren"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:176
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:176
+#: ../../Code/Module/Connedit.php:622
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:177
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:177
+#: ../../Code/Module/Connedit.php:622
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182
+#: ../../Code/Module/Admin/Accounts.php:182
 msgid "ID"
 msgstr "ID"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284
+#: ../../Code/Module/Admin/Accounts.php:184 ../../include/group.php:284
 msgid "All Channels"
 msgstr "Alle kanalen"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Code/Module/Admin/Accounts.php:185
 msgid "Register date"
 msgstr "Geregistreerd"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Code/Module/Admin/Accounts.php:186
 msgid "Last login"
 msgstr "Laatste keer ingelogd"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:187
+#: ../../Code/Module/Admin/Accounts.php:187
 msgid "Expires"
 msgstr "Verloopt"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Code/Module/Admin/Accounts.php:188
 msgid "Service Class"
 msgstr "Abonnement"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:190
+#: ../../Code/Module/Admin/Accounts.php:190
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:191
+#: ../../Code/Module/Admin/Accounts.php:191
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
+#: ../../Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "Logboek-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
-#: ../../Zotlabs/Widget/Admin.php:58
+#: ../../Code/Module/Admin/Logs.php:83 ../../Code/Widget/Admin.php:48
+#: ../../Code/Widget/Admin.php:58
 msgid "Logs"
 msgstr "Logboeken"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
+#: ../../Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Leegmaken"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
+#: ../../Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Debuggen"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "Logbestand"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je $Projectname-installatie."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
+#: ../../Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Logniveau"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
+#: ../../Code/Module/Admin/Channels.php:31
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s kanaal gecensureerd/ongecensureerd"
 msgstr[1] "%s kanalen gecensureerd/ongecensureerd"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
+#: ../../Code/Module/Admin/Channels.php:40
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "Scripts toegestaan/niet toegestaan voor %s kanaal"
 msgstr[1] "Scripts toegestaan/niet toegestaan voor %s kanalen"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
+#: ../../Code/Module/Admin/Channels.php:46
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s kanaal verwijderd"
 msgstr[1] "%s kanalen verwijderd"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
+#: ../../Code/Module/Admin/Channels.php:65
 msgid "Channel not found"
 msgstr "Kanaal niet gevonden"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
+#: ../../Code/Module/Admin/Channels.php:75
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanaal '%s' verwijderd"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanaal '%s' gecensureerd"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanaal '%s' ongecensureerd"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Scripts toegestaan voor kanaal '%s'"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Scripts niet toegestaan voor kanaal '%s'"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Module/Admin.php:110 ../../Zotlabs/Widget/Admin.php:24
+#: ../../Code/Module/Admin/Channels.php:146
+#: ../../Code/Module/Admin.php:110 ../../Code/Widget/Admin.php:24
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Code/Module/Admin/Channels.php:150
 msgid "Censor"
 msgstr "Censureren"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Code/Module/Admin/Channels.php:151
 msgid "Uncensor"
 msgstr "Niet censureren"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
+#: ../../Code/Module/Admin/Channels.php:152
 msgid "Allow Code"
 msgstr "Scripts toestaan"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
+#: ../../Code/Module/Admin/Channels.php:153
 msgid "Disallow Code"
 msgstr "Scripts niet toestaan"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../Code/Module/Admin/Channels.php:154
 #: ../../include/conversation.php:1811 ../../include/nav.php:378
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
+#: ../../Code/Module/Admin/Channels.php:158
 msgid "UID"
 msgstr "UID"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
+#: ../../Code/Module/Admin/Channels.php:162
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
+#: ../../Code/Module/Admin/Channels.php:163
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
+#: ../../Code/Module/Admin/Themes.php:26
 msgid "Theme settings updated."
 msgstr "Thema-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
+#: ../../Code/Module/Admin/Themes.php:61
 msgid "No themes found."
 msgstr "Geen thema's gevonden"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
+#: ../../Code/Module/Admin/Themes.php:116
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+#: ../../Code/Module/Admin/Themes.php:123
+#: ../../Code/Module/Admin/Themes.php:157 ../../Code/Widget/Admin.php:28
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
+#: ../../Code/Module/Admin/Themes.php:162
 msgid "[Experimental]"
 msgstr "[Experimenteel]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
+#: ../../Code/Module/Admin/Themes.php:163
 msgid "[Unsupported]"
 msgstr "[Niet ondersteund]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:165
+#: ../../Code/Module/Admin/Site.php:165
 msgid "Site settings updated."
 msgstr "Hub-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:191
+#: ../../Code/Module/Admin/Site.php:191
 #: ../../view/theme/redbasic_c/php/config.php:15
 #: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3106
 msgid "Default"
 msgstr "Standaard"
 
-#: ../../Zotlabs/Module/Admin/Site.php:202
-#: ../../Zotlabs/Module/Settings/Display.php:130
+#: ../../Code/Module/Admin/Site.php:202
+#: ../../Code/Module/Settings/Display.php:130
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (niet compatible)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:209
+#: ../../Code/Module/Admin/Site.php:209
 msgid "mobile"
 msgstr "mobiel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:211
+#: ../../Code/Module/Admin/Site.php:211
 msgid "experimental"
 msgstr "experimenteel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:213
+#: ../../Code/Module/Admin/Site.php:213
 msgid "unsupported"
 msgstr "Niet ondersteund"
 
-#: ../../Zotlabs/Module/Admin/Site.php:260
+#: ../../Code/Module/Admin/Site.php:260
 msgid "Yes - with approval"
 msgstr "Ja - met goedkeuring"
 
-#: ../../Zotlabs/Module/Admin/Site.php:266
+#: ../../Code/Module/Admin/Site.php:266
 msgid "My site is not a public server"
 msgstr "Mijn $Projectname-hub is niet openbaar"
 
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Code/Module/Admin/Site.php:267
 msgid "My site has paid access only"
 msgstr "Mijn $Projectname-hub kent alleen betaalde toegang"
 
-#: ../../Zotlabs/Module/Admin/Site.php:268
+#: ../../Code/Module/Admin/Site.php:268
 msgid "My site has free access only"
 msgstr "Mijn $Projectname-hub kent alleen gratis toegang"
 
-#: ../../Zotlabs/Module/Admin/Site.php:269
+#: ../../Code/Module/Admin/Site.php:269
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mijn $Projectname-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"
 
-#: ../../Zotlabs/Module/Admin/Site.php:281
+#: ../../Code/Module/Admin/Site.php:281
 msgid "Beginner/Basic"
 msgstr "Beginner/basic"
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Code/Module/Admin/Site.php:282
 msgid "Novice - not skilled but willing to learn"
 msgstr "Onervaren - niet bekwaam, maar wil graag leren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:283
+#: ../../Code/Module/Admin/Site.php:283
 msgid "Intermediate - somewhat comfortable"
 msgstr "Ervaren - voelt zich enigszins comfortabel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:284
+#: ../../Code/Module/Admin/Site.php:284
 msgid "Advanced - very comfortable"
 msgstr "Gevorderd - voelt zich comfortabel"
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
+#: ../../Code/Module/Admin/Site.php:285
 msgid "Expert - I can write computer code"
 msgstr "Expert - kan programmeren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Code/Module/Admin/Site.php:286
 msgid "Wizard - I probably know more than you do"
 msgstr "Tovenaar - ik weet waarschijnlijk meer dan jij"
 
-#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Code/Module/Admin/Site.php:295 ../../Code/Widget/Admin.php:22
 msgid "Site"
 msgstr "Hub-instellingen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-#: ../../Zotlabs/Module/Register.php:269
+#: ../../Code/Module/Admin/Site.php:297
+#: ../../Code/Module/Register.php:269
 msgid "Registration"
 msgstr "Registratie"
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Code/Module/Admin/Site.php:298
 msgid "File upload"
 msgstr "Bestand uploaden"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid "Policies"
 msgstr "Beleid"
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Code/Module/Admin/Site.php:300
 #: ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Code/Module/Admin/Site.php:304
 #: ../../addon/statusnet/statusnet.php:891
 msgid "Site name"
 msgstr "Hubnaam"
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Site default technical skill level"
 msgstr "Standaard technisch niveau voor deze hub"
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Code/Module/Admin/Site.php:306
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr "Wordt gebruikt om leden een gebruikerservaring te bieden die met hun technisch niveau overeenkomt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid "Lock the technical skill level setting"
 msgstr "Vergrendel de functie 'Standaard technisch niveau voor deze hub'"
 
-#: ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Module/Admin/Site.php:308
 msgid "Members can set their own technical comfort level by default"
 msgstr "Leden kunnen hun eigen technisch niveau standaard instellen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Code/Module/Admin/Site.php:310
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr "Ongefilterd HTML/CSS/JS is toegestaan"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid "Administrator Information"
 msgstr "Informatie over de beheerder"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Code/Module/Admin/Site.php:312
+#: ../../Code/Module/Siteinfo.php:21
 msgid "Site Information"
 msgstr "Hub-informatie"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Code/Module/Admin/Site.php:312
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Openbaar zichtbare beschrijving van deze hub. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Code/Module/Admin/Site.php:313
 msgid "System language"
 msgstr "Standaardtaal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid "System theme"
 msgstr "Standaardthema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Code/Module/Admin/Site.php:314
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Standaardthema voor $Projectname-hub (kan door lid veranderd worden) - verander thema-instellingen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "Allow Feeds as Connections"
 msgstr "Sta feeds toe als connecties"
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "(Heavy system resource usage)"
 msgstr "(sterk negatieve invloed op systeembronnen hub)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:318
 msgid "Maximum image size"
 msgstr "Maximale grootte van afbeeldingen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Code/Module/Admin/Site.php:318
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Does this site allow new member registration?"
 msgstr "Staat deze hub nieuwe accounts toe?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid "Invitation only"
 msgstr "Alleen op uitnodiging"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Code/Module/Admin/Site.php:320
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Sta alleen nieuwe registraties toe van mensen die een uitnodigingscode hebben. Bovenstaand accountbeleid moet op Ja staan."
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Minimum age"
 msgstr "Minimum leeftijd"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Minimum age (in years) for who may register on this site."
 msgstr "Minimum leeftijd (in jaren) voor wie zich op deze hub mag registreren."
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Code/Module/Admin/Site.php:322
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Wat voor soort accounts biedt deze $Projectname-hub aan? Kies wat het meest in de buurt komt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Register text"
 msgstr "Tekst tijdens registratie"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Will be displayed prominently on the registration page."
 msgstr "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond."
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepagina van deze hub die aan bezoekers wordt getoond (standaard: inlogformulier)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "voorbeeld: 'public' om de openbare tijdlijn te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken."
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid "Preserve site homepage URL"
 msgstr "Behoudt de URL van de hub (/)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Toon de homepagina van de hub in een frame op de oorspronkelijke locatie (/), i.p.v. een doorverwijzing naar een andere locatie (bv. .../home.html)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid "Accounts abandoned after x days"
 msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet."
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid "Allowed friend domains"
 msgstr "Toegestane domeinen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze $Projectname-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Code/Module/Admin/Site.php:328
 msgid "Verify Email Addresses"
 msgstr "E-mailadres verifieren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Code/Module/Admin/Site.php:328
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid "Force publish"
 msgstr "Dwing kanaalvermelding af"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Code/Module/Admin/Site.php:329
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "Import Public Streams"
 msgstr "Openbare tijdlijnen importeren"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Toegang verlenen tot openbare berichten die vanuit andere hubs worden geïmporteerd. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid "Site only Public Streams"
 msgstr "Alleen openbare tijdlijnen van deze hub"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr "Alleen toegang verlenen tot openbare berichten van deze hub, wanneer 'Openbare tijdlijnen importeren' is uitgeschakeld."
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr "Aan iedereen op het internet toegang tot openbare tijdlijnen verlenen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr "Uitschakelen wanneer authenticatie is vereist om de berichten te kunnen zien. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid "Login on Homepage"
 msgstr "Inlogformulier op de homepagina"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. "
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Enable context help"
 msgstr "Schakel contextuele hulp in"
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Toon hulp en documentatie voor de op dat moment getoonde pagina, wanneer op de hulp-knop wordt geklikt."
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Reply-to email address for system generated email."
 msgstr "Antwoordadres voor door de hub verzonden e-mail."
 
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Code/Module/Admin/Site.php:337
 msgid "Sender (From) email address for system generated email."
 msgstr "Afzenderadres voor door de hub verzonden e-mail."
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid "Name of email sender for system generated email."
 msgstr "Volledige naam van afzenderadres voor door de hub verzonden e-mail."
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Directory Server URL"
 msgstr "Server-URL voor de kanalengids"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Default directory server"
 msgstr "Standaardserver voor de kanalengids"
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Code/Module/Admin/Site.php:342
 msgid "Proxy user"
 msgstr "Gebruikersnaam proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Code/Module/Admin/Site.php:343
 msgid "Proxy URL"
 msgstr "Proxy-URL"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Network timeout"
 msgstr "Netwerktimeout"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid "Delivery interval"
 msgstr "Afleveringsinterval"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers."
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid "Deliveries per process"
 msgstr "Leveringen per serverproces"
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Aantal leveringen die aan één serverproces worden meegegeven. Pas dit aan wanneer het nodig is om systeemprestaties te verbeteren. Aangeraden: 1-5"
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid "Queue Threshold"
 msgstr "Wachtrijgrens"
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr "Stel onmiddellijke leveringen uit wanneer de wachtrij meer dan dit aantal vermeldingen bevat."
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid "Poll interval"
 msgstr "Poll-interval"
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken."
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Code/Module/Admin/Site.php:349
 msgid "Path to ImageMagick convert program"
 msgstr "Locatie van het conversieprogramma van ImageMagick"
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Code/Module/Admin/Site.php:349
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr "Wanneer dit is ingesteld wordt dit programma gebruikt om fotominiaturen voor enorme afbeeldingen (> 4000 pixels hoogte/breedte) aan te maken, anders kunnen er geheugenproblemen optreden. Bijvoorbeeld: /usr/bin/convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Code/Module/Admin/Site.php:350
 msgid "Allow SVG thumbnails in file browser"
 msgstr "SVG-miniaturen in bestandsbeheerder toestaan"
 
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Code/Module/Admin/Site.php:350
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "LET OP: SVG-afbeeldingen kunnen kwaadwillige code bevatten."
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid "Maximum Load Average"
 msgstr "Maximaal gemiddelde systeembelasting"
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands tijdlijn/netwerk-pagina wordt verwijderd."
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "0 for no expiration of imported content"
 msgstr "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud."
 
-#: ../../Zotlabs/Module/Admin/Site.php:353
+#: ../../Code/Module/Admin/Site.php:353
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr "Laat geen berichten verlopen die minder dan dit aantal dagen reacties hebben"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr "Openbare hubs: Optionele landingpage (marketing) voor nieuwe registraties"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Maak eerst deze pagina aan. Standaard wordt %s/register gebruikt"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Page to display after creating a new channel"
 msgstr "Pagina die na het aanmaken van een nieuw kanaal moet worden getoond"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Recommend: profiles, go, or settings"
 msgstr "Aanbevolen: profiles, go of settings"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Optional: site location"
 msgstr "Niet verplicht: locatie van deze hub"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Region or country"
 msgstr "Regio of land"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
+#: ../../Code/Module/Admin/Profs.php:89
 msgid "New Profile Field"
 msgstr "Nieuw profielveld"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "Field nickname"
 msgstr "Bijnaam voor veld"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "System name of field"
 msgstr "Systeemnaam voor veld"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
+#: ../../Code/Module/Admin/Profs.php:91
+#: ../../Code/Module/Admin/Profs.php:111
 msgid "Input type"
 msgstr "Invoertype"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Field Name"
 msgstr "Veldnaam"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Label on profile pages"
 msgstr "Tekstlabel voor op profielpagina's"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Help text"
 msgstr "Helptekst"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Additional info (optional)"
 msgstr "Extra informatie (niet verplicht)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
-#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052
+#: ../../Code/Module/Admin/Profs.php:94
+#: ../../Code/Module/Admin/Profs.php:114 ../../Code/Module/Rbmark.php:32
+#: ../../Code/Module/Rbmark.php:104 ../../Code/Module/Filer.php:53
+#: ../../Code/Widget/Notes.php:18 ../../include/text.php:1052
 #: ../../include/text.php:1064
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
+#: ../../Code/Module/Admin/Profs.php:103
 msgid "Field definition not found"
 msgstr "Velddefinitie niet gevonden"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
+#: ../../Code/Module/Admin/Profs.php:109
 msgid "Edit Profile Field"
 msgstr "Profielveld bewerken"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30
+#: ../../Code/Module/Admin/Profs.php:168 ../../Code/Widget/Admin.php:30
 msgid "Profile Fields"
 msgstr "Profielvelden"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
+#: ../../Code/Module/Admin/Profs.php:169
 msgid "Basic Profile Fields"
 msgstr "Standaard profielvelden"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "Advanced Profile Fields"
 msgstr "Geavanceerde profielvelden"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "(In addition to basic fields)"
 msgstr "(als toevoeging op de standaard velden)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
+#: ../../Code/Module/Admin/Profs.php:172
 msgid "All available fields"
 msgstr "Alle beschikbare velden"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
+#: ../../Code/Module/Admin/Profs.php:173
 msgid "Custom Fields"
 msgstr "Extra (handmatig toegevoegde) velden"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
+#: ../../Code/Module/Admin/Profs.php:177
 msgid "Create Custom Field"
 msgstr "Extra velden aanmaken"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#: ../../Code/Module/Admin/Account_edit.php:29
 #, php-format
 msgid "Password changed for account %d."
 msgstr "Wachtwoord veranderd voor account %d."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+#: ../../Code/Module/Admin/Account_edit.php:46
 msgid "Account settings updated."
 msgstr "Account-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+#: ../../Code/Module/Admin/Account_edit.php:61
 msgid "Account not found."
 msgstr "Account niet gevonden."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+#: ../../Code/Module/Admin/Account_edit.php:68
 msgid "Account Edit"
 msgstr "Account bewerken"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+#: ../../Code/Module/Admin/Account_edit.php:69
 msgid "New Password"
 msgstr "Nieuw wachtwoord"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+#: ../../Code/Module/Admin/Account_edit.php:70
 msgid "New Password again"
 msgstr "Nieuw wachtwoord bevestigen"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+#: ../../Code/Module/Admin/Account_edit.php:71
 msgid "Technical skill level"
 msgstr "Technisch niveau"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+#: ../../Code/Module/Admin/Account_edit.php:72
 msgid "Account language (for emails)"
 msgstr "Taal van account (voor e-mails)"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Code/Module/Admin/Account_edit.php:73
 msgid "Service class"
 msgstr "Abonnement"
 
-#: ../../Zotlabs/Module/Admin/Security.php:77
+#: ../../Code/Module/Admin/Security.php:77
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
 msgstr "Standaard is ongefilterde HTML in ingesloten (embedded) media toegestaan. Dit is inherent onveilig."
 
-#: ../../Zotlabs/Module/Admin/Security.php:80
+#: ../../Code/Module/Admin/Security.php:80
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr "Het wordt aanbevolen om alleen ongefilterde HTML van de volgende websites toe te staan:"
 
-#: ../../Zotlabs/Module/Admin/Security.php:81
+#: ../../Code/Module/Admin/Security.php:81
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/
              https://vimeo.com/
              https://soundcloud.com/
              "
 
-#: ../../Zotlabs/Module/Admin/Security.php:82
+#: ../../Code/Module/Admin/Security.php:82
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr "Alle andere ingesloten (embedded) inhoud wordt gefilterd, tenzij ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd."
 
-#: ../../Zotlabs/Module/Admin/Security.php:87
-#: ../../Zotlabs/Widget/Admin.php:25
+#: ../../Code/Module/Admin/Security.php:87
+#: ../../Code/Widget/Admin.php:25
 msgid "Security"
 msgstr "Beveiliging"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
+#: ../../Code/Module/Admin/Security.php:89
 msgid "Block public"
 msgstr "Openbare toegang blokkeren"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
+#: ../../Code/Module/Admin/Security.php:89
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor leden die zich hebben geauthenticeerd."
 
-#: ../../Zotlabs/Module/Admin/Security.php:90
+#: ../../Code/Module/Admin/Security.php:90
 msgid "Set \"Transport Security\" HTTP header"
 msgstr "\"Transport Security\" HTTP-header inschakelen"
 
-#: ../../Zotlabs/Module/Admin/Security.php:91
+#: ../../Code/Module/Admin/Security.php:91
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr " \"Content Security Policy\" HTTP-header inschakelen"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin/Security.php:92
 msgid "Allowed email domains"
 msgstr "Toegestane e-maildomeinen"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin/Security.php:92
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten."
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Code/Module/Admin/Security.php:93
 msgid "Not allowed email domains"
 msgstr "Niet toegestane e-maildomeinen"
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Code/Module/Admin/Security.php:93
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. "
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
+#: ../../Code/Module/Admin/Security.php:94
 msgid "Allow communications only from these sites"
 msgstr "Alleen communicatie met deze hubs toestaan"
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
+#: ../../Code/Module/Admin/Security.php:94
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Eén hub per regel. Laat leeg om communicatie standaard met alle hubs toe te staan"
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
+#: ../../Code/Module/Admin/Security.php:95
 msgid "Block communications from these sites"
 msgstr "Communicatie met deze hubs blokkeren"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid "Allow communications only from these channels"
 msgstr "Sta alleen communicatie toe met deze kanalen"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by "
 "default"
 msgstr "Eén kanaal (hash) per regel. Laat leeg om communicatie standaard met alle kanalen toe te staan"
 
-#: ../../Zotlabs/Module/Admin/Security.php:97
+#: ../../Code/Module/Admin/Security.php:97
 msgid "Block communications from these channels"
 msgstr "Communicatie met deze kanalen blokkeren"
 
-#: ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Code/Module/Admin/Security.php:98
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr "Alleen ingesloten (embedded) inhoud van veilige (SSL) websites en links toestaan."
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Alleen ongefilterde ingesloten (embedded) HTML van deze websites toestaan"
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "One site per line. By default embedded content is filtered."
 msgstr "Eén website per regel. Standaard wordt ingesloten (embedded) inhoud gefilterd."
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
+#: ../../Code/Module/Admin/Security.php:100
 msgid "Block embedded HTML from these domains"
 msgstr "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren"
 
-#: ../../Zotlabs/Module/Lockview.php:75
+#: ../../Code/Module/Lockview.php:75
 msgid "Remote privacy information not available."
 msgstr "Privacy-informatie op afstand niet beschikbaar."
 
-#: ../../Zotlabs/Module/Lockview.php:96
+#: ../../Code/Module/Lockview.php:96
 msgid "Visible to:"
 msgstr "Zichtbaar voor:"
 
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:121 ../../include/acl_selectors.php:88
+#: ../../Code/Module/Lockview.php:117 ../../Code/Module/Lockview.php:153
+#: ../../Code/Module/Acl.php:121 ../../include/acl_selectors.php:88
 msgctxt "acl"
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../../Zotlabs/Module/Moderate.php:65
+#: ../../Code/Module/Moderate.php:65
 msgid "Comment approved"
 msgstr "Reactie goedgekeurd"
 
-#: ../../Zotlabs/Module/Moderate.php:69
+#: ../../Code/Module/Moderate.php:69
 msgid "Comment deleted"
 msgstr "Reactie verwijderd"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:23
+#: ../../Code/Module/Settings/Permcats.php:23
 msgid "Permission Name is required."
 msgstr "Permissienaam is vereist"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:42
+#: ../../Code/Module/Settings/Permcats.php:42
 msgid "Permission category saved."
 msgstr "Permissiegroep opgeslagen."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:66
+#: ../../Code/Module/Settings/Permcats.php:66
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
 msgstr "Gebruik dit formulier om permissieregels voor diverse soorten mensen en connecties aan te maken."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:99
+#: ../../Code/Module/Settings/Permcats.php:99
 msgid "Permission Categories"
 msgstr "Permissiegroepen"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
+#: ../../Code/Module/Settings/Permcats.php:107
 msgid "Permission Name"
 msgstr "Permissienaam"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250
+#: ../../Code/Module/Settings/Permcats.php:108
+#: ../../Code/Module/Settings/Tokens.php:161
+#: ../../Code/Module/Connedit.php:891 ../../Code/Module/Defperms.php:250
 msgid "My Settings"
 msgstr "Mijn instellingen"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248
+#: ../../Code/Module/Settings/Permcats.php:110
+#: ../../Code/Module/Settings/Tokens.php:163
+#: ../../Code/Module/Connedit.php:886 ../../Code/Module/Defperms.php:248
 msgid "inherited"
 msgstr "geërfd"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:113
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253
+#: ../../Code/Module/Settings/Permcats.php:113
+#: ../../Code/Module/Settings/Tokens.php:166
+#: ../../Code/Module/Connedit.php:893 ../../Code/Module/Defperms.php:253
 msgid "Individual Permissions"
 msgstr "Individuele permissies"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:114
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:894
+#: ../../Code/Module/Settings/Permcats.php:114
+#: ../../Code/Module/Settings/Tokens.php:167
+#: ../../Code/Module/Connedit.php:894
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -3429,19 +3429,19 @@ msgid ""
 " settings here."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de privacyinstellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier niet veranderen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:68
-#: ../../Zotlabs/Module/Settings/Channel.php:69
-#: ../../Zotlabs/Module/Settings/Channel.php:72
-#: ../../Zotlabs/Module/Settings/Channel.php:83
-#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24
+#: ../../Code/Module/Settings/Channel.php:64
+#: ../../Code/Module/Settings/Channel.php:68
+#: ../../Code/Module/Settings/Channel.php:69
+#: ../../Code/Module/Settings/Channel.php:72
+#: ../../Code/Module/Settings/Channel.php:83
+#: ../../Code/Module/Connedit.php:711 ../../Code/Widget/Affinity.php:24
 #: ../../include/selectors.php:123 ../../include/channel.php:437
 #: ../../include/channel.php:438 ../../include/channel.php:445
 msgid "Friends"
 msgstr "Vrienden"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:264
-#: ../../Zotlabs/Module/Defperms.php:103
+#: ../../Code/Module/Settings/Channel.php:264
+#: ../../Code/Module/Defperms.php:103
 #: ../../addon/rendezvous/rendezvous.php:82
 #: ../../addon/openstreetmap/openstreetmap.php:184
 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
@@ -3450,958 +3450,958 @@ msgstr "Vrienden"
 msgid "Settings updated."
 msgstr "Instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:325
+#: ../../Code/Module/Settings/Channel.php:325
 msgid "Nobody except yourself"
 msgstr "Niemand, behalve jezelf"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:326
+#: ../../Code/Module/Settings/Channel.php:326
 msgid "Only those you specifically allow"
 msgstr "Alleen connecties met uitdrukkelijke toestemming"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:327
+#: ../../Code/Module/Settings/Channel.php:327
 msgid "Approved connections"
 msgstr "Geaccepteerde connecties"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:328
+#: ../../Code/Module/Settings/Channel.php:328
 msgid "Any connections"
 msgstr "Alle connecties"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:329
+#: ../../Code/Module/Settings/Channel.php:329
 msgid "Anybody on this website"
 msgstr "Iedereen op deze hub"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:330
+#: ../../Code/Module/Settings/Channel.php:330
 msgid "Anybody in this network"
 msgstr "Iedereen in dit netwerk"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:331
+#: ../../Code/Module/Settings/Channel.php:331
 msgid "Anybody authenticated"
 msgstr "Geauthenticeerd"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:332
+#: ../../Code/Module/Settings/Channel.php:332
 msgid "Anybody on the internet"
 msgstr "Iedereen op het internet"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:407
+#: ../../Code/Module/Settings/Channel.php:407
 msgid "Publish your default profile in the network directory"
 msgstr "Publiceer je standaardprofiel in de kanalengids"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:412
+#: ../../Code/Module/Settings/Channel.php:412
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:416
+#: ../../Code/Module/Settings/Channel.php:416
 msgid "or"
 msgstr "of"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:425
+#: ../../Code/Module/Settings/Channel.php:425
 msgid "Your channel address is"
 msgstr "Jouw kanaaladres is"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:428
+#: ../../Code/Module/Settings/Channel.php:428
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "Jouw bestanden/foto's zijn beschikbaar via WebDAV op"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Code/Module/Settings/Channel.php:493
 msgid "Channel Settings"
 msgstr "Kanaalinstellingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Code/Module/Settings/Channel.php:500
 msgid "Basic Settings"
 msgstr "Basis-instellingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../Code/Module/Settings/Channel.php:501
 #: ../../include/channel.php:1521
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:502
-#: ../../Zotlabs/Module/Settings/Account.php:119
+#: ../../Code/Module/Settings/Channel.php:502
+#: ../../Code/Module/Settings/Account.php:119
 msgid "Email Address:"
 msgstr "E-mailadres:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
+#: ../../Code/Module/Settings/Channel.php:503
 msgid "Your Timezone:"
 msgstr "Jouw tijdzone:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Code/Module/Settings/Channel.php:504
 msgid "Default Post Location:"
 msgstr "Standaardlocatie bericht:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Code/Module/Settings/Channel.php:504
 msgid "Geographical location to display on your posts"
 msgstr "Geografische locatie die bij het bericht moet worden vermeld"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
+#: ../../Code/Module/Settings/Channel.php:505
 msgid "Use Browser Location:"
 msgstr "Locatie van webbrowser gebruiken:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Code/Module/Settings/Channel.php:507
 msgid "Adult Content"
 msgstr "Inhoud voor volwassenen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
+#: ../../Code/Module/Settings/Channel.php:507
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Code/Module/Settings/Channel.php:509
 msgid "Security and Privacy Settings"
 msgstr "Veiligheids- en privacyinstellingen "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Code/Module/Settings/Channel.php:511
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Code/Module/Settings/Channel.php:513
 msgid "Hide my online presence"
 msgstr "Verberg mijn aanwezigheid"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
+#: ../../Code/Module/Settings/Channel.php:513
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op $Projectname aanwezig bent"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:515
+#: ../../Code/Module/Settings/Channel.php:515
 msgid "Simple Privacy Settings:"
 msgstr "Eenvoudige privacyinstellingen:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:516
+#: ../../Code/Module/Settings/Channel.php:516
 msgid ""
 "Very Public - extremely permissive (should be used with caution)"
 msgstr "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:517
+#: ../../Code/Module/Settings/Channel.php:517
 msgid ""
 "Typical - default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)"
 msgstr "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Code/Module/Settings/Channel.php:518
 msgid "Private - default private, never open or public"
 msgstr "Privé (standaard privé en nooit openbaar)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Code/Module/Settings/Channel.php:519
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Geblokkeerd (standaard geblokkeerd naar/van iedereen)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid "Allow others to tag your posts"
 msgstr "Anderen toestaan om je berichten te taggen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
+#: ../../Code/Module/Settings/Channel.php:523
 msgid "Channel Permission Limits"
 msgstr "Geavanceerde permissies"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "Expire other channel content after this many days"
 msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "0 or blank to use the website limit."
 msgstr "0 of leeg om het standaard aantal dagen van deze hub te gebruiken."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Deze hub laat de inhoud van andere kanalen na %d dagen verlopen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "This website does not expire imported content."
 msgstr "Deze hub laat de inhoud van andere kanalen niet verlopen."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Wanneer de standaard aantal dagen van deze hub lager ligt dan jouw aantal, dan heeft de limiet van deze hub voorrang."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximum aantal connectieverzoeken per dag:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "May reduce spam activity"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:527
+#: ../../Code/Module/Settings/Channel.php:527
 msgid "Default Privacy Group"
 msgstr "Standaard privacygroep"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
+#: ../../Code/Module/Settings/Channel.php:529
 msgid "Use my default audience setting for the type of object published"
 msgstr "Gebruik mijn standaard privacyinstelling voor dit type publicatie"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Code/Module/Settings/Channel.php:530
 msgid "Profile to assign new connections"
 msgstr "Profiel om aan nieuwe connecties toe te wijzen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Code/Module/Settings/Channel.php:540
 msgid "Default Permissions Group"
 msgstr "Standaard permissiegroep"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Useful to reduce spamming"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Module/Settings/Channel.php:549
+#: ../../Code/Lib/Enotify.php:68
 msgid "Notification Settings"
 msgstr "Meldingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Code/Module/Settings/Channel.php:550
 msgid "By default post a status message when:"
 msgstr "Plaats automatisch een bericht wanneer:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Code/Module/Settings/Channel.php:551
 msgid "accepting a friend request"
 msgstr "Een connectieverzoek wordt geaccepteerd"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Code/Module/Settings/Channel.php:552
 msgid "joining a forum/community"
 msgstr "Je lid wordt van een forum/groep"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Code/Module/Settings/Channel.php:553
 msgid "making an interesting profile change"
 msgstr "Er sprake is van een interessante profielwijziging"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Code/Module/Settings/Channel.php:554
 msgid "Send a notification email when:"
 msgstr "Verzend een melding per e-mail wanneer:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Code/Module/Settings/Channel.php:555
 msgid "You receive a connection request"
 msgstr "Je een connectieverzoek ontvangt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Code/Module/Settings/Channel.php:556
 msgid "Your connections are confirmed"
 msgstr "Jouw connecties zijn bevestigd"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Code/Module/Settings/Channel.php:557
 msgid "Someone writes on your profile wall"
 msgstr "Iemand iets op jouw kanaal heeft geschreven"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Code/Module/Settings/Channel.php:558
 msgid "Someone writes a followup comment"
 msgstr "Iemand een reactie schrijft"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Code/Module/Settings/Channel.php:559
 msgid "You receive a private message"
 msgstr "Je een privé-bericht ontvangt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:560
+#: ../../Code/Module/Settings/Channel.php:560
 msgid "You receive a friend suggestion"
 msgstr "Je een kanaalvoorstel ontvangt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Code/Module/Settings/Channel.php:561
 msgid "You are tagged in a post"
 msgstr "Je expliciet in een bericht bent genoemd"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:562
+#: ../../Code/Module/Settings/Channel.php:562
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Je bent in een bericht aangestoten/gepord/etc."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:564
+#: ../../Code/Module/Settings/Channel.php:564
 msgid "Someone likes your post/comment"
 msgstr "Iemand jouw bericht/reactie leuk vindt"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Code/Module/Settings/Channel.php:567
 msgid "Show visual notifications including:"
 msgstr "Toon de volgende zichtbare meldingen:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Code/Module/Settings/Channel.php:569
 msgid "Unseen grid activity"
 msgstr "Niet bekeken tijdlijnactiviteit"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Code/Module/Settings/Channel.php:570
 msgid "Unseen channel activity"
 msgstr "Niet bekeken kanaalactiviteit"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:571
 msgid "Unseen private messages"
 msgstr "Niet bekeken privéberichten"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-#: ../../Zotlabs/Module/Settings/Channel.php:577
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:578
 #: ../../addon/jappixmini/jappixmini.php:343
 msgid "Recommended"
 msgstr "Aanbevolen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Code/Module/Settings/Channel.php:572
 msgid "Upcoming events"
 msgstr "Aankomende gebeurtenissen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Code/Module/Settings/Channel.php:573
 msgid "Events today"
 msgstr "Gebeurtenissen van vandaag"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "Upcoming birthdays"
 msgstr "Aankomende verjaardagen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "Not available in all themes"
 msgstr "Niet in alle thema's beschikbaar"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Code/Module/Settings/Channel.php:575
 msgid "System (personal) notifications"
 msgstr "(Persoonlijke) systeemmeldingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:576
 msgid "System info messages"
 msgstr "Systeemmededelingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:577
 msgid "System critical alerts"
 msgstr "Kritische systeemwaarschuwingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:578
 msgid "New connections"
 msgstr "Nieuwe connecties"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Code/Module/Settings/Channel.php:579
 msgid "System Registrations"
 msgstr "Nieuwe accountregistraties op deze hub"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Code/Module/Settings/Channel.php:580
 msgid "Unseen shared files"
 msgstr "Niet bekeken gedeelde bestanden"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Code/Module/Settings/Channel.php:581
 msgid "Unseen public activity"
 msgstr "Niet bekeken openbare activiteit"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Code/Module/Settings/Channel.php:582
 msgid "Unseen likes and dislikes"
 msgstr "Niet bekeken vind-ik-leuks en vind-ik-niet-leuks"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 msgid "Email notification hub (hostname)"
 msgstr "Hub voor e-mailmeldingen (hostnaam)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple hubs, set this to your preferred "
 "location. This will prevent duplicate email notifications. Example: %s"
 msgstr "Wanneer jouw kanaal naar een of meerdere hubs is gekloond, kun je hier bepalen welke hub je voor e-mailmeldingen wilt gebruiken. Dit voorkomt dubbele e-mailmeldingen. Voorbeeld:%s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:584
+#: ../../Code/Module/Settings/Channel.php:584
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr "Toon nieuwe kanaalberichten, privéberichten en connecties onder Meldingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Code/Module/Settings/Channel.php:586
 msgid "Notify me of events this many days in advance"
 msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:586
+#: ../../Code/Module/Settings/Channel.php:586
 msgid "Must be greater than 0"
 msgstr "Moet hoger dan 0 zijn"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:592
 msgid "Advanced Account/Page Type Settings"
 msgstr "Instellingen geavanceerd account/paginatype"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Code/Module/Settings/Channel.php:593
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verander het gedrag van dit account voor speciale situaties"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Miscellaneous Settings"
 msgstr "Diverse instellingen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:596
 msgid "Default photo upload folder"
 msgstr "Standaard fotoalbum voor uploads"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - dit jaar, %m -  deze maand"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "Default file upload folder"
 msgstr "Standaard bestandsmap voor uploads"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Code/Module/Settings/Channel.php:599
 msgid "Personal menu to display in your channel pages"
 msgstr "Persoonlijk menu om op je kanaalpagina's te tonen"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Code/Module/Settings/Channel.php:601
 msgid "Remove this channel."
 msgstr "Verwijder dit kanaal."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:602
+#: ../../Code/Module/Settings/Channel.php:602
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-service voor Firefox Share"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:603
+#: ../../Code/Module/Settings/Channel.php:603
 msgid "Start calendar week on Monday"
 msgstr "Begin kalenderweek op maandag"
 
-#: ../../Zotlabs/Module/Settings/Features.php:73
+#: ../../Code/Module/Settings/Features.php:73
 msgid "Additional Features"
 msgstr "Extra functies"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid "Your technical skill level"
 msgstr "Jouw technisch niveau"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid ""
 "Used to provide a member experience and additional features consistent with "
 "your comfort level"
 msgstr "Wordt gebruikt om je een gebruikerservaring en extra functies te bieden die met jouw technisch niveau overeenkomt"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#: ../../Code/Module/Settings/Tokens.php:31
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Dit kanaal heeft een limiet van %d tokens"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
+#: ../../Code/Module/Settings/Tokens.php:37
 msgid "Name and Password are required."
 msgstr "Naam en wachtwoord zijn vereist"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
+#: ../../Code/Module/Settings/Tokens.php:77
 msgid "Token saved."
 msgstr "Token opgeslagen."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
+#: ../../Code/Module/Settings/Tokens.php:113
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
 "visitors may login using these credentials to access private content."
 msgstr "Gebruik dit formulier om tijdelijke identiteiten aan te maken, waarmee je bepaalde informatie met niet-leden kan delen. Deze identiteiten kunnen onder Permissies (handmatige selectie) worden gebruikt. Gasten kunnen inloggen met onderstaande gegevens om zo toegang te krijgen tot privéinhoud."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
+#: ../../Code/Module/Settings/Tokens.php:115
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
 "Examples:"
 msgstr "Je kan ook dropbox-achtige links aan mensen geven door bovenstaand wachtwoord op onderstaande manier aan een hub-URL toe te voegen. Voorbeelden:"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:100
+#: ../../Code/Module/Settings/Tokens.php:150
+#: ../../Code/Widget/Settings_menu.php:100
 msgid "Guest Access Tokens"
 msgstr "Gasttoegang"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
+#: ../../Code/Module/Settings/Tokens.php:157
 msgid "Login Name"
 msgstr "Inlognaam"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
+#: ../../Code/Module/Settings/Tokens.php:158
 msgid "Login Password"
 msgstr "Wachtwoord:"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
+#: ../../Code/Module/Settings/Tokens.php:159
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Geldig t/m (yyyy-mm-dd)"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:890
+#: ../../Code/Module/Settings/Tokens.php:160
+#: ../../Code/Module/Connedit.php:890
 msgid "Their Settings"
 msgstr "Hun instellingen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:35
+#: ../../Code/Module/Settings/Oauth2.php:35
 msgid "Name and Secret are required"
 msgstr "Naam en secret zijn vereist"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:83
+#: ../../Code/Module/Settings/Oauth2.php:83
 msgid "Add OAuth2 application"
 msgstr "OAuth2-applicatie toevoegen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:90
 msgid "Name of application"
 msgstr "Naam van applicatie"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth.php:118
 #: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
 msgid "Consumer Secret"
 msgstr "Consumer secret"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:92
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth.php:119
 msgid "Redirect"
 msgstr "Redirect/doorverwijzing"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:93
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:117
 msgid "Grant Types"
 msgstr "Grant-types"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "leave blank unless your application sepcifically requires this"
 msgstr "laat leeg, behalve wanneer de applicatie dit vereist"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "Authorization scope"
 msgstr "Autorisatie-scope "
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:102
+#: ../../Code/Module/Settings/Oauth2.php:102
 msgid "OAuth2 Application not found."
 msgstr "OAuth2-applicatie niet gevonden."
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:111
-#: ../../Zotlabs/Module/Settings/Oauth2.php:148
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
+#: ../../Code/Module/Settings/Oauth2.php:111
+#: ../../Code/Module/Settings/Oauth2.php:148
+#: ../../Code/Module/Settings/Oauth.php:87
+#: ../../Code/Module/Settings/Oauth.php:113
+#: ../../Code/Module/Settings/Oauth.php:149
 msgid "Add application"
 msgstr "Applicatie toevoegen"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:147
+#: ../../Code/Module/Settings/Oauth2.php:147
 msgid "Connected OAuth2 Apps"
 msgstr "Verbonden OAuth2-applicaties"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:151
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
+#: ../../Code/Module/Settings/Oauth2.php:151
+#: ../../Code/Module/Settings/Oauth.php:152
 msgid "Client key starts with"
 msgstr "Client key begint met"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:152
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
+#: ../../Code/Module/Settings/Oauth2.php:152
+#: ../../Code/Module/Settings/Oauth.php:153
 msgid "No name"
 msgstr "Geen naam"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:153
-#: ../../Zotlabs/Module/Settings/Oauth.php:154
+#: ../../Code/Module/Settings/Oauth2.php:153
+#: ../../Code/Module/Settings/Oauth.php:154
 msgid "Remove authorization"
 msgstr "Autorisatie verwijderen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:20
+#: ../../Code/Module/Settings/Account.php:20
 msgid "Not valid email."
 msgstr "Geen geldig e-mailadres."
 
-#: ../../Zotlabs/Module/Settings/Account.php:23
+#: ../../Code/Module/Settings/Account.php:23
 msgid "Protected email address. Cannot change to that email."
 msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."
 
-#: ../../Zotlabs/Module/Settings/Account.php:32
+#: ../../Code/Module/Settings/Account.php:32
 msgid "System failure storing new email. Please try again."
 msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."
 
-#: ../../Zotlabs/Module/Settings/Account.php:40
+#: ../../Code/Module/Settings/Account.php:40
 msgid "Technical skill level updated"
 msgstr "Technisch niveau bijgewerkt"
 
-#: ../../Zotlabs/Module/Settings/Account.php:56
+#: ../../Code/Module/Settings/Account.php:56
 msgid "Password verification failed."
 msgstr "Wachtwoordverificatie mislukt"
 
-#: ../../Zotlabs/Module/Settings/Account.php:63
+#: ../../Code/Module/Settings/Account.php:63
 msgid "Passwords do not match. Password unchanged."
 msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."
 
-#: ../../Zotlabs/Module/Settings/Account.php:67
+#: ../../Code/Module/Settings/Account.php:67
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."
 
-#: ../../Zotlabs/Module/Settings/Account.php:81
+#: ../../Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr "Wachtwoord veranderd."
 
-#: ../../Zotlabs/Module/Settings/Account.php:83
+#: ../../Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw."
 
-#: ../../Zotlabs/Module/Settings/Account.php:112
+#: ../../Code/Module/Settings/Account.php:112
 msgid "Account Settings"
 msgstr "Account-instellingen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:113
+#: ../../Code/Module/Settings/Account.php:113
 msgid "Current Password"
 msgstr "Huidig wachtwoord"
 
-#: ../../Zotlabs/Module/Settings/Account.php:114
+#: ../../Code/Module/Settings/Account.php:114
 msgid "Enter New Password"
 msgstr "Nieuw wachtwoord invoeren"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Confirm New Password"
 msgstr "Nieuw wachtwoord bevestigen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Leave password fields blank unless changing"
 msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:120
-#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Code/Module/Settings/Account.php:120
+#: ../../Code/Module/Removeaccount.php:61
 msgid "Remove Account"
 msgstr "Account verwijderen"
 
-#: ../../Zotlabs/Module/Settings/Account.php:121
+#: ../../Code/Module/Settings/Account.php:121
 msgid "Remove this account including all its channels"
 msgstr "Dit account en al zijn kanalen verwijderen"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:23
+#: ../../Code/Module/Settings/Featured.php:23
 msgid "Affinity Slider settings updated."
 msgstr "Affiniteitsinstellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:38
+#: ../../Code/Module/Settings/Featured.php:38
 msgid "No feature settings configured"
 msgstr "Geen plug-in-instellingen aanwezig"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "Default maximum affinity level"
 msgstr "Standaard hoogste affiniteitsniveau"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "0-99 default 99"
 msgstr "0-99 - standaard 99"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "Default minimum affinity level"
 msgstr "Standaard laagste affiniteitsniveau"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "0-99 - default 0"
 msgstr "0-99 - standaard 0"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Featured.php:54
 msgid "Affinity Slider Settings"
 msgstr "Affiniteitsinstellingen"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:67
+#: ../../Code/Module/Settings/Featured.php:67
 msgid "Addon Settings"
 msgstr "Plug-ins"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:68
+#: ../../Code/Module/Settings/Featured.php:68
 msgid "Please save/submit changes to any panel before opening another."
 msgstr "Gewijzigde instellingen van een plug-in opslaan alvorens een nieuwe plug-in te openen."
 
-#: ../../Zotlabs/Module/Settings/Display.php:139
+#: ../../Code/Module/Settings/Display.php:139
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (experimenteel)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:187
+#: ../../Code/Module/Settings/Display.php:187
 msgid "Display Settings"
 msgstr "Weergave-instellingen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Code/Module/Settings/Display.php:188
 msgid "Theme Settings"
 msgstr "Thema-instellingen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Code/Module/Settings/Display.php:189
 msgid "Custom Theme Settings"
 msgstr "Handmatige thema-instellingen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Code/Module/Settings/Display.php:190
 msgid "Content Settings"
 msgstr "Inhoudsinstellingen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Code/Module/Settings/Display.php:196
 msgid "Display Theme:"
 msgstr "Gebruik thema:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Code/Module/Settings/Display.php:197
 msgid "Select scheme"
 msgstr "Kies schema van thema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid "Preload images before rendering the page"
 msgstr "Afbeeldingen laden voordat de pagina wordt getoond"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "De laadtijd van een pagina lijkt langer, maar de pagina is wel meteen helemaal geladen wanneer deze wordt getoond"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
+#: ../../Code/Module/Settings/Display.php:200
 msgid "Enable user zoom on mobile devices"
 msgstr "Inzoomen op smartphones en tablets toestaan"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Update browser every xx seconds"
 msgstr "Ververs de webbrowser om de zoveel seconde"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimaal 10 seconde, geen maximum"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximaal aantal conversaties die per keer geladen worden:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum of 100 items"
 msgstr "Maximaal 100 conversaties"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Code/Module/Settings/Display.php:203
 msgid "Show emoticons (smilies) as images"
 msgstr "Toon emoticons (smilies) als afbeeldingen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Provide channel menu in navigation bar"
 msgstr "Kanaalmenu op navigatiebalk tonen"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Default: channel menu located in app menu"
 msgstr "Standaard valt het kanaalmenu in het appmenu te vinden"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Manual conversation updates"
 msgstr "Handmatige conversatie-updates"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Default is on, turning this off may increase screen jumping"
 msgstr "Dit is standaard ingeschakeld en door dit uit te schakelen kunnen items soms verspringen."
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Code/Module/Settings/Display.php:206
 msgid "Link post titles to source"
 msgstr "Berichtkoppen naar originele locatie linken"
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
+#: ../../Code/Module/Settings/Display.php:207
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Lay-out bewerken van systeempagina's (geavanceerd)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:210
 msgid "Use blog/list mode on channel page"
 msgstr "Gebruik blog/lijst-modus op kanaalpagina"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:211
 msgid "(comments displayed separately)"
 msgstr "(reacties worden afzonderlijk getoond)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:211
 msgid "Use blog/list mode on grid page"
 msgstr "Gebruik blog/lijst-modus op jouw kanaalpagina"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:212
 msgid "Channel page max height of content (in pixels)"
 msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:213
 msgid "click to expand content exceeding this height"
 msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt"
 
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:213
 msgid "Grid page max height of content (in pixels)"
 msgstr "Maximale hoogte berichtinhoud (in pixels)"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:35
+#: ../../Code/Module/Settings/Oauth.php:35
 msgid "Name is required"
 msgstr "Naam is vereist"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:39
+#: ../../Code/Module/Settings/Oauth.php:39
 msgid "Key and Secret are required"
 msgstr "Key en secret zijn vereist"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:117
 #: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781
 msgid "Consumer Key"
 msgstr "Consumer key"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Settings/Oauth.php:120
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Settings/Oauth.php:120
 msgid "Icon url"
 msgstr "Pictogram-URL"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid "Optional"
 msgstr "Niet verplicht"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:105
+#: ../../Code/Module/Settings/Oauth.php:105
 msgid "Application not found."
 msgstr "Applicatie niet gevonden."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
+#: ../../Code/Module/Settings/Oauth.php:148
 msgid "Connected Apps"
 msgstr "Verbonden applicaties"
 
-#: ../../Zotlabs/Module/Embedphotos.php:140
-#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350
-#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
+#: ../../Code/Module/Embedphotos.php:140
+#: ../../Code/Module/Photos.php:811 ../../Code/Module/Photos.php:1350
+#: ../../Code/Widget/Portfolio.php:87 ../../Code/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Foto tonen"
 
-#: ../../Zotlabs/Module/Embedphotos.php:156
-#: ../../Zotlabs/Module/Photos.php:842 ../../Zotlabs/Widget/Portfolio.php:108
-#: ../../Zotlabs/Widget/Album.php:95
+#: ../../Code/Module/Embedphotos.php:156
+#: ../../Code/Module/Photos.php:842 ../../Code/Widget/Portfolio.php:108
+#: ../../Code/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Album bewerken"
 
-#: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Module/Photos.php:712
-#: ../../Zotlabs/Module/Profile_photo.php:458
-#: ../../Zotlabs/Module/Cover_photo.php:362
-#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133
-#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Widget/Album.php:97
+#: ../../Code/Module/Embedphotos.php:158
+#: ../../Code/Module/Photos.php:712
+#: ../../Code/Module/Profile_photo.php:458
+#: ../../Code/Module/Cover_photo.php:362
+#: ../../Code/Storage/Browser.php:384 ../../Code/Widget/Cdav.php:133
+#: ../../Code/Widget/Cdav.php:169 ../../Code/Widget/Portfolio.php:110
+#: ../../Code/Widget/Album.php:97
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../Zotlabs/Module/Achievements.php:38
+#: ../../Code/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr "Welkom op $Projectname. Klik op de tab ontdekken of klik rechtsboven op de kanalengids, om kanalen te vinden. Rechtsboven vind je ook apps, waar je vrijwel alle functies van $Projectname kunt vinden. Voor hulp met $Projectname klik je op het vraagteken."
 
-#: ../../Zotlabs/Module/Thing.php:120
+#: ../../Code/Module/Thing.php:120
 msgid "Thing updated"
 msgstr "Ding bijgewerkt"
 
-#: ../../Zotlabs/Module/Thing.php:172
+#: ../../Code/Module/Thing.php:172
 msgid "Object store: failed"
 msgstr "Opslaan van ding mislukt"
 
-#: ../../Zotlabs/Module/Thing.php:176
+#: ../../Code/Module/Thing.php:176
 msgid "Thing added"
 msgstr "Ding toegevoegd"
 
-#: ../../Zotlabs/Module/Thing.php:202
+#: ../../Code/Module/Thing.php:202
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Thing.php:265
+#: ../../Code/Module/Thing.php:265
 msgid "Show Thing"
 msgstr "Ding tonen"
 
-#: ../../Zotlabs/Module/Thing.php:272
+#: ../../Code/Module/Thing.php:272
 msgid "item not found."
 msgstr "Item niet gevonden"
 
-#: ../../Zotlabs/Module/Thing.php:305
+#: ../../Code/Module/Thing.php:305
 msgid "Edit Thing"
 msgstr "Ding bewerken"
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364
+#: ../../Code/Module/Thing.php:307 ../../Code/Module/Thing.php:364
 msgid "Select a profile"
 msgstr "Kies een profiel"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Post an activity"
 msgstr "Plaats een bericht"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien."
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+#: ../../Code/Module/Thing.php:313 ../../Code/Module/Thing.php:369
 msgid "Name of thing e.g. something"
 msgstr "Naam van ding"
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370
+#: ../../Code/Module/Thing.php:315 ../../Code/Module/Thing.php:370
 msgid "URL of thing (optional)"
 msgstr "URL van ding (niet verplicht)"
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371
+#: ../../Code/Module/Thing.php:317 ../../Code/Module/Thing.php:371
 msgid "URL for photo of thing (optional)"
 msgstr "URL voor foto van ding (niet verplicht)"
 
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071
-#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
-#: ../../Zotlabs/Module/Filestorage.php:147
+#: ../../Code/Module/Thing.php:319 ../../Code/Module/Thing.php:372
+#: ../../Code/Module/Photos.php:702 ../../Code/Module/Photos.php:1071
+#: ../../Code/Module/Connedit.php:676 ../../Code/Module/Chat.php:235
+#: ../../Code/Module/Filestorage.php:147
 #: ../../include/acl_selectors.php:123
 msgid "Permissions"
 msgstr "Permissies"
 
-#: ../../Zotlabs/Module/Thing.php:362
+#: ../../Code/Module/Thing.php:362
 msgid "Add Thing to your Profile"
 msgstr "Ding aan je profiel toevoegen"
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:57
+#: ../../Code/Module/Notify.php:61
+#: ../../Code/Module/Notifications.php:57
 msgid "No more system notifications."
 msgstr "Geen systeemmeldingen meer."
 
-#: ../../Zotlabs/Module/Notify.php:65
-#: ../../Zotlabs/Module/Notifications.php:61
+#: ../../Code/Module/Notify.php:65
+#: ../../Code/Module/Notifications.php:61
 msgid "System Notifications"
 msgstr "Systeemmeldingen"
 
-#: ../../Zotlabs/Module/Follow.php:36
+#: ../../Code/Module/Follow.php:36
 msgid "Connection added."
 msgstr "Connectie toegevoegd."
 
-#: ../../Zotlabs/Module/Import.php:144
+#: ../../Code/Module/Import.php:144
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Jouw abonnement staat maar %d kanalen toe."
 
-#: ../../Zotlabs/Module/Import.php:158
+#: ../../Code/Module/Import.php:158
 msgid "No channel. Import failed."
 msgstr "Geen kanaal. Importeren mislukt."
 
-#: ../../Zotlabs/Module/Import.php:482
+#: ../../Code/Module/Import.php:482
 #: ../../addon/diaspora/import_diaspora.php:139
 msgid "Import completed."
 msgstr "Import voltooid."
 
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Code/Module/Import.php:510
 msgid "You must be logged in to use this feature."
 msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
 
-#: ../../Zotlabs/Module/Import.php:515
+#: ../../Code/Module/Import.php:515
 msgid "Import Channel"
 msgstr "Kanaal importeren"
 
-#: ../../Zotlabs/Module/Import.php:516
+#: ../../Code/Module/Import.php:516
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaalidentiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
 
-#: ../../Zotlabs/Module/Import.php:518
+#: ../../Code/Module/Import.php:518
 msgid "Or provide the old server/hub details"
 msgstr "Of vul de gegevens van de oude hub in"
 
-#: ../../Zotlabs/Module/Import.php:519
+#: ../../Code/Module/Import.php:519
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Jouw oude kanaaladres (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:520
+#: ../../Code/Module/Import.php:520
 msgid "Your old login email address"
 msgstr "Het e-mailadres van je oude account"
 
-#: ../../Zotlabs/Module/Import.php:521
+#: ../../Code/Module/Import.php:521
 msgid "Your old login password"
 msgstr "Wachtwoord van jouw oude account"
 
-#: ../../Zotlabs/Module/Import.php:522
+#: ../../Code/Module/Import.php:522
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -4409,508 +4409,508 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
 
-#: ../../Zotlabs/Module/Import.php:523
+#: ../../Code/Module/Import.php:523
 msgid "Make this hub my primary location"
 msgstr "Stel deze hub als mijn primaire locatie in"
 
-#: ../../Zotlabs/Module/Import.php:524
+#: ../../Code/Module/Import.php:524
 msgid "Move this channel (disable all previous locations)"
 msgstr "Verplaats dit kanaal (schakelt alle voormalige locaties uit)"
 
-#: ../../Zotlabs/Module/Import.php:525
+#: ../../Code/Module/Import.php:525
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importeer enkele maanden aan berichten wanneer mogelijk (afhankelijk van hoeveelheid geheugen hub)"
 
-#: ../../Zotlabs/Module/Import.php:526
+#: ../../Code/Module/Import.php:526
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
 msgstr "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid."
 
-#: ../../Zotlabs/Module/Rmagic.php:35
+#: ../../Code/Module/Rmagic.php:35
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590
+#: ../../Code/Module/Rmagic.php:75 ../../boot.php:1590
 #: ../../include/channel.php:2318
 msgid "Remote Authentication"
 msgstr "Authenticatie op afstand"
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319
+#: ../../Code/Module/Rmagic.php:76 ../../include/channel.php:2319
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320
+#: ../../Code/Module/Rmagic.php:77 ../../include/channel.php:2320
 msgid "Authenticate"
 msgstr "Authenticeren"
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Code/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Permissies niet toegestaan"
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2446
+#: ../../Code/Module/Cal.php:344 ../../include/text.php:2446
 msgid "Import"
 msgstr "Importeren"
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+#: ../../Code/Module/Api.php:74 ../../Code/Module/Api.php:95
 msgid "Authorize application connection"
 msgstr "Geef toestemming voor applicatiekoppeling"
 
-#: ../../Zotlabs/Module/Api.php:75
+#: ../../Code/Module/Api.php:75
 msgid "Return to your app and insert this Security Code:"
 msgstr "Ga terug naar je app en voeg deze beveiligingscode in:"
 
-#: ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:85
 msgid "Please login to continue."
 msgstr "Inloggen om verder te kunnen gaan."
 
-#: ../../Zotlabs/Module/Api.php:97
+#: ../../Code/Module/Api.php:97
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
 msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Item is niet aanwezig."
 
-#: ../../Zotlabs/Module/Editblock.php:138
+#: ../../Code/Module/Editblock.php:138
 msgid "Edit Block"
 msgstr "Blok bewerken"
 
-#: ../../Zotlabs/Module/Profile.php:93
+#: ../../Code/Module/Profile.php:93
 msgid "vcard"
 msgstr "vcard"
 
-#: ../../Zotlabs/Module/Apps.php:48 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Code/Module/Apps.php:48 ../../Code/Lib/Apps.php:228
 msgid "Apps"
 msgstr "Apps"
 
-#: ../../Zotlabs/Module/Apps.php:51
+#: ../../Code/Module/Apps.php:51
 msgid "Manage apps"
 msgstr "Apps beheren"
 
-#: ../../Zotlabs/Module/Apps.php:52
+#: ../../Code/Module/Apps.php:52
 msgid "Create new app"
 msgstr "Nieuwe app aanmaken"
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268
+#: ../../Code/Module/Mood.php:67 ../../include/conversation.php:268
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s is %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:253
+#: ../../Code/Module/Mood.php:135 ../../Code/Lib/Apps.php:253
 msgid "Mood"
 msgstr "Stemming"
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Code/Module/Mood.php:136
 msgid "Set your current mood and tell your friends"
 msgstr "Noteer je huidige stemming en toon het aan je connecties"
 
-#: ../../Zotlabs/Module/Connections.php:55
-#: ../../Zotlabs/Module/Connections.php:112
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Code/Module/Connections.php:55
+#: ../../Code/Module/Connections.php:112
+#: ../../Code/Module/Connections.php:256
 msgid "Active"
 msgstr "Actief"
 
-#: ../../Zotlabs/Module/Connections.php:60
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Code/Module/Connections.php:60
+#: ../../Code/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:261
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: ../../Zotlabs/Module/Connections.php:65
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Code/Module/Connections.php:65
+#: ../../Code/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:260
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: ../../Zotlabs/Module/Connections.php:70
-#: ../../Zotlabs/Module/Connections.php:185
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Code/Module/Connections.php:70
+#: ../../Code/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:259
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../../Zotlabs/Module/Connections.php:75
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:75
+#: ../../Code/Module/Connections.php:178
 msgid "Archived/Unreachable"
 msgstr "Gearchiveerd/onbereikbaar"
 
-#: ../../Zotlabs/Module/Connections.php:80
-#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116
-#: ../../Zotlabs/Module/Notifications.php:52
+#: ../../Code/Module/Connections.php:80
+#: ../../Code/Module/Connections.php:89 ../../Code/Module/Menu.php:116
+#: ../../Code/Module/Notifications.php:52
 #: ../../include/conversation.php:1717
 msgid "New"
 msgstr "Nieuw"
 
-#: ../../Zotlabs/Module/Connections.php:94
-#: ../../Zotlabs/Module/Connections.php:108
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
+#: ../../Code/Module/Connections.php:94
+#: ../../Code/Module/Connections.php:108
+#: ../../Code/Module/Connedit.php:713 ../../Code/Widget/Affinity.php:26
 msgid "All"
 msgstr "Alles"
 
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Code/Module/Connections.php:140
 msgid "Active Connections"
 msgstr "Actieve connecties"
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Code/Module/Connections.php:143
 msgid "Show active connections"
 msgstr "Actieve connecties tonen"
 
-#: ../../Zotlabs/Module/Connections.php:147
-#: ../../Zotlabs/Widget/Notifications.php:84
+#: ../../Code/Module/Connections.php:147
+#: ../../Code/Widget/Notifications.php:84
 msgid "New Connections"
 msgstr "Nieuwe connecties"
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Code/Module/Connections.php:150
 msgid "Show pending (new) connections"
 msgstr "Nog te accepteren (nieuwe) connecties tonen"
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Code/Module/Connections.php:167
 msgid "Only show blocked connections"
 msgstr "Toon alleen geblokkeerde connecties"
 
-#: ../../Zotlabs/Module/Connections.php:174
+#: ../../Code/Module/Connections.php:174
 msgid "Only show ignored connections"
 msgstr "Toon alleen genegeerde connecties"
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Code/Module/Connections.php:181
 msgid "Only show archived/unreachable connections"
 msgstr "Alleen gearchiveerde/onbereikbare connecties tonen"
 
-#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Code/Module/Connections.php:188
 msgid "Only show hidden connections"
 msgstr "Toon alleen verborgen connecties"
 
-#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Code/Module/Connections.php:203
 msgid "Show all connections"
 msgstr "Toon alle connecties"
 
-#: ../../Zotlabs/Module/Connections.php:257
+#: ../../Code/Module/Connections.php:257
 msgid "Pending approval"
 msgstr "Moet nog geaccepteerd worden"
 
-#: ../../Zotlabs/Module/Connections.php:258
+#: ../../Code/Module/Connections.php:258
 msgid "Archived"
 msgstr "Gearchiveerd"
 
-#: ../../Zotlabs/Module/Connections.php:262
+#: ../../Code/Module/Connections.php:262
 msgid "Not connected at this location"
 msgstr "Niet op deze locatie verbonden"
 
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Code/Module/Connections.php:279
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Code/Module/Connections.php:280
 msgid "Edit connection"
 msgstr "Connectie bewerken"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Code/Module/Connections.php:282
 msgid "Delete connection"
 msgstr "Connectie verwijderen"
 
-#: ../../Zotlabs/Module/Connections.php:291
+#: ../../Code/Module/Connections.php:291
 msgid "Channel address"
 msgstr "Kanaaladres"
 
-#: ../../Zotlabs/Module/Connections.php:293
+#: ../../Code/Module/Connections.php:293
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Code/Module/Connections.php:296
 msgid "Call"
 msgstr "Bellen"
 
-#: ../../Zotlabs/Module/Connections.php:298
+#: ../../Code/Module/Connections.php:298
 msgid "Status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Code/Module/Connections.php:300
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../../Zotlabs/Module/Connections.php:302
+#: ../../Code/Module/Connections.php:302
 msgid "Approve connection"
 msgstr "Connectie accepteren"
 
-#: ../../Zotlabs/Module/Connections.php:304
+#: ../../Code/Module/Connections.php:304
 msgid "Ignore connection"
 msgstr "Connectie negeren"
 
-#: ../../Zotlabs/Module/Connections.php:305
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connections.php:305
+#: ../../Code/Module/Connedit.php:630
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../../Zotlabs/Module/Connections.php:306
+#: ../../Code/Module/Connections.php:306
 msgid "Recent activity"
 msgstr "Recente activiteit"
 
-#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235
+#: ../../Code/Module/Connections.php:331 ../../Code/Lib/Apps.php:235
 #: ../../include/text.php:973
 msgid "Connections"
 msgstr "Connecties"
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Code/Module/Connections.php:336
 msgid "Search your connections"
 msgstr "Doorzoek jouw connecties"
 
-#: ../../Zotlabs/Module/Connections.php:337
+#: ../../Code/Module/Connections.php:337
 msgid "Connections search"
 msgstr "Connecties zoeken"
 
-#: ../../Zotlabs/Module/Connections.php:338
-#: ../../Zotlabs/Module/Directory.php:401
-#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23
+#: ../../Code/Module/Connections.php:338
+#: ../../Code/Module/Directory.php:401
+#: ../../Code/Module/Directory.php:406 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Vinden"
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
+#: ../../Code/Module/Viewsrc.php:43
 msgid "item"
 msgstr "item"
 
-#: ../../Zotlabs/Module/Viewsrc.php:55
+#: ../../Code/Module/Viewsrc.php:55
 msgid "Source of Item"
 msgstr "Bron van item"
 
-#: ../../Zotlabs/Module/Bookmarks.php:56
+#: ../../Code/Module/Bookmarks.php:56
 msgid "Bookmark added"
 msgstr "Bladwijzer toegevoegd"
 
-#: ../../Zotlabs/Module/Bookmarks.php:79
+#: ../../Code/Module/Bookmarks.php:79
 msgid "My Bookmarks"
 msgstr "Mijn bladwijzers"
 
-#: ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../Code/Module/Bookmarks.php:90
 msgid "My Connections Bookmarks"
 msgstr "Bladwijzers van mijn connecties"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../Code/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Verwijder dit account"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Dit account en al zijn kanalen worden volledig uit het $Projectname-netwerk verwijderd."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het $Projectname-netwerk verwijderen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het $Projectname-netwerk verwijderd"
 
-#: ../../Zotlabs/Module/Photos.php:78
+#: ../../Code/Module/Photos.php:78
 msgid "Page owner information could not be retrieved."
 msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
 
-#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
+#: ../../Code/Module/Photos.php:94 ../../Code/Module/Photos.php:120
 msgid "Album not found."
 msgstr "Album niet gevonden."
 
-#: ../../Zotlabs/Module/Photos.php:103
+#: ../../Code/Module/Photos.php:103
 msgid "Delete Album"
 msgstr "Verwijder album"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1083
+#: ../../Code/Module/Photos.php:174 ../../Code/Module/Photos.php:1083
 msgid "Delete Photo"
 msgstr "Verwijder foto"
 
-#: ../../Zotlabs/Module/Photos.php:551
+#: ../../Code/Module/Photos.php:551
 msgid "No photos selected"
 msgstr "Geen foto's geselecteerd"
 
-#: ../../Zotlabs/Module/Photos.php:600
+#: ../../Code/Module/Photos.php:600
 msgid "Access to this item is restricted."
 msgstr "Toegang tot dit item is beperkt."
 
-#: ../../Zotlabs/Module/Photos.php:646
+#: ../../Code/Module/Photos.php:646
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
 
-#: ../../Zotlabs/Module/Photos.php:649
+#: ../../Code/Module/Photos.php:649
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB aan foto-opslag gebruikt."
 
-#: ../../Zotlabs/Module/Photos.php:691
+#: ../../Code/Module/Photos.php:691
 msgid "Upload Photos"
 msgstr "Foto's uploaden"
 
-#: ../../Zotlabs/Module/Photos.php:695
+#: ../../Code/Module/Photos.php:695
 msgid "Enter an album name"
 msgstr "Vul een albumnaam in"
 
-#: ../../Zotlabs/Module/Photos.php:696
+#: ../../Code/Module/Photos.php:696
 msgid "or select an existing album (doubleclick)"
 msgstr "of kies een bestaand album (dubbelklikken)"
 
-#: ../../Zotlabs/Module/Photos.php:697
+#: ../../Code/Module/Photos.php:697
 msgid "Create a status post for this upload"
 msgstr "Plaats een bericht voor deze upload."
 
-#: ../../Zotlabs/Module/Photos.php:699
+#: ../../Code/Module/Photos.php:699
 msgid "Description (optional)"
 msgstr "Omschrijving (niet verplicht)"
 
-#: ../../Zotlabs/Module/Photos.php:785
+#: ../../Code/Module/Photos.php:785
 msgid "Show Newest First"
 msgstr "Nieuwste eerst tonen"
 
-#: ../../Zotlabs/Module/Photos.php:787
+#: ../../Code/Module/Photos.php:787
 msgid "Show Oldest First"
 msgstr "Oudste eerst tonen"
 
-#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381
+#: ../../Code/Module/Photos.php:844 ../../Code/Module/Photos.php:1381
 msgid "Add Photos"
 msgstr "Foto's toevoegen"
 
-#: ../../Zotlabs/Module/Photos.php:892
+#: ../../Code/Module/Photos.php:892
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
 
-#: ../../Zotlabs/Module/Photos.php:894
+#: ../../Code/Module/Photos.php:894
 msgid "Photo not available"
 msgstr "Foto niet aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:952
+#: ../../Code/Module/Photos.php:952
 msgid "Use as profile photo"
 msgstr "Als profielfoto gebruiken"
 
-#: ../../Zotlabs/Module/Photos.php:953
+#: ../../Code/Module/Photos.php:953
 msgid "Use as cover photo"
 msgstr "Als omslagfoto gebruiken"
 
-#: ../../Zotlabs/Module/Photos.php:960
+#: ../../Code/Module/Photos.php:960
 msgid "Private Photo"
 msgstr "Privéfoto"
 
-#: ../../Zotlabs/Module/Photos.php:975
+#: ../../Code/Module/Photos.php:975
 msgid "View Full Size"
 msgstr "Volledige grootte tonen"
 
-#: ../../Zotlabs/Module/Photos.php:1057
+#: ../../Code/Module/Photos.php:1057
 msgid "Edit photo"
 msgstr "Foto bewerken"
 
-#: ../../Zotlabs/Module/Photos.php:1059
+#: ../../Code/Module/Photos.php:1059
 msgid "Rotate CW (right)"
 msgstr "Draai met de klok mee (naar rechts)"
 
-#: ../../Zotlabs/Module/Photos.php:1060
+#: ../../Code/Module/Photos.php:1060
 msgid "Rotate CCW (left)"
 msgstr "Draai tegen de klok in (naar links)"
 
-#: ../../Zotlabs/Module/Photos.php:1063
+#: ../../Code/Module/Photos.php:1063
 msgid "Move photo to album"
 msgstr "Verplaatst foto naar album"
 
-#: ../../Zotlabs/Module/Photos.php:1064
+#: ../../Code/Module/Photos.php:1064
 msgid "Enter a new album name"
 msgstr "Vul een nieuwe albumnaam in"
 
-#: ../../Zotlabs/Module/Photos.php:1065
+#: ../../Code/Module/Photos.php:1065
 msgid "or select an existing one (doubleclick)"
 msgstr "of kies een bestaand album (dubbelklikken)"
 
-#: ../../Zotlabs/Module/Photos.php:1070
+#: ../../Code/Module/Photos.php:1070
 msgid "Add a Tag"
 msgstr "Tag toevoegen"
 
-#: ../../Zotlabs/Module/Photos.php:1078
+#: ../../Code/Module/Photos.php:1078
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
 
-#: ../../Zotlabs/Module/Photos.php:1081
+#: ../../Code/Module/Photos.php:1081
 msgid "Flag as adult in album view"
 msgstr "Markeer als voor volwassenen in albumweergave"
 
-#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:281
+#: ../../Code/Module/Photos.php:1100 ../../Code/Lib/ThreadItem.php:281
 msgid "I like this (toggle)"
 msgstr "Vind ik leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Lib/ThreadItem.php:282
+#: ../../Code/Module/Photos.php:1101 ../../Code/Lib/ThreadItem.php:282
 msgid "I don't like this (toggle)"
 msgstr "Vind ik niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:427
+#: ../../Code/Module/Photos.php:1103 ../../Code/Lib/ThreadItem.php:427
 #: ../../include/conversation.php:785
 msgid "Please wait"
 msgstr "Even wachten"
 
-#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237
-#: ../../Zotlabs/Lib/ThreadItem.php:749
+#: ../../Code/Module/Photos.php:1119 ../../Code/Module/Photos.php:1237
+#: ../../Code/Lib/ThreadItem.php:749
 msgid "This is you"
 msgstr "Dit ben jij"
 
-#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239
-#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6
+#: ../../Code/Module/Photos.php:1121 ../../Code/Module/Photos.php:1239
+#: ../../Code/Lib/ThreadItem.php:751 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Reactie"
 
-#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618
+#: ../../Code/Module/Photos.php:1137 ../../include/conversation.php:618
 msgctxt "title"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1137 ../../include/conversation.php:618
+#: ../../Code/Module/Photos.php:1137 ../../include/conversation.php:618
 msgctxt "title"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Agree"
 msgstr "eens"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Disagree"
 msgstr "oneens"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../include/conversation.php:619
+#: ../../Code/Module/Photos.php:1138 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Abstain"
 msgstr "onthoudingen"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Attending"
 msgstr "aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Not attending"
 msgstr "niet aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:620
+#: ../../Code/Module/Photos.php:1139 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Might attend"
 msgstr "mogelijk aanwezig"
 
-#: ../../Zotlabs/Module/Photos.php:1156 ../../Zotlabs/Module/Photos.php:1168
-#: ../../Zotlabs/Lib/ThreadItem.php:201 ../../Zotlabs/Lib/ThreadItem.php:213
+#: ../../Code/Module/Photos.php:1156 ../../Code/Module/Photos.php:1168
+#: ../../Code/Lib/ThreadItem.php:201 ../../Code/Lib/ThreadItem.php:213
 msgid "View all"
 msgstr "Toon alles"
 
-#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205
+#: ../../Code/Module/Photos.php:1160 ../../Code/Lib/ThreadItem.php:205
 #: ../../include/conversation.php:1981 ../../include/channel.php:1539
 #: ../../include/taxonomy.php:661
 msgctxt "noun"
@@ -4919,7 +4919,7 @@ msgid_plural "Likes"
 msgstr[0] "vindt dit leuk"
 msgstr[1] "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210
+#: ../../Code/Module/Photos.php:1165 ../../Code/Lib/ThreadItem.php:210
 #: ../../include/conversation.php:1984
 msgctxt "noun"
 msgid "Dislike"
@@ -4927,517 +4927,517 @@ msgid_plural "Dislikes"
 msgstr[0] "vindt dit niet leuk"
 msgstr[1] "vinden dit niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1265
+#: ../../Code/Module/Photos.php:1265
 msgid "Photo Tools"
 msgstr "Hulpmiddelen"
 
-#: ../../Zotlabs/Module/Photos.php:1274
+#: ../../Code/Module/Photos.php:1274
 msgid "In This Photo:"
 msgstr "Op deze foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1279
+#: ../../Code/Module/Photos.php:1279
 msgid "Map"
 msgstr "Kaart"
 
-#: ../../Zotlabs/Module/Photos.php:1287 ../../Zotlabs/Lib/ThreadItem.php:415
+#: ../../Code/Module/Photos.php:1287 ../../Code/Lib/ThreadItem.php:415
 msgctxt "noun"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1288 ../../Zotlabs/Lib/ThreadItem.php:416
+#: ../../Code/Module/Photos.php:1288 ../../Code/Lib/ThreadItem.php:416
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421
+#: ../../Code/Module/Photos.php:1293 ../../Code/Lib/ThreadItem.php:421
 #: ../../include/acl_selectors.php:125
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378
-#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:667
+#: ../../Code/Module/Photos.php:1365 ../../Code/Module/Photos.php:1378
+#: ../../Code/Module/Photos.php:1379 ../../include/photos.php:667
 msgid "Recent Photos"
 msgstr "Recente foto's"
 
-#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135
+#: ../../Code/Module/Wiki.php:30 ../../addon/cart/cart.php:1135
 msgid "Profile Unavailable."
 msgstr "Profiel niet beschikbaar."
 
-#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114
+#: ../../Code/Module/Wiki.php:44 ../../Code/Module/Cloud.php:114
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114
+#: ../../Code/Module/Wiki.php:68 ../../addon/cart/myshop.php:114
 #: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58
 msgid "Invalid channel"
 msgstr "Onbekend kanaal"
 
-#: ../../Zotlabs/Module/Wiki.php:124
+#: ../../Code/Module/Wiki.php:124
 msgid "Error retrieving wiki"
 msgstr "Fout tijdens ophalen wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:131
+#: ../../Code/Module/Wiki.php:131
 msgid "Error creating zip file export folder"
 msgstr "Fout tijdens aanmaken exportmap zipbestand"
 
-#: ../../Zotlabs/Module/Wiki.php:182
+#: ../../Code/Module/Wiki.php:182
 msgid "Error downloading wiki: "
 msgstr "Fout tijdens downloaden wiki: "
 
-#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928
+#: ../../Code/Module/Wiki.php:197 ../../include/conversation.php:1928
 #: ../../include/nav.php:494
 msgid "Wikis"
 msgstr "Wiki's"
 
-#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../Code/Module/Wiki.php:203
 msgid "Download"
 msgstr "Download"
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256
-#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Wiki.php:205 ../../Code/Module/Chat.php:256
+#: ../../Code/Module/Profiles.php:831 ../../Code/Module/Manage.php:145
 msgid "Create New"
 msgstr "Nieuwe aanmaken"
 
-#: ../../Zotlabs/Module/Wiki.php:207
+#: ../../Code/Module/Wiki.php:207
 msgid "Wiki name"
 msgstr "Naam wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:208
+#: ../../Code/Module/Wiki.php:208
 msgid "Content type"
 msgstr "Opmaaktype"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
 #: ../../include/text.php:1869
 msgid "Markdown"
 msgstr "Markdown"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867
+#: ../../Code/Module/Wiki.php:208 ../../Code/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1867
 msgid "BBcode"
 msgstr "BBcode"
 
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870
+#: ../../Code/Module/Wiki.php:208 ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:93 ../../include/text.php:1870
 msgid "Text"
 msgstr "Tekst"
 
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284
+#: ../../Code/Module/Wiki.php:210 ../../Code/Storage/Browser.php:284
 msgid "Type"
 msgstr "Type"
 
-#: ../../Zotlabs/Module/Wiki.php:211
+#: ../../Code/Module/Wiki.php:211
 msgid "Any type"
 msgstr "Elk type"
 
-#: ../../Zotlabs/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:218
 msgid "Lock content type"
 msgstr "Opmaaktype vastzetten"
 
-#: ../../Zotlabs/Module/Wiki.php:219
+#: ../../Code/Module/Wiki.php:219
 msgid "Create a status post for this wiki"
 msgstr "Plaats een bericht over deze wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:220
+#: ../../Code/Module/Wiki.php:220
 msgid "Edit Wiki Name"
 msgstr "Naam wiki bewerken"
 
-#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../Code/Module/Wiki.php:262
 msgid "Wiki not found"
 msgstr "Wiki is niet gevonden"
 
-#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../Code/Module/Wiki.php:286
 msgid "Rename page"
 msgstr "Pagina hernoemen"
 
-#: ../../Zotlabs/Module/Wiki.php:307
+#: ../../Code/Module/Wiki.php:307
 msgid "Error retrieving page content"
 msgstr "Fout tijdens ophalen inhoud pagina"
 
-#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317
+#: ../../Code/Module/Wiki.php:315 ../../Code/Module/Wiki.php:317
 msgid "New page"
 msgstr "Nieuwe pagina"
 
-#: ../../Zotlabs/Module/Wiki.php:345
+#: ../../Code/Module/Wiki.php:345
 msgid "Revision Comparison"
 msgstr "Revisies vergelijken"
 
-#: ../../Zotlabs/Module/Wiki.php:346
+#: ../../Code/Module/Wiki.php:346
 msgid "Revert"
 msgstr "Ongedaan maken"
 
-#: ../../Zotlabs/Module/Wiki.php:353
+#: ../../Code/Module/Wiki.php:353
 msgid "Short description of your changes (optional)"
 msgstr "Korte omschrijving van jouw wijzigingen (niet verplicht)"
 
-#: ../../Zotlabs/Module/Wiki.php:362
+#: ../../Code/Module/Wiki.php:362
 msgid "Source"
 msgstr "Bron"
 
-#: ../../Zotlabs/Module/Wiki.php:372
+#: ../../Code/Module/Wiki.php:372
 msgid "New page name"
 msgstr "Nieuwe paginanaam"
 
-#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282
+#: ../../Code/Module/Wiki.php:377 ../../include/conversation.php:1282
 msgid "Embed image from photo albums"
 msgstr "Afbeelding uit een fotoalbum invoegen"
 
-#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388
+#: ../../Code/Module/Wiki.php:378 ../../include/conversation.php:1388
 msgid "Embed an image from your albums"
 msgstr "Afbeelding uit jouw albums invoegen"
 
-#: ../../Zotlabs/Module/Wiki.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:465
-#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../Code/Module/Wiki.php:380
+#: ../../Code/Module/Profile_photo.php:465
+#: ../../Code/Module/Cover_photo.php:367
 #: ../../include/conversation.php:1390 ../../include/conversation.php:1437
 msgid "OK"
 msgstr "OK"
 
-#: ../../Zotlabs/Module/Wiki.php:381
-#: ../../Zotlabs/Module/Profile_photo.php:466
-#: ../../Zotlabs/Module/Cover_photo.php:368
+#: ../../Code/Module/Wiki.php:381
+#: ../../Code/Module/Profile_photo.php:466
+#: ../../Code/Module/Cover_photo.php:368
 #: ../../include/conversation.php:1320
 msgid "Choose images to embed"
 msgstr "Kies afbeeldingen om in te voegen"
 
-#: ../../Zotlabs/Module/Wiki.php:382
-#: ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:369
+#: ../../Code/Module/Wiki.php:382
+#: ../../Code/Module/Profile_photo.php:467
+#: ../../Code/Module/Cover_photo.php:369
 #: ../../include/conversation.php:1321
 msgid "Choose an album"
 msgstr "Kies een album"
 
-#: ../../Zotlabs/Module/Wiki.php:383
-#: ../../Zotlabs/Module/Profile_photo.php:468
-#: ../../Zotlabs/Module/Cover_photo.php:370
+#: ../../Code/Module/Wiki.php:383
+#: ../../Code/Module/Profile_photo.php:468
+#: ../../Code/Module/Cover_photo.php:370
 msgid "Choose a different album"
 msgstr "Kies een ander album"
 
-#: ../../Zotlabs/Module/Wiki.php:384
-#: ../../Zotlabs/Module/Profile_photo.php:469
-#: ../../Zotlabs/Module/Cover_photo.php:371
+#: ../../Code/Module/Wiki.php:384
+#: ../../Code/Module/Profile_photo.php:469
+#: ../../Code/Module/Cover_photo.php:371
 #: ../../include/conversation.php:1323
 msgid "Error getting album list"
 msgstr "Fout tijdens ophalen albumlijst"
 
-#: ../../Zotlabs/Module/Wiki.php:385
-#: ../../Zotlabs/Module/Profile_photo.php:470
-#: ../../Zotlabs/Module/Cover_photo.php:372
+#: ../../Code/Module/Wiki.php:385
+#: ../../Code/Module/Profile_photo.php:470
+#: ../../Code/Module/Cover_photo.php:372
 #: ../../include/conversation.php:1324
 msgid "Error getting photo link"
 msgstr "Fout tijdens ophalen fotolink"
 
-#: ../../Zotlabs/Module/Wiki.php:386
-#: ../../Zotlabs/Module/Profile_photo.php:471
-#: ../../Zotlabs/Module/Cover_photo.php:373
+#: ../../Code/Module/Wiki.php:386
+#: ../../Code/Module/Profile_photo.php:471
+#: ../../Code/Module/Cover_photo.php:373
 #: ../../include/conversation.php:1325
 msgid "Error getting album"
 msgstr "Fout tijdens ophalen album"
 
-#: ../../Zotlabs/Module/Wiki.php:462
+#: ../../Code/Module/Wiki.php:462
 msgid "Error creating wiki. Invalid name."
 msgstr "Fout tijdens aanmaken wiki. Ongeldige naam."
 
-#: ../../Zotlabs/Module/Wiki.php:469
+#: ../../Code/Module/Wiki.php:469
 msgid "A wiki with this name already exists."
 msgstr "Er bestaat al een wiki onder deze naam"
 
-#: ../../Zotlabs/Module/Wiki.php:482
+#: ../../Code/Module/Wiki.php:482
 msgid "Wiki created, but error creating Home page."
 msgstr "Wiki aangemaakt, maar fout tijdens aanmaken homepagina."
 
-#: ../../Zotlabs/Module/Wiki.php:489
+#: ../../Code/Module/Wiki.php:489
 msgid "Error creating wiki"
 msgstr "Fout tijdens aanmaken wiki."
 
-#: ../../Zotlabs/Module/Wiki.php:512
+#: ../../Code/Module/Wiki.php:512
 msgid "Error updating wiki. Invalid name."
 msgstr "Fout tijdens bijwerken wiki. Ongeldige naam."
 
-#: ../../Zotlabs/Module/Wiki.php:532
+#: ../../Code/Module/Wiki.php:532
 msgid "Error updating wiki"
 msgstr "Fout tijdens bijwerken wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:547
+#: ../../Code/Module/Wiki.php:547
 msgid "Wiki delete permission denied."
 msgstr "Toegang geweigerd tijdens verwijderen wiki."
 
-#: ../../Zotlabs/Module/Wiki.php:557
+#: ../../Code/Module/Wiki.php:557
 msgid "Error deleting wiki"
 msgstr "Fout tijdens verwijderen wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:590
+#: ../../Code/Module/Wiki.php:590
 msgid "New page created"
 msgstr "Nieuwe pagina aangemaakt"
 
-#: ../../Zotlabs/Module/Wiki.php:711
+#: ../../Code/Module/Wiki.php:711
 msgid "Cannot delete Home"
 msgstr "Kan Home niet verwijderen"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Current Revision"
 msgstr "Huidige revisie"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Selected Revision"
 msgstr "Geselecteerde revisie"
 
-#: ../../Zotlabs/Module/Wiki.php:825
+#: ../../Code/Module/Wiki.php:825
 msgid "You must be authenticated."
 msgstr "Je moet geauthenticeerd zijn"
 
-#: ../../Zotlabs/Module/Chanview.php:139
+#: ../../Code/Module/Chanview.php:139
 msgid "toggle full screen mode"
 msgstr "Volledig scherm"
 
-#: ../../Zotlabs/Module/Pdledit.php:21
+#: ../../Code/Module/Pdledit.php:21
 msgid "Layout updated."
 msgstr "Lay-out bijgewerkt."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
+#: ../../Code/Module/Pdledit.php:34 ../../Code/Module/Chat.php:219
 msgid "Feature disabled."
 msgstr "Functie uitgeschakeld."
 
-#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90
+#: ../../Code/Module/Pdledit.php:47 ../../Code/Module/Pdledit.php:90
 msgid "Edit System Page Description"
 msgstr "Systeempagina's bewerken"
 
-#: ../../Zotlabs/Module/Pdledit.php:68
+#: ../../Code/Module/Pdledit.php:68
 msgid "(modified)"
 msgstr "(aangepast)"
 
-#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133
+#: ../../Code/Module/Pdledit.php:68 ../../Code/Module/Lostpass.php:133
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
-#: ../../Zotlabs/Module/Pdledit.php:85
+#: ../../Code/Module/Pdledit.php:85
 msgid "Layout not found."
 msgstr "Lay-out niet gevonden."
 
-#: ../../Zotlabs/Module/Pdledit.php:91
+#: ../../Code/Module/Pdledit.php:91
 msgid "Module Name:"
 msgstr "Modulenaam:"
 
-#: ../../Zotlabs/Module/Pdledit.php:92
+#: ../../Code/Module/Pdledit.php:92
 msgid "Layout Help"
 msgstr "Lay-out-hulp"
 
-#: ../../Zotlabs/Module/Pdledit.php:93
+#: ../../Code/Module/Pdledit.php:93
 msgid "Edit another layout"
 msgstr "Andere systeempagina bewerken"
 
-#: ../../Zotlabs/Module/Pdledit.php:94
+#: ../../Code/Module/Pdledit.php:94
 msgid "System layout"
 msgstr "Systeemlay-out"
 
-#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:254
+#: ../../Code/Module/Poke.php:182 ../../Code/Lib/Apps.php:254
 #: ../../include/conversation.php:1092
 msgid "Poke"
 msgstr "Aanstoten"
 
-#: ../../Zotlabs/Module/Poke.php:183
+#: ../../Code/Module/Poke.php:183
 msgid "Poke somebody"
 msgstr "Iemand aanstoten"
 
-#: ../../Zotlabs/Module/Poke.php:186
+#: ../../Code/Module/Poke.php:186
 msgid "Poke/Prod"
 msgstr "Aanstoten/porren"
 
-#: ../../Zotlabs/Module/Poke.php:187
+#: ../../Code/Module/Poke.php:187
 msgid "Poke, prod or do other things to somebody"
 msgstr "Iemand bijvoorbeeld aanstoten of poren"
 
-#: ../../Zotlabs/Module/Poke.php:194
+#: ../../Code/Module/Poke.php:194
 msgid "Recipient"
 msgstr "Ontvanger"
 
-#: ../../Zotlabs/Module/Poke.php:195
+#: ../../Code/Module/Poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr "Kies wat je met de ontvanger wil doen"
 
-#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
+#: ../../Code/Module/Poke.php:198 ../../Code/Module/Poke.php:199
 msgid "Make this post private"
 msgstr "Maak dit bericht privé"
 
-#: ../../Zotlabs/Module/Profile_photo.php:66
-#: ../../Zotlabs/Module/Cover_photo.php:56
+#: ../../Code/Module/Profile_photo.php:66
+#: ../../Code/Module/Cover_photo.php:56
 msgid "Image uploaded but image cropping failed."
 msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "
 
-#: ../../Zotlabs/Module/Profile_photo.php:120
-#: ../../Zotlabs/Module/Profile_photo.php:248
+#: ../../Code/Module/Profile_photo.php:120
+#: ../../Code/Module/Profile_photo.php:248
 #: ../../include/photo/photo_driver.php:741
 msgid "Profile Photos"
 msgstr "Profielfoto's"
 
-#: ../../Zotlabs/Module/Profile_photo.php:142
-#: ../../Zotlabs/Module/Cover_photo.php:159
+#: ../../Code/Module/Profile_photo.php:142
+#: ../../Code/Module/Cover_photo.php:159
 msgid "Image resize failed."
 msgstr "Afbeelding kon niet van grootte veranderd worden."
 
-#: ../../Zotlabs/Module/Profile_photo.php:218
+#: ../../Code/Module/Profile_photo.php:218
 #: ../../addon/openclipatar/openclipatar.php:298
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt getoond."
 
-#: ../../Zotlabs/Module/Profile_photo.php:225
-#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:195
+#: ../../Code/Module/Profile_photo.php:225
+#: ../../Code/Module/Cover_photo.php:173 ../../include/photos.php:195
 msgid "Unable to process image"
 msgstr "Afbeelding kan niet verwerkt worden"
 
-#: ../../Zotlabs/Module/Profile_photo.php:260
-#: ../../Zotlabs/Module/Cover_photo.php:197
+#: ../../Code/Module/Profile_photo.php:260
+#: ../../Code/Module/Cover_photo.php:197
 msgid "Image upload failed."
 msgstr "Uploaden afbeelding mislukt"
 
-#: ../../Zotlabs/Module/Profile_photo.php:279
-#: ../../Zotlabs/Module/Cover_photo.php:214
+#: ../../Code/Module/Profile_photo.php:279
+#: ../../Code/Module/Cover_photo.php:214
 msgid "Unable to process image."
 msgstr "Niet in staat om afbeelding te verwerken."
 
-#: ../../Zotlabs/Module/Profile_photo.php:343
-#: ../../Zotlabs/Module/Profile_photo.php:390
-#: ../../Zotlabs/Module/Cover_photo.php:307
-#: ../../Zotlabs/Module/Cover_photo.php:322
+#: ../../Code/Module/Profile_photo.php:343
+#: ../../Code/Module/Profile_photo.php:390
+#: ../../Code/Module/Cover_photo.php:307
+#: ../../Code/Module/Cover_photo.php:322
 msgid "Photo not available."
 msgstr "Foto niet beschikbaar."
 
-#: ../../Zotlabs/Module/Profile_photo.php:455
-#: ../../Zotlabs/Module/Cover_photo.php:359
+#: ../../Code/Module/Profile_photo.php:455
+#: ../../Code/Module/Cover_photo.php:359
 msgid "Upload File:"
 msgstr "Bestand uploaden:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:456
-#: ../../Zotlabs/Module/Cover_photo.php:360
+#: ../../Code/Module/Profile_photo.php:456
+#: ../../Code/Module/Cover_photo.php:360
 msgid "Select a profile:"
 msgstr "Kies een profiel:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
+#: ../../Code/Module/Profile_photo.php:457
 msgid "Use Photo for Profile"
 msgstr "Als profielfoto gebruiken"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
+#: ../../Code/Module/Profile_photo.php:457
 msgid "Change Profile Photo"
 msgstr "Profielfoto wijzigen"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Code/Module/Profile_photo.php:458
 msgid "Use"
 msgstr "Gebruiken"
 
-#: ../../Zotlabs/Module/Profile_photo.php:462
-#: ../../Zotlabs/Module/Profile_photo.php:463
-#: ../../Zotlabs/Module/Cover_photo.php:364
-#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Code/Module/Profile_photo.php:462
+#: ../../Code/Module/Profile_photo.php:463
+#: ../../Code/Module/Cover_photo.php:364
+#: ../../Code/Module/Cover_photo.php:365
 msgid "Use a photo from your albums"
 msgstr "Gebruik een foto uit jouw albums"
 
-#: ../../Zotlabs/Module/Profile_photo.php:473
-#: ../../Zotlabs/Module/Cover_photo.php:376
+#: ../../Code/Module/Profile_photo.php:473
+#: ../../Code/Module/Cover_photo.php:376
 msgid "Select existing photo"
 msgstr "Kies een bestaande foto"
 
-#: ../../Zotlabs/Module/Profile_photo.php:492
-#: ../../Zotlabs/Module/Cover_photo.php:393
+#: ../../Code/Module/Profile_photo.php:492
+#: ../../Code/Module/Cover_photo.php:393
 msgid "Crop Image"
 msgstr "Afbeelding bijsnijden"
 
-#: ../../Zotlabs/Module/Profile_photo.php:493
-#: ../../Zotlabs/Module/Cover_photo.php:394
+#: ../../Code/Module/Profile_photo.php:493
+#: ../../Code/Module/Cover_photo.php:394
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Snij de afbeelding zo uit dat deze optimaal wordt getoond."
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
-#: ../../Zotlabs/Module/Cover_photo.php:396
+#: ../../Code/Module/Profile_photo.php:495
+#: ../../Code/Module/Cover_photo.php:396
 msgid "Done Editing"
 msgstr "Klaar met bewerken"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
+#: ../../Code/Module/Chatsvc.php:131
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
+#: ../../Code/Module/Chatsvc.php:136
 msgid "Online"
 msgstr "Online"
 
-#: ../../Zotlabs/Module/Item.php:194
+#: ../../Code/Module/Item.php:194
 msgid "Unable to locate original post."
 msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
 
-#: ../../Zotlabs/Module/Item.php:477
+#: ../../Code/Module/Item.php:477
 msgid "Empty post discarded."
 msgstr "Leeg bericht geannuleerd"
 
-#: ../../Zotlabs/Module/Item.php:874
+#: ../../Code/Module/Item.php:874
 msgid "Duplicate post suppressed."
 msgstr "Dubbel bericht tegengehouden."
 
-#: ../../Zotlabs/Module/Item.php:1019
+#: ../../Code/Module/Item.php:1019
 msgid "System error. Post not saved."
 msgstr "Systeemfout. Bericht niet opgeslagen."
 
-#: ../../Zotlabs/Module/Item.php:1055
+#: ../../Code/Module/Item.php:1055
 msgid "Your comment is awaiting approval."
 msgstr "Jouw reactie moet nog worden goedgekeurd"
 
-#: ../../Zotlabs/Module/Item.php:1160
+#: ../../Code/Module/Item.php:1160
 msgid "Unable to obtain post information from database."
 msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
 
-#: ../../Zotlabs/Module/Item.php:1189
+#: ../../Code/Module/Item.php:1189
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
 
-#: ../../Zotlabs/Module/Item.php:1196
+#: ../../Code/Module/Item.php:1196
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
 
-#: ../../Zotlabs/Module/Ping.php:330
+#: ../../Code/Module/Ping.php:330
 msgid "sent you a private message"
 msgstr "stuurde jou een privébericht"
 
-#: ../../Zotlabs/Module/Ping.php:383
+#: ../../Code/Module/Ping.php:383
 msgid "added your channel"
 msgstr "voegde jouw kanaal toe"
 
-#: ../../Zotlabs/Module/Ping.php:407
+#: ../../Code/Module/Ping.php:407
 msgid "requires approval"
 msgstr "vereist goedkeuring"
 
-#: ../../Zotlabs/Module/Ping.php:417
+#: ../../Code/Module/Ping.php:417
 msgid "g A l F d"
 msgstr "G:i, l d F"
 
-#: ../../Zotlabs/Module/Ping.php:435
+#: ../../Code/Module/Ping.php:435
 msgid "[today]"
 msgstr "[vandaag]"
 
-#: ../../Zotlabs/Module/Ping.php:444
+#: ../../Code/Module/Ping.php:444
 msgid "posted an event"
 msgstr "plaatste een gebeurtenis"
 
-#: ../../Zotlabs/Module/Ping.php:477
+#: ../../Code/Module/Ping.php:477
 msgid "shared a file with you"
 msgstr "deelde een bestand met jou"
 
-#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
+#: ../../Code/Module/Page.php:39 ../../Code/Module/Block.php:29
 msgid "Invalid item."
 msgstr "Ongeldig item."
 
-#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158
-#: ../../Zotlabs/Module/Display.php:175
-#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167
+#: ../../Code/Module/Page.php:136 ../../Code/Module/Block.php:77
+#: ../../Code/Module/Display.php:141 ../../Code/Module/Display.php:158
+#: ../../Code/Module/Display.php:175
+#: ../../Code/Lib/NativeWikiPage.php:519 ../../Code/Web/Router.php:167
 #: ../../include/help.php:81
 msgid "Page not found."
 msgstr "Pagina niet gevonden."
 
-#: ../../Zotlabs/Module/Page.php:173
+#: ../../Code/Module/Page.php:173
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
@@ -5447,314 +5447,314 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59
+#: ../../Code/Module/Connedit.php:79 ../../Code/Module/Defperms.php:59
 msgid "Could not access contact record."
 msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
 
-#: ../../Zotlabs/Module/Connedit.php:109
+#: ../../Code/Module/Connedit.php:109
 msgid "Could not locate selected profile."
 msgstr "Kon het gekozen profiel niet vinden."
 
-#: ../../Zotlabs/Module/Connedit.php:246
+#: ../../Code/Module/Connedit.php:246
 msgid "Connection updated."
 msgstr "Connectie bijgewerkt."
 
-#: ../../Zotlabs/Module/Connedit.php:248
+#: ../../Code/Module/Connedit.php:248
 msgid "Failed to update connection record."
 msgstr "Bijwerken van connectie-gegevens mislukt."
 
-#: ../../Zotlabs/Module/Connedit.php:302
+#: ../../Code/Module/Connedit.php:302
 msgid "is now connected to"
 msgstr "is nu verbonden met"
 
-#: ../../Zotlabs/Module/Connedit.php:427
+#: ../../Code/Module/Connedit.php:427
 msgid "Could not access address book record."
 msgstr "Kon geen toegang krijgen tot de record van de connectie."
 
-#: ../../Zotlabs/Module/Connedit.php:475
+#: ../../Code/Module/Connedit.php:475
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
 
-#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499
-#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Code/Module/Connedit.php:490 ../../Code/Module/Connedit.php:499
+#: ../../Code/Module/Connedit.php:508 ../../Code/Module/Connedit.php:517
+#: ../../Code/Module/Connedit.php:530
 msgid "Unable to set address book parameters."
 msgstr "Niet in staat om de parameters van connecties in te stellen."
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Code/Module/Connedit.php:554
 msgid "Connection has been removed."
 msgstr "Connectie is verwijderd"
 
-#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:247
+#: ../../Code/Module/Connedit.php:594 ../../Code/Lib/Apps.php:247
 #: ../../addon/openclipatar/openclipatar.php:57
 #: ../../include/conversation.php:1032 ../../include/nav.php:114
 msgid "View Profile"
 msgstr "Profiel tonen"
 
-#: ../../Zotlabs/Module/Connedit.php:597
+#: ../../Code/Module/Connedit.php:597
 #, php-format
 msgid "View %s's profile"
 msgstr "Profiel van %s tonen"
 
-#: ../../Zotlabs/Module/Connedit.php:601
+#: ../../Code/Module/Connedit.php:601
 msgid "Refresh Permissions"
 msgstr "Permissies vernieuwen"
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Code/Module/Connedit.php:604
 msgid "Fetch updated permissions"
 msgstr "Aangepaste permissies ophalen"
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Code/Module/Connedit.php:608
 msgid "Refresh Photo"
 msgstr "Foto vernieuwen"
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Code/Module/Connedit.php:611
 msgid "Fetch updated photo"
 msgstr "Aangepaste foto ophalen"
 
-#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042
+#: ../../Code/Module/Connedit.php:615 ../../include/conversation.php:1042
 msgid "Recent Activity"
 msgstr "Recente activiteit/berichten"
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Code/Module/Connedit.php:618
 msgid "View recent posts and comments"
 msgstr "Recente berichten en reacties tonen"
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Code/Module/Connedit.php:625
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
 
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Code/Module/Connedit.php:626
 msgid "This connection is blocked!"
 msgstr "Deze connectie is geblokkeerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connedit.php:630
 msgid "Unignore"
 msgstr "Niet meer negeren"
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Code/Module/Connedit.php:633
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
 
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Code/Module/Connedit.php:634
 msgid "This connection is ignored!"
 msgstr "Deze connectie wordt genegeerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Unarchive"
 msgstr "Niet meer archiveren"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Archive"
 msgstr "Archiveren"
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Code/Module/Connedit.php:641
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Code/Module/Connedit.php:642
 msgid "This connection is archived!"
 msgstr "Deze connectie is gearchiveerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Unhide"
 msgstr "Niet meer verbergen"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Code/Module/Connedit.php:649
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Code/Module/Connedit.php:650
 msgid "This connection is hidden!"
 msgstr "Deze connectie is verborgen!"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Code/Module/Connedit.php:657
 msgid "Delete this connection"
 msgstr "Deze connectie verwijderen"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Code/Module/Connedit.php:665
 msgid "Fetch Vcard"
 msgstr "Vcard ophalen"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Code/Module/Connedit.php:668
 msgid "Fetch electronic calling card for this connection"
 msgstr "Visitekaartje van deze connectie ophalen"
 
-#: ../../Zotlabs/Module/Connedit.php:679
+#: ../../Code/Module/Connedit.php:679
 msgid "Open Individual Permissions section by default"
 msgstr "Sectie met individuele permissies standaard openen"
 
-#: ../../Zotlabs/Module/Connedit.php:702
+#: ../../Code/Module/Connedit.php:702
 msgid "Affinity"
 msgstr "Affiniteit"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Code/Module/Connedit.php:705
 msgid "Open Set Affinity section by default"
 msgstr "Sectie met de affiniteitsinstelling standaard openen"
 
-#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22
+#: ../../Code/Module/Connedit.php:709 ../../Code/Widget/Affinity.php:22
 msgid "Me"
 msgstr "Ik"
 
-#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23
+#: ../../Code/Module/Connedit.php:710 ../../Code/Widget/Affinity.php:23
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25
+#: ../../Code/Module/Connedit.php:712 ../../Code/Widget/Affinity.php:25
 msgid "Acquaintances"
 msgstr "Kennissen"
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Code/Module/Connedit.php:739
 msgid "Filter"
 msgstr "Filter"
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Code/Module/Connedit.php:742
 msgid "Open Custom Filter section by default"
 msgstr "Sectie met de berichtenfilter standaard openen"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Approve this connection"
 msgstr "Deze connectie accepteren"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Accept connection to allow communication"
 msgstr "Keur deze connectie goed om communicatie toe te staan"
 
-#: ../../Zotlabs/Module/Connedit.php:784
+#: ../../Code/Module/Connedit.php:784
 msgid "Set Affinity"
 msgstr "Affiniteit instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:787
+#: ../../Code/Module/Connedit.php:787
 msgid "Set Profile"
 msgstr "Profiel instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:790
+#: ../../Code/Module/Connedit.php:790
 msgid "Set Affinity & Profile"
 msgstr "Affiniteit en profiel instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:838
+#: ../../Code/Module/Connedit.php:838
 msgid "This connection is unreachable from this location."
 msgstr "Deze connectie is onbereikbaar vanaf deze locatie"
 
-#: ../../Zotlabs/Module/Connedit.php:839
+#: ../../Code/Module/Connedit.php:839
 msgid "This connection may be unreachable from other channel locations."
 msgstr "Deze connectie is mogelijk onbereikbaar vanaf andere kanaallocaties."
 
-#: ../../Zotlabs/Module/Connedit.php:841
+#: ../../Code/Module/Connedit.php:841
 msgid "Location independence is not supported by their network."
 msgstr "Het netwerk van deze connectie ondersteund geen locatieonafhankelijkheid."
 
-#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Code/Module/Connedit.php:847
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr "Deze connectie is onbereikbaar vanaf deze locatie. Het netwerk van deze connectie ondersteunt geen locatieonafhankelijkheid."
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
-#: ../../Zotlabs/Widget/Settings_menu.php:117
+#: ../../Code/Module/Connedit.php:850 ../../Code/Module/Defperms.php:238
+#: ../../Code/Widget/Settings_menu.php:117
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214
+#: ../../Code/Module/Connedit.php:850 ../../include/items.php:4214
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Connedit.php:851 ../../Code/Module/Defperms.php:239
 msgid "Apply these permissions automatically"
 msgstr "Deze permissies automatisch toepassen"
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Code/Module/Connedit.php:851
 msgid "Connection requests will be approved without your interaction"
 msgstr "Connectieverzoeken zullen automatisch worden geaccepteerd"
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
 msgid "Permission role"
 msgstr "Permissietype"
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
-#: ../../Zotlabs/Widget/Notifications.php:151 ../../include/nav.php:284
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
+#: ../../Code/Widget/Notifications.php:151 ../../include/nav.php:284
 msgid "Loading"
 msgstr "Aan het laden"
 
-#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241
+#: ../../Code/Module/Connedit.php:853 ../../Code/Module/Defperms.php:241
 msgid "Add permission role"
 msgstr "Permissietype toevoegen"
 
-#: ../../Zotlabs/Module/Connedit.php:860
+#: ../../Code/Module/Connedit.php:860
 msgid "This connection's primary address is"
 msgstr "Het primaire kanaaladres van deze connectie is"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Code/Module/Connedit.php:861
 msgid "Available locations:"
 msgstr "Beschikbare locaties:"
 
-#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
+#: ../../Code/Module/Connedit.php:866 ../../Code/Module/Defperms.php:245
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
 
-#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Code/Module/Connedit.php:867
 msgid "Connection Tools"
 msgstr "Hulpmiddelen"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Code/Module/Connedit.php:869
 msgid "Slide to adjust your degree of friendship"
 msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
 
-#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155
+#: ../../Code/Module/Connedit.php:870 ../../Code/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Code/Module/Connedit.php:871
 msgid "Slide to adjust your rating"
 msgstr "Gebruik de schuif om je beoordeling te geven"
 
-#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877
+#: ../../Code/Module/Connedit.php:872 ../../Code/Module/Connedit.php:877
 msgid "Optionally explain your rating"
 msgstr "Verklaar jouw beoordeling (niet verplicht)"
 
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Code/Module/Connedit.php:874
 msgid "Custom Filter"
 msgstr "Berichtenfilter"
 
-#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../Code/Module/Connedit.php:875
 msgid "Only import posts with this text"
 msgstr "Importeer alleen berichten met deze tekst"
 
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:875 ../../Code/Module/Connedit.php:876
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren"
 
-#: ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:876
 msgid "Do not import posts with this text"
 msgstr "Importeer geen berichten met deze tekst"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Code/Module/Connedit.php:878
 msgid "This information is public!"
 msgstr "Deze informatie is openbaar!"
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Code/Module/Connedit.php:883
 msgid "Connection Pending Approval"
 msgstr "Connectie moet nog geaccepteerd worden"
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Code/Module/Connedit.php:888
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
 
-#: ../../Zotlabs/Module/Connedit.php:895
+#: ../../Code/Module/Connedit.php:895
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher "
@@ -5762,217 +5762,217 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de privacyinstellingen van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
 
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Code/Module/Connedit.php:896
 msgid "Last update:"
 msgstr "Laatste wijziging:"
 
-#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../Code/Module/Connedit.php:904
 msgid "Details"
 msgstr "Details"
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Code/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Code/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Chatkanaal verlaten"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Code/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Chatkanaal verwijderen"
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Code/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Ik ben momenteel afwezig"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Code/Module/Chat.php:200
 msgid "I am online"
 msgstr "Ik ben online"
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Code/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Chatkanaal aan bladwijzers toevoegen"
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315
+#: ../../Code/Module/Chat.php:205 ../../Code/Module/Mail.php:241
+#: ../../Code/Module/Mail.php:362 ../../include/conversation.php:1315
 msgid "Please enter a link URL:"
 msgstr "Vul een URL in:"
 
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766
+#: ../../Code/Module/Chat.php:206 ../../Code/Module/Mail.php:294
+#: ../../Code/Module/Mail.php:436 ../../Code/Lib/ThreadItem.php:766
 #: ../../include/conversation.php:1435
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Nieuw chatkanaal"
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Code/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Naam chatkanaal"
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Code/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Aantal minuten voordat chatberichten worden verwijderd"
 
-#: ../../Zotlabs/Module/Chat.php:250
+#: ../../Code/Module/Chat.php:250
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Chatkanalen van %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Code/Module/Chat.php:255
 msgid "No chatrooms available"
 msgstr "Geen chatkanalen beschikbaar"
 
-#: ../../Zotlabs/Module/Chat.php:259
+#: ../../Code/Module/Chat.php:259
 msgid "Expiration"
 msgstr "Verloopt na"
 
-#: ../../Zotlabs/Module/Chat.php:260
+#: ../../Code/Module/Chat.php:260
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248
+#: ../../Code/Module/Fbrowser.php:29 ../../Code/Lib/Apps.php:248
 #: ../../include/conversation.php:1834 ../../include/nav.php:401
 msgid "Photos"
 msgstr "Foto's"
 
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243
-#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842
+#: ../../Code/Module/Fbrowser.php:85 ../../Code/Lib/Apps.php:243
+#: ../../Code/Storage/Browser.php:272 ../../include/conversation.php:1842
 #: ../../include/nav.php:409
 msgid "Files"
 msgstr "Bestanden"
 
-#: ../../Zotlabs/Module/Menu.php:49
+#: ../../Code/Module/Menu.php:49
 msgid "Unable to update menu."
 msgstr "Niet in staat om menu aan te passen"
 
-#: ../../Zotlabs/Module/Menu.php:60
+#: ../../Code/Module/Menu.php:60
 msgid "Unable to create menu."
 msgstr "Niet in staat om menu aan te maken."
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+#: ../../Code/Module/Menu.php:98 ../../Code/Module/Menu.php:110
 msgid "Menu Name"
 msgstr "Menunaam"
 
-#: ../../Zotlabs/Module/Menu.php:98
+#: ../../Code/Module/Menu.php:98
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Unieke naam vereist (niet zichtbaar op webpagina)"
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+#: ../../Code/Module/Menu.php:99 ../../Code/Module/Menu.php:111
 msgid "Menu Title"
 msgstr "Menutitel"
 
-#: ../../Zotlabs/Module/Menu.php:99
+#: ../../Code/Module/Menu.php:99
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Zichtbaar op webpagina (leeg laten voor geen titel)"
 
-#: ../../Zotlabs/Module/Menu.php:100
+#: ../../Code/Module/Menu.php:100
 msgid "Allow Bookmarks"
 msgstr "Bladwijzers toestaan"
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:100 ../../Code/Module/Menu.php:157
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan"
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+#: ../../Code/Module/Menu.php:101 ../../Code/Module/Menu.php:159
 msgid "Submit and proceed"
 msgstr "Opslaan en doorgaan"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2423
+#: ../../Code/Module/Menu.php:107 ../../include/text.php:2423
 msgid "Menus"
 msgstr "Menu's"
 
-#: ../../Zotlabs/Module/Menu.php:117
+#: ../../Code/Module/Menu.php:117
 msgid "Bookmarks allowed"
 msgstr "Bladwijzers toegestaan"
 
-#: ../../Zotlabs/Module/Menu.php:119
+#: ../../Code/Module/Menu.php:119
 msgid "Delete this menu"
 msgstr "Menu verwijderen"
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+#: ../../Code/Module/Menu.php:120 ../../Code/Module/Menu.php:154
 msgid "Edit menu contents"
 msgstr "Bewerk de inhoud van het menu"
 
-#: ../../Zotlabs/Module/Menu.php:121
+#: ../../Code/Module/Menu.php:121
 msgid "Edit this menu"
 msgstr "Dit menu bewerken"
 
-#: ../../Zotlabs/Module/Menu.php:136
+#: ../../Code/Module/Menu.php:136
 msgid "Menu could not be deleted."
 msgstr "Menu kon niet verwijderd worden."
 
-#: ../../Zotlabs/Module/Menu.php:149
+#: ../../Code/Module/Menu.php:149
 msgid "Edit Menu"
 msgstr "Menu bewerken"
 
-#: ../../Zotlabs/Module/Menu.php:153
+#: ../../Code/Module/Menu.php:153
 msgid "Add or remove entries to this menu"
 msgstr "Items aan dit menu toevoegen of verwijder"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Menu name"
 msgstr "Naam van menu"
 
-#: ../../Zotlabs/Module/Menu.php:155
+#: ../../Code/Module/Menu.php:155
 msgid "Must be unique, only seen by you"
 msgstr "Moet uniek zijn en is alleen zichtbaar voor jou."
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title"
 msgstr "Titel van menu"
 
-#: ../../Zotlabs/Module/Menu.php:156
+#: ../../Code/Module/Menu.php:156
 msgid "Menu title as seen by others"
 msgstr "Titel van menu zoals anderen dat zien."
 
-#: ../../Zotlabs/Module/Menu.php:157
+#: ../../Code/Module/Menu.php:157
 msgid "Allow bookmarks"
 msgstr "Bladwijzers toestaan"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2424
+#: ../../Code/Module/Layouts.php:184 ../../include/text.php:2424
 msgid "Layouts"
 msgstr "Lay-outs"
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:251
+#: ../../Code/Module/Layouts.php:186 ../../Code/Lib/Apps.php:251
 #: ../../include/nav.php:176 ../../include/nav.php:280
 #: ../../include/help.php:68 ../../include/help.php:74
 msgid "Help"
 msgstr "Hulp"
 
-#: ../../Zotlabs/Module/Layouts.php:186
+#: ../../Code/Module/Layouts.php:186
 msgid "Comanche page description language help"
 msgstr "Hulp met de paginabeschrijvingstaal Comanche"
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Code/Module/Layouts.php:190
 msgid "Layout Description"
 msgstr "Lay-out-omschrijving"
 
-#: ../../Zotlabs/Module/Layouts.php:195
+#: ../../Code/Module/Layouts.php:195
 msgid "Download PDL file"
 msgstr "Download PDL-bestand"
 
-#: ../../Zotlabs/Module/Cloud.php:120
+#: ../../Code/Module/Cloud.php:120
 msgid "Please refresh page"
 msgstr "Vernieuw de pagina"
 
-#: ../../Zotlabs/Module/Cloud.php:123
+#: ../../Code/Module/Cloud.php:123
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ../../Zotlabs/Module/Email_validation.php:24
-#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Code/Module/Email_validation.php:24
+#: ../../Code/Module/Email_resend.php:12
 msgid "Token verification failed."
 msgstr "Tokenverificatie mislukt"
 
-#: ../../Zotlabs/Module/Email_validation.php:36
+#: ../../Code/Module/Email_validation.php:36
 msgid "Email Verification Required"
 msgstr "E-mailverificatie vereist"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../Code/Module/Email_validation.php:37
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -5980,1164 +5980,1164 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr "Er is een verificatietoken naar jouw e-mailadres verstuurd [%s]. Vul deze token hier in om de accountverificatie te voltooien. Wanneer het e-mailbericht niet is aangekomen, wacht dan nog een paar minuten en controleer jouw spamfolder."
 
-#: ../../Zotlabs/Module/Email_validation.php:38
+#: ../../Code/Module/Email_validation.php:38
 msgid "Resend Email"
 msgstr "E-mail opnieuw versturen"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
+#: ../../Code/Module/Email_validation.php:41
 msgid "Validation token"
 msgstr "Verificatie-token"
 
-#: ../../Zotlabs/Module/Tagger.php:48
+#: ../../Code/Module/Tagger.php:48
 msgid "Post not found."
 msgstr "Bericht niet gevonden."
 
-#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160
+#: ../../Code/Module/Tagger.php:77 ../../include/markdown.php:160
 #: ../../include/bbcode.php:352
 msgid "post"
 msgstr "bericht"
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
+#: ../../Code/Module/Tagger.php:79 ../../include/conversation.php:146
 #: ../../include/text.php:2013
 msgid "comment"
 msgstr "reactie"
 
-#: ../../Zotlabs/Module/Tagger.php:119
+#: ../../Code/Module/Tagger.php:119
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s"
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:26 ../../Code/Module/Pconfig.php:59
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd."
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Code/Module/Pconfig.php:48
 msgid "Configuration Editor"
 msgstr "Configuratiebewerker"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Code/Module/Pconfig.php:49
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please"
 " leave this page unless you are comfortable with and knowledgeable about how"
 " to correctly use this feature."
 msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
 
-#: ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Defperms.php:239
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr "Wanneer ingeschakeld worden connectieverzoeken automatisch geaccepteerd"
 
-#: ../../Zotlabs/Module/Defperms.php:246
+#: ../../Code/Module/Defperms.php:246
 msgid "Automatic approval settings"
 msgstr "Instellingen automatisch accepteren"
 
-#: ../../Zotlabs/Module/Defperms.php:254
+#: ../../Code/Module/Defperms.php:254
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
 msgstr "Sommige individuele permissies kunnen een standaardinstelling hebben of zijn vergrendeld, afhankelijk van je kanaaltype of privacyinstellingen."
 
-#: ../../Zotlabs/Module/Authorize.php:17
+#: ../../Code/Module/Authorize.php:17
 msgid "Unknown App"
 msgstr "Onbekende applicatie"
 
-#: ../../Zotlabs/Module/Authorize.php:22
+#: ../../Code/Module/Authorize.php:22
 msgid "Authorize"
 msgstr "Autoriseren"
 
-#: ../../Zotlabs/Module/Authorize.php:23
+#: ../../Code/Module/Authorize.php:23
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr "Geef je toestemming aan de app %s om toegang te krijgen tot jouw kanaalgegevens?"
 
-#: ../../Zotlabs/Module/Authorize.php:25
+#: ../../Code/Module/Authorize.php:25
 msgid "Allow"
 msgstr "Toestaan"
 
-#: ../../Zotlabs/Module/Group.php:24
+#: ../../Code/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Privacygroep aangemaakt"
 
-#: ../../Zotlabs/Module/Group.php:30
+#: ../../Code/Module/Group.php:30
 msgid "Could not create privacy group."
 msgstr "Kon privacygroep niet aanmaken"
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
+#: ../../Code/Module/Group.php:42 ../../Code/Module/Group.php:143
 #: ../../include/items.php:4181
 msgid "Privacy group not found."
 msgstr "Privacygroep niet gevonden"
 
-#: ../../Zotlabs/Module/Group.php:58
+#: ../../Code/Module/Group.php:58
 msgid "Privacy group updated."
 msgstr "Privacygroep bijgewerkt"
 
-#: ../../Zotlabs/Module/Group.php:92
+#: ../../Code/Module/Group.php:92
 msgid "Create a group of channels."
 msgstr "Privacygroep met kanalen aanmaken"
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:186
+#: ../../Code/Module/Group.php:93 ../../Code/Module/Group.php:186
 msgid "Privacy group name: "
 msgstr "Naam privacygroep: "
 
-#: ../../Zotlabs/Module/Group.php:95 ../../Zotlabs/Module/Group.php:189
+#: ../../Code/Module/Group.php:95 ../../Code/Module/Group.php:189
 msgid "Members are visible to other channels"
 msgstr "Kanalen in deze privacygroep zijn zichtbaar voor andere kanalen"
 
-#: ../../Zotlabs/Module/Group.php:113
+#: ../../Code/Module/Group.php:113
 msgid "Privacy group removed."
 msgstr "Privacygroep verwijderd."
 
-#: ../../Zotlabs/Module/Group.php:115
+#: ../../Code/Module/Group.php:115
 msgid "Unable to remove privacy group."
 msgstr "Verwijderen privacygroep mislukt"
 
-#: ../../Zotlabs/Module/Group.php:185
+#: ../../Code/Module/Group.php:185
 msgid "Privacy group editor"
 msgstr "Privacygroep bewerken"
 
-#: ../../Zotlabs/Module/Group.php:199 ../../Zotlabs/Module/Help.php:81
+#: ../../Code/Module/Group.php:199 ../../Code/Module/Help.php:81
 msgid "Members"
 msgstr "Kanalen"
 
-#: ../../Zotlabs/Module/Group.php:201
+#: ../../Code/Module/Group.php:201
 msgid "All Connected Channels"
 msgstr "Alle kanaalconnecties"
 
-#: ../../Zotlabs/Module/Group.php:233
+#: ../../Code/Module/Group.php:233
 msgid "Click on a channel to add or remove."
 msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen."
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+#: ../../Code/Module/Profiles.php:24 ../../Code/Module/Profiles.php:184
+#: ../../Code/Module/Profiles.php:241 ../../Code/Module/Profiles.php:659
 msgid "Profile not found."
 msgstr "Profiel niet gevonden."
 
-#: ../../Zotlabs/Module/Profiles.php:44
+#: ../../Code/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Profiel verwijderd."
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+#: ../../Code/Module/Profiles.php:68 ../../Code/Module/Profiles.php:105
 msgid "Profile-"
 msgstr "Profiel-"
 
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+#: ../../Code/Module/Profiles.php:90 ../../Code/Module/Profiles.php:127
 msgid "New profile created."
 msgstr "Nieuw profiel aangemaakt."
 
-#: ../../Zotlabs/Module/Profiles.php:111
+#: ../../Code/Module/Profiles.php:111
 msgid "Profile unavailable to clone."
 msgstr "Profiel niet beschikbaar om te klonen"
 
-#: ../../Zotlabs/Module/Profiles.php:146
+#: ../../Code/Module/Profiles.php:146
 msgid "Profile unavailable to export."
 msgstr "Geen profiel beschikbaar om te exporteren"
 
-#: ../../Zotlabs/Module/Profiles.php:252
+#: ../../Code/Module/Profiles.php:252
 msgid "Profile Name is required."
 msgstr "Profielnaam is vereist"
 
-#: ../../Zotlabs/Module/Profiles.php:459
+#: ../../Code/Module/Profiles.php:459
 msgid "Marital Status"
 msgstr "Huwelijke status"
 
-#: ../../Zotlabs/Module/Profiles.php:463
+#: ../../Code/Module/Profiles.php:463
 msgid "Romantic Partner"
 msgstr "Romantische partner"
 
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772
+#: ../../Code/Module/Profiles.php:467 ../../Code/Module/Profiles.php:772
 msgid "Likes"
 msgstr "Houdt van"
 
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773
+#: ../../Code/Module/Profiles.php:471 ../../Code/Module/Profiles.php:773
 msgid "Dislikes"
 msgstr "Houdt niet van"
 
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780
+#: ../../Code/Module/Profiles.php:475 ../../Code/Module/Profiles.php:780
 msgid "Work/Employment"
 msgstr "Werk/arbeid"
 
-#: ../../Zotlabs/Module/Profiles.php:478
+#: ../../Code/Module/Profiles.php:478
 msgid "Religion"
 msgstr "Religie"
 
-#: ../../Zotlabs/Module/Profiles.php:482
+#: ../../Code/Module/Profiles.php:482
 msgid "Political Views"
 msgstr "Politieke overtuigingen"
 
-#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../Code/Module/Profiles.php:486
 #: ../../addon/openid/MysqlProvider.php:74
 msgid "Gender"
 msgstr "Geslacht"
 
-#: ../../Zotlabs/Module/Profiles.php:490
+#: ../../Code/Module/Profiles.php:490
 msgid "Sexual Preference"
 msgstr "Seksuele voorkeur"
 
-#: ../../Zotlabs/Module/Profiles.php:494
+#: ../../Code/Module/Profiles.php:494
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../../Zotlabs/Module/Profiles.php:498
+#: ../../Code/Module/Profiles.php:498
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../../Zotlabs/Module/Profiles.php:594
+#: ../../Code/Module/Profiles.php:594
 msgid "Profile updated."
 msgstr "Profiel bijgewerkt"
 
-#: ../../Zotlabs/Module/Profiles.php:678
+#: ../../Code/Module/Profiles.php:678
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien."
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Code/Module/Profiles.php:722
 msgid "Edit Profile Details"
 msgstr "Profiel bewerken"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Code/Module/Profiles.php:724
 msgid "View this profile"
 msgstr "Profiel tonen"
 
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824
+#: ../../Code/Module/Profiles.php:725 ../../Code/Module/Profiles.php:824
 #: ../../include/channel.php:1319
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Profile Tools"
 msgstr "Hulpmiddelen"
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Change cover photo"
 msgstr "Omslagfoto wijzigen"
 
-#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289
+#: ../../Code/Module/Profiles.php:728 ../../include/channel.php:1289
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Code/Module/Profiles.php:729
 msgid "Create a new profile using these settings"
 msgstr "Een nieuw profiel aanmaken met dit profiel als basis"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Clone this profile"
 msgstr "Dit profiel klonen"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Profiles.php:731
 msgid "Delete this profile"
 msgstr "Dit profiel verwijderen"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Profiles.php:732
 msgid "Add profile things"
 msgstr "Dingen aan je profiel toevoegen"
 
-#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708
+#: ../../Code/Module/Profiles.php:733 ../../include/conversation.php:1708
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Relationship"
 msgstr "Relatie"
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44
+#: ../../Code/Module/Profiles.php:736 ../../Code/Widget/Newmember.php:44
 #: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr "Diversen"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Import profile from file"
 msgstr "Profiel vanuit bestand importeren"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Export profile to file"
 msgstr "Profiel naar bestand exporteren"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Your gender"
 msgstr "Jouw geslacht"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Marital status"
 msgstr "Burgerlijke staat"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Code/Module/Profiles.php:742
 msgid "Sexual preference"
 msgstr "Seksuele voorkeur"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:745
 msgid "Profile name"
 msgstr "Profielnaam"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Code/Module/Profiles.php:747
 msgid "This is your default profile."
 msgstr "Dit is jouw standaardprofiel"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Profiles.php:749
 msgid "Your full name"
 msgstr "Jouw volledige naam"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Code/Module/Profiles.php:750
 msgid "Title/Description"
 msgstr "Titel/omschrijving"
 
-#: ../../Zotlabs/Module/Profiles.php:753
+#: ../../Code/Module/Profiles.php:753
 msgid "Street address"
 msgstr "Straat en huisnummer"
 
-#: ../../Zotlabs/Module/Profiles.php:754
+#: ../../Code/Module/Profiles.php:754
 msgid "Locality/City"
 msgstr "Woonplaats"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Code/Module/Profiles.php:755
 msgid "Region/State"
 msgstr "Provincie/gewest/deelstaat"
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Code/Module/Profiles.php:756
 msgid "Postal/Zip code"
 msgstr "Postcode"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Who (if applicable)"
 msgstr "Wie (wanneer van toepassing)"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl"
 
-#: ../../Zotlabs/Module/Profiles.php:763
+#: ../../Code/Module/Profiles.php:763
 msgid "Since (date)"
 msgstr "Sinds (datum)"
 
-#: ../../Zotlabs/Module/Profiles.php:766
+#: ../../Code/Module/Profiles.php:766
 msgid "Tell us about yourself"
 msgstr "Vertel ons iets over jezelf"
 
-#: ../../Zotlabs/Module/Profiles.php:767
+#: ../../Code/Module/Profiles.php:767
 #: ../../addon/openid/MysqlProvider.php:68
 msgid "Homepage URL"
 msgstr "URL homepagina"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Code/Module/Profiles.php:768
 msgid "Hometown"
 msgstr "Oorspronkelijk uit"
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Code/Module/Profiles.php:769
 msgid "Political views"
 msgstr "Politieke overtuigingen"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Code/Module/Profiles.php:770
 msgid "Religious views"
 msgstr "Religieuze overtuigingen"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Keywords used in directory listings"
 msgstr "Trefwoorden voor in de kanalengids"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Example: fishing photography software"
 msgstr "Voorbeeld: muziek, fotografie, software"
 
-#: ../../Zotlabs/Module/Profiles.php:774
+#: ../../Code/Module/Profiles.php:774
 msgid "Musical interests"
 msgstr "Muzikale interesses"
 
-#: ../../Zotlabs/Module/Profiles.php:775
+#: ../../Code/Module/Profiles.php:775
 msgid "Books, literature"
 msgstr "Boeken/literatuur"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Code/Module/Profiles.php:776
 msgid "Television"
 msgstr "Televisie"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Code/Module/Profiles.php:777
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Film/dans/cultuur/entertainment"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Profiles.php:778
 msgid "Hobbies/Interests"
 msgstr "Hobby's/interesses"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Code/Module/Profiles.php:779
 msgid "Love/Romance"
 msgstr "Liefde/romantiek"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Code/Module/Profiles.php:781
 msgid "School/Education"
 msgstr "School/opleiding"
 
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Code/Module/Profiles.php:782
 msgid "Contact information and social networks"
 msgstr "Contactinformatie en sociale netwerken"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Code/Module/Profiles.php:783
 msgid "My other channels"
 msgstr "Mijn andere kanalen"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Code/Module/Profiles.php:785
 msgid "Communications"
 msgstr "Communicatie"
 
-#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315
+#: ../../Code/Module/Profiles.php:820 ../../include/channel.php:1315
 msgid "Profile Image"
 msgstr "Profielfoto"
 
-#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296
+#: ../../Code/Module/Profiles.php:830 ../../include/channel.php:1296
 #: ../../include/nav.php:117
 msgid "Edit Profiles"
 msgstr "Bewerk profielen"
 
-#: ../../Zotlabs/Module/Go.php:21
+#: ../../Code/Module/Go.php:21
 msgid "This page is available only to site members"
 msgstr "Deze pagina is alleen toegankelijk voor hubleden"
 
-#: ../../Zotlabs/Module/Go.php:27
+#: ../../Code/Module/Go.php:27
 msgid "Welcome"
 msgstr "Welkom"
 
-#: ../../Zotlabs/Module/Go.php:29
+#: ../../Code/Module/Go.php:29
 msgid "What would you like to do?"
 msgstr "Wat wil je graag doen?"
 
-#: ../../Zotlabs/Module/Go.php:31
+#: ../../Code/Module/Go.php:31
 msgid ""
 "Please bookmark this page if you would like to return to it in the future"
 msgstr "Maak een bladwijzer voor deze pagina aan, wanneer je in de toekomst hier weer naar wil terugkeren"
 
-#: ../../Zotlabs/Module/Go.php:35
+#: ../../Code/Module/Go.php:35
 msgid "Upload a profile photo"
 msgstr "Profielfoto uploaden"
 
-#: ../../Zotlabs/Module/Go.php:36
+#: ../../Code/Module/Go.php:36
 msgid "Upload a cover photo"
 msgstr "Omslagfoto uploaden"
 
-#: ../../Zotlabs/Module/Go.php:37
+#: ../../Code/Module/Go.php:37
 msgid "Edit your default profile"
 msgstr "Jouw standaardprofiel bewerken"
 
-#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34
+#: ../../Code/Module/Go.php:38 ../../Code/Widget/Newmember.php:34
 msgid "View friend suggestions"
 msgstr "Kanaalvoorstellen tonen"
 
-#: ../../Zotlabs/Module/Go.php:39
+#: ../../Code/Module/Go.php:39
 msgid "View the channel directory"
 msgstr "Kanalengids tonen"
 
-#: ../../Zotlabs/Module/Go.php:40
+#: ../../Code/Module/Go.php:40
 msgid "View/edit your channel settings"
 msgstr "Jouw profielinstellingen bekijken/bewerken"
 
-#: ../../Zotlabs/Module/Go.php:41
+#: ../../Code/Module/Go.php:41
 msgid "View the site or project documentation"
 msgstr "Documentatie van deze hub en het Hubzillaproject tonen"
 
-#: ../../Zotlabs/Module/Go.php:42
+#: ../../Code/Module/Go.php:42
 msgid "Visit your channel homepage"
 msgstr "Jouw kanaalpagina tonen"
 
-#: ../../Zotlabs/Module/Go.php:43
+#: ../../Code/Module/Go.php:43
 msgid ""
 "View your connections and/or add somebody whose address you already know"
 msgstr "Jouw connecties tonen en/of iemand toevoegen waarvan je het adres al weet"
 
-#: ../../Zotlabs/Module/Go.php:44
+#: ../../Code/Module/Go.php:44
 msgid ""
 "View your personal stream (this may be empty until you add some connections)"
 msgstr "Jouw persoonlijke tijdlijn tonen (deze is waarschijnlijk leeg totdat je enkele connecties toevoegt)"
 
-#: ../../Zotlabs/Module/Go.php:52
+#: ../../Code/Module/Go.php:52
 msgid "View the public stream. Warning: this content is not moderated"
 msgstr "De openbare tijdlijn tonen. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
+#: ../../Code/Module/Editwebpage.php:139
 msgid "Page link"
 msgstr "Paginalink"
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
+#: ../../Code/Module/Editwebpage.php:166
 msgid "Edit Webpage"
 msgstr "Webpagina bewerken"
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Manage.php:145
 msgid "Create a new channel"
 msgstr "Nieuw kanaal aanmaken"
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:240
+#: ../../Code/Module/Manage.php:170 ../../Code/Lib/Apps.php:240
 #: ../../include/nav.php:102 ../../include/nav.php:190
 msgid "Channel Manager"
 msgstr "Kanaalbeheer"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Code/Module/Manage.php:171
 msgid "Current Channel"
 msgstr "Huidig kanaal"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Code/Module/Manage.php:173
 msgid "Switch to one of your channels by selecting it."
 msgstr "Activeer een van jouw andere kanalen door er op te klikken."
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Code/Module/Manage.php:174
 msgid "Default Channel"
 msgstr "Standaardkanaal"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Code/Module/Manage.php:175
 msgid "Make Default"
 msgstr "Als standaard instellen"
 
-#: ../../Zotlabs/Module/Manage.php:178
+#: ../../Code/Module/Manage.php:178
 #, php-format
 msgid "%d new messages"
 msgstr "%d nieuwe berichten"
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Code/Module/Manage.php:179
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nieuwe connectieverzoeken"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Code/Module/Manage.php:181
 msgid "Delegated Channel"
 msgstr "Uitbesteed kanaal"
 
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893
+#: ../../Code/Module/Cards.php:42 ../../Code/Module/Cards.php:194
+#: ../../Code/Lib/Apps.php:230 ../../include/conversation.php:1893
 #: ../../include/features.php:123 ../../include/nav.php:458
 msgid "Cards"
 msgstr "Kaarten"
 
-#: ../../Zotlabs/Module/Cards.php:99
+#: ../../Code/Module/Cards.php:99
 msgid "Add Card"
 msgstr "Kaart toevoegen"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
+#: ../../Code/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig"
 
-#: ../../Zotlabs/Module/Siteinfo.php:18
+#: ../../Code/Module/Siteinfo.php:18
 msgid "About this site"
 msgstr "Over deze hub"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Code/Module/Siteinfo.php:19
 msgid "Site Name"
 msgstr "Hubnaam"
 
-#: ../../Zotlabs/Module/Siteinfo.php:23
+#: ../../Code/Module/Siteinfo.php:23
 msgid "Administrator"
 msgstr "Beheerder"
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232
+#: ../../Code/Module/Siteinfo.php:25 ../../Code/Module/Register.php:232
 msgid "Terms of Service"
 msgstr "Gebruiksvoorwaarden"
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
+#: ../../Code/Module/Siteinfo.php:26
 msgid "Software and Project information"
 msgstr "Software- en projectinformatie"
 
-#: ../../Zotlabs/Module/Siteinfo.php:27
+#: ../../Code/Module/Siteinfo.php:27
 msgid "This site is powered by $Projectname"
 msgstr "Dit is een $Projectname-hub"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Code/Module/Siteinfo.php:28
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr "Federatieve en gedecentraliseerde netwerk- en identiteitsdiensten, mogelijk gemaakt door Zot"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Code/Module/Siteinfo.php:30
 #, php-format
 msgid "Version %s"
 msgstr "Versie %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../Code/Module/Siteinfo.php:31
 msgid "Project homepage"
 msgstr "Projectwebsite"
 
-#: ../../Zotlabs/Module/Siteinfo.php:32
+#: ../../Code/Module/Siteinfo.php:32
 msgid "Developer homepage"
 msgstr "Ontwikkelaarswebsite"
 
-#: ../../Zotlabs/Module/Ratings.php:70
+#: ../../Code/Module/Ratings.php:70
 msgid "No ratings"
 msgstr "Geen beoordelingen"
 
-#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
+#: ../../Code/Module/Ratings.php:97 ../../Code/Module/Pubsites.php:35
 #: ../../include/conversation.php:1082
 msgid "Ratings"
 msgstr "Beoordelingen"
 
-#: ../../Zotlabs/Module/Ratings.php:98
+#: ../../Code/Module/Ratings.php:98
 msgid "Rating: "
 msgstr "Beoordeling: "
 
-#: ../../Zotlabs/Module/Ratings.php:99
+#: ../../Code/Module/Ratings.php:99
 msgid "Website: "
 msgstr "Website: "
 
-#: ../../Zotlabs/Module/Ratings.php:101
+#: ../../Code/Module/Ratings.php:101
 msgid "Description: "
 msgstr "Omschrijving: "
 
-#: ../../Zotlabs/Module/Webpages.php:54
+#: ../../Code/Module/Webpages.php:54
 msgid "Import Webpage Elements"
 msgstr "Webpagina-elementen importeren"
 
-#: ../../Zotlabs/Module/Webpages.php:55
+#: ../../Code/Module/Webpages.php:55
 msgid "Import selected"
 msgstr "Importbestand geselecteerd"
 
-#: ../../Zotlabs/Module/Webpages.php:78
+#: ../../Code/Module/Webpages.php:78
 msgid "Export Webpage Elements"
 msgstr "Webpagina-elementen exporteren"
 
-#: ../../Zotlabs/Module/Webpages.php:79
+#: ../../Code/Module/Webpages.php:79
 msgid "Export selected"
 msgstr "Selectie exporteren"
 
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244
+#: ../../Code/Module/Webpages.php:237 ../../Code/Lib/Apps.php:244
 #: ../../include/conversation.php:1915 ../../include/nav.php:481
 msgid "Webpages"
 msgstr "Webpagina's"
 
-#: ../../Zotlabs/Module/Webpages.php:248
+#: ../../Code/Module/Webpages.php:248
 msgid "Actions"
 msgstr "Acties"
 
-#: ../../Zotlabs/Module/Webpages.php:249
+#: ../../Code/Module/Webpages.php:249
 msgid "Page Link"
 msgstr "Paginalink"
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Code/Module/Webpages.php:250
 msgid "Page Title"
 msgstr "Paginatitel"
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Code/Module/Webpages.php:280
 msgid "Invalid file type."
 msgstr "Ongeldig bestandsformaat"
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Code/Module/Webpages.php:292
 msgid "Error opening zip file"
 msgstr "Fout tijdens openen zipbestand"
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Code/Module/Webpages.php:303
 msgid "Invalid folder path."
 msgstr "Ongeldige maplocatie"
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Code/Module/Webpages.php:330
 msgid "No webpage elements detected."
 msgstr "Geen webpagina-elementen gedecteerd"
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Code/Module/Webpages.php:405
 msgid "Import complete."
 msgstr "Importeren voltooid."
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
+#: ../../Code/Module/Changeaddr.php:35
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account"
 " password."
 msgstr "Veranderen van kanaaladres is niet toegestaan binnen 48 uur na het veranderen van het accountwachtwoord."
 
-#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214
+#: ../../Code/Module/Changeaddr.php:46 ../../include/channel.php:214
 #: ../../include/channel.php:599
 msgid "Reserved nickname. Please choose another."
 msgstr "Deze naam is gereserveerd. Kies een andere."
 
-#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219
+#: ../../Code/Module/Changeaddr.php:51 ../../include/channel.php:219
 #: ../../include/channel.php:604
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
+#: ../../Code/Module/Changeaddr.php:77
 msgid "Change channel nickname/address"
 msgstr "Kanaaladres veranderen"
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Changeaddr.php:78
 msgid "Any/all connections on other networks will be lost!"
 msgstr "Alle connecties op andere netwerken gaan verloren!"
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
+#: ../../Code/Module/Changeaddr.php:80
 msgid "New channel address"
 msgstr "Nieuw kanaaladres"
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
+#: ../../Code/Module/Changeaddr.php:81
 msgid "Rename Channel"
 msgstr "Kanaal hernoemen"
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+#: ../../Code/Module/Editpost.php:38 ../../Code/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "Item is niet te bewerken"
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144
+#: ../../Code/Module/Editpost.php:108 ../../Code/Module/Rpost.php:144
 msgid "Edit post"
 msgstr "Bericht bewerken"
 
-#: ../../Zotlabs/Module/Dreport.php:45
+#: ../../Code/Module/Dreport.php:45
 msgid "Invalid message"
 msgstr "Ongeldig bericht"
 
-#: ../../Zotlabs/Module/Dreport.php:78
+#: ../../Code/Module/Dreport.php:78
 msgid "no results"
 msgstr "geen resultaten"
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Code/Module/Dreport.php:93
 msgid "channel sync processed"
 msgstr "kanaalsync verwerkt"
 
-#: ../../Zotlabs/Module/Dreport.php:97
+#: ../../Code/Module/Dreport.php:97
 msgid "queued"
 msgstr "in wachtrij"
 
-#: ../../Zotlabs/Module/Dreport.php:101
+#: ../../Code/Module/Dreport.php:101
 msgid "posted"
 msgstr "verstuurd"
 
-#: ../../Zotlabs/Module/Dreport.php:105
+#: ../../Code/Module/Dreport.php:105
 msgid "accepted for delivery"
 msgstr "geaccepteerd om afgeleverd te worden"
 
-#: ../../Zotlabs/Module/Dreport.php:109
+#: ../../Code/Module/Dreport.php:109
 msgid "updated"
 msgstr "geüpdatet"
 
-#: ../../Zotlabs/Module/Dreport.php:112
+#: ../../Code/Module/Dreport.php:112
 msgid "update ignored"
 msgstr "update genegeerd"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Code/Module/Dreport.php:115
 msgid "permission denied"
 msgstr "toegang geweigerd"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Code/Module/Dreport.php:119
 msgid "recipient not found"
 msgstr "ontvanger niet gevonden"
 
-#: ../../Zotlabs/Module/Dreport.php:122
+#: ../../Code/Module/Dreport.php:122
 msgid "mail recalled"
 msgstr "Privébericht ingetrokken"
 
-#: ../../Zotlabs/Module/Dreport.php:125
+#: ../../Code/Module/Dreport.php:125
 msgid "duplicate mail received"
 msgstr "dubbel privébericht ontvangen"
 
-#: ../../Zotlabs/Module/Dreport.php:128
+#: ../../Code/Module/Dreport.php:128
 msgid "mail delivered"
 msgstr "privébericht afgeleverd"
 
-#: ../../Zotlabs/Module/Dreport.php:148
+#: ../../Code/Module/Dreport.php:148
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Afleveringsrapport voor %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Code/Module/Dreport.php:151 ../../Code/Widget/Wiki_pages.php:39
+#: ../../Code/Widget/Wiki_pages.php:96
 msgid "Options"
 msgstr "Opties"
 
-#: ../../Zotlabs/Module/Dreport.php:152
+#: ../../Code/Module/Dreport.php:152
 msgid "Redeliver"
 msgstr "Opnieuw afleveren"
 
-#: ../../Zotlabs/Module/Sources.php:37
+#: ../../Code/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
 msgstr "Aanmaken bron mislukt. Geen kanaal geselecteerd."
 
-#: ../../Zotlabs/Module/Sources.php:51
+#: ../../Code/Module/Sources.php:51
 msgid "Source created."
 msgstr "Bron aangemaakt."
 
-#: ../../Zotlabs/Module/Sources.php:64
+#: ../../Code/Module/Sources.php:64
 msgid "Source updated."
 msgstr "Bron aangemaakt."
 
-#: ../../Zotlabs/Module/Sources.php:90
+#: ../../Code/Module/Sources.php:90
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292
+#: ../../Code/Module/Sources.php:96
+#: ../../Code/Widget/Settings_menu.php:133 ../../include/features.php:292
 msgid "Channel Sources"
 msgstr "Kanaalbronnen"
 
-#: ../../Zotlabs/Module/Sources.php:97
+#: ../../Code/Module/Sources.php:97
 msgid "Manage remote sources of content for your channel."
 msgstr "Beheer externe bronnen met inhoud voor jouw kanaal"
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+#: ../../Code/Module/Sources.php:98 ../../Code/Module/Sources.php:108
 msgid "New Source"
 msgstr "Nieuwe bron"
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+#: ../../Code/Module/Sources.php:109 ../../Code/Module/Sources.php:143
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen."
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Only import content with these words (one per line)"
 msgstr "Importeer alleen inhoud met deze woorden (één per regel)"
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:110 ../../Code/Module/Sources.php:144
 msgid "Leave blank to import all public content"
 msgstr "Laat leeg om alle openbare inhoud te importeren"
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+#: ../../Code/Module/Sources.php:111 ../../Code/Module/Sources.php:148
 msgid "Channel Name"
 msgstr "Kanaalnaam"
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:147
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr "De volgende categorieën aan berichten toevoegen die uit deze bron zijn geïmporteerd (door komma's gescheiden)"
 
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+#: ../../Code/Module/Sources.php:133 ../../Code/Module/Sources.php:161
 msgid "Source not found."
 msgstr "Bron niet gevonden"
 
-#: ../../Zotlabs/Module/Sources.php:140
+#: ../../Code/Module/Sources.php:140
 msgid "Edit Source"
 msgstr "Bron bewerken"
 
-#: ../../Zotlabs/Module/Sources.php:141
+#: ../../Code/Module/Sources.php:141
 msgid "Delete Source"
 msgstr "Bron verwijderen"
 
-#: ../../Zotlabs/Module/Sources.php:169
+#: ../../Code/Module/Sources.php:169
 msgid "Source removed"
 msgstr "Bron verwijderd"
 
-#: ../../Zotlabs/Module/Sources.php:171
+#: ../../Code/Module/Sources.php:171
 msgid "Unable to remove source."
 msgstr "Verwijderen bron mislukt."
 
-#: ../../Zotlabs/Module/Like.php:54
+#: ../../Code/Module/Like.php:54
 msgid "Like/Dislike"
 msgstr "Leuk/niet leuk"
 
-#: ../../Zotlabs/Module/Like.php:59
+#: ../../Code/Module/Like.php:59
 msgid "This action is restricted to members."
 msgstr "Deze actie kan alleen door $Projectname-leden worden uitgevoerd."
 
-#: ../../Zotlabs/Module/Like.php:60
+#: ../../Code/Module/Like.php:60
 msgid ""
 "Please login with your $Projectname ID or register as a new $Projectname member to continue."
 msgstr "Je dient in te loggen met je $Projectname-account of een nieuw $Projectname-account aan te maken om verder te kunnen gaan."
 
-#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135
-#: ../../Zotlabs/Module/Like.php:173
+#: ../../Code/Module/Like.php:109 ../../Code/Module/Like.php:135
+#: ../../Code/Module/Like.php:173
 msgid "Invalid request."
 msgstr "Ongeldig verzoek"
 
-#: ../../Zotlabs/Module/Like.php:121 ../../include/conversation.php:122
+#: ../../Code/Module/Like.php:121 ../../include/conversation.php:122
 msgid "channel"
 msgstr "kanaal"
 
-#: ../../Zotlabs/Module/Like.php:150
+#: ../../Code/Module/Like.php:150
 msgid "thing"
 msgstr "ding"
 
-#: ../../Zotlabs/Module/Like.php:196
+#: ../../Code/Module/Like.php:196
 msgid "Channel unavailable."
 msgstr "Kanaal  niet beschikbaar."
 
-#: ../../Zotlabs/Module/Like.php:244
+#: ../../Code/Module/Like.php:244
 msgid "Previous action reversed."
 msgstr "Vorige actie omgedraaid"
 
-#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529
+#: ../../Code/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529
 #: ../../addon/pubcrawl/as.php:1440 ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s vindt %3$s van %2$s leuk"
 
-#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442
+#: ../../Code/Module/Like.php:440 ../../addon/pubcrawl/as.php:1442
 #: ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s vindt %3$s van %2$s niet leuk"
 
-#: ../../Zotlabs/Module/Like.php:442
+#: ../../Code/Module/Like.php:442
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s is het eens met %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:444
+#: ../../Code/Module/Like.php:444
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s is het niet eens met %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:446
+#: ../../Code/Module/Like.php:446
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s onthoudt zich van een besluit over %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072
+#: ../../Code/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s is aanwezig op %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074
+#: ../../Code/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s is niet aanwezig op %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076
+#: ../../Code/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s is mogelijk aanwezig op %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:564
+#: ../../Code/Module/Like.php:564
 msgid "Action completed."
 msgstr "Actie voltooid"
 
-#: ../../Zotlabs/Module/Like.php:565
+#: ../../Code/Module/Like.php:565
 msgid "Thank you."
 msgstr "Bedankt"
 
-#: ../../Zotlabs/Module/Directory.php:106
+#: ../../Code/Module/Directory.php:106
 msgid "No default suggestions were found."
 msgstr "Er zijn geen standaard kanaalvoorstellen gevonden."
 
-#: ../../Zotlabs/Module/Directory.php:255
+#: ../../Code/Module/Directory.php:255
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d beoordeling"
 msgstr[1] "%d beoordelingen"
 
-#: ../../Zotlabs/Module/Directory.php:266
+#: ../../Code/Module/Directory.php:266
 msgid "Gender: "
 msgstr "Geslacht:"
 
-#: ../../Zotlabs/Module/Directory.php:268
+#: ../../Code/Module/Directory.php:268
 msgid "Status: "
 msgstr "Status: "
 
-#: ../../Zotlabs/Module/Directory.php:270
+#: ../../Code/Module/Directory.php:270
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564
+#: ../../Code/Module/Directory.php:319 ../../include/channel.php:1564
 msgid "Age:"
 msgstr "Leeftijd:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391
+#: ../../Code/Module/Directory.php:324 ../../include/channel.php:1391
 #: ../../include/event.php:54 ../../include/event.php:86
 msgid "Location:"
 msgstr "Plaats:"
 
-#: ../../Zotlabs/Module/Directory.php:330
+#: ../../Code/Module/Directory.php:330
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593
+#: ../../Code/Module/Directory.php:335 ../../include/channel.php:1593
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599
+#: ../../Code/Module/Directory.php:337 ../../include/channel.php:1599
 msgid "About:"
 msgstr "Over:"
 
-#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../Code/Module/Directory.php:338 ../../Code/Module/Suggest.php:56
+#: ../../Code/Widget/Follow.php:32 ../../Code/Widget/Suggestions.php:44
 #: ../../include/conversation.php:1052 ../../include/channel.php:1376
 #: ../../include/connections.php:110
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../../Zotlabs/Module/Directory.php:339
+#: ../../Code/Module/Directory.php:339
 msgid "Public Forum:"
 msgstr "Openbaar forum:"
 
-#: ../../Zotlabs/Module/Directory.php:342
+#: ../../Code/Module/Directory.php:342
 msgid "Keywords: "
 msgstr "Trefwoorden: "
 
-#: ../../Zotlabs/Module/Directory.php:345
+#: ../../Code/Module/Directory.php:345
 msgid "Don't suggest"
 msgstr "Niet voorstellen"
 
-#: ../../Zotlabs/Module/Directory.php:347
+#: ../../Code/Module/Directory.php:347
 msgid "Common connections (estimated):"
 msgstr "Gemeenschappelijke connecties (schatting):"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Global Directory"
 msgstr "Volledige kanalengids"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Local Directory"
 msgstr "Lokale kanalengids"
 
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Code/Module/Directory.php:402
 msgid "Finding:"
 msgstr "Gezocht naar:"
 
-#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Code/Module/Directory.php:405 ../../Code/Module/Suggest.php:64
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Voorgestelde kanalen"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "next page"
 msgstr "volgende pagina"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "previous page"
 msgstr "vorige pagina"
 
-#: ../../Zotlabs/Module/Directory.php:408
+#: ../../Code/Module/Directory.php:408
 msgid "Sort options"
 msgstr "Sorteeropties"
 
-#: ../../Zotlabs/Module/Directory.php:409
+#: ../../Code/Module/Directory.php:409
 msgid "Alphabetic"
 msgstr "Alfabetisch"
 
-#: ../../Zotlabs/Module/Directory.php:410
+#: ../../Code/Module/Directory.php:410
 msgid "Reverse Alphabetic"
 msgstr "Omgekeerd alfabetisch"
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Code/Module/Directory.php:411
 msgid "Newest to Oldest"
 msgstr "Nieuw naar oud"
 
-#: ../../Zotlabs/Module/Directory.php:412
+#: ../../Code/Module/Directory.php:412
 msgid "Oldest to Newest"
 msgstr "Oud naar nieuw"
 
-#: ../../Zotlabs/Module/Directory.php:429
+#: ../../Code/Module/Directory.php:429
 msgid "No entries (some entries may be hidden)."
 msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
 
-#: ../../Zotlabs/Module/Xchan.php:10
+#: ../../Code/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr "Xchan opzoeken"
 
-#: ../../Zotlabs/Module/Xchan.php:13
+#: ../../Code/Module/Xchan.php:13
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Zoek een xchan (of webbie) die begint met:"
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Code/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer."
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Code/Module/Suggest.php:58 ../../Code/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr "Negeren/Verbergen"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "Niet in staat om je hub te vinden"
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "Verzenden bericht geslaagd."
 
-#: ../../Zotlabs/Module/Mail.php:73
+#: ../../Code/Module/Mail.php:73
 msgid "Unable to lookup recipient."
 msgstr "Niet in staat om ontvanger op te zoeken."
 
-#: ../../Zotlabs/Module/Mail.php:80
+#: ../../Code/Module/Mail.php:80
 msgid "Unable to communicate with requested channel."
 msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
 
-#: ../../Zotlabs/Module/Mail.php:87
+#: ../../Code/Module/Mail.php:87
 msgid "Cannot verify requested channel."
 msgstr "Kan opgevraagd kanaal niet verifieren"
 
-#: ../../Zotlabs/Module/Mail.php:105
+#: ../../Code/Module/Mail.php:105
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
 
-#: ../../Zotlabs/Module/Mail.php:160
+#: ../../Code/Module/Mail.php:160
 msgid "Messages"
 msgstr "Berichten"
 
-#: ../../Zotlabs/Module/Mail.php:173
+#: ../../Code/Module/Mail.php:173
 msgid "message"
 msgstr "bericht"
 
-#: ../../Zotlabs/Module/Mail.php:214
+#: ../../Code/Module/Mail.php:214
 msgid "Message recalled."
 msgstr "Bericht ingetrokken."
 
-#: ../../Zotlabs/Module/Mail.php:227
+#: ../../Code/Module/Mail.php:227
 msgid "Conversation removed."
 msgstr "Conversatie verwijderd"
 
-#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
+#: ../../Code/Module/Mail.php:242 ../../Code/Module/Mail.php:363
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:270
+#: ../../Code/Module/Mail.php:270
 msgid "Requested channel is not in this network"
 msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
 
-#: ../../Zotlabs/Module/Mail.php:278
+#: ../../Code/Module/Mail.php:278
 msgid "Send Private Message"
 msgstr "Privébericht versturen"
 
-#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
+#: ../../Code/Module/Mail.php:279 ../../Code/Module/Mail.php:421
 msgid "To:"
 msgstr "Aan:"
 
-#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
+#: ../../Code/Module/Mail.php:282 ../../Code/Module/Mail.php:423
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../Code/Module/Mail.php:287 ../../Code/Module/Mail.php:429
 #: ../../include/conversation.php:1385
 msgid "Attach file"
 msgstr "Bestand toevoegen"
 
-#: ../../Zotlabs/Module/Mail.php:289
+#: ../../Code/Module/Mail.php:289
 msgid "Send"
 msgstr "Verzenden"
 
-#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
+#: ../../Code/Module/Mail.php:292 ../../Code/Module/Mail.php:434
 #: ../../include/conversation.php:1430
 msgid "Set expiration date"
 msgstr "Verloopdatum instellen"
 
-#: ../../Zotlabs/Module/Mail.php:393
+#: ../../Code/Module/Mail.php:393
 msgid "Delete message"
 msgstr "Bericht verwijderen"
 
-#: ../../Zotlabs/Module/Mail.php:394
+#: ../../Code/Module/Mail.php:394
 msgid "Delivery report"
 msgstr "Afleveringsrapport"
 
-#: ../../Zotlabs/Module/Mail.php:395
+#: ../../Code/Module/Mail.php:395
 msgid "Recall message"
 msgstr "Bericht intrekken"
 
-#: ../../Zotlabs/Module/Mail.php:397
+#: ../../Code/Module/Mail.php:397
 msgid "Message has been recalled."
 msgstr "Bericht is ingetrokken."
 
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Code/Module/Mail.php:414
 msgid "Delete Conversation"
 msgstr "Verwijder conversatie"
 
-#: ../../Zotlabs/Module/Mail.php:416
+#: ../../Code/Module/Mail.php:416
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "Geen veilige communicatie beschikbaar. Mogelijk kan je reageren op de kanaalpagina van de afzender."
 
-#: ../../Zotlabs/Module/Mail.php:420
+#: ../../Code/Module/Mail.php:420
 msgid "Send Reply"
 msgstr "Antwoord versturen"
 
-#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Code/Module/Mail.php:425
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Jouw privébericht aan %s (%s):"
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+#: ../../Code/Module/Pubsites.php:24 ../../Code/Widget/Pubsites.php:12
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../Zotlabs/Module/Pubsites.php:27
+#: ../../Code/Module/Pubsites.php:27
 msgid ""
 "The listed hubs allow public registration for the $Projectname network. All "
 "hubs in the network are interlinked so membership on any of them conveys "
@@ -7146,1518 +7146,1518 @@ msgid ""
 "additional details."
 msgstr "Op de hier getoonde hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven."
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr "Hub-URL"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr "Toegangs-
               type"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr "Registratie-
               beleid"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Stats"
 msgstr "Stats"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Software"
 msgstr "Software"
 
-#: ../../Zotlabs/Module/Pubsites.php:49
+#: ../../Code/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Beoordeel"
 
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:267
+#: ../../Code/Module/Impel.php:43 ../../include/bbcode.php:267
 msgid "webpage"
 msgstr "Webpagina"
 
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:273
+#: ../../Code/Module/Impel.php:48 ../../include/bbcode.php:273
 msgid "block"
 msgstr "blok"
 
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:270
+#: ../../Code/Module/Impel.php:53 ../../include/bbcode.php:270
 msgid "layout"
 msgstr "lay-out"
 
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:276
+#: ../../Code/Module/Impel.php:60 ../../include/bbcode.php:276
 msgid "menu"
 msgstr "menu"
 
-#: ../../Zotlabs/Module/Impel.php:183
+#: ../../Code/Module/Impel.php:183
 #, php-format
 msgid "%s element installed"
 msgstr "%s onderdeel geïnstalleerd"
 
-#: ../../Zotlabs/Module/Impel.php:186
+#: ../../Code/Module/Impel.php:186
 #, php-format
 msgid "%s element installation failed"
 msgstr "Installatie %s-element mislukt"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Code/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr "Kies een bladwijzermap"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Code/Module/Rbmark.php:99
 msgid "Save Bookmark"
 msgstr "Bladwijzer opslaan"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Code/Module/Rbmark.php:100
 msgid "URL of bookmark"
 msgstr "URL van bladwijzer"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Code/Module/Rbmark.php:105
 msgid "Or enter new bookmark folder name"
 msgstr "Of geef de naam op van een nieuwe bladwijzermap"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "Enter a folder name"
 msgstr "Vul een mapnaam in"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "or select an existing folder (doubleclick)"
 msgstr "of kies een bestaande map (dubbelklikken)"
 
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:151
+#: ../../Code/Module/Filer.php:54 ../../Code/Lib/ThreadItem.php:151
 msgid "Save to Folder"
 msgstr "In map opslaan"
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Code/Module/Probe.php:30 ../../Code/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Ophalen URL gaf een foutmelding terug: %1$s"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Code/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Maximum toegestane dagelijkse registraties op deze $Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals."
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Code/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Code/Module/Register.php:89
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet met elkaar overeen."
 
-#: ../../Zotlabs/Module/Register.php:132
+#: ../../Code/Module/Register.php:132
 msgid "Registration successful. Continue to create your first channel..."
 msgstr "Registratie geslaagd. Ga verder met het aanmaken van jouw eerste kanaal..."
 
-#: ../../Zotlabs/Module/Register.php:135
+#: ../../Code/Module/Register.php:135
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registratie geslaagd. Controleer je e-mail voor instructies."
 
-#: ../../Zotlabs/Module/Register.php:142
+#: ../../Code/Module/Register.php:142
 msgid "Your registration is pending approval by the site owner."
 msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze $Projectname-hub."
 
-#: ../../Zotlabs/Module/Register.php:145
+#: ../../Code/Module/Register.php:145
 msgid "Your registration can not be processed."
 msgstr "Jouw registratie kan niet verwerkt worden."
 
-#: ../../Zotlabs/Module/Register.php:192
+#: ../../Code/Module/Register.php:192
 msgid "Registration on this hub is disabled."
 msgstr "Registreren van nieuwe accounts is op deze hub uitgeschakeld."
 
-#: ../../Zotlabs/Module/Register.php:201
+#: ../../Code/Module/Register.php:201
 msgid "Registration on this hub is by approval only."
 msgstr "Registraties op deze hub moeten eerst worden goedgekeurd."
 
-#: ../../Zotlabs/Module/Register.php:202
+#: ../../Code/Module/Register.php:202
 msgid "Register at another affiliated hub."
 msgstr "Registreer op een andere hub."
 
-#: ../../Zotlabs/Module/Register.php:212
+#: ../../Code/Module/Register.php:212
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Deze $Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."
 
-#: ../../Zotlabs/Module/Register.php:238
+#: ../../Code/Module/Register.php:238
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Ik accepteer de %s van deze $Projectname-hub"
 
-#: ../../Zotlabs/Module/Register.php:245
+#: ../../Code/Module/Register.php:245
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Ik ben %s jaar of ouder en accepteer de %s van deze hub"
 
-#: ../../Zotlabs/Module/Register.php:250
+#: ../../Code/Module/Register.php:250
 msgid "Your email address"
 msgstr "Jouw e-mailadres"
 
-#: ../../Zotlabs/Module/Register.php:251
+#: ../../Code/Module/Register.php:251
 msgid "Choose a password"
 msgstr "Geef een wachtwoord op"
 
-#: ../../Zotlabs/Module/Register.php:252
+#: ../../Code/Module/Register.php:252
 msgid "Please re-enter your password"
 msgstr "Geef het wachtwoord opnieuw op"
 
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Code/Module/Register.php:253
 msgid "Please enter your invitation code"
 msgstr "Vul jouw uitnodigingscode in"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Code/Module/Register.php:258
 msgid "no"
 msgstr "Nee"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Code/Module/Register.php:258
 msgid "yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Register.php:274
+#: ../../Code/Module/Register.php:274
 msgid "Membership on this site is by invitation only."
 msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging."
 
-#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570
+#: ../../Code/Module/Register.php:286 ../../boot.php:1570
 #: ../../include/nav.php:164
 msgid "Register"
 msgstr "Registreren"
 
-#: ../../Zotlabs/Module/Register.php:287
+#: ../../Code/Module/Register.php:287
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr "Deze hub vereist e-mailverificatie. Controleer na het indienen van dit formulier jouw e-mail voor verdere instructies."
 
-#: ../../Zotlabs/Module/Cover_photo.php:136
-#: ../../Zotlabs/Module/Cover_photo.php:186
+#: ../../Code/Module/Cover_photo.php:136
+#: ../../Code/Module/Cover_photo.php:186
 msgid "Cover Photos"
 msgstr "Omslagfoto's"
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558
+#: ../../Code/Module/Cover_photo.php:237 ../../include/items.php:4558
 msgid "female"
 msgstr "vrouw"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559
+#: ../../Code/Module/Cover_photo.php:238 ../../include/items.php:4559
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s heeft haar %2$s bijgewerkt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560
+#: ../../Code/Module/Cover_photo.php:239 ../../include/items.php:4560
 msgid "male"
 msgstr "man"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561
+#: ../../Code/Module/Cover_photo.php:240 ../../include/items.php:4561
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s heeft zijn %2$s bijgewerkt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563
+#: ../../Code/Module/Cover_photo.php:242 ../../include/items.php:4563
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "De %2$s van %1$s is bijgewerkt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070
+#: ../../Code/Module/Cover_photo.php:244 ../../include/channel.php:2070
 msgid "cover photo"
 msgstr "omslagfoto"
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Code/Module/Cover_photo.php:361
 msgid "Change Cover Photo"
 msgstr "Omslagfoto wijzigen"
 
-#: ../../Zotlabs/Module/Help.php:23
+#: ../../Code/Module/Help.php:23
 msgid "Documentation Search"
 msgstr "Zoek documentatie"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824
+#: ../../Code/Module/Help.php:80 ../../include/conversation.php:1824
 #: ../../include/nav.php:391
 msgid "About"
 msgstr "Over"
 
-#: ../../Zotlabs/Module/Help.php:82
+#: ../../Code/Module/Help.php:82
 msgid "Administrators"
 msgstr "Beheerders"
 
-#: ../../Zotlabs/Module/Help.php:83
+#: ../../Code/Module/Help.php:83
 msgid "Developers"
 msgstr "Ontwikkelaars"
 
-#: ../../Zotlabs/Module/Help.php:84
+#: ../../Code/Module/Help.php:84
 msgid "Tutorials"
 msgstr "Zelfstudie"
 
-#: ../../Zotlabs/Module/Help.php:95
+#: ../../Code/Module/Help.php:95
 msgid "$Projectname Documentation"
 msgstr "$Projectname-documentatie"
 
-#: ../../Zotlabs/Module/Help.php:96
+#: ../../Code/Module/Help.php:96
 msgid "Contents"
 msgstr "Inhoud"
 
-#: ../../Zotlabs/Module/Display.php:394
+#: ../../Code/Module/Display.php:394
 msgid "Article"
 msgstr "Artikel"
 
-#: ../../Zotlabs/Module/Display.php:446
+#: ../../Code/Module/Display.php:446
 msgid "Item has been removed."
 msgstr "Item is verwijderd"
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr "Tag verwijderd"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr "Verwijder item-tag"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr "Kies een tag om te verwijderen"
 
-#: ../../Zotlabs/Module/Network.php:100
+#: ../../Code/Module/Network.php:100
 msgid "No such group"
 msgstr "Collectie niet gevonden"
 
-#: ../../Zotlabs/Module/Network.php:142
+#: ../../Code/Module/Network.php:142
 msgid "No such channel"
 msgstr "Niet zo'n kanaal"
 
-#: ../../Zotlabs/Module/Network.php:147
+#: ../../Code/Module/Network.php:147
 msgid "forum"
 msgstr "forum"
 
-#: ../../Zotlabs/Module/Network.php:159
+#: ../../Code/Module/Network.php:159
 msgid "Search Results For:"
 msgstr "Zoekresultaten voor:"
 
-#: ../../Zotlabs/Module/Network.php:229
+#: ../../Code/Module/Network.php:229
 msgid "Privacy group is empty"
 msgstr "Privacygroep is leeg"
 
-#: ../../Zotlabs/Module/Network.php:238
+#: ../../Code/Module/Network.php:238
 msgid "Privacy group: "
 msgstr "Privacygroep: "
 
-#: ../../Zotlabs/Module/Network.php:265
+#: ../../Code/Module/Network.php:265
 msgid "Invalid connection."
 msgstr "Ongeldige connectie."
 
-#: ../../Zotlabs/Module/Network.php:285 ../../addon/redred/redred.php:65
+#: ../../Code/Module/Network.php:285 ../../addon/redred/redred.php:65
 msgid "Invalid channel."
 msgstr "Onbekend kanaal."
 
-#: ../../Zotlabs/Module/Acl.php:361
+#: ../../Code/Module/Acl.php:361
 msgid "network"
 msgstr "netwerk"
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
+#: ../../Code/Module/Home.php:74 ../../Code/Module/Home.php:82
+#: ../../Code/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../Zotlabs/Module/Home.php:92
+#: ../../Code/Module/Home.php:92
 #, php-format
 msgid "Welcome to %s"
 msgstr "Welkom op %s"
 
-#: ../../Zotlabs/Module/Filestorage.php:79
+#: ../../Code/Module/Filestorage.php:79
 msgid "Permission Denied."
 msgstr "Toegang geweigerd"
 
-#: ../../Zotlabs/Module/Filestorage.php:95
+#: ../../Code/Module/Filestorage.php:95
 msgid "File not found."
 msgstr "Bestand niet gevonden."
 
-#: ../../Zotlabs/Module/Filestorage.php:142
+#: ../../Code/Module/Filestorage.php:142
 msgid "Edit file permissions"
 msgstr "Bestandsrechten bewerken"
 
-#: ../../Zotlabs/Module/Filestorage.php:154
+#: ../../Code/Module/Filestorage.php:154
 msgid "Set/edit permissions"
 msgstr "Rechten instellen/bewerken"
 
-#: ../../Zotlabs/Module/Filestorage.php:155
+#: ../../Code/Module/Filestorage.php:155
 msgid "Include all files and sub folders"
 msgstr "Toepassen op alle bestanden en submappen"
 
-#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Code/Module/Filestorage.php:156
 msgid "Return to file list"
 msgstr "Terugkeren naar bestandlijst "
 
-#: ../../Zotlabs/Module/Filestorage.php:158
+#: ../../Code/Module/Filestorage.php:158
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Kopieer/plak deze code om het bestand aan een bericht te koppelen"
 
-#: ../../Zotlabs/Module/Filestorage.php:159
+#: ../../Code/Module/Filestorage.php:159
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen"
 
-#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Code/Module/Filestorage.php:161
 msgid "Share this file"
 msgstr "Dit bestand delen"
 
-#: ../../Zotlabs/Module/Filestorage.php:162
+#: ../../Code/Module/Filestorage.php:162
 msgid "Show URL to this file"
 msgstr "Toon URL van dit bestand"
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397
+#: ../../Code/Module/Filestorage.php:163
+#: ../../Code/Storage/Browser.php:397
 msgid "Show in your contacts shared folder"
 msgstr "In de met jouw connecties gedeelde map tonen "
 
-#: ../../Zotlabs/Module/Common.php:14
+#: ../../Code/Module/Common.php:14
 msgid "No channel."
 msgstr "Geen kanaal."
 
-#: ../../Zotlabs/Module/Common.php:45
+#: ../../Code/Module/Common.php:45
 msgid "No connections in common."
 msgstr "Geen gemeenschappelijke connecties."
 
-#: ../../Zotlabs/Module/Common.php:65
+#: ../../Code/Module/Common.php:65
 msgid "View Common Connections"
 msgstr "Gemeenschappelijke connecties tonen"
 
-#: ../../Zotlabs/Module/Email_resend.php:30
+#: ../../Code/Module/Email_resend.php:30
 msgid "Email verification resent"
 msgstr "E-mailverificatie opnieuw verzonden"
 
-#: ../../Zotlabs/Module/Email_resend.php:33
+#: ../../Code/Module/Email_resend.php:33
 msgid "Unable to resend email verification message."
 msgstr "Opnieuw verzenden e-mailverificatie mislukt"
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
+#: ../../Code/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Geen connecties."
 
-#: ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Code/Module/Viewconnections.php:83
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Bezoek het profiel van %s [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:113
+#: ../../Code/Module/Viewconnections.php:113
 msgid "View Connections"
 msgstr "Connecties tonen"
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Code/Module/Admin.php:97
 msgid "Blocked accounts"
 msgstr "Geblokkeerde accounts"
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Code/Module/Admin.php:98
 msgid "Expired accounts"
 msgstr "Verlopen accounts"
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Code/Module/Admin.php:99
 msgid "Expiring accounts"
 msgstr "Accounts die nog moeten verlopen"
 
-#: ../../Zotlabs/Module/Admin.php:112
+#: ../../Code/Module/Admin.php:112
 msgid "Clones"
 msgstr "Klonen"
 
-#: ../../Zotlabs/Module/Admin.php:118
+#: ../../Code/Module/Admin.php:118
 msgid "Message queues"
 msgstr "Berichtenwachtrij"
 
-#: ../../Zotlabs/Module/Admin.php:132
+#: ../../Code/Module/Admin.php:132
 msgid "Your software should be updated"
 msgstr "Jouw software moet worden bijgewerkt "
 
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Code/Module/Admin.php:137
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: ../../Zotlabs/Module/Admin.php:140
+#: ../../Code/Module/Admin.php:140
 msgid "Registered accounts"
 msgstr "Geregistreerde accounts"
 
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Code/Module/Admin.php:141
 msgid "Pending registrations"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Code/Module/Admin.php:142
 msgid "Registered channels"
 msgstr "Geregistreerde kanalen"
 
-#: ../../Zotlabs/Module/Admin.php:143
+#: ../../Code/Module/Admin.php:143
 msgid "Active plugins"
 msgstr "Ingeschakelde plug-ins"
 
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Code/Module/Admin.php:144
 msgid "Version"
 msgstr "Versie"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Code/Module/Admin.php:145
 msgid "Repository version (master)"
 msgstr "Versie repository (master)"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Code/Module/Admin.php:146
 msgid "Repository version (dev)"
 msgstr "Versie repository (dev)"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "Geen abonnementsbeperkingen gevonden."
 
-#: ../../Zotlabs/Module/Rate.php:156
+#: ../../Code/Module/Rate.php:156
 msgid "Website:"
 msgstr "Website:"
 
-#: ../../Zotlabs/Module/Rate.php:159
+#: ../../Code/Module/Rate.php:159
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
 
-#: ../../Zotlabs/Module/Rate.php:160
+#: ../../Code/Module/Rate.php:160
 msgid "Rating (this information is public)"
 msgstr "Beoordeling (deze informatie is openbaar)"
 
-#: ../../Zotlabs/Module/Rate.php:161
+#: ../../Code/Module/Rate.php:161
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
 
-#: ../../Zotlabs/Module/Card_edit.php:128
+#: ../../Code/Module/Card_edit.php:128
 msgid "Edit Card"
 msgstr "Kaart bewerken"
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "Geen geldige account gevonden."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:108
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Lid van hub (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../Code/Module/Lostpass.php:44 ../../Code/Module/Lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../Code/Module/Lostpass.php:68
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598
+#: ../../Code/Module/Lostpass.php:91 ../../boot.php:1598
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your password has been reset as requested."
 msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Your new password is"
 msgstr "Jouw nieuwe wachtwoord is"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "Save or copy your new password - and then"
 msgstr "Kopieer of sla je nieuwe wachtwoord op - en"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid "click here to login"
 msgstr "klik dan hier om in te loggen"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../Code/Module/Lostpass.php:96
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr "Jouw wachtwoord kan worden veranderd onder instellingen, nadat je succesvol bent ingelogd."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
+#: ../../Code/Module/Lostpass.php:117
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Jouw wachtwoord op %s is veranderd"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Forgot your Password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../Code/Module/Lostpass.php:131
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies."
 
-#: ../../Zotlabs/Module/Lostpass.php:132
+#: ../../Code/Module/Lostpass.php:132
 msgid "Email Address"
 msgstr "E-mailadres"
 
-#: ../../Zotlabs/Module/Notifications.php:62
-#: ../../Zotlabs/Lib/ThreadItem.php:408
+#: ../../Code/Module/Notifications.php:62
+#: ../../Code/Lib/ThreadItem.php:408
 msgid "Mark all seen"
 msgstr "Markeer alles als bekeken"
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Code/Lib/Techlevels.php:10
 msgid "0. Beginner/Basic"
 msgstr "0. Beginner/basic"
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Code/Lib/Techlevels.php:11
 msgid "1. Novice - not skilled but willing to learn"
 msgstr "1. Onervaren - niet bekwaam, maar wil graag leren"
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Code/Lib/Techlevels.php:12
 msgid "2. Intermediate - somewhat comfortable"
 msgstr "2. Ervaren - voelt zich enigszins comfortabel"
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Code/Lib/Techlevels.php:13
 msgid "3. Advanced - very comfortable"
 msgstr "3. Gevorderd - voelt zich comfortabel"
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Code/Lib/Techlevels.php:14
 msgid "4. Expert - I can write computer code"
 msgstr "4. Expert - kan programmeren"
 
-#: ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Code/Lib/Techlevels.php:15
 msgid "5. Wizard - I probably know more than you do"
 msgstr "5. Wizard - ik weet waarschijnlijk meer dan jij"
 
-#: ../../Zotlabs/Lib/Apps.php:231
+#: ../../Code/Lib/Apps.php:231
 msgid "Site Admin"
 msgstr "Hubbeheerder"
 
-#: ../../Zotlabs/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16
+#: ../../Code/Lib/Apps.php:232 ../../addon/buglink/buglink.php:16
 msgid "Report Bug"
 msgstr "Bugrapport indienen"
 
-#: ../../Zotlabs/Lib/Apps.php:233
+#: ../../Code/Lib/Apps.php:233
 msgid "View Bookmarks"
 msgstr "Bladwijzers bekijken"
 
-#: ../../Zotlabs/Lib/Apps.php:234
+#: ../../Code/Lib/Apps.php:234
 msgid "My Chatrooms"
 msgstr "Mijn chatkanalen"
 
-#: ../../Zotlabs/Lib/Apps.php:236
+#: ../../Code/Lib/Apps.php:236
 msgid "Firefox Share"
 msgstr "Firefox Share"
 
-#: ../../Zotlabs/Lib/Apps.php:237
+#: ../../Code/Lib/Apps.php:237
 msgid "Remote Diagnostics"
 msgstr "Diagnose op afstand"
 
-#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417
+#: ../../Code/Lib/Apps.php:238 ../../include/features.php:417
 msgid "Suggest Channels"
 msgstr "Kanalen voorstellen"
 
-#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589
+#: ../../Code/Lib/Apps.php:239 ../../boot.php:1589
 #: ../../include/nav.php:126 ../../include/nav.php:130
 msgid "Login"
 msgstr "Inloggen"
 
-#: ../../Zotlabs/Lib/Apps.php:241
+#: ../../Code/Lib/Apps.php:241
 msgid "Activity"
 msgstr "Jouw tijdlijn"
 
-#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931
+#: ../../Code/Lib/Apps.php:245 ../../include/conversation.php:1931
 #: ../../include/features.php:96 ../../include/nav.php:497
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:246
+#: ../../Code/Lib/Apps.php:246
 msgid "Channel Home"
 msgstr "Jouw kanaal"
 
-#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853
+#: ../../Code/Lib/Apps.php:249 ../../include/conversation.php:1853
 #: ../../include/conversation.php:1856
 msgid "Events"
 msgstr "Agenda"
 
-#: ../../Zotlabs/Lib/Apps.php:250
+#: ../../Code/Lib/Apps.php:250
 msgid "Directory"
 msgstr "Kanalengids"
 
-#: ../../Zotlabs/Lib/Apps.php:252
+#: ../../Code/Lib/Apps.php:252
 msgid "Mail"
 msgstr "Privéberichten"
 
-#: ../../Zotlabs/Lib/Apps.php:255
+#: ../../Code/Lib/Apps.php:255
 msgid "Chat"
 msgstr "Chatten"
 
-#: ../../Zotlabs/Lib/Apps.php:257
+#: ../../Code/Lib/Apps.php:257
 msgid "Probe"
 msgstr "Onderzoeken"
 
-#: ../../Zotlabs/Lib/Apps.php:258
+#: ../../Code/Lib/Apps.php:258
 msgid "Suggest"
 msgstr "Voorstellen"
 
-#: ../../Zotlabs/Lib/Apps.php:259
+#: ../../Code/Lib/Apps.php:259
 msgid "Random Channel"
 msgstr "Willekeurig kanaal"
 
-#: ../../Zotlabs/Lib/Apps.php:260
+#: ../../Code/Lib/Apps.php:260
 msgid "Invite"
 msgstr "Uitnodigen "
 
-#: ../../Zotlabs/Lib/Apps.php:261 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Code/Lib/Apps.php:261 ../../Code/Widget/Admin.php:26
 msgid "Features"
 msgstr "Extra functies"
 
-#: ../../Zotlabs/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69
+#: ../../Code/Lib/Apps.php:262 ../../addon/openid/MysqlProvider.php:69
 msgid "Language"
 msgstr "Taal"
 
-#: ../../Zotlabs/Lib/Apps.php:263
+#: ../../Code/Lib/Apps.php:263
 msgid "Post"
 msgstr "Bericht"
 
-#: ../../Zotlabs/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58
+#: ../../Code/Lib/Apps.php:264 ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
 #: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr "Profielfoto"
 
-#: ../../Zotlabs/Lib/Apps.php:407
+#: ../../Code/Lib/Apps.php:407
 msgid "Purchase"
 msgstr "Aanschaffen"
 
-#: ../../Zotlabs/Lib/Apps.php:411
+#: ../../Code/Lib/Apps.php:411
 msgid "Undelete"
 msgstr "Verwijdering ongedaan maken"
 
-#: ../../Zotlabs/Lib/Apps.php:419
+#: ../../Code/Lib/Apps.php:419
 msgid "Add to app-tray"
 msgstr "Aan appmenu toevoegen"
 
-#: ../../Zotlabs/Lib/Apps.php:420
+#: ../../Code/Lib/Apps.php:420
 msgid "Remove from app-tray"
 msgstr "Uit appmenu verwijderen"
 
-#: ../../Zotlabs/Lib/Apps.php:421
+#: ../../Code/Lib/Apps.php:421
 msgid "Pin to navbar"
 msgstr "Op navigatiebalk vastzetten"
 
-#: ../../Zotlabs/Lib/Apps.php:422
+#: ../../Code/Lib/Apps.php:422
 msgid "Unpin from navbar"
 msgstr "Van navigatiebalk losmaken"
 
-#: ../../Zotlabs/Lib/Permcat.php:82
+#: ../../Code/Lib/Permcat.php:82
 msgctxt "permcat"
 msgid "default"
 msgstr "standaard"
 
-#: ../../Zotlabs/Lib/Permcat.php:133
+#: ../../Code/Lib/Permcat.php:133
 msgctxt "permcat"
 msgid "follower"
 msgstr "volger"
 
-#: ../../Zotlabs/Lib/Permcat.php:137
+#: ../../Code/Lib/Permcat.php:137
 msgctxt "permcat"
 msgid "contributor"
 msgstr "bijdrager"
 
-#: ../../Zotlabs/Lib/Permcat.php:141
+#: ../../Code/Lib/Permcat.php:141
 msgctxt "permcat"
 msgid "publisher"
 msgstr "publichist "
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:93
+#: ../../Code/Lib/NativeWikiPage.php:42
+#: ../../Code/Lib/NativeWikiPage.php:93
 msgid "(No Title)"
 msgstr "(Geen titel)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:107
+#: ../../Code/Lib/NativeWikiPage.php:107
 msgid "Wiki page create failed."
 msgstr "Aanmaken wiki-pagina mislukt."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:120
+#: ../../Code/Lib/NativeWikiPage.php:120
 msgid "Wiki not found."
 msgstr "Wiki niet gevonden"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:131
+#: ../../Code/Lib/NativeWikiPage.php:131
 msgid "Destination name already exists"
 msgstr "Naam van doel bestaat al"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:163
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Code/Lib/NativeWikiPage.php:163
+#: ../../Code/Lib/NativeWikiPage.php:359
 msgid "Page not found"
 msgstr "Pagina niet gevonden"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:194
+#: ../../Code/Lib/NativeWikiPage.php:194
 msgid "Error reading page content"
 msgstr "Fout tijdens lezen pagina-inhoud"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:350
-#: ../../Zotlabs/Lib/NativeWikiPage.php:400
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Code/Lib/NativeWikiPage.php:350
+#: ../../Code/Lib/NativeWikiPage.php:400
+#: ../../Code/Lib/NativeWikiPage.php:467
+#: ../../Code/Lib/NativeWikiPage.php:508
 msgid "Error reading wiki"
 msgstr "Fout tijdens lezen wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:388
+#: ../../Code/Lib/NativeWikiPage.php:388
 msgid "Page update failed."
 msgstr "Bijwerken van pagina mislukt."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:422
+#: ../../Code/Lib/NativeWikiPage.php:422
 msgid "Nothing deleted"
 msgstr "Niets verwijderd"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:488
+#: ../../Code/Lib/NativeWikiPage.php:488
 msgid "Compare: object not found."
 msgstr "Vergelijken: object niet gevonden."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:494
+#: ../../Code/Lib/NativeWikiPage.php:494
 msgid "Page updated"
 msgstr "Pagina bijgewerkt"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
+#: ../../Code/Lib/NativeWikiPage.php:497
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:503
+#: ../../Code/Lib/NativeWikiPage.php:503
 msgid "Wiki resource_id required for git commit"
 msgstr "Resource_id wiki voor git commit vereist"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:559
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+#: ../../Code/Lib/NativeWikiPage.php:559
+#: ../../Code/Widget/Wiki_page_history.php:23
 msgctxt "wiki_history"
 msgid "Message"
 msgstr "Bericht"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744
+#: ../../Code/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744
 #: ../../include/bbcode.php:914
 msgid "Different viewers will see this text differently"
 msgstr "Deze tekst wordt per persoon anders getoond."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../Code/Lib/PermissionDescription.php:34
 #: ../../include/acl_selectors.php:33
 msgid "Visible to your default audience"
 msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../Code/Lib/PermissionDescription.php:107
 #: ../../include/acl_selectors.php:106
 msgid "Only me"
 msgstr "Alleen ik"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Code/Lib/PermissionDescription.php:108
 msgid "Public"
 msgstr "Openbaar"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#: ../../Code/Lib/PermissionDescription.php:109
 msgid "Anybody in the $Projectname network"
 msgstr "Iedereen in het $Projectname-netwerk"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#: ../../Code/Lib/PermissionDescription.php:110
 #, php-format
 msgid "Any account on %s"
 msgstr "Iedereen op %s"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
+#: ../../Code/Lib/PermissionDescription.php:111
 msgid "Any of my connections"
 msgstr "Al mijn geaccepteerde connecties"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
+#: ../../Code/Lib/PermissionDescription.php:112
 msgid "Only connections I specifically allow"
 msgstr "Alleen connecties die uitdrukkelijk door jou zijn toegestaan"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
+#: ../../Code/Lib/PermissionDescription.php:113
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
+#: ../../Code/Lib/PermissionDescription.php:114
 msgid "Any connections including those who haven't yet been approved"
 msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
+#: ../../Code/Lib/PermissionDescription.php:150
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
 msgstr "Dit is de standaard privacyinstelling voor wie jouw berichten kan bekijken"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
+#: ../../Code/Lib/PermissionDescription.php:151
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr "Dit is de standaard privacyinstelling voor wie jouw standaardprofiel kan bekijken"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
+#: ../../Code/Lib/PermissionDescription.php:152
 msgid "This is your default setting for who can view your connections"
 msgstr "Dit is de standaard privacyinstelling voor wie een lijst met jouw connecties kan bekijken"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
+#: ../../Code/Lib/PermissionDescription.php:153
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr "Dit is de standaard privacyinstelling voor wie jouw bestanden en foto's kan bekijken"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
+#: ../../Code/Lib/PermissionDescription.php:154
 msgid "This is your default setting for the audience of your webpages"
 msgstr "Dit is de standaard privacyinstelling voor wie jouw webpagina's kan bekijken"
 
-#: ../../Zotlabs/Lib/Chatroom.php:23
+#: ../../Code/Lib/Chatroom.php:23
 msgid "Missing room name"
 msgstr "Naam chatkanaal ontbreekt"
 
-#: ../../Zotlabs/Lib/Chatroom.php:32
+#: ../../Code/Lib/Chatroom.php:32
 msgid "Duplicate room name"
 msgstr "Naam chatkanaal bestaat al"
 
-#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90
+#: ../../Code/Lib/Chatroom.php:82 ../../Code/Lib/Chatroom.php:90
 msgid "Invalid room specifier."
 msgstr "Ongeldige omschrijving chatkanaal"
 
-#: ../../Zotlabs/Lib/Chatroom.php:122
+#: ../../Code/Lib/Chatroom.php:122
 msgid "Room not found."
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../Zotlabs/Lib/Chatroom.php:143
+#: ../../Code/Lib/Chatroom.php:143
 msgid "Room is full"
 msgstr "Chatkanaal is vol"
 
-#: ../../Zotlabs/Lib/Enotify.php:60
+#: ../../Code/Lib/Enotify.php:60
 msgid "$Projectname Notification"
 msgstr "$Projectname-melding"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308
+#: ../../Code/Lib/Enotify.php:61 ../../addon/diaspora/util.php:308
 #: ../../addon/diaspora/util.php:321 ../../addon/diaspora/p.php:48
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63
+#: ../../Code/Lib/Enotify.php:63
 msgid "Thank You,"
 msgstr "Bedankt,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33
+#: ../../Code/Lib/Enotify.php:65 ../../addon/hubwall/hubwall.php:33
 #, php-format
 msgid "%s Administrator"
 msgstr "Beheerder %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:66
+#: ../../Code/Lib/Enotify.php:66
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr "Deze e-mail was verzonden door %1$s op %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:67
+#: ../../Code/Lib/Enotify.php:67
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
 "at %s"
 msgstr "Wanneer je deze berichten niet meer wilt ontvangen, wijzig dan de instellingen voor jouw Meldingen op %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Lib/Enotify.php:68
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr "Wanneer je deze berichten niet meer wilt ontvangen, wijzig dan de instellingen voor jouw %s."
 
-#: ../../Zotlabs/Lib/Enotify.php:123
+#: ../../Code/Lib/Enotify.php:123
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Code/Lib/Enotify.php:127
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname-melding] Nieuw privébericht ontvangen op %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:129
+#: ../../Code/Lib/Enotify.php:129
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s heeft je een nieuw privébericht gestuurd op %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s zond jou %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 msgid "a private message"
 msgstr "een privébericht"
 
-#: ../../Zotlabs/Lib/Enotify.php:131
+#: ../../Code/Lib/Enotify.php:131
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren."
 
-#: ../../Zotlabs/Lib/Enotify.php:144
+#: ../../Code/Lib/Enotify.php:144
 msgid "commented on"
 msgstr "gaf een reactie op"
 
-#: ../../Zotlabs/Lib/Enotify.php:155
+#: ../../Code/Lib/Enotify.php:155
 msgid "liked"
 msgstr "vindt dit leuk:"
 
-#: ../../Zotlabs/Lib/Enotify.php:158
+#: ../../Code/Lib/Enotify.php:158
 msgid "disliked"
 msgstr "vindt dit niet leuk:"
 
-#: ../../Zotlabs/Lib/Enotify.php:201
+#: ../../Code/Lib/Enotify.php:201
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]een %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:209
+#: ../../Code/Lib/Enotify.php:209
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:218
+#: ../../Code/Lib/Enotify.php:218
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]jouw %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:230
+#: ../../Code/Lib/Enotify.php:230
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname-melding] %2$s gaf een te modereren reactie in conversatie #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../Code/Lib/Enotify.php:232
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname-melding] %2$s gaf een reactie in conversatie #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:233
+#: ../../Code/Lib/Enotify.php:233
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr "%1$s gaf een reactie op/in een item/conversatie die je volgt."
 
-#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317
-#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358
-#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Code/Lib/Enotify.php:236 ../../Code/Lib/Enotify.php:317
+#: ../../Code/Lib/Enotify.php:333 ../../Code/Lib/Enotify.php:358
+#: ../../Code/Lib/Enotify.php:375 ../../Code/Lib/Enotify.php:388
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
 
-#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241
+#: ../../Code/Lib/Enotify.php:240 ../../Code/Lib/Enotify.php:241
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Bezoek %s om de reactie goed of af te keuren."
 
-#: ../../Zotlabs/Lib/Enotify.php:299
+#: ../../Code/Lib/Enotify.php:299
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr "%1$s vindt [zrl=%2$s]jouw %3$s[/zrl] leuk"
 
-#: ../../Zotlabs/Lib/Enotify.php:313
+#: ../../Code/Lib/Enotify.php:313
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname-melding] %2$s vindt iets leuk in conversatie #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:314
+#: ../../Code/Lib/Enotify.php:314
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr "%1$s vindt iets leuk in een conversatie die jij bent gestart."
 
-#: ../../Zotlabs/Lib/Enotify.php:325
+#: ../../Code/Lib/Enotify.php:325
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname-melding] %s heeft een bericht op jouw kanaal geplaatst"
 
-#: ../../Zotlabs/Lib/Enotify.php:327
+#: ../../Code/Lib/Enotify.php:327
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s heeft om %2$s een bericht op jouw kanaalpagina geplaatst"
 
-#: ../../Zotlabs/Lib/Enotify.php:329
+#: ../../Code/Lib/Enotify.php:329
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$s heeft een bericht op jouw [zrl=%2$s]kanaalpagina[/zrl] geplaatst"
 
-#: ../../Zotlabs/Lib/Enotify.php:352
+#: ../../Code/Lib/Enotify.php:352
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname-melding] %s heeft jou genoemd"
 
-#: ../../Zotlabs/Lib/Enotify.php:353
+#: ../../Code/Lib/Enotify.php:353
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s vermeldde jou om %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:354
+#: ../../Code/Lib/Enotify.php:354
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s [zrl=%2$s]vermeldde jou[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:365
+#: ../../Code/Lib/Enotify.php:365
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname-melding] %1$s heeft jou aangestoten"
 
-#: ../../Zotlabs/Lib/Enotify.php:366
+#: ../../Code/Lib/Enotify.php:366
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s porde jou om %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:367
+#: ../../Code/Lib/Enotify.php:367
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s]porde jou[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:382
+#: ../../Code/Lib/Enotify.php:382
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname-melding] %s heeft jouw bericht getagd"
 
-#: ../../Zotlabs/Lib/Enotify.php:383
+#: ../../Code/Lib/Enotify.php:383
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s tagde jouw bericht om %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:384
+#: ../../Code/Lib/Enotify.php:384
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s tagde [zrl=%2$s]jouw bericht[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:395
+#: ../../Code/Lib/Enotify.php:395
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname-melding] Connectieverzoek ontvangen"
 
-#: ../../Zotlabs/Lib/Enotify.php:396
+#: ../../Code/Lib/Enotify.php:396
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr "Je hebt een nieuw connectieverzoek ontvangen van '%1$s' op %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:397
+#: ../../Code/Lib/Enotify.php:397
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr "Je hebt een [zrl=%1$s]nieuw connectieverzoek[/zrl] ontvangen van %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418
+#: ../../Code/Lib/Enotify.php:400 ../../Code/Lib/Enotify.php:418
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Je kan het profiel bekijken op %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Code/Lib/Enotify.php:402
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
 
-#: ../../Zotlabs/Lib/Enotify.php:409
+#: ../../Code/Lib/Enotify.php:409
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname-melding] Kanaalvoorstel ontvangen"
 
-#: ../../Zotlabs/Lib/Enotify.php:410
+#: ../../Code/Lib/Enotify.php:410
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Je hebt een kanaalvoorstel ontvangen van '%1$s' om %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:411
+#: ../../Code/Lib/Enotify.php:411
 #, php-format
 msgid ""
 "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr "Je hebt [zrl=%1$s]een kanaalvoorstel ontvangen[/zrl] voor %2$s van %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Code/Lib/Enotify.php:416
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Code/Lib/Enotify.php:417
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../Zotlabs/Lib/Enotify.php:420
+#: ../../Code/Lib/Enotify.php:420
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
 
-#: ../../Zotlabs/Lib/Enotify.php:640
+#: ../../Code/Lib/Enotify.php:640
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname-melding]"
 
-#: ../../Zotlabs/Lib/Enotify.php:808
+#: ../../Code/Lib/Enotify.php:808
 msgid "created a new post"
 msgstr "maakte een nieuw bericht aan"
 
-#: ../../Zotlabs/Lib/Enotify.php:809
+#: ../../Code/Lib/Enotify.php:809
 #, php-format
 msgid "commented on %s's post"
 msgstr "gaf een reactie op een bericht van %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:816
+#: ../../Code/Lib/Enotify.php:816
 #, php-format
 msgid "edited a post dated %s"
 msgstr "bewerkte een bericht op %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Code/Lib/Enotify.php:820
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "bewerkte een reactie op %s"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:151
+#: ../../Code/Lib/NativeWiki.php:151
 msgid "Wiki updated successfully"
 msgstr "Bijwerken wiki geslaagd"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:205
+#: ../../Code/Lib/NativeWiki.php:205
 msgid "Wiki files deleted successfully"
 msgstr "Verwijderen wiki-bestanden geslaagd"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:83
+#: ../../Code/Lib/DB_Upgrade.php:83
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:89
+#: ../../Code/Lib/DB_Upgrade.php:89
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:97 ../../include/conversation.php:697
+#: ../../Code/Lib/ThreadItem.php:97 ../../include/conversation.php:697
 msgid "Private Message"
 msgstr "Niet voor iedereen zichtbaar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../include/conversation.php:689
+#: ../../Code/Lib/ThreadItem.php:147 ../../include/conversation.php:689
 msgid "Select"
 msgstr "Kies"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I will attend"
 msgstr "Aanwezig"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I will not attend"
 msgstr "Niet aanwezig"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:172
+#: ../../Code/Lib/ThreadItem.php:172
 msgid "I might attend"
 msgstr "Mogelijk aanwezig"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I agree"
 msgstr "Eens"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I disagree"
 msgstr "Oneens"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:182
+#: ../../Code/Lib/ThreadItem.php:182
 msgid "I abstain"
 msgstr "Onthouding"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:238
+#: ../../Code/Lib/ThreadItem.php:238
 msgid "Add Star"
 msgstr "Ster toevoegen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:239
+#: ../../Code/Lib/ThreadItem.php:239
 msgid "Remove Star"
 msgstr "Ster verwijderen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240
+#: ../../Code/Lib/ThreadItem.php:240
 msgid "Toggle Star Status"
 msgstr "Ster toevoegen of verwijderen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:244
+#: ../../Code/Lib/ThreadItem.php:244
 msgid "starred"
 msgstr "met ster"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:254 ../../include/conversation.php:704
+#: ../../Code/Lib/ThreadItem.php:254 ../../include/conversation.php:704
 msgid "Message signature validated"
 msgstr "Berichtkenmerk gevalideerd"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../include/conversation.php:705
+#: ../../Code/Lib/ThreadItem.php:255 ../../include/conversation.php:705
 msgid "Message signature incorrect"
 msgstr "Berichtkenmerk onjuist"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:263
+#: ../../Code/Lib/ThreadItem.php:263
 msgid "Add Tag"
 msgstr "Tag toevoegen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575
+#: ../../Code/Lib/ThreadItem.php:281 ../../include/taxonomy.php:575
 msgid "like"
 msgstr "vind dit leuk"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576
+#: ../../Code/Lib/ThreadItem.php:282 ../../include/taxonomy.php:576
 msgid "dislike"
 msgstr "vind dit niet leuk"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Code/Lib/ThreadItem.php:286
 msgid "Share This"
 msgstr "Delen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Code/Lib/ThreadItem.php:286
 msgid "share"
 msgstr "delen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:295
+#: ../../Code/Lib/ThreadItem.php:295
 msgid "Delivery Report"
 msgstr "Afleveringsrapport"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:313
+#: ../../Code/Lib/ThreadItem.php:313
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d reactie"
 msgstr[1] "%d reacties"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:343 ../../Zotlabs/Lib/ThreadItem.php:344
+#: ../../Code/Lib/ThreadItem.php:343 ../../Code/Lib/ThreadItem.php:344
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Profiel van %s bekijken - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:347
+#: ../../Code/Lib/ThreadItem.php:347
 msgid "to"
 msgstr "aan"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../Code/Lib/ThreadItem.php:348
 msgid "via"
 msgstr "via"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:349
+#: ../../Code/Lib/ThreadItem.php:349
 msgid "Wall-to-Wall"
 msgstr "Kanaal-naar-kanaal"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350
+#: ../../Code/Lib/ThreadItem.php:350
 msgid "via Wall-To-Wall:"
 msgstr "via kanaal-naar-kanaal"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363 ../../include/conversation.php:763
+#: ../../Code/Lib/ThreadItem.php:363 ../../include/conversation.php:763
 #, php-format
 msgid "from %s"
 msgstr "van %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:366 ../../include/conversation.php:766
+#: ../../Code/Lib/ThreadItem.php:366 ../../include/conversation.php:766
 #, php-format
 msgid "last edited: %s"
 msgstr "laatst bewerkt: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:767
+#: ../../Code/Lib/ThreadItem.php:367 ../../include/conversation.php:767
 #, php-format
 msgid "Expires: %s"
 msgstr "Verloopt: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:374
+#: ../../Code/Lib/ThreadItem.php:374
 msgid "Attend"
 msgstr "Aanwezig"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:375
+#: ../../Code/Lib/ThreadItem.php:375
 msgid "Attendance Options"
 msgstr "Aanwezigheidsopties"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:376
+#: ../../Code/Lib/ThreadItem.php:376
 msgid "Vote"
 msgstr "Stem"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:377
+#: ../../Code/Lib/ThreadItem.php:377
 msgid "Voting Options"
 msgstr "Stemopties"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:398
+#: ../../Code/Lib/ThreadItem.php:398
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr "Bladwijzers opslaan"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:399
+#: ../../Code/Lib/ThreadItem.php:399
 msgid "Add to Calendar"
 msgstr "Aan agenda toevoegen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:426 ../../include/conversation.php:483
+#: ../../Code/Lib/ThreadItem.php:426 ../../include/conversation.php:483
 msgid "This is an unsaved preview"
 msgstr "Dit is een niet opgeslagen voorvertoning"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:458 ../../include/js_strings.php:7
+#: ../../Code/Lib/ThreadItem.php:458 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s alle"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380
+#: ../../Code/Lib/ThreadItem.php:753 ../../include/conversation.php:1380
 msgid "Bold"
 msgstr "Vet"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381
+#: ../../Code/Lib/ThreadItem.php:754 ../../include/conversation.php:1381
 msgid "Italic"
 msgstr "Cursief"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382
+#: ../../Code/Lib/ThreadItem.php:755 ../../include/conversation.php:1382
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383
+#: ../../Code/Lib/ThreadItem.php:756 ../../include/conversation.php:1383
 msgid "Quote"
 msgstr "Citeren"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384
+#: ../../Code/Lib/ThreadItem.php:757 ../../include/conversation.php:1384
 msgid "Code"
 msgstr "Broncode"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:758
+#: ../../Code/Lib/ThreadItem.php:758
 msgid "Image"
 msgstr "Afbeelding"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:759
+#: ../../Code/Lib/ThreadItem.php:759
 msgid "Attach File"
 msgstr "Bestand toevoegen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:760
+#: ../../Code/Lib/ThreadItem.php:760
 msgid "Insert Link"
 msgstr "Link invoegen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:761
+#: ../../Code/Lib/ThreadItem.php:761
 msgid "Video"
 msgstr "Video"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:771
+#: ../../Code/Lib/ThreadItem.php:771
 msgid "Your full name (required)"
 msgstr "Jouw volledige naam (verplicht)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:772
+#: ../../Code/Lib/ThreadItem.php:772
 msgid "Your email address (required)"
 msgstr "Jouw e-mailadres (verplicht)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:773
+#: ../../Code/Lib/ThreadItem.php:773
 msgid "Your website URL (optional)"
 msgstr "URL van jouw website (niet verplicht)"
 
-#: ../../Zotlabs/Zot/Auth.php:152
+#: ../../Code/Zot/Auth.php:152
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
 msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."
 
-#: ../../Zotlabs/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
+#: ../../Code/Zot/Auth.php:264 ../../addon/openid/Mod_Openid.php:76
 #: ../../addon/openid/Mod_Openid.php:178
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Welkom %s. Authenticatie op afstand geslaagd."
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:287
+#: ../../Code/Storage/Browser.php:107 ../../Code/Storage/Browser.php:287
 msgid "parent"
 msgstr "omhoog"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2845
+#: ../../Code/Storage/Browser.php:131 ../../include/text.php:2845
 msgid "Collection"
 msgstr "map"
 
-#: ../../Zotlabs/Storage/Browser.php:134
+#: ../../Code/Storage/Browser.php:134
 msgid "Principal"
 msgstr "principal"
 
-#: ../../Zotlabs/Storage/Browser.php:137
+#: ../../Code/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Adresboek"
 
-#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:420
+#: ../../Code/Storage/Browser.php:140 ../../include/nav.php:420
 #: ../../include/nav.php:423
 msgid "Calendar"
 msgstr "Agenda"
 
-#: ../../Zotlabs/Storage/Browser.php:143
+#: ../../Code/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Planning-postvak IN"
 
-#: ../../Zotlabs/Storage/Browser.php:146
+#: ../../Code/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
-#: ../../Zotlabs/Storage/Browser.php:273
+#: ../../Code/Storage/Browser.php:273
 msgid "Total"
 msgstr "Totaal"
 
-#: ../../Zotlabs/Storage/Browser.php:275
+#: ../../Code/Storage/Browser.php:275
 msgid "Shared"
 msgstr "Gedeeld"
 
-#: ../../Zotlabs/Storage/Browser.php:277
+#: ../../Code/Storage/Browser.php:277
 msgid "Add Files"
 msgstr "Bestanden toevoegen"
 
-#: ../../Zotlabs/Storage/Browser.php:353
+#: ../../Code/Storage/Browser.php:353
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Je gebruikt %1$s van de beschikbare bestandsopslag."
 
-#: ../../Zotlabs/Storage/Browser.php:358
+#: ../../Code/Storage/Browser.php:358
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "Je gebruikt %1$s van totaal %2$s beschikbare bestandsopslag. (%3$s%)"
 
-#: ../../Zotlabs/Storage/Browser.php:369
+#: ../../Code/Storage/Browser.php:369
 msgid "WARNING:"
 msgstr "WAARSCHUWING:"
 
-#: ../../Zotlabs/Storage/Browser.php:381
+#: ../../Code/Storage/Browser.php:381
 msgid "Create new folder"
 msgstr "Nieuwe map aanmaken"
 
-#: ../../Zotlabs/Storage/Browser.php:383
+#: ../../Code/Storage/Browser.php:383
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
-#: ../../Zotlabs/Storage/Browser.php:396
+#: ../../Code/Storage/Browser.php:396
 msgid "Drop files here to immediately upload"
 msgstr "Sleep bestanden hierheen om ze onmiddellijk te uploaden"
 
-#: ../../Zotlabs/Widget/Forums.php:100
+#: ../../Code/Widget/Forums.php:100
 msgid "Forums"
 msgstr "Forums"
 
-#: ../../Zotlabs/Widget/Cdav.php:37
+#: ../../Code/Widget/Cdav.php:37
 msgid "Select Channel"
 msgstr "Kies een kanaal"
 
-#: ../../Zotlabs/Widget/Cdav.php:42
+#: ../../Code/Widget/Cdav.php:42
 msgid "Read-write"
 msgstr "Lees- en schrijfrechten"
 
-#: ../../Zotlabs/Widget/Cdav.php:43
+#: ../../Code/Widget/Cdav.php:43
 msgid "Read-only"
 msgstr "Alleen leesrechten"
 
-#: ../../Zotlabs/Widget/Cdav.php:117
+#: ../../Code/Widget/Cdav.php:117
 msgid "My Calendars"
 msgstr "Mijn agenda's"
 
-#: ../../Zotlabs/Widget/Cdav.php:119
+#: ../../Code/Widget/Cdav.php:119
 msgid "Shared Calendars"
 msgstr "Gedeelde agenda's"
 
-#: ../../Zotlabs/Widget/Cdav.php:123
+#: ../../Code/Widget/Cdav.php:123
 msgid "Share this calendar"
 msgstr "Agenda delen"
 
-#: ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Code/Widget/Cdav.php:125
 msgid "Calendar name and color"
 msgstr "Naam en kleur agenda"
 
-#: ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Code/Widget/Cdav.php:127
 msgid "Create new calendar"
 msgstr "Nieuwe agenda aanmaken"
 
-#: ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Code/Widget/Cdav.php:129
 msgid "Calendar Name"
 msgstr "Naam agenda"
 
-#: ../../Zotlabs/Widget/Cdav.php:130
+#: ../../Code/Widget/Cdav.php:130
 msgid "Calendar Tools"
 msgstr "Agenda-hulpmiddelen"
 
-#: ../../Zotlabs/Widget/Cdav.php:131
+#: ../../Code/Widget/Cdav.php:131
 msgid "Import calendar"
 msgstr "Importeren"
 
-#: ../../Zotlabs/Widget/Cdav.php:132
+#: ../../Code/Widget/Cdav.php:132
 msgid "Select a calendar to import to"
 msgstr "Kies een agenda om te importeren"
 
-#: ../../Zotlabs/Widget/Cdav.php:159
+#: ../../Code/Widget/Cdav.php:159
 msgid "Addressbooks"
 msgstr "Adresboeken"
 
-#: ../../Zotlabs/Widget/Cdav.php:161
+#: ../../Code/Widget/Cdav.php:161
 msgid "Addressbook name"
 msgstr "Naam adresboek"
 
-#: ../../Zotlabs/Widget/Cdav.php:163
+#: ../../Code/Widget/Cdav.php:163
 msgid "Create new addressbook"
 msgstr "Nieuw adresboek aanmaken"
 
-#: ../../Zotlabs/Widget/Cdav.php:164
+#: ../../Code/Widget/Cdav.php:164
 msgid "Addressbook Name"
 msgstr "Naam adresboek"
 
-#: ../../Zotlabs/Widget/Cdav.php:166
+#: ../../Code/Widget/Cdav.php:166
 msgid "Addressbook Tools"
 msgstr "Adresboek-hulpmiddelen"
 
-#: ../../Zotlabs/Widget/Cdav.php:167
+#: ../../Code/Widget/Cdav.php:167
 msgid "Import addressbook"
 msgstr "Importeren"
 
-#: ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Code/Widget/Cdav.php:168
 msgid "Select an addressbook to import to"
 msgstr "Kies een adresboek om te importeren"
 
-#: ../../Zotlabs/Widget/Appcategories.php:40
+#: ../../Code/Widget/Appcategories.php:40
 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141
 #: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:409
 #: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511
@@ -8665,438 +8665,438 @@ msgstr "Kies een adresboek om te importeren"
 msgid "Categories"
 msgstr "Categorieën"
 
-#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Widget/Filer.php:31
+#: ../../Code/Widget/Appcategories.php:43 ../../Code/Widget/Filer.php:31
 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100
 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189
 msgid "Everything"
 msgstr "Alles"
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
+#: ../../Code/Widget/Eventstools.php:13
 msgid "Events Tools"
 msgstr "Agenda-hulpmiddelen"
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
+#: ../../Code/Widget/Eventstools.php:14
 msgid "Export Calendar"
 msgstr "Exporteren"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
+#: ../../Code/Widget/Eventstools.php:15
 msgid "Import Calendar"
 msgstr "Importeren"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
+#: ../../Code/Widget/Suggestedchats.php:32
 msgid "Suggested Chatrooms"
 msgstr "Voorgestelde chatkanalen"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
+#: ../../Code/Widget/Hq_controls.php:14
 msgid "HQ Control Panel"
 msgstr "HQ-controlepaneel"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
+#: ../../Code/Widget/Hq_controls.php:17
 msgid "Create a new post"
 msgstr "Nieuw bericht aanmaken"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
+#: ../../Code/Widget/Mailmenu.php:13
 msgid "Private Mail Menu"
 msgstr "Privéberichten"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
+#: ../../Code/Widget/Mailmenu.php:15
 msgid "Combined View"
 msgstr "Gecombineerd postvak"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20
+#: ../../Code/Widget/Mailmenu.php:20
 msgid "Inbox"
 msgstr "Postvak IN"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
+#: ../../Code/Widget/Mailmenu.php:25
 msgid "Outbox"
 msgstr "Postvak UIT"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
+#: ../../Code/Widget/Mailmenu.php:30
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../Code/Widget/Chatroom_list.php:16
 #: ../../include/conversation.php:1867 ../../include/conversation.php:1870
 #: ../../include/nav.php:434 ../../include/nav.php:437
 msgid "Chatrooms"
 msgstr "Chatkanalen"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
+#: ../../Code/Widget/Chatroom_list.php:20
 msgid "Overview"
 msgstr "Overzicht"
 
-#: ../../Zotlabs/Widget/Rating.php:51
+#: ../../Code/Widget/Rating.php:51
 msgid "Rating Tools"
 msgstr "Beoordelingen"
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+#: ../../Code/Widget/Rating.php:55 ../../Code/Widget/Rating.php:57
 msgid "Rate Me"
 msgstr "Beoordeel mij"
 
-#: ../../Zotlabs/Widget/Rating.php:60
+#: ../../Code/Widget/Rating.php:60
 msgid "View Ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../Zotlabs/Widget/Activity.php:50
+#: ../../Code/Widget/Activity.php:50
 msgctxt "widget"
 msgid "Activity"
 msgstr "Activiteit"
 
-#: ../../Zotlabs/Widget/Follow.php:22
+#: ../../Code/Widget/Follow.php:22
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties."
 
-#: ../../Zotlabs/Widget/Follow.php:29
+#: ../../Code/Widget/Follow.php:29
 msgid "Add New Connection"
 msgstr "Nieuwe connectie toevoegen"
 
-#: ../../Zotlabs/Widget/Follow.php:30
+#: ../../Code/Widget/Follow.php:30
 msgid "Enter channel address"
 msgstr "Vul kanaaladres in"
 
-#: ../../Zotlabs/Widget/Follow.php:31
+#: ../../Code/Widget/Follow.php:31
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
 
-#: ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../Code/Widget/Wiki_list.php:15
 msgid "Wiki List"
 msgstr "Wiki's"
 
-#: ../../Zotlabs/Widget/Archive.php:43
+#: ../../Code/Widget/Archive.php:43
 msgid "Archives"
 msgstr "Archieven"
 
-#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Code/Widget/Conversations.php:17
 msgid "Received Messages"
 msgstr "Ontvangen berichten"
 
-#: ../../Zotlabs/Widget/Conversations.php:21
+#: ../../Code/Widget/Conversations.php:21
 msgid "Sent Messages"
 msgstr "Verzonden berichten"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Code/Widget/Conversations.php:25
 msgid "Conversations"
 msgstr "Conversaties"
 
-#: ../../Zotlabs/Widget/Conversations.php:37
+#: ../../Code/Widget/Conversations.php:37
 msgid "No messages."
 msgstr "Geen berichten"
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Code/Widget/Conversations.php:57
 msgid "Delete conversation"
 msgstr "Verwijder conversatie"
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
+#: ../../Code/Widget/Chatroom_members.php:11
 msgid "Chat Members"
 msgstr "Chatleden"
 
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+#: ../../Code/Widget/Photo.php:48 ../../Code/Widget/Photo_rand.php:58
 msgid "photo/image"
 msgstr "foto/afbeelding"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
+#: ../../Code/Widget/Savedsearch.php:75
 msgid "Remove term"
 msgstr "Verwijder zoekterm"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381
+#: ../../Code/Widget/Savedsearch.php:83 ../../include/features.php:381
 msgid "Saved Searches"
 msgstr "Opgeslagen zoekopdrachten"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:333
+#: ../../Code/Widget/Savedsearch.php:84 ../../include/group.php:333
 msgid "add"
 msgstr "toevoegen"
 
-#: ../../Zotlabs/Widget/Notes.php:16
+#: ../../Code/Widget/Notes.php:16
 msgid "Notes"
 msgstr "Aantekeningen"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:89
+#: ../../Code/Widget/Wiki_pages.php:32
+#: ../../Code/Widget/Wiki_pages.php:89
 msgid "Add new page"
 msgstr "Nieuwe pagina toevoegen"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:83
+#: ../../Code/Widget/Wiki_pages.php:83
 msgid "Wiki Pages"
 msgstr "Wikipagina's"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:94
+#: ../../Code/Widget/Wiki_pages.php:94
 msgid "Page name"
 msgstr "Paginanaam"
 
-#: ../../Zotlabs/Widget/Affinity.php:45
+#: ../../Code/Widget/Affinity.php:45
 msgid "Refresh"
 msgstr "Vernieuwen"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
+#: ../../Code/Widget/Tasklist.php:23
 msgid "Tasks"
 msgstr "Taken"
 
-#: ../../Zotlabs/Widget/Suggestions.php:51
+#: ../../Code/Widget/Suggestions.php:51
 msgid "Suggestions"
 msgstr "Voorgestelde kanalen"
 
-#: ../../Zotlabs/Widget/Suggestions.php:52
+#: ../../Code/Widget/Suggestions.php:52
 msgid "See more..."
 msgstr "Meer..."
 
-#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../Code/Widget/Filer.php:28 ../../include/contact_widgets.php:53
 #: ../../include/features.php:470
 msgid "Saved Folders"
 msgstr "Bewaarde mappen"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:54
+#: ../../Code/Widget/Cover_photo.php:54
 msgid "Click to show more"
 msgstr "Klik voor meer"
 
-#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320
+#: ../../Code/Widget/Tagcloud.php:22 ../../include/taxonomy.php:320
 #: ../../include/taxonomy.php:449 ../../include/taxonomy.php:470
 msgid "Tags"
 msgstr "Tags"
 
-#: ../../Zotlabs/Widget/Newmember.php:24
+#: ../../Code/Widget/Newmember.php:24
 msgid "Profile Creation"
 msgstr "Profiel aanmaken"
 
-#: ../../Zotlabs/Widget/Newmember.php:26
+#: ../../Code/Widget/Newmember.php:26
 msgid "Upload profile photo"
 msgstr "Profielfoto uploaden"
 
-#: ../../Zotlabs/Widget/Newmember.php:27
+#: ../../Code/Widget/Newmember.php:27
 msgid "Upload cover photo"
 msgstr "Omslagfoto uploaden"
 
-#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119
+#: ../../Code/Widget/Newmember.php:28 ../../include/nav.php:119
 msgid "Edit your profile"
 msgstr "Jouw profiel bewerken"
 
-#: ../../Zotlabs/Widget/Newmember.php:31
+#: ../../Code/Widget/Newmember.php:31
 msgid "Find and Connect with others"
 msgstr "Vind en verbind met anderen"
 
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Code/Widget/Newmember.php:33
 msgid "View the directory"
 msgstr "Kanalengids tonen"
 
-#: ../../Zotlabs/Widget/Newmember.php:35
+#: ../../Code/Widget/Newmember.php:35
 msgid "Manage your connections"
 msgstr "Jouw connecties beheren"
 
-#: ../../Zotlabs/Widget/Newmember.php:38
+#: ../../Code/Widget/Newmember.php:38
 msgid "Communicate"
 msgstr "Communiceren"
 
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Code/Widget/Newmember.php:40
 msgid "View your channel homepage"
 msgstr "Jouw kanaalpagina tonen"
 
-#: ../../Zotlabs/Widget/Newmember.php:41
+#: ../../Code/Widget/Newmember.php:41
 msgid "View your network stream"
 msgstr "Jouw tijdlijn tonen"
 
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Code/Widget/Newmember.php:47
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: ../../Zotlabs/Widget/Newmember.php:58
+#: ../../Code/Widget/Newmember.php:58
 msgid "View public stream"
 msgstr "Openbare tijdlijn tonen"
 
-#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60
+#: ../../Code/Widget/Newmember.php:62 ../../include/features.php:60
 msgid "New Member Links"
 msgstr "Links voor nieuwe leden"
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+#: ../../Code/Widget/Admin.php:23 ../../Code/Widget/Admin.php:60
 msgid "Member registrations waiting for confirmation"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../Zotlabs/Widget/Admin.php:29
+#: ../../Code/Widget/Admin.php:29
 msgid "Inspect queue"
 msgstr "Inspecteer berichtenwachtrij"
 
-#: ../../Zotlabs/Widget/Admin.php:31
+#: ../../Code/Widget/Admin.php:31
 msgid "DB updates"
 msgstr "Database-updates"
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:199
+#: ../../Code/Widget/Admin.php:55 ../../include/nav.php:199
 msgid "Admin"
 msgstr "Beheer"
 
-#: ../../Zotlabs/Widget/Admin.php:56
+#: ../../Code/Widget/Admin.php:56
 msgid "Plugin Features"
 msgstr "Plug-in-opties"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:35
+#: ../../Code/Widget/Settings_menu.php:35
 msgid "Account settings"
 msgstr "Account"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:41
+#: ../../Code/Widget/Settings_menu.php:41
 msgid "Channel settings"
 msgstr "Kanaal"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:50
+#: ../../Code/Widget/Settings_menu.php:50
 msgid "Additional features"
 msgstr "Extra functies"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:57
+#: ../../Code/Widget/Settings_menu.php:57
 msgid "Addon settings"
 msgstr "Plug-ins"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:63
+#: ../../Code/Widget/Settings_menu.php:63
 msgid "Display settings"
 msgstr "Weergave"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:70
+#: ../../Code/Widget/Settings_menu.php:70
 msgid "Manage locations"
 msgstr "Locaties beheren"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:77
+#: ../../Code/Widget/Settings_menu.php:77
 msgid "Export channel"
 msgstr "Kanaal exporteren"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:84
+#: ../../Code/Widget/Settings_menu.php:84
 msgid "OAuth1 apps"
 msgstr "OAuth1-applicaties"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:92
+#: ../../Code/Widget/Settings_menu.php:92
 msgid "OAuth2 apps"
 msgstr "OAuth2-applicaties"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240
+#: ../../Code/Widget/Settings_menu.php:108 ../../include/features.php:240
 msgid "Permission Groups"
 msgstr "Permissiegroepen"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:125
+#: ../../Code/Widget/Settings_menu.php:125
 msgid "Premium Channel Settings"
 msgstr "Instellingen premiumkanaal"
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+#: ../../Code/Widget/Bookmarkedchats.php:24
 msgid "Bookmarked Chatrooms"
 msgstr "Bladwijzers van chatkanalen"
 
-#: ../../Zotlabs/Widget/Notifications.php:16
+#: ../../Code/Widget/Notifications.php:16
 msgid "New Network Activity"
 msgstr "Nieuwe tijdlijnactiviteit"
 
-#: ../../Zotlabs/Widget/Notifications.php:17
+#: ../../Code/Widget/Notifications.php:17
 msgid "New Network Activity Notifications"
 msgstr "Nieuwe tijdlijnactiviteitmeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:20
+#: ../../Code/Widget/Notifications.php:20
 msgid "View your network activity"
 msgstr "Jouw tijdlijnactiviteit tonen"
 
-#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Code/Widget/Notifications.php:23
 msgid "Mark all notifications read"
 msgstr "Markeer alle meldingen als gelezen"
 
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:45
-#: ../../Zotlabs/Widget/Notifications.php:141
+#: ../../Code/Widget/Notifications.php:26
+#: ../../Code/Widget/Notifications.php:45
+#: ../../Code/Widget/Notifications.php:141
 msgid "Show new posts only"
 msgstr "Alleen nieuwe berichten tonen"
 
-#: ../../Zotlabs/Widget/Notifications.php:27
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:142
+#: ../../Code/Widget/Notifications.php:27
+#: ../../Code/Widget/Notifications.php:46
+#: ../../Code/Widget/Notifications.php:142
 msgid "Filter by name"
 msgstr "Op naam filteren"
 
-#: ../../Zotlabs/Widget/Notifications.php:35
+#: ../../Code/Widget/Notifications.php:35
 msgid "New Home Activity"
 msgstr "Nieuwe kanaalactiviteit"
 
-#: ../../Zotlabs/Widget/Notifications.php:36
+#: ../../Code/Widget/Notifications.php:36
 msgid "New Home Activity Notifications"
 msgstr "Nieuwe kanaalactiviteitmeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:39
+#: ../../Code/Widget/Notifications.php:39
 msgid "View your home activity"
 msgstr "Jouw kanaalactiviteit tonen"
 
-#: ../../Zotlabs/Widget/Notifications.php:42
-#: ../../Zotlabs/Widget/Notifications.php:138
+#: ../../Code/Widget/Notifications.php:42
+#: ../../Code/Widget/Notifications.php:138
 msgid "Mark all notifications seen"
 msgstr "Markeer alle meldingen als bekeken"
 
-#: ../../Zotlabs/Widget/Notifications.php:54
+#: ../../Code/Widget/Notifications.php:54
 msgid "New Mails"
 msgstr "Nieuwe privéberichten"
 
-#: ../../Zotlabs/Widget/Notifications.php:55
+#: ../../Code/Widget/Notifications.php:55
 msgid "New Mails Notifications"
 msgstr "Nieuw privéberichtmeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:58
+#: ../../Code/Widget/Notifications.php:58
 msgid "View your private mails"
 msgstr "Jouw privéberichten tonen"
 
-#: ../../Zotlabs/Widget/Notifications.php:61
+#: ../../Code/Widget/Notifications.php:61
 msgid "Mark all messages seen"
 msgstr "Markeer alle berichten als bekeken"
 
-#: ../../Zotlabs/Widget/Notifications.php:69
+#: ../../Code/Widget/Notifications.php:69
 msgid "New Events"
 msgstr "Nieuwe gebeurtenissen"
 
-#: ../../Zotlabs/Widget/Notifications.php:70
+#: ../../Code/Widget/Notifications.php:70
 msgid "New Events Notifications"
 msgstr "Nieuwe gebeurtenismeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:73
+#: ../../Code/Widget/Notifications.php:73
 msgid "View events"
 msgstr "Agenda tonen"
 
-#: ../../Zotlabs/Widget/Notifications.php:76
+#: ../../Code/Widget/Notifications.php:76
 msgid "Mark all events seen"
 msgstr "Markeer alle gebeurtenissen als bekeken"
 
-#: ../../Zotlabs/Widget/Notifications.php:85
+#: ../../Code/Widget/Notifications.php:85
 msgid "New Connections Notifications"
 msgstr "Nieuwe connectiemeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:88
+#: ../../Code/Widget/Notifications.php:88
 msgid "View all connections"
 msgstr "Toon alle connecties"
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Code/Widget/Notifications.php:96
 msgid "New Files"
 msgstr "Nieuwe bestanden"
 
-#: ../../Zotlabs/Widget/Notifications.php:97
+#: ../../Code/Widget/Notifications.php:97
 msgid "New Files Notifications"
 msgstr "Nieuw bestandmeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:104
-#: ../../Zotlabs/Widget/Notifications.php:105
+#: ../../Code/Widget/Notifications.php:104
+#: ../../Code/Widget/Notifications.php:105
 msgid "Notices"
 msgstr "Meldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Code/Widget/Notifications.php:108
 msgid "View all notices"
 msgstr "Alle meldingen tonen"
 
-#: ../../Zotlabs/Widget/Notifications.php:111
+#: ../../Code/Widget/Notifications.php:111
 msgid "Mark all notices seen"
 msgstr "Markeer alle meldingen als bekeken"
 
-#: ../../Zotlabs/Widget/Notifications.php:121
+#: ../../Code/Widget/Notifications.php:121
 msgid "New Registrations"
 msgstr "Nieuwe registraties"
 
-#: ../../Zotlabs/Widget/Notifications.php:122
+#: ../../Code/Widget/Notifications.php:122
 msgid "New Registrations Notifications"
 msgstr "Nieuwe registratiemeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:132
+#: ../../Code/Widget/Notifications.php:132
 msgid "Public Stream Notifications"
 msgstr "Openbare tijdlijnmeldingen"
 
-#: ../../Zotlabs/Widget/Notifications.php:135
+#: ../../Code/Widget/Notifications.php:135
 msgid "View the public stream"
 msgstr "De openbare tijdlijn tonen"
 
-#: ../../Zotlabs/Widget/Notifications.php:150
+#: ../../Code/Widget/Notifications.php:150
 msgid "Sorry, you have got no notifications at the moment"
 msgstr "Sorry, maar je hebt op dit moment geen meldingen"
 
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index fe1cd7754..208d74813 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -1,5 +1,5 @@
 =2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2));\n"
 "X-Generator: Poedit 2.3\n"
 
-#: Zotlabs/Access/PermissionRoles.php:181
+#: Code/Access/PermissionRoles.php:181
 msgid "Social Networking"
 msgstr "Sieć społecznościowa"
 
-#: Zotlabs/Access/PermissionRoles.php:182
+#: Code/Access/PermissionRoles.php:182
 msgid "Social - Normal"
 msgstr "Społecznościowa - zwykła"
 
-#: Zotlabs/Access/PermissionRoles.php:183
+#: Code/Access/PermissionRoles.php:183
 msgid "Social - Restricted"
 msgstr "Społecznościowa - ograniczona"
 
-#: Zotlabs/Access/PermissionRoles.php:186
+#: Code/Access/PermissionRoles.php:186
 msgid "Community Group"
 msgstr "Grupa społecznościowa"
 
-#: Zotlabs/Access/PermissionRoles.php:187
+#: Code/Access/PermissionRoles.php:187
 msgid "Group - Normal"
 msgstr "Grupa - zwykła"
 
-#: Zotlabs/Access/PermissionRoles.php:188
+#: Code/Access/PermissionRoles.php:188
 msgid "Group - Restricted"
 msgstr "Grupa - ograniczona"
 
-#: Zotlabs/Access/PermissionRoles.php:189
+#: Code/Access/PermissionRoles.php:189
 msgid "Group - Moderated"
 msgstr "Grupa - moderowana"
 
-#: Zotlabs/Access/PermissionRoles.php:192 Zotlabs/Module/Directory.php:401
-#: Zotlabs/Module/Manage.php:77 Zotlabs/Module/Manage.php:174
-#: Zotlabs/Storage/Browser.php:148 include/text.php:3274
+#: Code/Access/PermissionRoles.php:192 Code/Module/Directory.php:401
+#: Code/Module/Manage.php:77 Code/Module/Manage.php:174
+#: Code/Storage/Browser.php:148 include/text.php:3274
 msgid "Collection"
 msgstr "Kolekcja"
 
-#: Zotlabs/Access/PermissionRoles.php:193
+#: Code/Access/PermissionRoles.php:193
 msgid "Collection - Normal"
 msgstr "Kolekcja - zwykła"
 
-#: Zotlabs/Access/PermissionRoles.php:194
+#: Code/Access/PermissionRoles.php:194
 msgid "Collection - Restricted"
 msgstr "Kolekcja ograniczona"
 
-#: Zotlabs/Access/Permissions.php:59
+#: Code/Access/Permissions.php:59
 msgid "Grant viewing access to and delivery of your channel stream and posts"
 msgstr ""
 "Przyznaj dostęp do oglądania i dostarczania strumienia i wpisów na swoim "
 "kanale"
 
-#: Zotlabs/Access/Permissions.php:60
+#: Code/Access/Permissions.php:60
 msgid "Grant viewing access to your default channel profile"
 msgstr "Przyznaj dostęp do domyślnego profilu kanału"
 
-#: Zotlabs/Access/Permissions.php:61
+#: Code/Access/Permissions.php:61
 msgid "Grant viewing access to your address book (connections)"
 msgstr "Przyznaj dostęp do przeglądania swojej książki adresowej (połączenia)"
 
-#: Zotlabs/Access/Permissions.php:62
+#: Code/Access/Permissions.php:62
 msgid "Grant viewing access to your file storage and photos"
 msgstr "Przyznaj dostęp do przechowywanych plików i zdjęć"
 
-#: Zotlabs/Access/Permissions.php:63
+#: Code/Access/Permissions.php:63
 msgid "Grant permission to post on your channel (wall) page"
 msgstr ""
 "Przyznaj uprawnienia do publikowania na stronie swojego kanału (tablicy)"
 
-#: Zotlabs/Access/Permissions.php:64
+#: Code/Access/Permissions.php:64
 msgid "Accept delivery of direct messages and personal mail"
 msgstr "Akceptuj dostarczanie wiadomości bezpośrednich i poczty osobistej"
 
-#: Zotlabs/Access/Permissions.php:65
+#: Code/Access/Permissions.php:65
 msgid "Accept delivery of their posts and all comments to their posts"
 msgstr ""
 "Zaakceptuj dostarczenie ich wpisów i wszystkich komentarzy do tych wpisów"
 
-#: Zotlabs/Access/Permissions.php:66
+#: Code/Access/Permissions.php:66
 msgid "Accept delivery of their comments and likes on your posts"
 msgstr "Zaakceptuj dostarczanie ich komentarzy i oceniania Twoich wpisów"
 
-#: Zotlabs/Access/Permissions.php:67
+#: Code/Access/Permissions.php:67
 msgid "Grant upload permissions to your file storage and photos"
 msgstr "Przyznaj uprawnienia do przesyłania plików i zdjęć"
 
-#: Zotlabs/Access/Permissions.php:68
+#: Code/Access/Permissions.php:68
 msgid "Grant permission to republish/mirror your posts"
 msgstr "Udziel pozwolenia na ponowną publikację lub powielanie Twoich wpisów"
 
-#: Zotlabs/Access/Permissions.php:69
+#: Code/Access/Permissions.php:69
 msgid "Accept comments and wall posts only after approval (moderation)"
 msgstr ""
 "Akceptuj komentarze i wpisy na tablicy dopiero po zatwierdzeniu (moderacja)"
 
-#: Zotlabs/Access/Permissions.php:70
+#: Code/Access/Permissions.php:70
 msgid "Grant channel administration (delegation) permission"
 msgstr "Przyznaj uprawnienie do administrowania kanałem (delegowanie)"
 
-#: Zotlabs/Lib/Libzotdir.php:118
+#: Code/Lib/Libzotdir.php:118
 msgid "Directory Options"
 msgstr "Opcje katalogu"
 
-#: Zotlabs/Lib/Libzotdir.php:120 include/nav.php:107
+#: Code/Lib/Libzotdir.php:120 include/nav.php:107
 msgid "Safe Mode"
 msgstr "Tryb bezpieczny"
 
-#: Zotlabs/Lib/Libzotdir.php:120 Zotlabs/Lib/Libzotdir.php:121
-#: Zotlabs/Lib/Libzotdir.php:124 Zotlabs/Lib/Libzotdir.php:125
-#: Zotlabs/Module/Admin/Site.php:287 Zotlabs/Module/Api.php:110
-#: Zotlabs/Module/Connedit.php:345 Zotlabs/Module/Connedit.php:732
-#: Zotlabs/Module/Connedit.php:812 Zotlabs/Module/Defperms.php:192
-#: Zotlabs/Module/Events.php:518 Zotlabs/Module/Events.php:519
-#: Zotlabs/Module/Events.php:544 Zotlabs/Module/Filestorage.php:240
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Module/Mitem.php:188
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:268
-#: Zotlabs/Module/Mitem.php:269 Zotlabs/Module/Menu.php:168
-#: Zotlabs/Module/Menu.php:226 Zotlabs/Module/Profiles.php:724
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:22
-#: Zotlabs/Module/Settings/Channel.php:413
-#: Zotlabs/Module/Settings/Display.php:113 Zotlabs/Module/Sources.php:129
-#: Zotlabs/Module/Sources.php:165 Zotlabs/Module/Photos.php:730
-#: Zotlabs/Module/Import.php:692 Zotlabs/Module/Import.php:696
-#: Zotlabs/Module/Import.php:697 Zotlabs/Storage/Browser.php:435 boot.php:1731
+#: Code/Lib/Libzotdir.php:120 Code/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:124 Code/Lib/Libzotdir.php:125
+#: Code/Module/Admin/Site.php:287 Code/Module/Api.php:110
+#: Code/Module/Connedit.php:345 Code/Module/Connedit.php:732
+#: Code/Module/Connedit.php:812 Code/Module/Defperms.php:192
+#: Code/Module/Events.php:518 Code/Module/Events.php:519
+#: Code/Module/Events.php:544 Code/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:248 Code/Module/Mitem.php:188
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:268
+#: Code/Module/Mitem.php:269 Code/Module/Menu.php:168
+#: Code/Module/Menu.php:226 Code/Module/Profiles.php:724
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:22
+#: Code/Module/Settings/Channel.php:413
+#: Code/Module/Settings/Display.php:113 Code/Module/Sources.php:129
+#: Code/Module/Sources.php:165 Code/Module/Photos.php:730
+#: Code/Module/Import.php:692 Code/Module/Import.php:696
+#: Code/Module/Import.php:697 Code/Storage/Browser.php:435 boot.php:1731
 #: extend/addon/a/zotpost/Mod_zotpost.php:77
 #: extend/addon/a/content_import/Mod_content_import.php:137
 #: extend/addon/a/content_import/Mod_content_import.php:138
@@ -145,23 +145,23 @@ msgstr "Tryb bezpieczny"
 msgid "No"
 msgstr "Nie"
 
-#: Zotlabs/Lib/Libzotdir.php:120 Zotlabs/Lib/Libzotdir.php:121
-#: Zotlabs/Lib/Libzotdir.php:124 Zotlabs/Lib/Libzotdir.php:125
-#: Zotlabs/Module/Admin/Site.php:289 Zotlabs/Module/Api.php:109
-#: Zotlabs/Module/Connedit.php:345 Zotlabs/Module/Connedit.php:732
-#: Zotlabs/Module/Connedit.php:812 Zotlabs/Module/Defperms.php:192
-#: Zotlabs/Module/Events.php:518 Zotlabs/Module/Events.php:519
-#: Zotlabs/Module/Events.php:544 Zotlabs/Module/Filestorage.php:240
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Module/Mitem.php:188
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:268
-#: Zotlabs/Module/Mitem.php:269 Zotlabs/Module/Menu.php:168
-#: Zotlabs/Module/Menu.php:226 Zotlabs/Module/Profiles.php:724
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:22
-#: Zotlabs/Module/Settings/Channel.php:413
-#: Zotlabs/Module/Settings/Display.php:113 Zotlabs/Module/Sources.php:129
-#: Zotlabs/Module/Sources.php:165 Zotlabs/Module/Photos.php:730
-#: Zotlabs/Module/Import.php:692 Zotlabs/Module/Import.php:696
-#: Zotlabs/Module/Import.php:697 Zotlabs/Storage/Browser.php:435 boot.php:1731
+#: Code/Lib/Libzotdir.php:120 Code/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:124 Code/Lib/Libzotdir.php:125
+#: Code/Module/Admin/Site.php:289 Code/Module/Api.php:109
+#: Code/Module/Connedit.php:345 Code/Module/Connedit.php:732
+#: Code/Module/Connedit.php:812 Code/Module/Defperms.php:192
+#: Code/Module/Events.php:518 Code/Module/Events.php:519
+#: Code/Module/Events.php:544 Code/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:248 Code/Module/Mitem.php:188
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:268
+#: Code/Module/Mitem.php:269 Code/Module/Menu.php:168
+#: Code/Module/Menu.php:226 Code/Module/Profiles.php:724
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:22
+#: Code/Module/Settings/Channel.php:413
+#: Code/Module/Settings/Display.php:113 Code/Module/Sources.php:129
+#: Code/Module/Sources.php:165 Code/Module/Photos.php:730
+#: Code/Module/Import.php:692 Code/Module/Import.php:696
+#: Code/Module/Import.php:697 Code/Storage/Browser.php:435 boot.php:1731
 #: extend/addon/a/zotpost/Mod_zotpost.php:77
 #: extend/addon/a/content_import/Mod_content_import.php:137
 #: extend/addon/a/content_import/Mod_content_import.php:138
@@ -170,486 +170,486 @@ msgstr "Nie"
 msgid "Yes"
 msgstr "Tak"
 
-#: Zotlabs/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:121
 msgid "Groups Only"
 msgstr "Tylko grupy"
 
-#: Zotlabs/Lib/Libzotdir.php:124
+#: Code/Lib/Libzotdir.php:124
 msgid "This Website Only"
 msgstr "Tylko ta witryna"
 
-#: Zotlabs/Lib/Libzotdir.php:125
+#: Code/Lib/Libzotdir.php:125
 msgid "Recently Updated"
 msgstr "Ostatnio zaktualizowane"
 
-#: Zotlabs/Lib/Markdown.php:219 include/bbcode.php:683
+#: Code/Lib/Markdown.php:219 include/bbcode.php:683
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s napisał ten %2$s %3$s"
 
-#: Zotlabs/Lib/Markdown.php:221 Zotlabs/Module/Tagger.php:92
+#: Code/Lib/Markdown.php:221 Code/Module/Tagger.php:92
 #: include/conversation.php:161 include/bbcode.php:677 include/text.php:2375
 msgid "post"
 msgstr "wpis"
 
-#: Zotlabs/Lib/Permcat.php:75
+#: Code/Lib/Permcat.php:75
 msgctxt "permcat"
 msgid "default"
 msgstr "domyślnie"
 
-#: Zotlabs/Lib/Permcat.php:129
+#: Code/Lib/Permcat.php:129
 msgctxt "permcat"
 msgid "follower"
 msgstr "obserwujący"
 
-#: Zotlabs/Lib/Permcat.php:133
+#: Code/Lib/Permcat.php:133
 msgctxt "permcat"
 msgid "contributor"
 msgstr "współpracownik"
 
-#: Zotlabs/Lib/Permcat.php:137
+#: Code/Lib/Permcat.php:137
 msgctxt "permcat"
 msgid "publisher"
 msgstr "wydawca"
 
-#: Zotlabs/Lib/Apps.php:339
+#: Code/Lib/Apps.php:339
 msgid "Site Admin"
 msgstr "Administrator serwisu"
 
-#: Zotlabs/Lib/Apps.php:340
+#: Code/Lib/Apps.php:340
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: Zotlabs/Lib/Apps.php:341 include/features.php:144 include/nav.php:491
+#: Code/Lib/Apps.php:341 include/features.php:144 include/nav.php:491
 msgid "Articles"
 msgstr "Artykuły"
 
-#: Zotlabs/Lib/Apps.php:342
+#: Code/Lib/Apps.php:342
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: Zotlabs/Lib/Apps.php:343
+#: Code/Lib/Apps.php:343
 msgid "CardDAV"
 msgstr "CardDAV"
 
-#: Zotlabs/Lib/Apps.php:344 Zotlabs/Module/Cards.php:212
+#: Code/Lib/Apps.php:344 Code/Module/Cards.php:212
 #: include/conversation.php:2060 include/nav.php:480
 msgid "Cards"
 msgstr "Karty"
 
-#: Zotlabs/Lib/Apps.php:345 Zotlabs/Storage/Browser.php:157 include/nav.php:442
+#: Code/Lib/Apps.php:345 Code/Storage/Browser.php:157 include/nav.php:442
 #: include/nav.php:445
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: Zotlabs/Lib/Apps.php:346 Zotlabs/Module/Cdav.php:1071
-#: Zotlabs/Widget/Appcategories.php:49 Zotlabs/Widget/Categories.php:85
-#: Zotlabs/Widget/Categories.php:133 Zotlabs/Widget/Categories.php:184
+#: Code/Lib/Apps.php:346 Code/Module/Cdav.php:1071
+#: Code/Widget/Appcategories.php:49 Code/Widget/Categories.php:85
+#: Code/Widget/Categories.php:133 Code/Widget/Categories.php:184
 #: include/taxonomy.php:465 include/taxonomy.php:559 include/taxonomy.php:581
 #: include/taxonomy.php:604
 msgid "Categories"
 msgstr "Kategorie"
 
-#: Zotlabs/Lib/Apps.php:347
+#: Code/Lib/Apps.php:347
 msgid "Channel Home"
 msgstr "Strona główna kanału"
 
-#: Zotlabs/Lib/Apps.php:348
+#: Code/Lib/Apps.php:348
 msgid "Channel Manager"
 msgstr "Menadżer kanałów"
 
-#: Zotlabs/Lib/Apps.php:349 Zotlabs/Module/Sources.php:112
+#: Code/Lib/Apps.php:349 Code/Module/Sources.php:112
 msgid "Channel Sources"
 msgstr "Źródła kanału"
 
-#: Zotlabs/Lib/Apps.php:350
+#: Code/Lib/Apps.php:350
 msgid "Chat"
 msgstr "Czat"
 
-#: Zotlabs/Lib/Apps.php:351 Zotlabs/Widget/Chatroom_list.php:22
+#: Code/Lib/Apps.php:351 Code/Widget/Chatroom_list.php:22
 #: include/conversation.php:2034 include/conversation.php:2037
 #: include/nav.php:456 include/nav.php:459
 msgid "Chatrooms"
 msgstr "Czaty"
 
-#: Zotlabs/Lib/Apps.php:352
+#: Code/Lib/Apps.php:352
 msgid "Clients"
 msgstr "Klienci"
 
-#: Zotlabs/Lib/Apps.php:353 include/conversation.php:1443
+#: Code/Lib/Apps.php:353 include/conversation.php:1443
 msgid "Comment Control"
 msgstr "Kontrola komentarzy"
 
-#: Zotlabs/Lib/Apps.php:354 Zotlabs/Module/Connedit.php:674
-#: Zotlabs/Module/Connections.php:368 Zotlabs/Module/Stream.php:135
-#: Zotlabs/Module/Affinity.php:65 Zotlabs/Widget/Activity_filter.php:146
-#: Zotlabs/Widget/Affinity.php:30 include/connections.php:954
+#: Code/Lib/Apps.php:354 Code/Module/Connedit.php:674
+#: Code/Module/Connections.php:368 Code/Module/Stream.php:135
+#: Code/Module/Affinity.php:65 Code/Widget/Activity_filter.php:146
+#: Code/Widget/Affinity.php:30 include/connections.php:954
 msgid "Connections"
 msgstr "Znajomi z sieci"
 
-#: Zotlabs/Lib/Apps.php:355
+#: Code/Lib/Apps.php:355
 msgid "Content Filter"
 msgstr "Filtr treści"
 
-#: Zotlabs/Lib/Apps.php:356
+#: Code/Lib/Apps.php:356
 #: extend/addon/a/content_import/Mod_content_import.php:135
 msgid "Content Import"
 msgstr "Import treści"
 
-#: Zotlabs/Lib/Apps.php:357 Zotlabs/Module/Directory.php:472
+#: Code/Lib/Apps.php:357 Code/Module/Directory.php:472
 msgid "Directory"
 msgstr "Katalog"
 
-#: Zotlabs/Lib/Apps.php:358 Zotlabs/Widget/Activity_filter.php:77
+#: Code/Lib/Apps.php:358 Code/Widget/Activity_filter.php:77
 msgid "Drafts"
 msgstr "Szkice"
 
-#: Zotlabs/Lib/Apps.php:359 Zotlabs/Widget/Activity_filter.php:105
+#: Code/Lib/Apps.php:359 Code/Widget/Activity_filter.php:105
 #: include/conversation.php:2020 include/conversation.php:2023
 msgid "Events"
 msgstr "Wydarzenia"
 
-#: Zotlabs/Lib/Apps.php:360
+#: Code/Lib/Apps.php:360
 msgid "Expire Posts"
 msgstr "Wygaszone wpisy"
 
-#: Zotlabs/Lib/Apps.php:361
+#: Code/Lib/Apps.php:361
 msgid "Features"
 msgstr "Możliwości"
 
-#: Zotlabs/Lib/Apps.php:362 Zotlabs/Module/Fbrowser.php:93
-#: Zotlabs/Storage/Browser.php:298 include/conversation.php:2009
+#: Code/Lib/Apps.php:362 Code/Module/Fbrowser.php:93
+#: Code/Storage/Browser.php:298 include/conversation.php:2009
 #: include/nav.php:431
 msgid "Files"
 msgstr "Pliki"
 
-#: Zotlabs/Lib/Apps.php:363 extend/addon/a/followlist/Mod_followlist.php:129
+#: Code/Lib/Apps.php:363 extend/addon/a/followlist/Mod_followlist.php:129
 msgid "Followlist"
 msgstr "Lista obserwacji"
 
-#: Zotlabs/Lib/Apps.php:364 Zotlabs/Module/Connedit.php:663
+#: Code/Lib/Apps.php:364 Code/Module/Connedit.php:663
 msgid "Friend Zoom"
 msgstr "Stopień zaprzyjaźnienia"
 
-#: Zotlabs/Lib/Apps.php:365
+#: Code/Lib/Apps.php:365
 msgid "Future Posting"
 msgstr "Przyszłe publikowanie"
 
-#: Zotlabs/Lib/Apps.php:366 extend/addon/a/gallery/Mod_Gallery.php:137
+#: Code/Lib/Apps.php:366 extend/addon/a/gallery/Mod_Gallery.php:137
 #: extend/addon/a/gallery/gallery.php:46
 msgid "Gallery"
 msgstr "Galeria"
 
-#: Zotlabs/Lib/Apps.php:367
+#: Code/Lib/Apps.php:367
 msgid "Guest Pass"
 msgstr "Przepustka dla gości"
 
-#: Zotlabs/Lib/Apps.php:368 include/help.php:69 include/nav.php:177
+#: Code/Lib/Apps.php:368 include/help.php:69 include/nav.php:177
 #: include/nav.php:297
 msgid "Help"
 msgstr "Pomoc"
 
-#: Zotlabs/Lib/Apps.php:369
+#: Code/Lib/Apps.php:369
 msgid "Invite"
 msgstr "Zaproszenie"
 
-#: Zotlabs/Lib/Apps.php:370
+#: Code/Lib/Apps.php:370
 msgid "Language"
 msgstr "Język"
 
-#: Zotlabs/Lib/Apps.php:371 Zotlabs/Lib/AccessList.php:391
-#: Zotlabs/Widget/Activity_filter.php:174 include/nav.php:103
+#: Code/Lib/Apps.php:371 Code/Lib/AccessList.php:391
+#: Code/Widget/Activity_filter.php:174 include/nav.php:103
 msgid "Lists"
 msgstr "Listy"
 
-#: Zotlabs/Lib/Apps.php:372 boot.php:1726 include/nav.php:128
+#: Code/Lib/Apps.php:372 boot.php:1726 include/nav.php:128
 #: include/nav.php:131
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: Zotlabs/Lib/Apps.php:373
+#: Code/Lib/Apps.php:373
 msgid "Mail"
 msgstr "Poczta"
 
-#: Zotlabs/Lib/Apps.php:374
+#: Code/Lib/Apps.php:374
 msgid "Markup"
 msgstr "Znacznik"
 
-#: Zotlabs/Lib/Apps.php:375 Zotlabs/Module/Mood.php:162
+#: Code/Lib/Apps.php:375 Code/Module/Mood.php:162
 msgid "Mood"
 msgstr "Nastrój"
 
-#: Zotlabs/Lib/Apps.php:376
+#: Code/Lib/Apps.php:376
 msgid "My Chatrooms"
 msgstr "Moje czaty"
 
-#: Zotlabs/Lib/Apps.php:377
+#: Code/Lib/Apps.php:377
 msgid "No Comment"
 msgstr "Brak komentarzy"
 
-#: Zotlabs/Lib/Apps.php:378 Zotlabs/Widget/Notes.php:22
+#: Code/Lib/Apps.php:378 Code/Widget/Notes.php:22
 msgid "Notes"
 msgstr "Notatki"
 
-#: Zotlabs/Lib/Apps.php:379 Zotlabs/Module/Settings/Channel.php:686
+#: Code/Lib/Apps.php:379 Code/Module/Settings/Channel.php:686
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: Zotlabs/Lib/Apps.php:380
+#: Code/Lib/Apps.php:380
 msgid "OAuth Apps Manager"
 msgstr "Menadżer aplikacji OAuth"
 
-#: Zotlabs/Lib/Apps.php:381
+#: Code/Lib/Apps.php:381
 msgid "OAuth2 Apps Manager"
 msgstr "Menadżer aplikacji OAuth2"
 
-#: Zotlabs/Lib/Apps.php:382
+#: Code/Lib/Apps.php:382
 msgid "Order Apps"
 msgstr "Kolejność aplikacji"
 
-#: Zotlabs/Lib/Apps.php:383
+#: Code/Lib/Apps.php:383
 msgid "PDL Editor"
 msgstr "Edytor PDL"
 
-#: Zotlabs/Lib/Apps.php:384 Zotlabs/Module/Settings/Permcats.php:111
+#: Code/Lib/Apps.php:384 Code/Module/Settings/Permcats.php:111
 msgid "Permission Categories"
 msgstr "Kategorie uprawnień"
 
-#: Zotlabs/Lib/Apps.php:385 Zotlabs/Module/Fbrowser.php:35
+#: Code/Lib/Apps.php:385 Code/Module/Fbrowser.php:35
 #: include/conversation.php:2001 include/nav.php:423
 msgid "Photos"
 msgstr "Zdjęcia"
 
-#: Zotlabs/Lib/Apps.php:386
+#: Code/Lib/Apps.php:386
 msgid "Photomap"
 msgstr "Mapa zdjęć"
 
-#: Zotlabs/Lib/Apps.php:387 Zotlabs/Module/Poke.php:139
+#: Code/Lib/Apps.php:387 Code/Module/Poke.php:139
 msgid "Poke"
 msgstr "Zaczepka"
 
-#: Zotlabs/Lib/Apps.php:388
+#: Code/Lib/Apps.php:388
 msgid "Post"
 msgstr "Wpis"
 
-#: Zotlabs/Lib/Apps.php:389
+#: Code/Lib/Apps.php:389
 msgid "Premium Channel"
 msgstr "Kanał Premium"
 
-#: Zotlabs/Lib/Apps.php:390
+#: Code/Lib/Apps.php:390
 msgid "Probe"
 msgstr "Sonda"
 
-#: Zotlabs/Lib/Apps.php:391 Zotlabs/Lib/Libprofile.php:656
-#: Zotlabs/Lib/Activity.php:2882 Zotlabs/Lib/Activity.php:2885
-#: Zotlabs/Lib/Activity.php:2905 Zotlabs/Module/Profperm.php:131
+#: Code/Lib/Apps.php:391 Code/Lib/Libprofile.php:656
+#: Code/Lib/Activity.php:2882 Code/Lib/Activity.php:2885
+#: Code/Lib/Activity.php:2905 Code/Module/Profperm.php:131
 msgid "Profile"
 msgstr "Profil"
 
-#: Zotlabs/Lib/Apps.php:392
+#: Code/Lib/Apps.php:392
 msgid "Profile Photo"
 msgstr "Zdjęcie profilowe"
 
-#: Zotlabs/Lib/Apps.php:393
+#: Code/Lib/Apps.php:393
 msgid "Profiles"
 msgstr "Profile"
 
-#: Zotlabs/Lib/Apps.php:394 Zotlabs/Module/Pubstream.php:95
-#: Zotlabs/Widget/Notifications.php:131
+#: Code/Lib/Apps.php:394 Code/Module/Pubstream.php:95
+#: Code/Widget/Notifications.php:131
 msgid "Public Stream"
 msgstr "Strumień publiczny"
 
-#: Zotlabs/Lib/Apps.php:395
+#: Code/Lib/Apps.php:395
 msgid "Random Channel"
 msgstr "Losowy kanał"
 
-#: Zotlabs/Lib/Apps.php:396
+#: Code/Lib/Apps.php:396
 msgid "Remote Diagnostics"
 msgstr "Zdalna diagnostyka"
 
-#: Zotlabs/Lib/Apps.php:397
+#: Code/Lib/Apps.php:397
 msgid "Report Bug"
 msgstr "Raport błędów"
 
-#: Zotlabs/Lib/Apps.php:398 Zotlabs/Module/Connections.php:375
-#: Zotlabs/Module/Search.php:61 Zotlabs/Widget/Sitesearch.php:35
+#: Code/Lib/Apps.php:398 Code/Module/Connections.php:375
+#: Code/Module/Search.php:61 Code/Widget/Sitesearch.php:35
 #: include/acl_selectors.php:147 include/nav.php:184 include/text.php:1042
 #: include/text.php:1055
 msgid "Search"
 msgstr "Wyszukaj"
 
-#: Zotlabs/Lib/Apps.php:399
+#: Code/Lib/Apps.php:399
 msgid "Secrets"
 msgstr "Tajniki"
 
-#: Zotlabs/Lib/Apps.php:400 Zotlabs/Module/Admin/Addons.php:346
-#: Zotlabs/Module/Admin/Themes.php:137 Zotlabs/Widget/Newmember.php:54
-#: Zotlabs/Widget/Settings_menu.php:135 include/nav.php:105
+#: Code/Lib/Apps.php:400 Code/Module/Admin/Addons.php:346
+#: Code/Module/Admin/Themes.php:137 Code/Widget/Newmember.php:54
+#: Code/Widget/Settings_menu.php:135 include/nav.php:105
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: Zotlabs/Lib/Apps.php:401
+#: Code/Lib/Apps.php:401
 msgid "Sites"
 msgstr "Portale"
 
-#: Zotlabs/Lib/Apps.php:402
+#: Code/Lib/Apps.php:402
 msgid "Stream"
 msgstr "Strumień"
 
-#: Zotlabs/Lib/Apps.php:403 Zotlabs/Widget/Stream_order.php:137
+#: Code/Lib/Apps.php:403 Code/Widget/Stream_order.php:137
 msgid "Stream Order"
 msgstr "Kolejność strumienia"
 
-#: Zotlabs/Lib/Apps.php:404
+#: Code/Lib/Apps.php:404
 msgid "Suggest"
 msgstr "Propozycja"
 
-#: Zotlabs/Lib/Apps.php:405 Zotlabs/Module/Settings/Network.php:112
+#: Code/Lib/Apps.php:405 Code/Module/Settings/Network.php:112
 #: include/features.php:447
 msgid "Suggest Channels"
 msgstr "Proponowane kanały"
 
-#: Zotlabs/Lib/Apps.php:406
+#: Code/Lib/Apps.php:406
 msgid "Tagadelic"
 msgstr "Tagadelic"
 
-#: Zotlabs/Lib/Apps.php:407 Zotlabs/Widget/Tasklist.php:30
+#: Code/Lib/Apps.php:407 Code/Widget/Tasklist.php:30
 msgid "Tasks"
 msgstr "Zadania"
 
-#: Zotlabs/Lib/Apps.php:408
+#: Code/Lib/Apps.php:408
 msgid "View Bookmarks"
 msgstr "Wyświetl zakładki"
 
-#: Zotlabs/Lib/Apps.php:409 Zotlabs/Module/Connedit.php:548 include/nav.php:117
+#: Code/Lib/Apps.php:409 Code/Module/Connedit.php:548 include/nav.php:117
 msgid "View Profile"
 msgstr "Wyświetl profil"
 
-#: Zotlabs/Lib/Apps.php:410
+#: Code/Lib/Apps.php:410
 msgid "Virtual Lists"
 msgstr "Listy wirtulane"
 
-#: Zotlabs/Lib/Apps.php:411 Zotlabs/Module/Webpages.php:262
+#: Code/Lib/Apps.php:411 Code/Module/Webpages.php:262
 #: include/conversation.php:2082 include/nav.php:503
 msgid "Webpages"
 msgstr "Strony internetowe"
 
-#: Zotlabs/Lib/Apps.php:412 include/conversation.php:2098 include/nav.php:518
+#: Code/Lib/Apps.php:412 include/conversation.php:2098 include/nav.php:518
 msgid "Wiki"
 msgstr "Wiki"
 
-#: Zotlabs/Lib/Apps.php:413 extend/addon/a/zotpost/Mod_zotpost.php:54
+#: Code/Lib/Apps.php:413 extend/addon/a/zotpost/Mod_zotpost.php:54
 msgid "ZotPost"
 msgstr "ZotPost"
 
-#: Zotlabs/Lib/Apps.php:588
+#: Code/Lib/Apps.php:588
 msgid "Installed"
 msgstr "Zainstalowane"
 
-#: Zotlabs/Lib/Apps.php:588 Zotlabs/Module/Admin/Addons.php:429
+#: Code/Lib/Apps.php:588 Code/Module/Admin/Addons.php:429
 msgid "Install"
 msgstr "Zainstaluj"
 
-#: Zotlabs/Lib/Apps.php:612
+#: Code/Lib/Apps.php:612
 msgid "Purchase"
 msgstr "Zakup"
 
-#: Zotlabs/Lib/Apps.php:615 Zotlabs/Lib/ThreadItem.php:154
-#: Zotlabs/Lib/Libprofile.php:203 Zotlabs/Lib/Libprofile.php:206
-#: Zotlabs/Module/Admin/Profs.php:188 Zotlabs/Module/Blocks.php:173
-#: Zotlabs/Module/Connections.php:319 Zotlabs/Module/Connections.php:358
-#: Zotlabs/Module/Connections.php:379 Zotlabs/Module/Editlayout.php:126
-#: Zotlabs/Module/Editwebpage.php:157 Zotlabs/Module/Thing.php:302
-#: Zotlabs/Module/Lists.php:335 Zotlabs/Module/Layouts.php:207
-#: Zotlabs/Module/Card_edit.php:108 Zotlabs/Module/Editblock.php:127
-#: Zotlabs/Module/Menu.php:181 Zotlabs/Module/Webpages.php:265
-#: Zotlabs/Module/Settings/Oauth.php:163 Zotlabs/Module/Settings/Oauth2.php:211
-#: Zotlabs/Storage/Browser.php:318 Zotlabs/Widget/Cdav.php:146
-#: Zotlabs/Widget/Cdav.php:181 include/menu.php:138
+#: Code/Lib/Apps.php:615 Code/Lib/ThreadItem.php:154
+#: Code/Lib/Libprofile.php:203 Code/Lib/Libprofile.php:206
+#: Code/Module/Admin/Profs.php:188 Code/Module/Blocks.php:173
+#: Code/Module/Connections.php:319 Code/Module/Connections.php:358
+#: Code/Module/Connections.php:379 Code/Module/Editlayout.php:126
+#: Code/Module/Editwebpage.php:157 Code/Module/Thing.php:302
+#: Code/Module/Lists.php:335 Code/Module/Layouts.php:207
+#: Code/Module/Card_edit.php:108 Code/Module/Editblock.php:127
+#: Code/Module/Menu.php:181 Code/Module/Webpages.php:265
+#: Code/Module/Settings/Oauth.php:163 Code/Module/Settings/Oauth2.php:211
+#: Code/Storage/Browser.php:318 Code/Widget/Cdav.php:146
+#: Code/Widget/Cdav.php:181 include/menu.php:138
 msgid "Edit"
 msgstr "Edytuj"
 
-#: Zotlabs/Lib/Apps.php:616 Zotlabs/Lib/ThreadItem.php:191
-#: Zotlabs/Module/Admin/Accounts.php:184 Zotlabs/Module/Admin/Channels.php:173
-#: Zotlabs/Module/Admin/Profs.php:189 Zotlabs/Module/Blocks.php:175
-#: Zotlabs/Module/Cdav.php:1058 Zotlabs/Module/Cdav.php:1367
-#: Zotlabs/Module/Connedit.php:616 Zotlabs/Module/Connedit.php:880
-#: Zotlabs/Module/Connections.php:327 Zotlabs/Module/Editlayout.php:150
-#: Zotlabs/Module/Editwebpage.php:182 Zotlabs/Module/Thing.php:303
-#: Zotlabs/Module/Card_edit.php:138 Zotlabs/Module/Editblock.php:152
-#: Zotlabs/Module/Webpages.php:267 Zotlabs/Module/Profiles.php:849
-#: Zotlabs/Module/Settings/Oauth.php:164 Zotlabs/Module/Settings/Oauth2.php:212
-#: Zotlabs/Module/Photos.php:1263 Zotlabs/Storage/Browser.php:319
+#: Code/Lib/Apps.php:616 Code/Lib/ThreadItem.php:191
+#: Code/Module/Admin/Accounts.php:184 Code/Module/Admin/Channels.php:173
+#: Code/Module/Admin/Profs.php:189 Code/Module/Blocks.php:175
+#: Code/Module/Cdav.php:1058 Code/Module/Cdav.php:1367
+#: Code/Module/Connedit.php:616 Code/Module/Connedit.php:880
+#: Code/Module/Connections.php:327 Code/Module/Editlayout.php:150
+#: Code/Module/Editwebpage.php:182 Code/Module/Thing.php:303
+#: Code/Module/Card_edit.php:138 Code/Module/Editblock.php:152
+#: Code/Module/Webpages.php:267 Code/Module/Profiles.php:849
+#: Code/Module/Settings/Oauth.php:164 Code/Module/Settings/Oauth2.php:212
+#: Code/Module/Photos.php:1263 Code/Storage/Browser.php:319
 #: include/conversation.php:600 include/conversation.php:654
 msgid "Delete"
 msgstr "Usuń"
 
-#: Zotlabs/Lib/Apps.php:617
+#: Code/Lib/Apps.php:617
 msgid "Undelete"
 msgstr "Cofnij usunięcie"
 
-#: Zotlabs/Lib/Apps.php:627
+#: Code/Lib/Apps.php:627
 msgid "Add to app-tray"
 msgstr "Dodaj do zasobnika aplikacji"
 
-#: Zotlabs/Lib/Apps.php:628
+#: Code/Lib/Apps.php:628
 msgid "Remove from app-tray"
 msgstr "Usuń z zasobnika aplikacji"
 
-#: Zotlabs/Lib/Apps.php:629
+#: Code/Lib/Apps.php:629
 msgid "Pin to navbar"
 msgstr "Przypnij do paska nawigacyjnego"
 
-#: Zotlabs/Lib/Apps.php:630
+#: Code/Lib/Apps.php:630
 msgid "Unpin from navbar"
 msgstr "Odepnij od paska nawigacyjnego"
 
-#: Zotlabs/Lib/Apps.php:1152 Zotlabs/Lib/Apps.php:1244
-#: Zotlabs/Lib/Activity.php:2194 Zotlabs/Module/Cdav.php:858
-#: Zotlabs/Module/Cdav.php:859 Zotlabs/Module/Cdav.php:865
-#: Zotlabs/Module/Embedphotos.php:214 Zotlabs/Module/Photos.php:854
-#: Zotlabs/Module/Photos.php:1329 Zotlabs/Storage/Browser.php:182
-#: Zotlabs/Widget/Album.php:94 Zotlabs/Widget/Portfolio.php:107
+#: Code/Lib/Apps.php:1152 Code/Lib/Apps.php:1244
+#: Code/Lib/Activity.php:2194 Code/Module/Cdav.php:858
+#: Code/Module/Cdav.php:859 Code/Module/Cdav.php:865
+#: Code/Module/Embedphotos.php:214 Code/Module/Photos.php:854
+#: Code/Module/Photos.php:1329 Code/Storage/Browser.php:182
+#: Code/Widget/Album.php:94 Code/Widget/Portfolio.php:107
 #: include/conversation.php:1082
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: Zotlabs/Lib/DB_Upgrade.php:68
+#: Code/Lib/DB_Upgrade.php:68
 msgid "Source code of failed update: "
 msgstr "Kod źródłowy nieudanej aktualizacji: "
 
-#: Zotlabs/Lib/DB_Upgrade.php:91
+#: Code/Lib/DB_Upgrade.php:91
 #, php-format
 msgid "Update Error at %s"
 msgstr "Błąd aktualizacji na %s"
 
-#: Zotlabs/Lib/DB_Upgrade.php:98
+#: Code/Lib/DB_Upgrade.php:98
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualizacja %s nie powiodła się. Zobacz dzienniki błędów."
 
-#: Zotlabs/Lib/Libsync.php:969
+#: Code/Lib/Libsync.php:969
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Nie można zweryfikować podpisu portalu dla %s"
 
-#: Zotlabs/Lib/Libzot.php:761
+#: Code/Lib/Libzot.php:761
 msgid "Unable to verify channel signature"
 msgstr "Nie można zweryfikować podpisu kanału"
 
-#: Zotlabs/Lib/ThreadItem.php:116 include/conversation.php:608
+#: Code/Lib/ThreadItem.php:116 include/conversation.php:608
 msgid "Public visibility"
 msgstr "Widoczość publiczna"
 
-#: Zotlabs/Lib/ThreadItem.php:118 include/conversation.php:610
+#: Code/Lib/ThreadItem.php:118 include/conversation.php:610
 msgid "Direct message (private mail)"
 msgstr "Komunikat bezpośredni (wiadomość prywatna)"
 
-#: Zotlabs/Lib/ThreadItem.php:121 include/conversation.php:613
+#: Code/Lib/ThreadItem.php:121 include/conversation.php:613
 msgid "Restricted visibility"
 msgstr "Widoczność ograniczona"
 
-#: Zotlabs/Lib/ThreadItem.php:146
+#: Code/Lib/ThreadItem.php:146
 msgid ""
 "This comment is part of a private conversation, yet was shared with the "
 "public. Discretion advised."
@@ -657,40 +657,40 @@ msgstr ""
 "Ten komentarz jest częścią prywatnej rozmowy, ale został udostępniony "
 "publicznie. Zalecana dyskrecja."
 
-#: Zotlabs/Lib/ThreadItem.php:194 Zotlabs/Storage/Browser.php:306
+#: Code/Lib/ThreadItem.php:194 Code/Storage/Browser.php:306
 msgid "Admin Delete"
 msgstr "Usunięte przez administratora"
 
-#: Zotlabs/Lib/ThreadItem.php:199 include/conversation.php:599
+#: Code/Lib/ThreadItem.php:199 include/conversation.php:599
 msgid "Select"
 msgstr "Wybierz"
 
-#: Zotlabs/Lib/ThreadItem.php:203 Zotlabs/Module/Filer.php:61
+#: Code/Lib/ThreadItem.php:203 Code/Module/Filer.php:61
 msgid "Save to Folder"
 msgstr "Zapisz do folderu"
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I will attend"
 msgstr "Będę uczestniczył"
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I will not attend"
 msgstr "Nie będę uczestniczył"
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I might attend"
 msgstr "Mogę wziąć udział"
 
-#: Zotlabs/Lib/ThreadItem.php:226
+#: Code/Lib/ThreadItem.php:226
 msgid "Undo attendance"
 msgstr "Cofnij uczestnictwo"
 
-#: Zotlabs/Lib/ThreadItem.php:241 Zotlabs/Lib/ThreadItem.php:261
-#: Zotlabs/Module/Photos.php:1223 Zotlabs/Module/Photos.php:1234
+#: Code/Lib/ThreadItem.php:241 Code/Lib/ThreadItem.php:261
+#: Code/Module/Photos.php:1223 Code/Module/Photos.php:1234
 msgid "View all"
 msgstr "Pokaż wszystko"
 
-#: Zotlabs/Lib/ThreadItem.php:246 Zotlabs/Module/Photos.php:1227
+#: Code/Lib/ThreadItem.php:246 Code/Module/Photos.php:1227
 #: include/conversation.php:2152 include/taxonomy.php:741
 msgctxt "noun"
 msgid "Like"
@@ -699,13 +699,13 @@ msgstr[0] "Pochwała"
 msgstr[1] "Pochwały"
 msgstr[2] "Pochwał"
 
-#: Zotlabs/Lib/ThreadItem.php:248 Zotlabs/Lib/ThreadItem.php:495
-#: Zotlabs/Module/Photos.php:1343 include/conversation.php:2154
+#: Code/Lib/ThreadItem.php:248 Code/Lib/ThreadItem.php:495
+#: Code/Module/Photos.php:1343 include/conversation.php:2154
 msgctxt "noun"
 msgid "Likes"
 msgstr "Pochwały"
 
-#: Zotlabs/Lib/ThreadItem.php:254 Zotlabs/Module/Photos.php:1231
+#: Code/Lib/ThreadItem.php:254 Code/Module/Photos.php:1231
 #: include/conversation.php:2159
 msgctxt "noun"
 msgid "Dislike"
@@ -714,61 +714,61 @@ msgstr[0] "Zganienie"
 msgstr[1] "Zganienia"
 msgstr[2] "Zganień"
 
-#: Zotlabs/Lib/ThreadItem.php:256 Zotlabs/Lib/ThreadItem.php:496
-#: Zotlabs/Module/Photos.php:1344 include/conversation.php:2161
+#: Code/Lib/ThreadItem.php:256 Code/Lib/ThreadItem.php:496
+#: Code/Module/Photos.php:1344 include/conversation.php:2161
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Zganienia"
 
-#: Zotlabs/Lib/ThreadItem.php:282 Zotlabs/Module/Admin/Profs.php:99
-#: Zotlabs/Module/Admin/Profs.php:120 Zotlabs/Module/Filer.php:60
-#: Zotlabs/Widget/Notes.php:24
+#: Code/Lib/ThreadItem.php:282 Code/Module/Admin/Profs.php:99
+#: Code/Module/Admin/Profs.php:120 Code/Module/Filer.php:60
+#: Code/Widget/Notes.php:24
 #: extend/addon/a/queueworker/Mod_Queueworker.php:116 include/text.php:1043
 #: include/text.php:1056
 msgid "Save"
 msgstr "Zapisz"
 
-#: Zotlabs/Lib/ThreadItem.php:291 include/conversation.php:621
+#: Code/Lib/ThreadItem.php:291 include/conversation.php:621
 msgid "Message signature validated"
 msgstr "Podpis wiadomości został zatwierdzony"
 
-#: Zotlabs/Lib/ThreadItem.php:292 include/conversation.php:622
+#: Code/Lib/ThreadItem.php:292 include/conversation.php:622
 msgid "Message signature incorrect"
 msgstr "Niepoprawny podpis wiadomości"
 
-#: Zotlabs/Lib/ThreadItem.php:298
+#: Code/Lib/ThreadItem.php:298
 msgid "Add Tag"
 msgstr "Dodaj tag"
 
-#: Zotlabs/Lib/ThreadItem.php:318 Zotlabs/Module/Photos.php:1164
+#: Code/Lib/ThreadItem.php:318 Code/Module/Photos.php:1164
 msgid "I like this"
 msgstr "Pochwalam to"
 
-#: Zotlabs/Lib/ThreadItem.php:318 Zotlabs/Module/Photos.php:1168
+#: Code/Lib/ThreadItem.php:318 Code/Module/Photos.php:1168
 msgid "Undo like"
 msgstr "Cofnij pochwałę"
 
-#: Zotlabs/Lib/ThreadItem.php:319 Zotlabs/Module/Photos.php:1167
+#: Code/Lib/ThreadItem.php:319 Code/Module/Photos.php:1167
 msgid "I don't like this"
 msgstr "Nie pochwalam tego"
 
-#: Zotlabs/Lib/ThreadItem.php:319 Zotlabs/Module/Photos.php:1169
+#: Code/Lib/ThreadItem.php:319 Code/Module/Photos.php:1169
 msgid "Undo dislike"
 msgstr "Cofnij zganienie"
 
-#: Zotlabs/Lib/ThreadItem.php:325
+#: Code/Lib/ThreadItem.php:325
 msgid "Repeat This"
 msgstr "Powtórz to"
 
-#: Zotlabs/Lib/ThreadItem.php:326
+#: Code/Lib/ThreadItem.php:326
 msgid "Share this"
 msgstr "Udostępnij to"
 
-#: Zotlabs/Lib/ThreadItem.php:337
+#: Code/Lib/ThreadItem.php:337
 msgid "Delivery Report"
 msgstr "Raport dostawy"
 
-#: Zotlabs/Lib/ThreadItem.php:366
+#: Code/Lib/ThreadItem.php:366
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -776,161 +776,161 @@ msgstr[0] "%d komentarz"
 msgstr[1] "%d komentarze"
 msgstr[2] "%d komentarzy"
 
-#: Zotlabs/Lib/ThreadItem.php:367
+#: Code/Lib/ThreadItem.php:367
 #, php-format
 msgid "%d unseen"
 msgstr "%d nie zobaczone"
 
-#: Zotlabs/Lib/ThreadItem.php:406 Zotlabs/Lib/ThreadItem.php:407
+#: Code/Lib/ThreadItem.php:406 Code/Lib/ThreadItem.php:407
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Pokaż profile %s - %s"
 
-#: Zotlabs/Lib/ThreadItem.php:410
+#: Code/Lib/ThreadItem.php:410
 msgid "to"
 msgstr "do"
 
-#: Zotlabs/Lib/ThreadItem.php:411 include/conversation.php:684
+#: Code/Lib/ThreadItem.php:411 include/conversation.php:684
 msgid "via"
 msgstr "poprzez"
 
-#: Zotlabs/Lib/ThreadItem.php:412
+#: Code/Lib/ThreadItem.php:412
 msgid "Wall-to-Wall"
 msgstr "Rozwinięcie"
 
-#: Zotlabs/Lib/ThreadItem.php:413
+#: Code/Lib/ThreadItem.php:413
 msgid "via Wall-To-Wall:"
 msgstr "poprzez rozwinięcie:"
 
-#: Zotlabs/Lib/ThreadItem.php:428 include/conversation.php:687
+#: Code/Lib/ThreadItem.php:428 include/conversation.php:687
 #, php-format
 msgid "from %s"
 msgstr "od %s"
 
-#: Zotlabs/Lib/ThreadItem.php:431 include/conversation.php:690
+#: Code/Lib/ThreadItem.php:431 include/conversation.php:690
 #, php-format
 msgid "last edited: %s"
 msgstr "ostatnio edytowane: %s"
 
-#: Zotlabs/Lib/ThreadItem.php:432 include/conversation.php:691
+#: Code/Lib/ThreadItem.php:432 include/conversation.php:691
 #, php-format
 msgid "Expires: %s"
 msgstr "Wygasa: %s"
 
-#: Zotlabs/Lib/ThreadItem.php:442
+#: Code/Lib/ThreadItem.php:442
 msgid "Attend"
 msgstr "Uczestnicz"
 
-#: Zotlabs/Lib/ThreadItem.php:443
+#: Code/Lib/ThreadItem.php:443
 msgid "Attendance Options"
 msgstr "Opcje uczestnictwa"
 
-#: Zotlabs/Lib/ThreadItem.php:444
+#: Code/Lib/ThreadItem.php:444
 msgid "Vote"
 msgstr "Głosuj"
 
-#: Zotlabs/Lib/ThreadItem.php:445
+#: Code/Lib/ThreadItem.php:445
 msgid "Voting Options"
 msgstr "Opcje głosowania"
 
-#: Zotlabs/Lib/ThreadItem.php:446
+#: Code/Lib/ThreadItem.php:446
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: Zotlabs/Lib/ThreadItem.php:471 include/conversation.php:706
+#: Code/Lib/ThreadItem.php:471 include/conversation.php:706
 msgid "Pinned post"
 msgstr "Wpis przypięty"
 
-#: Zotlabs/Lib/ThreadItem.php:473 include/conversation.php:708
+#: Code/Lib/ThreadItem.php:473 include/conversation.php:708
 #: include/js_strings.php:42
 msgid "Unpin this post"
 msgstr "Odepnij ten wpis"
 
-#: Zotlabs/Lib/ThreadItem.php:473 include/conversation.php:708
+#: Code/Lib/ThreadItem.php:473 include/conversation.php:708
 #: include/js_strings.php:41
 msgid "Pin this post"
 msgstr "Przypnij ten wpis"
 
-#: Zotlabs/Lib/ThreadItem.php:475
+#: Code/Lib/ThreadItem.php:475
 msgid "Saved draft"
 msgstr "Szkic zapisany"
 
-#: Zotlabs/Lib/ThreadItem.php:476
+#: Code/Lib/ThreadItem.php:476
 msgid "Save Bookmarks"
 msgstr "Zapisz zakładki"
 
-#: Zotlabs/Lib/ThreadItem.php:477
+#: Code/Lib/ThreadItem.php:477
 msgid "Add to Calendar"
 msgstr "Dodaj do kalendarza"
 
-#: Zotlabs/Lib/ThreadItem.php:488 Zotlabs/Module/Notifications.php:72
+#: Code/Lib/ThreadItem.php:488 Code/Module/Notifications.php:72
 msgid "Mark all seen"
 msgstr "Oznacz wszystko jako oglądnięte"
 
-#: Zotlabs/Lib/ThreadItem.php:501 Zotlabs/Module/Settings/Channel.php:685
-#: Zotlabs/Module/Photos.php:1349 include/conversation.php:1498
+#: Code/Lib/ThreadItem.php:501 Code/Module/Settings/Channel.php:685
+#: Code/Module/Photos.php:1349 include/conversation.php:1498
 #: include/acl_selectors.php:154
 msgid "Close"
 msgstr "Zamknij"
 
-#: Zotlabs/Lib/ThreadItem.php:506 include/conversation.php:412
+#: Code/Lib/ThreadItem.php:506 include/conversation.php:412
 msgid "This is an unsaved preview"
 msgstr "Ten podgląd nie został zapisany"
 
-#: Zotlabs/Lib/ThreadItem.php:507 Zotlabs/Module/Photos.php:1171
+#: Code/Lib/ThreadItem.php:507 Code/Module/Photos.php:1171
 #: include/conversation.php:711
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: Zotlabs/Lib/ThreadItem.php:572 include/js_strings.php:11
+#: Code/Lib/ThreadItem.php:572 include/js_strings.php:11
 #, php-format
 msgid "%s show all"
 msgstr "%s pokaż wszystko"
 
-#: Zotlabs/Lib/ThreadItem.php:947 Zotlabs/Module/Photos.php:1187
-#: Zotlabs/Module/Photos.php:1297
+#: Code/Lib/ThreadItem.php:947 Code/Module/Photos.php:1187
+#: Code/Module/Photos.php:1297
 msgid "This is you"
 msgstr "To jesteś ty"
 
-#: Zotlabs/Lib/ThreadItem.php:949 Zotlabs/Module/Photos.php:1189
-#: Zotlabs/Module/Photos.php:1299 include/js_strings.php:10
+#: Code/Lib/ThreadItem.php:949 Code/Module/Photos.php:1189
+#: Code/Module/Photos.php:1299 include/js_strings.php:10
 msgid "Comment"
 msgstr "Skomentuj"
 
-#: Zotlabs/Lib/ThreadItem.php:950 Zotlabs/Module/Admin/Account_edit.php:78
-#: Zotlabs/Module/Admin/Accounts.php:177 Zotlabs/Module/Admin/Addons.php:445
-#: Zotlabs/Module/Admin/Channels.php:171 Zotlabs/Module/Admin/Logs.php:84
-#: Zotlabs/Module/Admin/Profs.php:191 Zotlabs/Module/Admin/Security.php:169
-#: Zotlabs/Module/Admin/Site.php:312 Zotlabs/Module/Admin/Themes.php:170
-#: Zotlabs/Module/Cal.php:359 Zotlabs/Module/Expire.php:48
-#: Zotlabs/Module/Connedit.php:844 Zotlabs/Module/Appman.php:150
-#: Zotlabs/Module/Defperms.php:258 Zotlabs/Module/Events.php:541
-#: Zotlabs/Module/Email_validation.php:44 Zotlabs/Module/Invite.php:168
-#: Zotlabs/Module/Filestorage.php:245 Zotlabs/Module/Thing.php:362
-#: Zotlabs/Module/Thing.php:417 Zotlabs/Module/Chat.php:210
-#: Zotlabs/Module/Chat.php:247 Zotlabs/Module/Setup.php:332
-#: Zotlabs/Module/Setup.php:377 Zotlabs/Module/Lists.php:198
-#: Zotlabs/Module/Lists.php:210 Zotlabs/Module/Import_items.php:142
-#: Zotlabs/Module/Mitem.php:271 Zotlabs/Module/Finger.php:24
-#: Zotlabs/Module/Pconfig.php:129 Zotlabs/Module/Editpost.php:116
-#: Zotlabs/Module/Locs.php:136 Zotlabs/Module/Connect.php:95
-#: Zotlabs/Module/Mood.php:166 Zotlabs/Module/Pdledit.php:114
-#: Zotlabs/Module/Profiles.php:768 Zotlabs/Module/Poke.php:148
-#: Zotlabs/Module/Affinity.php:86 Zotlabs/Module/Zot_probe.php:21
-#: Zotlabs/Module/Ap_probe.php:23 Zotlabs/Module/Settings/Account.php:114
-#: Zotlabs/Module/Settings/Channel.php:626
-#: Zotlabs/Module/Settings/Display.php:204
-#: Zotlabs/Module/Settings/Featured.php:59
-#: Zotlabs/Module/Settings/Features.php:63
-#: Zotlabs/Module/Settings/Network.php:44 Zotlabs/Module/Settings/Oauth.php:95
-#: Zotlabs/Module/Settings/Oauth2.php:113
-#: Zotlabs/Module/Settings/Permcats.php:127
-#: Zotlabs/Module/Settings/Tokens.php:314 Zotlabs/Module/Sources.php:130
-#: Zotlabs/Module/Sources.php:168 Zotlabs/Module/Photos.php:1132
-#: Zotlabs/Module/Photos.php:1190 Zotlabs/Module/Photos.php:1300
-#: Zotlabs/Module/Import.php:703 Zotlabs/Module/Content_filter.php:66
-#: Zotlabs/Module/Superblock.php:255 Zotlabs/Module/Xchan.php:18
-#: Zotlabs/Module/Zotfinger.php:28 Zotlabs/Widget/Eventstools.php:19
+#: Code/Lib/ThreadItem.php:950 Code/Module/Admin/Account_edit.php:78
+#: Code/Module/Admin/Accounts.php:177 Code/Module/Admin/Addons.php:445
+#: Code/Module/Admin/Channels.php:171 Code/Module/Admin/Logs.php:84
+#: Code/Module/Admin/Profs.php:191 Code/Module/Admin/Security.php:169
+#: Code/Module/Admin/Site.php:312 Code/Module/Admin/Themes.php:170
+#: Code/Module/Cal.php:359 Code/Module/Expire.php:48
+#: Code/Module/Connedit.php:844 Code/Module/Appman.php:150
+#: Code/Module/Defperms.php:258 Code/Module/Events.php:541
+#: Code/Module/Email_validation.php:44 Code/Module/Invite.php:168
+#: Code/Module/Filestorage.php:245 Code/Module/Thing.php:362
+#: Code/Module/Thing.php:417 Code/Module/Chat.php:210
+#: Code/Module/Chat.php:247 Code/Module/Setup.php:332
+#: Code/Module/Setup.php:377 Code/Module/Lists.php:198
+#: Code/Module/Lists.php:210 Code/Module/Import_items.php:142
+#: Code/Module/Mitem.php:271 Code/Module/Finger.php:24
+#: Code/Module/Pconfig.php:129 Code/Module/Editpost.php:116
+#: Code/Module/Locs.php:136 Code/Module/Connect.php:95
+#: Code/Module/Mood.php:166 Code/Module/Pdledit.php:114
+#: Code/Module/Profiles.php:768 Code/Module/Poke.php:148
+#: Code/Module/Affinity.php:86 Code/Module/Zot_probe.php:21
+#: Code/Module/Ap_probe.php:23 Code/Module/Settings/Account.php:114
+#: Code/Module/Settings/Channel.php:626
+#: Code/Module/Settings/Display.php:204
+#: Code/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Features.php:63
+#: Code/Module/Settings/Network.php:44 Code/Module/Settings/Oauth.php:95
+#: Code/Module/Settings/Oauth2.php:113
+#: Code/Module/Settings/Permcats.php:127
+#: Code/Module/Settings/Tokens.php:314 Code/Module/Sources.php:130
+#: Code/Module/Sources.php:168 Code/Module/Photos.php:1132
+#: Code/Module/Photos.php:1190 Code/Module/Photos.php:1300
+#: Code/Module/Import.php:703 Code/Module/Content_filter.php:66
+#: Code/Module/Superblock.php:255 Code/Module/Xchan.php:18
+#: Code/Module/Zotfinger.php:28 Code/Widget/Eventstools.php:19
 #: extend/addon/a/logrot/logrot.php:36 extend/addon/a/nsfw/Mod_Nsfw.php:50
 #: extend/addon/a/zotpost/Mod_zotpost.php:81
 #: extend/addon/a/content_import/Mod_content_import.php:142
@@ -943,134 +943,134 @@ msgstr "Skomentuj"
 msgid "Submit"
 msgstr "Zatwierdź"
 
-#: Zotlabs/Lib/ThreadItem.php:952 include/conversation.php:1416
+#: Code/Lib/ThreadItem.php:952 include/conversation.php:1416
 msgid "Bold"
 msgstr "Grube"
 
-#: Zotlabs/Lib/ThreadItem.php:953 include/conversation.php:1417
+#: Code/Lib/ThreadItem.php:953 include/conversation.php:1417
 msgid "Italic"
 msgstr "Pochyłe"
 
-#: Zotlabs/Lib/ThreadItem.php:954 include/conversation.php:1418
+#: Code/Lib/ThreadItem.php:954 include/conversation.php:1418
 msgid "Underline"
 msgstr "Podkreślone"
 
-#: Zotlabs/Lib/ThreadItem.php:955 include/conversation.php:1419
+#: Code/Lib/ThreadItem.php:955 include/conversation.php:1419
 msgid "Quote"
 msgstr "Cytat"
 
-#: Zotlabs/Lib/ThreadItem.php:956 include/conversation.php:1420
+#: Code/Lib/ThreadItem.php:956 include/conversation.php:1420
 msgid "Code"
 msgstr "Kod"
 
-#: Zotlabs/Lib/ThreadItem.php:957
+#: Code/Lib/ThreadItem.php:957
 msgid "Image"
 msgstr "Obraz"
 
-#: Zotlabs/Lib/ThreadItem.php:958 include/conversation.php:1421
+#: Code/Lib/ThreadItem.php:958 include/conversation.php:1421
 msgid "Attach/Upload file"
 msgstr "Załącz/Prześlij plik"
 
-#: Zotlabs/Lib/ThreadItem.php:959
+#: Code/Lib/ThreadItem.php:959
 msgid "Insert Link"
 msgstr "Wstaw link"
 
-#: Zotlabs/Lib/ThreadItem.php:960
+#: Code/Lib/ThreadItem.php:960
 msgid "Video"
 msgstr "Wideao"
 
-#: Zotlabs/Lib/ThreadItem.php:961 Zotlabs/Module/Events.php:526
-#: Zotlabs/Module/Webpages.php:272 Zotlabs/Module/Photos.php:1191
+#: Code/Lib/ThreadItem.php:961 Code/Module/Events.php:526
+#: Code/Module/Webpages.php:272 Code/Module/Photos.php:1191
 #: include/conversation.php:1305
 msgid "Preview"
 msgstr "Podgląd"
 
-#: Zotlabs/Lib/ThreadItem.php:962 Zotlabs/Module/Lostpass.php:141
-#: Zotlabs/Module/Pdledit.php:71 Zotlabs/Module/Pdledit.php:79
+#: Code/Lib/ThreadItem.php:962 Code/Module/Lostpass.php:141
+#: Code/Module/Pdledit.php:71 Code/Module/Pdledit.php:79
 msgid "Reset"
 msgstr "Resetowanie"
 
-#: Zotlabs/Lib/ThreadItem.php:967 Zotlabs/Module/Chat.php:218
+#: Code/Lib/ThreadItem.php:967 Code/Module/Chat.php:218
 #: include/conversation.php:1490
 msgid "Encrypt text"
 msgstr "Zaszyfruj tekst"
 
-#: Zotlabs/Lib/ThreadItem.php:972
+#: Code/Lib/ThreadItem.php:972
 msgid "Your full name (required)"
 msgstr "Twoja imię i nazwisko lub pełna nazwa (wymagane)"
 
-#: Zotlabs/Lib/ThreadItem.php:973
+#: Code/Lib/ThreadItem.php:973
 msgid "Your email address (required)"
 msgstr "Twój adres e-mail (wymagane)"
 
-#: Zotlabs/Lib/ThreadItem.php:974
+#: Code/Lib/ThreadItem.php:974
 msgid "Your website URL (optional)"
 msgstr "Adres URL Twojego portalu (opcjonalnie)"
 
-#: Zotlabs/Lib/Chatroom.php:28
+#: Code/Lib/Chatroom.php:28
 msgid "Missing room name"
 msgstr "Brak nazwy pokoju"
 
-#: Zotlabs/Lib/Chatroom.php:38
+#: Code/Lib/Chatroom.php:38
 msgid "Duplicate room name"
 msgstr "Powielona nazwa pokoju"
 
-#: Zotlabs/Lib/Chatroom.php:94 Zotlabs/Lib/Chatroom.php:103
+#: Code/Lib/Chatroom.php:94 Code/Lib/Chatroom.php:103
 msgid "Invalid room specifier."
 msgstr "Nieprawidłowy specyfikator pokoju."
 
-#: Zotlabs/Lib/Chatroom.php:141
+#: Code/Lib/Chatroom.php:141
 msgid "Room not found."
 msgstr "Nie znaleziono pokoju."
 
-#: Zotlabs/Lib/Chatroom.php:153 Zotlabs/Module/Calendar.php:264
-#: Zotlabs/Module/Admin/Cover_photo.php:279
-#: Zotlabs/Module/Admin/Cover_photo.php:303
-#: Zotlabs/Module/Admin/Profile_photo.php:308
-#: Zotlabs/Module/Admin/Profile_photo.php:326 Zotlabs/Module/Api.php:35
-#: Zotlabs/Module/Common.php:48 Zotlabs/Module/Block.php:31
-#: Zotlabs/Module/Block.php:84 Zotlabs/Module/Cards.php:86
-#: Zotlabs/Module/Blocks.php:82 Zotlabs/Module/Blocks.php:89
-#: Zotlabs/Module/Connedit.php:338 Zotlabs/Module/Connections.php:36
-#: Zotlabs/Module/Item.php:611 Zotlabs/Module/Item.php:633
-#: Zotlabs/Module/Item.php:645 Zotlabs/Module/Item.php:1792
-#: Zotlabs/Module/Appman.php:91 Zotlabs/Module/Cover_photo.php:336
-#: Zotlabs/Module/Cover_photo.php:350 Zotlabs/Module/Defperms.php:179
-#: Zotlabs/Module/Defperms.php:185 Zotlabs/Module/Display.php:509
-#: Zotlabs/Module/Events.php:305 Zotlabs/Module/Editlayout.php:76
-#: Zotlabs/Module/Editlayout.php:99 Zotlabs/Module/Editwebpage.php:79
-#: Zotlabs/Module/Editwebpage.php:100 Zotlabs/Module/Editwebpage.php:119
-#: Zotlabs/Module/Editwebpage.php:135 Zotlabs/Module/Register.php:87
-#: Zotlabs/Module/Invite.php:99 Zotlabs/Module/Filestorage.php:25
-#: Zotlabs/Module/Filestorage.php:111 Zotlabs/Module/Filestorage.php:127
-#: Zotlabs/Module/Filestorage.php:155 Zotlabs/Module/Filestorage.php:188
-#: Zotlabs/Module/Filestorage.php:196 Zotlabs/Module/Thing.php:315
-#: Zotlabs/Module/Thing.php:336 Zotlabs/Module/Thing.php:378
-#: Zotlabs/Module/Chat.php:111 Zotlabs/Module/Chat.php:116
-#: Zotlabs/Module/Moderate.php:20 Zotlabs/Module/Setup.php:230
-#: Zotlabs/Module/Lists.php:84 Zotlabs/Module/Lists.php:96
-#: Zotlabs/Module/Lists.php:127 Zotlabs/Module/Layouts.php:80
-#: Zotlabs/Module/Layouts.php:87 Zotlabs/Module/Layouts.php:98
-#: Zotlabs/Module/Channel.php:236 Zotlabs/Module/Channel.php:414
-#: Zotlabs/Module/Channel.php:452 Zotlabs/Module/Card_edit.php:61
-#: Zotlabs/Module/Manage.php:18 Zotlabs/Module/Mitem.php:140
-#: Zotlabs/Module/Editblock.php:77 Zotlabs/Module/Menu.php:135
-#: Zotlabs/Module/Menu.php:146 Zotlabs/Module/Editpost.php:23
-#: Zotlabs/Module/Locs.php:107 Zotlabs/Module/Viewsrc.php:23
-#: Zotlabs/Module/New_channel.php:122 Zotlabs/Module/New_channel.php:147
-#: Zotlabs/Module/Notifications.php:16 Zotlabs/Module/Mood.php:132
-#: Zotlabs/Module/Vote.php:22 Zotlabs/Module/Webpages.php:139
-#: Zotlabs/Module/Page.php:41 Zotlabs/Module/Page.php:146
-#: Zotlabs/Module/Pdledit.php:36 Zotlabs/Module/Profiles.php:213
-#: Zotlabs/Module/Profiles.php:674 Zotlabs/Module/Profile_photo.php:344
-#: Zotlabs/Module/Profile_photo.php:358 Zotlabs/Module/Poke.php:115
-#: Zotlabs/Module/Regmod.php:24 Zotlabs/Module/Service_limits.php:16
-#: Zotlabs/Module/Settings.php:70 Zotlabs/Module/Sharedwithme.php:22
-#: Zotlabs/Module/Sources.php:89 Zotlabs/Module/Photos.php:70
-#: Zotlabs/Module/Profile.php:108 Zotlabs/Module/Profile.php:123
-#: Zotlabs/Module/Inspect.php:18 Zotlabs/Module/Suggestions.php:36
-#: Zotlabs/Module/Viewconnections.php:35 Zotlabs/Module/Viewconnections.php:40
-#: Zotlabs/Web/WebServer.php:70 include/photos.php:36 include/items.php:3996
+#: Code/Lib/Chatroom.php:153 Code/Module/Calendar.php:264
+#: Code/Module/Admin/Cover_photo.php:279
+#: Code/Module/Admin/Cover_photo.php:303
+#: Code/Module/Admin/Profile_photo.php:308
+#: Code/Module/Admin/Profile_photo.php:326 Code/Module/Api.php:35
+#: Code/Module/Common.php:48 Code/Module/Block.php:31
+#: Code/Module/Block.php:84 Code/Module/Cards.php:86
+#: Code/Module/Blocks.php:82 Code/Module/Blocks.php:89
+#: Code/Module/Connedit.php:338 Code/Module/Connections.php:36
+#: Code/Module/Item.php:611 Code/Module/Item.php:633
+#: Code/Module/Item.php:645 Code/Module/Item.php:1792
+#: Code/Module/Appman.php:91 Code/Module/Cover_photo.php:336
+#: Code/Module/Cover_photo.php:350 Code/Module/Defperms.php:179
+#: Code/Module/Defperms.php:185 Code/Module/Display.php:509
+#: Code/Module/Events.php:305 Code/Module/Editlayout.php:76
+#: Code/Module/Editlayout.php:99 Code/Module/Editwebpage.php:79
+#: Code/Module/Editwebpage.php:100 Code/Module/Editwebpage.php:119
+#: Code/Module/Editwebpage.php:135 Code/Module/Register.php:87
+#: Code/Module/Invite.php:99 Code/Module/Filestorage.php:25
+#: Code/Module/Filestorage.php:111 Code/Module/Filestorage.php:127
+#: Code/Module/Filestorage.php:155 Code/Module/Filestorage.php:188
+#: Code/Module/Filestorage.php:196 Code/Module/Thing.php:315
+#: Code/Module/Thing.php:336 Code/Module/Thing.php:378
+#: Code/Module/Chat.php:111 Code/Module/Chat.php:116
+#: Code/Module/Moderate.php:20 Code/Module/Setup.php:230
+#: Code/Module/Lists.php:84 Code/Module/Lists.php:96
+#: Code/Module/Lists.php:127 Code/Module/Layouts.php:80
+#: Code/Module/Layouts.php:87 Code/Module/Layouts.php:98
+#: Code/Module/Channel.php:236 Code/Module/Channel.php:414
+#: Code/Module/Channel.php:452 Code/Module/Card_edit.php:61
+#: Code/Module/Manage.php:18 Code/Module/Mitem.php:140
+#: Code/Module/Editblock.php:77 Code/Module/Menu.php:135
+#: Code/Module/Menu.php:146 Code/Module/Editpost.php:23
+#: Code/Module/Locs.php:107 Code/Module/Viewsrc.php:23
+#: Code/Module/New_channel.php:122 Code/Module/New_channel.php:147
+#: Code/Module/Notifications.php:16 Code/Module/Mood.php:132
+#: Code/Module/Vote.php:22 Code/Module/Webpages.php:139
+#: Code/Module/Page.php:41 Code/Module/Page.php:146
+#: Code/Module/Pdledit.php:36 Code/Module/Profiles.php:213
+#: Code/Module/Profiles.php:674 Code/Module/Profile_photo.php:344
+#: Code/Module/Profile_photo.php:358 Code/Module/Poke.php:115
+#: Code/Module/Regmod.php:24 Code/Module/Service_limits.php:16
+#: Code/Module/Settings.php:70 Code/Module/Sharedwithme.php:22
+#: Code/Module/Sources.php:89 Code/Module/Photos.php:70
+#: Code/Module/Profile.php:108 Code/Module/Profile.php:123
+#: Code/Module/Inspect.php:18 Code/Module/Suggestions.php:36
+#: Code/Module/Viewconnections.php:35 Code/Module/Viewconnections.php:40
+#: Code/Web/WebServer.php:70 include/photos.php:36 include/items.php:3996
 #: include/attach.php:160 include/attach.php:209 include/attach.php:287
 #: include/attach.php:413 include/attach.php:428 include/attach.php:435
 #: include/attach.php:514 include/attach.php:1131 include/attach.php:1208
@@ -1078,38 +1078,38 @@ msgstr "Nie znaleziono pokoju."
 msgid "Permission denied."
 msgstr "Odmowa dostępu."
 
-#: Zotlabs/Lib/Chatroom.php:164
+#: Code/Lib/Chatroom.php:164
 msgid "Room is full"
 msgstr "Pokój jest pełny"
 
-#: Zotlabs/Lib/Enotify.php:70
+#: Code/Lib/Enotify.php:70
 msgid "$Projectname Notification"
 msgstr "Powiadomienie $Projectname"
 
-#: Zotlabs/Lib/Enotify.php:71
+#: Code/Lib/Enotify.php:71
 msgid "$projectname"
 msgstr "$Projectname"
 
-#: Zotlabs/Lib/Enotify.php:73
+#: Code/Lib/Enotify.php:73
 msgid "Thank You,"
 msgstr "Dziękujemy,"
 
-#: Zotlabs/Lib/Enotify.php:75
+#: Code/Lib/Enotify.php:75
 #, php-format
 msgid "%s Administrator"
 msgstr "Administrator %s"
 
-#: Zotlabs/Lib/Enotify.php:76
+#: Code/Lib/Enotify.php:76
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr "Ta wiadomość e-mail została wysłana przez %1$s z %2$s."
 
-#: Zotlabs/Lib/Enotify.php:76 Zotlabs/Module/Home.php:142
-#: Zotlabs/Module/Home.php:151 extend/addon/a/opensearch/Mod_opensearch.php:28
+#: Code/Lib/Enotify.php:76 Code/Module/Home.php:142
+#: Code/Module/Home.php:151 extend/addon/a/opensearch/Mod_opensearch.php:28
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: Zotlabs/Lib/Enotify.php:77
+#: Code/Lib/Enotify.php:77
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
@@ -1117,664 +1117,664 @@ msgid ""
 msgstr ""
 "Jeśli nie chcesz otrzymywać te wiadomości, zmień ustawienia powiadomień na%s"
 
-#: Zotlabs/Lib/Enotify.php:78
+#: Code/Lib/Enotify.php:78
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr "Aby nie otrzymywać tych wiadomości, zmień %s."
 
-#: Zotlabs/Lib/Enotify.php:78
+#: Code/Lib/Enotify.php:78
 msgid "Notification Settings"
 msgstr "Ustawienia powiadomień"
 
-#: Zotlabs/Lib/Enotify.php:135
+#: Code/Lib/Enotify.php:135
 #, php-format
 msgid "%s "
 msgstr "%s "
 
-#: Zotlabs/Lib/Enotify.php:139
+#: Code/Lib/Enotify.php:139
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname:Notify] Otrzymano nową pocztę na %s"
 
-#: Zotlabs/Lib/Enotify.php:142
+#: Code/Lib/Enotify.php:142
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s wysłał Ci nową prywatną wiadomość na %2$s."
 
-#: Zotlabs/Lib/Enotify.php:143
+#: Code/Lib/Enotify.php:143
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s wysłał Ci %2$s."
 
-#: Zotlabs/Lib/Enotify.php:143 Zotlabs/Lib/Enotify.php:146
+#: Code/Lib/Enotify.php:143 Code/Lib/Enotify.php:146
 msgid "a private message"
 msgstr "prywatna wiadomość"
 
-#: Zotlabs/Lib/Enotify.php:145
+#: Code/Lib/Enotify.php:145
 #, php-format
 msgid "%1$s replied to a private message at %2$s."
 msgstr "%1$s odpowiedział na prywatną wiadomość wysłaną na %2$s."
 
-#: Zotlabs/Lib/Enotify.php:146
+#: Code/Lib/Enotify.php:146
 #, php-format
 msgid "%1$s replied to %2$s."
 msgstr "%1$s odpowiedział na %2$s."
 
-#: Zotlabs/Lib/Enotify.php:148
+#: Code/Lib/Enotify.php:148
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 "Odwiedź %s, aby wyświetlić albo odpowiedzieć na swoje prywatne wiadomości."
 
-#: Zotlabs/Lib/Enotify.php:162
+#: Code/Lib/Enotify.php:162
 msgid "commented on"
 msgstr "skomentował"
 
-#: Zotlabs/Lib/Enotify.php:172
+#: Code/Lib/Enotify.php:172
 msgid "liked"
 msgstr "pochwalił"
 
-#: Zotlabs/Lib/Enotify.php:176
+#: Code/Lib/Enotify.php:176
 msgid "disliked"
 msgstr "zganił"
 
-#: Zotlabs/Lib/Enotify.php:222
+#: Code/Lib/Enotify.php:222
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%4$s[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:232
+#: Code/Lib/Enotify.php:232
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%5$s %4$s[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:244
+#: Code/Lib/Enotify.php:244
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]Twój %4$s[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:258
+#: Code/Lib/Enotify.php:258
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Moderowany komentarz do rozmowy #%1$d przez %2$s"
 
-#: Zotlabs/Lib/Enotify.php:261
+#: Code/Lib/Enotify.php:261
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Komentarz do rozmowy #%1$d przez %2$s"
 
-#: Zotlabs/Lib/Enotify.php:263
+#: Code/Lib/Enotify.php:263
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr "%1$s skomentował obserwowany element/rozmowa."
 
-#: Zotlabs/Lib/Enotify.php:267
+#: Code/Lib/Enotify.php:267
 msgid "(Moderated)"
 msgstr "(Moderowane)"
 
-#: Zotlabs/Lib/Enotify.php:270 Zotlabs/Lib/Enotify.php:354
-#: Zotlabs/Lib/Enotify.php:382 Zotlabs/Lib/Enotify.php:413
-#: Zotlabs/Lib/Enotify.php:432 Zotlabs/Lib/Enotify.php:447
+#: Code/Lib/Enotify.php:270 Code/Lib/Enotify.php:354
+#: Code/Lib/Enotify.php:382 Code/Lib/Enotify.php:413
+#: Code/Lib/Enotify.php:432 Code/Lib/Enotify.php:447
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Odwiedź %s, aby wyświetlić albo włączyć się do rozmowy."
 
-#: Zotlabs/Lib/Enotify.php:274 Zotlabs/Lib/Enotify.php:275
+#: Code/Lib/Enotify.php:274 Code/Lib/Enotify.php:275
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Odwiedź %s, aby zaakceptować lub odrzucić ten komentarz."
 
-#: Zotlabs/Lib/Enotify.php:335
+#: Code/Lib/Enotify.php:335
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr "%1$s pochwalił [zrl=%2$s]Twój %3$s[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:350
+#: Code/Lib/Enotify.php:350
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Pochwała wysłana dla rozmowy #%1$d przez %2$s"
 
-#: Zotlabs/Lib/Enotify.php:351
+#: Code/Lib/Enotify.php:351
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr "%1$s pochwalił utworzony przez Ciebie element/rozmowę."
 
-#: Zotlabs/Lib/Enotify.php:362
+#: Code/Lib/Enotify.php:362
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Notify]%s opublikowany na Twojej ścianie profilu"
 
-#: Zotlabs/Lib/Enotify.php:368
+#: Code/Lib/Enotify.php:368
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s opublikowano na ścianie Twojego profilu pod adresem %2$s"
 
-#: Zotlabs/Lib/Enotify.php:371
+#: Code/Lib/Enotify.php:371
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$s opublikował na [zrl=%2$s]Twojej ścianie[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:378 Zotlabs/Lib/Enotify.php:379
+#: Code/Lib/Enotify.php:378 Code/Lib/Enotify.php:379
 msgid " - "
 msgstr " - "
 
-#: Zotlabs/Lib/Enotify.php:378 Zotlabs/Lib/Enotify.php:379
+#: Code/Lib/Enotify.php:378 Code/Lib/Enotify.php:379
 msgid "Moderated"
 msgstr "Moderowane"
 
-#: Zotlabs/Lib/Enotify.php:387 Zotlabs/Lib/Enotify.php:388
+#: Code/Lib/Enotify.php:387 Code/Lib/Enotify.php:388
 #, php-format
 msgid "Please visit %s to approve or reject this post."
 msgstr "Odwiedź %s, aby zaakceptować lub odrzucić ten wpis."
 
-#: Zotlabs/Lib/Enotify.php:405
+#: Code/Lib/Enotify.php:405
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Notify]%s oznaczył Cię tagiem"
 
-#: Zotlabs/Lib/Enotify.php:406
+#: Code/Lib/Enotify.php:406
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s oznaczył Cię tagiem %2$s"
 
-#: Zotlabs/Lib/Enotify.php:408
+#: Code/Lib/Enotify.php:408
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s [zrl=%2$s]oznaczył Cię tagiem[/zrl]."
 
-#: Zotlabs/Lib/Enotify.php:420
+#: Code/Lib/Enotify.php:420
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Notify] %1$s zaczepił Cię"
 
-#: Zotlabs/Lib/Enotify.php:421
+#: Code/Lib/Enotify.php:421
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s zaczepił Cię na %2$s"
 
-#: Zotlabs/Lib/Enotify.php:423
+#: Code/Lib/Enotify.php:423
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s]zaczepił Cię[/zrl]."
 
-#: Zotlabs/Lib/Enotify.php:439
+#: Code/Lib/Enotify.php:439
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Notify] %s oznaczył tagiem Twój wpis"
 
-#: Zotlabs/Lib/Enotify.php:440
+#: Code/Lib/Enotify.php:440
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s oznaczył tagiem Twój wpis na %2$s"
 
-#: Zotlabs/Lib/Enotify.php:442
+#: Code/Lib/Enotify.php:442
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s oznaczył tagiem [zrl=%2$s]Twój wpis[/zrl]"
 
-#: Zotlabs/Lib/Enotify.php:454
+#: Code/Lib/Enotify.php:454
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Notify] Otrzymano prośbę o połączenie"
 
-#: Zotlabs/Lib/Enotify.php:455
+#: Code/Lib/Enotify.php:455
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr "Masz nową prośbę połączenia od „%1$s” na %2$s"
 
-#: Zotlabs/Lib/Enotify.php:457
+#: Code/Lib/Enotify.php:457
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr "Masz [zrl=%1$s]nową prośbę połączenia [/zrl] od %2$s."
 
-#: Zotlabs/Lib/Enotify.php:461 Zotlabs/Lib/Enotify.php:481
+#: Code/Lib/Enotify.php:461 Code/Lib/Enotify.php:481
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Możesz odwiedzić ich profil na %s"
 
-#: Zotlabs/Lib/Enotify.php:463
+#: Code/Lib/Enotify.php:463
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Odwiedź %s, aby zatwierdzić lub odrzucić prośbę o połączenie."
 
-#: Zotlabs/Lib/Enotify.php:470
+#: Code/Lib/Enotify.php:470
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Notify] Otrzymano propozycję znajomości"
 
-#: Zotlabs/Lib/Enotify.php:471
+#: Code/Lib/Enotify.php:471
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Masz propozycję znajomości od '%1$s' na %2$s"
 
-#: Zotlabs/Lib/Enotify.php:473
+#: Code/Lib/Enotify.php:473
 #, php-format
 msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr "Masz [zrl=%1$s] propozycję znajomości[/ zrl] dla %2$s od %3$s."
 
-#: Zotlabs/Lib/Enotify.php:479
+#: Code/Lib/Enotify.php:479
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: Zotlabs/Lib/Enotify.php:480
+#: Code/Lib/Enotify.php:480
 msgid "Photo:"
 msgstr "Zdjęcie:"
 
-#: Zotlabs/Lib/Enotify.php:483
+#: Code/Lib/Enotify.php:483
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Odwiedź %s, aby zaakceptować lub odrzucić propozycję."
 
-#: Zotlabs/Lib/Enotify.php:741
+#: Code/Lib/Enotify.php:741
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Notify]"
 
-#: Zotlabs/Lib/Enotify.php:923
+#: Code/Lib/Enotify.php:923
 msgid "created a new post"
 msgstr "utworzył nowy wpis"
 
-#: Zotlabs/Lib/Enotify.php:924
+#: Code/Lib/Enotify.php:924
 #, php-format
 msgid "reacted to %s's conversation"
 msgstr "zareagował na rozmowę %s"
 
-#: Zotlabs/Lib/Enotify.php:926
+#: Code/Lib/Enotify.php:926
 #, php-format
 msgid "shared %s's post"
 msgstr "udostępnił wpis %s"
 
-#: Zotlabs/Lib/Enotify.php:930
+#: Code/Lib/Enotify.php:930
 msgid "sent a direct message"
 msgstr "wysłał bezpośrednią wiadomość"
 
-#: Zotlabs/Lib/Enotify.php:937
+#: Code/Lib/Enotify.php:937
 #, php-format
 msgid "edited a post dated %s"
 msgstr "edytował wpis z dnia %s"
 
-#: Zotlabs/Lib/Enotify.php:940
+#: Code/Lib/Enotify.php:940
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "edytował komentarz z dnia %s"
 
-#: Zotlabs/Lib/Connect.php:50 Zotlabs/Lib/Connect.php:172
+#: Code/Lib/Connect.php:50 Code/Lib/Connect.php:172
 msgid "Channel is blocked on this site."
 msgstr "Kanał jest zablokowany na tym portalu."
 
-#: Zotlabs/Lib/Connect.php:55
+#: Code/Lib/Connect.php:55
 msgid "Channel location missing."
 msgstr "Brak lokalizacji kanału."
 
-#: Zotlabs/Lib/Connect.php:133
+#: Code/Lib/Connect.php:133
 msgid "Remote channel or protocol unavailable."
 msgstr "Niedostępny jest zdalny kanał lub protokół."
 
-#: Zotlabs/Lib/Connect.php:166
+#: Code/Lib/Connect.php:166
 msgid "Channel discovery failed."
 msgstr "Wyszukanie kanału nie powiodło się."
 
-#: Zotlabs/Lib/Connect.php:180
+#: Code/Lib/Connect.php:180
 msgid "Protocol not supported"
 msgstr "Protokół  nie jest obsługiwany"
 
-#: Zotlabs/Lib/Connect.php:193
+#: Code/Lib/Connect.php:193
 msgid "Cannot connect to yourself."
 msgstr "Nie można połączyć się ze sobą."
 
-#: Zotlabs/Lib/Connect.php:271
+#: Code/Lib/Connect.php:271
 msgid "error saving data"
 msgstr "błąd podczas zapisywania danych"
 
-#: Zotlabs/Lib/Libprofile.php:36
+#: Code/Lib/Libprofile.php:36
 msgid "Requested channel is not available."
 msgstr "Żądany kanał nie jest dostępny."
 
-#: Zotlabs/Lib/Libprofile.php:96 Zotlabs/Module/Cards.php:42
-#: Zotlabs/Module/Blocks.php:41 Zotlabs/Module/Editlayout.php:39
-#: Zotlabs/Module/Editwebpage.php:42 Zotlabs/Module/Hcard.php:18
-#: Zotlabs/Module/Layouts.php:39 Zotlabs/Module/Editblock.php:40
-#: Zotlabs/Module/Menu.php:97 Zotlabs/Module/Connect.php:19
-#: Zotlabs/Module/Webpages.php:44 Zotlabs/Module/Profile.php:28
+#: Code/Lib/Libprofile.php:96 Code/Module/Cards.php:42
+#: Code/Module/Blocks.php:41 Code/Module/Editlayout.php:39
+#: Code/Module/Editwebpage.php:42 Code/Module/Hcard.php:18
+#: Code/Module/Layouts.php:39 Code/Module/Editblock.php:40
+#: Code/Module/Menu.php:97 Code/Module/Connect.php:19
+#: Code/Module/Webpages.php:44 Code/Module/Profile.php:28
 #: extend/addon/a/gallery/Mod_Gallery.php:50
 msgid "Requested profile is not available."
 msgstr "Żądany profil jest niedostępny."
 
-#: Zotlabs/Lib/Libprofile.php:196 Zotlabs/Module/Profiles.php:773
+#: Code/Lib/Libprofile.php:196 Code/Module/Profiles.php:773
 msgid "Change profile photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: Zotlabs/Lib/Libprofile.php:203 Zotlabs/Module/Profiles.php:878
+#: Code/Lib/Libprofile.php:203 Code/Module/Profiles.php:878
 #: include/nav.php:120
 msgid "Edit Profiles"
 msgstr "Edytuj profile"
 
-#: Zotlabs/Lib/Libprofile.php:204
+#: Code/Lib/Libprofile.php:204
 msgid "Create New Profile"
 msgstr "Utwórz nowy profil"
 
-#: Zotlabs/Lib/Libprofile.php:206 include/nav.php:122
+#: Code/Lib/Libprofile.php:206 include/nav.php:122
 msgid "Edit Profile"
 msgstr "Edytuj profil"
 
-#: Zotlabs/Lib/Libprofile.php:223 Zotlabs/Module/Profiles.php:868
+#: Code/Lib/Libprofile.php:223 Code/Module/Profiles.php:868
 msgid "Profile Image"
 msgstr "Obraz profilowy"
 
-#: Zotlabs/Lib/Libprofile.php:226
+#: Code/Lib/Libprofile.php:226
 msgid "Visible to everybody"
 msgstr "Widoczne dla każdego"
 
-#: Zotlabs/Lib/Libprofile.php:227 Zotlabs/Module/Profiles.php:770
-#: Zotlabs/Module/Profiles.php:872
+#: Code/Lib/Libprofile.php:227 Code/Module/Profiles.php:770
+#: Code/Module/Profiles.php:872
 msgid "Edit visibility"
 msgstr "Edytuj dostępność"
 
-#: Zotlabs/Lib/Libprofile.php:287 Zotlabs/Module/Directory.php:399
-#: Zotlabs/Module/Fedi_id.php:52 Zotlabs/Widget/Follow.php:38
-#: Zotlabs/Widget/Suggestions.php:50 include/connections.php:147
+#: Code/Lib/Libprofile.php:287 Code/Module/Directory.php:399
+#: Code/Module/Fedi_id.php:52 Code/Widget/Follow.php:38
+#: Code/Widget/Suggestions.php:50 include/connections.php:147
 #: include/conversation.php:975
 msgid "Connect"
 msgstr "Połącz"
 
-#: Zotlabs/Lib/Libprofile.php:306 Zotlabs/Module/Directory.php:381
+#: Code/Lib/Libprofile.php:306 Code/Module/Directory.php:381
 #: include/event.php:81 include/event.php:139
 msgid "Location:"
 msgstr "Lokalizacja:"
 
-#: Zotlabs/Lib/Libprofile.php:311 Zotlabs/Lib/Libprofile.php:485
+#: Code/Lib/Libprofile.php:311 Code/Lib/Libprofile.php:485
 msgid "Gender:"
 msgstr "Płeć:"
 
-#: Zotlabs/Lib/Libprofile.php:312 Zotlabs/Lib/Libprofile.php:535
+#: Code/Lib/Libprofile.php:312 Code/Lib/Libprofile.php:535
 msgid "Status:"
 msgstr "Status:"
 
-#: Zotlabs/Lib/Libprofile.php:313 Zotlabs/Lib/Libprofile.php:568
+#: Code/Lib/Libprofile.php:313 Code/Lib/Libprofile.php:568
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
-#: Zotlabs/Lib/Libprofile.php:314 Zotlabs/Lib/Libprofile.php:564
+#: Code/Lib/Libprofile.php:314 Code/Lib/Libprofile.php:564
 msgid "Pronouns:"
 msgstr "Zaimki:"
 
-#: Zotlabs/Lib/Libprofile.php:375 Zotlabs/Module/Connections.php:63
-#: Zotlabs/Module/Connections.php:122 Zotlabs/Module/Connections.php:133
-#: Zotlabs/Module/Connections.php:293
+#: Code/Lib/Libprofile.php:375 Code/Module/Connections.php:63
+#: Code/Module/Connections.php:122 Code/Module/Connections.php:133
+#: Code/Module/Connections.php:293
 msgid "Active"
 msgstr "Aktywny"
 
-#: Zotlabs/Lib/Libprofile.php:379
+#: Code/Lib/Libprofile.php:379
 msgid "Change your profile photo"
 msgstr "Zmień swoje zdjęcie profilowe"
 
-#: Zotlabs/Lib/Libprofile.php:380
+#: Code/Lib/Libprofile.php:380
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
-#: Zotlabs/Lib/Libprofile.php:381
+#: Code/Lib/Libprofile.php:381
 msgid "Address copied to clipboard"
 msgstr "Adres został skopiowany do schowka"
 
-#: Zotlabs/Lib/Libprofile.php:409 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003
+#: Code/Lib/Libprofile.php:409 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003
 msgid "Female"
 msgstr "Kobieta"
 
-#: Zotlabs/Lib/Libprofile.php:412 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003
+#: Code/Lib/Libprofile.php:412 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: Zotlabs/Lib/Libprofile.php:415
+#: Code/Lib/Libprofile.php:415
 msgid "Trans"
 msgstr "Trans"
 
-#: Zotlabs/Lib/Libprofile.php:418
+#: Code/Lib/Libprofile.php:418
 msgid "Inter"
 msgstr "Inter"
 
-#: Zotlabs/Lib/Libprofile.php:421 Zotlabs/Module/Profiles.php:985
+#: Code/Lib/Libprofile.php:421 Code/Module/Profiles.php:985
 msgid "Neuter"
 msgstr "Osoba aseksualna"
 
-#: Zotlabs/Lib/Libprofile.php:424 Zotlabs/Module/Profiles.php:985
+#: Code/Lib/Libprofile.php:424 Code/Module/Profiles.php:985
 msgid "Non-specific"
 msgstr "Nie określono"
 
-#: Zotlabs/Lib/Libprofile.php:438
+#: Code/Lib/Libprofile.php:438
 msgid "She"
 msgstr "Ona"
 
-#: Zotlabs/Lib/Libprofile.php:441
+#: Code/Lib/Libprofile.php:441
 msgid "Him"
 msgstr "Jego"
 
-#: Zotlabs/Lib/Libprofile.php:444
+#: Code/Lib/Libprofile.php:444
 msgid "Them"
 msgstr "Ich"
 
-#: Zotlabs/Lib/Libprofile.php:482
+#: Code/Lib/Libprofile.php:482
 msgid "Full Name:"
 msgstr "Pełna nazwa (imię i nazwisko)"
 
-#: Zotlabs/Lib/Libprofile.php:519
+#: Code/Lib/Libprofile.php:519
 msgid "j F, Y"
 msgstr "d M, R"
 
-#: Zotlabs/Lib/Libprofile.php:520
+#: Code/Lib/Libprofile.php:520
 msgid "j F"
 msgstr "d M"
 
-#: Zotlabs/Lib/Libprofile.php:527
+#: Code/Lib/Libprofile.php:527
 msgid "Birthday:"
 msgstr "Urodziny:"
 
-#: Zotlabs/Lib/Libprofile.php:531 Zotlabs/Module/Directory.php:376
+#: Code/Lib/Libprofile.php:531 Code/Module/Directory.php:376
 msgid "Age:"
 msgstr "Wiek:"
 
-#: Zotlabs/Lib/Libprofile.php:543
+#: Code/Lib/Libprofile.php:543
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "dla %1$d %2$s"
 
-#: Zotlabs/Lib/Libprofile.php:555
+#: Code/Lib/Libprofile.php:555
 msgid "Tags:"
 msgstr "Tagi:"
 
-#: Zotlabs/Lib/Libprofile.php:560
+#: Code/Lib/Libprofile.php:560
 msgid "Sexual Preference:"
 msgstr "Preferencje seksualne:"
 
-#: Zotlabs/Lib/Libprofile.php:572 Zotlabs/Module/Directory.php:396
+#: Code/Lib/Libprofile.php:572 Code/Module/Directory.php:396
 msgid "Hometown:"
 msgstr "Miasto pobytu:"
 
-#: Zotlabs/Lib/Libprofile.php:576
+#: Code/Lib/Libprofile.php:576
 msgid "Political Views:"
 msgstr "Poglądy polityczne:"
 
-#: Zotlabs/Lib/Libprofile.php:580
+#: Code/Lib/Libprofile.php:580
 msgid "Religion:"
 msgstr "Religia:"
 
-#: Zotlabs/Lib/Libprofile.php:584 Zotlabs/Module/Directory.php:398
+#: Code/Lib/Libprofile.php:584 Code/Module/Directory.php:398
 msgid "About:"
 msgstr "O mnie:"
 
-#: Zotlabs/Lib/Libprofile.php:588
+#: Code/Lib/Libprofile.php:588
 msgid "Hobbies/Interests:"
 msgstr "Hobby/Zainteresowania:"
 
-#: Zotlabs/Lib/Libprofile.php:592
+#: Code/Lib/Libprofile.php:592
 msgid "Likes:"
 msgstr "Pochwał:"
 
-#: Zotlabs/Lib/Libprofile.php:596
+#: Code/Lib/Libprofile.php:596
 msgid "Dislikes:"
 msgstr "Zganień:"
 
-#: Zotlabs/Lib/Libprofile.php:600
+#: Code/Lib/Libprofile.php:600
 msgid "Contact information and Social Networks:"
 msgstr "Informacje kontaktowe i sieci społecznościowe:"
 
-#: Zotlabs/Lib/Libprofile.php:604
+#: Code/Lib/Libprofile.php:604
 msgid "My other channels:"
 msgstr "Moje inne kanały:"
 
-#: Zotlabs/Lib/Libprofile.php:608
+#: Code/Lib/Libprofile.php:608
 msgid "Musical interests:"
 msgstr "Zainteresowania muzyczne:"
 
-#: Zotlabs/Lib/Libprofile.php:612
+#: Code/Lib/Libprofile.php:612
 msgid "Books, literature:"
 msgstr "Książki, literatura:"
 
-#: Zotlabs/Lib/Libprofile.php:616
+#: Code/Lib/Libprofile.php:616
 msgid "Television:"
 msgstr "Telewizja:"
 
-#: Zotlabs/Lib/Libprofile.php:620
+#: Code/Lib/Libprofile.php:620
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film/taniec/kultura/rozrywka:"
 
-#: Zotlabs/Lib/Libprofile.php:624
+#: Code/Lib/Libprofile.php:624
 msgid "Love/Romance:"
 msgstr "Miłość/Romans:"
 
-#: Zotlabs/Lib/Libprofile.php:628
+#: Code/Lib/Libprofile.php:628
 msgid "Work/employment:"
 msgstr "Praca/Zatrudnienie:"
 
-#: Zotlabs/Lib/Libprofile.php:632
+#: Code/Lib/Libprofile.php:632
 msgid "School/education:"
 msgstr "Szkoła/Wykształcenie:"
 
-#: Zotlabs/Lib/Libprofile.php:658
+#: Code/Lib/Libprofile.php:658
 msgid "Like this thing"
 msgstr "Podobne do tej rzeczy"
 
-#: Zotlabs/Lib/Libprofile.php:659 Zotlabs/Module/Cal.php:355
-#: Zotlabs/Module/Events.php:756
+#: Code/Lib/Libprofile.php:659 Code/Module/Cal.php:355
+#: Code/Module/Events.php:756
 msgid "Export"
 msgstr "Eksportuj"
 
-#: Zotlabs/Lib/Activity.php:2882
+#: Code/Lib/Activity.php:2882
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr "Pochwala %2$s %1$s"
 
-#: Zotlabs/Lib/Activity.php:2885
+#: Code/Lib/Activity.php:2885
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr "Gani %2$s %1$s"
 
-#: Zotlabs/Lib/Activity.php:2891
+#: Code/Lib/Activity.php:2891
 #, php-format
 msgid "Will attend %s's event"
 msgstr "Weźmie udział w wydarzeniu %s"
 
-#: Zotlabs/Lib/Activity.php:2894
+#: Code/Lib/Activity.php:2894
 #, php-format
 msgid "Will not attend %s's event"
 msgstr "Nie weźmie udziału w wydarzeniu %s"
 
-#: Zotlabs/Lib/Activity.php:2897
+#: Code/Lib/Activity.php:2897
 #, php-format
 msgid "May attend %s's event"
 msgstr "Może uczestniczyć w wydarzeniu %s"
 
-#: Zotlabs/Lib/Activity.php:2900
+#: Code/Lib/Activity.php:2900
 #, php-format
 msgid "May not attend %s's event"
 msgstr "Nie może uczestniczyć w wydarzeniu %s"
 
-#: Zotlabs/Lib/Activity.php:2905 Zotlabs/Lib/Share.php:124
-#: Zotlabs/Module/Share.php:118 include/items.php:3413
+#: Code/Lib/Activity.php:2905 Code/Lib/Share.php:124
+#: Code/Module/Share.php:118 include/items.php:3413
 #, php-format
 msgid "🔁 Repeated %1$s's %2$s"
 msgstr "🔁 Powtórzony %2$s %1$s"
 
-#: Zotlabs/Lib/Activity.php:3352 include/text.php:1687 include/text.php:3141
+#: Code/Lib/Activity.php:3352 include/text.php:1687 include/text.php:3141
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "Szukaj %1$s (%2$s)"
 
-#: Zotlabs/Lib/PermissionDescription.php:40 include/acl_selectors.php:37
+#: Code/Lib/PermissionDescription.php:40 include/acl_selectors.php:37
 msgid "Visible to your default audience"
 msgstr "Widoczne dla domyślnych odbiorców"
 
-#: Zotlabs/Lib/PermissionDescription.php:117 include/acl_selectors.php:135
+#: Code/Lib/PermissionDescription.php:117 include/acl_selectors.php:135
 msgid "Only me"
 msgstr "Tylko ja"
 
-#: Zotlabs/Lib/PermissionDescription.php:119
+#: Code/Lib/PermissionDescription.php:119
 msgid "Public"
 msgstr "Publiczny"
 
-#: Zotlabs/Lib/PermissionDescription.php:121
+#: Code/Lib/PermissionDescription.php:121
 msgid "Anybody in the $Projectname network"
 msgstr "Każdy w sieci $Projectname"
 
-#: Zotlabs/Lib/PermissionDescription.php:123
+#: Code/Lib/PermissionDescription.php:123
 #, php-format
 msgid "Any account on %s"
 msgstr "Dowolne konto na %s"
 
-#: Zotlabs/Lib/PermissionDescription.php:125
+#: Code/Lib/PermissionDescription.php:125
 msgid "Any of my connections"
 msgstr "Wszystkie moje połączenia"
 
-#: Zotlabs/Lib/PermissionDescription.php:127
+#: Code/Lib/PermissionDescription.php:127
 msgid "Only connections I specifically allow"
 msgstr "Tylko połączenia, na które wyraźnie zezwalam"
 
-#: Zotlabs/Lib/PermissionDescription.php:129
+#: Code/Lib/PermissionDescription.php:129
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr "Każdy uwierzytelniony (może obejmować odwiedzających z innych sieci)"
 
-#: Zotlabs/Lib/PermissionDescription.php:131
+#: Code/Lib/PermissionDescription.php:131
 msgid "Any connections including those who haven't yet been approved"
 msgstr "Wszelkie połączenia, w tym te, które nie zostały jeszcze zatwierdzone"
 
-#: Zotlabs/Lib/PermissionDescription.php:180
+#: Code/Lib/PermissionDescription.php:180
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
 msgstr ""
 "To jest domyślne ustawienie odbiorców Twojego normalnego strumienia i wpisów."
 
-#: Zotlabs/Lib/PermissionDescription.php:182
+#: Code/Lib/PermissionDescription.php:182
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr ""
 "To jest domyślne ustawienie określające, kto może wyświetlać Twój domyślny "
 "profil kanału"
 
-#: Zotlabs/Lib/PermissionDescription.php:184
+#: Code/Lib/PermissionDescription.php:184
 msgid "This is your default setting for who can view your connections"
 msgstr ""
 "To jest domyślne ustawienie określające, kto może wyświetlać Twoje połączenia"
 
-#: Zotlabs/Lib/PermissionDescription.php:186
+#: Code/Lib/PermissionDescription.php:186
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr ""
 "Jest to domyślne ustawienie określające, kto może przeglądać magazyn plików "
 "i zdjęć"
 
-#: Zotlabs/Lib/PermissionDescription.php:188
+#: Code/Lib/PermissionDescription.php:188
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 "To jest domyślne ustawienie dotyczące odbiorców Twoich stron internetowych"
 
-#: Zotlabs/Lib/Language.php:408 include/language.php:429 include/text.php:2186
+#: Code/Lib/Language.php:408 include/language.php:429 include/text.php:2186
 msgid "default"
 msgstr "domyślnie"
 
-#: Zotlabs/Lib/Language.php:421 include/language.php:442
+#: Code/Lib/Language.php:421 include/language.php:442
 msgid "Select an alternate language"
 msgstr "Wybierz alternatywny język"
 
-#: Zotlabs/Lib/AccessList.php:29
+#: Code/Lib/AccessList.php:29
 msgid ""
 "A deleted list with this name was revived. Existing item permissions "
 "may apply to this list and any future members. If this is "
@@ -1785,148 +1785,148 @@ msgstr ""
 "przyszłych członków. Jeśli nie o to chodziło, utwórz kolejną listę pod inną "
 "nazwą."
 
-#: Zotlabs/Lib/AccessList.php:345
+#: Code/Lib/AccessList.php:345
 msgid "Add new connections to this access list"
 msgstr "Dodaj nowe połączenia do tej listy dostępu"
 
-#: Zotlabs/Lib/AccessList.php:372
+#: Code/Lib/AccessList.php:372
 msgid "edit"
 msgstr "edytuj"
 
-#: Zotlabs/Lib/AccessList.php:392
+#: Code/Lib/AccessList.php:392
 msgid "Edit list"
 msgstr "Edytuj listę"
 
-#: Zotlabs/Lib/AccessList.php:393
+#: Code/Lib/AccessList.php:393
 msgid "Create new list"
 msgstr "Utwórz nową listę"
 
-#: Zotlabs/Lib/AccessList.php:394
+#: Code/Lib/AccessList.php:394
 msgid "Channels not in any access list"
 msgstr "Kanały, których nie ma na żadnej liście dostępu"
 
-#: Zotlabs/Lib/AccessList.php:396 Zotlabs/Widget/Savedsearch.php:95
+#: Code/Lib/AccessList.php:396 Code/Widget/Savedsearch.php:95
 msgid "add"
 msgstr "dodaj"
 
-#: Zotlabs/Module/Lockview.php:86 Zotlabs/Module/Lockview.php:128
+#: Code/Module/Lockview.php:86 Code/Module/Lockview.php:128
 msgid "Visible to:"
 msgstr "Widoczne dla:"
 
-#: Zotlabs/Module/Lockview.php:102
+#: Code/Module/Lockview.php:102
 msgid "Everybody"
 msgstr "Każdego"
 
-#: Zotlabs/Module/Calendar.php:93 Zotlabs/Module/Events.php:142
+#: Code/Module/Calendar.php:93 Code/Module/Events.php:142
 msgid "Event can not end before it has started."
 msgstr "Wydarzenie nie może zakończyć się przed jego rozpoczęciem."
 
-#: Zotlabs/Module/Calendar.php:95 Zotlabs/Module/Calendar.php:103
-#: Zotlabs/Module/Calendar.php:120 Zotlabs/Module/Events.php:144
-#: Zotlabs/Module/Events.php:153 Zotlabs/Module/Events.php:175
+#: Code/Module/Calendar.php:95 Code/Module/Calendar.php:103
+#: Code/Module/Calendar.php:120 Code/Module/Events.php:144
+#: Code/Module/Events.php:153 Code/Module/Events.php:175
 msgid "Unable to generate preview."
 msgstr "Nie można wygenerować podglądu."
 
-#: Zotlabs/Module/Calendar.php:101 Zotlabs/Module/Events.php:151
+#: Code/Module/Calendar.php:101 Code/Module/Events.php:151
 msgid "Event title and start time are required."
 msgstr "Tytuł wydarzenia i godzina rozpoczęcia, to dane wymagane."
 
-#: Zotlabs/Module/Calendar.php:118 Zotlabs/Module/Calendar.php:258
-#: Zotlabs/Module/Events.php:173 Zotlabs/Module/Events.php:299
+#: Code/Module/Calendar.php:118 Code/Module/Calendar.php:258
+#: Code/Module/Events.php:173 Code/Module/Events.php:299
 msgid "Event not found."
 msgstr "Nie znaleziono wydarzenia."
 
-#: Zotlabs/Module/Calendar.php:254 Zotlabs/Module/Events.php:295
-#: Zotlabs/Module/Like.php:174 Zotlabs/Module/Tagger.php:88
+#: Code/Module/Calendar.php:254 Code/Module/Events.php:295
+#: Code/Module/Like.php:174 Code/Module/Tagger.php:88
 #: include/conversation.php:132 include/event.php:1338 include/text.php:2372
 msgid "event"
 msgstr "wydarzenie"
 
-#: Zotlabs/Module/Calendar.php:423 Zotlabs/Module/Events.php:699
+#: Code/Module/Calendar.php:423 Code/Module/Events.php:699
 msgid "Edit event"
 msgstr "Edytuj wydarzenie"
 
-#: Zotlabs/Module/Calendar.php:425 Zotlabs/Module/Events.php:701
+#: Code/Module/Calendar.php:425 Code/Module/Events.php:701
 msgid "Delete event"
 msgstr "Usuń wydarzenie"
 
-#: Zotlabs/Module/Calendar.php:439 Zotlabs/Module/Cdav.php:951
+#: Code/Module/Calendar.php:439 Code/Module/Cdav.php:951
 msgid "Link to source"
 msgstr "Link do źródła"
 
-#: Zotlabs/Module/Calendar.php:453 Zotlabs/Module/Events.php:734
+#: Code/Module/Calendar.php:453 Code/Module/Events.php:734
 msgid "calendar"
 msgstr "kalendarz"
 
-#: Zotlabs/Module/Calendar.php:489 Zotlabs/Module/Events.php:860
+#: Code/Module/Calendar.php:489 Code/Module/Events.php:860
 msgid "Failed to remove event"
 msgstr "Nie udało się usunąć wydarzenia"
 
-#: Zotlabs/Module/Chanview.php:102 Zotlabs/Module/Cal.php:70
-#: Zotlabs/Module/Block.php:49 Zotlabs/Module/Card_edit.php:54
-#: Zotlabs/Module/Page.php:84 Zotlabs/Module/Superblock.php:64
-#: Zotlabs/Module/Wall_upload.php:37 include/items.php:4563
+#: Code/Module/Chanview.php:102 Code/Module/Cal.php:70
+#: Code/Module/Block.php:49 Code/Module/Card_edit.php:54
+#: Code/Module/Page.php:84 Code/Module/Superblock.php:64
+#: Code/Module/Wall_upload.php:37 include/items.php:4563
 msgid "Channel not found."
 msgstr "Nie znaleziono kanału."
 
-#: Zotlabs/Module/Chanview.php:149 Zotlabs/Module/Chanview.php:150
+#: Code/Module/Chanview.php:149 Code/Module/Chanview.php:150
 msgid "Not available"
 msgstr "Nie dostępne"
 
-#: Zotlabs/Module/Chanview.php:169
+#: Code/Module/Chanview.php:169
 msgid "Cover photo for this channel"
 msgstr "Zdjęcie okładkowe tego kanału"
 
-#: Zotlabs/Module/Chanview.php:171
+#: Code/Module/Chanview.php:171
 msgid "Followers"
 msgstr "Obserwujący"
 
-#: Zotlabs/Module/Chanview.php:172
+#: Code/Module/Chanview.php:172
 msgid "Following"
 msgstr "Obserwowani"
 
-#: Zotlabs/Module/Chanview.php:175 include/conversation.php:955
+#: Code/Module/Chanview.php:175 include/conversation.php:955
 msgid "Visit"
 msgstr "Odwiedź"
 
-#: Zotlabs/Module/Chanview.php:176
+#: Code/Module/Chanview.php:176
 msgid "toggle full screen mode"
 msgstr "przełącz na tryb pełnego ekranu"
 
-#: Zotlabs/Module/Admin/Account_edit.php:31
+#: Code/Module/Admin/Account_edit.php:31
 #, php-format
 msgid "Password changed for account %d."
 msgstr "Hasło zostało zmienione do konta %d."
 
-#: Zotlabs/Module/Admin/Account_edit.php:47
+#: Code/Module/Admin/Account_edit.php:47
 msgid "Account settings updated."
 msgstr "Zaktualizowano ustawienia konta."
 
-#: Zotlabs/Module/Admin/Account_edit.php:66
+#: Code/Module/Admin/Account_edit.php:66
 msgid "Account not found."
 msgstr "Konto nie zostało znalezione."
 
-#: Zotlabs/Module/Admin/Account_edit.php:73
+#: Code/Module/Admin/Account_edit.php:73
 msgid "Account Edit"
 msgstr "Edycja konta"
 
-#: Zotlabs/Module/Admin/Account_edit.php:74
+#: Code/Module/Admin/Account_edit.php:74
 msgid "New Password"
 msgstr "Nowe hasło"
 
-#: Zotlabs/Module/Admin/Account_edit.php:75
+#: Code/Module/Admin/Account_edit.php:75
 msgid "New Password again"
 msgstr "Powtórz nowe hasło"
 
-#: Zotlabs/Module/Admin/Account_edit.php:76
+#: Code/Module/Admin/Account_edit.php:76
 msgid "Account language (for emails)"
 msgstr "Język konta (dla wiadomości e-mail)"
 
-#: Zotlabs/Module/Admin/Account_edit.php:77
+#: Code/Module/Admin/Account_edit.php:77
 msgid "Service class"
 msgstr "Klasa usługi"
 
-#: Zotlabs/Module/Admin/Accounts.php:40
+#: Code/Module/Admin/Accounts.php:40
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s accounts blocked/unblocked"
@@ -1934,7 +1934,7 @@ msgstr[0] "%s konto jest zablokowane/odblokowane"
 msgstr[1] "%s konta są zablokowane/odblokowane"
 msgstr[2] "%s kont jest zablokowanych/odblokowanych"
 
-#: Zotlabs/Module/Admin/Accounts.php:48
+#: Code/Module/Admin/Accounts.php:48
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
@@ -1942,103 +1942,103 @@ msgstr[0] "%s konto zostało usunięte"
 msgstr[1] "%s konta zostały usunięte"
 msgstr[2] "%s kont zostało usuniętych"
 
-#: Zotlabs/Module/Admin/Accounts.php:88
+#: Code/Module/Admin/Accounts.php:88
 msgid "Account not found"
 msgstr "Konto nie znalezione"
 
-#: Zotlabs/Module/Admin/Accounts.php:99 include/channel.php:2312
+#: Code/Module/Admin/Accounts.php:99 include/channel.php:2312
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Usunięto konto '%s'"
 
-#: Zotlabs/Module/Admin/Accounts.php:108
+#: Code/Module/Admin/Accounts.php:108
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Konto '%s' zostało zablokowane"
 
-#: Zotlabs/Module/Admin/Accounts.php:117
+#: Code/Module/Admin/Accounts.php:117
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Konto '%s' zostało odblokowane"
 
-#: Zotlabs/Module/Admin/Accounts.php:175 Zotlabs/Module/Admin/Addons.php:343
-#: Zotlabs/Module/Admin/Addons.php:443 Zotlabs/Module/Admin/Channels.php:169
-#: Zotlabs/Module/Admin/Logs.php:82 Zotlabs/Module/Admin/Security.php:135
-#: Zotlabs/Module/Admin/Site.php:310 Zotlabs/Module/Admin/Themes.php:134
-#: Zotlabs/Module/Admin/Themes.php:168 Zotlabs/Module/Admin.php:179
+#: Code/Module/Admin/Accounts.php:175 Code/Module/Admin/Addons.php:343
+#: Code/Module/Admin/Addons.php:443 Code/Module/Admin/Channels.php:169
+#: Code/Module/Admin/Logs.php:82 Code/Module/Admin/Security.php:135
+#: Code/Module/Admin/Site.php:310 Code/Module/Admin/Themes.php:134
+#: Code/Module/Admin/Themes.php:168 Code/Module/Admin.php:179
 msgid "Administration"
 msgstr "Administracja"
 
-#: Zotlabs/Module/Admin/Accounts.php:176 Zotlabs/Module/Admin/Accounts.php:189
-#: Zotlabs/Module/Admin.php:123 Zotlabs/Widget/Admin.php:29
+#: Code/Module/Admin/Accounts.php:176 Code/Module/Admin/Accounts.php:189
+#: Code/Module/Admin.php:123 Code/Widget/Admin.php:29
 msgid "Accounts"
 msgstr "Konta"
 
-#: Zotlabs/Module/Admin/Accounts.php:178 Zotlabs/Module/Admin/Channels.php:172
+#: Code/Module/Admin/Accounts.php:178 Code/Module/Admin/Channels.php:172
 msgid "select all"
 msgstr "wybierz wszystkie"
 
-#: Zotlabs/Module/Admin/Accounts.php:179
+#: Code/Module/Admin/Accounts.php:179
 msgid "Registrations waiting for confirm"
 msgstr "Rejestracje członkowskie czekają na potwierdzenie"
 
-#: Zotlabs/Module/Admin/Accounts.php:180
+#: Code/Module/Admin/Accounts.php:180
 msgid "Request date"
 msgstr "Data wniosku"
 
-#: Zotlabs/Module/Admin/Accounts.php:180 Zotlabs/Module/Admin/Accounts.php:192
-#: Zotlabs/Module/Cdav.php:1354 Zotlabs/Module/Connedit.php:867
-#: Zotlabs/Module/Profiles.php:836 include/network.php:1690
+#: Code/Module/Admin/Accounts.php:180 Code/Module/Admin/Accounts.php:192
+#: Code/Module/Cdav.php:1354 Code/Module/Connedit.php:867
+#: Code/Module/Profiles.php:836 include/network.php:1690
 msgid "Email"
 msgstr "Adres e-mail"
 
-#: Zotlabs/Module/Admin/Accounts.php:181
+#: Code/Module/Admin/Accounts.php:181
 msgid "No registrations."
 msgstr "Brak rejestracji."
 
-#: Zotlabs/Module/Admin/Accounts.php:182 Zotlabs/Module/Connections.php:341
+#: Code/Module/Admin/Accounts.php:182 Code/Module/Connections.php:341
 #: include/conversation.php:653
 msgid "Approve"
 msgstr "Akceptuj"
 
-#: Zotlabs/Module/Admin/Accounts.php:183 Zotlabs/Module/Authorize.php:39
+#: Code/Module/Admin/Accounts.php:183 Code/Module/Authorize.php:39
 msgid "Deny"
 msgstr "Zabroń"
 
-#: Zotlabs/Module/Admin/Accounts.php:185 Zotlabs/Module/Connedit.php:576
-#: Zotlabs/Widget/Sblock.php:21
+#: Code/Module/Admin/Accounts.php:185 Code/Module/Connedit.php:576
+#: Code/Widget/Sblock.php:21
 msgid "Block"
 msgstr "Zablokuj"
 
-#: Zotlabs/Module/Admin/Accounts.php:186 Zotlabs/Module/Connedit.php:576
+#: Code/Module/Admin/Accounts.php:186 Code/Module/Connedit.php:576
 msgid "Unblock"
 msgstr "Odblokuj"
 
-#: Zotlabs/Module/Admin/Accounts.php:191
+#: Code/Module/Admin/Accounts.php:191
 msgid "ID"
 msgstr "ID"
 
-#: Zotlabs/Module/Admin/Accounts.php:193
+#: Code/Module/Admin/Accounts.php:193
 msgid "All Channels"
 msgstr "Wszystkie kanały"
 
-#: Zotlabs/Module/Admin/Accounts.php:194
+#: Code/Module/Admin/Accounts.php:194
 msgid "Register date"
 msgstr "Data rejestracji"
 
-#: Zotlabs/Module/Admin/Accounts.php:195
+#: Code/Module/Admin/Accounts.php:195
 msgid "Last login"
 msgstr "Ostatnie logowanie"
 
-#: Zotlabs/Module/Admin/Accounts.php:196
+#: Code/Module/Admin/Accounts.php:196
 msgid "Expires"
 msgstr "Wygasa"
 
-#: Zotlabs/Module/Admin/Accounts.php:197
+#: Code/Module/Admin/Accounts.php:197
 msgid "Service Class"
 msgstr "Klasa usługi"
 
-#: Zotlabs/Module/Admin/Accounts.php:199
+#: Code/Module/Admin/Accounts.php:199
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2047,7 +2047,7 @@ msgstr ""
 "opublikowane na tym serwisie, zostanie bezpowrotnie usunięte!\\n\\nCzy na "
 "pewno usunąć?"
 
-#: Zotlabs/Module/Admin/Accounts.php:200
+#: Code/Module/Admin/Accounts.php:200
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2055,147 +2055,147 @@ msgstr ""
 "Konto {0} zostanie usuniete!\\n\\nWszystko co opublikowano z tego konta na "
 "tym portalu zostanie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
 
-#: Zotlabs/Module/Admin/Addons.php:259 Zotlabs/Module/Admin/Themes.php:80
-#: Zotlabs/Module/Admin.php:89 Zotlabs/Module/Display.php:64
-#: Zotlabs/Module/Display.php:512 Zotlabs/Module/Filestorage.php:37
-#: Zotlabs/Module/Thing.php:108 Zotlabs/Module/Viewsrc.php:28
-#: Zotlabs/Module/Inspect.php:34
+#: Code/Module/Admin/Addons.php:259 Code/Module/Admin/Themes.php:80
+#: Code/Module/Admin.php:89 Code/Module/Display.php:64
+#: Code/Module/Display.php:512 Code/Module/Filestorage.php:37
+#: Code/Module/Thing.php:108 Code/Module/Viewsrc.php:28
+#: Code/Module/Inspect.php:34
 #: extend/addon/a/flashcards/Mod_Flashcards.php:284
 #: extend/addon/a/flashcards/Mod_Flashcards.php:285 include/items.php:3894
 msgid "Item not found."
 msgstr "Nie znaleziono elementu."
 
-#: Zotlabs/Module/Admin/Addons.php:289
+#: Code/Module/Admin/Addons.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Wtyczka %s jest wyłączona."
 
-#: Zotlabs/Module/Admin/Addons.php:294
+#: Code/Module/Admin/Addons.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Wtyczka %s jest włączona."
 
-#: Zotlabs/Module/Admin/Addons.php:311 Zotlabs/Module/Admin/Themes.php:105
+#: Code/Module/Admin/Addons.php:311 Code/Module/Admin/Themes.php:105
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: Zotlabs/Module/Admin/Addons.php:314 Zotlabs/Module/Admin/Themes.php:108
+#: Code/Module/Admin/Addons.php:314 Code/Module/Admin/Themes.php:108
 msgid "Enable"
 msgstr "Włącz"
 
-#: Zotlabs/Module/Admin/Addons.php:344 Zotlabs/Module/Admin/Addons.php:444
-#: Zotlabs/Widget/Admin.php:33
+#: Code/Module/Admin/Addons.php:344 Code/Module/Admin/Addons.php:444
+#: Code/Widget/Admin.php:33
 msgid "Addons"
 msgstr "Dodatki"
 
-#: Zotlabs/Module/Admin/Addons.php:345 Zotlabs/Module/Admin/Themes.php:136
+#: Code/Module/Admin/Addons.php:345 Code/Module/Admin/Themes.php:136
 msgid "Toggle"
 msgstr "Przełącz"
 
-#: Zotlabs/Module/Admin/Addons.php:353 Zotlabs/Module/Admin/Themes.php:146
+#: Code/Module/Admin/Addons.php:353 Code/Module/Admin/Themes.php:146
 msgid "Author: "
 msgstr "Autor: "
 
-#: Zotlabs/Module/Admin/Addons.php:354 Zotlabs/Module/Admin/Themes.php:147
+#: Code/Module/Admin/Addons.php:354 Code/Module/Admin/Themes.php:147
 msgid "Maintainer: "
 msgstr "Opiekun: "
 
-#: Zotlabs/Module/Admin/Addons.php:355
+#: Code/Module/Admin/Addons.php:355
 msgid "Minimum project version: "
 msgstr "Minimalna wersja projektu: "
 
-#: Zotlabs/Module/Admin/Addons.php:356
+#: Code/Module/Admin/Addons.php:356
 msgid "Maximum project version: "
 msgstr "Maksymalna wersja projektu: "
 
-#: Zotlabs/Module/Admin/Addons.php:357
+#: Code/Module/Admin/Addons.php:357
 msgid "Minimum PHP version: "
 msgstr "Minimalna wersja PHP: "
 
-#: Zotlabs/Module/Admin/Addons.php:358
+#: Code/Module/Admin/Addons.php:358
 msgid "Compatible Server Roles: "
 msgstr "Kompatybilne role serwera: "
 
-#: Zotlabs/Module/Admin/Addons.php:359
+#: Code/Module/Admin/Addons.php:359
 msgid "Requires: "
 msgstr "Wymagania: "
 
-#: Zotlabs/Module/Admin/Addons.php:360 Zotlabs/Module/Admin/Addons.php:449
+#: Code/Module/Admin/Addons.php:360 Code/Module/Admin/Addons.php:449
 msgid "Disabled - version incompatibility"
 msgstr "Wyłączone - niezgodność wersji"
 
-#: Zotlabs/Module/Admin/Addons.php:417
+#: Code/Module/Admin/Addons.php:417
 msgid "Enter the public git repository URL of the addon repo."
 msgstr "Wprowadź adres URL publicznego repozytorium Git dodatków."
 
-#: Zotlabs/Module/Admin/Addons.php:418
+#: Code/Module/Admin/Addons.php:418
 msgid "Addon repo git URL"
 msgstr "Adres URL repozytorium Git dodatków"
 
-#: Zotlabs/Module/Admin/Addons.php:419
+#: Code/Module/Admin/Addons.php:419
 msgid "Custom repo name"
 msgstr "Własna nazwa repozytorium"
 
-#: Zotlabs/Module/Admin/Addons.php:419
+#: Code/Module/Admin/Addons.php:419
 msgid "(optional)"
 msgstr "(opcjonalnie)"
 
-#: Zotlabs/Module/Admin/Addons.php:420
+#: Code/Module/Admin/Addons.php:420
 msgid "Download Addon Repo"
 msgstr "Pobierz repozytorium dodatków"
 
-#: Zotlabs/Module/Admin/Addons.php:428
+#: Code/Module/Admin/Addons.php:428
 msgid "Install new repo"
 msgstr "Zainstaluj nowe repozytorium"
 
-#: Zotlabs/Module/Admin/Addons.php:430 Zotlabs/Module/Admin/Cover_photo.php:378
-#: Zotlabs/Module/Admin/Profile_photo.php:474 Zotlabs/Module/Cdav.php:1060
-#: Zotlabs/Module/Cdav.php:1368 Zotlabs/Module/Connedit.php:881
-#: Zotlabs/Module/Cover_photo.php:424 Zotlabs/Module/Editlayout.php:152
-#: Zotlabs/Module/Editwebpage.php:184 Zotlabs/Module/Filer.php:62
-#: Zotlabs/Module/Fbrowser.php:73 Zotlabs/Module/Fbrowser.php:96
-#: Zotlabs/Module/Card_edit.php:140 Zotlabs/Module/Editblock.php:154
-#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Profiles.php:850
-#: Zotlabs/Module/Profile_photo.php:513 Zotlabs/Module/Settings/Oauth.php:96
-#: Zotlabs/Module/Settings/Oauth.php:124 Zotlabs/Module/Settings/Oauth2.php:114
-#: Zotlabs/Module/Settings/Oauth2.php:144 Zotlabs/Module/Tagrm.php:21
-#: Zotlabs/Module/Tagrm.php:152 include/conversation.php:1427
+#: Code/Module/Admin/Addons.php:430 Code/Module/Admin/Cover_photo.php:378
+#: Code/Module/Admin/Profile_photo.php:474 Code/Module/Cdav.php:1060
+#: Code/Module/Cdav.php:1368 Code/Module/Connedit.php:881
+#: Code/Module/Cover_photo.php:424 Code/Module/Editlayout.php:152
+#: Code/Module/Editwebpage.php:184 Code/Module/Filer.php:62
+#: Code/Module/Fbrowser.php:73 Code/Module/Fbrowser.php:96
+#: Code/Module/Card_edit.php:140 Code/Module/Editblock.php:154
+#: Code/Module/Editpost.php:147 Code/Module/Profiles.php:850
+#: Code/Module/Profile_photo.php:513 Code/Module/Settings/Oauth.php:96
+#: Code/Module/Settings/Oauth.php:124 Code/Module/Settings/Oauth2.php:114
+#: Code/Module/Settings/Oauth2.php:144 Code/Module/Tagrm.php:21
+#: Code/Module/Tagrm.php:152 include/conversation.php:1427
 #: include/conversation.php:1493 include/conversation.php:1495
 #: include/conversation.php:1497
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: Zotlabs/Module/Admin/Addons.php:452
+#: Code/Module/Admin/Addons.php:452
 msgid "Manage Repos"
 msgstr "Zarządzaj repozytoriami"
 
-#: Zotlabs/Module/Admin/Addons.php:453
+#: Code/Module/Admin/Addons.php:453
 msgid "Installed Addon Repositories"
 msgstr "Zainstalowane repozytoria dodatków"
 
-#: Zotlabs/Module/Admin/Addons.php:454
+#: Code/Module/Admin/Addons.php:454
 msgid "Install a New Addon Repository"
 msgstr "Zainstaluj nowe repozytorium dodatków"
 
-#: Zotlabs/Module/Admin/Addons.php:460 Zotlabs/Module/Cdav.php:1055
-#: Zotlabs/Module/Cdav.php:1366 Zotlabs/Module/Connedit.php:879
-#: Zotlabs/Module/Profiles.php:848 Zotlabs/Module/Settings/Oauth.php:45
-#: Zotlabs/Module/Settings/Oauth.php:123 Zotlabs/Module/Settings/Oauth2.php:55
-#: Zotlabs/Module/Settings/Oauth2.php:143
+#: Code/Module/Admin/Addons.php:460 Code/Module/Cdav.php:1055
+#: Code/Module/Cdav.php:1366 Code/Module/Connedit.php:879
+#: Code/Module/Profiles.php:848 Code/Module/Settings/Oauth.php:45
+#: Code/Module/Settings/Oauth.php:123 Code/Module/Settings/Oauth2.php:55
+#: Code/Module/Settings/Oauth2.php:143
 msgid "Update"
 msgstr "Zaktualizuj"
 
-#: Zotlabs/Module/Admin/Addons.php:461
+#: Code/Module/Admin/Addons.php:461
 msgid "Switch branch"
 msgstr "Przełącz gałąź"
 
-#: Zotlabs/Module/Admin/Addons.php:462 Zotlabs/Module/Photos.php:1068
-#: Zotlabs/Module/Tagrm.php:151 Zotlabs/Module/Superblock.php:234
-#: Zotlabs/Module/Superblock.php:251
+#: Code/Module/Admin/Addons.php:462 Code/Module/Photos.php:1068
+#: Code/Module/Tagrm.php:151 Code/Module/Superblock.php:234
+#: Code/Module/Superblock.php:251
 msgid "Remove"
 msgstr "Usuń"
 
-#: Zotlabs/Module/Admin/Channels.php:37
+#: Code/Module/Admin/Channels.php:37
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
@@ -2203,7 +2203,7 @@ msgstr[0] "%s kanał jest ocenzurowany/nieocenzurowany"
 msgstr[1] "%s kanały są ocenzurowane/nieocenzurowane"
 msgstr[2] "%s kanałów jest ocenzurowanych/nieocenzurowanych"
 
-#: Zotlabs/Module/Admin/Channels.php:47
+#: Code/Module/Admin/Channels.php:47
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
@@ -2211,7 +2211,7 @@ msgstr[0] "Dozwolony/Niedozwolony kod %s kanału"
 msgstr[1] "Dozwolony/Niedozwolony kod %s kanałów"
 msgstr[2] "Dozwolony/Niedozwolony kod %s kanałów"
 
-#: Zotlabs/Module/Admin/Channels.php:53
+#: Code/Module/Admin/Channels.php:53
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
@@ -2219,85 +2219,85 @@ msgstr[0] "%s kanał został usunięty"
 msgstr[1] "%s kanały zostały usunięte"
 msgstr[2] "%s kanałów został usuniętych"
 
-#: Zotlabs/Module/Admin/Channels.php:74
+#: Code/Module/Admin/Channels.php:74
 msgid "Channel not found"
 msgstr "Kanał nie został znaleziony"
 
-#: Zotlabs/Module/Admin/Channels.php:85
+#: Code/Module/Admin/Channels.php:85
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanał '%s' został usunięty"
 
-#: Zotlabs/Module/Admin/Channels.php:100
+#: Code/Module/Admin/Channels.php:100
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanał '%s' został ocenzurowany"
 
-#: Zotlabs/Module/Admin/Channels.php:100
+#: Code/Module/Admin/Channels.php:100
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanał '%s' jest nieocenzurowany"
 
-#: Zotlabs/Module/Admin/Channels.php:114
+#: Code/Module/Admin/Channels.php:114
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Dozwolony kod kanału '%s'"
 
-#: Zotlabs/Module/Admin/Channels.php:114
+#: Code/Module/Admin/Channels.php:114
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Niedozwolony kod kanału '%s'"
 
-#: Zotlabs/Module/Admin/Channels.php:170 Zotlabs/Module/Admin.php:142
-#: Zotlabs/Module/Manage.php:182 Zotlabs/Widget/Admin.php:30
+#: Code/Module/Admin/Channels.php:170 Code/Module/Admin.php:142
+#: Code/Module/Manage.php:182 Code/Widget/Admin.php:30
 #: include/nav.php:100
 msgid "Channels"
 msgstr "Kanały"
 
-#: Zotlabs/Module/Admin/Channels.php:174 Zotlabs/Module/Connedit.php:592
-#: Zotlabs/Module/Directory.php:391
+#: Code/Module/Admin/Channels.php:174 Code/Module/Connedit.php:592
+#: Code/Module/Directory.php:391
 msgid "Censor"
 msgstr "Cenzoruj"
 
-#: Zotlabs/Module/Admin/Channels.php:175 Zotlabs/Module/Connedit.php:592
-#: Zotlabs/Module/Directory.php:391
+#: Code/Module/Admin/Channels.php:175 Code/Module/Connedit.php:592
+#: Code/Module/Directory.php:391
 msgid "Uncensor"
 msgstr "Usuń cenzurę"
 
-#: Zotlabs/Module/Admin/Channels.php:176
+#: Code/Module/Admin/Channels.php:176
 msgid "Allow Code"
 msgstr "Zezwalaj na kod"
 
-#: Zotlabs/Module/Admin/Channels.php:177
+#: Code/Module/Admin/Channels.php:177
 msgid "Disallow Code"
 msgstr "Nie zezwalaj na kod"
 
-#: Zotlabs/Module/Admin/Channels.php:178 include/conversation.php:1978
+#: Code/Module/Admin/Channels.php:178 include/conversation.php:1978
 #: include/nav.php:400
 msgid "Channel"
 msgstr "Kanał"
 
-#: Zotlabs/Module/Admin/Channels.php:182
+#: Code/Module/Admin/Channels.php:182
 msgid "UID"
 msgstr "UID"
 
-#: Zotlabs/Module/Admin/Channels.php:183 Zotlabs/Module/Cdav.php:1350
-#: Zotlabs/Module/Connedit.php:863 Zotlabs/Module/Connections.php:236
-#: Zotlabs/Module/Chat.php:256 Zotlabs/Module/Lists.php:202
-#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth.php:125
-#: Zotlabs/Module/Settings/Oauth2.php:115
-#: Zotlabs/Module/Settings/Oauth2.php:145 Zotlabs/Module/Sharedwithme.php:107
-#: Zotlabs/Storage/Browser.php:313 Zotlabs/Widget/Activity_filter.php:294
+#: Code/Module/Admin/Channels.php:183 Code/Module/Cdav.php:1350
+#: Code/Module/Connedit.php:863 Code/Module/Connections.php:236
+#: Code/Module/Chat.php:256 Code/Module/Lists.php:202
+#: Code/Module/Settings/Oauth.php:97 Code/Module/Settings/Oauth.php:125
+#: Code/Module/Settings/Oauth2.php:115
+#: Code/Module/Settings/Oauth2.php:145 Code/Module/Sharedwithme.php:107
+#: Code/Storage/Browser.php:313 Code/Widget/Activity_filter.php:294
 msgid "Name"
 msgstr "Nazwa"
 
-#: Zotlabs/Module/Admin/Channels.php:184 Zotlabs/Module/Cdav.php:1357
-#: Zotlabs/Module/Connedit.php:870 Zotlabs/Module/Locs.php:133
-#: Zotlabs/Module/Profiles.php:527 Zotlabs/Module/Profiles.php:839
+#: Code/Module/Admin/Channels.php:184 Code/Module/Cdav.php:1357
+#: Code/Module/Connedit.php:870 Code/Module/Locs.php:133
+#: Code/Module/Profiles.php:527 Code/Module/Profiles.php:839
 msgid "Address"
 msgstr "Adres"
 
-#: Zotlabs/Module/Admin/Channels.php:186
+#: Code/Module/Admin/Channels.php:186
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2305,7 +2305,7 @@ msgstr ""
 "Wybrane kanały zostaną usunięte!\\n\\nWszystko co zostało w nich "
 "opublikowane będzie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
 
-#: Zotlabs/Module/Admin/Channels.php:187
+#: Code/Module/Admin/Channels.php:187
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2313,241 +2313,241 @@ msgstr ""
 "Kanał {0} zostanie usunięty!\\n\\nWszystko co opublikowano na tym kanale "
 "będzie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:64
-#: Zotlabs/Module/Admin/Profile_photo.php:67 Zotlabs/Module/Cover_photo.php:64
-#: Zotlabs/Module/Profile_photo.php:64
+#: Code/Module/Admin/Cover_photo.php:64
+#: Code/Module/Admin/Profile_photo.php:67 Code/Module/Cover_photo.php:64
+#: Code/Module/Profile_photo.php:64
 msgid "Image uploaded but image cropping failed."
 msgstr "Obraz został przesłany, ale przycinanie obrazu nie powiodło się."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:175
-#: Zotlabs/Module/Admin/Cover_photo.php:259 Zotlabs/Module/Cover_photo.php:175
-#: Zotlabs/Module/Cover_photo.php:262
+#: Code/Module/Admin/Cover_photo.php:175
+#: Code/Module/Admin/Cover_photo.php:259 Code/Module/Cover_photo.php:175
+#: Code/Module/Cover_photo.php:262
 msgid "Cover Photos"
 msgstr "Zdjęcia na okładkę"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:199
-#: Zotlabs/Module/Admin/Profile_photo.php:145
-#: Zotlabs/Module/Cover_photo.php:199 Zotlabs/Module/Profile_photo.php:144
+#: Code/Module/Admin/Cover_photo.php:199
+#: Code/Module/Admin/Profile_photo.php:145
+#: Code/Module/Cover_photo.php:199 Code/Module/Profile_photo.php:144
 msgid "Image resize failed."
 msgstr "Zmiana rozmiaru obrazu nie powiodła się."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:208
-#: Zotlabs/Module/Admin/Profile_photo.php:191
-#: Zotlabs/Module/Cover_photo.php:211 Zotlabs/Module/Profile_photo.php:227
+#: Code/Module/Admin/Cover_photo.php:208
+#: Code/Module/Admin/Profile_photo.php:191
+#: Code/Module/Cover_photo.php:211 Code/Module/Profile_photo.php:227
 #: include/photos.php:200
 msgid "Unable to process image"
 msgstr "Nie można przetworzyć obrazu"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:317
-#: Zotlabs/Module/Admin/Cover_photo.php:333
-#: Zotlabs/Module/Admin/Profile_photo.php:354
-#: Zotlabs/Module/Admin/Profile_photo.php:397
-#: Zotlabs/Module/Cover_photo.php:364 Zotlabs/Module/Cover_photo.php:380
-#: Zotlabs/Module/Profile_photo.php:386 Zotlabs/Module/Profile_photo.php:437
+#: Code/Module/Admin/Cover_photo.php:317
+#: Code/Module/Admin/Cover_photo.php:333
+#: Code/Module/Admin/Profile_photo.php:354
+#: Code/Module/Admin/Profile_photo.php:397
+#: Code/Module/Cover_photo.php:364 Code/Module/Cover_photo.php:380
+#: Code/Module/Profile_photo.php:386 Code/Module/Profile_photo.php:437
 msgid "Photo not available."
 msgstr "Zdjęcie nie jest dostępne."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:369 Zotlabs/Module/Cover_photo.php:415
+#: Code/Module/Admin/Cover_photo.php:369 Code/Module/Cover_photo.php:415
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr "Twoje zdjęcie okładkowe może być widoczne dla każdego w Internecie"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:371
-#: Zotlabs/Module/Admin/Profile_photo.php:465
-#: Zotlabs/Module/Cover_photo.php:417 Zotlabs/Module/Profile_photo.php:504
+#: Code/Module/Admin/Cover_photo.php:371
+#: Code/Module/Admin/Profile_photo.php:465
+#: Code/Module/Cover_photo.php:417 Code/Module/Profile_photo.php:504
 msgid "Upload File:"
 msgstr "Prześlij plik:"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:372
-#: Zotlabs/Module/Admin/Profile_photo.php:466
-#: Zotlabs/Module/Cover_photo.php:418 Zotlabs/Module/Profile_photo.php:505
+#: Code/Module/Admin/Cover_photo.php:372
+#: Code/Module/Admin/Profile_photo.php:466
+#: Code/Module/Cover_photo.php:418 Code/Module/Profile_photo.php:505
 msgid "Select a profile:"
 msgstr "Wybierz profil:"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:373 Zotlabs/Module/Cover_photo.php:419
+#: Code/Module/Admin/Cover_photo.php:373 Code/Module/Cover_photo.php:419
 msgid "Change Cover Photo"
 msgstr "Zmień zdjęcie na okładkę"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:374
-#: Zotlabs/Module/Admin/Profile_photo.php:468
-#: Zotlabs/Module/Cover_photo.php:420 Zotlabs/Module/Embedphotos.php:225
-#: Zotlabs/Module/Profile_photo.php:507 Zotlabs/Module/Photos.php:746
-#: Zotlabs/Storage/Browser.php:422 Zotlabs/Widget/Album.php:107
-#: Zotlabs/Widget/Portfolio.php:122 Zotlabs/Widget/Cdav.php:154
-#: Zotlabs/Widget/Cdav.php:188
+#: Code/Module/Admin/Cover_photo.php:374
+#: Code/Module/Admin/Profile_photo.php:468
+#: Code/Module/Cover_photo.php:420 Code/Module/Embedphotos.php:225
+#: Code/Module/Profile_photo.php:507 Code/Module/Photos.php:746
+#: Code/Storage/Browser.php:422 Code/Widget/Album.php:107
+#: Code/Widget/Portfolio.php:122 Code/Widget/Cdav.php:154
+#: Code/Widget/Cdav.php:188
 msgid "Upload"
 msgstr "Prześlij"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:376
-#: Zotlabs/Module/Admin/Cover_photo.php:377
-#: Zotlabs/Module/Admin/Profile_photo.php:472
-#: Zotlabs/Module/Admin/Profile_photo.php:473
-#: Zotlabs/Module/Cover_photo.php:422 Zotlabs/Module/Cover_photo.php:423
-#: Zotlabs/Module/Profile_photo.php:511 Zotlabs/Module/Profile_photo.php:512
+#: Code/Module/Admin/Cover_photo.php:376
+#: Code/Module/Admin/Cover_photo.php:377
+#: Code/Module/Admin/Profile_photo.php:472
+#: Code/Module/Admin/Profile_photo.php:473
+#: Code/Module/Cover_photo.php:422 Code/Module/Cover_photo.php:423
+#: Code/Module/Profile_photo.php:511 Code/Module/Profile_photo.php:512
 msgid "Use a photo from your albums"
 msgstr "Użyj zdjęcia ze swoich albumów"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:379
-#: Zotlabs/Module/Admin/Profile_photo.php:475
-#: Zotlabs/Module/Cover_photo.php:425 Zotlabs/Module/Profile_photo.php:514
+#: Code/Module/Admin/Cover_photo.php:379
+#: Code/Module/Admin/Profile_photo.php:475
+#: Code/Module/Cover_photo.php:425 Code/Module/Profile_photo.php:514
 #: include/conversation.php:1428 include/conversation.php:1492
 #: include/conversation.php:1494 include/conversation.php:1496
 msgid "OK"
 msgstr "Dobrze"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:380
-#: Zotlabs/Module/Admin/Profile_photo.php:476
-#: Zotlabs/Module/Cover_photo.php:426 Zotlabs/Module/Profile_photo.php:515
+#: Code/Module/Admin/Cover_photo.php:380
+#: Code/Module/Admin/Profile_photo.php:476
+#: Code/Module/Cover_photo.php:426 Code/Module/Profile_photo.php:515
 #: include/conversation.php:1292
 msgid "Choose images to embed"
 msgstr "Wybierz zdjęcie do osadzenia"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:381
-#: Zotlabs/Module/Admin/Profile_photo.php:477
-#: Zotlabs/Module/Cover_photo.php:427 Zotlabs/Module/Profile_photo.php:516
+#: Code/Module/Admin/Cover_photo.php:381
+#: Code/Module/Admin/Profile_photo.php:477
+#: Code/Module/Cover_photo.php:427 Code/Module/Profile_photo.php:516
 #: include/conversation.php:1293
 msgid "Choose an album"
 msgstr "Wybierz album"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:382
-#: Zotlabs/Module/Admin/Profile_photo.php:478
-#: Zotlabs/Module/Cover_photo.php:428 Zotlabs/Module/Profile_photo.php:517
+#: Code/Module/Admin/Cover_photo.php:382
+#: Code/Module/Admin/Profile_photo.php:478
+#: Code/Module/Cover_photo.php:428 Code/Module/Profile_photo.php:517
 msgid "Choose a different album"
 msgstr "Wybierz inny album"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:383
-#: Zotlabs/Module/Admin/Profile_photo.php:479
-#: Zotlabs/Module/Cover_photo.php:429 Zotlabs/Module/Profile_photo.php:518
+#: Code/Module/Admin/Cover_photo.php:383
+#: Code/Module/Admin/Profile_photo.php:479
+#: Code/Module/Cover_photo.php:429 Code/Module/Profile_photo.php:518
 #: include/conversation.php:1295
 msgid "Error getting album list"
 msgstr "Błąd podczas pobierania listy albumów"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:384
-#: Zotlabs/Module/Admin/Profile_photo.php:480
-#: Zotlabs/Module/Cover_photo.php:430 Zotlabs/Module/Profile_photo.php:519
+#: Code/Module/Admin/Cover_photo.php:384
+#: Code/Module/Admin/Profile_photo.php:480
+#: Code/Module/Cover_photo.php:430 Code/Module/Profile_photo.php:519
 #: include/conversation.php:1296
 msgid "Error getting photo link"
 msgstr "Błąd podczas pobierania linku do zdjęcia"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:385
-#: Zotlabs/Module/Admin/Profile_photo.php:481
-#: Zotlabs/Module/Cover_photo.php:431 Zotlabs/Module/Profile_photo.php:520
+#: Code/Module/Admin/Cover_photo.php:385
+#: Code/Module/Admin/Profile_photo.php:481
+#: Code/Module/Cover_photo.php:431 Code/Module/Profile_photo.php:520
 #: include/conversation.php:1297
 msgid "Error getting album"
 msgstr "Błąd podczas pobierania albumu"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:387
-#: Zotlabs/Module/Admin/Profile_photo.php:483
-#: Zotlabs/Module/Cover_photo.php:433 Zotlabs/Module/Profile_photo.php:522
+#: Code/Module/Admin/Cover_photo.php:387
+#: Code/Module/Admin/Profile_photo.php:483
+#: Code/Module/Cover_photo.php:433 Code/Module/Profile_photo.php:522
 msgid "Select previously uploaded photo"
 msgstr "Wybierz przesłane wcześniej zdjęcie"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:403
-#: Zotlabs/Module/Admin/Profile_photo.php:498
-#: Zotlabs/Module/Cover_photo.php:449 Zotlabs/Module/Profile_photo.php:537
+#: Code/Module/Admin/Cover_photo.php:403
+#: Code/Module/Admin/Profile_photo.php:498
+#: Code/Module/Cover_photo.php:449 Code/Module/Profile_photo.php:537
 msgid "Crop Image"
 msgstr "Przytnij zdjęcie"
 
-#: Zotlabs/Module/Admin/Cover_photo.php:404
-#: Zotlabs/Module/Admin/Profile_photo.php:499
-#: Zotlabs/Module/Cover_photo.php:450 Zotlabs/Module/Profile_photo.php:538
+#: Code/Module/Admin/Cover_photo.php:404
+#: Code/Module/Admin/Profile_photo.php:499
+#: Code/Module/Cover_photo.php:450 Code/Module/Profile_photo.php:538
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Dostosuj kadrowanie obrazu, aby uzyskać optymalne wyświetlanie."
 
-#: Zotlabs/Module/Admin/Cover_photo.php:406
-#: Zotlabs/Module/Admin/Profile_photo.php:501
-#: Zotlabs/Module/Cover_photo.php:452 Zotlabs/Module/Profile_photo.php:540
+#: Code/Module/Admin/Cover_photo.php:406
+#: Code/Module/Admin/Profile_photo.php:501
+#: Code/Module/Cover_photo.php:452 Code/Module/Profile_photo.php:540
 msgid "Done Editing"
 msgstr "Zakończono edycję"
 
-#: Zotlabs/Module/Admin/Dbsync.php:20 Zotlabs/Module/Admin/Dbsync.php:55
+#: Code/Module/Admin/Dbsync.php:20 Code/Module/Admin/Dbsync.php:55
 msgid "Update has been marked successful"
 msgstr "Aktualizacja została oznaczona jako pomyślna"
 
-#: Zotlabs/Module/Admin/Dbsync.php:32
+#: Code/Module/Admin/Dbsync.php:32
 #, php-format
 msgid "Verification of update %s failed. Check system logs."
 msgstr ""
 "Weryfikacja aktualizacji %s nie zakończyła się pomyślnie. Sprawdź dzienniki "
 "systemowe."
 
-#: Zotlabs/Module/Admin/Dbsync.php:34 Zotlabs/Module/Admin/Dbsync.php:69
+#: Code/Module/Admin/Dbsync.php:34 Code/Module/Admin/Dbsync.php:69
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizacja %s została pomyślnie zastosowana."
 
-#: Zotlabs/Module/Admin/Dbsync.php:37
+#: Code/Module/Admin/Dbsync.php:37
 #, php-format
 msgid "Verifying update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 "Weryfikacja aktualizacji %s nie zwróciła stanu. Nie wiadomo, czy się udało."
 
-#: Zotlabs/Module/Admin/Dbsync.php:40
+#: Code/Module/Admin/Dbsync.php:40
 #, php-format
 msgid "Update %s does not contain a verification function."
 msgstr "Aktualizacja %s nie zawiera funkcji weryfikacji."
 
-#: Zotlabs/Module/Admin/Dbsync.php:43 Zotlabs/Module/Admin/Dbsync.php:75
+#: Code/Module/Admin/Dbsync.php:43 Code/Module/Admin/Dbsync.php:75
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Nie można znaleźć funkcji aktualizacji %s."
 
-#: Zotlabs/Module/Admin/Dbsync.php:67
+#: Code/Module/Admin/Dbsync.php:67
 #, php-format
 msgid "Executing update procedure %s failed. Check system logs."
 msgstr ""
 "Wykonanie procedury aktualizacji %s nie powiodło się. Sprawdź dzienniki "
 "systemowe."
 
-#: Zotlabs/Module/Admin/Dbsync.php:72
+#: Code/Module/Admin/Dbsync.php:72
 #, php-format
 msgid ""
 "Update %s did not return a status. It cannot be determined if it was "
 "successful."
 msgstr "Aktualizacja %s nie zwróciła stanu. Nie można ustalić, czy się udało."
 
-#: Zotlabs/Module/Admin/Dbsync.php:95
+#: Code/Module/Admin/Dbsync.php:95
 msgid "Failed Updates"
 msgstr "Nieudane aktualizacje"
 
-#: Zotlabs/Module/Admin/Dbsync.php:97
+#: Code/Module/Admin/Dbsync.php:97
 msgid "Mark success (if update was manually applied)"
 msgstr "Oznacz sukces (jeśli aktualizacja została wykonana ręcznie)"
 
-#: Zotlabs/Module/Admin/Dbsync.php:98
+#: Code/Module/Admin/Dbsync.php:98
 msgid "Attempt to verify this update if a verification procedure exists"
 msgstr ""
 "Spróbuj zweryfikować tą aktualizację, jeśli istnieje procedura weryfikacji"
 
-#: Zotlabs/Module/Admin/Dbsync.php:99
+#: Code/Module/Admin/Dbsync.php:99
 msgid "Attempt to execute this update step automatically"
 msgstr "Spróbuj automatycznie wykonać ten krok aktualizacji"
 
-#: Zotlabs/Module/Admin/Dbsync.php:103
+#: Code/Module/Admin/Dbsync.php:103
 msgid "No failed updates."
 msgstr "Nie ma nieudanych aktualizacji."
 
-#: Zotlabs/Module/Admin/Logs.php:28
+#: Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "Zaktualizowano ustawienia dziennika."
 
-#: Zotlabs/Module/Admin/Logs.php:83 Zotlabs/Widget/Admin.php:54
-#: Zotlabs/Widget/Admin.php:64
+#: Code/Module/Admin/Logs.php:83 Code/Widget/Admin.php:54
+#: Code/Widget/Admin.php:64
 msgid "Logs"
 msgstr "Logi"
 
-#: Zotlabs/Module/Admin/Logs.php:85
+#: Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: Zotlabs/Module/Admin/Logs.php:91
+#: Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Debugowanie"
 
-#: Zotlabs/Module/Admin/Logs.php:92
+#: Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "Plik dziennika"
 
-#: Zotlabs/Module/Admin/Logs.php:92
+#: Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
@@ -2555,19 +2555,19 @@ msgstr ""
 "Musi mieć możliwość zapisu przez serwer WWW. Ścieżka względna do katalogu "
 "głównego serwera WWW."
 
-#: Zotlabs/Module/Admin/Logs.php:93
+#: Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Poziom rejestrowania zdarzeń"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:121
-#: Zotlabs/Module/Admin/Profile_photo.php:251
-#: Zotlabs/Module/Profile_photo.php:118 Zotlabs/Module/Profile_photo.php:287
+#: Code/Module/Admin/Profile_photo.php:121
+#: Code/Module/Admin/Profile_photo.php:251
+#: Code/Module/Profile_photo.php:118 Code/Module/Profile_photo.php:287
 #: include/photo_factory.php:539
 msgid "Profile Photos"
 msgstr "Zdjęcia profilowe"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:189
-#: Zotlabs/Module/Profile_photo.php:222
+#: Code/Module/Admin/Profile_photo.php:189
+#: Code/Module/Profile_photo.php:222
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
@@ -2575,18 +2575,18 @@ msgstr ""
 "Przeładuj stronę lub wyczyść pamięć podręczną przeglądarki, jeśli nowe "
 "zdjęcie nie zostanie wyświetlone od razu."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:266
-#: Zotlabs/Module/Profile_photo.php:302
+#: Code/Module/Admin/Profile_photo.php:266
+#: Code/Module/Profile_photo.php:302
 msgid "Image upload failed."
 msgstr "Przesyłanie obrazu nie powiodło się."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:285
-#: Zotlabs/Module/Profile_photo.php:321
+#: Code/Module/Admin/Profile_photo.php:285
+#: Code/Module/Profile_photo.php:321
 msgid "Unable to process image."
 msgstr "Nie można przetworzyć obrazu."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:463
-#: Zotlabs/Module/Profile_photo.php:502
+#: Code/Module/Admin/Profile_photo.php:463
+#: Code/Module/Profile_photo.php:502
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
@@ -2594,7 +2594,7 @@ msgstr ""
 "Twoje domyślne zdjęcie profilowe jest widoczne dla każdego w internecie. "
 "Zdjęcia profilowe dla profili alternatywnych odziedziczą uprawnienia profilu"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:463
+#: Code/Module/Admin/Profile_photo.php:463
 msgid ""
 "Your site photo is visible to anybody on the internet and may be distributed "
 "to other websites."
@@ -2602,116 +2602,116 @@ msgstr ""
 "Zdjęcie Twojego portalu jest widoczne dla każdego w internecie i może być "
 "rozpowszechniane na innych portali."
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
+#: Code/Module/Admin/Profile_photo.php:467
 msgid "Use Photo for Site Logo"
 msgstr "Użyj zdjęcia jako logo portalu"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
+#: Code/Module/Admin/Profile_photo.php:467
 msgid "Change Site Logo"
 msgstr "Zmień logo portalu"
 
-#: Zotlabs/Module/Admin/Profile_photo.php:468
-#: Zotlabs/Module/Profile_photo.php:507
+#: Code/Module/Admin/Profile_photo.php:468
+#: Code/Module/Profile_photo.php:507
 msgid "Use"
 msgstr "Użyj"
 
-#: Zotlabs/Module/Admin/Profs.php:94
+#: Code/Module/Admin/Profs.php:94
 msgid "New Profile Field"
 msgstr "Nowe pole profilu"
 
-#: Zotlabs/Module/Admin/Profs.php:95 Zotlabs/Module/Admin/Profs.php:116
+#: Code/Module/Admin/Profs.php:95 Code/Module/Admin/Profs.php:116
 msgid "Field nickname"
 msgstr "Krótka nazwa pola"
 
-#: Zotlabs/Module/Admin/Profs.php:95 Zotlabs/Module/Admin/Profs.php:116
+#: Code/Module/Admin/Profs.php:95 Code/Module/Admin/Profs.php:116
 msgid "System name of field"
 msgstr "Systemowa nazwa pola"
 
-#: Zotlabs/Module/Admin/Profs.php:96 Zotlabs/Module/Admin/Profs.php:117
+#: Code/Module/Admin/Profs.php:96 Code/Module/Admin/Profs.php:117
 msgid "Input type"
 msgstr "Typ wejścia"
 
-#: Zotlabs/Module/Admin/Profs.php:97 Zotlabs/Module/Admin/Profs.php:118
+#: Code/Module/Admin/Profs.php:97 Code/Module/Admin/Profs.php:118
 msgid "Field Name"
 msgstr "Nazwa pola"
 
-#: Zotlabs/Module/Admin/Profs.php:97 Zotlabs/Module/Admin/Profs.php:118
+#: Code/Module/Admin/Profs.php:97 Code/Module/Admin/Profs.php:118
 msgid "Label on profile pages"
 msgstr "Etykieta na stronach profilu"
 
-#: Zotlabs/Module/Admin/Profs.php:98 Zotlabs/Module/Admin/Profs.php:119
+#: Code/Module/Admin/Profs.php:98 Code/Module/Admin/Profs.php:119
 msgid "Help text"
 msgstr "Tekst pomocy"
 
-#: Zotlabs/Module/Admin/Profs.php:98 Zotlabs/Module/Admin/Profs.php:119
+#: Code/Module/Admin/Profs.php:98 Code/Module/Admin/Profs.php:119
 msgid "Additional info (optional)"
 msgstr "Dodatkowe informacje (opcjonalnie)"
 
-#: Zotlabs/Module/Admin/Profs.php:109
+#: Code/Module/Admin/Profs.php:109
 msgid "Field definition not found"
 msgstr "Nie znaleziono definicji pola"
 
-#: Zotlabs/Module/Admin/Profs.php:115
+#: Code/Module/Admin/Profs.php:115
 msgid "Edit Profile Field"
 msgstr "Edytuj pole profilu"
 
-#: Zotlabs/Module/Admin/Profs.php:181
+#: Code/Module/Admin/Profs.php:181
 msgid "Profile Fields"
 msgstr "Pola profilu"
 
-#: Zotlabs/Module/Admin/Profs.php:182
+#: Code/Module/Admin/Profs.php:182
 msgid "Basic Profile Fields"
 msgstr "Podstawowe pola profilu"
 
-#: Zotlabs/Module/Admin/Profs.php:183
+#: Code/Module/Admin/Profs.php:183
 msgid "Advanced Profile Fields"
 msgstr "Zaawansowane pola profilu"
 
-#: Zotlabs/Module/Admin/Profs.php:183
+#: Code/Module/Admin/Profs.php:183
 msgid "(In addition to basic fields)"
 msgstr "(Oprócz podstawowych pól)"
 
-#: Zotlabs/Module/Admin/Profs.php:185
+#: Code/Module/Admin/Profs.php:185
 msgid "All available fields"
 msgstr "Wszystkie dostępne pola"
 
-#: Zotlabs/Module/Admin/Profs.php:186
+#: Code/Module/Admin/Profs.php:186
 msgid "Custom Fields"
 msgstr "Pola własne"
 
-#: Zotlabs/Module/Admin/Profs.php:190
+#: Code/Module/Admin/Profs.php:190
 msgid "Create Custom Field"
 msgstr "Utwórz własne pole"
 
-#: Zotlabs/Module/Admin/Queue.php:35
+#: Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr "Statystyki kolejki"
 
-#: Zotlabs/Module/Admin/Queue.php:36
+#: Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr "Ogółem wpisów"
 
-#: Zotlabs/Module/Admin/Queue.php:37
+#: Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr "Priorytet"
 
-#: Zotlabs/Module/Admin/Queue.php:38
+#: Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr "Docelowy URL"
 
-#: Zotlabs/Module/Admin/Queue.php:39
+#: Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr "Oznacz na stałe jako portal w trybie offline"
 
-#: Zotlabs/Module/Admin/Queue.php:40
+#: Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr "Pusta kolejka dla tego portalu"
 
-#: Zotlabs/Module/Admin/Queue.php:41
+#: Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr "Ostatni znany kontakt"
 
-#: Zotlabs/Module/Admin/Security.php:126
+#: Code/Module/Admin/Security.php:126
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
 "insecure."
@@ -2719,7 +2719,7 @@ msgstr ""
 "Domyślnie, w osadzonych mediach jest dozwolony niefiltrowany HTML. Jest to z "
 "natury niebezpieczne."
 
-#: Zotlabs/Module/Admin/Security.php:129
+#: Code/Module/Admin/Security.php:129
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
@@ -2727,7 +2727,7 @@ msgstr ""
 "Zalecanym ustawieniem jest zezwolenie na niefiltrowany kod HTML tylko z "
 "następujących portali:"
 
-#: Zotlabs/Module/Admin/Security.php:130
+#: Code/Module/Admin/Security.php:130
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/"
 "
              https://vimeo.com/
              https://soundcloud.com/
              "
@@ -2735,7 +2735,7 @@ msgstr ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/"
 "
              https://vimeo.com/
              https://soundcloud.com/
              "
 
-#: Zotlabs/Module/Admin/Security.php:131
+#: Code/Module/Admin/Security.php:131
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
@@ -2743,15 +2743,15 @@ msgstr ""
 "Wszystkie inne osadzone treści będą filtrowane,  chyba że  "
 "osadzone treści z tego portalu są jawnie zablokowane."
 
-#: Zotlabs/Module/Admin/Security.php:136 Zotlabs/Widget/Admin.php:31
+#: Code/Module/Admin/Security.php:136 Code/Widget/Admin.php:31
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: Zotlabs/Module/Admin/Security.php:138
+#: Code/Module/Admin/Security.php:138
 msgid "Block public"
 msgstr "Zablokuj publiczny dostęp"
 
-#: Zotlabs/Module/Admin/Security.php:138
+#: Code/Module/Admin/Security.php:138
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
@@ -2759,38 +2759,38 @@ msgstr ""
 "Zaznacz, aby zablokować publiczny dostęp do wszystkich innych publicznych "
 "stron osobistych na tym portalu, chyba że jesteś obecnie uwierzytelniony."
 
-#: Zotlabs/Module/Admin/Security.php:139
+#: Code/Module/Admin/Security.php:139
 msgid "Block public search"
 msgstr "Zablokuj wyszukiwanie publiczne"
 
-#: Zotlabs/Module/Admin/Security.php:139
+#: Code/Module/Admin/Security.php:139
 msgid ""
 "Prevent access to search content unless you are currently authenticated."
 msgstr ""
 "Zablokuj dostęp do wyszukiwania treści, chyba że jesteś obecnie "
 "uwierzytelniony."
 
-#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Security.php:140 Code/Module/Admin/Site.php:339
 msgid "Block directory from visitors"
 msgstr "Zablokuj katalog przed odwiedzającymi"
 
-#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Security.php:140 Code/Module/Admin/Site.php:339
 msgid "Only allow authenticated access to directory."
 msgstr "Zezwalaj tylko na uwierzytelniony dostęp do katalogu."
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid "Hide local directory"
 msgstr "Ukryj katalog lokalny"
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid "Only use the global directory"
 msgstr "Używaj tylko katalogu globalnego"
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid "Provide a cloud root directory"
 msgstr "Podaj katalog główny w chmurze"
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid ""
 "The cloud root directory lists all channel names which provide public files. "
 "Otherwise only the names of connections are shown."
@@ -2799,48 +2799,48 @@ msgstr ""
 "udostępniających pliki publiczne. W przeciwnym razie wyświetlane są tylko "
 "nazwy połączeń."
 
-#: Zotlabs/Module/Admin/Security.php:143
+#: Code/Module/Admin/Security.php:143
 msgid "Show total disk space available to cloud uploads"
 msgstr ""
 "Pokaż całkowitą powierzchnię dyskową dostępną dla przesyłania plików do "
 "chmury"
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "Allow SVG thumbnails in file browser"
 msgstr "Zezwalaj na miniatury SVG w przeglądarce plików"
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "OSTRZEŻENIE: obrazy SVG mogą zawierać złośliwy kod."
 
-#: Zotlabs/Module/Admin/Security.php:146
+#: Code/Module/Admin/Security.php:146
 msgid "Allow embedded (inline) PDF files"
 msgstr "Zezwalaj na osadzone (w treści) pliki PDF"
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid "Permit anonymous comments"
 msgstr "Zezwalaj na anonimowe komentarze"
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid ""
 "Moderation will be performed by channels that select this comment option."
 msgstr ""
 "Moderacja będzie przeprowadzana tylko w kanałach, w których wybrano tą opcję "
 "komentarza."
 
-#: Zotlabs/Module/Admin/Security.php:148
+#: Code/Module/Admin/Security.php:148
 msgid "Set \"Transport Security\" HTTP header"
 msgstr "Ustaw nagłówek HTTP „Transport Security”"
 
-#: Zotlabs/Module/Admin/Security.php:149
+#: Code/Module/Admin/Security.php:149
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr "Ustaw nagłówek HTTP „Content Security Policy”"
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid "Allowed email domains"
 msgstr "Dozwolone domeny e-mail"
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
@@ -2850,11 +2850,11 @@ msgstr ""
 "podczas rejestracji w tym serwisie. Akceptowane są symbole wieloznaczne. "
 "Puste pole oznacza zezwolenie na dowolne domeny"
 
-#: Zotlabs/Module/Admin/Security.php:151
+#: Code/Module/Admin/Security.php:151
 msgid "Not allowed email domains"
 msgstr "Niedozwolone domeny e-mail"
 
-#: Zotlabs/Module/Admin/Security.php:151
+#: Code/Module/Admin/Security.php:151
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
@@ -2865,11 +2865,11 @@ msgstr ""
 "wieloznaczne. Puste pole oznacza zezwolenie na wszystkie domeny, chyba że "
 "zostały uprzednio zdefiniowane jakieś dozwolone domeny."
 
-#: Zotlabs/Module/Admin/Security.php:152
+#: Code/Module/Admin/Security.php:152
 msgid "Allow communications only from these sites"
 msgstr "Zezwalaj na komunikację tylko z tych portali"
 
-#: Zotlabs/Module/Admin/Security.php:152 Zotlabs/Module/Admin/Security.php:157
+#: Code/Module/Admin/Security.php:152 Code/Module/Admin/Security.php:157
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
@@ -2877,15 +2877,15 @@ msgstr ""
 "Jeden portal w każdym wierszu. Pozostaw puste, aby domyślnie zezwolić na "
 "komunikację z każdym portalem"
 
-#: Zotlabs/Module/Admin/Security.php:153
+#: Code/Module/Admin/Security.php:153
 msgid "Block communications from these sites"
 msgstr "Blokuj komunikację z tych portali"
 
-#: Zotlabs/Module/Admin/Security.php:154
+#: Code/Module/Admin/Security.php:154
 msgid "Allow communications only from these channels"
 msgstr "Zezwalaj na komunikację tylko z tych kanałów"
 
-#: Zotlabs/Module/Admin/Security.php:154 Zotlabs/Module/Admin/Security.php:159
+#: Code/Module/Admin/Security.php:154 Code/Module/Admin/Security.php:159
 msgid ""
 "One channel (hash) per line. Leave empty to allow communication from any "
 "channel by default"
@@ -2893,132 +2893,132 @@ msgstr ""
 "Jeden kanał (hasz) na linię. Pozostaw puste, aby domyślnie zezwolić na "
 "dowolny kanał"
 
-#: Zotlabs/Module/Admin/Security.php:155
+#: Code/Module/Admin/Security.php:155
 msgid "Block communications from these channels"
 msgstr "Blokuj komunikację z tych kanałów"
 
-#: Zotlabs/Module/Admin/Security.php:157
+#: Code/Module/Admin/Security.php:157
 msgid "Allow public stream communications only from these sites"
 msgstr "Zezwalaj na publiczną komunikację strumieniową tylko z tych portali"
 
-#: Zotlabs/Module/Admin/Security.php:158
+#: Code/Module/Admin/Security.php:158
 msgid "Block public stream communications from these sites"
 msgstr "Blokuj publiczne transmisje strumieniowe z tych portali"
 
-#: Zotlabs/Module/Admin/Security.php:159
+#: Code/Module/Admin/Security.php:159
 msgid "Allow public stream communications only from these channels"
 msgstr "Zezwalaj na publiczne przesyłanie strumieniowe tylko z tych kanałów"
 
-#: Zotlabs/Module/Admin/Security.php:160
+#: Code/Module/Admin/Security.php:160
 msgid "Block public stream communications from these channels"
 msgstr "Blokuj publiczne transmisje strumieniowe z tych kanałów"
 
-#: Zotlabs/Module/Admin/Security.php:163
+#: Code/Module/Admin/Security.php:163
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr "Zezwalaj na osadzanie tylko z bezpiecznych (SSL) witryn i linków."
 
-#: Zotlabs/Module/Admin/Security.php:164
+#: Code/Module/Admin/Security.php:164
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Zezwalaj na niefiltrowaną osadzony kod HTML tylko z tych domen"
 
-#: Zotlabs/Module/Admin/Security.php:164
+#: Code/Module/Admin/Security.php:164
 msgid "One site per line. By default embedded content is filtered."
 msgstr "Jeden portal w wierszu. Domyślnie, treść osadzona jest filtrowana."
 
-#: Zotlabs/Module/Admin/Security.php:165
+#: Code/Module/Admin/Security.php:165
 msgid "Block embedded HTML from these domains"
 msgstr "Zablokuj osadzony kod HTML z tych domen"
 
-#: Zotlabs/Module/Admin/Site.php:192
+#: Code/Module/Admin/Site.php:192
 msgid "Site settings updated."
 msgstr "Zaktualizowano ustawienia portalu."
 
-#: Zotlabs/Module/Admin/Site.php:221 include/text.php:3568
+#: Code/Module/Admin/Site.php:221 include/text.php:3568
 #: view/theme/redbasic/php/config.php:15
 msgid "Default"
 msgstr "Domyślnie"
 
-#: Zotlabs/Module/Admin/Site.php:232 Zotlabs/Module/Settings/Display.php:147
+#: Code/Module/Admin/Site.php:232 Code/Module/Settings/Display.php:147
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (niekompatybilne)"
 
-#: Zotlabs/Module/Admin/Site.php:240
+#: Code/Module/Admin/Site.php:240
 msgid "mobile"
 msgstr "urządzenie przenośne"
 
-#: Zotlabs/Module/Admin/Site.php:243
+#: Code/Module/Admin/Site.php:243
 msgid "experimental"
 msgstr "eksperymentalne"
 
-#: Zotlabs/Module/Admin/Site.php:246
+#: Code/Module/Admin/Site.php:246
 msgid "unsupported"
 msgstr "nieobsługiwane"
 
-#: Zotlabs/Module/Admin/Site.php:288
+#: Code/Module/Admin/Site.php:288
 msgid "Yes - with approval"
 msgstr "Tak - za zgodą"
 
-#: Zotlabs/Module/Admin/Site.php:294
+#: Code/Module/Admin/Site.php:294
 msgid "My site is not a public server"
 msgstr "Mój portal nie jest serwerem publicznym"
 
-#: Zotlabs/Module/Admin/Site.php:295
+#: Code/Module/Admin/Site.php:295
 msgid "My site provides free public access"
 msgstr "Mój portal ma tylko płatny dostęp"
 
-#: Zotlabs/Module/Admin/Site.php:296
+#: Code/Module/Admin/Site.php:296
 msgid "My site provides paid public access"
 msgstr "Mój porta ma tylko bezpłatny dostęp"
 
-#: Zotlabs/Module/Admin/Site.php:297
+#: Code/Module/Admin/Site.php:297
 msgid "My site provides free public access and premium paid plans"
 msgstr ""
 "Mój portal oferuje darmowe konta z opcjonalnymi płatnymi rozszerzeniami"
 
-#: Zotlabs/Module/Admin/Site.php:303
+#: Code/Module/Admin/Site.php:303
 msgid "Default permission role for new accounts"
 msgstr "Domyślna rola uprawnień dla nowych kont"
 
-#: Zotlabs/Module/Admin/Site.php:303
+#: Code/Module/Admin/Site.php:303
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr ""
 "Ta rola będzie używana dla pierwszego kanału utworzonego po rejestracji."
 
-#: Zotlabs/Module/Admin/Site.php:311 Zotlabs/Widget/Admin.php:26
+#: Code/Module/Admin/Site.php:311 Code/Widget/Admin.php:26
 msgid "Site"
 msgstr "Portal"
 
-#: Zotlabs/Module/Admin/Site.php:313
+#: Code/Module/Admin/Site.php:313
 msgid "Site Configuration"
 msgstr "Konfiguracja portalu"
 
-#: Zotlabs/Module/Admin/Site.php:314 Zotlabs/Module/Register.php:287
+#: Code/Module/Admin/Site.php:314 Code/Module/Register.php:287
 msgid "Registration"
 msgstr "Rejestracja"
 
-#: Zotlabs/Module/Admin/Site.php:315
+#: Code/Module/Admin/Site.php:315
 msgid "File upload"
 msgstr "Przesyłanie pliku"
 
-#: Zotlabs/Module/Admin/Site.php:316
+#: Code/Module/Admin/Site.php:316
 msgid "Policies"
 msgstr "Zasady"
 
-#: Zotlabs/Module/Admin/Site.php:317 Zotlabs/Widget/Findpeople.php:26
+#: Code/Module/Admin/Site.php:317 Code/Widget/Findpeople.php:26
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: Zotlabs/Module/Admin/Site.php:319
+#: Code/Module/Admin/Site.php:319
 msgid "Site name"
 msgstr "Nazwa portalu"
 
-#: Zotlabs/Module/Admin/Site.php:320
+#: Code/Module/Admin/Site.php:320
 msgid "Administrator Information"
 msgstr "Informacje o administratorze"
 
-#: Zotlabs/Module/Admin/Site.php:320
+#: Code/Module/Admin/Site.php:320
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode may be used here."
@@ -3026,11 +3026,11 @@ msgstr ""
 "Informacje kontaktowe o administratorach portalu. Wyświetlane na stronie "
 "informacji o portalu. Tutaj można użyć BBCode."
 
-#: Zotlabs/Module/Admin/Site.php:321 Zotlabs/Module/Siteinfo.php:38
+#: Code/Module/Admin/Site.php:321 Code/Module/Siteinfo.php:38
 msgid "Site Information"
 msgstr "Informacje o portalu"
 
-#: Zotlabs/Module/Admin/Site.php:321
+#: Code/Module/Admin/Site.php:321
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode may be used here."
@@ -3038,15 +3038,15 @@ msgstr ""
 "Publicznie widoczny opis tego portalu. Wyświetlane na stronie informacji o "
 "portalu. Tutaj można użyć BBCode."
 
-#: Zotlabs/Module/Admin/Site.php:322
+#: Code/Module/Admin/Site.php:322
 msgid "System language"
 msgstr "Język systemu"
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid "System theme"
 msgstr "Motyw systemu"
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
@@ -3054,19 +3054,19 @@ msgstr ""
 "Domyślny motyw systemu - może zostać zastąpiony w profilu użytkownika w "
 "opcji - zmień ustawienia motywu"
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid "ActivityPub protocol"
 msgstr "Protokół ActivityPub"
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid "Provides access to software supporting the ActivityPub protocol."
 msgstr "Zapewnia dostęp do oprogramowania obsługującego protokół ActivityPub."
 
-#: Zotlabs/Module/Admin/Site.php:327
+#: Code/Module/Admin/Site.php:327
 msgid "Maximum image size"
 msgstr "Maksymalny rozmiar obrazu"
 
-#: Zotlabs/Module/Admin/Site.php:327
+#: Code/Module/Admin/Site.php:327
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
@@ -3074,25 +3074,25 @@ msgstr ""
 "Maksymalny rozmiar przesyłanych obrazów w bajtach. Wartość domyślna to 0, co "
 "oznacza brak ograniczeń."
 
-#: Zotlabs/Module/Admin/Site.php:328
+#: Code/Module/Admin/Site.php:328
 msgid "Cache all public images"
 msgstr "Buforuj wszystkie publiczne obrazy"
 
-#: Zotlabs/Module/Admin/Site.php:328
+#: Code/Module/Admin/Site.php:328
 msgid "If disabled, proxy non-SSL images, but do not store locally"
 msgstr ""
 "Jeśli jest wyłączone, obrazy są przesyłane bez szyfrowania SSL, ale nie "
 "przechowywane lokalnie"
 
-#: Zotlabs/Module/Admin/Site.php:329
+#: Code/Module/Admin/Site.php:329
 msgid "Does this site allow new member registration?"
 msgstr "Czy ten portal umożliwia rejestrację nowych członków?"
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid "Invitation only"
 msgstr "Tylko za zaproszeniem"
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid ""
 "Only allow new member registrations with an invitation code. New member "
 "registration must be allowed for this to work."
@@ -3100,23 +3100,23 @@ msgstr ""
 "Zezwalaj tylko na rejestracje nowych członków za pomocą kodu zaproszenia. "
 "Aby to działało, trzeba zezwolić na rejestrację nowych członków."
 
-#: Zotlabs/Module/Admin/Site.php:332
+#: Code/Module/Admin/Site.php:332
 msgid "Minimum age"
 msgstr "Minimalny wiek"
 
-#: Zotlabs/Module/Admin/Site.php:332
+#: Code/Module/Admin/Site.php:332
 msgid "Minimum age (in years) for who may register on this site."
 msgstr ""
 "Minimalny wiek (w latach) dla osób, które mogą zarejestrować się na tym "
 "portalu."
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 "Które z poniższych stwierdzeń najlepiej opisuje rodzaje kont oferowanych "
 "przez ten portal?"
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid ""
 "If a public server policy is selected, this information may be displayed on "
 "the public server site list."
@@ -3124,21 +3124,21 @@ msgstr ""
 "Jeśli została wybrana zasada serwera publicznego, informacje te mogą być "
 "wyświetlane na liście portali serwerów publicznych."
 
-#: Zotlabs/Module/Admin/Site.php:334
+#: Code/Module/Admin/Site.php:334
 msgid "Register text"
 msgstr "Tekst rejestracyjny"
 
-#: Zotlabs/Module/Admin/Site.php:334
+#: Code/Module/Admin/Site.php:334
 msgid "Will be displayed prominently on the registration page."
 msgstr "Zostanie wyświetlony w widocznym miejscu na stronie rejestracji."
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 "Strona główna portalu do wyświetlania odwiedzającym (domyślnie: formularz "
 "logowania)"
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
@@ -3147,11 +3147,11 @@ msgstr ""
 "wyświetlić systemową stronę internetową o nazwie 'home' lub 'include: home."
 "html', aby dołączyć plik."
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid "Preserve site homepage URL"
 msgstr "Zachowaj adres URL strony głównej portalu"
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
@@ -3159,11 +3159,11 @@ msgstr ""
 "Przedstaw stronę główną portalu w ramce w oryginalnej lokalizacji zamiast "
 "przekierowywania"
 
-#: Zotlabs/Module/Admin/Site.php:338
+#: Code/Module/Admin/Site.php:338
 msgid "Accounts abandoned after x days"
 msgstr "Konta porzucone po x dniach"
 
-#: Zotlabs/Module/Admin/Site.php:338
+#: Code/Module/Admin/Site.php:338
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
@@ -3171,56 +3171,56 @@ msgstr ""
 "Nie marnuje zasobów systemowych na odpytywanie zewnętrznych portali w "
 "poszukiwaniu porzuconych kont. Wpisz 0, aby nie mieć ograniczeń czasowych."
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid "Verify Email Addresses"
 msgstr "Zweryfikuj adresy e-mail"
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 "Zaznacz, aby zweryfikować adresy e-mail użyte podczas rejestracji konta "
 "(zalecane)."
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid "Force publish in directory"
 msgstr "Wymuś publikację w katalogu"
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 "Zaznacz, aby wymusić opublikowanie w katalogu wszystkich profili założonych "
 "na tym portalu."
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid "Public stream"
 msgstr "Strumień publiczny"
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid "Provide a Public stream on your site. This content is unmoderated."
 msgstr ""
 "Zapewnij dostęp do strumienia publicznego w Twoim portalu.  Te treści nie sa "
 "moderowane."
 
-#: Zotlabs/Module/Admin/Site.php:344
+#: Code/Module/Admin/Site.php:344
 msgid "the Public stream is disabled"
 msgstr "ten strumień publiczny jest wyłączony"
 
-#: Zotlabs/Module/Admin/Site.php:345
+#: Code/Module/Admin/Site.php:345
 msgid "the Public stream contains public conversations from this site only"
 msgstr "ten strumień publiczny zawiera rozmowy publiczne tylko z tego portalu"
 
-#: Zotlabs/Module/Admin/Site.php:346
+#: Code/Module/Admin/Site.php:346
 msgid ""
 "the Public stream contains public conversations from anywhere on the internet"
 msgstr "ten strumień publiczny zawiera publiczne rozmowy z całego Internetu"
 
-#: Zotlabs/Module/Admin/Site.php:349
+#: Code/Module/Admin/Site.php:349
 msgid "Allow anybody on the internet to access the Public stream"
 msgstr "Zezwól każdemu w Internecie na dostęp do strumienia publicznego"
 
-#: Zotlabs/Module/Admin/Site.php:349
+#: Code/Module/Admin/Site.php:349
 msgid ""
 "Default is to only allow viewing by site members. Warning: this content is "
 "unmoderated."
@@ -3228,11 +3228,11 @@ msgstr ""
 "Domyślnie zezwala się na przeglądanie tylko członkom portalu. Ostrzeżenie: "
 "ta zawartość jest niemoderowana."
 
-#: Zotlabs/Module/Admin/Site.php:350
+#: Code/Module/Admin/Site.php:350
 msgid "Show numbers of likes and dislikes in conversations"
 msgstr "Pokaż w rozmowach liczbę pochwał i zganień"
 
-#: Zotlabs/Module/Admin/Site.php:350
+#: Code/Module/Admin/Site.php:350
 msgid ""
 "If disabled, the presence of likes and dislikes will be shown, but without "
 "totals."
@@ -3240,19 +3240,19 @@ msgstr ""
 "Jeśli ta opcja jest wyłączona, liczba pochwał i zganień będzie widoczna, ale "
 "bez podsumowania."
 
-#: Zotlabs/Module/Admin/Site.php:351
+#: Code/Module/Admin/Site.php:351
 msgid "Permit animated profile photos"
 msgstr "Zezwalaj na animowane zdjęcia profilowe"
 
-#: Zotlabs/Module/Admin/Site.php:351
+#: Code/Module/Admin/Site.php:351
 msgid "Changing this may take several days to work through the system"
 msgstr "Zmiana tego może zająć kilka dni, aby zostać przetworzona przez system"
 
-#: Zotlabs/Module/Admin/Site.php:352
+#: Code/Module/Admin/Site.php:352
 msgid "Only import Public stream posts with this text"
 msgstr "Importuj tylko wpisy ze strumienia publicznego z tym tekstem"
 
-#: Zotlabs/Module/Admin/Site.php:352 Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:352 Code/Module/Admin/Site.php:353
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
@@ -3260,15 +3260,15 @@ msgstr ""
 "słowa po jednym na wierszu lub #tagi lub /wzorce/ lub lang=xx, pozostaw "
 "puste, aby zaimportować wszystkie wpisy"
 
-#: Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:353
 msgid "Do not import Public stream posts with this text"
 msgstr "Nie importuj wpisów ze strumienia publicznego z tym tekstem"
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid "Maximum number of imported friends of friends"
 msgstr "Maksymalna liczba zaimportowanych znajomych znajomych"
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid ""
 "Warning: higher numbers will improve the quality of friend suggestions and "
 "directory results but can exponentially increase resource usage"
@@ -3276,11 +3276,11 @@ msgstr ""
 "Ostrzeżenie: wyższe liczby poprawią jakość proponowanych znajomych i wyników "
 "w katalogu, ale mogą wykładniczo zwiększyć wykorzystanie zasobów"
 
-#: Zotlabs/Module/Admin/Site.php:355
+#: Code/Module/Admin/Site.php:355
 msgid "Login on Homepage"
 msgstr "Zaloguj się na stronie głównej"
 
-#: Zotlabs/Module/Admin/Site.php:355
+#: Code/Module/Admin/Site.php:355
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
@@ -3288,64 +3288,64 @@ msgstr ""
 "Wyświetlaj formularz logowania odwiedzającym na stronie głównej, jeśli nie "
 "skonfigurowano żadnych innych treści."
 
-#: Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:356
 msgid "Enable context help"
 msgstr "Włącz pomoc kontekstową"
 
-#: Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:356
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 "Wyświetlanie pomocy kontekstowej dla bieżącej strony po naciśnięciu "
 "przycisku pomocy."
 
-#: Zotlabs/Module/Admin/Site.php:357
+#: Code/Module/Admin/Site.php:357
 msgid "Reply-to email address for system generated email."
 msgstr "Zwrotny adres e-mail dla wiadomości wygenerowanych przez system."
 
-#: Zotlabs/Module/Admin/Site.php:358
+#: Code/Module/Admin/Site.php:358
 msgid "Sender (From) email address for system generated email."
 msgstr ""
 "Adres e-mail nadawcy (Od) wiadomości e-mail wygenerowanej przez system."
 
-#: Zotlabs/Module/Admin/Site.php:359
+#: Code/Module/Admin/Site.php:359
 msgid "Display name of email sender for system generated email."
 msgstr "Wyświetlana nazwa nadawcy wiadomości e-mail generowanej przez system."
 
-#: Zotlabs/Module/Admin/Site.php:360
+#: Code/Module/Admin/Site.php:360
 msgid "Directory Server URL"
 msgstr "Adres URL serwera katalogowego"
 
-#: Zotlabs/Module/Admin/Site.php:360
+#: Code/Module/Admin/Site.php:360
 msgid "Default directory server"
 msgstr "Domyślny serwer katalogowy"
 
-#: Zotlabs/Module/Admin/Site.php:361
+#: Code/Module/Admin/Site.php:361
 msgid "Proxy user"
 msgstr "Użytkownik proxy"
 
-#: Zotlabs/Module/Admin/Site.php:362
+#: Code/Module/Admin/Site.php:362
 msgid "Proxy URL"
 msgstr "URL proxy"
 
-#: Zotlabs/Module/Admin/Site.php:363
+#: Code/Module/Admin/Site.php:363
 msgid "Network fetch timeout"
 msgstr "Limit czasu pobierania z sieci"
 
-#: Zotlabs/Module/Admin/Site.php:363 Zotlabs/Module/Admin/Site.php:364
+#: Code/Module/Admin/Site.php:363 Code/Module/Admin/Site.php:364
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 "Wartość w sekundach. Ustaw na 0 dla nieograniczonej liczby (niezalecane)."
 
-#: Zotlabs/Module/Admin/Site.php:364
+#: Code/Module/Admin/Site.php:364
 msgid "Network post timeout"
 msgstr "Limit czasu przesyłania do sieci"
 
-#: Zotlabs/Module/Admin/Site.php:365
+#: Code/Module/Admin/Site.php:365
 msgid "Delivery interval"
 msgstr "Interwał dostaw"
 
-#: Zotlabs/Module/Admin/Site.php:365
+#: Code/Module/Admin/Site.php:365
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
@@ -3355,11 +3355,11 @@ msgstr ""
 "systemu. Zalecane: 4-5 dla hostów współdzielonych, 2-3 dla wirtualnych "
 "serwerów prywatnych. 0-1 dla dużych serwerów dedykowanych."
 
-#: Zotlabs/Module/Admin/Site.php:366
+#: Code/Module/Admin/Site.php:366
 msgid "Deliveries per process"
 msgstr "Liczba dostaw na proces"
 
-#: Zotlabs/Module/Admin/Site.php:366
+#: Code/Module/Admin/Site.php:366
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
@@ -3367,11 +3367,11 @@ msgstr ""
 "Liczba dostaw do podjęcia w ramach jednego procesu systemu operacyjnego. W "
 "razie potrzeby dostosuj, aby dostroić wydajność systemu. Zalecane: 1-5."
 
-#: Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:367
 msgid "Queue Threshold"
 msgstr "Próg kolejki"
 
-#: Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:367
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
@@ -3379,11 +3379,11 @@ msgstr ""
 "Zawsze odraczaj natychmiastowe dostarczenie, jeśli kolejka zawiera więcej "
 "pozycji niż ta liczba."
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid "Poll interval"
 msgstr "Okres odpytywania"
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
@@ -3391,11 +3391,11 @@ msgstr ""
 "Opóźnij procesy sondowania w tle o kilka sekund, aby zmniejszyć obciążenie "
 "systemu. Jeśli 0, użyty będzie interwał dostawy."
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid "Path to ImageMagick convert program"
 msgstr "Ścieżka do programu konwertującego ImageMagick"
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
@@ -3405,11 +3405,11 @@ msgstr ""
 "dużych obrazów (> 4000 pikseli w każdym wymiarze), w przeciwnym razie może "
 "wystąpić wyczerpanie pamięci. Przykład: /usr/bin/convert"
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid "Maximum Load Average"
 msgstr "Maksymalne średnie obciążenie"
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
@@ -3417,77 +3417,77 @@ msgstr ""
 "Maksymalne obciążenie systemu przed odroczeniem procesów dostarczania i "
 "odpytywania - domyślnie 50."
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid "Expiration period in days for imported streams and cached images"
 msgstr ""
 "Okres ważności w dniach dla zaimportowanych strumieni i obrazów w pamięci "
 "podręcznej"
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid "0 for no expiration of imported content"
 msgstr "0 dla braku wygaśnięcia zaimportowanej treści"
 
-#: Zotlabs/Module/Admin/Site.php:372
+#: Code/Module/Admin/Site.php:372
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr ""
 "Nie wygaszaj żadnych wpisów, które mają komentarze z datami mniejszymi niż "
 "ta wartość dni od teraz"
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 "Serwery publiczne: opcjonalna strona lądowania (marketingowa) dla nowych "
 "rejestrujących"
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Utwórz najpierw tą stronę. Domyślnie %s/register"
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "Page to display after creating a new channel"
 msgstr "Strona do wyświetlenia po utworzeniu nowego kanału"
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "Default: profiles"
 msgstr "Domyślnie: profiles"
 
-#: Zotlabs/Module/Admin/Site.php:375
+#: Code/Module/Admin/Site.php:375
 msgid "Site location"
 msgstr "Lokalizacja portalu"
 
-#: Zotlabs/Module/Admin/Site.php:375
+#: Code/Module/Admin/Site.php:375
 msgid "Region or country - shared with other sites"
 msgstr "Region lub kraj - udostępniane innym portalom"
 
-#: Zotlabs/Module/Admin/Themes.php:29
+#: Code/Module/Admin/Themes.php:29
 msgid "Theme settings updated."
 msgstr "Zaktualizowano ustawienia motywu."
 
-#: Zotlabs/Module/Admin/Themes.php:69
+#: Code/Module/Admin/Themes.php:69
 msgid "No themes found."
 msgstr "Nie znaleziono motywów."
 
-#: Zotlabs/Module/Admin/Themes.php:127
+#: Code/Module/Admin/Themes.php:127
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: Zotlabs/Module/Admin/Themes.php:135 Zotlabs/Module/Admin/Themes.php:169
-#: Zotlabs/Widget/Admin.php:34
+#: Code/Module/Admin/Themes.php:135 Code/Module/Admin/Themes.php:169
+#: Code/Widget/Admin.php:34
 msgid "Themes"
 msgstr "Motywy"
 
-#: Zotlabs/Module/Admin/Themes.php:174
+#: Code/Module/Admin/Themes.php:174
 msgid "[Experimental]"
 msgstr "[Eksperymentalne]"
 
-#: Zotlabs/Module/Admin/Themes.php:175
+#: Code/Module/Admin/Themes.php:175
 msgid "[Unsupported]"
 msgstr "[Nieobsługiwane]"
 
-#: Zotlabs/Module/Drafts.php:23
+#: Code/Module/Drafts.php:23
 msgid ""
 "This app allows you to save posts you are writing and finish them later "
 "prior to sharing/publishing."
@@ -3496,19 +3496,19 @@ msgstr ""
 "kończenie ich w późniejszym terminie jeszcze przed udostępnieniem lub "
 "opublikowaniem."
 
-#: Zotlabs/Module/Api.php:84 Zotlabs/Module/Api.php:106
+#: Code/Module/Api.php:84 Code/Module/Api.php:106
 msgid "Authorize application connection"
 msgstr "Autoryzuj połączenie aplikacji"
 
-#: Zotlabs/Module/Api.php:85
+#: Code/Module/Api.php:85
 msgid "Return to your app and insert this Security Code:"
 msgstr "Wróć do aplikacji i wprowadź ten kod bezpieczeństwa:"
 
-#: Zotlabs/Module/Api.php:95
+#: Code/Module/Api.php:95
 msgid "Please login to continue."
 msgstr "Proszę się zalogować w celu kontynuowania."
 
-#: Zotlabs/Module/Api.php:108
+#: Code/Module/Api.php:108
 msgid ""
 "Do you want to authorize this application to access your posts and contacts, "
 "and/or create new posts for you?"
@@ -3516,15 +3516,15 @@ msgstr ""
 "Czy chcesz zezwolić tej aplikacji na dostęp do Twoich wpisów i kontaktów i "
 "ewentualnie na tworzenie nowych wpisów dla Ciebie?"
 
-#: Zotlabs/Module/Apporder.php:46
+#: Code/Module/Apporder.php:46
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Zmień kolejność aplikacji przypiętych do paska nawigacyjnego"
 
-#: Zotlabs/Module/Apporder.php:46
+#: Code/Module/Apporder.php:46
 msgid "Change Order of App Tray Apps"
 msgstr "Zmień kolejność aplikacji na pasku aplikacji"
 
-#: Zotlabs/Module/Apporder.php:47
+#: Code/Module/Apporder.php:47
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the "
 "navbar"
@@ -3532,115 +3532,115 @@ msgstr ""
 "Użyj strzałek, aby przesunąć odpowiednią aplikację w lewo (u góry) lub w "
 "prawo (u dołu) na pasku nawigacyjnym"
 
-#: Zotlabs/Module/Apporder.php:48
+#: Code/Module/Apporder.php:48
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
 "Użyj strzałek, aby przesunąć odpowiednią aplikację w górę lub w dół w "
 "zasobniku aplikacji"
 
-#: Zotlabs/Module/Follow.php:135
+#: Code/Module/Follow.php:135
 msgid "Connection added."
 msgstr "Dodano połączenie."
 
-#: Zotlabs/Module/Apps.php:59 Zotlabs/Widget/Appstore.php:15
+#: Code/Module/Apps.php:59 Code/Widget/Appstore.php:15
 #: include/nav.php:315
 msgid "Available Apps"
 msgstr "Dostępne aplikacje"
 
-#: Zotlabs/Module/Apps.php:59 Zotlabs/Widget/Appstore.php:14
+#: Code/Module/Apps.php:59 Code/Widget/Appstore.php:14
 #: include/nav.php:314
 msgid "Installed Apps"
 msgstr "Zainstalowane aplikacje"
 
-#: Zotlabs/Module/Apps.php:62
+#: Code/Module/Apps.php:62
 msgid "Manage apps"
 msgstr "Zarządzaj aplikacjami"
 
-#: Zotlabs/Module/Apps.php:63
+#: Code/Module/Apps.php:63
 msgid "Create Custom App"
 msgstr "Utwórz własną aplikację"
 
-#: Zotlabs/Module/Common.php:21
+#: Code/Module/Common.php:21
 msgid "No channel."
 msgstr "Brak kanału."
 
-#: Zotlabs/Module/Common.php:55
+#: Code/Module/Common.php:55
 msgid "No connections in common."
 msgstr "Brak popularnych połączeń."
 
-#: Zotlabs/Module/Common.php:75
+#: Code/Module/Common.php:75
 msgid "View Common Connections"
 msgstr "Wyświetl popularne połączenia"
 
-#: Zotlabs/Module/Attach.php:18
+#: Code/Module/Attach.php:18
 msgid "Item not available."
 msgstr "Element nie jest dostępny."
 
-#: Zotlabs/Module/Authorize.php:23
+#: Code/Module/Authorize.php:23
 msgid "Unknown App"
 msgstr "Nieznana aplikacja"
 
-#: Zotlabs/Module/Authorize.php:35
+#: Code/Module/Authorize.php:35
 msgid "Authorize"
 msgstr "Autoryzować"
 
-#: Zotlabs/Module/Authorize.php:36
+#: Code/Module/Authorize.php:36
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr "Czy zezwalasz aplikacji %s na dostęp do danych Twojego kanału?"
 
-#: Zotlabs/Module/Authorize.php:38
+#: Code/Module/Authorize.php:38
 msgid "Allow"
 msgstr "Zezwól"
 
-#: Zotlabs/Module/Cal.php:77
+#: Code/Module/Cal.php:77
 msgid "Permissions denied."
 msgstr "Odmowa dostępu."
 
-#: Zotlabs/Module/Cal.php:283 Zotlabs/Module/Events.php:672
+#: Code/Module/Cal.php:283 Code/Module/Events.php:672
 msgid "l, F j"
 msgstr "l, F j"
 
-#: Zotlabs/Module/Cal.php:331 Zotlabs/Module/Events.php:727
+#: Code/Module/Cal.php:331 Code/Module/Events.php:727
 #: include/text.php:2167
 msgid "Link to Source"
 msgstr "Link do źródła"
 
-#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753
+#: Code/Module/Cal.php:352 Code/Module/Events.php:753
 msgid "Edit Event"
 msgstr "Edytuj wydarzenie"
 
-#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753
+#: Code/Module/Cal.php:352 Code/Module/Events.php:753
 msgid "Create Event"
 msgstr "Utwórz wydarzenie"
 
-#: Zotlabs/Module/Cal.php:353 Zotlabs/Module/Cal.php:360
-#: Zotlabs/Module/Cdav.php:1037 Zotlabs/Module/Events.php:754
-#: Zotlabs/Module/Events.php:763 Zotlabs/Module/Photos.php:1015
+#: Code/Module/Cal.php:353 Code/Module/Cal.php:360
+#: Code/Module/Cdav.php:1037 Code/Module/Events.php:754
+#: Code/Module/Events.php:763 Code/Module/Photos.php:1015
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: Zotlabs/Module/Cal.php:354 Zotlabs/Module/Cal.php:361
-#: Zotlabs/Module/Cdav.php:1038 Zotlabs/Module/Events.php:755
-#: Zotlabs/Module/Events.php:764 Zotlabs/Module/Setup.php:286
-#: Zotlabs/Module/Photos.php:1025
+#: Code/Module/Cal.php:354 Code/Module/Cal.php:361
+#: Code/Module/Cdav.php:1038 Code/Module/Events.php:755
+#: Code/Module/Events.php:764 Code/Module/Setup.php:286
+#: Code/Module/Photos.php:1025
 msgid "Next"
 msgstr "Następny"
 
-#: Zotlabs/Module/Cal.php:358 include/text.php:2875
+#: Code/Module/Cal.php:358 include/text.php:2875
 msgid "Import"
 msgstr "Import"
 
-#: Zotlabs/Module/Cal.php:362 Zotlabs/Module/Cdav.php:1039
-#: Zotlabs/Module/Events.php:765
+#: Code/Module/Cal.php:362 Code/Module/Cdav.php:1039
+#: Code/Module/Events.php:765
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: Zotlabs/Module/Expire.php:25
+#: Code/Module/Expire.php:25
 msgid "Expiration settings updated."
 msgstr "Zaktualizowano ustawienia wygaśnięcia."
 
-#: Zotlabs/Module/Expire.php:35
+#: Code/Module/Expire.php:35
 msgid ""
 "This app allows you to set an optional expiration date/time for your own "
 "posts, after which they will be deleted. This must be at least fifteen "
@@ -3652,370 +3652,370 @@ msgstr ""
 "najmniej piętnaście minut w przyszłości. Możesz także wybrać automatyczne "
 "usuwanie wszystkich swoich wpisów po określonej liczbie dni"
 
-#: Zotlabs/Module/Expire.php:44
+#: Code/Module/Expire.php:44
 msgid "Expire and delete all my posts after this many days"
 msgstr "Wygaś i usuń wszystkie moje wpisy po tej ilości dni"
 
-#: Zotlabs/Module/Expire.php:44
+#: Code/Module/Expire.php:44
 msgid ""
 "Leave at 0 if you wish to manually control expiration of specific posts."
 msgstr ""
 "Pozostaw 0, jeśli chcesz ręcznie kontrolować wygaśnięcie określonych wpisów."
 
-#: Zotlabs/Module/Expire.php:48
+#: Code/Module/Expire.php:48
 msgid "Automatic Expiration Settings"
 msgstr "Ustawienia automatycznego wygaśnięcia"
 
-#: Zotlabs/Module/Admin.php:124
+#: Code/Module/Admin.php:124
 msgid "Blocked accounts"
 msgstr "Zablokowane konta"
 
-#: Zotlabs/Module/Admin.php:125
+#: Code/Module/Admin.php:125
 msgid "Expired accounts"
 msgstr "Wygasłe konta"
 
-#: Zotlabs/Module/Admin.php:126
+#: Code/Module/Admin.php:126
 msgid "Expiring accounts"
 msgstr "Wygasające konta"
 
-#: Zotlabs/Module/Admin.php:143 Zotlabs/Module/Locs.php:134
+#: Code/Module/Admin.php:143 Code/Module/Locs.php:134
 msgid "Primary"
 msgstr "Podstawowy"
 
-#: Zotlabs/Module/Admin.php:144
+#: Code/Module/Admin.php:144
 msgid "Clones"
 msgstr "Klony"
 
-#: Zotlabs/Module/Admin.php:150
+#: Code/Module/Admin.php:150
 msgid "Message queues"
 msgstr "Kolejki wiadomości"
 
-#: Zotlabs/Module/Admin.php:174
+#: Code/Module/Admin.php:174
 msgid "Your software should be updated"
 msgstr "Twoje oprogramowanie powinno zostać zaktualizowane"
 
-#: Zotlabs/Module/Admin.php:180 include/conversation.php:1504
+#: Code/Module/Admin.php:180 include/conversation.php:1504
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: Zotlabs/Module/Admin.php:183
+#: Code/Module/Admin.php:183
 msgid "Registered accounts"
 msgstr "Zarejestrowane konta"
 
-#: Zotlabs/Module/Admin.php:184
+#: Code/Module/Admin.php:184
 msgid "Pending registrations"
 msgstr "Rejestracje oczekujące"
 
-#: Zotlabs/Module/Admin.php:185
+#: Code/Module/Admin.php:185
 msgid "Registered channels"
 msgstr "Zarejestrowane kanały"
 
-#: Zotlabs/Module/Admin.php:186
+#: Code/Module/Admin.php:186
 msgid "Active addons"
 msgstr "Aktywne dodatki"
 
-#: Zotlabs/Module/Admin.php:187 Zotlabs/Module/Sites.php:103
+#: Code/Module/Admin.php:187 Code/Module/Sites.php:103
 msgid "Version"
 msgstr "Wersja"
 
-#: Zotlabs/Module/Admin.php:188
+#: Code/Module/Admin.php:188
 msgid "Repository version (release)"
 msgstr "Wersja repozytorium (release)"
 
-#: Zotlabs/Module/Admin.php:189
+#: Code/Module/Admin.php:189
 msgid "Repository version (dev)"
 msgstr "Wersja repozytorium (dev)"
 
-#: Zotlabs/Module/Block.php:36 Zotlabs/Module/Page.php:46
+#: Code/Module/Block.php:36 Code/Module/Page.php:46
 msgid "Invalid item."
 msgstr "Nieprawidłowy element."
 
-#: Zotlabs/Module/Block.php:86 Zotlabs/Module/Display.php:158
-#: Zotlabs/Module/Display.php:176 Zotlabs/Module/Display.php:194
-#: Zotlabs/Module/Display.php:200 Zotlabs/Module/Page.php:148
-#: Zotlabs/Web/Router.php:166
+#: Code/Module/Block.php:86 Code/Module/Display.php:158
+#: Code/Module/Display.php:176 Code/Module/Display.php:194
+#: Code/Module/Display.php:200 Code/Module/Page.php:148
+#: Code/Web/Router.php:166
 msgid "Page not found."
 msgstr "Nie znaleziono strony."
 
-#: Zotlabs/Module/Cards.php:52
+#: Code/Module/Cards.php:52
 msgid "Create personal planning cards"
 msgstr "Twórz osobiste karty zadań"
 
-#: Zotlabs/Module/Cards.php:110
+#: Code/Module/Cards.php:110
 msgid "Add Card"
 msgstr "Dodaj kartę"
 
-#: Zotlabs/Module/Cards.php:111 Zotlabs/Module/Blocks.php:172
-#: Zotlabs/Module/Cdav.php:1061 Zotlabs/Module/Cdav.php:1365
-#: Zotlabs/Module/Connedit.php:878 Zotlabs/Module/Layouts.php:199
-#: Zotlabs/Module/Menu.php:187 Zotlabs/Module/New_channel.php:203
-#: Zotlabs/Module/Webpages.php:264 Zotlabs/Module/Profiles.php:847
-#: Zotlabs/Storage/Browser.php:302 Zotlabs/Storage/Browser.php:420
-#: Zotlabs/Widget/Cdav.php:148 Zotlabs/Widget/Cdav.php:184
+#: Code/Module/Cards.php:111 Code/Module/Blocks.php:172
+#: Code/Module/Cdav.php:1061 Code/Module/Cdav.php:1365
+#: Code/Module/Connedit.php:878 Code/Module/Layouts.php:199
+#: Code/Module/Menu.php:187 Code/Module/New_channel.php:203
+#: Code/Module/Webpages.php:264 Code/Module/Profiles.php:847
+#: Code/Storage/Browser.php:302 Code/Storage/Browser.php:420
+#: Code/Widget/Cdav.php:148 Code/Widget/Cdav.php:184
 msgid "Create"
 msgstr "Utwórz"
 
-#: Zotlabs/Module/Blocks.php:106 Zotlabs/Module/Blocks.php:168
-#: Zotlabs/Module/Editblock.php:126
+#: Code/Module/Blocks.php:106 Code/Module/Blocks.php:168
+#: Code/Module/Editblock.php:126
 msgid "Block Name"
 msgstr "Nazwa bloku"
 
-#: Zotlabs/Module/Blocks.php:167 include/text.php:2850
+#: Code/Module/Blocks.php:167 include/text.php:2850
 msgid "Blocks"
 msgstr "Bloki"
 
-#: Zotlabs/Module/Blocks.php:169
+#: Code/Module/Blocks.php:169
 msgid "Block Title"
 msgstr "Tytuł bloku"
 
-#: Zotlabs/Module/Blocks.php:170 Zotlabs/Module/Connections.php:250
-#: Zotlabs/Module/Layouts.php:205 Zotlabs/Module/Menu.php:183
-#: Zotlabs/Module/Webpages.php:276
+#: Code/Module/Blocks.php:170 Code/Module/Connections.php:250
+#: Code/Module/Layouts.php:205 Code/Module/Menu.php:183
+#: Code/Module/Webpages.php:276
 msgid "Created"
 msgstr "Utworzono"
 
-#: Zotlabs/Module/Blocks.php:171 Zotlabs/Module/Layouts.php:206
-#: Zotlabs/Module/Menu.php:184 Zotlabs/Module/Webpages.php:277
+#: Code/Module/Blocks.php:171 Code/Module/Layouts.php:206
+#: Code/Module/Menu.php:184 Code/Module/Webpages.php:277
 msgid "Edited"
 msgstr "Edytowano"
 
-#: Zotlabs/Module/Blocks.php:174 Zotlabs/Module/Layouts.php:208
-#: Zotlabs/Module/Webpages.php:266 Zotlabs/Module/Photos.php:1170
-#: Zotlabs/Widget/Cdav.php:144 include/conversation.php:1401
+#: Code/Module/Blocks.php:174 Code/Module/Layouts.php:208
+#: Code/Module/Webpages.php:266 Code/Module/Photos.php:1170
+#: Code/Widget/Cdav.php:144 include/conversation.php:1401
 msgid "Share"
 msgstr "Udostępnij"
 
-#: Zotlabs/Module/Blocks.php:179 Zotlabs/Module/Events.php:759
-#: Zotlabs/Module/Layouts.php:212 Zotlabs/Module/Webpages.php:271
+#: Code/Module/Blocks.php:179 Code/Module/Events.php:759
+#: Code/Module/Layouts.php:212 Code/Module/Webpages.php:271
 msgid "View"
 msgstr "Widok"
 
-#: Zotlabs/Module/Cdav.php:793 Zotlabs/Module/Events.php:39
+#: Code/Module/Cdav.php:793 Code/Module/Events.php:39
 msgid "Calendar entries imported."
 msgstr "Zaimportowano wpisy kalendarza."
 
-#: Zotlabs/Module/Cdav.php:795 Zotlabs/Module/Events.php:41
+#: Code/Module/Cdav.php:795 Code/Module/Events.php:41
 msgid "No calendar entries found."
 msgstr "Nie znaleziono wpisów kalendarza."
 
-#: Zotlabs/Module/Cdav.php:857
+#: Code/Module/Cdav.php:857
 msgid "INVALID EVENT DISMISSED!"
 msgstr "NIEPRAWIDŁOWE WYDARZENIE ODRZUCONE!"
 
-#: Zotlabs/Module/Cdav.php:858
+#: Code/Module/Cdav.php:858
 msgid "Summary: "
 msgstr "Podsumowanie: "
 
-#: Zotlabs/Module/Cdav.php:859
+#: Code/Module/Cdav.php:859
 msgid "Date: "
 msgstr "Data: "
 
-#: Zotlabs/Module/Cdav.php:860 Zotlabs/Module/Cdav.php:866
+#: Code/Module/Cdav.php:860 Code/Module/Cdav.php:866
 msgid "Reason: "
 msgstr "Powód: "
 
-#: Zotlabs/Module/Cdav.php:864
+#: Code/Module/Cdav.php:864
 msgid "INVALID CARD DISMISSED!"
 msgstr "NIEPRAWIDŁOWA KARTA ODRZUCONA!"
 
-#: Zotlabs/Module/Cdav.php:865
+#: Code/Module/Cdav.php:865
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: Zotlabs/Module/Cdav.php:886
+#: Code/Module/Cdav.php:886
 msgid "CardDAV App"
 msgstr "Aplikacja CardDAV"
 
-#: Zotlabs/Module/Cdav.php:886 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
+#: Code/Module/Cdav.php:886 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
 #: extend/addon/a/gallery/Mod_Gallery.php:59
 msgid "Not Installed"
 msgstr "Nie zainstalowana"
 
-#: Zotlabs/Module/Cdav.php:887
+#: Code/Module/Cdav.php:887
 msgid "CalDAV capable addressbook"
 msgstr "Książka adresowa z obsługą CalDAV"
 
-#: Zotlabs/Module/Cdav.php:1014 Zotlabs/Module/Events.php:508
+#: Code/Module/Cdav.php:1014 Code/Module/Events.php:508
 msgid "Event title"
 msgstr "Tytuł wydarzenia"
 
-#: Zotlabs/Module/Cdav.php:1015 Zotlabs/Module/Events.php:514
+#: Code/Module/Cdav.php:1015 Code/Module/Events.php:514
 msgid "Start date and time"
 msgstr "Data i godzina rozpoczęcia"
 
-#: Zotlabs/Module/Cdav.php:1016
+#: Code/Module/Cdav.php:1016
 msgid "End date and time"
 msgstr "Data i godzina zakończenia"
 
-#: Zotlabs/Module/Cdav.php:1017 Zotlabs/Module/Appman.php:140
-#: Zotlabs/Module/Events.php:521
+#: Code/Module/Cdav.php:1017 Code/Module/Appman.php:140
+#: Code/Module/Events.php:521
 msgid "Description"
 msgstr "Opis"
 
-#: Zotlabs/Module/Cdav.php:1018 Zotlabs/Module/Events.php:523
-#: Zotlabs/Module/Sites.php:94 Zotlabs/Module/Locs.php:132
-#: Zotlabs/Module/Profiles.php:536 Zotlabs/Module/Profiles.php:779
+#: Code/Module/Cdav.php:1018 Code/Module/Events.php:523
+#: Code/Module/Sites.php:94 Code/Module/Locs.php:132
+#: Code/Module/Profiles.php:536 Code/Module/Profiles.php:779
 #: include/js_strings.php:29
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: Zotlabs/Module/Cdav.php:1040 Zotlabs/Module/Events.php:760
+#: Code/Module/Cdav.php:1040 Code/Module/Events.php:760
 msgid "Month"
 msgstr "Miesiąc"
 
-#: Zotlabs/Module/Cdav.php:1041 Zotlabs/Module/Events.php:761
+#: Code/Module/Cdav.php:1041 Code/Module/Events.php:761
 msgid "Week"
 msgstr "Tydzień"
 
-#: Zotlabs/Module/Cdav.php:1042 Zotlabs/Module/Events.php:762
+#: Code/Module/Cdav.php:1042 Code/Module/Events.php:762
 msgid "Day"
 msgstr "Dzień"
 
-#: Zotlabs/Module/Cdav.php:1043
+#: Code/Module/Cdav.php:1043
 msgid "List month"
 msgstr "Wymień miesiąc"
 
-#: Zotlabs/Module/Cdav.php:1044
+#: Code/Module/Cdav.php:1044
 msgid "List week"
 msgstr "Wymień tydzień"
 
-#: Zotlabs/Module/Cdav.php:1045
+#: Code/Module/Cdav.php:1045
 msgid "List day"
 msgstr "Wymień dzień"
 
-#: Zotlabs/Module/Cdav.php:1053
+#: Code/Module/Cdav.php:1053
 msgid "More"
 msgstr "Więcej"
 
-#: Zotlabs/Module/Cdav.php:1054
+#: Code/Module/Cdav.php:1054
 msgid "Less"
 msgstr "Mniej"
 
-#: Zotlabs/Module/Cdav.php:1056
+#: Code/Module/Cdav.php:1056
 msgid "Select calendar"
 msgstr "Wybierz kalendarz"
 
-#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:151
+#: Code/Module/Cdav.php:1057 Code/Widget/Cdav.php:151
 msgid "Channel Calendars"
 msgstr "Kalendarze kanału"
 
-#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:137
-#: Zotlabs/Widget/Cdav.php:151
+#: Code/Module/Cdav.php:1057 Code/Widget/Cdav.php:137
+#: Code/Widget/Cdav.php:151
 msgid "CalDAV Calendars"
 msgstr "Kalendarze CalDAV"
 
-#: Zotlabs/Module/Cdav.php:1059
+#: Code/Module/Cdav.php:1059
 msgid "Delete all"
 msgstr "Usuń wszystko"
 
-#: Zotlabs/Module/Cdav.php:1062
+#: Code/Module/Cdav.php:1062
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 "Przepraszamy! Edycja powtarzających się wydarzeń nie została jeszcze "
 "zaimplementowana."
 
-#: Zotlabs/Module/Cdav.php:1351 Zotlabs/Module/Connedit.php:864
+#: Code/Module/Cdav.php:1351 Code/Module/Connedit.php:864
 msgid "Organisation"
 msgstr "Organizacja"
 
-#: Zotlabs/Module/Cdav.php:1352 Zotlabs/Module/Connedit.php:865
+#: Code/Module/Cdav.php:1352 Code/Module/Connedit.php:865
 msgid "Title"
 msgstr "Tytuł"
 
-#: Zotlabs/Module/Cdav.php:1353 Zotlabs/Module/Connedit.php:866
-#: Zotlabs/Module/Profiles.php:835
+#: Code/Module/Cdav.php:1353 Code/Module/Connedit.php:866
+#: Code/Module/Profiles.php:835
 msgid "Phone"
 msgstr "Telefon"
 
-#: Zotlabs/Module/Cdav.php:1355 Zotlabs/Module/Connedit.php:868
-#: Zotlabs/Module/Profiles.php:837
+#: Code/Module/Cdav.php:1355 Code/Module/Connedit.php:868
+#: Code/Module/Profiles.php:837
 msgid "Instant messenger"
 msgstr "Komunikator internetowy"
 
-#: Zotlabs/Module/Cdav.php:1356 Zotlabs/Module/Connedit.php:869
-#: Zotlabs/Module/Profiles.php:838
+#: Code/Module/Cdav.php:1356 Code/Module/Connedit.php:869
+#: Code/Module/Profiles.php:838
 msgid "Website"
 msgstr "Portal"
 
-#: Zotlabs/Module/Cdav.php:1358 Zotlabs/Module/Connedit.php:871
-#: Zotlabs/Module/Profiles.php:840
+#: Code/Module/Cdav.php:1358 Code/Module/Connedit.php:871
+#: Code/Module/Profiles.php:840
 msgid "Note"
 msgstr "Uwagi"
 
-#: Zotlabs/Module/Cdav.php:1359 Zotlabs/Module/Connedit.php:872
-#: Zotlabs/Module/Profiles.php:841 include/connections.php:825
+#: Code/Module/Cdav.php:1359 Code/Module/Connedit.php:872
+#: Code/Module/Profiles.php:841 include/connections.php:825
 #: include/event.php:1514
 msgid "Mobile"
 msgstr "Telefon komórkowy"
 
-#: Zotlabs/Module/Cdav.php:1360 Zotlabs/Module/Connedit.php:873
-#: Zotlabs/Module/Profiles.php:842 include/connections.php:826
+#: Code/Module/Cdav.php:1360 Code/Module/Connedit.php:873
+#: Code/Module/Profiles.php:842 include/connections.php:826
 #: include/event.php:1515
 msgid "Home"
 msgstr "Telefon domowy"
 
-#: Zotlabs/Module/Cdav.php:1361 Zotlabs/Module/Connedit.php:874
-#: Zotlabs/Module/Profiles.php:843 include/connections.php:829
+#: Code/Module/Cdav.php:1361 Code/Module/Connedit.php:874
+#: Code/Module/Profiles.php:843 include/connections.php:829
 #: include/event.php:1518
 msgid "Work"
 msgstr "Telefon służbowy"
 
-#: Zotlabs/Module/Cdav.php:1362 Zotlabs/Module/Connedit.php:875
-#: Zotlabs/Module/Profiles.php:844 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003 Zotlabs/Module/Profiles.php:1073
-#: Zotlabs/Module/Profiles.php:1110 include/connections.php:832
+#: Code/Module/Cdav.php:1362 Code/Module/Connedit.php:875
+#: Code/Module/Profiles.php:844 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003 Code/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1110 include/connections.php:832
 #: include/connections.php:838 include/event.php:1521 include/event.php:1527
 msgid "Other"
 msgstr "Inne"
 
-#: Zotlabs/Module/Cdav.php:1363 Zotlabs/Module/Connedit.php:876
-#: Zotlabs/Module/Profiles.php:845
+#: Code/Module/Cdav.php:1363 Code/Module/Connedit.php:876
+#: Code/Module/Profiles.php:845
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: Zotlabs/Module/Cdav.php:1364 Zotlabs/Module/Connedit.php:877
-#: Zotlabs/Module/Profiles.php:846
+#: Code/Module/Cdav.php:1364 Code/Module/Connedit.php:877
+#: Code/Module/Profiles.php:846
 msgid "Add Field"
 msgstr "Dodaj pole"
 
-#: Zotlabs/Module/Cdav.php:1369 Zotlabs/Module/Connedit.php:882
+#: Code/Module/Cdav.php:1369 Code/Module/Connedit.php:882
 msgid "P.O. Box"
 msgstr "Skrytka pocztowa"
 
-#: Zotlabs/Module/Cdav.php:1370 Zotlabs/Module/Connedit.php:883
+#: Code/Module/Cdav.php:1370 Code/Module/Connedit.php:883
 msgid "Additional"
 msgstr "Dodatkowe"
 
-#: Zotlabs/Module/Cdav.php:1371 Zotlabs/Module/Connedit.php:884
+#: Code/Module/Cdav.php:1371 Code/Module/Connedit.php:884
 msgid "Street"
 msgstr "Ulica"
 
-#: Zotlabs/Module/Cdav.php:1372 Zotlabs/Module/Connedit.php:885
+#: Code/Module/Cdav.php:1372 Code/Module/Connedit.php:885
 msgid "Locality"
 msgstr "Miejscowość"
 
-#: Zotlabs/Module/Cdav.php:1373 Zotlabs/Module/Connedit.php:886
+#: Code/Module/Cdav.php:1373 Code/Module/Connedit.php:886
 msgid "Region"
 msgstr "Region"
 
-#: Zotlabs/Module/Cdav.php:1374 Zotlabs/Module/Connedit.php:887
+#: Code/Module/Cdav.php:1374 Code/Module/Connedit.php:887
 msgid "ZIP Code"
 msgstr "Kod pocztowy"
 
-#: Zotlabs/Module/Cdav.php:1375 Zotlabs/Module/Connedit.php:888
-#: Zotlabs/Module/Profiles.php:803
+#: Code/Module/Cdav.php:1375 Code/Module/Connedit.php:888
+#: Code/Module/Profiles.php:803
 msgid "Country"
 msgstr "Kraj"
 
-#: Zotlabs/Module/Cdav.php:1426
+#: Code/Module/Cdav.php:1426
 msgid "Default Calendar"
 msgstr "Domyślny kalendarz"
 
-#: Zotlabs/Module/Cdav.php:1437
+#: Code/Module/Cdav.php:1437
 msgid "Default Addressbook"
 msgstr "Domyślna książka adresowa"
 
-#: Zotlabs/Module/Changeaddr.php:57
+#: Code/Module/Changeaddr.php:57
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account "
 "password."
@@ -4023,347 +4023,347 @@ msgstr ""
 "Zmiany nazwy kanału są niedozwolone w ciągu 48 godzin od zmiany hasła do "
 "konta."
 
-#: Zotlabs/Module/Changeaddr.php:69 include/channel.php:298
+#: Code/Module/Changeaddr.php:69 include/channel.php:298
 #: include/channel.php:749
 msgid "Reserved nickname. Please choose another."
 msgstr "Ten pseudonim jest już zarezerwowany. Proszę wybrać inny."
 
-#: Zotlabs/Module/Changeaddr.php:74 include/channel.php:303
+#: Code/Module/Changeaddr.php:74 include/channel.php:303
 #: include/channel.php:754
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 "Pseudonim zawiera nieobsługiwane znaki lub jest już używany w tym serwisie."
 
-#: Zotlabs/Module/Changeaddr.php:88
+#: Code/Module/Changeaddr.php:88
 msgid "Feature has been disabled"
 msgstr "Funkcjonalność została wyłączona"
 
-#: Zotlabs/Module/Changeaddr.php:107
+#: Code/Module/Changeaddr.php:107
 msgid "Change channel nickname/address"
 msgstr "Zmień pseudonim/adres kanału"
 
-#: Zotlabs/Module/Changeaddr.php:108 Zotlabs/Module/Removeme.php:72
-#: Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Changeaddr.php:108 Code/Module/Removeme.php:72
+#: Code/Module/Removeaccount.php:72
 msgid "WARNING: "
 msgstr "OSTRZEŻENIE: "
 
-#: Zotlabs/Module/Changeaddr.php:108
+#: Code/Module/Changeaddr.php:108
 msgid "Any/all connections on other networks will be lost!"
 msgstr "Wszystkie połączenia w innych sieciach zostaną utracone!"
 
-#: Zotlabs/Module/Changeaddr.php:109 Zotlabs/Module/Removeme.php:73
-#: Zotlabs/Module/Removeaccount.php:73
+#: Code/Module/Changeaddr.php:109 Code/Module/Removeme.php:73
+#: Code/Module/Removeaccount.php:73
 msgid "Please enter your password for verification:"
 msgstr "Wprowadź hasło w celu weryfikacji:"
 
-#: Zotlabs/Module/Changeaddr.php:110
+#: Code/Module/Changeaddr.php:110
 msgid "New channel address"
 msgstr "Nowy adres kanału"
 
-#: Zotlabs/Module/Changeaddr.php:111
+#: Code/Module/Changeaddr.php:111
 msgid "Rename Channel"
 msgstr "Zmień nazwę kanału"
 
-#: Zotlabs/Module/Ping.php:432
+#: Code/Module/Ping.php:432
 msgid "added your channel"
 msgstr "dodał Twój kanał"
 
-#: Zotlabs/Module/Ping.php:457
+#: Code/Module/Ping.php:457
 msgid "requires approval"
 msgstr "wymaga zatwierdzenia"
 
-#: Zotlabs/Module/Ping.php:466
+#: Code/Module/Ping.php:466
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: Zotlabs/Module/Ping.php:484
+#: Code/Module/Ping.php:484
 msgid "[today]"
 msgstr "[dzisiaj]"
 
-#: Zotlabs/Module/Ping.php:494
+#: Code/Module/Ping.php:494
 msgid "posted an event"
 msgstr "opublikował wydarzenie"
 
-#: Zotlabs/Module/Ping.php:528
+#: Code/Module/Ping.php:528
 msgid "shared a file with you"
 msgstr "udostępnił Ci plik"
 
-#: Zotlabs/Module/Ping.php:556
+#: Code/Module/Ping.php:556
 msgid "reported content"
 msgstr "zgłosił treść"
 
-#: Zotlabs/Module/Ping.php:770
+#: Code/Module/Ping.php:770
 msgid "Private group"
 msgstr "Grupa prywatności"
 
-#: Zotlabs/Module/Ping.php:770
+#: Code/Module/Ping.php:770
 msgid "Public group"
 msgstr "Grupa publiczna"
 
-#: Zotlabs/Module/Help.php:24
+#: Code/Module/Help.php:24
 msgid "Documentation Search"
 msgstr "Przeszukaj dokumentację"
 
-#: Zotlabs/Module/Help.php:95
+#: Code/Module/Help.php:95
 msgid "Unknown language"
 msgstr "Nieznany język"
 
-#: Zotlabs/Module/Help.php:114
+#: Code/Module/Help.php:114
 msgid "$Projectname Documentation"
 msgstr "Dokumentacja $Projectname"
 
-#: Zotlabs/Module/Help.php:115
+#: Code/Module/Help.php:115
 msgid "Contents"
 msgstr "Zawartość"
 
-#: Zotlabs/Module/Chatsvc.php:146
+#: Code/Module/Chatsvc.php:146
 msgid "Away"
 msgstr "Z dala"
 
-#: Zotlabs/Module/Chatsvc.php:151
+#: Code/Module/Chatsvc.php:151
 msgid "Online"
 msgstr "On-line"
 
-#: Zotlabs/Module/Connedit.php:88 Zotlabs/Module/Defperms.php:74
+#: Code/Module/Connedit.php:88 Code/Module/Defperms.php:74
 msgid "Could not access contact record."
 msgstr "Brak dostępu do rekordu kontaktu."
 
-#: Zotlabs/Module/Connedit.php:120
+#: Code/Module/Connedit.php:120
 msgid "Could not locate selected profile."
 msgstr "Nie udało się znaleźć wybranego profilu."
 
-#: Zotlabs/Module/Connedit.php:203
+#: Code/Module/Connedit.php:203
 msgid "Connection updated."
 msgstr "Zaktualizowano połączenie."
 
-#: Zotlabs/Module/Connedit.php:205
+#: Code/Module/Connedit.php:205
 msgid "Failed to update connection record."
 msgstr "Nie udało się zaktualizować zapisu połączenia."
 
-#: Zotlabs/Module/Connedit.php:250
+#: Code/Module/Connedit.php:250
 msgid "is now connected to"
 msgstr "jest teraz połączony z"
 
-#: Zotlabs/Module/Connedit.php:377
+#: Code/Module/Connedit.php:377
 msgid "Could not access address book record."
 msgstr "Nie można uzyskać dostępu do rekordu książki adresowej."
 
-#: Zotlabs/Module/Connedit.php:423
+#: Code/Module/Connedit.php:423
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Odświeżenie nie powiodło się - kanał jest obecnie niedostępny."
 
-#: Zotlabs/Module/Connedit.php:450
+#: Code/Module/Connedit.php:450
 msgid "Added by Connedit"
 msgstr "Dodane przez Connedit"
 
-#: Zotlabs/Module/Connedit.php:488
+#: Code/Module/Connedit.php:488
 msgid "Unable to set address book parameters."
 msgstr "Nie można ustawić parametrów książki adresowej."
 
-#: Zotlabs/Module/Connedit.php:505
+#: Code/Module/Connedit.php:505
 msgid "Connection has been removed."
 msgstr "Połączenie zostało usunięte."
 
-#: Zotlabs/Module/Connedit.php:551
+#: Code/Module/Connedit.php:551
 #, php-format
 msgid "View %s's profile"
 msgstr "Wyświetl profil %s"
 
-#: Zotlabs/Module/Connedit.php:555
+#: Code/Module/Connedit.php:555
 msgid "Refresh Permissions"
 msgstr "Odśwież uprawnienia"
 
-#: Zotlabs/Module/Connedit.php:558
+#: Code/Module/Connedit.php:558
 msgid "Fetch updated permissions"
 msgstr "Pobierz zaktualizowane uprawnienia"
 
-#: Zotlabs/Module/Connedit.php:562
+#: Code/Module/Connedit.php:562
 msgid "Refresh Photo"
 msgstr "Odśwież zdjęcie"
 
-#: Zotlabs/Module/Connedit.php:565
+#: Code/Module/Connedit.php:565
 msgid "Fetch updated photo"
 msgstr "Pobierz zaktualizowane zdjęcie"
 
-#: Zotlabs/Module/Connedit.php:569 include/conversation.php:965
+#: Code/Module/Connedit.php:569 include/conversation.php:965
 msgid "Recent Activity"
 msgstr "Ostatnia aktywność"
 
-#: Zotlabs/Module/Connedit.php:572
+#: Code/Module/Connedit.php:572
 msgid "View recent posts and comments"
 msgstr "Wyświetl najnowsze wpisy i komentarze"
 
-#: Zotlabs/Module/Connedit.php:579
+#: Code/Module/Connedit.php:579
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Zablokuj (lub odblokuj) całą komunikację z tym połączeniem"
 
-#: Zotlabs/Module/Connedit.php:580
+#: Code/Module/Connedit.php:580
 msgid "This connection is blocked"
 msgstr "To połączenie jest zablokowane"
 
-#: Zotlabs/Module/Connedit.php:584
+#: Code/Module/Connedit.php:584
 msgid "Unignore"
 msgstr "Przestań ignorować"
 
-#: Zotlabs/Module/Connedit.php:584 Zotlabs/Module/Connections.php:343
+#: Code/Module/Connedit.php:584 Code/Module/Connections.php:343
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: Zotlabs/Module/Connedit.php:587
+#: Code/Module/Connedit.php:587
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignoruj (lub przywróć) całą komunikację przychodzącą z tego połączenia"
 
-#: Zotlabs/Module/Connedit.php:588
+#: Code/Module/Connedit.php:588
 msgid "This connection is ignored"
 msgstr "To połączenie jest ignorowane"
 
-#: Zotlabs/Module/Connedit.php:595
+#: Code/Module/Connedit.php:595
 msgid "Censor (or Uncensor) images from this connection"
 msgstr "Cenzuruj (lub przestań cenzorować) obrazy z tego połączenia"
 
-#: Zotlabs/Module/Connedit.php:596
+#: Code/Module/Connedit.php:596
 msgid "This connection is censored"
 msgstr "To połączenie jest cenzorowane"
 
-#: Zotlabs/Module/Connedit.php:600
+#: Code/Module/Connedit.php:600
 msgid "Unarchive"
 msgstr "Przywróć z archiwum"
 
-#: Zotlabs/Module/Connedit.php:600
+#: Code/Module/Connedit.php:600
 msgid "Archive"
 msgstr "Archiwizuj"
 
-#: Zotlabs/Module/Connedit.php:603
+#: Code/Module/Connedit.php:603
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 "Archiwizuj (lub przywróć) to połączenie - zaznacz kanał jako martwy, ale "
 "zachowaj zawartość"
 
-#: Zotlabs/Module/Connedit.php:604
+#: Code/Module/Connedit.php:604
 msgid "This connection is archived"
 msgstr "To połączenie zostało zarchiwizowane"
 
-#: Zotlabs/Module/Connedit.php:608
+#: Code/Module/Connedit.php:608
 msgid "Unhide"
 msgstr "Odkryj"
 
-#: Zotlabs/Module/Connedit.php:608
+#: Code/Module/Connedit.php:608
 msgid "Hide"
 msgstr "Ukryj"
 
-#: Zotlabs/Module/Connedit.php:611
+#: Code/Module/Connedit.php:611
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Ukryj lub odkryj to połączenie na liście innymi połączeń"
 
-#: Zotlabs/Module/Connedit.php:612
+#: Code/Module/Connedit.php:612
 msgid "This connection is hidden"
 msgstr "To połączenie jest ukryte"
 
-#: Zotlabs/Module/Connedit.php:619
+#: Code/Module/Connedit.php:619
 msgid "Delete this connection"
 msgstr "Usuń to połączenie"
 
-#: Zotlabs/Module/Connedit.php:627
+#: Code/Module/Connedit.php:627
 msgid "Fetch Vcard"
 msgstr "Pobierz Vcard"
 
-#: Zotlabs/Module/Connedit.php:630
+#: Code/Module/Connedit.php:630
 msgid "Fetch electronic calling card for this connection"
 msgstr "Pobierz kartę rozmów elektronicznych dla tego połączenia"
 
-#: Zotlabs/Module/Connedit.php:637 Zotlabs/Module/Filestorage.php:230
-#: Zotlabs/Module/Thing.php:355 Zotlabs/Module/Thing.php:410
-#: Zotlabs/Module/Chat.php:240 Zotlabs/Module/Photos.php:736
-#: Zotlabs/Module/Photos.php:1121
+#: Code/Module/Connedit.php:637 Code/Module/Filestorage.php:230
+#: Code/Module/Thing.php:355 Code/Module/Thing.php:410
+#: Code/Module/Chat.php:240 Code/Module/Photos.php:736
+#: Code/Module/Photos.php:1121
 #: extend/addon/a/flashcards/Mod_Flashcards.php:254
 #: extend/addon/a/faces/Mod_Faces.php:172 include/acl_selectors.php:152
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: Zotlabs/Module/Connedit.php:640
+#: Code/Module/Connedit.php:640
 msgid "Open Individual Permissions section by default"
 msgstr "Otwórz domyślnie sekcję Uprawnienia indywidualne"
 
-#: Zotlabs/Module/Connedit.php:666
+#: Code/Module/Connedit.php:666
 msgid "Open Friend Zoom section by default"
 msgstr "Otwieraj domyślnie sekcję Ustaw stopień zaprzyjażnienia"
 
-#: Zotlabs/Module/Connedit.php:670 Zotlabs/Module/Affinity.php:61
-#: Zotlabs/Widget/Affinity.php:26
+#: Code/Module/Connedit.php:670 Code/Module/Affinity.php:61
+#: Code/Widget/Affinity.php:26
 msgid "Me"
 msgstr "Ja"
 
-#: Zotlabs/Module/Connedit.php:671 Zotlabs/Module/Affinity.php:62
-#: Zotlabs/Widget/Affinity.php:27
+#: Code/Module/Connedit.php:671 Code/Module/Affinity.php:62
+#: Code/Widget/Affinity.php:27
 msgid "Family"
 msgstr "Rodzina"
 
-#: Zotlabs/Module/Connedit.php:672 Zotlabs/Module/Profiles.php:1092
-#: Zotlabs/Module/Affinity.php:63 Zotlabs/Module/Settings/Channel.php:78
-#: Zotlabs/Module/Settings/Channel.php:81
-#: Zotlabs/Module/Settings/Channel.php:82
-#: Zotlabs/Module/Settings/Channel.php:86
-#: Zotlabs/Module/Settings/Channel.php:97 Zotlabs/Widget/Affinity.php:28
-#: Zotlabs/Import/Friendica.php:244 Zotlabs/Import/Friendica.php:245
-#: Zotlabs/Import/Friendica.php:253 include/channel.php:529
+#: Code/Module/Connedit.php:672 Code/Module/Profiles.php:1092
+#: Code/Module/Affinity.php:63 Code/Module/Settings/Channel.php:78
+#: Code/Module/Settings/Channel.php:81
+#: Code/Module/Settings/Channel.php:82
+#: Code/Module/Settings/Channel.php:86
+#: Code/Module/Settings/Channel.php:97 Code/Widget/Affinity.php:28
+#: Code/Import/Friendica.php:244 Code/Import/Friendica.php:245
+#: Code/Import/Friendica.php:253 include/channel.php:529
 #: include/channel.php:531
 msgid "Friends"
 msgstr "Przyjaciele"
 
-#: Zotlabs/Module/Connedit.php:673 Zotlabs/Module/Affinity.php:64
-#: Zotlabs/Widget/Affinity.php:29
+#: Code/Module/Connedit.php:673 Code/Module/Affinity.php:64
+#: Code/Widget/Affinity.php:29
 msgid "Peers"
 msgstr "Koledzy"
 
-#: Zotlabs/Module/Connedit.php:675 Zotlabs/Module/Connections.php:88
-#: Zotlabs/Module/Connections.php:111 Zotlabs/Module/Affinity.php:66
-#: Zotlabs/Widget/Affinity.php:31
+#: Code/Module/Connedit.php:675 Code/Module/Connections.php:88
+#: Code/Module/Connections.php:111 Code/Module/Affinity.php:66
+#: Code/Widget/Affinity.php:31
 msgid "All"
 msgstr "Wszyscy"
 
-#: Zotlabs/Module/Connedit.php:692
+#: Code/Module/Connedit.php:692
 msgid "Filter"
 msgstr "Filtr"
 
-#: Zotlabs/Module/Connedit.php:695
+#: Code/Module/Connedit.php:695
 msgid "Open Custom Filter section by default"
 msgstr "Otwieraj domyślnie sekcję Własny filtr"
 
-#: Zotlabs/Module/Connedit.php:732
+#: Code/Module/Connedit.php:732
 msgid "Approve this connection"
 msgstr "Zatwierdź to połączenie"
 
-#: Zotlabs/Module/Connedit.php:732
+#: Code/Module/Connedit.php:732
 msgid "Accept connection to allow communication"
 msgstr "Zaakceptuj połączenie, aby umożliwić komunikację"
 
-#: Zotlabs/Module/Connedit.php:737
+#: Code/Module/Connedit.php:737
 msgid "Set Friend Zoom"
 msgstr "Ustaw stopień zaprzyjaźnienia"
 
-#: Zotlabs/Module/Connedit.php:741
+#: Code/Module/Connedit.php:741
 msgid "Set Profile"
 msgstr "Ustaw profil"
 
-#: Zotlabs/Module/Connedit.php:745
+#: Code/Module/Connedit.php:745
 msgid "Set Friend Zoom & Profile"
 msgstr "Ustaw stopień zaprzyjaźnienia i profil"
 
-#: Zotlabs/Module/Connedit.php:793
+#: Code/Module/Connedit.php:793
 msgid "This connection is unreachable from this location."
 msgstr "To połączenie jest nieosiągalne z tej lokalizacji."
 
-#: Zotlabs/Module/Connedit.php:794
+#: Code/Module/Connedit.php:794
 msgid "This connection may be unreachable from other channel locations."
 msgstr "To połączenie może być nieosiągalne z innych lokalizacji kanału."
 
-#: Zotlabs/Module/Connedit.php:796
+#: Code/Module/Connedit.php:796
 msgid "Location independence is not supported by their network."
 msgstr "Niezależność lokalizacji nie jest obsługiwana przez ich sieć."
 
-#: Zotlabs/Module/Connedit.php:801
+#: Code/Module/Connedit.php:801
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
@@ -4371,54 +4371,54 @@ msgstr ""
 "To połączenie jest nieosiągalne z tej lokalizacji. Niezależność lokalizacji "
 "nie jest obsługiwana przez ich sieć."
 
-#: Zotlabs/Module/Connedit.php:805 Zotlabs/Module/Defperms.php:247
+#: Code/Module/Connedit.php:805 Code/Module/Defperms.php:247
 msgid "Connection Default Permissions"
 msgstr "Domyślne uprawnienia połączenia"
 
-#: Zotlabs/Module/Connedit.php:805 include/items.php:4561
+#: Code/Module/Connedit.php:805 include/items.php:4561
 #, php-format
 msgid "Connection: %s"
 msgstr "Połączenie: %s"
 
-#: Zotlabs/Module/Connedit.php:806 Zotlabs/Module/Defperms.php:248
+#: Code/Module/Connedit.php:806 Code/Module/Defperms.php:248
 msgid "Apply these permissions automatically"
 msgstr "Zastosuj te uprawnienia automatycznie"
 
-#: Zotlabs/Module/Connedit.php:806
+#: Code/Module/Connedit.php:806
 msgid "Connection requests will be approved without your interaction"
 msgstr "Prośby o połączenie zostaną zatwierdzone bez Twojej interakcji"
 
-#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:249
+#: Code/Module/Connedit.php:807 Code/Module/Defperms.php:249
 msgid "Permission role"
 msgstr "Rola uprawnień"
 
-#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:249
-#: Zotlabs/Module/New_channel.php:171 Zotlabs/Module/New_channel.php:178
-#: Zotlabs/Widget/Notifications.php:151 include/nav.php:301
+#: Code/Module/Connedit.php:807 Code/Module/Defperms.php:249
+#: Code/Module/New_channel.php:171 Code/Module/New_channel.php:178
+#: Code/Widget/Notifications.php:151 include/nav.php:301
 msgid "Loading"
 msgstr "Ładowanie"
 
-#: Zotlabs/Module/Connedit.php:808 Zotlabs/Module/Defperms.php:250
+#: Code/Module/Connedit.php:808 Code/Module/Defperms.php:250
 msgid "Add permission role"
 msgstr "Dodaj rolę uprawnień"
 
-#: Zotlabs/Module/Connedit.php:812
+#: Code/Module/Connedit.php:812
 msgid "Ignore shares and repeats this connection posts"
 msgstr "Ignoruje udostępnienia i powtarza posty z tych połączeń"
 
-#: Zotlabs/Module/Connedit.php:812
+#: Code/Module/Connedit.php:812
 msgid "Note: This is not recommended for Groups."
 msgstr "Uwaga: nie jest to zalecane w przypadku grup."
 
-#: Zotlabs/Module/Connedit.php:816
+#: Code/Module/Connedit.php:816
 msgid "This connection's primary address is"
 msgstr "Podstawowym adresem tego połączenia jest"
 
-#: Zotlabs/Module/Connedit.php:817
+#: Code/Module/Connedit.php:817
 msgid "Available locations:"
 msgstr "Dostępne lokalizacje:"
 
-#: Zotlabs/Module/Connedit.php:822 Zotlabs/Module/Defperms.php:254
+#: Code/Module/Connedit.php:822 Code/Module/Defperms.php:254
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
@@ -4426,35 +4426,35 @@ msgstr ""
 "Uprawnienia wskazane na tej stronie zostaną zastosowane do wszystkich nowych "
 "połączeń."
 
-#: Zotlabs/Module/Connedit.php:823
+#: Code/Module/Connedit.php:823
 msgid "Connection Tools"
 msgstr "Narzędzia połączeń"
 
-#: Zotlabs/Module/Connedit.php:825
+#: Code/Module/Connedit.php:825
 msgid "Slide to adjust your degree of friendship"
 msgstr "Przesuń, aby dostosować stopień zaprzyjaźnienia"
 
-#: Zotlabs/Module/Connedit.php:826 include/js_strings.php:24
+#: Code/Module/Connedit.php:826 include/js_strings.php:24
 msgid "Rating"
 msgstr "Ocena"
 
-#: Zotlabs/Module/Connedit.php:827
+#: Code/Module/Connedit.php:827
 msgid "Slide to adjust your rating"
 msgstr "Przesuń, aby dostosować swoją ocenę"
 
-#: Zotlabs/Module/Connedit.php:828 Zotlabs/Module/Connedit.php:834
+#: Code/Module/Connedit.php:828 Code/Module/Connedit.php:834
 msgid "Optionally explain your rating"
 msgstr "Ewentualnie wyjaśnij swoją ocenę"
 
-#: Zotlabs/Module/Connedit.php:830
+#: Code/Module/Connedit.php:830
 msgid "Custom Filter"
 msgstr "Własny filtr"
 
-#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Content_filter.php:51
+#: Code/Module/Connedit.php:831 Code/Module/Content_filter.php:51
 msgid "Only import posts with this text"
 msgstr "Importuj tylko wpisy z tym tekstem"
 
-#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Connedit.php:832
+#: Code/Module/Connedit.php:831 Code/Module/Connedit.php:832
 msgid ""
 "words one per line or #tags, $categories, /patterns/, or lang=xx, leave "
 "blank to import all posts"
@@ -4462,33 +4462,33 @@ msgstr ""
 "słowa po jednym w wierszu lub #tags lub /patterns/ lub lang=xx, pozostaw "
 "puste, aby zaimportować wszystkie wpisy"
 
-#: Zotlabs/Module/Connedit.php:832 Zotlabs/Module/Content_filter.php:59
+#: Code/Module/Connedit.php:832 Code/Module/Content_filter.php:59
 msgid "Do not import posts with this text"
 msgstr "Nie importuj wpisów z tym tekstem"
 
-#: Zotlabs/Module/Connedit.php:833 extend/addon/a/zotpost/Mod_zotpost.php:69
+#: Code/Module/Connedit.php:833 extend/addon/a/zotpost/Mod_zotpost.php:69
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: Zotlabs/Module/Connedit.php:833
+#: Code/Module/Connedit.php:833
 msgid "optional - allows you to search by a name that you have chosen"
 msgstr "opcjonalne - umożliwia wyszukiwanie według wybranej przez Ciebie nazwy"
 
-#: Zotlabs/Module/Connedit.php:835
+#: Code/Module/Connedit.php:835
 msgid "This information is public!"
 msgstr "Ta informacja jest publiczna!"
 
-#: Zotlabs/Module/Connedit.php:840
+#: Code/Module/Connedit.php:840
 msgid "Connection Pending Approval"
 msgstr "Połączenie oczekujące na zatwierdzenie"
 
-#: Zotlabs/Module/Connedit.php:843 Zotlabs/Module/Defperms.php:257
-#: Zotlabs/Module/Settings/Permcats.php:122
-#: Zotlabs/Module/Settings/Tokens.php:309
+#: Code/Module/Connedit.php:843 Code/Module/Defperms.php:257
+#: Code/Module/Settings/Permcats.php:122
+#: Code/Module/Settings/Tokens.php:309
 msgid "inherited"
 msgstr "dziedziczone"
 
-#: Zotlabs/Module/Connedit.php:845
+#: Code/Module/Connedit.php:845
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
@@ -4497,24 +4497,24 @@ msgstr ""
 "Wybierz profil, który chcesz wyświetlić dla %s, podczas bezpiecznego "
 "przeglądania swojego profilu."
 
-#: Zotlabs/Module/Connedit.php:847 Zotlabs/Module/Settings/Tokens.php:306
+#: Code/Module/Connedit.php:847 Code/Module/Settings/Tokens.php:306
 msgid "Their Settings"
 msgstr "Ich ustawienia"
 
-#: Zotlabs/Module/Connedit.php:848 Zotlabs/Module/Defperms.php:259
-#: Zotlabs/Module/Settings/Permcats.php:120
-#: Zotlabs/Module/Settings/Tokens.php:307
+#: Code/Module/Connedit.php:848 Code/Module/Defperms.php:259
+#: Code/Module/Settings/Permcats.php:120
+#: Code/Module/Settings/Tokens.php:307
 msgid "My Settings"
 msgstr "Moje ustawienia"
 
-#: Zotlabs/Module/Connedit.php:850 Zotlabs/Module/Defperms.php:262
-#: Zotlabs/Module/Settings/Permcats.php:125
-#: Zotlabs/Module/Settings/Tokens.php:312
+#: Code/Module/Connedit.php:850 Code/Module/Defperms.php:262
+#: Code/Module/Settings/Permcats.php:125
+#: Code/Module/Settings/Tokens.php:312
 msgid "Individual Permissions"
 msgstr "Uprawnienia indywidualne"
 
-#: Zotlabs/Module/Connedit.php:851 Zotlabs/Module/Settings/Permcats.php:126
-#: Zotlabs/Module/Settings/Tokens.php:313
+#: Code/Module/Connedit.php:851 Code/Module/Settings/Permcats.php:126
+#: Code/Module/Settings/Tokens.php:313
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
@@ -4525,7 +4525,7 @@ msgstr ""
 "wyższy priorytet niż indywidualne ustawienia.  Nie możesz "
 "tutaj zmienić tych ustawień."
 
-#: Zotlabs/Module/Connedit.php:852
+#: Code/Module/Connedit.php:852
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
@@ -4538,189 +4538,189 @@ msgstr ""
 "tutaj, ale nie będą one miały żadnego wpływu, chyba że odziedziczone "
 "ustawienie ulegnie zmianie."
 
-#: Zotlabs/Module/Connedit.php:853
+#: Code/Module/Connedit.php:853
 msgid "Last update:"
 msgstr "Ostatnia aktualizacja:"
 
-#: Zotlabs/Module/Connedit.php:861
+#: Code/Module/Connedit.php:861
 msgid "Details"
 msgstr "Szczegóły"
 
-#: Zotlabs/Module/Connections.php:68 Zotlabs/Module/Connections.php:155
-#: Zotlabs/Module/Connections.php:298
+#: Code/Module/Connections.php:68 Code/Module/Connections.php:155
+#: Code/Module/Connections.php:298
 msgid "Blocked"
 msgstr "Zablokowane"
 
-#: Zotlabs/Module/Connections.php:73 Zotlabs/Module/Connections.php:162
-#: Zotlabs/Module/Connections.php:297
+#: Code/Module/Connections.php:73 Code/Module/Connections.php:162
+#: Code/Module/Connections.php:297
 msgid "Ignored"
 msgstr "Ignorowane"
 
-#: Zotlabs/Module/Connections.php:78 Zotlabs/Module/Connections.php:176
-#: Zotlabs/Module/Connections.php:296
+#: Code/Module/Connections.php:78 Code/Module/Connections.php:176
+#: Code/Module/Connections.php:296
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: Zotlabs/Module/Connections.php:83 Zotlabs/Module/Connections.php:169
+#: Code/Module/Connections.php:83 Code/Module/Connections.php:169
 msgid "Archived/Unreachable"
 msgstr "Zarchiwizowane/Nieosiągalne"
 
-#: Zotlabs/Module/Connections.php:93 Zotlabs/Module/Connections.php:107
-#: Zotlabs/Module/Menu.php:185 Zotlabs/Module/Notifications.php:63
+#: Code/Module/Connections.php:93 Code/Module/Connections.php:107
+#: Code/Module/Menu.php:185 Code/Module/Notifications.php:63
 msgid "New"
 msgstr "Nowe"
 
-#: Zotlabs/Module/Connections.php:141
+#: Code/Module/Connections.php:141
 msgid "Active Connections"
 msgstr "Aktywne połączenia"
 
-#: Zotlabs/Module/Connections.php:144
+#: Code/Module/Connections.php:144
 msgid "Show active connections"
 msgstr "Pokaż aktywne połączenia"
 
-#: Zotlabs/Module/Connections.php:148 Zotlabs/Widget/Notifications.php:73
+#: Code/Module/Connections.php:148 Code/Widget/Notifications.php:73
 msgid "New Connections"
 msgstr "Nowe połączenia"
 
-#: Zotlabs/Module/Connections.php:151
+#: Code/Module/Connections.php:151
 msgid "Show pending (new) connections"
 msgstr "Pokaż oczekujące (nowe) połączenia"
 
-#: Zotlabs/Module/Connections.php:158
+#: Code/Module/Connections.php:158
 msgid "Only show blocked connections"
 msgstr "Pokaż tylko zablokowane połączenia"
 
-#: Zotlabs/Module/Connections.php:165
+#: Code/Module/Connections.php:165
 msgid "Only show ignored connections"
 msgstr "Pokaż tylko ignorowane połączenia"
 
-#: Zotlabs/Module/Connections.php:172
+#: Code/Module/Connections.php:172
 msgid "Only show archived/unreachable connections"
 msgstr "Pokaż tylko zarchiwizowane/nieosiągalne połączenia"
 
-#: Zotlabs/Module/Connections.php:179
+#: Code/Module/Connections.php:179
 msgid "Only show hidden connections"
 msgstr "Pokaż tylko ukryte połączenia"
 
-#: Zotlabs/Module/Connections.php:183 Zotlabs/Module/Profperm.php:158
+#: Code/Module/Connections.php:183 Code/Module/Profperm.php:158
 msgid "All Connections"
 msgstr "Wszystkie połączenia"
 
-#: Zotlabs/Module/Connections.php:186
+#: Code/Module/Connections.php:186
 msgid "Show all connections"
 msgstr "Pokaż wszystkie połączenia"
 
-#: Zotlabs/Module/Connections.php:239
+#: Code/Module/Connections.php:239
 msgid "Order by name"
 msgstr "Kolejność wg nazwy"
 
-#: Zotlabs/Module/Connections.php:243
+#: Code/Module/Connections.php:243
 msgid "Recent"
 msgstr "Najnowsze"
 
-#: Zotlabs/Module/Connections.php:246
+#: Code/Module/Connections.php:246
 msgid "Order by recent"
 msgstr "Kolejność wg najnowszych"
 
-#: Zotlabs/Module/Connections.php:253
+#: Code/Module/Connections.php:253
 msgid "Order by date"
 msgstr "Kolejność wg daty"
 
-#: Zotlabs/Module/Connections.php:294
+#: Code/Module/Connections.php:294
 msgid "Pending approval"
 msgstr "W oczekiwaniu na zatwierdzenie"
 
-#: Zotlabs/Module/Connections.php:295
+#: Code/Module/Connections.php:295
 msgid "Archived"
 msgstr "Zarchiwizowane"
 
-#: Zotlabs/Module/Connections.php:299
+#: Code/Module/Connections.php:299
 msgid "Not connected at this location"
 msgstr "Brak połączenia w tej lokalizacji"
 
-#: Zotlabs/Module/Connections.php:317
+#: Code/Module/Connections.php:317
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: Zotlabs/Module/Connections.php:318
+#: Code/Module/Connections.php:318
 msgid "Edit connection"
 msgstr "Edytuj połączenie"
 
-#: Zotlabs/Module/Connections.php:320
+#: Code/Module/Connections.php:320
 msgid "Delete connection"
 msgstr "Usuń połączenie"
 
-#: Zotlabs/Module/Connections.php:329
+#: Code/Module/Connections.php:329
 msgid "Channel address"
 msgstr "Adres kanału"
 
-#: Zotlabs/Module/Connections.php:331
+#: Code/Module/Connections.php:331
 msgid "Network"
 msgstr "Sieć"
 
-#: Zotlabs/Module/Connections.php:334
+#: Code/Module/Connections.php:334
 msgid "Call"
 msgstr "Połączenie"
 
-#: Zotlabs/Module/Connections.php:336
+#: Code/Module/Connections.php:336
 msgid "Status"
 msgstr "Stan"
 
-#: Zotlabs/Module/Connections.php:338
+#: Code/Module/Connections.php:338
 msgid "Connected"
 msgstr "Połączone"
 
-#: Zotlabs/Module/Connections.php:340
+#: Code/Module/Connections.php:340
 msgid "Approve connection"
 msgstr "Zatwierdź połączenie"
 
-#: Zotlabs/Module/Connections.php:342
+#: Code/Module/Connections.php:342
 msgid "Ignore connection"
 msgstr "Ignoruj połączenie"
 
-#: Zotlabs/Module/Connections.php:344
+#: Code/Module/Connections.php:344
 msgid "Recent activity"
 msgstr "Ostatnia aktywność"
 
-#: Zotlabs/Module/Connections.php:371
+#: Code/Module/Connections.php:371
 msgid "Filter by"
 msgstr "Filtruj wg"
 
-#: Zotlabs/Module/Connections.php:372
+#: Code/Module/Connections.php:372
 msgid "Sort by"
 msgstr "Sortuj wg"
 
-#: Zotlabs/Module/Connections.php:376
+#: Code/Module/Connections.php:376
 msgid "Search your connections"
 msgstr "Wyszukaj swoje połączenia"
 
-#: Zotlabs/Module/Connections.php:377
+#: Code/Module/Connections.php:377
 msgid "Connections search"
 msgstr "Wyszukiwanie połączeń"
 
-#: Zotlabs/Module/Connections.php:378 Zotlabs/Module/Directory.php:477
-#: Zotlabs/Module/Directory.php:482 Zotlabs/Widget/Findpeople.php:33
+#: Code/Module/Connections.php:378 Code/Module/Directory.php:477
+#: Code/Module/Directory.php:482 Code/Widget/Findpeople.php:33
 msgid "Find"
 msgstr "Znajdź"
 
-#: Zotlabs/Module/Item.php:570 Zotlabs/Module/Pin.php:49
+#: Code/Module/Item.php:570 Code/Module/Pin.php:49
 msgid "Unable to locate original post."
 msgstr "Nie można znaleźć oryginalnego wpisu."
 
-#: Zotlabs/Module/Item.php:665
+#: Code/Module/Item.php:665
 msgid "Comment may be moderated."
 msgstr "Komentarz może być moderowany."
 
-#: Zotlabs/Module/Item.php:901
+#: Code/Module/Item.php:901
 msgid "Empty post discarded."
 msgstr "Pusty wpis został odrzucony."
 
-#: Zotlabs/Module/Item.php:1507
+#: Code/Module/Item.php:1507
 msgid "Duplicate post suppressed."
 msgstr "Powielony wpis został wyłączony."
 
-#: Zotlabs/Module/Item.php:1554
+#: Code/Module/Item.php:1554
 msgid ""
 "Draft saved. Use Drafts app to continue "
 "editing."
@@ -4728,141 +4728,141 @@ msgstr ""
 "Zapisano wersję roboczą. Wykorzystaj aplikacjię  Szkice, aby kontynuować edycję."
 
-#: Zotlabs/Module/Item.php:1598
+#: Code/Module/Item.php:1598
 msgid "Your comment has been posted."
 msgstr "Twój komentarz został opublikowany."
 
-#: Zotlabs/Module/Item.php:1667
+#: Code/Module/Item.php:1667
 msgid "System error. Post not saved."
 msgstr "Błąd systemu. Wpis nie został zapisany."
 
-#: Zotlabs/Module/Item.php:1709
+#: Code/Module/Item.php:1709
 msgid "Your post/comment is awaiting approval."
 msgstr "Twój komentarz oczekuje na zatwierdzenie."
 
-#: Zotlabs/Module/Item.php:1744 Zotlabs/Module/Cloud.php:132
+#: Code/Module/Item.php:1744 Code/Module/Cloud.php:132
 msgid "Not found"
 msgstr "Nie znaleziono"
 
-#: Zotlabs/Module/Item.php:1878
+#: Code/Module/Item.php:1878
 msgid "Unable to obtain post information from database."
 msgstr "Nie można uzyskać z bazy danych informacji o tym wpisie."
 
-#: Zotlabs/Module/Item.php:1886
+#: Code/Module/Item.php:1886
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Osiągnięty został limit %1$.0f wpisów najwyższego poziomu."
 
-#: Zotlabs/Module/Item.php:1892
+#: Code/Module/Item.php:1892
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Osiągnięty został limit %1$.0f stron internetowych."
 
-#: Zotlabs/Module/Appman.php:42 Zotlabs/Module/Appman.php:59
+#: Code/Module/Appman.php:42 Code/Module/Appman.php:59
 msgid "App installed."
 msgstr "Aplikacja została zainstalowana."
 
-#: Zotlabs/Module/Appman.php:52
+#: Code/Module/Appman.php:52
 msgid "Malformed app."
 msgstr "Malformed app."
 
-#: Zotlabs/Module/Appman.php:129
+#: Code/Module/Appman.php:129
 msgid "Embed code"
 msgstr "Kod osadzony"
 
-#: Zotlabs/Module/Appman.php:133
+#: Code/Module/Appman.php:133
 msgid "Edit App"
 msgstr "Edutuj aplikację"
 
-#: Zotlabs/Module/Appman.php:133
+#: Code/Module/Appman.php:133
 msgid "Create App"
 msgstr "Utwórz aplikację"
 
-#: Zotlabs/Module/Appman.php:138
+#: Code/Module/Appman.php:138
 msgid "Name of app"
 msgstr "Nazwa aplikacji"
 
-#: Zotlabs/Module/Appman.php:138 Zotlabs/Module/Appman.php:139
-#: Zotlabs/Module/Events.php:508 Zotlabs/Module/Events.php:513
-#: Zotlabs/Module/Profiles.php:791 Zotlabs/Module/Profiles.php:795
+#: Code/Module/Appman.php:138 Code/Module/Appman.php:139
+#: Code/Module/Events.php:508 Code/Module/Events.php:513
+#: Code/Module/Profiles.php:791 Code/Module/Profiles.php:795
 #: include/datetime.php:249
 msgid "Required"
 msgstr "Wymagane"
 
-#: Zotlabs/Module/Appman.php:139
+#: Code/Module/Appman.php:139
 msgid "Location (URL) of app"
 msgstr "Lokalizacja (URL) aolikacji"
 
-#: Zotlabs/Module/Appman.php:141
+#: Code/Module/Appman.php:141
 msgid "Photo icon URL"
 msgstr "Adres URL ikony zdjęcia"
 
-#: Zotlabs/Module/Appman.php:141
+#: Code/Module/Appman.php:141
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pikseli - opcjonalnie"
 
-#: Zotlabs/Module/Appman.php:142
+#: Code/Module/Appman.php:142
 msgid "Categories (optional, comma separated list)"
 msgstr "Kategorie (opcjonalnie, lista rozdzielana przecinkami)"
 
-#: Zotlabs/Module/Appman.php:143
+#: Code/Module/Appman.php:143
 msgid "Version ID"
 msgstr "ID wersji"
 
-#: Zotlabs/Module/Appman.php:144
+#: Code/Module/Appman.php:144
 msgid "Price of app"
 msgstr "Cena aplikacji"
 
-#: Zotlabs/Module/Appman.php:145
+#: Code/Module/Appman.php:145
 msgid "Location (URL) to purchase app"
 msgstr "Lokalizacja zakupu aplikacji (adres URL)"
 
-#: Zotlabs/Module/Cover_photo.php:281 include/items.php:4912
+#: Code/Module/Cover_photo.php:281 include/items.php:4912
 msgid "female"
 msgstr "kobieta"
 
-#: Zotlabs/Module/Cover_photo.php:282 include/items.php:4913
+#: Code/Module/Cover_photo.php:282 include/items.php:4913
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s zaktualizował jej %2$s"
 
-#: Zotlabs/Module/Cover_photo.php:283 include/items.php:4914
+#: Code/Module/Cover_photo.php:283 include/items.php:4914
 msgid "male"
 msgstr "mężczuzna"
 
-#: Zotlabs/Module/Cover_photo.php:284 include/items.php:4915
+#: Code/Module/Cover_photo.php:284 include/items.php:4915
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s zaktualizował jego %2$s"
 
-#: Zotlabs/Module/Cover_photo.php:286 include/items.php:4917
+#: Code/Module/Cover_photo.php:286 include/items.php:4917
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s zaktualizował ich %2$s"
 
-#: Zotlabs/Module/Cover_photo.php:289 include/channel.php:1841
+#: Code/Module/Cover_photo.php:289 include/channel.php:1841
 msgid "cover photo"
 msgstr "zdjęcie okładkowe"
 
-#: Zotlabs/Module/Defperms.php:106 Zotlabs/Module/Settings/Channel.php:357
+#: Code/Module/Defperms.php:106 Code/Module/Settings/Channel.php:357
 #: extend/addon/a/logrot/logrot.php:55
 #: extend/addon/a/openstreetmap/openstreetmap.php:222
 #: extend/addon/a/faces/faces.php:208
 msgid "Settings updated."
 msgstr "Zaktualizowano ustawienia."
 
-#: Zotlabs/Module/Defperms.php:248 Zotlabs/Module/Settings/Channel.php:583
+#: Code/Module/Defperms.php:248 Code/Module/Settings/Channel.php:583
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr ""
 "Jeśli jest włączone, prośby o połączenie będą zatwierdzane bez Twojej "
 "interakcji"
 
-#: Zotlabs/Module/Defperms.php:255
+#: Code/Module/Defperms.php:255
 msgid "Automatic approval settings"
 msgstr "Ustawienia automatycznego zatwierdzania"
 
-#: Zotlabs/Module/Defperms.php:263
+#: Code/Module/Defperms.php:263
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
@@ -4870,206 +4870,206 @@ msgstr ""
 "Niektóre indywidualne uprawnienia mogły zostać wstępnie ustawione lub "
 "zablokowane w zależności od typu kanału i ustawień prywatności."
 
-#: Zotlabs/Module/Directory.php:96 Zotlabs/Module/Directory.php:103
-#: Zotlabs/Module/Display.php:47 Zotlabs/Module/Search.php:41
-#: Zotlabs/Module/Photos.php:579 Zotlabs/Module/Viewconnections.php:30
+#: Code/Module/Directory.php:96 Code/Module/Directory.php:103
+#: Code/Module/Display.php:47 Code/Module/Search.php:41
+#: Code/Module/Photos.php:579 Code/Module/Viewconnections.php:30
 msgid "Public access denied."
 msgstr "Odmowa dostępu publicznego."
 
-#: Zotlabs/Module/Directory.php:159
+#: Code/Module/Directory.php:159
 msgid "No default suggestions were found."
 msgstr "Nie znaleziono domyślnych propozycji."
 
-#: Zotlabs/Module/Directory.php:326
+#: Code/Module/Directory.php:326
 msgid "Gender: "
 msgstr "Płeć: "
 
-#: Zotlabs/Module/Directory.php:327
+#: Code/Module/Directory.php:327
 msgid "Status: "
 msgstr "Status: "
 
-#: Zotlabs/Module/Directory.php:328
+#: Code/Module/Directory.php:328
 msgid "Homepage: "
 msgstr "Strona główna: "
 
-#: Zotlabs/Module/Directory.php:389
+#: Code/Module/Directory.php:389
 msgid "Description:"
 msgstr "Opis:"
 
-#: Zotlabs/Module/Directory.php:400 Zotlabs/Module/Manage.php:78
-#: Zotlabs/Module/Manage.php:175
+#: Code/Module/Directory.php:400 Code/Module/Manage.php:78
+#: Code/Module/Manage.php:175
 msgid "Group"
 msgstr "Grupa"
 
-#: Zotlabs/Module/Directory.php:404
+#: Code/Module/Directory.php:404
 msgid "Keywords: "
 msgstr "Słowa kluczowe: "
 
-#: Zotlabs/Module/Directory.php:407
+#: Code/Module/Directory.php:407
 msgid "Don't suggest"
 msgstr "Nie sugeruj"
 
-#: Zotlabs/Module/Directory.php:409
+#: Code/Module/Directory.php:409
 msgid "Suggestion ranking:"
 msgstr "Ranking sugestii:"
 
-#: Zotlabs/Module/Directory.php:472
+#: Code/Module/Directory.php:472
 msgid "Local Directory"
 msgstr "Katalog lokalny"
 
-#: Zotlabs/Module/Directory.php:478
+#: Code/Module/Directory.php:478
 msgid "Finding:"
 msgstr "Odnaleziono:"
 
-#: Zotlabs/Module/Directory.php:481 Zotlabs/Widget/Findpeople.php:34
+#: Code/Module/Directory.php:481 Code/Widget/Findpeople.php:34
 msgid "Channel Suggestions"
 msgstr "Sugerowane kanały"
 
-#: Zotlabs/Module/Directory.php:483
+#: Code/Module/Directory.php:483
 msgid "next page"
 msgstr "następna strona"
 
-#: Zotlabs/Module/Directory.php:483
+#: Code/Module/Directory.php:483
 msgid "previous page"
 msgstr "poprzednia strona"
 
-#: Zotlabs/Module/Directory.php:484
+#: Code/Module/Directory.php:484
 msgid "Sort options"
 msgstr "Opcje sortowania"
 
-#: Zotlabs/Module/Directory.php:485
+#: Code/Module/Directory.php:485
 msgid "Alphabetic"
 msgstr "Alfabetycznie"
 
-#: Zotlabs/Module/Directory.php:486
+#: Code/Module/Directory.php:486
 msgid "Reverse Alphabetic"
 msgstr "Odwrotnie alfabetycznie"
 
-#: Zotlabs/Module/Directory.php:487
+#: Code/Module/Directory.php:487
 msgid "Newest to Oldest"
 msgstr "Od najnowszych do najstarszych"
 
-#: Zotlabs/Module/Directory.php:488
+#: Code/Module/Directory.php:488
 msgid "Oldest to Newest"
 msgstr "Od najstarszych do najnowszych"
 
-#: Zotlabs/Module/Directory.php:513
+#: Code/Module/Directory.php:513
 msgid "No entries (some entries may be hidden)."
 msgstr "Brak wpisów (niektóre wpisy mogą być ukryte)."
 
-#: Zotlabs/Module/Display.php:98 Zotlabs/Module/Channel.php:287
-#: Zotlabs/Module/Hq.php:153 Zotlabs/Module/Rpost.php:236
-#: Zotlabs/Module/Pubstream.php:86 Zotlabs/Module/Stream.php:246
+#: Code/Module/Display.php:98 Code/Module/Channel.php:287
+#: Code/Module/Hq.php:153 Code/Module/Rpost.php:236
+#: Code/Module/Pubstream.php:86 Code/Module/Stream.php:246
 msgid "Reset form"
 msgstr "Resetuj formularz"
 
-#: Zotlabs/Module/Display.php:390
+#: Code/Module/Display.php:390
 #, php-format
 msgid "\"%1$s\", shared by %2$s with %3$s"
 msgstr "\"%1$s\", udostępniony przez %2$s %3$s"
 
-#: Zotlabs/Module/Display.php:391
+#: Code/Module/Display.php:391
 #, php-format
 msgid "%1$s shared this post with %2$s"
 msgstr "%1$s udostępnił ten wpis dla %2$s"
 
-#: Zotlabs/Module/Display.php:395
+#: Code/Module/Display.php:395
 msgid "Not much to read, click to see the post."
 msgstr "Niewiele do przeczytania, kliknij, aby zobaczyć wpis."
 
-#: Zotlabs/Module/Display.php:399
+#: Code/Module/Display.php:399
 #, php-format
 msgid "%1$s shared a reaction to \"%2$s\""
 msgstr "%1$s udostępnił reakcję na \"%2$s\""
 
-#: Zotlabs/Module/Display.php:400
+#: Code/Module/Display.php:400
 #, php-format
 msgid "%s shared a reaction to this post/conversation"
 msgstr "%s udostępnił reakcję na ten wpis/rozmowę"
 
-#: Zotlabs/Module/Display.php:407
+#: Code/Module/Display.php:407
 #, php-format
 msgid "%1$s commented \"%2$s\""
 msgstr "%1$s skomentował \"%2$s\""
 
-#: Zotlabs/Module/Display.php:408
+#: Code/Module/Display.php:408
 #, php-format
 msgid "%s shared a comment of this post/conversation"
 msgstr "%s udostępnił komentarz do tego wpisu/rozmowy"
 
-#: Zotlabs/Module/Display.php:412
+#: Code/Module/Display.php:412
 #, php-format
 msgid "%1$s wrote this: \"%2$s\""
 msgstr "%1$s napisał to: \"%2$s\""
 
-#: Zotlabs/Module/Display.php:437 Zotlabs/Module/Channel.php:556
+#: Code/Module/Display.php:437 Code/Module/Channel.php:556
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr ""
 "Aby przeglądać te treści, musisz włączyć obsługę JavaScript w swojej "
 "przeglądarce."
 
-#: Zotlabs/Module/Display.php:454
+#: Code/Module/Display.php:454
 msgid "Article"
 msgstr "Artykuł"
 
-#: Zotlabs/Module/Display.php:507
+#: Code/Module/Display.php:507
 msgid "Item has been removed."
 msgstr "Element został usunięty."
 
-#: Zotlabs/Module/Events.php:492
+#: Code/Module/Events.php:492
 msgid "day(s)"
 msgstr "dzień/dni"
 
-#: Zotlabs/Module/Events.php:493
+#: Code/Module/Events.php:493
 msgid "week(s)"
 msgstr "tydzień/tygodnie"
 
-#: Zotlabs/Module/Events.php:494
+#: Code/Module/Events.php:494
 msgid "month(s)"
 msgstr "miesiąc/miesiące"
 
-#: Zotlabs/Module/Events.php:495
+#: Code/Module/Events.php:495
 msgid "year(s)"
 msgstr "rok/lata"
 
-#: Zotlabs/Module/Events.php:508
+#: Code/Module/Events.php:508
 msgid "Edit event title"
 msgstr "Edytuj tytuł wydarzenia"
 
-#: Zotlabs/Module/Events.php:510
+#: Code/Module/Events.php:510
 msgid "Categories (comma-separated list)"
 msgstr "Kategorie (lista rozdzielana przecinkami)"
 
-#: Zotlabs/Module/Events.php:511
+#: Code/Module/Events.php:511
 msgid "Edit Category"
 msgstr "Edytuj kategorię"
 
-#: Zotlabs/Module/Events.php:511
+#: Code/Module/Events.php:511
 msgid "Category"
 msgstr "Kategoria"
 
-#: Zotlabs/Module/Events.php:514
+#: Code/Module/Events.php:514
 msgid "Edit start date and time"
 msgstr "Edytuj datę i godzinę rozpoczęcia"
 
-#: Zotlabs/Module/Events.php:515 Zotlabs/Module/Events.php:518
+#: Code/Module/Events.php:515 Code/Module/Events.php:518
 msgid "Finish date and time are not known or not relevant"
 msgstr "Data i godzina zakończenia nie są znane lub nie mają znaczenia"
 
-#: Zotlabs/Module/Events.php:517
+#: Code/Module/Events.php:517
 msgid "Edit finish date and time"
 msgstr "Edytuj datę i godzinę zakończenia"
 
-#: Zotlabs/Module/Events.php:517
+#: Code/Module/Events.php:517
 msgid "Finish date and time"
 msgstr "Data i godzina zakończenia"
 
-#: Zotlabs/Module/Events.php:519 Zotlabs/Module/Events.php:520
+#: Code/Module/Events.php:519 Code/Module/Events.php:520
 msgid "Adjust for viewer timezone"
 msgstr "Dostosuj do strefy czasowej przeglądającego"
 
-#: Zotlabs/Module/Events.php:519
+#: Code/Module/Events.php:519
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
@@ -5077,124 +5077,124 @@ msgstr ""
 "Ważne dla wydarzeń, które mają miejsce w określonym miejscu. Niepraktyczne "
 "dla świąt ogólnych."
 
-#: Zotlabs/Module/Events.php:521
+#: Code/Module/Events.php:521
 msgid "Edit Description"
 msgstr "Edytuj opis"
 
-#: Zotlabs/Module/Events.php:523
+#: Code/Module/Events.php:523
 msgid "Edit Location"
 msgstr "Edytuj lokalizację"
 
-#: Zotlabs/Module/Events.php:527 include/conversation.php:1455
+#: Code/Module/Events.php:527 include/conversation.php:1455
 msgid "Permission settings"
 msgstr "Ustawienia uprawnień"
 
-#: Zotlabs/Module/Events.php:537
+#: Code/Module/Events.php:537
 msgid "Timezone:"
 msgstr "Strefa czasowa:"
 
-#: Zotlabs/Module/Events.php:542
+#: Code/Module/Events.php:542
 msgid "Advanced Options"
 msgstr "Zaawansowane opcje"
 
-#: Zotlabs/Module/Events.php:544
+#: Code/Module/Events.php:544
 msgid "Event repeat"
 msgstr "Powtórzenie wydarzenia"
 
-#: Zotlabs/Module/Events.php:545
+#: Code/Module/Events.php:545
 msgid "Repeat frequency"
 msgstr "Częstotliwość powtarzania"
 
-#: Zotlabs/Module/Events.php:546
+#: Code/Module/Events.php:546
 msgid "Repeat every"
 msgstr "Powtarzaj każde"
 
-#: Zotlabs/Module/Events.php:547
+#: Code/Module/Events.php:547
 msgid "Number of total repeats"
 msgstr "Liczba wszystkich powtórzeń"
 
-#: Zotlabs/Module/Events.php:858
+#: Code/Module/Events.php:858
 msgid "Event removed"
 msgstr "Wydarzenie usunięte"
 
-#: Zotlabs/Module/Editlayout.php:88 Zotlabs/Module/Editwebpage.php:91
-#: Zotlabs/Module/Card_edit.php:25 Zotlabs/Module/Card_edit.php:43
-#: Zotlabs/Module/Editblock.php:89 Zotlabs/Module/Editblock.php:107
-#: Zotlabs/Module/Editpost.php:30 Zotlabs/Module/Dreport.php:67
+#: Code/Module/Editlayout.php:88 Code/Module/Editwebpage.php:91
+#: Code/Module/Card_edit.php:25 Code/Module/Card_edit.php:43
+#: Code/Module/Editblock.php:89 Code/Module/Editblock.php:107
+#: Code/Module/Editpost.php:30 Code/Module/Dreport.php:67
 msgid "Item not found"
 msgstr "Nie znaleziono elementu"
 
-#: Zotlabs/Module/Editlayout.php:140 Zotlabs/Module/Layouts.php:139
-#: Zotlabs/Module/Layouts.php:203
+#: Code/Module/Editlayout.php:140 Code/Module/Layouts.php:139
+#: Code/Module/Layouts.php:203
 msgid "Layout Name"
 msgstr "Nazwa układu"
 
-#: Zotlabs/Module/Editlayout.php:141 Zotlabs/Module/Layouts.php:142
+#: Code/Module/Editlayout.php:141 Code/Module/Layouts.php:142
 msgid "Layout Description (Optional)"
 msgstr "Opis układu (opcjonalnie)"
 
-#: Zotlabs/Module/Editlayout.php:149
+#: Code/Module/Editlayout.php:149
 msgid "Edit Layout"
 msgstr "Edytuj układ"
 
-#: Zotlabs/Module/Plike.php:128 include/conversation.php:135
+#: Code/Module/Plike.php:128 include/conversation.php:135
 msgid "channel"
 msgstr "kanał"
 
-#: Zotlabs/Module/Plike.php:202 Zotlabs/Module/Like.php:221
+#: Code/Module/Plike.php:202 Code/Module/Like.php:221
 #: include/conversation.php:178
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s pochwalił %3$s %2$s"
 
-#: Zotlabs/Module/Plike.php:205 Zotlabs/Module/Like.php:224
+#: Code/Module/Plike.php:205 Code/Module/Like.php:224
 #: include/conversation.php:180
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s zganił %3$s  %2$s"
 
-#: Zotlabs/Module/Notes.php:52
+#: Code/Module/Notes.php:52
 msgid "This app allows you to create private notes for your personal use."
 msgstr ""
 "Ta aplikacja umożliwia tworzenie prywatnych notatek do użytku osobistego."
 
-#: Zotlabs/Module/Notes.php:60
+#: Code/Module/Notes.php:60
 msgid "This app is installed. The Notes tool can be found on your stream page."
 msgstr ""
 "Ta aplikacja jest zainstalowana. Narzędzie Notatki można znaleźć na stronie "
 "strumienia."
 
-#: Zotlabs/Module/Editwebpage.php:154
+#: Code/Module/Editwebpage.php:154
 msgid "Page link"
 msgstr "Link do strony"
 
-#: Zotlabs/Module/Editwebpage.php:158 Zotlabs/Module/Chat.php:219
-#: Zotlabs/Module/Card_edit.php:110 Zotlabs/Module/Editblock.php:129
+#: Code/Module/Editwebpage.php:158 Code/Module/Chat.php:219
+#: Code/Module/Card_edit.php:110 Code/Module/Editblock.php:129
 #: include/conversation.php:1237
 msgid "Insert web link"
 msgstr "Wstaw link internetowy"
 
-#: Zotlabs/Module/Editwebpage.php:181
+#: Code/Module/Editwebpage.php:181
 msgid "Edit Webpage"
 msgstr "Edytuj stronę internetową"
 
-#: Zotlabs/Module/Email_resend.php:15 Zotlabs/Module/Email_validation.php:27
+#: Code/Module/Email_resend.php:15 Code/Module/Email_validation.php:27
 msgid "Token verification failed."
 msgstr "Weryfikacja tokena nie powiodła się."
 
-#: Zotlabs/Module/Email_resend.php:33
+#: Code/Module/Email_resend.php:33
 msgid "Email verification resent"
 msgstr "Weryfikacja adresu e-mail została wysłana ponownie"
 
-#: Zotlabs/Module/Email_resend.php:35
+#: Code/Module/Email_resend.php:35
 msgid "Unable to resend email verification message."
 msgstr "Nie można ponownie wysłać weryfikacyjnej wiadomości e-mail."
 
-#: Zotlabs/Module/Email_validation.php:40
+#: Code/Module/Email_validation.php:40
 msgid "Email Verification Required"
 msgstr "Wymagana weryfikacja adresu e-mail"
 
-#: Zotlabs/Module/Email_validation.php:41
+#: Code/Module/Email_validation.php:41
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -5205,82 +5205,82 @@ msgstr ""
 "token tutaj, aby zakończyć etap weryfikacji konta. Poczekaj kilka minut na "
 "dostarczenie i  jeśli nie widzisz wiadomości, sprawdź folder ze spamem."
 
-#: Zotlabs/Module/Email_validation.php:42
+#: Code/Module/Email_validation.php:42
 msgid "Resend Email"
 msgstr "Wyślij ponownie wiadomość e-mail"
 
-#: Zotlabs/Module/Email_validation.php:45
+#: Code/Module/Email_validation.php:45
 msgid "Validation token"
 msgstr "Token walidacyjny"
 
-#: Zotlabs/Module/Embedphotos.php:103 include/bbcode.php:258
+#: Code/Module/Embedphotos.php:103 include/bbcode.php:258
 #: include/bbcode.php:1125 include/bbcode.php:2031 include/bbcode.php:2033
 #: include/bbcode.php:2036 include/text.php:1828 include/text.php:1829
 msgid "Image/photo"
 msgstr "Obraz/zdjęcie"
 
-#: Zotlabs/Module/Embedphotos.php:208 Zotlabs/Module/Photos.php:848
-#: Zotlabs/Module/Photos.php:1405 Zotlabs/Widget/Album.php:88
-#: Zotlabs/Widget/Portfolio.php:99
+#: Code/Module/Embedphotos.php:208 Code/Module/Photos.php:848
+#: Code/Module/Photos.php:1405 Code/Widget/Album.php:88
+#: Code/Widget/Portfolio.php:99
 msgid "View Photo"
 msgstr "Pokaż zdjęcie"
 
-#: Zotlabs/Module/Embedphotos.php:223 Zotlabs/Module/Photos.php:879
-#: Zotlabs/Widget/Album.php:105 Zotlabs/Widget/Portfolio.php:120
+#: Code/Module/Embedphotos.php:223 Code/Module/Photos.php:879
+#: Code/Widget/Album.php:105 Code/Widget/Portfolio.php:120
 msgid "Edit Album"
 msgstr "Edytuj album"
 
-#: Zotlabs/Module/Register.php:60
+#: Code/Module/Register.php:60
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 "Przekroczono maksymalną dzienną liczbę rejestracji na tym portalu. Proszę "
 "spróbować ponownie jutro."
 
-#: Zotlabs/Module/Register.php:66
+#: Code/Module/Register.php:66
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 "Proszę zaznaczyć, że akceptujesz Regulamin portalu. Rejestracja nieudana."
 
-#: Zotlabs/Module/Register.php:100
+#: Code/Module/Register.php:100
 msgid "Passwords do not match."
 msgstr "Hasła niezgodne."
 
-#: Zotlabs/Module/Register.php:151
+#: Code/Module/Register.php:151
 msgid "Registration successful. Continue to create your first channel..."
 msgstr ""
 "Rejestracja pomyślna. Kontynuuj tworzenie swojego pierwszego kanału ..."
 
-#: Zotlabs/Module/Register.php:153
+#: Code/Module/Register.php:153
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr ""
 "Rejestracja pomyślna. Sprawdź pocztę e-mail, aby uzyskać instrukcje "
 "dotyczące weryfikacji."
 
-#: Zotlabs/Module/Register.php:159
+#: Code/Module/Register.php:159
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 "Twoja rejestracja oczekuje na zatwierdzenie przez administratora portalu."
 
-#: Zotlabs/Module/Register.php:161
+#: Code/Module/Register.php:161
 msgid "Your registration can not be processed."
 msgstr "Twoja rejestracja nie może zostać przetworzona."
 
-#: Zotlabs/Module/Register.php:206
+#: Code/Module/Register.php:206
 msgid "Registration on this website is disabled."
 msgstr "Rejestracja na tym portalu jest wyłączona."
 
-#: Zotlabs/Module/Register.php:215
+#: Code/Module/Register.php:215
 msgid "Registration on this website is by approval only."
 msgstr ""
 "Rejestracja na tym portalu odbywa się wyłącznie za zgodą administratora."
 
-#: Zotlabs/Module/Register.php:223
+#: Code/Module/Register.php:223
 msgid "Registration on this site is by invitation only."
 msgstr "Rejestracja na tym portalu odbywa się wyłącznie za zaproszeniem."
 
-#: Zotlabs/Module/Register.php:236
+#: Code/Module/Register.php:236
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
@@ -5288,49 +5288,49 @@ msgstr ""
 "Na tym portalu przekroczona została dozwolona liczba dziennych rejestracji "
 "kont. Proszę spróbować ponownie jutro."
 
-#: Zotlabs/Module/Register.php:252 Zotlabs/Module/Siteinfo.php:42
+#: Code/Module/Register.php:252 Code/Module/Siteinfo.php:42
 msgid "Terms of Service"
 msgstr "Regulamin"
 
-#: Zotlabs/Module/Register.php:258
+#: Code/Module/Register.php:258
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Akceptuję %s dla tego portalu"
 
-#: Zotlabs/Module/Register.php:264
+#: Code/Module/Register.php:264
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Mam ponad %s lat i akceptuję %s dla tego portalu"
 
-#: Zotlabs/Module/Register.php:269
+#: Code/Module/Register.php:269
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
-#: Zotlabs/Module/Register.php:270
+#: Code/Module/Register.php:270
 msgid "Choose a password"
 msgstr "Wybierz hasło"
 
-#: Zotlabs/Module/Register.php:271
+#: Code/Module/Register.php:271
 msgid "Please re-enter your password"
 msgstr "Wprowadź ponownie swoje hasło"
 
-#: Zotlabs/Module/Register.php:272
+#: Code/Module/Register.php:272
 msgid "Please enter your invitation code"
 msgstr "Wprowadź kod zaproszenia"
 
-#: Zotlabs/Module/Register.php:273
+#: Code/Module/Register.php:273
 msgid "Your Name"
 msgstr "Twoja nazwa"
 
-#: Zotlabs/Module/Register.php:273
+#: Code/Module/Register.php:273
 msgid "Real names are preferred."
 msgstr "Preferowane jest prawdziwe imię i nazwisko."
 
-#: Zotlabs/Module/Register.php:275 Zotlabs/Module/New_channel.php:191
+#: Code/Module/Register.php:275 Code/Module/New_channel.php:191
 msgid "Choose a short nickname"
 msgstr "Wybierz krótki pseudonim"
 
-#: Zotlabs/Module/Register.php:275
+#: Code/Module/Register.php:275
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
@@ -5338,11 +5338,11 @@ msgid ""
 msgstr ""
 "Twój pseudonim posłuży do stworzenia łatwego do zapamiętania adresu kanału %s"
 
-#: Zotlabs/Module/Register.php:276 Zotlabs/Module/New_channel.php:192
+#: Code/Module/Register.php:276 Code/Module/New_channel.php:192
 msgid "Channel role and privacy"
 msgstr "Rola kanału i prywatność"
 
-#: Zotlabs/Module/Register.php:276
+#: Code/Module/Register.php:276
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
@@ -5350,15 +5350,15 @@ msgstr ""
 "Wybierz rolę uprawnień kanału dla swoich potrzeb użytkowania i wymagań "
 "dotyczących prywatności."
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "no"
 msgstr "nie"
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "yes"
 msgstr "tak"
 
-#: Zotlabs/Module/Register.php:290
+#: Code/Module/Register.php:290
 msgid ""
 "Show affiliated sites - some of which may allow "
 "registration."
@@ -5366,12 +5366,12 @@ msgstr ""
 "Pokaż stowarzyszone portale - niektóre z nich mogą "
 "zezwalać na rejestrację."
 
-#: Zotlabs/Module/Register.php:303 Zotlabs/Module/Sites.php:55 boot.php:1706
+#: Code/Module/Register.php:303 Code/Module/Sites.php:55 boot.php:1706
 #: include/nav.php:164
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: Zotlabs/Module/Register.php:304
+#: Code/Module/Register.php:304
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
@@ -5379,30 +5379,30 @@ msgstr ""
 "Ten portal wymaga weryfikacji adresem e-mail. Po wypełnieniu tego formularza "
 "sprawdź swoją pocztę e-mail, aby uzyskać dalsze instrukcje."
 
-#: Zotlabs/Module/Invite.php:35
+#: Code/Module/Invite.php:35
 msgid "Total invitation limit exceeded."
 msgstr "Przekroczono łączny limit zaproszeń."
 
-#: Zotlabs/Module/Invite.php:60
+#: Code/Module/Invite.php:60
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s: nieprawidłowy adres e-mail."
 
-#: Zotlabs/Module/Invite.php:73
+#: Code/Module/Invite.php:73
 msgid "Please join us on $Projectname"
 msgstr "Dołącz do nas na $Projectname"
 
-#: Zotlabs/Module/Invite.php:83
+#: Code/Module/Invite.php:83
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 "Przekroczono limit zaproszeń. Skontaktuj się z administratorem portalu."
 
-#: Zotlabs/Module/Invite.php:87
+#: Code/Module/Invite.php:87
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s: dostarczenie wiadomości nie powiodło się."
 
-#: Zotlabs/Module/Invite.php:90
+#: Code/Module/Invite.php:90
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
@@ -5410,55 +5410,55 @@ msgstr[0] "Wysłano %d wiadomość."
 msgstr[1] "Wysłano %d wiadomości."
 msgstr[2] "Wysłano %d wiadomości."
 
-#: Zotlabs/Module/Invite.php:108
+#: Code/Module/Invite.php:108
 msgid "Send email invitations to join this network"
 msgstr ""
 "Wyślij wiadomości e-mail z zaproszeniami do przyłączenia się do tej sieci"
 
-#: Zotlabs/Module/Invite.php:121
+#: Code/Module/Invite.php:121
 msgid "You have no more invitations available"
 msgstr "Nie masz więcej dostępnych zaproszeń"
 
-#: Zotlabs/Module/Invite.php:155
+#: Code/Module/Invite.php:155
 msgid "Send invitations"
 msgstr "Wyślij zaproszenia"
 
-#: Zotlabs/Module/Invite.php:156
+#: Code/Module/Invite.php:156
 msgid "Enter email addresses, one per line:"
 msgstr "Wprowadź adresy e-mail, po jednym w każdym wierszu:"
 
-#: Zotlabs/Module/Invite.php:157
+#: Code/Module/Invite.php:157
 msgid "Your message:"
 msgstr "Twoja wiadomość:"
 
-#: Zotlabs/Module/Invite.php:158
+#: Code/Module/Invite.php:158
 msgid "Please join my community on $Projectname."
 msgstr "Dołącz do mojej społeczności w $Projectname."
 
-#: Zotlabs/Module/Invite.php:160
+#: Code/Module/Invite.php:160
 msgid "You will need to supply this invitation code:"
 msgstr "Musisz podać ten kod zaproszenia:"
 
-#: Zotlabs/Module/Invite.php:161
+#: Code/Module/Invite.php:161
 msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 "1. Zarejestruj się w dowolnej lokalizacji $Projectname (wszystkie są ze sobą "
 "połączone)"
 
-#: Zotlabs/Module/Invite.php:163
+#: Code/Module/Invite.php:163
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 "2. Wprowadź mój adres sieciowy Projectname w pasku wyszukiwania portalu."
 
-#: Zotlabs/Module/Invite.php:164
+#: Code/Module/Invite.php:164
 msgid "or visit"
 msgstr "lub odwiedź"
 
-#: Zotlabs/Module/Invite.php:166
+#: Code/Module/Invite.php:166
 msgid "3. Click [Connect]"
 msgstr "3. Kliknij [Połącz]"
 
-#: Zotlabs/Module/Sites.php:17
+#: Code/Module/Sites.php:17
 msgid ""
 "This page provides information about related projects and websites that are "
 "currently known to this system. These are a small fraction of the thousands "
@@ -5469,274 +5469,274 @@ msgstr ""
 "tysięcy stron internetowych i dziesiątek projektów i dostawców, które tworzą "
 "Fediverse."
 
-#: Zotlabs/Module/Sites.php:45
+#: Code/Module/Sites.php:45
 msgid "free"
 msgstr "bezpłatne"
 
-#: Zotlabs/Module/Sites.php:47
+#: Code/Module/Sites.php:47
 msgid "subscription"
 msgstr "subskrypcja"
 
-#: Zotlabs/Module/Sites.php:49
+#: Code/Module/Sites.php:49
 msgid "tiered service plans"
 msgstr "stopniowane plany usług"
 
-#: Zotlabs/Module/Sites.php:57
+#: Code/Module/Sites.php:57
 msgid "Register (requires approval)"
 msgstr "Zarejestruj się (wymagana zgoda)"
 
-#: Zotlabs/Module/Sites.php:101
+#: Code/Module/Sites.php:101
 msgid "Project"
 msgstr "Projekt"
 
-#: Zotlabs/Module/Sites.php:109
+#: Code/Module/Sites.php:109
 msgid "Access type"
 msgstr "Typ dostępu"
 
-#: Zotlabs/Module/Sites.php:115
+#: Code/Module/Sites.php:115
 msgid "Affiliated Sites"
 msgstr "Powiązane witryny internetowe"
 
-#: Zotlabs/Module/Filer.php:59
+#: Code/Module/Filer.php:59
 msgid "Enter a folder name"
 msgstr "Wprowadź nazwę folderu"
 
-#: Zotlabs/Module/Filer.php:59
+#: Code/Module/Filer.php:59
 msgid "or select an existing folder (doubleclick)"
 msgstr "lub wybierz istniejący folder (kliknij dwukrotnie)"
 
-#: Zotlabs/Module/Filestorage.php:98
+#: Code/Module/Filestorage.php:98
 msgid "Channel unavailable."
 msgstr "Kanał niedostępny."
 
-#: Zotlabs/Module/Filestorage.php:142
+#: Code/Module/Filestorage.php:142
 msgid "File not found."
 msgstr "Nie znaleziono pliku."
 
-#: Zotlabs/Module/Filestorage.php:225
+#: Code/Module/Filestorage.php:225
 msgid "Edit file permissions"
 msgstr "Edytuj uprawnienia do pliku"
 
-#: Zotlabs/Module/Filestorage.php:237
+#: Code/Module/Filestorage.php:237
 msgid "Change filename to"
 msgstr "Zmień nazwę pliku na"
 
-#: Zotlabs/Module/Filestorage.php:237
+#: Code/Module/Filestorage.php:237
 msgid "Leave blank to keep the existing filename"
 msgstr "Pozostaw puste, aby zachować istniejącą nazwę pliku"
 
-#: Zotlabs/Module/Filestorage.php:238
+#: Code/Module/Filestorage.php:238
 msgid "Move to directory"
 msgstr "Przejdź do katalogu"
 
-#: Zotlabs/Module/Filestorage.php:239
+#: Code/Module/Filestorage.php:239
 #: extend/addon/a/flashcards/Mod_Flashcards.php:261
 #: extend/addon/a/faces/Mod_Faces.php:179
 msgid "Set/edit permissions"
 msgstr "Ustaw/edytuj uprawnienia"
 
-#: Zotlabs/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:240
 msgid "Include all files and sub folders"
 msgstr "Uwzględnij wszystkie pliki i podfoldery"
 
-#: Zotlabs/Module/Filestorage.php:241
+#: Code/Module/Filestorage.php:241
 msgid "Return to file list"
 msgstr "Wróć do listy plików"
 
-#: Zotlabs/Module/Filestorage.php:243
+#: Code/Module/Filestorage.php:243
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Skopiuj/wklej ten kod, aby dołączyć plik do wpisu"
 
-#: Zotlabs/Module/Filestorage.php:244
+#: Code/Module/Filestorage.php:244
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Skopiuj/wklej ten adres URL, aby połączyć plik ze strony internetowej"
 
-#: Zotlabs/Module/Filestorage.php:246
+#: Code/Module/Filestorage.php:246
 msgid "Share this file"
 msgstr "Udostępnij ten plik"
 
-#: Zotlabs/Module/Filestorage.php:247
+#: Code/Module/Filestorage.php:247
 msgid "Show URL to this file"
 msgstr "Pokaż adres URL do tego pliku"
 
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Storage/Browser.php:435
+#: Code/Module/Filestorage.php:248 Code/Storage/Browser.php:435
 msgid "Show in your contacts shared folder"
 msgstr "Pokaż w folderze udostępnionym kontaktów"
 
-#: Zotlabs/Module/Dircensor.php:45
+#: Code/Module/Dircensor.php:45
 msgid "Entry censored"
 msgstr "Wpis ocenzurowany"
 
-#: Zotlabs/Module/Dircensor.php:47
+#: Code/Module/Dircensor.php:47
 msgid "Entry uncensored"
 msgstr "Wpis nieocenzurowany"
 
-#: Zotlabs/Module/Impel.php:56 include/bbcode.php:416
+#: Code/Module/Impel.php:56 include/bbcode.php:416
 msgid "webpage"
 msgstr "strona internetowa"
 
-#: Zotlabs/Module/Impel.php:61 include/bbcode.php:422
+#: Code/Module/Impel.php:61 include/bbcode.php:422
 msgid "block"
 msgstr "blok"
 
-#: Zotlabs/Module/Impel.php:66 include/bbcode.php:419
+#: Code/Module/Impel.php:66 include/bbcode.php:419
 msgid "layout"
 msgstr "układ"
 
-#: Zotlabs/Module/Impel.php:73 include/bbcode.php:425
+#: Code/Module/Impel.php:73 include/bbcode.php:425
 msgid "menu"
 msgstr "menu"
 
-#: Zotlabs/Module/Impel.php:206
+#: Code/Module/Impel.php:206
 #, php-format
 msgid "%s element installed"
 msgstr "Element %s został zainstalowany"
 
-#: Zotlabs/Module/Impel.php:208
+#: Code/Module/Impel.php:208
 #, php-format
 msgid "%s element installation failed"
 msgstr "Instalacja elementu %s nie powiodła się"
 
-#: Zotlabs/Module/Thing.php:139
+#: Code/Module/Thing.php:139
 msgid "Thing updated"
 msgstr "Obiekt został zaktualizowany"
 
-#: Zotlabs/Module/Thing.php:200
+#: Code/Module/Thing.php:200
 msgid "Object store: failed"
 msgstr "Magazyn obiektów: błąd"
 
-#: Zotlabs/Module/Thing.php:204
+#: Code/Module/Thing.php:204
 msgid "Thing added"
 msgstr "Obiekt został dodany"
 
-#: Zotlabs/Module/Thing.php:232
+#: Code/Module/Thing.php:232
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: Zotlabs/Module/Thing.php:301
+#: Code/Module/Thing.php:301
 msgid "Show Thing"
 msgstr "Wyświetl obiekt"
 
-#: Zotlabs/Module/Thing.php:307
+#: Code/Module/Thing.php:307
 msgid "item not found."
 msgstr "element nie została znaleziony."
 
-#: Zotlabs/Module/Thing.php:341
+#: Code/Module/Thing.php:341
 msgid "Edit Thing"
 msgstr "Edytuj obiekt"
 
-#: Zotlabs/Module/Thing.php:343 Zotlabs/Module/Thing.php:402
+#: Code/Module/Thing.php:343 Code/Module/Thing.php:402
 msgid "Select a profile"
 msgstr "Wybierz profile"
 
-#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405
+#: Code/Module/Thing.php:347 Code/Module/Thing.php:405
 msgid "Post an activity"
 msgstr "Opublikuj aktywność"
 
-#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405
+#: Code/Module/Thing.php:347 Code/Module/Thing.php:405
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Wysyłane tylko do osób przeglądających odpowiedni profil"
 
-#: Zotlabs/Module/Thing.php:349 Zotlabs/Module/Thing.php:407
+#: Code/Module/Thing.php:349 Code/Module/Thing.php:407
 msgid "Name of thing e.g. something"
 msgstr "Nazwa obiektu, np. coś"
 
-#: Zotlabs/Module/Thing.php:351 Zotlabs/Module/Thing.php:408
+#: Code/Module/Thing.php:351 Code/Module/Thing.php:408
 msgid "URL of thing (optional)"
 msgstr "URL obiektu (opcjonalnie)"
 
-#: Zotlabs/Module/Thing.php:353 Zotlabs/Module/Thing.php:409
+#: Code/Module/Thing.php:353 Code/Module/Thing.php:409
 msgid "URL for photo of thing (optional)"
 msgstr "URL do zdjęcia obiektu (opcjonalnie)"
 
-#: Zotlabs/Module/Thing.php:400
+#: Code/Module/Thing.php:400
 msgid "Add Thing to your Profile"
 msgstr "Dodaj obiekt do swojego profilu"
 
-#: Zotlabs/Module/Chat.php:30 Zotlabs/Module/Channel.php:58
+#: Code/Module/Chat.php:30 Code/Module/Channel.php:58
 msgid "You must be logged in to see this page."
 msgstr "Trzeba być zalogowanym, aby zobaczyć tę stronę."
 
-#: Zotlabs/Module/Chat.php:194
+#: Code/Module/Chat.php:194
 msgid "Room not found"
 msgstr "Nie znaleziono czatu"
 
-#: Zotlabs/Module/Chat.php:211
+#: Code/Module/Chat.php:211
 msgid "Leave Room"
 msgstr "Opuść czat"
 
-#: Zotlabs/Module/Chat.php:212
+#: Code/Module/Chat.php:212
 msgid "Delete Room"
 msgstr "Usuń czat"
 
-#: Zotlabs/Module/Chat.php:213
+#: Code/Module/Chat.php:213
 msgid "I am away right now"
 msgstr "Nie ma mnie teraz"
 
-#: Zotlabs/Module/Chat.php:214
+#: Code/Module/Chat.php:214
 msgid "I am online"
 msgstr "Jestem dostępny"
 
-#: Zotlabs/Module/Chat.php:217 include/conversation.php:1287
+#: Code/Module/Chat.php:217 include/conversation.php:1287
 msgid "Please enter a link URL:"
 msgstr "Proszę wprowadzić adres URL linku:"
 
-#: Zotlabs/Module/Chat.php:237
+#: Code/Module/Chat.php:237
 msgid "New Chatroom"
 msgstr "Nowy czat"
 
-#: Zotlabs/Module/Chat.php:238
+#: Code/Module/Chat.php:238
 msgid "Chatroom name"
 msgstr "Nazwa czatu"
 
-#: Zotlabs/Module/Chat.php:239
+#: Code/Module/Chat.php:239
 msgid "Expiration of chats (minutes)"
 msgstr "Wygaśnięcie czatów (minuty)"
 
-#: Zotlabs/Module/Chat.php:255
+#: Code/Module/Chat.php:255
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Czaty %1$s"
 
-#: Zotlabs/Module/Chat.php:260
+#: Code/Module/Chat.php:260
 msgid "No chatrooms available"
 msgstr "Brak dostępnych czatów"
 
-#: Zotlabs/Module/Chat.php:261 Zotlabs/Module/Manage.php:154
-#: Zotlabs/Module/Profiles.php:879
+#: Code/Module/Chat.php:261 Code/Module/Manage.php:154
+#: Code/Module/Profiles.php:879
 msgid "Create New"
 msgstr "Utwórz nowy"
 
-#: Zotlabs/Module/Chat.php:264
+#: Code/Module/Chat.php:264
 msgid "Expiration"
 msgstr "Wygaśnięcie"
 
-#: Zotlabs/Module/Chat.php:265
+#: Code/Module/Chat.php:265
 msgid "min"
 msgstr "min"
 
-#: Zotlabs/Module/Moderate.php:35
+#: Code/Module/Moderate.php:35
 msgid "No entries."
 msgstr "Brak wpisów."
 
-#: Zotlabs/Module/Moderate.php:80
+#: Code/Module/Moderate.php:80
 msgid "Comment approved"
 msgstr "Komentarz został zatwierdzony"
 
-#: Zotlabs/Module/Moderate.php:83
+#: Code/Module/Moderate.php:83
 msgid "Comment deleted"
 msgstr "Komentarz został usunięty"
 
-#: Zotlabs/Module/Setup.php:192
+#: Code/Module/Setup.php:192
 msgid "$Projectname Server - Setup"
 msgstr "Serwer $Projectname - Konfiguracja"
 
-#: Zotlabs/Module/Setup.php:196
+#: Code/Module/Setup.php:196
 msgid "Could not connect to database."
 msgstr "Nie można połączyć się z bazą danych."
 
-#: Zotlabs/Module/Setup.php:200
+#: Code/Module/Setup.php:200
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
@@ -5744,23 +5744,23 @@ msgstr ""
 "Nie można połączyć się z określonym adresem URL portalu. Możliwy problem z "
 "certyfikatem SSL lub DNS."
 
-#: Zotlabs/Module/Setup.php:208
+#: Code/Module/Setup.php:208
 msgid "Could not create table."
 msgstr "Nie udało się utworzyć tabeli."
 
-#: Zotlabs/Module/Setup.php:211
+#: Code/Module/Setup.php:211
 msgid "Installation succeeded!"
 msgstr "Instacja zakończyła sie pomyślnie!"
 
-#: Zotlabs/Module/Setup.php:213
+#: Code/Module/Setup.php:213
 msgid "Your site database has been installed."
 msgstr "Baza danych portalu została zainstalowana."
 
-#: Zotlabs/Module/Setup.php:217
+#: Code/Module/Setup.php:217
 msgid "Database install failed!"
 msgstr "Błąd instalacji bazy danych!"
 
-#: Zotlabs/Module/Setup.php:219
+#: Code/Module/Setup.php:219
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
@@ -5768,23 +5768,23 @@ msgstr ""
 "Może być konieczne ręczne zaimportowanie pliku \"install/schema_xxx.sql\" za "
 "pomocą klienta bazy danych."
 
-#: Zotlabs/Module/Setup.php:220 Zotlabs/Module/Setup.php:285
+#: Code/Module/Setup.php:220 Code/Module/Setup.php:285
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Proszę zobaczyć plik \"install/INSTALL.txt\"."
 
-#: Zotlabs/Module/Setup.php:282
+#: Code/Module/Setup.php:282
 msgid "System check"
 msgstr "Sprawdzanie systemu"
 
-#: Zotlabs/Module/Setup.php:287
+#: Code/Module/Setup.php:287
 msgid "Check again"
 msgstr "Sprawdź ponownie"
 
-#: Zotlabs/Module/Setup.php:313
+#: Code/Module/Setup.php:313
 msgid "Database connection"
 msgstr "Połączenie z bazą danych"
 
-#: Zotlabs/Module/Setup.php:314
+#: Code/Module/Setup.php:314
 msgid ""
 "In order to install this software we need to know how to connect to your "
 "database."
@@ -5792,7 +5792,7 @@ msgstr ""
 "Aby zainstalować $Projectname, musimy wiedzieć, jak połączyć się z twoją "
 "bazą danych."
 
-#: Zotlabs/Module/Setup.php:315
+#: Code/Module/Setup.php:315
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
@@ -5800,7 +5800,7 @@ msgstr ""
 "Jeśli masz pytania dotyczące tych ustawień, skontaktuj się z dostawcą usług "
 "hostingowych lub administratorem portalu."
 
-#: Zotlabs/Module/Setup.php:316
+#: Code/Module/Setup.php:316
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
@@ -5808,43 +5808,43 @@ msgstr ""
 "Baza danych, którą określisz poniżej, powinna już istnieć. Jeśli tak się nie "
 "stało, utwórz ją przed kontynuowaniem."
 
-#: Zotlabs/Module/Setup.php:320
+#: Code/Module/Setup.php:320
 msgid "Database Server Name"
 msgstr "Nazwa serwera bazy danych"
 
-#: Zotlabs/Module/Setup.php:320
+#: Code/Module/Setup.php:320
 msgid "Default is 127.0.0.1"
 msgstr "Domyślnie, 127.0.0.1"
 
-#: Zotlabs/Module/Setup.php:321
+#: Code/Module/Setup.php:321
 msgid "Database Port"
 msgstr "Port bazy danych"
 
-#: Zotlabs/Module/Setup.php:321
+#: Code/Module/Setup.php:321
 msgid "Communication port number - use 0 for default"
 msgstr "Numer portu komunikacyjnego - dla wartości domyślnej użyj 0"
 
-#: Zotlabs/Module/Setup.php:322
+#: Code/Module/Setup.php:322
 msgid "Database Login Name"
 msgstr "Nazwa logowania do bazy danych"
 
-#: Zotlabs/Module/Setup.php:323
+#: Code/Module/Setup.php:323
 msgid "Database Login Password"
 msgstr "Hasło logowania do bazy danych"
 
-#: Zotlabs/Module/Setup.php:324
+#: Code/Module/Setup.php:324
 msgid "Database Name"
 msgstr "Nazwa bazy danych"
 
-#: Zotlabs/Module/Setup.php:325
+#: Code/Module/Setup.php:325
 msgid "Database Type"
 msgstr "Typ bazy danych"
 
-#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369
+#: Code/Module/Setup.php:327 Code/Module/Setup.php:369
 msgid "Site administrator email address"
 msgstr "Adres e-mail administratora portalu"
 
-#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369
+#: Code/Module/Setup.php:327 Code/Module/Setup.php:369
 msgid ""
 "Required. Your account email address must match this in order to use the web "
 "admin panel."
@@ -5852,35 +5852,35 @@ msgstr ""
 "Wymagane. Twój adres e-mail musi być zgodny z tym adresem, aby móc później "
 "korzystać z panelu administratora portalu."
 
-#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:328 Code/Module/Setup.php:371
 msgid "Website URL"
 msgstr "Adres URL portalu"
 
-#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:328 Code/Module/Setup.php:371
 msgid "Required. Please use SSL (https) URL if available."
 msgstr "Wymagane. Proszę iżyć adresu URL z SSL (https), jeśli jest dostępny."
 
-#: Zotlabs/Module/Setup.php:329 Zotlabs/Module/Setup.php:373
+#: Code/Module/Setup.php:329 Code/Module/Setup.php:373
 msgid "Please select a default timezone for your website"
 msgstr "Wybierz domyślną strefę czasową dla swojego portalu"
 
-#: Zotlabs/Module/Setup.php:357
+#: Code/Module/Setup.php:357
 msgid "Site settings"
 msgstr "Ustawienia portalu"
 
-#: Zotlabs/Module/Setup.php:415
+#: Code/Module/Setup.php:415
 msgid "PHP version 7.1 or greater is required."
 msgstr "Wymagany jest PHP w wersji 7.1 lub wyższej."
 
-#: Zotlabs/Module/Setup.php:416
+#: Code/Module/Setup.php:416
 msgid "PHP version"
 msgstr "Wersja PHP"
 
-#: Zotlabs/Module/Setup.php:431
+#: Code/Module/Setup.php:431
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Nie można znaleźć wersji CLI PHP w zmiennej PATH serwerze WWW."
 
-#: Zotlabs/Module/Setup.php:432
+#: Code/Module/Setup.php:432
 msgid ""
 "If you do not have a command line version of PHP installed on server, you "
 "will not be able to run background tasks - including message delivery."
@@ -5888,11 +5888,11 @@ msgstr ""
 "Jeśli nie masz wersji CLI PHP zainstalowanej na serwerze, nie będzie można "
 "uruchomić odpytywania w tle przez cron."
 
-#: Zotlabs/Module/Setup.php:436
+#: Code/Module/Setup.php:436
 msgid "PHP executable path"
 msgstr "Ścieżka do pliku wykonywalnego PHP"
 
-#: Zotlabs/Module/Setup.php:436
+#: Code/Module/Setup.php:436
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
@@ -5900,11 +5900,11 @@ msgstr ""
 "Wpisz pełną ścieżkę do pliku wykonywalnego php. Możesz pozostawić to pole "
 "puste, aby kontynuować instalację."
 
-#: Zotlabs/Module/Setup.php:441
+#: Code/Module/Setup.php:441
 msgid "Command line PHP"
 msgstr "Wiersz poleceń PHP"
 
-#: Zotlabs/Module/Setup.php:451
+#: Code/Module/Setup.php:451
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
@@ -5912,22 +5912,22 @@ msgstr ""
 "Nie można sprawdzić PHP CLI, ponieważ funkcja shell_exec() jest wyłączona. "
 "To jest wymagane."
 
-#: Zotlabs/Module/Setup.php:455
+#: Code/Module/Setup.php:455
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 "Ta wersja PHP CLI w Twoim systemie nie ma włączonego \"register_argc_argv\"."
 
-#: Zotlabs/Module/Setup.php:456
+#: Code/Module/Setup.php:456
 msgid "This is required for message delivery to work."
 msgstr "Jest to konieczne, aby dostarczanie wiadomości działało."
 
-#: Zotlabs/Module/Setup.php:459
+#: Code/Module/Setup.php:459
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: Zotlabs/Module/Setup.php:479
+#: Code/Module/Setup.php:479
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 2MB (2097152 bytes) at once."
@@ -5935,7 +5935,7 @@ msgstr ""
 "To nie wystarczy, aby przesłać większe obrazy lub pliki. Powinieneś móc "
 "przesłać co najmniej 2 MB  (2097152 bajty) na raz."
 
-#: Zotlabs/Module/Setup.php:483
+#: Code/Module/Setup.php:483
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to "
@@ -5945,15 +5945,15 @@ msgstr ""
 "Maksymalny rozmiar jednego pliku do przesłania to %s. Możesz przesłać "
 "jednocześnie do %d plików."
 
-#: Zotlabs/Module/Setup.php:490
+#: Code/Module/Setup.php:490
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Możesz dostosować te ustawienia w pliku php.ini na serwerze."
 
-#: Zotlabs/Module/Setup.php:492
+#: Code/Module/Setup.php:492
 msgid "PHP upload limits"
 msgstr "Limity wysyłania PHP"
 
-#: Zotlabs/Module/Setup.php:515
+#: Code/Module/Setup.php:515
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
@@ -5961,7 +5961,7 @@ msgstr ""
 "Błąd: funkcja \"openssl_pkey_new\" w tym systemie nie jest w stanie "
 "wygenerować kluczy szyfrujących"
 
-#: Zotlabs/Module/Setup.php:516
+#: Code/Module/Setup.php:516
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
@@ -5969,64 +5969,64 @@ msgstr ""
 "Jeśli pracujesz w systemie Windows, przeczytaj \"http://www.php.net/manual/"
 "en/openssl.installation.php\"."
 
-#: Zotlabs/Module/Setup.php:519
+#: Code/Module/Setup.php:519
 msgid "Generate encryption keys"
 msgstr "Wygeneruj klucze szyfrowania"
 
-#: Zotlabs/Module/Setup.php:538
+#: Code/Module/Setup.php:538
 msgid "libCurl PHP module"
 msgstr "moduł PHP libCurl"
 
-#: Zotlabs/Module/Setup.php:539
+#: Code/Module/Setup.php:539
 msgid "GD graphics PHP module"
 msgstr "Moduł PHP GD graphics"
 
-#: Zotlabs/Module/Setup.php:540
+#: Code/Module/Setup.php:540
 msgid "OpenSSL PHP module"
 msgstr "Moduł PHP OpenSSL"
 
-#: Zotlabs/Module/Setup.php:541
+#: Code/Module/Setup.php:541
 msgid "PDO database PHP module"
 msgstr "Moduł PHP PDO"
 
-#: Zotlabs/Module/Setup.php:542
+#: Code/Module/Setup.php:542
 msgid "mb_string PHP module"
 msgstr "moduł PHP mb_string"
 
-#: Zotlabs/Module/Setup.php:543
+#: Code/Module/Setup.php:543
 msgid "xml PHP module"
 msgstr "moduł PHP xml"
 
-#: Zotlabs/Module/Setup.php:544
+#: Code/Module/Setup.php:544
 msgid "zip PHP module"
 msgstr "moduł PHP zip"
 
-#: Zotlabs/Module/Setup.php:548 Zotlabs/Module/Setup.php:550
+#: Code/Module/Setup.php:548 Code/Module/Setup.php:550
 msgid "Apache mod_rewrite module"
 msgstr "Moduł Apache mod_rewrite"
 
-#: Zotlabs/Module/Setup.php:548
+#: Code/Module/Setup.php:548
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 "Błąd: wymagany jest moduł mod-rewrite serwera Apache, ale nie jest "
 "zainstalowany."
 
-#: Zotlabs/Module/Setup.php:554 Zotlabs/Module/Setup.php:556
+#: Code/Module/Setup.php:554 Code/Module/Setup.php:556
 msgid "exec"
 msgstr "exec"
 
-#: Zotlabs/Module/Setup.php:554
+#: Code/Module/Setup.php:554
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Dodatkowe informacje można znaleźć w pliku install/INSTALL.txt"
 
-#: Zotlabs/Module/Setup.php:559 Zotlabs/Module/Setup.php:561
+#: Code/Module/Setup.php:559 Code/Module/Setup.php:561
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: Zotlabs/Module/Setup.php:559
+#: Code/Module/Setup.php:559
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
@@ -6034,11 +6034,11 @@ msgstr ""
 "Błąd: wymagany jest shell_exec, ale nie jest zainstalowany lub został "
 "wyłączony w php.ini"
 
-#: Zotlabs/Module/Setup.php:566
+#: Code/Module/Setup.php:566
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Błąd: wymagany jest moduł PHP libCURL, ale nie jest zainstalowany."
 
-#: Zotlabs/Module/Setup.php:570
+#: Code/Module/Setup.php:570
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
@@ -6046,36 +6046,36 @@ msgstr ""
 "Błąd: wymagany jest moduł PHP GD z obsługą formatu JPEG lub biblioteką "
 "graficzną ImageMagick, ale nie jest on zainstalowany."
 
-#: Zotlabs/Module/Setup.php:574
+#: Code/Module/Setup.php:574
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Błąd: wymagany jest moduł PHP openssl, ale niezainstalowany."
 
-#: Zotlabs/Module/Setup.php:580
+#: Code/Module/Setup.php:580
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr "Błąd: w module PHP PDO brakuje sterownika dla mysql lub pgsql."
 
-#: Zotlabs/Module/Setup.php:585
+#: Code/Module/Setup.php:585
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Błąd: wymagany jest moduł PHP PDO, ale nie jest zainstalowany."
 
-#: Zotlabs/Module/Setup.php:589
+#: Code/Module/Setup.php:589
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Błąd: wymagany, ale niezainstalowany moduł mb_string PHP."
 
-#: Zotlabs/Module/Setup.php:593
+#: Code/Module/Setup.php:593
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Błąd: moduł xml PHP jest wymagany dla DAV, ale nie jest zainstalowany."
 
-#: Zotlabs/Module/Setup.php:597
+#: Code/Module/Setup.php:597
 msgid "Error: zip PHP module required but not installed."
 msgstr "Błąd: wymagany jest moduł PHP zip, ale nie jest on zainstalowany."
 
-#: Zotlabs/Module/Setup.php:619 Zotlabs/Module/Setup.php:628
+#: Code/Module/Setup.php:619 Code/Module/Setup.php:628
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php jest możliwy do zapisu"
 
-#: Zotlabs/Module/Setup.php:624
+#: Code/Module/Setup.php:624
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
@@ -6083,7 +6083,7 @@ msgstr ""
 "Instalator internetowy musi mieć możliwość utworzenia pliku o nazwie \"."
 "htconfig.php\" w głównym folderze serwera WWW a nie może tego zrobić."
 
-#: Zotlabs/Module/Setup.php:625
+#: Code/Module/Setup.php:625
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
@@ -6091,11 +6091,11 @@ msgstr ""
 "Najczęściej jest to ustawienie uprawnień, ponieważ serwer WWW może nie być w "
 "stanie zapisywać plików w Twoim folderze - nawet jeśli Ty możesz."
 
-#: Zotlabs/Module/Setup.php:626
+#: Code/Module/Setup.php:626
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Dodatkowe informacje można znaleźć w pliku install/INSTALL.txt."
 
-#: Zotlabs/Module/Setup.php:645
+#: Code/Module/Setup.php:645
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
@@ -6104,7 +6104,7 @@ msgstr ""
 "widoków internetowych. Smarty3 kompiluje szablony do PHP, aby przyspieszyć "
 "renderowanie."
 
-#: Zotlabs/Module/Setup.php:646
+#: Code/Module/Setup.php:646
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
@@ -6113,7 +6113,7 @@ msgstr ""
 "Aby przechowywać te skompilowane szablony, serwer sieciowy musi mieć dostęp "
 "do zapisu w katalogu %s zlokalizowanym w folderze głównym serwera WWW."
 
-#: Zotlabs/Module/Setup.php:647 Zotlabs/Module/Setup.php:668
+#: Code/Module/Setup.php:647 Code/Module/Setup.php:668
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
@@ -6121,12 +6121,12 @@ msgstr ""
 "Upewnij się, że właściciel procesu serwer WWW (np. www-data), ma prawo do "
 "zapisu w tym folderze."
 
-#: Zotlabs/Module/Setup.php:650
+#: Code/Module/Setup.php:650
 #, php-format
 msgid "%s is writable"
 msgstr "%s jest możliwy do zapisu"
 
-#: Zotlabs/Module/Setup.php:667
+#: Code/Module/Setup.php:667
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level "
@@ -6136,11 +6136,11 @@ msgstr ""
 "Serwer WWW musi mieć dostęp do zapisu w katalogu store, znajdującego się w "
 "folderze serwera WWW najwyższego poziomu"
 
-#: Zotlabs/Module/Setup.php:671
+#: Code/Module/Setup.php:671
 msgid "store is writable"
 msgstr "katalog store jest możliwy do zapisu"
 
-#: Zotlabs/Module/Setup.php:703
+#: Code/Module/Setup.php:703
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
@@ -6148,7 +6148,7 @@ msgstr ""
 "Nie można zweryfikować certyfikatu SSL. Napraw certyfikat lub wyłącz dostęp "
 "https do tego portalu."
 
-#: Zotlabs/Module/Setup.php:704
+#: Code/Module/Setup.php:704
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
@@ -6159,7 +6159,7 @@ msgstr ""
 "akceptowanego przez przeglądarki. NIE WOLNO używać certyfikatów z podpisem "
 "własnym!"
 
-#: Zotlabs/Module/Setup.php:705
+#: Code/Module/Setup.php:705
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
@@ -6167,7 +6167,7 @@ msgstr ""
 "To ograniczenie zostało wprowadzone, ponieważ Twoje publiczne wpisy mogą na "
 "przykład zawierać odniesienia do obrazów na Twoim portalu."
 
-#: Zotlabs/Module/Setup.php:706
+#: Code/Module/Setup.php:706
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
@@ -6177,7 +6177,7 @@ msgstr ""
 "(którzy sami mogą mieć ważne certyfikaty) otrzymają komunikat ostrzegawczy "
 "we własnym portalu, ostrzegający o problemie z bezpieczeństwem."
 
-#: Zotlabs/Module/Setup.php:707
+#: Code/Module/Setup.php:707
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
@@ -6185,14 +6185,14 @@ msgstr ""
 "Może to powodować problemy z użytecznością w innym portalu (nie tylko na "
 "Twoim), więc musimy nalegać na to wymaganie."
 
-#: Zotlabs/Module/Setup.php:708
+#: Code/Module/Setup.php:708
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 "Są dostępni dostawcy, którzy wydają bezpłatne certyfikaty akceptowane przez "
 "przeglądarki."
 
-#: Zotlabs/Module/Setup.php:710
+#: Code/Module/Setup.php:710
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -6204,11 +6204,11 @@ msgstr ""
 "Zwykle nie są one wymagane przez przeglądarki, ale są wymagane do "
 "komunikacji między serwerami."
 
-#: Zotlabs/Module/Setup.php:712
+#: Code/Module/Setup.php:712
 msgid "SSL certificate validation"
 msgstr "Walidacja certyfikatu SSL"
 
-#: Zotlabs/Module/Setup.php:718
+#: Code/Module/Setup.php:718
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
@@ -6216,11 +6216,11 @@ msgstr ""
 "Przepisywanie adresu URL w .htaccess nie działa. Sprawdź konfigurację "
 "serwera. Test: "
 
-#: Zotlabs/Module/Setup.php:721
+#: Code/Module/Setup.php:721
 msgid "Url rewrite is working"
 msgstr "Przepisywanie adresu URL działa"
 
-#: Zotlabs/Module/Setup.php:736
+#: Code/Module/Setup.php:736
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
@@ -6230,31 +6230,31 @@ msgstr ""
 "załączonego tekstu, aby utworzyć plik konfiguracyjny w katalogu głównym "
 "serwera WWW."
 
-#: Zotlabs/Module/Setup.php:762 extend/addon/a/faces/faces.php:219
+#: Code/Module/Setup.php:762 extend/addon/a/faces/faces.php:219
 msgid "Errors encountered creating database tables."
 msgstr "Napotkano błędy podczas tworzenia tabel bazy danych."
 
-#: Zotlabs/Module/Setup.php:807
+#: Code/Module/Setup.php:807
 msgid "registration page"
 msgstr "strony rejestracji"
 
-#: Zotlabs/Module/Setup.php:810
+#: Code/Module/Setup.php:810
 msgid "
              What next?
              "
 msgstr "
              Co następnie?
              "
 
-#: Zotlabs/Module/Setup.php:812
+#: Code/Module/Setup.php:812
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr "WAŻNE: Będziesz musiał [ręcznie] ustawić zaplanowanie zadania Cron."
 
-#: Zotlabs/Module/Setup.php:814
+#: Code/Module/Setup.php:814
 msgid ""
 "Please see the file \"install/INSTALL.txt\" for more information and "
 "instructions."
 msgstr ""
 "Dodatkowe informacje i instrukcje można znaleźć w pliku install/INSTALL.txt."
 
-#: Zotlabs/Module/Setup.php:816
+#: Code/Module/Setup.php:816
 #, php-format
 msgid ""
 "Go to your new hub %s and register as new member. Please use the same email "
@@ -6266,416 +6266,416 @@ msgstr ""
 "administratora, ponieważ pozwoli to Tobie na używanie panelu "
 "administracyjnego z tego konta."
 
-#: Zotlabs/Module/Hcard.php:45 Zotlabs/Module/Profile.php:55
+#: Code/Module/Hcard.php:45 Code/Module/Profile.php:55
 msgid "Posts and comments"
 msgstr "Wpisy i komentarze"
 
-#: Zotlabs/Module/Hcard.php:52 Zotlabs/Module/Channel.php:85
-#: Zotlabs/Module/Profile.php:62
+#: Code/Module/Hcard.php:52 Code/Module/Channel.php:85
+#: Code/Module/Profile.php:62
 msgid "Only posts"
 msgstr "Tylko wpisy"
 
-#: Zotlabs/Module/Lists.php:107
+#: Code/Module/Lists.php:107
 msgid "Access list created."
 msgstr "Lista dostępu została utworzona."
 
-#: Zotlabs/Module/Lists.php:109
+#: Code/Module/Lists.php:109
 msgid "Could not create access list."
 msgstr "Nie udało się utworzyć listy dostępu."
 
-#: Zotlabs/Module/Lists.php:129 Zotlabs/Module/Lists.php:276
+#: Code/Module/Lists.php:129 Code/Module/Lists.php:276
 #: include/items.php:4529
 msgid "Access list not found."
 msgstr "Nie znaleziono listy dostępu."
 
-#: Zotlabs/Module/Lists.php:146
+#: Code/Module/Lists.php:146
 msgid "Access list updated."
 msgstr "Lista dostępu została zaktualizowana."
 
-#: Zotlabs/Module/Lists.php:169 Zotlabs/Module/Lists.php:215
-#: Zotlabs/Module/Lists.php:244 Zotlabs/Module/Lists.php:287
-#: Zotlabs/Module/Import_items.php:133 Zotlabs/Module/Cloud.php:134
-#: Zotlabs/Module/Like.php:109 Zotlabs/Module/Share.php:81
-#: Zotlabs/Module/Dreport.php:16 Zotlabs/Module/Dreport.php:86
-#: Zotlabs/Module/Profperm.php:35 Zotlabs/Module/Subthread.php:97
-#: Zotlabs/Web/WebServer.php:69 include/items.php:490
+#: Code/Module/Lists.php:169 Code/Module/Lists.php:215
+#: Code/Module/Lists.php:244 Code/Module/Lists.php:287
+#: Code/Module/Import_items.php:133 Code/Module/Cloud.php:134
+#: Code/Module/Like.php:109 Code/Module/Share.php:81
+#: Code/Module/Dreport.php:16 Code/Module/Dreport.php:86
+#: Code/Module/Profperm.php:35 Code/Module/Subthread.php:97
+#: Code/Web/WebServer.php:69 include/items.php:490
 msgid "Permission denied"
 msgstr "Odmowa dostępu"
 
-#: Zotlabs/Module/Lists.php:190 Zotlabs/Module/Lists.php:201
+#: Code/Module/Lists.php:190 Code/Module/Lists.php:201
 msgid "Access Lists"
 msgstr "Listy dostępu"
 
-#: Zotlabs/Module/Lists.php:191
+#: Code/Module/Lists.php:191
 msgid "Create access list"
 msgstr "Utwórz listę dostępu"
 
-#: Zotlabs/Module/Lists.php:195
+#: Code/Module/Lists.php:195
 msgid "Access list name"
 msgstr "Nazwa listy dostępu"
 
-#: Zotlabs/Module/Lists.php:196 Zotlabs/Module/Lists.php:339
+#: Code/Module/Lists.php:196 Code/Module/Lists.php:339
 msgid "Members are visible to other channels"
 msgstr "Członkowie są widoczni dla innych kanałów"
 
-#: Zotlabs/Module/Lists.php:203
+#: Code/Module/Lists.php:203
 msgid "Members"
 msgstr "Członkowie"
 
-#: Zotlabs/Module/Lists.php:232
+#: Code/Module/Lists.php:232
 msgid "Access list removed."
 msgstr "Lista dostępu została  usunięta."
 
-#: Zotlabs/Module/Lists.php:234
+#: Code/Module/Lists.php:234
 msgid "Unable to remove access list."
 msgstr "Nie można usunąć listy dostępu."
 
-#: Zotlabs/Module/Lists.php:299 Zotlabs/Module/Lists.php:351
-#: Zotlabs/Module/Followers.php:86 Zotlabs/Module/Following.php:88
+#: Code/Module/Lists.php:299 Code/Module/Lists.php:351
+#: Code/Module/Followers.php:86 Code/Module/Following.php:88
 msgid "List members"
 msgstr "Lista członków"
 
-#: Zotlabs/Module/Lists.php:334
+#: Code/Module/Lists.php:334
 #, php-format
 msgid "Access List: %s"
 msgstr "Lista dostępu: %s"
 
-#: Zotlabs/Module/Lists.php:336
+#: Code/Module/Lists.php:336
 msgid "Access list name: "
 msgstr "Nazwa listy dostępu: "
 
-#: Zotlabs/Module/Lists.php:341
+#: Code/Module/Lists.php:341
 msgid "Delete access list"
 msgstr "Usuń listę dostępu"
 
-#: Zotlabs/Module/Lists.php:353
+#: Code/Module/Lists.php:353
 msgid "Not in this list"
 msgstr "Nie ma na tej liście"
 
-#: Zotlabs/Module/Lists.php:386
+#: Code/Module/Lists.php:386
 msgid "Select a channel to toggle membership"
 msgstr "Wybierz kanał w celu przełączenia członkostwa"
 
-#: Zotlabs/Module/Layouts.php:198 include/text.php:2852
+#: Code/Module/Layouts.php:198 include/text.php:2852
 msgid "Layouts"
 msgstr "Układy"
 
-#: Zotlabs/Module/Layouts.php:204
+#: Code/Module/Layouts.php:204
 msgid "Layout Description"
 msgstr "Opis układu"
 
-#: Zotlabs/Module/Layouts.php:209
+#: Code/Module/Layouts.php:209
 msgid "Download PDL file"
 msgstr "Pobierz plik PDL"
 
-#: Zotlabs/Module/Channel.php:176
+#: Code/Module/Channel.php:176
 #, php-format
 msgid "This is the home page of %s."
 msgstr "To jest strona główna %s."
 
-#: Zotlabs/Module/Channel.php:233
+#: Code/Module/Channel.php:233
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Niewystarczające uprawnienia. Żądanie przekierowane na stronę profilu."
 
-#: Zotlabs/Module/Channel.php:249 Zotlabs/Module/Stream.php:215
+#: Code/Module/Channel.php:249 Code/Module/Stream.php:215
 msgid "Search Results For:"
 msgstr "Wyniki wyszukiwania dla:"
 
-#: Zotlabs/Module/Channel.php:604
+#: Code/Module/Channel.php:604
 #, php-format
 msgid "This post was published on the home page of %s."
 msgstr "Ten wpis został opublikowany na stronie głównej %s."
 
-#: Zotlabs/Module/Card_edit.php:126 Zotlabs/Module/Editblock.php:142
-#: Zotlabs/Module/Photos.php:732 Zotlabs/Module/Photos.php:1118
+#: Code/Module/Card_edit.php:126 Code/Module/Editblock.php:142
+#: Code/Module/Photos.php:732 Code/Module/Photos.php:1118
 #: include/conversation.php:1451
 msgid "Title (optional)"
 msgstr "Tytuł (opcjonalnie)"
 
-#: Zotlabs/Module/Card_edit.php:137
+#: Code/Module/Card_edit.php:137
 msgid "Edit Card"
 msgstr "Edytuj kartę"
 
-#: Zotlabs/Module/Import_items.php:54 Zotlabs/Module/Import.php:73
+#: Code/Module/Import_items.php:54 Code/Module/Import.php:73
 msgid "Nothing to import."
 msgstr "Nie ma nic do zaimportowania."
 
-#: Zotlabs/Module/Import_items.php:79 Zotlabs/Module/Import.php:88
-#: Zotlabs/Module/Import.php:103
+#: Code/Module/Import_items.php:79 Code/Module/Import.php:88
+#: Code/Module/Import.php:103
 msgid "Unable to download data from old server"
 msgstr "Nie można pobrać danych ze starego serwera"
 
-#: Zotlabs/Module/Import_items.php:85 Zotlabs/Module/Import.php:110
+#: Code/Module/Import_items.php:85 Code/Module/Import.php:110
 msgid "Imported file is empty."
 msgstr "Zaimportowany plik jest pusty."
 
-#: Zotlabs/Module/Import_items.php:110
+#: Code/Module/Import_items.php:110
 msgid "Data export format is not compatible with this software"
 msgstr "Format eksportowy danych nie jest zgodny z tym oprogramowaniem"
 
-#: Zotlabs/Module/Import_items.php:120
+#: Code/Module/Import_items.php:120
 msgid "Import completed"
 msgstr "Zakończono importowanie"
 
-#: Zotlabs/Module/Import_items.php:138
+#: Code/Module/Import_items.php:138
 msgid "Import Items"
 msgstr "Importuj elementy"
 
-#: Zotlabs/Module/Import_items.php:139
+#: Code/Module/Import_items.php:139
 msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 "Użyj tego formularza, aby zaimportować istniejące wpisy i treść z pliku "
 "eksportu."
 
-#: Zotlabs/Module/Import_items.php:140 Zotlabs/Module/Import.php:687
+#: Code/Module/Import_items.php:140 Code/Module/Import.php:687
 msgid "File to Upload"
 msgstr "Plik do przesłania"
 
-#: Zotlabs/Module/Cloud.php:136
+#: Code/Module/Cloud.php:136
 msgid "Please refresh page"
 msgstr "Proszę odświeżyć stronę"
 
-#: Zotlabs/Module/Cloud.php:142
+#: Code/Module/Cloud.php:142
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: Zotlabs/Module/Manage.php:148 Zotlabs/Module/New_channel.php:165
+#: Code/Module/Manage.php:148 Code/Module/New_channel.php:165
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Utworzono %1$.0f z %2$.0f dozwolonych kanałów."
 
-#: Zotlabs/Module/Manage.php:154
+#: Code/Module/Manage.php:154
 msgid "Create a new channel"
 msgstr "Utwórz nowy kanał"
 
-#: Zotlabs/Module/Manage.php:183
+#: Code/Module/Manage.php:183
 msgid "Current Channel"
 msgstr "Bieżący kanał"
 
-#: Zotlabs/Module/Manage.php:185
+#: Code/Module/Manage.php:185
 msgid "Switch to one of your channels by selecting it."
 msgstr "Przełącz się na jeden ze swoich kanałów, wybierając go."
 
-#: Zotlabs/Module/Manage.php:186
+#: Code/Module/Manage.php:186
 msgid "Default Login Channel"
 msgstr "Domyślny kanał logowania"
 
-#: Zotlabs/Module/Manage.php:187
+#: Code/Module/Manage.php:187
 msgid "Make Default"
 msgstr "Ustaw jako domyślny"
 
-#: Zotlabs/Module/Manage.php:188 Zotlabs/Module/Manage.php:189
+#: Code/Module/Manage.php:188 Code/Module/Manage.php:189
 msgid "Add to menu"
 msgstr "Dodaj do menu"
 
-#: Zotlabs/Module/Manage.php:192
+#: Code/Module/Manage.php:192
 #, php-format
 msgid "%d new messages"
 msgstr "%d nowych wiadomości"
 
-#: Zotlabs/Module/Manage.php:193
+#: Code/Module/Manage.php:193
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nowych wprowadzeń"
 
-#: Zotlabs/Module/Manage.php:195
+#: Code/Module/Manage.php:195
 msgid "Delegated Channel"
 msgstr "Delegowany kanał"
 
-#: Zotlabs/Module/Lang.php:21
+#: Code/Module/Lang.php:21
 msgid "Change UI language"
 msgstr "Zmień język interfejsu użytkownika"
 
-#: Zotlabs/Module/Mitem.php:41 Zotlabs/Module/Menu.php:213
+#: Code/Module/Mitem.php:41 Code/Module/Menu.php:213
 msgid "Menu not found."
 msgstr "Nie znaleziono menu."
 
-#: Zotlabs/Module/Mitem.php:75
+#: Code/Module/Mitem.php:75
 msgid "Unable to create element."
 msgstr "Nie można utworzyć elementu."
 
-#: Zotlabs/Module/Mitem.php:100
+#: Code/Module/Mitem.php:100
 msgid "Unable to update menu element."
 msgstr "Nie można zaktualizować elementu menu."
 
-#: Zotlabs/Module/Mitem.php:114
+#: Code/Module/Mitem.php:114
 msgid "Unable to add menu element."
 msgstr "Nie można dodać elementu menu."
 
-#: Zotlabs/Module/Mitem.php:145 Zotlabs/Module/Menu.php:234
-#: Zotlabs/Module/Xchan.php:46
+#: Code/Module/Mitem.php:145 Code/Module/Menu.php:234
+#: Code/Module/Xchan.php:46
 msgid "Not found."
 msgstr "Nie znaleziono."
 
-#: Zotlabs/Module/Mitem.php:179 Zotlabs/Module/Mitem.php:258
+#: Code/Module/Mitem.php:179 Code/Module/Mitem.php:258
 msgid "Menu Item Permissions"
 msgstr "Uprawnienia do pozycji menu"
 
-#: Zotlabs/Module/Mitem.php:180 Zotlabs/Module/Mitem.php:259
-#: Zotlabs/Module/Settings/Channel.php:658
+#: Code/Module/Mitem.php:180 Code/Module/Mitem.php:259
+#: Code/Module/Settings/Channel.php:658
 msgid "(click to open/close)"
 msgstr "(kliknij, aby otworzyć/zamknąć)"
 
-#: Zotlabs/Module/Mitem.php:186 Zotlabs/Module/Mitem.php:203
+#: Code/Module/Mitem.php:186 Code/Module/Mitem.php:203
 msgid "Link Name"
 msgstr "Nazwa linku"
 
-#: Zotlabs/Module/Mitem.php:187 Zotlabs/Module/Mitem.php:267
+#: Code/Module/Mitem.php:187 Code/Module/Mitem.php:267
 msgid "Link or Submenu Target"
 msgstr "Link lub element docelowy podmenu"
 
-#: Zotlabs/Module/Mitem.php:187
+#: Code/Module/Mitem.php:187
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr "Wprowadź adres URL linku lub wybierz nazwę menu, aby utworzyć podmenu"
 
-#: Zotlabs/Module/Mitem.php:188 Zotlabs/Module/Mitem.php:268
+#: Code/Module/Mitem.php:188 Code/Module/Mitem.php:268
 msgid "Use magic-auth if available"
 msgstr "Użyj magicznego uwierzytelniania, jeśli jest dostępne"
 
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:269
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:269
 msgid "Open link in new window"
 msgstr "Otwórz link w nowym oknie"
 
-#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270
+#: Code/Module/Mitem.php:190 Code/Module/Mitem.php:270
 msgid "Order in list"
 msgstr "Porządek listy"
 
-#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270
+#: Code/Module/Mitem.php:190 Code/Module/Mitem.php:270
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Wyższe liczby spadną na koniec listy"
 
-#: Zotlabs/Module/Mitem.php:191
+#: Code/Module/Mitem.php:191
 msgid "Submit and finish"
 msgstr "Prześlij i zakończ"
 
-#: Zotlabs/Module/Mitem.php:192
+#: Code/Module/Mitem.php:192
 msgid "Submit and continue"
 msgstr "Prześlij i kontynuuj"
 
-#: Zotlabs/Module/Mitem.php:201
+#: Code/Module/Mitem.php:201
 msgid "Menu:"
 msgstr "Menu:"
 
-#: Zotlabs/Module/Mitem.php:204
+#: Code/Module/Mitem.php:204
 msgid "Link Target"
 msgstr "Cel linku"
 
-#: Zotlabs/Module/Mitem.php:207
+#: Code/Module/Mitem.php:207
 msgid "Edit menu"
 msgstr "Edytuj menu"
 
-#: Zotlabs/Module/Mitem.php:210
+#: Code/Module/Mitem.php:210
 msgid "Edit element"
 msgstr "Edytuj element"
 
-#: Zotlabs/Module/Mitem.php:211
+#: Code/Module/Mitem.php:211
 msgid "Drop element"
 msgstr "Upuść element"
 
-#: Zotlabs/Module/Mitem.php:212
+#: Code/Module/Mitem.php:212
 msgid "New element"
 msgstr "Nowy element"
 
-#: Zotlabs/Module/Mitem.php:213
+#: Code/Module/Mitem.php:213
 msgid "Edit this menu container"
 msgstr "Edytuj ten kontener menu"
 
-#: Zotlabs/Module/Mitem.php:214
+#: Code/Module/Mitem.php:214
 msgid "Add menu element"
 msgstr "Dodaj element menu"
 
-#: Zotlabs/Module/Mitem.php:215
+#: Code/Module/Mitem.php:215
 msgid "Delete this menu item"
 msgstr "Usuń tę pozycję menu"
 
-#: Zotlabs/Module/Mitem.php:216
+#: Code/Module/Mitem.php:216
 msgid "Edit this menu item"
 msgstr "Edytuj tę pozycję menu"
 
-#: Zotlabs/Module/Mitem.php:233
+#: Code/Module/Mitem.php:233
 msgid "Menu item not found."
 msgstr "Nie znaleziono elementu menu."
 
-#: Zotlabs/Module/Mitem.php:246
+#: Code/Module/Mitem.php:246
 msgid "Menu item deleted."
 msgstr "Usunięto element menu."
 
-#: Zotlabs/Module/Mitem.php:248
+#: Code/Module/Mitem.php:248
 msgid "Menu item could not be deleted."
 msgstr "Nie można usunąć elementu menu."
 
-#: Zotlabs/Module/Mitem.php:256
+#: Code/Module/Mitem.php:256
 msgid "Edit Menu Element"
 msgstr "Edycja elementu menu"
 
-#: Zotlabs/Module/Mitem.php:266
+#: Code/Module/Mitem.php:266
 msgid "Link text"
 msgstr "Tekst linku"
 
-#: Zotlabs/Module/Finger.php:22
+#: Code/Module/Finger.php:22
 msgid "Webfinger Diagnostic"
 msgstr "Diagnostyka Webfinger"
 
-#: Zotlabs/Module/Finger.php:23
+#: Code/Module/Finger.php:23
 msgid "Lookup address or URL"
 msgstr "Wyszukaj adres lub URL"
 
-#: Zotlabs/Module/Editblock.php:151
+#: Code/Module/Editblock.php:151
 msgid "Edit Block"
 msgstr "Edytuj blok"
 
-#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124
-#: Zotlabs/Module/Tagger.php:84 include/conversation.php:129
+#: Code/Module/Like.php:172 Code/Module/Subthread.php:124
+#: Code/Module/Tagger.php:84 include/conversation.php:129
 #: include/text.php:2369
 msgid "photo"
 msgstr "zdjęcie"
 
-#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124
+#: Code/Module/Like.php:172 Code/Module/Subthread.php:124
 msgid "status"
 msgstr "stan"
 
-#: Zotlabs/Module/Like.php:217
+#: Code/Module/Like.php:217
 msgid "Undo a previous action"
 msgstr "Cofnij poprzednią czynność"
 
-#: Zotlabs/Module/Like.php:227
+#: Code/Module/Like.php:227
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s jest uczestnikiem  %3$s %2$s"
 
-#: Zotlabs/Module/Like.php:230
+#: Code/Module/Like.php:230
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s nie jest uczestnikiem %3$s %2$s"
 
-#: Zotlabs/Module/Like.php:233
+#: Code/Module/Like.php:233
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s może być uczestnikiem %3$s %2$s"
 
-#: Zotlabs/Module/Share.php:134
+#: Code/Module/Share.php:134
 msgid "Post repeated"
 msgstr "Wpis powtórzony"
 
-#: Zotlabs/Module/Lostpass.php:25
+#: Code/Module/Lostpass.php:25
 msgid "No valid account found."
 msgstr "Nie znaleziono prawidłowego konta."
 
-#: Zotlabs/Module/Lostpass.php:40
+#: Code/Module/Lostpass.php:40
 msgid "Password reset request issued. Check your email."
 msgstr "Wysłano prośbę o zresetowanie hasła. Sprawdź swoją skrzynkę e-mail."
 
-#: Zotlabs/Module/Lostpass.php:47 Zotlabs/Module/Lostpass.php:119
+#: Code/Module/Lostpass.php:47 Code/Module/Lostpass.php:119
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Członek portalu (%s)"
 
-#: Zotlabs/Module/Lostpass.php:52 Zotlabs/Module/Lostpass.php:57
+#: Code/Module/Lostpass.php:52 Code/Module/Lostpass.php:57
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Zresetowano hasło na %s"
 
-#: Zotlabs/Module/Lostpass.php:78
+#: Code/Module/Lostpass.php:78
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
@@ -6683,27 +6683,27 @@ msgstr ""
 "Nie można zweryfikować żądania. (Możliwe, że zostało już przesłane). "
 "Resetowanie hasła nie powiodło się."
 
-#: Zotlabs/Module/Lostpass.php:102 boot.php:1735
+#: Code/Module/Lostpass.php:102 boot.php:1735
 msgid "Password Reset"
 msgstr "Resetowanie hasła"
 
-#: Zotlabs/Module/Lostpass.php:103
+#: Code/Module/Lostpass.php:103
 msgid "Your password has been reset as requested."
 msgstr "Twoje hasło zostało zresetowane zgodnie z żądaniem."
 
-#: Zotlabs/Module/Lostpass.php:104
+#: Code/Module/Lostpass.php:104
 msgid "Your new password is"
 msgstr "Twoje nowe hasło to"
 
-#: Zotlabs/Module/Lostpass.php:105
+#: Code/Module/Lostpass.php:105
 msgid "Save or copy your new password - and then"
 msgstr "Zapisz lub skopiuj nowe hasło, a następnie"
 
-#: Zotlabs/Module/Lostpass.php:106
+#: Code/Module/Lostpass.php:106
 msgid "click here to login"
 msgstr "kliknij tutaj aby się zalogować"
 
-#: Zotlabs/Module/Lostpass.php:107
+#: Code/Module/Lostpass.php:107
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
@@ -6711,16 +6711,16 @@ msgstr ""
 "Twoje hasło może zostać zmienione na stronie Ustawienia po "
 "pomyślnym zalogowaniu."
 
-#: Zotlabs/Module/Lostpass.php:127
+#: Code/Module/Lostpass.php:127
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Twoje hasło zostało zmienione na %s"
 
-#: Zotlabs/Module/Lostpass.php:138
+#: Code/Module/Lostpass.php:138
 msgid "Forgot your Password?"
 msgstr "Zapomniałeś hasła?"
 
-#: Zotlabs/Module/Lostpass.php:139
+#: Code/Module/Lostpass.php:139
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
@@ -6728,112 +6728,112 @@ msgstr ""
 "Wpisz swój adres e-mail i prześlij, aby zresetować hasło. Następnie sprawdź "
 "swoja skrzynkę e-mail, aby uzyskać dalsze instrukcje."
 
-#: Zotlabs/Module/Lostpass.php:140 Zotlabs/Module/Settings/Channel.php:633
+#: Code/Module/Lostpass.php:140 Code/Module/Settings/Channel.php:633
 msgid "Email Address"
 msgstr "Adres e-mail"
 
-#: Zotlabs/Module/Menu.php:76
+#: Code/Module/Menu.php:76
 msgid "Unable to update menu."
 msgstr "Nie można zaktualizować menu."
 
-#: Zotlabs/Module/Menu.php:86
+#: Code/Module/Menu.php:86
 msgid "Unable to create menu."
 msgstr "Nie można utworzyć menu."
 
-#: Zotlabs/Module/Menu.php:166 Zotlabs/Module/Menu.php:179
+#: Code/Module/Menu.php:166 Code/Module/Menu.php:179
 msgid "Menu Name"
 msgstr "Nazwa menu"
 
-#: Zotlabs/Module/Menu.php:166
+#: Code/Module/Menu.php:166
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Unikalna nazwa (niewidoczna na stronie) - wymagana"
 
-#: Zotlabs/Module/Menu.php:167 Zotlabs/Module/Menu.php:180
+#: Code/Module/Menu.php:167 Code/Module/Menu.php:180
 msgid "Menu Title"
 msgstr "Tytuł menu"
 
-#: Zotlabs/Module/Menu.php:167
+#: Code/Module/Menu.php:167
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Widoczne na stronie - pozostaw puste bez tytułu"
 
-#: Zotlabs/Module/Menu.php:168
+#: Code/Module/Menu.php:168
 msgid "Allow Bookmarks"
 msgstr "Zezwalaj na zakładki"
 
-#: Zotlabs/Module/Menu.php:168 Zotlabs/Module/Menu.php:226
+#: Code/Module/Menu.php:168 Code/Module/Menu.php:226
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Menu może służyć do przechowywania zapisanych zakładek"
 
-#: Zotlabs/Module/Menu.php:169 Zotlabs/Module/Menu.php:229
+#: Code/Module/Menu.php:169 Code/Module/Menu.php:229
 msgid "Submit and proceed"
 msgstr "Prześlij i kontynuuj"
 
-#: Zotlabs/Module/Menu.php:176 include/text.php:2851
+#: Code/Module/Menu.php:176 include/text.php:2851
 msgid "Menus"
 msgstr "Kolekcja menu"
 
-#: Zotlabs/Module/Menu.php:182 Zotlabs/Module/Locs.php:135
+#: Code/Module/Menu.php:182 Code/Module/Locs.php:135
 msgid "Drop"
 msgstr "Usuń"
 
-#: Zotlabs/Module/Menu.php:186
+#: Code/Module/Menu.php:186
 msgid "Bookmarks allowed"
 msgstr "Zakładki są dozwolone"
 
-#: Zotlabs/Module/Menu.php:188
+#: Code/Module/Menu.php:188
 msgid "Delete this menu"
 msgstr "Usuń to menu"
 
-#: Zotlabs/Module/Menu.php:189 Zotlabs/Module/Menu.php:223
+#: Code/Module/Menu.php:189 Code/Module/Menu.php:223
 msgid "Edit menu contents"
 msgstr "Edytuj zawartość menu"
 
-#: Zotlabs/Module/Menu.php:190
+#: Code/Module/Menu.php:190
 msgid "Edit this menu"
 msgstr "Edytuj to menu"
 
-#: Zotlabs/Module/Menu.php:204
+#: Code/Module/Menu.php:204
 msgid "Menu could not be deleted."
 msgstr "Nie udało się usunąć menu."
 
-#: Zotlabs/Module/Menu.php:218
+#: Code/Module/Menu.php:218
 msgid "Edit Menu"
 msgstr "Edytuj menu"
 
-#: Zotlabs/Module/Menu.php:222
+#: Code/Module/Menu.php:222
 msgid "Add or remove entries to this menu"
 msgstr "Dodaj lub usuń wpisy w tym menu"
 
-#: Zotlabs/Module/Menu.php:224
+#: Code/Module/Menu.php:224
 msgid "Menu name"
 msgstr "Nazwa menu"
 
-#: Zotlabs/Module/Menu.php:224
+#: Code/Module/Menu.php:224
 msgid "Must be unique, only seen by you"
 msgstr "Musi być unikalna, widoczna tylko dla Ciebie"
 
-#: Zotlabs/Module/Menu.php:225
+#: Code/Module/Menu.php:225
 msgid "Menu title"
 msgstr "Tytuł menu"
 
-#: Zotlabs/Module/Menu.php:225
+#: Code/Module/Menu.php:225
 msgid "Menu title as seen by others"
 msgstr "Tytuł menu widziany przez innych"
 
-#: Zotlabs/Module/Menu.php:226
+#: Code/Module/Menu.php:226
 msgid "Allow bookmarks"
 msgstr "Zezwalaj na zakładki"
 
-#: Zotlabs/Module/Pconfig.php:37 Zotlabs/Module/Pconfig.php:73
+#: Code/Module/Pconfig.php:37 Code/Module/Pconfig.php:73
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 "To ustawienie wymaga specjalnego przetwarzania, a edycja została zablokowana."
 
-#: Zotlabs/Module/Pconfig.php:63
+#: Code/Module/Pconfig.php:63
 msgid "Configuration Editor"
 msgstr "Edytor konfiguracji"
 
-#: Zotlabs/Module/Pconfig.php:64
+#: Code/Module/Pconfig.php:64
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please "
 "leave this page unless you are comfortable with and knowledgeable about how "
@@ -6843,41 +6843,41 @@ msgstr ""
 "przestanie działać. Opuść tę stronę, chyba że czujesz się kompetentny i "
 "wiesz, jak prawidłowo korzystać z tej funkcji."
 
-#: Zotlabs/Module/Editpost.php:44
+#: Code/Module/Editpost.php:44
 msgid "Item is not editable"
 msgstr "Elementu nie można edytować"
 
-#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Rpost.php:242
+#: Code/Module/Editpost.php:147 Code/Module/Rpost.php:242
 msgid "Edit post"
 msgstr "Edytuj wpis"
 
-#: Zotlabs/Module/Search.php:336
+#: Code/Module/Search.php:336
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Elementy oznaczone jako: %s"
 
-#: Zotlabs/Module/Search.php:338
+#: Code/Module/Search.php:338
 #, php-format
 msgid "Search results for: %s"
 msgstr "Wyniki wyszukiwania dla: %s"
 
-#: Zotlabs/Module/Hq.php:160
+#: Code/Module/Hq.php:160
 msgid "Welcome to $Projectname!"
 msgstr "Witamy w $Projectname!"
 
-#: Zotlabs/Module/Hq.php:160
+#: Code/Module/Hq.php:160
 msgid "You have got no unseen posts..."
 msgstr "Nie masz żadnych nieoglądniętych wpisów..."
 
-#: Zotlabs/Module/Locs.php:31 Zotlabs/Module/Locs.php:72
+#: Code/Module/Locs.php:31 Code/Module/Locs.php:72
 msgid "Location not found."
 msgstr "Nie znaleziono lokalizacji."
 
-#: Zotlabs/Module/Locs.php:81
+#: Code/Module/Locs.php:81
 msgid "Location lookup failed."
 msgstr "Wyszukiwanie lokalizacji nie powiodło się."
 
-#: Zotlabs/Module/Locs.php:85
+#: Code/Module/Locs.php:85
 msgid ""
 "Please select another location to become primary before removing the primary "
 "location."
@@ -6885,27 +6885,27 @@ msgstr ""
 "Przed usunięciem lokalizacji podstawowej wybierz inną lokalizację jako "
 "główną."
 
-#: Zotlabs/Module/Locs.php:115
+#: Code/Module/Locs.php:115
 msgid "Pushing location info"
 msgstr "Przesyłanie informacji o lokalizacji"
 
-#: Zotlabs/Module/Locs.php:126
+#: Code/Module/Locs.php:126
 msgid "No locations found."
 msgstr "Nie znaleziono lokalizacji."
 
-#: Zotlabs/Module/Locs.php:131
+#: Code/Module/Locs.php:131
 msgid "Manage Channel Locations"
 msgstr "Zarządzaj lokalizacjami kanałów"
 
-#: Zotlabs/Module/Locs.php:137
+#: Code/Module/Locs.php:137
 msgid "Publish these settings"
 msgstr "Opublikuj te ustawienia"
 
-#: Zotlabs/Module/Locs.php:138
+#: Code/Module/Locs.php:138
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Poczekaj kilka minut między kolejnymi operacjami."
 
-#: Zotlabs/Module/Locs.php:139
+#: Code/Module/Locs.php:139
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing "
 "your channel."
@@ -6913,26 +6913,26 @@ msgstr ""
 "Jeśli to możliwe, usuń lokalizację przez zalogowanie się do tego serwisu i "
 "usunięcie swojego kanału."
 
-#: Zotlabs/Module/Locs.php:140
+#: Code/Module/Locs.php:140
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 "Użyj tego formularza, aby usunąć lokalizację, jeśli serwer już nie działa."
 
-#: Zotlabs/Module/Viewsrc.php:48
+#: Code/Module/Viewsrc.php:48
 msgid "item"
 msgstr "element"
 
-#: Zotlabs/Module/Viewsrc.php:58
+#: Code/Module/Viewsrc.php:58
 msgid "inspect"
 msgstr "sprawdź"
 
-#: Zotlabs/Module/New_channel.php:173
+#: Code/Module/New_channel.php:173
 msgid "Your real name is recommended."
 msgstr ""
 "Zalecane jest podania rzeczywistej nazwy lub prawdziwego imienia i nazwiska, "
 "choć można posługiwać się również pseudonimem."
 
-#: Zotlabs/Module/New_channel.php:174
+#: Code/Module/New_channel.php:174
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
@@ -6940,22 +6940,22 @@ msgstr ""
 "Przykłady: \"Bob Jameson\", \"Lisa i jej konie\", \"Piłka nożna\", \"Grupa "
 "lotnicza\""
 
-#: Zotlabs/Module/New_channel.php:179
+#: Code/Module/New_channel.php:179
 msgid ""
 "This will be used to create a unique network address (like an email address)."
 msgstr ""
 "Zostanie to zastosowane do utworzenia unikalnego adresu sieciowego "
 "(podobnego do adresu e-mail)."
 
-#: Zotlabs/Module/New_channel.php:181
+#: Code/Module/New_channel.php:181
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr "Dozwolone znaki, to a-z 0-9, - oraz _"
 
-#: Zotlabs/Module/New_channel.php:189
+#: Code/Module/New_channel.php:189
 msgid "Channel name"
 msgstr "Nazwa kanału"
 
-#: Zotlabs/Module/New_channel.php:192
+#: Code/Module/New_channel.php:192
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
@@ -6963,11 +6963,11 @@ msgstr ""
 "Wybierz rolę uprawnień do kanału, zgodną z Twoimi potrzebami użytkowania i "
 "wymaganiami dotyczącymi prywatności."
 
-#: Zotlabs/Module/New_channel.php:195
+#: Code/Module/New_channel.php:195
 msgid "Create a Channel"
 msgstr "Utwórz kanał"
 
-#: Zotlabs/Module/New_channel.php:196
+#: Code/Module/New_channel.php:196
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed, "
@@ -6977,29 +6977,29 @@ msgstr ""
 "społecznościowej), forum (grupę), stronę biznesową lub celebrycką, kanał "
 "informacyjny i wiele innych rzeczy."
 
-#: Zotlabs/Module/New_channel.php:197
+#: Code/Module/New_channel.php:197
 msgid ""
 "or import an existing channel from another location."
 msgstr ""
 "lub zaimportuj istniejący kanał z innej lokalizacji."
 
-#: Zotlabs/Module/New_channel.php:202
+#: Code/Module/New_channel.php:202
 msgid "Validate"
 msgstr "Zatwierdź"
 
-#: Zotlabs/Module/Connect.php:56 Zotlabs/Module/Connect.php:106
+#: Code/Module/Connect.php:56 Code/Module/Connect.php:106
 msgid "Continue"
 msgstr "Kontynuj"
 
-#: Zotlabs/Module/Connect.php:87
+#: Code/Module/Connect.php:87
 msgid "Premium Channel Setup"
 msgstr "Konfiguracja kanału Premium"
 
-#: Zotlabs/Module/Connect.php:89
+#: Code/Module/Connect.php:89
 msgid "Enable premium channel connection restrictions"
 msgstr "Włącz ograniczenia połączeń z kanałem premium"
 
-#: Zotlabs/Module/Connect.php:90
+#: Code/Module/Connect.php:90
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
@@ -7007,7 +7007,7 @@ msgstr ""
 "Podaj swoje ograniczenia lub warunki, takie jak pokwitowanie PayPal, "
 "wytyczne dotyczące użytkowania itp."
 
-#: Zotlabs/Module/Connect.php:92 Zotlabs/Module/Connect.php:112
+#: Code/Module/Connect.php:92 Code/Module/Connect.php:112
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
@@ -7015,12 +7015,12 @@ msgstr ""
 "Ten kanał, przed podłączeniem,  może wymagać dodatkowych kroków lub "
 "potwierdzenia następujących warunków:"
 
-#: Zotlabs/Module/Connect.php:93
+#: Code/Module/Connect.php:93
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr "Potencjalne połączenia zobaczą następujący tekst przed kontynuowaniem:"
 
-#: Zotlabs/Module/Connect.php:94 Zotlabs/Module/Connect.php:115
+#: Code/Module/Connect.php:94 Code/Module/Connect.php:115
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided "
 "on this page."
@@ -7028,106 +7028,106 @@ msgstr ""
 "Kontynuując, oświadczam, że postępowałem zgodnie z instrukcjami podanymi na "
 "tej stronie."
 
-#: Zotlabs/Module/Connect.php:102
+#: Code/Module/Connect.php:102
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr "(Właściciel kanału nie przekazał żadnych szczegółowych instrukcji.)"
 
-#: Zotlabs/Module/Connect.php:111
+#: Code/Module/Connect.php:111
 msgid "Restricted or Premium Channel"
 msgstr "Kanał z ograniczeniami lub premium"
 
-#: Zotlabs/Module/Notifications.php:67 Zotlabs/Module/Notify.php:73
+#: Code/Module/Notifications.php:67 Code/Module/Notify.php:73
 msgid "No more system notifications."
 msgstr "Nigdy więcej powiadomień systemowych."
 
-#: Zotlabs/Module/Notifications.php:71 Zotlabs/Module/Notify.php:77
+#: Code/Module/Notifications.php:71 Code/Module/Notify.php:77
 msgid "System Notifications"
 msgstr "Powiadomienia systemowe"
 
-#: Zotlabs/Module/Notify.php:42
+#: Code/Module/Notify.php:42
 #, php-format
 msgid "A notification with that id was not found for channel '%s'"
 msgstr "Nie znaleziono powiadomienia o tym identyfikatorze dla kanału '%s'"
 
-#: Zotlabs/Module/Acl.php:261
+#: Code/Module/Acl.php:261
 msgid "network"
 msgstr "sieć"
 
-#: Zotlabs/Module/Mood.php:80 include/conversation.php:296
+#: Code/Module/Mood.php:80 include/conversation.php:296
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s to %2$s"
 
-#: Zotlabs/Module/Mood.php:141 Zotlabs/Module/Mood.php:163
+#: Code/Module/Mood.php:141 Code/Module/Mood.php:163
 msgid "Set your current mood and tell your friends"
 msgstr "Ustaw swój aktualny i podziel się tym ze znajomych"
 
-#: Zotlabs/Module/Vote.php:41
+#: Code/Module/Vote.php:41
 msgid "Poll not found."
 msgstr "Nie znaleziono ankiety."
 
-#: Zotlabs/Module/Vote.php:72
+#: Code/Module/Vote.php:72
 msgid "Invalid response."
 msgstr "Nieprawidłowa odpowiedź."
 
-#: Zotlabs/Module/Vote.php:131
+#: Code/Module/Vote.php:131
 msgid "Response submitted. Updates may not appear instantly."
 msgstr "Odpowiedź przesłana. Aktualizacje mogą nie pojawiać się natychmiast."
 
-#: Zotlabs/Module/Webpages.php:54
+#: Code/Module/Webpages.php:54
 msgid "Provide managed web pages on your channel"
 msgstr "Udostępnij zarządzane strony internetowe na swoim kanale"
 
-#: Zotlabs/Module/Webpages.php:74
+#: Code/Module/Webpages.php:74
 msgid "Import Webpage Elements"
 msgstr "Importuj elementy strony internetowej"
 
-#: Zotlabs/Module/Webpages.php:75
+#: Code/Module/Webpages.php:75
 msgid "Import selected"
 msgstr "Importuj wybrane"
 
-#: Zotlabs/Module/Webpages.php:98
+#: Code/Module/Webpages.php:98
 msgid "Export Webpage Elements"
 msgstr "Eksportuj elementy strony internetowej"
 
-#: Zotlabs/Module/Webpages.php:99
+#: Code/Module/Webpages.php:99
 msgid "Export selected"
 msgstr "Eksportuj wybrane"
 
-#: Zotlabs/Module/Webpages.php:273
+#: Code/Module/Webpages.php:273
 msgid "Actions"
 msgstr "Akcje"
 
-#: Zotlabs/Module/Webpages.php:274
+#: Code/Module/Webpages.php:274
 msgid "Page Link"
 msgstr "Link do strony"
 
-#: Zotlabs/Module/Webpages.php:275
+#: Code/Module/Webpages.php:275
 msgid "Page Title"
 msgstr "Tytuł strony"
 
-#: Zotlabs/Module/Webpages.php:305
+#: Code/Module/Webpages.php:305
 msgid "Invalid file type."
 msgstr "Zły typ pliku."
 
-#: Zotlabs/Module/Webpages.php:317
+#: Code/Module/Webpages.php:317
 msgid "Error opening zip file"
 msgstr "Błąd podczas otwierania pliku zip"
 
-#: Zotlabs/Module/Webpages.php:327
+#: Code/Module/Webpages.php:327
 msgid "Invalid folder path."
 msgstr "Nieprawidłowa ścieżka folderu."
 
-#: Zotlabs/Module/Webpages.php:353
+#: Code/Module/Webpages.php:353
 msgid "No webpage elements detected."
 msgstr "Nie wykryto żadnych elementów strony internetowej."
 
-#: Zotlabs/Module/Webpages.php:427 Zotlabs/Import/Friendica.php:360
+#: Code/Module/Webpages.php:427 Code/Import/Friendica.php:360
 msgid "Import complete."
 msgstr "Importowanie zakończone."
 
-#: Zotlabs/Module/Page.php:187
+#: Code/Module/Page.php:187
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
@@ -7143,7 +7143,7 @@ msgstr ""
 "cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: Zotlabs/Module/Removeme.php:48
+#: Code/Module/Removeme.php:48
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
@@ -7151,672 +7151,672 @@ msgstr ""
 "Usunięcia kanałów nie są dozwolone w ciągu 48 godzin od zmiany hasła do "
 "konta."
 
-#: Zotlabs/Module/Removeme.php:71
+#: Code/Module/Removeme.php:71
 msgid "Remove This Channel"
 msgstr "Usuń ten kanał"
 
-#: Zotlabs/Module/Removeme.php:72
+#: Code/Module/Removeme.php:72
 msgid "This channel will be completely removed from this server. "
 msgstr "Ten kanał zostanie całkowicie usunięty z tego serwera. "
 
-#: Zotlabs/Module/Removeme.php:72 Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Removeme.php:72 Code/Module/Removeaccount.php:72
 msgid "This action is permanent and can not be undone!"
 msgstr "Ta akcja jest trwała i nie można jej cofnąć!"
 
-#: Zotlabs/Module/Removeme.php:74 Zotlabs/Module/Settings/Channel.php:744
+#: Code/Module/Removeme.php:74 Code/Module/Settings/Channel.php:744
 msgid "Remove Channel"
 msgstr "Usuń kanał"
 
-#: Zotlabs/Module/Pdledit.php:27
+#: Code/Module/Pdledit.php:27
 msgid "Layout updated."
 msgstr "Zaktualizowano układ."
 
-#: Zotlabs/Module/Pdledit.php:49 Zotlabs/Module/Pdledit.php:106
+#: Code/Module/Pdledit.php:49 Code/Module/Pdledit.php:106
 msgid "Edit System Page Description"
 msgstr "Edytuj opis strony systemowej"
 
-#: Zotlabs/Module/Pdledit.php:71 Zotlabs/Module/Pdledit.php:79
+#: Code/Module/Pdledit.php:71 Code/Module/Pdledit.php:79
 msgid "(modified)"
 msgstr "(zmodyfikowano)"
 
-#: Zotlabs/Module/Pdledit.php:101
+#: Code/Module/Pdledit.php:101
 msgid "Layout not found."
 msgstr "Nie znaleziono układu."
 
-#: Zotlabs/Module/Pdledit.php:107
+#: Code/Module/Pdledit.php:107
 msgid "Module Name:"
 msgstr "Nazwa modułu:"
 
-#: Zotlabs/Module/Pdledit.php:108
+#: Code/Module/Pdledit.php:108
 msgid "Layout Help"
 msgstr "Pomoc dotycząca układu"
 
-#: Zotlabs/Module/Pdledit.php:109
+#: Code/Module/Pdledit.php:109
 msgid "Edit another layout"
 msgstr "Edytuj inny układ"
 
-#: Zotlabs/Module/Pdledit.php:110
+#: Code/Module/Pdledit.php:110
 msgid "System layout"
 msgstr "Układ systemowy"
 
-#: Zotlabs/Module/Dreport.php:35
+#: Code/Module/Dreport.php:35
 msgid "Invalid message"
 msgstr "Nieprawidłowa wiadomość"
 
-#: Zotlabs/Module/Dreport.php:63
+#: Code/Module/Dreport.php:63
 msgid "Delivery Log"
 msgstr "Dziennik dostaw"
 
-#: Zotlabs/Module/Dreport.php:97
+#: Code/Module/Dreport.php:97
 msgid "no results"
 msgstr "brak wyników"
 
-#: Zotlabs/Module/Dreport.php:109
+#: Code/Module/Dreport.php:109
 msgid "channel sync processed"
 msgstr "synchronizacja kanałów została przetworzona"
 
-#: Zotlabs/Module/Dreport.php:113
+#: Code/Module/Dreport.php:113
 msgid "queued"
 msgstr "w kolejce"
 
-#: Zotlabs/Module/Dreport.php:117
+#: Code/Module/Dreport.php:117
 msgid "site dead"
 msgstr "witryna jest martwa"
 
-#: Zotlabs/Module/Dreport.php:121
+#: Code/Module/Dreport.php:121
 msgid "site might be dead - deferred"
 msgstr "witryna może być martwa - odroczona"
 
-#: Zotlabs/Module/Dreport.php:125
+#: Code/Module/Dreport.php:125
 msgid "posted"
 msgstr "opublikowano"
 
-#: Zotlabs/Module/Dreport.php:129
+#: Code/Module/Dreport.php:129
 msgid "accepted for delivery"
 msgstr "przyjęto do dostarczenia"
 
-#: Zotlabs/Module/Dreport.php:133
+#: Code/Module/Dreport.php:133
 msgid "updated"
 msgstr "zaktualizowano"
 
-#: Zotlabs/Module/Dreport.php:136
+#: Code/Module/Dreport.php:136
 msgid "update ignored"
 msgstr "aktualizacja zignorowana"
 
-#: Zotlabs/Module/Dreport.php:139
+#: Code/Module/Dreport.php:139
 msgid "permission denied"
 msgstr "odmowa dostępu"
 
-#: Zotlabs/Module/Dreport.php:143
+#: Code/Module/Dreport.php:143
 msgid "recipient not found"
 msgstr "nie znaleziono odbiorcy"
 
-#: Zotlabs/Module/Dreport.php:146
+#: Code/Module/Dreport.php:146
 msgid "mail recalled"
 msgstr "poczta została odwołana"
 
-#: Zotlabs/Module/Dreport.php:149
+#: Code/Module/Dreport.php:149
 msgid "duplicate mail received"
 msgstr "otrzymano powieloną wiadomość"
 
-#: Zotlabs/Module/Dreport.php:152
+#: Code/Module/Dreport.php:152
 msgid "mail delivered"
 msgstr "dostarczono pocztę"
 
-#: Zotlabs/Module/Dreport.php:156
+#: Code/Module/Dreport.php:156
 msgid "delivery rejected"
 msgstr "dostawa odrzucona"
 
-#: Zotlabs/Module/Dreport.php:175
+#: Code/Module/Dreport.php:175
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Raport dostarczenia dla %1$s"
 
-#: Zotlabs/Module/Dreport.php:178
+#: Code/Module/Dreport.php:178
 msgid "Options"
 msgstr "Opcje"
 
-#: Zotlabs/Module/Dreport.php:179
+#: Code/Module/Dreport.php:179
 msgid "Redeliver"
 msgstr "Dostarcz ponownie"
 
-#: Zotlabs/Module/Profiles.php:32 Zotlabs/Module/Profiles.php:198
-#: Zotlabs/Module/Profiles.php:254 Zotlabs/Module/Profiles.php:701
+#: Code/Module/Profiles.php:32 Code/Module/Profiles.php:198
+#: Code/Module/Profiles.php:254 Code/Module/Profiles.php:701
 msgid "Profile not found."
 msgstr "Nie znaleziono profilu."
 
-#: Zotlabs/Module/Profiles.php:53
+#: Code/Module/Profiles.php:53
 msgid "Profile deleted."
 msgstr "Profil został usunięty."
 
-#: Zotlabs/Module/Profiles.php:76 Zotlabs/Module/Profiles.php:118
+#: Code/Module/Profiles.php:76 Code/Module/Profiles.php:118
 msgid "Profile-"
 msgstr "Profil-"
 
-#: Zotlabs/Module/Profiles.php:101 Zotlabs/Module/Profiles.php:142
+#: Code/Module/Profiles.php:101 Code/Module/Profiles.php:142
 msgid "New profile created."
 msgstr "Utworzono nowy profil."
 
-#: Zotlabs/Module/Profiles.php:125
+#: Code/Module/Profiles.php:125
 msgid "Profile unavailable to clone."
 msgstr "Profil niedostępny do sklonowania."
 
-#: Zotlabs/Module/Profiles.php:162
+#: Code/Module/Profiles.php:162
 msgid "Profile unavailable to export."
 msgstr "Profil niedostępny do wyeksportowania."
 
-#: Zotlabs/Module/Profiles.php:265
+#: Code/Module/Profiles.php:265
 msgid "Profile Name is required."
 msgstr "Wymaga się podania nazwy profilu."
 
-#: Zotlabs/Module/Profiles.php:484
+#: Code/Module/Profiles.php:484
 msgid "Marital Status"
 msgstr "Stan cywilny"
 
-#: Zotlabs/Module/Profiles.php:488
+#: Code/Module/Profiles.php:488
 msgid "Romantic Partner"
 msgstr "Partner romantyczny"
 
-#: Zotlabs/Module/Profiles.php:492 Zotlabs/Module/Profiles.php:821
+#: Code/Module/Profiles.php:492 Code/Module/Profiles.php:821
 msgid "Likes"
 msgstr "Pochwały"
 
-#: Zotlabs/Module/Profiles.php:496 Zotlabs/Module/Profiles.php:822
+#: Code/Module/Profiles.php:496 Code/Module/Profiles.php:822
 msgid "Dislikes"
 msgstr "Zganienia"
 
-#: Zotlabs/Module/Profiles.php:500 Zotlabs/Module/Profiles.php:829
+#: Code/Module/Profiles.php:500 Code/Module/Profiles.php:829
 msgid "Work/Employment"
 msgstr "Praca/Zatrudnienie"
 
-#: Zotlabs/Module/Profiles.php:503
+#: Code/Module/Profiles.php:503
 msgid "Religion"
 msgstr "Religia"
 
-#: Zotlabs/Module/Profiles.php:507
+#: Code/Module/Profiles.php:507
 msgid "Political Views"
 msgstr "Poglądy polityczny"
 
-#: Zotlabs/Module/Profiles.php:511
+#: Code/Module/Profiles.php:511
 msgid "Gender"
 msgstr "Płeć"
 
-#: Zotlabs/Module/Profiles.php:515
+#: Code/Module/Profiles.php:515
 msgid "Sexual Preference"
 msgstr "Prefernecje seksualne"
 
-#: Zotlabs/Module/Profiles.php:519
+#: Code/Module/Profiles.php:519
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: Zotlabs/Module/Profiles.php:523
+#: Code/Module/Profiles.php:523
 msgid "Interests"
 msgstr "Zainteresowania"
 
-#: Zotlabs/Module/Profiles.php:623
+#: Code/Module/Profiles.php:623
 msgid "Profile updated."
 msgstr "Profil został zaktualizowany."
 
-#: Zotlabs/Module/Profiles.php:721
+#: Code/Module/Profiles.php:721
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Ukryj swoją listę kontaktów przed przeglądającymi ten profil"
 
-#: Zotlabs/Module/Profiles.php:767
+#: Code/Module/Profiles.php:767
 msgid "Edit Profile Details"
 msgstr "Edytuj szczegóły profilu"
 
-#: Zotlabs/Module/Profiles.php:769
+#: Code/Module/Profiles.php:769
 msgid "View this profile"
 msgstr "Zobacz ten profil"
 
-#: Zotlabs/Module/Profiles.php:771
+#: Code/Module/Profiles.php:771
 msgid "Profile Tools"
 msgstr "Narzędzia profilowe"
 
-#: Zotlabs/Module/Profiles.php:772
+#: Code/Module/Profiles.php:772
 msgid "Change cover photo"
 msgstr "Zmień zdjęcie okładkowe"
 
-#: Zotlabs/Module/Profiles.php:774
+#: Code/Module/Profiles.php:774
 msgid "Create a new profile using these settings"
 msgstr "Utwórz nowy profil, korzystając z tych ustawień"
 
-#: Zotlabs/Module/Profiles.php:775
+#: Code/Module/Profiles.php:775
 msgid "Clone this profile"
 msgstr "Sklonuj ten profil"
 
-#: Zotlabs/Module/Profiles.php:776
+#: Code/Module/Profiles.php:776
 msgid "Delete this profile"
 msgstr "Usuń ten profil"
 
-#: Zotlabs/Module/Profiles.php:777
+#: Code/Module/Profiles.php:777
 msgid "Add profile things"
 msgstr "Dodaj elementy profilu"
 
-#: Zotlabs/Module/Profiles.php:778
+#: Code/Module/Profiles.php:778
 msgid "Personal"
 msgstr "Osobiste"
 
-#: Zotlabs/Module/Profiles.php:780
+#: Code/Module/Profiles.php:780
 msgid "Relationship"
 msgstr "Relacje"
 
-#: Zotlabs/Module/Profiles.php:781 Zotlabs/Module/Settings/Channel.php:739
-#: Zotlabs/Widget/Newmember.php:52 include/datetime.php:72
+#: Code/Module/Profiles.php:781 Code/Module/Settings/Channel.php:739
+#: Code/Widget/Newmember.php:52 include/datetime.php:72
 msgid "Miscellaneous"
 msgstr "Inne"
 
-#: Zotlabs/Module/Profiles.php:783
+#: Code/Module/Profiles.php:783
 msgid "Import profile from file"
 msgstr "Importuj profil z pliku"
 
-#: Zotlabs/Module/Profiles.php:784
+#: Code/Module/Profiles.php:784
 msgid "Export profile to file"
 msgstr "Eksportuj profil do pliku"
 
-#: Zotlabs/Module/Profiles.php:785
+#: Code/Module/Profiles.php:785
 msgid "Your gender"
 msgstr "Twoja płeć"
 
-#: Zotlabs/Module/Profiles.php:786
+#: Code/Module/Profiles.php:786
 msgid "Marital status"
 msgstr "Stan cywilny"
 
-#: Zotlabs/Module/Profiles.php:787
+#: Code/Module/Profiles.php:787
 msgid "Sexual preference"
 msgstr "Preferencje seksualne"
 
-#: Zotlabs/Module/Profiles.php:788
+#: Code/Module/Profiles.php:788
 msgid "Pronouns"
 msgstr "Zaimki"
 
-#: Zotlabs/Module/Profiles.php:791
+#: Code/Module/Profiles.php:791
 msgid "Profile name"
 msgstr "Nazwa profilu"
 
-#: Zotlabs/Module/Profiles.php:795
+#: Code/Module/Profiles.php:795
 msgid "Your full name"
 msgstr "Twoje imię i nazwisko albo pełna nazwa"
 
-#: Zotlabs/Module/Profiles.php:796
+#: Code/Module/Profiles.php:796
 msgid "Title/Description"
 msgstr "Tytuł/Opis"
 
-#: Zotlabs/Module/Profiles.php:799
+#: Code/Module/Profiles.php:799
 msgid "Street address"
 msgstr "Ulica oraz numer domu i mieszkania"
 
-#: Zotlabs/Module/Profiles.php:800
+#: Code/Module/Profiles.php:800
 msgid "Locality/City"
 msgstr "Miejscowość"
 
-#: Zotlabs/Module/Profiles.php:801
+#: Code/Module/Profiles.php:801
 msgid "Region/State"
 msgstr "Region/Stan"
 
-#: Zotlabs/Module/Profiles.php:802
+#: Code/Module/Profiles.php:802
 msgid "Postal/Zip code"
 msgstr "Kod pocztowy"
 
-#: Zotlabs/Module/Profiles.php:809
+#: Code/Module/Profiles.php:809
 msgid "Who (if applicable)"
 msgstr "Kto (jeśli dotyczy)"
 
-#: Zotlabs/Module/Profiles.php:809
+#: Code/Module/Profiles.php:809
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Przykłady: jan123, Jan Kowalski, jan@example.com"
 
-#: Zotlabs/Module/Profiles.php:810
+#: Code/Module/Profiles.php:810
 msgid "Since (date)"
 msgstr "Od (data)"
 
-#: Zotlabs/Module/Profiles.php:815
+#: Code/Module/Profiles.php:815
 msgid "Tell us about yourself"
 msgstr "Opowiedz nam o sobie"
 
-#: Zotlabs/Module/Profiles.php:816
+#: Code/Module/Profiles.php:816
 msgid "Homepage URL"
 msgstr "Adres URL strony domowej"
 
-#: Zotlabs/Module/Profiles.php:817
+#: Code/Module/Profiles.php:817
 msgid "Hometown"
 msgstr "Miejscowość zamieszkania"
 
-#: Zotlabs/Module/Profiles.php:818
+#: Code/Module/Profiles.php:818
 msgid "Political views"
 msgstr "Poglądy polityczne"
 
-#: Zotlabs/Module/Profiles.php:819
+#: Code/Module/Profiles.php:819
 msgid "Religious views"
 msgstr "Poglądy religijne"
 
-#: Zotlabs/Module/Profiles.php:820
+#: Code/Module/Profiles.php:820
 msgid "Keywords used in directory listings"
 msgstr "Słowa kluczowe używane w wykazach katalogów"
 
-#: Zotlabs/Module/Profiles.php:820
+#: Code/Module/Profiles.php:820
 msgid "Example: fishing photography software"
 msgstr "Przykład: oprogramowanie do fotografii wędkarskiej"
 
-#: Zotlabs/Module/Profiles.php:823
+#: Code/Module/Profiles.php:823
 msgid "Musical interests"
 msgstr "Zainteresowania muzyczne"
 
-#: Zotlabs/Module/Profiles.php:824
+#: Code/Module/Profiles.php:824
 msgid "Books, literature"
 msgstr "Ksiązki, literatura"
 
-#: Zotlabs/Module/Profiles.php:825
+#: Code/Module/Profiles.php:825
 msgid "Television"
 msgstr "Telewizja"
 
-#: Zotlabs/Module/Profiles.php:826
+#: Code/Module/Profiles.php:826
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Film/Taniec/Kultura/Rozrywka"
 
-#: Zotlabs/Module/Profiles.php:827
+#: Code/Module/Profiles.php:827
 msgid "Hobbies/Interests"
 msgstr "Zainteresowania"
 
-#: Zotlabs/Module/Profiles.php:828
+#: Code/Module/Profiles.php:828
 msgid "Love/Romance"
 msgstr "Miłość/romans"
 
-#: Zotlabs/Module/Profiles.php:830
+#: Code/Module/Profiles.php:830
 msgid "School/Education"
 msgstr "Szkoła/Edukacja"
 
-#: Zotlabs/Module/Profiles.php:831
+#: Code/Module/Profiles.php:831
 msgid "Contact information and social networks"
 msgstr "Informacje kontaktowe i sieci społecznościowe"
 
-#: Zotlabs/Module/Profiles.php:832
+#: Code/Module/Profiles.php:832
 msgid "My other channels"
 msgstr "Moje inne kanały"
 
-#: Zotlabs/Module/Profiles.php:834
+#: Code/Module/Profiles.php:834
 msgid "Communications"
 msgstr "Komunikacja"
 
-#: Zotlabs/Module/Profiles.php:932
+#: Code/Module/Profiles.php:932
 msgid " and "
 msgstr " i "
 
-#: Zotlabs/Module/Profiles.php:934
+#: Code/Module/Profiles.php:934
 msgid ", "
 msgstr ", "
 
-#: Zotlabs/Module/Profiles.php:941
+#: Code/Module/Profiles.php:941
 msgid "public profile"
 msgstr "profil publiczny"
 
-#: Zotlabs/Module/Profiles.php:951
+#: Code/Module/Profiles.php:951
 #, php-format
 msgid "%1$s changed %2$s to “%3$s”"
 msgstr "%1$s zmienił %2$s na „%3$s”"
 
-#: Zotlabs/Module/Profiles.php:952
+#: Code/Module/Profiles.php:952
 #, php-format
 msgid "Visit %1$s's %2$s"
 msgstr "Odwiedź %2$s %1$s"
 
-#: Zotlabs/Module/Profiles.php:954
+#: Code/Module/Profiles.php:954
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ma zaktualizowane %2$s, zmieniając %3$s."
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Currently Male"
 msgstr "Obecnie mężczyzna"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Currently Female"
 msgstr "Obecnie kobieta"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Mostly Male"
 msgstr "Głównie mężczyzna"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Mostly Female"
 msgstr "Głównie kobieta"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Transgender"
 msgstr "Osoba transpłciowa"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Intersex"
 msgstr "Interpłciowość"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Transsexual"
 msgstr "Osoba transseksualna"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Hermaphrodite"
 msgstr "Hermafrodyta"
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Undecided"
 msgstr "Osoba niezdecydowana"
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "He/Him"
 msgstr "On/Jemu"
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "She/Her"
 msgstr "Ona/Jej"
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "They/Them"
 msgstr "Oni/Ich"
 
-#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1053 Code/Module/Profiles.php:1073
 msgid "Males"
 msgstr "Mężczyźni"
 
-#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1053 Code/Module/Profiles.php:1073
 msgid "Females"
 msgstr "Kobiety"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Gay"
 msgstr "Gej"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Lesbian"
 msgstr "Lesbijka"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "No Preference"
 msgstr "Bez preferencji"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Bisexual"
 msgstr "Osoba biseksualna"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Autosexual"
 msgstr "Osoba autoseksualna"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Abstinent"
 msgstr "Abstydent"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Virgin"
 msgstr "Dziewica"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Deviant"
 msgstr "Deviant"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Fetish"
 msgstr "Fetysz"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Oodles"
 msgstr "Wszystko"
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Nonsexual"
 msgstr "Osoba aseksualna"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Single"
 msgstr "Singiel"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Lonely"
 msgstr "Osoba samotna"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Available"
 msgstr "Osoba dostępna"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unavailable"
 msgstr "Osoba niedostępna"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Has crush"
 msgstr "Osoba zadłużona"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Infatuated"
 msgstr "Osoba zakochana"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Dating"
 msgstr "Randkowicz"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unfaithful"
 msgstr "Osoba niewierna"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Sex Addict"
 msgstr "Osoba uzależniona od seksu"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Friends/Benefits"
 msgstr "Przyjaciele/Korzyści"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Casual"
 msgstr "Przygodnie"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Engaged"
 msgstr "Osoba zaręczona"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Married"
 msgstr "Osoba zaślubiona"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Imaginarily married"
 msgstr "Małżeństwo pomysłowe"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Partners"
 msgstr "Partnerstwo"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Cohabiting"
 msgstr "Konkubinat"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Common law"
 msgstr "Prawo zwyczajowe"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Happy"
 msgstr "Osoba szczęśliwa"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Not looking"
 msgstr "Osoba nie szukająca"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Swinger"
 msgstr "Swinger"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Betrayed"
 msgstr "Osoba zdradzona"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Separated"
 msgstr "W separacji"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unstable"
 msgstr "Związek niestabilny"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Divorced"
 msgstr "Osoba rozwiedziona"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Imaginarily divorced"
 msgstr "Osoba rozwiedziona umownie"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Widowed"
 msgstr "Osoba owdowiała"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Uncertain"
 msgstr "Osoba niezdecydowana"
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "It's complicated"
 msgstr "To skomplikowane"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Don't care"
 msgstr "Nie obchodzi mnie to"
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Ask me"
 msgstr "Zapytaj mnie"
 
-#: Zotlabs/Module/Stream.php:139 Zotlabs/Widget/Activity_filter.php:149
+#: Code/Module/Stream.php:139 Code/Widget/Activity_filter.php:149
 #: include/network.php:1693
 msgid "Nomad"
 msgstr "Nomad"
 
-#: Zotlabs/Module/Stream.php:143 Zotlabs/Widget/Activity_filter.php:152
+#: Code/Module/Stream.php:143 Code/Widget/Activity_filter.php:152
 #: include/network.php:1689
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
-#: Zotlabs/Module/Stream.php:158
+#: Code/Module/Stream.php:158
 msgid "Access list not found"
 msgstr "Nie znaleziono listy dostępu"
 
-#: Zotlabs/Module/Stream.php:202
+#: Code/Module/Stream.php:202
 msgid "No such channel"
 msgstr "Nie ma takiego kanału"
 
-#: Zotlabs/Module/Stream.php:288
+#: Code/Module/Stream.php:288
 msgid "Access list is empty"
 msgstr "Lista dostępu jest pusta"
 
-#: Zotlabs/Module/Stream.php:302 include/items.php:4552
+#: Code/Module/Stream.php:302 include/items.php:4552
 #, php-format
 msgid "Access list: %s"
 msgstr "Lista dostępu: %s"
 
-#: Zotlabs/Module/Stream.php:345 extend/addon/a/zotpost/Mod_zotpost.php:29
+#: Code/Module/Stream.php:345 extend/addon/a/zotpost/Mod_zotpost.php:29
 msgid "Invalid channel."
 msgstr "Zły kanał."
 
-#: Zotlabs/Module/Profile_photo.php:502
+#: Code/Module/Profile_photo.php:502
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
@@ -7824,60 +7824,60 @@ msgstr ""
 "Twoje zdjęcie profilowe jest widoczne dla każdego w internecie i może być "
 "rozpowszechniane na innych stronach internetowych."
 
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Profile_photo.php:506
 msgid "Use Photo for Profile"
 msgstr "Użyj zdjęcia do profilu"
 
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Profile_photo.php:506
 msgid "Change Profile Photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: Zotlabs/Module/Poke.php:104
+#: Code/Module/Poke.php:104
 #, php-format
 msgid "You %1$s %2$s"
 msgstr "Ty %1$s %2$s"
 
-#: Zotlabs/Module/Poke.php:120
+#: Code/Module/Poke.php:120
 msgid "Poke App (Not Installed)"
 msgstr "Aplikacja Poke (nie zainstalowana)"
 
-#: Zotlabs/Module/Poke.php:121
+#: Code/Module/Poke.php:121
 msgid "Poke or do something else to somebody"
 msgstr "Zaczepić, szturchnąć lub robić z kimś podobne rzeczy"
 
-#: Zotlabs/Module/Poke.php:140
+#: Code/Module/Poke.php:140
 msgid "Poke, prod or do other things to somebody"
 msgstr "Zaczepić, sprawdzić lub robić z kimś podobne rzeczy"
 
-#: Zotlabs/Module/Poke.php:145
+#: Code/Module/Poke.php:145
 msgid "Recipient"
 msgstr "Odbiorca"
 
-#: Zotlabs/Module/Poke.php:146
+#: Code/Module/Poke.php:146
 msgid "Choose your default action"
 msgstr "Wybierz domyślną akcję"
 
-#: Zotlabs/Module/Profperm.php:41 Zotlabs/Module/Profperm.php:75
+#: Code/Module/Profperm.php:41 Code/Module/Profperm.php:75
 msgid "Invalid profile identifier."
 msgstr "Nieprawidłowy identyfikator profilu."
 
-#: Zotlabs/Module/Profperm.php:129
+#: Code/Module/Profperm.php:129
 msgid "Profile Visibility Editor"
 msgstr "Edytor widoczności profilu"
 
-#: Zotlabs/Module/Profperm.php:133
+#: Code/Module/Profperm.php:133
 msgid "Click on a contact to add or remove."
 msgstr "Kliknij kontakt, który chcesz dodać lub usunąć."
 
-#: Zotlabs/Module/Profperm.php:142
+#: Code/Module/Profperm.php:142
 msgid "Visible To"
 msgstr "Widoczne dla"
 
-#: Zotlabs/Module/Affinity.php:31
+#: Code/Module/Affinity.php:31
 msgid "Friend Zoom settings updated."
 msgstr "Zaktualizowano ustawienia \"Skalowanie znajomości\"."
 
-#: Zotlabs/Module/Affinity.php:41
+#: Code/Module/Affinity.php:41
 msgid ""
 "This app (when installed) presents a slider control in your connection "
 "editor and also on your stream page. The slider represents your degree of "
@@ -7890,7 +7890,7 @@ msgstr ""
 "rozmów tylko od najbliższych znajomych lub wszystkich osób w Twoim "
 "strumieniu."
 
-#: Zotlabs/Module/Affinity.php:49
+#: Code/Module/Affinity.php:49
 msgid ""
 "The number below represents the default maximum slider position for your "
 "stream page as a percentage."
@@ -7898,48 +7898,48 @@ msgstr ""
 "Poniższa liczba przedstawia w procentach domyślną maksymalną pozycję suwaka "
 "na stronie strumienia."
 
-#: Zotlabs/Module/Affinity.php:74
+#: Code/Module/Affinity.php:74
 msgid "Default friend zoom in/out"
 msgstr "Skalowanie domyślnej znajomości"
 
-#: Zotlabs/Module/Affinity.php:75 Zotlabs/Widget/Affinity.php:40
+#: Code/Module/Affinity.php:75 Code/Widget/Affinity.php:40
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: Zotlabs/Module/Affinity.php:86
+#: Code/Module/Affinity.php:86
 msgid "Friend Zoom Settings"
 msgstr "Ustawienia \"Skalowanie  znajomości\""
 
-#: Zotlabs/Module/Zot_probe.php:18
+#: Code/Module/Zot_probe.php:18
 msgid "Zot6 Probe Diagnostic"
 msgstr "Diagnostyka \"Sondy Zot6\""
 
-#: Zotlabs/Module/Zot_probe.php:19 Zotlabs/Module/Ap_probe.php:21
+#: Code/Module/Zot_probe.php:19 Code/Module/Ap_probe.php:21
 msgid "Object URL"
 msgstr "URL obiektu"
 
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:22
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:22
 msgid "Authenticated fetch"
 msgstr "Pobieranie uwierzytelnione"
 
-#: Zotlabs/Module/Home.php:161
+#: Code/Module/Home.php:161
 #, php-format
 msgid "Welcome to %s"
 msgstr "Witamy w %s"
 
-#: Zotlabs/Module/Oexchange.php:28
+#: Code/Module/Oexchange.php:28
 msgid "Unable to find your site."
 msgstr "Nie można znaleźć Twojego serwisu."
 
-#: Zotlabs/Module/Oexchange.php:42
+#: Code/Module/Oexchange.php:42
 msgid "Post successful."
 msgstr "Opublikowanie powiodło się."
 
-#: Zotlabs/Module/Regmod.php:19
+#: Code/Module/Regmod.php:19
 msgid "Please login."
 msgstr "Proszę się zalogować."
 
-#: Zotlabs/Module/Removeaccount.php:49
+#: Code/Module/Removeaccount.php:49
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
@@ -7947,142 +7947,142 @@ msgstr ""
 "Usunięcie konta nie jest dozwolone w ciągu 48 godzin od zmiany hasła do "
 "konta."
 
-#: Zotlabs/Module/Removeaccount.php:71
+#: Code/Module/Removeaccount.php:71
 msgid "Remove This Account"
 msgstr "Usuń to konto"
 
-#: Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Removeaccount.php:72
 msgid ""
 "This account and all its channels will be completely removed from this "
 "server. "
 msgstr "To konto i wszystkie jego kanały zostaną całkowicie usunięte z sieci. "
 
-#: Zotlabs/Module/Removeaccount.php:74 Zotlabs/Module/Settings/Account.php:116
+#: Code/Module/Removeaccount.php:74 Code/Module/Settings/Account.php:116
 msgid "Remove Account"
 msgstr "Usuń konto"
 
-#: Zotlabs/Module/Rmagic.php:44
+#: Code/Module/Rmagic.php:44
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiodło się."
 
-#: Zotlabs/Module/Rmagic.php:84 boot.php:1727 include/channel.php:2142
+#: Code/Module/Rmagic.php:84 boot.php:1727 include/channel.php:2142
 msgid "Remote Authentication"
 msgstr "Zdalne uwierzytelnienie"
 
-#: Zotlabs/Module/Rmagic.php:85 include/channel.php:2143
+#: Code/Module/Rmagic.php:85 include/channel.php:2143
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Wpisz adres swojego kanału (np. kanał@example.com)"
 
-#: Zotlabs/Module/Rmagic.php:88 include/channel.php:2144
+#: Code/Module/Rmagic.php:88 include/channel.php:2144
 msgid "Authenticate"
 msgstr "Uwierzytelnienie"
 
-#: Zotlabs/Module/Ap_probe.php:20
+#: Code/Module/Ap_probe.php:20
 msgid "ActivityPub Probe Diagnostic"
 msgstr "Sondowanie diagnostyczne ActivityPub"
 
-#: Zotlabs/Module/Tasks.php:106
+#: Code/Module/Tasks.php:106
 msgid "This app provides a simple personal and task list."
 msgstr "Ta aplikacja zapewnia prostą listę osobistą i zadaniową."
 
-#: Zotlabs/Module/Service_limits.php:28
+#: Code/Module/Service_limits.php:28
 msgid "No service class restrictions found."
 msgstr "Nie znaleziono ograniczeń klasy usług."
 
-#: Zotlabs/Module/Settings/Account.php:23
+#: Code/Module/Settings/Account.php:23
 msgid "Not valid email."
 msgstr "Nieprawidłowy adres e-mail."
 
-#: Zotlabs/Module/Settings/Account.php:27
+#: Code/Module/Settings/Account.php:27
 msgid "Protected email address. Cannot change to that email."
 msgstr "Chroniony adres e-mail. Nie można zmienić tego adresu e-mail."
 
-#: Zotlabs/Module/Settings/Account.php:37
+#: Code/Module/Settings/Account.php:37
 msgid "System failure storing new email. Please try again."
 msgstr ""
 "Błąd systemu podczas zapisywania nowej wiadomości e-mail. Proszę spróbuj "
 "ponownie."
 
-#: Zotlabs/Module/Settings/Account.php:55
+#: Code/Module/Settings/Account.php:55
 msgid "Password verification failed."
 msgstr "Weryfikacja hasła nie powiodła się."
 
-#: Zotlabs/Module/Settings/Account.php:62
+#: Code/Module/Settings/Account.php:62
 msgid "Passwords do not match. Password unchanged."
 msgstr "Hasła nie pasują do siebie. Nie zmieniono hasła."
 
-#: Zotlabs/Module/Settings/Account.php:66
+#: Code/Module/Settings/Account.php:66
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Puste hasła są niedozwolone. Nie zmieniono hasła."
 
-#: Zotlabs/Module/Settings/Account.php:81
+#: Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr "Hasło zostało zmienione."
 
-#: Zotlabs/Module/Settings/Account.php:83
+#: Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr "Aktualizacja hasła nie powiodła się. Proszę spróbuj ponownie."
 
-#: Zotlabs/Module/Settings/Account.php:110
+#: Code/Module/Settings/Account.php:110
 msgid "Account Settings"
 msgstr "Ustawienia konta"
 
-#: Zotlabs/Module/Settings/Account.php:111
+#: Code/Module/Settings/Account.php:111
 msgid "Current Password"
 msgstr "Bieżące hasło"
 
-#: Zotlabs/Module/Settings/Account.php:112
+#: Code/Module/Settings/Account.php:112
 msgid "Enter New Password"
 msgstr "Wprowadź nowe hasło"
 
-#: Zotlabs/Module/Settings/Account.php:113
+#: Code/Module/Settings/Account.php:113
 msgid "Confirm New Password"
 msgstr "Potwierdź nowe hasło"
 
-#: Zotlabs/Module/Settings/Account.php:113
+#: Code/Module/Settings/Account.php:113
 msgid "Leave password fields blank unless changing"
 msgstr "Pozostaw pola hasła puste, chyba że je zmieniasz"
 
-#: Zotlabs/Module/Settings/Account.php:115
+#: Code/Module/Settings/Account.php:115
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: Zotlabs/Module/Settings/Account.php:117
+#: Code/Module/Settings/Account.php:117
 msgid "Remove this account including all its channels"
 msgstr "Usuń to konto wraz ze wszystkimi jego kanałami"
 
-#: Zotlabs/Module/Settings/Channel.php:433 include/conversation.php:1355
+#: Code/Module/Settings/Channel.php:433 include/conversation.php:1355
 msgid "Restricted - from connections only"
 msgstr "Ograniczony - tylko z połączeń"
 
-#: Zotlabs/Module/Settings/Channel.php:434 include/conversation.php:1356
+#: Code/Module/Settings/Channel.php:434 include/conversation.php:1356
 msgid "Semi-public - from anybody that can be identified"
 msgstr "Częściowo publiczny – od każdego, kogo można zidentyfikować"
 
-#: Zotlabs/Module/Settings/Channel.php:435 include/conversation.php:1357
+#: Code/Module/Settings/Channel.php:435 include/conversation.php:1357
 msgid "Public - from anybody on the internet"
 msgstr "Publiczny – od każdego w internecie"
 
-#: Zotlabs/Module/Settings/Channel.php:513
+#: Code/Module/Settings/Channel.php:513
 msgid "Publish your profile in the network directory"
 msgstr "Opublikuj swój domyślny profil w katalogu sieciowym"
 
-#: Zotlabs/Module/Settings/Channel.php:518
+#: Code/Module/Settings/Channel.php:518
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 "Czy pozwalasz nam sugerować nowym członkom Ciebie jako potencjalnego "
 "przyjaciela?"
 
-#: Zotlabs/Module/Settings/Channel.php:522
-#: Zotlabs/Module/Settings/Channel.php:536
+#: Code/Module/Settings/Channel.php:522
+#: Code/Module/Settings/Channel.php:536
 msgid "or"
 msgstr "lub"
 
-#: Zotlabs/Module/Settings/Channel.php:528
+#: Code/Module/Settings/Channel.php:528
 msgid "Your channel address is"
 msgstr "Twój adres kanału to"
 
-#: Zotlabs/Module/Settings/Channel.php:530
+#: Code/Module/Settings/Channel.php:530
 msgid ""
 "Friends using compatible applications can use this address to connect with "
 "you."
@@ -8090,27 +8090,27 @@ msgstr ""
 "Znajomi korzystający ze zgodnych aplikacji mogą używać tego adresu do "
 "łączenia się z Tobą."
 
-#: Zotlabs/Module/Settings/Channel.php:532
+#: Code/Module/Settings/Channel.php:532
 msgid "Your files/photos are accessible as a network drive at"
 msgstr "Twoje pliki i zdjęcia są dostępne jako dysk sieciowy pod adresem"
 
-#: Zotlabs/Module/Settings/Channel.php:534
+#: Code/Module/Settings/Channel.php:534
 msgid "(Windows)"
 msgstr "(Windows)"
 
-#: Zotlabs/Module/Settings/Channel.php:535
+#: Code/Module/Settings/Channel.php:535
 msgid "(other platforms)"
 msgstr "(inne platformy)"
 
-#: Zotlabs/Module/Settings/Channel.php:583
+#: Code/Module/Settings/Channel.php:583
 msgid "Automatic membership approval"
 msgstr "Automatyczne zatwierdzanie członkostwa"
 
-#: Zotlabs/Module/Settings/Channel.php:588
+#: Code/Module/Settings/Channel.php:588
 msgid "Friend-of-friend conversations"
 msgstr "Rozmowy w gronie przyjaciół"
 
-#: Zotlabs/Module/Settings/Channel.php:588
+#: Code/Module/Settings/Channel.php:588
 msgid ""
 "Import public third-party conversations in which your connections "
 "participate."
@@ -8118,52 +8118,52 @@ msgstr ""
 "Importuj publiczne konwersacje innych platform, w których uczestniczą osoby "
 "z Twoich kontaktów."
 
-#: Zotlabs/Module/Settings/Channel.php:592
+#: Code/Module/Settings/Channel.php:592
 msgid "Enable ActivityPub protocol"
 msgstr "Włącz protokół ActivityPub"
 
-#: Zotlabs/Module/Settings/Channel.php:592
+#: Code/Module/Settings/Channel.php:592
 msgid "ActivityPub is an emerging internet standard for social communications"
 msgstr "ActivityPub to nowy internetowy standard komunikacji społecznościowej"
 
-#: Zotlabs/Module/Settings/Channel.php:625
+#: Code/Module/Settings/Channel.php:625
 msgid "Channel Settings"
 msgstr "Ustawienia kanału"
 
-#: Zotlabs/Module/Settings/Channel.php:631
+#: Code/Module/Settings/Channel.php:631
 msgid "Basic Settings"
 msgstr "Podstawowe ustawienia"
 
-#: Zotlabs/Module/Settings/Channel.php:632
+#: Code/Module/Settings/Channel.php:632
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: Zotlabs/Module/Settings/Channel.php:634
+#: Code/Module/Settings/Channel.php:634
 msgid "Your timezone"
 msgstr "Twoja strefa czasowa"
 
-#: Zotlabs/Module/Settings/Channel.php:634
+#: Code/Module/Settings/Channel.php:634
 msgid "This is important for showing the correct time on shared events"
 msgstr ""
 "Jest to ważne dla pokazywania prawidłowego czasu we wspólnych wydarzeniach"
 
-#: Zotlabs/Module/Settings/Channel.php:635
+#: Code/Module/Settings/Channel.php:635
 msgid "Default post location"
 msgstr "Domyślna lokalizacja wpisu"
 
-#: Zotlabs/Module/Settings/Channel.php:635
+#: Code/Module/Settings/Channel.php:635
 msgid "Optional geographical location to display on your posts"
 msgstr "Lokalizacja geograficzna do ewentualnego wyświetlania w Twoich wpisach"
 
-#: Zotlabs/Module/Settings/Channel.php:636
+#: Code/Module/Settings/Channel.php:636
 msgid "Obtain post location from your web browser or device"
 msgstr "Uzyskaj lokalizację wpisu z przeglądarki internetowej lub urządzenia"
 
-#: Zotlabs/Module/Settings/Channel.php:638
+#: Code/Module/Settings/Channel.php:638
 msgid "Adult content"
 msgstr "Treść dla dorosłych"
 
-#: Zotlabs/Module/Settings/Channel.php:638
+#: Code/Module/Settings/Channel.php:638
 msgid ""
 "Enable to indicate if this channel frequently or regularly publishes adult "
 "content. (Please also tag any adult material and/or nudity with #NSFW)"
@@ -8172,241 +8172,241 @@ msgstr ""
 "dorosłych. (Proszę również oznaczyć wszelkie materiały dla dorosłych oraz "
 "nagość hasztagiem #NSFW)"
 
-#: Zotlabs/Module/Settings/Channel.php:640
+#: Code/Module/Settings/Channel.php:640
 msgid "Security and Privacy"
 msgstr "Bezpieczeństwo i prywatność"
 
-#: Zotlabs/Module/Settings/Channel.php:642
+#: Code/Module/Settings/Channel.php:642
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 "Twoje uprawnienia są już skonfigurowane. Kliknij, aby je wyświetlić/"
 "dostosować"
 
-#: Zotlabs/Module/Settings/Channel.php:644
+#: Code/Module/Settings/Channel.php:644
 msgid "Hide my online presence"
 msgstr "Ukryj moją obecność w Internecie"
 
-#: Zotlabs/Module/Settings/Channel.php:644
+#: Code/Module/Settings/Channel.php:644
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Zapobiega wyświetlaniu w Twoim profilu informacji, że jesteś online"
 
-#: Zotlabs/Module/Settings/Channel.php:645
+#: Code/Module/Settings/Channel.php:645
 msgid "Allow others to view your friends and connections"
 msgstr "Zezwalaj innym na przeglądanie Twoich znajomych i kontaktów"
 
-#: Zotlabs/Module/Settings/Channel.php:649
+#: Code/Module/Settings/Channel.php:649
 msgid "Forbid indexing of your channel content by search engines"
 msgstr "Zabroń indeksowania treści Twojego kanału przez wyszukiwarki"
 
-#: Zotlabs/Module/Settings/Channel.php:650
+#: Code/Module/Settings/Channel.php:650
 msgid "Disable acceptance of comments on my posts after this many days"
 msgstr "Wyłącz akceptację komentarzy do moich wpisów po tylu dniach"
 
-#: Zotlabs/Module/Settings/Channel.php:650
+#: Code/Module/Settings/Channel.php:650
 msgid "Leave unset or enter 0 to allow comments indefinitely"
 msgstr ""
 "Pozostaw nieustawione lub wpisz 0, aby zezwolić na komentarze bez ograniczeń"
 
-#: Zotlabs/Module/Settings/Channel.php:651
+#: Code/Module/Settings/Channel.php:651
 msgid "Allow others to tag your posts"
 msgstr "Pozwól innym oznaczać Twoje wpisy"
 
-#: Zotlabs/Module/Settings/Channel.php:651
+#: Code/Module/Settings/Channel.php:651
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 "Często używany przez społeczność do oznaczania nieodpowiednich treści z mocą "
 "wsteczną"
 
-#: Zotlabs/Module/Settings/Channel.php:653
+#: Code/Module/Settings/Channel.php:653
 msgid "Channel Permission Limits"
 msgstr "Limity uprawnień kanału"
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "Expire conversations you have not participated in after this many days"
 msgstr "Wygaś rozmowy, w których nie uczestniczyłeś po tylu dniach"
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "0 or blank to use the website limit."
 msgstr "0 lub puste, aby użyć limitu portalu."
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Ta strona wygasa po %d dniach."
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "This website does not provide an expiration policy."
 msgstr "Ta strona internetowa nie zawiera zasad wygasania treści."
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Limit portalu ma pierwszeństwo, jeśli jest niższy niż Twój limit."
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maksymalna liczba zaproszeń do znajomych, dziennie:"
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "May reduce spam activity"
 msgstr "Może zmniejszyć aktywność spamu"
 
-#: Zotlabs/Module/Settings/Channel.php:657
+#: Code/Module/Settings/Channel.php:657
 msgid "Default Access List"
 msgstr "Domyślna lista dostępu"
 
-#: Zotlabs/Module/Settings/Channel.php:659
+#: Code/Module/Settings/Channel.php:659
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 "Użyj mojego domyślnego ustawienia odbiorców dla typu publikowanego obiektu"
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 msgid "Profile to assign new connections"
 msgstr "Profil do przypisywania nowych połączeń"
 
-#: Zotlabs/Module/Settings/Channel.php:671
+#: Code/Module/Settings/Channel.php:671
 msgid "Channel type and privacy"
 msgstr "Typ kanału i prywatność"
 
-#: Zotlabs/Module/Settings/Channel.php:672
+#: Code/Module/Settings/Channel.php:672
 msgid "Default Permissions Group"
 msgstr "Domyślna grupa prywatności"
 
-#: Zotlabs/Module/Settings/Channel.php:678
+#: Code/Module/Settings/Channel.php:678
 msgid "Maximum direct messages per day from unknown people:"
 msgstr "Maksymalna liczba prywatnych wiadomości dziennie od nieznanych osób:"
 
-#: Zotlabs/Module/Settings/Channel.php:678
+#: Code/Module/Settings/Channel.php:678
 msgid ""
 "Useful to reduce spamming if you allow direct messages from unknown people"
 msgstr ""
 "Przydatne, aby ograniczyć spamowanie, jeśli zezwalasz na bezpośrednie "
 "wiadomości od nieznanych osób"
 
-#: Zotlabs/Module/Settings/Channel.php:687
+#: Code/Module/Settings/Channel.php:687
 msgid "By default post a status message when:"
 msgstr "Domyślnie publikuj komunikat o stanie, gdy:"
 
-#: Zotlabs/Module/Settings/Channel.php:688
+#: Code/Module/Settings/Channel.php:688
 msgid "accepting a friend request"
 msgstr "zaakceptowano zaproszenia do znajomych"
 
-#: Zotlabs/Module/Settings/Channel.php:689
+#: Code/Module/Settings/Channel.php:689
 msgid "joining a forum/community"
 msgstr "dołączono do forum/społeczności"
 
-#: Zotlabs/Module/Settings/Channel.php:690
+#: Code/Module/Settings/Channel.php:690
 msgid "making an interesting profile change"
 msgstr "dokonano interesującej zmiany profilu"
 
-#: Zotlabs/Module/Settings/Channel.php:691
+#: Code/Module/Settings/Channel.php:691
 msgid "Send a notification email when:"
 msgstr "Wyślij e-mail z powiadomieniem, gdy:"
 
-#: Zotlabs/Module/Settings/Channel.php:692
+#: Code/Module/Settings/Channel.php:692
 msgid "You receive a connection request"
 msgstr "Otrzymujesz żądanie połączenia"
 
-#: Zotlabs/Module/Settings/Channel.php:694
+#: Code/Module/Settings/Channel.php:694
 msgid "Someone writes on your profile wall"
 msgstr "Ktoś pisze na Twojej ścianie profilu"
 
-#: Zotlabs/Module/Settings/Channel.php:695
+#: Code/Module/Settings/Channel.php:695
 msgid "Someone writes a followup comment"
 msgstr "Ktoś pisze komentarz uzupełniający"
 
-#: Zotlabs/Module/Settings/Channel.php:696
+#: Code/Module/Settings/Channel.php:696
 msgid "Someone shares a followed conversation"
 msgstr "Ktoś udostępnia obserwowaną rozmowę"
 
-#: Zotlabs/Module/Settings/Channel.php:697
+#: Code/Module/Settings/Channel.php:697
 msgid "You receive a direct (private) message"
 msgstr "Otrzymujesz bezpośrednią (prywatną) wiadomość"
 
-#: Zotlabs/Module/Settings/Channel.php:699
+#: Code/Module/Settings/Channel.php:699
 msgid "You are tagged in a post"
 msgstr "Oznaczono Ciebie tagiem we wpisie"
 
-#: Zotlabs/Module/Settings/Channel.php:702
+#: Code/Module/Settings/Channel.php:702
 msgid "Someone likes your post/comment"
 msgstr "Ktoś pochwalił Twój wpis/komentarz"
 
-#: Zotlabs/Module/Settings/Channel.php:705
+#: Code/Module/Settings/Channel.php:705
 msgid "Show visual notifications including:"
 msgstr "Pokaż powiadomienia wizualne, w tym:"
 
-#: Zotlabs/Module/Settings/Channel.php:707
+#: Code/Module/Settings/Channel.php:707
 msgid "Unseen stream activity"
 msgstr "Niewidoczną aktywność na strumieniu"
 
-#: Zotlabs/Module/Settings/Channel.php:708
+#: Code/Module/Settings/Channel.php:708
 msgid "Unseen channel activity"
 msgstr "Niewidoczną aktywność w kanale"
 
-#: Zotlabs/Module/Settings/Channel.php:709
+#: Code/Module/Settings/Channel.php:709
 msgid "Unseen direct messages"
 msgstr "Niewidoczne wiadomości prywatne"
 
-#: Zotlabs/Module/Settings/Channel.php:709
-#: Zotlabs/Module/Settings/Channel.php:714
-#: Zotlabs/Module/Settings/Channel.php:715
-#: Zotlabs/Module/Settings/Channel.php:716
+#: Code/Module/Settings/Channel.php:709
+#: Code/Module/Settings/Channel.php:714
+#: Code/Module/Settings/Channel.php:715
+#: Code/Module/Settings/Channel.php:716
 msgid "Recommended"
 msgstr "Zalecane"
 
-#: Zotlabs/Module/Settings/Channel.php:710
+#: Code/Module/Settings/Channel.php:710
 msgid "Upcoming events"
 msgstr "Nadchodzące wydarzenia"
 
-#: Zotlabs/Module/Settings/Channel.php:711
+#: Code/Module/Settings/Channel.php:711
 msgid "Events today"
 msgstr "Wydarzenia dzisiejsze"
 
-#: Zotlabs/Module/Settings/Channel.php:712
+#: Code/Module/Settings/Channel.php:712
 msgid "Upcoming birthdays"
 msgstr "Nadchodzące urodziny"
 
-#: Zotlabs/Module/Settings/Channel.php:712
+#: Code/Module/Settings/Channel.php:712
 msgid "Not available in all themes"
 msgstr "Niedostępne we wszystkich motywach"
 
-#: Zotlabs/Module/Settings/Channel.php:713
+#: Code/Module/Settings/Channel.php:713
 msgid "System (personal) notifications"
 msgstr "Powiadomienia systemowe (osobiste)"
 
-#: Zotlabs/Module/Settings/Channel.php:714
+#: Code/Module/Settings/Channel.php:714
 msgid "System info messages"
 msgstr "Systemowe komunikaty informacyjne"
 
-#: Zotlabs/Module/Settings/Channel.php:715
+#: Code/Module/Settings/Channel.php:715
 msgid "System critical alerts"
 msgstr "Systemowe alerty krytyczne"
 
-#: Zotlabs/Module/Settings/Channel.php:716
+#: Code/Module/Settings/Channel.php:716
 msgid "New connections"
 msgstr "Nowe połączenia"
 
-#: Zotlabs/Module/Settings/Channel.php:717
+#: Code/Module/Settings/Channel.php:717
 msgid "System Registrations"
 msgstr "Rejestracje systemowe"
 
-#: Zotlabs/Module/Settings/Channel.php:719
+#: Code/Module/Settings/Channel.php:719
 msgid "Unseen public stream activity"
 msgstr "Niewidoczna aktywność na strumieniu"
 
-#: Zotlabs/Module/Settings/Channel.php:720
+#: Code/Module/Settings/Channel.php:720
 msgid "Unseen likes and dislikes"
 msgstr "Niewidoczne pochwały i zganienia"
 
-#: Zotlabs/Module/Settings/Channel.php:721
+#: Code/Module/Settings/Channel.php:721
 msgid "Unseen forum posts"
 msgstr "Niewidoczne wpisy na forum"
 
-#: Zotlabs/Module/Settings/Channel.php:722
+#: Code/Module/Settings/Channel.php:722
 msgid "Reported content"
 msgstr "Zgłoszona treść"
 
-#: Zotlabs/Module/Settings/Channel.php:723
+#: Code/Module/Settings/Channel.php:723
 msgid ""
 "Desktop notifications are unavailable because the required browser "
 "permission has not been granted"
@@ -8414,15 +8414,15 @@ msgstr ""
 "Powiadomienia na pulpicie są niedostępne, ponieważ nie udzielono wymaganych "
 "uprawnień przeglądarce"
 
-#: Zotlabs/Module/Settings/Channel.php:724
+#: Code/Module/Settings/Channel.php:724
 msgid "Grant permission"
 msgstr "Przyznaj uprawnienia"
 
-#: Zotlabs/Module/Settings/Channel.php:725
+#: Code/Module/Settings/Channel.php:725
 msgid "Email notifications sent from (hostname)"
 msgstr "Powiadomienia e-mail wysyłane z (nazwa hosta)"
 
-#: Zotlabs/Module/Settings/Channel.php:725
+#: Code/Module/Settings/Channel.php:725
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple locations, set this to your "
@@ -8432,44 +8432,44 @@ msgstr ""
 "Jeśli twój kanał jest powielany na wielu portalach, ustaw to na preferowaną "
 "lokalizację. Zapobiegnie to powielaniu powiadomień e-mail. Przykład: % s"
 
-#: Zotlabs/Module/Settings/Channel.php:726
+#: Code/Module/Settings/Channel.php:726
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
 "Pokaż w powiadomieniach nowe wpisy na ścianie oraz prywatne wiadomości i "
 "połączenia"
 
-#: Zotlabs/Module/Settings/Channel.php:727
+#: Code/Module/Settings/Channel.php:727
 msgid "Accept messages from strangers which mention you"
 msgstr "Akceptuj wiadomości od nieznajomych, które wspominają o Tobie"
 
-#: Zotlabs/Module/Settings/Channel.php:727
+#: Code/Module/Settings/Channel.php:727
 msgid "This setting bypasses normal permissions"
 msgstr "To ustawienie omija normalne uprawnienia"
 
-#: Zotlabs/Module/Settings/Channel.php:728
+#: Code/Module/Settings/Channel.php:728
 msgid ""
 "Accept messages from strangers which include any of the following hashtags"
 msgstr ""
 "Akceptuj wiadomości od nieznajomych, które zawierają jeden z następujących "
 "hasztagów"
 
-#: Zotlabs/Module/Settings/Channel.php:728
+#: Code/Module/Settings/Channel.php:728
 msgid "comma separated, do not include the #"
 msgstr "oddzielone przecinkami, nie dołączaj #"
 
-#: Zotlabs/Module/Settings/Channel.php:729
+#: Code/Module/Settings/Channel.php:729
 msgid "Notify me of events this many days in advance"
 msgstr "Powiadamiaj mnie o wydarzeniach z kilkudniowym wyprzedzeniem"
 
-#: Zotlabs/Module/Settings/Channel.php:729
+#: Code/Module/Settings/Channel.php:729
 msgid "Must be greater than 0"
 msgstr "Musi być większa niż 0"
 
-#: Zotlabs/Module/Settings/Channel.php:734
+#: Code/Module/Settings/Channel.php:734
 msgid "Date and time"
 msgstr "Data i czas"
 
-#: Zotlabs/Module/Settings/Channel.php:735
+#: Code/Module/Settings/Channel.php:735
 msgid ""
 "This section is reserved for use by optional addons and apps to provide "
 "additional settings."
@@ -8477,40 +8477,40 @@ msgstr ""
 "Ta sekcja jest zarezerwowana do wykorzystania przez opcjonalne dodatki i "
 "aplikacje w celu zapewnienia dodatkowych ustawień."
 
-#: Zotlabs/Module/Settings/Channel.php:736
+#: Code/Module/Settings/Channel.php:736
 msgid "Advanced Account/Page Type Settings"
 msgstr "Zaawansowane ustawienia konta/typu strony"
 
-#: Zotlabs/Module/Settings/Channel.php:737
+#: Code/Module/Settings/Channel.php:737
 msgid "Change the behaviour of this account for special situations"
 msgstr "Zmień zachowanie tego konta w szczególnych sytuacjach"
 
-#: Zotlabs/Module/Settings/Channel.php:740
+#: Code/Module/Settings/Channel.php:740
 msgid "Default photo upload folder name"
 msgstr "Domyślny folder na przesyłane zdjęcia"
 
-#: Zotlabs/Module/Settings/Channel.php:740
-#: Zotlabs/Module/Settings/Channel.php:741
+#: Code/Module/Settings/Channel.php:740
+#: Code/Module/Settings/Channel.php:741
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - bieżący rok, %m - bieżący miesiąc"
 
-#: Zotlabs/Module/Settings/Channel.php:741
+#: Code/Module/Settings/Channel.php:741
 msgid "Default file upload folder name"
 msgstr "Domyślny folder przesyłania plików"
 
-#: Zotlabs/Module/Settings/Channel.php:743
+#: Code/Module/Settings/Channel.php:743
 msgid "Personal menu to display in your channel pages"
 msgstr "Osobiste menu do wyświetlania na stronach Twojego kanału"
 
-#: Zotlabs/Module/Settings/Channel.php:745
+#: Code/Module/Settings/Channel.php:745
 msgid "Remove this channel."
 msgstr "Usuń ten kanał."
 
-#: Zotlabs/Module/Settings/Channel.php:746
+#: Code/Module/Settings/Channel.php:746
 msgid "Mentions should display"
 msgstr "Wzmianki powinny być wyświetlane"
 
-#: Zotlabs/Module/Settings/Channel.php:746
+#: Code/Module/Settings/Channel.php:746
 msgid ""
 "Changes to this setting are applied to new posts/comments only. It is not "
 "retroactive."
@@ -8518,99 +8518,99 @@ msgstr ""
 "Zmiany tego ustawienia dotyczą tylko nowych wpisów i komentarzy. Nie działa "
 "wstecz."
 
-#: Zotlabs/Module/Settings/Channel.php:748
+#: Code/Module/Settings/Channel.php:748
 msgid "the channel display name [example: @Barbara Jenkins]"
 msgstr "wyświetlana nazwa kanału [przykład: @Barbara Jenkins]"
 
-#: Zotlabs/Module/Settings/Channel.php:749
+#: Code/Module/Settings/Channel.php:749
 msgid "the channel nickname [example: @barbara1976]"
 msgstr "pseudonim kanału [przykład: @barbara1976]"
 
-#: Zotlabs/Module/Settings/Channel.php:750
+#: Code/Module/Settings/Channel.php:750
 msgid "combined [example: @Barbara Jenkins (barbara1976)]"
 msgstr "połączone [przykład: @Barbara Jenkins (barbara1976)]"
 
-#: Zotlabs/Module/Settings/Channel.php:751
+#: Code/Module/Settings/Channel.php:751
 msgid "no preference, use the system default"
 msgstr "brak preferencji, użyj domyślnych ustawień systemowych"
 
-#: Zotlabs/Module/Settings/Channel.php:754
+#: Code/Module/Settings/Channel.php:754
 msgid "Calendar week begins on"
 msgstr "Tydzień kalendarzowy zaczyna się w dniu"
 
-#: Zotlabs/Module/Settings/Channel.php:754
+#: Code/Module/Settings/Channel.php:754
 msgid "This varies by country/culture"
 msgstr "To zależy od kraju/kultury"
 
-#: Zotlabs/Module/Settings/Channel.php:755 include/js_strings.php:93
+#: Code/Module/Settings/Channel.php:755 include/js_strings.php:93
 #: include/text.php:1427
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: Zotlabs/Module/Settings/Channel.php:756 include/js_strings.php:94
+#: Code/Module/Settings/Channel.php:756 include/js_strings.php:94
 #: include/text.php:1427
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: Zotlabs/Module/Settings/Channel.php:757 include/js_strings.php:95
+#: Code/Module/Settings/Channel.php:757 include/js_strings.php:95
 #: include/text.php:1427
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: Zotlabs/Module/Settings/Channel.php:758 include/js_strings.php:96
+#: Code/Module/Settings/Channel.php:758 include/js_strings.php:96
 #: include/text.php:1427
 msgid "Wednesday"
 msgstr "Środa"
 
-#: Zotlabs/Module/Settings/Channel.php:759 include/js_strings.php:97
+#: Code/Module/Settings/Channel.php:759 include/js_strings.php:97
 #: include/text.php:1427
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: Zotlabs/Module/Settings/Channel.php:760 include/js_strings.php:98
+#: Code/Module/Settings/Channel.php:760 include/js_strings.php:98
 #: include/text.php:1427
 msgid "Friday"
 msgstr "Piątek"
 
-#: Zotlabs/Module/Settings/Channel.php:761 include/js_strings.php:99
+#: Code/Module/Settings/Channel.php:761 include/js_strings.php:99
 #: include/text.php:1427
 msgid "Saturday"
 msgstr "Sobota"
 
-#: Zotlabs/Module/Settings/Display.php:156
+#: Code/Module/Settings/Display.php:156
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (eksperymentalne)"
 
-#: Zotlabs/Module/Settings/Display.php:199
+#: Code/Module/Settings/Display.php:199
 msgid "Display Settings"
 msgstr "Ustawienia wyświetlania"
 
-#: Zotlabs/Module/Settings/Display.php:200
+#: Code/Module/Settings/Display.php:200
 msgid "Theme Settings"
 msgstr "Ustawienia motywu"
 
-#: Zotlabs/Module/Settings/Display.php:201
+#: Code/Module/Settings/Display.php:201
 msgid "Custom Theme Settings"
 msgstr "Ustawienia własnego motywu"
 
-#: Zotlabs/Module/Settings/Display.php:202
+#: Code/Module/Settings/Display.php:202
 msgid "Content Settings"
 msgstr "Ustawienia treści"
 
-#: Zotlabs/Module/Settings/Display.php:208
+#: Code/Module/Settings/Display.php:208
 msgid "Display Theme:"
 msgstr "Wyświetl motyw:"
 
-#: Zotlabs/Module/Settings/Display.php:209
+#: Code/Module/Settings/Display.php:209
 msgid "Select scheme"
 msgstr "Wybierz schemat"
 
-#: Zotlabs/Module/Settings/Display.php:211
+#: Code/Module/Settings/Display.php:211
 msgid "Preload images before rendering the page"
 msgstr "Przeładuj obrazy przed renderowaniem strony"
 
-#: Zotlabs/Module/Settings/Display.php:211
+#: Code/Module/Settings/Display.php:211
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
@@ -8618,139 +8618,139 @@ msgstr ""
 "Subiektywny czas ładowania strony będzie dłuższy, ale strona będzie gotowa "
 "po wyświetleniu"
 
-#: Zotlabs/Module/Settings/Display.php:212
+#: Code/Module/Settings/Display.php:212
 msgid "Enable user zoom on mobile devices"
 msgstr "Włącz zoom użytkownika na urządzeniach mobilnych"
 
-#: Zotlabs/Module/Settings/Display.php:213
+#: Code/Module/Settings/Display.php:213
 msgid "Update notifications every xx seconds"
 msgstr "Aktualizuj powiadomienia co xx sekund"
 
-#: Zotlabs/Module/Settings/Display.php:213
+#: Code/Module/Settings/Display.php:213
 msgid "Minimum of 15 seconds, no maximum"
 msgstr "Co najmniej 15 sekund, nie maksimum"
 
-#: Zotlabs/Module/Settings/Display.php:214
+#: Code/Module/Settings/Display.php:214
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maksymalna liczba rozmów do załadowania w dowolnym momencie:"
 
-#: Zotlabs/Module/Settings/Display.php:214
+#: Code/Module/Settings/Display.php:214
 msgid "Maximum of 100 items"
 msgstr "Maksymalnie 100 pozycji"
 
-#: Zotlabs/Module/Settings/Display.php:215
+#: Code/Module/Settings/Display.php:215
 msgid "Show emoticons (smilies) as images"
 msgstr "Pokaż emotikony (uśmieszki) jako obrazy"
 
-#: Zotlabs/Module/Settings/Display.php:216
+#: Code/Module/Settings/Display.php:216
 msgid "Provide channel menu in navigation bar"
 msgstr "Podaj menu kanału na pasku nawigacji"
 
-#: Zotlabs/Module/Settings/Display.php:216
+#: Code/Module/Settings/Display.php:216
 msgid "Default: channel menu located in app menu"
 msgstr "Domyślnie: menu kanału znajduje się w menu aplikacji"
 
-#: Zotlabs/Module/Settings/Display.php:217
+#: Code/Module/Settings/Display.php:217
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Edytor układu strony systemowej — (zaawansowane)"
 
-#: Zotlabs/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:220
 msgid "Channel page max height of content (in pixels)"
 msgstr "Maksymalna wysokość treści na stronie kanału (w pikselach)"
 
-#: Zotlabs/Module/Settings/Display.php:220
-#: Zotlabs/Module/Settings/Display.php:221
+#: Code/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:221
 msgid "click to expand content exceeding this height"
 msgstr "kliknij, aby rozwinąć treść przekraczającą tę wysokość"
 
-#: Zotlabs/Module/Settings/Display.php:221
+#: Code/Module/Settings/Display.php:221
 msgid "Stream page max height of content (in pixels)"
 msgstr "Maksymalna wysokość treści strony strumienia (w pikselach)"
 
-#: Zotlabs/Module/Settings/Display.php:222
+#: Code/Module/Settings/Display.php:222
 msgid "Indent threaded comments this many pixels from the parent"
 msgstr "Wcięcie komentarzy w wątkach o tyle pikseli od rodzica"
 
-#: Zotlabs/Module/Settings/Display.php:222
+#: Code/Module/Settings/Display.php:222
 msgid "0-20"
 msgstr "0-20"
 
-#: Zotlabs/Module/Settings/Featured.php:28
+#: Code/Module/Settings/Featured.php:28
 msgid "Affinity Slider settings updated."
 msgstr "Zaktualizowano ustawienia suwaka więzi."
 
-#: Zotlabs/Module/Settings/Featured.php:43
+#: Code/Module/Settings/Featured.php:43
 msgid "No feature settings configured"
 msgstr "Brak skonfigurowanych ustawień funkcji"
 
-#: Zotlabs/Module/Settings/Featured.php:50
+#: Code/Module/Settings/Featured.php:50
 msgid "Default maximum affinity level"
 msgstr "Domyślny maksymalny poziom więzi"
 
-#: Zotlabs/Module/Settings/Featured.php:50
+#: Code/Module/Settings/Featured.php:50
 msgid "0-99 default 99"
 msgstr "0-99, domyślnie 99"
 
-#: Zotlabs/Module/Settings/Featured.php:55
+#: Code/Module/Settings/Featured.php:55
 msgid "Default minimum affinity level"
 msgstr "Domyślny minimalny poziom więzi"
 
-#: Zotlabs/Module/Settings/Featured.php:55
+#: Code/Module/Settings/Featured.php:55
 msgid "0-99 - default 0"
 msgstr "0-99 - domyślnie 0"
 
-#: Zotlabs/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Featured.php:59
 msgid "Affinity Slider Settings"
 msgstr "Ustawienia Suwaka więzi"
 
-#: Zotlabs/Module/Settings/Featured.php:72
+#: Code/Module/Settings/Featured.php:72
 msgid "Addon Settings"
 msgstr "Ustawienia dodatku"
 
-#: Zotlabs/Module/Settings/Featured.php:73
+#: Code/Module/Settings/Featured.php:73
 msgid "Please save/submit changes to any panel before opening another."
 msgstr "Zapisz/prześlij zmiany do dowolnego panelu przed otwarciem kolejnego."
 
-#: Zotlabs/Module/Settings/Features.php:51
-#: Zotlabs/Module/Settings/Network.php:33
+#: Code/Module/Settings/Features.php:51
+#: Code/Module/Settings/Network.php:33
 msgid "Off"
 msgstr "WYŁ"
 
-#: Zotlabs/Module/Settings/Features.php:51
-#: Zotlabs/Module/Settings/Network.php:33
+#: Code/Module/Settings/Features.php:51
+#: Code/Module/Settings/Network.php:33
 msgid "On"
 msgstr "WŁ"
 
-#: Zotlabs/Module/Settings/Features.php:59
+#: Code/Module/Settings/Features.php:59
 msgid "Additional Features"
 msgstr "Dodatkowe funkcjonalności"
 
-#: Zotlabs/Module/Settings/Network.php:41
+#: Code/Module/Settings/Network.php:41
 msgid "Activity Settings"
 msgstr "Ustawienia aktywności"
 
-#: Zotlabs/Module/Settings/Network.php:56 include/features.php:383
+#: Code/Module/Settings/Network.php:56 include/features.php:383
 msgid "Search by Date"
 msgstr "Wyszukaj po dacie"
 
-#: Zotlabs/Module/Settings/Network.php:57 include/features.php:384
+#: Code/Module/Settings/Network.php:57 include/features.php:384
 msgid "Ability to select posts by date ranges"
 msgstr "Możliwość wyboru wpisów według zakresów dat"
 
-#: Zotlabs/Module/Settings/Network.php:64 Zotlabs/Widget/Savedsearch.php:94
+#: Code/Module/Settings/Network.php:64 Code/Widget/Savedsearch.php:94
 #: include/features.php:393
 msgid "Saved Searches"
 msgstr "Zapisywane wyszukiwanie"
 
-#: Zotlabs/Module/Settings/Network.php:65 include/features.php:394
+#: Code/Module/Settings/Network.php:65 include/features.php:394
 msgid "Save search terms for re-use"
 msgstr "Zapisywanie wyszukiwanych haseł do ponownego wykorzystania"
 
-#: Zotlabs/Module/Settings/Network.php:72 include/features.php:402
+#: Code/Module/Settings/Network.php:72 include/features.php:402
 msgid "Alternate Stream Order"
 msgstr "Alternatywna kolejność strumienia"
 
-#: Zotlabs/Module/Settings/Network.php:73 include/features.php:403
+#: Code/Module/Settings/Network.php:73 include/features.php:403
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
@@ -8758,181 +8758,181 @@ msgstr ""
 "Możliwość uporządkowania strumienia według daty ostatniego wpisu, daty "
 "ostatniego komentarza lub nieprzeczytanych aktywności"
 
-#: Zotlabs/Module/Settings/Network.php:80 include/features.php:411
+#: Code/Module/Settings/Network.php:80 include/features.php:411
 msgid "Contact Filter"
 msgstr "Filtr kontaktów"
 
-#: Zotlabs/Module/Settings/Network.php:81 include/features.php:412
+#: Code/Module/Settings/Network.php:81 include/features.php:412
 msgid "Ability to display only posts of a selected contact"
 msgstr "Możliwość wyświetlania wpisów autorstwa tylko wybranego kontaktu"
 
-#: Zotlabs/Module/Settings/Network.php:88 include/features.php:420
+#: Code/Module/Settings/Network.php:88 include/features.php:420
 msgid "Forum Filter"
 msgstr "Filtr forów"
 
-#: Zotlabs/Module/Settings/Network.php:89 include/features.php:421
+#: Code/Module/Settings/Network.php:89 include/features.php:421
 msgid "Ability to display only posts of a specific forum"
 msgstr "Możliwość wyświetlania wpisów tylko z określonego forum"
 
-#: Zotlabs/Module/Settings/Network.php:96 include/features.php:429
+#: Code/Module/Settings/Network.php:96 include/features.php:429
 msgid "Personal Posts Filter"
 msgstr "Filtr wpisów osobistych"
 
-#: Zotlabs/Module/Settings/Network.php:97 include/features.php:430
+#: Code/Module/Settings/Network.php:97 include/features.php:430
 msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 "Możliwość wyświetlania tylko tych wpisów, z którymi miało się interakcję"
 
-#: Zotlabs/Module/Settings/Network.php:104 include/features.php:438
+#: Code/Module/Settings/Network.php:104 include/features.php:438
 msgid "Affinity Tool"
 msgstr "Narzędzie więzi"
 
-#: Zotlabs/Module/Settings/Network.php:105 include/features.php:439
+#: Code/Module/Settings/Network.php:105 include/features.php:439
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtruj aktywność strumienia według głębokości relacji"
 
-#: Zotlabs/Module/Settings/Network.php:113 include/features.php:448
+#: Code/Module/Settings/Network.php:113 include/features.php:448
 msgid "Show friend and connection suggestions"
 msgstr "Pokaż propozycje znajomości i połączeń"
 
-#: Zotlabs/Module/Settings/Network.php:120 include/features.php:456
+#: Code/Module/Settings/Network.php:120 include/features.php:456
 msgid "Connection Filtering"
 msgstr "Filtrowanie połączeń"
 
-#: Zotlabs/Module/Settings/Network.php:121 include/features.php:457
+#: Code/Module/Settings/Network.php:121 include/features.php:457
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 "Filtruj przychodzące wpisy z połączeń, na podstawie słów kluczowych lub "
 "treści"
 
-#: Zotlabs/Module/Settings/Oauth.php:37
+#: Code/Module/Settings/Oauth.php:37
 msgid "Name is required"
 msgstr "Wymaga się podania nazwy"
 
-#: Zotlabs/Module/Settings/Oauth.php:41
+#: Code/Module/Settings/Oauth.php:41
 msgid "Key and Secret are required"
 msgstr "Wymaga się wprowadzenia klucza i sekretu"
 
-#: Zotlabs/Module/Settings/Oauth.php:94 Zotlabs/Module/Settings/Oauth.php:122
-#: Zotlabs/Module/Settings/Oauth.php:162 Zotlabs/Module/Settings/Oauth2.php:142
-#: Zotlabs/Module/Settings/Oauth2.php:210
+#: Code/Module/Settings/Oauth.php:94 Code/Module/Settings/Oauth.php:122
+#: Code/Module/Settings/Oauth.php:162 Code/Module/Settings/Oauth2.php:142
+#: Code/Module/Settings/Oauth2.php:210
 msgid "Add application"
 msgstr "Dodaj aplikację"
 
-#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth2.php:115
-#: Zotlabs/Module/Settings/Oauth2.php:145
+#: Code/Module/Settings/Oauth.php:97 Code/Module/Settings/Oauth2.php:115
+#: Code/Module/Settings/Oauth2.php:145
 msgid "Name of application"
 msgstr "Nazwa aplikacji"
 
-#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:126
+#: Code/Module/Settings/Oauth.php:98 Code/Module/Settings/Oauth.php:126
 msgid "Consumer Key"
 msgstr "Klucz konsumenta"
 
-#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:99
-#: Zotlabs/Module/Settings/Oauth2.php:116
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:146
-#: Zotlabs/Module/Settings/Oauth2.php:147
+#: Code/Module/Settings/Oauth.php:98 Code/Module/Settings/Oauth.php:99
+#: Code/Module/Settings/Oauth2.php:116
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:146
+#: Code/Module/Settings/Oauth2.php:147
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 "Wygenerowane automatycznie - w razie potrzeby zmień. Maksymalna długość 20"
 
-#: Zotlabs/Module/Settings/Oauth.php:99 Zotlabs/Module/Settings/Oauth.php:127
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:147
+#: Code/Module/Settings/Oauth.php:99 Code/Module/Settings/Oauth.php:127
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:147
 msgid "Consumer Secret"
 msgstr "Sekret konsumenta"
 
-#: Zotlabs/Module/Settings/Oauth.php:100 Zotlabs/Module/Settings/Oauth.php:128
-#: Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth.php:100 Code/Module/Settings/Oauth.php:128
+#: Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:148
 msgid "Redirect"
 msgstr "Przekierowanie"
 
-#: Zotlabs/Module/Settings/Oauth.php:100 Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth.php:100 Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:148
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 "Identyfikator URI przekierowania - pozostaw puste, chyba że aplikacja tego "
 "wymaga"
 
-#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Settings/Oauth.php:129
+#: Code/Module/Settings/Oauth.php:101 Code/Module/Settings/Oauth.php:129
 msgid "Icon url"
 msgstr "URL ikony"
 
-#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Sources.php:128
-#: Zotlabs/Module/Sources.php:164
+#: Code/Module/Settings/Oauth.php:101 Code/Module/Sources.php:128
+#: Code/Module/Sources.php:164
 msgid "Optional"
 msgstr "Opcjonalne"
 
-#: Zotlabs/Module/Settings/Oauth.php:114
+#: Code/Module/Settings/Oauth.php:114
 msgid "Application not found."
 msgstr "Aplikacji nie znaleziono."
 
-#: Zotlabs/Module/Settings/Oauth.php:161
+#: Code/Module/Settings/Oauth.php:161
 msgid "Connected Apps"
 msgstr "Podłączone aplikacje"
 
-#: Zotlabs/Module/Settings/Oauth.php:165 Zotlabs/Module/Settings/Oauth2.php:213
+#: Code/Module/Settings/Oauth.php:165 Code/Module/Settings/Oauth2.php:213
 msgid "Client key starts with"
 msgstr "Klucz klienta zaczyna się od"
 
-#: Zotlabs/Module/Settings/Oauth.php:166 Zotlabs/Module/Settings/Oauth2.php:214
+#: Code/Module/Settings/Oauth.php:166 Code/Module/Settings/Oauth2.php:214
 msgid "No name"
 msgstr "Brak nazwy"
 
-#: Zotlabs/Module/Settings/Oauth.php:167 Zotlabs/Module/Settings/Oauth2.php:215
+#: Code/Module/Settings/Oauth.php:167 Code/Module/Settings/Oauth2.php:215
 msgid "Remove authorization"
 msgstr "Usuń autoryzację"
 
-#: Zotlabs/Module/Settings/Oauth2.php:51
+#: Code/Module/Settings/Oauth2.php:51
 msgid "ID and Secret are required"
 msgstr "Wymagany jest identyfikator i sekret"
 
-#: Zotlabs/Module/Settings/Oauth2.php:112
+#: Code/Module/Settings/Oauth2.php:112
 msgid "Add OAuth2 application"
 msgstr "Dodaj aplikację OAuth2"
 
-#: Zotlabs/Module/Settings/Oauth2.php:116
-#: Zotlabs/Module/Settings/Oauth2.php:146
+#: Code/Module/Settings/Oauth2.php:116
+#: Code/Module/Settings/Oauth2.php:146
 msgid "Consumer ID"
 msgstr "Identyfikator konsumenta"
 
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:149
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:149
 msgid "Grant Types"
 msgstr "Rodzaje zezwoleń"
 
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:149
-#: Zotlabs/Module/Settings/Oauth2.php:150
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:149
+#: Code/Module/Settings/Oauth2.php:150
 msgid "leave blank unless your application specifically requires this"
 msgstr "pozostaw puste, chyba że Twoja aplikacja jawnie tego wymaga"
 
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:150
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:150
 msgid "Authorization scope"
 msgstr "Zakres uprawnień"
 
-#: Zotlabs/Module/Settings/Oauth2.php:133
+#: Code/Module/Settings/Oauth2.php:133
 msgid "OAuth2 Application not found."
 msgstr "Nie znaleziono aplikacji OAuth2."
 
-#: Zotlabs/Module/Settings/Oauth2.php:209
+#: Code/Module/Settings/Oauth2.php:209
 msgid "Connected OAuth2 Apps"
 msgstr "Podłączone aplikacje OAuth2"
 
-#: Zotlabs/Module/Settings/Permcats.php:30
+#: Code/Module/Settings/Permcats.php:30
 msgid "Permission Name is required."
 msgstr "Wymagana jest nazwa uprwanień."
 
-#: Zotlabs/Module/Settings/Permcats.php:49
+#: Code/Module/Settings/Permcats.php:49
 msgid "Permission category saved."
 msgstr "Kategoria uprawnień została zapisana."
 
-#: Zotlabs/Module/Settings/Permcats.php:76
+#: Code/Module/Settings/Permcats.php:76
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
@@ -8940,24 +8940,24 @@ msgstr ""
 "Użyj tego formularza, aby utworzyć reguły uprawnień dla różnych klas osób "
 "lub połączeń."
 
-#: Zotlabs/Module/Settings/Permcats.php:119
+#: Code/Module/Settings/Permcats.php:119
 msgid "Permission Name"
 msgstr "Nazwa uprawnienia"
 
-#: Zotlabs/Module/Settings/Tokens.php:45
+#: Code/Module/Settings/Tokens.php:45
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Ten kanał jest ograniczony do %d tokenów"
 
-#: Zotlabs/Module/Settings/Tokens.php:51
+#: Code/Module/Settings/Tokens.php:51
 msgid "Name and Password are required."
 msgstr "Wymagane są nazwa i hasło."
 
-#: Zotlabs/Module/Settings/Tokens.php:187
+#: Code/Module/Settings/Tokens.php:187
 msgid "Token saved."
 msgstr "Token został zapisany."
 
-#: Zotlabs/Module/Settings/Tokens.php:258
+#: Code/Module/Settings/Tokens.php:258
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
@@ -8968,7 +8968,7 @@ msgstr ""
 "używane na listach kontroli dostępu, a odwiedzający mogą logować się przy "
 "użyciu tych poświadczeń, aby uzyskać dostęp do treści prywatnych."
 
-#: Zotlabs/Module/Settings/Tokens.php:260
+#: Code/Module/Settings/Tokens.php:260
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
@@ -8978,78 +8978,78 @@ msgstr ""
 "dropbox, dodając hasło logowania do dowolnego adresu URL portalu, "
 "jak pokazano na ilustracji. Przykłady:"
 
-#: Zotlabs/Module/Settings/Tokens.php:295
+#: Code/Module/Settings/Tokens.php:295
 msgid "Guest Access Tokens"
 msgstr "Token dostępu gościa"
 
-#: Zotlabs/Module/Settings/Tokens.php:303
+#: Code/Module/Settings/Tokens.php:303
 msgid "Login Name"
 msgstr "Nazwa logowania"
 
-#: Zotlabs/Module/Settings/Tokens.php:304
+#: Code/Module/Settings/Tokens.php:304
 msgid "Login Password"
 msgstr "Hasło logowania"
 
-#: Zotlabs/Module/Settings/Tokens.php:305
+#: Code/Module/Settings/Tokens.php:305
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Wygasa (rrrr-mm-dd)"
 
-#: Zotlabs/Module/Subthread.php:139
+#: Code/Module/Subthread.php:139
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s obserwuje %3$s %2$s"
 
-#: Zotlabs/Module/Subthread.php:142
+#: Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s przestał obserwować %3$s %2$s"
 
-#: Zotlabs/Module/Sharedwithme.php:106
+#: Code/Module/Sharedwithme.php:106
 msgid "Files: shared with me"
 msgstr "Pliki: udostępnione mi"
 
-#: Zotlabs/Module/Sharedwithme.php:108
+#: Code/Module/Sharedwithme.php:108
 msgid "NEW"
 msgstr "NOWE"
 
-#: Zotlabs/Module/Sharedwithme.php:109 Zotlabs/Storage/Browser.php:315
+#: Code/Module/Sharedwithme.php:109 Code/Storage/Browser.php:315
 #: include/text.php:1534
 msgid "Size"
 msgstr "Rozmiar"
 
-#: Zotlabs/Module/Sharedwithme.php:110 Zotlabs/Storage/Browser.php:316
+#: Code/Module/Sharedwithme.php:110 Code/Storage/Browser.php:316
 msgid "Last Modified"
 msgstr "Ostatnio zmodyfikowane"
 
-#: Zotlabs/Module/Sharedwithme.php:111
+#: Code/Module/Sharedwithme.php:111
 msgid "Remove all files"
 msgstr "Usuń wszystkie pliki"
 
-#: Zotlabs/Module/Sharedwithme.php:112
+#: Code/Module/Sharedwithme.php:112
 msgid "Remove this file"
 msgstr "Usuń ten plik"
 
-#: Zotlabs/Module/Siteinfo.php:34
+#: Code/Module/Siteinfo.php:34
 msgid "About this site"
 msgstr "O tym portalu"
 
-#: Zotlabs/Module/Siteinfo.php:36
+#: Code/Module/Siteinfo.php:36
 msgid "Site Name"
 msgstr "Nazwa portalu"
 
-#: Zotlabs/Module/Siteinfo.php:40
+#: Code/Module/Siteinfo.php:40
 msgid "Administrator"
 msgstr "Administrator"
 
-#: Zotlabs/Module/Siteinfo.php:43
+#: Code/Module/Siteinfo.php:43
 msgid "Software and Project information"
 msgstr "Informacje o oprogramowaniu i projekcie"
 
-#: Zotlabs/Module/Siteinfo.php:44
+#: Code/Module/Siteinfo.php:44
 msgid "This site is powered by $Projectname"
 msgstr "Ten portal jest oparty na $Projectname"
 
-#: Zotlabs/Module/Siteinfo.php:45
+#: Code/Module/Siteinfo.php:45
 msgid ""
 "Federated and decentralised networking and identity services provided by "
 "Nomad"
@@ -9057,28 +9057,28 @@ msgstr ""
 "Sfederowane i zdecentralizowane usługi sieciowe i tożsamościowe dostarczane "
 "przez Nomad"
 
-#: Zotlabs/Module/Siteinfo.php:49
+#: Code/Module/Siteinfo.php:49
 msgid "Protocols:"
 msgstr "Protokoły:"
 
-#: Zotlabs/Module/Siteinfo.php:51
+#: Code/Module/Siteinfo.php:51
 #, php-format
 msgid "Version %s"
 msgstr "Wersja %s"
 
-#: Zotlabs/Module/Siteinfo.php:52
+#: Code/Module/Siteinfo.php:52
 msgid "Project homepage"
 msgstr "Strona główna projektu"
 
-#: Zotlabs/Module/Siteinfo.php:53
+#: Code/Module/Siteinfo.php:53
 msgid "Developer homepage"
 msgstr "Strona główna developerów"
 
-#: Zotlabs/Module/Uexport.php:64 Zotlabs/Module/Uexport.php:65
+#: Code/Module/Uexport.php:64 Code/Module/Uexport.php:65
 msgid "Export Channel"
 msgstr "Eksportuj kanał"
 
-#: Zotlabs/Module/Uexport.php:66
+#: Code/Module/Uexport.php:66
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
@@ -9088,11 +9088,11 @@ msgstr ""
 "zapasowa połączeń, uprawnień, profilu i podstawowych danych, których można "
 "użyć do zaimportowania danych do nowego portalu, ale nie zawiera treści."
 
-#: Zotlabs/Module/Uexport.php:67
+#: Code/Module/Uexport.php:67
 msgid "Export Content"
 msgstr "Eksport treści"
 
-#: Zotlabs/Module/Uexport.php:68
+#: Code/Module/Uexport.php:68
 msgid ""
 "Export your channel information and recent content to a JSON backup that can "
 "be restored or imported to another server hub. This backs up all of your "
@@ -9106,11 +9106,11 @@ msgstr ""
 "miesięcy. Ten plik może być BARDZO duży. Prosimy o cierpliwość - rozpoczęcie "
 "pobierania może zająć kilka minut."
 
-#: Zotlabs/Module/Uexport.php:70
+#: Code/Module/Uexport.php:70
 msgid "Export your posts from a given year."
 msgstr "Eksportuj swoje wpisy z danego roku."
 
-#: Zotlabs/Module/Uexport.php:72
+#: Code/Module/Uexport.php:72
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -9123,7 +9123,7 @@ msgstr ""
 "w serwera portalu), spróbuj ponownie, wybierając bardziej ograniczony zakres "
 "dat."
 
-#: Zotlabs/Module/Uexport.php:73
+#: Code/Module/Uexport.php:73
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 
-#: Zotlabs/Module/Uexport.php:74
+#: Code/Module/Uexport.php:74
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
@@ -9141,7 +9141,7 @@ msgstr ""
 "Aby wybrać wszystkie wpisy z danego miesiąca, np. stycznia tego roku, "
 "odwiedź %2$s"
 
-#: Zotlabs/Module/Uexport.php:75
+#: Code/Module/Uexport.php:75
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting "
@@ -9153,31 +9153,31 @@ msgstr ""
 "uzyskać najlepsze wyniki, zaimportuj lub przywróć je w kolejności (od "
 "najstarszych)."
 
-#: Zotlabs/Module/Sources.php:49
+#: Code/Module/Sources.php:49
 msgid "Failed to create source. No channel selected."
 msgstr "Nie udało się utworzyć źródła. Nie wybrano kanału."
 
-#: Zotlabs/Module/Sources.php:66
+#: Code/Module/Sources.php:66
 msgid "Source created."
 msgstr "Utworzono źródło."
 
-#: Zotlabs/Module/Sources.php:79
+#: Code/Module/Sources.php:79
 msgid "Source updated."
 msgstr "Źródło zaktualizowane."
 
-#: Zotlabs/Module/Sources.php:106
+#: Code/Module/Sources.php:106
 msgid "*"
 msgstr "*"
 
-#: Zotlabs/Module/Sources.php:113
+#: Code/Module/Sources.php:113
 msgid "Manage remote sources of content for your channel."
 msgstr "Zarządzaj zdalnymi źródłami treści na swoim kanale."
 
-#: Zotlabs/Module/Sources.php:114 Zotlabs/Module/Sources.php:124
+#: Code/Module/Sources.php:114 Code/Module/Sources.php:124
 msgid "New Source"
 msgstr "Nowe źródło"
 
-#: Zotlabs/Module/Sources.php:125 Zotlabs/Module/Sources.php:160
+#: Code/Module/Sources.php:125 Code/Module/Sources.php:160
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
@@ -9185,19 +9185,19 @@ msgstr ""
 "Zaimportuj wszystkie lub wybrane treści z następującego kanału do tego "
 "kanału i rozpowszechniaj je zgodnie z ustawieniami kanału."
 
-#: Zotlabs/Module/Sources.php:126 Zotlabs/Module/Sources.php:161
+#: Code/Module/Sources.php:126 Code/Module/Sources.php:161
 msgid "Only import content with these words (one per line)"
 msgstr "Importuj tylko zawartość z tymi słowami (po jednym w każdym wierszu)"
 
-#: Zotlabs/Module/Sources.php:126 Zotlabs/Module/Sources.php:161
+#: Code/Module/Sources.php:126 Code/Module/Sources.php:161
 msgid "Leave blank to import all public content"
 msgstr "Pozostaw puste, aby zaimportować całą zawartość publiczną"
 
-#: Zotlabs/Module/Sources.php:127 Zotlabs/Module/Sources.php:167
+#: Code/Module/Sources.php:127 Code/Module/Sources.php:167
 msgid "Channel Name"
 msgstr "Nazwa kanału"
 
-#: Zotlabs/Module/Sources.php:128 Zotlabs/Module/Sources.php:164
+#: Code/Module/Sources.php:128 Code/Module/Sources.php:164
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
@@ -9205,281 +9205,281 @@ msgstr ""
 "Dodaj następujące kategorie do wpisów zaimportowanych z tego źródła "
 "(rozdzielone przecinkami)"
 
-#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:165
+#: Code/Module/Sources.php:129 Code/Module/Sources.php:165
 msgid "Resend posts with this channel as author"
 msgstr "Wyślij ponownie wpisy z tym kanałem jako autor"
 
-#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:165
+#: Code/Module/Sources.php:129 Code/Module/Sources.php:165
 msgid "Copyrights may apply"
 msgstr "Mogą obowiązywać prawa autorskie"
 
-#: Zotlabs/Module/Sources.php:150 Zotlabs/Module/Sources.php:180
+#: Code/Module/Sources.php:150 Code/Module/Sources.php:180
 msgid "Source not found."
 msgstr "Nie znaleziono źródła."
 
-#: Zotlabs/Module/Sources.php:157
+#: Code/Module/Sources.php:157
 msgid "Edit Source"
 msgstr "Edytuj źródło"
 
-#: Zotlabs/Module/Sources.php:158
+#: Code/Module/Sources.php:158
 msgid "Delete Source"
 msgstr "Usuń źródło"
 
-#: Zotlabs/Module/Sources.php:189
+#: Code/Module/Sources.php:189
 msgid "Source removed"
 msgstr "Źródło zostało usunięte"
 
-#: Zotlabs/Module/Sources.php:191
+#: Code/Module/Sources.php:191
 msgid "Unable to remove source."
 msgstr "Nie można usunąć źródła."
 
-#: Zotlabs/Module/Photos.php:81 Zotlabs/Module/Photos.php:99
+#: Code/Module/Photos.php:81 Code/Module/Photos.php:99
 msgid "Album not found."
 msgstr "Nie znaleziono albumu."
 
-#: Zotlabs/Module/Photos.php:90
+#: Code/Module/Photos.php:90
 msgid "Delete Album"
 msgstr "Usuń album"
 
-#: Zotlabs/Module/Photos.php:164 Zotlabs/Module/Photos.php:1133
+#: Code/Module/Photos.php:164 Code/Module/Photos.php:1133
 msgid "Delete Photo"
 msgstr "Usuń zdjęcie"
 
-#: Zotlabs/Module/Photos.php:365
+#: Code/Module/Photos.php:365
 msgid "linked item not found."
 msgstr "nie znaleziono zlinkowanego elementu."
 
-#: Zotlabs/Module/Photos.php:559
+#: Code/Module/Photos.php:559
 #, php-format
 msgid "%s: Unsupported photo type. Saved as file."
 msgstr "%s: Nieobsługiwany typ zdjęcia. Zapisano jako plik."
 
-#: Zotlabs/Module/Photos.php:587
+#: Code/Module/Photos.php:587
 msgid "No photos selected"
 msgstr "Nie wybrano zdjęć"
 
-#: Zotlabs/Module/Photos.php:637
+#: Code/Module/Photos.php:637
 msgid "Access to this item is restricted."
 msgstr "Dostęp do tego elementu jest ograniczony."
 
-#: Zotlabs/Module/Photos.php:680
+#: Code/Module/Photos.php:680
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "Wykorzystane miejsce na zdjęcia: %1$.2f MB z %2$.2f MB."
 
-#: Zotlabs/Module/Photos.php:682
+#: Code/Module/Photos.php:682
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "Wykorzystane miejsce na zdjęcia: %1$.2f MB."
 
-#: Zotlabs/Module/Photos.php:724
+#: Code/Module/Photos.php:724
 msgid "Upload Photos"
 msgstr "Prześlij zdjęcia"
 
-#: Zotlabs/Module/Photos.php:728
+#: Code/Module/Photos.php:728
 msgid "Enter an album name"
 msgstr "Wpisz nazwę albumu"
 
-#: Zotlabs/Module/Photos.php:729
+#: Code/Module/Photos.php:729
 msgid "or select an existing album (doubleclick)"
 msgstr "lub wybierz istniejący album (podwójne kliknięcie)"
 
-#: Zotlabs/Module/Photos.php:730
+#: Code/Module/Photos.php:730
 msgid "Create a status post for this upload"
 msgstr "Utwórz wpis o stanie tego przesyłania"
 
-#: Zotlabs/Module/Photos.php:730
+#: Code/Module/Photos.php:730
 msgid ""
 "If multiple files are selected, the message will be repeated for each photo"
 msgstr ""
 "W przypadku wybrania wielu plików komunikat zostanie powtórzony dla każdego "
 "zdjęcia"
 
-#: Zotlabs/Module/Photos.php:731 Zotlabs/Module/Photos.php:1117
+#: Code/Module/Photos.php:731 Code/Module/Photos.php:1117
 msgid "Please briefly describe this photo for vision-impaired viewers"
 msgstr "Proszę opisz krótko to zdjęcie to zdjęcie dla osób niedowidzących"
 
-#: Zotlabs/Module/Photos.php:733 Zotlabs/Module/Photos.php:1119
+#: Code/Module/Photos.php:733 Code/Module/Photos.php:1119
 msgid "Your message (optional)"
 msgstr "Twoja wiadomość (opcjonalnie)"
 
-#: Zotlabs/Module/Photos.php:820
+#: Code/Module/Photos.php:820
 msgid "Date descending"
 msgstr "Data malejąco"
 
-#: Zotlabs/Module/Photos.php:821
+#: Code/Module/Photos.php:821
 msgid "Date ascending"
 msgstr "Data rosnąco"
 
-#: Zotlabs/Module/Photos.php:822
+#: Code/Module/Photos.php:822
 msgid "Name ascending"
 msgstr "Nazwa rosnąco"
 
-#: Zotlabs/Module/Photos.php:877 Zotlabs/Module/Photos.php:1430
+#: Code/Module/Photos.php:877 Code/Module/Photos.php:1430
 msgid "View files"
 msgstr "Wyświetl pliki"
 
-#: Zotlabs/Module/Photos.php:881 Zotlabs/Module/Photos.php:1433
+#: Code/Module/Photos.php:881 Code/Module/Photos.php:1433
 msgid "Add Photos"
 msgstr "Dodaj zdjęcia"
 
-#: Zotlabs/Module/Photos.php:883
+#: Code/Module/Photos.php:883
 msgid "Sort"
 msgstr "Sortuj"
 
-#: Zotlabs/Module/Photos.php:928
+#: Code/Module/Photos.php:928
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Odmowa dostępu. Dostęp do tej pozycji może być ograniczony."
 
-#: Zotlabs/Module/Photos.php:930
+#: Code/Module/Photos.php:930
 msgid "Photo not available"
 msgstr "Zdjęcie niedostępne"
 
-#: Zotlabs/Module/Photos.php:994
+#: Code/Module/Photos.php:994
 msgid "Use as profile photo"
 msgstr "Użyj jako zdjęcie profilowe"
 
-#: Zotlabs/Module/Photos.php:995
+#: Code/Module/Photos.php:995
 msgid "Use as cover photo"
 msgstr "Użyj jako zdjęcia okładkowe"
 
-#: Zotlabs/Module/Photos.php:1002
+#: Code/Module/Photos.php:1002
 msgid "Private Photo"
 msgstr "Zdjęcie prywatne"
 
-#: Zotlabs/Module/Photos.php:1020
+#: Code/Module/Photos.php:1020
 msgid "View Full Size"
 msgstr "Zobacz pełny rozmiar"
 
-#: Zotlabs/Module/Photos.php:1108
+#: Code/Module/Photos.php:1108
 msgid "Edit photo"
 msgstr "Edytuj zdjęcie"
 
-#: Zotlabs/Module/Photos.php:1112
+#: Code/Module/Photos.php:1112
 msgid "Move photo to album"
 msgstr "Przenieś zdjęcie do albumu"
 
-#: Zotlabs/Module/Photos.php:1113
+#: Code/Module/Photos.php:1113
 msgid "Enter a new album name"
 msgstr "Wprowadź nową nazwę albumu"
 
-#: Zotlabs/Module/Photos.php:1114
+#: Code/Module/Photos.php:1114
 msgid "or select an existing one (doubleclick)"
 msgstr "lub wybierz istniejący (podwójne kliknięcie)"
 
-#: Zotlabs/Module/Photos.php:1119
+#: Code/Module/Photos.php:1119
 msgid ""
 "This will only appear in the optional status post attached to this photo"
 msgstr ""
 "Będzie to widoczne tylko w opcjonalnym wpisie stanu dołączonym do tego "
 "zdjęcia"
 
-#: Zotlabs/Module/Photos.php:1120
+#: Code/Module/Photos.php:1120
 msgid "Add a Tag"
 msgstr "Dodaj tag"
 
-#: Zotlabs/Module/Photos.php:1128
+#: Code/Module/Photos.php:1128
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Przykład: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: Zotlabs/Module/Photos.php:1131
+#: Code/Module/Photos.php:1131
 msgid "Flag as adult in album view"
 msgstr "Oznacz jako \"dla dorosłych\" w widoku albumu"
 
-#: Zotlabs/Module/Photos.php:1206 include/conversation.php:521
+#: Code/Module/Photos.php:1206 include/conversation.php:521
 msgctxt "title"
 msgid "Likes"
 msgstr "Pochwał"
 
-#: Zotlabs/Module/Photos.php:1207 include/conversation.php:522
+#: Code/Module/Photos.php:1207 include/conversation.php:522
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Zganień"
 
-#: Zotlabs/Module/Photos.php:1208 include/conversation.php:523
+#: Code/Module/Photos.php:1208 include/conversation.php:523
 msgctxt "title"
 msgid "Attending"
 msgstr "Uczestniczę"
 
-#: Zotlabs/Module/Photos.php:1209 include/conversation.php:524
+#: Code/Module/Photos.php:1209 include/conversation.php:524
 msgctxt "title"
 msgid "Not attending"
 msgstr "Nie uczestniczę"
 
-#: Zotlabs/Module/Photos.php:1210 include/conversation.php:525
+#: Code/Module/Photos.php:1210 include/conversation.php:525
 msgctxt "title"
 msgid "Might attend"
 msgstr "Mogę uczestniczyć"
 
-#: Zotlabs/Module/Photos.php:1320
+#: Code/Module/Photos.php:1320
 msgid "Photo Tools"
 msgstr "Narzędzia fotograficzne"
 
-#: Zotlabs/Module/Photos.php:1330
+#: Code/Module/Photos.php:1330
 msgid "In This Photo:"
 msgstr "Na tym zdjęciu:"
 
-#: Zotlabs/Module/Photos.php:1335
+#: Code/Module/Photos.php:1335
 msgid "Map"
 msgstr "Mapa"
 
-#: Zotlabs/Module/Photos.php:1417 Zotlabs/Module/Photos.php:1428
-#: Zotlabs/Module/Photos.php:1429 include/photos.php:756
+#: Code/Module/Photos.php:1417 Code/Module/Photos.php:1428
+#: Code/Module/Photos.php:1429 include/photos.php:756
 msgid "Recent Photos"
 msgstr "Najnowsze zdjęcia"
 
-#: Zotlabs/Module/Tagger.php:62
+#: Code/Module/Tagger.php:62
 msgid "Post not found."
 msgstr "Nie znaleziono wpisu."
 
-#: Zotlabs/Module/Tagger.php:94 include/conversation.php:163
+#: Code/Module/Tagger.php:94 include/conversation.php:163
 #: include/text.php:2377
 msgid "comment"
 msgstr "komentarz"
 
-#: Zotlabs/Module/Tagger.php:135
+#: Code/Module/Tagger.php:135
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s oznaczono jako %3$s %2$s w %4$s"
 
-#: Zotlabs/Module/Tagrm.php:59 Zotlabs/Module/Tagrm.php:111
+#: Code/Module/Tagrm.php:59 Code/Module/Tagrm.php:111
 msgid "Tag removed"
 msgstr "Tag został usunięty"
 
-#: Zotlabs/Module/Tagrm.php:137
+#: Code/Module/Tagrm.php:137
 msgid "Remove Item Tag"
 msgstr "Usuń znacznik elementu"
 
-#: Zotlabs/Module/Tagrm.php:139
+#: Code/Module/Tagrm.php:139
 msgid "Select a tag to remove: "
 msgstr "Wybierz znacznik do usunięcia: "
 
-#: Zotlabs/Module/Import.php:160 Zotlabs/Import/Friendica.php:64
+#: Code/Module/Import.php:160 Code/Import/Friendica.php:64
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Twój plan usług zezwala tylko na %d kanał/kanałów."
 
-#: Zotlabs/Module/Import.php:188
+#: Code/Module/Import.php:188
 msgid "No channel. Import failed."
 msgstr "Brak kanału. Import nieudany."
 
-#: Zotlabs/Module/Import.php:633
+#: Code/Module/Import.php:633
 msgid "Files and Posts imported."
 msgstr "Pliki i wpisy zostały zaimportowane."
 
-#: Zotlabs/Module/Import.php:648
+#: Code/Module/Import.php:648
 msgid "Import completed."
 msgstr "Import zakończony."
 
-#: Zotlabs/Module/Import.php:680
+#: Code/Module/Import.php:680
 msgid "You must be logged in to use this feature."
 msgstr "Trzeba się zalogować, aby korzystać z tej funkcji."
 
-#: Zotlabs/Module/Import.php:685
+#: Code/Module/Import.php:685
 msgid "Import Channel"
 msgstr "Importuj kanał"
 
-#: Zotlabs/Module/Import.php:686
+#: Code/Module/Import.php:686
 msgid ""
 "Use this form to import an existing channel from a different server. You may "
 "retrieve the channel identity from the old server via the network or provide "
@@ -9489,29 +9489,29 @@ msgstr ""
 "Możesz pobrać tożsamość kanału ze starego serwera przez sieć lub dostarczyć "
 "plik eksportu."
 
-#: Zotlabs/Module/Import.php:688
+#: Code/Module/Import.php:688
 msgid "Or provide the old server details"
 msgstr "Lub podaj szczegóły starego serwera"
 
-#: Zotlabs/Module/Import.php:689
+#: Code/Module/Import.php:689
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Twój stary adres tożsamości (xyz@example.com)"
 
-#: Zotlabs/Module/Import.php:690
+#: Code/Module/Import.php:690
 msgid "Your old login email address"
 msgstr "Twój stary adres e-mail logowania"
 
-#: Zotlabs/Module/Import.php:691
+#: Code/Module/Import.php:691
 msgid "Your old login password"
 msgstr "Twoje stare hasło logowania"
 
-#: Zotlabs/Module/Import.php:692
+#: Code/Module/Import.php:692
 msgid "Import a few months of posts if possible (limited by available memory)"
 msgstr ""
 "Zaimportuj wpisy z kilku miesięcy, jeśli to możliwe (ograniczone dostępną "
 "pamięcią)"
 
-#: Zotlabs/Module/Import.php:694
+#: Code/Module/Import.php:694
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be "
@@ -9523,19 +9523,19 @@ msgstr ""
 "Będziesz mógł publikować z dowolnej lokalizacji, ale tylko jedna może być "
 "oznaczona jako główna lokalizacja plików, zdjęć i multimediów."
 
-#: Zotlabs/Module/Import.php:696
+#: Code/Module/Import.php:696
 msgid "Make this hub my primary location"
 msgstr "Ustaw ten węzeł jako moją główną lokalizację"
 
-#: Zotlabs/Module/Import.php:697
+#: Code/Module/Import.php:697
 msgid "Move this channel (disable all previous locations)"
 msgstr "Przenieś ten kanał (wyłącz wszystkie poprzednie lokalizacje)"
 
-#: Zotlabs/Module/Import.php:698
+#: Code/Module/Import.php:698
 msgid "Use this channel nickname instead of the one provided"
 msgstr "Użyj tego pseudonimu kanału zamiast podanego"
 
-#: Zotlabs/Module/Import.php:698
+#: Code/Module/Import.php:698
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this site."
@@ -9544,7 +9544,7 @@ msgstr ""
 "podobny pseudonim, jeśli któryś z nich jest już przydzielony na tym "
 "serwisie ."
 
-#: Zotlabs/Module/Import.php:700
+#: Code/Module/Import.php:700
 msgid ""
 "This process may take several minutes to complete and considerably longer if "
 "importing a large amount of posts and files. Please submit the form only "
@@ -9553,11 +9553,11 @@ msgstr ""
 "Ten proces może zająć kilka minut. Prześlij formularz tylko raz i pozostaw "
 "tę stronę otwartą do zakończenia procedury."
 
-#: Zotlabs/Module/Profile.php:115
+#: Code/Module/Profile.php:115
 msgid "vcard"
 msgstr "vcard"
 
-#: Zotlabs/Module/Comment_control.php:15
+#: Code/Module/Comment_control.php:15
 msgid ""
 "This app allows you to select the comment audience and set a length of time "
 "that comments on a particular post will be accepted."
@@ -9565,7 +9565,7 @@ msgstr ""
 "Ta aplikacja pozwala wybrać odbiorców komentarzy i ustawić czas, przez który "
 "komentarze do konkretnego wpisu będą akceptowane."
 
-#: Zotlabs/Module/Comment_control.php:23
+#: Code/Module/Comment_control.php:23
 msgid ""
 "This app is installed. A button to control comments may be found below the "
 "post editor."
@@ -9573,7 +9573,7 @@ msgstr ""
 "Ta aplikacja jest zainstalowana. Przycisk do sterowania komentarzami "
 "znajduje się pod edytorem wpisów."
 
-#: Zotlabs/Module/Future.php:15
+#: Code/Module/Future.php:15
 msgid ""
 "This app allows you to set an optional publish date/time for posts, which "
 "may be in the future. This must be at least ten minutes into the future to "
@@ -9588,7 +9588,7 @@ msgstr ""
 "Po zainstalowaniu w edytorze wpisów pojawi się nowy przycisk, aby ustawić "
 "datę i godzinę."
 
-#: Zotlabs/Module/Markup.php:16
+#: Code/Module/Markup.php:16
 msgid ""
 "This app adds editor buttons for bold, italic, underline, quote, and "
 "possibly other common richtext constructs."
@@ -9597,7 +9597,7 @@ msgstr ""
 "podkreślenia, cytatu i prawdopodobnie innych typowych konstrukcji tekstu "
 "sformatowanego."
 
-#: Zotlabs/Module/Photomap.php:15
+#: Code/Module/Photomap.php:15
 msgid ""
 "This app provides a displayable map when viewing detail of photos that "
 "contain location information."
@@ -9605,11 +9605,11 @@ msgstr ""
 "Ta aplikacja dostarcza mapę wyświetlaną podczas przeglądania szczegółów "
 "zdjęć, które zawierających informacje o lokalizacji."
 
-#: Zotlabs/Module/Photomap.php:23
+#: Code/Module/Photomap.php:23
 msgid "This app is currently installed."
 msgstr "Ta aplikacja jest obecnie zainstalowana."
 
-#: Zotlabs/Module/Suggestions.php:44
+#: Code/Module/Suggestions.php:44
 msgid ""
 "This app (when installed) displays a small number of friend suggestions on "
 "selected pages or you can run the app to display a full list of channel "
@@ -9619,25 +9619,25 @@ msgstr ""
 "propozycji znajomości na wybranych stronach lub możesz uruchomić tą "
 "aplikację, aby wyświetlić pełną listę proponowanych kanałów."
 
-#: Zotlabs/Module/Fedi_id.php:25
+#: Code/Module/Fedi_id.php:25
 msgid "You are already connected with this channel."
 msgstr "Już masz łączność z tym kanałem."
 
-#: Zotlabs/Module/Fedi_id.php:37
+#: Code/Module/Fedi_id.php:37
 msgid "Unknown or unreachable identifier"
 msgstr "Nieznany lub nieosiągalny identyfikator"
 
-#: Zotlabs/Module/Fedi_id.php:48
+#: Code/Module/Fedi_id.php:48
 msgid "Home instance"
 msgstr "Instancja domowa"
 
-#: Zotlabs/Module/Fedi_id.php:49
+#: Code/Module/Fedi_id.php:49
 msgid "Enter your channel address or fediverse ID (e.g. channel@example.com)"
 msgstr ""
 "Wpisz adres swojego kanału lub identyfikator Fediverse (np. kanał@example."
 "com)"
 
-#: Zotlabs/Module/Fedi_id.php:49
+#: Code/Module/Fedi_id.php:49
 msgid ""
 "If you do not have a fediverse ID, please use your browser 'back' button to "
 "return to the previous page"
@@ -9645,7 +9645,7 @@ msgstr ""
 "Jeśli nie masz identyfikatora Fediverse, to aby powrócić do poprzedniej "
 "strony użyj w przeglądarce przycisku \"Wstecz\""
 
-#: Zotlabs/Module/Clients.php:16
+#: Code/Module/Clients.php:16
 msgid ""
 "This app allows you to authorize mobile apps using OAuth and OpenID to "
 "access your channel."
@@ -9653,7 +9653,7 @@ msgstr ""
 "Ta aplikacja umożliwia autoryzowanie aplikacji mobilnych przy użyciu OAuth i "
 "OpenID w celu uzyskania dostępu do Twojego kanału."
 
-#: Zotlabs/Module/Secrets.php:15
+#: Code/Module/Secrets.php:15
 msgid ""
 "This app allows you to protect messages with a secret passphrase. This only "
 "works across selected platforms."
@@ -9661,7 +9661,7 @@ msgstr ""
 "Ta aplikacja pozwala chronić wiadomości za pomocą tajnego hasła. Działa to "
 "tylko na wybranych platformach."
 
-#: Zotlabs/Module/Secrets.php:23
+#: Code/Module/Secrets.php:23
 msgid ""
 "This app is installed. A button to encrypt content may be found in the post "
 "editor."
@@ -9669,19 +9669,19 @@ msgstr ""
 "Ta aplikacja jest zainstalowana. Przycisk do szyfrowania treści można "
 "znaleźć w edytorze wpisów."
 
-#: Zotlabs/Module/Tagadelic.php:31
+#: Code/Module/Tagadelic.php:31
 msgid "This app displays a hashtag cloud on your channel homepage."
 msgstr ""
 "Ta aplikacja wyświetla chmurę hasztagów na stronie głównej Twojego kanału."
 
-#: Zotlabs/Module/Tagadelic.php:39
+#: Code/Module/Tagadelic.php:39
 msgid ""
 "This app is installed. It displays a hashtag cloud on your channel homepage."
 msgstr ""
 "Ta aplikacja jest zainstalowana. Wyświetla chmurę hasztagów na stronie "
 "głównej Twojego kanału."
 
-#: Zotlabs/Module/Vlists.php:16
+#: Code/Module/Vlists.php:16
 msgid ""
 "This app creates dynamic access lists corresponding to [1] all connections, "
 "[2] all ActivityPub protocol connections, and [3] all Nomad or Zot/6 "
@@ -9693,15 +9693,15 @@ msgstr ""
 "połączeniom protokołu Nomad lub Zot/6. Te dodatkowe opcje można znaleźć w "
 "narzędziu do ustawiania uprawnień."
 
-#: Zotlabs/Module/Vlists.php:23
+#: Code/Module/Vlists.php:23
 msgid "This app is installed. "
 msgstr "Ta aplikacja jest zainstalowana. "
 
-#: Zotlabs/Module/Content_filter.php:26
+#: Code/Module/Content_filter.php:26
 msgid "Content Filter settings updated."
 msgstr "Zaktualizowano ustawienia filtra treści."
 
-#: Zotlabs/Module/Content_filter.php:36
+#: Code/Module/Content_filter.php:36
 msgid ""
 "This app (when installed) allows you to filter incoming content from all "
 "sources or from specific connections. The filtering may be based on words, "
@@ -9712,7 +9712,7 @@ msgstr ""
 "może opierać się na słowach, tagach, wyrażeniach regularnych lub języku "
 "treści"
 
-#: Zotlabs/Module/Content_filter.php:44
+#: Code/Module/Content_filter.php:44
 msgid ""
 "The settings on this page apply to all incoming content. To edit the "
 "settings for individual connetions, see the similar settings on the "
@@ -9722,7 +9722,7 @@ msgstr ""
 "edytować ustawienia dla poszczególnych połączeń, zobacz podobne ustawienia "
 "na stronie Edycja połączenia dla tego połączenia."
 
-#: Zotlabs/Module/Content_filter.php:53 Zotlabs/Module/Content_filter.php:61
+#: Code/Module/Content_filter.php:53 Code/Module/Content_filter.php:61
 msgid ""
 "words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - "
 "leave blank to import all posts"
@@ -9730,587 +9730,587 @@ msgstr ""
 "każde słowo na jedną linię lub #tagis, $kategorie, /wyrażenia regularne/, "
 "lang=xx, lang!=xx - pozostaw puste, aby zaimportować wszystkie wpisy"
 
-#: Zotlabs/Module/Content_filter.php:66
+#: Code/Module/Content_filter.php:66
 msgid "Content Filter Settings"
 msgstr "Ustawienia filtra treści"
 
-#: Zotlabs/Module/Superblock.php:36
+#: Code/Module/Superblock.php:36
 msgid "Blocking this site is not permitted."
 msgstr "Blokowanie tego portalu jest niedozwolone."
 
-#: Zotlabs/Module/Superblock.php:93
+#: Code/Module/Superblock.php:93
 msgid "Added by Superblock"
 msgstr "Dodane przez Superblock"
 
-#: Zotlabs/Module/Superblock.php:199
+#: Code/Module/Superblock.php:199
 msgid "superblock settings updated"
 msgstr "zaktualizowano ustawienia superbloku"
 
-#: Zotlabs/Module/Superblock.php:230
+#: Code/Module/Superblock.php:230
 msgid "Blocked channels"
 msgstr "Zablokowane kanały"
 
-#: Zotlabs/Module/Superblock.php:232
+#: Code/Module/Superblock.php:232
 msgid "No channels currently blocked"
 msgstr "Obecnie nie ma zablokowanych kanałów"
 
-#: Zotlabs/Module/Superblock.php:247
+#: Code/Module/Superblock.php:247
 msgid "Blocked servers"
 msgstr "Zablokowane serwery"
 
-#: Zotlabs/Module/Superblock.php:249
+#: Code/Module/Superblock.php:249
 msgid "No servers currently blocked"
 msgstr "Brak obecnie zablokowanych serwerów"
 
-#: Zotlabs/Module/Superblock.php:255 Zotlabs/Widget/Settings_menu.php:64
+#: Code/Module/Superblock.php:255 Code/Widget/Settings_menu.php:64
 msgid "Manage Blocks"
 msgstr "Zarządzaj blokadami"
 
-#: Zotlabs/Module/Categories.php:31
+#: Code/Module/Categories.php:31
 msgid "This app allows you to add categories to posts and events."
 msgstr "Ta aplikacja umożliwia dodawanie kategorii do wpisów i wydarzeń."
 
-#: Zotlabs/Module/Xchan.php:13
+#: Code/Module/Xchan.php:13
 msgid "Xchan Lookup"
 msgstr "Wyszukiwanie xchan"
 
-#: Zotlabs/Module/Xchan.php:16
+#: Code/Module/Xchan.php:16
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Wyszukaj xchan (lub webbie) zaczynając od: "
 
-#: Zotlabs/Module/Zotfinger.php:26
+#: Code/Module/Zotfinger.php:26
 msgid "Zotfinger Diagnostic"
 msgstr "Diagnostyka Zotfinger"
 
-#: Zotlabs/Module/Zotfinger.php:27
+#: Code/Module/Zotfinger.php:27
 msgid "Lookup URL"
 msgstr "Wyszukaj adres URL"
 
-#: Zotlabs/Module/Viewconnections.php:66
+#: Code/Module/Viewconnections.php:66
 msgid "No connections."
 msgstr "Brak połączeń."
 
-#: Zotlabs/Module/Viewconnections.php:83
+#: Code/Module/Viewconnections.php:83
 #, php-format
 msgid "Visit %1$s's profile [%2$s]"
 msgstr "Odwiedź profil %1$s [%2$s]"
 
-#: Zotlabs/Module/Viewconnections.php:110
+#: Code/Module/Viewconnections.php:110
 msgid "View Connections"
 msgstr "Wyświetl połączenia"
 
-#: Zotlabs/Storage/Browser.php:120 Zotlabs/Storage/Browser.php:317
+#: Code/Storage/Browser.php:120 Code/Storage/Browser.php:317
 msgid "parent"
 msgstr "nadrzędny"
 
-#: Zotlabs/Storage/Browser.php:151
+#: Code/Storage/Browser.php:151
 msgid "Principal"
 msgstr "Pryncypał"
 
-#: Zotlabs/Storage/Browser.php:154
+#: Code/Storage/Browser.php:154
 msgid "Addressbook"
 msgstr "Książka adresowa"
 
-#: Zotlabs/Storage/Browser.php:160
+#: Code/Storage/Browser.php:160
 msgid "Schedule Inbox"
 msgstr "Skrzynka odbiorcza rozkładu"
 
-#: Zotlabs/Storage/Browser.php:163
+#: Code/Storage/Browser.php:163
 msgid "Schedule Outbox"
 msgstr "Skrzynka nadawcza rozkładu"
 
-#: Zotlabs/Storage/Browser.php:299
+#: Code/Storage/Browser.php:299
 msgid "Total"
 msgstr "Ogółem"
 
-#: Zotlabs/Storage/Browser.php:301
+#: Code/Storage/Browser.php:301
 msgid "Shared"
 msgstr "Udostępnione"
 
-#: Zotlabs/Storage/Browser.php:303
+#: Code/Storage/Browser.php:303
 msgid "Add Files"
 msgstr "Dodaj pliki"
 
-#: Zotlabs/Storage/Browser.php:310
+#: Code/Storage/Browser.php:310
 msgid "View photos"
 msgstr "Wyświetl zdjęcia"
 
-#: Zotlabs/Storage/Browser.php:314
+#: Code/Storage/Browser.php:314
 msgid "Type"
 msgstr "Typ"
 
-#: Zotlabs/Storage/Browser.php:392
+#: Code/Storage/Browser.php:392
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Używasz %1$s dostępnego miejsca na pliki."
 
-#: Zotlabs/Storage/Browser.php:396
+#: Code/Storage/Browser.php:396
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "Używasz %1$s z %2$s dostępnego miejsca na pliki. (%3$s %)"
 
-#: Zotlabs/Storage/Browser.php:407
+#: Code/Storage/Browser.php:407
 msgid "WARNING:"
 msgstr "OSTRZEŻENIE:"
 
-#: Zotlabs/Storage/Browser.php:419
+#: Code/Storage/Browser.php:419
 msgid "Create new folder"
 msgstr "Utwórz nowy folder"
 
-#: Zotlabs/Storage/Browser.php:421
+#: Code/Storage/Browser.php:421
 msgid "Upload file"
 msgstr "Prześlij plik"
 
-#: Zotlabs/Storage/Browser.php:434
+#: Code/Storage/Browser.php:434
 msgid "Drop files here to immediately upload"
 msgstr "Upuść pliki tutaj, aby natychmiast przesłać"
 
-#: Zotlabs/Update/_1239.php:25
+#: Code/Update/_1239.php:25
 msgid "Added by superblock"
 msgstr "Dodane przez superblock"
 
-#: Zotlabs/Widget/Rating.php:58
+#: Code/Widget/Rating.php:58
 msgid "Rating Tools"
 msgstr "Narzędzia oceny"
 
-#: Zotlabs/Widget/Rating.php:62 Zotlabs/Widget/Rating.php:64
+#: Code/Widget/Rating.php:62 Code/Widget/Rating.php:64
 msgid "Rate Me"
 msgstr "Oceń mnie"
 
-#: Zotlabs/Widget/Rating.php:68
+#: Code/Widget/Rating.php:68
 msgid "View Ratings"
 msgstr "Zobacz oceny"
 
-#: Zotlabs/Widget/Savedsearch.php:86
+#: Code/Widget/Savedsearch.php:86
 msgid "Remove term"
 msgstr "Usuń termin"
 
-#: Zotlabs/Widget/Activity_filter.php:36
+#: Code/Widget/Activity_filter.php:36
 msgid "Direct Messages"
 msgstr "Bezpośrednie wiadomości"
 
-#: Zotlabs/Widget/Activity_filter.php:40
+#: Code/Widget/Activity_filter.php:40
 msgid "Show direct (private) messages"
 msgstr "Pokaż bezpośrednie (prywatne) wiadomości"
 
-#: Zotlabs/Widget/Activity_filter.php:50
+#: Code/Widget/Activity_filter.php:50
 msgid "Personal Posts"
 msgstr "Osobiste wpisy"
 
-#: Zotlabs/Widget/Activity_filter.php:54
+#: Code/Widget/Activity_filter.php:54
 msgid "Show posts that mention or involve me"
 msgstr "Pokaż wpisy, które wspominają o mnie lub mnie dotyczą"
 
-#: Zotlabs/Widget/Activity_filter.php:63
+#: Code/Widget/Activity_filter.php:63
 msgid "Saved Posts"
 msgstr "Zapisane wpisy"
 
-#: Zotlabs/Widget/Activity_filter.php:67
+#: Code/Widget/Activity_filter.php:67
 msgid "Show posts that I have saved"
 msgstr "Pokaż wpisy, które zapisałem"
 
-#: Zotlabs/Widget/Activity_filter.php:81
+#: Code/Widget/Activity_filter.php:81
 msgid "Show drafts that I have saved"
 msgstr "Pokaż szkice, które zapisałem"
 
-#: Zotlabs/Widget/Activity_filter.php:91
+#: Code/Widget/Activity_filter.php:91
 msgid "Videos"
 msgstr "Filmy wideo"
 
-#: Zotlabs/Widget/Activity_filter.php:95
+#: Code/Widget/Activity_filter.php:95
 msgid "Show posts that include videos"
 msgstr "Pokaż wpisy zawierające wideo"
 
-#: Zotlabs/Widget/Activity_filter.php:109
+#: Code/Widget/Activity_filter.php:109
 msgid "Show posts that include events"
 msgstr "Pokaż wpisy zawierające wydarzenia"
 
-#: Zotlabs/Widget/Activity_filter.php:113
+#: Code/Widget/Activity_filter.php:113
 msgid "Polls"
 msgstr "Ankiety"
 
-#: Zotlabs/Widget/Activity_filter.php:117
+#: Code/Widget/Activity_filter.php:117
 msgid "Show posts that include polls"
 msgstr "Pokaż wpisy zawierające ankiety"
 
-#: Zotlabs/Widget/Activity_filter.php:138
-#: Zotlabs/Widget/Activity_filter.php:168
+#: Code/Widget/Activity_filter.php:138
+#: Code/Widget/Activity_filter.php:168
 #, php-format
 msgid "Show posts related to the %s access list"
 msgstr "Pokaż wpisy związane z grupą prywatności %s"
 
-#: Zotlabs/Widget/Activity_filter.php:178
+#: Code/Widget/Activity_filter.php:178
 msgid "Show my access lists"
 msgstr "Pokaż moje listy dostępu"
 
-#: Zotlabs/Widget/Activity_filter.php:196
+#: Code/Widget/Activity_filter.php:196
 msgid "Show posts to this group"
 msgstr "Pokaż wpiy w tej grupie"
 
-#: Zotlabs/Widget/Activity_filter.php:198
+#: Code/Widget/Activity_filter.php:198
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: Zotlabs/Widget/Activity_filter.php:205 Zotlabs/Widget/Notifications.php:108
-#: Zotlabs/Widget/Notifications.php:109 Zotlabs/Widget/Groups.php:114
+#: Code/Widget/Activity_filter.php:205 Code/Widget/Notifications.php:108
+#: Code/Widget/Notifications.php:109 Code/Widget/Groups.php:114
 msgid "Groups"
 msgstr "Grupy"
 
-#: Zotlabs/Widget/Activity_filter.php:209
+#: Code/Widget/Activity_filter.php:209
 msgid "Show groups"
 msgstr "Pokaż grupy"
 
-#: Zotlabs/Widget/Activity_filter.php:232
+#: Code/Widget/Activity_filter.php:232
 #, php-format
 msgid "Show posts that I have filed to %s"
 msgstr "Pokaż wpisy przesłane przeze mnie do %s"
 
-#: Zotlabs/Widget/Activity_filter.php:238 Zotlabs/Widget/Filer.php:34
+#: Code/Widget/Activity_filter.php:238 Code/Widget/Filer.php:34
 #: include/features.php:500
 msgid "Saved Folders"
 msgstr "Zapisane foldery"
 
-#: Zotlabs/Widget/Activity_filter.php:242
+#: Code/Widget/Activity_filter.php:242
 msgid "Show filed post categories"
 msgstr "Pokaż wprowadzone kategorie wpisów"
 
-#: Zotlabs/Widget/Activity_filter.php:262
+#: Code/Widget/Activity_filter.php:262
 #, php-format
 msgid "Show posts with hashtag %s"
 msgstr "Pokaż wpisy z hasztagiem %s"
 
-#: Zotlabs/Widget/Activity_filter.php:268
+#: Code/Widget/Activity_filter.php:268
 msgid "Followed Hashtags"
 msgstr "Obserwowane hasztagi"
 
-#: Zotlabs/Widget/Activity_filter.php:272
+#: Code/Widget/Activity_filter.php:272
 msgid "Show followed hashtags"
 msgstr "Pokaż obserwowane hasztagi"
 
-#: Zotlabs/Widget/Activity_filter.php:308
+#: Code/Widget/Activity_filter.php:308
 msgid "Remove active filter"
 msgstr "Usuń aktywny filtr"
 
-#: Zotlabs/Widget/Activity_filter.php:324
+#: Code/Widget/Activity_filter.php:324
 msgid "Stream Filters"
 msgstr "Filtry strumienia"
 
-#: Zotlabs/Widget/Activity.php:58
+#: Code/Widget/Activity.php:58
 msgctxt "widget"
 msgid "Activity"
 msgstr "Aktywność"
 
-#: Zotlabs/Widget/Follow.php:29
+#: Code/Widget/Follow.php:29
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr "Masz %1$.0f z %2$.0f dozwolonych połączeń."
 
-#: Zotlabs/Widget/Follow.php:35
+#: Code/Widget/Follow.php:35
 msgid "Add New Connection"
 msgstr "Dodaj nowe połączenie"
 
-#: Zotlabs/Widget/Follow.php:36
+#: Code/Widget/Follow.php:36
 msgid "Enter channel address"
 msgstr "Wprowadź adres kanału"
 
-#: Zotlabs/Widget/Follow.php:37 Zotlabs/Widget/Sblock.php:20
+#: Code/Widget/Follow.php:37 Code/Widget/Sblock.php:20
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr "Przykład: bob@example.com, https://example.com/barbara"
 
-#: Zotlabs/Widget/Appcategories.php:52 Zotlabs/Widget/Filer.php:37
-#: Zotlabs/Widget/Categories.php:88 Zotlabs/Widget/Categories.php:136
-#: Zotlabs/Widget/Categories.php:187
+#: Code/Widget/Appcategories.php:52 Code/Widget/Filer.php:37
+#: Code/Widget/Categories.php:88 Code/Widget/Categories.php:136
+#: Code/Widget/Categories.php:187
 msgid "Everything"
 msgstr "Wszystko"
 
-#: Zotlabs/Widget/Mailmenu.php:16
+#: Code/Widget/Mailmenu.php:16
 msgid "Private Mail Menu"
 msgstr "Menu prywatnej poczty"
 
-#: Zotlabs/Widget/Mailmenu.php:18
+#: Code/Widget/Mailmenu.php:18
 msgid "Combined View"
 msgstr "Połączony widok"
 
-#: Zotlabs/Widget/Mailmenu.php:23
+#: Code/Widget/Mailmenu.php:23
 msgid "Inbox"
 msgstr "Skrzynka odbiorcza"
 
-#: Zotlabs/Widget/Mailmenu.php:28
+#: Code/Widget/Mailmenu.php:28
 msgid "Outbox"
 msgstr "Skrzynka nadawcza"
 
-#: Zotlabs/Widget/Mailmenu.php:33
+#: Code/Widget/Mailmenu.php:33
 msgid "New Message"
 msgstr "Nowy komunikat"
 
-#: Zotlabs/Widget/Newmember.php:32
+#: Code/Widget/Newmember.php:32
 msgid "Profile Creation"
 msgstr "Tworzenie profilu"
 
-#: Zotlabs/Widget/Newmember.php:34
+#: Code/Widget/Newmember.php:34
 msgid "Upload profile photo"
 msgstr "Prześlij zdjęcie profilowe"
 
-#: Zotlabs/Widget/Newmember.php:35
+#: Code/Widget/Newmember.php:35
 msgid "Upload cover photo"
 msgstr "Prześlij zdjęcie okładkowe"
 
-#: Zotlabs/Widget/Newmember.php:36 include/nav.php:122
+#: Code/Widget/Newmember.php:36 include/nav.php:122
 msgid "Edit your profile"
 msgstr "Edytuj swój profil"
 
-#: Zotlabs/Widget/Newmember.php:39
+#: Code/Widget/Newmember.php:39
 msgid "Find and Connect with others"
 msgstr "Znajdź i połącz się z innymi"
 
-#: Zotlabs/Widget/Newmember.php:41
+#: Code/Widget/Newmember.php:41
 msgid "View the directory"
 msgstr "Pokaż katalog"
 
-#: Zotlabs/Widget/Newmember.php:42
+#: Code/Widget/Newmember.php:42
 msgid "View friend suggestions"
 msgstr "Zobacz propozycje znajomości"
 
-#: Zotlabs/Widget/Newmember.php:43
+#: Code/Widget/Newmember.php:43
 msgid "Manage your connections"
 msgstr "Zarządzaj swoimi połączeniami"
 
-#: Zotlabs/Widget/Newmember.php:46
+#: Code/Widget/Newmember.php:46
 msgid "Communicate"
 msgstr "Komunikuj się"
 
-#: Zotlabs/Widget/Newmember.php:48
+#: Code/Widget/Newmember.php:48
 msgid "View your channel homepage"
 msgstr "Wyświetl stronę główną swojego kanału"
 
-#: Zotlabs/Widget/Newmember.php:49
+#: Code/Widget/Newmember.php:49
 msgid "View your stream"
 msgstr "Wyświetl swój strumień"
 
-#: Zotlabs/Widget/Newmember.php:62
+#: Code/Widget/Newmember.php:62
 msgid "View public stream"
 msgstr "Wyświetl strumień publiczny"
 
-#: Zotlabs/Widget/Newmember.php:66 include/features.php:68
+#: Code/Widget/Newmember.php:66 include/features.php:68
 msgid "New Member Links"
 msgstr "Linki dla nowych członków"
 
-#: Zotlabs/Widget/Notifications.php:20
+#: Code/Widget/Notifications.php:20
 msgid "New Stream Activity"
 msgstr "Nowa aktywność w strumieniu"
 
-#: Zotlabs/Widget/Notifications.php:21
+#: Code/Widget/Notifications.php:21
 msgid "New Stream Activity Notifications"
 msgstr "Powiadomienia o nowej aktywności w strumieniu"
 
-#: Zotlabs/Widget/Notifications.php:24
+#: Code/Widget/Notifications.php:24
 msgid "View your stream activity"
 msgstr "Wyświetl swoją aktywność w strumieniu"
 
-#: Zotlabs/Widget/Notifications.php:27
+#: Code/Widget/Notifications.php:27
 msgid "Mark all notifications read"
 msgstr "Oznacz wszystkie powiadomienia jako przeczytane"
 
-#: Zotlabs/Widget/Notifications.php:30 Zotlabs/Widget/Notifications.php:49
-#: Zotlabs/Widget/Notifications.php:141
+#: Code/Widget/Notifications.php:30 Code/Widget/Notifications.php:49
+#: Code/Widget/Notifications.php:141
 msgid "Show new posts only"
 msgstr "Pokaż tylko nowe wpisy"
 
-#: Zotlabs/Widget/Notifications.php:31 Zotlabs/Widget/Notifications.php:50
-#: Zotlabs/Widget/Notifications.php:111 Zotlabs/Widget/Notifications.php:142
+#: Code/Widget/Notifications.php:31 Code/Widget/Notifications.php:50
+#: Code/Widget/Notifications.php:111 Code/Widget/Notifications.php:142
 msgid "Filter by name"
 msgstr "Filtruj wg nazwy"
 
-#: Zotlabs/Widget/Notifications.php:39
+#: Code/Widget/Notifications.php:39
 msgid "New Home Activity"
 msgstr "Nowa aktywność domowa"
 
-#: Zotlabs/Widget/Notifications.php:40
+#: Code/Widget/Notifications.php:40
 msgid "New Home Activity Notifications"
 msgstr "Powiadomienia o nowej aktywności domowej"
 
-#: Zotlabs/Widget/Notifications.php:43
+#: Code/Widget/Notifications.php:43
 msgid "View your home activity"
 msgstr "Wyświetl swoją aktywność domową"
 
-#: Zotlabs/Widget/Notifications.php:46 Zotlabs/Widget/Notifications.php:138
+#: Code/Widget/Notifications.php:46 Code/Widget/Notifications.php:138
 msgid "Mark all notifications seen"
 msgstr "Oznacz wszystkie powiadomienia jako oglądnięte"
 
-#: Zotlabs/Widget/Notifications.php:58
+#: Code/Widget/Notifications.php:58
 msgid "New Events"
 msgstr "Nowe wydarzenia"
 
-#: Zotlabs/Widget/Notifications.php:59
+#: Code/Widget/Notifications.php:59
 msgid "New Events Notifications"
 msgstr "Powiadomienia o nowych wydarzeniach"
 
-#: Zotlabs/Widget/Notifications.php:62
+#: Code/Widget/Notifications.php:62
 msgid "View events"
 msgstr "Pokaż wydarzenia"
 
-#: Zotlabs/Widget/Notifications.php:65
+#: Code/Widget/Notifications.php:65
 msgid "Mark all events seen"
 msgstr "Oznacza wydarzenia jako oglądnięte"
 
-#: Zotlabs/Widget/Notifications.php:74
+#: Code/Widget/Notifications.php:74
 msgid "New Connections Notifications"
 msgstr "Powiadomienia o nowych połączeniach"
 
-#: Zotlabs/Widget/Notifications.php:77
+#: Code/Widget/Notifications.php:77
 msgid "View all connections"
 msgstr "Pokaż wszystkie połączenia"
 
-#: Zotlabs/Widget/Notifications.php:85
+#: Code/Widget/Notifications.php:85
 msgid "New Files"
 msgstr "Nowe pliki"
 
-#: Zotlabs/Widget/Notifications.php:86
+#: Code/Widget/Notifications.php:86
 msgid "New Files Notifications"
 msgstr "Powiadomienia o nowych plikach"
 
-#: Zotlabs/Widget/Notifications.php:93 Zotlabs/Widget/Notifications.php:94
+#: Code/Widget/Notifications.php:93 Code/Widget/Notifications.php:94
 msgid "Notices"
 msgstr "Powiadomienia"
 
-#: Zotlabs/Widget/Notifications.php:97
+#: Code/Widget/Notifications.php:97
 msgid "View all notices"
 msgstr "Pokaż wszystkie powiadomienia"
 
-#: Zotlabs/Widget/Notifications.php:100
+#: Code/Widget/Notifications.php:100
 msgid "Mark all notices seen"
 msgstr "Oznacz wszystkie powiadomienia jako oglądnięte"
 
-#: Zotlabs/Widget/Notifications.php:121
+#: Code/Widget/Notifications.php:121
 msgid "New Registrations"
 msgstr "Nowe rejestracje"
 
-#: Zotlabs/Widget/Notifications.php:122
+#: Code/Widget/Notifications.php:122
 msgid "New Registrations Notifications"
 msgstr "Powiadomienia o nowych rejestracjach"
 
-#: Zotlabs/Widget/Notifications.php:132
+#: Code/Widget/Notifications.php:132
 msgid "Public Stream Notifications"
 msgstr "Powiadomienia o strumieniu publicznym"
 
-#: Zotlabs/Widget/Notifications.php:135
+#: Code/Widget/Notifications.php:135
 msgid "View the public stream"
 msgstr "Pokaż strumień publiczny"
 
-#: Zotlabs/Widget/Notifications.php:150
+#: Code/Widget/Notifications.php:150
 msgid "Sorry, you have got no notifications at the moment"
 msgstr "W tej chwili nie masz żadnych powiadomień"
 
-#: Zotlabs/Widget/Sblock.php:18
+#: Code/Widget/Sblock.php:18
 msgid "Block channel or site"
 msgstr "Blokuj kanał lub portal"
 
-#: Zotlabs/Widget/Sblock.php:19
+#: Code/Widget/Sblock.php:19
 msgid "Enter channel address or URL"
 msgstr "Wprowadź adres kanału lub URL"
 
-#: Zotlabs/Widget/Stream_order.php:104
+#: Code/Widget/Stream_order.php:104
 msgid "Commented Date"
 msgstr "Data skomentowania"
 
-#: Zotlabs/Widget/Stream_order.php:108
+#: Code/Widget/Stream_order.php:108
 msgid "Order by last commented date"
 msgstr "Kolejność wg ostatniej daty skomentowania"
 
-#: Zotlabs/Widget/Stream_order.php:111
+#: Code/Widget/Stream_order.php:111
 msgid "Posted Date"
 msgstr "Data opublikowania"
 
-#: Zotlabs/Widget/Stream_order.php:115
+#: Code/Widget/Stream_order.php:115
 msgid "Order by last posted date"
 msgstr "Kolejność wg ostatnie daty wpisu"
 
-#: Zotlabs/Widget/Stream_order.php:118
+#: Code/Widget/Stream_order.php:118
 msgid "Date Unthreaded"
 msgstr "Data wpisu bezwątkowego"
 
-#: Zotlabs/Widget/Stream_order.php:122
+#: Code/Widget/Stream_order.php:122
 msgid "Order unthreaded by date"
 msgstr "Kolejność wpisów bezwątkowych według daty"
 
-#: Zotlabs/Widget/Suggestions.php:52
+#: Code/Widget/Suggestions.php:52
 msgid "Ignore/Hide"
 msgstr "Ignoruj/Ukryj"
 
-#: Zotlabs/Widget/Suggestions.php:57
+#: Code/Widget/Suggestions.php:57
 msgid "Suggestions"
 msgstr "Propozycje"
 
-#: Zotlabs/Widget/Suggestions.php:58
+#: Code/Widget/Suggestions.php:58
 msgid "See more..."
 msgstr "Zobacz więcej..."
 
-#: Zotlabs/Widget/Admin.php:29 Zotlabs/Widget/Admin.php:66
+#: Code/Widget/Admin.php:29 Code/Widget/Admin.php:66
 msgid "Member registrations waiting for confirmation"
 msgstr "Rejestracja członków czeka na potwierdzenie"
 
-#: Zotlabs/Widget/Admin.php:35
+#: Code/Widget/Admin.php:35
 msgid "Inspect queue"
 msgstr "Sprawdź kolejkę"
 
-#: Zotlabs/Widget/Admin.php:37
+#: Code/Widget/Admin.php:37
 msgid "DB updates"
 msgstr "Aktualizacje bazy danych"
 
-#: Zotlabs/Widget/Admin.php:61 include/nav.php:190
+#: Code/Widget/Admin.php:61 include/nav.php:190
 msgid "Admin"
 msgstr "Admin"
 
-#: Zotlabs/Widget/Admin.php:62
+#: Code/Widget/Admin.php:62
 msgid "Addon Features"
 msgstr "Dodatkowe możliwości"
 
-#: Zotlabs/Widget/Appstore.php:12
+#: Code/Widget/Appstore.php:12
 msgid "App Collections"
 msgstr "Kolekcje aplikacji"
 
-#: Zotlabs/Widget/Archive.php:49
+#: Code/Widget/Archive.php:49
 msgid "Archives"
 msgstr "Archiwa"
 
-#: Zotlabs/Widget/Bookmarkedchats.php:31
+#: Code/Widget/Bookmarkedchats.php:31
 msgid "Bookmarked Chatrooms"
 msgstr "Czaty z zakładkami"
 
-#: Zotlabs/Widget/Chatroom_list.php:26
+#: Code/Widget/Chatroom_list.php:26
 msgid "Overview"
 msgstr "Przegląd"
 
-#: Zotlabs/Widget/Chatroom_members.php:13
+#: Code/Widget/Chatroom_members.php:13
 msgid "Chat Members"
 msgstr "Członkowie czatu"
 
-#: Zotlabs/Widget/Common_friends.php:47
+#: Code/Widget/Common_friends.php:47
 msgid "Common Connections"
 msgstr "Popularne połączenia"
 
-#: Zotlabs/Widget/Common_friends.php:52
+#: Code/Widget/Common_friends.php:52
 #, php-format
 msgid "View all %d common connections"
 msgstr "Wyświetl wszystkie %d popularne połączenia"
 
-#: Zotlabs/Widget/Cover_photo.php:95
+#: Code/Widget/Cover_photo.php:95
 msgid "Click to show more"
 msgstr "Kliknij, aby pokazać więcej"
 
-#: Zotlabs/Widget/Eventstools.php:16
+#: Code/Widget/Eventstools.php:16
 msgid "Events Tools"
 msgstr "Narzędzia wydarzeń"
 
-#: Zotlabs/Widget/Eventstools.php:17
+#: Code/Widget/Eventstools.php:17
 msgid "Export Calendar"
 msgstr "Eksport kalendarza"
 
-#: Zotlabs/Widget/Eventstools.php:18
+#: Code/Widget/Eventstools.php:18
 msgid "Import Calendar"
 msgstr "Import kalendarza"
 
-#: Zotlabs/Widget/Findpeople.php:21
+#: Code/Widget/Findpeople.php:21
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
@@ -10318,164 +10318,164 @@ msgstr[0] "%d dostępne zaproszenie"
 msgstr[1] "%d dostępne zaproszenia"
 msgstr[2] "%d dostępnych zaproszeń"
 
-#: Zotlabs/Widget/Findpeople.php:29
+#: Code/Widget/Findpeople.php:29
 msgid "Find Channels"
 msgstr "Znajdź kanały"
 
-#: Zotlabs/Widget/Findpeople.php:30
+#: Code/Widget/Findpeople.php:30
 msgid "Enter name or interest"
 msgstr "Wpisz nazwę lub zainteresowanie"
 
-#: Zotlabs/Widget/Findpeople.php:31
+#: Code/Widget/Findpeople.php:31
 msgid "Connect/Follow"
 msgstr "Połącz/Obserwuj"
 
-#: Zotlabs/Widget/Findpeople.php:32
+#: Code/Widget/Findpeople.php:32
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Przykłady: Robert Morgenstein, łowienie ryb"
 
-#: Zotlabs/Widget/Findpeople.php:37
+#: Code/Widget/Findpeople.php:37
 msgid "Affiliated sites"
 msgstr "Powiązane witryny internetowe"
 
-#: Zotlabs/Widget/Findpeople.php:40
+#: Code/Widget/Findpeople.php:40
 msgid "Advanced example: name=fred and country=iceland"
 msgstr "Zaawansowany przykład: imię=fred i kraj=poland"
 
-#: Zotlabs/Widget/Photo_rand.php:72 Zotlabs/Widget/Photo.php:55
+#: Code/Widget/Photo_rand.php:72 Code/Widget/Photo.php:55
 msgid "photo/image"
 msgstr "zdjęcie/obraz"
 
-#: Zotlabs/Widget/Settings_menu.php:44
+#: Code/Widget/Settings_menu.php:44
 msgid "Account settings"
 msgstr "Ustawienia konta"
 
-#: Zotlabs/Widget/Settings_menu.php:50
+#: Code/Widget/Settings_menu.php:50
 msgid "Channel settings"
 msgstr "Ustawienia kanału"
 
-#: Zotlabs/Widget/Settings_menu.php:58
+#: Code/Widget/Settings_menu.php:58
 msgid "Display settings"
 msgstr "Ustawienia wyświetlania"
 
-#: Zotlabs/Widget/Settings_menu.php:72
+#: Code/Widget/Settings_menu.php:72
 msgid "Manage locations"
 msgstr "Zarządzaj lokalizacjami"
 
-#: Zotlabs/Widget/Settings_menu.php:79
+#: Code/Widget/Settings_menu.php:79
 msgid "Export channel"
 msgstr "Eksport Kanału"
 
-#: Zotlabs/Widget/Settings_menu.php:94
+#: Code/Widget/Settings_menu.php:94
 msgid "Client apps"
 msgstr "Aplikacje klienckie"
 
-#: Zotlabs/Widget/Site_projects.php:32
+#: Code/Widget/Site_projects.php:32
 msgid "Projects"
 msgstr "Projekty"
 
-#: Zotlabs/Widget/Site_projects.php:34
+#: Code/Widget/Site_projects.php:34
 msgid "All projects"
 msgstr "Wszystkie projekty"
 
-#: Zotlabs/Widget/Suggestedchats.php:38
+#: Code/Widget/Suggestedchats.php:38
 msgid "Suggested Chatrooms"
 msgstr "Sugerowane czaty"
 
-#: Zotlabs/Widget/Tagcloud.php:25 include/taxonomy.php:364
+#: Code/Widget/Tagcloud.php:25 include/taxonomy.php:364
 #: include/taxonomy.php:509 include/taxonomy.php:532
 msgid "Tags"
 msgstr "Tagi"
 
-#: Zotlabs/Widget/Affinity.php:39
+#: Code/Widget/Affinity.php:39
 msgid "Friend zoom in/out"
 msgstr "Powiększ/Pomniejsz znajomego"
 
-#: Zotlabs/Widget/Cdav.php:43
+#: Code/Widget/Cdav.php:43
 msgid "Select Channel"
 msgstr "Wybierz kanał"
 
-#: Zotlabs/Widget/Cdav.php:48
+#: Code/Widget/Cdav.php:48
 msgid "Read-write"
 msgstr "Czytanie i zapis"
 
-#: Zotlabs/Widget/Cdav.php:49
+#: Code/Widget/Cdav.php:49
 msgid "Read-only"
 msgstr "Tylko odczyt"
 
-#: Zotlabs/Widget/Cdav.php:135
+#: Code/Widget/Cdav.php:135
 msgid "Channel Calendar"
 msgstr "Kalendarz kanału"
 
-#: Zotlabs/Widget/Cdav.php:139
+#: Code/Widget/Cdav.php:139
 msgid "Shared CalDAV Calendars"
 msgstr "Udostępnione kalendarze CalDAV"
 
-#: Zotlabs/Widget/Cdav.php:143
+#: Code/Widget/Cdav.php:143
 msgid "Share this calendar"
 msgstr "Udostępnij ten kalendarz"
 
-#: Zotlabs/Widget/Cdav.php:145
+#: Code/Widget/Cdav.php:145
 msgid "Calendar name and color"
 msgstr "Nazwa kalendarza i kolor"
 
-#: Zotlabs/Widget/Cdav.php:147
+#: Code/Widget/Cdav.php:147
 msgid "Create new CalDAV calendar"
 msgstr "Utwórz nowy kalendarz CalDAV"
 
-#: Zotlabs/Widget/Cdav.php:149
+#: Code/Widget/Cdav.php:149
 msgid "Calendar Name"
 msgstr "Nazwa kalendarza"
 
-#: Zotlabs/Widget/Cdav.php:150
+#: Code/Widget/Cdav.php:150
 msgid "Calendar Tools"
 msgstr "Narzędzia kalendarza"
 
-#: Zotlabs/Widget/Cdav.php:152
+#: Code/Widget/Cdav.php:152
 msgid "Import calendar"
 msgstr "Importuj kalendarz"
 
-#: Zotlabs/Widget/Cdav.php:153
+#: Code/Widget/Cdav.php:153
 msgid "Select a calendar to import to"
 msgstr "Wybierz kalendarz do zaimportowania"
 
-#: Zotlabs/Widget/Cdav.php:178
+#: Code/Widget/Cdav.php:178
 msgid "Addressbooks"
 msgstr "Książki adresowe"
 
-#: Zotlabs/Widget/Cdav.php:180
+#: Code/Widget/Cdav.php:180
 msgid "Addressbook name"
 msgstr "Nazwa książki adresowej"
 
-#: Zotlabs/Widget/Cdav.php:182
+#: Code/Widget/Cdav.php:182
 msgid "Create new addressbook"
 msgstr "Utwórz nową książkę adresową"
 
-#: Zotlabs/Widget/Cdav.php:183
+#: Code/Widget/Cdav.php:183
 msgid "Addressbook Name"
 msgstr "Nazwa książki adresowej"
 
-#: Zotlabs/Widget/Cdav.php:185
+#: Code/Widget/Cdav.php:185
 msgid "Addressbook Tools"
 msgstr "Narzędzia książki adresowej"
 
-#: Zotlabs/Widget/Cdav.php:186
+#: Code/Widget/Cdav.php:186
 msgid "Import addressbook"
 msgstr "Importuj książkę adresową"
 
-#: Zotlabs/Widget/Cdav.php:187
+#: Code/Widget/Cdav.php:187
 msgid "Select an addressbook to import to"
 msgstr "Wybierz książkę adresową do zaimportowania"
 
-#: Zotlabs/Widget/Hq_controls.php:18
+#: Code/Widget/Hq_controls.php:18
 msgid "HQ Control Panel"
 msgstr "Panel kontrolny HQ"
 
-#: Zotlabs/Widget/Hq_controls.php:21
+#: Code/Widget/Hq_controls.php:21
 msgid "Create a new post"
 msgstr "Utwórz nowy wpis"
 
-#: Zotlabs/Import/Friendica.php:195 include/channel.php:480
+#: Code/Import/Friendica.php:195 include/channel.php:480
 msgid "Default Profile"
 msgstr "Domyślny profil"
 
diff --git a/view/pl/messages.pot b/view/pl/messages.pot
index 2d4049cc4..bc77edfb5 100644
--- a/view/pl/messages.pot
+++ b/view/pl/messages.pot
@@ -17,121 +17,121 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Zotlabs/Access/PermissionRoles.php:181
+#: Code/Access/PermissionRoles.php:181
 msgid "Social Networking"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:182
+#: Code/Access/PermissionRoles.php:182
 msgid "Social - Normal"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:183
+#: Code/Access/PermissionRoles.php:183
 msgid "Social - Restricted"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:186
+#: Code/Access/PermissionRoles.php:186
 msgid "Community Group"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:187
+#: Code/Access/PermissionRoles.php:187
 msgid "Group - Normal"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:188
+#: Code/Access/PermissionRoles.php:188
 msgid "Group - Restricted"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:189
+#: Code/Access/PermissionRoles.php:189
 msgid "Group - Moderated"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:192 Zotlabs/Module/Directory.php:401
-#: Zotlabs/Module/Manage.php:77 Zotlabs/Module/Manage.php:174
-#: Zotlabs/Storage/Browser.php:148 include/text.php:3274
+#: Code/Access/PermissionRoles.php:192 Code/Module/Directory.php:401
+#: Code/Module/Manage.php:77 Code/Module/Manage.php:174
+#: Code/Storage/Browser.php:148 include/text.php:3274
 msgid "Collection"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:193
+#: Code/Access/PermissionRoles.php:193
 msgid "Collection - Normal"
 msgstr ""
 
-#: Zotlabs/Access/PermissionRoles.php:194
+#: Code/Access/PermissionRoles.php:194
 msgid "Collection - Restricted"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:59
+#: Code/Access/Permissions.php:59
 msgid "Grant viewing access to and delivery of your channel stream and posts"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:60
+#: Code/Access/Permissions.php:60
 msgid "Grant viewing access to your default channel profile"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:61
+#: Code/Access/Permissions.php:61
 msgid "Grant viewing access to your address book (connections)"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:62
+#: Code/Access/Permissions.php:62
 msgid "Grant viewing access to your file storage and photos"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:63
+#: Code/Access/Permissions.php:63
 msgid "Grant permission to post on your channel (wall) page"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:64
+#: Code/Access/Permissions.php:64
 msgid "Accept delivery of direct messages and personal mail"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:65
+#: Code/Access/Permissions.php:65
 msgid "Accept delivery of their posts and all comments to their posts"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:66
+#: Code/Access/Permissions.php:66
 msgid "Accept delivery of their comments and likes on your posts"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:67
+#: Code/Access/Permissions.php:67
 msgid "Grant upload permissions to your file storage and photos"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:68
+#: Code/Access/Permissions.php:68
 msgid "Grant permission to republish/mirror your posts"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:69
+#: Code/Access/Permissions.php:69
 msgid "Accept comments and wall posts only after approval (moderation)"
 msgstr ""
 
-#: Zotlabs/Access/Permissions.php:70
+#: Code/Access/Permissions.php:70
 msgid "Grant channel administration (delegation) permission"
 msgstr ""
 
-#: Zotlabs/Lib/Libzotdir.php:118
+#: Code/Lib/Libzotdir.php:118
 msgid "Directory Options"
 msgstr ""
 
-#: Zotlabs/Lib/Libzotdir.php:120 include/nav.php:107
+#: Code/Lib/Libzotdir.php:120 include/nav.php:107
 msgid "Safe Mode"
 msgstr ""
 
-#: Zotlabs/Lib/Libzotdir.php:120 Zotlabs/Lib/Libzotdir.php:121
-#: Zotlabs/Lib/Libzotdir.php:124 Zotlabs/Lib/Libzotdir.php:125
-#: Zotlabs/Module/Admin/Site.php:287 Zotlabs/Module/Api.php:110
-#: Zotlabs/Module/Connedit.php:345 Zotlabs/Module/Connedit.php:732
-#: Zotlabs/Module/Connedit.php:812 Zotlabs/Module/Defperms.php:192
-#: Zotlabs/Module/Events.php:518 Zotlabs/Module/Events.php:519
-#: Zotlabs/Module/Events.php:544 Zotlabs/Module/Filestorage.php:240
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Module/Mitem.php:188
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:268
-#: Zotlabs/Module/Mitem.php:269 Zotlabs/Module/Menu.php:168
-#: Zotlabs/Module/Menu.php:226 Zotlabs/Module/Profiles.php:724
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:22
-#: Zotlabs/Module/Settings/Channel.php:413
-#: Zotlabs/Module/Settings/Display.php:113 Zotlabs/Module/Sources.php:129
-#: Zotlabs/Module/Sources.php:165 Zotlabs/Module/Photos.php:730
-#: Zotlabs/Module/Import.php:692 Zotlabs/Module/Import.php:696
-#: Zotlabs/Module/Import.php:697 Zotlabs/Storage/Browser.php:435 boot.php:1731
+#: Code/Lib/Libzotdir.php:120 Code/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:124 Code/Lib/Libzotdir.php:125
+#: Code/Module/Admin/Site.php:287 Code/Module/Api.php:110
+#: Code/Module/Connedit.php:345 Code/Module/Connedit.php:732
+#: Code/Module/Connedit.php:812 Code/Module/Defperms.php:192
+#: Code/Module/Events.php:518 Code/Module/Events.php:519
+#: Code/Module/Events.php:544 Code/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:248 Code/Module/Mitem.php:188
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:268
+#: Code/Module/Mitem.php:269 Code/Module/Menu.php:168
+#: Code/Module/Menu.php:226 Code/Module/Profiles.php:724
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:22
+#: Code/Module/Settings/Channel.php:413
+#: Code/Module/Settings/Display.php:113 Code/Module/Sources.php:129
+#: Code/Module/Sources.php:165 Code/Module/Photos.php:730
+#: Code/Module/Import.php:692 Code/Module/Import.php:696
+#: Code/Module/Import.php:697 Code/Storage/Browser.php:435 boot.php:1731
 #: extend/addon/a/zotpost/Mod_zotpost.php:77
 #: extend/addon/a/content_import/Mod_content_import.php:137
 #: extend/addon/a/content_import/Mod_content_import.php:138
@@ -140,23 +140,23 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: Zotlabs/Lib/Libzotdir.php:120 Zotlabs/Lib/Libzotdir.php:121
-#: Zotlabs/Lib/Libzotdir.php:124 Zotlabs/Lib/Libzotdir.php:125
-#: Zotlabs/Module/Admin/Site.php:289 Zotlabs/Module/Api.php:109
-#: Zotlabs/Module/Connedit.php:345 Zotlabs/Module/Connedit.php:732
-#: Zotlabs/Module/Connedit.php:812 Zotlabs/Module/Defperms.php:192
-#: Zotlabs/Module/Events.php:518 Zotlabs/Module/Events.php:519
-#: Zotlabs/Module/Events.php:544 Zotlabs/Module/Filestorage.php:240
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Module/Mitem.php:188
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:268
-#: Zotlabs/Module/Mitem.php:269 Zotlabs/Module/Menu.php:168
-#: Zotlabs/Module/Menu.php:226 Zotlabs/Module/Profiles.php:724
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:22
-#: Zotlabs/Module/Settings/Channel.php:413
-#: Zotlabs/Module/Settings/Display.php:113 Zotlabs/Module/Sources.php:129
-#: Zotlabs/Module/Sources.php:165 Zotlabs/Module/Photos.php:730
-#: Zotlabs/Module/Import.php:692 Zotlabs/Module/Import.php:696
-#: Zotlabs/Module/Import.php:697 Zotlabs/Storage/Browser.php:435 boot.php:1731
+#: Code/Lib/Libzotdir.php:120 Code/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:124 Code/Lib/Libzotdir.php:125
+#: Code/Module/Admin/Site.php:289 Code/Module/Api.php:109
+#: Code/Module/Connedit.php:345 Code/Module/Connedit.php:732
+#: Code/Module/Connedit.php:812 Code/Module/Defperms.php:192
+#: Code/Module/Events.php:518 Code/Module/Events.php:519
+#: Code/Module/Events.php:544 Code/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:248 Code/Module/Mitem.php:188
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:268
+#: Code/Module/Mitem.php:269 Code/Module/Menu.php:168
+#: Code/Module/Menu.php:226 Code/Module/Profiles.php:724
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:22
+#: Code/Module/Settings/Channel.php:413
+#: Code/Module/Settings/Display.php:113 Code/Module/Sources.php:129
+#: Code/Module/Sources.php:165 Code/Module/Photos.php:730
+#: Code/Module/Import.php:692 Code/Module/Import.php:696
+#: Code/Module/Import.php:697 Code/Storage/Browser.php:435 boot.php:1731
 #: extend/addon/a/zotpost/Mod_zotpost.php:77
 #: extend/addon/a/content_import/Mod_content_import.php:137
 #: extend/addon/a/content_import/Mod_content_import.php:138
@@ -165,525 +165,525 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: Zotlabs/Lib/Libzotdir.php:121
+#: Code/Lib/Libzotdir.php:121
 msgid "Groups Only"
 msgstr ""
 
-#: Zotlabs/Lib/Libzotdir.php:124
+#: Code/Lib/Libzotdir.php:124
 msgid "This Website Only"
 msgstr ""
 
-#: Zotlabs/Lib/Libzotdir.php:125
+#: Code/Lib/Libzotdir.php:125
 msgid "Recently Updated"
 msgstr ""
 
-#: Zotlabs/Lib/Markdown.php:219 include/bbcode.php:683
+#: Code/Lib/Markdown.php:219 include/bbcode.php:683
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: Zotlabs/Lib/Markdown.php:221 Zotlabs/Module/Tagger.php:92
+#: Code/Lib/Markdown.php:221 Code/Module/Tagger.php:92
 #: include/conversation.php:161 include/bbcode.php:677 include/text.php:2375
 msgid "post"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:75
+#: Code/Lib/Permcat.php:75
 msgctxt "permcat"
 msgid "default"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:129
+#: Code/Lib/Permcat.php:129
 msgctxt "permcat"
 msgid "follower"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:133
+#: Code/Lib/Permcat.php:133
 msgctxt "permcat"
 msgid "contributor"
 msgstr ""
 
-#: Zotlabs/Lib/Permcat.php:137
+#: Code/Lib/Permcat.php:137
 msgctxt "permcat"
 msgid "publisher"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:339
+#: Code/Lib/Apps.php:339
 msgid "Site Admin"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:340
+#: Code/Lib/Apps.php:340
 msgid "Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:341 include/features.php:144 include/nav.php:491
+#: Code/Lib/Apps.php:341 include/features.php:144 include/nav.php:491
 msgid "Articles"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:342
+#: Code/Lib/Apps.php:342
 msgid "CalDAV"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:343
+#: Code/Lib/Apps.php:343
 msgid "CardDAV"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:344 Zotlabs/Module/Cards.php:212
+#: Code/Lib/Apps.php:344 Code/Module/Cards.php:212
 #: include/conversation.php:2060 include/nav.php:480
 msgid "Cards"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:345 Zotlabs/Storage/Browser.php:157 include/nav.php:442
+#: Code/Lib/Apps.php:345 Code/Storage/Browser.php:157 include/nav.php:442
 #: include/nav.php:445
 msgid "Calendar"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:346 Zotlabs/Module/Cdav.php:1071
-#: Zotlabs/Widget/Appcategories.php:49 Zotlabs/Widget/Categories.php:85
-#: Zotlabs/Widget/Categories.php:133 Zotlabs/Widget/Categories.php:184
+#: Code/Lib/Apps.php:346 Code/Module/Cdav.php:1071
+#: Code/Widget/Appcategories.php:49 Code/Widget/Categories.php:85
+#: Code/Widget/Categories.php:133 Code/Widget/Categories.php:184
 #: include/taxonomy.php:465 include/taxonomy.php:559 include/taxonomy.php:581
 #: include/taxonomy.php:604
 msgid "Categories"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:347
+#: Code/Lib/Apps.php:347
 msgid "Channel Home"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:348
+#: Code/Lib/Apps.php:348
 msgid "Channel Manager"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:349 Zotlabs/Module/Sources.php:112
+#: Code/Lib/Apps.php:349 Code/Module/Sources.php:112
 msgid "Channel Sources"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:350
+#: Code/Lib/Apps.php:350
 msgid "Chat"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:351 Zotlabs/Widget/Chatroom_list.php:22
+#: Code/Lib/Apps.php:351 Code/Widget/Chatroom_list.php:22
 #: include/conversation.php:2034 include/conversation.php:2037
 #: include/nav.php:456 include/nav.php:459
 msgid "Chatrooms"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:352
+#: Code/Lib/Apps.php:352
 msgid "Clients"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:353 include/conversation.php:1443
+#: Code/Lib/Apps.php:353 include/conversation.php:1443
 msgid "Comment Control"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:354 Zotlabs/Module/Connedit.php:674
-#: Zotlabs/Module/Connections.php:368 Zotlabs/Module/Stream.php:135
-#: Zotlabs/Module/Affinity.php:65 Zotlabs/Widget/Activity_filter.php:146
-#: Zotlabs/Widget/Affinity.php:30 include/connections.php:954
+#: Code/Lib/Apps.php:354 Code/Module/Connedit.php:674
+#: Code/Module/Connections.php:368 Code/Module/Stream.php:135
+#: Code/Module/Affinity.php:65 Code/Widget/Activity_filter.php:146
+#: Code/Widget/Affinity.php:30 include/connections.php:954
 msgid "Connections"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:355
+#: Code/Lib/Apps.php:355
 msgid "Content Filter"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:356
+#: Code/Lib/Apps.php:356
 #: extend/addon/a/content_import/Mod_content_import.php:135
 msgid "Content Import"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:357 Zotlabs/Module/Directory.php:472
+#: Code/Lib/Apps.php:357 Code/Module/Directory.php:472
 msgid "Directory"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:358 Zotlabs/Widget/Activity_filter.php:77
+#: Code/Lib/Apps.php:358 Code/Widget/Activity_filter.php:77
 msgid "Drafts"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:359 Zotlabs/Widget/Activity_filter.php:105
+#: Code/Lib/Apps.php:359 Code/Widget/Activity_filter.php:105
 #: include/conversation.php:2020 include/conversation.php:2023
 msgid "Events"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:360
+#: Code/Lib/Apps.php:360
 msgid "Expire Posts"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:361
+#: Code/Lib/Apps.php:361
 msgid "Features"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:362 Zotlabs/Module/Fbrowser.php:93
-#: Zotlabs/Storage/Browser.php:298 include/conversation.php:2009
+#: Code/Lib/Apps.php:362 Code/Module/Fbrowser.php:93
+#: Code/Storage/Browser.php:298 include/conversation.php:2009
 #: include/nav.php:431
 msgid "Files"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:363 extend/addon/a/followlist/Mod_followlist.php:129
+#: Code/Lib/Apps.php:363 extend/addon/a/followlist/Mod_followlist.php:129
 msgid "Followlist"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:364 Zotlabs/Module/Connedit.php:663
+#: Code/Lib/Apps.php:364 Code/Module/Connedit.php:663
 msgid "Friend Zoom"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:365
+#: Code/Lib/Apps.php:365
 msgid "Future Posting"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:366 extend/addon/a/gallery/Mod_Gallery.php:137
+#: Code/Lib/Apps.php:366 extend/addon/a/gallery/Mod_Gallery.php:137
 #: extend/addon/a/gallery/gallery.php:46
 msgid "Gallery"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:367
+#: Code/Lib/Apps.php:367
 msgid "Guest Pass"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:368 include/help.php:69 include/nav.php:177
+#: Code/Lib/Apps.php:368 include/help.php:69 include/nav.php:177
 #: include/nav.php:297
 msgid "Help"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:369
+#: Code/Lib/Apps.php:369
 msgid "Invite"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:370
+#: Code/Lib/Apps.php:370
 msgid "Language"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:371 Zotlabs/Lib/AccessList.php:391
-#: Zotlabs/Widget/Activity_filter.php:174 include/nav.php:103
+#: Code/Lib/Apps.php:371 Code/Lib/AccessList.php:391
+#: Code/Widget/Activity_filter.php:174 include/nav.php:103
 msgid "Lists"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:372 boot.php:1726 include/nav.php:128
+#: Code/Lib/Apps.php:372 boot.php:1726 include/nav.php:128
 #: include/nav.php:131
 msgid "Login"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:373
+#: Code/Lib/Apps.php:373
 msgid "Mail"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:374
+#: Code/Lib/Apps.php:374
 msgid "Markup"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:375 Zotlabs/Module/Mood.php:162
+#: Code/Lib/Apps.php:375 Code/Module/Mood.php:162
 msgid "Mood"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:376
+#: Code/Lib/Apps.php:376
 msgid "My Chatrooms"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:377
+#: Code/Lib/Apps.php:377
 msgid "No Comment"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:378 Zotlabs/Widget/Notes.php:22
+#: Code/Lib/Apps.php:378 Code/Widget/Notes.php:22
 msgid "Notes"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:379 Zotlabs/Module/Settings/Channel.php:686
+#: Code/Lib/Apps.php:379 Code/Module/Settings/Channel.php:686
 msgid "Notifications"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:380
+#: Code/Lib/Apps.php:380
 msgid "OAuth Apps Manager"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:381
+#: Code/Lib/Apps.php:381
 msgid "OAuth2 Apps Manager"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:382
+#: Code/Lib/Apps.php:382
 msgid "Order Apps"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:383
+#: Code/Lib/Apps.php:383
 msgid "PDL Editor"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:384 Zotlabs/Module/Settings/Permcats.php:111
+#: Code/Lib/Apps.php:384 Code/Module/Settings/Permcats.php:111
 msgid "Permission Categories"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:385 Zotlabs/Module/Fbrowser.php:35
+#: Code/Lib/Apps.php:385 Code/Module/Fbrowser.php:35
 #: include/conversation.php:2001 include/nav.php:423
 msgid "Photos"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:386
+#: Code/Lib/Apps.php:386
 msgid "Photomap"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:387 Zotlabs/Module/Poke.php:139
+#: Code/Lib/Apps.php:387 Code/Module/Poke.php:139
 msgid "Poke"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:388
+#: Code/Lib/Apps.php:388
 msgid "Post"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:389
+#: Code/Lib/Apps.php:389
 msgid "Premium Channel"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:390
+#: Code/Lib/Apps.php:390
 msgid "Probe"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:391 Zotlabs/Lib/Libprofile.php:656
-#: Zotlabs/Lib/Activity.php:2882 Zotlabs/Lib/Activity.php:2885
-#: Zotlabs/Lib/Activity.php:2905 Zotlabs/Module/Profperm.php:131
+#: Code/Lib/Apps.php:391 Code/Lib/Libprofile.php:656
+#: Code/Lib/Activity.php:2882 Code/Lib/Activity.php:2885
+#: Code/Lib/Activity.php:2905 Code/Module/Profperm.php:131
 msgid "Profile"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:392
+#: Code/Lib/Apps.php:392
 msgid "Profile Photo"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:393
+#: Code/Lib/Apps.php:393
 msgid "Profiles"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:394 Zotlabs/Module/Pubstream.php:95
-#: Zotlabs/Widget/Notifications.php:131
+#: Code/Lib/Apps.php:394 Code/Module/Pubstream.php:95
+#: Code/Widget/Notifications.php:131
 msgid "Public Stream"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:395
+#: Code/Lib/Apps.php:395
 msgid "Random Channel"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:396
+#: Code/Lib/Apps.php:396
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:397
+#: Code/Lib/Apps.php:397
 msgid "Report Bug"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:398 Zotlabs/Module/Connections.php:375
-#: Zotlabs/Module/Search.php:61 Zotlabs/Widget/Sitesearch.php:35
+#: Code/Lib/Apps.php:398 Code/Module/Connections.php:375
+#: Code/Module/Search.php:61 Code/Widget/Sitesearch.php:35
 #: include/acl_selectors.php:147 include/nav.php:184 include/text.php:1042
 #: include/text.php:1055
 msgid "Search"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:399
+#: Code/Lib/Apps.php:399
 msgid "Secrets"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:400 Zotlabs/Module/Admin/Addons.php:346
-#: Zotlabs/Module/Admin/Themes.php:137 Zotlabs/Widget/Newmember.php:54
-#: Zotlabs/Widget/Settings_menu.php:135 include/nav.php:105
+#: Code/Lib/Apps.php:400 Code/Module/Admin/Addons.php:346
+#: Code/Module/Admin/Themes.php:137 Code/Widget/Newmember.php:54
+#: Code/Widget/Settings_menu.php:135 include/nav.php:105
 msgid "Settings"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:401
+#: Code/Lib/Apps.php:401
 msgid "Sites"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:402
+#: Code/Lib/Apps.php:402
 msgid "Stream"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:403 Zotlabs/Widget/Stream_order.php:137
+#: Code/Lib/Apps.php:403 Code/Widget/Stream_order.php:137
 msgid "Stream Order"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:404
+#: Code/Lib/Apps.php:404
 msgid "Suggest"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:405 Zotlabs/Module/Settings/Network.php:112
+#: Code/Lib/Apps.php:405 Code/Module/Settings/Network.php:112
 #: include/features.php:447
 msgid "Suggest Channels"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:406
+#: Code/Lib/Apps.php:406
 msgid "Tagadelic"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:407 Zotlabs/Widget/Tasklist.php:30
+#: Code/Lib/Apps.php:407 Code/Widget/Tasklist.php:30
 msgid "Tasks"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:408
+#: Code/Lib/Apps.php:408
 msgid "View Bookmarks"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:409 Zotlabs/Module/Connedit.php:548 include/nav.php:117
+#: Code/Lib/Apps.php:409 Code/Module/Connedit.php:548 include/nav.php:117
 msgid "View Profile"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:410
+#: Code/Lib/Apps.php:410
 msgid "Virtual Lists"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:411 Zotlabs/Module/Webpages.php:262
+#: Code/Lib/Apps.php:411 Code/Module/Webpages.php:262
 #: include/conversation.php:2082 include/nav.php:503
 msgid "Webpages"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:412 include/conversation.php:2098 include/nav.php:518
+#: Code/Lib/Apps.php:412 include/conversation.php:2098 include/nav.php:518
 msgid "Wiki"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:413 extend/addon/a/zotpost/Mod_zotpost.php:54
+#: Code/Lib/Apps.php:413 extend/addon/a/zotpost/Mod_zotpost.php:54
 msgid "ZotPost"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:588
+#: Code/Lib/Apps.php:588
 msgid "Installed"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:588 Zotlabs/Module/Admin/Addons.php:429
+#: Code/Lib/Apps.php:588 Code/Module/Admin/Addons.php:429
 msgid "Install"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:612
+#: Code/Lib/Apps.php:612
 msgid "Purchase"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:615 Zotlabs/Lib/ThreadItem.php:154
-#: Zotlabs/Lib/Libprofile.php:203 Zotlabs/Lib/Libprofile.php:206
-#: Zotlabs/Module/Admin/Profs.php:188 Zotlabs/Module/Blocks.php:173
-#: Zotlabs/Module/Connections.php:319 Zotlabs/Module/Connections.php:358
-#: Zotlabs/Module/Connections.php:379 Zotlabs/Module/Editlayout.php:126
-#: Zotlabs/Module/Editwebpage.php:157 Zotlabs/Module/Thing.php:302
-#: Zotlabs/Module/Lists.php:335 Zotlabs/Module/Layouts.php:207
-#: Zotlabs/Module/Card_edit.php:108 Zotlabs/Module/Editblock.php:127
-#: Zotlabs/Module/Menu.php:181 Zotlabs/Module/Webpages.php:265
-#: Zotlabs/Module/Settings/Oauth.php:163 Zotlabs/Module/Settings/Oauth2.php:211
-#: Zotlabs/Storage/Browser.php:318 Zotlabs/Widget/Cdav.php:146
-#: Zotlabs/Widget/Cdav.php:181 include/menu.php:138
+#: Code/Lib/Apps.php:615 Code/Lib/ThreadItem.php:154
+#: Code/Lib/Libprofile.php:203 Code/Lib/Libprofile.php:206
+#: Code/Module/Admin/Profs.php:188 Code/Module/Blocks.php:173
+#: Code/Module/Connections.php:319 Code/Module/Connections.php:358
+#: Code/Module/Connections.php:379 Code/Module/Editlayout.php:126
+#: Code/Module/Editwebpage.php:157 Code/Module/Thing.php:302
+#: Code/Module/Lists.php:335 Code/Module/Layouts.php:207
+#: Code/Module/Card_edit.php:108 Code/Module/Editblock.php:127
+#: Code/Module/Menu.php:181 Code/Module/Webpages.php:265
+#: Code/Module/Settings/Oauth.php:163 Code/Module/Settings/Oauth2.php:211
+#: Code/Storage/Browser.php:318 Code/Widget/Cdav.php:146
+#: Code/Widget/Cdav.php:181 include/menu.php:138
 msgid "Edit"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:616 Zotlabs/Lib/ThreadItem.php:191
-#: Zotlabs/Module/Admin/Accounts.php:184 Zotlabs/Module/Admin/Channels.php:173
-#: Zotlabs/Module/Admin/Profs.php:189 Zotlabs/Module/Blocks.php:175
-#: Zotlabs/Module/Cdav.php:1058 Zotlabs/Module/Cdav.php:1367
-#: Zotlabs/Module/Connedit.php:616 Zotlabs/Module/Connedit.php:880
-#: Zotlabs/Module/Connections.php:327 Zotlabs/Module/Editlayout.php:150
-#: Zotlabs/Module/Editwebpage.php:182 Zotlabs/Module/Thing.php:303
-#: Zotlabs/Module/Card_edit.php:138 Zotlabs/Module/Editblock.php:152
-#: Zotlabs/Module/Webpages.php:267 Zotlabs/Module/Profiles.php:849
-#: Zotlabs/Module/Settings/Oauth.php:164 Zotlabs/Module/Settings/Oauth2.php:212
-#: Zotlabs/Module/Photos.php:1263 Zotlabs/Storage/Browser.php:319
+#: Code/Lib/Apps.php:616 Code/Lib/ThreadItem.php:191
+#: Code/Module/Admin/Accounts.php:184 Code/Module/Admin/Channels.php:173
+#: Code/Module/Admin/Profs.php:189 Code/Module/Blocks.php:175
+#: Code/Module/Cdav.php:1058 Code/Module/Cdav.php:1367
+#: Code/Module/Connedit.php:616 Code/Module/Connedit.php:880
+#: Code/Module/Connections.php:327 Code/Module/Editlayout.php:150
+#: Code/Module/Editwebpage.php:182 Code/Module/Thing.php:303
+#: Code/Module/Card_edit.php:138 Code/Module/Editblock.php:152
+#: Code/Module/Webpages.php:267 Code/Module/Profiles.php:849
+#: Code/Module/Settings/Oauth.php:164 Code/Module/Settings/Oauth2.php:212
+#: Code/Module/Photos.php:1263 Code/Storage/Browser.php:319
 #: include/conversation.php:600 include/conversation.php:654
 msgid "Delete"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:617
+#: Code/Lib/Apps.php:617
 msgid "Undelete"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:627
+#: Code/Lib/Apps.php:627
 msgid "Add to app-tray"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:628
+#: Code/Lib/Apps.php:628
 msgid "Remove from app-tray"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:629
+#: Code/Lib/Apps.php:629
 msgid "Pin to navbar"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:630
+#: Code/Lib/Apps.php:630
 msgid "Unpin from navbar"
 msgstr ""
 
-#: Zotlabs/Lib/Apps.php:1152 Zotlabs/Lib/Apps.php:1244
-#: Zotlabs/Lib/Activity.php:2194 Zotlabs/Module/Cdav.php:858
-#: Zotlabs/Module/Cdav.php:859 Zotlabs/Module/Cdav.php:865
-#: Zotlabs/Module/Embedphotos.php:214 Zotlabs/Module/Photos.php:854
-#: Zotlabs/Module/Photos.php:1329 Zotlabs/Storage/Browser.php:182
-#: Zotlabs/Widget/Album.php:94 Zotlabs/Widget/Portfolio.php:107
+#: Code/Lib/Apps.php:1152 Code/Lib/Apps.php:1244
+#: Code/Lib/Activity.php:2194 Code/Module/Cdav.php:858
+#: Code/Module/Cdav.php:859 Code/Module/Cdav.php:865
+#: Code/Module/Embedphotos.php:214 Code/Module/Photos.php:854
+#: Code/Module/Photos.php:1329 Code/Storage/Browser.php:182
+#: Code/Widget/Album.php:94 Code/Widget/Portfolio.php:107
 #: include/conversation.php:1082
 msgid "Unknown"
 msgstr ""
 
-#: Zotlabs/Lib/DB_Upgrade.php:68
+#: Code/Lib/DB_Upgrade.php:68
 msgid "Source code of failed update: "
 msgstr ""
 
-#: Zotlabs/Lib/DB_Upgrade.php:91
+#: Code/Lib/DB_Upgrade.php:91
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: Zotlabs/Lib/DB_Upgrade.php:98
+#: Code/Lib/DB_Upgrade.php:98
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: Zotlabs/Lib/Libsync.php:969
+#: Code/Lib/Libsync.php:969
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: Zotlabs/Lib/Libzot.php:761
+#: Code/Lib/Libzot.php:761
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:116 include/conversation.php:608
+#: Code/Lib/ThreadItem.php:116 include/conversation.php:608
 msgid "Public visibility"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:118 include/conversation.php:610
+#: Code/Lib/ThreadItem.php:118 include/conversation.php:610
 msgid "Direct message (private mail)"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:121 include/conversation.php:613
+#: Code/Lib/ThreadItem.php:121 include/conversation.php:613
 msgid "Restricted visibility"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:146
+#: Code/Lib/ThreadItem.php:146
 msgid ""
 "This comment is part of a private conversation, yet was shared with the "
 "public. Discretion advised."
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:194 Zotlabs/Storage/Browser.php:306
+#: Code/Lib/ThreadItem.php:194 Code/Storage/Browser.php:306
 msgid "Admin Delete"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:199 include/conversation.php:599
+#: Code/Lib/ThreadItem.php:199 include/conversation.php:599
 msgid "Select"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:203 Zotlabs/Module/Filer.php:61
+#: Code/Lib/ThreadItem.php:203 Code/Module/Filer.php:61
 msgid "Save to Folder"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I will attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I will not attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:225
+#: Code/Lib/ThreadItem.php:225
 msgid "I might attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:226
+#: Code/Lib/ThreadItem.php:226
 msgid "Undo attendance"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:241 Zotlabs/Lib/ThreadItem.php:261
-#: Zotlabs/Module/Photos.php:1223 Zotlabs/Module/Photos.php:1234
+#: Code/Lib/ThreadItem.php:241 Code/Lib/ThreadItem.php:261
+#: Code/Module/Photos.php:1223 Code/Module/Photos.php:1234
 msgid "View all"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:246 Zotlabs/Module/Photos.php:1227
+#: Code/Lib/ThreadItem.php:246 Code/Module/Photos.php:1227
 #: include/conversation.php:2152 include/taxonomy.php:741
 msgctxt "noun"
 msgid "Like"
@@ -691,13 +691,13 @@ msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Lib/ThreadItem.php:248 Zotlabs/Lib/ThreadItem.php:495
-#: Zotlabs/Module/Photos.php:1343 include/conversation.php:2154
+#: Code/Lib/ThreadItem.php:248 Code/Lib/ThreadItem.php:495
+#: Code/Module/Photos.php:1343 include/conversation.php:2154
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:254 Zotlabs/Module/Photos.php:1231
+#: Code/Lib/ThreadItem.php:254 Code/Module/Photos.php:1231
 #: include/conversation.php:2159
 msgctxt "noun"
 msgid "Dislike"
@@ -705,222 +705,222 @@ msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Lib/ThreadItem.php:256 Zotlabs/Lib/ThreadItem.php:496
-#: Zotlabs/Module/Photos.php:1344 include/conversation.php:2161
+#: Code/Lib/ThreadItem.php:256 Code/Lib/ThreadItem.php:496
+#: Code/Module/Photos.php:1344 include/conversation.php:2161
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:282 Zotlabs/Module/Admin/Profs.php:99
-#: Zotlabs/Module/Admin/Profs.php:120 Zotlabs/Module/Filer.php:60
-#: Zotlabs/Widget/Notes.php:24
+#: Code/Lib/ThreadItem.php:282 Code/Module/Admin/Profs.php:99
+#: Code/Module/Admin/Profs.php:120 Code/Module/Filer.php:60
+#: Code/Widget/Notes.php:24
 #: extend/addon/a/queueworker/Mod_Queueworker.php:116 include/text.php:1043
 #: include/text.php:1056
 msgid "Save"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:291 include/conversation.php:621
+#: Code/Lib/ThreadItem.php:291 include/conversation.php:621
 msgid "Message signature validated"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:292 include/conversation.php:622
+#: Code/Lib/ThreadItem.php:292 include/conversation.php:622
 msgid "Message signature incorrect"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:298
+#: Code/Lib/ThreadItem.php:298
 msgid "Add Tag"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:318 Zotlabs/Module/Photos.php:1164
+#: Code/Lib/ThreadItem.php:318 Code/Module/Photos.php:1164
 msgid "I like this"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:318 Zotlabs/Module/Photos.php:1168
+#: Code/Lib/ThreadItem.php:318 Code/Module/Photos.php:1168
 msgid "Undo like"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:319 Zotlabs/Module/Photos.php:1167
+#: Code/Lib/ThreadItem.php:319 Code/Module/Photos.php:1167
 msgid "I don't like this"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:319 Zotlabs/Module/Photos.php:1169
+#: Code/Lib/ThreadItem.php:319 Code/Module/Photos.php:1169
 msgid "Undo dislike"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:325
+#: Code/Lib/ThreadItem.php:325
 msgid "Repeat This"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:326
+#: Code/Lib/ThreadItem.php:326
 msgid "Share this"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:337
+#: Code/Lib/ThreadItem.php:337
 msgid "Delivery Report"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:366
+#: Code/Lib/ThreadItem.php:366
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Lib/ThreadItem.php:367
+#: Code/Lib/ThreadItem.php:367
 #, php-format
 msgid "%d unseen"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:406 Zotlabs/Lib/ThreadItem.php:407
+#: Code/Lib/ThreadItem.php:406 Code/Lib/ThreadItem.php:407
 #, php-format
 msgid "View %s's profile - %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:410
+#: Code/Lib/ThreadItem.php:410
 msgid "to"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:411 include/conversation.php:684
+#: Code/Lib/ThreadItem.php:411 include/conversation.php:684
 msgid "via"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:412
+#: Code/Lib/ThreadItem.php:412
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:413
+#: Code/Lib/ThreadItem.php:413
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:428 include/conversation.php:687
+#: Code/Lib/ThreadItem.php:428 include/conversation.php:687
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:431 include/conversation.php:690
+#: Code/Lib/ThreadItem.php:431 include/conversation.php:690
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:432 include/conversation.php:691
+#: Code/Lib/ThreadItem.php:432 include/conversation.php:691
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:442
+#: Code/Lib/ThreadItem.php:442
 msgid "Attend"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:443
+#: Code/Lib/ThreadItem.php:443
 msgid "Attendance Options"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:444
+#: Code/Lib/ThreadItem.php:444
 msgid "Vote"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:445
+#: Code/Lib/ThreadItem.php:445
 msgid "Voting Options"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:446
+#: Code/Lib/ThreadItem.php:446
 msgid "Reply"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:471 include/conversation.php:706
+#: Code/Lib/ThreadItem.php:471 include/conversation.php:706
 msgid "Pinned post"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:473 include/conversation.php:708
+#: Code/Lib/ThreadItem.php:473 include/conversation.php:708
 #: include/js_strings.php:42
 msgid "Unpin this post"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:473 include/conversation.php:708
+#: Code/Lib/ThreadItem.php:473 include/conversation.php:708
 #: include/js_strings.php:41
 msgid "Pin this post"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:475
+#: Code/Lib/ThreadItem.php:475
 msgid "Saved draft"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:476
+#: Code/Lib/ThreadItem.php:476
 msgid "Save Bookmarks"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:477
+#: Code/Lib/ThreadItem.php:477
 msgid "Add to Calendar"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:488 Zotlabs/Module/Notifications.php:72
+#: Code/Lib/ThreadItem.php:488 Code/Module/Notifications.php:72
 msgid "Mark all seen"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:501 Zotlabs/Module/Settings/Channel.php:685
-#: Zotlabs/Module/Photos.php:1349 include/conversation.php:1498
+#: Code/Lib/ThreadItem.php:501 Code/Module/Settings/Channel.php:685
+#: Code/Module/Photos.php:1349 include/conversation.php:1498
 #: include/acl_selectors.php:154
 msgid "Close"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:506 include/conversation.php:412
+#: Code/Lib/ThreadItem.php:506 include/conversation.php:412
 msgid "This is an unsaved preview"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:507 Zotlabs/Module/Photos.php:1171
+#: Code/Lib/ThreadItem.php:507 Code/Module/Photos.php:1171
 #: include/conversation.php:711
 msgid "Please wait"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:572 include/js_strings.php:11
+#: Code/Lib/ThreadItem.php:572 include/js_strings.php:11
 #, php-format
 msgid "%s show all"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:947 Zotlabs/Module/Photos.php:1187
-#: Zotlabs/Module/Photos.php:1297
+#: Code/Lib/ThreadItem.php:947 Code/Module/Photos.php:1187
+#: Code/Module/Photos.php:1297
 msgid "This is you"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:949 Zotlabs/Module/Photos.php:1189
-#: Zotlabs/Module/Photos.php:1299 include/js_strings.php:10
+#: Code/Lib/ThreadItem.php:949 Code/Module/Photos.php:1189
+#: Code/Module/Photos.php:1299 include/js_strings.php:10
 msgid "Comment"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:950 Zotlabs/Module/Admin/Account_edit.php:78
-#: Zotlabs/Module/Admin/Accounts.php:177 Zotlabs/Module/Admin/Addons.php:445
-#: Zotlabs/Module/Admin/Channels.php:171 Zotlabs/Module/Admin/Logs.php:84
-#: Zotlabs/Module/Admin/Profs.php:191 Zotlabs/Module/Admin/Security.php:169
-#: Zotlabs/Module/Admin/Site.php:312 Zotlabs/Module/Admin/Themes.php:170
-#: Zotlabs/Module/Cal.php:359 Zotlabs/Module/Expire.php:48
-#: Zotlabs/Module/Connedit.php:844 Zotlabs/Module/Appman.php:150
-#: Zotlabs/Module/Defperms.php:258 Zotlabs/Module/Events.php:541
-#: Zotlabs/Module/Email_validation.php:44 Zotlabs/Module/Invite.php:168
-#: Zotlabs/Module/Filestorage.php:245 Zotlabs/Module/Thing.php:362
-#: Zotlabs/Module/Thing.php:417 Zotlabs/Module/Chat.php:210
-#: Zotlabs/Module/Chat.php:247 Zotlabs/Module/Setup.php:332
-#: Zotlabs/Module/Setup.php:377 Zotlabs/Module/Lists.php:198
-#: Zotlabs/Module/Lists.php:210 Zotlabs/Module/Import_items.php:142
-#: Zotlabs/Module/Mitem.php:271 Zotlabs/Module/Finger.php:24
-#: Zotlabs/Module/Pconfig.php:129 Zotlabs/Module/Editpost.php:116
-#: Zotlabs/Module/Locs.php:136 Zotlabs/Module/Connect.php:95
-#: Zotlabs/Module/Mood.php:166 Zotlabs/Module/Pdledit.php:114
-#: Zotlabs/Module/Profiles.php:768 Zotlabs/Module/Poke.php:148
-#: Zotlabs/Module/Affinity.php:86 Zotlabs/Module/Zot_probe.php:21
-#: Zotlabs/Module/Ap_probe.php:23 Zotlabs/Module/Settings/Account.php:114
-#: Zotlabs/Module/Settings/Channel.php:626
-#: Zotlabs/Module/Settings/Display.php:204
-#: Zotlabs/Module/Settings/Featured.php:59
-#: Zotlabs/Module/Settings/Features.php:63
-#: Zotlabs/Module/Settings/Network.php:44 Zotlabs/Module/Settings/Oauth.php:95
-#: Zotlabs/Module/Settings/Oauth2.php:113
-#: Zotlabs/Module/Settings/Permcats.php:127
-#: Zotlabs/Module/Settings/Tokens.php:314 Zotlabs/Module/Sources.php:130
-#: Zotlabs/Module/Sources.php:168 Zotlabs/Module/Photos.php:1132
-#: Zotlabs/Module/Photos.php:1190 Zotlabs/Module/Photos.php:1300
-#: Zotlabs/Module/Import.php:703 Zotlabs/Module/Content_filter.php:66
-#: Zotlabs/Module/Superblock.php:255 Zotlabs/Module/Xchan.php:18
-#: Zotlabs/Module/Zotfinger.php:28 Zotlabs/Widget/Eventstools.php:19
+#: Code/Lib/ThreadItem.php:950 Code/Module/Admin/Account_edit.php:78
+#: Code/Module/Admin/Accounts.php:177 Code/Module/Admin/Addons.php:445
+#: Code/Module/Admin/Channels.php:171 Code/Module/Admin/Logs.php:84
+#: Code/Module/Admin/Profs.php:191 Code/Module/Admin/Security.php:169
+#: Code/Module/Admin/Site.php:312 Code/Module/Admin/Themes.php:170
+#: Code/Module/Cal.php:359 Code/Module/Expire.php:48
+#: Code/Module/Connedit.php:844 Code/Module/Appman.php:150
+#: Code/Module/Defperms.php:258 Code/Module/Events.php:541
+#: Code/Module/Email_validation.php:44 Code/Module/Invite.php:168
+#: Code/Module/Filestorage.php:245 Code/Module/Thing.php:362
+#: Code/Module/Thing.php:417 Code/Module/Chat.php:210
+#: Code/Module/Chat.php:247 Code/Module/Setup.php:332
+#: Code/Module/Setup.php:377 Code/Module/Lists.php:198
+#: Code/Module/Lists.php:210 Code/Module/Import_items.php:142
+#: Code/Module/Mitem.php:271 Code/Module/Finger.php:24
+#: Code/Module/Pconfig.php:129 Code/Module/Editpost.php:116
+#: Code/Module/Locs.php:136 Code/Module/Connect.php:95
+#: Code/Module/Mood.php:166 Code/Module/Pdledit.php:114
+#: Code/Module/Profiles.php:768 Code/Module/Poke.php:148
+#: Code/Module/Affinity.php:86 Code/Module/Zot_probe.php:21
+#: Code/Module/Ap_probe.php:23 Code/Module/Settings/Account.php:114
+#: Code/Module/Settings/Channel.php:626
+#: Code/Module/Settings/Display.php:204
+#: Code/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Features.php:63
+#: Code/Module/Settings/Network.php:44 Code/Module/Settings/Oauth.php:95
+#: Code/Module/Settings/Oauth2.php:113
+#: Code/Module/Settings/Permcats.php:127
+#: Code/Module/Settings/Tokens.php:314 Code/Module/Sources.php:130
+#: Code/Module/Sources.php:168 Code/Module/Photos.php:1132
+#: Code/Module/Photos.php:1190 Code/Module/Photos.php:1300
+#: Code/Module/Import.php:703 Code/Module/Content_filter.php:66
+#: Code/Module/Superblock.php:255 Code/Module/Xchan.php:18
+#: Code/Module/Zotfinger.php:28 Code/Widget/Eventstools.php:19
 #: extend/addon/a/logrot/logrot.php:36 extend/addon/a/nsfw/Mod_Nsfw.php:50
 #: extend/addon/a/zotpost/Mod_zotpost.php:81
 #: extend/addon/a/content_import/Mod_content_import.php:142
@@ -933,134 +933,134 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:952 include/conversation.php:1416
+#: Code/Lib/ThreadItem.php:952 include/conversation.php:1416
 msgid "Bold"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:953 include/conversation.php:1417
+#: Code/Lib/ThreadItem.php:953 include/conversation.php:1417
 msgid "Italic"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:954 include/conversation.php:1418
+#: Code/Lib/ThreadItem.php:954 include/conversation.php:1418
 msgid "Underline"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:955 include/conversation.php:1419
+#: Code/Lib/ThreadItem.php:955 include/conversation.php:1419
 msgid "Quote"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:956 include/conversation.php:1420
+#: Code/Lib/ThreadItem.php:956 include/conversation.php:1420
 msgid "Code"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:957
+#: Code/Lib/ThreadItem.php:957
 msgid "Image"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:958 include/conversation.php:1421
+#: Code/Lib/ThreadItem.php:958 include/conversation.php:1421
 msgid "Attach/Upload file"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:959
+#: Code/Lib/ThreadItem.php:959
 msgid "Insert Link"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:960
+#: Code/Lib/ThreadItem.php:960
 msgid "Video"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:961 Zotlabs/Module/Events.php:526
-#: Zotlabs/Module/Webpages.php:272 Zotlabs/Module/Photos.php:1191
+#: Code/Lib/ThreadItem.php:961 Code/Module/Events.php:526
+#: Code/Module/Webpages.php:272 Code/Module/Photos.php:1191
 #: include/conversation.php:1305
 msgid "Preview"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:962 Zotlabs/Module/Lostpass.php:141
-#: Zotlabs/Module/Pdledit.php:71 Zotlabs/Module/Pdledit.php:79
+#: Code/Lib/ThreadItem.php:962 Code/Module/Lostpass.php:141
+#: Code/Module/Pdledit.php:71 Code/Module/Pdledit.php:79
 msgid "Reset"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:967 Zotlabs/Module/Chat.php:218
+#: Code/Lib/ThreadItem.php:967 Code/Module/Chat.php:218
 #: include/conversation.php:1490
 msgid "Encrypt text"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:972
+#: Code/Lib/ThreadItem.php:972
 msgid "Your full name (required)"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:973
+#: Code/Lib/ThreadItem.php:973
 msgid "Your email address (required)"
 msgstr ""
 
-#: Zotlabs/Lib/ThreadItem.php:974
+#: Code/Lib/ThreadItem.php:974
 msgid "Your website URL (optional)"
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:28
+#: Code/Lib/Chatroom.php:28
 msgid "Missing room name"
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:38
+#: Code/Lib/Chatroom.php:38
 msgid "Duplicate room name"
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:94 Zotlabs/Lib/Chatroom.php:103
+#: Code/Lib/Chatroom.php:94 Code/Lib/Chatroom.php:103
 msgid "Invalid room specifier."
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:141
+#: Code/Lib/Chatroom.php:141
 msgid "Room not found."
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:153 Zotlabs/Module/Calendar.php:264
-#: Zotlabs/Module/Admin/Cover_photo.php:279
-#: Zotlabs/Module/Admin/Cover_photo.php:303
-#: Zotlabs/Module/Admin/Profile_photo.php:308
-#: Zotlabs/Module/Admin/Profile_photo.php:326 Zotlabs/Module/Api.php:35
-#: Zotlabs/Module/Common.php:48 Zotlabs/Module/Block.php:31
-#: Zotlabs/Module/Block.php:84 Zotlabs/Module/Cards.php:86
-#: Zotlabs/Module/Blocks.php:82 Zotlabs/Module/Blocks.php:89
-#: Zotlabs/Module/Connedit.php:338 Zotlabs/Module/Connections.php:36
-#: Zotlabs/Module/Item.php:611 Zotlabs/Module/Item.php:633
-#: Zotlabs/Module/Item.php:645 Zotlabs/Module/Item.php:1792
-#: Zotlabs/Module/Appman.php:91 Zotlabs/Module/Cover_photo.php:336
-#: Zotlabs/Module/Cover_photo.php:350 Zotlabs/Module/Defperms.php:179
-#: Zotlabs/Module/Defperms.php:185 Zotlabs/Module/Display.php:509
-#: Zotlabs/Module/Events.php:305 Zotlabs/Module/Editlayout.php:76
-#: Zotlabs/Module/Editlayout.php:99 Zotlabs/Module/Editwebpage.php:79
-#: Zotlabs/Module/Editwebpage.php:100 Zotlabs/Module/Editwebpage.php:119
-#: Zotlabs/Module/Editwebpage.php:135 Zotlabs/Module/Register.php:87
-#: Zotlabs/Module/Invite.php:99 Zotlabs/Module/Filestorage.php:25
-#: Zotlabs/Module/Filestorage.php:111 Zotlabs/Module/Filestorage.php:127
-#: Zotlabs/Module/Filestorage.php:155 Zotlabs/Module/Filestorage.php:188
-#: Zotlabs/Module/Filestorage.php:196 Zotlabs/Module/Thing.php:315
-#: Zotlabs/Module/Thing.php:336 Zotlabs/Module/Thing.php:378
-#: Zotlabs/Module/Chat.php:111 Zotlabs/Module/Chat.php:116
-#: Zotlabs/Module/Moderate.php:20 Zotlabs/Module/Setup.php:230
-#: Zotlabs/Module/Lists.php:84 Zotlabs/Module/Lists.php:96
-#: Zotlabs/Module/Lists.php:127 Zotlabs/Module/Layouts.php:80
-#: Zotlabs/Module/Layouts.php:87 Zotlabs/Module/Layouts.php:98
-#: Zotlabs/Module/Channel.php:236 Zotlabs/Module/Channel.php:414
-#: Zotlabs/Module/Channel.php:452 Zotlabs/Module/Card_edit.php:61
-#: Zotlabs/Module/Manage.php:18 Zotlabs/Module/Mitem.php:140
-#: Zotlabs/Module/Editblock.php:77 Zotlabs/Module/Menu.php:135
-#: Zotlabs/Module/Menu.php:146 Zotlabs/Module/Editpost.php:23
-#: Zotlabs/Module/Locs.php:107 Zotlabs/Module/Viewsrc.php:23
-#: Zotlabs/Module/New_channel.php:122 Zotlabs/Module/New_channel.php:147
-#: Zotlabs/Module/Notifications.php:16 Zotlabs/Module/Mood.php:132
-#: Zotlabs/Module/Vote.php:22 Zotlabs/Module/Webpages.php:139
-#: Zotlabs/Module/Page.php:41 Zotlabs/Module/Page.php:146
-#: Zotlabs/Module/Pdledit.php:36 Zotlabs/Module/Profiles.php:213
-#: Zotlabs/Module/Profiles.php:674 Zotlabs/Module/Profile_photo.php:344
-#: Zotlabs/Module/Profile_photo.php:358 Zotlabs/Module/Poke.php:115
-#: Zotlabs/Module/Regmod.php:24 Zotlabs/Module/Service_limits.php:16
-#: Zotlabs/Module/Settings.php:70 Zotlabs/Module/Sharedwithme.php:22
-#: Zotlabs/Module/Sources.php:89 Zotlabs/Module/Photos.php:70
-#: Zotlabs/Module/Profile.php:108 Zotlabs/Module/Profile.php:123
-#: Zotlabs/Module/Inspect.php:18 Zotlabs/Module/Suggestions.php:36
-#: Zotlabs/Module/Viewconnections.php:35 Zotlabs/Module/Viewconnections.php:40
-#: Zotlabs/Web/WebServer.php:70 include/photos.php:36 include/items.php:3996
+#: Code/Lib/Chatroom.php:153 Code/Module/Calendar.php:264
+#: Code/Module/Admin/Cover_photo.php:279
+#: Code/Module/Admin/Cover_photo.php:303
+#: Code/Module/Admin/Profile_photo.php:308
+#: Code/Module/Admin/Profile_photo.php:326 Code/Module/Api.php:35
+#: Code/Module/Common.php:48 Code/Module/Block.php:31
+#: Code/Module/Block.php:84 Code/Module/Cards.php:86
+#: Code/Module/Blocks.php:82 Code/Module/Blocks.php:89
+#: Code/Module/Connedit.php:338 Code/Module/Connections.php:36
+#: Code/Module/Item.php:611 Code/Module/Item.php:633
+#: Code/Module/Item.php:645 Code/Module/Item.php:1792
+#: Code/Module/Appman.php:91 Code/Module/Cover_photo.php:336
+#: Code/Module/Cover_photo.php:350 Code/Module/Defperms.php:179
+#: Code/Module/Defperms.php:185 Code/Module/Display.php:509
+#: Code/Module/Events.php:305 Code/Module/Editlayout.php:76
+#: Code/Module/Editlayout.php:99 Code/Module/Editwebpage.php:79
+#: Code/Module/Editwebpage.php:100 Code/Module/Editwebpage.php:119
+#: Code/Module/Editwebpage.php:135 Code/Module/Register.php:87
+#: Code/Module/Invite.php:99 Code/Module/Filestorage.php:25
+#: Code/Module/Filestorage.php:111 Code/Module/Filestorage.php:127
+#: Code/Module/Filestorage.php:155 Code/Module/Filestorage.php:188
+#: Code/Module/Filestorage.php:196 Code/Module/Thing.php:315
+#: Code/Module/Thing.php:336 Code/Module/Thing.php:378
+#: Code/Module/Chat.php:111 Code/Module/Chat.php:116
+#: Code/Module/Moderate.php:20 Code/Module/Setup.php:230
+#: Code/Module/Lists.php:84 Code/Module/Lists.php:96
+#: Code/Module/Lists.php:127 Code/Module/Layouts.php:80
+#: Code/Module/Layouts.php:87 Code/Module/Layouts.php:98
+#: Code/Module/Channel.php:236 Code/Module/Channel.php:414
+#: Code/Module/Channel.php:452 Code/Module/Card_edit.php:61
+#: Code/Module/Manage.php:18 Code/Module/Mitem.php:140
+#: Code/Module/Editblock.php:77 Code/Module/Menu.php:135
+#: Code/Module/Menu.php:146 Code/Module/Editpost.php:23
+#: Code/Module/Locs.php:107 Code/Module/Viewsrc.php:23
+#: Code/Module/New_channel.php:122 Code/Module/New_channel.php:147
+#: Code/Module/Notifications.php:16 Code/Module/Mood.php:132
+#: Code/Module/Vote.php:22 Code/Module/Webpages.php:139
+#: Code/Module/Page.php:41 Code/Module/Page.php:146
+#: Code/Module/Pdledit.php:36 Code/Module/Profiles.php:213
+#: Code/Module/Profiles.php:674 Code/Module/Profile_photo.php:344
+#: Code/Module/Profile_photo.php:358 Code/Module/Poke.php:115
+#: Code/Module/Regmod.php:24 Code/Module/Service_limits.php:16
+#: Code/Module/Settings.php:70 Code/Module/Sharedwithme.php:22
+#: Code/Module/Sources.php:89 Code/Module/Photos.php:70
+#: Code/Module/Profile.php:108 Code/Module/Profile.php:123
+#: Code/Module/Inspect.php:18 Code/Module/Suggestions.php:36
+#: Code/Module/Viewconnections.php:35 Code/Module/Viewconnections.php:40
+#: Code/Web/WebServer.php:70 include/photos.php:36 include/items.php:3996
 #: include/attach.php:160 include/attach.php:209 include/attach.php:287
 #: include/attach.php:413 include/attach.php:428 include/attach.php:435
 #: include/attach.php:514 include/attach.php:1131 include/attach.php:1208
@@ -1068,2420 +1068,2420 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: Zotlabs/Lib/Chatroom.php:164
+#: Code/Lib/Chatroom.php:164
 msgid "Room is full"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:70
+#: Code/Lib/Enotify.php:70
 msgid "$Projectname Notification"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:71
+#: Code/Lib/Enotify.php:71
 msgid "$projectname"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:73
+#: Code/Lib/Enotify.php:73
 msgid "Thank You,"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:75
+#: Code/Lib/Enotify.php:75
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:76
+#: Code/Lib/Enotify.php:76
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:76 Zotlabs/Module/Home.php:142
-#: Zotlabs/Module/Home.php:151 extend/addon/a/opensearch/Mod_opensearch.php:28
+#: Code/Lib/Enotify.php:76 Code/Module/Home.php:142
+#: Code/Module/Home.php:151 extend/addon/a/opensearch/Mod_opensearch.php:28
 msgid "$Projectname"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:77
+#: Code/Lib/Enotify.php:77
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
 "at %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:78
+#: Code/Lib/Enotify.php:78
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:78
+#: Code/Lib/Enotify.php:78
 msgid "Notification Settings"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:135
+#: Code/Lib/Enotify.php:135
 #, php-format
 msgid "%s "
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:139
+#: Code/Lib/Enotify.php:139
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:142
+#: Code/Lib/Enotify.php:142
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:143
+#: Code/Lib/Enotify.php:143
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:143 Zotlabs/Lib/Enotify.php:146
+#: Code/Lib/Enotify.php:143 Code/Lib/Enotify.php:146
 msgid "a private message"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:145
+#: Code/Lib/Enotify.php:145
 #, php-format
 msgid "%1$s replied to a private message at %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:146
+#: Code/Lib/Enotify.php:146
 #, php-format
 msgid "%1$s replied to %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:148
+#: Code/Lib/Enotify.php:148
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:162
+#: Code/Lib/Enotify.php:162
 msgid "commented on"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:172
+#: Code/Lib/Enotify.php:172
 msgid "liked"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:176
+#: Code/Lib/Enotify.php:176
 msgid "disliked"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:222
+#: Code/Lib/Enotify.php:222
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:232
+#: Code/Lib/Enotify.php:232
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:244
+#: Code/Lib/Enotify.php:244
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:258
+#: Code/Lib/Enotify.php:258
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:261
+#: Code/Lib/Enotify.php:261
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:263
+#: Code/Lib/Enotify.php:263
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:267
+#: Code/Lib/Enotify.php:267
 msgid "(Moderated)"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:270 Zotlabs/Lib/Enotify.php:354
-#: Zotlabs/Lib/Enotify.php:382 Zotlabs/Lib/Enotify.php:413
-#: Zotlabs/Lib/Enotify.php:432 Zotlabs/Lib/Enotify.php:447
+#: Code/Lib/Enotify.php:270 Code/Lib/Enotify.php:354
+#: Code/Lib/Enotify.php:382 Code/Lib/Enotify.php:413
+#: Code/Lib/Enotify.php:432 Code/Lib/Enotify.php:447
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:274 Zotlabs/Lib/Enotify.php:275
+#: Code/Lib/Enotify.php:274 Code/Lib/Enotify.php:275
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:335
+#: Code/Lib/Enotify.php:335
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:350
+#: Code/Lib/Enotify.php:350
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:351
+#: Code/Lib/Enotify.php:351
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:362
+#: Code/Lib/Enotify.php:362
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:368
+#: Code/Lib/Enotify.php:368
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:371
+#: Code/Lib/Enotify.php:371
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:378 Zotlabs/Lib/Enotify.php:379
+#: Code/Lib/Enotify.php:378 Code/Lib/Enotify.php:379
 msgid " - "
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:378 Zotlabs/Lib/Enotify.php:379
+#: Code/Lib/Enotify.php:378 Code/Lib/Enotify.php:379
 msgid "Moderated"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:387 Zotlabs/Lib/Enotify.php:388
+#: Code/Lib/Enotify.php:387 Code/Lib/Enotify.php:388
 #, php-format
 msgid "Please visit %s to approve or reject this post."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:405
+#: Code/Lib/Enotify.php:405
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:406
+#: Code/Lib/Enotify.php:406
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:408
+#: Code/Lib/Enotify.php:408
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:420
+#: Code/Lib/Enotify.php:420
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:421
+#: Code/Lib/Enotify.php:421
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:423
+#: Code/Lib/Enotify.php:423
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:439
+#: Code/Lib/Enotify.php:439
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:440
+#: Code/Lib/Enotify.php:440
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:442
+#: Code/Lib/Enotify.php:442
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:454
+#: Code/Lib/Enotify.php:454
 msgid "[$Projectname:Notify] Introduction received"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:455
+#: Code/Lib/Enotify.php:455
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:457
+#: Code/Lib/Enotify.php:457
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:461 Zotlabs/Lib/Enotify.php:481
+#: Code/Lib/Enotify.php:461 Code/Lib/Enotify.php:481
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:463
+#: Code/Lib/Enotify.php:463
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:470
+#: Code/Lib/Enotify.php:470
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:471
+#: Code/Lib/Enotify.php:471
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:473
+#: Code/Lib/Enotify.php:473
 #, php-format
 msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:479
+#: Code/Lib/Enotify.php:479
 msgid "Name:"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:480
+#: Code/Lib/Enotify.php:480
 msgid "Photo:"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:483
+#: Code/Lib/Enotify.php:483
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:741
+#: Code/Lib/Enotify.php:741
 msgid "[$Projectname:Notify]"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:923
+#: Code/Lib/Enotify.php:923
 msgid "created a new post"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:924
+#: Code/Lib/Enotify.php:924
 #, php-format
 msgid "reacted to %s's conversation"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:926
+#: Code/Lib/Enotify.php:926
 #, php-format
 msgid "shared %s's post"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:930
+#: Code/Lib/Enotify.php:930
 msgid "sent a direct message"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:937
+#: Code/Lib/Enotify.php:937
 #, php-format
 msgid "edited a post dated %s"
 msgstr ""
 
-#: Zotlabs/Lib/Enotify.php:940
+#: Code/Lib/Enotify.php:940
 #, php-format
 msgid "edited a comment dated %s"
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:50 Zotlabs/Lib/Connect.php:172
+#: Code/Lib/Connect.php:50 Code/Lib/Connect.php:172
 msgid "Channel is blocked on this site."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:55
+#: Code/Lib/Connect.php:55
 msgid "Channel location missing."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:133
+#: Code/Lib/Connect.php:133
 msgid "Remote channel or protocol unavailable."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:166
+#: Code/Lib/Connect.php:166
 msgid "Channel discovery failed."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:180
+#: Code/Lib/Connect.php:180
 msgid "Protocol not supported"
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:193
+#: Code/Lib/Connect.php:193
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: Zotlabs/Lib/Connect.php:271
+#: Code/Lib/Connect.php:271
 msgid "error saving data"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:36
+#: Code/Lib/Libprofile.php:36
 msgid "Requested channel is not available."
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:96 Zotlabs/Module/Cards.php:42
-#: Zotlabs/Module/Blocks.php:41 Zotlabs/Module/Editlayout.php:39
-#: Zotlabs/Module/Editwebpage.php:42 Zotlabs/Module/Hcard.php:18
-#: Zotlabs/Module/Layouts.php:39 Zotlabs/Module/Editblock.php:40
-#: Zotlabs/Module/Menu.php:97 Zotlabs/Module/Connect.php:19
-#: Zotlabs/Module/Webpages.php:44 Zotlabs/Module/Profile.php:28
+#: Code/Lib/Libprofile.php:96 Code/Module/Cards.php:42
+#: Code/Module/Blocks.php:41 Code/Module/Editlayout.php:39
+#: Code/Module/Editwebpage.php:42 Code/Module/Hcard.php:18
+#: Code/Module/Layouts.php:39 Code/Module/Editblock.php:40
+#: Code/Module/Menu.php:97 Code/Module/Connect.php:19
+#: Code/Module/Webpages.php:44 Code/Module/Profile.php:28
 #: extend/addon/a/gallery/Mod_Gallery.php:50
 msgid "Requested profile is not available."
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:196 Zotlabs/Module/Profiles.php:773
+#: Code/Lib/Libprofile.php:196 Code/Module/Profiles.php:773
 msgid "Change profile photo"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:203 Zotlabs/Module/Profiles.php:878
+#: Code/Lib/Libprofile.php:203 Code/Module/Profiles.php:878
 #: include/nav.php:120
 msgid "Edit Profiles"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:204
+#: Code/Lib/Libprofile.php:204
 msgid "Create New Profile"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:206 include/nav.php:122
+#: Code/Lib/Libprofile.php:206 include/nav.php:122
 msgid "Edit Profile"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:223 Zotlabs/Module/Profiles.php:868
+#: Code/Lib/Libprofile.php:223 Code/Module/Profiles.php:868
 msgid "Profile Image"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:226
+#: Code/Lib/Libprofile.php:226
 msgid "Visible to everybody"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:227 Zotlabs/Module/Profiles.php:770
-#: Zotlabs/Module/Profiles.php:872
+#: Code/Lib/Libprofile.php:227 Code/Module/Profiles.php:770
+#: Code/Module/Profiles.php:872
 msgid "Edit visibility"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:287 Zotlabs/Module/Directory.php:399
-#: Zotlabs/Module/Fedi_id.php:52 Zotlabs/Widget/Follow.php:38
-#: Zotlabs/Widget/Suggestions.php:50 include/connections.php:147
+#: Code/Lib/Libprofile.php:287 Code/Module/Directory.php:399
+#: Code/Module/Fedi_id.php:52 Code/Widget/Follow.php:38
+#: Code/Widget/Suggestions.php:50 include/connections.php:147
 #: include/conversation.php:975
 msgid "Connect"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:306 Zotlabs/Module/Directory.php:381
+#: Code/Lib/Libprofile.php:306 Code/Module/Directory.php:381
 #: include/event.php:81 include/event.php:139
 msgid "Location:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:311 Zotlabs/Lib/Libprofile.php:485
+#: Code/Lib/Libprofile.php:311 Code/Lib/Libprofile.php:485
 msgid "Gender:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:312 Zotlabs/Lib/Libprofile.php:535
+#: Code/Lib/Libprofile.php:312 Code/Lib/Libprofile.php:535
 msgid "Status:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:313 Zotlabs/Lib/Libprofile.php:568
+#: Code/Lib/Libprofile.php:313 Code/Lib/Libprofile.php:568
 msgid "Homepage:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:314 Zotlabs/Lib/Libprofile.php:564
+#: Code/Lib/Libprofile.php:314 Code/Lib/Libprofile.php:564
 msgid "Pronouns:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:375 Zotlabs/Module/Connections.php:63
-#: Zotlabs/Module/Connections.php:122 Zotlabs/Module/Connections.php:133
-#: Zotlabs/Module/Connections.php:293
+#: Code/Lib/Libprofile.php:375 Code/Module/Connections.php:63
+#: Code/Module/Connections.php:122 Code/Module/Connections.php:133
+#: Code/Module/Connections.php:293
 msgid "Active"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:379
+#: Code/Lib/Libprofile.php:379
 msgid "Change your profile photo"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:380
+#: Code/Lib/Libprofile.php:380
 msgid "Copy to clipboard"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:381
+#: Code/Lib/Libprofile.php:381
 msgid "Address copied to clipboard"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:409 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003
+#: Code/Lib/Libprofile.php:409 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003
 msgid "Female"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:412 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003
+#: Code/Lib/Libprofile.php:412 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003
 msgid "Male"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:415
+#: Code/Lib/Libprofile.php:415
 msgid "Trans"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:418
+#: Code/Lib/Libprofile.php:418
 msgid "Inter"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:421 Zotlabs/Module/Profiles.php:985
+#: Code/Lib/Libprofile.php:421 Code/Module/Profiles.php:985
 msgid "Neuter"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:424 Zotlabs/Module/Profiles.php:985
+#: Code/Lib/Libprofile.php:424 Code/Module/Profiles.php:985
 msgid "Non-specific"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:438
+#: Code/Lib/Libprofile.php:438
 msgid "She"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:441
+#: Code/Lib/Libprofile.php:441
 msgid "Him"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:444
+#: Code/Lib/Libprofile.php:444
 msgid "Them"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:482
+#: Code/Lib/Libprofile.php:482
 msgid "Full Name:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:519
+#: Code/Lib/Libprofile.php:519
 msgid "j F, Y"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:520
+#: Code/Lib/Libprofile.php:520
 msgid "j F"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:527
+#: Code/Lib/Libprofile.php:527
 msgid "Birthday:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:531 Zotlabs/Module/Directory.php:376
+#: Code/Lib/Libprofile.php:531 Code/Module/Directory.php:376
 msgid "Age:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:543
+#: Code/Lib/Libprofile.php:543
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:555
+#: Code/Lib/Libprofile.php:555
 msgid "Tags:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:560
+#: Code/Lib/Libprofile.php:560
 msgid "Sexual Preference:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:572 Zotlabs/Module/Directory.php:396
+#: Code/Lib/Libprofile.php:572 Code/Module/Directory.php:396
 msgid "Hometown:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:576
+#: Code/Lib/Libprofile.php:576
 msgid "Political Views:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:580
+#: Code/Lib/Libprofile.php:580
 msgid "Religion:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:584 Zotlabs/Module/Directory.php:398
+#: Code/Lib/Libprofile.php:584 Code/Module/Directory.php:398
 msgid "About:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:588
+#: Code/Lib/Libprofile.php:588
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:592
+#: Code/Lib/Libprofile.php:592
 msgid "Likes:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:596
+#: Code/Lib/Libprofile.php:596
 msgid "Dislikes:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:600
+#: Code/Lib/Libprofile.php:600
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:604
+#: Code/Lib/Libprofile.php:604
 msgid "My other channels:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:608
+#: Code/Lib/Libprofile.php:608
 msgid "Musical interests:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:612
+#: Code/Lib/Libprofile.php:612
 msgid "Books, literature:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:616
+#: Code/Lib/Libprofile.php:616
 msgid "Television:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:620
+#: Code/Lib/Libprofile.php:620
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:624
+#: Code/Lib/Libprofile.php:624
 msgid "Love/Romance:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:628
+#: Code/Lib/Libprofile.php:628
 msgid "Work/employment:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:632
+#: Code/Lib/Libprofile.php:632
 msgid "School/education:"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:658
+#: Code/Lib/Libprofile.php:658
 msgid "Like this thing"
 msgstr ""
 
-#: Zotlabs/Lib/Libprofile.php:659 Zotlabs/Module/Cal.php:355
-#: Zotlabs/Module/Events.php:756
+#: Code/Lib/Libprofile.php:659 Code/Module/Cal.php:355
+#: Code/Module/Events.php:756
 msgid "Export"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:2882
+#: Code/Lib/Activity.php:2882
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:2885
+#: Code/Lib/Activity.php:2885
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:2891
+#: Code/Lib/Activity.php:2891
 #, php-format
 msgid "Will attend %s's event"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:2894
+#: Code/Lib/Activity.php:2894
 #, php-format
 msgid "Will not attend %s's event"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:2897
+#: Code/Lib/Activity.php:2897
 #, php-format
 msgid "May attend %s's event"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:2900
+#: Code/Lib/Activity.php:2900
 #, php-format
 msgid "May not attend %s's event"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:2905 Zotlabs/Lib/Share.php:124
-#: Zotlabs/Module/Share.php:118 include/items.php:3413
+#: Code/Lib/Activity.php:2905 Code/Lib/Share.php:124
+#: Code/Module/Share.php:118 include/items.php:3413
 #, php-format
 msgid "🔁 Repeated %1$s's %2$s"
 msgstr ""
 
-#: Zotlabs/Lib/Activity.php:3352 include/text.php:1687 include/text.php:3141
+#: Code/Lib/Activity.php:3352 include/text.php:1687 include/text.php:3141
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:40 include/acl_selectors.php:37
+#: Code/Lib/PermissionDescription.php:40 include/acl_selectors.php:37
 msgid "Visible to your default audience"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:117 include/acl_selectors.php:135
+#: Code/Lib/PermissionDescription.php:117 include/acl_selectors.php:135
 msgid "Only me"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:119
+#: Code/Lib/PermissionDescription.php:119
 msgid "Public"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:121
+#: Code/Lib/PermissionDescription.php:121
 msgid "Anybody in the $Projectname network"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:123
+#: Code/Lib/PermissionDescription.php:123
 #, php-format
 msgid "Any account on %s"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:125
+#: Code/Lib/PermissionDescription.php:125
 msgid "Any of my connections"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:127
+#: Code/Lib/PermissionDescription.php:127
 msgid "Only connections I specifically allow"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:129
+#: Code/Lib/PermissionDescription.php:129
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:131
+#: Code/Lib/PermissionDescription.php:131
 msgid "Any connections including those who haven't yet been approved"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:180
+#: Code/Lib/PermissionDescription.php:180
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:182
+#: Code/Lib/PermissionDescription.php:182
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:184
+#: Code/Lib/PermissionDescription.php:184
 msgid "This is your default setting for who can view your connections"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:186
+#: Code/Lib/PermissionDescription.php:186
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr ""
 
-#: Zotlabs/Lib/PermissionDescription.php:188
+#: Code/Lib/PermissionDescription.php:188
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
-#: Zotlabs/Lib/Language.php:408 include/language.php:429 include/text.php:2186
+#: Code/Lib/Language.php:408 include/language.php:429 include/text.php:2186
 msgid "default"
 msgstr ""
 
-#: Zotlabs/Lib/Language.php:421 include/language.php:442
+#: Code/Lib/Language.php:421 include/language.php:442
 msgid "Select an alternate language"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:29
+#: Code/Lib/AccessList.php:29
 msgid ""
 "A deleted list with this name was revived. Existing item permissions "
 "may apply to this list and any future members. If this is "
 "not what you intended, please create another list with a different name."
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:345
+#: Code/Lib/AccessList.php:345
 msgid "Add new connections to this access list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:372
+#: Code/Lib/AccessList.php:372
 msgid "edit"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:392
+#: Code/Lib/AccessList.php:392
 msgid "Edit list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:393
+#: Code/Lib/AccessList.php:393
 msgid "Create new list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:394
+#: Code/Lib/AccessList.php:394
 msgid "Channels not in any access list"
 msgstr ""
 
-#: Zotlabs/Lib/AccessList.php:396 Zotlabs/Widget/Savedsearch.php:95
+#: Code/Lib/AccessList.php:396 Code/Widget/Savedsearch.php:95
 msgid "add"
 msgstr ""
 
-#: Zotlabs/Module/Lockview.php:86 Zotlabs/Module/Lockview.php:128
+#: Code/Module/Lockview.php:86 Code/Module/Lockview.php:128
 msgid "Visible to:"
 msgstr ""
 
-#: Zotlabs/Module/Lockview.php:102
+#: Code/Module/Lockview.php:102
 msgid "Everybody"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:93 Zotlabs/Module/Events.php:142
+#: Code/Module/Calendar.php:93 Code/Module/Events.php:142
 msgid "Event can not end before it has started."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:95 Zotlabs/Module/Calendar.php:103
-#: Zotlabs/Module/Calendar.php:120 Zotlabs/Module/Events.php:144
-#: Zotlabs/Module/Events.php:153 Zotlabs/Module/Events.php:175
+#: Code/Module/Calendar.php:95 Code/Module/Calendar.php:103
+#: Code/Module/Calendar.php:120 Code/Module/Events.php:144
+#: Code/Module/Events.php:153 Code/Module/Events.php:175
 msgid "Unable to generate preview."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:101 Zotlabs/Module/Events.php:151
+#: Code/Module/Calendar.php:101 Code/Module/Events.php:151
 msgid "Event title and start time are required."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:118 Zotlabs/Module/Calendar.php:258
-#: Zotlabs/Module/Events.php:173 Zotlabs/Module/Events.php:299
+#: Code/Module/Calendar.php:118 Code/Module/Calendar.php:258
+#: Code/Module/Events.php:173 Code/Module/Events.php:299
 msgid "Event not found."
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:254 Zotlabs/Module/Events.php:295
-#: Zotlabs/Module/Like.php:174 Zotlabs/Module/Tagger.php:88
+#: Code/Module/Calendar.php:254 Code/Module/Events.php:295
+#: Code/Module/Like.php:174 Code/Module/Tagger.php:88
 #: include/conversation.php:132 include/event.php:1338 include/text.php:2372
 msgid "event"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:423 Zotlabs/Module/Events.php:699
+#: Code/Module/Calendar.php:423 Code/Module/Events.php:699
 msgid "Edit event"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:425 Zotlabs/Module/Events.php:701
+#: Code/Module/Calendar.php:425 Code/Module/Events.php:701
 msgid "Delete event"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:439 Zotlabs/Module/Cdav.php:951
+#: Code/Module/Calendar.php:439 Code/Module/Cdav.php:951
 msgid "Link to source"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:453 Zotlabs/Module/Events.php:734
+#: Code/Module/Calendar.php:453 Code/Module/Events.php:734
 msgid "calendar"
 msgstr ""
 
-#: Zotlabs/Module/Calendar.php:489 Zotlabs/Module/Events.php:860
+#: Code/Module/Calendar.php:489 Code/Module/Events.php:860
 msgid "Failed to remove event"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:102 Zotlabs/Module/Cal.php:70
-#: Zotlabs/Module/Block.php:49 Zotlabs/Module/Card_edit.php:54
-#: Zotlabs/Module/Page.php:84 Zotlabs/Module/Superblock.php:64
-#: Zotlabs/Module/Wall_upload.php:37 include/items.php:4563
+#: Code/Module/Chanview.php:102 Code/Module/Cal.php:70
+#: Code/Module/Block.php:49 Code/Module/Card_edit.php:54
+#: Code/Module/Page.php:84 Code/Module/Superblock.php:64
+#: Code/Module/Wall_upload.php:37 include/items.php:4563
 msgid "Channel not found."
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:149 Zotlabs/Module/Chanview.php:150
+#: Code/Module/Chanview.php:149 Code/Module/Chanview.php:150
 msgid "Not available"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:169
+#: Code/Module/Chanview.php:169
 msgid "Cover photo for this channel"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:171
+#: Code/Module/Chanview.php:171
 msgid "Followers"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:172
+#: Code/Module/Chanview.php:172
 msgid "Following"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:175 include/conversation.php:955
+#: Code/Module/Chanview.php:175 include/conversation.php:955
 msgid "Visit"
 msgstr ""
 
-#: Zotlabs/Module/Chanview.php:176
+#: Code/Module/Chanview.php:176
 msgid "toggle full screen mode"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:31
+#: Code/Module/Admin/Account_edit.php:31
 #, php-format
 msgid "Password changed for account %d."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:47
+#: Code/Module/Admin/Account_edit.php:47
 msgid "Account settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:66
+#: Code/Module/Admin/Account_edit.php:66
 msgid "Account not found."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:73
+#: Code/Module/Admin/Account_edit.php:73
 msgid "Account Edit"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:74
+#: Code/Module/Admin/Account_edit.php:74
 msgid "New Password"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:75
+#: Code/Module/Admin/Account_edit.php:75
 msgid "New Password again"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:76
+#: Code/Module/Admin/Account_edit.php:76
 msgid "Account language (for emails)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Account_edit.php:77
+#: Code/Module/Admin/Account_edit.php:77
 msgid "Service class"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:40
+#: Code/Module/Admin/Accounts.php:40
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s accounts blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Accounts.php:48
+#: Code/Module/Admin/Accounts.php:48
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Accounts.php:88
+#: Code/Module/Admin/Accounts.php:88
 msgid "Account not found"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:99 include/channel.php:2312
+#: Code/Module/Admin/Accounts.php:99 include/channel.php:2312
 #, php-format
 msgid "Account '%s' deleted"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:108
+#: Code/Module/Admin/Accounts.php:108
 #, php-format
 msgid "Account '%s' blocked"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:117
+#: Code/Module/Admin/Accounts.php:117
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:175 Zotlabs/Module/Admin/Addons.php:343
-#: Zotlabs/Module/Admin/Addons.php:443 Zotlabs/Module/Admin/Channels.php:169
-#: Zotlabs/Module/Admin/Logs.php:82 Zotlabs/Module/Admin/Security.php:135
-#: Zotlabs/Module/Admin/Site.php:310 Zotlabs/Module/Admin/Themes.php:134
-#: Zotlabs/Module/Admin/Themes.php:168 Zotlabs/Module/Admin.php:179
+#: Code/Module/Admin/Accounts.php:175 Code/Module/Admin/Addons.php:343
+#: Code/Module/Admin/Addons.php:443 Code/Module/Admin/Channels.php:169
+#: Code/Module/Admin/Logs.php:82 Code/Module/Admin/Security.php:135
+#: Code/Module/Admin/Site.php:310 Code/Module/Admin/Themes.php:134
+#: Code/Module/Admin/Themes.php:168 Code/Module/Admin.php:179
 msgid "Administration"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:176 Zotlabs/Module/Admin/Accounts.php:189
-#: Zotlabs/Module/Admin.php:123 Zotlabs/Widget/Admin.php:29
+#: Code/Module/Admin/Accounts.php:176 Code/Module/Admin/Accounts.php:189
+#: Code/Module/Admin.php:123 Code/Widget/Admin.php:29
 msgid "Accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:178 Zotlabs/Module/Admin/Channels.php:172
+#: Code/Module/Admin/Accounts.php:178 Code/Module/Admin/Channels.php:172
 msgid "select all"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:179
+#: Code/Module/Admin/Accounts.php:179
 msgid "Registrations waiting for confirm"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:180
+#: Code/Module/Admin/Accounts.php:180
 msgid "Request date"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:180 Zotlabs/Module/Admin/Accounts.php:192
-#: Zotlabs/Module/Cdav.php:1354 Zotlabs/Module/Connedit.php:867
-#: Zotlabs/Module/Profiles.php:836 include/network.php:1690
+#: Code/Module/Admin/Accounts.php:180 Code/Module/Admin/Accounts.php:192
+#: Code/Module/Cdav.php:1354 Code/Module/Connedit.php:867
+#: Code/Module/Profiles.php:836 include/network.php:1690
 msgid "Email"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:181
+#: Code/Module/Admin/Accounts.php:181
 msgid "No registrations."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:182 Zotlabs/Module/Connections.php:341
+#: Code/Module/Admin/Accounts.php:182 Code/Module/Connections.php:341
 #: include/conversation.php:653
 msgid "Approve"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:183 Zotlabs/Module/Authorize.php:39
+#: Code/Module/Admin/Accounts.php:183 Code/Module/Authorize.php:39
 msgid "Deny"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:185 Zotlabs/Module/Connedit.php:576
-#: Zotlabs/Widget/Sblock.php:21
+#: Code/Module/Admin/Accounts.php:185 Code/Module/Connedit.php:576
+#: Code/Widget/Sblock.php:21
 msgid "Block"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:186 Zotlabs/Module/Connedit.php:576
+#: Code/Module/Admin/Accounts.php:186 Code/Module/Connedit.php:576
 msgid "Unblock"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:191
+#: Code/Module/Admin/Accounts.php:191
 msgid "ID"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:193
+#: Code/Module/Admin/Accounts.php:193
 msgid "All Channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:194
+#: Code/Module/Admin/Accounts.php:194
 msgid "Register date"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:195
+#: Code/Module/Admin/Accounts.php:195
 msgid "Last login"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:196
+#: Code/Module/Admin/Accounts.php:196
 msgid "Expires"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:197
+#: Code/Module/Admin/Accounts.php:197
 msgid "Service Class"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:199
+#: Code/Module/Admin/Accounts.php:199
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Accounts.php:200
+#: Code/Module/Admin/Accounts.php:200
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:259 Zotlabs/Module/Admin/Themes.php:80
-#: Zotlabs/Module/Admin.php:89 Zotlabs/Module/Display.php:64
-#: Zotlabs/Module/Display.php:512 Zotlabs/Module/Filestorage.php:37
-#: Zotlabs/Module/Thing.php:108 Zotlabs/Module/Viewsrc.php:28
-#: Zotlabs/Module/Inspect.php:34
+#: Code/Module/Admin/Addons.php:259 Code/Module/Admin/Themes.php:80
+#: Code/Module/Admin.php:89 Code/Module/Display.php:64
+#: Code/Module/Display.php:512 Code/Module/Filestorage.php:37
+#: Code/Module/Thing.php:108 Code/Module/Viewsrc.php:28
+#: Code/Module/Inspect.php:34
 #: extend/addon/a/flashcards/Mod_Flashcards.php:284
 #: extend/addon/a/flashcards/Mod_Flashcards.php:285 include/items.php:3894
 msgid "Item not found."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:289
+#: Code/Module/Admin/Addons.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:294
+#: Code/Module/Admin/Addons.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:311 Zotlabs/Module/Admin/Themes.php:105
+#: Code/Module/Admin/Addons.php:311 Code/Module/Admin/Themes.php:105
 msgid "Disable"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:314 Zotlabs/Module/Admin/Themes.php:108
+#: Code/Module/Admin/Addons.php:314 Code/Module/Admin/Themes.php:108
 msgid "Enable"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:344 Zotlabs/Module/Admin/Addons.php:444
-#: Zotlabs/Widget/Admin.php:33
+#: Code/Module/Admin/Addons.php:344 Code/Module/Admin/Addons.php:444
+#: Code/Widget/Admin.php:33
 msgid "Addons"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:345 Zotlabs/Module/Admin/Themes.php:136
+#: Code/Module/Admin/Addons.php:345 Code/Module/Admin/Themes.php:136
 msgid "Toggle"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:353 Zotlabs/Module/Admin/Themes.php:146
+#: Code/Module/Admin/Addons.php:353 Code/Module/Admin/Themes.php:146
 msgid "Author: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:354 Zotlabs/Module/Admin/Themes.php:147
+#: Code/Module/Admin/Addons.php:354 Code/Module/Admin/Themes.php:147
 msgid "Maintainer: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:355
+#: Code/Module/Admin/Addons.php:355
 msgid "Minimum project version: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:356
+#: Code/Module/Admin/Addons.php:356
 msgid "Maximum project version: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:357
+#: Code/Module/Admin/Addons.php:357
 msgid "Minimum PHP version: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:358
+#: Code/Module/Admin/Addons.php:358
 msgid "Compatible Server Roles: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:359
+#: Code/Module/Admin/Addons.php:359
 msgid "Requires: "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:360 Zotlabs/Module/Admin/Addons.php:449
+#: Code/Module/Admin/Addons.php:360 Code/Module/Admin/Addons.php:449
 msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:417
+#: Code/Module/Admin/Addons.php:417
 msgid "Enter the public git repository URL of the addon repo."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:418
+#: Code/Module/Admin/Addons.php:418
 msgid "Addon repo git URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:419
+#: Code/Module/Admin/Addons.php:419
 msgid "Custom repo name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:419
+#: Code/Module/Admin/Addons.php:419
 msgid "(optional)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:420
+#: Code/Module/Admin/Addons.php:420
 msgid "Download Addon Repo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:428
+#: Code/Module/Admin/Addons.php:428
 msgid "Install new repo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:430 Zotlabs/Module/Admin/Cover_photo.php:378
-#: Zotlabs/Module/Admin/Profile_photo.php:474 Zotlabs/Module/Cdav.php:1060
-#: Zotlabs/Module/Cdav.php:1368 Zotlabs/Module/Connedit.php:881
-#: Zotlabs/Module/Cover_photo.php:424 Zotlabs/Module/Editlayout.php:152
-#: Zotlabs/Module/Editwebpage.php:184 Zotlabs/Module/Filer.php:62
-#: Zotlabs/Module/Fbrowser.php:73 Zotlabs/Module/Fbrowser.php:96
-#: Zotlabs/Module/Card_edit.php:140 Zotlabs/Module/Editblock.php:154
-#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Profiles.php:850
-#: Zotlabs/Module/Profile_photo.php:513 Zotlabs/Module/Settings/Oauth.php:96
-#: Zotlabs/Module/Settings/Oauth.php:124 Zotlabs/Module/Settings/Oauth2.php:114
-#: Zotlabs/Module/Settings/Oauth2.php:144 Zotlabs/Module/Tagrm.php:21
-#: Zotlabs/Module/Tagrm.php:152 include/conversation.php:1427
+#: Code/Module/Admin/Addons.php:430 Code/Module/Admin/Cover_photo.php:378
+#: Code/Module/Admin/Profile_photo.php:474 Code/Module/Cdav.php:1060
+#: Code/Module/Cdav.php:1368 Code/Module/Connedit.php:881
+#: Code/Module/Cover_photo.php:424 Code/Module/Editlayout.php:152
+#: Code/Module/Editwebpage.php:184 Code/Module/Filer.php:62
+#: Code/Module/Fbrowser.php:73 Code/Module/Fbrowser.php:96
+#: Code/Module/Card_edit.php:140 Code/Module/Editblock.php:154
+#: Code/Module/Editpost.php:147 Code/Module/Profiles.php:850
+#: Code/Module/Profile_photo.php:513 Code/Module/Settings/Oauth.php:96
+#: Code/Module/Settings/Oauth.php:124 Code/Module/Settings/Oauth2.php:114
+#: Code/Module/Settings/Oauth2.php:144 Code/Module/Tagrm.php:21
+#: Code/Module/Tagrm.php:152 include/conversation.php:1427
 #: include/conversation.php:1493 include/conversation.php:1495
 #: include/conversation.php:1497
 msgid "Cancel"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:452
+#: Code/Module/Admin/Addons.php:452
 msgid "Manage Repos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:453
+#: Code/Module/Admin/Addons.php:453
 msgid "Installed Addon Repositories"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:454
+#: Code/Module/Admin/Addons.php:454
 msgid "Install a New Addon Repository"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:460 Zotlabs/Module/Cdav.php:1055
-#: Zotlabs/Module/Cdav.php:1366 Zotlabs/Module/Connedit.php:879
-#: Zotlabs/Module/Profiles.php:848 Zotlabs/Module/Settings/Oauth.php:45
-#: Zotlabs/Module/Settings/Oauth.php:123 Zotlabs/Module/Settings/Oauth2.php:55
-#: Zotlabs/Module/Settings/Oauth2.php:143
+#: Code/Module/Admin/Addons.php:460 Code/Module/Cdav.php:1055
+#: Code/Module/Cdav.php:1366 Code/Module/Connedit.php:879
+#: Code/Module/Profiles.php:848 Code/Module/Settings/Oauth.php:45
+#: Code/Module/Settings/Oauth.php:123 Code/Module/Settings/Oauth2.php:55
+#: Code/Module/Settings/Oauth2.php:143
 msgid "Update"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:461
+#: Code/Module/Admin/Addons.php:461
 msgid "Switch branch"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Addons.php:462 Zotlabs/Module/Photos.php:1068
-#: Zotlabs/Module/Tagrm.php:151 Zotlabs/Module/Superblock.php:234
-#: Zotlabs/Module/Superblock.php:251
+#: Code/Module/Admin/Addons.php:462 Code/Module/Photos.php:1068
+#: Code/Module/Tagrm.php:151 Code/Module/Superblock.php:234
+#: Code/Module/Superblock.php:251
 msgid "Remove"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:37
+#: Code/Module/Admin/Channels.php:37
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Channels.php:47
+#: Code/Module/Admin/Channels.php:47
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Channels.php:53
+#: Code/Module/Admin/Channels.php:53
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Admin/Channels.php:74
+#: Code/Module/Admin/Channels.php:74
 msgid "Channel not found"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:85
+#: Code/Module/Admin/Channels.php:85
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:100
+#: Code/Module/Admin/Channels.php:100
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:100
+#: Code/Module/Admin/Channels.php:100
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:114
+#: Code/Module/Admin/Channels.php:114
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:114
+#: Code/Module/Admin/Channels.php:114
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:170 Zotlabs/Module/Admin.php:142
-#: Zotlabs/Module/Manage.php:182 Zotlabs/Widget/Admin.php:30
+#: Code/Module/Admin/Channels.php:170 Code/Module/Admin.php:142
+#: Code/Module/Manage.php:182 Code/Widget/Admin.php:30
 #: include/nav.php:100
 msgid "Channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:174 Zotlabs/Module/Connedit.php:592
-#: Zotlabs/Module/Directory.php:391
+#: Code/Module/Admin/Channels.php:174 Code/Module/Connedit.php:592
+#: Code/Module/Directory.php:391
 msgid "Censor"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:175 Zotlabs/Module/Connedit.php:592
-#: Zotlabs/Module/Directory.php:391
+#: Code/Module/Admin/Channels.php:175 Code/Module/Connedit.php:592
+#: Code/Module/Directory.php:391
 msgid "Uncensor"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:176
+#: Code/Module/Admin/Channels.php:176
 msgid "Allow Code"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:177
+#: Code/Module/Admin/Channels.php:177
 msgid "Disallow Code"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:178 include/conversation.php:1978
+#: Code/Module/Admin/Channels.php:178 include/conversation.php:1978
 #: include/nav.php:400
 msgid "Channel"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:182
+#: Code/Module/Admin/Channels.php:182
 msgid "UID"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:183 Zotlabs/Module/Cdav.php:1350
-#: Zotlabs/Module/Connedit.php:863 Zotlabs/Module/Connections.php:236
-#: Zotlabs/Module/Chat.php:256 Zotlabs/Module/Lists.php:202
-#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth.php:125
-#: Zotlabs/Module/Settings/Oauth2.php:115
-#: Zotlabs/Module/Settings/Oauth2.php:145 Zotlabs/Module/Sharedwithme.php:107
-#: Zotlabs/Storage/Browser.php:313 Zotlabs/Widget/Activity_filter.php:294
+#: Code/Module/Admin/Channels.php:183 Code/Module/Cdav.php:1350
+#: Code/Module/Connedit.php:863 Code/Module/Connections.php:236
+#: Code/Module/Chat.php:256 Code/Module/Lists.php:202
+#: Code/Module/Settings/Oauth.php:97 Code/Module/Settings/Oauth.php:125
+#: Code/Module/Settings/Oauth2.php:115
+#: Code/Module/Settings/Oauth2.php:145 Code/Module/Sharedwithme.php:107
+#: Code/Storage/Browser.php:313 Code/Widget/Activity_filter.php:294
 msgid "Name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:184 Zotlabs/Module/Cdav.php:1357
-#: Zotlabs/Module/Connedit.php:870 Zotlabs/Module/Locs.php:133
-#: Zotlabs/Module/Profiles.php:527 Zotlabs/Module/Profiles.php:839
+#: Code/Module/Admin/Channels.php:184 Code/Module/Cdav.php:1357
+#: Code/Module/Connedit.php:870 Code/Module/Locs.php:133
+#: Code/Module/Profiles.php:527 Code/Module/Profiles.php:839
 msgid "Address"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:186
+#: Code/Module/Admin/Channels.php:186
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Channels.php:187
+#: Code/Module/Admin/Channels.php:187
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:64
-#: Zotlabs/Module/Admin/Profile_photo.php:67 Zotlabs/Module/Cover_photo.php:64
-#: Zotlabs/Module/Profile_photo.php:64
+#: Code/Module/Admin/Cover_photo.php:64
+#: Code/Module/Admin/Profile_photo.php:67 Code/Module/Cover_photo.php:64
+#: Code/Module/Profile_photo.php:64
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:175
-#: Zotlabs/Module/Admin/Cover_photo.php:259 Zotlabs/Module/Cover_photo.php:175
-#: Zotlabs/Module/Cover_photo.php:262
+#: Code/Module/Admin/Cover_photo.php:175
+#: Code/Module/Admin/Cover_photo.php:259 Code/Module/Cover_photo.php:175
+#: Code/Module/Cover_photo.php:262
 msgid "Cover Photos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:199
-#: Zotlabs/Module/Admin/Profile_photo.php:145
-#: Zotlabs/Module/Cover_photo.php:199 Zotlabs/Module/Profile_photo.php:144
+#: Code/Module/Admin/Cover_photo.php:199
+#: Code/Module/Admin/Profile_photo.php:145
+#: Code/Module/Cover_photo.php:199 Code/Module/Profile_photo.php:144
 msgid "Image resize failed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:208
-#: Zotlabs/Module/Admin/Profile_photo.php:191
-#: Zotlabs/Module/Cover_photo.php:211 Zotlabs/Module/Profile_photo.php:227
+#: Code/Module/Admin/Cover_photo.php:208
+#: Code/Module/Admin/Profile_photo.php:191
+#: Code/Module/Cover_photo.php:211 Code/Module/Profile_photo.php:227
 #: include/photos.php:200
 msgid "Unable to process image"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:317
-#: Zotlabs/Module/Admin/Cover_photo.php:333
-#: Zotlabs/Module/Admin/Profile_photo.php:354
-#: Zotlabs/Module/Admin/Profile_photo.php:397
-#: Zotlabs/Module/Cover_photo.php:364 Zotlabs/Module/Cover_photo.php:380
-#: Zotlabs/Module/Profile_photo.php:386 Zotlabs/Module/Profile_photo.php:437
+#: Code/Module/Admin/Cover_photo.php:317
+#: Code/Module/Admin/Cover_photo.php:333
+#: Code/Module/Admin/Profile_photo.php:354
+#: Code/Module/Admin/Profile_photo.php:397
+#: Code/Module/Cover_photo.php:364 Code/Module/Cover_photo.php:380
+#: Code/Module/Profile_photo.php:386 Code/Module/Profile_photo.php:437
 msgid "Photo not available."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:369 Zotlabs/Module/Cover_photo.php:415
+#: Code/Module/Admin/Cover_photo.php:369 Code/Module/Cover_photo.php:415
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:371
-#: Zotlabs/Module/Admin/Profile_photo.php:465
-#: Zotlabs/Module/Cover_photo.php:417 Zotlabs/Module/Profile_photo.php:504
+#: Code/Module/Admin/Cover_photo.php:371
+#: Code/Module/Admin/Profile_photo.php:465
+#: Code/Module/Cover_photo.php:417 Code/Module/Profile_photo.php:504
 msgid "Upload File:"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:372
-#: Zotlabs/Module/Admin/Profile_photo.php:466
-#: Zotlabs/Module/Cover_photo.php:418 Zotlabs/Module/Profile_photo.php:505
+#: Code/Module/Admin/Cover_photo.php:372
+#: Code/Module/Admin/Profile_photo.php:466
+#: Code/Module/Cover_photo.php:418 Code/Module/Profile_photo.php:505
 msgid "Select a profile:"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:373 Zotlabs/Module/Cover_photo.php:419
+#: Code/Module/Admin/Cover_photo.php:373 Code/Module/Cover_photo.php:419
 msgid "Change Cover Photo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:374
-#: Zotlabs/Module/Admin/Profile_photo.php:468
-#: Zotlabs/Module/Cover_photo.php:420 Zotlabs/Module/Embedphotos.php:225
-#: Zotlabs/Module/Profile_photo.php:507 Zotlabs/Module/Photos.php:746
-#: Zotlabs/Storage/Browser.php:422 Zotlabs/Widget/Album.php:107
-#: Zotlabs/Widget/Portfolio.php:122 Zotlabs/Widget/Cdav.php:154
-#: Zotlabs/Widget/Cdav.php:188
+#: Code/Module/Admin/Cover_photo.php:374
+#: Code/Module/Admin/Profile_photo.php:468
+#: Code/Module/Cover_photo.php:420 Code/Module/Embedphotos.php:225
+#: Code/Module/Profile_photo.php:507 Code/Module/Photos.php:746
+#: Code/Storage/Browser.php:422 Code/Widget/Album.php:107
+#: Code/Widget/Portfolio.php:122 Code/Widget/Cdav.php:154
+#: Code/Widget/Cdav.php:188
 msgid "Upload"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:376
-#: Zotlabs/Module/Admin/Cover_photo.php:377
-#: Zotlabs/Module/Admin/Profile_photo.php:472
-#: Zotlabs/Module/Admin/Profile_photo.php:473
-#: Zotlabs/Module/Cover_photo.php:422 Zotlabs/Module/Cover_photo.php:423
-#: Zotlabs/Module/Profile_photo.php:511 Zotlabs/Module/Profile_photo.php:512
+#: Code/Module/Admin/Cover_photo.php:376
+#: Code/Module/Admin/Cover_photo.php:377
+#: Code/Module/Admin/Profile_photo.php:472
+#: Code/Module/Admin/Profile_photo.php:473
+#: Code/Module/Cover_photo.php:422 Code/Module/Cover_photo.php:423
+#: Code/Module/Profile_photo.php:511 Code/Module/Profile_photo.php:512
 msgid "Use a photo from your albums"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:379
-#: Zotlabs/Module/Admin/Profile_photo.php:475
-#: Zotlabs/Module/Cover_photo.php:425 Zotlabs/Module/Profile_photo.php:514
+#: Code/Module/Admin/Cover_photo.php:379
+#: Code/Module/Admin/Profile_photo.php:475
+#: Code/Module/Cover_photo.php:425 Code/Module/Profile_photo.php:514
 #: include/conversation.php:1428 include/conversation.php:1492
 #: include/conversation.php:1494 include/conversation.php:1496
 msgid "OK"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:380
-#: Zotlabs/Module/Admin/Profile_photo.php:476
-#: Zotlabs/Module/Cover_photo.php:426 Zotlabs/Module/Profile_photo.php:515
+#: Code/Module/Admin/Cover_photo.php:380
+#: Code/Module/Admin/Profile_photo.php:476
+#: Code/Module/Cover_photo.php:426 Code/Module/Profile_photo.php:515
 #: include/conversation.php:1292
 msgid "Choose images to embed"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:381
-#: Zotlabs/Module/Admin/Profile_photo.php:477
-#: Zotlabs/Module/Cover_photo.php:427 Zotlabs/Module/Profile_photo.php:516
+#: Code/Module/Admin/Cover_photo.php:381
+#: Code/Module/Admin/Profile_photo.php:477
+#: Code/Module/Cover_photo.php:427 Code/Module/Profile_photo.php:516
 #: include/conversation.php:1293
 msgid "Choose an album"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:382
-#: Zotlabs/Module/Admin/Profile_photo.php:478
-#: Zotlabs/Module/Cover_photo.php:428 Zotlabs/Module/Profile_photo.php:517
+#: Code/Module/Admin/Cover_photo.php:382
+#: Code/Module/Admin/Profile_photo.php:478
+#: Code/Module/Cover_photo.php:428 Code/Module/Profile_photo.php:517
 msgid "Choose a different album"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:383
-#: Zotlabs/Module/Admin/Profile_photo.php:479
-#: Zotlabs/Module/Cover_photo.php:429 Zotlabs/Module/Profile_photo.php:518
+#: Code/Module/Admin/Cover_photo.php:383
+#: Code/Module/Admin/Profile_photo.php:479
+#: Code/Module/Cover_photo.php:429 Code/Module/Profile_photo.php:518
 #: include/conversation.php:1295
 msgid "Error getting album list"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:384
-#: Zotlabs/Module/Admin/Profile_photo.php:480
-#: Zotlabs/Module/Cover_photo.php:430 Zotlabs/Module/Profile_photo.php:519
+#: Code/Module/Admin/Cover_photo.php:384
+#: Code/Module/Admin/Profile_photo.php:480
+#: Code/Module/Cover_photo.php:430 Code/Module/Profile_photo.php:519
 #: include/conversation.php:1296
 msgid "Error getting photo link"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:385
-#: Zotlabs/Module/Admin/Profile_photo.php:481
-#: Zotlabs/Module/Cover_photo.php:431 Zotlabs/Module/Profile_photo.php:520
+#: Code/Module/Admin/Cover_photo.php:385
+#: Code/Module/Admin/Profile_photo.php:481
+#: Code/Module/Cover_photo.php:431 Code/Module/Profile_photo.php:520
 #: include/conversation.php:1297
 msgid "Error getting album"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:387
-#: Zotlabs/Module/Admin/Profile_photo.php:483
-#: Zotlabs/Module/Cover_photo.php:433 Zotlabs/Module/Profile_photo.php:522
+#: Code/Module/Admin/Cover_photo.php:387
+#: Code/Module/Admin/Profile_photo.php:483
+#: Code/Module/Cover_photo.php:433 Code/Module/Profile_photo.php:522
 msgid "Select previously uploaded photo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:403
-#: Zotlabs/Module/Admin/Profile_photo.php:498
-#: Zotlabs/Module/Cover_photo.php:449 Zotlabs/Module/Profile_photo.php:537
+#: Code/Module/Admin/Cover_photo.php:403
+#: Code/Module/Admin/Profile_photo.php:498
+#: Code/Module/Cover_photo.php:449 Code/Module/Profile_photo.php:537
 msgid "Crop Image"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:404
-#: Zotlabs/Module/Admin/Profile_photo.php:499
-#: Zotlabs/Module/Cover_photo.php:450 Zotlabs/Module/Profile_photo.php:538
+#: Code/Module/Admin/Cover_photo.php:404
+#: Code/Module/Admin/Profile_photo.php:499
+#: Code/Module/Cover_photo.php:450 Code/Module/Profile_photo.php:538
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Cover_photo.php:406
-#: Zotlabs/Module/Admin/Profile_photo.php:501
-#: Zotlabs/Module/Cover_photo.php:452 Zotlabs/Module/Profile_photo.php:540
+#: Code/Module/Admin/Cover_photo.php:406
+#: Code/Module/Admin/Profile_photo.php:501
+#: Code/Module/Cover_photo.php:452 Code/Module/Profile_photo.php:540
 msgid "Done Editing"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:20 Zotlabs/Module/Admin/Dbsync.php:55
+#: Code/Module/Admin/Dbsync.php:20 Code/Module/Admin/Dbsync.php:55
 msgid "Update has been marked successful"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:32
+#: Code/Module/Admin/Dbsync.php:32
 #, php-format
 msgid "Verification of update %s failed. Check system logs."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:34 Zotlabs/Module/Admin/Dbsync.php:69
+#: Code/Module/Admin/Dbsync.php:34 Code/Module/Admin/Dbsync.php:69
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:37
+#: Code/Module/Admin/Dbsync.php:37
 #, php-format
 msgid "Verifying update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:40
+#: Code/Module/Admin/Dbsync.php:40
 #, php-format
 msgid "Update %s does not contain a verification function."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:43 Zotlabs/Module/Admin/Dbsync.php:75
+#: Code/Module/Admin/Dbsync.php:43 Code/Module/Admin/Dbsync.php:75
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:67
+#: Code/Module/Admin/Dbsync.php:67
 #, php-format
 msgid "Executing update procedure %s failed. Check system logs."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:72
+#: Code/Module/Admin/Dbsync.php:72
 #, php-format
 msgid ""
 "Update %s did not return a status. It cannot be determined if it was "
 "successful."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:95
+#: Code/Module/Admin/Dbsync.php:95
 msgid "Failed Updates"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:97
+#: Code/Module/Admin/Dbsync.php:97
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:98
+#: Code/Module/Admin/Dbsync.php:98
 msgid "Attempt to verify this update if a verification procedure exists"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:99
+#: Code/Module/Admin/Dbsync.php:99
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Dbsync.php:103
+#: Code/Module/Admin/Dbsync.php:103
 msgid "No failed updates."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:28
+#: Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:83 Zotlabs/Widget/Admin.php:54
-#: Zotlabs/Widget/Admin.php:64
+#: Code/Module/Admin/Logs.php:83 Code/Widget/Admin.php:54
+#: Code/Widget/Admin.php:64
 msgid "Logs"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:85
+#: Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:91
+#: Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:92
+#: Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:92
+#: Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Logs.php:93
+#: Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:121
-#: Zotlabs/Module/Admin/Profile_photo.php:251
-#: Zotlabs/Module/Profile_photo.php:118 Zotlabs/Module/Profile_photo.php:287
+#: Code/Module/Admin/Profile_photo.php:121
+#: Code/Module/Admin/Profile_photo.php:251
+#: Code/Module/Profile_photo.php:118 Code/Module/Profile_photo.php:287
 #: include/photo_factory.php:539
 msgid "Profile Photos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:189
-#: Zotlabs/Module/Profile_photo.php:222
+#: Code/Module/Admin/Profile_photo.php:189
+#: Code/Module/Profile_photo.php:222
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:266
-#: Zotlabs/Module/Profile_photo.php:302
+#: Code/Module/Admin/Profile_photo.php:266
+#: Code/Module/Profile_photo.php:302
 msgid "Image upload failed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:285
-#: Zotlabs/Module/Profile_photo.php:321
+#: Code/Module/Admin/Profile_photo.php:285
+#: Code/Module/Profile_photo.php:321
 msgid "Unable to process image."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:463
-#: Zotlabs/Module/Profile_photo.php:502
+#: Code/Module/Admin/Profile_photo.php:463
+#: Code/Module/Profile_photo.php:502
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:463
+#: Code/Module/Admin/Profile_photo.php:463
 msgid ""
 "Your site photo is visible to anybody on the internet and may be distributed "
 "to other websites."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
+#: Code/Module/Admin/Profile_photo.php:467
 msgid "Use Photo for Site Logo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:467
+#: Code/Module/Admin/Profile_photo.php:467
 msgid "Change Site Logo"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profile_photo.php:468
-#: Zotlabs/Module/Profile_photo.php:507
+#: Code/Module/Admin/Profile_photo.php:468
+#: Code/Module/Profile_photo.php:507
 msgid "Use"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:94
+#: Code/Module/Admin/Profs.php:94
 msgid "New Profile Field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:95 Zotlabs/Module/Admin/Profs.php:116
+#: Code/Module/Admin/Profs.php:95 Code/Module/Admin/Profs.php:116
 msgid "Field nickname"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:95 Zotlabs/Module/Admin/Profs.php:116
+#: Code/Module/Admin/Profs.php:95 Code/Module/Admin/Profs.php:116
 msgid "System name of field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:96 Zotlabs/Module/Admin/Profs.php:117
+#: Code/Module/Admin/Profs.php:96 Code/Module/Admin/Profs.php:117
 msgid "Input type"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:97 Zotlabs/Module/Admin/Profs.php:118
+#: Code/Module/Admin/Profs.php:97 Code/Module/Admin/Profs.php:118
 msgid "Field Name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:97 Zotlabs/Module/Admin/Profs.php:118
+#: Code/Module/Admin/Profs.php:97 Code/Module/Admin/Profs.php:118
 msgid "Label on profile pages"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:98 Zotlabs/Module/Admin/Profs.php:119
+#: Code/Module/Admin/Profs.php:98 Code/Module/Admin/Profs.php:119
 msgid "Help text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:98 Zotlabs/Module/Admin/Profs.php:119
+#: Code/Module/Admin/Profs.php:98 Code/Module/Admin/Profs.php:119
 msgid "Additional info (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:109
+#: Code/Module/Admin/Profs.php:109
 msgid "Field definition not found"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:115
+#: Code/Module/Admin/Profs.php:115
 msgid "Edit Profile Field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:181
+#: Code/Module/Admin/Profs.php:181
 msgid "Profile Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:182
+#: Code/Module/Admin/Profs.php:182
 msgid "Basic Profile Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:183
+#: Code/Module/Admin/Profs.php:183
 msgid "Advanced Profile Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:183
+#: Code/Module/Admin/Profs.php:183
 msgid "(In addition to basic fields)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:185
+#: Code/Module/Admin/Profs.php:185
 msgid "All available fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:186
+#: Code/Module/Admin/Profs.php:186
 msgid "Custom Fields"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Profs.php:190
+#: Code/Module/Admin/Profs.php:190
 msgid "Create Custom Field"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:35
+#: Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:36
+#: Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:37
+#: Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:38
+#: Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:39
+#: Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:40
+#: Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Queue.php:41
+#: Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:126
+#: Code/Module/Admin/Security.php:126
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
 "insecure."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:129
+#: Code/Module/Admin/Security.php:129
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:130
+#: Code/Module/Admin/Security.php:130
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/"
 "
              https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:131
+#: Code/Module/Admin/Security.php:131
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:136 Zotlabs/Widget/Admin.php:31
+#: Code/Module/Admin/Security.php:136 Code/Widget/Admin.php:31
 msgid "Security"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:138
+#: Code/Module/Admin/Security.php:138
 msgid "Block public"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:138
+#: Code/Module/Admin/Security.php:138
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:139
+#: Code/Module/Admin/Security.php:139
 msgid "Block public search"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:139
+#: Code/Module/Admin/Security.php:139
 msgid ""
 "Prevent access to search content unless you are currently authenticated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Security.php:140 Code/Module/Admin/Site.php:339
 msgid "Block directory from visitors"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:140 Zotlabs/Module/Admin/Site.php:339
+#: Code/Module/Admin/Security.php:140 Code/Module/Admin/Site.php:339
 msgid "Only allow authenticated access to directory."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid "Hide local directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:141
+#: Code/Module/Admin/Security.php:141
 msgid "Only use the global directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid "Provide a cloud root directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:142
+#: Code/Module/Admin/Security.php:142
 msgid ""
 "The cloud root directory lists all channel names which provide public files. "
 "Otherwise only the names of connections are shown."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:143
+#: Code/Module/Admin/Security.php:143
 msgid "Show total disk space available to cloud uploads"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "Allow SVG thumbnails in file browser"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:144
+#: Code/Module/Admin/Security.php:144
 msgid "WARNING: SVG images may contain malicious code."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:146
+#: Code/Module/Admin/Security.php:146
 msgid "Allow embedded (inline) PDF files"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid "Permit anonymous comments"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:147
+#: Code/Module/Admin/Security.php:147
 msgid ""
 "Moderation will be performed by channels that select this comment option."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:148
+#: Code/Module/Admin/Security.php:148
 msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:149
+#: Code/Module/Admin/Security.php:149
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid "Allowed email domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:150
+#: Code/Module/Admin/Security.php:150
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:151
+#: Code/Module/Admin/Security.php:151
 msgid "Not allowed email domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:151
+#: Code/Module/Admin/Security.php:151
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:152
+#: Code/Module/Admin/Security.php:152
 msgid "Allow communications only from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:152 Zotlabs/Module/Admin/Security.php:157
+#: Code/Module/Admin/Security.php:152 Code/Module/Admin/Security.php:157
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:153
+#: Code/Module/Admin/Security.php:153
 msgid "Block communications from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:154
+#: Code/Module/Admin/Security.php:154
 msgid "Allow communications only from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:154 Zotlabs/Module/Admin/Security.php:159
+#: Code/Module/Admin/Security.php:154 Code/Module/Admin/Security.php:159
 msgid ""
 "One channel (hash) per line. Leave empty to allow communication from any "
 "channel by default"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:155
+#: Code/Module/Admin/Security.php:155
 msgid "Block communications from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:157
+#: Code/Module/Admin/Security.php:157
 msgid "Allow public stream communications only from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:158
+#: Code/Module/Admin/Security.php:158
 msgid "Block public stream communications from these sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:159
+#: Code/Module/Admin/Security.php:159
 msgid "Allow public stream communications only from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:160
+#: Code/Module/Admin/Security.php:160
 msgid "Block public stream communications from these channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:163
+#: Code/Module/Admin/Security.php:163
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:164
+#: Code/Module/Admin/Security.php:164
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:164
+#: Code/Module/Admin/Security.php:164
 msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Security.php:165
+#: Code/Module/Admin/Security.php:165
 msgid "Block embedded HTML from these domains"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:192
+#: Code/Module/Admin/Site.php:192
 msgid "Site settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:221 include/text.php:3568
+#: Code/Module/Admin/Site.php:221 include/text.php:3568
 #: view/theme/redbasic/php/config.php:15
 msgid "Default"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:232 Zotlabs/Module/Settings/Display.php:147
+#: Code/Module/Admin/Site.php:232 Code/Module/Settings/Display.php:147
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:240
+#: Code/Module/Admin/Site.php:240
 msgid "mobile"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:243
+#: Code/Module/Admin/Site.php:243
 msgid "experimental"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:246
+#: Code/Module/Admin/Site.php:246
 msgid "unsupported"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:288
+#: Code/Module/Admin/Site.php:288
 msgid "Yes - with approval"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:294
+#: Code/Module/Admin/Site.php:294
 msgid "My site is not a public server"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:295
+#: Code/Module/Admin/Site.php:295
 msgid "My site provides free public access"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:296
+#: Code/Module/Admin/Site.php:296
 msgid "My site provides paid public access"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:297
+#: Code/Module/Admin/Site.php:297
 msgid "My site provides free public access and premium paid plans"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:303
+#: Code/Module/Admin/Site.php:303
 msgid "Default permission role for new accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:303
+#: Code/Module/Admin/Site.php:303
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:311 Zotlabs/Widget/Admin.php:26
+#: Code/Module/Admin/Site.php:311 Code/Widget/Admin.php:26
 msgid "Site"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:313
+#: Code/Module/Admin/Site.php:313
 msgid "Site Configuration"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:314 Zotlabs/Module/Register.php:287
+#: Code/Module/Admin/Site.php:314 Code/Module/Register.php:287
 msgid "Registration"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:315
+#: Code/Module/Admin/Site.php:315
 msgid "File upload"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:316
+#: Code/Module/Admin/Site.php:316
 msgid "Policies"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:317 Zotlabs/Widget/Findpeople.php:26
+#: Code/Module/Admin/Site.php:317 Code/Widget/Findpeople.php:26
 msgid "Advanced"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:319
+#: Code/Module/Admin/Site.php:319
 msgid "Site name"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:320
+#: Code/Module/Admin/Site.php:320
 msgid "Administrator Information"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:320
+#: Code/Module/Admin/Site.php:320
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode may be used here."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:321 Zotlabs/Module/Siteinfo.php:38
+#: Code/Module/Admin/Site.php:321 Code/Module/Siteinfo.php:38
 msgid "Site Information"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:321
+#: Code/Module/Admin/Site.php:321
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode may be used here."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:322
+#: Code/Module/Admin/Site.php:322
 msgid "System language"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid "System theme"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:323
+#: Code/Module/Admin/Site.php:323
 msgid ""
 "Default system theme - may be over-ridden by user profiles -               change theme settings"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid "ActivityPub protocol"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:326
+#: Code/Module/Admin/Site.php:326
 msgid "Provides access to software supporting the ActivityPub protocol."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:327
+#: Code/Module/Admin/Site.php:327
 msgid "Maximum image size"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:327
+#: Code/Module/Admin/Site.php:327
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:328
+#: Code/Module/Admin/Site.php:328
 msgid "Cache all public images"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:328
+#: Code/Module/Admin/Site.php:328
 msgid "If disabled, proxy non-SSL images, but do not store locally"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:329
+#: Code/Module/Admin/Site.php:329
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid "Invitation only"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:330
+#: Code/Module/Admin/Site.php:330
 msgid ""
 "Only allow new member registrations with an invitation code. New member "
 "registration must be allowed for this to work."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:332
+#: Code/Module/Admin/Site.php:332
 msgid "Minimum age"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:332
+#: Code/Module/Admin/Site.php:332
 msgid "Minimum age (in years) for who may register on this site."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:333
+#: Code/Module/Admin/Site.php:333
 msgid ""
 "If a public server policy is selected, this information may be displayed on "
 "the public server site list."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:334
+#: Code/Module/Admin/Site.php:334
 msgid "Register text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:334
+#: Code/Module/Admin/Site.php:334
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:336
+#: Code/Module/Admin/Site.php:336
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:337
+#: Code/Module/Admin/Site.php:337
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:338
+#: Code/Module/Admin/Site.php:338
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:338
+#: Code/Module/Admin/Site.php:338
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:340
+#: Code/Module/Admin/Site.php:340
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid "Force publish in directory"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:341
+#: Code/Module/Admin/Site.php:341
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid "Public stream"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:343
+#: Code/Module/Admin/Site.php:343
 msgid "Provide a Public stream on your site. This content is unmoderated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:344
+#: Code/Module/Admin/Site.php:344
 msgid "the Public stream is disabled"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:345
+#: Code/Module/Admin/Site.php:345
 msgid "the Public stream contains public conversations from this site only"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:346
+#: Code/Module/Admin/Site.php:346
 msgid ""
 "the Public stream contains public conversations from anywhere on the internet"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:349
+#: Code/Module/Admin/Site.php:349
 msgid "Allow anybody on the internet to access the Public stream"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:349
+#: Code/Module/Admin/Site.php:349
 msgid ""
 "Default is to only allow viewing by site members. Warning: this content is "
 "unmoderated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:350
+#: Code/Module/Admin/Site.php:350
 msgid "Show numbers of likes and dislikes in conversations"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:350
+#: Code/Module/Admin/Site.php:350
 msgid ""
 "If disabled, the presence of likes and dislikes will be shown, but without "
 "totals."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:351
+#: Code/Module/Admin/Site.php:351
 msgid "Permit animated profile photos"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:351
+#: Code/Module/Admin/Site.php:351
 msgid "Changing this may take several days to work through the system"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:352
+#: Code/Module/Admin/Site.php:352
 msgid "Only import Public stream posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:352 Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:352 Code/Module/Admin/Site.php:353
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:353
+#: Code/Module/Admin/Site.php:353
 msgid "Do not import Public stream posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid "Maximum number of imported friends of friends"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:354
+#: Code/Module/Admin/Site.php:354
 msgid ""
 "Warning: higher numbers will improve the quality of friend suggestions and "
 "directory results but can exponentially increase resource usage"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:355
+#: Code/Module/Admin/Site.php:355
 msgid "Login on Homepage"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:355
+#: Code/Module/Admin/Site.php:355
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:356
 msgid "Enable context help"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:356
+#: Code/Module/Admin/Site.php:356
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:357
+#: Code/Module/Admin/Site.php:357
 msgid "Reply-to email address for system generated email."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:358
+#: Code/Module/Admin/Site.php:358
 msgid "Sender (From) email address for system generated email."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:359
+#: Code/Module/Admin/Site.php:359
 msgid "Display name of email sender for system generated email."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:360
+#: Code/Module/Admin/Site.php:360
 msgid "Directory Server URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:360
+#: Code/Module/Admin/Site.php:360
 msgid "Default directory server"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:361
+#: Code/Module/Admin/Site.php:361
 msgid "Proxy user"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:362
+#: Code/Module/Admin/Site.php:362
 msgid "Proxy URL"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:363
+#: Code/Module/Admin/Site.php:363
 msgid "Network fetch timeout"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:363 Zotlabs/Module/Admin/Site.php:364
+#: Code/Module/Admin/Site.php:363 Code/Module/Admin/Site.php:364
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:364
+#: Code/Module/Admin/Site.php:364
 msgid "Network post timeout"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:365
+#: Code/Module/Admin/Site.php:365
 msgid "Delivery interval"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:365
+#: Code/Module/Admin/Site.php:365
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:366
+#: Code/Module/Admin/Site.php:366
 msgid "Deliveries per process"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:366
+#: Code/Module/Admin/Site.php:366
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:367
 msgid "Queue Threshold"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:367
+#: Code/Module/Admin/Site.php:367
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid "Poll interval"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:368
+#: Code/Module/Admin/Site.php:368
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid "Path to ImageMagick convert program"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:369
+#: Code/Module/Admin/Site.php:369
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid "Maximum Load Average"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:370
+#: Code/Module/Admin/Site.php:370
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid "Expiration period in days for imported streams and cached images"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:371
+#: Code/Module/Admin/Site.php:371
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:372
+#: Code/Module/Admin/Site.php:372
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:373
+#: Code/Module/Admin/Site.php:373
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "Page to display after creating a new channel"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:374
+#: Code/Module/Admin/Site.php:374
 msgid "Default: profiles"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:375
+#: Code/Module/Admin/Site.php:375
 msgid "Site location"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Site.php:375
+#: Code/Module/Admin/Site.php:375
 msgid "Region or country - shared with other sites"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:29
+#: Code/Module/Admin/Themes.php:29
 msgid "Theme settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:69
+#: Code/Module/Admin/Themes.php:69
 msgid "No themes found."
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:127
+#: Code/Module/Admin/Themes.php:127
 msgid "Screenshot"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:135 Zotlabs/Module/Admin/Themes.php:169
-#: Zotlabs/Widget/Admin.php:34
+#: Code/Module/Admin/Themes.php:135 Code/Module/Admin/Themes.php:169
+#: Code/Widget/Admin.php:34
 msgid "Themes"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:174
+#: Code/Module/Admin/Themes.php:174
 msgid "[Experimental]"
 msgstr ""
 
-#: Zotlabs/Module/Admin/Themes.php:175
+#: Code/Module/Admin/Themes.php:175
 msgid "[Unsupported]"
 msgstr ""
 
-#: Zotlabs/Module/Drafts.php:23
+#: Code/Module/Drafts.php:23
 msgid ""
 "This app allows you to save posts you are writing and finish them later "
 "prior to sharing/publishing."
 msgstr ""
 
-#: Zotlabs/Module/Api.php:84 Zotlabs/Module/Api.php:106
+#: Code/Module/Api.php:84 Code/Module/Api.php:106
 msgid "Authorize application connection"
 msgstr ""
 
-#: Zotlabs/Module/Api.php:85
+#: Code/Module/Api.php:85
 msgid "Return to your app and insert this Security Code:"
 msgstr ""
 
-#: Zotlabs/Module/Api.php:95
+#: Code/Module/Api.php:95
 msgid "Please login to continue."
 msgstr ""
 
-#: Zotlabs/Module/Api.php:108
+#: Code/Module/Api.php:108
 msgid ""
 "Do you want to authorize this application to access your posts and contacts, "
 "and/or create new posts for you?"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:46
+#: Code/Module/Apporder.php:46
 msgid "Change Order of Pinned Navbar Apps"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:46
+#: Code/Module/Apporder.php:46
 msgid "Change Order of App Tray Apps"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:47
+#: Code/Module/Apporder.php:47
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the "
 "navbar"
 msgstr ""
 
-#: Zotlabs/Module/Apporder.php:48
+#: Code/Module/Apporder.php:48
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
 
-#: Zotlabs/Module/Follow.php:135
+#: Code/Module/Follow.php:135
 msgid "Connection added."
 msgstr ""
 
-#: Zotlabs/Module/Apps.php:59 Zotlabs/Widget/Appstore.php:15
+#: Code/Module/Apps.php:59 Code/Widget/Appstore.php:15
 #: include/nav.php:315
 msgid "Available Apps"
 msgstr ""
 
-#: Zotlabs/Module/Apps.php:59 Zotlabs/Widget/Appstore.php:14
+#: Code/Module/Apps.php:59 Code/Widget/Appstore.php:14
 #: include/nav.php:314
 msgid "Installed Apps"
 msgstr ""
 
-#: Zotlabs/Module/Apps.php:62
+#: Code/Module/Apps.php:62
 msgid "Manage apps"
 msgstr ""
 
-#: Zotlabs/Module/Apps.php:63
+#: Code/Module/Apps.php:63
 msgid "Create Custom App"
 msgstr ""
 
-#: Zotlabs/Module/Common.php:21
+#: Code/Module/Common.php:21
 msgid "No channel."
 msgstr ""
 
-#: Zotlabs/Module/Common.php:55
+#: Code/Module/Common.php:55
 msgid "No connections in common."
 msgstr ""
 
-#: Zotlabs/Module/Common.php:75
+#: Code/Module/Common.php:75
 msgid "View Common Connections"
 msgstr ""
 
-#: Zotlabs/Module/Attach.php:18
+#: Code/Module/Attach.php:18
 msgid "Item not available."
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:23
+#: Code/Module/Authorize.php:23
 msgid "Unknown App"
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:35
+#: Code/Module/Authorize.php:35
 msgid "Authorize"
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:36
+#: Code/Module/Authorize.php:36
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr ""
 
-#: Zotlabs/Module/Authorize.php:38
+#: Code/Module/Authorize.php:38
 msgid "Allow"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:77
+#: Code/Module/Cal.php:77
 msgid "Permissions denied."
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:283 Zotlabs/Module/Events.php:672
+#: Code/Module/Cal.php:283 Code/Module/Events.php:672
 msgid "l, F j"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:331 Zotlabs/Module/Events.php:727
+#: Code/Module/Cal.php:331 Code/Module/Events.php:727
 #: include/text.php:2167
 msgid "Link to Source"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753
+#: Code/Module/Cal.php:352 Code/Module/Events.php:753
 msgid "Edit Event"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:352 Zotlabs/Module/Events.php:753
+#: Code/Module/Cal.php:352 Code/Module/Events.php:753
 msgid "Create Event"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:353 Zotlabs/Module/Cal.php:360
-#: Zotlabs/Module/Cdav.php:1037 Zotlabs/Module/Events.php:754
-#: Zotlabs/Module/Events.php:763 Zotlabs/Module/Photos.php:1015
+#: Code/Module/Cal.php:353 Code/Module/Cal.php:360
+#: Code/Module/Cdav.php:1037 Code/Module/Events.php:754
+#: Code/Module/Events.php:763 Code/Module/Photos.php:1015
 msgid "Previous"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:354 Zotlabs/Module/Cal.php:361
-#: Zotlabs/Module/Cdav.php:1038 Zotlabs/Module/Events.php:755
-#: Zotlabs/Module/Events.php:764 Zotlabs/Module/Setup.php:286
-#: Zotlabs/Module/Photos.php:1025
+#: Code/Module/Cal.php:354 Code/Module/Cal.php:361
+#: Code/Module/Cdav.php:1038 Code/Module/Events.php:755
+#: Code/Module/Events.php:764 Code/Module/Setup.php:286
+#: Code/Module/Photos.php:1025
 msgid "Next"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:358 include/text.php:2875
+#: Code/Module/Cal.php:358 include/text.php:2875
 msgid "Import"
 msgstr ""
 
-#: Zotlabs/Module/Cal.php:362 Zotlabs/Module/Cdav.php:1039
-#: Zotlabs/Module/Events.php:765
+#: Code/Module/Cal.php:362 Code/Module/Cdav.php:1039
+#: Code/Module/Events.php:765
 msgid "Today"
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:25
+#: Code/Module/Expire.php:25
 msgid "Expiration settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:35
+#: Code/Module/Expire.php:35
 msgid ""
 "This app allows you to set an optional expiration date/time for your own "
 "posts, after which they will be deleted. This must be at least fifteen "
@@ -3489,860 +3489,860 @@ msgid ""
 "your posts after a set number of days"
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:44
+#: Code/Module/Expire.php:44
 msgid "Expire and delete all my posts after this many days"
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:44
+#: Code/Module/Expire.php:44
 msgid ""
 "Leave at 0 if you wish to manually control expiration of specific posts."
 msgstr ""
 
-#: Zotlabs/Module/Expire.php:48
+#: Code/Module/Expire.php:48
 msgid "Automatic Expiration Settings"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:124
+#: Code/Module/Admin.php:124
 msgid "Blocked accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:125
+#: Code/Module/Admin.php:125
 msgid "Expired accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:126
+#: Code/Module/Admin.php:126
 msgid "Expiring accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:143 Zotlabs/Module/Locs.php:134
+#: Code/Module/Admin.php:143 Code/Module/Locs.php:134
 msgid "Primary"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:144
+#: Code/Module/Admin.php:144
 msgid "Clones"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:150
+#: Code/Module/Admin.php:150
 msgid "Message queues"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:174
+#: Code/Module/Admin.php:174
 msgid "Your software should be updated"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:180 include/conversation.php:1504
+#: Code/Module/Admin.php:180 include/conversation.php:1504
 msgid "Summary"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:183
+#: Code/Module/Admin.php:183
 msgid "Registered accounts"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:184
+#: Code/Module/Admin.php:184
 msgid "Pending registrations"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:185
+#: Code/Module/Admin.php:185
 msgid "Registered channels"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:186
+#: Code/Module/Admin.php:186
 msgid "Active addons"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:187 Zotlabs/Module/Sites.php:103
+#: Code/Module/Admin.php:187 Code/Module/Sites.php:103
 msgid "Version"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:188
+#: Code/Module/Admin.php:188
 msgid "Repository version (release)"
 msgstr ""
 
-#: Zotlabs/Module/Admin.php:189
+#: Code/Module/Admin.php:189
 msgid "Repository version (dev)"
 msgstr ""
 
-#: Zotlabs/Module/Block.php:36 Zotlabs/Module/Page.php:46
+#: Code/Module/Block.php:36 Code/Module/Page.php:46
 msgid "Invalid item."
 msgstr ""
 
-#: Zotlabs/Module/Block.php:86 Zotlabs/Module/Display.php:158
-#: Zotlabs/Module/Display.php:176 Zotlabs/Module/Display.php:194
-#: Zotlabs/Module/Display.php:200 Zotlabs/Module/Page.php:148
-#: Zotlabs/Web/Router.php:166
+#: Code/Module/Block.php:86 Code/Module/Display.php:158
+#: Code/Module/Display.php:176 Code/Module/Display.php:194
+#: Code/Module/Display.php:200 Code/Module/Page.php:148
+#: Code/Web/Router.php:166
 msgid "Page not found."
 msgstr ""
 
-#: Zotlabs/Module/Cards.php:52
+#: Code/Module/Cards.php:52
 msgid "Create personal planning cards"
 msgstr ""
 
-#: Zotlabs/Module/Cards.php:110
+#: Code/Module/Cards.php:110
 msgid "Add Card"
 msgstr ""
 
-#: Zotlabs/Module/Cards.php:111 Zotlabs/Module/Blocks.php:172
-#: Zotlabs/Module/Cdav.php:1061 Zotlabs/Module/Cdav.php:1365
-#: Zotlabs/Module/Connedit.php:878 Zotlabs/Module/Layouts.php:199
-#: Zotlabs/Module/Menu.php:187 Zotlabs/Module/New_channel.php:203
-#: Zotlabs/Module/Webpages.php:264 Zotlabs/Module/Profiles.php:847
-#: Zotlabs/Storage/Browser.php:302 Zotlabs/Storage/Browser.php:420
-#: Zotlabs/Widget/Cdav.php:148 Zotlabs/Widget/Cdav.php:184
+#: Code/Module/Cards.php:111 Code/Module/Blocks.php:172
+#: Code/Module/Cdav.php:1061 Code/Module/Cdav.php:1365
+#: Code/Module/Connedit.php:878 Code/Module/Layouts.php:199
+#: Code/Module/Menu.php:187 Code/Module/New_channel.php:203
+#: Code/Module/Webpages.php:264 Code/Module/Profiles.php:847
+#: Code/Storage/Browser.php:302 Code/Storage/Browser.php:420
+#: Code/Widget/Cdav.php:148 Code/Widget/Cdav.php:184
 msgid "Create"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:106 Zotlabs/Module/Blocks.php:168
-#: Zotlabs/Module/Editblock.php:126
+#: Code/Module/Blocks.php:106 Code/Module/Blocks.php:168
+#: Code/Module/Editblock.php:126
 msgid "Block Name"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:167 include/text.php:2850
+#: Code/Module/Blocks.php:167 include/text.php:2850
 msgid "Blocks"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:169
+#: Code/Module/Blocks.php:169
 msgid "Block Title"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:170 Zotlabs/Module/Connections.php:250
-#: Zotlabs/Module/Layouts.php:205 Zotlabs/Module/Menu.php:183
-#: Zotlabs/Module/Webpages.php:276
+#: Code/Module/Blocks.php:170 Code/Module/Connections.php:250
+#: Code/Module/Layouts.php:205 Code/Module/Menu.php:183
+#: Code/Module/Webpages.php:276
 msgid "Created"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:171 Zotlabs/Module/Layouts.php:206
-#: Zotlabs/Module/Menu.php:184 Zotlabs/Module/Webpages.php:277
+#: Code/Module/Blocks.php:171 Code/Module/Layouts.php:206
+#: Code/Module/Menu.php:184 Code/Module/Webpages.php:277
 msgid "Edited"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:174 Zotlabs/Module/Layouts.php:208
-#: Zotlabs/Module/Webpages.php:266 Zotlabs/Module/Photos.php:1170
-#: Zotlabs/Widget/Cdav.php:144 include/conversation.php:1401
+#: Code/Module/Blocks.php:174 Code/Module/Layouts.php:208
+#: Code/Module/Webpages.php:266 Code/Module/Photos.php:1170
+#: Code/Widget/Cdav.php:144 include/conversation.php:1401
 msgid "Share"
 msgstr ""
 
-#: Zotlabs/Module/Blocks.php:179 Zotlabs/Module/Events.php:759
-#: Zotlabs/Module/Layouts.php:212 Zotlabs/Module/Webpages.php:271
+#: Code/Module/Blocks.php:179 Code/Module/Events.php:759
+#: Code/Module/Layouts.php:212 Code/Module/Webpages.php:271
 msgid "View"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:793 Zotlabs/Module/Events.php:39
+#: Code/Module/Cdav.php:793 Code/Module/Events.php:39
 msgid "Calendar entries imported."
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:795 Zotlabs/Module/Events.php:41
+#: Code/Module/Cdav.php:795 Code/Module/Events.php:41
 msgid "No calendar entries found."
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:857
+#: Code/Module/Cdav.php:857
 msgid "INVALID EVENT DISMISSED!"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:858
+#: Code/Module/Cdav.php:858
 msgid "Summary: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:859
+#: Code/Module/Cdav.php:859
 msgid "Date: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:860 Zotlabs/Module/Cdav.php:866
+#: Code/Module/Cdav.php:860 Code/Module/Cdav.php:866
 msgid "Reason: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:864
+#: Code/Module/Cdav.php:864
 msgid "INVALID CARD DISMISSED!"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:865
+#: Code/Module/Cdav.php:865
 msgid "Name: "
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:886
+#: Code/Module/Cdav.php:886
 msgid "CardDAV App"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:886 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
+#: Code/Module/Cdav.php:886 extend/addon/a/fuzzloc/Mod_Fuzzloc.php:37
 #: extend/addon/a/gallery/Mod_Gallery.php:59
 msgid "Not Installed"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:887
+#: Code/Module/Cdav.php:887
 msgid "CalDAV capable addressbook"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1014 Zotlabs/Module/Events.php:508
+#: Code/Module/Cdav.php:1014 Code/Module/Events.php:508
 msgid "Event title"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1015 Zotlabs/Module/Events.php:514
+#: Code/Module/Cdav.php:1015 Code/Module/Events.php:514
 msgid "Start date and time"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1016
+#: Code/Module/Cdav.php:1016
 msgid "End date and time"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1017 Zotlabs/Module/Appman.php:140
-#: Zotlabs/Module/Events.php:521
+#: Code/Module/Cdav.php:1017 Code/Module/Appman.php:140
+#: Code/Module/Events.php:521
 msgid "Description"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1018 Zotlabs/Module/Events.php:523
-#: Zotlabs/Module/Sites.php:94 Zotlabs/Module/Locs.php:132
-#: Zotlabs/Module/Profiles.php:536 Zotlabs/Module/Profiles.php:779
+#: Code/Module/Cdav.php:1018 Code/Module/Events.php:523
+#: Code/Module/Sites.php:94 Code/Module/Locs.php:132
+#: Code/Module/Profiles.php:536 Code/Module/Profiles.php:779
 #: include/js_strings.php:29
 msgid "Location"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1040 Zotlabs/Module/Events.php:760
+#: Code/Module/Cdav.php:1040 Code/Module/Events.php:760
 msgid "Month"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1041 Zotlabs/Module/Events.php:761
+#: Code/Module/Cdav.php:1041 Code/Module/Events.php:761
 msgid "Week"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1042 Zotlabs/Module/Events.php:762
+#: Code/Module/Cdav.php:1042 Code/Module/Events.php:762
 msgid "Day"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1043
+#: Code/Module/Cdav.php:1043
 msgid "List month"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1044
+#: Code/Module/Cdav.php:1044
 msgid "List week"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1045
+#: Code/Module/Cdav.php:1045
 msgid "List day"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1053
+#: Code/Module/Cdav.php:1053
 msgid "More"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1054
+#: Code/Module/Cdav.php:1054
 msgid "Less"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1056
+#: Code/Module/Cdav.php:1056
 msgid "Select calendar"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:151
+#: Code/Module/Cdav.php:1057 Code/Widget/Cdav.php:151
 msgid "Channel Calendars"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1057 Zotlabs/Widget/Cdav.php:137
-#: Zotlabs/Widget/Cdav.php:151
+#: Code/Module/Cdav.php:1057 Code/Widget/Cdav.php:137
+#: Code/Widget/Cdav.php:151
 msgid "CalDAV Calendars"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1059
+#: Code/Module/Cdav.php:1059
 msgid "Delete all"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1062
+#: Code/Module/Cdav.php:1062
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1351 Zotlabs/Module/Connedit.php:864
+#: Code/Module/Cdav.php:1351 Code/Module/Connedit.php:864
 msgid "Organisation"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1352 Zotlabs/Module/Connedit.php:865
+#: Code/Module/Cdav.php:1352 Code/Module/Connedit.php:865
 msgid "Title"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1353 Zotlabs/Module/Connedit.php:866
-#: Zotlabs/Module/Profiles.php:835
+#: Code/Module/Cdav.php:1353 Code/Module/Connedit.php:866
+#: Code/Module/Profiles.php:835
 msgid "Phone"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1355 Zotlabs/Module/Connedit.php:868
-#: Zotlabs/Module/Profiles.php:837
+#: Code/Module/Cdav.php:1355 Code/Module/Connedit.php:868
+#: Code/Module/Profiles.php:837
 msgid "Instant messenger"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1356 Zotlabs/Module/Connedit.php:869
-#: Zotlabs/Module/Profiles.php:838
+#: Code/Module/Cdav.php:1356 Code/Module/Connedit.php:869
+#: Code/Module/Profiles.php:838
 msgid "Website"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1358 Zotlabs/Module/Connedit.php:871
-#: Zotlabs/Module/Profiles.php:840
+#: Code/Module/Cdav.php:1358 Code/Module/Connedit.php:871
+#: Code/Module/Profiles.php:840
 msgid "Note"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1359 Zotlabs/Module/Connedit.php:872
-#: Zotlabs/Module/Profiles.php:841 include/connections.php:825
+#: Code/Module/Cdav.php:1359 Code/Module/Connedit.php:872
+#: Code/Module/Profiles.php:841 include/connections.php:825
 #: include/event.php:1514
 msgid "Mobile"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1360 Zotlabs/Module/Connedit.php:873
-#: Zotlabs/Module/Profiles.php:842 include/connections.php:826
+#: Code/Module/Cdav.php:1360 Code/Module/Connedit.php:873
+#: Code/Module/Profiles.php:842 include/connections.php:826
 #: include/event.php:1515
 msgid "Home"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1361 Zotlabs/Module/Connedit.php:874
-#: Zotlabs/Module/Profiles.php:843 include/connections.php:829
+#: Code/Module/Cdav.php:1361 Code/Module/Connedit.php:874
+#: Code/Module/Profiles.php:843 include/connections.php:829
 #: include/event.php:1518
 msgid "Work"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1362 Zotlabs/Module/Connedit.php:875
-#: Zotlabs/Module/Profiles.php:844 Zotlabs/Module/Profiles.php:985
-#: Zotlabs/Module/Profiles.php:1003 Zotlabs/Module/Profiles.php:1073
-#: Zotlabs/Module/Profiles.php:1110 include/connections.php:832
+#: Code/Module/Cdav.php:1362 Code/Module/Connedit.php:875
+#: Code/Module/Profiles.php:844 Code/Module/Profiles.php:985
+#: Code/Module/Profiles.php:1003 Code/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1110 include/connections.php:832
 #: include/connections.php:838 include/event.php:1521 include/event.php:1527
 msgid "Other"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1363 Zotlabs/Module/Connedit.php:876
-#: Zotlabs/Module/Profiles.php:845
+#: Code/Module/Cdav.php:1363 Code/Module/Connedit.php:876
+#: Code/Module/Profiles.php:845
 msgid "Add Contact"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1364 Zotlabs/Module/Connedit.php:877
-#: Zotlabs/Module/Profiles.php:846
+#: Code/Module/Cdav.php:1364 Code/Module/Connedit.php:877
+#: Code/Module/Profiles.php:846
 msgid "Add Field"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1369 Zotlabs/Module/Connedit.php:882
+#: Code/Module/Cdav.php:1369 Code/Module/Connedit.php:882
 msgid "P.O. Box"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1370 Zotlabs/Module/Connedit.php:883
+#: Code/Module/Cdav.php:1370 Code/Module/Connedit.php:883
 msgid "Additional"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1371 Zotlabs/Module/Connedit.php:884
+#: Code/Module/Cdav.php:1371 Code/Module/Connedit.php:884
 msgid "Street"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1372 Zotlabs/Module/Connedit.php:885
+#: Code/Module/Cdav.php:1372 Code/Module/Connedit.php:885
 msgid "Locality"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1373 Zotlabs/Module/Connedit.php:886
+#: Code/Module/Cdav.php:1373 Code/Module/Connedit.php:886
 msgid "Region"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1374 Zotlabs/Module/Connedit.php:887
+#: Code/Module/Cdav.php:1374 Code/Module/Connedit.php:887
 msgid "ZIP Code"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1375 Zotlabs/Module/Connedit.php:888
-#: Zotlabs/Module/Profiles.php:803
+#: Code/Module/Cdav.php:1375 Code/Module/Connedit.php:888
+#: Code/Module/Profiles.php:803
 msgid "Country"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1426
+#: Code/Module/Cdav.php:1426
 msgid "Default Calendar"
 msgstr ""
 
-#: Zotlabs/Module/Cdav.php:1437
+#: Code/Module/Cdav.php:1437
 msgid "Default Addressbook"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:57
+#: Code/Module/Changeaddr.php:57
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:69 include/channel.php:298
+#: Code/Module/Changeaddr.php:69 include/channel.php:298
 #: include/channel.php:749
 msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:74 include/channel.php:303
+#: Code/Module/Changeaddr.php:74 include/channel.php:303
 #: include/channel.php:754
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:88
+#: Code/Module/Changeaddr.php:88
 msgid "Feature has been disabled"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:107
+#: Code/Module/Changeaddr.php:107
 msgid "Change channel nickname/address"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:108 Zotlabs/Module/Removeme.php:72
-#: Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Changeaddr.php:108 Code/Module/Removeme.php:72
+#: Code/Module/Removeaccount.php:72
 msgid "WARNING: "
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:108
+#: Code/Module/Changeaddr.php:108
 msgid "Any/all connections on other networks will be lost!"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:109 Zotlabs/Module/Removeme.php:73
-#: Zotlabs/Module/Removeaccount.php:73
+#: Code/Module/Changeaddr.php:109 Code/Module/Removeme.php:73
+#: Code/Module/Removeaccount.php:73
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:110
+#: Code/Module/Changeaddr.php:110
 msgid "New channel address"
 msgstr ""
 
-#: Zotlabs/Module/Changeaddr.php:111
+#: Code/Module/Changeaddr.php:111
 msgid "Rename Channel"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:432
+#: Code/Module/Ping.php:432
 msgid "added your channel"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:457
+#: Code/Module/Ping.php:457
 msgid "requires approval"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:466
+#: Code/Module/Ping.php:466
 msgid "g A l F d"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:484
+#: Code/Module/Ping.php:484
 msgid "[today]"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:494
+#: Code/Module/Ping.php:494
 msgid "posted an event"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:528
+#: Code/Module/Ping.php:528
 msgid "shared a file with you"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:556
+#: Code/Module/Ping.php:556
 msgid "reported content"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:770
+#: Code/Module/Ping.php:770
 msgid "Private group"
 msgstr ""
 
-#: Zotlabs/Module/Ping.php:770
+#: Code/Module/Ping.php:770
 msgid "Public group"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:24
+#: Code/Module/Help.php:24
 msgid "Documentation Search"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:95
+#: Code/Module/Help.php:95
 msgid "Unknown language"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:114
+#: Code/Module/Help.php:114
 msgid "$Projectname Documentation"
 msgstr ""
 
-#: Zotlabs/Module/Help.php:115
+#: Code/Module/Help.php:115
 msgid "Contents"
 msgstr ""
 
-#: Zotlabs/Module/Chatsvc.php:146
+#: Code/Module/Chatsvc.php:146
 msgid "Away"
 msgstr ""
 
-#: Zotlabs/Module/Chatsvc.php:151
+#: Code/Module/Chatsvc.php:151
 msgid "Online"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:88 Zotlabs/Module/Defperms.php:74
+#: Code/Module/Connedit.php:88 Code/Module/Defperms.php:74
 msgid "Could not access contact record."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:120
+#: Code/Module/Connedit.php:120
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:203
+#: Code/Module/Connedit.php:203
 msgid "Connection updated."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:205
+#: Code/Module/Connedit.php:205
 msgid "Failed to update connection record."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:250
+#: Code/Module/Connedit.php:250
 msgid "is now connected to"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:377
+#: Code/Module/Connedit.php:377
 msgid "Could not access address book record."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:423
+#: Code/Module/Connedit.php:423
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:450
+#: Code/Module/Connedit.php:450
 msgid "Added by Connedit"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:488
+#: Code/Module/Connedit.php:488
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:505
+#: Code/Module/Connedit.php:505
 msgid "Connection has been removed."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:551
+#: Code/Module/Connedit.php:551
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:555
+#: Code/Module/Connedit.php:555
 msgid "Refresh Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:558
+#: Code/Module/Connedit.php:558
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:562
+#: Code/Module/Connedit.php:562
 msgid "Refresh Photo"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:565
+#: Code/Module/Connedit.php:565
 msgid "Fetch updated photo"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:569 include/conversation.php:965
+#: Code/Module/Connedit.php:569 include/conversation.php:965
 msgid "Recent Activity"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:572
+#: Code/Module/Connedit.php:572
 msgid "View recent posts and comments"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:579
+#: Code/Module/Connedit.php:579
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:580
+#: Code/Module/Connedit.php:580
 msgid "This connection is blocked"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:584
+#: Code/Module/Connedit.php:584
 msgid "Unignore"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:584 Zotlabs/Module/Connections.php:343
+#: Code/Module/Connedit.php:584 Code/Module/Connections.php:343
 msgid "Ignore"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:587
+#: Code/Module/Connedit.php:587
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:588
+#: Code/Module/Connedit.php:588
 msgid "This connection is ignored"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:595
+#: Code/Module/Connedit.php:595
 msgid "Censor (or Uncensor) images from this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:596
+#: Code/Module/Connedit.php:596
 msgid "This connection is censored"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:600
+#: Code/Module/Connedit.php:600
 msgid "Unarchive"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:600
+#: Code/Module/Connedit.php:600
 msgid "Archive"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:603
+#: Code/Module/Connedit.php:603
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:604
+#: Code/Module/Connedit.php:604
 msgid "This connection is archived"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:608
+#: Code/Module/Connedit.php:608
 msgid "Unhide"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:608
+#: Code/Module/Connedit.php:608
 msgid "Hide"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:611
+#: Code/Module/Connedit.php:611
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:612
+#: Code/Module/Connedit.php:612
 msgid "This connection is hidden"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:619
+#: Code/Module/Connedit.php:619
 msgid "Delete this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:627
+#: Code/Module/Connedit.php:627
 msgid "Fetch Vcard"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:630
+#: Code/Module/Connedit.php:630
 msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:637 Zotlabs/Module/Filestorage.php:230
-#: Zotlabs/Module/Thing.php:355 Zotlabs/Module/Thing.php:410
-#: Zotlabs/Module/Chat.php:240 Zotlabs/Module/Photos.php:736
-#: Zotlabs/Module/Photos.php:1121
+#: Code/Module/Connedit.php:637 Code/Module/Filestorage.php:230
+#: Code/Module/Thing.php:355 Code/Module/Thing.php:410
+#: Code/Module/Chat.php:240 Code/Module/Photos.php:736
+#: Code/Module/Photos.php:1121
 #: extend/addon/a/flashcards/Mod_Flashcards.php:254
 #: extend/addon/a/faces/Mod_Faces.php:172 include/acl_selectors.php:152
 msgid "Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:640
+#: Code/Module/Connedit.php:640
 msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:666
+#: Code/Module/Connedit.php:666
 msgid "Open Friend Zoom section by default"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:670 Zotlabs/Module/Affinity.php:61
-#: Zotlabs/Widget/Affinity.php:26
+#: Code/Module/Connedit.php:670 Code/Module/Affinity.php:61
+#: Code/Widget/Affinity.php:26
 msgid "Me"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:671 Zotlabs/Module/Affinity.php:62
-#: Zotlabs/Widget/Affinity.php:27
+#: Code/Module/Connedit.php:671 Code/Module/Affinity.php:62
+#: Code/Widget/Affinity.php:27
 msgid "Family"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:672 Zotlabs/Module/Profiles.php:1092
-#: Zotlabs/Module/Affinity.php:63 Zotlabs/Module/Settings/Channel.php:78
-#: Zotlabs/Module/Settings/Channel.php:81
-#: Zotlabs/Module/Settings/Channel.php:82
-#: Zotlabs/Module/Settings/Channel.php:86
-#: Zotlabs/Module/Settings/Channel.php:97 Zotlabs/Widget/Affinity.php:28
-#: Zotlabs/Import/Friendica.php:244 Zotlabs/Import/Friendica.php:245
-#: Zotlabs/Import/Friendica.php:253 include/channel.php:529
+#: Code/Module/Connedit.php:672 Code/Module/Profiles.php:1092
+#: Code/Module/Affinity.php:63 Code/Module/Settings/Channel.php:78
+#: Code/Module/Settings/Channel.php:81
+#: Code/Module/Settings/Channel.php:82
+#: Code/Module/Settings/Channel.php:86
+#: Code/Module/Settings/Channel.php:97 Code/Widget/Affinity.php:28
+#: Code/Import/Friendica.php:244 Code/Import/Friendica.php:245
+#: Code/Import/Friendica.php:253 include/channel.php:529
 #: include/channel.php:531
 msgid "Friends"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:673 Zotlabs/Module/Affinity.php:64
-#: Zotlabs/Widget/Affinity.php:29
+#: Code/Module/Connedit.php:673 Code/Module/Affinity.php:64
+#: Code/Widget/Affinity.php:29
 msgid "Peers"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:675 Zotlabs/Module/Connections.php:88
-#: Zotlabs/Module/Connections.php:111 Zotlabs/Module/Affinity.php:66
-#: Zotlabs/Widget/Affinity.php:31
+#: Code/Module/Connedit.php:675 Code/Module/Connections.php:88
+#: Code/Module/Connections.php:111 Code/Module/Affinity.php:66
+#: Code/Widget/Affinity.php:31
 msgid "All"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:692
+#: Code/Module/Connedit.php:692
 msgid "Filter"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:695
+#: Code/Module/Connedit.php:695
 msgid "Open Custom Filter section by default"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:732
+#: Code/Module/Connedit.php:732
 msgid "Approve this connection"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:732
+#: Code/Module/Connedit.php:732
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:737
+#: Code/Module/Connedit.php:737
 msgid "Set Friend Zoom"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:741
+#: Code/Module/Connedit.php:741
 msgid "Set Profile"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:745
+#: Code/Module/Connedit.php:745
 msgid "Set Friend Zoom & Profile"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:793
+#: Code/Module/Connedit.php:793
 msgid "This connection is unreachable from this location."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:794
+#: Code/Module/Connedit.php:794
 msgid "This connection may be unreachable from other channel locations."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:796
+#: Code/Module/Connedit.php:796
 msgid "Location independence is not supported by their network."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:801
+#: Code/Module/Connedit.php:801
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:805 Zotlabs/Module/Defperms.php:247
+#: Code/Module/Connedit.php:805 Code/Module/Defperms.php:247
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:805 include/items.php:4561
+#: Code/Module/Connedit.php:805 include/items.php:4561
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:806 Zotlabs/Module/Defperms.php:248
+#: Code/Module/Connedit.php:806 Code/Module/Defperms.php:248
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:806
+#: Code/Module/Connedit.php:806
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:249
+#: Code/Module/Connedit.php:807 Code/Module/Defperms.php:249
 msgid "Permission role"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:807 Zotlabs/Module/Defperms.php:249
-#: Zotlabs/Module/New_channel.php:171 Zotlabs/Module/New_channel.php:178
-#: Zotlabs/Widget/Notifications.php:151 include/nav.php:301
+#: Code/Module/Connedit.php:807 Code/Module/Defperms.php:249
+#: Code/Module/New_channel.php:171 Code/Module/New_channel.php:178
+#: Code/Widget/Notifications.php:151 include/nav.php:301
 msgid "Loading"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:808 Zotlabs/Module/Defperms.php:250
+#: Code/Module/Connedit.php:808 Code/Module/Defperms.php:250
 msgid "Add permission role"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:812
+#: Code/Module/Connedit.php:812
 msgid "Ignore shares and repeats this connection posts"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:812
+#: Code/Module/Connedit.php:812
 msgid "Note: This is not recommended for Groups."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:816
+#: Code/Module/Connedit.php:816
 msgid "This connection's primary address is"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:817
+#: Code/Module/Connedit.php:817
 msgid "Available locations:"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:822 Zotlabs/Module/Defperms.php:254
+#: Code/Module/Connedit.php:822 Code/Module/Defperms.php:254
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:823
+#: Code/Module/Connedit.php:823
 msgid "Connection Tools"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:825
+#: Code/Module/Connedit.php:825
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:826 include/js_strings.php:24
+#: Code/Module/Connedit.php:826 include/js_strings.php:24
 msgid "Rating"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:827
+#: Code/Module/Connedit.php:827
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:828 Zotlabs/Module/Connedit.php:834
+#: Code/Module/Connedit.php:828 Code/Module/Connedit.php:834
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:830
+#: Code/Module/Connedit.php:830
 msgid "Custom Filter"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Content_filter.php:51
+#: Code/Module/Connedit.php:831 Code/Module/Content_filter.php:51
 msgid "Only import posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:831 Zotlabs/Module/Connedit.php:832
+#: Code/Module/Connedit.php:831 Code/Module/Connedit.php:832
 msgid ""
 "words one per line or #tags, $categories, /patterns/, or lang=xx, leave "
 "blank to import all posts"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:832 Zotlabs/Module/Content_filter.php:59
+#: Code/Module/Connedit.php:832 Code/Module/Content_filter.php:59
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:833 extend/addon/a/zotpost/Mod_zotpost.php:69
+#: Code/Module/Connedit.php:833 extend/addon/a/zotpost/Mod_zotpost.php:69
 msgid "Nickname"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:833
+#: Code/Module/Connedit.php:833
 msgid "optional - allows you to search by a name that you have chosen"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:835
+#: Code/Module/Connedit.php:835
 msgid "This information is public!"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:840
+#: Code/Module/Connedit.php:840
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:843 Zotlabs/Module/Defperms.php:257
-#: Zotlabs/Module/Settings/Permcats.php:122
-#: Zotlabs/Module/Settings/Tokens.php:309
+#: Code/Module/Connedit.php:843 Code/Module/Defperms.php:257
+#: Code/Module/Settings/Permcats.php:122
+#: Code/Module/Settings/Tokens.php:309
 msgid "inherited"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:845
+#: Code/Module/Connedit.php:845
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:847 Zotlabs/Module/Settings/Tokens.php:306
+#: Code/Module/Connedit.php:847 Code/Module/Settings/Tokens.php:306
 msgid "Their Settings"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:848 Zotlabs/Module/Defperms.php:259
-#: Zotlabs/Module/Settings/Permcats.php:120
-#: Zotlabs/Module/Settings/Tokens.php:307
+#: Code/Module/Connedit.php:848 Code/Module/Defperms.php:259
+#: Code/Module/Settings/Permcats.php:120
+#: Code/Module/Settings/Tokens.php:307
 msgid "My Settings"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:850 Zotlabs/Module/Defperms.php:262
-#: Zotlabs/Module/Settings/Permcats.php:125
-#: Zotlabs/Module/Settings/Tokens.php:312
+#: Code/Module/Connedit.php:850 Code/Module/Defperms.php:262
+#: Code/Module/Settings/Permcats.php:125
+#: Code/Module/Settings/Tokens.php:312
 msgid "Individual Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:851 Zotlabs/Module/Settings/Permcats.php:126
-#: Zotlabs/Module/Settings/Tokens.php:313
+#: Code/Module/Connedit.php:851 Code/Module/Settings/Permcats.php:126
+#: Code/Module/Settings/Tokens.php:313
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
 "individual settings. You can not change those settings here."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:852
+#: Code/Module/Connedit.php:852
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
@@ -4350,650 +4350,650 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:853
+#: Code/Module/Connedit.php:853
 msgid "Last update:"
 msgstr ""
 
-#: Zotlabs/Module/Connedit.php:861
+#: Code/Module/Connedit.php:861
 msgid "Details"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:68 Zotlabs/Module/Connections.php:155
-#: Zotlabs/Module/Connections.php:298
+#: Code/Module/Connections.php:68 Code/Module/Connections.php:155
+#: Code/Module/Connections.php:298
 msgid "Blocked"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:73 Zotlabs/Module/Connections.php:162
-#: Zotlabs/Module/Connections.php:297
+#: Code/Module/Connections.php:73 Code/Module/Connections.php:162
+#: Code/Module/Connections.php:297
 msgid "Ignored"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:78 Zotlabs/Module/Connections.php:176
-#: Zotlabs/Module/Connections.php:296
+#: Code/Module/Connections.php:78 Code/Module/Connections.php:176
+#: Code/Module/Connections.php:296
 msgid "Hidden"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:83 Zotlabs/Module/Connections.php:169
+#: Code/Module/Connections.php:83 Code/Module/Connections.php:169
 msgid "Archived/Unreachable"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:93 Zotlabs/Module/Connections.php:107
-#: Zotlabs/Module/Menu.php:185 Zotlabs/Module/Notifications.php:63
+#: Code/Module/Connections.php:93 Code/Module/Connections.php:107
+#: Code/Module/Menu.php:185 Code/Module/Notifications.php:63
 msgid "New"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:141
+#: Code/Module/Connections.php:141
 msgid "Active Connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:144
+#: Code/Module/Connections.php:144
 msgid "Show active connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:148 Zotlabs/Widget/Notifications.php:73
+#: Code/Module/Connections.php:148 Code/Widget/Notifications.php:73
 msgid "New Connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:151
+#: Code/Module/Connections.php:151
 msgid "Show pending (new) connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:158
+#: Code/Module/Connections.php:158
 msgid "Only show blocked connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:165
+#: Code/Module/Connections.php:165
 msgid "Only show ignored connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:172
+#: Code/Module/Connections.php:172
 msgid "Only show archived/unreachable connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:179
+#: Code/Module/Connections.php:179
 msgid "Only show hidden connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:183 Zotlabs/Module/Profperm.php:158
+#: Code/Module/Connections.php:183 Code/Module/Profperm.php:158
 msgid "All Connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:186
+#: Code/Module/Connections.php:186
 msgid "Show all connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:239
+#: Code/Module/Connections.php:239
 msgid "Order by name"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:243
+#: Code/Module/Connections.php:243
 msgid "Recent"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:246
+#: Code/Module/Connections.php:246
 msgid "Order by recent"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:253
+#: Code/Module/Connections.php:253
 msgid "Order by date"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:294
+#: Code/Module/Connections.php:294
 msgid "Pending approval"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:295
+#: Code/Module/Connections.php:295
 msgid "Archived"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:299
+#: Code/Module/Connections.php:299
 msgid "Not connected at this location"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:317
+#: Code/Module/Connections.php:317
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:318
+#: Code/Module/Connections.php:318
 msgid "Edit connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:320
+#: Code/Module/Connections.php:320
 msgid "Delete connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:329
+#: Code/Module/Connections.php:329
 msgid "Channel address"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:331
+#: Code/Module/Connections.php:331
 msgid "Network"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:334
+#: Code/Module/Connections.php:334
 msgid "Call"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:336
+#: Code/Module/Connections.php:336
 msgid "Status"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:338
+#: Code/Module/Connections.php:338
 msgid "Connected"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:340
+#: Code/Module/Connections.php:340
 msgid "Approve connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:342
+#: Code/Module/Connections.php:342
 msgid "Ignore connection"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:344
+#: Code/Module/Connections.php:344
 msgid "Recent activity"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:371
+#: Code/Module/Connections.php:371
 msgid "Filter by"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:372
+#: Code/Module/Connections.php:372
 msgid "Sort by"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:376
+#: Code/Module/Connections.php:376
 msgid "Search your connections"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:377
+#: Code/Module/Connections.php:377
 msgid "Connections search"
 msgstr ""
 
-#: Zotlabs/Module/Connections.php:378 Zotlabs/Module/Directory.php:477
-#: Zotlabs/Module/Directory.php:482 Zotlabs/Widget/Findpeople.php:33
+#: Code/Module/Connections.php:378 Code/Module/Directory.php:477
+#: Code/Module/Directory.php:482 Code/Widget/Findpeople.php:33
 msgid "Find"
 msgstr ""
 
-#: Zotlabs/Module/Item.php:570 Zotlabs/Module/Pin.php:49
+#: Code/Module/Item.php:570 Code/Module/Pin.php:49
 msgid "Unable to locate original post."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:665
+#: Code/Module/Item.php:665
 msgid "Comment may be moderated."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:901
+#: Code/Module/Item.php:901
 msgid "Empty post discarded."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1507
+#: Code/Module/Item.php:1507
 msgid "Duplicate post suppressed."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1554
+#: Code/Module/Item.php:1554
 msgid ""
 "Draft saved. Use Drafts app to continue "
 "editing."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1598
+#: Code/Module/Item.php:1598
 msgid "Your comment has been posted."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1667
+#: Code/Module/Item.php:1667
 msgid "System error. Post not saved."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1709
+#: Code/Module/Item.php:1709
 msgid "Your post/comment is awaiting approval."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1744 Zotlabs/Module/Cloud.php:132
+#: Code/Module/Item.php:1744 Code/Module/Cloud.php:132
 msgid "Not found"
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1878
+#: Code/Module/Item.php:1878
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1886
+#: Code/Module/Item.php:1886
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: Zotlabs/Module/Item.php:1892
+#: Code/Module/Item.php:1892
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:42 Zotlabs/Module/Appman.php:59
+#: Code/Module/Appman.php:42 Code/Module/Appman.php:59
 msgid "App installed."
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:52
+#: Code/Module/Appman.php:52
 msgid "Malformed app."
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:129
+#: Code/Module/Appman.php:129
 msgid "Embed code"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:133
+#: Code/Module/Appman.php:133
 msgid "Edit App"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:133
+#: Code/Module/Appman.php:133
 msgid "Create App"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:138
+#: Code/Module/Appman.php:138
 msgid "Name of app"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:138 Zotlabs/Module/Appman.php:139
-#: Zotlabs/Module/Events.php:508 Zotlabs/Module/Events.php:513
-#: Zotlabs/Module/Profiles.php:791 Zotlabs/Module/Profiles.php:795
+#: Code/Module/Appman.php:138 Code/Module/Appman.php:139
+#: Code/Module/Events.php:508 Code/Module/Events.php:513
+#: Code/Module/Profiles.php:791 Code/Module/Profiles.php:795
 #: include/datetime.php:249
 msgid "Required"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:139
+#: Code/Module/Appman.php:139
 msgid "Location (URL) of app"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:141
+#: Code/Module/Appman.php:141
 msgid "Photo icon URL"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:141
+#: Code/Module/Appman.php:141
 msgid "80 x 80 pixels - optional"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:142
+#: Code/Module/Appman.php:142
 msgid "Categories (optional, comma separated list)"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:143
+#: Code/Module/Appman.php:143
 msgid "Version ID"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:144
+#: Code/Module/Appman.php:144
 msgid "Price of app"
 msgstr ""
 
-#: Zotlabs/Module/Appman.php:145
+#: Code/Module/Appman.php:145
 msgid "Location (URL) to purchase app"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:281 include/items.php:4912
+#: Code/Module/Cover_photo.php:281 include/items.php:4912
 msgid "female"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:282 include/items.php:4913
+#: Code/Module/Cover_photo.php:282 include/items.php:4913
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:283 include/items.php:4914
+#: Code/Module/Cover_photo.php:283 include/items.php:4914
 msgid "male"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:284 include/items.php:4915
+#: Code/Module/Cover_photo.php:284 include/items.php:4915
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:286 include/items.php:4917
+#: Code/Module/Cover_photo.php:286 include/items.php:4917
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Cover_photo.php:289 include/channel.php:1841
+#: Code/Module/Cover_photo.php:289 include/channel.php:1841
 msgid "cover photo"
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:106 Zotlabs/Module/Settings/Channel.php:357
+#: Code/Module/Defperms.php:106 Code/Module/Settings/Channel.php:357
 #: extend/addon/a/logrot/logrot.php:55
 #: extend/addon/a/openstreetmap/openstreetmap.php:222
 #: extend/addon/a/faces/faces.php:208
 msgid "Settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:248 Zotlabs/Module/Settings/Channel.php:583
+#: Code/Module/Defperms.php:248 Code/Module/Settings/Channel.php:583
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:255
+#: Code/Module/Defperms.php:255
 msgid "Automatic approval settings"
 msgstr ""
 
-#: Zotlabs/Module/Defperms.php:263
+#: Code/Module/Defperms.php:263
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:96 Zotlabs/Module/Directory.php:103
-#: Zotlabs/Module/Display.php:47 Zotlabs/Module/Search.php:41
-#: Zotlabs/Module/Photos.php:579 Zotlabs/Module/Viewconnections.php:30
+#: Code/Module/Directory.php:96 Code/Module/Directory.php:103
+#: Code/Module/Display.php:47 Code/Module/Search.php:41
+#: Code/Module/Photos.php:579 Code/Module/Viewconnections.php:30
 msgid "Public access denied."
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:159
+#: Code/Module/Directory.php:159
 msgid "No default suggestions were found."
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:326
+#: Code/Module/Directory.php:326
 msgid "Gender: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:327
+#: Code/Module/Directory.php:327
 msgid "Status: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:328
+#: Code/Module/Directory.php:328
 msgid "Homepage: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:389
+#: Code/Module/Directory.php:389
 msgid "Description:"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:400 Zotlabs/Module/Manage.php:78
-#: Zotlabs/Module/Manage.php:175
+#: Code/Module/Directory.php:400 Code/Module/Manage.php:78
+#: Code/Module/Manage.php:175
 msgid "Group"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:404
+#: Code/Module/Directory.php:404
 msgid "Keywords: "
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:407
+#: Code/Module/Directory.php:407
 msgid "Don't suggest"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:409
+#: Code/Module/Directory.php:409
 msgid "Suggestion ranking:"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:472
+#: Code/Module/Directory.php:472
 msgid "Local Directory"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:478
+#: Code/Module/Directory.php:478
 msgid "Finding:"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:481 Zotlabs/Widget/Findpeople.php:34
+#: Code/Module/Directory.php:481 Code/Widget/Findpeople.php:34
 msgid "Channel Suggestions"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:483
+#: Code/Module/Directory.php:483
 msgid "next page"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:483
+#: Code/Module/Directory.php:483
 msgid "previous page"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:484
+#: Code/Module/Directory.php:484
 msgid "Sort options"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:485
+#: Code/Module/Directory.php:485
 msgid "Alphabetic"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:486
+#: Code/Module/Directory.php:486
 msgid "Reverse Alphabetic"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:487
+#: Code/Module/Directory.php:487
 msgid "Newest to Oldest"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:488
+#: Code/Module/Directory.php:488
 msgid "Oldest to Newest"
 msgstr ""
 
-#: Zotlabs/Module/Directory.php:513
+#: Code/Module/Directory.php:513
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: Zotlabs/Module/Display.php:98 Zotlabs/Module/Channel.php:287
-#: Zotlabs/Module/Hq.php:153 Zotlabs/Module/Rpost.php:236
-#: Zotlabs/Module/Pubstream.php:86 Zotlabs/Module/Stream.php:246
+#: Code/Module/Display.php:98 Code/Module/Channel.php:287
+#: Code/Module/Hq.php:153 Code/Module/Rpost.php:236
+#: Code/Module/Pubstream.php:86 Code/Module/Stream.php:246
 msgid "Reset form"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:390
+#: Code/Module/Display.php:390
 #, php-format
 msgid "\"%1$s\", shared by %2$s with %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:391
+#: Code/Module/Display.php:391
 #, php-format
 msgid "%1$s shared this post with %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:395
+#: Code/Module/Display.php:395
 msgid "Not much to read, click to see the post."
 msgstr ""
 
-#: Zotlabs/Module/Display.php:399
+#: Code/Module/Display.php:399
 #, php-format
 msgid "%1$s shared a reaction to \"%2$s\""
 msgstr ""
 
-#: Zotlabs/Module/Display.php:400
+#: Code/Module/Display.php:400
 #, php-format
 msgid "%s shared a reaction to this post/conversation"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:407
+#: Code/Module/Display.php:407
 #, php-format
 msgid "%1$s commented \"%2$s\""
 msgstr ""
 
-#: Zotlabs/Module/Display.php:408
+#: Code/Module/Display.php:408
 #, php-format
 msgid "%s shared a comment of this post/conversation"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:412
+#: Code/Module/Display.php:412
 #, php-format
 msgid "%1$s wrote this: \"%2$s\""
 msgstr ""
 
-#: Zotlabs/Module/Display.php:437 Zotlabs/Module/Channel.php:556
+#: Code/Module/Display.php:437 Code/Module/Channel.php:556
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr ""
 
-#: Zotlabs/Module/Display.php:454
+#: Code/Module/Display.php:454
 msgid "Article"
 msgstr ""
 
-#: Zotlabs/Module/Display.php:507
+#: Code/Module/Display.php:507
 msgid "Item has been removed."
 msgstr ""
 
-#: Zotlabs/Module/Events.php:492
+#: Code/Module/Events.php:492
 msgid "day(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:493
+#: Code/Module/Events.php:493
 msgid "week(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:494
+#: Code/Module/Events.php:494
 msgid "month(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:495
+#: Code/Module/Events.php:495
 msgid "year(s)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:508
+#: Code/Module/Events.php:508
 msgid "Edit event title"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:510
+#: Code/Module/Events.php:510
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:511
+#: Code/Module/Events.php:511
 msgid "Edit Category"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:511
+#: Code/Module/Events.php:511
 msgid "Category"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:514
+#: Code/Module/Events.php:514
 msgid "Edit start date and time"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:515 Zotlabs/Module/Events.php:518
+#: Code/Module/Events.php:515 Code/Module/Events.php:518
 msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:517
+#: Code/Module/Events.php:517
 msgid "Edit finish date and time"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:517
+#: Code/Module/Events.php:517
 msgid "Finish date and time"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:519 Zotlabs/Module/Events.php:520
+#: Code/Module/Events.php:519 Code/Module/Events.php:520
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:519
+#: Code/Module/Events.php:519
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: Zotlabs/Module/Events.php:521
+#: Code/Module/Events.php:521
 msgid "Edit Description"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:523
+#: Code/Module/Events.php:523
 msgid "Edit Location"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:527 include/conversation.php:1455
+#: Code/Module/Events.php:527 include/conversation.php:1455
 msgid "Permission settings"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:537
+#: Code/Module/Events.php:537
 msgid "Timezone:"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:542
+#: Code/Module/Events.php:542
 msgid "Advanced Options"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:544
+#: Code/Module/Events.php:544
 msgid "Event repeat"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:545
+#: Code/Module/Events.php:545
 msgid "Repeat frequency"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:546
+#: Code/Module/Events.php:546
 msgid "Repeat every"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:547
+#: Code/Module/Events.php:547
 msgid "Number of total repeats"
 msgstr ""
 
-#: Zotlabs/Module/Events.php:858
+#: Code/Module/Events.php:858
 msgid "Event removed"
 msgstr ""
 
-#: Zotlabs/Module/Editlayout.php:88 Zotlabs/Module/Editwebpage.php:91
-#: Zotlabs/Module/Card_edit.php:25 Zotlabs/Module/Card_edit.php:43
-#: Zotlabs/Module/Editblock.php:89 Zotlabs/Module/Editblock.php:107
-#: Zotlabs/Module/Editpost.php:30 Zotlabs/Module/Dreport.php:67
+#: Code/Module/Editlayout.php:88 Code/Module/Editwebpage.php:91
+#: Code/Module/Card_edit.php:25 Code/Module/Card_edit.php:43
+#: Code/Module/Editblock.php:89 Code/Module/Editblock.php:107
+#: Code/Module/Editpost.php:30 Code/Module/Dreport.php:67
 msgid "Item not found"
 msgstr ""
 
-#: Zotlabs/Module/Editlayout.php:140 Zotlabs/Module/Layouts.php:139
-#: Zotlabs/Module/Layouts.php:203
+#: Code/Module/Editlayout.php:140 Code/Module/Layouts.php:139
+#: Code/Module/Layouts.php:203
 msgid "Layout Name"
 msgstr ""
 
-#: Zotlabs/Module/Editlayout.php:141 Zotlabs/Module/Layouts.php:142
+#: Code/Module/Editlayout.php:141 Code/Module/Layouts.php:142
 msgid "Layout Description (Optional)"
 msgstr ""
 
-#: Zotlabs/Module/Editlayout.php:149
+#: Code/Module/Editlayout.php:149
 msgid "Edit Layout"
 msgstr ""
 
-#: Zotlabs/Module/Plike.php:128 include/conversation.php:135
+#: Code/Module/Plike.php:128 include/conversation.php:135
 msgid "channel"
 msgstr ""
 
-#: Zotlabs/Module/Plike.php:202 Zotlabs/Module/Like.php:221
+#: Code/Module/Plike.php:202 Code/Module/Like.php:221
 #: include/conversation.php:178
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Plike.php:205 Zotlabs/Module/Like.php:224
+#: Code/Module/Plike.php:205 Code/Module/Like.php:224
 #: include/conversation.php:180
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Notes.php:52
+#: Code/Module/Notes.php:52
 msgid "This app allows you to create private notes for your personal use."
 msgstr ""
 
-#: Zotlabs/Module/Notes.php:60
+#: Code/Module/Notes.php:60
 msgid "This app is installed. The Notes tool can be found on your stream page."
 msgstr ""
 
-#: Zotlabs/Module/Editwebpage.php:154
+#: Code/Module/Editwebpage.php:154
 msgid "Page link"
 msgstr ""
 
-#: Zotlabs/Module/Editwebpage.php:158 Zotlabs/Module/Chat.php:219
-#: Zotlabs/Module/Card_edit.php:110 Zotlabs/Module/Editblock.php:129
+#: Code/Module/Editwebpage.php:158 Code/Module/Chat.php:219
+#: Code/Module/Card_edit.php:110 Code/Module/Editblock.php:129
 #: include/conversation.php:1237
 msgid "Insert web link"
 msgstr ""
 
-#: Zotlabs/Module/Editwebpage.php:181
+#: Code/Module/Editwebpage.php:181
 msgid "Edit Webpage"
 msgstr ""
 
-#: Zotlabs/Module/Email_resend.php:15 Zotlabs/Module/Email_validation.php:27
+#: Code/Module/Email_resend.php:15 Code/Module/Email_validation.php:27
 msgid "Token verification failed."
 msgstr ""
 
-#: Zotlabs/Module/Email_resend.php:33
+#: Code/Module/Email_resend.php:33
 msgid "Email verification resent"
 msgstr ""
 
-#: Zotlabs/Module/Email_resend.php:35
+#: Code/Module/Email_resend.php:35
 msgid "Unable to resend email verification message."
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:40
+#: Code/Module/Email_validation.php:40
 msgid "Email Verification Required"
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:41
+#: Code/Module/Email_validation.php:41
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -5001,904 +5001,904 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:42
+#: Code/Module/Email_validation.php:42
 msgid "Resend Email"
 msgstr ""
 
-#: Zotlabs/Module/Email_validation.php:45
+#: Code/Module/Email_validation.php:45
 msgid "Validation token"
 msgstr ""
 
-#: Zotlabs/Module/Embedphotos.php:103 include/bbcode.php:258
+#: Code/Module/Embedphotos.php:103 include/bbcode.php:258
 #: include/bbcode.php:1125 include/bbcode.php:2031 include/bbcode.php:2033
 #: include/bbcode.php:2036 include/text.php:1828 include/text.php:1829
 msgid "Image/photo"
 msgstr ""
 
-#: Zotlabs/Module/Embedphotos.php:208 Zotlabs/Module/Photos.php:848
-#: Zotlabs/Module/Photos.php:1405 Zotlabs/Widget/Album.php:88
-#: Zotlabs/Widget/Portfolio.php:99
+#: Code/Module/Embedphotos.php:208 Code/Module/Photos.php:848
+#: Code/Module/Photos.php:1405 Code/Widget/Album.php:88
+#: Code/Widget/Portfolio.php:99
 msgid "View Photo"
 msgstr ""
 
-#: Zotlabs/Module/Embedphotos.php:223 Zotlabs/Module/Photos.php:879
-#: Zotlabs/Widget/Album.php:105 Zotlabs/Widget/Portfolio.php:120
+#: Code/Module/Embedphotos.php:223 Code/Module/Photos.php:879
+#: Code/Widget/Album.php:105 Code/Widget/Portfolio.php:120
 msgid "Edit Album"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:60
+#: Code/Module/Register.php:60
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:66
+#: Code/Module/Register.php:66
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:100
+#: Code/Module/Register.php:100
 msgid "Passwords do not match."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:151
+#: Code/Module/Register.php:151
 msgid "Registration successful. Continue to create your first channel..."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:153
+#: Code/Module/Register.php:153
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:159
+#: Code/Module/Register.php:159
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:161
+#: Code/Module/Register.php:161
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:206
+#: Code/Module/Register.php:206
 msgid "Registration on this website is disabled."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:215
+#: Code/Module/Register.php:215
 msgid "Registration on this website is by approval only."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:223
+#: Code/Module/Register.php:223
 msgid "Registration on this site is by invitation only."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:236
+#: Code/Module/Register.php:236
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:252 Zotlabs/Module/Siteinfo.php:42
+#: Code/Module/Register.php:252 Code/Module/Siteinfo.php:42
 msgid "Terms of Service"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:258
+#: Code/Module/Register.php:258
 #, php-format
 msgid "I accept the %s for this website"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:264
+#: Code/Module/Register.php:264
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:269
+#: Code/Module/Register.php:269
 msgid "Your email address"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:270
+#: Code/Module/Register.php:270
 msgid "Choose a password"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:271
+#: Code/Module/Register.php:271
 msgid "Please re-enter your password"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:272
+#: Code/Module/Register.php:272
 msgid "Please enter your invitation code"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:273
+#: Code/Module/Register.php:273
 msgid "Your Name"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:273
+#: Code/Module/Register.php:273
 msgid "Real names are preferred."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:275 Zotlabs/Module/New_channel.php:191
+#: Code/Module/Register.php:275 Code/Module/New_channel.php:191
 msgid "Choose a short nickname"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:275
+#: Code/Module/Register.php:275
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
 "g. nickname%s"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:276 Zotlabs/Module/New_channel.php:192
+#: Code/Module/Register.php:276 Code/Module/New_channel.php:192
 msgid "Channel role and privacy"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:276
+#: Code/Module/Register.php:276
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "no"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:277
+#: Code/Module/Register.php:277
 msgid "yes"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:290
+#: Code/Module/Register.php:290
 msgid ""
 "Show affiliated sites - some of which may allow "
 "registration."
 msgstr ""
 
-#: Zotlabs/Module/Register.php:303 Zotlabs/Module/Sites.php:55 boot.php:1706
+#: Code/Module/Register.php:303 Code/Module/Sites.php:55 boot.php:1706
 #: include/nav.php:164
 msgid "Register"
 msgstr ""
 
-#: Zotlabs/Module/Register.php:304
+#: Code/Module/Register.php:304
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:35
+#: Code/Module/Invite.php:35
 msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:60
+#: Code/Module/Invite.php:60
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:73
+#: Code/Module/Invite.php:73
 msgid "Please join us on $Projectname"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:83
+#: Code/Module/Invite.php:83
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:87
+#: Code/Module/Invite.php:87
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:90
+#: Code/Module/Invite.php:90
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Module/Invite.php:108
+#: Code/Module/Invite.php:108
 msgid "Send email invitations to join this network"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:121
+#: Code/Module/Invite.php:121
 msgid "You have no more invitations available"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:155
+#: Code/Module/Invite.php:155
 msgid "Send invitations"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:156
+#: Code/Module/Invite.php:156
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:157
+#: Code/Module/Invite.php:157
 msgid "Your message:"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:158
+#: Code/Module/Invite.php:158
 msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:160
+#: Code/Module/Invite.php:160
 msgid "You will need to supply this invitation code:"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:161
+#: Code/Module/Invite.php:161
 msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:163
+#: Code/Module/Invite.php:163
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:164
+#: Code/Module/Invite.php:164
 msgid "or visit"
 msgstr ""
 
-#: Zotlabs/Module/Invite.php:166
+#: Code/Module/Invite.php:166
 msgid "3. Click [Connect]"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:17
+#: Code/Module/Sites.php:17
 msgid ""
 "This page provides information about related projects and websites that are "
 "currently known to this system. These are a small fraction of the thousands "
 "of websites and dozens of projects and providers which make up the fediverse."
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:45
+#: Code/Module/Sites.php:45
 msgid "free"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:47
+#: Code/Module/Sites.php:47
 msgid "subscription"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:49
+#: Code/Module/Sites.php:49
 msgid "tiered service plans"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:57
+#: Code/Module/Sites.php:57
 msgid "Register (requires approval)"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:101
+#: Code/Module/Sites.php:101
 msgid "Project"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:109
+#: Code/Module/Sites.php:109
 msgid "Access type"
 msgstr ""
 
-#: Zotlabs/Module/Sites.php:115
+#: Code/Module/Sites.php:115
 msgid "Affiliated Sites"
 msgstr ""
 
-#: Zotlabs/Module/Filer.php:59
+#: Code/Module/Filer.php:59
 msgid "Enter a folder name"
 msgstr ""
 
-#: Zotlabs/Module/Filer.php:59
+#: Code/Module/Filer.php:59
 msgid "or select an existing folder (doubleclick)"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:98
+#: Code/Module/Filestorage.php:98
 msgid "Channel unavailable."
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:142
+#: Code/Module/Filestorage.php:142
 msgid "File not found."
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:225
+#: Code/Module/Filestorage.php:225
 msgid "Edit file permissions"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:237
+#: Code/Module/Filestorage.php:237
 msgid "Change filename to"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:237
+#: Code/Module/Filestorage.php:237
 msgid "Leave blank to keep the existing filename"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:238
+#: Code/Module/Filestorage.php:238
 msgid "Move to directory"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:239
+#: Code/Module/Filestorage.php:239
 #: extend/addon/a/flashcards/Mod_Flashcards.php:261
 #: extend/addon/a/faces/Mod_Faces.php:179
 msgid "Set/edit permissions"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:240
+#: Code/Module/Filestorage.php:240
 msgid "Include all files and sub folders"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:241
+#: Code/Module/Filestorage.php:241
 msgid "Return to file list"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:243
+#: Code/Module/Filestorage.php:243
 msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:244
+#: Code/Module/Filestorage.php:244
 msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:246
+#: Code/Module/Filestorage.php:246
 msgid "Share this file"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:247
+#: Code/Module/Filestorage.php:247
 msgid "Show URL to this file"
 msgstr ""
 
-#: Zotlabs/Module/Filestorage.php:248 Zotlabs/Storage/Browser.php:435
+#: Code/Module/Filestorage.php:248 Code/Storage/Browser.php:435
 msgid "Show in your contacts shared folder"
 msgstr ""
 
-#: Zotlabs/Module/Dircensor.php:45
+#: Code/Module/Dircensor.php:45
 msgid "Entry censored"
 msgstr ""
 
-#: Zotlabs/Module/Dircensor.php:47
+#: Code/Module/Dircensor.php:47
 msgid "Entry uncensored"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:56 include/bbcode.php:416
+#: Code/Module/Impel.php:56 include/bbcode.php:416
 msgid "webpage"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:61 include/bbcode.php:422
+#: Code/Module/Impel.php:61 include/bbcode.php:422
 msgid "block"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:66 include/bbcode.php:419
+#: Code/Module/Impel.php:66 include/bbcode.php:419
 msgid "layout"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:73 include/bbcode.php:425
+#: Code/Module/Impel.php:73 include/bbcode.php:425
 msgid "menu"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:206
+#: Code/Module/Impel.php:206
 #, php-format
 msgid "%s element installed"
 msgstr ""
 
-#: Zotlabs/Module/Impel.php:208
+#: Code/Module/Impel.php:208
 #, php-format
 msgid "%s element installation failed"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:139
+#: Code/Module/Thing.php:139
 msgid "Thing updated"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:200
+#: Code/Module/Thing.php:200
 msgid "Object store: failed"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:204
+#: Code/Module/Thing.php:204
 msgid "Thing added"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:232
+#: Code/Module/Thing.php:232
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:301
+#: Code/Module/Thing.php:301
 msgid "Show Thing"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:307
+#: Code/Module/Thing.php:307
 msgid "item not found."
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:341
+#: Code/Module/Thing.php:341
 msgid "Edit Thing"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:343 Zotlabs/Module/Thing.php:402
+#: Code/Module/Thing.php:343 Code/Module/Thing.php:402
 msgid "Select a profile"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405
+#: Code/Module/Thing.php:347 Code/Module/Thing.php:405
 msgid "Post an activity"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:347 Zotlabs/Module/Thing.php:405
+#: Code/Module/Thing.php:347 Code/Module/Thing.php:405
 msgid "Only sends to viewers of the applicable profile"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:349 Zotlabs/Module/Thing.php:407
+#: Code/Module/Thing.php:349 Code/Module/Thing.php:407
 msgid "Name of thing e.g. something"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:351 Zotlabs/Module/Thing.php:408
+#: Code/Module/Thing.php:351 Code/Module/Thing.php:408
 msgid "URL of thing (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:353 Zotlabs/Module/Thing.php:409
+#: Code/Module/Thing.php:353 Code/Module/Thing.php:409
 msgid "URL for photo of thing (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Thing.php:400
+#: Code/Module/Thing.php:400
 msgid "Add Thing to your Profile"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:30 Zotlabs/Module/Channel.php:58
+#: Code/Module/Chat.php:30 Code/Module/Channel.php:58
 msgid "You must be logged in to see this page."
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:194
+#: Code/Module/Chat.php:194
 msgid "Room not found"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:211
+#: Code/Module/Chat.php:211
 msgid "Leave Room"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:212
+#: Code/Module/Chat.php:212
 msgid "Delete Room"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:213
+#: Code/Module/Chat.php:213
 msgid "I am away right now"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:214
+#: Code/Module/Chat.php:214
 msgid "I am online"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:217 include/conversation.php:1287
+#: Code/Module/Chat.php:217 include/conversation.php:1287
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:237
+#: Code/Module/Chat.php:237
 msgid "New Chatroom"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:238
+#: Code/Module/Chat.php:238
 msgid "Chatroom name"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:239
+#: Code/Module/Chat.php:239
 msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:255
+#: Code/Module/Chat.php:255
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:260
+#: Code/Module/Chat.php:260
 msgid "No chatrooms available"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:261 Zotlabs/Module/Manage.php:154
-#: Zotlabs/Module/Profiles.php:879
+#: Code/Module/Chat.php:261 Code/Module/Manage.php:154
+#: Code/Module/Profiles.php:879
 msgid "Create New"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:264
+#: Code/Module/Chat.php:264
 msgid "Expiration"
 msgstr ""
 
-#: Zotlabs/Module/Chat.php:265
+#: Code/Module/Chat.php:265
 msgid "min"
 msgstr ""
 
-#: Zotlabs/Module/Moderate.php:35
+#: Code/Module/Moderate.php:35
 msgid "No entries."
 msgstr ""
 
-#: Zotlabs/Module/Moderate.php:80
+#: Code/Module/Moderate.php:80
 msgid "Comment approved"
 msgstr ""
 
-#: Zotlabs/Module/Moderate.php:83
+#: Code/Module/Moderate.php:83
 msgid "Comment deleted"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:192
+#: Code/Module/Setup.php:192
 msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:196
+#: Code/Module/Setup.php:196
 msgid "Could not connect to database."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:200
+#: Code/Module/Setup.php:200
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:208
+#: Code/Module/Setup.php:208
 msgid "Could not create table."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:211
+#: Code/Module/Setup.php:211
 msgid "Installation succeeded!"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:213
+#: Code/Module/Setup.php:213
 msgid "Your site database has been installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:217
+#: Code/Module/Setup.php:217
 msgid "Database install failed!"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:219
+#: Code/Module/Setup.php:219
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:220 Zotlabs/Module/Setup.php:285
+#: Code/Module/Setup.php:220 Code/Module/Setup.php:285
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:282
+#: Code/Module/Setup.php:282
 msgid "System check"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:287
+#: Code/Module/Setup.php:287
 msgid "Check again"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:313
+#: Code/Module/Setup.php:313
 msgid "Database connection"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:314
+#: Code/Module/Setup.php:314
 msgid ""
 "In order to install this software we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:315
+#: Code/Module/Setup.php:315
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:316
+#: Code/Module/Setup.php:316
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:320
+#: Code/Module/Setup.php:320
 msgid "Database Server Name"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:320
+#: Code/Module/Setup.php:320
 msgid "Default is 127.0.0.1"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:321
+#: Code/Module/Setup.php:321
 msgid "Database Port"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:321
+#: Code/Module/Setup.php:321
 msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:322
+#: Code/Module/Setup.php:322
 msgid "Database Login Name"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:323
+#: Code/Module/Setup.php:323
 msgid "Database Login Password"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:324
+#: Code/Module/Setup.php:324
 msgid "Database Name"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:325
+#: Code/Module/Setup.php:325
 msgid "Database Type"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369
+#: Code/Module/Setup.php:327 Code/Module/Setup.php:369
 msgid "Site administrator email address"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:327 Zotlabs/Module/Setup.php:369
+#: Code/Module/Setup.php:327 Code/Module/Setup.php:369
 msgid ""
 "Required. Your account email address must match this in order to use the web "
 "admin panel."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:328 Code/Module/Setup.php:371
 msgid "Website URL"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:328 Zotlabs/Module/Setup.php:371
+#: Code/Module/Setup.php:328 Code/Module/Setup.php:371
 msgid "Required. Please use SSL (https) URL if available."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:329 Zotlabs/Module/Setup.php:373
+#: Code/Module/Setup.php:329 Code/Module/Setup.php:373
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:357
+#: Code/Module/Setup.php:357
 msgid "Site settings"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:415
+#: Code/Module/Setup.php:415
 msgid "PHP version 7.1 or greater is required."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:416
+#: Code/Module/Setup.php:416
 msgid "PHP version"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:431
+#: Code/Module/Setup.php:431
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:432
+#: Code/Module/Setup.php:432
 msgid ""
 "If you do not have a command line version of PHP installed on server, you "
 "will not be able to run background tasks - including message delivery."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:436
+#: Code/Module/Setup.php:436
 msgid "PHP executable path"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:436
+#: Code/Module/Setup.php:436
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:441
+#: Code/Module/Setup.php:441
 msgid "Command line PHP"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:451
+#: Code/Module/Setup.php:451
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:455
+#: Code/Module/Setup.php:455
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:456
+#: Code/Module/Setup.php:456
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:459
+#: Code/Module/Setup.php:459
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:479
+#: Code/Module/Setup.php:479
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 2MB (2097152 bytes) at once."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:483
+#: Code/Module/Setup.php:483
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to "
 "upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:490
+#: Code/Module/Setup.php:490
 msgid "You can adjust these settings in the server php.ini file."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:492
+#: Code/Module/Setup.php:492
 msgid "PHP upload limits"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:515
+#: Code/Module/Setup.php:515
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:516
+#: Code/Module/Setup.php:516
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:519
+#: Code/Module/Setup.php:519
 msgid "Generate encryption keys"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:538
+#: Code/Module/Setup.php:538
 msgid "libCurl PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:539
+#: Code/Module/Setup.php:539
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:540
+#: Code/Module/Setup.php:540
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:541
+#: Code/Module/Setup.php:541
 msgid "PDO database PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:542
+#: Code/Module/Setup.php:542
 msgid "mb_string PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:543
+#: Code/Module/Setup.php:543
 msgid "xml PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:544
+#: Code/Module/Setup.php:544
 msgid "zip PHP module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:548 Zotlabs/Module/Setup.php:550
+#: Code/Module/Setup.php:548 Code/Module/Setup.php:550
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:548
+#: Code/Module/Setup.php:548
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:554 Zotlabs/Module/Setup.php:556
+#: Code/Module/Setup.php:554 Code/Module/Setup.php:556
 msgid "exec"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:554
+#: Code/Module/Setup.php:554
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:559 Zotlabs/Module/Setup.php:561
+#: Code/Module/Setup.php:559 Code/Module/Setup.php:561
 msgid "shell_exec"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:559
+#: Code/Module/Setup.php:559
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:566
+#: Code/Module/Setup.php:566
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:570
+#: Code/Module/Setup.php:570
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:574
+#: Code/Module/Setup.php:574
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:580
+#: Code/Module/Setup.php:580
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:585
+#: Code/Module/Setup.php:585
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:589
+#: Code/Module/Setup.php:589
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:593
+#: Code/Module/Setup.php:593
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:597
+#: Code/Module/Setup.php:597
 msgid "Error: zip PHP module required but not installed."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:619 Zotlabs/Module/Setup.php:628
+#: Code/Module/Setup.php:619 Code/Module/Setup.php:628
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:624
+#: Code/Module/Setup.php:624
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:625
+#: Code/Module/Setup.php:625
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:626
+#: Code/Module/Setup.php:626
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:645
+#: Code/Module/Setup.php:645
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:646
+#: Code/Module/Setup.php:646
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:647 Zotlabs/Module/Setup.php:668
+#: Code/Module/Setup.php:647 Code/Module/Setup.php:668
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:650
+#: Code/Module/Setup.php:650
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:667
+#: Code/Module/Setup.php:667
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level "
 "web folder"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:671
+#: Code/Module/Setup.php:671
 msgid "store is writable"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:703
+#: Code/Module/Setup.php:703
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:704
+#: Code/Module/Setup.php:704
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:705
+#: Code/Module/Setup.php:705
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:706
+#: Code/Module/Setup.php:706
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:707
+#: Code/Module/Setup.php:707
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:708
+#: Code/Module/Setup.php:708
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:710
+#: Code/Module/Setup.php:710
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -5906,51 +5906,51 @@ msgid ""
 "server communications."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:712
+#: Code/Module/Setup.php:712
 msgid "SSL certificate validation"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:718
+#: Code/Module/Setup.php:718
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:721
+#: Code/Module/Setup.php:721
 msgid "Url rewrite is working"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:736
+#: Code/Module/Setup.php:736
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:762 extend/addon/a/faces/faces.php:219
+#: Code/Module/Setup.php:762 extend/addon/a/faces/faces.php:219
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:807
+#: Code/Module/Setup.php:807
 msgid "registration page"
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:810
+#: Code/Module/Setup.php:810
 msgid "
              What next?
              "
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:812
+#: Code/Module/Setup.php:812
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:814
+#: Code/Module/Setup.php:814
 msgid ""
 "Please see the file \"install/INSTALL.txt\" for more information and "
 "instructions."
 msgstr ""
 
-#: Zotlabs/Module/Setup.php:816
+#: Code/Module/Setup.php:816
 #, php-format
 msgid ""
 "Go to your new hub %s and register as new member. Please use the same email "
@@ -5958,833 +5958,833 @@ msgid ""
 "new account to enter the site admin panel."
 msgstr ""
 
-#: Zotlabs/Module/Hcard.php:45 Zotlabs/Module/Profile.php:55
+#: Code/Module/Hcard.php:45 Code/Module/Profile.php:55
 msgid "Posts and comments"
 msgstr ""
 
-#: Zotlabs/Module/Hcard.php:52 Zotlabs/Module/Channel.php:85
-#: Zotlabs/Module/Profile.php:62
+#: Code/Module/Hcard.php:52 Code/Module/Channel.php:85
+#: Code/Module/Profile.php:62
 msgid "Only posts"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:107
+#: Code/Module/Lists.php:107
 msgid "Access list created."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:109
+#: Code/Module/Lists.php:109
 msgid "Could not create access list."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:129 Zotlabs/Module/Lists.php:276
+#: Code/Module/Lists.php:129 Code/Module/Lists.php:276
 #: include/items.php:4529
 msgid "Access list not found."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:146
+#: Code/Module/Lists.php:146
 msgid "Access list updated."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:169 Zotlabs/Module/Lists.php:215
-#: Zotlabs/Module/Lists.php:244 Zotlabs/Module/Lists.php:287
-#: Zotlabs/Module/Import_items.php:133 Zotlabs/Module/Cloud.php:134
-#: Zotlabs/Module/Like.php:109 Zotlabs/Module/Share.php:81
-#: Zotlabs/Module/Dreport.php:16 Zotlabs/Module/Dreport.php:86
-#: Zotlabs/Module/Profperm.php:35 Zotlabs/Module/Subthread.php:97
-#: Zotlabs/Web/WebServer.php:69 include/items.php:490
+#: Code/Module/Lists.php:169 Code/Module/Lists.php:215
+#: Code/Module/Lists.php:244 Code/Module/Lists.php:287
+#: Code/Module/Import_items.php:133 Code/Module/Cloud.php:134
+#: Code/Module/Like.php:109 Code/Module/Share.php:81
+#: Code/Module/Dreport.php:16 Code/Module/Dreport.php:86
+#: Code/Module/Profperm.php:35 Code/Module/Subthread.php:97
+#: Code/Web/WebServer.php:69 include/items.php:490
 msgid "Permission denied"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:190 Zotlabs/Module/Lists.php:201
+#: Code/Module/Lists.php:190 Code/Module/Lists.php:201
 msgid "Access Lists"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:191
+#: Code/Module/Lists.php:191
 msgid "Create access list"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:195
+#: Code/Module/Lists.php:195
 msgid "Access list name"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:196 Zotlabs/Module/Lists.php:339
+#: Code/Module/Lists.php:196 Code/Module/Lists.php:339
 msgid "Members are visible to other channels"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:203
+#: Code/Module/Lists.php:203
 msgid "Members"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:232
+#: Code/Module/Lists.php:232
 msgid "Access list removed."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:234
+#: Code/Module/Lists.php:234
 msgid "Unable to remove access list."
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:299 Zotlabs/Module/Lists.php:351
-#: Zotlabs/Module/Followers.php:86 Zotlabs/Module/Following.php:88
+#: Code/Module/Lists.php:299 Code/Module/Lists.php:351
+#: Code/Module/Followers.php:86 Code/Module/Following.php:88
 msgid "List members"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:334
+#: Code/Module/Lists.php:334
 #, php-format
 msgid "Access List: %s"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:336
+#: Code/Module/Lists.php:336
 msgid "Access list name: "
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:341
+#: Code/Module/Lists.php:341
 msgid "Delete access list"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:353
+#: Code/Module/Lists.php:353
 msgid "Not in this list"
 msgstr ""
 
-#: Zotlabs/Module/Lists.php:386
+#: Code/Module/Lists.php:386
 msgid "Select a channel to toggle membership"
 msgstr ""
 
-#: Zotlabs/Module/Layouts.php:198 include/text.php:2852
+#: Code/Module/Layouts.php:198 include/text.php:2852
 msgid "Layouts"
 msgstr ""
 
-#: Zotlabs/Module/Layouts.php:204
+#: Code/Module/Layouts.php:204
 msgid "Layout Description"
 msgstr ""
 
-#: Zotlabs/Module/Layouts.php:209
+#: Code/Module/Layouts.php:209
 msgid "Download PDL file"
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:176
+#: Code/Module/Channel.php:176
 #, php-format
 msgid "This is the home page of %s."
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:233
+#: Code/Module/Channel.php:233
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:249 Zotlabs/Module/Stream.php:215
+#: Code/Module/Channel.php:249 Code/Module/Stream.php:215
 msgid "Search Results For:"
 msgstr ""
 
-#: Zotlabs/Module/Channel.php:604
+#: Code/Module/Channel.php:604
 #, php-format
 msgid "This post was published on the home page of %s."
 msgstr ""
 
-#: Zotlabs/Module/Card_edit.php:126 Zotlabs/Module/Editblock.php:142
-#: Zotlabs/Module/Photos.php:732 Zotlabs/Module/Photos.php:1118
+#: Code/Module/Card_edit.php:126 Code/Module/Editblock.php:142
+#: Code/Module/Photos.php:732 Code/Module/Photos.php:1118
 #: include/conversation.php:1451
 msgid "Title (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Card_edit.php:137
+#: Code/Module/Card_edit.php:137
 msgid "Edit Card"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:54 Zotlabs/Module/Import.php:73
+#: Code/Module/Import_items.php:54 Code/Module/Import.php:73
 msgid "Nothing to import."
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:79 Zotlabs/Module/Import.php:88
-#: Zotlabs/Module/Import.php:103
+#: Code/Module/Import_items.php:79 Code/Module/Import.php:88
+#: Code/Module/Import.php:103
 msgid "Unable to download data from old server"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:85 Zotlabs/Module/Import.php:110
+#: Code/Module/Import_items.php:85 Code/Module/Import.php:110
 msgid "Imported file is empty."
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:110
+#: Code/Module/Import_items.php:110
 msgid "Data export format is not compatible with this software"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:120
+#: Code/Module/Import_items.php:120
 msgid "Import completed"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:138
+#: Code/Module/Import_items.php:138
 msgid "Import Items"
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:139
+#: Code/Module/Import_items.php:139
 msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: Zotlabs/Module/Import_items.php:140 Zotlabs/Module/Import.php:687
+#: Code/Module/Import_items.php:140 Code/Module/Import.php:687
 msgid "File to Upload"
 msgstr ""
 
-#: Zotlabs/Module/Cloud.php:136
+#: Code/Module/Cloud.php:136
 msgid "Please refresh page"
 msgstr ""
 
-#: Zotlabs/Module/Cloud.php:142
+#: Code/Module/Cloud.php:142
 msgid "Unknown error"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:148 Zotlabs/Module/New_channel.php:165
+#: Code/Module/Manage.php:148 Code/Module/New_channel.php:165
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:154
+#: Code/Module/Manage.php:154
 msgid "Create a new channel"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:183
+#: Code/Module/Manage.php:183
 msgid "Current Channel"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:185
+#: Code/Module/Manage.php:185
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:186
+#: Code/Module/Manage.php:186
 msgid "Default Login Channel"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:187
+#: Code/Module/Manage.php:187
 msgid "Make Default"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:188 Zotlabs/Module/Manage.php:189
+#: Code/Module/Manage.php:188 Code/Module/Manage.php:189
 msgid "Add to menu"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:192
+#: Code/Module/Manage.php:192
 #, php-format
 msgid "%d new messages"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:193
+#: Code/Module/Manage.php:193
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: Zotlabs/Module/Manage.php:195
+#: Code/Module/Manage.php:195
 msgid "Delegated Channel"
 msgstr ""
 
-#: Zotlabs/Module/Lang.php:21
+#: Code/Module/Lang.php:21
 msgid "Change UI language"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:41 Zotlabs/Module/Menu.php:213
+#: Code/Module/Mitem.php:41 Code/Module/Menu.php:213
 msgid "Menu not found."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:75
+#: Code/Module/Mitem.php:75
 msgid "Unable to create element."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:100
+#: Code/Module/Mitem.php:100
 msgid "Unable to update menu element."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:114
+#: Code/Module/Mitem.php:114
 msgid "Unable to add menu element."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:145 Zotlabs/Module/Menu.php:234
-#: Zotlabs/Module/Xchan.php:46
+#: Code/Module/Mitem.php:145 Code/Module/Menu.php:234
+#: Code/Module/Xchan.php:46
 msgid "Not found."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:179 Zotlabs/Module/Mitem.php:258
+#: Code/Module/Mitem.php:179 Code/Module/Mitem.php:258
 msgid "Menu Item Permissions"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:180 Zotlabs/Module/Mitem.php:259
-#: Zotlabs/Module/Settings/Channel.php:658
+#: Code/Module/Mitem.php:180 Code/Module/Mitem.php:259
+#: Code/Module/Settings/Channel.php:658
 msgid "(click to open/close)"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:186 Zotlabs/Module/Mitem.php:203
+#: Code/Module/Mitem.php:186 Code/Module/Mitem.php:203
 msgid "Link Name"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:187 Zotlabs/Module/Mitem.php:267
+#: Code/Module/Mitem.php:187 Code/Module/Mitem.php:267
 msgid "Link or Submenu Target"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:187
+#: Code/Module/Mitem.php:187
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:188 Zotlabs/Module/Mitem.php:268
+#: Code/Module/Mitem.php:188 Code/Module/Mitem.php:268
 msgid "Use magic-auth if available"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:189 Zotlabs/Module/Mitem.php:269
+#: Code/Module/Mitem.php:189 Code/Module/Mitem.php:269
 msgid "Open link in new window"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270
+#: Code/Module/Mitem.php:190 Code/Module/Mitem.php:270
 msgid "Order in list"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:190 Zotlabs/Module/Mitem.php:270
+#: Code/Module/Mitem.php:190 Code/Module/Mitem.php:270
 msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:191
+#: Code/Module/Mitem.php:191
 msgid "Submit and finish"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:192
+#: Code/Module/Mitem.php:192
 msgid "Submit and continue"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:201
+#: Code/Module/Mitem.php:201
 msgid "Menu:"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:204
+#: Code/Module/Mitem.php:204
 msgid "Link Target"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:207
+#: Code/Module/Mitem.php:207
 msgid "Edit menu"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:210
+#: Code/Module/Mitem.php:210
 msgid "Edit element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:211
+#: Code/Module/Mitem.php:211
 msgid "Drop element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:212
+#: Code/Module/Mitem.php:212
 msgid "New element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:213
+#: Code/Module/Mitem.php:213
 msgid "Edit this menu container"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:214
+#: Code/Module/Mitem.php:214
 msgid "Add menu element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:215
+#: Code/Module/Mitem.php:215
 msgid "Delete this menu item"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:216
+#: Code/Module/Mitem.php:216
 msgid "Edit this menu item"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:233
+#: Code/Module/Mitem.php:233
 msgid "Menu item not found."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:246
+#: Code/Module/Mitem.php:246
 msgid "Menu item deleted."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:248
+#: Code/Module/Mitem.php:248
 msgid "Menu item could not be deleted."
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:256
+#: Code/Module/Mitem.php:256
 msgid "Edit Menu Element"
 msgstr ""
 
-#: Zotlabs/Module/Mitem.php:266
+#: Code/Module/Mitem.php:266
 msgid "Link text"
 msgstr ""
 
-#: Zotlabs/Module/Finger.php:22
+#: Code/Module/Finger.php:22
 msgid "Webfinger Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Finger.php:23
+#: Code/Module/Finger.php:23
 msgid "Lookup address or URL"
 msgstr ""
 
-#: Zotlabs/Module/Editblock.php:151
+#: Code/Module/Editblock.php:151
 msgid "Edit Block"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124
-#: Zotlabs/Module/Tagger.php:84 include/conversation.php:129
+#: Code/Module/Like.php:172 Code/Module/Subthread.php:124
+#: Code/Module/Tagger.php:84 include/conversation.php:129
 #: include/text.php:2369
 msgid "photo"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:172 Zotlabs/Module/Subthread.php:124
+#: Code/Module/Like.php:172 Code/Module/Subthread.php:124
 msgid "status"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:217
+#: Code/Module/Like.php:217
 msgid "Undo a previous action"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:227
+#: Code/Module/Like.php:227
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:230
+#: Code/Module/Like.php:230
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Like.php:233
+#: Code/Module/Like.php:233
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Share.php:134
+#: Code/Module/Share.php:134
 msgid "Post repeated"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:25
+#: Code/Module/Lostpass.php:25
 msgid "No valid account found."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:40
+#: Code/Module/Lostpass.php:40
 msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:47 Zotlabs/Module/Lostpass.php:119
+#: Code/Module/Lostpass.php:47 Code/Module/Lostpass.php:119
 #, php-format
 msgid "Site Member (%s)"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:52 Zotlabs/Module/Lostpass.php:57
+#: Code/Module/Lostpass.php:52 Code/Module/Lostpass.php:57
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:78
+#: Code/Module/Lostpass.php:78
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:102 boot.php:1735
+#: Code/Module/Lostpass.php:102 boot.php:1735
 msgid "Password Reset"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:103
+#: Code/Module/Lostpass.php:103
 msgid "Your password has been reset as requested."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:104
+#: Code/Module/Lostpass.php:104
 msgid "Your new password is"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:105
+#: Code/Module/Lostpass.php:105
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:106
+#: Code/Module/Lostpass.php:106
 msgid "click here to login"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:107
+#: Code/Module/Lostpass.php:107
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:127
+#: Code/Module/Lostpass.php:127
 #, php-format
 msgid "Your password has changed at %s"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:138
+#: Code/Module/Lostpass.php:138
 msgid "Forgot your Password?"
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:139
+#: Code/Module/Lostpass.php:139
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
-#: Zotlabs/Module/Lostpass.php:140 Zotlabs/Module/Settings/Channel.php:633
+#: Code/Module/Lostpass.php:140 Code/Module/Settings/Channel.php:633
 msgid "Email Address"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:76
+#: Code/Module/Menu.php:76
 msgid "Unable to update menu."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:86
+#: Code/Module/Menu.php:86
 msgid "Unable to create menu."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:166 Zotlabs/Module/Menu.php:179
+#: Code/Module/Menu.php:166 Code/Module/Menu.php:179
 msgid "Menu Name"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:166
+#: Code/Module/Menu.php:166
 msgid "Unique name (not visible on webpage) - required"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:167 Zotlabs/Module/Menu.php:180
+#: Code/Module/Menu.php:167 Code/Module/Menu.php:180
 msgid "Menu Title"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:167
+#: Code/Module/Menu.php:167
 msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:168
+#: Code/Module/Menu.php:168
 msgid "Allow Bookmarks"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:168 Zotlabs/Module/Menu.php:226
+#: Code/Module/Menu.php:168 Code/Module/Menu.php:226
 msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:169 Zotlabs/Module/Menu.php:229
+#: Code/Module/Menu.php:169 Code/Module/Menu.php:229
 msgid "Submit and proceed"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:176 include/text.php:2851
+#: Code/Module/Menu.php:176 include/text.php:2851
 msgid "Menus"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:182 Zotlabs/Module/Locs.php:135
+#: Code/Module/Menu.php:182 Code/Module/Locs.php:135
 msgid "Drop"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:186
+#: Code/Module/Menu.php:186
 msgid "Bookmarks allowed"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:188
+#: Code/Module/Menu.php:188
 msgid "Delete this menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:189 Zotlabs/Module/Menu.php:223
+#: Code/Module/Menu.php:189 Code/Module/Menu.php:223
 msgid "Edit menu contents"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:190
+#: Code/Module/Menu.php:190
 msgid "Edit this menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:204
+#: Code/Module/Menu.php:204
 msgid "Menu could not be deleted."
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:218
+#: Code/Module/Menu.php:218
 msgid "Edit Menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:222
+#: Code/Module/Menu.php:222
 msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:224
+#: Code/Module/Menu.php:224
 msgid "Menu name"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:224
+#: Code/Module/Menu.php:224
 msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:225
+#: Code/Module/Menu.php:225
 msgid "Menu title"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:225
+#: Code/Module/Menu.php:225
 msgid "Menu title as seen by others"
 msgstr ""
 
-#: Zotlabs/Module/Menu.php:226
+#: Code/Module/Menu.php:226
 msgid "Allow bookmarks"
 msgstr ""
 
-#: Zotlabs/Module/Pconfig.php:37 Zotlabs/Module/Pconfig.php:73
+#: Code/Module/Pconfig.php:37 Code/Module/Pconfig.php:73
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: Zotlabs/Module/Pconfig.php:63
+#: Code/Module/Pconfig.php:63
 msgid "Configuration Editor"
 msgstr ""
 
-#: Zotlabs/Module/Pconfig.php:64
+#: Code/Module/Pconfig.php:64
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please "
 "leave this page unless you are comfortable with and knowledgeable about how "
 "to correctly use this feature."
 msgstr ""
 
-#: Zotlabs/Module/Editpost.php:44
+#: Code/Module/Editpost.php:44
 msgid "Item is not editable"
 msgstr ""
 
-#: Zotlabs/Module/Editpost.php:147 Zotlabs/Module/Rpost.php:242
+#: Code/Module/Editpost.php:147 Code/Module/Rpost.php:242
 msgid "Edit post"
 msgstr ""
 
-#: Zotlabs/Module/Search.php:336
+#: Code/Module/Search.php:336
 #, php-format
 msgid "Items tagged with: %s"
 msgstr ""
 
-#: Zotlabs/Module/Search.php:338
+#: Code/Module/Search.php:338
 #, php-format
 msgid "Search results for: %s"
 msgstr ""
 
-#: Zotlabs/Module/Hq.php:160
+#: Code/Module/Hq.php:160
 msgid "Welcome to $Projectname!"
 msgstr ""
 
-#: Zotlabs/Module/Hq.php:160
+#: Code/Module/Hq.php:160
 msgid "You have got no unseen posts..."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:31 Zotlabs/Module/Locs.php:72
+#: Code/Module/Locs.php:31 Code/Module/Locs.php:72
 msgid "Location not found."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:81
+#: Code/Module/Locs.php:81
 msgid "Location lookup failed."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:85
+#: Code/Module/Locs.php:85
 msgid ""
 "Please select another location to become primary before removing the primary "
 "location."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:115
+#: Code/Module/Locs.php:115
 msgid "Pushing location info"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:126
+#: Code/Module/Locs.php:126
 msgid "No locations found."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:131
+#: Code/Module/Locs.php:131
 msgid "Manage Channel Locations"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:137
+#: Code/Module/Locs.php:137
 msgid "Publish these settings"
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:138
+#: Code/Module/Locs.php:138
 msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:139
+#: Code/Module/Locs.php:139
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing "
 "your channel."
 msgstr ""
 
-#: Zotlabs/Module/Locs.php:140
+#: Code/Module/Locs.php:140
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: Zotlabs/Module/Viewsrc.php:48
+#: Code/Module/Viewsrc.php:48
 msgid "item"
 msgstr ""
 
-#: Zotlabs/Module/Viewsrc.php:58
+#: Code/Module/Viewsrc.php:58
 msgid "inspect"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:173
+#: Code/Module/New_channel.php:173
 msgid "Your real name is recommended."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:174
+#: Code/Module/New_channel.php:174
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:179
+#: Code/Module/New_channel.php:179
 msgid ""
 "This will be used to create a unique network address (like an email address)."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:181
+#: Code/Module/New_channel.php:181
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:189
+#: Code/Module/New_channel.php:189
 msgid "Channel name"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:192
+#: Code/Module/New_channel.php:192
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:195
+#: Code/Module/New_channel.php:195
 msgid "Create a Channel"
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:196
+#: Code/Module/New_channel.php:196
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed, "
 "and many other things."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:197
+#: Code/Module/New_channel.php:197
 msgid ""
 "or import an existing channel from another location."
 msgstr ""
 
-#: Zotlabs/Module/New_channel.php:202
+#: Code/Module/New_channel.php:202
 msgid "Validate"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:56 Zotlabs/Module/Connect.php:106
+#: Code/Module/Connect.php:56 Code/Module/Connect.php:106
 msgid "Continue"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:87
+#: Code/Module/Connect.php:87
 msgid "Premium Channel Setup"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:89
+#: Code/Module/Connect.php:89
 msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:90
+#: Code/Module/Connect.php:90
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:92 Zotlabs/Module/Connect.php:112
+#: Code/Module/Connect.php:92 Code/Module/Connect.php:112
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:93
+#: Code/Module/Connect.php:93
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:94 Zotlabs/Module/Connect.php:115
+#: Code/Module/Connect.php:94 Code/Module/Connect.php:115
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided "
 "on this page."
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:102
+#: Code/Module/Connect.php:102
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: Zotlabs/Module/Connect.php:111
+#: Code/Module/Connect.php:111
 msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: Zotlabs/Module/Notifications.php:67 Zotlabs/Module/Notify.php:73
+#: Code/Module/Notifications.php:67 Code/Module/Notify.php:73
 msgid "No more system notifications."
 msgstr ""
 
-#: Zotlabs/Module/Notifications.php:71 Zotlabs/Module/Notify.php:77
+#: Code/Module/Notifications.php:71 Code/Module/Notify.php:77
 msgid "System Notifications"
 msgstr ""
 
-#: Zotlabs/Module/Notify.php:42
+#: Code/Module/Notify.php:42
 #, php-format
 msgid "A notification with that id was not found for channel '%s'"
 msgstr ""
 
-#: Zotlabs/Module/Acl.php:261
+#: Code/Module/Acl.php:261
 msgid "network"
 msgstr ""
 
-#: Zotlabs/Module/Mood.php:80 include/conversation.php:296
+#: Code/Module/Mood.php:80 include/conversation.php:296
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Mood.php:141 Zotlabs/Module/Mood.php:163
+#: Code/Module/Mood.php:141 Code/Module/Mood.php:163
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: Zotlabs/Module/Vote.php:41
+#: Code/Module/Vote.php:41
 msgid "Poll not found."
 msgstr ""
 
-#: Zotlabs/Module/Vote.php:72
+#: Code/Module/Vote.php:72
 msgid "Invalid response."
 msgstr ""
 
-#: Zotlabs/Module/Vote.php:131
+#: Code/Module/Vote.php:131
 msgid "Response submitted. Updates may not appear instantly."
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:54
+#: Code/Module/Webpages.php:54
 msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:74
+#: Code/Module/Webpages.php:74
 msgid "Import Webpage Elements"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:75
+#: Code/Module/Webpages.php:75
 msgid "Import selected"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:98
+#: Code/Module/Webpages.php:98
 msgid "Export Webpage Elements"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:99
+#: Code/Module/Webpages.php:99
 msgid "Export selected"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:273
+#: Code/Module/Webpages.php:273
 msgid "Actions"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:274
+#: Code/Module/Webpages.php:274
 msgid "Page Link"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:275
+#: Code/Module/Webpages.php:275
 msgid "Page Title"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:305
+#: Code/Module/Webpages.php:305
 msgid "Invalid file type."
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:317
+#: Code/Module/Webpages.php:317
 msgid "Error opening zip file"
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:327
+#: Code/Module/Webpages.php:327
 msgid "Invalid folder path."
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:353
+#: Code/Module/Webpages.php:353
 msgid "No webpage elements detected."
 msgstr ""
 
-#: Zotlabs/Module/Webpages.php:427 Zotlabs/Import/Friendica.php:360
+#: Code/Module/Webpages.php:427 Code/Import/Friendica.php:360
 msgid "Import complete."
 msgstr ""
 
-#: Zotlabs/Module/Page.php:187
+#: Code/Module/Page.php:187
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
@@ -6794,737 +6794,737 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:48
+#: Code/Module/Removeme.php:48
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:71
+#: Code/Module/Removeme.php:71
 msgid "Remove This Channel"
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:72
+#: Code/Module/Removeme.php:72
 msgid "This channel will be completely removed from this server. "
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:72 Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Removeme.php:72 Code/Module/Removeaccount.php:72
 msgid "This action is permanent and can not be undone!"
 msgstr ""
 
-#: Zotlabs/Module/Removeme.php:74 Zotlabs/Module/Settings/Channel.php:744
+#: Code/Module/Removeme.php:74 Code/Module/Settings/Channel.php:744
 msgid "Remove Channel"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:27
+#: Code/Module/Pdledit.php:27
 msgid "Layout updated."
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:49 Zotlabs/Module/Pdledit.php:106
+#: Code/Module/Pdledit.php:49 Code/Module/Pdledit.php:106
 msgid "Edit System Page Description"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:71 Zotlabs/Module/Pdledit.php:79
+#: Code/Module/Pdledit.php:71 Code/Module/Pdledit.php:79
 msgid "(modified)"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:101
+#: Code/Module/Pdledit.php:101
 msgid "Layout not found."
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:107
+#: Code/Module/Pdledit.php:107
 msgid "Module Name:"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:108
+#: Code/Module/Pdledit.php:108
 msgid "Layout Help"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:109
+#: Code/Module/Pdledit.php:109
 msgid "Edit another layout"
 msgstr ""
 
-#: Zotlabs/Module/Pdledit.php:110
+#: Code/Module/Pdledit.php:110
 msgid "System layout"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:35
+#: Code/Module/Dreport.php:35
 msgid "Invalid message"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:63
+#: Code/Module/Dreport.php:63
 msgid "Delivery Log"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:97
+#: Code/Module/Dreport.php:97
 msgid "no results"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:109
+#: Code/Module/Dreport.php:109
 msgid "channel sync processed"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:113
+#: Code/Module/Dreport.php:113
 msgid "queued"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:117
+#: Code/Module/Dreport.php:117
 msgid "site dead"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:121
+#: Code/Module/Dreport.php:121
 msgid "site might be dead - deferred"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:125
+#: Code/Module/Dreport.php:125
 msgid "posted"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:129
+#: Code/Module/Dreport.php:129
 msgid "accepted for delivery"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:133
+#: Code/Module/Dreport.php:133
 msgid "updated"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:136
+#: Code/Module/Dreport.php:136
 msgid "update ignored"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:139
+#: Code/Module/Dreport.php:139
 msgid "permission denied"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:143
+#: Code/Module/Dreport.php:143
 msgid "recipient not found"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:146
+#: Code/Module/Dreport.php:146
 msgid "mail recalled"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:149
+#: Code/Module/Dreport.php:149
 msgid "duplicate mail received"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:152
+#: Code/Module/Dreport.php:152
 msgid "mail delivered"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:156
+#: Code/Module/Dreport.php:156
 msgid "delivery rejected"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:175
+#: Code/Module/Dreport.php:175
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:178
+#: Code/Module/Dreport.php:178
 msgid "Options"
 msgstr ""
 
-#: Zotlabs/Module/Dreport.php:179
+#: Code/Module/Dreport.php:179
 msgid "Redeliver"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:32 Zotlabs/Module/Profiles.php:198
-#: Zotlabs/Module/Profiles.php:254 Zotlabs/Module/Profiles.php:701
+#: Code/Module/Profiles.php:32 Code/Module/Profiles.php:198
+#: Code/Module/Profiles.php:254 Code/Module/Profiles.php:701
 msgid "Profile not found."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:53
+#: Code/Module/Profiles.php:53
 msgid "Profile deleted."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:76 Zotlabs/Module/Profiles.php:118
+#: Code/Module/Profiles.php:76 Code/Module/Profiles.php:118
 msgid "Profile-"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:101 Zotlabs/Module/Profiles.php:142
+#: Code/Module/Profiles.php:101 Code/Module/Profiles.php:142
 msgid "New profile created."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:125
+#: Code/Module/Profiles.php:125
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:162
+#: Code/Module/Profiles.php:162
 msgid "Profile unavailable to export."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:265
+#: Code/Module/Profiles.php:265
 msgid "Profile Name is required."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:484
+#: Code/Module/Profiles.php:484
 msgid "Marital Status"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:488
+#: Code/Module/Profiles.php:488
 msgid "Romantic Partner"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:492 Zotlabs/Module/Profiles.php:821
+#: Code/Module/Profiles.php:492 Code/Module/Profiles.php:821
 msgid "Likes"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:496 Zotlabs/Module/Profiles.php:822
+#: Code/Module/Profiles.php:496 Code/Module/Profiles.php:822
 msgid "Dislikes"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:500 Zotlabs/Module/Profiles.php:829
+#: Code/Module/Profiles.php:500 Code/Module/Profiles.php:829
 msgid "Work/Employment"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:503
+#: Code/Module/Profiles.php:503
 msgid "Religion"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:507
+#: Code/Module/Profiles.php:507
 msgid "Political Views"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:511
+#: Code/Module/Profiles.php:511
 msgid "Gender"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:515
+#: Code/Module/Profiles.php:515
 msgid "Sexual Preference"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:519
+#: Code/Module/Profiles.php:519
 msgid "Homepage"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:523
+#: Code/Module/Profiles.php:523
 msgid "Interests"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:623
+#: Code/Module/Profiles.php:623
 msgid "Profile updated."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:721
+#: Code/Module/Profiles.php:721
 msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:767
+#: Code/Module/Profiles.php:767
 msgid "Edit Profile Details"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:769
+#: Code/Module/Profiles.php:769
 msgid "View this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:771
+#: Code/Module/Profiles.php:771
 msgid "Profile Tools"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:772
+#: Code/Module/Profiles.php:772
 msgid "Change cover photo"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:774
+#: Code/Module/Profiles.php:774
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:775
+#: Code/Module/Profiles.php:775
 msgid "Clone this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:776
+#: Code/Module/Profiles.php:776
 msgid "Delete this profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:777
+#: Code/Module/Profiles.php:777
 msgid "Add profile things"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:778
+#: Code/Module/Profiles.php:778
 msgid "Personal"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:780
+#: Code/Module/Profiles.php:780
 msgid "Relationship"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:781 Zotlabs/Module/Settings/Channel.php:739
-#: Zotlabs/Widget/Newmember.php:52 include/datetime.php:72
+#: Code/Module/Profiles.php:781 Code/Module/Settings/Channel.php:739
+#: Code/Widget/Newmember.php:52 include/datetime.php:72
 msgid "Miscellaneous"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:783
+#: Code/Module/Profiles.php:783
 msgid "Import profile from file"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:784
+#: Code/Module/Profiles.php:784
 msgid "Export profile to file"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:785
+#: Code/Module/Profiles.php:785
 msgid "Your gender"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:786
+#: Code/Module/Profiles.php:786
 msgid "Marital status"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:787
+#: Code/Module/Profiles.php:787
 msgid "Sexual preference"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:788
+#: Code/Module/Profiles.php:788
 msgid "Pronouns"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:791
+#: Code/Module/Profiles.php:791
 msgid "Profile name"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:795
+#: Code/Module/Profiles.php:795
 msgid "Your full name"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:796
+#: Code/Module/Profiles.php:796
 msgid "Title/Description"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:799
+#: Code/Module/Profiles.php:799
 msgid "Street address"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:800
+#: Code/Module/Profiles.php:800
 msgid "Locality/City"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:801
+#: Code/Module/Profiles.php:801
 msgid "Region/State"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:802
+#: Code/Module/Profiles.php:802
 msgid "Postal/Zip code"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:809
+#: Code/Module/Profiles.php:809
 msgid "Who (if applicable)"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:809
+#: Code/Module/Profiles.php:809
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:810
+#: Code/Module/Profiles.php:810
 msgid "Since (date)"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:815
+#: Code/Module/Profiles.php:815
 msgid "Tell us about yourself"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:816
+#: Code/Module/Profiles.php:816
 msgid "Homepage URL"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:817
+#: Code/Module/Profiles.php:817
 msgid "Hometown"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:818
+#: Code/Module/Profiles.php:818
 msgid "Political views"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:819
+#: Code/Module/Profiles.php:819
 msgid "Religious views"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:820
+#: Code/Module/Profiles.php:820
 msgid "Keywords used in directory listings"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:820
+#: Code/Module/Profiles.php:820
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:823
+#: Code/Module/Profiles.php:823
 msgid "Musical interests"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:824
+#: Code/Module/Profiles.php:824
 msgid "Books, literature"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:825
+#: Code/Module/Profiles.php:825
 msgid "Television"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:826
+#: Code/Module/Profiles.php:826
 msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:827
+#: Code/Module/Profiles.php:827
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:828
+#: Code/Module/Profiles.php:828
 msgid "Love/Romance"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:830
+#: Code/Module/Profiles.php:830
 msgid "School/Education"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:831
+#: Code/Module/Profiles.php:831
 msgid "Contact information and social networks"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:832
+#: Code/Module/Profiles.php:832
 msgid "My other channels"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:834
+#: Code/Module/Profiles.php:834
 msgid "Communications"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:932
+#: Code/Module/Profiles.php:932
 msgid " and "
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:934
+#: Code/Module/Profiles.php:934
 msgid ", "
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:941
+#: Code/Module/Profiles.php:941
 msgid "public profile"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:951
+#: Code/Module/Profiles.php:951
 #, php-format
 msgid "%1$s changed %2$s to “%3$s”"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:952
+#: Code/Module/Profiles.php:952
 #, php-format
 msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:954
+#: Code/Module/Profiles.php:954
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Currently Male"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Currently Female"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Mostly Male"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Mostly Female"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Transgender"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Intersex"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Transsexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Hermaphrodite"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:985
+#: Code/Module/Profiles.php:985
 msgid "Undecided"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "He/Him"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "She/Her"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1021
+#: Code/Module/Profiles.php:1021
 msgid "They/Them"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1053 Code/Module/Profiles.php:1073
 msgid "Males"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053 Zotlabs/Module/Profiles.php:1073
+#: Code/Module/Profiles.php:1053 Code/Module/Profiles.php:1073
 msgid "Females"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Gay"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Lesbian"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "No Preference"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Bisexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Autosexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Abstinent"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Virgin"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Deviant"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Fetish"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Oodles"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1053
+#: Code/Module/Profiles.php:1053
 msgid "Nonsexual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Single"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Lonely"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Available"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unavailable"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Has crush"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Infatuated"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Dating"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unfaithful"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Sex Addict"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Friends/Benefits"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Casual"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Engaged"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Married"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Imaginarily married"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Partners"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Cohabiting"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Common law"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Happy"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Not looking"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Swinger"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Betrayed"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Separated"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Unstable"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Divorced"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Imaginarily divorced"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "Widowed"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Uncertain"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092 Zotlabs/Module/Profiles.php:1110
+#: Code/Module/Profiles.php:1092 Code/Module/Profiles.php:1110
 msgid "It's complicated"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Don't care"
 msgstr ""
 
-#: Zotlabs/Module/Profiles.php:1092
+#: Code/Module/Profiles.php:1092
 msgid "Ask me"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:139 Zotlabs/Widget/Activity_filter.php:149
+#: Code/Module/Stream.php:139 Code/Widget/Activity_filter.php:149
 #: include/network.php:1693
 msgid "Nomad"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:143 Zotlabs/Widget/Activity_filter.php:152
+#: Code/Module/Stream.php:143 Code/Widget/Activity_filter.php:152
 #: include/network.php:1689
 msgid "ActivityPub"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:158
+#: Code/Module/Stream.php:158
 msgid "Access list not found"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:202
+#: Code/Module/Stream.php:202
 msgid "No such channel"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:288
+#: Code/Module/Stream.php:288
 msgid "Access list is empty"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:302 include/items.php:4552
+#: Code/Module/Stream.php:302 include/items.php:4552
 #, php-format
 msgid "Access list: %s"
 msgstr ""
 
-#: Zotlabs/Module/Stream.php:345 extend/addon/a/zotpost/Mod_zotpost.php:29
+#: Code/Module/Stream.php:345 extend/addon/a/zotpost/Mod_zotpost.php:29
 msgid "Invalid channel."
 msgstr ""
 
-#: Zotlabs/Module/Profile_photo.php:502
+#: Code/Module/Profile_photo.php:502
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
 msgstr ""
 
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Profile_photo.php:506
 msgid "Use Photo for Profile"
 msgstr ""
 
-#: Zotlabs/Module/Profile_photo.php:506
+#: Code/Module/Profile_photo.php:506
 msgid "Change Profile Photo"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:104
+#: Code/Module/Poke.php:104
 #, php-format
 msgid "You %1$s %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:120
+#: Code/Module/Poke.php:120
 msgid "Poke App (Not Installed)"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:121
+#: Code/Module/Poke.php:121
 msgid "Poke or do something else to somebody"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:140
+#: Code/Module/Poke.php:140
 msgid "Poke, prod or do other things to somebody"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:145
+#: Code/Module/Poke.php:145
 msgid "Recipient"
 msgstr ""
 
-#: Zotlabs/Module/Poke.php:146
+#: Code/Module/Poke.php:146
 msgid "Choose your default action"
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:41 Zotlabs/Module/Profperm.php:75
+#: Code/Module/Profperm.php:41 Code/Module/Profperm.php:75
 msgid "Invalid profile identifier."
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:129
+#: Code/Module/Profperm.php:129
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:133
+#: Code/Module/Profperm.php:133
 msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: Zotlabs/Module/Profperm.php:142
+#: Code/Module/Profperm.php:142
 msgid "Visible To"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:31
+#: Code/Module/Affinity.php:31
 msgid "Friend Zoom settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:41
+#: Code/Module/Affinity.php:41
 msgid ""
 "This app (when installed) presents a slider control in your connection "
 "editor and also on your stream page. The slider represents your degree of "
@@ -7532,513 +7532,513 @@ msgid ""
 "conversations from only your closest friends or everybody in your stream."
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:49
+#: Code/Module/Affinity.php:49
 msgid ""
 "The number below represents the default maximum slider position for your "
 "stream page as a percentage."
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:74
+#: Code/Module/Affinity.php:74
 msgid "Default friend zoom in/out"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:75 Zotlabs/Widget/Affinity.php:40
+#: Code/Module/Affinity.php:75 Code/Widget/Affinity.php:40
 msgid "Refresh"
 msgstr ""
 
-#: Zotlabs/Module/Affinity.php:86
+#: Code/Module/Affinity.php:86
 msgid "Friend Zoom Settings"
 msgstr ""
 
-#: Zotlabs/Module/Zot_probe.php:18
+#: Code/Module/Zot_probe.php:18
 msgid "Zot6 Probe Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Zot_probe.php:19 Zotlabs/Module/Ap_probe.php:21
+#: Code/Module/Zot_probe.php:19 Code/Module/Ap_probe.php:21
 msgid "Object URL"
 msgstr ""
 
-#: Zotlabs/Module/Zot_probe.php:20 Zotlabs/Module/Ap_probe.php:22
+#: Code/Module/Zot_probe.php:20 Code/Module/Ap_probe.php:22
 msgid "Authenticated fetch"
 msgstr ""
 
-#: Zotlabs/Module/Home.php:161
+#: Code/Module/Home.php:161
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: Zotlabs/Module/Oexchange.php:28
+#: Code/Module/Oexchange.php:28
 msgid "Unable to find your site."
 msgstr ""
 
-#: Zotlabs/Module/Oexchange.php:42
+#: Code/Module/Oexchange.php:42
 msgid "Post successful."
 msgstr ""
 
-#: Zotlabs/Module/Regmod.php:19
+#: Code/Module/Regmod.php:19
 msgid "Please login."
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:49
+#: Code/Module/Removeaccount.php:49
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:71
+#: Code/Module/Removeaccount.php:71
 msgid "Remove This Account"
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:72
+#: Code/Module/Removeaccount.php:72
 msgid ""
 "This account and all its channels will be completely removed from this "
 "server. "
 msgstr ""
 
-#: Zotlabs/Module/Removeaccount.php:74 Zotlabs/Module/Settings/Account.php:116
+#: Code/Module/Removeaccount.php:74 Code/Module/Settings/Account.php:116
 msgid "Remove Account"
 msgstr ""
 
-#: Zotlabs/Module/Rmagic.php:44
+#: Code/Module/Rmagic.php:44
 msgid "Authentication failed."
 msgstr ""
 
-#: Zotlabs/Module/Rmagic.php:84 boot.php:1727 include/channel.php:2142
+#: Code/Module/Rmagic.php:84 boot.php:1727 include/channel.php:2142
 msgid "Remote Authentication"
 msgstr ""
 
-#: Zotlabs/Module/Rmagic.php:85 include/channel.php:2143
+#: Code/Module/Rmagic.php:85 include/channel.php:2143
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: Zotlabs/Module/Rmagic.php:88 include/channel.php:2144
+#: Code/Module/Rmagic.php:88 include/channel.php:2144
 msgid "Authenticate"
 msgstr ""
 
-#: Zotlabs/Module/Ap_probe.php:20
+#: Code/Module/Ap_probe.php:20
 msgid "ActivityPub Probe Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Tasks.php:106
+#: Code/Module/Tasks.php:106
 msgid "This app provides a simple personal and task list."
 msgstr ""
 
-#: Zotlabs/Module/Service_limits.php:28
+#: Code/Module/Service_limits.php:28
 msgid "No service class restrictions found."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:23
+#: Code/Module/Settings/Account.php:23
 msgid "Not valid email."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:27
+#: Code/Module/Settings/Account.php:27
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:37
+#: Code/Module/Settings/Account.php:37
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:55
+#: Code/Module/Settings/Account.php:55
 msgid "Password verification failed."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:62
+#: Code/Module/Settings/Account.php:62
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:66
+#: Code/Module/Settings/Account.php:66
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:81
+#: Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:83
+#: Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:110
+#: Code/Module/Settings/Account.php:110
 msgid "Account Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:111
+#: Code/Module/Settings/Account.php:111
 msgid "Current Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:112
+#: Code/Module/Settings/Account.php:112
 msgid "Enter New Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:113
+#: Code/Module/Settings/Account.php:113
 msgid "Confirm New Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:113
+#: Code/Module/Settings/Account.php:113
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:115
+#: Code/Module/Settings/Account.php:115
 msgid "Email Address:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Account.php:117
+#: Code/Module/Settings/Account.php:117
 msgid "Remove this account including all its channels"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:433 include/conversation.php:1355
+#: Code/Module/Settings/Channel.php:433 include/conversation.php:1355
 msgid "Restricted - from connections only"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:434 include/conversation.php:1356
+#: Code/Module/Settings/Channel.php:434 include/conversation.php:1356
 msgid "Semi-public - from anybody that can be identified"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:435 include/conversation.php:1357
+#: Code/Module/Settings/Channel.php:435 include/conversation.php:1357
 msgid "Public - from anybody on the internet"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:513
+#: Code/Module/Settings/Channel.php:513
 msgid "Publish your profile in the network directory"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:518
+#: Code/Module/Settings/Channel.php:518
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:522
-#: Zotlabs/Module/Settings/Channel.php:536
+#: Code/Module/Settings/Channel.php:522
+#: Code/Module/Settings/Channel.php:536
 msgid "or"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:528
+#: Code/Module/Settings/Channel.php:528
 msgid "Your channel address is"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:530
+#: Code/Module/Settings/Channel.php:530
 msgid ""
 "Friends using compatible applications can use this address to connect with "
 "you."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:532
+#: Code/Module/Settings/Channel.php:532
 msgid "Your files/photos are accessible as a network drive at"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:534
+#: Code/Module/Settings/Channel.php:534
 msgid "(Windows)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:535
+#: Code/Module/Settings/Channel.php:535
 msgid "(other platforms)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:583
+#: Code/Module/Settings/Channel.php:583
 msgid "Automatic membership approval"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:588
+#: Code/Module/Settings/Channel.php:588
 msgid "Friend-of-friend conversations"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:588
+#: Code/Module/Settings/Channel.php:588
 msgid ""
 "Import public third-party conversations in which your connections "
 "participate."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:592
+#: Code/Module/Settings/Channel.php:592
 msgid "Enable ActivityPub protocol"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:592
+#: Code/Module/Settings/Channel.php:592
 msgid "ActivityPub is an emerging internet standard for social communications"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:625
+#: Code/Module/Settings/Channel.php:625
 msgid "Channel Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:631
+#: Code/Module/Settings/Channel.php:631
 msgid "Basic Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:632
+#: Code/Module/Settings/Channel.php:632
 msgid "Full name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:634
+#: Code/Module/Settings/Channel.php:634
 msgid "Your timezone"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:634
+#: Code/Module/Settings/Channel.php:634
 msgid "This is important for showing the correct time on shared events"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:635
+#: Code/Module/Settings/Channel.php:635
 msgid "Default post location"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:635
+#: Code/Module/Settings/Channel.php:635
 msgid "Optional geographical location to display on your posts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:636
+#: Code/Module/Settings/Channel.php:636
 msgid "Obtain post location from your web browser or device"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:638
+#: Code/Module/Settings/Channel.php:638
 msgid "Adult content"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:638
+#: Code/Module/Settings/Channel.php:638
 msgid ""
 "Enable to indicate if this channel frequently or regularly publishes adult "
 "content. (Please also tag any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:640
+#: Code/Module/Settings/Channel.php:640
 msgid "Security and Privacy"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:642
+#: Code/Module/Settings/Channel.php:642
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:644
+#: Code/Module/Settings/Channel.php:644
 msgid "Hide my online presence"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:644
+#: Code/Module/Settings/Channel.php:644
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:645
+#: Code/Module/Settings/Channel.php:645
 msgid "Allow others to view your friends and connections"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:649
+#: Code/Module/Settings/Channel.php:649
 msgid "Forbid indexing of your channel content by search engines"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:650
+#: Code/Module/Settings/Channel.php:650
 msgid "Disable acceptance of comments on my posts after this many days"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:650
+#: Code/Module/Settings/Channel.php:650
 msgid "Leave unset or enter 0 to allow comments indefinitely"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:651
+#: Code/Module/Settings/Channel.php:651
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:651
+#: Code/Module/Settings/Channel.php:651
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:653
+#: Code/Module/Settings/Channel.php:653
 msgid "Channel Permission Limits"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "Expire conversations you have not participated in after this many days"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "This website does not provide an expiration policy."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:655
+#: Code/Module/Settings/Channel.php:655
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:656
+#: Code/Module/Settings/Channel.php:656
 msgid "May reduce spam activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:657
+#: Code/Module/Settings/Channel.php:657
 msgid "Default Access List"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:659
+#: Code/Module/Settings/Channel.php:659
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:660
+#: Code/Module/Settings/Channel.php:660
 msgid "Profile to assign new connections"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:671
+#: Code/Module/Settings/Channel.php:671
 msgid "Channel type and privacy"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:672
+#: Code/Module/Settings/Channel.php:672
 msgid "Default Permissions Group"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:678
+#: Code/Module/Settings/Channel.php:678
 msgid "Maximum direct messages per day from unknown people:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:678
+#: Code/Module/Settings/Channel.php:678
 msgid ""
 "Useful to reduce spamming if you allow direct messages from unknown people"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:687
+#: Code/Module/Settings/Channel.php:687
 msgid "By default post a status message when:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:688
+#: Code/Module/Settings/Channel.php:688
 msgid "accepting a friend request"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:689
+#: Code/Module/Settings/Channel.php:689
 msgid "joining a forum/community"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:690
+#: Code/Module/Settings/Channel.php:690
 msgid "making an interesting profile change"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:691
+#: Code/Module/Settings/Channel.php:691
 msgid "Send a notification email when:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:692
+#: Code/Module/Settings/Channel.php:692
 msgid "You receive a connection request"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:694
+#: Code/Module/Settings/Channel.php:694
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:695
+#: Code/Module/Settings/Channel.php:695
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:696
+#: Code/Module/Settings/Channel.php:696
 msgid "Someone shares a followed conversation"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:697
+#: Code/Module/Settings/Channel.php:697
 msgid "You receive a direct (private) message"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:699
+#: Code/Module/Settings/Channel.php:699
 msgid "You are tagged in a post"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:702
+#: Code/Module/Settings/Channel.php:702
 msgid "Someone likes your post/comment"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:705
+#: Code/Module/Settings/Channel.php:705
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:707
+#: Code/Module/Settings/Channel.php:707
 msgid "Unseen stream activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:708
+#: Code/Module/Settings/Channel.php:708
 msgid "Unseen channel activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:709
+#: Code/Module/Settings/Channel.php:709
 msgid "Unseen direct messages"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:709
-#: Zotlabs/Module/Settings/Channel.php:714
-#: Zotlabs/Module/Settings/Channel.php:715
-#: Zotlabs/Module/Settings/Channel.php:716
+#: Code/Module/Settings/Channel.php:709
+#: Code/Module/Settings/Channel.php:714
+#: Code/Module/Settings/Channel.php:715
+#: Code/Module/Settings/Channel.php:716
 msgid "Recommended"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:710
+#: Code/Module/Settings/Channel.php:710
 msgid "Upcoming events"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:711
+#: Code/Module/Settings/Channel.php:711
 msgid "Events today"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:712
+#: Code/Module/Settings/Channel.php:712
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:712
+#: Code/Module/Settings/Channel.php:712
 msgid "Not available in all themes"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:713
+#: Code/Module/Settings/Channel.php:713
 msgid "System (personal) notifications"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:714
+#: Code/Module/Settings/Channel.php:714
 msgid "System info messages"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:715
+#: Code/Module/Settings/Channel.php:715
 msgid "System critical alerts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:716
+#: Code/Module/Settings/Channel.php:716
 msgid "New connections"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:717
+#: Code/Module/Settings/Channel.php:717
 msgid "System Registrations"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:719
+#: Code/Module/Settings/Channel.php:719
 msgid "Unseen public stream activity"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:720
+#: Code/Module/Settings/Channel.php:720
 msgid "Unseen likes and dislikes"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:721
+#: Code/Module/Settings/Channel.php:721
 msgid "Unseen forum posts"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:722
+#: Code/Module/Settings/Channel.php:722
 msgid "Reported content"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:723
+#: Code/Module/Settings/Channel.php:723
 msgid ""
 "Desktop notifications are unavailable because the required browser "
 "permission has not been granted"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:724
+#: Code/Module/Settings/Channel.php:724
 msgid "Grant permission"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:725
+#: Code/Module/Settings/Channel.php:725
 msgid "Email notifications sent from (hostname)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:725
+#: Code/Module/Settings/Channel.php:725
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple locations, set this to your "
@@ -8046,635 +8046,635 @@ msgid ""
 "Example: %s"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:726
+#: Code/Module/Settings/Channel.php:726
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:727
+#: Code/Module/Settings/Channel.php:727
 msgid "Accept messages from strangers which mention you"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:727
+#: Code/Module/Settings/Channel.php:727
 msgid "This setting bypasses normal permissions"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:728
+#: Code/Module/Settings/Channel.php:728
 msgid ""
 "Accept messages from strangers which include any of the following hashtags"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:728
+#: Code/Module/Settings/Channel.php:728
 msgid "comma separated, do not include the #"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:729
+#: Code/Module/Settings/Channel.php:729
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:729
+#: Code/Module/Settings/Channel.php:729
 msgid "Must be greater than 0"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:734
+#: Code/Module/Settings/Channel.php:734
 msgid "Date and time"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:735
+#: Code/Module/Settings/Channel.php:735
 msgid ""
 "This section is reserved for use by optional addons and apps to provide "
 "additional settings."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:736
+#: Code/Module/Settings/Channel.php:736
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:737
+#: Code/Module/Settings/Channel.php:737
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:740
+#: Code/Module/Settings/Channel.php:740
 msgid "Default photo upload folder name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:740
-#: Zotlabs/Module/Settings/Channel.php:741
+#: Code/Module/Settings/Channel.php:740
+#: Code/Module/Settings/Channel.php:741
 msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:741
+#: Code/Module/Settings/Channel.php:741
 msgid "Default file upload folder name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:743
+#: Code/Module/Settings/Channel.php:743
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:745
+#: Code/Module/Settings/Channel.php:745
 msgid "Remove this channel."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:746
+#: Code/Module/Settings/Channel.php:746
 msgid "Mentions should display"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:746
+#: Code/Module/Settings/Channel.php:746
 msgid ""
 "Changes to this setting are applied to new posts/comments only. It is not "
 "retroactive."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:748
+#: Code/Module/Settings/Channel.php:748
 msgid "the channel display name [example: @Barbara Jenkins]"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:749
+#: Code/Module/Settings/Channel.php:749
 msgid "the channel nickname [example: @barbara1976]"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:750
+#: Code/Module/Settings/Channel.php:750
 msgid "combined [example: @Barbara Jenkins (barbara1976)]"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:751
+#: Code/Module/Settings/Channel.php:751
 msgid "no preference, use the system default"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:754
+#: Code/Module/Settings/Channel.php:754
 msgid "Calendar week begins on"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:754
+#: Code/Module/Settings/Channel.php:754
 msgid "This varies by country/culture"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:755 include/js_strings.php:93
+#: Code/Module/Settings/Channel.php:755 include/js_strings.php:93
 #: include/text.php:1427
 msgid "Sunday"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:756 include/js_strings.php:94
+#: Code/Module/Settings/Channel.php:756 include/js_strings.php:94
 #: include/text.php:1427
 msgid "Monday"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:757 include/js_strings.php:95
+#: Code/Module/Settings/Channel.php:757 include/js_strings.php:95
 #: include/text.php:1427
 msgid "Tuesday"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:758 include/js_strings.php:96
+#: Code/Module/Settings/Channel.php:758 include/js_strings.php:96
 #: include/text.php:1427
 msgid "Wednesday"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:759 include/js_strings.php:97
+#: Code/Module/Settings/Channel.php:759 include/js_strings.php:97
 #: include/text.php:1427
 msgid "Thursday"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:760 include/js_strings.php:98
+#: Code/Module/Settings/Channel.php:760 include/js_strings.php:98
 #: include/text.php:1427
 msgid "Friday"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Channel.php:761 include/js_strings.php:99
+#: Code/Module/Settings/Channel.php:761 include/js_strings.php:99
 #: include/text.php:1427
 msgid "Saturday"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:156
+#: Code/Module/Settings/Display.php:156
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:199
+#: Code/Module/Settings/Display.php:199
 msgid "Display Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:200
+#: Code/Module/Settings/Display.php:200
 msgid "Theme Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:201
+#: Code/Module/Settings/Display.php:201
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:202
+#: Code/Module/Settings/Display.php:202
 msgid "Content Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:208
+#: Code/Module/Settings/Display.php:208
 msgid "Display Theme:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:209
+#: Code/Module/Settings/Display.php:209
 msgid "Select scheme"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:211
+#: Code/Module/Settings/Display.php:211
 msgid "Preload images before rendering the page"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:211
+#: Code/Module/Settings/Display.php:211
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:212
+#: Code/Module/Settings/Display.php:212
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:213
+#: Code/Module/Settings/Display.php:213
 msgid "Update notifications every xx seconds"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:213
+#: Code/Module/Settings/Display.php:213
 msgid "Minimum of 15 seconds, no maximum"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:214
+#: Code/Module/Settings/Display.php:214
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:214
+#: Code/Module/Settings/Display.php:214
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:215
+#: Code/Module/Settings/Display.php:215
 msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:216
+#: Code/Module/Settings/Display.php:216
 msgid "Provide channel menu in navigation bar"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:216
+#: Code/Module/Settings/Display.php:216
 msgid "Default: channel menu located in app menu"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:217
+#: Code/Module/Settings/Display.php:217
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:220
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:220
-#: Zotlabs/Module/Settings/Display.php:221
+#: Code/Module/Settings/Display.php:220
+#: Code/Module/Settings/Display.php:221
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:221
+#: Code/Module/Settings/Display.php:221
 msgid "Stream page max height of content (in pixels)"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:222
+#: Code/Module/Settings/Display.php:222
 msgid "Indent threaded comments this many pixels from the parent"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Display.php:222
+#: Code/Module/Settings/Display.php:222
 msgid "0-20"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:28
+#: Code/Module/Settings/Featured.php:28
 msgid "Affinity Slider settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:43
+#: Code/Module/Settings/Featured.php:43
 msgid "No feature settings configured"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:50
+#: Code/Module/Settings/Featured.php:50
 msgid "Default maximum affinity level"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:50
+#: Code/Module/Settings/Featured.php:50
 msgid "0-99 default 99"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:55
+#: Code/Module/Settings/Featured.php:55
 msgid "Default minimum affinity level"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:55
+#: Code/Module/Settings/Featured.php:55
 msgid "0-99 - default 0"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:59
+#: Code/Module/Settings/Featured.php:59
 msgid "Affinity Slider Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:72
+#: Code/Module/Settings/Featured.php:72
 msgid "Addon Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Featured.php:73
+#: Code/Module/Settings/Featured.php:73
 msgid "Please save/submit changes to any panel before opening another."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Features.php:51
-#: Zotlabs/Module/Settings/Network.php:33
+#: Code/Module/Settings/Features.php:51
+#: Code/Module/Settings/Network.php:33
 msgid "Off"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Features.php:51
-#: Zotlabs/Module/Settings/Network.php:33
+#: Code/Module/Settings/Features.php:51
+#: Code/Module/Settings/Network.php:33
 msgid "On"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Features.php:59
+#: Code/Module/Settings/Features.php:59
 msgid "Additional Features"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:41
+#: Code/Module/Settings/Network.php:41
 msgid "Activity Settings"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:56 include/features.php:383
+#: Code/Module/Settings/Network.php:56 include/features.php:383
 msgid "Search by Date"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:57 include/features.php:384
+#: Code/Module/Settings/Network.php:57 include/features.php:384
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:64 Zotlabs/Widget/Savedsearch.php:94
+#: Code/Module/Settings/Network.php:64 Code/Widget/Savedsearch.php:94
 #: include/features.php:393
 msgid "Saved Searches"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:65 include/features.php:394
+#: Code/Module/Settings/Network.php:65 include/features.php:394
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:72 include/features.php:402
+#: Code/Module/Settings/Network.php:72 include/features.php:402
 msgid "Alternate Stream Order"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:73 include/features.php:403
+#: Code/Module/Settings/Network.php:73 include/features.php:403
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:80 include/features.php:411
+#: Code/Module/Settings/Network.php:80 include/features.php:411
 msgid "Contact Filter"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:81 include/features.php:412
+#: Code/Module/Settings/Network.php:81 include/features.php:412
 msgid "Ability to display only posts of a selected contact"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:88 include/features.php:420
+#: Code/Module/Settings/Network.php:88 include/features.php:420
 msgid "Forum Filter"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:89 include/features.php:421
+#: Code/Module/Settings/Network.php:89 include/features.php:421
 msgid "Ability to display only posts of a specific forum"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:96 include/features.php:429
+#: Code/Module/Settings/Network.php:96 include/features.php:429
 msgid "Personal Posts Filter"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:97 include/features.php:430
+#: Code/Module/Settings/Network.php:97 include/features.php:430
 msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:104 include/features.php:438
+#: Code/Module/Settings/Network.php:104 include/features.php:438
 msgid "Affinity Tool"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:105 include/features.php:439
+#: Code/Module/Settings/Network.php:105 include/features.php:439
 msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:113 include/features.php:448
+#: Code/Module/Settings/Network.php:113 include/features.php:448
 msgid "Show friend and connection suggestions"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:120 include/features.php:456
+#: Code/Module/Settings/Network.php:120 include/features.php:456
 msgid "Connection Filtering"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Network.php:121 include/features.php:457
+#: Code/Module/Settings/Network.php:121 include/features.php:457
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:37
+#: Code/Module/Settings/Oauth.php:37
 msgid "Name is required"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:41
+#: Code/Module/Settings/Oauth.php:41
 msgid "Key and Secret are required"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:94 Zotlabs/Module/Settings/Oauth.php:122
-#: Zotlabs/Module/Settings/Oauth.php:162 Zotlabs/Module/Settings/Oauth2.php:142
-#: Zotlabs/Module/Settings/Oauth2.php:210
+#: Code/Module/Settings/Oauth.php:94 Code/Module/Settings/Oauth.php:122
+#: Code/Module/Settings/Oauth.php:162 Code/Module/Settings/Oauth2.php:142
+#: Code/Module/Settings/Oauth2.php:210
 msgid "Add application"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:97 Zotlabs/Module/Settings/Oauth2.php:115
-#: Zotlabs/Module/Settings/Oauth2.php:145
+#: Code/Module/Settings/Oauth.php:97 Code/Module/Settings/Oauth2.php:115
+#: Code/Module/Settings/Oauth2.php:145
 msgid "Name of application"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:126
+#: Code/Module/Settings/Oauth.php:98 Code/Module/Settings/Oauth.php:126
 msgid "Consumer Key"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:98 Zotlabs/Module/Settings/Oauth.php:99
-#: Zotlabs/Module/Settings/Oauth2.php:116
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:146
-#: Zotlabs/Module/Settings/Oauth2.php:147
+#: Code/Module/Settings/Oauth.php:98 Code/Module/Settings/Oauth.php:99
+#: Code/Module/Settings/Oauth2.php:116
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:146
+#: Code/Module/Settings/Oauth2.php:147
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:99 Zotlabs/Module/Settings/Oauth.php:127
-#: Zotlabs/Module/Settings/Oauth2.php:117
-#: Zotlabs/Module/Settings/Oauth2.php:147
+#: Code/Module/Settings/Oauth.php:99 Code/Module/Settings/Oauth.php:127
+#: Code/Module/Settings/Oauth2.php:117
+#: Code/Module/Settings/Oauth2.php:147
 msgid "Consumer Secret"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:100 Zotlabs/Module/Settings/Oauth.php:128
-#: Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth.php:100 Code/Module/Settings/Oauth.php:128
+#: Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:148
 msgid "Redirect"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:100 Zotlabs/Module/Settings/Oauth2.php:118
-#: Zotlabs/Module/Settings/Oauth2.php:148
+#: Code/Module/Settings/Oauth.php:100 Code/Module/Settings/Oauth2.php:118
+#: Code/Module/Settings/Oauth2.php:148
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Settings/Oauth.php:129
+#: Code/Module/Settings/Oauth.php:101 Code/Module/Settings/Oauth.php:129
 msgid "Icon url"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:101 Zotlabs/Module/Sources.php:128
-#: Zotlabs/Module/Sources.php:164
+#: Code/Module/Settings/Oauth.php:101 Code/Module/Sources.php:128
+#: Code/Module/Sources.php:164
 msgid "Optional"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:114
+#: Code/Module/Settings/Oauth.php:114
 msgid "Application not found."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:161
+#: Code/Module/Settings/Oauth.php:161
 msgid "Connected Apps"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:165 Zotlabs/Module/Settings/Oauth2.php:213
+#: Code/Module/Settings/Oauth.php:165 Code/Module/Settings/Oauth2.php:213
 msgid "Client key starts with"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:166 Zotlabs/Module/Settings/Oauth2.php:214
+#: Code/Module/Settings/Oauth.php:166 Code/Module/Settings/Oauth2.php:214
 msgid "No name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth.php:167 Zotlabs/Module/Settings/Oauth2.php:215
+#: Code/Module/Settings/Oauth.php:167 Code/Module/Settings/Oauth2.php:215
 msgid "Remove authorization"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:51
+#: Code/Module/Settings/Oauth2.php:51
 msgid "ID and Secret are required"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:112
+#: Code/Module/Settings/Oauth2.php:112
 msgid "Add OAuth2 application"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:116
-#: Zotlabs/Module/Settings/Oauth2.php:146
+#: Code/Module/Settings/Oauth2.php:116
+#: Code/Module/Settings/Oauth2.php:146
 msgid "Consumer ID"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:149
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:149
 msgid "Grant Types"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:119
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:149
-#: Zotlabs/Module/Settings/Oauth2.php:150
+#: Code/Module/Settings/Oauth2.php:119
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:149
+#: Code/Module/Settings/Oauth2.php:150
 msgid "leave blank unless your application specifically requires this"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:120
-#: Zotlabs/Module/Settings/Oauth2.php:150
+#: Code/Module/Settings/Oauth2.php:120
+#: Code/Module/Settings/Oauth2.php:150
 msgid "Authorization scope"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:133
+#: Code/Module/Settings/Oauth2.php:133
 msgid "OAuth2 Application not found."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Oauth2.php:209
+#: Code/Module/Settings/Oauth2.php:209
 msgid "Connected OAuth2 Apps"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:30
+#: Code/Module/Settings/Permcats.php:30
 msgid "Permission Name is required."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:49
+#: Code/Module/Settings/Permcats.php:49
 msgid "Permission category saved."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:76
+#: Code/Module/Settings/Permcats.php:76
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Permcats.php:119
+#: Code/Module/Settings/Permcats.php:119
 msgid "Permission Name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:45
+#: Code/Module/Settings/Tokens.php:45
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:51
+#: Code/Module/Settings/Tokens.php:51
 msgid "Name and Password are required."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:187
+#: Code/Module/Settings/Tokens.php:187
 msgid "Token saved."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:258
+#: Code/Module/Settings/Tokens.php:258
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
 "visitors may login using these credentials to access private content."
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:260
+#: Code/Module/Settings/Tokens.php:260
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
 "Examples:"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:295
+#: Code/Module/Settings/Tokens.php:295
 msgid "Guest Access Tokens"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:303
+#: Code/Module/Settings/Tokens.php:303
 msgid "Login Name"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:304
+#: Code/Module/Settings/Tokens.php:304
 msgid "Login Password"
 msgstr ""
 
-#: Zotlabs/Module/Settings/Tokens.php:305
+#: Code/Module/Settings/Tokens.php:305
 msgid "Expires (yyyy-mm-dd)"
 msgstr ""
 
-#: Zotlabs/Module/Subthread.php:139
+#: Code/Module/Subthread.php:139
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Subthread.php:142
+#: Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:106
+#: Code/Module/Sharedwithme.php:106
 msgid "Files: shared with me"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:108
+#: Code/Module/Sharedwithme.php:108
 msgid "NEW"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:109 Zotlabs/Storage/Browser.php:315
+#: Code/Module/Sharedwithme.php:109 Code/Storage/Browser.php:315
 #: include/text.php:1534
 msgid "Size"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:110 Zotlabs/Storage/Browser.php:316
+#: Code/Module/Sharedwithme.php:110 Code/Storage/Browser.php:316
 msgid "Last Modified"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:111
+#: Code/Module/Sharedwithme.php:111
 msgid "Remove all files"
 msgstr ""
 
-#: Zotlabs/Module/Sharedwithme.php:112
+#: Code/Module/Sharedwithme.php:112
 msgid "Remove this file"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:34
+#: Code/Module/Siteinfo.php:34
 msgid "About this site"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:36
+#: Code/Module/Siteinfo.php:36
 msgid "Site Name"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:40
+#: Code/Module/Siteinfo.php:40
 msgid "Administrator"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:43
+#: Code/Module/Siteinfo.php:43
 msgid "Software and Project information"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:44
+#: Code/Module/Siteinfo.php:44
 msgid "This site is powered by $Projectname"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:45
+#: Code/Module/Siteinfo.php:45
 msgid ""
 "Federated and decentralised networking and identity services provided by "
 "Nomad"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:49
+#: Code/Module/Siteinfo.php:49
 msgid "Protocols:"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:51
+#: Code/Module/Siteinfo.php:51
 #, php-format
 msgid "Version %s"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:52
+#: Code/Module/Siteinfo.php:52
 msgid "Project homepage"
 msgstr ""
 
-#: Zotlabs/Module/Siteinfo.php:53
+#: Code/Module/Siteinfo.php:53
 msgid "Developer homepage"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:64 Zotlabs/Module/Uexport.php:65
+#: Code/Module/Uexport.php:64 Code/Module/Uexport.php:65
 msgid "Export Channel"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:66
+#: Code/Module/Uexport.php:66
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:67
+#: Code/Module/Uexport.php:67
 msgid "Export Content"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:68
+#: Code/Module/Uexport.php:68
 msgid ""
 "Export your channel information and recent content to a JSON backup that can "
 "be restored or imported to another server hub. This backs up all of your "
@@ -8683,11 +8683,11 @@ msgid ""
 "this download to begin."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:70
+#: Code/Module/Uexport.php:70
 msgid "Export your posts from a given year."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:72
+#: Code/Module/Uexport.php:72
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -8695,21 +8695,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:73
+#: Code/Module/Uexport.php:73
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:74
+#: Code/Module/Uexport.php:74
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr ""
 
-#: Zotlabs/Module/Uexport.php:75
+#: Code/Module/Uexport.php:75
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting "
@@ -8717,352 +8717,352 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:49
+#: Code/Module/Sources.php:49
 msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:66
+#: Code/Module/Sources.php:66
 msgid "Source created."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:79
+#: Code/Module/Sources.php:79
 msgid "Source updated."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:106
+#: Code/Module/Sources.php:106
 msgid "*"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:113
+#: Code/Module/Sources.php:113
 msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:114 Zotlabs/Module/Sources.php:124
+#: Code/Module/Sources.php:114 Code/Module/Sources.php:124
 msgid "New Source"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:125 Zotlabs/Module/Sources.php:160
+#: Code/Module/Sources.php:125 Code/Module/Sources.php:160
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:126 Zotlabs/Module/Sources.php:161
+#: Code/Module/Sources.php:126 Code/Module/Sources.php:161
 msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:126 Zotlabs/Module/Sources.php:161
+#: Code/Module/Sources.php:126 Code/Module/Sources.php:161
 msgid "Leave blank to import all public content"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:127 Zotlabs/Module/Sources.php:167
+#: Code/Module/Sources.php:127 Code/Module/Sources.php:167
 msgid "Channel Name"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:128 Zotlabs/Module/Sources.php:164
+#: Code/Module/Sources.php:128 Code/Module/Sources.php:164
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:165
+#: Code/Module/Sources.php:129 Code/Module/Sources.php:165
 msgid "Resend posts with this channel as author"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:129 Zotlabs/Module/Sources.php:165
+#: Code/Module/Sources.php:129 Code/Module/Sources.php:165
 msgid "Copyrights may apply"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:150 Zotlabs/Module/Sources.php:180
+#: Code/Module/Sources.php:150 Code/Module/Sources.php:180
 msgid "Source not found."
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:157
+#: Code/Module/Sources.php:157
 msgid "Edit Source"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:158
+#: Code/Module/Sources.php:158
 msgid "Delete Source"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:189
+#: Code/Module/Sources.php:189
 msgid "Source removed"
 msgstr ""
 
-#: Zotlabs/Module/Sources.php:191
+#: Code/Module/Sources.php:191
 msgid "Unable to remove source."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:81 Zotlabs/Module/Photos.php:99
+#: Code/Module/Photos.php:81 Code/Module/Photos.php:99
 msgid "Album not found."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:90
+#: Code/Module/Photos.php:90
 msgid "Delete Album"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:164 Zotlabs/Module/Photos.php:1133
+#: Code/Module/Photos.php:164 Code/Module/Photos.php:1133
 msgid "Delete Photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:365
+#: Code/Module/Photos.php:365
 msgid "linked item not found."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:559
+#: Code/Module/Photos.php:559
 #, php-format
 msgid "%s: Unsupported photo type. Saved as file."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:587
+#: Code/Module/Photos.php:587
 msgid "No photos selected"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:637
+#: Code/Module/Photos.php:637
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:680
+#: Code/Module/Photos.php:680
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:682
+#: Code/Module/Photos.php:682
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:724
+#: Code/Module/Photos.php:724
 msgid "Upload Photos"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:728
+#: Code/Module/Photos.php:728
 msgid "Enter an album name"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:729
+#: Code/Module/Photos.php:729
 msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:730
+#: Code/Module/Photos.php:730
 msgid "Create a status post for this upload"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:730
+#: Code/Module/Photos.php:730
 msgid ""
 "If multiple files are selected, the message will be repeated for each photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:731 Zotlabs/Module/Photos.php:1117
+#: Code/Module/Photos.php:731 Code/Module/Photos.php:1117
 msgid "Please briefly describe this photo for vision-impaired viewers"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:733 Zotlabs/Module/Photos.php:1119
+#: Code/Module/Photos.php:733 Code/Module/Photos.php:1119
 msgid "Your message (optional)"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:820
+#: Code/Module/Photos.php:820
 msgid "Date descending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:821
+#: Code/Module/Photos.php:821
 msgid "Date ascending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:822
+#: Code/Module/Photos.php:822
 msgid "Name ascending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:877 Zotlabs/Module/Photos.php:1430
+#: Code/Module/Photos.php:877 Code/Module/Photos.php:1430
 msgid "View files"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:881 Zotlabs/Module/Photos.php:1433
+#: Code/Module/Photos.php:881 Code/Module/Photos.php:1433
 msgid "Add Photos"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:883
+#: Code/Module/Photos.php:883
 msgid "Sort"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:928
+#: Code/Module/Photos.php:928
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:930
+#: Code/Module/Photos.php:930
 msgid "Photo not available"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:994
+#: Code/Module/Photos.php:994
 msgid "Use as profile photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:995
+#: Code/Module/Photos.php:995
 msgid "Use as cover photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1002
+#: Code/Module/Photos.php:1002
 msgid "Private Photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1020
+#: Code/Module/Photos.php:1020
 msgid "View Full Size"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1108
+#: Code/Module/Photos.php:1108
 msgid "Edit photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1112
+#: Code/Module/Photos.php:1112
 msgid "Move photo to album"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1113
+#: Code/Module/Photos.php:1113
 msgid "Enter a new album name"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1114
+#: Code/Module/Photos.php:1114
 msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1119
+#: Code/Module/Photos.php:1119
 msgid ""
 "This will only appear in the optional status post attached to this photo"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1120
+#: Code/Module/Photos.php:1120
 msgid "Add a Tag"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1128
+#: Code/Module/Photos.php:1128
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1131
+#: Code/Module/Photos.php:1131
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1206 include/conversation.php:521
+#: Code/Module/Photos.php:1206 include/conversation.php:521
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1207 include/conversation.php:522
+#: Code/Module/Photos.php:1207 include/conversation.php:522
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1208 include/conversation.php:523
+#: Code/Module/Photos.php:1208 include/conversation.php:523
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1209 include/conversation.php:524
+#: Code/Module/Photos.php:1209 include/conversation.php:524
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1210 include/conversation.php:525
+#: Code/Module/Photos.php:1210 include/conversation.php:525
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1320
+#: Code/Module/Photos.php:1320
 msgid "Photo Tools"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1330
+#: Code/Module/Photos.php:1330
 msgid "In This Photo:"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1335
+#: Code/Module/Photos.php:1335
 msgid "Map"
 msgstr ""
 
-#: Zotlabs/Module/Photos.php:1417 Zotlabs/Module/Photos.php:1428
-#: Zotlabs/Module/Photos.php:1429 include/photos.php:756
+#: Code/Module/Photos.php:1417 Code/Module/Photos.php:1428
+#: Code/Module/Photos.php:1429 include/photos.php:756
 msgid "Recent Photos"
 msgstr ""
 
-#: Zotlabs/Module/Tagger.php:62
+#: Code/Module/Tagger.php:62
 msgid "Post not found."
 msgstr ""
 
-#: Zotlabs/Module/Tagger.php:94 include/conversation.php:163
+#: Code/Module/Tagger.php:94 include/conversation.php:163
 #: include/text.php:2377
 msgid "comment"
 msgstr ""
 
-#: Zotlabs/Module/Tagger.php:135
+#: Code/Module/Tagger.php:135
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: Zotlabs/Module/Tagrm.php:59 Zotlabs/Module/Tagrm.php:111
+#: Code/Module/Tagrm.php:59 Code/Module/Tagrm.php:111
 msgid "Tag removed"
 msgstr ""
 
-#: Zotlabs/Module/Tagrm.php:137
+#: Code/Module/Tagrm.php:137
 msgid "Remove Item Tag"
 msgstr ""
 
-#: Zotlabs/Module/Tagrm.php:139
+#: Code/Module/Tagrm.php:139
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: Zotlabs/Module/Import.php:160 Zotlabs/Import/Friendica.php:64
+#: Code/Module/Import.php:160 Code/Import/Friendica.php:64
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:188
+#: Code/Module/Import.php:188
 msgid "No channel. Import failed."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:633
+#: Code/Module/Import.php:633
 msgid "Files and Posts imported."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:648
+#: Code/Module/Import.php:648
 msgid "Import completed."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:680
+#: Code/Module/Import.php:680
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:685
+#: Code/Module/Import.php:685
 msgid "Import Channel"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:686
+#: Code/Module/Import.php:686
 msgid ""
 "Use this form to import an existing channel from a different server. You may "
 "retrieve the channel identity from the old server via the network or provide "
 "an export file."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:688
+#: Code/Module/Import.php:688
 msgid "Or provide the old server details"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:689
+#: Code/Module/Import.php:689
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:690
+#: Code/Module/Import.php:690
 msgid "Your old login email address"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:691
+#: Code/Module/Import.php:691
 msgid "Your old login password"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:692
+#: Code/Module/Import.php:692
 msgid "Import a few months of posts if possible (limited by available memory)"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:694
+#: Code/Module/Import.php:694
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be "
@@ -9070,48 +9070,48 @@ msgid ""
 "location for files, photos, and media."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:696
+#: Code/Module/Import.php:696
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:697
+#: Code/Module/Import.php:697
 msgid "Move this channel (disable all previous locations)"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:698
+#: Code/Module/Import.php:698
 msgid "Use this channel nickname instead of the one provided"
 msgstr ""
 
-#: Zotlabs/Module/Import.php:698
+#: Code/Module/Import.php:698
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this site."
 msgstr ""
 
-#: Zotlabs/Module/Import.php:700
+#: Code/Module/Import.php:700
 msgid ""
 "This process may take several minutes to complete and considerably longer if "
 "importing a large amount of posts and files. Please submit the form only "
 "once and leave this page open until finished."
 msgstr ""
 
-#: Zotlabs/Module/Profile.php:115
+#: Code/Module/Profile.php:115
 msgid "vcard"
 msgstr ""
 
-#: Zotlabs/Module/Comment_control.php:15
+#: Code/Module/Comment_control.php:15
 msgid ""
 "This app allows you to select the comment audience and set a length of time "
 "that comments on a particular post will be accepted."
 msgstr ""
 
-#: Zotlabs/Module/Comment_control.php:23
+#: Code/Module/Comment_control.php:23
 msgid ""
 "This app is installed. A button to control comments may be found below the "
 "post editor."
 msgstr ""
 
-#: Zotlabs/Module/Future.php:15
+#: Code/Module/Future.php:15
 msgid ""
 "This app allows you to set an optional publish date/time for posts, which "
 "may be in the future. This must be at least ten minutes into the future to "
@@ -9120,79 +9120,79 @@ msgid ""
 "editor to set the date/time."
 msgstr ""
 
-#: Zotlabs/Module/Markup.php:16
+#: Code/Module/Markup.php:16
 msgid ""
 "This app adds editor buttons for bold, italic, underline, quote, and "
 "possibly other common richtext constructs."
 msgstr ""
 
-#: Zotlabs/Module/Photomap.php:15
+#: Code/Module/Photomap.php:15
 msgid ""
 "This app provides a displayable map when viewing detail of photos that "
 "contain location information."
 msgstr ""
 
-#: Zotlabs/Module/Photomap.php:23
+#: Code/Module/Photomap.php:23
 msgid "This app is currently installed."
 msgstr ""
 
-#: Zotlabs/Module/Suggestions.php:44
+#: Code/Module/Suggestions.php:44
 msgid ""
 "This app (when installed) displays a small number of friend suggestions on "
 "selected pages or you can run the app to display a full list of channel "
 "suggestions."
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:25
+#: Code/Module/Fedi_id.php:25
 msgid "You are already connected with this channel."
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:37
+#: Code/Module/Fedi_id.php:37
 msgid "Unknown or unreachable identifier"
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:48
+#: Code/Module/Fedi_id.php:48
 msgid "Home instance"
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:49
+#: Code/Module/Fedi_id.php:49
 msgid "Enter your channel address or fediverse ID (e.g. channel@example.com)"
 msgstr ""
 
-#: Zotlabs/Module/Fedi_id.php:49
+#: Code/Module/Fedi_id.php:49
 msgid ""
 "If you do not have a fediverse ID, please use your browser 'back' button to "
 "return to the previous page"
 msgstr ""
 
-#: Zotlabs/Module/Clients.php:16
+#: Code/Module/Clients.php:16
 msgid ""
 "This app allows you to authorize mobile apps using OAuth and OpenID to "
 "access your channel."
 msgstr ""
 
-#: Zotlabs/Module/Secrets.php:15
+#: Code/Module/Secrets.php:15
 msgid ""
 "This app allows you to protect messages with a secret passphrase. This only "
 "works across selected platforms."
 msgstr ""
 
-#: Zotlabs/Module/Secrets.php:23
+#: Code/Module/Secrets.php:23
 msgid ""
 "This app is installed. A button to encrypt content may be found in the post "
 "editor."
 msgstr ""
 
-#: Zotlabs/Module/Tagadelic.php:31
+#: Code/Module/Tagadelic.php:31
 msgid "This app displays a hashtag cloud on your channel homepage."
 msgstr ""
 
-#: Zotlabs/Module/Tagadelic.php:39
+#: Code/Module/Tagadelic.php:39
 msgid ""
 "This app is installed. It displays a hashtag cloud on your channel homepage."
 msgstr ""
 
-#: Zotlabs/Module/Vlists.php:16
+#: Code/Module/Vlists.php:16
 msgid ""
 "This app creates dynamic access lists corresponding to [1] all connections, "
 "[2] all ActivityPub protocol connections, and [3] all Nomad or Zot/6 "
@@ -9200,779 +9200,779 @@ msgid ""
 "Permissions setting tool."
 msgstr ""
 
-#: Zotlabs/Module/Vlists.php:23
+#: Code/Module/Vlists.php:23
 msgid "This app is installed. "
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:26
+#: Code/Module/Content_filter.php:26
 msgid "Content Filter settings updated."
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:36
+#: Code/Module/Content_filter.php:36
 msgid ""
 "This app (when installed) allows you to filter incoming content from all "
 "sources or from specific connections. The filtering may be based on words, "
 "tags, regular expressions, or language"
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:44
+#: Code/Module/Content_filter.php:44
 msgid ""
 "The settings on this page apply to all incoming content. To edit the "
 "settings for individual connetions, see the similar settings on the "
 "Connection Edit page for that connection."
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:53 Zotlabs/Module/Content_filter.php:61
+#: Code/Module/Content_filter.php:53 Code/Module/Content_filter.php:61
 msgid ""
 "words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - "
 "leave blank to import all posts"
 msgstr ""
 
-#: Zotlabs/Module/Content_filter.php:66
+#: Code/Module/Content_filter.php:66
 msgid "Content Filter Settings"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:36
+#: Code/Module/Superblock.php:36
 msgid "Blocking this site is not permitted."
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:93
+#: Code/Module/Superblock.php:93
 msgid "Added by Superblock"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:199
+#: Code/Module/Superblock.php:199
 msgid "superblock settings updated"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:230
+#: Code/Module/Superblock.php:230
 msgid "Blocked channels"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:232
+#: Code/Module/Superblock.php:232
 msgid "No channels currently blocked"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:247
+#: Code/Module/Superblock.php:247
 msgid "Blocked servers"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:249
+#: Code/Module/Superblock.php:249
 msgid "No servers currently blocked"
 msgstr ""
 
-#: Zotlabs/Module/Superblock.php:255 Zotlabs/Widget/Settings_menu.php:64
+#: Code/Module/Superblock.php:255 Code/Widget/Settings_menu.php:64
 msgid "Manage Blocks"
 msgstr ""
 
-#: Zotlabs/Module/Categories.php:31
+#: Code/Module/Categories.php:31
 msgid "This app allows you to add categories to posts and events."
 msgstr ""
 
-#: Zotlabs/Module/Xchan.php:13
+#: Code/Module/Xchan.php:13
 msgid "Xchan Lookup"
 msgstr ""
 
-#: Zotlabs/Module/Xchan.php:16
+#: Code/Module/Xchan.php:16
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: Zotlabs/Module/Zotfinger.php:26
+#: Code/Module/Zotfinger.php:26
 msgid "Zotfinger Diagnostic"
 msgstr ""
 
-#: Zotlabs/Module/Zotfinger.php:27
+#: Code/Module/Zotfinger.php:27
 msgid "Lookup URL"
 msgstr ""
 
-#: Zotlabs/Module/Viewconnections.php:66
+#: Code/Module/Viewconnections.php:66
 msgid "No connections."
 msgstr ""
 
-#: Zotlabs/Module/Viewconnections.php:83
+#: Code/Module/Viewconnections.php:83
 #, php-format
 msgid "Visit %1$s's profile [%2$s]"
 msgstr ""
 
-#: Zotlabs/Module/Viewconnections.php:110
+#: Code/Module/Viewconnections.php:110
 msgid "View Connections"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:120 Zotlabs/Storage/Browser.php:317
+#: Code/Storage/Browser.php:120 Code/Storage/Browser.php:317
 msgid "parent"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:151
+#: Code/Storage/Browser.php:151
 msgid "Principal"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:154
+#: Code/Storage/Browser.php:154
 msgid "Addressbook"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:160
+#: Code/Storage/Browser.php:160
 msgid "Schedule Inbox"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:163
+#: Code/Storage/Browser.php:163
 msgid "Schedule Outbox"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:299
+#: Code/Storage/Browser.php:299
 msgid "Total"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:301
+#: Code/Storage/Browser.php:301
 msgid "Shared"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:303
+#: Code/Storage/Browser.php:303
 msgid "Add Files"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:310
+#: Code/Storage/Browser.php:310
 msgid "View photos"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:314
+#: Code/Storage/Browser.php:314
 msgid "Type"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:392
+#: Code/Storage/Browser.php:392
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:396
+#: Code/Storage/Browser.php:396
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:407
+#: Code/Storage/Browser.php:407
 msgid "WARNING:"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:419
+#: Code/Storage/Browser.php:419
 msgid "Create new folder"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:421
+#: Code/Storage/Browser.php:421
 msgid "Upload file"
 msgstr ""
 
-#: Zotlabs/Storage/Browser.php:434
+#: Code/Storage/Browser.php:434
 msgid "Drop files here to immediately upload"
 msgstr ""
 
-#: Zotlabs/Update/_1239.php:25
+#: Code/Update/_1239.php:25
 msgid "Added by superblock"
 msgstr ""
 
-#: Zotlabs/Widget/Rating.php:58
+#: Code/Widget/Rating.php:58
 msgid "Rating Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Rating.php:62 Zotlabs/Widget/Rating.php:64
+#: Code/Widget/Rating.php:62 Code/Widget/Rating.php:64
 msgid "Rate Me"
 msgstr ""
 
-#: Zotlabs/Widget/Rating.php:68
+#: Code/Widget/Rating.php:68
 msgid "View Ratings"
 msgstr ""
 
-#: Zotlabs/Widget/Savedsearch.php:86
+#: Code/Widget/Savedsearch.php:86
 msgid "Remove term"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:36
+#: Code/Widget/Activity_filter.php:36
 msgid "Direct Messages"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:40
+#: Code/Widget/Activity_filter.php:40
 msgid "Show direct (private) messages"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:50
+#: Code/Widget/Activity_filter.php:50
 msgid "Personal Posts"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:54
+#: Code/Widget/Activity_filter.php:54
 msgid "Show posts that mention or involve me"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:63
+#: Code/Widget/Activity_filter.php:63
 msgid "Saved Posts"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:67
+#: Code/Widget/Activity_filter.php:67
 msgid "Show posts that I have saved"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:81
+#: Code/Widget/Activity_filter.php:81
 msgid "Show drafts that I have saved"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:91
+#: Code/Widget/Activity_filter.php:91
 msgid "Videos"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:95
+#: Code/Widget/Activity_filter.php:95
 msgid "Show posts that include videos"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:109
+#: Code/Widget/Activity_filter.php:109
 msgid "Show posts that include events"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:113
+#: Code/Widget/Activity_filter.php:113
 msgid "Polls"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:117
+#: Code/Widget/Activity_filter.php:117
 msgid "Show posts that include polls"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:138
-#: Zotlabs/Widget/Activity_filter.php:168
+#: Code/Widget/Activity_filter.php:138
+#: Code/Widget/Activity_filter.php:168
 #, php-format
 msgid "Show posts related to the %s access list"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:178
+#: Code/Widget/Activity_filter.php:178
 msgid "Show my access lists"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:196
+#: Code/Widget/Activity_filter.php:196
 msgid "Show posts to this group"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:198
+#: Code/Widget/Activity_filter.php:198
 msgid "New post"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:205 Zotlabs/Widget/Notifications.php:108
-#: Zotlabs/Widget/Notifications.php:109 Zotlabs/Widget/Groups.php:114
+#: Code/Widget/Activity_filter.php:205 Code/Widget/Notifications.php:108
+#: Code/Widget/Notifications.php:109 Code/Widget/Groups.php:114
 msgid "Groups"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:209
+#: Code/Widget/Activity_filter.php:209
 msgid "Show groups"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:232
+#: Code/Widget/Activity_filter.php:232
 #, php-format
 msgid "Show posts that I have filed to %s"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:238 Zotlabs/Widget/Filer.php:34
+#: Code/Widget/Activity_filter.php:238 Code/Widget/Filer.php:34
 #: include/features.php:500
 msgid "Saved Folders"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:242
+#: Code/Widget/Activity_filter.php:242
 msgid "Show filed post categories"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:262
+#: Code/Widget/Activity_filter.php:262
 #, php-format
 msgid "Show posts with hashtag %s"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:268
+#: Code/Widget/Activity_filter.php:268
 msgid "Followed Hashtags"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:272
+#: Code/Widget/Activity_filter.php:272
 msgid "Show followed hashtags"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:308
+#: Code/Widget/Activity_filter.php:308
 msgid "Remove active filter"
 msgstr ""
 
-#: Zotlabs/Widget/Activity_filter.php:324
+#: Code/Widget/Activity_filter.php:324
 msgid "Stream Filters"
 msgstr ""
 
-#: Zotlabs/Widget/Activity.php:58
+#: Code/Widget/Activity.php:58
 msgctxt "widget"
 msgid "Activity"
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:29
+#: Code/Widget/Follow.php:29
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:35
+#: Code/Widget/Follow.php:35
 msgid "Add New Connection"
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:36
+#: Code/Widget/Follow.php:36
 msgid "Enter channel address"
 msgstr ""
 
-#: Zotlabs/Widget/Follow.php:37 Zotlabs/Widget/Sblock.php:20
+#: Code/Widget/Follow.php:37 Code/Widget/Sblock.php:20
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: Zotlabs/Widget/Appcategories.php:52 Zotlabs/Widget/Filer.php:37
-#: Zotlabs/Widget/Categories.php:88 Zotlabs/Widget/Categories.php:136
-#: Zotlabs/Widget/Categories.php:187
+#: Code/Widget/Appcategories.php:52 Code/Widget/Filer.php:37
+#: Code/Widget/Categories.php:88 Code/Widget/Categories.php:136
+#: Code/Widget/Categories.php:187
 msgid "Everything"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:16
+#: Code/Widget/Mailmenu.php:16
 msgid "Private Mail Menu"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:18
+#: Code/Widget/Mailmenu.php:18
 msgid "Combined View"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:23
+#: Code/Widget/Mailmenu.php:23
 msgid "Inbox"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:28
+#: Code/Widget/Mailmenu.php:28
 msgid "Outbox"
 msgstr ""
 
-#: Zotlabs/Widget/Mailmenu.php:33
+#: Code/Widget/Mailmenu.php:33
 msgid "New Message"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:32
+#: Code/Widget/Newmember.php:32
 msgid "Profile Creation"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:34
+#: Code/Widget/Newmember.php:34
 msgid "Upload profile photo"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:35
+#: Code/Widget/Newmember.php:35
 msgid "Upload cover photo"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:36 include/nav.php:122
+#: Code/Widget/Newmember.php:36 include/nav.php:122
 msgid "Edit your profile"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:39
+#: Code/Widget/Newmember.php:39
 msgid "Find and Connect with others"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:41
+#: Code/Widget/Newmember.php:41
 msgid "View the directory"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:42
+#: Code/Widget/Newmember.php:42
 msgid "View friend suggestions"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:43
+#: Code/Widget/Newmember.php:43
 msgid "Manage your connections"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:46
+#: Code/Widget/Newmember.php:46
 msgid "Communicate"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:48
+#: Code/Widget/Newmember.php:48
 msgid "View your channel homepage"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:49
+#: Code/Widget/Newmember.php:49
 msgid "View your stream"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:62
+#: Code/Widget/Newmember.php:62
 msgid "View public stream"
 msgstr ""
 
-#: Zotlabs/Widget/Newmember.php:66 include/features.php:68
+#: Code/Widget/Newmember.php:66 include/features.php:68
 msgid "New Member Links"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:20
+#: Code/Widget/Notifications.php:20
 msgid "New Stream Activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:21
+#: Code/Widget/Notifications.php:21
 msgid "New Stream Activity Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:24
+#: Code/Widget/Notifications.php:24
 msgid "View your stream activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:27
+#: Code/Widget/Notifications.php:27
 msgid "Mark all notifications read"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:30 Zotlabs/Widget/Notifications.php:49
-#: Zotlabs/Widget/Notifications.php:141
+#: Code/Widget/Notifications.php:30 Code/Widget/Notifications.php:49
+#: Code/Widget/Notifications.php:141
 msgid "Show new posts only"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:31 Zotlabs/Widget/Notifications.php:50
-#: Zotlabs/Widget/Notifications.php:111 Zotlabs/Widget/Notifications.php:142
+#: Code/Widget/Notifications.php:31 Code/Widget/Notifications.php:50
+#: Code/Widget/Notifications.php:111 Code/Widget/Notifications.php:142
 msgid "Filter by name"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:39
+#: Code/Widget/Notifications.php:39
 msgid "New Home Activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:40
+#: Code/Widget/Notifications.php:40
 msgid "New Home Activity Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:43
+#: Code/Widget/Notifications.php:43
 msgid "View your home activity"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:46 Zotlabs/Widget/Notifications.php:138
+#: Code/Widget/Notifications.php:46 Code/Widget/Notifications.php:138
 msgid "Mark all notifications seen"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:58
+#: Code/Widget/Notifications.php:58
 msgid "New Events"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:59
+#: Code/Widget/Notifications.php:59
 msgid "New Events Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:62
+#: Code/Widget/Notifications.php:62
 msgid "View events"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:65
+#: Code/Widget/Notifications.php:65
 msgid "Mark all events seen"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:74
+#: Code/Widget/Notifications.php:74
 msgid "New Connections Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:77
+#: Code/Widget/Notifications.php:77
 msgid "View all connections"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:85
+#: Code/Widget/Notifications.php:85
 msgid "New Files"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:86
+#: Code/Widget/Notifications.php:86
 msgid "New Files Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:93 Zotlabs/Widget/Notifications.php:94
+#: Code/Widget/Notifications.php:93 Code/Widget/Notifications.php:94
 msgid "Notices"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:97
+#: Code/Widget/Notifications.php:97
 msgid "View all notices"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:100
+#: Code/Widget/Notifications.php:100
 msgid "Mark all notices seen"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:121
+#: Code/Widget/Notifications.php:121
 msgid "New Registrations"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:122
+#: Code/Widget/Notifications.php:122
 msgid "New Registrations Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:132
+#: Code/Widget/Notifications.php:132
 msgid "Public Stream Notifications"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:135
+#: Code/Widget/Notifications.php:135
 msgid "View the public stream"
 msgstr ""
 
-#: Zotlabs/Widget/Notifications.php:150
+#: Code/Widget/Notifications.php:150
 msgid "Sorry, you have got no notifications at the moment"
 msgstr ""
 
-#: Zotlabs/Widget/Sblock.php:18
+#: Code/Widget/Sblock.php:18
 msgid "Block channel or site"
 msgstr ""
 
-#: Zotlabs/Widget/Sblock.php:19
+#: Code/Widget/Sblock.php:19
 msgid "Enter channel address or URL"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:104
+#: Code/Widget/Stream_order.php:104
 msgid "Commented Date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:108
+#: Code/Widget/Stream_order.php:108
 msgid "Order by last commented date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:111
+#: Code/Widget/Stream_order.php:111
 msgid "Posted Date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:115
+#: Code/Widget/Stream_order.php:115
 msgid "Order by last posted date"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:118
+#: Code/Widget/Stream_order.php:118
 msgid "Date Unthreaded"
 msgstr ""
 
-#: Zotlabs/Widget/Stream_order.php:122
+#: Code/Widget/Stream_order.php:122
 msgid "Order unthreaded by date"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestions.php:52
+#: Code/Widget/Suggestions.php:52
 msgid "Ignore/Hide"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestions.php:57
+#: Code/Widget/Suggestions.php:57
 msgid "Suggestions"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestions.php:58
+#: Code/Widget/Suggestions.php:58
 msgid "See more..."
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:29 Zotlabs/Widget/Admin.php:66
+#: Code/Widget/Admin.php:29 Code/Widget/Admin.php:66
 msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:35
+#: Code/Widget/Admin.php:35
 msgid "Inspect queue"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:37
+#: Code/Widget/Admin.php:37
 msgid "DB updates"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:61 include/nav.php:190
+#: Code/Widget/Admin.php:61 include/nav.php:190
 msgid "Admin"
 msgstr ""
 
-#: Zotlabs/Widget/Admin.php:62
+#: Code/Widget/Admin.php:62
 msgid "Addon Features"
 msgstr ""
 
-#: Zotlabs/Widget/Appstore.php:12
+#: Code/Widget/Appstore.php:12
 msgid "App Collections"
 msgstr ""
 
-#: Zotlabs/Widget/Archive.php:49
+#: Code/Widget/Archive.php:49
 msgid "Archives"
 msgstr ""
 
-#: Zotlabs/Widget/Bookmarkedchats.php:31
+#: Code/Widget/Bookmarkedchats.php:31
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: Zotlabs/Widget/Chatroom_list.php:26
+#: Code/Widget/Chatroom_list.php:26
 msgid "Overview"
 msgstr ""
 
-#: Zotlabs/Widget/Chatroom_members.php:13
+#: Code/Widget/Chatroom_members.php:13
 msgid "Chat Members"
 msgstr ""
 
-#: Zotlabs/Widget/Common_friends.php:47
+#: Code/Widget/Common_friends.php:47
 msgid "Common Connections"
 msgstr ""
 
-#: Zotlabs/Widget/Common_friends.php:52
+#: Code/Widget/Common_friends.php:52
 #, php-format
 msgid "View all %d common connections"
 msgstr ""
 
-#: Zotlabs/Widget/Cover_photo.php:95
+#: Code/Widget/Cover_photo.php:95
 msgid "Click to show more"
 msgstr ""
 
-#: Zotlabs/Widget/Eventstools.php:16
+#: Code/Widget/Eventstools.php:16
 msgid "Events Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Eventstools.php:17
+#: Code/Widget/Eventstools.php:17
 msgid "Export Calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Eventstools.php:18
+#: Code/Widget/Eventstools.php:18
 msgid "Import Calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:21
+#: Code/Widget/Findpeople.php:21
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Zotlabs/Widget/Findpeople.php:29
+#: Code/Widget/Findpeople.php:29
 msgid "Find Channels"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:30
+#: Code/Widget/Findpeople.php:30
 msgid "Enter name or interest"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:31
+#: Code/Widget/Findpeople.php:31
 msgid "Connect/Follow"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:32
+#: Code/Widget/Findpeople.php:32
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:37
+#: Code/Widget/Findpeople.php:37
 msgid "Affiliated sites"
 msgstr ""
 
-#: Zotlabs/Widget/Findpeople.php:40
+#: Code/Widget/Findpeople.php:40
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: Zotlabs/Widget/Photo_rand.php:72 Zotlabs/Widget/Photo.php:55
+#: Code/Widget/Photo_rand.php:72 Code/Widget/Photo.php:55
 msgid "photo/image"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:44
+#: Code/Widget/Settings_menu.php:44
 msgid "Account settings"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:50
+#: Code/Widget/Settings_menu.php:50
 msgid "Channel settings"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:58
+#: Code/Widget/Settings_menu.php:58
 msgid "Display settings"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:72
+#: Code/Widget/Settings_menu.php:72
 msgid "Manage locations"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:79
+#: Code/Widget/Settings_menu.php:79
 msgid "Export channel"
 msgstr ""
 
-#: Zotlabs/Widget/Settings_menu.php:94
+#: Code/Widget/Settings_menu.php:94
 msgid "Client apps"
 msgstr ""
 
-#: Zotlabs/Widget/Site_projects.php:32
+#: Code/Widget/Site_projects.php:32
 msgid "Projects"
 msgstr ""
 
-#: Zotlabs/Widget/Site_projects.php:34
+#: Code/Widget/Site_projects.php:34
 msgid "All projects"
 msgstr ""
 
-#: Zotlabs/Widget/Suggestedchats.php:38
+#: Code/Widget/Suggestedchats.php:38
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: Zotlabs/Widget/Tagcloud.php:25 include/taxonomy.php:364
+#: Code/Widget/Tagcloud.php:25 include/taxonomy.php:364
 #: include/taxonomy.php:509 include/taxonomy.php:532
 msgid "Tags"
 msgstr ""
 
-#: Zotlabs/Widget/Affinity.php:39
+#: Code/Widget/Affinity.php:39
 msgid "Friend zoom in/out"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:43
+#: Code/Widget/Cdav.php:43
 msgid "Select Channel"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:48
+#: Code/Widget/Cdav.php:48
 msgid "Read-write"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:49
+#: Code/Widget/Cdav.php:49
 msgid "Read-only"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:135
+#: Code/Widget/Cdav.php:135
 msgid "Channel Calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:139
+#: Code/Widget/Cdav.php:139
 msgid "Shared CalDAV Calendars"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:143
+#: Code/Widget/Cdav.php:143
 msgid "Share this calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:145
+#: Code/Widget/Cdav.php:145
 msgid "Calendar name and color"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:147
+#: Code/Widget/Cdav.php:147
 msgid "Create new CalDAV calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:149
+#: Code/Widget/Cdav.php:149
 msgid "Calendar Name"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:150
+#: Code/Widget/Cdav.php:150
 msgid "Calendar Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:152
+#: Code/Widget/Cdav.php:152
 msgid "Import calendar"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:153
+#: Code/Widget/Cdav.php:153
 msgid "Select a calendar to import to"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:178
+#: Code/Widget/Cdav.php:178
 msgid "Addressbooks"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:180
+#: Code/Widget/Cdav.php:180
 msgid "Addressbook name"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:182
+#: Code/Widget/Cdav.php:182
 msgid "Create new addressbook"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:183
+#: Code/Widget/Cdav.php:183
 msgid "Addressbook Name"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:185
+#: Code/Widget/Cdav.php:185
 msgid "Addressbook Tools"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:186
+#: Code/Widget/Cdav.php:186
 msgid "Import addressbook"
 msgstr ""
 
-#: Zotlabs/Widget/Cdav.php:187
+#: Code/Widget/Cdav.php:187
 msgid "Select an addressbook to import to"
 msgstr ""
 
-#: Zotlabs/Widget/Hq_controls.php:18
+#: Code/Widget/Hq_controls.php:18
 msgid "HQ Control Panel"
 msgstr ""
 
-#: Zotlabs/Widget/Hq_controls.php:21
+#: Code/Widget/Hq_controls.php:21
 msgid "Create a new post"
 msgstr ""
 
-#: Zotlabs/Import/Friendica.php:195 include/channel.php:480
+#: Code/Import/Friendica.php:195 include/channel.php:480
 msgid "Default Profile"
 msgstr ""
 
diff --git a/view/ru/messages.po b/view/ru/messages.po
index e4cbf3594..388989136 100644
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
@@ -176,24 +176,24 @@ msgstr "Включить плагин публикаций Dreamwidth"
 #: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1621
 #: ../../view/theme/redbasic/php/config.php:98 ../../include/dir_fns.php:143
 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Events.php:470
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Sources.php:116
-#: ../../Zotlabs/Module/Sources.php:151
-#: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Connedit.php:779
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
-#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Admin/Site.php:266
-#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Menu.php:162
-#: ../../Zotlabs/Module/Menu.php:221
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558
-#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Wiki.php:218
-#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Storage/Browser.php:405
+#: ../../Code/Module/Photos.php:702 ../../Code/Module/Events.php:470
+#: ../../Code/Module/Events.php:471 ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Api.php:99 ../../Code/Module/Sources.php:116
+#: ../../Code/Module/Sources.php:151
+#: ../../Code/Module/Filestorage.php:178
+#: ../../Code/Module/Filestorage.php:186
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Connedit.php:779
+#: ../../Code/Module/Mitem.php:176 ../../Code/Module/Mitem.php:177
+#: ../../Code/Module/Mitem.php:256 ../../Code/Module/Mitem.php:257
+#: ../../Code/Module/Admin/Site.php:266
+#: ../../Code/Module/Defperms.php:180 ../../Code/Module/Menu.php:162
+#: ../../Code/Module/Menu.php:221
+#: ../../Code/Module/Settings/Channel.php:315
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Import.php:554 ../../Code/Module/Import.php:558
+#: ../../Code/Module/Import.php:559 ../../Code/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:219 ../../Code/Module/Profiles.php:681
+#: ../../Code/Storage/Browser.php:405
 msgid "No"
 msgstr "Нет"
 
@@ -252,23 +252,23 @@ msgstr "Нет"
 #: ../../extend/addon/hzaddons/wppost/wppost.php:109 ../../boot.php:1621
 #: ../../view/theme/redbasic/php/config.php:98 ../../include/dir_fns.php:143
 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Events.php:470
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Sources.php:116
-#: ../../Zotlabs/Module/Sources.php:151
-#: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Module/Connedit.php:396 ../../Zotlabs/Module/Mitem.php:176
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
-#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Admin/Site.php:268
-#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Menu.php:162
-#: ../../Zotlabs/Module/Menu.php:221
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-#: ../../Zotlabs/Module/Settings/Display.php:100
-#: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558
-#: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Wiki.php:218
-#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Storage/Browser.php:405
+#: ../../Code/Module/Photos.php:702 ../../Code/Module/Events.php:470
+#: ../../Code/Module/Events.php:471 ../../Code/Module/Removeme.php:63
+#: ../../Code/Module/Api.php:98 ../../Code/Module/Sources.php:116
+#: ../../Code/Module/Sources.php:151
+#: ../../Code/Module/Filestorage.php:178
+#: ../../Code/Module/Filestorage.php:186
+#: ../../Code/Module/Connedit.php:396 ../../Code/Module/Mitem.php:176
+#: ../../Code/Module/Mitem.php:177 ../../Code/Module/Mitem.php:256
+#: ../../Code/Module/Mitem.php:257 ../../Code/Module/Admin/Site.php:268
+#: ../../Code/Module/Defperms.php:180 ../../Code/Module/Menu.php:162
+#: ../../Code/Module/Menu.php:221
+#: ../../Code/Module/Settings/Channel.php:315
+#: ../../Code/Module/Settings/Display.php:100
+#: ../../Code/Module/Import.php:554 ../../Code/Module/Import.php:558
+#: ../../Code/Module/Import.php:559 ../../Code/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:219 ../../Code/Module/Profiles.php:681
+#: ../../Code/Storage/Browser.php:405
 msgid "Yes"
 msgstr "Да"
 
@@ -339,54 +339,54 @@ msgstr "Настройки публикаций в Dreamwidth"
 #: ../../extend/addon/hzaddons/irc/irc.php:53
 #: ../../extend/addon/hzaddons/wppost/wppost.php:113
 #: ../../view/theme/redbasic/php/config.php:93 ../../include/js_strings.php:22
-#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:99
-#: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Appman.php:153
-#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1127
-#: ../../Zotlabs/Module/Photos.php:1245 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Pdledit.php:98 ../../Zotlabs/Module/Mail.php:431
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Sources.php:117
-#: ../../Zotlabs/Module/Sources.php:154
-#: ../../Zotlabs/Module/Filestorage.php:183
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Connedit.php:887
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Setup.php:308
-#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Mitem.php:259
-#: ../../Zotlabs/Module/Admin/Addons.php:438
-#: ../../Zotlabs/Module/Admin/Site.php:309
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-#: ../../Zotlabs/Module/Admin/Security.php:112
-#: ../../Zotlabs/Module/Admin/Profs.php:178
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Email_validation.php:40
-#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Defperms.php:249
-#: ../../Zotlabs/Module/Settings/Features.php:79
-#: ../../Zotlabs/Module/Settings/Channel.php:516
-#: ../../Zotlabs/Module/Settings/Featured.php:54
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Display.php:192
-#: ../../Zotlabs/Module/Settings/Permcats.php:115
-#: ../../Zotlabs/Module/Settings/Oauth2.php:85
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Import.php:565 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Group.php:121
-#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Profiles.php:723
-#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Import_items.php:129
+#: ../../Code/Lib/ThreadItem.php:757 ../../Code/Widget/Wiki_pages.php:40
+#: ../../Code/Widget/Wiki_pages.php:99
+#: ../../Code/Widget/Eventstools.php:16 ../../Code/Module/Appman.php:153
+#: ../../Code/Module/Photos.php:1087 ../../Code/Module/Photos.php:1127
+#: ../../Code/Module/Photos.php:1245 ../../Code/Module/Connect.php:98
+#: ../../Code/Module/Poke.php:200 ../../Code/Module/Events.php:493
+#: ../../Code/Module/Pdledit.php:98 ../../Code/Module/Mail.php:431
+#: ../../Code/Module/Xchan.php:15 ../../Code/Module/Sources.php:117
+#: ../../Code/Module/Sources.php:154
+#: ../../Code/Module/Filestorage.php:183
+#: ../../Code/Module/Editpost.php:85 ../../Code/Module/Connedit.php:887
+#: ../../Code/Module/Cal.php:345 ../../Code/Module/Setup.php:308
+#: ../../Code/Module/Setup.php:349 ../../Code/Module/Mitem.php:259
+#: ../../Code/Module/Admin/Addons.php:438
+#: ../../Code/Module/Admin/Site.php:309
+#: ../../Code/Module/Admin/Logs.php:84
+#: ../../Code/Module/Admin/Accounts.php:168
+#: ../../Code/Module/Admin/Security.php:112
+#: ../../Code/Module/Admin/Profs.php:178
+#: ../../Code/Module/Admin/Themes.php:158
+#: ../../Code/Module/Admin/Features.php:66
+#: ../../Code/Module/Admin/Account_edit.php:74
+#: ../../Code/Module/Admin/Channels.php:147
+#: ../../Code/Module/Email_validation.php:40
+#: ../../Code/Module/Invite.php:151 ../../Code/Module/Defperms.php:249
+#: ../../Code/Module/Settings/Features.php:79
+#: ../../Code/Module/Settings/Channel.php:516
+#: ../../Code/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Account.php:118
+#: ../../Code/Module/Settings/Display.php:192
+#: ../../Code/Module/Settings/Permcats.php:115
+#: ../../Code/Module/Settings/Oauth2.php:85
+#: ../../Code/Module/Settings/Oauth.php:88
+#: ../../Code/Module/Settings/Tokens.php:168
+#: ../../Code/Module/Chat.php:196 ../../Code/Module/Chat.php:242
+#: ../../Code/Module/Rate.php:166 ../../Code/Module/Locs.php:121
+#: ../../Code/Module/Import.php:565 ../../Code/Module/Pconfig.php:107
+#: ../../Code/Module/Wiki.php:206 ../../Code/Module/Group.php:121
+#: ../../Code/Module/Group.php:137 ../../Code/Module/Profiles.php:723
+#: ../../Code/Module/Thing.php:326 ../../Code/Module/Thing.php:379
+#: ../../Code/Module/Mood.php:139 ../../Code/Module/Import_items.php:129
 msgid "Submit"
 msgstr "Отправить"
 
 #: ../../extend/addon/hzaddons/mdpost/mdpost.php:40 ../../include/text.php:1886
-#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:208
-#: ../../Zotlabs/Module/Wiki.php:350
+#: ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:95 ../../Code/Module/Wiki.php:208
+#: ../../Code/Module/Wiki.php:350
 msgid "Markdown"
 msgstr "Разметка"
 
@@ -522,8 +522,8 @@ msgid "No channels currently blocked"
 msgstr "В настоящее время никакие каналы не блокируются"
 
 #: ../../extend/addon/hzaddons/superblock/superblock.php:116
-#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137
-#: ../../Zotlabs/Module/Admin/Addons.php:455
+#: ../../Code/Module/Photos.php:1025 ../../Code/Module/Tagrm.php:137
+#: ../../Code/Module/Admin/Addons.php:455
 msgid "Remove"
 msgstr "Удалить"
 
@@ -587,8 +587,8 @@ msgstr "Если включено, участники автоматически
 #: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:184
 #: ../../extend/addon/hzaddons/twitter/twitter.php:772
 #: ../../extend/addon/hzaddons/piwik/piwik.php:116
-#: ../../Zotlabs/Module/Defperms.php:103
-#: ../../Zotlabs/Module/Settings/Channel.php:272
+#: ../../Code/Module/Defperms.php:103
+#: ../../Code/Module/Settings/Channel.php:272
 msgid "Settings updated."
 msgstr "Настройки обновлены."
 
@@ -597,7 +597,7 @@ msgid "Send email to all members"
 msgstr "Отправить email всем участникам"
 
 #: ../../extend/addon/hzaddons/hubwall/hubwall.php:33
-#: ../../Zotlabs/Lib/Enotify.php:65
+#: ../../Code/Lib/Enotify.php:65
 #, php-format
 msgid "%s Administrator"
 msgstr "администратор %s"
@@ -620,7 +620,7 @@ msgid "Test mode (only send to hub administrator)"
 msgstr "Тестовый режим (отправка только администратору узла)"
 
 #: ../../extend/addon/hzaddons/buglink/buglink.php:16
-#: ../../Zotlabs/Lib/Apps.php:299
+#: ../../Code/Lib/Apps.php:299
 msgid "Report Bug"
 msgstr "Сообщить об ошибке"
 
@@ -747,8 +747,8 @@ msgid "You must select a local channel /chess/channelname"
 msgstr "Вы должны выбрать локальный канал /chess/channelname"
 
 #: ../../extend/addon/hzaddons/chess/chess.php:508
-#: ../../Zotlabs/Module/Channel.php:35 ../../Zotlabs/Module/Ochannel.php:32
-#: ../../Zotlabs/Module/Chat.php:25
+#: ../../Code/Module/Channel.php:35 ../../Code/Module/Ochannel.php:32
+#: ../../Code/Module/Chat.php:25
 msgid "You must be logged in to see this page."
 msgstr "Вы должны авторизоваться, чтобы увидеть эту страницу."
 
@@ -852,11 +852,11 @@ msgstr "файл"
 #: ../../extend/addon/hzaddons/frphotos/frphotos.php:82
 #: ../../extend/addon/hzaddons/redphotos/redphotos.php:119
 #: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:73
-#: ../../include/items.php:364 ../../Zotlabs/Web/WebServer.php:122
-#: ../../Zotlabs/Module/Subthread.php:86 ../../Zotlabs/Module/Like.php:296
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Group.php:83 ../../Zotlabs/Module/Profperm.php:28
-#: ../../Zotlabs/Module/Cloud.php:126 ../../Zotlabs/Module/Import_items.php:120
+#: ../../include/items.php:364 ../../Code/Web/WebServer.php:122
+#: ../../Code/Module/Subthread.php:86 ../../Code/Module/Like.php:296
+#: ../../Code/Module/Dreport.php:10 ../../Code/Module/Dreport.php:68
+#: ../../Code/Module/Group.php:83 ../../Code/Module/Profperm.php:28
+#: ../../Code/Module/Cloud.php:126 ../../Code/Module/Import_items.php:120
 msgid "Permission denied"
 msgstr "Доступ запрещен"
 
@@ -1007,64 +1007,64 @@ msgstr "Настройки виджета Flattr"
 #: ../../include/attach.php:482 ../../include/attach.php:1042
 #: ../../include/attach.php:1116 ../../include/attach.php:1281
 #: ../../include/items.php:3653 ../../include/photos.php:27
-#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
-#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Photos.php:69
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Poke.php:149
-#: ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Connections.php:29 ../../Zotlabs/Module/Item.php:229
-#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
-#: ../../Zotlabs/Module/Item.php:1108 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Settings.php:59
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Mail.php:146
-#: ../../Zotlabs/Module/Card_edit.php:51 ../../Zotlabs/Module/Suggest.php:28
-#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:281
-#: ../../Zotlabs/Module/Channel.php:320 ../../Zotlabs/Module/Block.php:24
-#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Api.php:24
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Sources.php:77
-#: ../../Zotlabs/Module/Profile_photo.php:302
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Filestorage.php:15
-#: ../../Zotlabs/Module/Filestorage.php:70
-#: ../../Zotlabs/Module/Filestorage.php:96
-#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Connedit.php:389
-#: ../../Zotlabs/Module/Webpages.php:118
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107
-#: ../../Zotlabs/Module/Editwebpage.php:121
-#: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Moderate.php:13
-#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Bookmarks.php:64
-#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Cover_photo.php:313
-#: ../../Zotlabs/Module/Cover_photo.php:326 ../../Zotlabs/Module/Like.php:185
-#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Menu.php:129
-#: ../../Zotlabs/Module/Menu.php:140 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Settings/Features.php:38
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/New_channel.php:105
-#: ../../Zotlabs/Module/New_channel.php:130 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Regmod.php:20
-#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Cards.php:72
-#: ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Article_edit.php:51 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404
-#: ../../Zotlabs/Module/Group.php:12 ../../Zotlabs/Module/Group.php:24
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
-#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
-#: ../../Zotlabs/Module/Thing.php:280 ../../Zotlabs/Module/Thing.php:300
-#: ../../Zotlabs/Module/Thing.php:341 ../../Zotlabs/Module/Display.php:449
-#: ../../Zotlabs/Module/Cloud.php:40 ../../Zotlabs/Module/Mood.php:116
+#: ../../Code/Lib/Chatroom.php:133 ../../Code/Web/WebServer.php:123
+#: ../../Code/Module/Appman.php:87 ../../Code/Module/Photos.php:69
+#: ../../Code/Module/Authtest.php:16 ../../Code/Module/Poke.php:149
+#: ../../Code/Module/Achievements.php:34
+#: ../../Code/Module/Connections.php:29 ../../Code/Module/Item.php:229
+#: ../../Code/Module/Item.php:246 ../../Code/Module/Item.php:256
+#: ../../Code/Module/Item.php:1108 ../../Code/Module/Events.php:271
+#: ../../Code/Module/Layouts.php:71 ../../Code/Module/Layouts.php:78
+#: ../../Code/Module/Layouts.php:89 ../../Code/Module/Settings.php:59
+#: ../../Code/Module/Notifications.php:11
+#: ../../Code/Module/Pdledit.php:29 ../../Code/Module/Mail.php:146
+#: ../../Code/Module/Card_edit.php:51 ../../Code/Module/Suggest.php:28
+#: ../../Code/Module/Channel.php:115 ../../Code/Module/Channel.php:281
+#: ../../Code/Module/Channel.php:320 ../../Code/Module/Block.php:24
+#: ../../Code/Module/Block.php:74 ../../Code/Module/Api.php:24
+#: ../../Code/Module/Viewsrc.php:19 ../../Code/Module/Sources.php:77
+#: ../../Code/Module/Profile_photo.php:302
+#: ../../Code/Module/Profile_photo.php:315
+#: ../../Code/Module/Common.php:38 ../../Code/Module/Message.php:18
+#: ../../Code/Module/Filestorage.php:15
+#: ../../Code/Module/Filestorage.php:70
+#: ../../Code/Module/Filestorage.php:96
+#: ../../Code/Module/Filestorage.php:140 ../../Code/Module/Page.php:34
+#: ../../Code/Module/Page.php:133 ../../Code/Module/Editblock.php:67
+#: ../../Code/Module/Editpost.php:17 ../../Code/Module/Connedit.php:389
+#: ../../Code/Module/Webpages.php:118
+#: ../../Code/Module/Editwebpage.php:68
+#: ../../Code/Module/Editwebpage.php:89
+#: ../../Code/Module/Editwebpage.php:107
+#: ../../Code/Module/Editwebpage.php:121
+#: ../../Code/Module/Editlayout.php:67
+#: ../../Code/Module/Editlayout.php:90 ../../Code/Module/Moderate.php:13
+#: ../../Code/Module/Articles.php:68 ../../Code/Module/Bookmarks.php:64
+#: ../../Code/Module/Sharedwithme.php:16 ../../Code/Module/Setup.php:209
+#: ../../Code/Module/Mitem.php:129 ../../Code/Module/Invite.php:17
+#: ../../Code/Module/Invite.php:94 ../../Code/Module/Blocks.php:73
+#: ../../Code/Module/Blocks.php:80 ../../Code/Module/Cover_photo.php:313
+#: ../../Code/Module/Cover_photo.php:326 ../../Code/Module/Like.php:185
+#: ../../Code/Module/Defperms.php:173 ../../Code/Module/Menu.php:129
+#: ../../Code/Module/Menu.php:140 ../../Code/Module/Manage.php:10
+#: ../../Code/Module/Settings/Features.php:38
+#: ../../Code/Module/Chat.php:100 ../../Code/Module/Chat.php:105
+#: ../../Code/Module/Rate.php:113 ../../Code/Module/Locs.php:87
+#: ../../Code/Module/Viewconnections.php:28
+#: ../../Code/Module/Viewconnections.php:33
+#: ../../Code/Module/New_channel.php:105
+#: ../../Code/Module/New_channel.php:130 ../../Code/Module/Network.php:15
+#: ../../Code/Module/Regmod.php:20
+#: ../../Code/Module/Service_limits.php:11 ../../Code/Module/Cards.php:72
+#: ../../Code/Module/Register.php:77
+#: ../../Code/Module/Article_edit.php:51 ../../Code/Module/Wiki.php:50
+#: ../../Code/Module/Wiki.php:273 ../../Code/Module/Wiki.php:404
+#: ../../Code/Module/Group.php:12 ../../Code/Module/Group.php:24
+#: ../../Code/Module/Profiles.php:198 ../../Code/Module/Profiles.php:635
+#: ../../Code/Module/Profile.php:85 ../../Code/Module/Profile.php:101
+#: ../../Code/Module/Thing.php:280 ../../Code/Module/Thing.php:300
+#: ../../Code/Module/Thing.php:341 ../../Code/Module/Display.php:449
+#: ../../Code/Module/Cloud.php:40 ../../Code/Module/Mood.php:116
 msgid "Permission denied."
 msgstr "Доступ запрещен."
 
@@ -1129,7 +1129,7 @@ msgid "PumpIO Settings saved."
 msgstr "Настройки публикаций в Pump.io сохранены."
 
 #: ../../extend/addon/hzaddons/bookmarker/bookmarker.php:38
-#: ../../Zotlabs/Lib/ThreadItem.php:403
+#: ../../Code/Lib/ThreadItem.php:403
 msgid "Save Bookmarks"
 msgstr "Сохранить закладки"
 
@@ -1167,10 +1167,10 @@ msgid "Encrypt Jabber password with Hubzilla password"
 msgstr "Зашифровать пароль Jabber с помощью пароля Hubzilla"
 
 #: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:343
-#: ../../Zotlabs/Module/Settings/Channel.php:592
-#: ../../Zotlabs/Module/Settings/Channel.php:597
-#: ../../Zotlabs/Module/Settings/Channel.php:598
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Code/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:598
+#: ../../Code/Module/Settings/Channel.php:599
 msgid "Recommended"
 msgstr "рекомендовано"
 
@@ -1193,8 +1193,8 @@ msgid "Configuration Help"
 msgstr "Помощь по конфигурации"
 
 #: ../../extend/addon/hzaddons/jappixmini/jappixmini.php:368
-#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
-#: ../../Zotlabs/Module/Profiles.php:796
+#: ../../Code/Module/Cdav.php:1183 ../../Code/Module/Connedit.php:919
+#: ../../Code/Module/Profiles.php:796
 msgid "Add Contact"
 msgstr "Добавить контакт"
 
@@ -1286,24 +1286,24 @@ msgid "Let's meet here"
 msgstr "Давайте встретимся здесь"
 
 #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172
-#: ../../Zotlabs/Lib/NativeWikiPage.php:558
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Connedit.php:906
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Module/Wiki.php:209
-#: ../../Zotlabs/Module/Group.php:125 ../../Zotlabs/Storage/Browser.php:285
+#: ../../Code/Lib/NativeWikiPage.php:558
+#: ../../Code/Widget/Wiki_page_history.php:22
+#: ../../Code/Module/Cdav.php:1170 ../../Code/Module/Connedit.php:906
+#: ../../Code/Module/Sharedwithme.php:105
+#: ../../Code/Module/Admin/Channels.php:159
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth.php:116
+#: ../../Code/Module/Chat.php:251 ../../Code/Module/Wiki.php:209
+#: ../../Code/Module/Group.php:125 ../../Code/Storage/Browser.php:285
 msgid "Name"
 msgstr "Имя"
 
 #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:173
 #: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:659
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Cdav.php:871
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Code/Module/Appman.php:143 ../../Code/Module/Cdav.php:871
+#: ../../Code/Module/Events.php:473 ../../Code/Module/Rbmark.php:101
 msgid "Description"
 msgstr "Описание"
 
@@ -1383,7 +1383,7 @@ msgid "You have no rendezvous. Press the button above to create a rendezvous!"
 msgstr "У вас нет Rendezvous. Нажмите на кнопку ниже чтобы создать его!"
 
 #: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:401
-#: ../../Zotlabs/Module/Setup.php:707
+#: ../../Code/Module/Setup.php:707
 msgid "Errors encountered creating database tables."
 msgstr "При создании базы данных возникли ошибки."
 
@@ -1444,7 +1444,7 @@ msgstr "Ошибка протокола OpenID. Идентификатор не
 
 #: ../../extend/addon/hzaddons/openid/Mod_Openid.php:76
 #: ../../extend/addon/hzaddons/openid/Mod_Openid.php:178
-#: ../../Zotlabs/Zot/Auth.php:264
+#: ../../Code/Zot/Auth.php:264
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Добро пожаловать %s. Удаленная аутентификация успешно завершена."
@@ -1475,18 +1475,18 @@ msgstr "Полное имя"
 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:57
 #: ../../extend/addon/hzaddons/rtof/rtof.php:93
 #: ../../extend/addon/hzaddons/redred/redred.php:107
-#: ../../include/network.php:1769 ../../Zotlabs/Module/Cdav.php:1174
-#: ../../Zotlabs/Module/Connedit.php:910
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-#: ../../Zotlabs/Module/Profiles.php:787
+#: ../../include/network.php:1769 ../../Code/Module/Cdav.php:1174
+#: ../../Code/Module/Connedit.php:910
+#: ../../Code/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:183
+#: ../../Code/Module/Profiles.php:787
 msgid "Email"
 msgstr "Электронная почта"
 
 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:58
 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:59
 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:60
-#: ../../Zotlabs/Lib/Apps.php:330
+#: ../../Code/Lib/Apps.php:330
 msgid "Profile Photo"
 msgstr "Фотография профиля"
 
@@ -1519,12 +1519,12 @@ msgid "Timezone"
 msgstr "Часовой пояс"
 
 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:68
-#: ../../Zotlabs/Module/Profiles.php:767
+#: ../../Code/Module/Profiles.php:767
 msgid "Homepage URL"
 msgstr "URL домашней страницы"
 
 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:69
-#: ../../Zotlabs/Lib/Apps.php:328
+#: ../../Code/Lib/Apps.php:328
 msgid "Language"
 msgstr "Язык"
 
@@ -1545,7 +1545,7 @@ msgid "Birthdate"
 msgstr "Дата рождения"
 
 #: ../../extend/addon/hzaddons/openid/MysqlProvider.php:74
-#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../Code/Module/Profiles.php:486
 msgid "Gender"
 msgstr "Гендер"
 
@@ -1682,17 +1682,17 @@ msgstr "Настройки публикаций в Twitter"
 
 #: ../../extend/addon/hzaddons/twitter/twitter.php:781
 #: ../../extend/addon/hzaddons/statusnet/statusnet.php:894
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:117
 msgid "Consumer Key"
 msgstr "Ключ клиента"
 
 #: ../../extend/addon/hzaddons/twitter/twitter.php:782
 #: ../../extend/addon/hzaddons/statusnet/statusnet.php:893
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth.php:118
 msgid "Consumer Secret"
 msgstr "Код клиента"
 
@@ -1707,13 +1707,13 @@ msgid ""
 msgstr "Предоставьте возможность редактирования фотографий, чтобы скрыть неприемлемые фотографии из альбома по умолчанию"
 
 #: ../../extend/addon/hzaddons/pubcrawl/as.php:961
-#: ../../include/conversation.php:1165 ../../Zotlabs/Lib/Apps.php:867
-#: ../../Zotlabs/Lib/Apps.php:949 ../../Zotlabs/Widget/Album.php:84
-#: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Module/Cdav.php:786
-#: ../../Zotlabs/Module/Cdav.php:787 ../../Zotlabs/Module/Cdav.php:794
-#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278
-#: ../../Zotlabs/Module/Embedphotos.php:146
-#: ../../Zotlabs/Storage/Browser.php:164
+#: ../../include/conversation.php:1165 ../../Code/Lib/Apps.php:867
+#: ../../Code/Lib/Apps.php:949 ../../Code/Widget/Album.php:84
+#: ../../Code/Widget/Portfolio.php:95 ../../Code/Module/Cdav.php:786
+#: ../../Code/Module/Cdav.php:787 ../../Code/Module/Cdav.php:794
+#: ../../Code/Module/Photos.php:822 ../../Code/Module/Photos.php:1278
+#: ../../Code/Module/Embedphotos.php:146
+#: ../../Code/Storage/Browser.php:164
 msgid "Unknown"
 msgstr "Неизвестный"
 
@@ -1728,27 +1728,27 @@ msgstr ""
 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:1530
 #: ../../extend/addon/hzaddons/redphotos/redphotohelper.php:71
 #: ../../include/conversation.php:116 ../../include/text.php:2022
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Tagger.php:69
+#: ../../Code/Module/Like.php:384
 msgid "photo"
 msgstr "фото"
 
 #: ../../extend/addon/hzaddons/pubcrawl/as.php:1509
 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:1530
 #: ../../include/conversation.php:144 ../../include/text.php:2028
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384
+#: ../../Code/Module/Subthread.php:111 ../../Code/Module/Like.php:384
 msgid "status"
 msgstr "статус"
 
 #: ../../extend/addon/hzaddons/pubcrawl/as.php:1544
 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:1559
-#: ../../include/conversation.php:160 ../../Zotlabs/Module/Like.php:438
+#: ../../include/conversation.php:160 ../../Code/Module/Like.php:438
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s нравится %3$s %2$s"
 
 #: ../../extend/addon/hzaddons/pubcrawl/as.php:1546
-#: ../../include/conversation.php:163 ../../Zotlabs/Module/Like.php:440
+#: ../../include/conversation.php:163 ../../Code/Module/Like.php:440
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s не нравится %2$s %3$s"
@@ -1800,14 +1800,14 @@ msgid "Unable to create a unique channel address. Import failed."
 msgstr "Не удалось создать уникальный адрес канала. Импорт не завершен."
 
 #: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:139
-#: ../../Zotlabs/Module/Import.php:513
+#: ../../Code/Module/Import.php:513
 msgid "Import completed."
 msgstr "Импорт завершен."
 
 #: ../../extend/addon/hzaddons/diaspora/util.php:308
 #: ../../extend/addon/hzaddons/diaspora/util.php:321
 #: ../../extend/addon/hzaddons/diaspora/p.php:48
-#: ../../Zotlabs/Lib/Enotify.php:61
+#: ../../Code/Lib/Enotify.php:61
 msgid "$projectname"
 msgstr ""
 
@@ -1847,19 +1847,19 @@ msgid "Diaspora Protocol Settings"
 msgstr "Настройки протокола Diaspora"
 
 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:2102
-#: ../../Zotlabs/Module/Like.php:448
+#: ../../Code/Module/Like.php:448
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s посещает %2$s%3$s"
 
 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:2104
-#: ../../Zotlabs/Module/Like.php:450
+#: ../../Code/Module/Like.php:450
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s не посещает %2$s%3$s"
 
 #: ../../extend/addon/hzaddons/diaspora/Receiver.php:2106
-#: ../../Zotlabs/Module/Like.php:452
+#: ../../Code/Module/Like.php:452
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s может посетить %2$s%3$s"
@@ -1895,7 +1895,7 @@ msgstr "Страница для загрузки после выбора изо
 
 #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57
 #: ../../include/conversation.php:1037 ../../include/nav.php:108
-#: ../../Zotlabs/Lib/Apps.php:313 ../../Zotlabs/Module/Connedit.php:594
+#: ../../Code/Lib/Apps.php:313 ../../Code/Module/Connedit.php:594
 msgid "View Profile"
 msgstr "Просмотреть профиль"
 
@@ -1975,7 +1975,7 @@ msgid "Unknown error. Please try again later."
 msgstr "Неизвестная ошибка. Пожалуйста, повторите попытку позже."
 
 #: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:298
-#: ../../Zotlabs/Module/Profile_photo.php:218
+#: ../../Code/Module/Profile_photo.php:218
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
@@ -2476,7 +2476,7 @@ msgid "GNU social Post Settings"
 msgstr "Настройки публикаций GNU social"
 
 #: ../../extend/addon/hzaddons/statusnet/statusnet.php:891
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Code/Module/Admin/Site.php:317
 msgid "Site name"
 msgstr "Название сайта"
 
@@ -2604,8 +2604,8 @@ msgid "$Projectname"
 msgstr ""
 
 #: ../../extend/addon/hzaddons/opensearch/opensearch.php:42
-#: ../../Zotlabs/Lib/Enotify.php:66 ../../Zotlabs/Module/Home.php:74
-#: ../../Zotlabs/Module/Home.php:82
+#: ../../Code/Lib/Enotify.php:66 ../../Code/Module/Home.php:74
+#: ../../Code/Module/Home.php:82
 msgid "$Projectname"
 msgstr ""
 
@@ -2664,7 +2664,7 @@ msgstr "Завершено"
 #: ../../extend/addon/hzaddons/cart/cart.php:1425
 #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:481
 #: ../../extend/addon/hzaddons/cart/myshop.php:51
-#: ../../Zotlabs/Module/Wiki.php:68
+#: ../../Code/Module/Wiki.php:68
 msgid "Invalid channel"
 msgstr "Недействительный канал"
 
@@ -2702,7 +2702,7 @@ msgid "Shop"
 msgstr "Магазин"
 
 #: ../../extend/addon/hzaddons/cart/cart.php:1298
-#: ../../Zotlabs/Module/Wiki.php:30
+#: ../../Code/Module/Wiki.php:30
 msgid "Profile Unavailable."
 msgstr "Профиль недоступен."
 
@@ -2982,7 +2982,7 @@ msgid "Channel is required."
 msgstr "Необходим канал."
 
 #: ../../extend/addon/hzaddons/redred/redred.php:65
-#: ../../Zotlabs/Module/Network.php:304
+#: ../../Code/Module/Network.php:304
 msgid "Invalid channel."
 msgstr "Недействительный канал."
 
@@ -3065,7 +3065,7 @@ msgid "New registration"
 msgstr "Новая регистрация"
 
 #: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:40
-#: ../../Zotlabs/Module/Invite.php:82
+#: ../../Code/Module/Invite.php:82
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : Доставка сообщения не удалась."
@@ -3319,7 +3319,7 @@ msgid "Create an account to access services and applications"
 msgstr "Создайте аккаунт для доступа к службам и приложениям"
 
 #: ../../boot.php:1596 ../../include/nav.php:158
-#: ../../Zotlabs/Module/Register.php:294
+#: ../../Code/Module/Register.php:294
 msgid "Register"
 msgstr "Регистрация"
 
@@ -3329,12 +3329,12 @@ msgid "Logout"
 msgstr "Выход"
 
 #: ../../boot.php:1616 ../../include/nav.php:120 ../../include/nav.php:124
-#: ../../Zotlabs/Lib/Apps.php:305
+#: ../../Code/Lib/Apps.php:305
 msgid "Login"
 msgstr "Войти"
 
 #: ../../boot.php:1617 ../../include/channel.php:2334
-#: ../../Zotlabs/Module/Rmagic.php:75
+#: ../../Code/Module/Rmagic.php:75
 msgid "Remote Authentication"
 msgstr "Удаленная аутентификация"
 
@@ -3354,7 +3354,7 @@ msgstr "Запомнить меня"
 msgid "Forgot your password?"
 msgstr "Забыли пароль или логин?"
 
-#: ../../boot.php:1625 ../../Zotlabs/Module/Lostpass.php:91
+#: ../../boot.php:1625 ../../Code/Module/Lostpass.php:91
 msgid "Password Reset"
 msgstr "Сбросить пароль"
 
@@ -3381,7 +3381,7 @@ msgid "never"
 msgstr "никогда"
 
 #: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078
-#: ../../Zotlabs/Module/Admin/Site.php:198
+#: ../../Code/Module/Admin/Site.php:198
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -3500,19 +3500,19 @@ msgid ""
 "to install it on this site."
 msgstr "Эта публикация содержит устанавливаемый %s элемент, однако у вас нет разрешений для его установки на этом сайте."
 
-#: ../../include/bbcode.php:269 ../../Zotlabs/Module/Impel.php:43
+#: ../../include/bbcode.php:269 ../../Code/Module/Impel.php:43
 msgid "webpage"
 msgstr "веб-страница"
 
-#: ../../include/bbcode.php:272 ../../Zotlabs/Module/Impel.php:53
+#: ../../include/bbcode.php:272 ../../Code/Module/Impel.php:53
 msgid "layout"
 msgstr "шаблон"
 
-#: ../../include/bbcode.php:275 ../../Zotlabs/Module/Impel.php:48
+#: ../../include/bbcode.php:275 ../../Code/Module/Impel.php:48
 msgid "block"
 msgstr "заблокировать"
 
-#: ../../include/bbcode.php:278 ../../Zotlabs/Module/Impel.php:60
+#: ../../include/bbcode.php:278 ../../Code/Module/Impel.php:60
 msgid "menu"
 msgstr "меню"
 
@@ -3525,7 +3525,7 @@ msgid "article"
 msgstr "статья"
 
 #: ../../include/bbcode.php:354 ../../include/markdown.php:160
-#: ../../Zotlabs/Module/Tagger.php:77
+#: ../../Code/Module/Tagger.php:77
 msgid "post"
 msgstr "публикация"
 
@@ -3551,7 +3551,7 @@ msgid "View summary"
 msgstr "Просмотр резюме"
 
 #: ../../include/bbcode.php:746 ../../include/bbcode.php:916
-#: ../../Zotlabs/Lib/NativeWikiPage.php:597
+#: ../../Code/Lib/NativeWikiPage.php:597
 msgid "Different viewers will see this text differently"
 msgstr "Различные зрители увидят этот текст по-разному"
 
@@ -3644,17 +3644,17 @@ msgid "Failed authentication"
 msgstr "Ошибка аутентификации"
 
 #: ../../include/conversation.php:119 ../../include/event.php:1153
-#: ../../include/text.php:2025 ../../Zotlabs/Module/Events.php:260
-#: ../../Zotlabs/Module/Tagger.php:73 ../../Zotlabs/Module/Like.php:386
+#: ../../include/text.php:2025 ../../Code/Module/Events.php:260
+#: ../../Code/Module/Tagger.php:73 ../../Code/Module/Like.php:386
 msgid "event"
 msgstr "событие"
 
-#: ../../include/conversation.php:122 ../../Zotlabs/Module/Like.php:121
+#: ../../include/conversation.php:122 ../../Code/Module/Like.php:121
 msgid "channel"
 msgstr "канал"
 
 #: ../../include/conversation.php:146 ../../include/text.php:2030
-#: ../../Zotlabs/Module/Tagger.php:79
+#: ../../Code/Module/Tagger.php:79
 msgid "comment"
 msgstr "комментарий"
 
@@ -3683,100 +3683,100 @@ msgstr "%1$s ткнул %2$s"
 msgid "poked"
 msgstr "ткнут"
 
-#: ../../include/conversation.php:268 ../../Zotlabs/Module/Mood.php:67
+#: ../../include/conversation.php:268 ../../Code/Module/Mood.php:67
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s в %2$s"
 
-#: ../../include/conversation.php:483 ../../Zotlabs/Lib/ThreadItem.php:431
+#: ../../include/conversation.php:483 ../../Code/Lib/ThreadItem.php:431
 msgid "This is an unsaved preview"
 msgstr "Это несохранённый просмотр"
 
-#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1142
+#: ../../include/conversation.php:619 ../../Code/Module/Photos.php:1142
 msgctxt "title"
 msgid "Likes"
 msgstr "Нравится"
 
-#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1142
+#: ../../include/conversation.php:619 ../../Code/Module/Photos.php:1142
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Не нравится"
 
-#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143
+#: ../../include/conversation.php:620 ../../Code/Module/Photos.php:1143
 msgctxt "title"
 msgid "Agree"
 msgstr "Согласен"
 
-#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143
+#: ../../include/conversation.php:620 ../../Code/Module/Photos.php:1143
 msgctxt "title"
 msgid "Disagree"
 msgstr "Не согласен"
 
-#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1143
+#: ../../include/conversation.php:620 ../../Code/Module/Photos.php:1143
 msgctxt "title"
 msgid "Abstain"
 msgstr "Воздержался"
 
-#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144
+#: ../../include/conversation.php:621 ../../Code/Module/Photos.php:1144
 msgctxt "title"
 msgid "Attending"
 msgstr "Посещаю"
 
-#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144
+#: ../../include/conversation.php:621 ../../Code/Module/Photos.php:1144
 msgctxt "title"
 msgid "Not attending"
 msgstr "Не посещаю"
 
-#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1144
+#: ../../include/conversation.php:621 ../../Code/Module/Photos.php:1144
 msgctxt "title"
 msgid "Might attend"
 msgstr "Возможно посещу"
 
-#: ../../include/conversation.php:690 ../../Zotlabs/Lib/ThreadItem.php:158
+#: ../../include/conversation.php:690 ../../Code/Lib/ThreadItem.php:158
 msgid "Select"
 msgstr "Выбрать"
 
 #: ../../include/conversation.php:691 ../../include/conversation.php:736
-#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Lib/Apps.php:500
-#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
-#: ../../Zotlabs/Module/Photos.php:1208
-#: ../../Zotlabs/Module/Connections.php:289
-#: ../../Zotlabs/Module/Card_edit.php:129
-#: ../../Zotlabs/Module/Editblock.php:139 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Webpages.php:242
-#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Settings/Oauth2.php:151
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Thing.php:267
-#: ../../Zotlabs/Storage/Browser.php:291
+#: ../../Code/Lib/ThreadItem.php:148 ../../Code/Lib/Apps.php:500
+#: ../../Code/Module/Cdav.php:897 ../../Code/Module/Cdav.php:1187
+#: ../../Code/Module/Photos.php:1208
+#: ../../Code/Module/Connections.php:289
+#: ../../Code/Module/Card_edit.php:129
+#: ../../Code/Module/Editblock.php:139 ../../Code/Module/Connedit.php:654
+#: ../../Code/Module/Connedit.php:923 ../../Code/Module/Webpages.php:242
+#: ../../Code/Module/Editwebpage.php:167
+#: ../../Code/Module/Editlayout.php:138
+#: ../../Code/Module/Admin/Accounts.php:175
+#: ../../Code/Module/Admin/Profs.php:176
+#: ../../Code/Module/Admin/Channels.php:149
+#: ../../Code/Module/Blocks.php:162
+#: ../../Code/Module/Settings/Oauth2.php:151
+#: ../../Code/Module/Settings/Oauth.php:151
+#: ../../Code/Module/Article_edit.php:129
+#: ../../Code/Module/Profiles.php:800 ../../Code/Module/Thing.php:267
+#: ../../Code/Storage/Browser.php:291
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../../include/conversation.php:695 ../../Zotlabs/Lib/ThreadItem.php:247
+#: ../../include/conversation.php:695 ../../Code/Lib/ThreadItem.php:247
 msgid "Toggle Star Status"
 msgstr "Переключить статус пометки"
 
-#: ../../include/conversation.php:700 ../../Zotlabs/Lib/ThreadItem.php:97
+#: ../../include/conversation.php:700 ../../Code/Lib/ThreadItem.php:97
 msgid "Private Message"
 msgstr "Личное сообщение"
 
-#: ../../include/conversation.php:707 ../../Zotlabs/Lib/ThreadItem.php:258
+#: ../../include/conversation.php:707 ../../Code/Lib/ThreadItem.php:258
 msgid "Message signature validated"
 msgstr "Подпись сообщения проверена"
 
-#: ../../include/conversation.php:708 ../../Zotlabs/Lib/ThreadItem.php:259
+#: ../../include/conversation.php:708 ../../Code/Lib/ThreadItem.php:259
 msgid "Message signature incorrect"
 msgstr "Подпись сообщения неверная"
 
-#: ../../include/conversation.php:735 ../../Zotlabs/Module/Connections.php:303
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
+#: ../../include/conversation.php:735 ../../Code/Module/Connections.php:303
+#: ../../Code/Module/Admin/Accounts.php:173
 msgid "Approve"
 msgstr "Утвердить"
 
@@ -3793,17 +3793,17 @@ msgstr "Категории:"
 msgid "Filed under:"
 msgstr "Хранить под:"
 
-#: ../../include/conversation.php:766 ../../Zotlabs/Lib/ThreadItem.php:367
+#: ../../include/conversation.php:766 ../../Code/Lib/ThreadItem.php:367
 #, php-format
 msgid "from %s"
 msgstr "от %s"
 
-#: ../../include/conversation.php:769 ../../Zotlabs/Lib/ThreadItem.php:370
+#: ../../include/conversation.php:769 ../../Code/Lib/ThreadItem.php:370
 #, php-format
 msgid "last edited: %s"
 msgstr "последнее редактирование: %s"
 
-#: ../../include/conversation.php:770 ../../Zotlabs/Lib/ThreadItem.php:371
+#: ../../include/conversation.php:770 ../../Code/Lib/ThreadItem.php:371
 #, php-format
 msgid "Expires: %s"
 msgstr "Срок действия: %s"
@@ -3812,8 +3812,8 @@ msgstr "Срок действия: %s"
 msgid "View in context"
 msgstr "Показать в контексте"
 
-#: ../../include/conversation.php:787 ../../Zotlabs/Lib/ThreadItem.php:432
-#: ../../Zotlabs/Module/Photos.php:1108
+#: ../../include/conversation.php:787 ../../Code/Lib/ThreadItem.php:432
+#: ../../Code/Module/Photos.php:1108
 msgid "Please wait"
 msgstr "Подождите пожалуйста"
 
@@ -3841,14 +3841,14 @@ msgstr "Следить за темой"
 msgid "Unfollow Thread"
 msgstr "Прекратить отслеживать тему"
 
-#: ../../include/conversation.php:1047 ../../Zotlabs/Module/Connedit.php:615
+#: ../../include/conversation.php:1047 ../../Code/Module/Connedit.php:615
 msgid "Recent Activity"
 msgstr "Последние действия"
 
 #: ../../include/conversation.php:1057 ../../include/channel.php:1376
-#: ../../include/connections.php:110 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Suggest.php:56
-#: ../../Zotlabs/Module/Directory.php:338
+#: ../../include/connections.php:110 ../../Code/Widget/Suggestions.php:44
+#: ../../Code/Widget/Follow.php:32 ../../Code/Module/Suggest.php:56
+#: ../../Code/Module/Directory.php:338
 msgid "Connect"
 msgstr "Подключить"
 
@@ -3860,13 +3860,13 @@ msgstr "Редактировать контакт"
 msgid "Message"
 msgstr "Сообщение"
 
-#: ../../include/conversation.php:1087 ../../Zotlabs/Module/Pubsites.php:35
-#: ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:1087 ../../Code/Module/Pubsites.php:35
+#: ../../Code/Module/Ratings.php:97
 msgid "Ratings"
 msgstr "Оценки"
 
-#: ../../include/conversation.php:1097 ../../Zotlabs/Lib/Apps.php:320
-#: ../../Zotlabs/Module/Poke.php:182
+#: ../../include/conversation.php:1097 ../../Code/Lib/Apps.php:320
+#: ../../Code/Module/Poke.php:182
 msgid "Poke"
 msgstr "Ткнуть"
 
@@ -3926,11 +3926,11 @@ msgstr "Задать своё местоположение"
 msgid "Clear browser location"
 msgstr "Очистить местоположение из браузера"
 
-#: ../../include/conversation.php:1283 ../../Zotlabs/Module/Mail.php:288
-#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101
-#: ../../Zotlabs/Module/Editblock.php:116
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:207
-#: ../../Zotlabs/Module/Article_edit.php:101
+#: ../../include/conversation.php:1283 ../../Code/Module/Mail.php:288
+#: ../../Code/Module/Mail.php:430 ../../Code/Module/Card_edit.php:101
+#: ../../Code/Module/Editblock.php:116
+#: ../../Code/Module/Editwebpage.php:143 ../../Code/Module/Chat.php:207
+#: ../../Code/Module/Article_edit.php:101
 msgid "Insert web link"
 msgstr "Вставить веб-ссылку"
 
@@ -3938,8 +3938,8 @@ msgstr "Вставить веб-ссылку"
 msgid "Embed (existing) photo from your photo albums"
 msgstr "Встроить (существующее) фото из вашего фотоальбома"
 
-#: ../../include/conversation.php:1322 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../Zotlabs/Module/Chat.php:205
+#: ../../include/conversation.php:1322 ../../Code/Module/Mail.php:241
+#: ../../Code/Module/Mail.php:362 ../../Code/Module/Chat.php:205
 msgid "Please enter a link URL:"
 msgstr "Пожалуйста введите URL ссылки:"
 
@@ -3952,14 +3952,14 @@ msgid "Where are you right now?"
 msgstr "Где вы сейчас?"
 
 #: ../../include/conversation.php:1327
-#: ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:401 ../../Zotlabs/Module/Wiki.php:381
+#: ../../Code/Module/Profile_photo.php:467
+#: ../../Code/Module/Cover_photo.php:401 ../../Code/Module/Wiki.php:381
 msgid "Choose images to embed"
 msgstr "Выбрать изображения для встраивания"
 
 #: ../../include/conversation.php:1328
-#: ../../Zotlabs/Module/Profile_photo.php:468
-#: ../../Zotlabs/Module/Cover_photo.php:402 ../../Zotlabs/Module/Wiki.php:382
+#: ../../Code/Module/Profile_photo.php:468
+#: ../../Code/Module/Cover_photo.php:402 ../../Code/Module/Wiki.php:382
 msgid "Choose an album"
 msgstr "Выбрать альбом"
 
@@ -3968,20 +3968,20 @@ msgid "Choose a different album..."
 msgstr "Выбрать другой альбом..."
 
 #: ../../include/conversation.php:1330
-#: ../../Zotlabs/Module/Profile_photo.php:470
-#: ../../Zotlabs/Module/Cover_photo.php:404 ../../Zotlabs/Module/Wiki.php:384
+#: ../../Code/Module/Profile_photo.php:470
+#: ../../Code/Module/Cover_photo.php:404 ../../Code/Module/Wiki.php:384
 msgid "Error getting album list"
 msgstr "Ошибка получения списка альбомов"
 
 #: ../../include/conversation.php:1331
-#: ../../Zotlabs/Module/Profile_photo.php:471
-#: ../../Zotlabs/Module/Cover_photo.php:405 ../../Zotlabs/Module/Wiki.php:385
+#: ../../Code/Module/Profile_photo.php:471
+#: ../../Code/Module/Cover_photo.php:405 ../../Code/Module/Wiki.php:385
 msgid "Error getting photo link"
 msgstr "Ошибка получения ссылки на фотографию"
 
 #: ../../include/conversation.php:1332
-#: ../../Zotlabs/Module/Profile_photo.php:472
-#: ../../Zotlabs/Module/Cover_photo.php:406 ../../Zotlabs/Module/Wiki.php:386
+#: ../../Code/Module/Profile_photo.php:472
+#: ../../Code/Module/Cover_photo.php:406 ../../Code/Module/Wiki.php:386
 msgid "Error getting album"
 msgstr "Ошибка получения альбома"
 
@@ -3993,16 +3993,16 @@ msgstr "Комментарии включены"
 msgid "Comments disabled"
 msgstr "Комментарии отключены"
 
-#: ../../include/conversation.php:1341 ../../Zotlabs/Lib/ThreadItem.php:767
-#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Webpages.php:247
+#: ../../include/conversation.php:1341 ../../Code/Lib/ThreadItem.php:767
+#: ../../Code/Module/Photos.php:1128 ../../Code/Module/Events.php:478
+#: ../../Code/Module/Webpages.php:247
 msgid "Preview"
 msgstr "Предварительный просмотр"
 
-#: ../../include/conversation.php:1374 ../../Zotlabs/Widget/Cdav.php:124
-#: ../../Zotlabs/Module/Photos.php:1107 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Wiki.php:287
+#: ../../include/conversation.php:1374 ../../Code/Widget/Cdav.php:124
+#: ../../Code/Module/Photos.php:1107 ../../Code/Module/Layouts.php:194
+#: ../../Code/Module/Webpages.php:241 ../../Code/Module/Blocks.php:161
+#: ../../Code/Module/Wiki.php:287
 msgid "Share"
 msgstr "Поделиться"
 
@@ -4014,59 +4014,59 @@ msgstr "Название ссылки на страницу "
 msgid "Post as"
 msgstr "Опубликовать как"
 
-#: ../../include/conversation.php:1388 ../../Zotlabs/Lib/ThreadItem.php:758
+#: ../../include/conversation.php:1388 ../../Code/Lib/ThreadItem.php:758
 msgid "Bold"
 msgstr "Жирный"
 
-#: ../../include/conversation.php:1389 ../../Zotlabs/Lib/ThreadItem.php:759
+#: ../../include/conversation.php:1389 ../../Code/Lib/ThreadItem.php:759
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../../include/conversation.php:1390 ../../Zotlabs/Lib/ThreadItem.php:760
+#: ../../include/conversation.php:1390 ../../Code/Lib/ThreadItem.php:760
 msgid "Underline"
 msgstr "Подчеркнутый"
 
-#: ../../include/conversation.php:1391 ../../Zotlabs/Lib/ThreadItem.php:761
+#: ../../include/conversation.php:1391 ../../Code/Lib/ThreadItem.php:761
 msgid "Quote"
 msgstr "Цитата"
 
-#: ../../include/conversation.php:1392 ../../Zotlabs/Lib/ThreadItem.php:762
+#: ../../include/conversation.php:1392 ../../Code/Lib/ThreadItem.php:762
 msgid "Code"
 msgstr "Код"
 
-#: ../../include/conversation.php:1393 ../../Zotlabs/Lib/ThreadItem.php:764
+#: ../../include/conversation.php:1393 ../../Code/Lib/ThreadItem.php:764
 msgid "Attach/Upload file"
 msgstr "Прикрепить/загрузить файл"
 
-#: ../../include/conversation.php:1396 ../../Zotlabs/Module/Wiki.php:378
+#: ../../include/conversation.php:1396 ../../Code/Module/Wiki.php:378
 msgid "Embed an image from your albums"
 msgstr "Встроить изображение из ваших альбомов"
 
 #: ../../include/conversation.php:1397 ../../include/conversation.php:1446
-#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Card_edit.php:131
-#: ../../Zotlabs/Module/Profile_photo.php:465
-#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Editpost.php:109
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../Zotlabs/Module/Connedit.php:924
-#: ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Admin/Addons.php:423
-#: ../../Zotlabs/Module/Cover_photo.php:399
-#: ../../Zotlabs/Module/Settings/Oauth2.php:86
-#: ../../Zotlabs/Module/Settings/Oauth2.php:114
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Article_edit.php:131
-#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379
-#: ../../Zotlabs/Module/Profiles.php:801
+#: ../../Code/Module/Cdav.php:899 ../../Code/Module/Cdav.php:1188
+#: ../../Code/Module/Fbrowser.php:66 ../../Code/Module/Fbrowser.php:88
+#: ../../Code/Module/Card_edit.php:131
+#: ../../Code/Module/Profile_photo.php:465
+#: ../../Code/Module/Editblock.php:141 ../../Code/Module/Editpost.php:109
+#: ../../Code/Module/Tagrm.php:15 ../../Code/Module/Tagrm.php:138
+#: ../../Code/Module/Connedit.php:924
+#: ../../Code/Module/Editwebpage.php:169
+#: ../../Code/Module/Editlayout.php:140
+#: ../../Code/Module/Admin/Addons.php:423
+#: ../../Code/Module/Cover_photo.php:399
+#: ../../Code/Module/Settings/Oauth2.php:86
+#: ../../Code/Module/Settings/Oauth2.php:114
+#: ../../Code/Module/Settings/Oauth.php:89
+#: ../../Code/Module/Settings/Oauth.php:115
+#: ../../Code/Module/Filer.php:55 ../../Code/Module/Article_edit.php:131
+#: ../../Code/Module/Wiki.php:347 ../../Code/Module/Wiki.php:379
+#: ../../Code/Module/Profiles.php:801
 msgid "Cancel"
 msgstr "Отменить"
 
 #: ../../include/conversation.php:1398 ../../include/conversation.php:1445
-#: ../../Zotlabs/Module/Profile_photo.php:466
-#: ../../Zotlabs/Module/Cover_photo.php:400 ../../Zotlabs/Module/Wiki.php:380
+#: ../../Code/Module/Profile_photo.php:466
+#: ../../Code/Module/Cover_photo.php:400 ../../Code/Module/Wiki.php:380
 msgid "OK"
 msgstr ""
 
@@ -4082,10 +4082,10 @@ msgstr "Отключить комментарии"
 msgid "Toggle comments"
 msgstr "Переключить комментарии"
 
-#: ../../include/conversation.php:1409 ../../Zotlabs/Module/Photos.php:703
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129
-#: ../../Zotlabs/Module/Article_edit.php:117
+#: ../../include/conversation.php:1409 ../../Code/Module/Photos.php:703
+#: ../../Code/Module/Photos.php:1073 ../../Code/Module/Card_edit.php:117
+#: ../../Code/Module/Editblock.php:129
+#: ../../Code/Module/Article_edit.php:117
 msgid "Title (optional)"
 msgstr "Заголовок (необязательно)"
 
@@ -4093,7 +4093,7 @@ msgstr "Заголовок (необязательно)"
 msgid "Categories (optional, comma-separated list)"
 msgstr "Категории (необязательно, список через запятую)"
 
-#: ../../include/conversation.php:1413 ../../Zotlabs/Module/Events.php:479
+#: ../../include/conversation.php:1413 ../../Code/Module/Events.php:479
 msgid "Permission settings"
 msgstr "Настройки разрешений"
 
@@ -4101,8 +4101,8 @@ msgstr "Настройки разрешений"
 msgid "Other networks and post services"
 msgstr "Другие сети и службы публикаций"
 
-#: ../../include/conversation.php:1438 ../../Zotlabs/Module/Mail.php:292
-#: ../../Zotlabs/Module/Mail.php:434
+#: ../../include/conversation.php:1438 ../../Code/Module/Mail.php:292
+#: ../../Code/Module/Mail.php:434
 msgid "Set expiration date"
 msgstr "Установить срок действия"
 
@@ -4110,9 +4110,9 @@ msgstr "Установить срок действия"
 msgid "Set publish date"
 msgstr "Установить дату публикации"
 
-#: ../../include/conversation.php:1443 ../../Zotlabs/Lib/ThreadItem.php:771
-#: ../../Zotlabs/Module/Mail.php:294 ../../Zotlabs/Module/Mail.php:436
-#: ../../Zotlabs/Module/Chat.php:206
+#: ../../include/conversation.php:1443 ../../Code/Lib/ThreadItem.php:771
+#: ../../Code/Module/Mail.php:294 ../../Code/Module/Mail.php:436
+#: ../../Code/Module/Chat.php:206
 msgid "Encrypt text"
 msgstr "Зашифровать текст"
 
@@ -4132,7 +4132,7 @@ msgstr "По публикациям"
 msgid "Sort by Post Date"
 msgstr "Сортировать по дате публикации"
 
-#: ../../include/conversation.php:1717 ../../Zotlabs/Module/Profiles.php:733
+#: ../../include/conversation.php:1717 ../../Code/Module/Profiles.php:733
 msgid "Personal"
 msgstr "Личное"
 
@@ -4140,9 +4140,9 @@ msgstr "Личное"
 msgid "Posts that mention or involve you"
 msgstr "Публикации, где вы были упомянуты или участвовали"
 
-#: ../../include/conversation.php:1726 ../../Zotlabs/Module/Connections.php:80
-#: ../../Zotlabs/Module/Connections.php:89
-#: ../../Zotlabs/Module/Notifications.php:50 ../../Zotlabs/Module/Menu.php:179
+#: ../../include/conversation.php:1726 ../../Code/Module/Connections.php:80
+#: ../../Code/Module/Connections.php:89
+#: ../../Code/Module/Notifications.php:50 ../../Code/Module/Menu.php:179
 msgid "New"
 msgstr "Новые"
 
@@ -4167,7 +4167,7 @@ msgid "Posts flagged as SPAM"
 msgstr "Публикация помечена как спам"
 
 #: ../../include/conversation.php:1820 ../../include/nav.php:370
-#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../Code/Module/Admin/Channels.php:154
 msgid "Channel"
 msgstr "Канал"
 
@@ -4176,7 +4176,7 @@ msgid "Status Messages and Posts"
 msgstr "Статусы и публикации"
 
 #: ../../include/conversation.php:1833 ../../include/nav.php:383
-#: ../../Zotlabs/Module/Help.php:80
+#: ../../Code/Module/Help.php:80
 msgid "About"
 msgstr "О себе"
 
@@ -4185,7 +4185,7 @@ msgid "Profile Details"
 msgstr "Информация о профиле"
 
 #: ../../include/conversation.php:1843 ../../include/nav.php:393
-#: ../../Zotlabs/Lib/Apps.php:314 ../../Zotlabs/Module/Fbrowser.php:29
+#: ../../Code/Lib/Apps.php:314 ../../Code/Module/Fbrowser.php:29
 msgid "Photos"
 msgstr "Фотографии"
 
@@ -4195,8 +4195,8 @@ msgid "Photo Albums"
 msgstr "Фотоальбомы"
 
 #: ../../include/conversation.php:1851 ../../include/nav.php:401
-#: ../../Zotlabs/Lib/Apps.php:309 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Storage/Browser.php:272
+#: ../../Code/Lib/Apps.php:309 ../../Code/Module/Fbrowser.php:85
+#: ../../Code/Storage/Browser.php:272
 msgid "Files"
 msgstr "Файлы"
 
@@ -4205,13 +4205,13 @@ msgid "Files and Storage"
 msgstr "Файлы и хранилище"
 
 #: ../../include/conversation.php:1862 ../../include/conversation.php:1865
-#: ../../Zotlabs/Lib/Apps.php:315
+#: ../../Code/Lib/Apps.php:315
 msgid "Events"
 msgstr "События"
 
 #: ../../include/conversation.php:1876 ../../include/conversation.php:1879
 #: ../../include/nav.php:426 ../../include/nav.php:429
-#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../Code/Widget/Chatroom_list.php:16
 msgid "Chatrooms"
 msgstr "Чаты"
 
@@ -4224,8 +4224,8 @@ msgid "Saved Bookmarks"
 msgstr "Сохранённые закладки"
 
 #: ../../include/conversation.php:1902 ../../include/nav.php:450
-#: ../../include/features.php:123 ../../Zotlabs/Lib/Apps.php:297
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194
+#: ../../include/features.php:123 ../../Code/Lib/Apps.php:297
+#: ../../Code/Module/Cards.php:42 ../../Code/Module/Cards.php:194
 msgid "Cards"
 msgstr "Карточки"
 
@@ -4242,7 +4242,7 @@ msgid "View Articles"
 msgstr "Просмотр статей"
 
 #: ../../include/conversation.php:1924 ../../include/nav.php:473
-#: ../../Zotlabs/Lib/Apps.php:310 ../../Zotlabs/Module/Webpages.php:237
+#: ../../Code/Lib/Apps.php:310 ../../Code/Module/Webpages.php:237
 msgid "Webpages"
 msgstr "Веб-страницы"
 
@@ -4251,18 +4251,18 @@ msgid "View Webpages"
 msgstr "Просмотр веб-страниц"
 
 #: ../../include/conversation.php:1937 ../../include/nav.php:486
-#: ../../Zotlabs/Module/Wiki.php:197
+#: ../../Code/Module/Wiki.php:197
 msgid "Wikis"
 msgstr ""
 
 #: ../../include/conversation.php:1940 ../../include/nav.php:489
-#: ../../include/features.php:96 ../../Zotlabs/Lib/Apps.php:311
+#: ../../include/features.php:96 ../../Code/Lib/Apps.php:311
 msgid "Wiki"
 msgstr ""
 
 #: ../../include/conversation.php:1990 ../../include/taxonomy.php:661
-#: ../../include/channel.php:1539 ../../Zotlabs/Lib/ThreadItem.php:216
-#: ../../Zotlabs/Module/Photos.php:1165
+#: ../../include/channel.php:1539 ../../Code/Lib/ThreadItem.php:216
+#: ../../Code/Module/Photos.php:1165
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -4270,8 +4270,8 @@ msgstr[0] "Нравится"
 msgstr[1] "Нравится"
 msgstr[2] "Нравится"
 
-#: ../../include/conversation.php:1993 ../../Zotlabs/Lib/ThreadItem.php:221
-#: ../../Zotlabs/Module/Photos.php:1170
+#: ../../include/conversation.php:1993 ../../Code/Lib/ThreadItem.php:221
+#: ../../Code/Module/Photos.php:1170
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -4355,7 +4355,7 @@ msgid "Finishes:"
 msgstr "Окончание:"
 
 #: ../../include/event.php:54 ../../include/event.php:86
-#: ../../include/channel.php:1391 ../../Zotlabs/Module/Directory.php:324
+#: ../../include/channel.php:1391 ../../Code/Module/Directory.php:324
 msgid "Location:"
 msgstr "Местоположение:"
 
@@ -4384,14 +4384,14 @@ msgid "Cancelled"
 msgstr "Отменено"
 
 #: ../../include/event.php:1308 ../../include/connections.php:698
-#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
-#: ../../Zotlabs/Module/Profiles.php:792
+#: ../../Code/Module/Cdav.php:1179 ../../Code/Module/Connedit.php:915
+#: ../../Code/Module/Profiles.php:792
 msgid "Mobile"
 msgstr "Мобильный"
 
 #: ../../include/event.php:1309 ../../include/connections.php:699
-#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Module/Profiles.php:793
+#: ../../Code/Module/Cdav.php:1180 ../../Code/Module/Connedit.php:916
+#: ../../Code/Module/Profiles.php:793
 msgid "Home"
 msgstr "Домашний"
 
@@ -4404,8 +4404,8 @@ msgid "Home, Fax"
 msgstr "Дом, факс"
 
 #: ../../include/event.php:1312 ../../include/connections.php:702
-#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
-#: ../../Zotlabs/Module/Profiles.php:794
+#: ../../Code/Module/Cdav.php:1181 ../../Code/Module/Connedit.php:917
+#: ../../Code/Module/Profiles.php:794
 msgid "Work"
 msgstr "Рабочий"
 
@@ -4421,11 +4421,11 @@ msgstr "Работа, факс"
 #: ../../include/selectors.php:49 ../../include/selectors.php:66
 #: ../../include/selectors.php:104 ../../include/selectors.php:140
 #: ../../include/connections.php:705 ../../include/connections.php:712
-#: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/Connedit.php:918
-#: ../../Zotlabs/Module/Settings/Channel.php:496
-#: ../../Zotlabs/Module/New_channel.php:172
-#: ../../Zotlabs/Module/Register.php:233 ../../Zotlabs/Module/Profiles.php:795
+#: ../../Code/Access/PermissionRoles.php:306
+#: ../../Code/Module/Cdav.php:1182 ../../Code/Module/Connedit.php:918
+#: ../../Code/Module/Settings/Channel.php:496
+#: ../../Code/Module/New_channel.php:172
+#: ../../Code/Module/Register.php:233 ../../Code/Module/Profiles.php:795
 msgid "Other"
 msgstr "Другой"
 
@@ -4595,8 +4595,8 @@ msgstr "Удаленная аутентификация"
 msgid "Click to authenticate to your home hub"
 msgstr "Нажмите, чтобы аутентифицировать себя на домашнем узле"
 
-#: ../../include/nav.php:94 ../../Zotlabs/Lib/Apps.php:306
-#: ../../Zotlabs/Module/Manage.php:170
+#: ../../include/nav.php:94 ../../Code/Lib/Apps.php:306
+#: ../../Code/Module/Manage.php:170
 msgid "Channel Manager"
 msgstr "Менеджер каналов"
 
@@ -4605,9 +4605,9 @@ msgid "Manage your channels"
 msgstr "Управление вашими каналами"
 
 #: ../../include/nav.php:97 ../../include/group.php:320
-#: ../../include/features.php:221 ../../Zotlabs/Lib/Apps.php:333
-#: ../../Zotlabs/Widget/Activity_filter.php:68
-#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124
+#: ../../include/features.php:221 ../../Code/Lib/Apps.php:333
+#: ../../Code/Widget/Activity_filter.php:68
+#: ../../Code/Module/Group.php:113 ../../Code/Module/Group.php:124
 msgid "Privacy Groups"
 msgstr "Группы безопасности"
 
@@ -4615,11 +4615,11 @@ msgstr "Группы безопасности"
 msgid "Manage your privacy groups"
 msgstr "Управление вашим группами безопасности"
 
-#: ../../include/nav.php:99 ../../Zotlabs/Lib/Apps.php:308
-#: ../../Zotlabs/Widget/Settings_menu.php:141
-#: ../../Zotlabs/Widget/Newmember.php:46
-#: ../../Zotlabs/Module/Admin/Addons.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125
+#: ../../include/nav.php:99 ../../Code/Lib/Apps.php:308
+#: ../../Code/Widget/Settings_menu.php:141
+#: ../../Code/Widget/Newmember.php:46
+#: ../../Code/Module/Admin/Addons.php:344
+#: ../../Code/Module/Admin/Themes.php:125
 msgid "Settings"
 msgstr "Настройки"
 
@@ -4636,7 +4636,7 @@ msgid "Your profile page"
 msgstr "Страницa вашего профиля"
 
 #: ../../include/nav.php:111 ../../include/channel.php:1296
-#: ../../Zotlabs/Module/Profiles.php:830
+#: ../../Code/Module/Profiles.php:830
 msgid "Edit Profiles"
 msgstr "Редактирование профилей"
 
@@ -4644,7 +4644,7 @@ msgstr "Редактирование профилей"
 msgid "Manage/Edit profiles"
 msgstr "Управление / редактирование профилей"
 
-#: ../../include/nav.php:113 ../../Zotlabs/Widget/Newmember.php:28
+#: ../../include/nav.php:113 ../../Code/Widget/Newmember.php:28
 msgid "Edit your profile"
 msgstr "Редактировать профиль"
 
@@ -4666,7 +4666,7 @@ msgstr "Создать аккаунт"
 
 #: ../../include/nav.php:170 ../../include/nav.php:272
 #: ../../include/help.php:68 ../../include/help.php:74
-#: ../../Zotlabs/Lib/Apps.php:317 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Code/Lib/Apps.php:317 ../../Code/Module/Layouts.php:186
 msgid "Help"
 msgstr "Помощь"
 
@@ -4676,9 +4676,9 @@ msgstr "Справочная информация и документация"
 
 #: ../../include/nav.php:185 ../../include/acl_selectors.php:118
 #: ../../include/text.php:1062 ../../include/text.php:1074
-#: ../../Zotlabs/Lib/Apps.php:322 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../Zotlabs/Widget/Activity_filter.php:148
-#: ../../Zotlabs/Module/Connections.php:335 ../../Zotlabs/Module/Search.php:44
+#: ../../Code/Lib/Apps.php:322 ../../Code/Widget/Sitesearch.php:31
+#: ../../Code/Widget/Activity_filter.php:148
+#: ../../Code/Module/Connections.php:335 ../../Code/Module/Search.php:44
 msgid "Search"
 msgstr "Поиск"
 
@@ -4686,7 +4686,7 @@ msgstr "Поиск"
 msgid "Search site @name, !forum, #tag, ?docs, content"
 msgstr "Искать на сайте @name, !forum, #tag, ?docs, содержимое"
 
-#: ../../include/nav.php:191 ../../Zotlabs/Widget/Admin.php:55
+#: ../../include/nav.php:191 ../../Code/Widget/Admin.php:55
 msgid "Admin"
 msgstr "Администрирование"
 
@@ -4694,10 +4694,10 @@ msgstr "Администрирование"
 msgid "Site Setup and Configuration"
 msgstr "Установка и конфигурация сайта"
 
-#: ../../include/nav.php:276 ../../Zotlabs/Widget/Notifications.php:162
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
-#: ../../Zotlabs/Module/New_channel.php:154
-#: ../../Zotlabs/Module/New_channel.php:161
+#: ../../include/nav.php:276 ../../Code/Widget/Notifications.php:162
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
+#: ../../Code/Module/New_channel.php:154
+#: ../../Code/Module/New_channel.php:161
 msgid "Loading"
 msgstr "Загрузка"
 
@@ -4722,13 +4722,13 @@ msgid "Toggle System Apps"
 msgstr "Переключить системные приложения"
 
 #: ../../include/nav.php:412 ../../include/nav.php:415
-#: ../../Zotlabs/Storage/Browser.php:140
+#: ../../Code/Storage/Browser.php:140
 msgid "Calendar"
 msgstr "Календарь"
 
 #: ../../include/nav.php:461 ../../include/features.php:133
-#: ../../Zotlabs/Lib/Apps.php:296 ../../Zotlabs/Module/Articles.php:38
-#: ../../Zotlabs/Module/Articles.php:191
+#: ../../Code/Lib/Apps.php:296 ../../Code/Module/Articles.php:38
+#: ../../Code/Module/Articles.php:191
 msgid "Articles"
 msgstr "Статьи"
 
@@ -4740,10 +4740,10 @@ msgstr "Помощь:"
 msgid "Not Found"
 msgstr "Не найдено"
 
-#: ../../include/help.php:81 ../../Zotlabs/Lib/NativeWikiPage.php:519
-#: ../../Zotlabs/Web/Router.php:167 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Display.php:141
-#: ../../Zotlabs/Module/Display.php:158 ../../Zotlabs/Module/Display.php:175
+#: ../../include/help.php:81 ../../Code/Lib/NativeWikiPage.php:519
+#: ../../Code/Web/Router.php:167 ../../Code/Module/Block.php:77
+#: ../../Code/Module/Page.php:136 ../../Code/Module/Display.php:141
+#: ../../Code/Module/Display.php:158 ../../Code/Module/Display.php:175
 msgid "Page not found."
 msgstr "Страница не найдена."
 
@@ -4774,7 +4774,7 @@ msgstr "Добавить группу безопасности"
 msgid "Channels not in any privacy group"
 msgstr "Каналы не включены ни в одну группу безопасности"
 
-#: ../../include/group.php:325 ../../Zotlabs/Widget/Savedsearch.php:84
+#: ../../include/group.php:325 ../../Code/Widget/Savedsearch.php:84
 msgid "add"
 msgstr "добавить"
 
@@ -4792,8 +4792,8 @@ msgid "Cloned channel not found. Import failed."
 msgstr "Клон канала не найден. Импорт невозможен."
 
 #: ../../include/photo/photo_driver.php:741
-#: ../../Zotlabs/Module/Profile_photo.php:120
-#: ../../Zotlabs/Module/Profile_photo.php:248
+#: ../../Code/Module/Profile_photo.php:120
+#: ../../Code/Module/Profile_photo.php:248
 msgid "Profile Photos"
 msgstr "Фотографии профиля"
 
@@ -4802,7 +4802,7 @@ msgid "Trending"
 msgstr "В тренде"
 
 #: ../../include/taxonomy.php:320 ../../include/taxonomy.php:449
-#: ../../include/taxonomy.php:470 ../../Zotlabs/Widget/Tagcloud.php:22
+#: ../../include/taxonomy.php:470 ../../Code/Widget/Tagcloud.php:22
 msgid "Tags"
 msgstr "Теги"
 
@@ -4810,7 +4810,7 @@ msgstr "Теги"
 #: ../../include/taxonomy.php:511 ../../include/taxonomy.php:532
 #: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141
 #: ../../include/contact_widgets.php:186
-#: ../../Zotlabs/Widget/Appcategories.php:43
+#: ../../Code/Widget/Appcategories.php:43
 msgid "Categories"
 msgstr "Категории"
 
@@ -4834,7 +4834,7 @@ msgstr "хотеть"
 msgid "wants"
 msgstr "хотеть"
 
-#: ../../include/taxonomy.php:575 ../../Zotlabs/Lib/ThreadItem.php:285
+#: ../../include/taxonomy.php:575 ../../Code/Lib/ThreadItem.php:285
 msgid "like"
 msgstr "нравится"
 
@@ -4842,7 +4842,7 @@ msgstr "нравится"
 msgid "likes"
 msgstr "нравится"
 
-#: ../../include/taxonomy.php:576 ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../include/taxonomy.php:576 ../../Code/Lib/ThreadItem.php:286
 msgid "dislike"
 msgstr "не нравится"
 
@@ -4900,18 +4900,18 @@ msgid "Cannot connect to yourself."
 msgstr "Нельзя подключиться к самому себе."
 
 #: ../../include/acl_selectors.php:33
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../Code/Lib/PermissionDescription.php:34
 msgid "Visible to your default audience"
 msgstr "Видно вашей аудитории по умолчанию."
 
-#: ../../include/acl_selectors.php:88 ../../Zotlabs/Module/Acl.php:120
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
+#: ../../include/acl_selectors.php:88 ../../Code/Module/Acl.php:120
+#: ../../Code/Module/Lockview.php:117 ../../Code/Module/Lockview.php:153
 msgctxt "acl"
 msgid "Profile"
 msgstr "Профиль"
 
 #: ../../include/acl_selectors.php:106
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../Code/Lib/PermissionDescription.php:107
 msgid "Only me"
 msgstr "Только мне"
 
@@ -4937,16 +4937,16 @@ msgstr "Показать"
 msgid "Don't show"
 msgstr "Не показывать"
 
-#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Photos.php:707
-#: ../../Zotlabs/Module/Photos.php:1076
-#: ../../Zotlabs/Module/Filestorage.php:170
-#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
+#: ../../include/acl_selectors.php:123 ../../Code/Module/Photos.php:707
+#: ../../Code/Module/Photos.php:1076
+#: ../../Code/Module/Filestorage.php:170
+#: ../../Code/Module/Connedit.php:676 ../../Code/Module/Chat.php:235
+#: ../../Code/Module/Thing.php:319 ../../Code/Module/Thing.php:372
 msgid "Permissions"
 msgstr "Разрешения"
 
-#: ../../include/acl_selectors.php:125 ../../Zotlabs/Lib/ThreadItem.php:426
-#: ../../Zotlabs/Module/Photos.php:1298
+#: ../../include/acl_selectors.php:125 ../../Code/Lib/ThreadItem.php:426
+#: ../../Code/Module/Photos.php:1298
 msgid "Close"
 msgstr "Закрыть"
 
@@ -4957,8 +4957,8 @@ msgid ""
 "permissions set who is allowed to view the post."
 msgstr "Разрешения публикации %s не могут быть изменены %s после того, как ею поделились. Эти разрешения устанавливают кому разрешено просматривать эту публикацию."
 
-#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:44
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../include/datetime.php:58 ../../Code/Widget/Newmember.php:44
+#: ../../Code/Module/Profiles.php:736
 msgid "Miscellaneous"
 msgstr "Прочее"
 
@@ -4974,10 +4974,10 @@ msgstr "Возраст:"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "YYYY-MM-DD или MM-DD"
 
-#: ../../include/datetime.php:211 ../../Zotlabs/Module/Appman.php:141
-#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:465 ../../Zotlabs/Module/Profiles.php:745
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../include/datetime.php:211 ../../Code/Module/Appman.php:141
+#: ../../Code/Module/Appman.php:142 ../../Code/Module/Events.php:460
+#: ../../Code/Module/Events.php:465 ../../Code/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:749
 msgid "Required"
 msgstr "Требуется"
 
@@ -5090,8 +5090,8 @@ msgstr "новее"
 msgid "No connections"
 msgstr "Нет контактов"
 
-#: ../../include/text.php:975 ../../Zotlabs/Lib/Apps.php:302
-#: ../../Zotlabs/Module/Connections.php:331
+#: ../../include/text.php:975 ../../Code/Lib/Apps.php:302
+#: ../../Code/Module/Connections.php:331
 msgid "Connections"
 msgstr "Контакты"
 
@@ -5106,9 +5106,9 @@ msgid "Network: %s"
 msgstr "Сеть: %s"
 
 #: ../../include/text.php:1063 ../../include/text.php:1075
-#: ../../Zotlabs/Widget/Notes.php:18 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:53
+#: ../../Code/Widget/Notes.php:18 ../../Code/Module/Rbmark.php:32
+#: ../../Code/Module/Rbmark.php:104 ../../Code/Module/Admin/Profs.php:94
+#: ../../Code/Module/Admin/Profs.php:114 ../../Code/Module/Filer.php:53
 msgid "Save"
 msgstr "Запомнить"
 
@@ -5320,8 +5320,8 @@ msgstr "Декабрь"
 msgid "Unknown Attachment"
 msgstr "Неизвестное вложение"
 
-#: ../../include/text.php:1451 ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:287
+#: ../../include/text.php:1451 ../../Code/Module/Sharedwithme.php:107
+#: ../../Code/Storage/Browser.php:287
 msgid "Size"
 msgstr "Размер"
 
@@ -5337,8 +5337,8 @@ msgstr "удалить из файла"
 msgid "Download binary/encrypted content"
 msgstr "Загрузить двоичное / зашифрованное содержимое"
 
-#: ../../include/text.php:1844 ../../Zotlabs/Module/Events.php:660
-#: ../../Zotlabs/Module/Cal.php:315
+#: ../../include/text.php:1844 ../../Code/Module/Events.php:660
+#: ../../Code/Module/Cal.php:315
 msgid "Link to Source"
 msgstr "Ссылка на источник"
 
@@ -5350,9 +5350,9 @@ msgstr "Шаблон страницы"
 msgid "You can create your own with the layouts tool"
 msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов"
 
-#: ../../include/text.php:1884 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:208
-#: ../../Zotlabs/Module/Wiki.php:350
+#: ../../include/text.php:1884 ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:95 ../../Code/Module/Wiki.php:208
+#: ../../Code/Module/Wiki.php:350
 msgid "BBcode"
 msgstr ""
 
@@ -5360,8 +5360,8 @@ msgstr ""
 msgid "HTML"
 msgstr ""
 
-#: ../../include/text.php:1887 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:208
+#: ../../include/text.php:1887 ../../Code/Widget/Wiki_pages.php:36
+#: ../../Code/Widget/Wiki_pages.php:95 ../../Code/Module/Wiki.php:208
 msgid "Text"
 msgstr "Текст"
 
@@ -5389,15 +5389,15 @@ msgstr "Только a-z, 0-9, -, и _"
 msgid "Design Tools"
 msgstr "Инструменты дизайна"
 
-#: ../../include/text.php:2458 ../../Zotlabs/Module/Blocks.php:154
+#: ../../include/text.php:2458 ../../Code/Module/Blocks.php:154
 msgid "Blocks"
 msgstr "Блокировки"
 
-#: ../../include/text.php:2459 ../../Zotlabs/Module/Menu.php:170
+#: ../../include/text.php:2459 ../../Code/Module/Menu.php:170
 msgid "Menus"
 msgstr "Меню"
 
-#: ../../include/text.php:2460 ../../Zotlabs/Module/Layouts.php:184
+#: ../../include/text.php:2460 ../../Code/Module/Layouts.php:184
 msgid "Layouts"
 msgstr "Шаблоны"
 
@@ -5405,7 +5405,7 @@ msgstr "Шаблоны"
 msgid "Pages"
 msgstr "Страницы"
 
-#: ../../include/text.php:2482 ../../Zotlabs/Module/Cal.php:344
+#: ../../include/text.php:2482 ../../Code/Module/Cal.php:344
 msgid "Import"
 msgstr "Импортировать"
 
@@ -5469,7 +5469,7 @@ msgstr "Введите путь к расположению сетевых фа
 msgid "Specify folder"
 msgstr "Указать каталог"
 
-#: ../../include/text.php:2817 ../../Zotlabs/Storage/Browser.php:131
+#: ../../include/text.php:2817 ../../Code/Storage/Browser.php:131
 msgid "Collection"
 msgstr "Коллекция"
 
@@ -5480,22 +5480,22 @@ msgid ""
 msgstr "Не верный токен безопасности для формы. Вероятно, это произошло потому, что форма была открыта слишком долго (> 3-х часов) перед его отправкой."
 
 #: ../../include/menu.php:118 ../../include/channel.php:1296
-#: ../../include/channel.php:1300 ../../Zotlabs/Lib/ThreadItem.php:128
-#: ../../Zotlabs/Lib/Apps.php:499 ../../Zotlabs/Widget/Cdav.php:126
-#: ../../Zotlabs/Widget/Cdav.php:162 ../../Zotlabs/Module/Connections.php:281
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Connections.php:339
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Webpages.php:240
-#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Menu.php:175
-#: ../../Zotlabs/Module/Settings/Oauth2.php:150
-#: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Article_edit.php:99 ../../Zotlabs/Module/Wiki.php:202
-#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Group.php:216
-#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Storage/Browser.php:290
+#: ../../include/channel.php:1300 ../../Code/Lib/ThreadItem.php:128
+#: ../../Code/Lib/Apps.php:499 ../../Code/Widget/Cdav.php:126
+#: ../../Code/Widget/Cdav.php:162 ../../Code/Module/Connections.php:281
+#: ../../Code/Module/Connections.php:319
+#: ../../Code/Module/Connections.php:339
+#: ../../Code/Module/Layouts.php:193 ../../Code/Module/Card_edit.php:99
+#: ../../Code/Module/Editblock.php:114 ../../Code/Module/Webpages.php:240
+#: ../../Code/Module/Editwebpage.php:142
+#: ../../Code/Module/Editlayout.php:114
+#: ../../Code/Module/Admin/Profs.php:175 ../../Code/Module/Blocks.php:160
+#: ../../Code/Module/Menu.php:175
+#: ../../Code/Module/Settings/Oauth2.php:150
+#: ../../Code/Module/Settings/Oauth.php:150
+#: ../../Code/Module/Article_edit.php:99 ../../Code/Module/Wiki.php:202
+#: ../../Code/Module/Wiki.php:362 ../../Code/Module/Group.php:216
+#: ../../Code/Module/Thing.php:266 ../../Code/Storage/Browser.php:290
 msgid "Edit"
 msgstr "Изменить"
 
@@ -5536,16 +5536,16 @@ msgstr "Видно только одобренным контактам."
 msgid "Visible to specific connections."
 msgstr "Видно указанным контактам."
 
-#: ../../include/items.php:3566 ../../Zotlabs/Module/Viewsrc.php:25
-#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
-#: ../../Zotlabs/Module/Admin/Addons.php:259
-#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94
-#: ../../Zotlabs/Module/Display.php:46 ../../Zotlabs/Module/Display.php:453
+#: ../../include/items.php:3566 ../../Code/Module/Viewsrc.php:25
+#: ../../Code/Module/Filestorage.php:24 ../../Code/Module/Admin.php:62
+#: ../../Code/Module/Admin/Addons.php:259
+#: ../../Code/Module/Admin/Themes.php:72 ../../Code/Module/Thing.php:94
+#: ../../Code/Module/Display.php:46 ../../Code/Module/Display.php:453
 msgid "Item not found."
 msgstr "Элемент не найден."
 
-#: ../../include/items.php:4125 ../../Zotlabs/Module/Group.php:51
-#: ../../Zotlabs/Module/Group.php:181
+#: ../../include/items.php:4125 ../../Code/Module/Group.php:51
+#: ../../Code/Module/Group.php:181
 msgid "Privacy group not found."
 msgstr "Группа безопасности не найдена."
 
@@ -5558,7 +5558,7 @@ msgstr "Группа безопасности пуста"
 msgid "Privacy group: %s"
 msgstr "Группа безопасности: %s"
 
-#: ../../include/items.php:4158 ../../Zotlabs/Module/Connedit.php:850
+#: ../../include/items.php:4158 ../../Code/Module/Connedit.php:850
 #, php-format
 msgid "Connection: %s"
 msgstr "Контакт: %s"
@@ -5567,25 +5567,25 @@ msgstr "Контакт: %s"
 msgid "Connection not found."
 msgstr "Контакт не найден."
 
-#: ../../include/items.php:4502 ../../Zotlabs/Module/Cover_photo.php:269
+#: ../../include/items.php:4502 ../../Code/Module/Cover_photo.php:269
 msgid "female"
 msgstr "женщина"
 
-#: ../../include/items.php:4503 ../../Zotlabs/Module/Cover_photo.php:270
+#: ../../include/items.php:4503 ../../Code/Module/Cover_photo.php:270
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s обновила её %2$s"
 
-#: ../../include/items.php:4504 ../../Zotlabs/Module/Cover_photo.php:271
+#: ../../include/items.php:4504 ../../Code/Module/Cover_photo.php:271
 msgid "male"
 msgstr "мужчина"
 
-#: ../../include/items.php:4505 ../../Zotlabs/Module/Cover_photo.php:272
+#: ../../include/items.php:4505 ../../Code/Module/Cover_photo.php:272
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s обновил его %2$s"
 
-#: ../../include/items.php:4507 ../../Zotlabs/Module/Cover_photo.php:274
+#: ../../include/items.php:4507 ../../Code/Module/Cover_photo.php:274
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s обновили их %2$s"
@@ -5617,7 +5617,7 @@ msgstr[0] "доступно %d приглашение"
 msgstr[1] "доступны %d приглашения"
 msgstr[2] "доступны %d приглашений"
 
-#: ../../include/contact_widgets.php:16 ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../include/contact_widgets.php:16 ../../Code/Module/Admin/Site.php:313
 msgid "Advanced"
 msgstr "Дополнительно"
 
@@ -5638,14 +5638,14 @@ msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Примеры: Владимир Ильич, Революционер"
 
 #: ../../include/contact_widgets.php:23
-#: ../../Zotlabs/Module/Connections.php:338
-#: ../../Zotlabs/Module/Directory.php:401
-#: ../../Zotlabs/Module/Directory.php:406
+#: ../../Code/Module/Connections.php:338
+#: ../../Code/Module/Directory.php:401
+#: ../../Code/Module/Directory.php:406
 msgid "Find"
 msgstr "Поиск"
 
-#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Suggest.php:64
-#: ../../Zotlabs/Module/Directory.php:405
+#: ../../include/contact_widgets.php:24 ../../Code/Module/Suggest.php:64
+#: ../../Code/Module/Directory.php:405
 msgid "Channel Suggestions"
 msgstr "Рекомендации каналов"
 
@@ -5662,14 +5662,14 @@ msgid "Advanced example: name=fred and country=iceland"
 msgstr "Расширенный пример: name=ivan and country=russia"
 
 #: ../../include/contact_widgets.php:53 ../../include/features.php:488
-#: ../../Zotlabs/Widget/Filer.php:28
-#: ../../Zotlabs/Widget/Activity_filter.php:134
+#: ../../Code/Widget/Filer.php:28
+#: ../../Code/Widget/Activity_filter.php:134
 msgid "Saved Folders"
 msgstr "Сохранённые каталоги"
 
 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100
 #: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189
-#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
+#: ../../Code/Widget/Appcategories.php:46 ../../Code/Widget/Filer.php:31
 msgid "Everything"
 msgstr "Всё"
 
@@ -5703,12 +5703,12 @@ msgid "Nickname is required."
 msgstr "Требуется псевдоним."
 
 #: ../../include/channel.php:214 ../../include/channel.php:599
-#: ../../Zotlabs/Module/Changeaddr.php:46
+#: ../../Code/Module/Changeaddr.php:46
 msgid "Reserved nickname. Please choose another."
 msgstr "Зарезервированый псевдоним. Пожалуйста, выберите другой."
 
 #: ../../include/channel.php:219 ../../include/channel.php:604
-#: ../../Zotlabs/Module/Changeaddr.php:51
+#: ../../Code/Module/Changeaddr.php:51
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте."
@@ -5723,12 +5723,12 @@ msgstr "Профиль по умолчанию"
 
 #: ../../include/channel.php:437 ../../include/channel.php:438
 #: ../../include/channel.php:445 ../../include/selectors.php:123
-#: ../../Zotlabs/Widget/Affinity.php:24 ../../Zotlabs/Module/Connedit.php:711
-#: ../../Zotlabs/Module/Settings/Channel.php:68
-#: ../../Zotlabs/Module/Settings/Channel.php:72
-#: ../../Zotlabs/Module/Settings/Channel.php:73
-#: ../../Zotlabs/Module/Settings/Channel.php:76
-#: ../../Zotlabs/Module/Settings/Channel.php:87
+#: ../../Code/Widget/Affinity.php:24 ../../Code/Module/Connedit.php:711
+#: ../../Code/Module/Settings/Channel.php:68
+#: ../../Code/Module/Settings/Channel.php:72
+#: ../../Code/Module/Settings/Channel.php:73
+#: ../../Code/Module/Settings/Channel.php:76
+#: ../../Code/Module/Settings/Channel.php:87
 msgid "Friends"
 msgstr "Друзья"
 
@@ -5736,19 +5736,19 @@ msgstr "Друзья"
 msgid "Unable to retrieve modified identity"
 msgstr "Не удается найти изменённый идентификатор"
 
-#: ../../include/channel.php:1197 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Layouts.php:31
-#: ../../Zotlabs/Module/Filestorage.php:51
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Articles.php:29
-#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Cards.php:33
-#: ../../Zotlabs/Module/Profile.php:20
+#: ../../include/channel.php:1197 ../../Code/Module/Connect.php:17
+#: ../../Code/Module/Achievements.php:15 ../../Code/Module/Layouts.php:31
+#: ../../Code/Module/Filestorage.php:51
+#: ../../Code/Module/Editblock.php:31 ../../Code/Module/Webpages.php:33
+#: ../../Code/Module/Editwebpage.php:32
+#: ../../Code/Module/Editlayout.php:31 ../../Code/Module/Articles.php:29
+#: ../../Code/Module/Hcard.php:12 ../../Code/Module/Blocks.php:33
+#: ../../Code/Module/Menu.php:91 ../../Code/Module/Cards.php:33
+#: ../../Code/Module/Profile.php:20
 msgid "Requested profile is not available."
 msgstr "Запрашиваемый профиль не доступен."
 
-#: ../../include/channel.php:1289 ../../Zotlabs/Module/Profiles.php:728
+#: ../../include/channel.php:1289 ../../Code/Module/Profiles.php:728
 msgid "Change profile photo"
 msgstr "Изменить фотографию профиля"
 
@@ -5756,7 +5756,7 @@ msgstr "Изменить фотографию профиля"
 msgid "Create New Profile"
 msgstr "Создать новый профиль"
 
-#: ../../include/channel.php:1315 ../../Zotlabs/Module/Profiles.php:820
+#: ../../include/channel.php:1315 ../../Code/Module/Profiles.php:820
 msgid "Profile Image"
 msgstr "Изображение профиля"
 
@@ -5764,8 +5764,8 @@ msgstr "Изображение профиля"
 msgid "Visible to everybody"
 msgstr "Видно всем"
 
-#: ../../include/channel.php:1319 ../../Zotlabs/Module/Profiles.php:725
-#: ../../Zotlabs/Module/Profiles.php:824
+#: ../../include/channel.php:1319 ../../Code/Module/Profiles.php:725
+#: ../../Code/Module/Profiles.php:824
 msgid "Edit visibility"
 msgstr "Редактировать видимость"
 
@@ -5797,7 +5797,7 @@ msgstr "Среднего рода"
 msgid "Non-specific"
 msgstr "Неспецифический"
 
-#: ../../include/channel.php:1521 ../../Zotlabs/Module/Settings/Channel.php:522
+#: ../../include/channel.php:1521 ../../Code/Module/Settings/Channel.php:522
 msgid "Full Name:"
 msgstr "Полное имя:"
 
@@ -5817,7 +5817,7 @@ msgstr ""
 msgid "Birthday:"
 msgstr "День рождения:"
 
-#: ../../include/channel.php:1564 ../../Zotlabs/Module/Directory.php:319
+#: ../../include/channel.php:1564 ../../Code/Module/Directory.php:319
 msgid "Age:"
 msgstr "Возраст:"
 
@@ -5834,7 +5834,7 @@ msgstr "Теги:"
 msgid "Sexual Preference:"
 msgstr "Сексуальные предпочтения:"
 
-#: ../../include/channel.php:1593 ../../Zotlabs/Module/Directory.php:335
+#: ../../include/channel.php:1593 ../../Code/Module/Directory.php:335
 msgid "Hometown:"
 msgstr "Родной город:"
 
@@ -5846,7 +5846,7 @@ msgstr "Политические взгляды:"
 msgid "Religion:"
 msgstr "Религия:"
 
-#: ../../include/channel.php:1599 ../../Zotlabs/Module/Directory.php:337
+#: ../../include/channel.php:1599 ../../Code/Module/Directory.php:337
 msgid "About:"
 msgstr "О себе:"
 
@@ -5898,8 +5898,8 @@ msgstr "Работа / занятость:"
 msgid "School/education:"
 msgstr "Школа / образование:"
 
-#: ../../include/channel.php:1644 ../../Zotlabs/Lib/Apps.php:331
-#: ../../Zotlabs/Module/Profperm.php:113
+#: ../../include/channel.php:1644 ../../Code/Lib/Apps.php:331
+#: ../../Code/Module/Profperm.php:113
 msgid "Profile"
 msgstr "Профиль"
 
@@ -5907,24 +5907,24 @@ msgstr "Профиль"
 msgid "Like this thing"
 msgstr "нравится этo"
 
-#: ../../include/channel.php:1647 ../../Zotlabs/Module/Events.php:691
-#: ../../Zotlabs/Module/Cal.php:341
+#: ../../include/channel.php:1647 ../../Code/Module/Events.php:691
+#: ../../Code/Module/Cal.php:341
 msgid "Export"
 msgstr "Экспорт"
 
-#: ../../include/channel.php:2081 ../../Zotlabs/Module/Cover_photo.php:276
+#: ../../include/channel.php:2081 ../../Code/Module/Cover_photo.php:276
 msgid "cover photo"
 msgstr "фотография обложки"
 
-#: ../../include/channel.php:2335 ../../Zotlabs/Module/Rmagic.php:76
+#: ../../include/channel.php:2335 ../../Code/Module/Rmagic.php:76
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Введите адрес вашего канала (например: channel@example.com)"
 
-#: ../../include/channel.php:2336 ../../Zotlabs/Module/Rmagic.php:77
+#: ../../include/channel.php:2336 ../../Code/Module/Rmagic.php:77
 msgid "Authenticate"
 msgstr "Проверка подлинности"
 
-#: ../../include/channel.php:2490 ../../Zotlabs/Module/Admin/Accounts.php:91
+#: ../../include/channel.php:2490 ../../Code/Module/Admin/Accounts.php:91
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Аккаунт '%s' удален"
@@ -5933,7 +5933,7 @@ msgstr "Аккаунт '%s' удален"
 msgid "General Features"
 msgstr "Главные функции"
 
-#: ../../include/features.php:60 ../../Zotlabs/Widget/Newmember.php:62
+#: ../../include/features.php:60 ../../Code/Widget/Newmember.php:62
 msgid "New Member Links"
 msgstr "Ссылки для новичков"
 
@@ -6069,8 +6069,8 @@ msgstr "Несколько профилей"
 msgid "Ability to create multiple profiles"
 msgstr "Возможность создания нескольких профилей"
 
-#: ../../include/features.php:240 ../../Zotlabs/Widget/Settings_menu.php:108
-#: ../../Zotlabs/Module/Settings/Permcats.php:99
+#: ../../include/features.php:240 ../../Code/Widget/Settings_menu.php:108
+#: ../../Code/Module/Settings/Permcats.php:99
 msgid "Permission Categories"
 msgstr "Категории разрешений"
 
@@ -6116,8 +6116,8 @@ msgid ""
 "(640px) photo thumbnails"
 msgstr "Включить большие (1024px) миниатюры изображений в публикациях. Если не включено, использовать маленькие (640px) миниатюры."
 
-#: ../../include/features.php:292 ../../Zotlabs/Widget/Settings_menu.php:133
-#: ../../Zotlabs/Module/Sources.php:99
+#: ../../include/features.php:292 ../../Code/Widget/Settings_menu.php:133
+#: ../../Code/Module/Sources.php:99
 msgid "Channel Sources"
 msgstr "Источники канала"
 
@@ -6198,7 +6198,7 @@ msgstr "Поиск по дате"
 msgid "Ability to select posts by date ranges"
 msgstr "Возможность выбора сообщений по диапазонам дат"
 
-#: ../../include/features.php:381 ../../Zotlabs/Widget/Savedsearch.php:83
+#: ../../include/features.php:381 ../../Code/Widget/Savedsearch.php:83
 msgid "Saved Searches"
 msgstr "Сохранённые поиски"
 
@@ -6248,7 +6248,7 @@ msgstr "Инструмент сходства / соответствия"
 msgid "Filter stream activity by depth of relationships"
 msgstr "Фильтровать потоки активности по глубине отношений"
 
-#: ../../include/features.php:435 ../../Zotlabs/Lib/Apps.php:304
+#: ../../include/features.php:435 ../../Code/Lib/Apps.php:304
 msgid "Suggest Channels"
 msgstr "Предлагаемые каналы"
 
@@ -6572,12 +6572,12 @@ msgstr "Спроси меня"
 msgid "Delete this item?"
 msgstr "Удалить этот элемент?"
 
-#: ../../include/js_strings.php:6 ../../Zotlabs/Lib/ThreadItem.php:756
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244
+#: ../../include/js_strings.php:6 ../../Code/Lib/ThreadItem.php:756
+#: ../../Code/Module/Photos.php:1126 ../../Code/Module/Photos.php:1244
 msgid "Comment"
 msgstr "Комментарий"
 
-#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:463
+#: ../../include/js_strings.php:7 ../../Code/Lib/ThreadItem.php:463
 #, php-format
 msgid "%s show all"
 msgstr "%s показать всё"
@@ -6633,8 +6633,8 @@ msgstr "Здесь нет ничего нового"
 msgid "Rate This Channel (this is public)"
 msgstr "Оценкa этoго канала (общедоступно)"
 
-#: ../../include/js_strings.php:20 ../../Zotlabs/Module/Connedit.php:870
-#: ../../Zotlabs/Module/Rate.php:155
+#: ../../include/js_strings.php:20 ../../Code/Module/Connedit.php:870
+#: ../../Code/Module/Rate.php:155
 msgid "Rating"
 msgstr "Оценка"
 
@@ -6650,10 +6650,10 @@ msgstr "Пожалуйста, введите URL ссылки"
 msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr "Есть несохраненные изменения. Вы уверены, что хотите покинуть эту страницу?"
 
-#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Cdav.php:872
-#: ../../Zotlabs/Module/Pubsites.php:52 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Profiles.php:509
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../include/js_strings.php:25 ../../Code/Module/Cdav.php:872
+#: ../../Code/Module/Pubsites.php:52 ../../Code/Module/Events.php:475
+#: ../../Code/Module/Locs.php:117 ../../Code/Module/Profiles.php:509
+#: ../../Code/Module/Profiles.php:734
 msgid "Location"
 msgstr "Место"
 
@@ -6908,8 +6908,8 @@ msgstr "Файл превышает предельный размер для с
 msgid "Image file is empty."
 msgstr "Файл изображения пуст."
 
-#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:225
-#: ../../Zotlabs/Module/Cover_photo.php:205
+#: ../../include/photos.php:196 ../../Code/Module/Profile_photo.php:225
+#: ../../Code/Module/Cover_photo.php:205
 msgid "Unable to process image"
 msgstr "Не удается обработать изображение"
 
@@ -6927,8 +6927,8 @@ msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr "%1$s опубликовал %2$s в %3$s"
 
-#: ../../include/photos.php:668 ../../Zotlabs/Module/Photos.php:1370
-#: ../../Zotlabs/Module/Photos.php:1383 ../../Zotlabs/Module/Photos.php:1384
+#: ../../include/photos.php:668 ../../Code/Module/Photos.php:1370
+#: ../../Code/Module/Photos.php:1383 ../../Code/Module/Photos.php:1384
 msgid "Recent Photos"
 msgstr "Последние фотографии"
 
@@ -6944,153 +6944,153 @@ msgstr "Новое окно"
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Открыть выбранное местоположение в другом окне или вкладке браузера"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:151
+#: ../../Code/Lib/NativeWiki.php:151
 msgid "Wiki updated successfully"
 msgstr "Wiki успешно обновлена"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:205
+#: ../../Code/Lib/NativeWiki.php:205
 msgid "Wiki files deleted successfully"
 msgstr "Wiki успешно удалена"
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Code/Lib/Techlevels.php:10
 msgid "0. Beginner/Basic"
 msgstr "Начинающий / Базовый"
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Code/Lib/Techlevels.php:11
 msgid "1. Novice - not skilled but willing to learn"
 msgstr "1. Новичок - не опытный, но желающий учиться"
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Code/Lib/Techlevels.php:12
 msgid "2. Intermediate - somewhat comfortable"
 msgstr "2. Промежуточный - более удобный"
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Code/Lib/Techlevels.php:13
 msgid "3. Advanced - very comfortable"
 msgstr "3. Продвинутый - очень удобный"
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Code/Lib/Techlevels.php:14
 msgid "4. Expert - I can write computer code"
 msgstr "4. Эксперт - я умею программировать"
 
-#: ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Code/Lib/Techlevels.php:15
 msgid "5. Wizard - I probably know more than you do"
 msgstr "5. Волшебник - возможно я знаю больше чем ты"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Code/Lib/PermissionDescription.php:108
 msgid "Public"
 msgstr "Общедоступно"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#: ../../Code/Lib/PermissionDescription.php:109
 msgid "Anybody in the $Projectname network"
 msgstr "Любому в сети $Projectname"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#: ../../Code/Lib/PermissionDescription.php:110
 #, php-format
 msgid "Any account on %s"
 msgstr "Любой аккаунт в %s"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
+#: ../../Code/Lib/PermissionDescription.php:111
 msgid "Any of my connections"
 msgstr "Любой из моих контактов"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
+#: ../../Code/Lib/PermissionDescription.php:112
 msgid "Only connections I specifically allow"
 msgstr "Только те контакты, кому я дам разрешение"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
+#: ../../Code/Lib/PermissionDescription.php:113
 msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr "Любой аутентифицированный (может включать посетителей их других сетей)"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
+#: ../../Code/Lib/PermissionDescription.php:114
 msgid "Any connections including those who haven't yet been approved"
 msgstr "Любые контакты включая те, которые вы ещё не одобрили"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
+#: ../../Code/Lib/PermissionDescription.php:150
 msgid ""
 "This is your default setting for the audience of your normal stream, and "
 "posts."
 msgstr "Это настройка по умолчанию для аудитории ваших обычных потоков и публикаций"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
+#: ../../Code/Lib/PermissionDescription.php:151
 msgid ""
 "This is your default setting for who can view your default channel profile"
 msgstr "Это настройка по умолчанию для тех, кто может просматривать профиль вашего основного канала"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
+#: ../../Code/Lib/PermissionDescription.php:152
 msgid "This is your default setting for who can view your connections"
 msgstr "Это настройка по умолчанию для тех, кто может просматривать ваши контакты"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
+#: ../../Code/Lib/PermissionDescription.php:153
 msgid ""
 "This is your default setting for who can view your file storage and photos"
 msgstr "Это настройка по умолчанию для тех, кто может просматривать ваше хранилище файлов и фотографий"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
+#: ../../Code/Lib/PermissionDescription.php:154
 msgid "This is your default setting for the audience of your webpages"
 msgstr "Это настройка по умолчанию для аудитории ваших веб-страниц"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:152 ../../Zotlabs/Storage/Browser.php:280
+#: ../../Code/Lib/ThreadItem.php:152 ../../Code/Storage/Browser.php:280
 msgid "Admin Delete"
 msgstr "Удалено администратором"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:162 ../../Zotlabs/Module/Filer.php:54
+#: ../../Code/Lib/ThreadItem.php:162 ../../Code/Module/Filer.php:54
 msgid "Save to Folder"
 msgstr "Сохранить в каталог"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Code/Lib/ThreadItem.php:183
 msgid "I will attend"
 msgstr "Я буду присутствовать"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Code/Lib/ThreadItem.php:183
 msgid "I will not attend"
 msgstr "Я не буду присутствовать"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:183
+#: ../../Code/Lib/ThreadItem.php:183
 msgid "I might attend"
 msgstr "Я возможно буду присутствовать"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Lib/ThreadItem.php:193
 msgid "I agree"
 msgstr "Я согласен"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Lib/ThreadItem.php:193
 msgid "I disagree"
 msgstr "Я не согласен"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../Code/Lib/ThreadItem.php:193
 msgid "I abstain"
 msgstr "Я воздержался"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224
-#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173
+#: ../../Code/Lib/ThreadItem.php:212 ../../Code/Lib/ThreadItem.php:224
+#: ../../Code/Module/Photos.php:1161 ../../Code/Module/Photos.php:1173
 msgid "View all"
 msgstr "Просмотреть все"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:267
+#: ../../Code/Lib/ThreadItem.php:267
 msgid "Add Tag"
 msgstr "Добавить тег"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../Zotlabs/Module/Photos.php:1105
+#: ../../Code/Lib/ThreadItem.php:285 ../../Code/Module/Photos.php:1105
 msgid "I like this (toggle)"
 msgstr "мне это нравится (переключение)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../Zotlabs/Module/Photos.php:1106
+#: ../../Code/Lib/ThreadItem.php:286 ../../Code/Module/Photos.php:1106
 msgid "I don't like this (toggle)"
 msgstr "мне это не нравится (переключение)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290
+#: ../../Code/Lib/ThreadItem.php:290
 msgid "Share This"
 msgstr "Поделиться этим"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290
+#: ../../Code/Lib/ThreadItem.php:290
 msgid "share"
 msgstr "поделиться"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:299
+#: ../../Code/Lib/ThreadItem.php:299
 msgid "Delivery Report"
 msgstr "Отчёт о доставке"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:317
+#: ../../Code/Lib/ThreadItem.php:317
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -7098,1860 +7098,1860 @@ msgstr[0] "%d комментарий"
 msgstr[1] "%d комментария"
 msgstr[2] "%d комментариев"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../Code/Lib/ThreadItem.php:347 ../../Code/Lib/ThreadItem.php:348
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Просмотр %s профиля - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:351
+#: ../../Code/Lib/ThreadItem.php:351
 msgid "to"
 msgstr "к"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:352
+#: ../../Code/Lib/ThreadItem.php:352
 msgid "via"
 msgstr "через"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353
+#: ../../Code/Lib/ThreadItem.php:353
 msgid "Wall-to-Wall"
 msgstr "Стена-к-Стене"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354
+#: ../../Code/Lib/ThreadItem.php:354
 msgid "via Wall-To-Wall:"
 msgstr "через Стена-к-Стене:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:379
+#: ../../Code/Lib/ThreadItem.php:379
 msgid "Attend"
 msgstr "Посетить"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:380
+#: ../../Code/Lib/ThreadItem.php:380
 msgid "Attendance Options"
 msgstr "Параметры посещаемости"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:381
+#: ../../Code/Lib/ThreadItem.php:381
 msgid "Vote"
 msgstr "Голосовать"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:382
+#: ../../Code/Lib/ThreadItem.php:382
 msgid "Voting Options"
 msgstr "Параметры голосования"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:404
+#: ../../Code/Lib/ThreadItem.php:404
 msgid "Add to Calendar"
 msgstr "Добавить в календарь"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:413
-#: ../../Zotlabs/Module/Notifications.php:60
+#: ../../Code/Lib/ThreadItem.php:413
+#: ../../Code/Module/Notifications.php:60
 msgid "Mark all seen"
 msgstr "Отметить как просмотренное"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:420 ../../Zotlabs/Module/Photos.php:1292
+#: ../../Code/Lib/ThreadItem.php:420 ../../Code/Module/Photos.php:1292
 msgctxt "noun"
 msgid "Likes"
 msgstr "Нравится"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:421 ../../Zotlabs/Module/Photos.php:1293
+#: ../../Code/Lib/ThreadItem.php:421 ../../Code/Module/Photos.php:1293
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Не нравится"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../Zotlabs/Module/Photos.php:1124
-#: ../../Zotlabs/Module/Photos.php:1242
+#: ../../Code/Lib/ThreadItem.php:754 ../../Code/Module/Photos.php:1124
+#: ../../Code/Module/Photos.php:1242
 msgid "This is you"
 msgstr "Это вы"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:763
+#: ../../Code/Lib/ThreadItem.php:763
 msgid "Image"
 msgstr "Изображение"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:765
+#: ../../Code/Lib/ThreadItem.php:765
 msgid "Insert Link"
 msgstr "Вставить ссылку"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:766
+#: ../../Code/Lib/ThreadItem.php:766
 msgid "Video"
 msgstr "Видео"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:776
+#: ../../Code/Lib/ThreadItem.php:776
 msgid "Your full name (required)"
 msgstr "Ваше полное имя (требуется)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:777
+#: ../../Code/Lib/ThreadItem.php:777
 msgid "Your email address (required)"
 msgstr "Ваш адрес электронной почты (требуется)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:778
+#: ../../Code/Lib/ThreadItem.php:778
 msgid "Your website URL (optional)"
 msgstr "URL вашего вебсайта (необязательно)"
 
-#: ../../Zotlabs/Lib/Apps.php:295 ../../Zotlabs/Module/Apps.php:50
+#: ../../Code/Lib/Apps.php:295 ../../Code/Module/Apps.php:50
 msgid "Apps"
 msgstr "Приложения"
 
-#: ../../Zotlabs/Lib/Apps.php:298
+#: ../../Code/Lib/Apps.php:298
 msgid "Site Admin"
 msgstr "Администратор сайта"
 
-#: ../../Zotlabs/Lib/Apps.php:300
+#: ../../Code/Lib/Apps.php:300
 msgid "View Bookmarks"
 msgstr "Просмотреть закадки"
 
-#: ../../Zotlabs/Lib/Apps.php:301
+#: ../../Code/Lib/Apps.php:301
 msgid "My Chatrooms"
 msgstr "Мои чаты"
 
-#: ../../Zotlabs/Lib/Apps.php:303
+#: ../../Code/Lib/Apps.php:303
 msgid "Remote Diagnostics"
 msgstr "Удалённая диагностика"
 
-#: ../../Zotlabs/Lib/Apps.php:307
+#: ../../Code/Lib/Apps.php:307
 msgid "Activity"
 msgstr "Активность"
 
-#: ../../Zotlabs/Lib/Apps.php:312
+#: ../../Code/Lib/Apps.php:312
 msgid "Channel Home"
 msgstr "Главная канала"
 
-#: ../../Zotlabs/Lib/Apps.php:316
+#: ../../Code/Lib/Apps.php:316
 msgid "Directory"
 msgstr "Каталог"
 
-#: ../../Zotlabs/Lib/Apps.php:318
+#: ../../Code/Lib/Apps.php:318
 msgid "Mail"
 msgstr "Переписка"
 
-#: ../../Zotlabs/Lib/Apps.php:319 ../../Zotlabs/Module/Mood.php:135
+#: ../../Code/Lib/Apps.php:319 ../../Code/Module/Mood.php:135
 msgid "Mood"
 msgstr "Настроение"
 
-#: ../../Zotlabs/Lib/Apps.php:321
+#: ../../Code/Lib/Apps.php:321
 msgid "Chat"
 msgstr "Чат"
 
-#: ../../Zotlabs/Lib/Apps.php:323
+#: ../../Code/Lib/Apps.php:323
 msgid "Probe"
 msgstr "Проба"
 
-#: ../../Zotlabs/Lib/Apps.php:324
+#: ../../Code/Lib/Apps.php:324
 msgid "Suggest"
 msgstr "Предложить"
 
-#: ../../Zotlabs/Lib/Apps.php:325
+#: ../../Code/Lib/Apps.php:325
 msgid "Random Channel"
 msgstr "Случайный канал"
 
-#: ../../Zotlabs/Lib/Apps.php:326
+#: ../../Code/Lib/Apps.php:326
 msgid "Invite"
 msgstr "Пригласить"
 
-#: ../../Zotlabs/Lib/Apps.php:327 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Code/Lib/Apps.php:327 ../../Code/Widget/Admin.php:26
 msgid "Features"
 msgstr "Функции"
 
-#: ../../Zotlabs/Lib/Apps.php:329
+#: ../../Code/Lib/Apps.php:329
 msgid "Post"
 msgstr "Публикация"
 
-#: ../../Zotlabs/Lib/Apps.php:332
+#: ../../Code/Lib/Apps.php:332
 msgid "Profiles"
 msgstr "Редактировать профиль"
 
-#: ../../Zotlabs/Lib/Apps.php:334
+#: ../../Code/Lib/Apps.php:334
 msgid "Notifications"
 msgstr "Оповещения"
 
-#: ../../Zotlabs/Lib/Apps.php:335
+#: ../../Code/Lib/Apps.php:335
 msgid "Order Apps"
 msgstr "Порядок приложений"
 
-#: ../../Zotlabs/Lib/Apps.php:480 ../../Zotlabs/Module/Cdav.php:1186
-#: ../../Zotlabs/Module/Connedit.php:922
-#: ../../Zotlabs/Module/Admin/Addons.php:453
-#: ../../Zotlabs/Module/Settings/Oauth2.php:40
-#: ../../Zotlabs/Module/Settings/Oauth2.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:43
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Profiles.php:799
+#: ../../Code/Lib/Apps.php:480 ../../Code/Module/Cdav.php:1186
+#: ../../Code/Module/Connedit.php:922
+#: ../../Code/Module/Admin/Addons.php:453
+#: ../../Code/Module/Settings/Oauth2.php:40
+#: ../../Code/Module/Settings/Oauth2.php:113
+#: ../../Code/Module/Settings/Oauth.php:43
+#: ../../Code/Module/Settings/Oauth.php:114
+#: ../../Code/Module/Profiles.php:799
 msgid "Update"
 msgstr "Обновить"
 
-#: ../../Zotlabs/Lib/Apps.php:480 ../../Zotlabs/Module/Admin/Addons.php:422
+#: ../../Code/Lib/Apps.php:480 ../../Code/Module/Admin/Addons.php:422
 msgid "Install"
 msgstr "Установить"
 
-#: ../../Zotlabs/Lib/Apps.php:497
+#: ../../Code/Lib/Apps.php:497
 msgid "Purchase"
 msgstr "Купить"
 
-#: ../../Zotlabs/Lib/Apps.php:501
+#: ../../Code/Lib/Apps.php:501
 msgid "Undelete"
 msgstr "Восстановить"
 
-#: ../../Zotlabs/Lib/Apps.php:509
+#: ../../Code/Lib/Apps.php:509
 msgid "Add to app-tray"
 msgstr "Добавить в app-tray"
 
-#: ../../Zotlabs/Lib/Apps.php:510
+#: ../../Code/Lib/Apps.php:510
 msgid "Remove from app-tray"
 msgstr "Удалить из app-tray"
 
-#: ../../Zotlabs/Lib/Apps.php:511
+#: ../../Code/Lib/Apps.php:511
 msgid "Pin to navbar"
 msgstr "Добавить на панель навигации"
 
-#: ../../Zotlabs/Lib/Apps.php:512
+#: ../../Code/Lib/Apps.php:512
 msgid "Unpin from navbar"
 msgstr "Удалить с панели навигации"
 
-#: ../../Zotlabs/Lib/Enotify.php:60
+#: ../../Code/Lib/Enotify.php:60
 msgid "$Projectname Notification"
 msgstr "Оповещение $Projectname "
 
-#: ../../Zotlabs/Lib/Enotify.php:63
+#: ../../Code/Lib/Enotify.php:63
 msgid "Thank You,"
 msgstr "Спасибо,"
 
-#: ../../Zotlabs/Lib/Enotify.php:66
+#: ../../Code/Lib/Enotify.php:66
 #, php-format
 msgid "This email was sent by %1$s at %2$s."
 msgstr "Это письмо было отправлено %1$s на %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:67
+#: ../../Code/Lib/Enotify.php:67
 #, php-format
 msgid ""
 "To stop receiving these messages, please adjust your Notification Settings "
 "at %s"
 msgstr "Чтобы прекратить получать эти сообщения, настройте параметры уведомлений в %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Code/Lib/Enotify.php:68
 #, php-format
 msgid "To stop receiving these messages, please adjust your %s."
 msgstr "Чтобы прекратить получать эти сообщения, пожалуйста измените %s."
 
-#: ../../Zotlabs/Lib/Enotify.php:68
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Code/Lib/Enotify.php:68
+#: ../../Code/Module/Settings/Channel.php:570
 msgid "Notification Settings"
 msgstr "Настройки уведомлений"
 
-#: ../../Zotlabs/Lib/Enotify.php:123
+#: ../../Code/Lib/Enotify.php:123
 #, php-format
 msgid "%s "
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Code/Lib/Enotify.php:127
 #, php-format
 msgid "[$Projectname:Notify] New mail received at %s"
 msgstr "[$Projectname:Notify] Получено новое сообщение в %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:129
+#: ../../Code/Lib/Enotify.php:129
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s отправил вам новое личное сообщение в %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s отправил вам %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Code/Lib/Enotify.php:130
 msgid "a private message"
 msgstr "личное сообщение"
 
-#: ../../Zotlabs/Lib/Enotify.php:131
+#: ../../Code/Lib/Enotify.php:131
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Пожалуйста, посетите %s для просмотра и/или ответа на ваши личные сообщения."
 
-#: ../../Zotlabs/Lib/Enotify.php:144
+#: ../../Code/Lib/Enotify.php:144
 msgid "commented on"
 msgstr "прокомментировал"
 
-#: ../../Zotlabs/Lib/Enotify.php:155
+#: ../../Code/Lib/Enotify.php:155
 msgid "liked"
 msgstr "понравилось"
 
-#: ../../Zotlabs/Lib/Enotify.php:158
+#: ../../Code/Lib/Enotify.php:158
 msgid "disliked"
 msgstr "не понравилось"
 
-#: ../../Zotlabs/Lib/Enotify.php:201
+#: ../../Code/Lib/Enotify.php:201
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:209
+#: ../../Code/Lib/Enotify.php:209
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]%5$s %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:218
+#: ../../Code/Lib/Enotify.php:218
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]ваш %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:230
+#: ../../Code/Lib/Enotify.php:230
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Отмодерирован комментарий к беседе #%1$d по %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../Code/Lib/Enotify.php:232
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Комментарий к беседе #%1$d по %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:233
+#: ../../Code/Lib/Enotify.php:233
 #, php-format
 msgid "%1$s commented on an item/conversation you have been following."
 msgstr "%1$s прокомментировал тему / беседу за которым вы следите."
 
-#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317
-#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358
-#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Code/Lib/Enotify.php:236 ../../Code/Lib/Enotify.php:317
+#: ../../Code/Lib/Enotify.php:333 ../../Code/Lib/Enotify.php:358
+#: ../../Code/Lib/Enotify.php:375 ../../Code/Lib/Enotify.php:388
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Пожалуйста, посетите %s для просмотра и / или ответа в беседе."
 
-#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241
+#: ../../Code/Lib/Enotify.php:240 ../../Code/Lib/Enotify.php:241
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Пожалуйста посетитет %s для одобрения и отклонения комментария."
 
-#: ../../Zotlabs/Lib/Enotify.php:299
+#: ../../Code/Lib/Enotify.php:299
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr "%1$s понравился [zrl=%2$s]ваш %3$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:313
+#: ../../Code/Lib/Enotify.php:313
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Notify] Беседа получила отметку \"нравится\" #%1$d от %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:314
+#: ../../Code/Lib/Enotify.php:314
 #, php-format
 msgid "%1$s liked an item/conversation you created."
 msgstr "%1$s нравится тема / беседа которую вы создали."
 
-#: ../../Zotlabs/Lib/Enotify.php:325
+#: ../../Code/Lib/Enotify.php:325
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr "[$Projectname:Notify] %s сделал публикацию на стене вашего профиля"
 
-#: ../../Zotlabs/Lib/Enotify.php:327
+#: ../../Code/Lib/Enotify.php:327
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s сделал публикацию на стене вашего профиля в %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:329
+#: ../../Code/Lib/Enotify.php:329
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$s опубликовал на [zrl=%2$s]вашей стене[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:352
+#: ../../Code/Lib/Enotify.php:352
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Notify] %s отметил вас"
 
-#: ../../Zotlabs/Lib/Enotify.php:353
+#: ../../Code/Lib/Enotify.php:353
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s отметил вас в %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:354
+#: ../../Code/Lib/Enotify.php:354
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s [zrl=%2$s]отметил вас[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:365
+#: ../../Code/Lib/Enotify.php:365
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Notify] %1$s ткнул вас"
 
-#: ../../Zotlabs/Lib/Enotify.php:366
+#: ../../Code/Lib/Enotify.php:366
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s ткнул вас в %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:367
+#: ../../Code/Lib/Enotify.php:367
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s]ткнул вас[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:382
+#: ../../Code/Lib/Enotify.php:382
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Notify] %s отметил вашу публикацию"
 
-#: ../../Zotlabs/Lib/Enotify.php:383
+#: ../../Code/Lib/Enotify.php:383
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s отметил вашу публикацию на %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:384
+#: ../../Code/Lib/Enotify.php:384
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s отметил [zrl=%2$s]вашу публикацию[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:395
+#: ../../Code/Lib/Enotify.php:395
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Notify] Получено приглашение"
 
-#: ../../Zotlabs/Lib/Enotify.php:396
+#: ../../Code/Lib/Enotify.php:396
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr "Вы получили новый запрос контакта от '%1$s' в %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:397
+#: ../../Code/Lib/Enotify.php:397
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr "Вы получили [zrl=%1$s]новый запрос контакта[/zrl] от %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418
+#: ../../Code/Lib/Enotify.php:400 ../../Code/Lib/Enotify.php:418
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Вы можете увидеть его профиль по ссылке %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Code/Lib/Enotify.php:402
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить запрос контакта."
 
-#: ../../Zotlabs/Lib/Enotify.php:409
+#: ../../Code/Lib/Enotify.php:409
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Notify] Получено предложение дружить"
 
-#: ../../Zotlabs/Lib/Enotify.php:410
+#: ../../Code/Lib/Enotify.php:410
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Вы получили предложение дружить от '%1$s' в %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:411
+#: ../../Code/Lib/Enotify.php:411
 #, php-format
 msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr "Вы получили [zrl=%1$s]предложение дружить[/zrl] для %2$s от %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Code/Lib/Enotify.php:416
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Code/Lib/Enotify.php:417
 msgid "Photo:"
 msgstr "Фото:"
 
-#: ../../Zotlabs/Lib/Enotify.php:420
+#: ../../Code/Lib/Enotify.php:420
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить предложение."
 
-#: ../../Zotlabs/Lib/Enotify.php:640
+#: ../../Code/Lib/Enotify.php:640
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Уведомление]"
 
-#: ../../Zotlabs/Lib/Enotify.php:808
+#: ../../Code/Lib/Enotify.php:808
 msgid "created a new post"
 msgstr "создал новую публикацию"
 
-#: ../../Zotlabs/Lib/Enotify.php:809
+#: ../../Code/Lib/Enotify.php:809
 #, php-format
 msgid "commented on %s's post"
 msgstr "прокомментировал публикацию %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:816
+#: ../../Code/Lib/Enotify.php:816
 #, php-format
 msgid "edited a post dated %s"
 msgstr "отредактировал публикацию датированную %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Code/Lib/Enotify.php:820
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "отредактировал комментарий датированный %s"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:93
+#: ../../Code/Lib/NativeWikiPage.php:42
+#: ../../Code/Lib/NativeWikiPage.php:93
 msgid "(No Title)"
 msgstr "(нет заголовка)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:107
+#: ../../Code/Lib/NativeWikiPage.php:107
 msgid "Wiki page create failed."
 msgstr "Не удалось создать страницу Wiki."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:120
+#: ../../Code/Lib/NativeWikiPage.php:120
 msgid "Wiki not found."
 msgstr "Wiki не найдена."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:131
+#: ../../Code/Lib/NativeWikiPage.php:131
 msgid "Destination name already exists"
 msgstr "Имя назначения уже существует"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:163
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Code/Lib/NativeWikiPage.php:163
+#: ../../Code/Lib/NativeWikiPage.php:359
 msgid "Page not found"
 msgstr "Страница не найдена."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:194
+#: ../../Code/Lib/NativeWikiPage.php:194
 msgid "Error reading page content"
 msgstr "Ошибка чтения содержимого страницы"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:350
-#: ../../Zotlabs/Lib/NativeWikiPage.php:400
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Code/Lib/NativeWikiPage.php:350
+#: ../../Code/Lib/NativeWikiPage.php:400
+#: ../../Code/Lib/NativeWikiPage.php:467
+#: ../../Code/Lib/NativeWikiPage.php:508
 msgid "Error reading wiki"
 msgstr "Ошибка чтения Wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:388
+#: ../../Code/Lib/NativeWikiPage.php:388
 msgid "Page update failed."
 msgstr "Не удалось обновить страницу."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:422
+#: ../../Code/Lib/NativeWikiPage.php:422
 msgid "Nothing deleted"
 msgstr "Ничего не удалено"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:488
+#: ../../Code/Lib/NativeWikiPage.php:488
 msgid "Compare: object not found."
 msgstr "Сравнение: объект не найден."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:494
+#: ../../Code/Lib/NativeWikiPage.php:494
 msgid "Page updated"
 msgstr "Страница обновлена"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
+#: ../../Code/Lib/NativeWikiPage.php:497
 msgid "Untitled"
 msgstr "Не озаглавлено"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:503
+#: ../../Code/Lib/NativeWikiPage.php:503
 msgid "Wiki resource_id required for git commit"
 msgstr "Требуется resource_id Wiki для отправки в Git"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:559
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+#: ../../Code/Lib/NativeWikiPage.php:559
+#: ../../Code/Widget/Wiki_page_history.php:23
 msgctxt "wiki_history"
 msgid "Message"
 msgstr "Сообщение"
 
-#: ../../Zotlabs/Lib/Permcat.php:82
+#: ../../Code/Lib/Permcat.php:82
 msgctxt "permcat"
 msgid "default"
 msgstr "по умолчанию"
 
-#: ../../Zotlabs/Lib/Permcat.php:133
+#: ../../Code/Lib/Permcat.php:133
 msgctxt "permcat"
 msgid "follower"
 msgstr "поклонник"
 
-#: ../../Zotlabs/Lib/Permcat.php:137
+#: ../../Code/Lib/Permcat.php:137
 msgctxt "permcat"
 msgid "contributor"
 msgstr "участник"
 
-#: ../../Zotlabs/Lib/Permcat.php:141
+#: ../../Code/Lib/Permcat.php:141
 msgctxt "permcat"
 msgid "publisher"
 msgstr "издатель"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:83
+#: ../../Code/Lib/DB_Upgrade.php:83
 #, php-format
 msgid "Update Error at %s"
 msgstr "Ошибка обновления на %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:89
+#: ../../Code/Lib/DB_Upgrade.php:89
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Выполнение %s неудачно. Проверьте системный журнал."
 
-#: ../../Zotlabs/Lib/Chatroom.php:23
+#: ../../Code/Lib/Chatroom.php:23
 msgid "Missing room name"
 msgstr "Отсутствует название комнаты"
 
-#: ../../Zotlabs/Lib/Chatroom.php:32
+#: ../../Code/Lib/Chatroom.php:32
 msgid "Duplicate room name"
 msgstr "Название комнаты дублируется"
 
-#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90
+#: ../../Code/Lib/Chatroom.php:82 ../../Code/Lib/Chatroom.php:90
 msgid "Invalid room specifier."
 msgstr "Неверный указатель комнаты."
 
-#: ../../Zotlabs/Lib/Chatroom.php:122
+#: ../../Code/Lib/Chatroom.php:122
 msgid "Room not found."
 msgstr "Комната не найдена."
 
-#: ../../Zotlabs/Lib/Chatroom.php:143
+#: ../../Code/Lib/Chatroom.php:143
 msgid "Room is full"
 msgstr "Комната переполнена"
 
-#: ../../Zotlabs/Widget/Activity_order.php:89
+#: ../../Code/Widget/Activity_order.php:89
 msgid "Commented Date"
 msgstr "По комментариям"
 
-#: ../../Zotlabs/Widget/Activity_order.php:93
+#: ../../Code/Widget/Activity_order.php:93
 msgid "Order by last commented date"
 msgstr "Сортировка по дате последнего комментария"
 
-#: ../../Zotlabs/Widget/Activity_order.php:96
+#: ../../Code/Widget/Activity_order.php:96
 msgid "Posted Date"
 msgstr "По публикациям"
 
-#: ../../Zotlabs/Widget/Activity_order.php:100
+#: ../../Code/Widget/Activity_order.php:100
 msgid "Order by last posted date"
 msgstr "Сортировка по дате последней публикации"
 
-#: ../../Zotlabs/Widget/Activity_order.php:103
+#: ../../Code/Widget/Activity_order.php:103
 msgid "Date Unthreaded"
 msgstr "По порядку"
 
-#: ../../Zotlabs/Widget/Activity_order.php:107
+#: ../../Code/Widget/Activity_order.php:107
 msgid "Order unthreaded by date"
 msgstr "Сортировка в порядке поступления"
 
-#: ../../Zotlabs/Widget/Activity_order.php:122
+#: ../../Code/Widget/Activity_order.php:122
 msgid "Activity Order"
 msgstr "Сортировка активности"
 
-#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:308
+#: ../../Code/Widget/Admin.php:22 ../../Code/Module/Admin/Site.php:308
 msgid "Site"
 msgstr "Сайт"
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Module/Admin.php:96
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
+#: ../../Code/Widget/Admin.php:23 ../../Code/Module/Admin.php:96
+#: ../../Code/Module/Admin/Accounts.php:167
+#: ../../Code/Module/Admin/Accounts.php:180
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+#: ../../Code/Widget/Admin.php:23 ../../Code/Widget/Admin.php:60
 msgid "Member registrations waiting for confirmation"
 msgstr "Регистрации участников, ожидающие подверждения"
 
-#: ../../Zotlabs/Widget/Admin.php:24 ../../Zotlabs/Module/Admin.php:114
-#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Code/Widget/Admin.php:24 ../../Code/Module/Admin.php:114
+#: ../../Code/Module/Admin/Channels.php:146
 msgid "Channels"
 msgstr "Каналы"
 
-#: ../../Zotlabs/Widget/Admin.php:25 ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Code/Widget/Admin.php:25 ../../Code/Module/Admin/Security.php:93
 msgid "Security"
 msgstr "Безопасность"
 
-#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Addons.php:342
-#: ../../Zotlabs/Module/Admin/Addons.php:437
+#: ../../Code/Widget/Admin.php:27 ../../Code/Module/Admin/Addons.php:342
+#: ../../Code/Module/Admin/Addons.php:437
 msgid "Addons"
 msgstr "Расширения"
 
-#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157
+#: ../../Code/Widget/Admin.php:28 ../../Code/Module/Admin/Themes.php:123
+#: ../../Code/Module/Admin/Themes.php:157
 msgid "Themes"
 msgstr "Темы"
 
-#: ../../Zotlabs/Widget/Admin.php:29
+#: ../../Code/Widget/Admin.php:29
 msgid "Inspect queue"
 msgstr "Просмотр очереди"
 
-#: ../../Zotlabs/Widget/Admin.php:30 ../../Zotlabs/Module/Admin/Profs.php:168
+#: ../../Code/Widget/Admin.php:30 ../../Code/Module/Admin/Profs.php:168
 msgid "Profile Fields"
 msgstr "Поля профиля"
 
-#: ../../Zotlabs/Widget/Admin.php:31
+#: ../../Code/Widget/Admin.php:31
 msgid "DB updates"
 msgstr "Обновление базы данных"
 
-#: ../../Zotlabs/Widget/Admin.php:48 ../../Zotlabs/Widget/Admin.php:58
-#: ../../Zotlabs/Module/Admin/Logs.php:83
+#: ../../Code/Widget/Admin.php:48 ../../Code/Widget/Admin.php:58
+#: ../../Code/Module/Admin/Logs.php:83
 msgid "Logs"
 msgstr "Журналы"
 
-#: ../../Zotlabs/Widget/Admin.php:56
+#: ../../Code/Widget/Admin.php:56
 msgid "Addon Features"
 msgstr "Настройки расширений"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
+#: ../../Code/Widget/Tasklist.php:23
 msgid "Tasks"
 msgstr "Задачи"
 
-#: ../../Zotlabs/Widget/Suggestions.php:46 ../../Zotlabs/Module/Suggest.php:58
+#: ../../Code/Widget/Suggestions.php:46 ../../Code/Module/Suggest.php:58
 msgid "Ignore/Hide"
 msgstr "Игнорировать / cкрыть"
 
-#: ../../Zotlabs/Widget/Suggestions.php:51
+#: ../../Code/Widget/Suggestions.php:51
 msgid "Suggestions"
 msgstr "Рекомендации"
 
-#: ../../Zotlabs/Widget/Suggestions.php:52
+#: ../../Code/Widget/Suggestions.php:52
 msgid "See more..."
 msgstr "Просмотреть больше..."
 
-#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Code/Widget/Conversations.php:17
 msgid "Received Messages"
 msgstr "Полученные сообщения"
 
-#: ../../Zotlabs/Widget/Conversations.php:21
+#: ../../Code/Widget/Conversations.php:21
 msgid "Sent Messages"
 msgstr "Отправленные сообщения"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Code/Widget/Conversations.php:25
 msgid "Conversations"
 msgstr "Беседы"
 
-#: ../../Zotlabs/Widget/Conversations.php:37
+#: ../../Code/Widget/Conversations.php:37
 msgid "No messages."
 msgstr "Сообщений нет."
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Code/Widget/Conversations.php:57
 msgid "Delete conversation"
 msgstr "Удалить беседу"
 
-#: ../../Zotlabs/Widget/Cdav.php:37
+#: ../../Code/Widget/Cdav.php:37
 msgid "Select Channel"
 msgstr "Выбрать канал"
 
-#: ../../Zotlabs/Widget/Cdav.php:42
+#: ../../Code/Widget/Cdav.php:42
 msgid "Read-write"
 msgstr "Чтение-запись"
 
-#: ../../Zotlabs/Widget/Cdav.php:43
+#: ../../Code/Widget/Cdav.php:43
 msgid "Read-only"
 msgstr "Только чтение"
 
-#: ../../Zotlabs/Widget/Cdav.php:117
+#: ../../Code/Widget/Cdav.php:117
 msgid "My Calendars"
 msgstr "Мои календари"
 
-#: ../../Zotlabs/Widget/Cdav.php:119
+#: ../../Code/Widget/Cdav.php:119
 msgid "Shared Calendars"
 msgstr "Общие календари"
 
-#: ../../Zotlabs/Widget/Cdav.php:123
+#: ../../Code/Widget/Cdav.php:123
 msgid "Share this calendar"
 msgstr "Поделиться этим календарём"
 
-#: ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Code/Widget/Cdav.php:125
 msgid "Calendar name and color"
 msgstr "Имя и цвет календаря"
 
-#: ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Code/Widget/Cdav.php:127
 msgid "Create new calendar"
 msgstr "Создать новый календарь"
 
-#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/Layouts.php:185
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Webpages.php:239
-#: ../../Zotlabs/Module/Articles.php:96 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Menu.php:181 ../../Zotlabs/Module/New_channel.php:188
-#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390
+#: ../../Code/Widget/Cdav.php:128 ../../Code/Widget/Cdav.php:165
+#: ../../Code/Module/Cdav.php:1185 ../../Code/Module/Layouts.php:185
+#: ../../Code/Module/Connedit.php:921 ../../Code/Module/Webpages.php:239
+#: ../../Code/Module/Articles.php:96 ../../Code/Module/Blocks.php:159
+#: ../../Code/Module/Menu.php:181 ../../Code/Module/New_channel.php:188
+#: ../../Code/Module/Cards.php:100 ../../Code/Module/Profiles.php:798
+#: ../../Code/Storage/Browser.php:276 ../../Code/Storage/Browser.php:390
 msgid "Create"
 msgstr "Создать"
 
-#: ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Code/Widget/Cdav.php:129
 msgid "Calendar Name"
 msgstr "Имя календаря"
 
-#: ../../Zotlabs/Widget/Cdav.php:130
+#: ../../Code/Widget/Cdav.php:130
 msgid "Calendar Tools"
 msgstr "Инструменты календаря"
 
-#: ../../Zotlabs/Widget/Cdav.php:131
+#: ../../Code/Widget/Cdav.php:131
 msgid "Import calendar"
 msgstr "Импортировать календарь"
 
-#: ../../Zotlabs/Widget/Cdav.php:132
+#: ../../Code/Widget/Cdav.php:132
 msgid "Select a calendar to import to"
 msgstr "Выбрать календарь для импорта в"
 
-#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169
-#: ../../Zotlabs/Widget/Album.php:97 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Module/Photos.php:717
-#: ../../Zotlabs/Module/Profile_photo.php:459
-#: ../../Zotlabs/Module/Cover_photo.php:395
-#: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Storage/Browser.php:392
+#: ../../Code/Widget/Cdav.php:133 ../../Code/Widget/Cdav.php:169
+#: ../../Code/Widget/Album.php:97 ../../Code/Widget/Portfolio.php:110
+#: ../../Code/Module/Photos.php:717
+#: ../../Code/Module/Profile_photo.php:459
+#: ../../Code/Module/Cover_photo.php:395
+#: ../../Code/Module/Embedphotos.php:158
+#: ../../Code/Storage/Browser.php:392
 msgid "Upload"
 msgstr "Загрузка"
 
-#: ../../Zotlabs/Widget/Cdav.php:159
+#: ../../Code/Widget/Cdav.php:159
 msgid "Addressbooks"
 msgstr "Адресные книги"
 
-#: ../../Zotlabs/Widget/Cdav.php:161
+#: ../../Code/Widget/Cdav.php:161
 msgid "Addressbook name"
 msgstr "Имя адресной книги"
 
-#: ../../Zotlabs/Widget/Cdav.php:163
+#: ../../Code/Widget/Cdav.php:163
 msgid "Create new addressbook"
 msgstr "Создать новую адресную книгу"
 
-#: ../../Zotlabs/Widget/Cdav.php:164
+#: ../../Code/Widget/Cdav.php:164
 msgid "Addressbook Name"
 msgstr "Имя адресной книги"
 
-#: ../../Zotlabs/Widget/Cdav.php:166
+#: ../../Code/Widget/Cdav.php:166
 msgid "Addressbook Tools"
 msgstr "Инструменты адресной книги"
 
-#: ../../Zotlabs/Widget/Cdav.php:167
+#: ../../Code/Widget/Cdav.php:167
 msgid "Import addressbook"
 msgstr "Импортировать адресную книгу"
 
-#: ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Code/Widget/Cdav.php:168
 msgid "Select an addressbook to import to"
 msgstr "Выбрать адресную книгу для импорта в"
 
-#: ../../Zotlabs/Widget/Activity.php:50
+#: ../../Code/Widget/Activity.php:50
 msgctxt "widget"
 msgid "Activity"
 msgstr "Активность"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
+#: ../../Code/Widget/Hq_controls.php:14
 msgid "HQ Control Panel"
 msgstr "Панель управления HQ"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
+#: ../../Code/Widget/Hq_controls.php:17
 msgid "Create a new post"
 msgstr "Создать новую публикацию"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:91
+#: ../../Code/Widget/Wiki_pages.php:32
+#: ../../Code/Widget/Wiki_pages.php:91
 msgid "Add new page"
 msgstr "Добавить новую страницу"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:39
-#: ../../Zotlabs/Widget/Wiki_pages.php:98 ../../Zotlabs/Module/Dreport.php:151
+#: ../../Code/Widget/Wiki_pages.php:39
+#: ../../Code/Widget/Wiki_pages.php:98 ../../Code/Module/Dreport.php:151
 msgid "Options"
 msgstr "Параметры"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:85
+#: ../../Code/Widget/Wiki_pages.php:85
 msgid "Wiki Pages"
 msgstr "Wiki страницы"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Code/Widget/Wiki_pages.php:96
 msgid "Page name"
 msgstr "Название страницы"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
+#: ../../Code/Widget/Mailmenu.php:13
 msgid "Private Mail Menu"
 msgstr "Меню личной переписки"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
+#: ../../Code/Widget/Mailmenu.php:15
 msgid "Combined View"
 msgstr "Комбинированный вид"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20
+#: ../../Code/Widget/Mailmenu.php:20
 msgid "Inbox"
 msgstr "Входящие"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
+#: ../../Code/Widget/Mailmenu.php:25
 msgid "Outbox"
 msgstr "Исходящие"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
+#: ../../Code/Widget/Mailmenu.php:30
 msgid "New Message"
 msgstr "Новое сообщение"
 
-#: ../../Zotlabs/Widget/Photo_rand.php:58 ../../Zotlabs/Widget/Photo.php:48
+#: ../../Code/Widget/Photo_rand.php:58 ../../Code/Widget/Photo.php:48
 msgid "photo/image"
 msgstr "фотография / изображение"
 
-#: ../../Zotlabs/Widget/Archive.php:43
+#: ../../Code/Widget/Archive.php:43
 msgid "Archives"
 msgstr "Архивы"
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
+#: ../../Code/Widget/Eventstools.php:13
 msgid "Events Tools"
 msgstr "Инструменты для событий"
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
+#: ../../Code/Widget/Eventstools.php:14
 msgid "Export Calendar"
 msgstr "Экспортировать календарь"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
+#: ../../Code/Widget/Eventstools.php:15
 msgid "Import Calendar"
 msgstr "Импортировать календарь"
 
-#: ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../Code/Widget/Wiki_list.php:15
 msgid "Wiki List"
 msgstr "Список Wiki"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:35
+#: ../../Code/Widget/Settings_menu.php:35
 msgid "Account settings"
 msgstr "Настройки аккаунта"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:41
+#: ../../Code/Widget/Settings_menu.php:41
 msgid "Channel settings"
 msgstr "Настройки канала"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:50
+#: ../../Code/Widget/Settings_menu.php:50
 msgid "Additional features"
 msgstr "Дополнительные функции"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:57
+#: ../../Code/Widget/Settings_menu.php:57
 msgid "Addon settings"
 msgstr "Настройки расширений"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:63
+#: ../../Code/Widget/Settings_menu.php:63
 msgid "Display settings"
 msgstr "Настройки отображения"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:70
+#: ../../Code/Widget/Settings_menu.php:70
 msgid "Manage locations"
 msgstr "Управление местоположением"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:77
+#: ../../Code/Widget/Settings_menu.php:77
 msgid "Export channel"
 msgstr "Экспортировать канал"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:84
+#: ../../Code/Widget/Settings_menu.php:84
 msgid "OAuth1 apps"
 msgstr "Приложения OAuth1"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:92
+#: ../../Code/Widget/Settings_menu.php:92
 msgid "OAuth2 apps"
 msgstr "Приложения OAuth2"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:100
-#: ../../Zotlabs/Module/Settings/Tokens.php:150
+#: ../../Code/Widget/Settings_menu.php:100
+#: ../../Code/Module/Settings/Tokens.php:150
 msgid "Guest Access Tokens"
 msgstr "Токен гостевого доступа"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:117
-#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
+#: ../../Code/Widget/Settings_menu.php:117
+#: ../../Code/Module/Connedit.php:850 ../../Code/Module/Defperms.php:238
 msgid "Connection Default Permissions"
 msgstr "Разрешения по умолчанию для контакта"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:125
+#: ../../Code/Widget/Settings_menu.php:125
 msgid "Premium Channel Settings"
 msgstr "Настройки премиум-канала"
 
-#: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87
-#: ../../Zotlabs/Module/Photos.php:816 ../../Zotlabs/Module/Photos.php:1355
-#: ../../Zotlabs/Module/Embedphotos.php:140
+#: ../../Code/Widget/Album.php:78 ../../Code/Widget/Portfolio.php:87
+#: ../../Code/Module/Photos.php:816 ../../Code/Module/Photos.php:1355
+#: ../../Code/Module/Embedphotos.php:140
 msgid "View Photo"
 msgstr "Посмотреть фотографию"
 
-#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108
-#: ../../Zotlabs/Module/Photos.php:847 ../../Zotlabs/Module/Embedphotos.php:156
+#: ../../Code/Widget/Album.php:95 ../../Code/Widget/Portfolio.php:108
+#: ../../Code/Module/Photos.php:847 ../../Code/Module/Embedphotos.php:156
 msgid "Edit Album"
 msgstr "Редактировать Фотоальбом"
 
-#: ../../Zotlabs/Widget/Pubsites.php:12 ../../Zotlabs/Module/Pubsites.php:24
+#: ../../Code/Widget/Pubsites.php:12 ../../Code/Module/Pubsites.php:24
 msgid "Public Hubs"
 msgstr "Публичные хабы"
 
-#: ../../Zotlabs/Widget/Notes.php:16
+#: ../../Code/Widget/Notes.php:16
 msgid "Notes"
 msgstr "Заметки"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
+#: ../../Code/Widget/Chatroom_list.php:20
 msgid "Overview"
 msgstr "Обзор"
 
-#: ../../Zotlabs/Widget/Appstore.php:11
+#: ../../Code/Widget/Appstore.php:11
 msgid "App Collections"
 msgstr "Коллекции приложений"
 
-#: ../../Zotlabs/Widget/Appstore.php:13
+#: ../../Code/Widget/Appstore.php:13
 msgid "Available Apps"
 msgstr "Доступные приложения"
 
-#: ../../Zotlabs/Widget/Appstore.php:14
+#: ../../Code/Widget/Appstore.php:14
 msgid "Installed apps"
 msgstr "Установленные приложения"
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+#: ../../Code/Widget/Bookmarkedchats.php:24
 msgid "Bookmarked Chatrooms"
 msgstr "Закладки чатов"
 
-#: ../../Zotlabs/Widget/Follow.php:22
+#: ../../Code/Widget/Follow.php:22
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr "У вас есть %1$.0f из %2$.0f разрешенных контактов."
 
-#: ../../Zotlabs/Widget/Follow.php:29
+#: ../../Code/Widget/Follow.php:29
 msgid "Add New Connection"
 msgstr "Добавить новый контакт"
 
-#: ../../Zotlabs/Widget/Follow.php:30
+#: ../../Code/Widget/Follow.php:30
 msgid "Enter channel address"
 msgstr "Введите адрес канала"
 
-#: ../../Zotlabs/Widget/Follow.php:31
+#: ../../Code/Widget/Follow.php:31
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr "Пример: ivan@example.com, http://example.com/ivan"
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
+#: ../../Code/Widget/Chatroom_members.php:11
 msgid "Chat Members"
 msgstr "Участники чата"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
+#: ../../Code/Widget/Suggestedchats.php:32
 msgid "Suggested Chatrooms"
 msgstr "Рекомендуемые чаты"
 
-#: ../../Zotlabs/Widget/Rating.php:51
+#: ../../Code/Widget/Rating.php:51
 msgid "Rating Tools"
 msgstr "Инструменты оценки"
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+#: ../../Code/Widget/Rating.php:55 ../../Code/Widget/Rating.php:57
 msgid "Rate Me"
 msgstr "Оценить меня"
 
-#: ../../Zotlabs/Widget/Rating.php:60
+#: ../../Code/Widget/Rating.php:60
 msgid "View Ratings"
 msgstr "Просмотр оценок"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
+#: ../../Code/Widget/Savedsearch.php:75
 msgid "Remove term"
 msgstr "Удалить термин"
 
-#: ../../Zotlabs/Widget/Affinity.php:22 ../../Zotlabs/Module/Connedit.php:709
+#: ../../Code/Widget/Affinity.php:22 ../../Code/Module/Connedit.php:709
 msgid "Me"
 msgstr "Я"
 
-#: ../../Zotlabs/Widget/Affinity.php:23 ../../Zotlabs/Module/Connedit.php:710
+#: ../../Code/Widget/Affinity.php:23 ../../Code/Module/Connedit.php:710
 msgid "Family"
 msgstr "Семья"
 
-#: ../../Zotlabs/Widget/Affinity.php:25 ../../Zotlabs/Module/Connedit.php:712
+#: ../../Code/Widget/Affinity.php:25 ../../Code/Module/Connedit.php:712
 msgid "Acquaintances"
 msgstr "Знакомые"
 
-#: ../../Zotlabs/Widget/Affinity.php:26 ../../Zotlabs/Module/Connections.php:94
-#: ../../Zotlabs/Module/Connections.php:108
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Code/Widget/Affinity.php:26 ../../Code/Module/Connections.php:94
+#: ../../Code/Module/Connections.php:108
+#: ../../Code/Module/Connedit.php:713
 msgid "All"
 msgstr "Все"
 
-#: ../../Zotlabs/Widget/Affinity.php:45
+#: ../../Code/Widget/Affinity.php:45
 msgid "Refresh"
 msgstr "Обновить"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:24
+#: ../../Code/Widget/Activity_filter.php:24
 msgid "Personal Posts"
 msgstr "Личные публикации"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:28
+#: ../../Code/Widget/Activity_filter.php:28
 msgid "Show posts that mention or involve me"
 msgstr "Показывать публикации где вы были упомянуты или привлечены"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:39
+#: ../../Code/Widget/Activity_filter.php:39
 msgid "Starred Posts"
 msgstr "Отмеченные публикации"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:43
+#: ../../Code/Widget/Activity_filter.php:43
 msgid "Show posts that I have starred"
 msgstr "Показывать публикации которые я отметил"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:63
+#: ../../Code/Widget/Activity_filter.php:63
 #, php-format
 msgid "Show posts related to the %s privacy group"
 msgstr "Показывать публикации относящиеся к группе безопасности %s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:72
+#: ../../Code/Widget/Activity_filter.php:72
 msgid "Show my privacy groups"
 msgstr "Показывать мои группы безопасности"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:93
+#: ../../Code/Widget/Activity_filter.php:93
 msgid "Show posts to this forum"
 msgstr "Показывать публикации этого форума"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:100
-#: ../../Zotlabs/Widget/Notifications.php:119
-#: ../../Zotlabs/Widget/Notifications.php:120
-#: ../../Zotlabs/Widget/Forums.php:100
+#: ../../Code/Widget/Activity_filter.php:100
+#: ../../Code/Widget/Notifications.php:119
+#: ../../Code/Widget/Notifications.php:120
+#: ../../Code/Widget/Forums.php:100
 msgid "Forums"
 msgstr "Форумы"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:104
+#: ../../Code/Widget/Activity_filter.php:104
 msgid "Show forums"
 msgstr "Показывать форумы"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:128
+#: ../../Code/Widget/Activity_filter.php:128
 #, php-format
 msgid "Show posts that I have filed to %s"
 msgstr "Показывать публикации которые я добавил в %s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:138
+#: ../../Code/Widget/Activity_filter.php:138
 msgid "Show filed post categories"
 msgstr "Показывать категории добавленных публикаций"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:152
+#: ../../Code/Widget/Activity_filter.php:152
 msgid "Panel search"
 msgstr "Панель поиска"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:162
-#: ../../Zotlabs/Widget/Notifications.php:27
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:122
-#: ../../Zotlabs/Widget/Notifications.php:153
+#: ../../Code/Widget/Activity_filter.php:162
+#: ../../Code/Widget/Notifications.php:27
+#: ../../Code/Widget/Notifications.php:46
+#: ../../Code/Widget/Notifications.php:122
+#: ../../Code/Widget/Notifications.php:153
 msgid "Filter by name"
 msgstr "Отфильтровать по имени"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:177
+#: ../../Code/Widget/Activity_filter.php:177
 msgid "Remove active filter"
 msgstr "Удалить активный фильтр"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:193
+#: ../../Code/Widget/Activity_filter.php:193
 msgid "Activity Filters"
 msgstr "Фильтры активности"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:54
+#: ../../Code/Widget/Cover_photo.php:54
 msgid "Click to show more"
 msgstr "Нажмите чтобы показать больше"
 
-#: ../../Zotlabs/Widget/Notifications.php:16
+#: ../../Code/Widget/Notifications.php:16
 msgid "New Network Activity"
 msgstr "Новая сетевая активность"
 
-#: ../../Zotlabs/Widget/Notifications.php:17
+#: ../../Code/Widget/Notifications.php:17
 msgid "New Network Activity Notifications"
 msgstr "Новые уведомления о сетевой активности"
 
-#: ../../Zotlabs/Widget/Notifications.php:20
+#: ../../Code/Widget/Notifications.php:20
 msgid "View your network activity"
 msgstr "Просмотреть вашу сетевую активность"
 
-#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Code/Widget/Notifications.php:23
 msgid "Mark all notifications read"
 msgstr "Пометить уведомления как прочитанные"
 
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:45
-#: ../../Zotlabs/Widget/Notifications.php:152
+#: ../../Code/Widget/Notifications.php:26
+#: ../../Code/Widget/Notifications.php:45
+#: ../../Code/Widget/Notifications.php:152
 msgid "Show new posts only"
 msgstr "Показывать только новые публикации"
 
-#: ../../Zotlabs/Widget/Notifications.php:35
+#: ../../Code/Widget/Notifications.php:35
 msgid "New Home Activity"
 msgstr "Новая локальная активность"
 
-#: ../../Zotlabs/Widget/Notifications.php:36
+#: ../../Code/Widget/Notifications.php:36
 msgid "New Home Activity Notifications"
 msgstr "Новые уведомления локальной активности"
 
-#: ../../Zotlabs/Widget/Notifications.php:39
+#: ../../Code/Widget/Notifications.php:39
 msgid "View your home activity"
 msgstr "Просмотреть локальную активность"
 
-#: ../../Zotlabs/Widget/Notifications.php:42
-#: ../../Zotlabs/Widget/Notifications.php:149
+#: ../../Code/Widget/Notifications.php:42
+#: ../../Code/Widget/Notifications.php:149
 msgid "Mark all notifications seen"
 msgstr "Пометить уведомления как просмотренные"
 
-#: ../../Zotlabs/Widget/Notifications.php:54
+#: ../../Code/Widget/Notifications.php:54
 msgid "New Mails"
 msgstr "Новая переписка"
 
-#: ../../Zotlabs/Widget/Notifications.php:55
+#: ../../Code/Widget/Notifications.php:55
 msgid "New Mails Notifications"
 msgstr "Уведомления о новой переписке"
 
-#: ../../Zotlabs/Widget/Notifications.php:58
+#: ../../Code/Widget/Notifications.php:58
 msgid "View your private mails"
 msgstr "Просмотреть вашу личную переписку"
 
-#: ../../Zotlabs/Widget/Notifications.php:61
+#: ../../Code/Widget/Notifications.php:61
 msgid "Mark all messages seen"
 msgstr "Пометить сообщения как просмотренные"
 
-#: ../../Zotlabs/Widget/Notifications.php:69
+#: ../../Code/Widget/Notifications.php:69
 msgid "New Events"
 msgstr "Новые события"
 
-#: ../../Zotlabs/Widget/Notifications.php:70
+#: ../../Code/Widget/Notifications.php:70
 msgid "New Events Notifications"
 msgstr "Уведомления о новых событиях"
 
-#: ../../Zotlabs/Widget/Notifications.php:73
+#: ../../Code/Widget/Notifications.php:73
 msgid "View events"
 msgstr "Просмотреть события"
 
-#: ../../Zotlabs/Widget/Notifications.php:76
+#: ../../Code/Widget/Notifications.php:76
 msgid "Mark all events seen"
 msgstr "Пометить все события как просмотренные"
 
-#: ../../Zotlabs/Widget/Notifications.php:84
-#: ../../Zotlabs/Module/Connections.php:147
+#: ../../Code/Widget/Notifications.php:84
+#: ../../Code/Module/Connections.php:147
 msgid "New Connections"
 msgstr "Новые контакты"
 
-#: ../../Zotlabs/Widget/Notifications.php:85
+#: ../../Code/Widget/Notifications.php:85
 msgid "New Connections Notifications"
 msgstr "Уведомления о новых контактах"
 
-#: ../../Zotlabs/Widget/Notifications.php:88
+#: ../../Code/Widget/Notifications.php:88
 msgid "View all connections"
 msgstr "Просмотр всех контактов"
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Code/Widget/Notifications.php:96
 msgid "New Files"
 msgstr "Новые файлы"
 
-#: ../../Zotlabs/Widget/Notifications.php:97
+#: ../../Code/Widget/Notifications.php:97
 msgid "New Files Notifications"
 msgstr "Уведомления о новых файлах"
 
-#: ../../Zotlabs/Widget/Notifications.php:104
-#: ../../Zotlabs/Widget/Notifications.php:105
+#: ../../Code/Widget/Notifications.php:104
+#: ../../Code/Widget/Notifications.php:105
 msgid "Notices"
 msgstr "Оповещения"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Code/Widget/Notifications.php:108
 msgid "View all notices"
 msgstr "Просмотреть все оповещения"
 
-#: ../../Zotlabs/Widget/Notifications.php:111
+#: ../../Code/Widget/Notifications.php:111
 msgid "Mark all notices seen"
 msgstr "Пометить все оповещения как просмотренные"
 
-#: ../../Zotlabs/Widget/Notifications.php:132
+#: ../../Code/Widget/Notifications.php:132
 msgid "New Registrations"
 msgstr "Новые регистрации"
 
-#: ../../Zotlabs/Widget/Notifications.php:133
+#: ../../Code/Widget/Notifications.php:133
 msgid "New Registrations Notifications"
 msgstr "Уведомления о новых регистрациях"
 
-#: ../../Zotlabs/Widget/Notifications.php:142
-#: ../../Zotlabs/Module/Pubstream.php:95
+#: ../../Code/Widget/Notifications.php:142
+#: ../../Code/Module/Pubstream.php:95
 msgid "Public Stream"
 msgstr "Публичный поток"
 
-#: ../../Zotlabs/Widget/Notifications.php:143
+#: ../../Code/Widget/Notifications.php:143
 msgid "Public Stream Notifications"
 msgstr "Уведомления публичного потока"
 
-#: ../../Zotlabs/Widget/Notifications.php:146
+#: ../../Code/Widget/Notifications.php:146
 msgid "View the public stream"
 msgstr "Просмотреть публичный поток"
 
-#: ../../Zotlabs/Widget/Notifications.php:161
+#: ../../Code/Widget/Notifications.php:161
 msgid "Sorry, you have got no notifications at the moment"
 msgstr "Извините, но сейчас у вас нет уведомлений"
 
-#: ../../Zotlabs/Widget/Newmember.php:24
+#: ../../Code/Widget/Newmember.php:24
 msgid "Profile Creation"
 msgstr "Создание профиля"
 
-#: ../../Zotlabs/Widget/Newmember.php:26
+#: ../../Code/Widget/Newmember.php:26
 msgid "Upload profile photo"
 msgstr "Загрузить фотографию профиля"
 
-#: ../../Zotlabs/Widget/Newmember.php:27
+#: ../../Code/Widget/Newmember.php:27
 msgid "Upload cover photo"
 msgstr "Загрузить фотографию обложки"
 
-#: ../../Zotlabs/Widget/Newmember.php:31
+#: ../../Code/Widget/Newmember.php:31
 msgid "Find and Connect with others"
 msgstr "Найти и вступить в контакт"
 
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Code/Widget/Newmember.php:33
 msgid "View the directory"
 msgstr "Просмотреть каталог"
 
-#: ../../Zotlabs/Widget/Newmember.php:34 ../../Zotlabs/Module/Go.php:38
+#: ../../Code/Widget/Newmember.php:34 ../../Code/Module/Go.php:38
 msgid "View friend suggestions"
 msgstr "Просмотр рекомендуемых друзей"
 
-#: ../../Zotlabs/Widget/Newmember.php:35
+#: ../../Code/Widget/Newmember.php:35
 msgid "Manage your connections"
 msgstr "Управлять вашими контактами"
 
-#: ../../Zotlabs/Widget/Newmember.php:38
+#: ../../Code/Widget/Newmember.php:38
 msgid "Communicate"
 msgstr "Связаться"
 
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Code/Widget/Newmember.php:40
 msgid "View your channel homepage"
 msgstr "Домашняя страница канала"
 
-#: ../../Zotlabs/Widget/Newmember.php:41
+#: ../../Code/Widget/Newmember.php:41
 msgid "View your network stream"
 msgstr "Просмотреть ваш сетевой поток"
 
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Code/Widget/Newmember.php:47
 msgid "Documentation"
 msgstr "Документация"
 
-#: ../../Zotlabs/Widget/Newmember.php:58
+#: ../../Code/Widget/Newmember.php:58
 msgid "View public stream"
 msgstr "Просмотреть публичный поток"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:283
+#: ../../Code/Access/PermissionRoles.php:283
 msgid "Social Networking"
 msgstr "Социальная Сеть"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:284
+#: ../../Code/Access/PermissionRoles.php:284
 msgid "Social - Federation"
 msgstr "Социальная - Федерация"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:285
+#: ../../Code/Access/PermissionRoles.php:285
 msgid "Social - Mostly Public"
 msgstr "Социальная - В основном общественный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:286
+#: ../../Code/Access/PermissionRoles.php:286
 msgid "Social - Restricted"
 msgstr "Социальная - Ограниченный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
+#: ../../Code/Access/PermissionRoles.php:287
 msgid "Social - Private"
 msgstr "Социальная - Частный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
+#: ../../Code/Access/PermissionRoles.php:290
 msgid "Community Forum"
 msgstr "Форум сообщества"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
+#: ../../Code/Access/PermissionRoles.php:291
 msgid "Forum - Mostly Public"
 msgstr "Форум - В основном общественный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:292
+#: ../../Code/Access/PermissionRoles.php:292
 msgid "Forum - Restricted"
 msgstr "Форум - Ограниченный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:293
+#: ../../Code/Access/PermissionRoles.php:293
 msgid "Forum - Private"
 msgstr "Форум - Частный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
+#: ../../Code/Access/PermissionRoles.php:296
 msgid "Feed Republish"
 msgstr "Публиковать ленты новостей"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
+#: ../../Code/Access/PermissionRoles.php:297
 msgid "Feed - Mostly Public"
 msgstr "Ленты новостей - В основном общественный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:298
+#: ../../Code/Access/PermissionRoles.php:298
 msgid "Feed - Restricted"
 msgstr "Ленты новостей - Ограниченный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
+#: ../../Code/Access/PermissionRoles.php:301
 msgid "Special Purpose"
 msgstr "Спец. назначение"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
+#: ../../Code/Access/PermissionRoles.php:302
 msgid "Special - Celebrity/Soapbox"
 msgstr "Спец. назначение - Знаменитость/Soapbox"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:303
+#: ../../Code/Access/PermissionRoles.php:303
 msgid "Special - Group Repository"
 msgstr "Спец. назначение - Групповой репозиторий"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
+#: ../../Code/Access/PermissionRoles.php:307
 msgid "Custom/Expert Mode"
 msgstr "Экспертный режим"
 
-#: ../../Zotlabs/Access/Permissions.php:56
+#: ../../Code/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
 msgstr "Может просматривать мою ленту и сообщения"
 
-#: ../../Zotlabs/Access/Permissions.php:57
+#: ../../Code/Access/Permissions.php:57
 msgid "Can send me their channel stream and posts"
 msgstr "Может присылать мне свои потоки и сообщения"
 
-#: ../../Zotlabs/Access/Permissions.php:58
+#: ../../Code/Access/Permissions.php:58
 msgid "Can view my default channel profile"
 msgstr "Может просматривать мой стандартный профиль канала"
 
-#: ../../Zotlabs/Access/Permissions.php:59
+#: ../../Code/Access/Permissions.php:59
 msgid "Can view my connections"
 msgstr "Может просматривать мои контакты"
 
-#: ../../Zotlabs/Access/Permissions.php:60
+#: ../../Code/Access/Permissions.php:60
 msgid "Can view my file storage and photos"
 msgstr "Может просматривать мое хранилище файлов"
 
-#: ../../Zotlabs/Access/Permissions.php:61
+#: ../../Code/Access/Permissions.php:61
 msgid "Can upload/modify my file storage and photos"
 msgstr "Может загружать/изменять мои  файлы и фотографии в хранилище"
 
-#: ../../Zotlabs/Access/Permissions.php:62
+#: ../../Code/Access/Permissions.php:62
 msgid "Can view my channel webpages"
 msgstr "Может просматривать мои веб-страницы"
 
-#: ../../Zotlabs/Access/Permissions.php:63
+#: ../../Code/Access/Permissions.php:63
 msgid "Can view my wiki pages"
 msgstr "Может просматривать мои вики-страницы"
 
-#: ../../Zotlabs/Access/Permissions.php:64
+#: ../../Code/Access/Permissions.php:64
 msgid "Can create/edit my channel webpages"
 msgstr "Может редактировать мои веб-страницы"
 
-#: ../../Zotlabs/Access/Permissions.php:65
+#: ../../Code/Access/Permissions.php:65
 msgid "Can write to my wiki pages"
 msgstr "Может редактировать мои вики-страницы"
 
-#: ../../Zotlabs/Access/Permissions.php:66
+#: ../../Code/Access/Permissions.php:66
 msgid "Can post on my channel (wall) page"
 msgstr "Может публиковать на моей странице канала"
 
-#: ../../Zotlabs/Access/Permissions.php:67
+#: ../../Code/Access/Permissions.php:67
 msgid "Can comment on or like my posts"
 msgstr "Может прокомментировать или отмечать как понравившиеся мои посты"
 
-#: ../../Zotlabs/Access/Permissions.php:68
+#: ../../Code/Access/Permissions.php:68
 msgid "Can send me private mail messages"
 msgstr "Может отправлять мне личные сообщения по эл. почте"
 
-#: ../../Zotlabs/Access/Permissions.php:69
+#: ../../Code/Access/Permissions.php:69
 msgid "Can like/dislike profiles and profile things"
 msgstr "Может комментировать или отмечать как нравится/ненравится мой профиль"
 
-#: ../../Zotlabs/Access/Permissions.php:70
+#: ../../Code/Access/Permissions.php:70
 msgid "Can forward to all my channel connections via ! mentions in posts"
 msgstr "Может пересылать всем подписчикам моего канала используя ! в публикациях"
 
-#: ../../Zotlabs/Access/Permissions.php:71
+#: ../../Code/Access/Permissions.php:71
 msgid "Can chat with me"
 msgstr "Может общаться со мной в чате"
 
-#: ../../Zotlabs/Access/Permissions.php:72
+#: ../../Code/Access/Permissions.php:72
 msgid "Can source my public posts in derived channels"
 msgstr "Может использовать мои публичные сообщения в клонированных  лентах сообщений"
 
-#: ../../Zotlabs/Access/Permissions.php:73
+#: ../../Code/Access/Permissions.php:73
 msgid "Can administer my channel"
 msgstr "Может администрировать мой канал"
 
-#: ../../Zotlabs/Zot/Auth.php:152
+#: ../../Code/Zot/Auth.php:152
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please "
 "logout and retry."
 msgstr "Удалённая аутентификация заблокирована. Вы вошли на этот сайт локально. Пожалуйста, выйдите и попробуйте ещё раз."
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+#: ../../Code/Module/Appman.php:39 ../../Code/Module/Appman.php:56
 msgid "App installed."
 msgstr "Приложение установлено."
 
-#: ../../Zotlabs/Module/Appman.php:49
+#: ../../Code/Module/Appman.php:49
 msgid "Malformed app."
 msgstr "Неработающее приложение."
 
-#: ../../Zotlabs/Module/Appman.php:130
+#: ../../Code/Module/Appman.php:130
 msgid "Embed code"
 msgstr "Встроить код"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Edit App"
 msgstr "Редактировать приложение"
 
-#: ../../Zotlabs/Module/Appman.php:136
+#: ../../Code/Module/Appman.php:136
 msgid "Create App"
 msgstr "Создать приложение"
 
-#: ../../Zotlabs/Module/Appman.php:141
+#: ../../Code/Module/Appman.php:141
 msgid "Name of app"
 msgstr "Наименование приложения"
 
-#: ../../Zotlabs/Module/Appman.php:142
+#: ../../Code/Module/Appman.php:142
 msgid "Location (URL) of app"
 msgstr "Местоположение (URL) приложения"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "Photo icon URL"
 msgstr "URL пиктограммы"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Code/Module/Appman.php:144
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 пикселей - необязательно"
 
-#: ../../Zotlabs/Module/Appman.php:145
+#: ../../Code/Module/Appman.php:145
 msgid "Categories (optional, comma separated list)"
 msgstr "Категории (необязательно, список через запятую)"
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Code/Module/Appman.php:146
 msgid "Version ID"
 msgstr "ID версии"
 
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Code/Module/Appman.php:147
 msgid "Price of app"
 msgstr "Цена приложения"
 
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Code/Module/Appman.php:148
 msgid "Location (URL) to purchase app"
 msgstr "Ссылка (URL) для покупки приложения"
 
-#: ../../Zotlabs/Module/Acl.php:359
+#: ../../Code/Module/Acl.php:359
 msgid "network"
 msgstr "сеть"
 
-#: ../../Zotlabs/Module/Cdav.php:785
+#: ../../Code/Module/Cdav.php:785
 msgid "INVALID EVENT DISMISSED!"
 msgstr "НЕДЕЙСТВИТЕЛЬНОЕ СОБЫТИЕ ОТКЛОНЕНО!"
 
-#: ../../Zotlabs/Module/Cdav.php:786
+#: ../../Code/Module/Cdav.php:786
 msgid "Summary: "
 msgstr "Резюме:"
 
-#: ../../Zotlabs/Module/Cdav.php:787
+#: ../../Code/Module/Cdav.php:787
 msgid "Date: "
 msgstr "Дата:"
 
-#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795
+#: ../../Code/Module/Cdav.php:788 ../../Code/Module/Cdav.php:795
 msgid "Reason: "
 msgstr "Причина:"
 
-#: ../../Zotlabs/Module/Cdav.php:793
+#: ../../Code/Module/Cdav.php:793
 msgid "INVALID CARD DISMISSED!"
 msgstr "НЕДЕЙСТВИТЕЛЬНАЯ КАРТОЧКА ОТКЛОНЕНА!"
 
-#: ../../Zotlabs/Module/Cdav.php:794
+#: ../../Code/Module/Cdav.php:794
 msgid "Name: "
 msgstr "Имя:"
 
-#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Cdav.php:868 ../../Code/Module/Events.php:460
 msgid "Event title"
 msgstr "Наименование события"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Events.php:466
 msgid "Start date and time"
 msgstr "Дата и время начала"
 
-#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:869 ../../Code/Module/Cdav.php:870
 msgid "Example: YYYY-MM-DD HH:mm"
 msgstr "Пример: YYYY-MM-DD HH:mm"
 
-#: ../../Zotlabs/Module/Cdav.php:870
+#: ../../Code/Module/Cdav.php:870
 msgid "End date and time"
 msgstr "Дата и время окончания"
 
-#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Photos.php:976
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Cal.php:346
+#: ../../Code/Module/Cdav.php:879 ../../Code/Module/Photos.php:976
+#: ../../Code/Module/Events.php:689 ../../Code/Module/Events.php:698
+#: ../../Code/Module/Cal.php:339 ../../Code/Module/Cal.php:346
 msgid "Previous"
 msgstr "Предыдущая"
 
-#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Photos.php:985
-#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347
-#: ../../Zotlabs/Module/Setup.php:263
+#: ../../Code/Module/Cdav.php:880 ../../Code/Module/Photos.php:985
+#: ../../Code/Module/Events.php:690 ../../Code/Module/Events.php:699
+#: ../../Code/Module/Cal.php:340 ../../Code/Module/Cal.php:347
+#: ../../Code/Module/Setup.php:263
 msgid "Next"
 msgstr "Следующая"
 
-#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700
-#: ../../Zotlabs/Module/Cal.php:348
+#: ../../Code/Module/Cdav.php:881 ../../Code/Module/Events.php:700
+#: ../../Code/Module/Cal.php:348
 msgid "Today"
 msgstr "Сегодня"
 
-#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695
+#: ../../Code/Module/Cdav.php:882 ../../Code/Module/Events.php:695
 msgid "Month"
 msgstr "Месяц"
 
-#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696
+#: ../../Code/Module/Cdav.php:883 ../../Code/Module/Events.php:696
 msgid "Week"
 msgstr "Неделя"
 
-#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697
+#: ../../Code/Module/Cdav.php:884 ../../Code/Module/Events.php:697
 msgid "Day"
 msgstr "День"
 
-#: ../../Zotlabs/Module/Cdav.php:885
+#: ../../Code/Module/Cdav.php:885
 msgid "List month"
 msgstr "Просмотреть месяц"
 
-#: ../../Zotlabs/Module/Cdav.php:886
+#: ../../Code/Module/Cdav.php:886
 msgid "List week"
 msgstr "Просмотреть неделю"
 
-#: ../../Zotlabs/Module/Cdav.php:887
+#: ../../Code/Module/Cdav.php:887
 msgid "List day"
 msgstr "Просмотреть день"
 
-#: ../../Zotlabs/Module/Cdav.php:894
+#: ../../Code/Module/Cdav.php:894
 msgid "More"
 msgstr "Больше"
 
-#: ../../Zotlabs/Module/Cdav.php:895
+#: ../../Code/Module/Cdav.php:895
 msgid "Less"
 msgstr "Меньше"
 
-#: ../../Zotlabs/Module/Cdav.php:896
+#: ../../Code/Module/Cdav.php:896
 msgid "Select calendar"
 msgstr "Выбрать календарь"
 
-#: ../../Zotlabs/Module/Cdav.php:898
+#: ../../Code/Module/Cdav.php:898
 msgid "Delete all"
 msgstr "Удалить всё"
 
-#: ../../Zotlabs/Module/Cdav.php:900
+#: ../../Code/Module/Cdav.php:900
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "Простите, но редактирование повторяющихся событий пока не реализовано."
 
-#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907
+#: ../../Code/Module/Cdav.php:1171 ../../Code/Module/Connedit.php:907
 msgid "Organisation"
 msgstr "Организация"
 
-#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Code/Module/Cdav.php:1172 ../../Code/Module/Connedit.php:908
 msgid "Title"
 msgstr "Наименование"
 
-#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
-#: ../../Zotlabs/Module/Profiles.php:786
+#: ../../Code/Module/Cdav.php:1173 ../../Code/Module/Connedit.php:909
+#: ../../Code/Module/Profiles.php:786
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
-#: ../../Zotlabs/Module/Profiles.php:788
+#: ../../Code/Module/Cdav.php:1175 ../../Code/Module/Connedit.php:911
+#: ../../Code/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr "Мессенджер"
 
-#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
-#: ../../Zotlabs/Module/Profiles.php:789
+#: ../../Code/Module/Cdav.php:1176 ../../Code/Module/Connedit.php:912
+#: ../../Code/Module/Profiles.php:789
 msgid "Website"
 msgstr "Веб-сайт"
 
-#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Connedit.php:913
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Code/Module/Cdav.php:1177 ../../Code/Module/Connedit.php:913
+#: ../../Code/Module/Admin/Channels.php:160
+#: ../../Code/Module/Locs.php:118 ../../Code/Module/Profiles.php:502
+#: ../../Code/Module/Profiles.php:790
 msgid "Address"
 msgstr "Адрес"
 
-#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
-#: ../../Zotlabs/Module/Profiles.php:791
+#: ../../Code/Module/Cdav.php:1178 ../../Code/Module/Connedit.php:914
+#: ../../Code/Module/Profiles.php:791
 msgid "Note"
 msgstr "Заметка"
 
-#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Profiles.php:797
+#: ../../Code/Module/Cdav.php:1184 ../../Code/Module/Connedit.php:920
+#: ../../Code/Module/Profiles.php:797
 msgid "Add Field"
 msgstr "Добавить поле"
 
-#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Code/Module/Cdav.php:1189 ../../Code/Module/Connedit.php:925
 msgid "P.O. Box"
 msgstr "абонентский ящик"
 
-#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Code/Module/Cdav.php:1190 ../../Code/Module/Connedit.php:926
 msgid "Additional"
 msgstr "Дополнительно"
 
-#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Code/Module/Cdav.php:1191 ../../Code/Module/Connedit.php:927
 msgid "Street"
 msgstr "Улица"
 
-#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Code/Module/Cdav.php:1192 ../../Code/Module/Connedit.php:928
 msgid "Locality"
 msgstr "Населённый пункт"
 
-#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Code/Module/Cdav.php:1193 ../../Code/Module/Connedit.php:929
 msgid "Region"
 msgstr "Регион"
 
-#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Code/Module/Cdav.php:1194 ../../Code/Module/Connedit.php:930
 msgid "ZIP Code"
 msgstr "Индекс"
 
-#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Code/Module/Cdav.php:1195 ../../Code/Module/Connedit.php:931
+#: ../../Code/Module/Profiles.php:757
 msgid "Country"
 msgstr "Страна"
 
-#: ../../Zotlabs/Module/Cdav.php:1242
+#: ../../Code/Module/Cdav.php:1242
 msgid "Default Calendar"
 msgstr "Календарь по умолчанию"
 
-#: ../../Zotlabs/Module/Cdav.php:1252
+#: ../../Code/Module/Cdav.php:1252
 msgid "Default Addressbook"
 msgstr "Адресная книга по умолчанию"
 
-#: ../../Zotlabs/Module/Go.php:21
+#: ../../Code/Module/Go.php:21
 msgid "This page is available only to site members"
 msgstr "Эта страница доступна только для подписчиков сайта"
 
-#: ../../Zotlabs/Module/Go.php:27
+#: ../../Code/Module/Go.php:27
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
-#: ../../Zotlabs/Module/Go.php:29
+#: ../../Code/Module/Go.php:29
 msgid "What would you like to do?"
 msgstr "Что бы вы хотели сделать?"
 
-#: ../../Zotlabs/Module/Go.php:31
+#: ../../Code/Module/Go.php:31
 msgid ""
 "Please bookmark this page if you would like to return to it in the future"
 msgstr "Пожалуйста, запомните эту страницу если вы хотите вернуться на неё в будущем"
 
-#: ../../Zotlabs/Module/Go.php:35
+#: ../../Code/Module/Go.php:35
 msgid "Upload a profile photo"
 msgstr "Загрузить фотографию профиля"
 
-#: ../../Zotlabs/Module/Go.php:36
+#: ../../Code/Module/Go.php:36
 msgid "Upload a cover photo"
 msgstr "Загрузить фотографию обложки"
 
-#: ../../Zotlabs/Module/Go.php:37
+#: ../../Code/Module/Go.php:37
 msgid "Edit your default profile"
 msgstr "Редактировать ваш профиль по умолчанию"
 
-#: ../../Zotlabs/Module/Go.php:39
+#: ../../Code/Module/Go.php:39
 msgid "View the channel directory"
 msgstr "Просмотр каталога каналов"
 
-#: ../../Zotlabs/Module/Go.php:40
+#: ../../Code/Module/Go.php:40
 msgid "View/edit your channel settings"
 msgstr "Просмотреть / редактировать настройки вашего канала"
 
-#: ../../Zotlabs/Module/Go.php:41
+#: ../../Code/Module/Go.php:41
 msgid "View the site or project documentation"
 msgstr "Просмотр документации сайта / проекта"
 
-#: ../../Zotlabs/Module/Go.php:42
+#: ../../Code/Module/Go.php:42
 msgid "Visit your channel homepage"
 msgstr "Посетить страницу вашего канала"
 
-#: ../../Zotlabs/Module/Go.php:43
+#: ../../Code/Module/Go.php:43
 msgid ""
 "View your connections and/or add somebody whose address you already know"
 msgstr "Просмотреть ваши контакты и / или добавить кого-то чей адрес в уже знаете"
 
-#: ../../Zotlabs/Module/Go.php:44
+#: ../../Code/Module/Go.php:44
 msgid ""
 "View your personal stream (this may be empty until you add some connections)"
 msgstr "Ваш персональный поток (может быть пуст пока вы не добавите контакты)"
 
-#: ../../Zotlabs/Module/Go.php:52
+#: ../../Code/Module/Go.php:52
 msgid "View the public stream. Warning: this content is not moderated"
 msgstr "Просмотр публичного потока. Предупреждение: этот контент не модерируется"
 
-#: ../../Zotlabs/Module/Photos.php:78
+#: ../../Code/Module/Photos.php:78
 msgid "Page owner information could not be retrieved."
 msgstr "Информация о владельце страницы не может быть получена."
 
-#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113
+#: ../../Code/Module/Photos.php:94 ../../Code/Module/Photos.php:113
 msgid "Album not found."
 msgstr "Альбом не найден."
 
-#: ../../Zotlabs/Module/Photos.php:103
+#: ../../Code/Module/Photos.php:103
 msgid "Delete Album"
 msgstr "Удалить альбом"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088
+#: ../../Code/Module/Photos.php:174 ../../Code/Module/Photos.php:1088
 msgid "Delete Photo"
 msgstr "Удалить фотографию"
 
-#: ../../Zotlabs/Module/Photos.php:545 ../../Zotlabs/Module/Ratings.php:83
-#: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Directory.php:68
-#: ../../Zotlabs/Module/Display.php:30
+#: ../../Code/Module/Photos.php:545 ../../Code/Module/Ratings.php:83
+#: ../../Code/Module/Search.php:17
+#: ../../Code/Module/Viewconnections.php:23
+#: ../../Code/Module/Directory.php:63 ../../Code/Module/Directory.php:68
+#: ../../Code/Module/Display.php:30
 msgid "Public access denied."
 msgstr "Публичный доступ запрещен."
 
-#: ../../Zotlabs/Module/Photos.php:556
+#: ../../Code/Module/Photos.php:556
 msgid "No photos selected"
 msgstr "Никакие фотографии не выбраны"
 
-#: ../../Zotlabs/Module/Photos.php:605
+#: ../../Code/Module/Photos.php:605
 msgid "Access to this item is restricted."
 msgstr "Доступ к этому элементу ограничен."
 
-#: ../../Zotlabs/Module/Photos.php:651
+#: ../../Code/Module/Photos.php:651
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото."
 
-#: ../../Zotlabs/Module/Photos.php:654
+#: ../../Code/Module/Photos.php:654
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "Вы использовали %1$.2f мегабайт для хранения фото."
 
-#: ../../Zotlabs/Module/Photos.php:696
+#: ../../Code/Module/Photos.php:696
 msgid "Upload Photos"
 msgstr "Загрузить фотографии"
 
-#: ../../Zotlabs/Module/Photos.php:700
+#: ../../Code/Module/Photos.php:700
 msgid "Enter an album name"
 msgstr "Введите название альбома"
 
-#: ../../Zotlabs/Module/Photos.php:701
+#: ../../Code/Module/Photos.php:701
 msgid "or select an existing album (doubleclick)"
 msgstr "или выберите существующий альбом (двойной щелчок)"
 
-#: ../../Zotlabs/Module/Photos.php:702
+#: ../../Code/Module/Photos.php:702
 msgid "Create a status post for this upload"
 msgstr "Сделать публикацию о статусе для этой загрузки"
 
-#: ../../Zotlabs/Module/Photos.php:704
+#: ../../Code/Module/Photos.php:704
 msgid "Description (optional)"
 msgstr "Описание (необязательно)"
 
-#: ../../Zotlabs/Module/Photos.php:790
+#: ../../Code/Module/Photos.php:790
 msgid "Show Newest First"
 msgstr "Показать новые первыми"
 
-#: ../../Zotlabs/Module/Photos.php:792
+#: ../../Code/Module/Photos.php:792
 msgid "Show Oldest First"
 msgstr "Показать старые первыми"
 
-#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386
+#: ../../Code/Module/Photos.php:849 ../../Code/Module/Photos.php:1386
 msgid "Add Photos"
 msgstr "Добавить фотографии"
 
-#: ../../Zotlabs/Module/Photos.php:897
+#: ../../Code/Module/Photos.php:897
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Доступ запрещен. Доступ к этому элементу может быть ограничен."
 
-#: ../../Zotlabs/Module/Photos.php:899
+#: ../../Code/Module/Photos.php:899
 msgid "Photo not available"
 msgstr "Фотография не доступна"
 
-#: ../../Zotlabs/Module/Photos.php:957
+#: ../../Code/Module/Photos.php:957
 msgid "Use as profile photo"
 msgstr "Использовать в качестве фотографии профиля"
 
-#: ../../Zotlabs/Module/Photos.php:958
+#: ../../Code/Module/Photos.php:958
 msgid "Use as cover photo"
 msgstr "Использовать в качестве фотографии обложки"
 
-#: ../../Zotlabs/Module/Photos.php:965
+#: ../../Code/Module/Photos.php:965
 msgid "Private Photo"
 msgstr "Личная фотография"
 
-#: ../../Zotlabs/Module/Photos.php:980
+#: ../../Code/Module/Photos.php:980
 msgid "View Full Size"
 msgstr "Посмотреть в полный размер"
 
-#: ../../Zotlabs/Module/Photos.php:1062
+#: ../../Code/Module/Photos.php:1062
 msgid "Edit photo"
 msgstr "Редактировать фотографию"
 
-#: ../../Zotlabs/Module/Photos.php:1064
+#: ../../Code/Module/Photos.php:1064
 msgid "Rotate CW (right)"
 msgstr "Повернуть CW (направо)"
 
-#: ../../Zotlabs/Module/Photos.php:1065
+#: ../../Code/Module/Photos.php:1065
 msgid "Rotate CCW (left)"
 msgstr "Повернуть CCW (налево)"
 
-#: ../../Zotlabs/Module/Photos.php:1068
+#: ../../Code/Module/Photos.php:1068
 msgid "Move photo to album"
 msgstr "Переместить фотографию в альбом"
 
-#: ../../Zotlabs/Module/Photos.php:1069
+#: ../../Code/Module/Photos.php:1069
 msgid "Enter a new album name"
 msgstr "Введите новое название альбома"
 
-#: ../../Zotlabs/Module/Photos.php:1070
+#: ../../Code/Module/Photos.php:1070
 msgid "or select an existing one (doubleclick)"
 msgstr "или выбрать существующую (двойной щелчок)"
 
-#: ../../Zotlabs/Module/Photos.php:1075
+#: ../../Code/Module/Photos.php:1075
 msgid "Add a Tag"
 msgstr "Добавить тег"
 
-#: ../../Zotlabs/Module/Photos.php:1083
+#: ../../Code/Module/Photos.php:1083
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../Zotlabs/Module/Photos.php:1086
+#: ../../Code/Module/Photos.php:1086
 msgid "Flag as adult in album view"
 msgstr "Пометить как альбом \"для взрослых\""
 
-#: ../../Zotlabs/Module/Photos.php:1270
+#: ../../Code/Module/Photos.php:1270
 msgid "Photo Tools"
 msgstr "Фото-Инструменты"
 
-#: ../../Zotlabs/Module/Photos.php:1279
+#: ../../Code/Module/Photos.php:1279
 msgid "In This Photo:"
 msgstr "На этой фотографии:"
 
-#: ../../Zotlabs/Module/Photos.php:1284
+#: ../../Code/Module/Photos.php:1284
 msgid "Map"
 msgstr "Карта"
 
-#: ../../Zotlabs/Module/Pubsites.php:27
+#: ../../Code/Module/Pubsites.php:27
 msgid ""
 "The listed hubs allow public registration for the $Projectname network. All "
 "hubs in the network are interlinked so membership on any of them conveys "
@@ -8960,790 +8960,790 @@ msgid ""
 "additional details."
 msgstr "Указанные хабы разрешают публичную регистрацию для сети $Projectname. Все хабы в сети взаимосвязаны, поэтому членство в любом из них передает членство во всю сеть. Некоторым хабам может потребоваться подписка или предоставление многоуровневых планов обслуживания. Сам хаб может предоставить дополнительные сведения."
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr "URL сервера"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr "Тип доступа"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr "Политика регистрации"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Stats"
 msgstr "Статистика"
 
-#: ../../Zotlabs/Module/Pubsites.php:33
+#: ../../Code/Module/Pubsites.php:33
 msgid "Software"
 msgstr "Программное обеспечение"
 
-#: ../../Zotlabs/Module/Pubsites.php:49
+#: ../../Code/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Оценка"
 
-#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:246
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Wiki.php:204
+#: ../../Code/Module/Pubsites.php:60 ../../Code/Module/Events.php:694
+#: ../../Code/Module/Layouts.php:198 ../../Code/Module/Webpages.php:246
+#: ../../Code/Module/Blocks.php:166 ../../Code/Module/Wiki.php:204
 msgid "View"
 msgstr "Просмотр"
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+#: ../../Code/Module/Connect.php:61 ../../Code/Module/Connect.php:109
 msgid "Continue"
 msgstr "Продолжить"
 
-#: ../../Zotlabs/Module/Connect.php:90
+#: ../../Code/Module/Connect.php:90
 msgid "Premium Channel Setup"
 msgstr "Установка премиум канала"
 
-#: ../../Zotlabs/Module/Connect.php:92
+#: ../../Code/Module/Connect.php:92
 msgid "Enable premium channel connection restrictions"
 msgstr "Включить ограничения для премиум канала"
 
-#: ../../Zotlabs/Module/Connect.php:93
+#: ../../Code/Module/Connect.php:93
 msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr "Пожалуйста введите ваши ограничения или условия, такие, как оплата PayPal, правила использования и т.п."
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Code/Module/Connect.php:95 ../../Code/Module/Connect.php:115
 msgid ""
 "This channel may require additional steps or acknowledgement of the "
 "following conditions prior to connecting:"
 msgstr "Этот канал до подключения может требовать дополнительных шагов или подтверждений следующих условий:"
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Code/Module/Connect.php:96
 msgid ""
 "Potential connections will then see the following text before proceeding:"
 msgstr "Потенциальные соединения будут видеть следующий предварительный текст:"
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Code/Module/Connect.php:97 ../../Code/Module/Connect.php:118
 msgid ""
 "By continuing, I certify that I have complied with any instructions provided "
 "on this page."
 msgstr "Продолжая, я подтверждаю что я выполнил все условия представленные на данной странице."
 
-#: ../../Zotlabs/Module/Connect.php:106
+#: ../../Code/Module/Connect.php:106
 msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr "(Владельцем канала не было представлено никаких специальных инструкций.)"
 
-#: ../../Zotlabs/Module/Connect.php:114
+#: ../../Code/Module/Connect.php:114
 msgid "Restricted or Premium Channel"
 msgstr "Ограниченный или Премиум канал"
 
-#: ../../Zotlabs/Module/Poke.php:183
+#: ../../Code/Module/Poke.php:183
 msgid "Poke somebody"
 msgstr "Ткнуть кого-нибудь"
 
-#: ../../Zotlabs/Module/Poke.php:186
+#: ../../Code/Module/Poke.php:186
 msgid "Poke/Prod"
 msgstr "Толкнуть / подтолкнуть"
 
-#: ../../Zotlabs/Module/Poke.php:187
+#: ../../Code/Module/Poke.php:187
 msgid "Poke, prod or do other things to somebody"
 msgstr "Толкнуть, подтолкнуть или сделать что-то ещё с кем-то"
 
-#: ../../Zotlabs/Module/Poke.php:194
+#: ../../Code/Module/Poke.php:194
 msgid "Recipient"
 msgstr "Получатель"
 
-#: ../../Zotlabs/Module/Poke.php:195
+#: ../../Code/Module/Poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr "Выбрать что вы хотите сделать с получателем"
 
-#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199
+#: ../../Code/Module/Poke.php:198 ../../Code/Module/Poke.php:199
 msgid "Make this post private"
 msgstr "Сделать эту публикацию приватной"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
+#: ../../Code/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr "Невозможно найти ваш сервер"
 
-#: ../../Zotlabs/Module/Oexchange.php:41
+#: ../../Code/Module/Oexchange.php:41
 msgid "Post successful."
 msgstr "Успешно опубликовано."
 
-#: ../../Zotlabs/Module/Impel.php:183
+#: ../../Code/Module/Impel.php:183
 #, php-format
 msgid "%s element installed"
 msgstr "%s элемент установлен"
 
-#: ../../Zotlabs/Module/Impel.php:186
+#: ../../Code/Module/Impel.php:186
 #, php-format
 msgid "%s element installation failed"
 msgstr "%sустановка элемента неудачна."
 
-#: ../../Zotlabs/Module/Ping.php:332
+#: ../../Code/Module/Ping.php:332
 msgid "sent you a private message"
 msgstr "отправил вам личное сообщение"
 
-#: ../../Zotlabs/Module/Ping.php:385
+#: ../../Code/Module/Ping.php:385
 msgid "added your channel"
 msgstr "добавил ваш канал"
 
-#: ../../Zotlabs/Module/Ping.php:409
+#: ../../Code/Module/Ping.php:409
 msgid "requires approval"
 msgstr "Требуется подтверждение"
 
-#: ../../Zotlabs/Module/Ping.php:419
+#: ../../Code/Module/Ping.php:419
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../Zotlabs/Module/Ping.php:437
+#: ../../Code/Module/Ping.php:437
 msgid "[today]"
 msgstr "[сегодня]"
 
-#: ../../Zotlabs/Module/Ping.php:446
+#: ../../Code/Module/Ping.php:446
 msgid "posted an event"
 msgstr "событие опубликовано"
 
-#: ../../Zotlabs/Module/Ping.php:479
+#: ../../Code/Module/Ping.php:479
 msgid "shared a file with you"
 msgstr "с вами поделились файлом"
 
-#: ../../Zotlabs/Module/Ping.php:654
+#: ../../Code/Module/Ping.php:654
 msgid "Private forum"
 msgstr "Частный форум"
 
-#: ../../Zotlabs/Module/Ping.php:654
+#: ../../Code/Module/Ping.php:654
 msgid "Public forum"
 msgstr "Публичный форум"
 
-#: ../../Zotlabs/Module/Achievements.php:38
+#: ../../Code/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr "Некоторые предложения о том, что делать, если вы здесь новичок "
 
-#: ../../Zotlabs/Module/Connections.php:55
-#: ../../Zotlabs/Module/Connections.php:112
-#: ../../Zotlabs/Module/Connections.php:256
+#: ../../Code/Module/Connections.php:55
+#: ../../Code/Module/Connections.php:112
+#: ../../Code/Module/Connections.php:256
 msgid "Active"
 msgstr "Активен"
 
-#: ../../Zotlabs/Module/Connections.php:60
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Code/Module/Connections.php:60
+#: ../../Code/Module/Connections.php:164
+#: ../../Code/Module/Connections.php:261
 msgid "Blocked"
 msgstr "Заблокирован"
 
-#: ../../Zotlabs/Module/Connections.php:65
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Code/Module/Connections.php:65
+#: ../../Code/Module/Connections.php:171
+#: ../../Code/Module/Connections.php:260
 msgid "Ignored"
 msgstr "Игнорируется"
 
-#: ../../Zotlabs/Module/Connections.php:70
-#: ../../Zotlabs/Module/Connections.php:185
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Code/Module/Connections.php:70
+#: ../../Code/Module/Connections.php:185
+#: ../../Code/Module/Connections.php:259
 msgid "Hidden"
 msgstr "Скрыт"
 
-#: ../../Zotlabs/Module/Connections.php:75
-#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Code/Module/Connections.php:75
+#: ../../Code/Module/Connections.php:178
 msgid "Archived/Unreachable"
 msgstr "Заархивировано / недоступно"
 
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Code/Module/Connections.php:140
 msgid "Active Connections"
 msgstr "Активные контакты"
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Code/Module/Connections.php:143
 msgid "Show active connections"
 msgstr "Показать активные контакты"
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Code/Module/Connections.php:150
 msgid "Show pending (new) connections"
 msgstr "Просмотр (новых) ожидающих контактов"
 
-#: ../../Zotlabs/Module/Connections.php:167
+#: ../../Code/Module/Connections.php:167
 msgid "Only show blocked connections"
 msgstr "Показать только заблокированные контакты"
 
-#: ../../Zotlabs/Module/Connections.php:174
+#: ../../Code/Module/Connections.php:174
 msgid "Only show ignored connections"
 msgstr "Показать только проигнорированные контакты"
 
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Code/Module/Connections.php:181
 msgid "Only show archived/unreachable connections"
 msgstr "Показать только заархивированные / недоступные контакты"
 
-#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Code/Module/Connections.php:188
 msgid "Only show hidden connections"
 msgstr "Показать только скрытые контакты"
 
-#: ../../Zotlabs/Module/Connections.php:200
-#: ../../Zotlabs/Module/Profperm.php:140
+#: ../../Code/Module/Connections.php:200
+#: ../../Code/Module/Profperm.php:140
 msgid "All Connections"
 msgstr "Все контакты"
 
-#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Code/Module/Connections.php:203
 msgid "Show all connections"
 msgstr "Просмотр всех контактов"
 
-#: ../../Zotlabs/Module/Connections.php:257
+#: ../../Code/Module/Connections.php:257
 msgid "Pending approval"
 msgstr "Ожидающие подтверждения"
 
-#: ../../Zotlabs/Module/Connections.php:258
+#: ../../Code/Module/Connections.php:258
 msgid "Archived"
 msgstr "Зархивирован"
 
-#: ../../Zotlabs/Module/Connections.php:262
+#: ../../Code/Module/Connections.php:262
 msgid "Not connected at this location"
 msgstr "Не подключено в этом месте"
 
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Code/Module/Connections.php:279
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Code/Module/Connections.php:280
 msgid "Edit connection"
 msgstr "Редактировать контакт"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Code/Module/Connections.php:282
 msgid "Delete connection"
 msgstr "Удалить контакт"
 
-#: ../../Zotlabs/Module/Connections.php:291
+#: ../../Code/Module/Connections.php:291
 msgid "Channel address"
 msgstr "Адрес канала"
 
-#: ../../Zotlabs/Module/Connections.php:293
+#: ../../Code/Module/Connections.php:293
 msgid "Network"
 msgstr "Сеть"
 
-#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Code/Module/Connections.php:296
 msgid "Call"
 msgstr "Вызов"
 
-#: ../../Zotlabs/Module/Connections.php:298
+#: ../../Code/Module/Connections.php:298
 msgid "Status"
 msgstr "Статус"
 
-#: ../../Zotlabs/Module/Connections.php:300
+#: ../../Code/Module/Connections.php:300
 msgid "Connected"
 msgstr "Подключено"
 
-#: ../../Zotlabs/Module/Connections.php:302
+#: ../../Code/Module/Connections.php:302
 msgid "Approve connection"
 msgstr "Утвердить контакт"
 
-#: ../../Zotlabs/Module/Connections.php:304
+#: ../../Code/Module/Connections.php:304
 msgid "Ignore connection"
 msgstr "Игнорировать контакт"
 
-#: ../../Zotlabs/Module/Connections.php:305
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connections.php:305
+#: ../../Code/Module/Connedit.php:630
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../../Zotlabs/Module/Connections.php:306
+#: ../../Code/Module/Connections.php:306
 msgid "Recent activity"
 msgstr "Последние действия"
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Code/Module/Connections.php:336
 msgid "Search your connections"
 msgstr "Поиск ваших контактов"
 
-#: ../../Zotlabs/Module/Connections.php:337
+#: ../../Code/Module/Connections.php:337
 msgid "Connections search"
 msgstr "Поиск контаков"
 
-#: ../../Zotlabs/Module/Item.php:194
+#: ../../Code/Module/Item.php:194
 msgid "Unable to locate original post."
 msgstr "Не удалось найти оригинальную публикацию."
 
-#: ../../Zotlabs/Module/Item.php:477
+#: ../../Code/Module/Item.php:477
 msgid "Empty post discarded."
 msgstr "Пустая публикация отклонена."
 
-#: ../../Zotlabs/Module/Item.php:864
+#: ../../Code/Module/Item.php:864
 msgid "Duplicate post suppressed."
 msgstr "Подавлена дублирующаяся публикация."
 
-#: ../../Zotlabs/Module/Item.php:1009
+#: ../../Code/Module/Item.php:1009
 msgid "System error. Post not saved."
 msgstr "Системная ошибка. Публикация не сохранена."
 
-#: ../../Zotlabs/Module/Item.php:1045
+#: ../../Code/Module/Item.php:1045
 msgid "Your comment is awaiting approval."
 msgstr "Ваш комментарий ожидает одобрения."
 
-#: ../../Zotlabs/Module/Item.php:1162
+#: ../../Code/Module/Item.php:1162
 msgid "Unable to obtain post information from database."
 msgstr "Невозможно получить информацию о публикации из базы данных"
 
-#: ../../Zotlabs/Module/Item.php:1191
+#: ../../Code/Module/Item.php:1191
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня."
 
-#: ../../Zotlabs/Module/Item.php:1198
+#: ../../Code/Module/Item.php:1198
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Вы достигли вашего ограничения в %1$.0f  страниц."
 
-#: ../../Zotlabs/Module/Events.php:25
+#: ../../Code/Module/Events.php:25
 msgid "Calendar entries imported."
 msgstr "События календаря импортированы."
 
-#: ../../Zotlabs/Module/Events.php:27
+#: ../../Code/Module/Events.php:27
 msgid "No calendar entries found."
 msgstr "Не найдено событий в календаре."
 
-#: ../../Zotlabs/Module/Events.php:110
+#: ../../Code/Module/Events.php:110
 msgid "Event can not end before it has started."
 msgstr "Событие не может завершиться до его начала."
 
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
+#: ../../Code/Module/Events.php:112 ../../Code/Module/Events.php:121
+#: ../../Code/Module/Events.php:143
 msgid "Unable to generate preview."
 msgstr "Невозможно создать предварительный просмотр."
 
-#: ../../Zotlabs/Module/Events.php:119
+#: ../../Code/Module/Events.php:119
 msgid "Event title and start time are required."
 msgstr "Требуются наименование события и время начала."
 
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+#: ../../Code/Module/Events.php:141 ../../Code/Module/Events.php:265
 msgid "Event not found."
 msgstr "Событие не найдено."
 
-#: ../../Zotlabs/Module/Events.php:460
+#: ../../Code/Module/Events.php:460
 msgid "Edit event title"
 msgstr "Редактировать наименование события"
 
-#: ../../Zotlabs/Module/Events.php:462
+#: ../../Code/Module/Events.php:462
 msgid "Categories (comma-separated list)"
 msgstr "Категории (список через запятую)"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Edit Category"
 msgstr "Редактировать категорию"
 
-#: ../../Zotlabs/Module/Events.php:463
+#: ../../Code/Module/Events.php:463
 msgid "Category"
 msgstr "Категория"
 
-#: ../../Zotlabs/Module/Events.php:466
+#: ../../Code/Module/Events.php:466
 msgid "Edit start date and time"
 msgstr "Редактировать дату и время начала"
 
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+#: ../../Code/Module/Events.php:467 ../../Code/Module/Events.php:470
 msgid "Finish date and time are not known or not relevant"
 msgstr "Дата и время окончания неизвестны или неприменимы"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Edit finish date and time"
 msgstr "Редактировать дату и время окончания"
 
-#: ../../Zotlabs/Module/Events.php:469
+#: ../../Code/Module/Events.php:469
 msgid "Finish date and time"
 msgstr "Дата и время окончания"
 
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+#: ../../Code/Module/Events.php:471 ../../Code/Module/Events.php:472
 msgid "Adjust for viewer timezone"
 msgstr "Настройте просмотр часовых поясов"
 
-#: ../../Zotlabs/Module/Events.php:471
+#: ../../Code/Module/Events.php:471
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Важно для событий, которые происходят в определённом месте. Не подходит для всеобщих праздников."
 
-#: ../../Zotlabs/Module/Events.php:473
+#: ../../Code/Module/Events.php:473
 msgid "Edit Description"
 msgstr "Редактировать описание"
 
-#: ../../Zotlabs/Module/Events.php:475
+#: ../../Code/Module/Events.php:475
 msgid "Edit Location"
 msgstr "Редактировать местоположение"
 
-#: ../../Zotlabs/Module/Events.php:489
+#: ../../Code/Module/Events.php:489
 msgid "Timezone:"
 msgstr "Часовой пояс:"
 
-#: ../../Zotlabs/Module/Events.php:494
+#: ../../Code/Module/Events.php:494
 msgid "Advanced Options"
 msgstr "Дополнительные настройки"
 
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266
+#: ../../Code/Module/Events.php:605 ../../Code/Module/Cal.php:266
 msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:633
+#: ../../Code/Module/Events.php:633
 msgid "Edit event"
 msgstr "Редактировать событие"
 
-#: ../../Zotlabs/Module/Events.php:635
+#: ../../Code/Module/Events.php:635
 msgid "Delete event"
 msgstr "Удалить событие"
 
-#: ../../Zotlabs/Module/Events.php:669
+#: ../../Code/Module/Events.php:669
 msgid "calendar"
 msgstr "календарь"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Edit Event"
 msgstr "Редактировать событие"
 
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338
+#: ../../Code/Module/Events.php:688 ../../Code/Module/Cal.php:338
 msgid "Create Event"
 msgstr "Создать событие"
 
-#: ../../Zotlabs/Module/Events.php:731
+#: ../../Code/Module/Events.php:731
 msgid "Event removed"
 msgstr "Событие удалено"
 
-#: ../../Zotlabs/Module/Events.php:734
+#: ../../Code/Module/Events.php:734
 msgid "Failed to remove event"
 msgstr "Не удалось удалить событие"
 
-#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Code/Module/Layouts.php:129 ../../Code/Module/Layouts.php:189
+#: ../../Code/Module/Editlayout.php:128
 msgid "Layout Name"
 msgstr "Название шаблона"
 
-#: ../../Zotlabs/Module/Layouts.php:132 ../../Zotlabs/Module/Editlayout.php:129
+#: ../../Code/Module/Layouts.php:132 ../../Code/Module/Editlayout.php:129
 msgid "Layout Description (Optional)"
 msgstr "Описание шаблона (необязательно)"
 
-#: ../../Zotlabs/Module/Layouts.php:186
+#: ../../Code/Module/Layouts.php:186
 msgid "Comanche page description language help"
 msgstr "Помощь по языку описания страниц Comanche "
 
-#: ../../Zotlabs/Module/Layouts.php:190
+#: ../../Code/Module/Layouts.php:190
 msgid "Layout Description"
 msgstr "Описание шаблона"
 
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177
+#: ../../Code/Module/Layouts.php:191 ../../Code/Module/Webpages.php:251
+#: ../../Code/Module/Blocks.php:157 ../../Code/Module/Menu.php:177
 msgid "Created"
 msgstr "Создано"
 
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178
+#: ../../Code/Module/Layouts.php:192 ../../Code/Module/Webpages.php:252
+#: ../../Code/Module/Blocks.php:158 ../../Code/Module/Menu.php:178
 msgid "Edited"
 msgstr "Отредактировано"
 
-#: ../../Zotlabs/Module/Layouts.php:195
+#: ../../Code/Module/Layouts.php:195
 msgid "Download PDL file"
 msgstr "Загрузить PDL файл"
 
-#: ../../Zotlabs/Module/Notifications.php:55 ../../Zotlabs/Module/Notify.php:61
+#: ../../Code/Module/Notifications.php:55 ../../Code/Module/Notify.php:61
 msgid "No more system notifications."
 msgstr "Нет новых оповещений системы."
 
-#: ../../Zotlabs/Module/Notifications.php:59 ../../Zotlabs/Module/Notify.php:65
+#: ../../Code/Module/Notifications.php:59 ../../Code/Module/Notify.php:65
 msgid "System Notifications"
 msgstr "Системные оповещения "
 
-#: ../../Zotlabs/Module/Pdledit.php:21
+#: ../../Code/Module/Pdledit.php:21
 msgid "Layout updated."
 msgstr "Шаблон обновлен."
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219
+#: ../../Code/Module/Pdledit.php:34 ../../Code/Module/Chat.php:219
 msgid "Feature disabled."
 msgstr "Функция отключена."
 
-#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90
+#: ../../Code/Module/Pdledit.php:47 ../../Code/Module/Pdledit.php:90
 msgid "Edit System Page Description"
 msgstr "Редактировать описание системной страницы"
 
-#: ../../Zotlabs/Module/Pdledit.php:68
+#: ../../Code/Module/Pdledit.php:68
 msgid "(modified)"
 msgstr "(изменено)"
 
-#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133
+#: ../../Code/Module/Pdledit.php:68 ../../Code/Module/Lostpass.php:133
 msgid "Reset"
 msgstr "Сбросить"
 
-#: ../../Zotlabs/Module/Pdledit.php:85
+#: ../../Code/Module/Pdledit.php:85
 msgid "Layout not found."
 msgstr "Шаблон не найден."
 
-#: ../../Zotlabs/Module/Pdledit.php:91
+#: ../../Code/Module/Pdledit.php:91
 msgid "Module Name:"
 msgstr "Имя модуля:"
 
-#: ../../Zotlabs/Module/Pdledit.php:92
+#: ../../Code/Module/Pdledit.php:92
 msgid "Layout Help"
 msgstr "Помощь к шаблону"
 
-#: ../../Zotlabs/Module/Pdledit.php:93
+#: ../../Code/Module/Pdledit.php:93
 msgid "Edit another layout"
 msgstr "Редактировать другой шаблон"
 
-#: ../../Zotlabs/Module/Pdledit.php:94
+#: ../../Code/Module/Pdledit.php:94
 msgid "System layout"
 msgstr "Системный шаблон"
 
-#: ../../Zotlabs/Module/Mail.php:73
+#: ../../Code/Module/Mail.php:73
 msgid "Unable to lookup recipient."
 msgstr "Не удалось найти получателя."
 
-#: ../../Zotlabs/Module/Mail.php:80
+#: ../../Code/Module/Mail.php:80
 msgid "Unable to communicate with requested channel."
 msgstr "Не удалось установить связь с запрашиваемым каналом."
 
-#: ../../Zotlabs/Module/Mail.php:87
+#: ../../Code/Module/Mail.php:87
 msgid "Cannot verify requested channel."
 msgstr "Не удалось установить подлинность требуемого канала."
 
-#: ../../Zotlabs/Module/Mail.php:105
+#: ../../Code/Module/Mail.php:105
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Выбранный канал ограничивает частные сообщения. Отправка не удалась."
 
-#: ../../Zotlabs/Module/Mail.php:160
+#: ../../Code/Module/Mail.php:160
 msgid "Messages"
 msgstr "Сообщения"
 
-#: ../../Zotlabs/Module/Mail.php:173
+#: ../../Code/Module/Mail.php:173
 msgid "message"
 msgstr "сообщение"
 
-#: ../../Zotlabs/Module/Mail.php:214
+#: ../../Code/Module/Mail.php:214
 msgid "Message recalled."
 msgstr "Сообщение отозванно."
 
-#: ../../Zotlabs/Module/Mail.php:227
+#: ../../Code/Module/Mail.php:227
 msgid "Conversation removed."
 msgstr "Беседа удалена."
 
-#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
+#: ../../Code/Module/Mail.php:242 ../../Code/Module/Mail.php:363
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Истекает YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:270
+#: ../../Code/Module/Mail.php:270
 msgid "Requested channel is not in this network"
 msgstr "Запрашиваемый канал не доступен."
 
-#: ../../Zotlabs/Module/Mail.php:278
+#: ../../Code/Module/Mail.php:278
 msgid "Send Private Message"
 msgstr "Отправить личное сообщение"
 
-#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
+#: ../../Code/Module/Mail.php:279 ../../Code/Module/Mail.php:421
 msgid "To:"
 msgstr "Кому:"
 
-#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
+#: ../../Code/Module/Mail.php:282 ../../Code/Module/Mail.php:423
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../../Zotlabs/Module/Mail.php:285 ../../Zotlabs/Module/Invite.php:140
+#: ../../Code/Module/Mail.php:285 ../../Code/Module/Invite.php:140
 msgid "Your message:"
 msgstr "Сообщение:"
 
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
+#: ../../Code/Module/Mail.php:287 ../../Code/Module/Mail.php:429
 msgid "Attach file"
 msgstr "Прикрепить файл"
 
-#: ../../Zotlabs/Module/Mail.php:289
+#: ../../Code/Module/Mail.php:289
 msgid "Send"
 msgstr "Отправить"
 
-#: ../../Zotlabs/Module/Mail.php:393
+#: ../../Code/Module/Mail.php:393
 msgid "Delete message"
 msgstr "Удалить сообщение"
 
-#: ../../Zotlabs/Module/Mail.php:394
+#: ../../Code/Module/Mail.php:394
 msgid "Delivery report"
 msgstr "Отчёт о доставке"
 
-#: ../../Zotlabs/Module/Mail.php:395
+#: ../../Code/Module/Mail.php:395
 msgid "Recall message"
 msgstr "Отозвать сообщение"
 
-#: ../../Zotlabs/Module/Mail.php:397
+#: ../../Code/Module/Mail.php:397
 msgid "Message has been recalled."
 msgstr "Сообщение отозванно"
 
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Code/Module/Mail.php:414
 msgid "Delete Conversation"
 msgstr "Удалить беседу"
 
-#: ../../Zotlabs/Module/Mail.php:416
+#: ../../Code/Module/Mail.php:416
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "Безопасная связь недоступна. Вы можете попытаться ответить со страницы профиля отправителя."
 
-#: ../../Zotlabs/Module/Mail.php:420
+#: ../../Code/Module/Mail.php:420
 msgid "Send Reply"
 msgstr "Отправить ответ"
 
-#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Code/Module/Mail.php:425
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Ваше сообщение для %s (%s):"
 
-#: ../../Zotlabs/Module/Removeme.php:35
+#: ../../Code/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."
 
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Code/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Удалить этот канал"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
+#: ../../Code/Module/Changeaddr.php:78
 msgid "WARNING: "
 msgstr "ПРЕДУПРЕЖДЕНИЕ:"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Code/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Этот канал будет полностью удалён из сети."
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeme.php:61
+#: ../../Code/Module/Removeaccount.php:58
 msgid "This action is permanent and can not be undone!"
 msgstr "Это действие необратимо и не может быть отменено!"
 
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Changeaddr.php:79
+#: ../../Code/Module/Removeme.php:62
+#: ../../Code/Module/Removeaccount.php:59
+#: ../../Code/Module/Changeaddr.php:79
 msgid "Please enter your password for verification:"
 msgstr "Пожалуйста, введите ваш пароль для проверки:"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Удалить этот канал и все его клоны из сети"
 
-#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Code/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:622
+#: ../../Code/Module/Removeme.php:64
+#: ../../Code/Module/Settings/Channel.php:622
 msgid "Remove Channel"
 msgstr "Удаление канала"
 
-#: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Channel.php:164
-#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Network.php:204
-#: ../../Zotlabs/Module/Display.php:81
+#: ../../Code/Module/Hq.php:134 ../../Code/Module/Channel.php:164
+#: ../../Code/Module/Pubstream.php:80 ../../Code/Module/Network.php:204
+#: ../../Code/Module/Display.php:81
 msgid "Reset form"
 msgstr "Очистить форму"
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "Welcome to Hubzilla!"
 msgstr "Добро пожаловать в Hubzilla!"
 
-#: ../../Zotlabs/Module/Hq.php:140
+#: ../../Code/Module/Hq.php:140
 msgid "You have got no unseen posts..."
 msgstr "У вас нет видимых публикаций..."
 
-#: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Article_edit.php:17
-#: ../../Zotlabs/Module/Article_edit.php:33
+#: ../../Code/Module/Card_edit.php:17 ../../Code/Module/Card_edit.php:33
+#: ../../Code/Module/Editblock.php:79 ../../Code/Module/Editblock.php:95
+#: ../../Code/Module/Editpost.php:24 ../../Code/Module/Editwebpage.php:80
+#: ../../Code/Module/Editlayout.php:79
+#: ../../Code/Module/Article_edit.php:17
+#: ../../Code/Module/Article_edit.php:33
 msgid "Item not found"
 msgstr "Элемент не найден"
 
-#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Block.php:41
-#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Wall_upload.php:31
-#: ../../Zotlabs/Module/Article_edit.php:44
-#: ../../Zotlabs/Module/Chanview.php:96
+#: ../../Code/Module/Card_edit.php:44 ../../Code/Module/Block.php:41
+#: ../../Code/Module/Page.php:75 ../../Code/Module/Cal.php:62
+#: ../../Code/Module/Wall_upload.php:31
+#: ../../Code/Module/Article_edit.php:44
+#: ../../Code/Module/Chanview.php:96
 msgid "Channel not found."
 msgstr "Канал не найден."
 
-#: ../../Zotlabs/Module/Card_edit.php:128
+#: ../../Code/Module/Card_edit.php:128
 msgid "Edit Card"
 msgstr "Редактировать карточку"
 
-#: ../../Zotlabs/Module/Xchan.php:10
+#: ../../Code/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr "Поиск Xchan"
 
-#: ../../Zotlabs/Module/Xchan.php:13
+#: ../../Code/Module/Xchan.php:13
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Запрос Xchan начинается с (или webbie):"
 
-#: ../../Zotlabs/Module/Xchan.php:41 ../../Zotlabs/Module/Mitem.php:134
-#: ../../Zotlabs/Module/Menu.php:231
+#: ../../Code/Module/Xchan.php:41 ../../Code/Module/Mitem.php:134
+#: ../../Code/Module/Menu.php:231
 msgid "Not found."
 msgstr "Не найдено."
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Code/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "Нет предложений. Если это новый сайт, повторите попытку через 24 часа."
 
-#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37
-#: ../../Zotlabs/Module/Profile.php:45
+#: ../../Code/Module/Channel.php:50 ../../Code/Module/Hcard.php:37
+#: ../../Code/Module/Profile.php:45
 msgid "Posts and comments"
 msgstr "Публикации и комментарии"
 
-#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44
-#: ../../Zotlabs/Module/Profile.php:52
+#: ../../Code/Module/Channel.php:57 ../../Code/Module/Hcard.php:44
+#: ../../Code/Module/Profile.php:52
 msgid "Only posts"
 msgstr "Только публикации"
 
-#: ../../Zotlabs/Module/Channel.php:112
+#: ../../Code/Module/Channel.php:112
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Недостаточно прав. Запрос перенаправлен на страницу профиля."
 
-#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174
+#: ../../Code/Module/Channel.php:129 ../../Code/Module/Network.php:174
 msgid "Search Results For:"
 msgstr "Результаты поиска для:"
 
-#: ../../Zotlabs/Module/Help.php:23
+#: ../../Code/Module/Help.php:23
 msgid "Documentation Search"
 msgstr "Поиск документации"
 
-#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:126
+#: ../../Code/Module/Help.php:81 ../../Code/Module/Group.php:126
 msgid "Members"
 msgstr "Участники"
 
-#: ../../Zotlabs/Module/Help.php:82
+#: ../../Code/Module/Help.php:82
 msgid "Administrators"
 msgstr "Администраторы"
 
-#: ../../Zotlabs/Module/Help.php:83
+#: ../../Code/Module/Help.php:83
 msgid "Developers"
 msgstr "Разработчики"
 
-#: ../../Zotlabs/Module/Help.php:84
+#: ../../Code/Module/Help.php:84
 msgid "Tutorials"
 msgstr "Руководства"
 
-#: ../../Zotlabs/Module/Help.php:95
+#: ../../Code/Module/Help.php:95
 msgid "$Projectname Documentation"
 msgstr "$Projectname Документация"
 
-#: ../../Zotlabs/Module/Help.php:96
+#: ../../Code/Module/Help.php:96
 msgid "Contents"
 msgstr "Содержимое"
 
-#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
+#: ../../Code/Module/Regdir.php:49 ../../Code/Module/Dirsearch.php:25
 msgid "This site is not a directory server"
 msgstr "Этот сайт не является сервером каталога"
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+#: ../../Code/Module/Uexport.php:57 ../../Code/Module/Uexport.php:58
 msgid "Export Channel"
 msgstr "Экспорт канала"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Code/Module/Uexport.php:59
 msgid ""
 "Export your basic channel information to a file.  This acts as a backup of "
 "your connections, permissions, profile and basic data, which can be used to "
 "import your data to a new server hub, but does not contain your content."
 msgstr "Экспортировать основную информацию из канала в файл. Служит в качестве резервной копии ваших контактов, основных данных и профиля, однако не включает содержимое. Может быть использовано для импорта ваши данных на новый сервер."
 
-#: ../../Zotlabs/Module/Uexport.php:60
+#: ../../Code/Module/Uexport.php:60
 msgid "Export Content"
 msgstr "Экспортировать содержимое"
 
-#: ../../Zotlabs/Module/Uexport.php:61
+#: ../../Code/Module/Uexport.php:61
 msgid ""
 "Export your channel information and recent content to a JSON backup that can "
 "be restored or imported to another server hub. This backs up all of your "
@@ -9752,11 +9752,11 @@ msgid ""
 "this download to begin."
 msgstr "Экспортировать информацию из вашего канала и его содержимое в резервную копию в формате JSON которая может быть использована для восстановления или импорта на другом сервере. Сохраняет все ваши контакты, разрешения, данные профиля и публикации за несколько месяцев. Файл может иметь очень большой размер. Пожалуйста, будьте терпеливы и подождите несколько минут пока не начнётся загрузка."
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Code/Module/Uexport.php:63
 msgid "Export your posts from a given year."
 msgstr "Экспортировать ваши публикации за данный год."
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Code/Module/Uexport.php:65
 msgid ""
 "You may also export your posts and conversations for a particular year or "
 "month. Adjust the date in your browser location bar to select other dates. "
@@ -9764,21 +9764,21 @@ msgid ""
 "please try again selecting a more limited date range."
 msgstr "Вы также можете экспортировать ваши публикации и беседы за определённый месяц или год. Выберите дату в панели местоположения в браузере. Если экспорт будет неудачным (это возможно, например, из-за исчерпания памяти на сервере), повторите попытку, выбрав меньший диапазон дат."
 
-#: ../../Zotlabs/Module/Uexport.php:66
+#: ../../Code/Module/Uexport.php:66
 #, php-format
 msgid ""
 "To select all posts for a given year, such as this year, visit %2$s"
 msgstr "Для выбора всех публикаций заданного года, например текущего, посетите %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:67
+#: ../../Code/Module/Uexport.php:67
 #, php-format
 msgid ""
 "To select all posts for a given month, such as January of this year, visit "
 "%2$s"
 msgstr "Для выбора всех публикаций заданного месяца, например за январь сего года, посетите %2$s"
 
-#: ../../Zotlabs/Module/Uexport.php:68
+#: ../../Code/Module/Uexport.php:68
 #, php-format
 msgid ""
 "These content files may be imported or restored by visiting "
@@ -9786,357 +9786,357 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr "Данные файлы с содержимым могут быть импортированы и восстановлены на любом содержащем ваш канал сайте. Посетите %2$s. Для лучших результатов пожалуйста производите импорт и восстановление в порядке датировки (старые сначала)."
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
+#: ../../Code/Module/Chatsvc.php:131
 msgid "Away"
 msgstr "Нет на месте"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
+#: ../../Code/Module/Chatsvc.php:136
 msgid "Online"
 msgstr "В сети"
 
-#: ../../Zotlabs/Module/Block.php:29 ../../Zotlabs/Module/Page.php:39
+#: ../../Code/Module/Block.php:29 ../../Code/Module/Page.php:39
 msgid "Invalid item."
 msgstr "Недействительный элемент."
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+#: ../../Code/Module/Api.php:74 ../../Code/Module/Api.php:95
 msgid "Authorize application connection"
 msgstr "Авторизовать подключение приложения"
 
-#: ../../Zotlabs/Module/Api.php:75
+#: ../../Code/Module/Api.php:75
 msgid "Return to your app and insert this Security Code:"
 msgstr "Вернитесь к своему приложению и вставьте этот код безопасности:"
 
-#: ../../Zotlabs/Module/Api.php:85
+#: ../../Code/Module/Api.php:85
 msgid "Please login to continue."
 msgstr "Пожалуйста, войдите, чтобы продолжить."
 
-#: ../../Zotlabs/Module/Api.php:97
+#: ../../Code/Module/Api.php:97
 msgid ""
 "Do you want to authorize this application to access your posts and contacts, "
 "and/or create new posts for you?"
 msgstr "Вы хотите авторизовать это приложение для доступа к вашим публикациям и контактам и / или созданию новых публикаций?"
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
+#: ../../Code/Module/Viewsrc.php:43
 msgid "item"
 msgstr "пункт"
 
-#: ../../Zotlabs/Module/Ratings.php:70
+#: ../../Code/Module/Ratings.php:70
 msgid "No ratings"
 msgstr "Оценок нет"
 
-#: ../../Zotlabs/Module/Ratings.php:98
+#: ../../Code/Module/Ratings.php:98
 msgid "Rating: "
 msgstr "Оценкa:"
 
-#: ../../Zotlabs/Module/Ratings.php:99
+#: ../../Code/Module/Ratings.php:99
 msgid "Website: "
 msgstr "Веб-сайт:"
 
-#: ../../Zotlabs/Module/Ratings.php:101
+#: ../../Code/Module/Ratings.php:101
 msgid "Description: "
 msgstr "Описание:"
 
-#: ../../Zotlabs/Module/Sources.php:38
+#: ../../Code/Module/Sources.php:38
 msgid "Failed to create source. No channel selected."
 msgstr "Не удалось создать источник. Канал не выбран."
 
-#: ../../Zotlabs/Module/Sources.php:54
+#: ../../Code/Module/Sources.php:54
 msgid "Source created."
 msgstr "Источник создан."
 
-#: ../../Zotlabs/Module/Sources.php:67
+#: ../../Code/Module/Sources.php:67
 msgid "Source updated."
 msgstr "Источник обновлен."
 
-#: ../../Zotlabs/Module/Sources.php:93
+#: ../../Code/Module/Sources.php:93
 msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:100
+#: ../../Code/Module/Sources.php:100
 msgid "Manage remote sources of content for your channel."
 msgstr "Управлять удалённым источниками содержимого для вашего канала"
 
-#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111
+#: ../../Code/Module/Sources.php:101 ../../Code/Module/Sources.php:111
 msgid "New Source"
 msgstr "Новый источник"
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146
+#: ../../Code/Module/Sources.php:112 ../../Code/Module/Sources.php:146
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Импортировать всё или выбранное содержимое из следующего канала в этот канал и распределить его в соответствии с вашими настройками."
 
-#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:113 ../../Code/Module/Sources.php:147
 msgid "Only import content with these words (one per line)"
 msgstr "Импортировать содержимое только с этим текстом (построчно)"
 
-#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147
+#: ../../Code/Module/Sources.php:113 ../../Code/Module/Sources.php:147
 msgid "Leave blank to import all public content"
 msgstr "Оставьте пустым для импорта всего общедоступного содержимого"
 
-#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153
+#: ../../Code/Module/Sources.php:114 ../../Code/Module/Sources.php:153
 msgid "Channel Name"
 msgstr "Название канала"
 
-#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150
+#: ../../Code/Module/Sources.php:115 ../../Code/Module/Sources.php:150
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr "Добавить следующие категории к импортированным публикациям из этого источника (через запятые)"
 
-#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Sources.php:115 ../../Code/Module/Sources.php:150
+#: ../../Code/Module/Settings/Oauth.php:94
 msgid "Optional"
 msgstr "Необязательно"
 
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
+#: ../../Code/Module/Sources.php:116 ../../Code/Module/Sources.php:151
 msgid "Resend posts with this channel as author"
 msgstr "Отправить публикации в этот канал повторно как автор"
 
-#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151
+#: ../../Code/Module/Sources.php:116 ../../Code/Module/Sources.php:151
 msgid "Copyrights may apply"
 msgstr "Могут применяться авторские права"
 
-#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166
+#: ../../Code/Module/Sources.php:136 ../../Code/Module/Sources.php:166
 msgid "Source not found."
 msgstr "Источник не найден."
 
-#: ../../Zotlabs/Module/Sources.php:143
+#: ../../Code/Module/Sources.php:143
 msgid "Edit Source"
 msgstr "Редактировать источник"
 
-#: ../../Zotlabs/Module/Sources.php:144
+#: ../../Code/Module/Sources.php:144
 msgid "Delete Source"
 msgstr "Удалить источник"
 
-#: ../../Zotlabs/Module/Sources.php:174
+#: ../../Code/Module/Sources.php:174
 msgid "Source removed"
 msgstr "Источник удален"
 
-#: ../../Zotlabs/Module/Sources.php:176
+#: ../../Code/Module/Sources.php:176
 msgid "Unable to remove source."
 msgstr "Невозможно удалить источник."
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Code/Module/Siteinfo.php:21
 msgid "About this site"
 msgstr "Об этом сайте"
 
-#: ../../Zotlabs/Module/Siteinfo.php:22
+#: ../../Code/Module/Siteinfo.php:22
 msgid "Site Name"
 msgstr "Название сайта"
 
-#: ../../Zotlabs/Module/Siteinfo.php:24 ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Siteinfo.php:24 ../../Code/Module/Admin/Site.php:325
 msgid "Site Information"
 msgstr "Информация о сайте"
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
+#: ../../Code/Module/Siteinfo.php:26
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241
+#: ../../Code/Module/Siteinfo.php:28 ../../Code/Module/Register.php:241
 msgid "Terms of Service"
 msgstr "Условия предоставления услуг"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
+#: ../../Code/Module/Siteinfo.php:29
 msgid "Software and Project information"
 msgstr "Информация о программном обеспечении и проекте"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Code/Module/Siteinfo.php:30
 msgid "This site is powered by $Projectname"
 msgstr "Этот сайт работает на $Projectname"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../Code/Module/Siteinfo.php:31
 msgid ""
 "Federated and decentralised networking and identity services provided by Zot"
 msgstr "Объединенные и децентрализованные сети и службы идентификациии обеспечиваются Zot"
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
+#: ../../Code/Module/Siteinfo.php:34
 msgid "Additional federated transport protocols:"
 msgstr "Дополнительные федеративные транспортные протоколы:"
 
-#: ../../Zotlabs/Module/Siteinfo.php:36
+#: ../../Code/Module/Siteinfo.php:36
 #, php-format
 msgid "Version %s"
 msgstr "Версия %s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:37
+#: ../../Code/Module/Siteinfo.php:37
 msgid "Project homepage"
 msgstr "Домашняя страница проекта"
 
-#: ../../Zotlabs/Module/Siteinfo.php:38
+#: ../../Code/Module/Siteinfo.php:38
 msgid "Developer homepage"
 msgstr "Домашняя страница разработчика"
 
-#: ../../Zotlabs/Module/Profile_photo.php:66
-#: ../../Zotlabs/Module/Cover_photo.php:57
+#: ../../Code/Module/Profile_photo.php:66
+#: ../../Code/Module/Cover_photo.php:57
 msgid "Image uploaded but image cropping failed."
 msgstr "Изображение загружено но обрезка не удалась."
 
-#: ../../Zotlabs/Module/Profile_photo.php:142
-#: ../../Zotlabs/Module/Cover_photo.php:191
+#: ../../Code/Module/Profile_photo.php:142
+#: ../../Code/Module/Cover_photo.php:191
 msgid "Image resize failed."
 msgstr "Не удалось изменить размер изображения."
 
-#: ../../Zotlabs/Module/Profile_photo.php:260
-#: ../../Zotlabs/Module/Cover_photo.php:229
+#: ../../Code/Module/Profile_photo.php:260
+#: ../../Code/Module/Cover_photo.php:229
 msgid "Image upload failed."
 msgstr "Загрузка изображения не удалась."
 
-#: ../../Zotlabs/Module/Profile_photo.php:279
-#: ../../Zotlabs/Module/Cover_photo.php:246
+#: ../../Code/Module/Profile_photo.php:279
+#: ../../Code/Module/Cover_photo.php:246
 msgid "Unable to process image."
 msgstr "Невозможно обработать изображение."
 
-#: ../../Zotlabs/Module/Profile_photo.php:343
-#: ../../Zotlabs/Module/Profile_photo.php:390
-#: ../../Zotlabs/Module/Cover_photo.php:339
-#: ../../Zotlabs/Module/Cover_photo.php:354
+#: ../../Code/Module/Profile_photo.php:343
+#: ../../Code/Module/Profile_photo.php:390
+#: ../../Code/Module/Cover_photo.php:339
+#: ../../Code/Module/Cover_photo.php:354
 msgid "Photo not available."
 msgstr "Фотография недоступна."
 
-#: ../../Zotlabs/Module/Profile_photo.php:454
+#: ../../Code/Module/Profile_photo.php:454
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
 msgstr "Фотография вашего профиля по умолчанию видна всем в Интернете. Фотографияпрофиля для альтернативных профилей наследуют разрешения текущего профиля"
 
-#: ../../Zotlabs/Module/Profile_photo.php:454
+#: ../../Code/Module/Profile_photo.php:454
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
 msgstr "Фотография вашего профиля видна всем в Интернете и может быть отправлена на другие сайты."
 
-#: ../../Zotlabs/Module/Profile_photo.php:456
-#: ../../Zotlabs/Module/Cover_photo.php:392
+#: ../../Code/Module/Profile_photo.php:456
+#: ../../Code/Module/Cover_photo.php:392
 msgid "Upload File:"
 msgstr "Загрузить файл:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
-#: ../../Zotlabs/Module/Cover_photo.php:393
+#: ../../Code/Module/Profile_photo.php:457
+#: ../../Code/Module/Cover_photo.php:393
 msgid "Select a profile:"
 msgstr "Выбрать профиль:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Code/Module/Profile_photo.php:458
 msgid "Use Photo for Profile"
 msgstr "Использовать фотографию для профиля"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Code/Module/Profile_photo.php:458
 msgid "Change Profile Photo"
 msgstr "Изменить фотографию профиля"
 
-#: ../../Zotlabs/Module/Profile_photo.php:459
+#: ../../Code/Module/Profile_photo.php:459
 msgid "Use"
 msgstr "Использовать"
 
-#: ../../Zotlabs/Module/Profile_photo.php:463
-#: ../../Zotlabs/Module/Profile_photo.php:464
-#: ../../Zotlabs/Module/Cover_photo.php:397
-#: ../../Zotlabs/Module/Cover_photo.php:398
+#: ../../Code/Module/Profile_photo.php:463
+#: ../../Code/Module/Profile_photo.php:464
+#: ../../Code/Module/Cover_photo.php:397
+#: ../../Code/Module/Cover_photo.php:398
 msgid "Use a photo from your albums"
 msgstr "Использовать фотографию из ваших альбомов"
 
-#: ../../Zotlabs/Module/Profile_photo.php:469
-#: ../../Zotlabs/Module/Cover_photo.php:403 ../../Zotlabs/Module/Wiki.php:383
+#: ../../Code/Module/Profile_photo.php:469
+#: ../../Code/Module/Cover_photo.php:403 ../../Code/Module/Wiki.php:383
 msgid "Choose a different album"
 msgstr "Выбрать другой альбом"
 
-#: ../../Zotlabs/Module/Profile_photo.php:474
-#: ../../Zotlabs/Module/Cover_photo.php:409
+#: ../../Code/Module/Profile_photo.php:474
+#: ../../Code/Module/Cover_photo.php:409
 msgid "Select existing photo"
 msgstr "Выбрать существующую фотографию"
 
-#: ../../Zotlabs/Module/Profile_photo.php:493
-#: ../../Zotlabs/Module/Cover_photo.php:426
+#: ../../Code/Module/Profile_photo.php:493
+#: ../../Code/Module/Cover_photo.php:426
 msgid "Crop Image"
 msgstr "Обрезать изображение"
 
-#: ../../Zotlabs/Module/Profile_photo.php:494
-#: ../../Zotlabs/Module/Cover_photo.php:427
+#: ../../Code/Module/Profile_photo.php:494
+#: ../../Code/Module/Cover_photo.php:427
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Пожалуйста настройте обрезку изображения для оптимального просмотра."
 
-#: ../../Zotlabs/Module/Profile_photo.php:496
-#: ../../Zotlabs/Module/Cover_photo.php:429
+#: ../../Code/Module/Profile_photo.php:496
+#: ../../Code/Module/Cover_photo.php:429
 msgid "Done Editing"
 msgstr "Закончить редактирование"
 
-#: ../../Zotlabs/Module/Subthread.php:142
+#: ../../Code/Module/Subthread.php:142
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr "%1$s отслеживает %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Subthread.php:144
+#: ../../Code/Module/Subthread.php:144
 #, php-format
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s прекратил отслеживать %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Common.php:14
+#: ../../Code/Module/Common.php:14
 msgid "No channel."
 msgstr "Канала нет."
 
-#: ../../Zotlabs/Module/Common.php:45
+#: ../../Code/Module/Common.php:45
 msgid "No connections in common."
 msgstr "Общих контактов нет."
 
-#: ../../Zotlabs/Module/Common.php:65
+#: ../../Code/Module/Common.php:65
 msgid "View Common Connections"
 msgstr "Просмотр общий контактов"
 
-#: ../../Zotlabs/Module/Filestorage.php:79
+#: ../../Code/Module/Filestorage.php:79
 msgid "Permission Denied."
 msgstr "Доступ запрещен."
 
-#: ../../Zotlabs/Module/Filestorage.php:112
+#: ../../Code/Module/Filestorage.php:112
 msgid "File not found."
 msgstr "Файл не найден."
 
-#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Code/Module/Filestorage.php:165
 msgid "Edit file permissions"
 msgstr "Редактировать разрешения файла"
 
-#: ../../Zotlabs/Module/Filestorage.php:177
+#: ../../Code/Module/Filestorage.php:177
 msgid "Set/edit permissions"
 msgstr "Редактировать разрешения"
 
-#: ../../Zotlabs/Module/Filestorage.php:178
+#: ../../Code/Module/Filestorage.php:178
 msgid "Include all files and sub folders"
 msgstr "Включить все файлы и подкаталоги"
 
-#: ../../Zotlabs/Module/Filestorage.php:179
+#: ../../Code/Module/Filestorage.php:179
 msgid "Return to file list"
 msgstr "Вернутся к списку файлов"
 
-#: ../../Zotlabs/Module/Filestorage.php:181
+#: ../../Code/Module/Filestorage.php:181
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Копировать / вставить этот код для прикрепления файла к публикации"
 
-#: ../../Zotlabs/Module/Filestorage.php:182
+#: ../../Code/Module/Filestorage.php:182
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Копировать / вставить эту URL для ссылки на файл со страницы"
 
-#: ../../Zotlabs/Module/Filestorage.php:184
+#: ../../Code/Module/Filestorage.php:184
 msgid "Share this file"
 msgstr "Поделиться этим файлом"
 
-#: ../../Zotlabs/Module/Filestorage.php:185
+#: ../../Code/Module/Filestorage.php:185
 msgid "Show URL to this file"
 msgstr "Показать URL этого файла"
 
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Storage/Browser.php:405
+#: ../../Code/Module/Filestorage.php:186
+#: ../../Code/Storage/Browser.php:405
 msgid "Show in your contacts shared folder"
 msgstr "Показать общий каталог в ваших контактах"
 
-#: ../../Zotlabs/Module/Tagger.php:48
+#: ../../Code/Module/Tagger.php:48
 msgid "Post not found."
 msgstr "Публикация не найдена"
 
-#: ../../Zotlabs/Module/Tagger.php:119
+#: ../../Code/Module/Tagger.php:119
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s отметил тегом %2$s %3$s с %4$s"
 
-#: ../../Zotlabs/Module/Page.php:173
+#: ../../Code/Module/Page.php:173
 msgid ""
 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
 "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
@@ -10146,450 +10146,450 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
+#: ../../Code/Module/Editblock.php:113 ../../Code/Module/Blocks.php:97
+#: ../../Code/Module/Blocks.php:155
 msgid "Block Name"
 msgstr "Название блока"
 
-#: ../../Zotlabs/Module/Editblock.php:138
+#: ../../Code/Module/Editblock.php:138
 msgid "Edit Block"
 msgstr "Редактировать блок"
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+#: ../../Code/Module/Editpost.php:38 ../../Code/Module/Editpost.php:43
 msgid "Item is not editable"
 msgstr "Элемент нельзя редактировать"
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144
+#: ../../Code/Module/Editpost.php:108 ../../Code/Module/Rpost.php:144
 msgid "Edit post"
 msgstr "Редактировать сообщение"
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+#: ../../Code/Module/Tagrm.php:48 ../../Code/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr "Тег удалён"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
+#: ../../Code/Module/Tagrm.php:123
 msgid "Remove Item Tag"
 msgstr "Удалить тег элемента"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
+#: ../../Code/Module/Tagrm.php:125
 msgid "Select a tag to remove: "
 msgstr "Выбрать тег для удаления:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../Code/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Code/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Удалить этот аккаунт"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Code/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Этот аккаунт и все его каналы будут полностью удалены из сети."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Удалить этот аккаунт, все его каналы и их клоны из сети."
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Code/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "По умолчанию только представление канала расположенное на данном хабе будет удалено из сети"
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings/Account.php:120
+#: ../../Code/Module/Removeaccount.php:61
+#: ../../Code/Module/Settings/Account.php:120
 msgid "Remove Account"
 msgstr "Удалить аккаунт"
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Code/Module/Admin.php:97
 msgid "Blocked accounts"
 msgstr "Заблокированные аккаунты"
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Code/Module/Admin.php:98
 msgid "Expired accounts"
 msgstr "Просроченные аккаунты"
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Code/Module/Admin.php:99
 msgid "Expiring accounts"
 msgstr "Близкие к просрочке аккаунты"
 
-#: ../../Zotlabs/Module/Admin.php:115 ../../Zotlabs/Module/Locs.php:119
+#: ../../Code/Module/Admin.php:115 ../../Code/Module/Locs.php:119
 msgid "Primary"
 msgstr "Основной"
 
-#: ../../Zotlabs/Module/Admin.php:116
+#: ../../Code/Module/Admin.php:116
 msgid "Clones"
 msgstr "Клоны"
 
-#: ../../Zotlabs/Module/Admin.php:122
+#: ../../Code/Module/Admin.php:122
 msgid "Message queues"
 msgstr "Очередь сообщений"
 
-#: ../../Zotlabs/Module/Admin.php:136
+#: ../../Code/Module/Admin.php:136
 msgid "Your software should be updated"
 msgstr "Ваше программное обеспечение должно быть обновлено"
 
-#: ../../Zotlabs/Module/Admin.php:140 ../../Zotlabs/Module/Admin/Addons.php:341
-#: ../../Zotlabs/Module/Admin/Addons.php:436
-#: ../../Zotlabs/Module/Admin/Site.php:307
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Security.php:92
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Code/Module/Admin.php:140 ../../Code/Module/Admin/Addons.php:341
+#: ../../Code/Module/Admin/Addons.php:436
+#: ../../Code/Module/Admin/Site.php:307
+#: ../../Code/Module/Admin/Logs.php:82
+#: ../../Code/Module/Admin/Accounts.php:166
+#: ../../Code/Module/Admin/Security.php:92
+#: ../../Code/Module/Admin/Themes.php:122
+#: ../../Code/Module/Admin/Themes.php:156
+#: ../../Code/Module/Admin/Channels.php:145
 msgid "Administration"
 msgstr "Администрирование"
 
-#: ../../Zotlabs/Module/Admin.php:141
+#: ../../Code/Module/Admin.php:141
 msgid "Summary"
 msgstr "Резюме"
 
-#: ../../Zotlabs/Module/Admin.php:144
+#: ../../Code/Module/Admin.php:144
 msgid "Registered accounts"
 msgstr "Зарегистрированные аккаунты"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Code/Module/Admin.php:145
 msgid "Pending registrations"
 msgstr "Ждут утверждения"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Code/Module/Admin.php:146
 msgid "Registered channels"
 msgstr "Зарегистрированные каналы"
 
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Code/Module/Admin.php:147
 msgid "Active addons"
 msgstr "Активные расширения"
 
-#: ../../Zotlabs/Module/Admin.php:148
+#: ../../Code/Module/Admin.php:148
 msgid "Version"
 msgstr "Версия системы"
 
-#: ../../Zotlabs/Module/Admin.php:149
+#: ../../Code/Module/Admin.php:149
 msgid "Repository version (master)"
 msgstr "Версия репозитория (master)"
 
-#: ../../Zotlabs/Module/Admin.php:150
+#: ../../Code/Module/Admin.php:150
 msgid "Repository version (dev)"
 msgstr "Версия репозитория (dev)"
 
-#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59
+#: ../../Code/Module/Connedit.php:79 ../../Code/Module/Defperms.php:59
 msgid "Could not access contact record."
 msgstr "Не удалось получить доступ к записи контакта."
 
-#: ../../Zotlabs/Module/Connedit.php:109
+#: ../../Code/Module/Connedit.php:109
 msgid "Could not locate selected profile."
 msgstr "Не удалось обнаружить выбранный профиль."
 
-#: ../../Zotlabs/Module/Connedit.php:246
+#: ../../Code/Module/Connedit.php:246
 msgid "Connection updated."
 msgstr "Контакты обновлены."
 
-#: ../../Zotlabs/Module/Connedit.php:248
+#: ../../Code/Module/Connedit.php:248
 msgid "Failed to update connection record."
 msgstr "Не удалось обновить запись контакта."
 
-#: ../../Zotlabs/Module/Connedit.php:302
+#: ../../Code/Module/Connedit.php:302
 msgid "is now connected to"
 msgstr "теперь подключён к"
 
-#: ../../Zotlabs/Module/Connedit.php:427
+#: ../../Code/Module/Connedit.php:427
 msgid "Could not access address book record."
 msgstr "Не удалось получить доступ к записи адресной книги."
 
-#: ../../Zotlabs/Module/Connedit.php:475
+#: ../../Code/Module/Connedit.php:475
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Обновление невозможно - в настоящее время канал недоступен."
 
-#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499
-#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517
-#: ../../Zotlabs/Module/Connedit.php:530
+#: ../../Code/Module/Connedit.php:490 ../../Code/Module/Connedit.php:499
+#: ../../Code/Module/Connedit.php:508 ../../Code/Module/Connedit.php:517
+#: ../../Code/Module/Connedit.php:530
 msgid "Unable to set address book parameters."
 msgstr "Не удалось получить доступ к параметрам адресной книги."
 
-#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Code/Module/Connedit.php:554
 msgid "Connection has been removed."
 msgstr "Контакт был удалён."
 
-#: ../../Zotlabs/Module/Connedit.php:597
+#: ../../Code/Module/Connedit.php:597
 #, php-format
 msgid "View %s's profile"
 msgstr "Просмотр %s профиля"
 
-#: ../../Zotlabs/Module/Connedit.php:601
+#: ../../Code/Module/Connedit.php:601
 msgid "Refresh Permissions"
 msgstr "Обновить разрешения"
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Code/Module/Connedit.php:604
 msgid "Fetch updated permissions"
 msgstr "Получить обновлённые разрешения"
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Code/Module/Connedit.php:608
 msgid "Refresh Photo"
 msgstr "Обновить фотографию"
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Code/Module/Connedit.php:611
 msgid "Fetch updated photo"
 msgstr "Получить обновлённую фотографию"
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Code/Module/Connedit.php:618
 msgid "View recent posts and comments"
 msgstr "Просмотреть последние публикации и комментарии"
 
-#: ../../Zotlabs/Module/Connedit.php:622
-#: ../../Zotlabs/Module/Admin/Accounts.php:177
+#: ../../Code/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:177
 msgid "Unblock"
 msgstr "Разблокировать"
 
-#: ../../Zotlabs/Module/Connedit.php:622
-#: ../../Zotlabs/Module/Admin/Accounts.php:176
+#: ../../Code/Module/Connedit.php:622
+#: ../../Code/Module/Admin/Accounts.php:176
 msgid "Block"
 msgstr "Блокировать"
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Code/Module/Connedit.php:625
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Блокировать (или разблокировать) связи с этим контактом"
 
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Code/Module/Connedit.php:626
 msgid "This connection is blocked!"
 msgstr "Этот контакт заблокирован!"
 
-#: ../../Zotlabs/Module/Connedit.php:630
+#: ../../Code/Module/Connedit.php:630
 msgid "Unignore"
 msgstr "Не игнорировать"
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Code/Module/Connedit.php:633
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Игнорировать (или не игнорировать) все связи для этого контакта"
 
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Code/Module/Connedit.php:634
 msgid "This connection is ignored!"
 msgstr "Этот контакт игнорируется!"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Unarchive"
 msgstr "Разархивировать"
 
-#: ../../Zotlabs/Module/Connedit.php:638
+#: ../../Code/Module/Connedit.php:638
 msgid "Archive"
 msgstr "Заархивировать"
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Code/Module/Connedit.php:641
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое"
 
-#: ../../Zotlabs/Module/Connedit.php:642
+#: ../../Code/Module/Connedit.php:642
 msgid "This connection is archived!"
 msgstr "Этот контакт заархивирован!"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Unhide"
 msgstr "Показать"
 
-#: ../../Zotlabs/Module/Connedit.php:646
+#: ../../Code/Module/Connedit.php:646
 msgid "Hide"
 msgstr "Скрыть"
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Code/Module/Connedit.php:649
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Скрыть или показать этот контакт от / для остальных"
 
-#: ../../Zotlabs/Module/Connedit.php:650
+#: ../../Code/Module/Connedit.php:650
 msgid "This connection is hidden!"
 msgstr "Этот контакт скрыт!"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Code/Module/Connedit.php:657
 msgid "Delete this connection"
 msgstr "Удалить этот контакт"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Code/Module/Connedit.php:665
 msgid "Fetch Vcard"
 msgstr "Получить vCard"
 
-#: ../../Zotlabs/Module/Connedit.php:668
+#: ../../Code/Module/Connedit.php:668
 msgid "Fetch electronic calling card for this connection"
 msgstr "Получить электронную телефонную карточку для этого контакта"
 
-#: ../../Zotlabs/Module/Connedit.php:679
+#: ../../Code/Module/Connedit.php:679
 msgid "Open Individual Permissions section by default"
 msgstr "Открывать раздел \"Индивидуальные разрешения\" по умолчанию"
 
-#: ../../Zotlabs/Module/Connedit.php:702
+#: ../../Code/Module/Connedit.php:702
 msgid "Affinity"
 msgstr "Сходство"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Code/Module/Connedit.php:705
 msgid "Open Set Affinity section by default"
 msgstr "Открыть секцию установления сходства по умолчанию"
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Code/Module/Connedit.php:739
 msgid "Filter"
 msgstr "Фильтр"
 
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Code/Module/Connedit.php:742
 msgid "Open Custom Filter section by default"
 msgstr "Открывать секцию \"Настраиваемый фильтр\" по умолчанию"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Approve this connection"
 msgstr "Утвердить этот контакт"
 
-#: ../../Zotlabs/Module/Connedit.php:779
+#: ../../Code/Module/Connedit.php:779
 msgid "Accept connection to allow communication"
 msgstr "Принять контакт чтобы разрешить связь"
 
-#: ../../Zotlabs/Module/Connedit.php:784
+#: ../../Code/Module/Connedit.php:784
 msgid "Set Affinity"
 msgstr "Установить сходство"
 
-#: ../../Zotlabs/Module/Connedit.php:787
+#: ../../Code/Module/Connedit.php:787
 msgid "Set Profile"
 msgstr "Установить профиль"
 
-#: ../../Zotlabs/Module/Connedit.php:790
+#: ../../Code/Module/Connedit.php:790
 msgid "Set Affinity & Profile"
 msgstr "Установить сходство и профиль"
 
-#: ../../Zotlabs/Module/Connedit.php:838
+#: ../../Code/Module/Connedit.php:838
 msgid "This connection is unreachable from this location."
 msgstr "Этот контакт недоступен для данного местоположения"
 
-#: ../../Zotlabs/Module/Connedit.php:839
+#: ../../Code/Module/Connedit.php:839
 msgid "This connection may be unreachable from other channel locations."
 msgstr "Этот контакт может быть недоступен из других мест размещения канала"
 
-#: ../../Zotlabs/Module/Connedit.php:841
+#: ../../Code/Module/Connedit.php:841
 msgid "Location independence is not supported by their network."
 msgstr "Независимое местоположение не поддерживается их сетью."
 
-#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Code/Module/Connedit.php:847
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr "Этот контакт недоступен из данного местоположения. Независимое местоположение не поддерживается их сетью."
 
-#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239
+#: ../../Code/Module/Connedit.php:851 ../../Code/Module/Defperms.php:239
 msgid "Apply these permissions automatically"
 msgstr "Применить эти разрешения автоматически"
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Code/Module/Connedit.php:851
 msgid "Connection requests will be approved without your interaction"
 msgstr "Запросы контактов будут одобрены без вашего участия"
 
-#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240
+#: ../../Code/Module/Connedit.php:852 ../../Code/Module/Defperms.php:240
 msgid "Permission role"
 msgstr "Роль разрешения"
 
-#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241
+#: ../../Code/Module/Connedit.php:853 ../../Code/Module/Defperms.php:241
 msgid "Add permission role"
 msgstr "Добавить роль разрешения"
 
-#: ../../Zotlabs/Module/Connedit.php:860
+#: ../../Code/Module/Connedit.php:860
 msgid "This connection's primary address is"
 msgstr "Главный адрес это контакта"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Code/Module/Connedit.php:861
 msgid "Available locations:"
 msgstr "Доступные расположения:"
 
-#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245
+#: ../../Code/Module/Connedit.php:866 ../../Code/Module/Defperms.php:245
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Разрешения, указанные на этой странице, будут применяться ко всем новым соединениям."
 
-#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Code/Module/Connedit.php:867
 msgid "Connection Tools"
 msgstr "Инструменты контактов"
 
-#: ../../Zotlabs/Module/Connedit.php:869
+#: ../../Code/Module/Connedit.php:869
 msgid "Slide to adjust your degree of friendship"
 msgstr "Прокрутить для настройки степени дружбы"
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Code/Module/Connedit.php:871
 msgid "Slide to adjust your rating"
 msgstr "Прокрутить для настройки оценки"
 
-#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877
+#: ../../Code/Module/Connedit.php:872 ../../Code/Module/Connedit.php:877
 msgid "Optionally explain your rating"
 msgstr "Объясните свою оценку (не обязательно)"
 
-#: ../../Zotlabs/Module/Connedit.php:874
+#: ../../Code/Module/Connedit.php:874
 msgid "Custom Filter"
 msgstr "Настраиваемый фильтр"
 
-#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../Code/Module/Connedit.php:875
 msgid "Only import posts with this text"
 msgstr "Импортировать публикации только с этим текстом"
 
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876
-#: ../../Zotlabs/Module/Admin/Site.php:347
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Connedit.php:875 ../../Code/Module/Connedit.php:876
+#: ../../Code/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:348
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "слова по одному в строку, #тег,  /шаблон/ или lang=xxl; оставьте пустым для импорта всех публикаций"
 
-#: ../../Zotlabs/Module/Connedit.php:876
+#: ../../Code/Module/Connedit.php:876
 msgid "Do not import posts with this text"
 msgstr "Не импортировать публикации с этим текстом"
 
-#: ../../Zotlabs/Module/Connedit.php:878
+#: ../../Code/Module/Connedit.php:878
 msgid "This information is public!"
 msgstr "Эта информация общедоступна!"
 
-#: ../../Zotlabs/Module/Connedit.php:883
+#: ../../Code/Module/Connedit.php:883
 msgid "Connection Pending Approval"
 msgstr "Ожидающие подтверждения контактов"
 
-#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
+#: ../../Code/Module/Connedit.php:886 ../../Code/Module/Defperms.php:248
+#: ../../Code/Module/Settings/Permcats.php:110
+#: ../../Code/Module/Settings/Tokens.php:163
 msgid "inherited"
 msgstr "наследуется"
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Code/Module/Connedit.php:888
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Пожалуйста, выберите профиль который вы хотит показывать в %s при безопасном просмотре."
 
-#: ../../Zotlabs/Module/Connedit.php:890
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
+#: ../../Code/Module/Connedit.php:890
+#: ../../Code/Module/Settings/Tokens.php:160
 msgid "Their Settings"
 msgstr "Их настройки"
 
-#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Code/Module/Connedit.php:891 ../../Code/Module/Defperms.php:250
+#: ../../Code/Module/Settings/Permcats.php:108
+#: ../../Code/Module/Settings/Tokens.php:161
 msgid "My Settings"
 msgstr "Мои настройки"
 
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253
-#: ../../Zotlabs/Module/Settings/Permcats.php:113
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
+#: ../../Code/Module/Connedit.php:893 ../../Code/Module/Defperms.php:253
+#: ../../Code/Module/Settings/Permcats.php:113
+#: ../../Code/Module/Settings/Tokens.php:166
 msgid "Individual Permissions"
 msgstr "Индивидуальные разрешения"
 
-#: ../../Zotlabs/Module/Connedit.php:894
-#: ../../Zotlabs/Module/Settings/Permcats.php:114
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
+#: ../../Code/Module/Connedit.php:894
+#: ../../Code/Module/Settings/Permcats.php:114
+#: ../../Code/Module/Settings/Tokens.php:167
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
 "individual settings. You can not change those settings here."
 msgstr "Некоторые разрешения могут наследовать из настроек приватности ваших каналов которые могут иметь более высокий приоритет чем индивидуальные. Вы не можете менять эти настройки здесь."
 
-#: ../../Zotlabs/Module/Connedit.php:895
+#: ../../Code/Module/Connedit.php:895
 msgid ""
 "Some permissions may be inherited from your channel's privacy settings, which have higher priority than "
@@ -10597,565 +10597,565 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr "Некоторые разрешения могут быть унаследованы из настроек приватности вашего канала, которые могут иметь более высокий приоритет чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения переданных по наследству настроек."
 
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Code/Module/Connedit.php:896
 msgid "Last update:"
 msgstr "Последнее обновление:"
 
-#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../Code/Module/Connedit.php:904
 msgid "Details"
 msgstr "Сведения"
 
-#: ../../Zotlabs/Module/Webpages.php:54
+#: ../../Code/Module/Webpages.php:54
 msgid "Import Webpage Elements"
 msgstr "Импортировать части веб-страницы"
 
-#: ../../Zotlabs/Module/Webpages.php:55
+#: ../../Code/Module/Webpages.php:55
 msgid "Import selected"
 msgstr "Импортировать выбранное"
 
-#: ../../Zotlabs/Module/Webpages.php:78
+#: ../../Code/Module/Webpages.php:78
 msgid "Export Webpage Elements"
 msgstr "Экспортировать часть веб-страницы"
 
-#: ../../Zotlabs/Module/Webpages.php:79
+#: ../../Code/Module/Webpages.php:79
 msgid "Export selected"
 msgstr "Экспортировать выбранное"
 
-#: ../../Zotlabs/Module/Webpages.php:248
+#: ../../Code/Module/Webpages.php:248
 msgid "Actions"
 msgstr "Действия"
 
-#: ../../Zotlabs/Module/Webpages.php:249
+#: ../../Code/Module/Webpages.php:249
 msgid "Page Link"
 msgstr "Ссылка страницы"
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Code/Module/Webpages.php:250
 msgid "Page Title"
 msgstr "Заголовок страницы"
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Code/Module/Webpages.php:280
 msgid "Invalid file type."
 msgstr "Неверный тип файла."
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Code/Module/Webpages.php:292
 msgid "Error opening zip file"
 msgstr "Ошибка открытия ZIP файла"
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Code/Module/Webpages.php:303
 msgid "Invalid folder path."
 msgstr "Неверный путь к каталогу."
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Code/Module/Webpages.php:330
 msgid "No webpage elements detected."
 msgstr "Не обнаружено частей веб-страницы."
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Code/Module/Webpages.php:405
 msgid "Import complete."
 msgstr "Импорт завершен."
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
+#: ../../Code/Module/Editwebpage.php:139
 msgid "Page link"
 msgstr "Ссылка страницы"
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
+#: ../../Code/Module/Editwebpage.php:166
 msgid "Edit Webpage"
 msgstr "Редактировать веб-страницу"
 
-#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Code/Module/Editlayout.php:137
 msgid "Edit Layout"
 msgstr "Редактировать шаблон"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
+#: ../../Code/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "Для доступа к этому серверу каталогов требуется токен"
 
-#: ../../Zotlabs/Module/Moderate.php:65
+#: ../../Code/Module/Moderate.php:65
 msgid "Comment approved"
 msgstr "Комментарий одобрен"
 
-#: ../../Zotlabs/Module/Moderate.php:69
+#: ../../Code/Module/Moderate.php:69
 msgid "Comment deleted"
 msgstr "Комментарий удалён"
 
-#: ../../Zotlabs/Module/Articles.php:95
+#: ../../Code/Module/Articles.php:95
 msgid "Add Article"
 msgstr "Добавить статью"
 
-#: ../../Zotlabs/Module/Bookmarks.php:56
+#: ../../Code/Module/Bookmarks.php:56
 msgid "Bookmark added"
 msgstr "Закладка добавлена"
 
-#: ../../Zotlabs/Module/Bookmarks.php:79
+#: ../../Code/Module/Bookmarks.php:79
 msgid "My Bookmarks"
 msgstr "Мои закладки"
 
-#: ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../Code/Module/Bookmarks.php:90
 msgid "My Connections Bookmarks"
 msgstr "Закладки моих контактов"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Code/Module/Sharedwithme.php:104
 msgid "Files: shared with me"
 msgstr "Файлы: поделились со мной"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Code/Module/Sharedwithme.php:106
 msgid "NEW"
 msgstr "НОВОЕ"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:288
+#: ../../Code/Module/Sharedwithme.php:108
+#: ../../Code/Storage/Browser.php:288
 msgid "Last Modified"
 msgstr "Последнее изменение"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Code/Module/Sharedwithme.php:109
 msgid "Remove all files"
 msgstr "Удалить все файлы"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
+#: ../../Code/Module/Sharedwithme.php:110
 msgid "Remove this file"
 msgstr "Удалить этот файл"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Code/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
 msgstr "Выбрать каталог для закладок"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Code/Module/Rbmark.php:99
 msgid "Save Bookmark"
 msgstr "Сохранить закладку"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Code/Module/Rbmark.php:100
 msgid "URL of bookmark"
 msgstr "URL закладки"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Code/Module/Rbmark.php:105
 msgid "Or enter new bookmark folder name"
 msgstr "или введите новое имя каталога закладок"
 
-#: ../../Zotlabs/Module/Cal.php:69
+#: ../../Code/Module/Cal.php:69
 msgid "Permissions denied."
 msgstr "Доступ запрещен."
 
-#: ../../Zotlabs/Module/Authorize.php:17
+#: ../../Code/Module/Authorize.php:17
 msgid "Unknown App"
 msgstr "Неизвестное приложение"
 
-#: ../../Zotlabs/Module/Authorize.php:22
+#: ../../Code/Module/Authorize.php:22
 msgid "Authorize"
 msgstr "Авторизовать"
 
-#: ../../Zotlabs/Module/Authorize.php:23
+#: ../../Code/Module/Authorize.php:23
 #, php-format
 msgid "Do you authorize the app %s to access your channel data?"
 msgstr "Авторизуете ли вы приложение %s для доступа к данным вашего канала?"
 
-#: ../../Zotlabs/Module/Authorize.php:25
+#: ../../Code/Module/Authorize.php:25
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../../Zotlabs/Module/Authorize.php:26
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Code/Module/Authorize.php:26
+#: ../../Code/Module/Admin/Accounts.php:174
 msgid "Deny"
 msgstr "Запретить"
 
-#: ../../Zotlabs/Module/Search.php:230
+#: ../../Code/Module/Search.php:230
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "Объекты помечены как: %s"
 
-#: ../../Zotlabs/Module/Search.php:232
+#: ../../Code/Module/Search.php:232
 #, php-format
 msgid "Search results for: %s"
 msgstr "Результаты поиска для: %s"
 
-#: ../../Zotlabs/Module/Setup.php:170
+#: ../../Code/Module/Setup.php:170
 msgid "$Projectname Server - Setup"
 msgstr "$Projectname сервер - Установка"
 
-#: ../../Zotlabs/Module/Setup.php:174
+#: ../../Code/Module/Setup.php:174
 msgid "Could not connect to database."
 msgstr "Не удалось подключиться к серверу баз данных."
 
-#: ../../Zotlabs/Module/Setup.php:178
+#: ../../Code/Module/Setup.php:178
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Не удалось подключиться к указанному URL. Вероятно проблема с SSL сертификатом или DNS."
 
-#: ../../Zotlabs/Module/Setup.php:185
+#: ../../Code/Module/Setup.php:185
 msgid "Could not create table."
 msgstr "Не удалось создать таблицу."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Code/Module/Setup.php:191
 msgid "Your site database has been installed."
 msgstr "Ваша база данных установлена."
 
-#: ../../Zotlabs/Module/Setup.php:197
+#: ../../Code/Module/Setup.php:197
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Вам может понадобится импортировать файл \"install/schema_xxx.sql\" вручную используя клиент базы данных."
 
-#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:749
+#: ../../Code/Module/Setup.php:198 ../../Code/Module/Setup.php:262
+#: ../../Code/Module/Setup.php:749
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Пожалуйста, обратитесь к файлу \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:259
+#: ../../Code/Module/Setup.php:259
 msgid "System check"
 msgstr "Проверка системы"
 
-#: ../../Zotlabs/Module/Setup.php:264
+#: ../../Code/Module/Setup.php:264
 msgid "Check again"
 msgstr "Перепроверить"
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Code/Module/Setup.php:286
 msgid "Database connection"
 msgstr "Подключение к базе данных"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Code/Module/Setup.php:287
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Для установки $Projectname необходимо знать как подключиться к ваше базе данных."
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Code/Module/Setup.php:288
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Пожалуйста, свяжитесь с вашим хостинг провайдером или администрацией сайта если у вас есть вопросы об этих настройках."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Code/Module/Setup.php:289
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Указанная ниже база данных должна существовать. Если это не так, пожалуйста, создайте её перед тем, как продолжить."
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Database Server Name"
 msgstr "Имя сервера баз данных"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Code/Module/Setup.php:293
 msgid "Default is 127.0.0.1"
 msgstr "По умолчанию 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Database Port"
 msgstr "Порт сервера баз данных"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Code/Module/Setup.php:294
 msgid "Communication port number - use 0 for default"
 msgstr "Порт коммуникации - используйте 0 по умолчанию"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Code/Module/Setup.php:295
 msgid "Database Login Name"
 msgstr "Имя для подключения к базе данных"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Code/Module/Setup.php:296
 msgid "Database Login Password"
 msgstr "Пароль для подключения к базе данных"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Code/Module/Setup.php:297
 msgid "Database Name"
 msgstr "Имя базы данных"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Code/Module/Setup.php:298
 msgid "Database Type"
 msgstr "Тип базы данных"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid "Site administrator email address"
 msgstr "Адрес электронной почты администратора сайта"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Code/Module/Setup.php:300 ../../Code/Module/Setup.php:341
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Ваш адрес электронной почты должен соответствовать этому для использования веб-панели администратора."
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Website URL"
 msgstr "URL веб-сайта"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Code/Module/Setup.php:301 ../../Code/Module/Setup.php:343
 msgid "Please use SSL (https) URL if available."
 msgstr "Пожалуйста, используйте SSL (https) URL если возможно."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
+#: ../../Code/Module/Setup.php:302 ../../Code/Module/Setup.php:345
 msgid "Please select a default timezone for your website"
 msgstr "Пожалуйста, выберите часовой пояс по умолчанию для вашего сайта"
 
-#: ../../Zotlabs/Module/Setup.php:330
+#: ../../Code/Module/Setup.php:330
 msgid "Site settings"
 msgstr "Настройки сайта"
 
-#: ../../Zotlabs/Module/Setup.php:384
+#: ../../Code/Module/Setup.php:384
 msgid "PHP version 5.5 or greater is required."
 msgstr "Требуется PHP версии 5.5 или выше"
 
-#: ../../Zotlabs/Module/Setup.php:385
+#: ../../Code/Module/Setup.php:385
 msgid "PHP version"
 msgstr "Версия PHP"
 
-#: ../../Zotlabs/Module/Setup.php:401
+#: ../../Code/Module/Setup.php:401
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Не удалось найти консольную версию PHP в путях переменной PATH веб-сервера."
 
-#: ../../Zotlabs/Module/Setup.php:402
+#: ../../Code/Module/Setup.php:402
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Если у вас на сервере не установлена консольная версия PHP вы не сможете запустить фоновый опрос через cron. "
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid "PHP executable path"
 msgstr "Пусть к исполняемому модулю PHP"
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Code/Module/Setup.php:406
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Введите полный путь к исполняемому модулю PHP. Вы можете оставить его пустым для продолжения установки."
 
-#: ../../Zotlabs/Module/Setup.php:411
+#: ../../Code/Module/Setup.php:411
 msgid "Command line PHP"
 msgstr "Командная строка PHP"
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Code/Module/Setup.php:421
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "Невозможно проверить командную строку PHP поскольку требуемая функция shell_exec() отключена."
 
-#: ../../Zotlabs/Module/Setup.php:424
+#: ../../Code/Module/Setup.php:424
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\"."
 
-#: ../../Zotlabs/Module/Setup.php:425
+#: ../../Code/Module/Setup.php:425
 msgid "This is required for message delivery to work."
 msgstr "Это необходимо для функционирования доставки сообщений."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Code/Module/Setup.php:428
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Code/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to "
 "upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "Максимально разрешённый общий размер загрузок установлен в %s. Максимальный размер одной загрузки установлен в %s. Вам разрешено загружать до %d файлов за один приём."
 
-#: ../../Zotlabs/Module/Setup.php:451
+#: ../../Code/Module/Setup.php:451
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Вы можете изменить эти настройки в файле php.ini на сервере."
 
-#: ../../Zotlabs/Module/Setup.php:453
+#: ../../Code/Module/Setup.php:453
 msgid "PHP upload limits"
 msgstr "Максимальный размер загрузки в PHP"
 
-#: ../../Zotlabs/Module/Setup.php:476
+#: ../../Code/Module/Setup.php:476
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Ошибка: функция \"openssl_pkey_new\" не может сгенерировать ключи шифрования"
 
-#: ../../Zotlabs/Module/Setup.php:477
+#: ../../Code/Module/Setup.php:477
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr "Если работаете под Windows, см. \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:480
+#: ../../Code/Module/Setup.php:480
 msgid "Generate encryption keys"
 msgstr "Генерация ключей шифрования"
 
-#: ../../Zotlabs/Module/Setup.php:497
+#: ../../Code/Module/Setup.php:497
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:498
+#: ../../Code/Module/Setup.php:498
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:499
+#: ../../Code/Module/Setup.php:499
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Code/Module/Setup.php:500
 msgid "PDO database PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Code/Module/Setup.php:501
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Code/Module/Setup.php:502
 msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Code/Module/Setup.php:503
 msgid "zip PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+#: ../../Code/Module/Setup.php:507 ../../Code/Module/Setup.php:509
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Code/Module/Setup.php:507
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Ошибка: требуемый модуль mod_rewrite веб-сервера Apache не установлен."
 
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+#: ../../Code/Module/Setup.php:513 ../../Code/Module/Setup.php:516
 msgid "exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:513
+#: ../../Code/Module/Setup.php:513
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+#: ../../Code/Module/Setup.php:519 ../../Code/Module/Setup.php:522
 msgid "shell_exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Code/Module/Setup.php:519
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Code/Module/Setup.php:527
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Code/Module/Setup.php:531
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:535
+#: ../../Code/Module/Setup.php:535
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Code/Module/Setup.php:539
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:543
+#: ../../Code/Module/Setup.php:543
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:547
+#: ../../Code/Module/Setup.php:547
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Code/Module/Setup.php:551
 msgid "Error: zip PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579
+#: ../../Code/Module/Setup.php:570 ../../Code/Module/Setup.php:579
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:575
+#: ../../Code/Module/Setup.php:575
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:576
+#: ../../Code/Module/Setup.php:576
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Code/Module/Setup.php:577
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:593
+#: ../../Code/Module/Setup.php:593
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:594
+#: ../../Code/Module/Setup.php:594
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616
+#: ../../Code/Module/Setup.php:595 ../../Code/Module/Setup.php:616
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:596
+#: ../../Code/Module/Setup.php:596
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Code/Module/Setup.php:599
 #, php-format
 msgid "%s is writable"
 msgstr "%s доступен для записи"
 
-#: ../../Zotlabs/Module/Setup.php:615
+#: ../../Code/Module/Setup.php:615
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level "
 "web folder"
 msgstr "Эта программа использует каталог хранения для загруженных файлов. Для веб-сервера требуется доступ на запись начиная с верхнего уровня каталога хранения."
 
-#: ../../Zotlabs/Module/Setup.php:619
+#: ../../Code/Module/Setup.php:619
 msgid "store is writable"
 msgstr "хранилище доступно для записи"
 
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Code/Module/Setup.php:651
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Code/Module/Setup.php:652
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Code/Module/Setup.php:653
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Эти ограничения приняты поскольку ваши общедоступные публикации могут, например, содержать ссылки на изображения на вашем собственном хабе."
 
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Code/Module/Setup.php:654
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Code/Module/Setup.php:655
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Code/Module/Setup.php:656
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:658
+#: ../../Code/Module/Setup.php:658
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -11163,754 +11163,754 @@ msgid ""
 "server communications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:660
+#: ../../Code/Module/Setup.php:660
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Code/Module/Setup.php:666
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Code/Module/Setup.php:669
 msgid "Url rewrite is working"
 msgstr "Перезапись URL работает"
 
-#: ../../Zotlabs/Module/Setup.php:683
+#: ../../Code/Module/Setup.php:683
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:747
+#: ../../Code/Module/Setup.php:747
 msgid "
              What next?
              "
 msgstr "
              Что дальше? 
              "
 
-#: ../../Zotlabs/Module/Setup.php:748
+#: ../../Code/Module/Setup.php:748
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr "Вам понадобится [вручную] настроить запланированную задачу для опрашивателя."
 
-#: ../../Zotlabs/Module/Lockview.php:75
+#: ../../Code/Module/Lockview.php:75
 msgid "Remote privacy information not available."
 msgstr "Удаленная информация о конфиденциальности недоступна."
 
-#: ../../Zotlabs/Module/Lockview.php:96
+#: ../../Code/Module/Lockview.php:96
 msgid "Visible to:"
 msgstr "Видимо для:"
 
-#: ../../Zotlabs/Module/Follow.php:36
+#: ../../Code/Module/Follow.php:36
 msgid "Connection added."
 msgstr "Контакт добавлен."
 
-#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:208
+#: ../../Code/Module/Mitem.php:31 ../../Code/Module/Menu.php:208
 msgid "Menu not found."
 msgstr "Меню не найдено"
 
-#: ../../Zotlabs/Module/Mitem.php:63
+#: ../../Code/Module/Mitem.php:63
 msgid "Unable to create element."
 msgstr "Невозможно создать элемент."
 
-#: ../../Zotlabs/Module/Mitem.php:87
+#: ../../Code/Module/Mitem.php:87
 msgid "Unable to update menu element."
 msgstr "Невозможно обновить элемент меню."
 
-#: ../../Zotlabs/Module/Mitem.php:103
+#: ../../Code/Module/Mitem.php:103
 msgid "Unable to add menu element."
 msgstr "Невозможно добавить элемент меню."
 
-#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
+#: ../../Code/Module/Mitem.php:167 ../../Code/Module/Mitem.php:246
 msgid "Menu Item Permissions"
 msgstr "Разрешения на пункт меню"
 
-#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Code/Module/Mitem.php:168 ../../Code/Module/Mitem.php:247
+#: ../../Code/Module/Settings/Channel.php:549
 msgid "(click to open/close)"
 msgstr "(нажмите чтобы открыть/закрыть)"
 
-#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
+#: ../../Code/Module/Mitem.php:174 ../../Code/Module/Mitem.php:191
 msgid "Link Name"
 msgstr "Имя ссылки"
 
-#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
+#: ../../Code/Module/Mitem.php:175 ../../Code/Module/Mitem.php:255
 msgid "Link or Submenu Target"
 msgstr "Ссылка или цель подменю"
 
-#: ../../Zotlabs/Module/Mitem.php:175
+#: ../../Code/Module/Mitem.php:175
 msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr "Введите URL ссылки или выберите имя меню для создания подменю"
 
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
+#: ../../Code/Module/Mitem.php:176 ../../Code/Module/Mitem.php:256
 msgid "Use magic-auth if available"
 msgstr "Использовать magic-auth если возможно"
 
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
+#: ../../Code/Module/Mitem.php:177 ../../Code/Module/Mitem.php:257
 msgid "Open link in new window"
 msgstr "Открыть ссылку в новом окне"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+#: ../../Code/Module/Mitem.php:178 ../../Code/Module/Mitem.php:258
 msgid "Order in list"
 msgstr "Порядок в списке"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+#: ../../Code/Module/Mitem.php:178 ../../Code/Module/Mitem.php:258
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Большие значения в конце списка"
 
-#: ../../Zotlabs/Module/Mitem.php:179
+#: ../../Code/Module/Mitem.php:179
 msgid "Submit and finish"
 msgstr "Отправить и завершить"
 
-#: ../../Zotlabs/Module/Mitem.php:180
+#: ../../Code/Module/Mitem.php:180
 msgid "Submit and continue"
 msgstr "Отправить и продолжить"
 
-#: ../../Zotlabs/Module/Mitem.php:189
+#: ../../Code/Module/Mitem.php:189
 msgid "Menu:"
 msgstr "Меню:"
 
-#: ../../Zotlabs/Module/Mitem.php:192
+#: ../../Code/Module/Mitem.php:192
 msgid "Link Target"
 msgstr "Цель ссылки"
 
-#: ../../Zotlabs/Module/Mitem.php:195
+#: ../../Code/Module/Mitem.php:195
 msgid "Edit menu"
 msgstr "Редактировать меню"
 
-#: ../../Zotlabs/Module/Mitem.php:198
+#: ../../Code/Module/Mitem.php:198
 msgid "Edit element"
 msgstr "Редактировать элемент"
 
-#: ../../Zotlabs/Module/Mitem.php:199
+#: ../../Code/Module/Mitem.php:199
 msgid "Drop element"
 msgstr "Удалить элемент"
 
-#: ../../Zotlabs/Module/Mitem.php:200
+#: ../../Code/Module/Mitem.php:200
 msgid "New element"
 msgstr "Новый элемент"
 
-#: ../../Zotlabs/Module/Mitem.php:201
+#: ../../Code/Module/Mitem.php:201
 msgid "Edit this menu container"
 msgstr "Редактировать контейнер меню"
 
-#: ../../Zotlabs/Module/Mitem.php:202
+#: ../../Code/Module/Mitem.php:202
 msgid "Add menu element"
 msgstr "Добавить элемент меню"
 
-#: ../../Zotlabs/Module/Mitem.php:203
+#: ../../Code/Module/Mitem.php:203
 msgid "Delete this menu item"
 msgstr "Удалить этот элемент меню"
 
-#: ../../Zotlabs/Module/Mitem.php:204
+#: ../../Code/Module/Mitem.php:204
 msgid "Edit this menu item"
 msgstr "Редактировать этот элемент меню"
 
-#: ../../Zotlabs/Module/Mitem.php:222
+#: ../../Code/Module/Mitem.php:222
 msgid "Menu item not found."
 msgstr "Элемент меню не найден."
 
-#: ../../Zotlabs/Module/Mitem.php:235
+#: ../../Code/Module/Mitem.php:235
 msgid "Menu item deleted."
 msgstr "Элемент меню удалён."
 
-#: ../../Zotlabs/Module/Mitem.php:237
+#: ../../Code/Module/Mitem.php:237
 msgid "Menu item could not be deleted."
 msgstr "Невозможно удалить элемент меню."
 
-#: ../../Zotlabs/Module/Mitem.php:244
+#: ../../Code/Module/Mitem.php:244
 msgid "Edit Menu Element"
 msgstr "Редактировать элемент меню"
 
-#: ../../Zotlabs/Module/Mitem.php:254
+#: ../../Code/Module/Mitem.php:254
 msgid "Link text"
 msgstr "Текст ссылки"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:289
+#: ../../Code/Module/Admin/Addons.php:289
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Плагин %s отключен."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:294
+#: ../../Code/Module/Admin/Addons.php:294
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Плагин %s включен."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Code/Module/Admin/Addons.php:310
+#: ../../Code/Module/Admin/Themes.php:95
 msgid "Disable"
 msgstr "Запретить"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Code/Module/Admin/Addons.php:313
+#: ../../Code/Module/Admin/Themes.php:97
 msgid "Enable"
 msgstr "Разрешить"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Code/Module/Admin/Addons.php:343
+#: ../../Code/Module/Admin/Themes.php:124
 msgid "Toggle"
 msgstr "Переключить"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Code/Module/Admin/Addons.php:351
+#: ../../Code/Module/Admin/Themes.php:134
 msgid "Author: "
 msgstr "Автор: "
 
-#: ../../Zotlabs/Module/Admin/Addons.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Code/Module/Admin/Addons.php:352
+#: ../../Code/Module/Admin/Themes.php:135
 msgid "Maintainer: "
 msgstr "Сопровождающий:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:353
+#: ../../Code/Module/Admin/Addons.php:353
 msgid "Minimum project version: "
 msgstr "Минимальная версия проекта:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:354
+#: ../../Code/Module/Admin/Addons.php:354
 msgid "Maximum project version: "
 msgstr "Максимальная версия проекта:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:355
+#: ../../Code/Module/Admin/Addons.php:355
 msgid "Minimum PHP version: "
 msgstr "Минимальная версия PHP:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:356
+#: ../../Code/Module/Admin/Addons.php:356
 msgid "Compatible Server Roles: "
 msgstr "Совместимые роли сервера:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:357
+#: ../../Code/Module/Admin/Addons.php:357
 msgid "Requires: "
 msgstr "Необходимо:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:358
-#: ../../Zotlabs/Module/Admin/Addons.php:442
+#: ../../Code/Module/Admin/Addons.php:358
+#: ../../Code/Module/Admin/Addons.php:442
 msgid "Disabled - version incompatibility"
 msgstr "Отключено - несовместимость версий"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:411
+#: ../../Code/Module/Admin/Addons.php:411
 msgid "Enter the public git repository URL of the addon repo."
 msgstr "Введите URL публичного репозитория расширений git"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:412
+#: ../../Code/Module/Admin/Addons.php:412
 msgid "Addon repo git URL"
 msgstr "URL репозитория расширений git"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:413
+#: ../../Code/Module/Admin/Addons.php:413
 msgid "Custom repo name"
 msgstr "Пользовательское имя репозитория"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:413
+#: ../../Code/Module/Admin/Addons.php:413
 msgid "(optional)"
 msgstr "(необязательно)"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:414
+#: ../../Code/Module/Admin/Addons.php:414
 msgid "Download Addon Repo"
 msgstr "Загрузить репозиторий расширений"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:421
+#: ../../Code/Module/Admin/Addons.php:421
 msgid "Install new repo"
 msgstr "Установить новый репозиторий"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:445
+#: ../../Code/Module/Admin/Addons.php:445
 msgid "Manage Repos"
 msgstr "Управление репозиториями"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:446
+#: ../../Code/Module/Admin/Addons.php:446
 msgid "Installed Addon Repositories"
 msgstr "Установленные репозитории расширений"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:447
+#: ../../Code/Module/Admin/Addons.php:447
 msgid "Install a New Addon Repository"
 msgstr "Установить новый репозиторий расширений"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:454
+#: ../../Code/Module/Admin/Addons.php:454
 msgid "Switch branch"
 msgstr "Переключить ветку"
 
-#: ../../Zotlabs/Module/Admin/Site.php:172
+#: ../../Code/Module/Admin/Site.php:172
 msgid "Site settings updated."
 msgstr "Настройки сайта обновлены."
 
-#: ../../Zotlabs/Module/Admin/Site.php:209
-#: ../../Zotlabs/Module/Settings/Display.php:130
+#: ../../Code/Module/Admin/Site.php:209
+#: ../../Code/Module/Settings/Display.php:130
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (несовместимо)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:216
+#: ../../Code/Module/Admin/Site.php:216
 msgid "mobile"
 msgstr "мобильный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:218
+#: ../../Code/Module/Admin/Site.php:218
 msgid "experimental"
 msgstr "экспериментальный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:220
+#: ../../Code/Module/Admin/Site.php:220
 msgid "unsupported"
 msgstr "неподдерживаемый"
 
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Code/Module/Admin/Site.php:267
 msgid "Yes - with approval"
 msgstr "Да - требует подтверждения"
 
-#: ../../Zotlabs/Module/Admin/Site.php:273
+#: ../../Code/Module/Admin/Site.php:273
 msgid "My site is not a public server"
 msgstr "Мой сайт не является публичным сервером"
 
-#: ../../Zotlabs/Module/Admin/Site.php:274
+#: ../../Code/Module/Admin/Site.php:274
 msgid "My site has paid access only"
 msgstr "Мой сайт доступен только с оплатой "
 
-#: ../../Zotlabs/Module/Admin/Site.php:275
+#: ../../Code/Module/Admin/Site.php:275
 msgid "My site has free access only"
 msgstr "На моём сайте разрешён свободный доступ"
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Code/Module/Admin/Site.php:276
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "На моём сайте разрешены бесплатные аккаунты с дополнительными платными услугами"
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
+#: ../../Code/Module/Admin/Site.php:288
 msgid "Beginner/Basic"
 msgstr "Начинающий/Базовый"
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Code/Module/Admin/Site.php:289
 msgid "Novice - not skilled but willing to learn"
 msgstr "Новичок - не опытный, но желающий учиться"
 
-#: ../../Zotlabs/Module/Admin/Site.php:290
+#: ../../Code/Module/Admin/Site.php:290
 msgid "Intermediate - somewhat comfortable"
 msgstr "Промежуточный - более удобный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Code/Module/Admin/Site.php:291
 msgid "Advanced - very comfortable"
 msgstr "Продвинутый - очень удобный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Code/Module/Admin/Site.php:292
 msgid "Expert - I can write computer code"
 msgstr "Эксперт - я умею программировать"
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Code/Module/Admin/Site.php:293
 msgid "Wizard - I probably know more than you do"
 msgstr "Волшебник - возможно я знаю больше чем ты"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid "Default permission role for new accounts"
 msgstr "Разрешения по умолчанию для новых аккаунтов"
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Code/Module/Admin/Site.php:299
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr "Эта роль будет использоваться для первого канала, созданного после регистрации."
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
-#: ../../Zotlabs/Module/Register.php:278
+#: ../../Code/Module/Admin/Site.php:310
+#: ../../Code/Module/Register.php:278
 msgid "Registration"
 msgstr "Регистрация"
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Code/Module/Admin/Site.php:311
 msgid "File upload"
 msgstr "Загрузка файла"
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Code/Module/Admin/Site.php:312
 msgid "Policies"
 msgstr "Правила"
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Site default technical skill level"
 msgstr "Уровень технических навыков на сайте по умолчанию"
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Code/Module/Admin/Site.php:319
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr "Используется чтобы обеспечить удобство на уровне технических навыков пользователя"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Lock the technical skill level setting"
 msgstr "Заблокировать уровень технических навыков"
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Code/Module/Admin/Site.php:321
 msgid "Members can set their own technical comfort level by default"
 msgstr "Участники могут выбрать уровень своих технических навыков по умолчанию"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Banner/Logo"
 msgstr "Баннер / логотип"
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Code/Module/Admin/Site.php:323
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr "Разрешён нефильтруемый HTML/CSS/JS"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid "Administrator Information"
 msgstr "Информация об администраторе"
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Code/Module/Admin/Site.php:324
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Контактная информация для администраторов сайта. Показывается на информационной странице сайта. Можно использовать BBCode."
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Code/Module/Admin/Site.php:325
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Публичное видимое описание сайта. Показывается на информационной странице сайта. Можно использовать BBCode."
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Code/Module/Admin/Site.php:326
 msgid "System language"
 msgstr "Язык системы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid "System theme"
 msgstr "Системная тема"
 
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Code/Module/Admin/Site.php:327
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Системная тема по умолчанию  - может быть изменена в профиле пользователя - изменить параметры темы."
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "Allow Feeds as Connections"
 msgstr "Разрешить ленты новостей как контакты"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Code/Module/Admin/Site.php:330
 msgid "(Heavy system resource usage)"
 msgstr "(Высокое использование системных ресурсов)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid "Maximum image size"
 msgstr "Максимальный размер изображения"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Code/Module/Admin/Site.php:331
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Максимальный размер загруженных изображений в байтах. По умолчанию 0 или без ограничений."
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Code/Module/Admin/Site.php:332
 msgid "Does this site allow new member registration?"
 msgstr "Разрешается ли регистрация новых пользователей на этом сайте?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid "Invitation only"
 msgstr "Только по приглашениям"
 
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Code/Module/Admin/Site.php:333
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr "Регистрация пользователей разрешается только по приглашениям. Вышеуказанная политика регистрация должны быть установлена в \"Да\"."
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Minimum age"
 msgstr "Минимальный возраст"
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Code/Module/Admin/Site.php:334
 msgid "Minimum age (in years) for who may register on this site."
 msgstr "Минимальный возраст (в годах) для регистрации на этом сайте."
 
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Code/Module/Admin/Site.php:335
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Как лучше описать тип учётных записей предлагаемых на этом хабе?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Code/Module/Admin/Site.php:335
 msgid "This is displayed on the public server site list."
 msgstr "Это отображается в списке общедоступных серверов."
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Register text"
 msgstr "Текст регистрации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Code/Module/Admin/Site.php:336
 msgid "Will be displayed prominently on the registration page."
 msgstr "Будет отображаться на странице регистрации на видном месте."
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Code/Module/Admin/Site.php:338
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "например: 'public' для показа публичного потока, 'page/sys/home' показывает системную страницу home или 'include:home.html' для подключения файла."
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Code/Module/Admin/Site.php:339
 msgid "Preserve site homepage URL"
 msgstr "Сохранить URL главной страницы сайта"
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Code/Module/Admin/Site.php:339
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid "Accounts abandoned after x days"
 msgstr "Аккаунты считаются заброшенными после N дней"
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Code/Module/Admin/Site.php:340
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Системные ресурсы не будут расходоваться для опроса внешних сайтов для заброшенных аккаунтов. Введите 0 для отсутствия ограничений."
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Code/Module/Admin/Site.php:341
 msgid "Allowed friend domains"
 msgstr "Разрешенные домены друзей"
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Code/Module/Admin/Site.php:341
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Список разделённых запятыми доменов с которыми разрешено устанавливать дружеские отношения на этом сайте. Wildcards разрешены. Пусто означает разрешены любые домены."
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Code/Module/Admin/Site.php:342
 msgid "Verify Email Addresses"
 msgstr "Проверка адреса электронной почты"
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Code/Module/Admin/Site.php:342
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Включите для проверки адреса электронной почты использованного при регистрации (рекомендуется)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Code/Module/Admin/Site.php:343
 msgid "Force publish"
 msgstr "Принудительно публиковать"
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Code/Module/Admin/Site.php:343
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Включите для принудительного включения всех учётных записей на данном сайте в каталог."
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid "Import Public Streams"
 msgstr "Импортированные публичные потоки"
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Code/Module/Admin/Site.php:344
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Импортировать и разрешить публичный доступ к загружаемым с других сайтов потоков. Внимание - этот контент не может модерироваться."
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid "Site only Public Streams"
 msgstr "Публичные потоки только с сайта"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Code/Module/Admin/Site.php:345
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr "Разрешить доступ к общедоступному контенту, исходящему только с этого сайта, если импортированные публичные потоки отключены."
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr "Разрешить всем доступ к публичным потокам"
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Code/Module/Admin/Site.php:346
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr "Отключите если для просмотра требуется аутентификация. Внимание - этот контент не может модерироваться."
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Code/Module/Admin/Site.php:347
 msgid "Only import Public stream posts with this text"
 msgstr "Импортировать только публичные потоки с этим текстом"
 
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Code/Module/Admin/Site.php:348
 msgid "Do not import Public stream posts with this text"
 msgstr "Не импортировать публичные потоки с этим текстом"
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid "Login on Homepage"
 msgstr "Вход на домашней странице"
 
-#: ../../Zotlabs/Module/Admin/Site.php:351
+#: ../../Code/Module/Admin/Site.php:351
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Предоставлять форму входа для посетителей на домашней странице если другого содержимого не настроено."
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid "Enable context help"
 msgstr "Включить контекстную помощь"
 
-#: ../../Zotlabs/Module/Admin/Site.php:352
+#: ../../Code/Module/Admin/Site.php:352
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"."
 
-#: ../../Zotlabs/Module/Admin/Site.php:354
+#: ../../Code/Module/Admin/Site.php:354
 msgid "Reply-to email address for system generated email."
 msgstr "Адрес email Reply-to для генерируемых системой сообщений."
 
-#: ../../Zotlabs/Module/Admin/Site.php:355
+#: ../../Code/Module/Admin/Site.php:355
 msgid "Sender (From) email address for system generated email."
 msgstr "Адрес email отправителя (From) для генерируемых системой сообщений."
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Code/Module/Admin/Site.php:356
 msgid "Name of email sender for system generated email."
 msgstr "Имя отправителя для генерируемых системой сообщений."
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Directory Server URL"
 msgstr "URL сервера каталогов"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Code/Module/Admin/Site.php:358
 msgid "Default directory server"
 msgstr "Сервер каталогов по умолчанию"
 
-#: ../../Zotlabs/Module/Admin/Site.php:360
+#: ../../Code/Module/Admin/Site.php:360
 msgid "Proxy user"
 msgstr "Имя пользователя proxy-сервера"
 
-#: ../../Zotlabs/Module/Admin/Site.php:361
+#: ../../Code/Module/Admin/Site.php:361
 msgid "Proxy URL"
 msgstr "URL proxy-сервера"
 
-#: ../../Zotlabs/Module/Admin/Site.php:362
+#: ../../Code/Module/Admin/Site.php:362
 msgid "Network timeout"
 msgstr "Время ожидания сети"
 
-#: ../../Zotlabs/Module/Admin/Site.php:362
+#: ../../Code/Module/Admin/Site.php:362
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Значение в секундах. Если установлен в 0 - без ограничений (не рекомендуется)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:363
+#: ../../Code/Module/Admin/Site.php:363
 msgid "Delivery interval"
 msgstr "Интервал доставки"
 
-#: ../../Zotlabs/Module/Admin/Site.php:363
+#: ../../Code/Module/Admin/Site.php:363
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Значение задержки фоновых процессов доставки в секундах для снижения нагрузки на систему. Рекомендуется 4-5 для серверов совместного использования, 2-3 для частных виртуальных и 0-1 для выделенных серверов."
 
-#: ../../Zotlabs/Module/Admin/Site.php:364
+#: ../../Code/Module/Admin/Site.php:364
 msgid "Deliveries per process"
 msgstr "Доставок на процесс"
 
-#: ../../Zotlabs/Module/Admin/Site.php:364
+#: ../../Code/Module/Admin/Site.php:364
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr "Количество доставок для одного процесса. Настройте в соответствии с производительностью системы. Рекомендуется 1-5."
 
-#: ../../Zotlabs/Module/Admin/Site.php:365
+#: ../../Code/Module/Admin/Site.php:365
 msgid "Queue Threshold"
 msgstr "Порог очереди"
 
-#: ../../Zotlabs/Module/Admin/Site.php:365
+#: ../../Code/Module/Admin/Site.php:365
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr "Всегда откладывать немедленную доставку, если в очереди содержится большее количество записей, чем это."
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
+#: ../../Code/Module/Admin/Site.php:366
 msgid "Poll interval"
 msgstr "Интервал опроса"
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
+#: ../../Code/Module/Admin/Site.php:366
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Задержка фоновых процессов опроса на указанное количество секунд для снижения нагрузки на систему. Если 0 - использовать интервал доставки."
 
-#: ../../Zotlabs/Module/Admin/Site.php:367
+#: ../../Code/Module/Admin/Site.php:367
 msgid "Path to ImageMagick convert program"
 msgstr "Путь к ImageMagick"
 
-#: ../../Zotlabs/Module/Admin/Site.php:367
+#: ../../Code/Module/Admin/Site.php:367
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr "При установке эта программа генерирует миниатюры изображений для больших файлов (свыше 4000 в любом измерении) для предотвращения утечки памяти. Пример: /usr/bin/convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:368
+#: ../../Code/Module/Admin/Site.php:368
 msgid "Allow SVG thumbnails in file browser"
 msgstr "Разрешить SVG миниатюры в просмотрщике файлов"
 
-#: ../../Zotlabs/Module/Admin/Site.php:368
+#: ../../Code/Module/Admin/Site.php:368
 msgid "WARNING: SVG images may contain malicious code."
 msgstr "Внимание: изображения SVG могут содержать вредоносный код."
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
+#: ../../Code/Module/Admin/Site.php:369
 msgid "Maximum Load Average"
 msgstr "Максимальная средняя нагрузка"
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
+#: ../../Code/Module/Admin/Site.php:369
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Максимальная нагрузка системы для откладывания процессов опроса и доставки - по умолчанию 50."
 
-#: ../../Zotlabs/Module/Admin/Site.php:370
+#: ../../Code/Module/Admin/Site.php:370
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Срок хранения в днях для импортированного содержимого (из матрицы / сети)."
 
-#: ../../Zotlabs/Module/Admin/Site.php:370
+#: ../../Code/Module/Admin/Site.php:370
 msgid "0 for no expiration of imported content"
 msgstr "0 для постоянного хранения импортированного содержимого"
 
-#: ../../Zotlabs/Module/Admin/Site.php:371
+#: ../../Code/Module/Admin/Site.php:371
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr "Продлевать строк хранения для любых публикаций, которые имеют комментарии возрастом менее этого значения"
 
-#: ../../Zotlabs/Module/Admin/Site.php:373
+#: ../../Code/Module/Admin/Site.php:373
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr "Публичные серверы: необязательная маркетинговая лэндинг-страница для новых пользователей"
 
-#: ../../Zotlabs/Module/Admin/Site.php:373
+#: ../../Code/Module/Admin/Site.php:373
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Создать эту страницу первой. По умолчанию %s/register"
 
-#: ../../Zotlabs/Module/Admin/Site.php:374
+#: ../../Code/Module/Admin/Site.php:374
 msgid "Page to display after creating a new channel"
 msgstr "Страница для показа после создания нового канала"
 
-#: ../../Zotlabs/Module/Admin/Site.php:374
+#: ../../Code/Module/Admin/Site.php:374
 msgid "Default: profiles"
 msgstr "По умолчанию: profiles"
 
-#: ../../Zotlabs/Module/Admin/Site.php:376
+#: ../../Code/Module/Admin/Site.php:376
 msgid "Optional: site location"
 msgstr "Необязательно: место размещения сайта"
 
-#: ../../Zotlabs/Module/Admin/Site.php:376
+#: ../../Code/Module/Admin/Site.php:376
 msgid "Region or country"
 msgstr "Регион или страна"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
+#: ../../Code/Module/Admin/Logs.php:28
 msgid "Log settings updated."
 msgstr "Настройки журнала обновлены."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
+#: ../../Code/Module/Admin/Logs.php:85
 msgid "Clear"
 msgstr "Очистить"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
+#: ../../Code/Module/Admin/Logs.php:91
 msgid "Debugging"
 msgstr "Отладка"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid "Log file"
 msgstr "Файл журнала"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
+#: ../../Code/Module/Admin/Logs.php:92
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr "Должен быть доступен для записи веб-сервером. Пусть относителен основного каталога веб-сайта."
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
+#: ../../Code/Module/Admin/Logs.php:93
 msgid "Log level"
 msgstr "Уровень журнала"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:37
+#: ../../Code/Module/Admin/Accounts.php:37
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
@@ -11918,7 +11918,7 @@ msgstr[0] "%s аккаунт блокирован/разблокирован"
 msgstr[1] "%s аккаунта блокированы/разблокированы"
 msgstr[2] "%s аккаунтов блокированы/разблокированы"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:44
+#: ../../Code/Module/Admin/Accounts.php:44
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
@@ -11926,411 +11926,411 @@ msgstr[0] "%s аккаунт удалён"
 msgstr[1] "%s аккаунта удалёны"
 msgstr[2] "%s аккаунтов удалёны"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:80
+#: ../../Code/Module/Admin/Accounts.php:80
 msgid "Account not found"
 msgstr "Аккаунт не найден"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:99
+#: ../../Code/Module/Admin/Accounts.php:99
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Аккаунт '%s' заблокирован"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:107
+#: ../../Code/Module/Admin/Accounts.php:107
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Аккаунт '%s' разблокирован"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Channels.php:148
+#: ../../Code/Module/Admin/Accounts.php:169
+#: ../../Code/Module/Admin/Channels.php:148
 msgid "select all"
 msgstr "выбрать все"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Code/Module/Admin/Accounts.php:170
 msgid "Registrations waiting for confirm"
 msgstr "Регистрации ждут подтверждения"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Code/Module/Admin/Accounts.php:171
 msgid "Request date"
 msgstr "Дата запроса"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
+#: ../../Code/Module/Admin/Accounts.php:172
 msgid "No registrations."
 msgstr "Нет новых регистраций."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182
+#: ../../Code/Module/Admin/Accounts.php:182
 msgid "ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../Code/Module/Admin/Accounts.php:184
 msgid "All Channels"
 msgstr "Все каналы"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Code/Module/Admin/Accounts.php:185
 msgid "Register date"
 msgstr "Дата регистрации"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Code/Module/Admin/Accounts.php:186
 msgid "Last login"
 msgstr "Последний вход"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:187
+#: ../../Code/Module/Admin/Accounts.php:187
 msgid "Expires"
 msgstr "Срок действия"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
+#: ../../Code/Module/Admin/Accounts.php:188
 msgid "Service Class"
 msgstr "Класс обслуживания"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:190
+#: ../../Code/Module/Admin/Accounts.php:190
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Выбранные учётные записи будут удалены!\n\nВсё что было ими опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:191
+#: ../../Code/Module/Admin/Accounts.php:191
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"
 
-#: ../../Zotlabs/Module/Admin/Security.php:83
+#: ../../Code/Module/Admin/Security.php:83
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
 "insecure."
 msgstr "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно."
 
-#: ../../Zotlabs/Module/Admin/Security.php:86
+#: ../../Code/Module/Admin/Security.php:86
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:"
 
-#: ../../Zotlabs/Module/Admin/Security.php:87
+#: ../../Code/Module/Admin/Security.php:87
 msgid ""
 "https://youtube.com/
              https://www.youtube.com/
              https://youtu.be/"
 "
              https://vimeo.com/
              https://soundcloud.com/
              "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:88
+#: ../../Code/Module/Admin/Security.php:88
 msgid ""
 "All other embedded content will be filtered, unless "
 "embedded content from that site is explicitly blocked."
 msgstr "се остальные встроенные материалы будут отфильтрованы, если  встроенное содержимое с этого сайта явно заблокировано."
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
+#: ../../Code/Module/Admin/Security.php:95
 msgid "Block public"
 msgstr "Блокировать публичный доступ"
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
+#: ../../Code/Module/Admin/Security.php:95
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr "Установите флажок для блокировки публичного доступа ко всем другим общедоступным страницам на этом сайте, если вы в настоящее время не аутентифицированы."
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid "Provide a cloud root directory"
 msgstr "Предоставить корневой каталог в облаке"
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
+#: ../../Code/Module/Admin/Security.php:96
 msgid ""
 "The cloud root directory lists all channel names which provide public files"
 msgstr "В корневом каталоге облака показываются все имена каналов, которые предоставляют общедоступные файлы"
 
-#: ../../Zotlabs/Module/Admin/Security.php:97
+#: ../../Code/Module/Admin/Security.php:97
 msgid "Show total disk space available to cloud uploads"
 msgstr "Показывать общее доступное для загрузок место в хранилище"
 
-#: ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Code/Module/Admin/Security.php:98
 msgid "Set \"Transport Security\" HTTP header"
 msgstr "Установить HTTP-заголовок \"Transport Security\""
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
+#: ../../Code/Module/Admin/Security.php:99
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr "Установить HTTP-заголовок \"Content Security Policy\""
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
+#: ../../Code/Module/Admin/Security.php:100
 msgid "Allowed email domains"
 msgstr "Разрешённые домены email"
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
+#: ../../Code/Module/Admin/Security.php:100
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Список разделённых запятыми доменов для которых разрешена регистрация на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены."
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
+#: ../../Code/Module/Admin/Security.php:101
 msgid "Not allowed email domains"
 msgstr "Запрещённые домены email"
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
+#: ../../Code/Module/Admin/Security.php:101
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Список разделённых запятыми доменов для которых запрещена регистрация на этом сайте. Wildcards разрешены. Если пусто то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны."
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
+#: ../../Code/Module/Admin/Security.php:102
 msgid "Allow communications only from these sites"
 msgstr "Разрешить связь только с этими сайтами"
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
+#: ../../Code/Module/Admin/Security.php:102
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr "Один сайт на строку. Оставьте пустым для разрешения взаимодействия без ограничений (по умочанию)."
 
-#: ../../Zotlabs/Module/Admin/Security.php:103
+#: ../../Code/Module/Admin/Security.php:103
 msgid "Block communications from these sites"
 msgstr "Блокировать связь с этими сайтами"
 
-#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Code/Module/Admin/Security.php:104
 msgid "Allow communications only from these channels"
 msgstr "Разрешить связь только для этих каналов"
 
-#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Code/Module/Admin/Security.php:104
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr "Один канал (или его хэш) на строку. Оставьте пустым для разрешения взаимодействия с любым каналом (по умолчанию)."
 
-#: ../../Zotlabs/Module/Admin/Security.php:105
+#: ../../Code/Module/Admin/Security.php:105
 msgid "Block communications from these channels"
 msgstr "Блокировать связь с этими каналами"
 
-#: ../../Zotlabs/Module/Admin/Security.php:106
+#: ../../Code/Module/Admin/Security.php:106
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr "Разрешать встраивание только для безопасных (SSL/TLS) сайтов и ссылок."
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
+#: ../../Code/Module/Admin/Security.php:107
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr "Разрешить  встраивать нефильтруемое HTML-содержимое только для этих доменов"
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
+#: ../../Code/Module/Admin/Security.php:107
 msgid "One site per line. By default embedded content is filtered."
 msgstr "Один сайт на строку. По умолчанию встраиваемое содержимое фильтруется."
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
+#: ../../Code/Module/Admin/Security.php:108
 msgid "Block embedded HTML from these domains"
 msgstr "Блокировать встраивание HTML-содержимого для этих доменов"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Code/Module/Admin/Dbsync.php:19
 msgid "Update has been marked successful"
 msgstr "Обновление было помечено как успешное"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:31
+#: ../../Code/Module/Admin/Dbsync.php:31
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Выполнение %s неудачно. Проверьте системный журнал."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:34
+#: ../../Code/Module/Admin/Dbsync.php:34
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Обновление %sбыло успешно применено."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:38
+#: ../../Code/Module/Admin/Dbsync.php:38
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Обновление %s не вернуло статус. Неизвестно было ли оно успешным."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:41
+#: ../../Code/Module/Admin/Dbsync.php:41
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Функция обновления %sне может быть найдена."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Code/Module/Admin/Dbsync.php:59
 msgid "Failed Updates"
 msgstr "Обновления с ошибками"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+#: ../../Code/Module/Admin/Dbsync.php:61
 msgid "Mark success (if update was manually applied)"
 msgstr "Пометить успешным (если обновление было применено вручную)"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+#: ../../Code/Module/Admin/Dbsync.php:62
 msgid "Attempt to execute this update step automatically"
 msgstr "Попытаться применить это обновление автоматически"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:67
+#: ../../Code/Module/Admin/Dbsync.php:67
 msgid "No failed updates."
 msgstr "Ошибок обновлений нет."
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
+#: ../../Code/Module/Admin/Profs.php:89
 msgid "New Profile Field"
 msgstr "Поле нового профиля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "Field nickname"
 msgstr "Псевдоним поля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Code/Module/Admin/Profs.php:90
+#: ../../Code/Module/Admin/Profs.php:110
 msgid "System name of field"
 msgstr "Системное имя поля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
+#: ../../Code/Module/Admin/Profs.php:91
+#: ../../Code/Module/Admin/Profs.php:111
 msgid "Input type"
 msgstr "Тип ввода"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Field Name"
 msgstr "Имя поля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Code/Module/Admin/Profs.php:92
+#: ../../Code/Module/Admin/Profs.php:112
 msgid "Label on profile pages"
 msgstr "Метка на странице профиля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Help text"
 msgstr "Текст подсказки"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Code/Module/Admin/Profs.php:93
+#: ../../Code/Module/Admin/Profs.php:113
 msgid "Additional info (optional)"
 msgstr "Дополнительная информация (необязательно)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
+#: ../../Code/Module/Admin/Profs.php:103
 msgid "Field definition not found"
 msgstr "Определения поля не найдено"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
+#: ../../Code/Module/Admin/Profs.php:109
 msgid "Edit Profile Field"
 msgstr "Редактировать поле профиля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
+#: ../../Code/Module/Admin/Profs.php:169
 msgid "Basic Profile Fields"
 msgstr "Основные поля профиля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "Advanced Profile Fields"
 msgstr "Дополнительные поля профиля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
+#: ../../Code/Module/Admin/Profs.php:170
 msgid "(In addition to basic fields)"
 msgstr "(к основым полям)"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
+#: ../../Code/Module/Admin/Profs.php:172
 msgid "All available fields"
 msgstr "Все доступные поля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
+#: ../../Code/Module/Admin/Profs.php:173
 msgid "Custom Fields"
 msgstr "Настраиваемые поля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
+#: ../../Code/Module/Admin/Profs.php:177
 msgid "Create Custom Field"
 msgstr "Создать настраиваемое поле"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
+#: ../../Code/Module/Admin/Themes.php:26
 msgid "Theme settings updated."
 msgstr "Настройки темы обновленны."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
+#: ../../Code/Module/Admin/Themes.php:61
 msgid "No themes found."
 msgstr "Темы не найдены."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
+#: ../../Code/Module/Admin/Themes.php:116
 msgid "Screenshot"
 msgstr "Снимок экрана"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
+#: ../../Code/Module/Admin/Themes.php:162
 msgid "[Experimental]"
 msgstr "[экспериментальный]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
+#: ../../Code/Module/Admin/Themes.php:163
 msgid "[Unsupported]"
 msgstr "[неподдерживаемый]"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "Off"
 msgstr "Выкл."
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:65
+#: ../../Code/Module/Admin/Features.php:55
+#: ../../Code/Module/Admin/Features.php:56
+#: ../../Code/Module/Settings/Features.php:65
 msgid "On"
 msgstr "Вкл."
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Code/Module/Admin/Features.php:56
 #, php-format
 msgid "Lock feature %s"
 msgstr "Заблокировать функцию \"%s\""
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
+#: ../../Code/Module/Admin/Features.php:64
 msgid "Manage Additional Features"
 msgstr "Управлять дополнительными функциями"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
+#: ../../Code/Module/Admin/Queue.php:35
 msgid "Queue Statistics"
 msgstr "Статистика очереди"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
+#: ../../Code/Module/Admin/Queue.php:36
 msgid "Total Entries"
 msgstr "Всего записей"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
+#: ../../Code/Module/Admin/Queue.php:37
 msgid "Priority"
 msgstr "Приоритет"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
+#: ../../Code/Module/Admin/Queue.php:38
 msgid "Destination URL"
 msgstr "Конечный URL-адрес"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
+#: ../../Code/Module/Admin/Queue.php:39
 msgid "Mark hub permanently offline"
 msgstr "Пометить хаб как постоянно отключенный"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
+#: ../../Code/Module/Admin/Queue.php:40
 msgid "Empty queue for this hub"
 msgstr "Освободить очередь для этого хаба"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
+#: ../../Code/Module/Admin/Queue.php:41
 msgid "Last known contact"
 msgstr "Последний известный контакт"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#: ../../Code/Module/Admin/Account_edit.php:29
 #, php-format
 msgid "Password changed for account %d."
 msgstr "Пароль для аккаунта %d изменён."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+#: ../../Code/Module/Admin/Account_edit.php:46
 msgid "Account settings updated."
 msgstr "Настройки аккаунта обновлены."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+#: ../../Code/Module/Admin/Account_edit.php:61
 msgid "Account not found."
 msgstr "Учётная запись не найдена."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+#: ../../Code/Module/Admin/Account_edit.php:68
 msgid "Account Edit"
 msgstr "Редактировать аккаунт"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+#: ../../Code/Module/Admin/Account_edit.php:69
 msgid "New Password"
 msgstr "Новый пароль"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+#: ../../Code/Module/Admin/Account_edit.php:70
 msgid "New Password again"
 msgstr "Повторите новый пароль"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+#: ../../Code/Module/Admin/Account_edit.php:71
 msgid "Technical skill level"
 msgstr "Уровень технических навыков"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+#: ../../Code/Module/Admin/Account_edit.php:72
 msgid "Account language (for emails)"
 msgstr "Язык сообщения для email"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Code/Module/Admin/Account_edit.php:73
 msgid "Service class"
 msgstr "Класс обслуживания"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
+#: ../../Code/Module/Admin/Channels.php:31
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
@@ -12338,7 +12338,7 @@ msgstr[0] "%s канал цензурируется/нецензурируетс
 msgstr[1] "%s канала цензурируются/нецензурируются"
 msgstr[2] "%s каналов цензурируются/нецензурируются"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
+#: ../../Code/Module/Admin/Channels.php:40
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
@@ -12346,7 +12346,7 @@ msgstr[0] "в %s канале код разрешён/запрещён"
 msgstr[1] "в %s каналах код разрешён/запрещён"
 msgstr[2] "в %s каналах код разрешён/запрещён"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
+#: ../../Code/Module/Admin/Channels.php:46
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
@@ -12354,77 +12354,77 @@ msgstr[0] "%s канал удалён"
 msgstr[1] "%s канала удалены"
 msgstr[2] "%s каналов удалены"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
+#: ../../Code/Module/Admin/Channels.php:65
 msgid "Channel not found"
 msgstr "Канал не найден"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
+#: ../../Code/Module/Admin/Channels.php:75
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Канал '%s' удалён"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Канал '%s' цензурируется"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../Code/Module/Admin/Channels.php:87
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Канал '%s' нецензурируется"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Код в канале '%s' разрешён"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Code/Module/Admin/Channels.php:98
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Код в канале '%s' запрещён"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Code/Module/Admin/Channels.php:150
 msgid "Censor"
 msgstr "Цензурировать"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Code/Module/Admin/Channels.php:151
 msgid "Uncensor"
 msgstr "Нецензурировать"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
+#: ../../Code/Module/Admin/Channels.php:152
 msgid "Allow Code"
 msgstr "Разрешить код"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
+#: ../../Code/Module/Admin/Channels.php:153
 msgid "Disallow Code"
 msgstr "Запретить код"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
+#: ../../Code/Module/Admin/Channels.php:158
 msgid "UID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
+#: ../../Code/Module/Admin/Channels.php:162
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
+#: ../../Code/Module/Admin/Channels.php:163
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Канал {0} будет удалён!\n\nВсё что было опубликовано в этом канале на этом сайте будет удалено навсегда!\n\nВы уверены?"
 
-#: ../../Zotlabs/Module/Email_validation.php:24
-#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Code/Module/Email_validation.php:24
+#: ../../Code/Module/Email_resend.php:12
 msgid "Token verification failed."
 msgstr "Не удалось выполнить проверку токена."
 
-#: ../../Zotlabs/Module/Email_validation.php:36
+#: ../../Code/Module/Email_validation.php:36
 msgid "Email Verification Required"
 msgstr "Требуется проверка адреса email"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../Code/Module/Email_validation.php:37
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -12432,32 +12432,32 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr "Проверочный токен был выслн на ваш адрес электронной почты {%s]. Введите этот токен здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите несколько минут для завершения доставки и проверьте вашу папку \"Спам\" если вы не видите письма."
 
-#: ../../Zotlabs/Module/Email_validation.php:38
+#: ../../Code/Module/Email_validation.php:38
 msgid "Resend Email"
 msgstr "Выслать повторно"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
+#: ../../Code/Module/Email_validation.php:41
 msgid "Validation token"
 msgstr "Проверочный токен"
 
-#: ../../Zotlabs/Module/Invite.php:29
+#: ../../Code/Module/Invite.php:29
 msgid "Total invitation limit exceeded."
 msgstr "Превышено общее количество приглашений."
 
-#: ../../Zotlabs/Module/Invite.php:53
+#: ../../Code/Module/Invite.php:53
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : Недействительный адрес электронной почты."
 
-#: ../../Zotlabs/Module/Invite.php:67
+#: ../../Code/Module/Invite.php:67
 msgid "Please join us on $Projectname"
 msgstr "Присоединятесь к $Projectname !"
 
-#: ../../Zotlabs/Module/Invite.php:77
+#: ../../Code/Module/Invite.php:77
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr "Превышен лимит приглашений. Пожалуйста, свяжитесь с администрацией сайта."
 
-#: ../../Zotlabs/Module/Invite.php:86
+#: ../../Code/Module/Invite.php:86
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
@@ -12465,1245 +12465,1245 @@ msgstr[0] "%d сообщение отправлено."
 msgstr[1] "%d сообщения отправлено."
 msgstr[2] "%d сообщений отправлено."
 
-#: ../../Zotlabs/Module/Invite.php:107
+#: ../../Code/Module/Invite.php:107
 msgid "You have no more invitations available"
 msgstr "У вас больше нет приглашений"
 
-#: ../../Zotlabs/Module/Invite.php:138
+#: ../../Code/Module/Invite.php:138
 msgid "Send invitations"
 msgstr "Отправить приглашение"
 
-#: ../../Zotlabs/Module/Invite.php:139
+#: ../../Code/Module/Invite.php:139
 msgid "Enter email addresses, one per line:"
 msgstr "Введите адреса электронной почты, по одному в строке:"
 
-#: ../../Zotlabs/Module/Invite.php:141
+#: ../../Code/Module/Invite.php:141
 msgid "Please join my community on $Projectname."
 msgstr "Присоединятесь к нашему сообществу $Projectname !"
 
-#: ../../Zotlabs/Module/Invite.php:143
+#: ../../Code/Module/Invite.php:143
 msgid "You will need to supply this invitation code:"
 msgstr "Вам нужно предоставит этот код приглашения:"
 
-#: ../../Zotlabs/Module/Invite.php:144
+#: ../../Code/Module/Invite.php:144
 msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr "1. Зарегистрируйтесь на любом из серверов $Projectname"
 
-#: ../../Zotlabs/Module/Invite.php:146
+#: ../../Code/Module/Invite.php:146
 msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr "2. Введите сетевой адрес $Projectname в поисковой строке сайта"
 
-#: ../../Zotlabs/Module/Invite.php:147
+#: ../../Code/Module/Invite.php:147
 msgid "or visit"
 msgstr "или посетите"
 
-#: ../../Zotlabs/Module/Invite.php:149
+#: ../../Code/Module/Invite.php:149
 msgid "3. Click [Connect]"
 msgstr "Нажать [Подключиться]"
 
-#: ../../Zotlabs/Module/Blocks.php:156
+#: ../../Code/Module/Blocks.php:156
 msgid "Block Title"
 msgstr "Заблокировать заголовок"
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Cover_photo.php:218
+#: ../../Code/Module/Cover_photo.php:168
+#: ../../Code/Module/Cover_photo.php:218
 msgid "Cover Photos"
 msgstr "Фотографии обложки"
 
-#: ../../Zotlabs/Module/Cover_photo.php:390
+#: ../../Code/Module/Cover_photo.php:390
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr "Фотография вашей обложки может быть видна всем в Интернете"
 
-#: ../../Zotlabs/Module/Cover_photo.php:394
+#: ../../Code/Module/Cover_photo.php:394
 msgid "Change Cover Photo"
 msgstr "Изменить фотографию обложки"
 
-#: ../../Zotlabs/Module/Like.php:54
+#: ../../Code/Module/Like.php:54
 msgid "Like/Dislike"
 msgstr "Нравится / не нравится"
 
-#: ../../Zotlabs/Module/Like.php:59
+#: ../../Code/Module/Like.php:59
 msgid "This action is restricted to members."
 msgstr "Это действие доступно только участникам."
 
-#: ../../Zotlabs/Module/Like.php:60
+#: ../../Code/Module/Like.php:60
 msgid ""
 "Please login with your $Projectname ID or register as a new $Projectname member to continue."
 msgstr "Пожалуйста, для продолжения  войдите с вашим $Projectname ID или зарегистрируйтесь как новый участник $Projectname."
 
-#: ../../Zotlabs/Module/Like.php:109 ../../Zotlabs/Module/Like.php:135
-#: ../../Zotlabs/Module/Like.php:173
+#: ../../Code/Module/Like.php:109 ../../Code/Module/Like.php:135
+#: ../../Code/Module/Like.php:173
 msgid "Invalid request."
 msgstr "Неверный запрос."
 
-#: ../../Zotlabs/Module/Like.php:150
+#: ../../Code/Module/Like.php:150
 msgid "thing"
 msgstr "предмет"
 
-#: ../../Zotlabs/Module/Like.php:196
+#: ../../Code/Module/Like.php:196
 msgid "Channel unavailable."
 msgstr "Канал недоступен."
 
-#: ../../Zotlabs/Module/Like.php:244
+#: ../../Code/Module/Like.php:244
 msgid "Previous action reversed."
 msgstr "Предыдущее действие отменено."
 
-#: ../../Zotlabs/Module/Like.php:442
+#: ../../Code/Module/Like.php:442
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s согласен с %2$s %3$s"
 
-#: ../../Zotlabs/Module/Like.php:444
+#: ../../Code/Module/Like.php:444
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s не согласен с %2$s %3$s"
 
-#: ../../Zotlabs/Module/Like.php:446
+#: ../../Code/Module/Like.php:446
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s воздерживается от решения по %2$s%3$s"
 
-#: ../../Zotlabs/Module/Like.php:564
+#: ../../Code/Module/Like.php:564
 msgid "Action completed."
 msgstr "Действие завершено."
 
-#: ../../Zotlabs/Module/Like.php:565
+#: ../../Code/Module/Like.php:565
 msgid "Thank you."
 msgstr "Спасибо."
 
-#: ../../Zotlabs/Module/Defperms.php:239
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Code/Module/Defperms.php:239
+#: ../../Code/Module/Settings/Channel.php:488
 msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr "Если включено, запросы контактов будут одобрены без вашего участия"
 
-#: ../../Zotlabs/Module/Defperms.php:246
+#: ../../Code/Module/Defperms.php:246
 msgid "Automatic approval settings"
 msgstr "Настройки автоматического одобрения"
 
-#: ../../Zotlabs/Module/Defperms.php:254
+#: ../../Code/Module/Defperms.php:254
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
 msgstr "Некоторые индивидуальные разрешения могут быть предустановлены или заблокированы на основании типа вашего канала и настроек приватности."
 
-#: ../../Zotlabs/Module/Menu.php:67
+#: ../../Code/Module/Menu.php:67
 msgid "Unable to update menu."
 msgstr "Невозможно обновить меню."
 
-#: ../../Zotlabs/Module/Menu.php:78
+#: ../../Code/Module/Menu.php:78
 msgid "Unable to create menu."
 msgstr "Невозможно создать меню."
 
-#: ../../Zotlabs/Module/Menu.php:160 ../../Zotlabs/Module/Menu.php:173
+#: ../../Code/Module/Menu.php:160 ../../Code/Module/Menu.php:173
 msgid "Menu Name"
 msgstr "Название меню"
 
-#: ../../Zotlabs/Module/Menu.php:160
+#: ../../Code/Module/Menu.php:160
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Уникальное название (не видимо на странице) - требуется"
 
-#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
+#: ../../Code/Module/Menu.php:161 ../../Code/Module/Menu.php:174
 msgid "Menu Title"
 msgstr "Заголовок меню"
 
-#: ../../Zotlabs/Module/Menu.php:161
+#: ../../Code/Module/Menu.php:161
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Видимость на странице - оставьте пустым если не хотите иметь заголовок"
 
-#: ../../Zotlabs/Module/Menu.php:162
+#: ../../Code/Module/Menu.php:162
 msgid "Allow Bookmarks"
 msgstr "Разрешить закладки"
 
-#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221
+#: ../../Code/Module/Menu.php:162 ../../Code/Module/Menu.php:221
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Меню может использоваться, чтобы сохранить закладки"
 
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:224
+#: ../../Code/Module/Menu.php:163 ../../Code/Module/Menu.php:224
 msgid "Submit and proceed"
 msgstr "Отправить и обработать"
 
-#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Module/Locs.php:120
+#: ../../Code/Module/Menu.php:176 ../../Code/Module/Locs.php:120
 msgid "Drop"
 msgstr "Удалить"
 
-#: ../../Zotlabs/Module/Menu.php:180
+#: ../../Code/Module/Menu.php:180
 msgid "Bookmarks allowed"
 msgstr "Закладки разрешены"
 
-#: ../../Zotlabs/Module/Menu.php:182
+#: ../../Code/Module/Menu.php:182
 msgid "Delete this menu"
 msgstr "Удалить это меню"
 
-#: ../../Zotlabs/Module/Menu.php:183 ../../Zotlabs/Module/Menu.php:218
+#: ../../Code/Module/Menu.php:183 ../../Code/Module/Menu.php:218
 msgid "Edit menu contents"
 msgstr "Редактировать содержание меню"
 
-#: ../../Zotlabs/Module/Menu.php:184
+#: ../../Code/Module/Menu.php:184
 msgid "Edit this menu"
 msgstr "Редактировать это меню"
 
-#: ../../Zotlabs/Module/Menu.php:200
+#: ../../Code/Module/Menu.php:200
 msgid "Menu could not be deleted."
 msgstr "Меню не может быть удалено."
 
-#: ../../Zotlabs/Module/Menu.php:213
+#: ../../Code/Module/Menu.php:213
 msgid "Edit Menu"
 msgstr "Редактировать меню"
 
-#: ../../Zotlabs/Module/Menu.php:217
+#: ../../Code/Module/Menu.php:217
 msgid "Add or remove entries to this menu"
 msgstr "Добавить или удалить пункты этого меню"
 
-#: ../../Zotlabs/Module/Menu.php:219
+#: ../../Code/Module/Menu.php:219
 msgid "Menu name"
 msgstr "Название меню"
 
-#: ../../Zotlabs/Module/Menu.php:219
+#: ../../Code/Module/Menu.php:219
 msgid "Must be unique, only seen by you"
 msgstr "Должно быть уникальным (видно только вам)"
 
-#: ../../Zotlabs/Module/Menu.php:220
+#: ../../Code/Module/Menu.php:220
 msgid "Menu title"
 msgstr "Заголовок меню"
 
-#: ../../Zotlabs/Module/Menu.php:220
+#: ../../Code/Module/Menu.php:220
 msgid "Menu title as seen by others"
 msgstr "Видимый другими заголовок меню"
 
-#: ../../Zotlabs/Module/Menu.php:221
+#: ../../Code/Module/Menu.php:221
 msgid "Allow bookmarks"
 msgstr "Разрешить закладки"
 
-#: ../../Zotlabs/Module/Manage.php:138 ../../Zotlabs/Module/New_channel.php:147
+#: ../../Code/Module/Manage.php:138 ../../Code/Module/New_channel.php:147
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Вы создали %1$.0f из %2$.0f возможных каналов."
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Code/Module/Manage.php:145
 msgid "Create a new channel"
 msgstr "Создать новый канал"
 
-#: ../../Zotlabs/Module/Manage.php:145 ../../Zotlabs/Module/Chat.php:256
-#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Profiles.php:831
+#: ../../Code/Module/Manage.php:145 ../../Code/Module/Chat.php:256
+#: ../../Code/Module/Wiki.php:205 ../../Code/Module/Profiles.php:831
 msgid "Create New"
 msgstr "Создать новый"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Code/Module/Manage.php:171
 msgid "Current Channel"
 msgstr "Текущий канал"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Code/Module/Manage.php:173
 msgid "Switch to one of your channels by selecting it."
 msgstr "Выбрать и переключиться на один из ваших каналов"
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Code/Module/Manage.php:174
 msgid "Default Channel"
 msgstr "Основной канал"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Code/Module/Manage.php:175
 msgid "Make Default"
 msgstr "Сделать основным"
 
-#: ../../Zotlabs/Module/Manage.php:178
+#: ../../Code/Module/Manage.php:178
 #, php-format
 msgid "%d new messages"
 msgstr "%d новых сообщений"
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Code/Module/Manage.php:179
 #, php-format
 msgid "%d new introductions"
 msgstr "%d новых представлений"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Code/Module/Manage.php:181
 msgid "Delegated Channel"
 msgstr "Делегированный канал"
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
+#: ../../Code/Module/Changeaddr.php:35
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Изменение названия канала не разрешается в течении 48 часов после смены пароля у аккаунта."
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
+#: ../../Code/Module/Changeaddr.php:77
 msgid "Change channel nickname/address"
 msgstr "Изменить псевдоним / адрес канала"
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
+#: ../../Code/Module/Changeaddr.php:78
 msgid "Any/all connections on other networks will be lost!"
 msgstr "Любые / все контакты в других сетях будут утеряны!"
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
+#: ../../Code/Module/Changeaddr.php:80
 msgid "New channel address"
 msgstr "Новый адрес канала"
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
+#: ../../Code/Module/Changeaddr.php:81
 msgid "Rename Channel"
 msgstr "Переименовать канал"
 
-#: ../../Zotlabs/Module/Settings/Features.php:73
+#: ../../Code/Module/Settings/Features.php:73
 msgid "Additional Features"
 msgstr "Дополнительные функции"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid "Your technical skill level"
 msgstr "Ваш уровень технических навыков"
 
-#: ../../Zotlabs/Module/Settings/Features.php:74
-#: ../../Zotlabs/Module/Settings/Account.php:116
+#: ../../Code/Module/Settings/Features.php:74
+#: ../../Code/Module/Settings/Account.php:116
 msgid ""
 "Used to provide a member experience and additional features consistent with "
 "your comfort level"
 msgstr "Используется чтобы обеспечить соответствие опыта пользователя и функций на комфортном для вас уровне"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:333
+#: ../../Code/Module/Settings/Channel.php:333
 msgid "Nobody except yourself"
 msgstr "Никто кроме вас"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:334
+#: ../../Code/Module/Settings/Channel.php:334
 msgid "Only those you specifically allow"
 msgstr "Только персонально разрешённые"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:335
+#: ../../Code/Module/Settings/Channel.php:335
 msgid "Approved connections"
 msgstr "Одобренные контакты"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:336
+#: ../../Code/Module/Settings/Channel.php:336
 msgid "Any connections"
 msgstr "Любые контакты"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:337
+#: ../../Code/Module/Settings/Channel.php:337
 msgid "Anybody on this website"
 msgstr "Любой на этом сайте"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:338
+#: ../../Code/Module/Settings/Channel.php:338
 msgid "Anybody in this network"
 msgstr "Любой в этой сети"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:339
+#: ../../Code/Module/Settings/Channel.php:339
 msgid "Anybody authenticated"
 msgstr "Любой аутентифицированный"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:340
+#: ../../Code/Module/Settings/Channel.php:340
 msgid "Anybody on the internet"
 msgstr "Любой в интернете"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:415
+#: ../../Code/Module/Settings/Channel.php:415
 msgid "Publish your default profile in the network directory"
 msgstr "Публиковать ваш профиль по умолчанию в сетевом каталоге"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:420
+#: ../../Code/Module/Settings/Channel.php:420
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Разрешить предлагать вас как потенциального друга для новых пользователей?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:424
+#: ../../Code/Module/Settings/Channel.php:424
 msgid "or"
 msgstr "или"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:433
+#: ../../Code/Module/Settings/Channel.php:433
 msgid "Your channel address is"
 msgstr "Адрес вашего канала"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:436
+#: ../../Code/Module/Settings/Channel.php:436
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "Ваши файы / фотографии доступны через WebDAV по"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Code/Module/Settings/Channel.php:488
 msgid "Automatic membership approval"
 msgstr "Членство одобрено автоматически"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:514
+#: ../../Code/Module/Settings/Channel.php:514
 msgid "Channel Settings"
 msgstr "Настройки канала"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Code/Module/Settings/Channel.php:521
 msgid "Basic Settings"
 msgstr "Основные настройки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
-#: ../../Zotlabs/Module/Settings/Account.php:119
+#: ../../Code/Module/Settings/Channel.php:523
+#: ../../Code/Module/Settings/Account.php:119
 msgid "Email Address:"
 msgstr "Адрес email:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:524
+#: ../../Code/Module/Settings/Channel.php:524
 msgid "Your Timezone:"
 msgstr "Часовой пояс:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "Default Post Location:"
 msgstr "Расположение по умолчанию:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
+#: ../../Code/Module/Settings/Channel.php:525
 msgid "Geographical location to display on your posts"
 msgstr "Показывать географическое положение в ваших публикациях"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Code/Module/Settings/Channel.php:526
 msgid "Use Browser Location:"
 msgstr "Определять расположение из браузера"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Code/Module/Settings/Channel.php:528
 msgid "Adult Content"
 msgstr "Содержимое для взрослых"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Code/Module/Settings/Channel.php:528
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Этот канал часто или регулярно публикует содержимое для взрослых. Пожалуйста, помечайте любой такой материал тегом #NSFW"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:530
+#: ../../Code/Module/Settings/Channel.php:530
 msgid "Security and Privacy Settings"
 msgstr "Безопасность и настройки приватности"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Code/Module/Settings/Channel.php:532
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Ваши разрешения уже настроены. Нажмите чтобы просмотреть или изменить"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Code/Module/Settings/Channel.php:534
 msgid "Hide my online presence"
 msgstr "Скрывать моё присутствие онлайн"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:534
+#: ../../Code/Module/Settings/Channel.php:534
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Предотвращает отображения статуса \"в сети\" в вашем профиле"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:536
+#: ../../Code/Module/Settings/Channel.php:536
 msgid "Simple Privacy Settings:"
 msgstr "Простые настройки безопасности:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Code/Module/Settings/Channel.php:537
 msgid ""
 "Very Public - extremely permissive (should be used with caution)"
 msgstr "Полностью открытый - сверхлиберальный (должен использоваться с осторожностью)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
+#: ../../Code/Module/Settings/Channel.php:538
 msgid ""
 "Typical - default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)"
 msgstr "Обычный - открытый по умолчанию, приватность по желанию (как в социальных сетях, но с улучшенными настройками)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Code/Module/Settings/Channel.php:539
 msgid "Private - default private, never open or public"
 msgstr "Частный - частный по умочанию, не открытый и не публичный"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:540
+#: ../../Code/Module/Settings/Channel.php:540
 msgid "Blocked - default blocked to/from everybody"
 msgstr "Закрытый - заблокированный по умолчанию от / для всех"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Code/Module/Settings/Channel.php:542
 msgid "Allow others to tag your posts"
 msgstr "Разрешить другим отмечать ваши публикации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Code/Module/Settings/Channel.php:542
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Часто используется сообществом для маркировки неподобающего содержания"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
+#: ../../Code/Module/Settings/Channel.php:544
 msgid "Channel Permission Limits"
 msgstr "Ограничения разрешений канала"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "Expire other channel content after this many days"
 msgstr "Храненить содержимое других каналов, дней"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "0 or blank to use the website limit."
 msgstr "0 или пусто - использовать настройки сайта."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Срок хранения содержимого этого сайта истекает через %d дней"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "This website does not expire imported content."
 msgstr "Срок хранения импортированного содержимого этого сайта не ограничен."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Code/Module/Settings/Channel.php:546
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Ограничение сайта имеет приоритет если ниже вашего значения."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Code/Module/Settings/Channel.php:547
 msgid "Maximum Friend Requests/Day:"
 msgstr "Запросов в друзья в день:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Code/Module/Settings/Channel.php:547
 msgid "May reduce spam activity"
 msgstr "Может ограничить спам активность"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Code/Module/Settings/Channel.php:548
 msgid "Default Privacy Group"
 msgstr "Группа конфиденциальности по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Code/Module/Settings/Channel.php:550
 msgid "Use my default audience setting for the type of object published"
 msgstr "Использовать настройки аудитории по умолчанию для типа опубликованного объекта"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Code/Module/Settings/Channel.php:551
 msgid "Profile to assign new connections"
 msgstr "Назначить профиль для новых контактов"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:560
-#: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Code/Module/Settings/Channel.php:560
+#: ../../Code/Module/New_channel.php:177
+#: ../../Code/Module/Register.php:266
 msgid "Channel role and privacy"
 msgstr "Роль и конфиденциальность канала"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:561
+#: ../../Code/Module/Settings/Channel.php:561
 msgid "Default Permissions Group"
 msgstr "Группа разрешений по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Code/Module/Settings/Channel.php:567
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Максимально количество сообщений от незнакомых людей, в день:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Code/Module/Settings/Channel.php:567
 msgid "Useful to reduce spamming"
 msgstr "Полезно для сокращения количества спама"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Code/Module/Settings/Channel.php:571
 msgid "By default post a status message when:"
 msgstr "По умолчанию публиковать новый статус при:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Code/Module/Settings/Channel.php:572
 msgid "accepting a friend request"
 msgstr "одобрении запроса в друзья"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Code/Module/Settings/Channel.php:573
 msgid "joining a forum/community"
 msgstr "вступлении в сообщество / форум"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Code/Module/Settings/Channel.php:574
 msgid "making an interesting profile change"
 msgstr "интересном изменении профиля"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Code/Module/Settings/Channel.php:575
 msgid "Send a notification email when:"
 msgstr "Отправить уведомление по email когда:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Code/Module/Settings/Channel.php:576
 msgid "You receive a connection request"
 msgstr "вы получили новый запрос контакта"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Code/Module/Settings/Channel.php:577
 msgid "Your connections are confirmed"
 msgstr "ваш запрос контакта был одобрен"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Code/Module/Settings/Channel.php:578
 msgid "Someone writes on your profile wall"
 msgstr "кто-то написал на стене вашего профиля"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Code/Module/Settings/Channel.php:579
 msgid "Someone writes a followup comment"
 msgstr "кто-то пишет комментарий"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Code/Module/Settings/Channel.php:580
 msgid "You receive a private message"
 msgstr "вы получили личное сообщение"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Code/Module/Settings/Channel.php:581
 msgid "You receive a friend suggestion"
 msgstr "вы получили предложение друзей"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Code/Module/Settings/Channel.php:582
 msgid "You are tagged in a post"
 msgstr "вы были отмечены в публикации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Code/Module/Settings/Channel.php:583
 msgid "You are poked/prodded/etc. in a post"
 msgstr "вас толкнули, подтолкнули и т.п. в публикации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Code/Module/Settings/Channel.php:585
 msgid "Someone likes your post/comment"
 msgstr "кому-то нравится ваша публикация / комментарий"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:588
+#: ../../Code/Module/Settings/Channel.php:588
 msgid "Show visual notifications including:"
 msgstr "Показывать визуальные оповещения включая:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:590
+#: ../../Code/Module/Settings/Channel.php:590
 msgid "Unseen grid activity"
 msgstr "невидимую сетевую активность"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:591
+#: ../../Code/Module/Settings/Channel.php:591
 msgid "Unseen channel activity"
 msgstr "невидимую активность в канале"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Code/Module/Settings/Channel.php:592
 msgid "Unseen private messages"
 msgstr "невидимое личное сообщение"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Code/Module/Settings/Channel.php:593
 msgid "Upcoming events"
 msgstr "грядущие события"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Code/Module/Settings/Channel.php:594
 msgid "Events today"
 msgstr "события сегодня"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Upcoming birthdays"
 msgstr "грядущие дни рождения"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Code/Module/Settings/Channel.php:595
 msgid "Not available in all themes"
 msgstr "не доступно во всех темах"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Code/Module/Settings/Channel.php:596
 msgid "System (personal) notifications"
 msgstr "системные (личные) уведомления"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Code/Module/Settings/Channel.php:597
 msgid "System info messages"
 msgstr "сообщения с системной информацией"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:598
+#: ../../Code/Module/Settings/Channel.php:598
 msgid "System critical alerts"
 msgstr "критические уведомления системы"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:599
+#: ../../Code/Module/Settings/Channel.php:599
 msgid "New connections"
 msgstr "новые контакты"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:600
+#: ../../Code/Module/Settings/Channel.php:600
 msgid "System Registrations"
 msgstr "системные регистрации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:601
+#: ../../Code/Module/Settings/Channel.php:601
 msgid "Unseen shared files"
 msgstr "невидимые общие файлы"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:602
+#: ../../Code/Module/Settings/Channel.php:602
 msgid "Unseen public activity"
 msgstr "невидимая публичная активность"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:603
+#: ../../Code/Module/Settings/Channel.php:603
 msgid "Unseen likes and dislikes"
 msgstr "невидимые лайки и дислайки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:604
+#: ../../Code/Module/Settings/Channel.php:604
 msgid "Unseen forum posts"
 msgstr "Невидимые публикации на форуме"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:605
+#: ../../Code/Module/Settings/Channel.php:605
 msgid "Email notification hub (hostname)"
 msgstr "Центр уведомлений по email (имя хоста)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:605
+#: ../../Code/Module/Settings/Channel.php:605
 #, php-format
 msgid ""
 "If your channel is mirrored to multiple hubs, set this to your preferred "
 "location. This will prevent duplicate email notifications. Example: %s"
 msgstr "Если ваш канал зеркалируется в нескольких местах, это ваше предпочтительное местоположение. Это должно предотвратить дублировать уведомлений по email. Например: %s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:606
+#: ../../Code/Module/Settings/Channel.php:606
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr "Показать новые сообщения на стене, личные сообщения и контакты в \"Уведомлениях\""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:608
+#: ../../Code/Module/Settings/Channel.php:608
 msgid "Notify me of events this many days in advance"
 msgstr "Уведомлять меня о событиях заранее, дней"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:608
+#: ../../Code/Module/Settings/Channel.php:608
 msgid "Must be greater than 0"
 msgstr "Должно быть больше 0"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:614
+#: ../../Code/Module/Settings/Channel.php:614
 msgid "Advanced Account/Page Type Settings"
 msgstr "Дополнительные настройки учётной записи / страницы"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:615
+#: ../../Code/Module/Settings/Channel.php:615
 msgid "Change the behaviour of this account for special situations"
 msgstr "Изменить поведение этого аккаунта в особых ситуациях"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:617
+#: ../../Code/Module/Settings/Channel.php:617
 msgid "Miscellaneous Settings"
 msgstr "Дополнительные настройки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:618
+#: ../../Code/Module/Settings/Channel.php:618
 msgid "Default photo upload folder"
 msgstr "Каталог загрузки фотографий по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:618
-#: ../../Zotlabs/Module/Settings/Channel.php:619
+#: ../../Code/Module/Settings/Channel.php:618
+#: ../../Code/Module/Settings/Channel.php:619
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - текущий год, %y - текущий месяц"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:619
+#: ../../Code/Module/Settings/Channel.php:619
 msgid "Default file upload folder"
 msgstr "Каталог загрузки файлов по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:621
+#: ../../Code/Module/Settings/Channel.php:621
 msgid "Personal menu to display in your channel pages"
 msgstr "Персональное меню для отображения на странице вашего канала"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:623
+#: ../../Code/Module/Settings/Channel.php:623
 msgid "Remove this channel."
 msgstr "Удалить этот канал."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:624
+#: ../../Code/Module/Settings/Channel.php:624
 msgid "Firefox Share $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:625
+#: ../../Code/Module/Settings/Channel.php:625
 msgid "Start calendar week on Monday"
 msgstr "Начинать календарную неделю с понедельника"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:23
+#: ../../Code/Module/Settings/Featured.php:23
 msgid "Affinity Slider settings updated."
 msgstr "Обновлены настройки слайдера cходства."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:38
+#: ../../Code/Module/Settings/Featured.php:38
 msgid "No feature settings configured"
 msgstr "Параметры функций не настроены"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "Default maximum affinity level"
 msgstr "Максимальный уровень сходства по умолчанию."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:45
+#: ../../Code/Module/Settings/Featured.php:45
 msgid "0-99 default 99"
 msgstr "0-99 (по умолчанию 99)"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "Default minimum affinity level"
 msgstr "Минимальный уровень сходства по умолчанию."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Code/Module/Settings/Featured.php:50
 msgid "0-99 - default 0"
 msgstr "0-99 (по умолчанию 0)"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:54
+#: ../../Code/Module/Settings/Featured.php:54
 msgid "Affinity Slider Settings"
 msgstr "Настройки слайдера сходства"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:67
+#: ../../Code/Module/Settings/Featured.php:67
 msgid "Addon Settings"
 msgstr "Настройки расширений"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:68
+#: ../../Code/Module/Settings/Featured.php:68
 msgid "Please save/submit changes to any panel before opening another."
 msgstr "Пожалуйста сохраните / отправьте изменения на панели прежде чем открывать другую."
 
-#: ../../Zotlabs/Module/Settings/Account.php:20
+#: ../../Code/Module/Settings/Account.php:20
 msgid "Not valid email."
 msgstr "Не действительный адрес email."
 
-#: ../../Zotlabs/Module/Settings/Account.php:23
+#: ../../Code/Module/Settings/Account.php:23
 msgid "Protected email address. Cannot change to that email."
 msgstr "Защищенный адрес электронной почты. Нельзя изменить."
 
-#: ../../Zotlabs/Module/Settings/Account.php:32
+#: ../../Code/Module/Settings/Account.php:32
 msgid "System failure storing new email. Please try again."
 msgstr "Системная ошибка сохранения email. Пожалуйста попробуйте ещё раз."
 
-#: ../../Zotlabs/Module/Settings/Account.php:40
+#: ../../Code/Module/Settings/Account.php:40
 msgid "Technical skill level updated"
 msgstr "Уровень технических навыков обновлён"
 
-#: ../../Zotlabs/Module/Settings/Account.php:56
+#: ../../Code/Module/Settings/Account.php:56
 msgid "Password verification failed."
 msgstr "Не удалось выполнить проверку пароля."
 
-#: ../../Zotlabs/Module/Settings/Account.php:63
+#: ../../Code/Module/Settings/Account.php:63
 msgid "Passwords do not match. Password unchanged."
 msgstr "Пароли не совпадают. Пароль не изменён."
 
-#: ../../Zotlabs/Module/Settings/Account.php:67
+#: ../../Code/Module/Settings/Account.php:67
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Пустые пароли не допускаются. Пароль не изменён."
 
-#: ../../Zotlabs/Module/Settings/Account.php:81
+#: ../../Code/Module/Settings/Account.php:81
 msgid "Password changed."
 msgstr "Пароль изменен."
 
-#: ../../Zotlabs/Module/Settings/Account.php:83
+#: ../../Code/Module/Settings/Account.php:83
 msgid "Password update failed. Please try again."
 msgstr "Изменение пароля не удалось. Пожалуйста, попробуйте ещё раз."
 
-#: ../../Zotlabs/Module/Settings/Account.php:112
+#: ../../Code/Module/Settings/Account.php:112
 msgid "Account Settings"
 msgstr "Настройки аккаунта"
 
-#: ../../Zotlabs/Module/Settings/Account.php:113
+#: ../../Code/Module/Settings/Account.php:113
 msgid "Current Password"
 msgstr "Текущий пароль"
 
-#: ../../Zotlabs/Module/Settings/Account.php:114
+#: ../../Code/Module/Settings/Account.php:114
 msgid "Enter New Password"
 msgstr "Введите новый пароль:"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Confirm New Password"
 msgstr "Подтвердите новый пароль:"
 
-#: ../../Zotlabs/Module/Settings/Account.php:115
+#: ../../Code/Module/Settings/Account.php:115
 msgid "Leave password fields blank unless changing"
 msgstr "Оставьте поля пустыми до измнения"
 
-#: ../../Zotlabs/Module/Settings/Account.php:121
+#: ../../Code/Module/Settings/Account.php:121
 msgid "Remove this account including all its channels"
 msgstr "Удалить этот аккаунт включая все каналы"
 
-#: ../../Zotlabs/Module/Settings/Display.php:139
+#: ../../Code/Module/Settings/Display.php:139
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (экспериментальный)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:187
+#: ../../Code/Module/Settings/Display.php:187
 msgid "Display Settings"
 msgstr "Настройки отображения"
 
-#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Code/Module/Settings/Display.php:188
 msgid "Theme Settings"
 msgstr "Настройки темы"
 
-#: ../../Zotlabs/Module/Settings/Display.php:189
+#: ../../Code/Module/Settings/Display.php:189
 msgid "Custom Theme Settings"
 msgstr "Дополнительные настройки темы"
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
+#: ../../Code/Module/Settings/Display.php:190
 msgid "Content Settings"
 msgstr "Настройки содержимого"
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Code/Module/Settings/Display.php:196
 msgid "Display Theme:"
 msgstr "Тема отображения:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Code/Module/Settings/Display.php:197
 msgid "Select scheme"
 msgstr "Выбрать схему"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid "Preload images before rendering the page"
 msgstr "Предзагрузка изображений перед обработкой страницы"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Code/Module/Settings/Display.php:199
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
 msgstr "Субъективное время загрузки страницы будет длиннее, но страница будет готова при отображении"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
+#: ../../Code/Module/Settings/Display.php:200
 msgid "Enable user zoom on mobile devices"
 msgstr "Включить масштабирование на мобильных устройствах"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Update browser every xx seconds"
 msgstr "Обновление браузера каждые N секунд"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Code/Module/Settings/Display.php:201
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Минимум 10 секунд, без максимума"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Максимальное количество бесед для загрузки одновременно:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:202
+#: ../../Code/Module/Settings/Display.php:202
 msgid "Maximum of 100 items"
 msgstr "Максимум 100 элементов"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Code/Module/Settings/Display.php:203
 msgid "Show emoticons (smilies) as images"
 msgstr "Показывать эмотиконы (смайлики) как изображения"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Provide channel menu in navigation bar"
 msgstr "Показывать меню канала в панели навигации"
 
-#: ../../Zotlabs/Module/Settings/Display.php:204
+#: ../../Code/Module/Settings/Display.php:204
 msgid "Default: channel menu located in app menu"
 msgstr "По умолчанию каналы расположены в меню приложения"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Manual conversation updates"
 msgstr "Обновление бесед вручную"
 
-#: ../../Zotlabs/Module/Settings/Display.php:205
+#: ../../Code/Module/Settings/Display.php:205
 msgid "Default is on, turning this off may increase screen jumping"
 msgstr "Включено по умолчанию, выключение может привести к рывкам в отображении"
 
-#: ../../Zotlabs/Module/Settings/Display.php:206
+#: ../../Code/Module/Settings/Display.php:206
 msgid "Link post titles to source"
 msgstr "Ссылки на источник заголовков публикаций"
 
-#: ../../Zotlabs/Module/Settings/Display.php:207
+#: ../../Code/Module/Settings/Display.php:207
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Системный редактор макета страницы - (продвинутый)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:210
 msgid "Use blog/list mode on channel page"
 msgstr "Использовать режим блога / списка на странице канала"
 
-#: ../../Zotlabs/Module/Settings/Display.php:210
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:210
+#: ../../Code/Module/Settings/Display.php:211
 msgid "(comments displayed separately)"
 msgstr "(комментарии отображаются отдельно)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Code/Module/Settings/Display.php:211
 msgid "Use blog/list mode on grid page"
 msgstr "Использовать режим блога / списка на странице матрицы"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:212
 msgid "Channel page max height of content (in pixels)"
 msgstr "Максимальная высота содержания канала (в пикселях)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:212
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:212
+#: ../../Code/Module/Settings/Display.php:213
 msgid "click to expand content exceeding this height"
 msgstr "нажмите, чтобы увеличить содержимое, превышающее эту высоту"
 
-#: ../../Zotlabs/Module/Settings/Display.php:213
+#: ../../Code/Module/Settings/Display.php:213
 msgid "Grid page max height of content (in pixels)"
 msgstr "Максимальная высота содержания на страницах матрицы (в пикселях)"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:23
+#: ../../Code/Module/Settings/Permcats.php:23
 msgid "Permission Name is required."
 msgstr "Требуется имя разрешения"
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:42
+#: ../../Code/Module/Settings/Permcats.php:42
 msgid "Permission category saved."
 msgstr "Категория разрешения сохранена."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:66
+#: ../../Code/Module/Settings/Permcats.php:66
 msgid ""
 "Use this form to create permission rules for various classes of people or "
 "connections."
 msgstr "Используйте эту форму для создания правил разрешений для различных групп людей и контактов."
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
+#: ../../Code/Module/Settings/Permcats.php:107
 msgid "Permission Name"
 msgstr "Имя разрешения"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:36
+#: ../../Code/Module/Settings/Oauth2.php:36
 msgid "Name and Secret are required"
 msgstr "Требуются имя и код"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:84
+#: ../../Code/Module/Settings/Oauth2.php:84
 msgid "Add OAuth2 application"
 msgstr "Добавить приложение OAuth2"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:87
-#: ../../Zotlabs/Module/Settings/Oauth2.php:115
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Code/Module/Settings/Oauth2.php:87
+#: ../../Code/Module/Settings/Oauth2.php:115
+#: ../../Code/Module/Settings/Oauth.php:90
 msgid "Name of application"
 msgstr "Название приложения"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:88
-#: ../../Zotlabs/Module/Settings/Oauth2.php:116
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Code/Module/Settings/Oauth2.php:88
+#: ../../Code/Module/Settings/Oauth2.php:116
+#: ../../Code/Module/Settings/Oauth.php:91
+#: ../../Code/Module/Settings/Oauth.php:92
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Сгенерирован автоматические - измените если требуется. Макс. длина 20"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth.php:119
 msgid "Redirect"
 msgstr "Перенаправление"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:89
-#: ../../Zotlabs/Module/Settings/Oauth2.php:117
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Code/Module/Settings/Oauth2.php:89
+#: ../../Code/Module/Settings/Oauth2.php:117
+#: ../../Code/Module/Settings/Oauth.php:93
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr "URI перенаправления - оставьте пустыми до тех пока ваше приложение не требует этого"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:118
 msgid "Grant Types"
 msgstr "Разрешить типы"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:90
-#: ../../Zotlabs/Module/Settings/Oauth2.php:91
-#: ../../Zotlabs/Module/Settings/Oauth2.php:118
-#: ../../Zotlabs/Module/Settings/Oauth2.php:119
+#: ../../Code/Module/Settings/Oauth2.php:90
+#: ../../Code/Module/Settings/Oauth2.php:91
+#: ../../Code/Module/Settings/Oauth2.php:118
+#: ../../Code/Module/Settings/Oauth2.php:119
 msgid "leave blank unless your application sepcifically requires this"
 msgstr "оставьте пустыми до тех пока ваше приложение не требует этого"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:91
-#: ../../Zotlabs/Module/Settings/Oauth2.php:119
+#: ../../Code/Module/Settings/Oauth2.php:91
+#: ../../Code/Module/Settings/Oauth2.php:119
 msgid "Authorization scope"
 msgstr "Область полномочий"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:103
+#: ../../Code/Module/Settings/Oauth2.php:103
 msgid "OAuth2 Application not found."
 msgstr "Приложение OAuth2 не найдено."
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:112
-#: ../../Zotlabs/Module/Settings/Oauth2.php:149
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
+#: ../../Code/Module/Settings/Oauth2.php:112
+#: ../../Code/Module/Settings/Oauth2.php:149
+#: ../../Code/Module/Settings/Oauth.php:87
+#: ../../Code/Module/Settings/Oauth.php:113
+#: ../../Code/Module/Settings/Oauth.php:149
 msgid "Add application"
 msgstr "Добавить приложение"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:148
+#: ../../Code/Module/Settings/Oauth2.php:148
 msgid "Connected OAuth2 Apps"
 msgstr "Подключённые приложения OAuth2"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:152
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
+#: ../../Code/Module/Settings/Oauth2.php:152
+#: ../../Code/Module/Settings/Oauth.php:152
 msgid "Client key starts with"
 msgstr "Ключ клиента начинаетя с"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:153
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
+#: ../../Code/Module/Settings/Oauth2.php:153
+#: ../../Code/Module/Settings/Oauth.php:153
 msgid "No name"
 msgstr "Без названия"
 
-#: ../../Zotlabs/Module/Settings/Oauth2.php:154
-#: ../../Zotlabs/Module/Settings/Oauth.php:154
+#: ../../Code/Module/Settings/Oauth2.php:154
+#: ../../Code/Module/Settings/Oauth.php:154
 msgid "Remove authorization"
 msgstr "Удалить разрешение"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:35
+#: ../../Code/Module/Settings/Oauth.php:35
 msgid "Name is required"
 msgstr "Необходимо имя"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:39
+#: ../../Code/Module/Settings/Oauth.php:39
 msgid "Key and Secret are required"
 msgstr "Требуются ключ и код"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:94
-#: ../../Zotlabs/Module/Settings/Oauth.php:120
+#: ../../Code/Module/Settings/Oauth.php:94
+#: ../../Code/Module/Settings/Oauth.php:120
 msgid "Icon url"
 msgstr "URL значка"
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:105
+#: ../../Code/Module/Settings/Oauth.php:105
 msgid "Application not found."
 msgstr "Приложение не найдено."
 
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
+#: ../../Code/Module/Settings/Oauth.php:148
 msgid "Connected Apps"
 msgstr "Подключенные приложения"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#: ../../Code/Module/Settings/Tokens.php:31
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Этот канал ограничен %d токенами"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
+#: ../../Code/Module/Settings/Tokens.php:37
 msgid "Name and Password are required."
 msgstr "Требуются имя и пароль."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
+#: ../../Code/Module/Settings/Tokens.php:77
 msgid "Token saved."
 msgstr "Токен сохранён."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
+#: ../../Code/Module/Settings/Tokens.php:113
 msgid ""
 "Use this form to create temporary access identifiers to share things with "
 "non-members. These identities may be used in Access Control Lists and "
 "visitors may login using these credentials to access private content."
 msgstr "Используйте эту форму для создания идентификаторов временного доступа для сторонних пользователей. Эти идентификаторы могут использоваться в списках контроля доступа, и посетители могут использовать эти учетные данные для доступа к частному контенту."
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
+#: ../../Code/Module/Settings/Tokens.php:115
 msgid ""
 "You may also provide dropbox style access links to friends and "
 "associates by adding the Login Password to any specific site URL as shown. "
 "Examples:"
 msgstr "Вы также можете предоставить доступ в стиле dropbox для друзей и коллег, добавив имя и пароль для входа на любой URL-адрес сайта. Например:"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
+#: ../../Code/Module/Settings/Tokens.php:157
 msgid "Login Name"
 msgstr "Имя"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
+#: ../../Code/Module/Settings/Tokens.php:158
 msgid "Login Password"
 msgstr "Пароль"
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
+#: ../../Code/Module/Settings/Tokens.php:159
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Срок действия (yyyy-mm-dd)"
 
-#: ../../Zotlabs/Module/Chat.php:181
+#: ../../Code/Module/Chat.php:181
 msgid "Room not found"
 msgstr "Комната не найдена"
 
-#: ../../Zotlabs/Module/Chat.php:197
+#: ../../Code/Module/Chat.php:197
 msgid "Leave Room"
 msgstr "Покинуть комнату"
 
-#: ../../Zotlabs/Module/Chat.php:198
+#: ../../Code/Module/Chat.php:198
 msgid "Delete Room"
 msgstr "Удалить комнату"
 
-#: ../../Zotlabs/Module/Chat.php:199
+#: ../../Code/Module/Chat.php:199
 msgid "I am away right now"
 msgstr "Я сейчас отошёл"
 
-#: ../../Zotlabs/Module/Chat.php:200
+#: ../../Code/Module/Chat.php:200
 msgid "I am online"
 msgstr "Я на связи"
 
-#: ../../Zotlabs/Module/Chat.php:202
+#: ../../Code/Module/Chat.php:202
 msgid "Bookmark this room"
 msgstr "Запомнить эту комнату"
 
-#: ../../Zotlabs/Module/Chat.php:232
+#: ../../Code/Module/Chat.php:232
 msgid "New Chatroom"
 msgstr "Новый чат"
 
-#: ../../Zotlabs/Module/Chat.php:233
+#: ../../Code/Module/Chat.php:233
 msgid "Chatroom name"
 msgstr "Название чата"
 
-#: ../../Zotlabs/Module/Chat.php:234
+#: ../../Code/Module/Chat.php:234
 msgid "Expiration of chats (minutes)"
 msgstr "Завершение чатов (минут)"
 
-#: ../../Zotlabs/Module/Chat.php:250
+#: ../../Code/Module/Chat.php:250
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Чаты пользователя %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:255
+#: ../../Code/Module/Chat.php:255
 msgid "No chatrooms available"
 msgstr "Нет доступных чатов"
 
-#: ../../Zotlabs/Module/Chat.php:259
+#: ../../Code/Module/Chat.php:259
 msgid "Expiration"
 msgstr "Срок действия"
 
-#: ../../Zotlabs/Module/Chat.php:260
+#: ../../Code/Module/Chat.php:260
 msgid "min"
 msgstr "мин."
 
-#: ../../Zotlabs/Module/Rate.php:156
+#: ../../Code/Module/Rate.php:156
 msgid "Website:"
 msgstr "Веб-сайт:"
 
-#: ../../Zotlabs/Module/Rate.php:159
+#: ../../Code/Module/Rate.php:159
 #, php-format
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Удалённый канал [%s] (пока неизвестен на этом сайте)"
 
-#: ../../Zotlabs/Module/Rate.php:160
+#: ../../Code/Module/Rate.php:160
 msgid "Rating (this information is public)"
 msgstr "Оценка (эта информация общедоступна)"
 
-#: ../../Zotlabs/Module/Rate.php:161
+#: ../../Code/Module/Rate.php:161
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Объясните свою оценку (необязательно; эта информация общедоступна)"
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Code/Module/Probe.php:30 ../../Code/Module/Probe.php:34
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Загрузка URL возвращает ошибку: %1$s"
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+#: ../../Code/Module/Locs.php:25 ../../Code/Module/Locs.php:54
 msgid "Location not found."
 msgstr "Местоположение не найдено"
 
-#: ../../Zotlabs/Module/Locs.php:62
+#: ../../Code/Module/Locs.php:62
 msgid "Location lookup failed."
 msgstr "Поиск местоположения не удался"
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Code/Module/Locs.php:66
 msgid ""
 "Please select another location to become primary before removing the primary "
 "location."
 msgstr "Пожалуйста, выберите другое местоположение в качестве основного прежде чем удалить предыдущее"
 
-#: ../../Zotlabs/Module/Locs.php:95
+#: ../../Code/Module/Locs.php:95
 msgid "Syncing locations"
 msgstr "Синхронизировать местоположение"
 
-#: ../../Zotlabs/Module/Locs.php:105
+#: ../../Code/Module/Locs.php:105
 msgid "No locations found."
 msgstr "Местоположений не найдено"
 
-#: ../../Zotlabs/Module/Locs.php:116
+#: ../../Code/Module/Locs.php:116
 msgid "Manage Channel Locations"
 msgstr "Управление местоположением канала"
 
-#: ../../Zotlabs/Module/Locs.php:122
+#: ../../Code/Module/Locs.php:122
 msgid "Sync Now"
 msgstr "Синхронизировать"
 
-#: ../../Zotlabs/Module/Locs.php:123
+#: ../../Code/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Пожалуйста, подождите несколько минут между последовательными операциями."
 
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Code/Module/Locs.php:124
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing "
 "your channel."
 msgstr "По возможности, очистите местоположение, войдя на этот веб-сайт / хаб и удалив свой канал."
 
-#: ../../Zotlabs/Module/Locs.php:125
+#: ../../Code/Module/Locs.php:125
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Используйте эту форму, чтобы удалить местоположение, если хаб больше не функционирует."
 
-#: ../../Zotlabs/Module/Import.php:66 ../../Zotlabs/Module/Import_items.php:48
+#: ../../Code/Module/Import.php:66 ../../Code/Module/Import_items.php:48
 msgid "Nothing to import."
 msgstr "Ничего импортировать."
 
-#: ../../Zotlabs/Module/Import.php:81 ../../Zotlabs/Module/Import.php:97
-#: ../../Zotlabs/Module/Import_items.php:72
+#: ../../Code/Module/Import.php:81 ../../Code/Module/Import.php:97
+#: ../../Code/Module/Import_items.php:72
 msgid "Unable to download data from old server"
 msgstr "Невозможно загрузить данные со старого сервера"
 
-#: ../../Zotlabs/Module/Import.php:104 ../../Zotlabs/Module/Import_items.php:77
+#: ../../Code/Module/Import.php:104 ../../Code/Module/Import_items.php:77
 msgid "Imported file is empty."
 msgstr "Импортированный файл пуст."
 
-#: ../../Zotlabs/Module/Import.php:146
+#: ../../Code/Module/Import.php:146
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Ваш класс обслуживания разрешает только %d каналов."
 
-#: ../../Zotlabs/Module/Import.php:173
+#: ../../Code/Module/Import.php:173
 msgid "No channel. Import failed."
 msgstr "Канала нет. Импорт невозможен."
 
-#: ../../Zotlabs/Module/Import.php:541
+#: ../../Code/Module/Import.php:541
 msgid "You must be logged in to use this feature."
 msgstr "Вы должны войти в систему, чтобы использовать эту функцию."
 
-#: ../../Zotlabs/Module/Import.php:546
+#: ../../Code/Module/Import.php:546
 msgid "Import Channel"
 msgstr "Импортировать канал"
 
-#: ../../Zotlabs/Module/Import.php:547
+#: ../../Code/Module/Import.php:547
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You "
 "may retrieve the channel identity from the old server/hub via the network or "
 "provide an export file."
 msgstr "Используйте эту форм для импорта существующего канала с другого сервера / хаба. Вы можете получить идентификационные данные канала со старого сервера / хаба через сеть или предоставить файл экспорта."
 
-#: ../../Zotlabs/Module/Import.php:548
-#: ../../Zotlabs/Module/Import_items.php:127
+#: ../../Code/Module/Import.php:548
+#: ../../Code/Module/Import_items.php:127
 msgid "File to Upload"
 msgstr "Файл для загрузки"
 
-#: ../../Zotlabs/Module/Import.php:549
+#: ../../Code/Module/Import.php:549
 msgid "Or provide the old server/hub details"
 msgstr "или предоставьте данные старого сервера"
 
-#: ../../Zotlabs/Module/Import.php:551
+#: ../../Code/Module/Import.php:551
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Ваш старый адрес идентичности (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:552
+#: ../../Code/Module/Import.php:552
 msgid "Your old login email address"
 msgstr "Ваш старый адрес электронной почты"
 
-#: ../../Zotlabs/Module/Import.php:553
+#: ../../Code/Module/Import.php:553
 msgid "Your old login password"
 msgstr "Ваш старый пароль"
 
-#: ../../Zotlabs/Module/Import.php:554
+#: ../../Code/Module/Import.php:554
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Импортировать несколько месяцев публикаций если возможно (ограничено доступной памятью)"
 
-#: ../../Zotlabs/Module/Import.php:556
+#: ../../Code/Module/Import.php:556
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be "
@@ -13711,119 +13711,119 @@ msgid ""
 "location for files, photos, and media."
 msgstr "Для любого варианта, пожалуйста, выберите, следует ли сделать этот хаб вашим новым основным адресом, или ваше прежнее местоположение должно продолжить выполнять эту роль. Вы сможете отправлять сообщения из любого местоположения, но только одно может быть помечено как основное место для файлов, фотографий и мультимедиа."
 
-#: ../../Zotlabs/Module/Import.php:558
+#: ../../Code/Module/Import.php:558
 msgid "Make this hub my primary location"
 msgstr "Сделать этот хаб главным"
 
-#: ../../Zotlabs/Module/Import.php:559
+#: ../../Code/Module/Import.php:559
 msgid "Move this channel (disable all previous locations)"
 msgstr "Переместить это канал (отключить все предыдущие месторасположения)"
 
-#: ../../Zotlabs/Module/Import.php:560
+#: ../../Code/Module/Import.php:560
 msgid "Use this channel nickname instead of the one provided"
 msgstr "Использовать псевдоним этого канала вместо предоставленного"
 
-#: ../../Zotlabs/Module/Import.php:560
+#: ../../Code/Module/Import.php:560
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this site."
 msgstr "Оставьте пустым для сохранения существующего псевдонима канала. Вам будет случайным образом назначен похожий псевдоним если такое имя уже выделено на этом сайте."
 
-#: ../../Zotlabs/Module/Import.php:562
+#: ../../Code/Module/Import.php:562
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
 msgstr "Процесс может занять несколько минут. Пожалуйста, отправьте форму только один раз и оставьте эту страницу открытой до завершения."
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
+#: ../../Code/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Контактов нет."
 
-#: ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Code/Module/Viewconnections.php:83
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Посетить %s ​​профиль [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:113
+#: ../../Code/Module/Viewconnections.php:113
 msgid "View Connections"
 msgstr "Просмотр контактов"
 
-#: ../../Zotlabs/Module/Rmagic.php:35
+#: ../../Code/Module/Rmagic.php:35
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: ../../Zotlabs/Module/New_channel.php:156
+#: ../../Code/Module/New_channel.php:156
 msgid "Your real name is recommended."
 msgstr "Рекомендуется использовать ваше настоящее имя."
 
-#: ../../Zotlabs/Module/New_channel.php:157
+#: ../../Code/Module/New_channel.php:157
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
 msgstr "Примеры: \"Иван Иванов\", \"Оксана и кони\", \"Футбол\", \"Тимур и его команда\""
 
-#: ../../Zotlabs/Module/New_channel.php:162
+#: ../../Code/Module/New_channel.php:162
 msgid ""
 "This will be used to create a unique network address (like an email address)."
 msgstr "Это будет использовано для создания уникального сетевого адреса (наподобие email)."
 
-#: ../../Zotlabs/Module/New_channel.php:164
+#: ../../Code/Module/New_channel.php:164
 msgid "Allowed characters are a-z 0-9, - and _"
 msgstr "Разрешённые символы a-z 0-9, - и _"
 
-#: ../../Zotlabs/Module/New_channel.php:174
+#: ../../Code/Module/New_channel.php:174
 msgid "Channel name"
 msgstr "Название канала"
 
-#: ../../Zotlabs/Module/New_channel.php:176
-#: ../../Zotlabs/Module/Register.php:265
+#: ../../Code/Module/New_channel.php:176
+#: ../../Code/Module/Register.php:265
 msgid "Choose a short nickname"
 msgstr "Выберите короткий псевдоним"
 
-#: ../../Zotlabs/Module/New_channel.php:177
+#: ../../Code/Module/New_channel.php:177
 msgid ""
 "Select a channel permission role compatible with your usage needs and "
 "privacy requirements."
 msgstr "Выберите разрешения для канала в соответствии с вашими потребностями и требованиями безопасности."
 
-#: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Code/Module/New_channel.php:177
+#: ../../Code/Module/Register.php:266
 msgid "Read more about channel permission roles"
 msgstr "Прочитать больше о разрешениях для каналов"
 
-#: ../../Zotlabs/Module/New_channel.php:180
+#: ../../Code/Module/New_channel.php:180
 msgid "Create a Channel"
 msgstr "Создать канал"
 
-#: ../../Zotlabs/Module/New_channel.php:181
+#: ../../Code/Module/New_channel.php:181
 msgid ""
 "A channel is a unique network identity. It can represent a person (social "
 "network profile), a forum (group), a business or celebrity page, a newsfeed, "
 "and many other things."
 msgstr "Канал это уникальная сетевая идентичность. Он может представлять человека (профиль в социальной сети), форум или группу, бизнес или страницу знаменитости, новостную ленту и многие другие вещи."
 
-#: ../../Zotlabs/Module/New_channel.php:182
+#: ../../Code/Module/New_channel.php:182
 msgid ""
 "or import an existing channel from another location."
 msgstr "или импортировать существующий канал из другого места."
 
-#: ../../Zotlabs/Module/New_channel.php:187
+#: ../../Code/Module/New_channel.php:187
 msgid "Validate"
 msgstr "Проверить"
 
-#: ../../Zotlabs/Module/Apps.php:53
+#: ../../Code/Module/Apps.php:53
 msgid "Manage apps"
 msgstr "Управление приложениями"
 
-#: ../../Zotlabs/Module/Apps.php:54
+#: ../../Code/Module/Apps.php:54
 msgid "Create new app"
 msgstr "Создать новое приложение"
 
-#: ../../Zotlabs/Module/Directory.php:106
+#: ../../Code/Module/Directory.php:106
 msgid "No default suggestions were found."
 msgstr "Предложений по умолчанию не найдено."
 
-#: ../../Zotlabs/Module/Directory.php:255
+#: ../../Code/Module/Directory.php:255
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
@@ -13831,1025 +13831,1025 @@ msgstr[0] "%d оценка"
 msgstr[1] "%d оценки"
 msgstr[2] "%d оценок"
 
-#: ../../Zotlabs/Module/Directory.php:266
+#: ../../Code/Module/Directory.php:266
 msgid "Gender: "
 msgstr "Пол:"
 
-#: ../../Zotlabs/Module/Directory.php:268
+#: ../../Code/Module/Directory.php:268
 msgid "Status: "
 msgstr "Статус:"
 
-#: ../../Zotlabs/Module/Directory.php:270
+#: ../../Code/Module/Directory.php:270
 msgid "Homepage: "
 msgstr "Домашняя страница:"
 
-#: ../../Zotlabs/Module/Directory.php:330
+#: ../../Code/Module/Directory.php:330
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../../Zotlabs/Module/Directory.php:339
+#: ../../Code/Module/Directory.php:339
 msgid "Public Forum:"
 msgstr "Публичный форум:"
 
-#: ../../Zotlabs/Module/Directory.php:342
+#: ../../Code/Module/Directory.php:342
 msgid "Keywords: "
 msgstr "Ключевые слова:"
 
-#: ../../Zotlabs/Module/Directory.php:345
+#: ../../Code/Module/Directory.php:345
 msgid "Don't suggest"
 msgstr "Не предлагать"
 
-#: ../../Zotlabs/Module/Directory.php:347
+#: ../../Code/Module/Directory.php:347
 msgid "Common connections (estimated):"
 msgstr "Общие контакты (оценочно):"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Global Directory"
 msgstr "Глобальный каталог"
 
-#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Code/Module/Directory.php:396
 msgid "Local Directory"
 msgstr "Локальный каталог"
 
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Code/Module/Directory.php:402
 msgid "Finding:"
 msgstr "Поиск:"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "next page"
 msgstr "следующая страница"
 
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Code/Module/Directory.php:407
 msgid "previous page"
 msgstr "предыдущая страница"
 
-#: ../../Zotlabs/Module/Directory.php:408
+#: ../../Code/Module/Directory.php:408
 msgid "Sort options"
 msgstr "Параметры сортировки"
 
-#: ../../Zotlabs/Module/Directory.php:409
+#: ../../Code/Module/Directory.php:409
 msgid "Alphabetic"
 msgstr "По алфавиту"
 
-#: ../../Zotlabs/Module/Directory.php:410
+#: ../../Code/Module/Directory.php:410
 msgid "Reverse Alphabetic"
 msgstr "Против алфавита"
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Code/Module/Directory.php:411
 msgid "Newest to Oldest"
 msgstr "От новых к старым"
 
-#: ../../Zotlabs/Module/Directory.php:412
+#: ../../Code/Module/Directory.php:412
 msgid "Oldest to Newest"
 msgstr "От старых к новым"
 
-#: ../../Zotlabs/Module/Directory.php:429
+#: ../../Code/Module/Directory.php:429
 msgid "No entries (some entries may be hidden)."
 msgstr "Нет записей (некоторые записи могут быть скрыты)."
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "Enter a folder name"
 msgstr "Введите название каталога"
 
-#: ../../Zotlabs/Module/Filer.php:52
+#: ../../Code/Module/Filer.php:52
 msgid "or select an existing folder (doubleclick)"
 msgstr "или выберите существующий каталог (двойной щелчок)"
 
-#: ../../Zotlabs/Module/Dreport.php:45
+#: ../../Code/Module/Dreport.php:45
 msgid "Invalid message"
 msgstr "Неверное сообщение"
 
-#: ../../Zotlabs/Module/Dreport.php:78
+#: ../../Code/Module/Dreport.php:78
 msgid "no results"
 msgstr "Ничего не найдено."
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Code/Module/Dreport.php:93
 msgid "channel sync processed"
 msgstr "синхронизация канала завершена"
 
-#: ../../Zotlabs/Module/Dreport.php:97
+#: ../../Code/Module/Dreport.php:97
 msgid "queued"
 msgstr "в очереди"
 
-#: ../../Zotlabs/Module/Dreport.php:101
+#: ../../Code/Module/Dreport.php:101
 msgid "posted"
 msgstr "опубликовано"
 
-#: ../../Zotlabs/Module/Dreport.php:105
+#: ../../Code/Module/Dreport.php:105
 msgid "accepted for delivery"
 msgstr "принято к доставке"
 
-#: ../../Zotlabs/Module/Dreport.php:109
+#: ../../Code/Module/Dreport.php:109
 msgid "updated"
 msgstr "обновлено"
 
-#: ../../Zotlabs/Module/Dreport.php:112
+#: ../../Code/Module/Dreport.php:112
 msgid "update ignored"
 msgstr "обновление игнорируется"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Code/Module/Dreport.php:115
 msgid "permission denied"
 msgstr "доступ запрещен"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Code/Module/Dreport.php:119
 msgid "recipient not found"
 msgstr "получатель не найден"
 
-#: ../../Zotlabs/Module/Dreport.php:122
+#: ../../Code/Module/Dreport.php:122
 msgid "mail recalled"
 msgstr "почта отозвана"
 
-#: ../../Zotlabs/Module/Dreport.php:125
+#: ../../Code/Module/Dreport.php:125
 msgid "duplicate mail received"
 msgstr "получено дублирующее сообщение"
 
-#: ../../Zotlabs/Module/Dreport.php:128
+#: ../../Code/Module/Dreport.php:128
 msgid "mail delivered"
 msgstr "почта доставлен"
 
-#: ../../Zotlabs/Module/Dreport.php:148
+#: ../../Code/Module/Dreport.php:148
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Отчёт о доставке для %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:152
+#: ../../Code/Module/Dreport.php:152
 msgid "Redeliver"
 msgstr "Доставить повторно"
 
-#: ../../Zotlabs/Module/Network.php:116
+#: ../../Code/Module/Network.php:116
 msgid "No such group"
 msgstr "Нет такой группы"
 
-#: ../../Zotlabs/Module/Network.php:157
+#: ../../Code/Module/Network.php:157
 msgid "No such channel"
 msgstr "Нет такого канала"
 
-#: ../../Zotlabs/Module/Network.php:242
+#: ../../Code/Module/Network.php:242
 msgid "Privacy group is empty"
 msgstr "Группа безопасности пуста"
 
-#: ../../Zotlabs/Module/Network.php:253
+#: ../../Code/Module/Network.php:253
 msgid "Privacy group: "
 msgstr "Группа безопасности: "
 
-#: ../../Zotlabs/Module/Regmod.php:15
+#: ../../Code/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Пожалуйста, войдите."
 
-#: ../../Zotlabs/Module/Service_limits.php:23
+#: ../../Code/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr "Ограничений класса обслуживание не найдено."
 
-#: ../../Zotlabs/Module/Cards.php:99
+#: ../../Code/Module/Cards.php:99
 msgid "Add Card"
 msgstr "Добавить карточку"
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of Pinned Navbar Apps"
 msgstr "Изменить порядок приложений на панели навигации"
 
-#: ../../Zotlabs/Module/Apporder.php:44
+#: ../../Code/Module/Apporder.php:44
 msgid "Change Order of App Tray Apps"
 msgstr "Изменить порядок приложений в лотке"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid ""
 "Use arrows to move the corresponding app left (top) or right (bottom) in the "
 "navbar"
 msgstr "Используйте стрелки для перемещения приложения влево (вверх) или вправо (вниз) в панели навигации"
 
-#: ../../Zotlabs/Module/Apporder.php:45
+#: ../../Code/Module/Apporder.php:45
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr "Используйте стрелки для перемещения приложения вверх или вниз в лотке"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Code/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Превышено максимальное количество регистраций на сегодня. Пожалуйста, попробуйте снова завтра."
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Code/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Пожалуйста, подтвердите согласие с \"Условиями обслуживания\". Регистрация не удалась."
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Code/Module/Register.php:89
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../../Zotlabs/Module/Register.php:132
+#: ../../Code/Module/Register.php:132
 msgid "Registration successful. Continue to create your first channel..."
 msgstr "Регистрация завершена успешно. Для продолжения создайте свой первый канал..."
 
-#: ../../Zotlabs/Module/Register.php:135
+#: ../../Code/Module/Register.php:135
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr "Регистрация завершена успешно. Пожалуйста проверьте вашу электронную почту для подтверждения."
 
-#: ../../Zotlabs/Module/Register.php:142
+#: ../../Code/Module/Register.php:142
 msgid "Your registration is pending approval by the site owner."
 msgstr "Ваша регистрация ожидает одобрения администрации сайта."
 
-#: ../../Zotlabs/Module/Register.php:145
+#: ../../Code/Module/Register.php:145
 msgid "Your registration can not be processed."
 msgstr "Ваша регистрация не может быть обработана."
 
-#: ../../Zotlabs/Module/Register.php:192
+#: ../../Code/Module/Register.php:192
 msgid "Registration on this hub is disabled."
 msgstr "Регистрация на этом хабе отключена."
 
-#: ../../Zotlabs/Module/Register.php:201
+#: ../../Code/Module/Register.php:201
 msgid "Registration on this hub is by approval only."
 msgstr "Регистрация на этом хабе только по утверждению."
 
-#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211
+#: ../../Code/Module/Register.php:202 ../../Code/Module/Register.php:211
 msgid "Register at another affiliated hub."
 msgstr "Зарегистрироваться на другом хабе."
 
-#: ../../Zotlabs/Module/Register.php:210
+#: ../../Code/Module/Register.php:210
 msgid "Registration on this hub is by invitation only."
 msgstr "Регистрация на этом хабе доступна только по приглашениям."
 
-#: ../../Zotlabs/Module/Register.php:221
+#: ../../Code/Module/Register.php:221
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Этот сайт превысил максимальное количество регистраций на сегодня. Пожалуйста, попробуйте снова завтра. "
 
-#: ../../Zotlabs/Module/Register.php:247
+#: ../../Code/Module/Register.php:247
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Я принимаю %s для этого веб-сайта."
 
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Code/Module/Register.php:254
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Мой возраст превышает %s лет и я принимаю %s для этого веб-сайта."
 
-#: ../../Zotlabs/Module/Register.php:259
+#: ../../Code/Module/Register.php:259
 msgid "Your email address"
 msgstr "Ваш адрес электронной почты"
 
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Code/Module/Register.php:260
 msgid "Choose a password"
 msgstr "Выберите пароль"
 
-#: ../../Zotlabs/Module/Register.php:261
+#: ../../Code/Module/Register.php:261
 msgid "Please re-enter your password"
 msgstr "Пожалуйста, введите пароль еще раз"
 
-#: ../../Zotlabs/Module/Register.php:262
+#: ../../Code/Module/Register.php:262
 msgid "Please enter your invitation code"
 msgstr "Пожалуйста, введите Ваш код приглашения"
 
-#: ../../Zotlabs/Module/Register.php:263
+#: ../../Code/Module/Register.php:263
 msgid "Your Name"
 msgstr "Ваше имя"
 
-#: ../../Zotlabs/Module/Register.php:263
+#: ../../Code/Module/Register.php:263
 msgid "Real names are preferred."
 msgstr "Предпочтительны реальные имена."
 
-#: ../../Zotlabs/Module/Register.php:265
+#: ../../Code/Module/Register.php:265
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
 "g. nickname%s"
 msgstr "Ваш псевдоним будет использован для создания легко запоминаемого адреса канала, напр. nickname %s"
 
-#: ../../Zotlabs/Module/Register.php:266
+#: ../../Code/Module/Register.php:266
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
 msgstr "Выберите разрешения для канала в зависимости от ваших потребностей и требований приватности."
 
-#: ../../Zotlabs/Module/Register.php:267
+#: ../../Code/Module/Register.php:267
 msgid "no"
 msgstr "нет"
 
-#: ../../Zotlabs/Module/Register.php:267
+#: ../../Code/Module/Register.php:267
 msgid "yes"
 msgstr "да"
 
-#: ../../Zotlabs/Module/Register.php:295
+#: ../../Code/Module/Register.php:295
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr "Этот сайт требует проверку адреса электронной почты. После заполнения этой формы, пожалуйста, проверьте ваш почтовый ящик для дальнейших инструкций."
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+#: ../../Code/Module/Pconfig.php:26 ../../Code/Module/Pconfig.php:59
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Этот параметр требует специальной обработки и редактирования и был заблокирован."
 
-#: ../../Zotlabs/Module/Pconfig.php:48
+#: ../../Code/Module/Pconfig.php:48
 msgid "Configuration Editor"
 msgstr "Редактор конфигурации"
 
-#: ../../Zotlabs/Module/Pconfig.php:49
+#: ../../Code/Module/Pconfig.php:49
 msgid ""
 "Warning: Changing some settings could render your channel inoperable. Please "
 "leave this page unless you are comfortable with and knowledgeable about how "
 "to correctly use this feature."
 msgstr "Предупреждение. Изменение некоторых настроек может привести к неработоспособности вашего канала. Пожалуйста, покиньте эту страницу, если вы точно не значете, как правильно использовать эту функцию."
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Code/Module/Article_edit.php:128
 msgid "Edit Article"
 msgstr "Редактировать статью"
 
-#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123
+#: ../../Code/Module/Wiki.php:44 ../../Code/Module/Cloud.php:123
 msgid "Not found"
 msgstr "Не найдено."
 
-#: ../../Zotlabs/Module/Wiki.php:124
+#: ../../Code/Module/Wiki.php:124
 msgid "Error retrieving wiki"
 msgstr "Ошибка при получении Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:131
+#: ../../Code/Module/Wiki.php:131
 msgid "Error creating zip file export folder"
 msgstr "Ошибка при создании zip-файла при экспорте каталога"
 
-#: ../../Zotlabs/Module/Wiki.php:182
+#: ../../Code/Module/Wiki.php:182
 msgid "Error downloading wiki: "
 msgstr "Ошибка загрузки Wiki:"
 
-#: ../../Zotlabs/Module/Wiki.php:203
+#: ../../Code/Module/Wiki.php:203
 msgid "Download"
 msgstr "Загрузить"
 
-#: ../../Zotlabs/Module/Wiki.php:207
+#: ../../Code/Module/Wiki.php:207
 msgid "Wiki name"
 msgstr "Название Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:208
+#: ../../Code/Module/Wiki.php:208
 msgid "Content type"
 msgstr "Тип содержимого"
 
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286
+#: ../../Code/Module/Wiki.php:210 ../../Code/Storage/Browser.php:286
 msgid "Type"
 msgstr "Тип"
 
-#: ../../Zotlabs/Module/Wiki.php:211
+#: ../../Code/Module/Wiki.php:211
 msgid "Any type"
 msgstr "Любой тип"
 
-#: ../../Zotlabs/Module/Wiki.php:218
+#: ../../Code/Module/Wiki.php:218
 msgid "Lock content type"
 msgstr "Зафиксировать тип содержимого"
 
-#: ../../Zotlabs/Module/Wiki.php:219
+#: ../../Code/Module/Wiki.php:219
 msgid "Create a status post for this wiki"
 msgstr "Создать публикацию о статусе этой Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:220
+#: ../../Code/Module/Wiki.php:220
 msgid "Edit Wiki Name"
 msgstr "Редактировать наименование Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../Code/Module/Wiki.php:262
 msgid "Wiki not found"
 msgstr "Wiki не найдена"
 
-#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../Code/Module/Wiki.php:286
 msgid "Rename page"
 msgstr "Переименовать страницу"
 
-#: ../../Zotlabs/Module/Wiki.php:307
+#: ../../Code/Module/Wiki.php:307
 msgid "Error retrieving page content"
 msgstr "Ошибка при получении содержимого страницы"
 
-#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317
+#: ../../Code/Module/Wiki.php:315 ../../Code/Module/Wiki.php:317
 msgid "New page"
 msgstr "Новая страница"
 
-#: ../../Zotlabs/Module/Wiki.php:345
+#: ../../Code/Module/Wiki.php:345
 msgid "Revision Comparison"
 msgstr "Сравнение ревизий"
 
-#: ../../Zotlabs/Module/Wiki.php:346
+#: ../../Code/Module/Wiki.php:346
 msgid "Revert"
 msgstr "Вернуть"
 
-#: ../../Zotlabs/Module/Wiki.php:353
+#: ../../Code/Module/Wiki.php:353
 msgid "Short description of your changes (optional)"
 msgstr "Краткое описание ваших изменений (необязательно)"
 
-#: ../../Zotlabs/Module/Wiki.php:362
+#: ../../Code/Module/Wiki.php:362
 msgid "Source"
 msgstr "Источник"
 
-#: ../../Zotlabs/Module/Wiki.php:372
+#: ../../Code/Module/Wiki.php:372
 msgid "New page name"
 msgstr "Новое имя страницы"
 
-#: ../../Zotlabs/Module/Wiki.php:377
+#: ../../Code/Module/Wiki.php:377
 msgid "Embed image from photo albums"
 msgstr "Встроить изображение из фотоальбома"
 
-#: ../../Zotlabs/Module/Wiki.php:462
+#: ../../Code/Module/Wiki.php:462
 msgid "Error creating wiki. Invalid name."
 msgstr "Ошибка создания Wiki. Неверное имя."
 
-#: ../../Zotlabs/Module/Wiki.php:469
+#: ../../Code/Module/Wiki.php:469
 msgid "A wiki with this name already exists."
 msgstr "Wiki с таким именем уже существует."
 
-#: ../../Zotlabs/Module/Wiki.php:482
+#: ../../Code/Module/Wiki.php:482
 msgid "Wiki created, but error creating Home page."
 msgstr "Wiki создана, но возникла ошибка при создании домашней страницы"
 
-#: ../../Zotlabs/Module/Wiki.php:489
+#: ../../Code/Module/Wiki.php:489
 msgid "Error creating wiki"
 msgstr "Ошибка при создании Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:512
+#: ../../Code/Module/Wiki.php:512
 msgid "Error updating wiki. Invalid name."
 msgstr "Ошибка при обновлении Wiki. Неверное имя."
 
-#: ../../Zotlabs/Module/Wiki.php:532
+#: ../../Code/Module/Wiki.php:532
 msgid "Error updating wiki"
 msgstr "Ошибка при обновлении Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:547
+#: ../../Code/Module/Wiki.php:547
 msgid "Wiki delete permission denied."
 msgstr "Нет прав на удаление Wiki."
 
-#: ../../Zotlabs/Module/Wiki.php:557
+#: ../../Code/Module/Wiki.php:557
 msgid "Error deleting wiki"
 msgstr "Ошибка удаления Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:590
+#: ../../Code/Module/Wiki.php:590
 msgid "New page created"
 msgstr "Создана новая страница"
 
-#: ../../Zotlabs/Module/Wiki.php:711
+#: ../../Code/Module/Wiki.php:711
 msgid "Cannot delete Home"
 msgstr "Невозможно удалить домашнюю страницу"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Current Revision"
 msgstr "Текущая ревизия"
 
-#: ../../Zotlabs/Module/Wiki.php:775
+#: ../../Code/Module/Wiki.php:775
 msgid "Selected Revision"
 msgstr "Выбранная ревизия"
 
-#: ../../Zotlabs/Module/Wiki.php:825
+#: ../../Code/Module/Wiki.php:825
 msgid "You must be authenticated."
 msgstr "Вы должны быть аутентифицированы."
 
-#: ../../Zotlabs/Module/Magic.php:76
+#: ../../Code/Module/Magic.php:76
 msgid "Hub not found."
 msgstr "Узел не найден."
 
-#: ../../Zotlabs/Module/Attach.php:13
+#: ../../Code/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Элемент недоступен."
 
-#: ../../Zotlabs/Module/Group.php:35
+#: ../../Code/Module/Group.php:35
 msgid "Privacy group created."
 msgstr "Группа безопасности создана."
 
-#: ../../Zotlabs/Module/Group.php:38
+#: ../../Code/Module/Group.php:38
 msgid "Could not create privacy group."
 msgstr "Не удалось создать группу безопасности."
 
-#: ../../Zotlabs/Module/Group.php:67
+#: ../../Code/Module/Group.php:67
 msgid "Privacy group updated."
 msgstr "Группа безопасности обновлена."
 
-#: ../../Zotlabs/Module/Group.php:114
+#: ../../Code/Module/Group.php:114
 msgid "Add Group"
 msgstr "Добавить группу"
 
-#: ../../Zotlabs/Module/Group.php:118
+#: ../../Code/Module/Group.php:118
 msgid "Privacy group name"
 msgstr "Имя группы безопасности"
 
-#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220
+#: ../../Code/Module/Group.php:119 ../../Code/Module/Group.php:220
 msgid "Members are visible to other channels"
 msgstr "Участники канала видимые для остальных"
 
-#: ../../Zotlabs/Module/Group.php:151
+#: ../../Code/Module/Group.php:151
 msgid "Privacy group removed."
 msgstr "Группа безопасности удалена."
 
-#: ../../Zotlabs/Module/Group.php:153
+#: ../../Code/Module/Group.php:153
 msgid "Unable to remove privacy group."
 msgstr "Ну удалось удалить группу безопасности."
 
-#: ../../Zotlabs/Module/Group.php:215
+#: ../../Code/Module/Group.php:215
 #, php-format
 msgid "Privacy Group: %s"
 msgstr "Группа безопасности: %s"
 
-#: ../../Zotlabs/Module/Group.php:217
+#: ../../Code/Module/Group.php:217
 msgid "Privacy group name: "
 msgstr "Название группы безопасности: "
 
-#: ../../Zotlabs/Module/Group.php:222
+#: ../../Code/Module/Group.php:222
 msgid "Delete Group"
 msgstr "Удалить группу"
 
-#: ../../Zotlabs/Module/Group.php:232
+#: ../../Code/Module/Group.php:232
 msgid "Group members"
 msgstr "Члены группы"
 
-#: ../../Zotlabs/Module/Group.php:234
+#: ../../Code/Module/Group.php:234
 msgid "Not in this group"
 msgstr "Не в этой группе"
 
-#: ../../Zotlabs/Module/Group.php:266
+#: ../../Code/Module/Group.php:266
 msgid "Click a channel to toggle membership"
 msgstr "Нажмите на канал для просмотра членства"
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+#: ../../Code/Module/Profiles.php:24 ../../Code/Module/Profiles.php:184
+#: ../../Code/Module/Profiles.php:241 ../../Code/Module/Profiles.php:659
 msgid "Profile not found."
 msgstr "Профиль не найден."
 
-#: ../../Zotlabs/Module/Profiles.php:44
+#: ../../Code/Module/Profiles.php:44
 msgid "Profile deleted."
 msgstr "Профиль удален."
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+#: ../../Code/Module/Profiles.php:68 ../../Code/Module/Profiles.php:105
 msgid "Profile-"
 msgstr "Профиль -"
 
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+#: ../../Code/Module/Profiles.php:90 ../../Code/Module/Profiles.php:127
 msgid "New profile created."
 msgstr "Новый профиль создан."
 
-#: ../../Zotlabs/Module/Profiles.php:111
+#: ../../Code/Module/Profiles.php:111
 msgid "Profile unavailable to clone."
 msgstr "Профиль недоступен для клонирования."
 
-#: ../../Zotlabs/Module/Profiles.php:146
+#: ../../Code/Module/Profiles.php:146
 msgid "Profile unavailable to export."
 msgstr "Профиль недоступен для экспорта."
 
-#: ../../Zotlabs/Module/Profiles.php:252
+#: ../../Code/Module/Profiles.php:252
 msgid "Profile Name is required."
 msgstr "Требуется имя профиля."
 
-#: ../../Zotlabs/Module/Profiles.php:459
+#: ../../Code/Module/Profiles.php:459
 msgid "Marital Status"
 msgstr "Семейное положение"
 
-#: ../../Zotlabs/Module/Profiles.php:463
+#: ../../Code/Module/Profiles.php:463
 msgid "Romantic Partner"
 msgstr "Романтический партнер"
 
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772
+#: ../../Code/Module/Profiles.php:467 ../../Code/Module/Profiles.php:772
 msgid "Likes"
 msgstr "Нравится"
 
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773
+#: ../../Code/Module/Profiles.php:471 ../../Code/Module/Profiles.php:773
 msgid "Dislikes"
 msgstr "Не нравится"
 
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780
+#: ../../Code/Module/Profiles.php:475 ../../Code/Module/Profiles.php:780
 msgid "Work/Employment"
 msgstr "Работа / Занятость"
 
-#: ../../Zotlabs/Module/Profiles.php:478
+#: ../../Code/Module/Profiles.php:478
 msgid "Religion"
 msgstr "Религия"
 
-#: ../../Zotlabs/Module/Profiles.php:482
+#: ../../Code/Module/Profiles.php:482
 msgid "Political Views"
 msgstr "Политические взгляды"
 
-#: ../../Zotlabs/Module/Profiles.php:490
+#: ../../Code/Module/Profiles.php:490
 msgid "Sexual Preference"
 msgstr "Сексуальная ориентация"
 
-#: ../../Zotlabs/Module/Profiles.php:494
+#: ../../Code/Module/Profiles.php:494
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: ../../Zotlabs/Module/Profiles.php:498
+#: ../../Code/Module/Profiles.php:498
 msgid "Interests"
 msgstr "Интересы"
 
-#: ../../Zotlabs/Module/Profiles.php:594
+#: ../../Code/Module/Profiles.php:594
 msgid "Profile updated."
 msgstr "Профиль обновлен."
 
-#: ../../Zotlabs/Module/Profiles.php:678
+#: ../../Code/Module/Profiles.php:678
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Скрывать от просмотра ваш список контактов в этом профиле"
 
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Code/Module/Profiles.php:722
 msgid "Edit Profile Details"
 msgstr "Редактирование профиля"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Code/Module/Profiles.php:724
 msgid "View this profile"
 msgstr "Посмотреть этот профиль"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Code/Module/Profiles.php:726
 msgid "Profile Tools"
 msgstr "Инструменты профиля"
 
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Code/Module/Profiles.php:727
 msgid "Change cover photo"
 msgstr "Изменить фотографию обложки"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Code/Module/Profiles.php:729
 msgid "Create a new profile using these settings"
 msgstr "Создать новый профиль со следующими настройками"
 
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Code/Module/Profiles.php:730
 msgid "Clone this profile"
 msgstr "Клонировать этот профиль"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Code/Module/Profiles.php:731
 msgid "Delete this profile"
 msgstr "Удалить этот профиль"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Code/Module/Profiles.php:732
 msgid "Add profile things"
 msgstr "Добавить в профиль"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Code/Module/Profiles.php:735
 msgid "Relationship"
 msgstr "Отношения"
 
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Code/Module/Profiles.php:738
 msgid "Import profile from file"
 msgstr "Импортировать профиль из файла"
 
-#: ../../Zotlabs/Module/Profiles.php:739
+#: ../../Code/Module/Profiles.php:739
 msgid "Export profile to file"
 msgstr "Экспортировать профиль в файл"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Code/Module/Profiles.php:740
 msgid "Your gender"
 msgstr "Ваш пол"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Code/Module/Profiles.php:741
 msgid "Marital status"
 msgstr "Семейное положение"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Code/Module/Profiles.php:742
 msgid "Sexual preference"
 msgstr "Сексуальная ориентация"
 
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Code/Module/Profiles.php:745
 msgid "Profile name"
 msgstr "Имя профиля"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Code/Module/Profiles.php:747
 msgid "This is your default profile."
 msgstr "Это ваш профиль по умолчанию."
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Code/Module/Profiles.php:749
 msgid "Your full name"
 msgstr "Ваше полное имя"
 
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Code/Module/Profiles.php:750
 msgid "Title/Description"
 msgstr "Заголовок / описание"
 
-#: ../../Zotlabs/Module/Profiles.php:753
+#: ../../Code/Module/Profiles.php:753
 msgid "Street address"
 msgstr "Улица, дом, квартира"
 
-#: ../../Zotlabs/Module/Profiles.php:754
+#: ../../Code/Module/Profiles.php:754
 msgid "Locality/City"
 msgstr "Населенный пункт / город"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Code/Module/Profiles.php:755
 msgid "Region/State"
 msgstr "Регион / Область"
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Code/Module/Profiles.php:756
 msgid "Postal/Zip code"
 msgstr "Почтовый индекс"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Who (if applicable)"
 msgstr "Кто (если применимо)"
 
-#: ../../Zotlabs/Module/Profiles.php:762
+#: ../../Code/Module/Profiles.php:762
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Примеры: ivan1990, Ivan Petrov, ivan@example.com"
 
-#: ../../Zotlabs/Module/Profiles.php:763
+#: ../../Code/Module/Profiles.php:763
 msgid "Since (date)"
 msgstr "С (дата)"
 
-#: ../../Zotlabs/Module/Profiles.php:766
+#: ../../Code/Module/Profiles.php:766
 msgid "Tell us about yourself"
 msgstr "Расскажите нам о себе"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Code/Module/Profiles.php:768
 msgid "Hometown"
 msgstr "Родной город"
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Code/Module/Profiles.php:769
 msgid "Political views"
 msgstr "Политические взгляды"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Code/Module/Profiles.php:770
 msgid "Religious views"
 msgstr "Религиозные взгляды"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Keywords used in directory listings"
 msgstr "Ключевые слова для участия в каталоге"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Code/Module/Profiles.php:771
 msgid "Example: fishing photography software"
 msgstr "Например: fishing photography software"
 
-#: ../../Zotlabs/Module/Profiles.php:774
+#: ../../Code/Module/Profiles.php:774
 msgid "Musical interests"
 msgstr "Музыкальные интересы"
 
-#: ../../Zotlabs/Module/Profiles.php:775
+#: ../../Code/Module/Profiles.php:775
 msgid "Books, literature"
 msgstr "Книги, литература"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Code/Module/Profiles.php:776
 msgid "Television"
 msgstr "Телевидение"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Code/Module/Profiles.php:777
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Кино / танцы / культура / развлечения"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Code/Module/Profiles.php:778
 msgid "Hobbies/Interests"
 msgstr "Хобби / интересы"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Code/Module/Profiles.php:779
 msgid "Love/Romance"
 msgstr "Любовь / романтические отношения"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Code/Module/Profiles.php:781
 msgid "School/Education"
 msgstr "Школа / образование"
 
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Code/Module/Profiles.php:782
 msgid "Contact information and social networks"
 msgstr "Информация и социальные сети для связи"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Code/Module/Profiles.php:783
 msgid "My other channels"
 msgstr "Мои другие контакты"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Code/Module/Profiles.php:785
 msgid "Communications"
 msgstr "Связи"
 
-#: ../../Zotlabs/Module/Email_resend.php:30
+#: ../../Code/Module/Email_resend.php:30
 msgid "Email verification resent"
 msgstr "Сообщение для проверки email отправлено повторно"
 
-#: ../../Zotlabs/Module/Email_resend.php:33
+#: ../../Code/Module/Email_resend.php:33
 msgid "Unable to resend email verification message."
 msgstr "Невозможно повторно отправить сообщение для проверки email"
 
-#: ../../Zotlabs/Module/Profile.php:93
+#: ../../Code/Module/Profile.php:93
 msgid "vcard"
 msgstr "vCard"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+#: ../../Code/Module/Profperm.php:34 ../../Code/Module/Profperm.php:63
 msgid "Invalid profile identifier."
 msgstr "Неверный идентификатор профиля"
 
-#: ../../Zotlabs/Module/Profperm.php:111
+#: ../../Code/Module/Profperm.php:111
 msgid "Profile Visibility Editor"
 msgstr "Редактор видимости профиля"
 
-#: ../../Zotlabs/Module/Profperm.php:115
+#: ../../Code/Module/Profperm.php:115
 msgid "Click on a contact to add or remove."
 msgstr "Нажмите на контакт, чтобы добавить или удалить."
 
-#: ../../Zotlabs/Module/Profperm.php:124
+#: ../../Code/Module/Profperm.php:124
 msgid "Visible To"
 msgstr "Видно"
 
-#: ../../Zotlabs/Module/Thing.php:120
+#: ../../Code/Module/Thing.php:120
 msgid "Thing updated"
 msgstr "Обновлено"
 
-#: ../../Zotlabs/Module/Thing.php:172
+#: ../../Code/Module/Thing.php:172
 msgid "Object store: failed"
 msgstr "Хранлищие объектов: неудача"
 
-#: ../../Zotlabs/Module/Thing.php:176
+#: ../../Code/Module/Thing.php:176
 msgid "Thing added"
 msgstr "Добавлено"
 
-#: ../../Zotlabs/Module/Thing.php:202
+#: ../../Code/Module/Thing.php:202
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:265
+#: ../../Code/Module/Thing.php:265
 msgid "Show Thing"
 msgstr "Показать"
 
-#: ../../Zotlabs/Module/Thing.php:272
+#: ../../Code/Module/Thing.php:272
 msgid "item not found."
 msgstr "Элемент не найден."
 
-#: ../../Zotlabs/Module/Thing.php:305
+#: ../../Code/Module/Thing.php:305
 msgid "Edit Thing"
 msgstr "Редактировать"
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364
+#: ../../Code/Module/Thing.php:307 ../../Code/Module/Thing.php:364
 msgid "Select a profile"
 msgstr "Выбрать профиль"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Post an activity"
 msgstr "Опубликовать мероприятие"
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
+#: ../../Code/Module/Thing.php:311 ../../Code/Module/Thing.php:367
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Отправлять только подходящий профиль"
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+#: ../../Code/Module/Thing.php:313 ../../Code/Module/Thing.php:369
 msgid "Name of thing e.g. something"
 msgstr "Наименование, например \"нечто\""
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370
+#: ../../Code/Module/Thing.php:315 ../../Code/Module/Thing.php:370
 msgid "URL of thing (optional)"
 msgstr "URL (необязательно)"
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371
+#: ../../Code/Module/Thing.php:317 ../../Code/Module/Thing.php:371
 msgid "URL for photo of thing (optional)"
 msgstr "URL для фотографии (необязательно)"
 
-#: ../../Zotlabs/Module/Thing.php:362
+#: ../../Code/Module/Thing.php:362
 msgid "Add Thing to your Profile"
 msgstr "Добавить к вашему профилю"
 
-#: ../../Zotlabs/Module/Display.php:394
+#: ../../Code/Module/Display.php:394
 msgid "Article"
 msgstr "Статья"
 
-#: ../../Zotlabs/Module/Display.php:446
+#: ../../Code/Module/Display.php:446
 msgid "Item has been removed."
 msgstr "Элемент был удалён."
 
-#: ../../Zotlabs/Module/Home.php:92
+#: ../../Code/Module/Home.php:92
 #, php-format
 msgid "Welcome to %s"
 msgstr "Добро пожаловать в %s"
 
-#: ../../Zotlabs/Module/Cloud.php:129
+#: ../../Code/Module/Cloud.php:129
 msgid "Please refresh page"
 msgstr "Пожалуйста обновите страницу"
 
-#: ../../Zotlabs/Module/Cloud.php:132
+#: ../../Code/Module/Cloud.php:132
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../../Zotlabs/Module/Lostpass.php:19
+#: ../../Code/Module/Lostpass.php:19
 msgid "No valid account found."
 msgstr "Действительный аккаунт не найден."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
+#: ../../Code/Module/Lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "Запрос на сброс пароля отправлен. Проверьте вашу электронную почту."
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../Code/Module/Lostpass.php:39 ../../Code/Module/Lostpass.php:108
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Участник сайта (%s)"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../Code/Module/Lostpass.php:44 ../../Code/Module/Lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Запрошен сброс пароля на %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../Code/Module/Lostpass.php:68
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Запрос не может быть проверен. (Вы могли отправить его раньше). Сброс пароля не возможен."
 
-#: ../../Zotlabs/Module/Lostpass.php:92
+#: ../../Code/Module/Lostpass.php:92
 msgid "Your password has been reset as requested."
 msgstr "Ваш пароль в соответствии с просьбой сброшен."
 
-#: ../../Zotlabs/Module/Lostpass.php:93
+#: ../../Code/Module/Lostpass.php:93
 msgid "Your new password is"
 msgstr "Ваш новый пароль"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
+#: ../../Code/Module/Lostpass.php:94
 msgid "Save or copy your new password - and then"
 msgstr "Сохраните ваш новый пароль и затем"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
+#: ../../Code/Module/Lostpass.php:95
 msgid "click here to login"
 msgstr "нажмите здесь чтобы войти"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../Code/Module/Lostpass.php:96
 msgid ""
 "Your password may be changed from the Settings page after "
 "successful login."
 msgstr "Ваш пароль может быть изменён на странице Настройки после успешного входа."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
+#: ../../Code/Module/Lostpass.php:117
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Пароль был изменен на %s"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
+#: ../../Code/Module/Lostpass.php:130
 msgid "Forgot your Password?"
 msgstr "Забыли ваш пароль?"
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../Code/Module/Lostpass.php:131
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Введите ваш адрес электронной почты и нажмите отправить чтобы сбросить пароль. Затем проверьте ваш почтовый ящик для дальнейших инструкций. "
 
-#: ../../Zotlabs/Module/Lostpass.php:132
+#: ../../Code/Module/Lostpass.php:132
 msgid "Email Address"
 msgstr "Адрес электронной почты"
 
-#: ../../Zotlabs/Module/Mood.php:136
+#: ../../Code/Module/Mood.php:136
 msgid "Set your current mood and tell your friends"
 msgstr "Установить текущее настроение и рассказать друзьям"
 
-#: ../../Zotlabs/Module/Import_items.php:93
+#: ../../Code/Module/Import_items.php:93
 #, php-format
 msgid "Warning: Database versions differ by %1$d updates."
 msgstr "Предупреждение: Версия базы данных отличается от %1$d обновления."
 
-#: ../../Zotlabs/Module/Import_items.php:108
+#: ../../Code/Module/Import_items.php:108
 msgid "Import completed"
 msgstr "Импорт завершён."
 
-#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Code/Module/Import_items.php:125
 msgid "Import Items"
 msgstr "Импортировать объекты"
 
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Code/Module/Import_items.php:126
 msgid "Use this form to import existing posts and content from an export file."
 msgstr "Используйте эту форму для импорта существующих публикаций и содержимого из файла."
 
-#: ../../Zotlabs/Module/Chanview.php:139
+#: ../../Code/Module/Chanview.php:139
 msgid "toggle full screen mode"
 msgstr "переключение полноэкранного режима"
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289
+#: ../../Code/Storage/Browser.php:107 ../../Code/Storage/Browser.php:289
 msgid "parent"
 msgstr "источник"
 
-#: ../../Zotlabs/Storage/Browser.php:134
+#: ../../Code/Storage/Browser.php:134
 msgid "Principal"
 msgstr "Субъект"
 
-#: ../../Zotlabs/Storage/Browser.php:137
+#: ../../Code/Storage/Browser.php:137
 msgid "Addressbook"
 msgstr "Адресная книга"
 
-#: ../../Zotlabs/Storage/Browser.php:143
+#: ../../Code/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "План занятий входящий"
 
-#: ../../Zotlabs/Storage/Browser.php:146
+#: ../../Code/Storage/Browser.php:146
 msgid "Schedule Outbox"
 msgstr "План занятий исходящий"
 
-#: ../../Zotlabs/Storage/Browser.php:273
+#: ../../Code/Storage/Browser.php:273
 msgid "Total"
 msgstr "Всего"
 
-#: ../../Zotlabs/Storage/Browser.php:275
+#: ../../Code/Storage/Browser.php:275
 msgid "Shared"
 msgstr "Общие"
 
-#: ../../Zotlabs/Storage/Browser.php:277
+#: ../../Code/Storage/Browser.php:277
 msgid "Add Files"
 msgstr "Добавить файлы"
 
-#: ../../Zotlabs/Storage/Browser.php:361
+#: ../../Code/Storage/Browser.php:361
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Вы используете %1$s из доступного вам хранилища файлов."
 
-#: ../../Zotlabs/Storage/Browser.php:366
+#: ../../Code/Storage/Browser.php:366
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s%)"
 msgstr "Вы используете %1$s из %2$s доступного хранилища файлов (%3$s%)."
 
-#: ../../Zotlabs/Storage/Browser.php:377
+#: ../../Code/Storage/Browser.php:377
 msgid "WARNING:"
 msgstr "Предупреждение:"
 
-#: ../../Zotlabs/Storage/Browser.php:389
+#: ../../Code/Storage/Browser.php:389
 msgid "Create new folder"
 msgstr "Создать новую папку"
 
-#: ../../Zotlabs/Storage/Browser.php:391
+#: ../../Code/Storage/Browser.php:391
 msgid "Upload file"
 msgstr "Загрузить файл"
 
-#: ../../Zotlabs/Storage/Browser.php:404
+#: ../../Code/Storage/Browser.php:404
 msgid "Drop files here to immediately upload"
 msgstr "Поместите файлы сюда для немедленной загрузки"
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 582b58c1d..440307304 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -1,9 +1,9 @@
 {{$base}}
 
     Zotlabs
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Code
     Hubzilla